[gnome-control-center] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Fri, 11 Feb 2011 11:15:41 +0000 (UTC)
commit 15d67c1eaddc734512d8d1d061ea83250f1b24df
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Feb 11 19:15:32 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  537 ++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po |  537 ++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 592 insertions(+), 482 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index c443aea..e0346d8 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.91.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-03 14:32+0800\n"
-"PO-Revision-Date: 2011-02-03 14:32+0800\n"
+"POT-Creation-Date: 2011-02-11 19:14+0800\n"
+"PO-Revision-Date: 2011-02-11 19:15+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -197,53 +197,53 @@ msgstr "é?ªæ??"
 msgid "Zoom"
 msgstr "ç¸®æ?¾"
 
-#: ../panels/background/bg-colors-source.c:44
+#: ../panels/background/bg-colors-source.c:45
 msgid "Horizontal Gradient"
 msgstr "æ°´å¹³æ¼¸è®?è?²"
 
-#: ../panels/background/bg-colors-source.c:45
+#: ../panels/background/bg-colors-source.c:46
 msgid "Vertical Gradient"
 msgstr "å??ç?´æ¼¸è®?è?²"
 
-#: ../panels/background/bg-colors-source.c:46
+#: ../panels/background/bg-colors-source.c:47
 msgid "Solid Color"
 msgstr "å?®è?²"
 
-#: ../panels/background/cc-background-panel.c:747
+#: ../panels/background/cc-background-panel.c:775
 msgid "Wallpapers"
 msgstr "æ¡?å¸?"
 
-#: ../panels/background/cc-background-panel.c:755
+#: ../panels/background/cc-background-panel.c:783
 msgid "Pictures Folder"
 msgstr "å??ç??è³?æ??å¤¾"
 
-#: ../panels/background/cc-background-panel.c:763
+#: ../panels/background/cc-background-panel.c:791
 msgid "Colors & Gradients"
 msgstr "é¡?è?² & æ¼¸è®?è?²"
 
-#: ../panels/background/cc-background-panel.c:772
+#: ../panels/background/cc-background-panel.c:800
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../panels/background/cc-background-panel.c:833
+#: ../panels/background/cc-background-panel.c:854
 msgid "Current background"
 msgstr "ç?®å??ç??è??æ?¯"
 
-#: ../panels/background/gnome-wp-info.c:59
-msgid "No Desktop Background"
-msgstr "ç?¡æ¡?é?¢è??æ?¯"
-
-#: ../panels/background/gnome-wp-item.c:277
+#: ../panels/background/cc-background-item.c:146
 msgid "multiple sizes"
 msgstr "å¤?é??å°ºå¯¸"
 
 #. translators: 100 Ã? 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/gnome-wp-item.c:285
+#: ../panels/background/cc-background-item.c:150
 #, c-format
 msgid "%d Ã? %d"
 msgstr "%d Ã? %d"
 
+#: ../panels/background/cc-background-item.c:252
+msgid "No Desktop Background"
+msgstr "ç?¡æ¡?é?¢è??æ?¯"
+
 #: ../panels/common/gdm-languages.c:709
 msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
@@ -336,22 +336,26 @@ msgstr "å??å??ï¼?"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../panels/datetime/dt-lockbutton.c:347 ../panels/screen/screen.ui.h:13
+#: ../panels/datetime/dt-lockbutton.c:347
+#: ../panels/printers/pp-lockbutton.c:347 ../panels/screen/screen.ui.h:13
 #: ../panels/user-accounts/um-lockbutton.c:347
 msgid "Lock"
 msgstr "é??å®?"
 
-#: ../panels/datetime/dt-lockbutton.c:356 ../panels/network/network.ui.h:23
+#: ../panels/datetime/dt-lockbutton.c:356
+#: ../panels/printers/pp-lockbutton.c:356 ../panels/network/network.ui.h:23
 #: ../panels/user-accounts/um-lockbutton.c:356
 msgid "Unlock"
 msgstr "è§£é??"
 
 #: ../panels/datetime/dt-lockbutton.c:365
+#: ../panels/printers/pp-lockbutton.c:365
 #: ../panels/user-accounts/um-lockbutton.c:365
 msgid "Locked"
 msgstr "å·²é??å®?"
 
 #: ../panels/datetime/dt-lockbutton.c:374
+#: ../panels/printers/pp-lockbutton.c:374
 #: ../panels/user-accounts/um-lockbutton.c:374
 msgid ""
 "Dialog is unlocked.\n"
@@ -361,6 +365,7 @@ msgstr ""
 "é»?é?¸ä»¥é?²æ¢é?²ä¸?æ¥ç??æ?´æ?¹"
 
 #: ../panels/datetime/dt-lockbutton.c:383
+#: ../panels/printers/pp-lockbutton.c:383
 #: ../panels/user-accounts/um-lockbutton.c:383
 msgid ""
 "Dialog is locked.\n"
@@ -370,6 +375,7 @@ msgstr ""
 "é»?é?¸é?²è¡?æ?´æ?¹"
 
 #: ../panels/datetime/dt-lockbutton.c:392
+#: ../panels/printers/pp-lockbutton.c:392
 #: ../panels/user-accounts/um-lockbutton.c:392
 msgid ""
 "System policy prevents changes.\n"
@@ -396,13 +402,13 @@ msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:503
+#: ../panels/display/xrandr-capplet.c:497
 msgid "Monitor"
 msgstr "é¡¯ç¤ºå?¨"
 
 #: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:339
-#: ../panels/display/xrandr-capplet.c:378
+#: ../panels/display/xrandr-capplet.c:333
+#: ../panels/display/xrandr-capplet.c:372
 #: ../panels/universal-access/uap.ui.h:58
 msgid "Normal"
 msgstr "æ£å¸¸"
@@ -449,15 +455,15 @@ msgstr "é¡¯ç¤ºå?¨"
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;è§£å??åº¦;é??æ?°æ?´ç??;"
 
-#: ../panels/display/xrandr-capplet.c:340
+#: ../panels/display/xrandr-capplet.c:334
 msgid "Anti-Clockwise"
 msgstr "é??æ??é??"
 
-#: ../panels/display/xrandr-capplet.c:341
+#: ../panels/display/xrandr-capplet.c:335
 msgid "Clockwise"
 msgstr "é ?æ??é??"
 
-#: ../panels/display/xrandr-capplet.c:342
+#: ../panels/display/xrandr-capplet.c:336
 msgid "180 Degrees"
 msgstr "180 åº¦"
 
@@ -466,102 +472,102 @@ msgstr "180 åº¦"
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:479
+#: ../panels/display/xrandr-capplet.c:473
 msgid "Mirror Displays"
 msgstr "é?¡å°?é¡¯ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:612
+#: ../panels/display/xrandr-capplet.c:603
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:614
+#: ../panels/display/xrandr-capplet.c:605
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1527
+#: ../panels/display/xrandr-capplet.c:1518
 msgid "Drag to change primary display."
 msgstr "æ??æ?³ä»¥æ?¹è®?ä¸»è¦?é¡¯ç¤ºå?¨ã??"
 
-#: ../panels/display/xrandr-capplet.c:1585
+#: ../panels/display/xrandr-capplet.c:1576
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é?¸æ??ä¸?å??è?¢å¹?ä»¥æ?¹è®?å®?ç??å±¬æ?§ï¼?æ??æ?³å®?å??è?½é??æ?°æ??å??å®?ç??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1975
+#: ../panels/display/xrandr-capplet.c:1966
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1977
+#: ../panels/display/xrandr-capplet.c:1968
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/xrandr-capplet.c:2262
+#: ../panels/display/xrandr-capplet.c:2214
 msgid "Could not save the monitor configuration"
 msgstr "ç?¡æ³?å?²å?é¡¯ç¤ºå?¨çµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2285
+#: ../panels/display/xrandr-capplet.c:2239
 msgid "Could not get session bus while applying display configuration"
 msgstr "å?¨å¥?ç?¨é¡¯ç¤ºçµ?æ??æ??ç?¡æ³?å??å¾?ä½?æ¥é??æ®µå?¯æµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2330
+#: ../panels/display/xrandr-capplet.c:2284
 msgid "Could not detect displays"
 msgstr "ç?¡æ³?å?µæ¸¬é¡¯ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:2538
+#: ../panels/display/xrandr-capplet.c:2479
 msgid "Could not get screen information"
 msgstr "ç?¡æ³?å??å¾?è?¢å¹?è³?è¨?"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:247
+#: ../panels/info/cc-info-panel.c:417
 #, c-format
 msgid "%d-bit"
 msgstr "%d-ä½?å??"
 
-#: ../panels/info/cc-info-panel.c:261
+#: ../panels/info/cc-info-panel.c:431
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u ä½?å??çµ?"
 
-#: ../panels/info/cc-info-panel.c:269
+#: ../panels/info/cc-info-panel.c:439
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panels/info/cc-info-panel.c:274
+#: ../panels/info/cc-info-panel.c:444
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panels/info/cc-info-panel.c:279
+#: ../panels/info/cc-info-panel.c:449
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panels/info/cc-info-panel.c:284
+#: ../panels/info/cc-info-panel.c:454
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../panels/info/cc-info-panel.c:289
+#: ../panels/info/cc-info-panel.c:459
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../panels/info/cc-info-panel.c:294
+#: ../panels/info/cc-info-panel.c:464
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../panels/info/cc-info-panel.c:404
+#: ../panels/info/cc-info-panel.c:574
 msgid "Unknown model"
 msgstr "ä¸?æ??ç??å??è??"
 
-#: ../panels/info/cc-info-panel.c:466
+#: ../panels/info/cc-info-panel.c:637
 #, c-format
 msgid "Version %s"
 msgstr "ç??æ?¬ %s"
@@ -588,22 +594,26 @@ msgid "Disk:"
 msgstr "ç£?ç¢?ï¼?"
 
 #: ../panels/info/info.ui.h:3
+msgid "Graphics:"
+msgstr "å??å½¢ï¼?"
+
+#: ../panels/info/info.ui.h:4
 msgid "Memory:"
 msgstr "è¨?æ?¶é«?ï¼?"
 
-#: ../panels/info/info.ui.h:4
+#: ../panels/info/info.ui.h:5
 msgid "More Info"
 msgstr "æ?´å¤?è³?è¨?"
 
-#: ../panels/info/info.ui.h:5
+#: ../panels/info/info.ui.h:6
 msgid "OS type:"
 msgstr "OS é¡?å??ï¼?"
 
-#: ../panels/info/info.ui.h:6
+#: ../panels/info/info.ui.h:7
 msgid "Processor:"
 msgstr "è??ç??å?¨ï¼?"
 
-#: ../panels/info/info.ui.h:7
+#: ../panels/info/info.ui.h:8
 msgid "Update Available"
 msgstr "æ??æ?´æ?°å?¯ç?¨"
 
@@ -612,16 +622,12 @@ msgid "Sound and Media"
 msgstr "è?²é?³è??åª?é«?"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
-#, fuzzy
-#| msgid "Launchers and Actions"
 msgid "Launchers"
-msgstr "å?·è¡?å?¨è??å??ä½?"
+msgstr "å?·è¡?å?¨"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#, fuzzy
-#| msgid "System Info"
 msgid "System"
-msgstr "ç³»çµ±è³?è¨?"
+msgstr "ç³»çµ±"
 
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
@@ -973,185 +979,219 @@ msgid "cd;dvd;usb;audio;video;disc;"
 msgstr "cd;dvd;usb;audio;video;disc;å??ç¢?;å½±ç??;é?³æ¨?;"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:220
+#: ../panels/printers/cc-printers-panel.c:224
 msgid "Low on toner"
 msgstr "ç¢³ç²?ä¸?è¶³"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:222
+#: ../panels/printers/cc-printers-panel.c:226
 msgid "Out of toner"
 msgstr "ç¢³ç²?ç?¨å®?"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:225
+#: ../panels/printers/cc-printers-panel.c:229
 msgid "Low on developer"
 msgstr "é¡¯å??å??ä¸?è¶³"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:228
+#: ../panels/printers/cc-printers-panel.c:232
 msgid "Out of developer"
 msgstr "é¡¯å??å??ç?¨å®?"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:230
+#: ../panels/printers/cc-printers-panel.c:234
 msgid "Low on a marker supply"
 msgstr "å¢¨æ°´å?£ä¸?è¶³"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:232
+#: ../panels/printers/cc-printers-panel.c:236
 msgid "Out of a marker supply"
 msgstr "å¢¨æ°´å?£ç?¨å®?"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:234
+#: ../panels/printers/cc-printers-panel.c:238
 #, fuzzy
 #| msgid "Open Folder"
 msgid "Open cover"
 msgstr "å»ºç«?å°?å¥?(_C)"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:236
+#: ../panels/printers/cc-printers-panel.c:240
 #, fuzzy
 #| msgid "Open Folder"
 msgid "Open door"
 msgstr "æ??å??å??ç©ºä½?"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:238
+#: ../panels/printers/cc-printers-panel.c:242
 msgid "Low on paper"
 msgstr "ç´?å¼µä¸?è¶³ã??"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:240
+#: ../panels/printers/cc-printers-panel.c:244
 msgid "Out of paper"
 msgstr "ç´?å¼µç?¨å®?"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:242
+#: ../panels/printers/cc-printers-panel.c:246
+msgctxt "printer state"
 msgid "Offline"
 msgstr "é?¢ç·?"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:244
+#: ../panels/printers/cc-printers-panel.c:248
+msgctxt "printer state"
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:246
+#: ../panels/printers/cc-printers-panel.c:250
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:248
+#: ../panels/printers/cc-printers-panel.c:252
 #, fuzzy
 msgid "Waste receptacle full"
 msgstr "ä¿?è?? [25 å??]"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:250
+#: ../panels/printers/cc-printers-panel.c:254
 msgid "The optical photo conductor is near end of life"
 msgstr ""
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:252
+#: ../panels/printers/cc-printers-panel.c:256
 msgid "The optical photo conductor is no longer functioning"
 msgstr ""
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:344
-msgid "Idle"
-msgstr "é??ç½®"
+#: ../panels/printers/cc-printers-panel.c:348
+msgctxt "printer state"
+msgid "Ready"
+msgstr ""
 
 #. Translators: Printer's state (jobs are processing)
-#. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:348
-#: ../panels/printers/cc-printers-panel.c:794
+#: ../panels/printers/cc-printers-panel.c:352
+msgctxt "printer state"
 msgid "Processing"
 msgstr "è??ç??ä¸"
 
 #. Translators: Printer's state (no jobs can be processed)
-#. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:352
-#: ../panels/printers/cc-printers-panel.c:798
+#: ../panels/printers/cc-printers-panel.c:356
+msgctxt "printer state"
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
+#. Translators: Toner supply
+#: ../panels/printers/cc-printers-panel.c:454
+msgid "Toner Level"
+msgstr "ç¢³ç²?å?£ç?ç´?"
+
+#. Translators: Ink supply
+#: ../panels/printers/cc-printers-panel.c:457
+msgid "Ink Level"
+msgstr "å¢¨æ°´ç?ç´?"
+
+#. Translators: By supply we mean ink, toner, staples, water, ...
+#: ../panels/printers/cc-printers-panel.c:460
+msgid "Supply Level"
+msgstr "è??æ??ç?ç´?"
+
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:465
+#: ../panels/printers/cc-printers-panel.c:475
 #, c-format
-msgid "%d active"
-msgstr "%d å??ä½¿ç?¨ä¸"
+msgid "%u active"
+msgid_plural "%u active"
+msgstr[0] "%u ä½¿ç?¨ä¸"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:786
+#: ../panels/printers/cc-printers-panel.c:910
+msgctxt "print job"
 msgid "Pending"
-msgstr "ç?å¾?ä¸"
+msgstr "ä¿?ç??ä¸"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:790
+#: ../panels/printers/cc-printers-panel.c:914
+msgctxt "print job"
 msgid "Held"
 msgstr "å·²æ?«å??"
 
+#. Translators: Job's state (job is currently printing)
+#: ../panels/printers/cc-printers-panel.c:918
+msgctxt "print job"
+msgid "Processing"
+msgstr "è??ç??ä¸"
+
+#. Translators: Job's state (job has been stopped)
+#: ../panels/printers/cc-printers-panel.c:922
+msgctxt "print job"
+msgid "Stopped"
+msgstr "å·²å??æ¢"
+
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:802
+#: ../panels/printers/cc-printers-panel.c:926
+msgctxt "print job"
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:806
+#: ../panels/printers/cc-printers-panel.c:930
+msgctxt "print job"
 msgid "Aborted"
 msgstr "å·²æ?¾æ£?"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:810
+#: ../panels/printers/cc-printers-panel.c:934
+msgctxt "print job"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:905
+#: ../panels/printers/cc-printers-panel.c:1029
 msgid "Job Title"
 msgstr "å·¥ä½?å??ç¨±"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:913
+#: ../panels/printers/cc-printers-panel.c:1037
 msgid "Job State"
 msgstr "å·¥ä½?ç??æ??"
 
 #. Translators: Name of column showing names of creators of print jobs
-#: ../panels/printers/cc-printers-panel.c:919
+#: ../panels/printers/cc-printers-panel.c:1043
 msgid "User"
 msgstr "ä½¿ç?¨è??"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:925
+#: ../panels/printers/cc-printers-panel.c:1049
 msgid "Time"
 msgstr "æ??å?»"
 
 #. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1115
+#: ../panels/printers/cc-printers-panel.c:1239
 #, c-format
 msgid "Could not connect to system bus: %s"
 msgstr "ç?¡æ³?é?£ç·?è?³ç³»çµ±å?¯æµ?æ??ï¼?%s"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:1767
+#: ../panels/printers/cc-printers-panel.c:1949
 msgid "Test page"
 msgstr "æ¸¬è©¦é ?"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1775
+#: ../panels/printers/cc-printers-panel.c:1957
 msgid "Clean print heads"
 msgstr "æ¸?ç??æ??å?°å?´é "
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1780
+#: ../panels/printers/cc-printers-panel.c:1962
 msgid "An error has occured during a maintenance command."
 msgstr "å?¨ç¶è·æ??ä»¤å?·è¡?æ??ç?¼ç??é?¯èª¤ã??"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:1906
+#: ../panels/printers/cc-printers-panel.c:2088
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
@@ -1173,111 +1213,103 @@ msgstr "æ??å?°æ©?"
 msgid "---"
 msgstr "---"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "0 active"
-msgstr "0 ä½¿ç?¨ä¸"
-
-#: ../panels/printers/printers.ui.h:3
-msgid "<b>Allowed users</b>"
-msgstr "<b>å??è¨ç??ä½¿ç?¨è??</b>"
-
 #. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:5
+#: ../panels/printers/printers.ui.h:3
 msgid "Active Print Jobs"
 msgstr "ä½¿ç?¨ä¸ç??æ??å?°å·¥ä½?"
 
+#: ../panels/printers/printers.ui.h:4
+msgid "Allowed users"
+msgstr "å??è¨±ç??ä½¿ç?¨è??"
+
 #. Translators: Switch back to printer's info tab
-#: ../panels/printers/printers.ui.h:7
+#: ../panels/printers/printers.ui.h:6
 msgid "Back"
 msgstr "è¿?å??"
 
 #. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:9
+#: ../panels/printers/printers.ui.h:8
 #: ../panels/region/gnome-region-panel-xkbot.c:229
-#: ../panels/sound/gvc-sound-theme-chooser.c:589
+#: ../panels/sound/gvc-sound-theme-chooser.c:581
 msgid "Default"
 msgstr "é ?è¨å?¼"
 
-#: ../panels/printers/printers.ui.h:10
+#: ../panels/printers/printers.ui.h:9
 msgid "IP Address"
 msgstr "IP ä½?å??"
 
-#: ../panels/printers/printers.ui.h:11
+#: ../panels/printers/printers.ui.h:10
 msgid "Info"
 msgstr "è³?è¨?"
 
-#: ../panels/printers/printers.ui.h:12
+#: ../panels/printers/printers.ui.h:11
 msgid "Jobs"
 msgstr "å·¥ä½?"
 
 #. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/printers/printers.ui.h:13
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../panels/printers/printers.ui.h:15
+#: ../panels/printers/printers.ui.h:14
 msgid "Model"
 msgstr "å??è??"
 
 #. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:17
+#: ../panels/printers/printers.ui.h:16
 msgid "Options"
 msgstr "é?¸é ?"
 
 #. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:19
+#: ../panels/printers/printers.ui.h:18
 msgid "Print Test Page"
 msgstr "æ??å?°æ¸¬è©¦é ?"
 
-#: ../panels/printers/printers.ui.h:20
+#: ../panels/printers/printers.ui.h:19
 msgid "Printer"
 msgstr "æ??å?°æ©?"
 
 #. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:22
+#: ../panels/printers/printers.ui.h:21
 msgid "Printer Options"
 msgstr "æ??å?°æ©?é?¸é ?"
 
-#: ../panels/printers/printers.ui.h:23
+#: ../panels/printers/printers.ui.h:22
 msgid "Printing..."
 msgstr "æ£å?¨æ??å?°â?¦"
 
 #. Tanslators: Switch to tab containing printer's jobs
-#: ../panels/printers/printers.ui.h:25
+#: ../panels/printers/printers.ui.h:24
 msgid "Show"
 msgstr "é¡¯ç¤º"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:27
+#: ../panels/printers/printers.ui.h:26
 msgid "Supply"
 msgstr "è??æ??"
 
 #: ../panels/region/gnome-region-panel.ui.h:1
+msgid "Allow different layouts for each window"
+msgstr "çµ¦æ¯?ä¸?å??è¦?çª?ç?¨ç«?ç??é??ç½®"
+
+#: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Install languages..."
 msgstr "å®?è£?èª?è¨?â?¦"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Language"
 msgstr "èª?è¨?"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Layouts"
 msgstr "é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "List of keyboard layouts selected for usage"
-msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
-
 #: ../panels/region/gnome-region-panel.ui.h:5
-msgid "New windows u_se active window's layout"
-msgstr "æ?°è¦?çª?å»¶ç?¨ä½¿ç?¨ä¸è¦?çª?ç??é??ç½®(_S)"
-
-#: ../panels/region/gnome-region-panel.ui.h:6
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "å?°å??å??èª?è¨?"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
+#: ../panels/region/gnome-region-panel.ui.h:6
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
@@ -1285,53 +1317,45 @@ msgstr ""
 "ä»¥é ?è¨å?¼æ?¿æ??ç?®å??ç??é?µç?¤é??ç½®\n"
 "è¨å®?å?¼"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
+#: ../panels/region/gnome-region-panel.ui.h:8
 msgid "Reset to De_faults"
 msgstr "é??ç½®ç?ºé ?è¨å?¼(_F)"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Select a display language"
 msgstr "é?¸æ??é¡¯ç¤ºç??èª?è¨?"
 
+#: ../panels/region/gnome-region-panel.ui.h:10
+msgid "Use default layout in new windows"
+msgstr "å?¨æ?°ç??è¦?çª?ä¸ä½¿ç?¨é ?è¨ç??é??ç½®"
+
 #: ../panels/region/gnome-region-panel.ui.h:11
+msgid "Use previous window's layout in new windows"
+msgstr "å?¨æ?°è¦?çª?ä½¿ç?¨å??ä¸?å??è¦?çª?ç??é??ç½®"
+
+#: ../panels/region/gnome-region-panel.ui.h:12
+msgid "Use same layout in all windows"
+msgstr "å?¨æ??æ??è¦?çª?ä¸ä½¿ç?¨ç?¸å??ç??é??ç½®"
+
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "View and edit keyboard layout options"
 msgstr "æª¢è¦?ä¸¦ç·¨è¼¯é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/gnome-region-panel.ui.h:14
 msgid "_Options..."
 msgstr "é?¸é ?(_O)â?¦"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
-msgid "_Separate layout for each window"
-msgstr "çµ¦æ¯?ä¸?å??è¦?çª?ç?¨ç«?ç??é??ç½®(_S)"
-
 #: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
-msgid "By _country"
-msgstr "æ ¹æ??å??å®¶(_C)"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:2
-msgid "By _language"
-msgstr "æ ¹æ??èª?è¨?(_L)"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:3
 msgid "Choose a Layout"
 msgstr "é?¸æ??é??ç½®"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:4
-msgid "Preview:"
-msgstr "é ?è¦½ï¼?"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:5
-msgid "_Country:"
-msgstr "å??å®¶(_C):"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:6
-msgid "_Language:"
-msgstr "èª?è¨?(_L):"
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:2
+msgid "Preview"
+msgstr "é ?è¦½"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:7
-msgid "_Variants:"
-msgstr "è®?é«?(_V):"
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:3
+msgid "Select an input source to add"
+msgstr "é?¸æ??è¦?å? å?¥ç??è¼¸å?¥ä¾?æº?"
 
 #: ../panels/region/gnome-region-panel-options-dialog.ui.h:1
 msgid "Keyboard Layout Options"
@@ -1479,123 +1503,125 @@ msgstr "è¨å®?ä½ ç??æ»?é¼ è??è§¸æ?§æ?¿å??å¥½è¨å®?"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;è§¸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?è§¸;é?£æ??å?©ä¸?;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/cc-network-panel.c:1086
-#: ../panels/network/cc-network-panel.c:1108
-#, c-format
-msgid "%i Mb/s"
-msgstr "%i Mb/s"
-
-#: ../panels/network/cc-network-panel.c:1088
-#, c-format
-msgid "%i Gb/s"
-msgstr "%i Gb/s"
-
-#: ../panels/network/cc-network-panel.c:1106
-#, c-format
-msgid "%i kb/s"
-msgstr "%i kb/s"
-
-#: ../panels/network/cc-network-panel.c:1763
+#: ../panels/network/cc-network-panel.c:819
 msgid "Network proxy"
 msgstr "ç¶²çµ¡ä»£ç??ä¼ºæ??å?¨"
 
-#: ../panels/network/cc-network-panel.c:1772
+#: ../panels/network/cc-network-panel.c:828
 msgid "Set the system proxy settings"
 msgstr "è¨å®?ç³»çµ±ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/network/nm-device.c:117 ../panels/network/nm-access-point.c:65
 #: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:69
+#: ../panels/network/nm-device.c:121 ../panels/network/panel-common.c:69
 msgid "Wired"
 msgstr "æ??ç·?"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:73
+#: ../panels/network/nm-device.c:125 ../panels/network/panel-common.c:73
 msgid "Wireless"
 msgstr "ç?¡ç·?"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:78
+#: ../panels/network/nm-device.c:130 ../panels/network/panel-common.c:78
 msgid "Mobile broadband"
 msgstr "è¡?å??å¯¬é »"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:82
+#: ../panels/network/nm-device.c:134 ../panels/network/panel-common.c:82
 msgid "Bluetooth"
 msgstr "è??ç??"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:86
+#: ../panels/network/nm-device.c:138 ../panels/network/panel-common.c:86
 #, fuzzy
 #| msgid "Models"
 msgid "Mesh"
 msgstr "å??è??"
 
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:142
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:146
-msgid "Infrastructure"
-msgstr "å?ºç¤?æ?¶æ§?"
-
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:164
+#: ../panels/network/nm-device.c:190 ../panels/network/panel-common.c:164
 msgid "Status unknown"
 msgstr "ç??æ??ä¸?æ??"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:168
+#: ../panels/network/nm-device.c:194 ../panels/network/panel-common.c:168
 msgid "Unmanaged"
 msgstr "æ?ªç®¡ç??"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:172
+#: ../panels/network/nm-device.c:198 ../panels/network/panel-common.c:172
 msgid "Unavailable"
 msgstr "ç?¡æ³?ä½¿ç?¨"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:176
+#: ../panels/network/nm-device.c:202 ../panels/network/panel-common.c:176
 msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:180
+#: ../panels/network/nm-device.c:206 ../panels/network/panel-common.c:180
 msgid "Preparing connection"
 msgstr "æ£å?¨æº?å??é?£ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:184
+#: ../panels/network/nm-device.c:210 ../panels/network/panel-common.c:184
 msgid "Configuring connection"
 msgstr "æ£å?¨è¨å®?é?£ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:188
+#: ../panels/network/nm-device.c:214 ../panels/network/panel-common.c:188
 msgid "Authenticating"
 msgstr "æ£å?¨é©?è?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:192
+#: ../panels/network/nm-device.c:218 ../panels/network/panel-common.c:192
 msgid "Getting network address"
 msgstr "æ£å?¨å??å¾?ç¶²çµ¡ä½?å??"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:196
+#: ../panels/network/nm-device.c:222 ../panels/network/panel-common.c:196
 msgid "Connected"
 msgstr "å·²é?£ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:200
+#: ../panels/network/nm-device.c:226 ../panels/network/panel-common.c:200
 msgid "Failed to connect"
 msgstr "ç?¡æ³?é?£ç·?"
 
+#: ../panels/network/nm-device.c:837
+#, c-format
+msgid "%i kb/s"
+msgstr "%i kb/s"
+
+#: ../panels/network/nm-device.c:839 ../panels/network/nm-device.c:856
+#, c-format
+msgid "%i Mb/s"
+msgstr "%i Mb/s"
+
+#: ../panels/network/nm-device.c:858
+#, c-format
+msgid "%i Gb/s"
+msgstr "%i Gb/s"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/nm-access-point.c:69 ../panels/network/panel-common.c:142
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/nm-access-point.c:73 ../panels/network/panel-common.c:146
+msgid "Infrastructure"
+msgstr "å?ºç¤?æ?¶æ§?"
+
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
 msgid "Network"
 msgstr "ç¶²çµ¡"
@@ -2026,7 +2052,7 @@ msgstr "å³°å?¼æª¢æ¸¬"
 
 #: ../panels/sound/gvc-mixer-dialog.c:1507
 #: ../panels/sound/gvc-mixer-dialog.c:1719
-#: ../panels/sound/gvc-sound-theme-chooser.c:599
+#: ../panels/sound/gvc-sound-theme-chooser.c:591
 msgid "Name"
 msgstr "å??ç¨±"
 
@@ -2122,27 +2148,27 @@ msgstr "é?³æ??å??å¥½è¨å®?(_S)"
 msgid "Muted"
 msgstr "å·²é??é?³"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:189
+#: ../panels/sound/gvc-sound-theme-chooser.c:188
 msgid "Built-in"
 msgstr "å?§ç½®"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:459
-#: ../panels/sound/gvc-sound-theme-chooser.c:471
-#: ../panels/sound/gvc-sound-theme-chooser.c:483
+#: ../panels/sound/gvc-sound-theme-chooser.c:451
+#: ../panels/sound/gvc-sound-theme-chooser.c:463
+#: ../panels/sound/gvc-sound-theme-chooser.c:475
 msgid "Sound Preferences"
 msgstr "é?³æ??å??å¥½è¨å®?"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:462
-#: ../panels/sound/gvc-sound-theme-chooser.c:473
-#: ../panels/sound/gvc-sound-theme-chooser.c:485
+#: ../panels/sound/gvc-sound-theme-chooser.c:454
+#: ../panels/sound/gvc-sound-theme-chooser.c:465
+#: ../panels/sound/gvc-sound-theme-chooser.c:477
 msgid "Testing event sound"
 msgstr "æ¸¬è©¦äº?ä»¶è?²é?³"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:590
+#: ../panels/sound/gvc-sound-theme-chooser.c:582
 msgid "From theme"
 msgstr "å¾?ä¸»é¡?"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:778
+#: ../panels/sound/gvc-sound-theme-chooser.c:764
 msgid "C_hoose an alert sound:"
 msgstr "é?¸æ??è¦ç¤ºé?³æ??(_H):"
 
@@ -2842,72 +2868,72 @@ msgstr "ä»¥ã??%sã??ç?ºå??ç??ä½¿ç?¨è??å·²ç¶?å?å?¨ã??"
 msgid "This user does not exist."
 msgstr "é??å??ä½¿ç?¨è??ä¸?å?å?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:359
+#: ../panels/user-accounts/um-user-panel.c:357
 msgid "Failed to delete user"
 msgstr "å?ªé?¤ä½¿ç?¨è??å¤±æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:419
+#: ../panels/user-accounts/um-user-panel.c:417
 msgid "You cannot delete your own account."
 msgstr "ä½ ä¸?è?½å?ªé?¤è?ªå·±ç??å¸³è??ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:428
+#: ../panels/user-accounts/um-user-panel.c:426
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s ä»?å?¨ç?»å?¥ä¸"
 
-#: ../panels/user-accounts/um-user-panel.c:432
+#: ../panels/user-accounts/um-user-panel.c:430
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "å?¨ä½¿ç?¨è??ç?»å?¥æ??é??å?ªé?¤ä»?æ??ä½¿ç³»çµ±è??æ?¼ä¸?ç©©å®?ç??ç??æ??ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:441
+#: ../panels/user-accounts/um-user-panel.c:439
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "ä½ æ?³è¦?ä¿?ç?? %s ç??æª?æ¡?å??ï¼?"
 
-#: ../panels/user-accounts/um-user-panel.c:445
+#: ../panels/user-accounts/um-user-panel.c:443
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "ç?¶å?ªé?¤ä½¿ç?¨è??æ??æ?¯å?¯ä»¥ä¿?ç??å®¶ç?®é??ã??æ?°é?²é?µä»¶(mail spool)å??æ?«å?æª?æ¡?ç??ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:448
+#: ../panels/user-accounts/um-user-panel.c:446
 msgid "_Delete Files"
 msgstr "å?ªé?¤æª?æ¡?(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:449
+#: ../panels/user-accounts/um-user-panel.c:447
 msgid "_Keep Files"
 msgstr "ä¿?ç??æª?æ¡?(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:450
+#: ../panels/user-accounts/um-user-panel.c:448
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:474
+#: ../panels/user-accounts/um-user-panel.c:472
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "å¸³è??å·²å??ç?¨"
 
-#: ../panels/user-accounts/um-user-panel.c:483
+#: ../panels/user-accounts/um-user-panel.c:481
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "å?¨ä¸?æ¬¡ç?»å?¥æ??è¨å®?"
 
-#: ../panels/user-accounts/um-user-panel.c:486
+#: ../panels/user-accounts/um-user-panel.c:484
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:808
+#: ../panels/user-accounts/um-user-panel.c:806
 msgid "Failed to contact the accounts service"
 msgstr "ç?¡æ³?é?£æ?¥å¸³è??æ??å??"
 
-#: ../panels/user-accounts/um-user-panel.c:810
+#: ../panels/user-accounts/um-user-panel.c:808
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "è«?ç¢ºå®? AccountService å·²ç¶?å®?è£?ä¸¦å??ç?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:843
+#: ../panels/user-accounts/um-user-panel.c:841
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -2915,12 +2941,12 @@ msgstr ""
 "è¦?é?²è¡?æ?´æ?¹ï¼?\n"
 "è«?å??é»?é?¸ * å??ç¤º"
 
-#: ../panels/user-accounts/um-user-panel.c:881
+#: ../panels/user-accounts/um-user-panel.c:879
 msgid "Create a user"
 msgstr "å»ºç«?æ?°ç??ä½¿ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:892
-#: ../panels/user-accounts/um-user-panel.c:1191
+#: ../panels/user-accounts/um-user-panel.c:890
+#: ../panels/user-accounts/um-user-panel.c:1189
 msgid ""
 "To create a user,\n"
 "click the * icon first"
@@ -2928,12 +2954,12 @@ msgstr ""
 "è¦?å»ºç«?ä½¿ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??ç¤º"
 
-#: ../panels/user-accounts/um-user-panel.c:901
+#: ../panels/user-accounts/um-user-panel.c:899
 msgid "Delete the selected user"
 msgstr "å?ªé?¤é?¸å??ç??ä½¿ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:913
-#: ../panels/user-accounts/um-user-panel.c:1196
+#: ../panels/user-accounts/um-user-panel.c:911
+#: ../panels/user-accounts/um-user-panel.c:1194
 msgid ""
 "To delete the selected user,\n"
 "click the * icon first"
@@ -2941,11 +2967,11 @@ msgstr ""
 "è¦?å?ªé?¤é?¸å??ç??ä½¿ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??ç¤º"
 
-#: ../panels/user-accounts/um-user-panel.c:1091
+#: ../panels/user-accounts/um-user-panel.c:1089
 msgid "My Account"
 msgstr "æ??ç??å¸³è??"
 
-#: ../panels/user-accounts/um-user-panel.c:1101
+#: ../panels/user-accounts/um-user-panel.c:1099
 msgid "Other Accounts"
 msgstr "å?¶ä»?å¸³è??"
 
@@ -3196,6 +3222,38 @@ msgstr "æ?§å?¶ä¸å¿?"
 msgid "_All Settings"
 msgstr "æ??æ??è¨å®?å?¼(_A)"
 
+#~| msgid "Idle"
+#~ msgctxt "printer state"
+#~ msgid "Idle"
+#~ msgstr "é??ç½®"
+
+#~ msgid "0 active"
+#~ msgstr "0 ä½¿ç?¨ä¸"
+
+#~ msgid "List of keyboard layouts selected for usage"
+#~ msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
+
+#~ msgid "New windows u_se active window's layout"
+#~ msgstr "æ?°è¦?çª?å»¶ç?¨ä½¿ç?¨ä¸è¦?çª?ç??é??ç½®(_S)"
+
+#~ msgid "By _country"
+#~ msgstr "ä¾?å??å®¶(_C)"
+
+#~ msgid "By _language"
+#~ msgstr "ä¾?èª?è¨?(_L)"
+
+#~ msgid "Preview:"
+#~ msgstr "é ?è¦½ï¼?"
+
+#~ msgid "_Country:"
+#~ msgstr "å??å®¶(_C):"
+
+#~ msgid "_Language:"
+#~ msgstr "èª?è¨?(_L):"
+
+#~ msgid "_Variants:"
+#~ msgstr "è®?é«?(_V):"
+
 #~ msgid "Upside Down"
 #~ msgstr "ç?±ä¸?è??ä¸?"
 
@@ -5270,9 +5328,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Menus and Toolbars"
 #~ msgstr "é?¸å?®å??å·¥å?·å??"
 
-#~ msgid "Preview"
-#~ msgstr "é ?è¦½"
-
 #~ msgid "Show _icons in menus"
 #~ msgstr "å?¨é?¸å?®ä¸é¡¯ç¤ºå??ç¤º(_I)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 38c639a..13587ea 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.91.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-03 14:32+0800\n"
-"PO-Revision-Date: 2011-02-02 14:57+0800\n"
+"POT-Creation-Date: 2011-02-11 19:14+0800\n"
+"PO-Revision-Date: 2011-02-11 08:09+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "Language: \n"
@@ -197,53 +197,53 @@ msgstr "é?ªæ??"
 msgid "Zoom"
 msgstr "ç¸®æ?¾"
 
-#: ../panels/background/bg-colors-source.c:44
+#: ../panels/background/bg-colors-source.c:45
 msgid "Horizontal Gradient"
 msgstr "æ°´å¹³æ¼¸å±¤"
 
-#: ../panels/background/bg-colors-source.c:45
+#: ../panels/background/bg-colors-source.c:46
 msgid "Vertical Gradient"
 msgstr "å??ç?´æ¼¸å±¤"
 
-#: ../panels/background/bg-colors-source.c:46
+#: ../panels/background/bg-colors-source.c:47
 msgid "Solid Color"
 msgstr "å?®è?²"
 
-#: ../panels/background/cc-background-panel.c:747
+#: ../panels/background/cc-background-panel.c:775
 msgid "Wallpapers"
 msgstr "æ¡?å¸?"
 
-#: ../panels/background/cc-background-panel.c:755
+#: ../panels/background/cc-background-panel.c:783
 msgid "Pictures Folder"
 msgstr "å??ç??è³?æ??å¤¾"
 
-#: ../panels/background/cc-background-panel.c:763
+#: ../panels/background/cc-background-panel.c:791
 msgid "Colors & Gradients"
 msgstr "é¡?è?² & æ¼¸å±¤"
 
-#: ../panels/background/cc-background-panel.c:772
+#: ../panels/background/cc-background-panel.c:800
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../panels/background/cc-background-panel.c:833
+#: ../panels/background/cc-background-panel.c:854
 msgid "Current background"
 msgstr "ç?®å??ç??è??æ?¯"
 
-#: ../panels/background/gnome-wp-info.c:59
-msgid "No Desktop Background"
-msgstr "ç?¡æ¡?é?¢è??æ?¯"
-
-#: ../panels/background/gnome-wp-item.c:277
+#: ../panels/background/cc-background-item.c:146
 msgid "multiple sizes"
 msgstr "å¤?é??å°ºå¯¸"
 
 #. translators: 100 Ã? 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/gnome-wp-item.c:285
+#: ../panels/background/cc-background-item.c:150
 #, c-format
 msgid "%d Ã? %d"
 msgstr "%d Ã? %d"
 
+#: ../panels/background/cc-background-item.c:252
+msgid "No Desktop Background"
+msgstr "ç?¡æ¡?é?¢è??æ?¯"
+
 #: ../panels/common/gdm-languages.c:709
 msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
@@ -336,22 +336,26 @@ msgstr "å??å??ï¼?"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../panels/datetime/dt-lockbutton.c:347 ../panels/screen/screen.ui.h:13
+#: ../panels/datetime/dt-lockbutton.c:347
+#: ../panels/printers/pp-lockbutton.c:347 ../panels/screen/screen.ui.h:13
 #: ../panels/user-accounts/um-lockbutton.c:347
 msgid "Lock"
 msgstr "é??å®?"
 
-#: ../panels/datetime/dt-lockbutton.c:356 ../panels/network/network.ui.h:23
+#: ../panels/datetime/dt-lockbutton.c:356
+#: ../panels/printers/pp-lockbutton.c:356 ../panels/network/network.ui.h:23
 #: ../panels/user-accounts/um-lockbutton.c:356
 msgid "Unlock"
 msgstr "è§£é??"
 
 #: ../panels/datetime/dt-lockbutton.c:365
+#: ../panels/printers/pp-lockbutton.c:365
 #: ../panels/user-accounts/um-lockbutton.c:365
 msgid "Locked"
 msgstr "å·²é??å®?"
 
 #: ../panels/datetime/dt-lockbutton.c:374
+#: ../panels/printers/pp-lockbutton.c:374
 #: ../panels/user-accounts/um-lockbutton.c:374
 msgid ""
 "Dialog is unlocked.\n"
@@ -361,6 +365,7 @@ msgstr ""
 "é»?é?¸ä»¥é?²æ¢é?²ä¸?æ¥ç??è®?æ?´"
 
 #: ../panels/datetime/dt-lockbutton.c:383
+#: ../panels/printers/pp-lockbutton.c:383
 #: ../panels/user-accounts/um-lockbutton.c:383
 msgid ""
 "Dialog is locked.\n"
@@ -370,6 +375,7 @@ msgstr ""
 "é»?é?¸é?²è¡?è®?æ?´"
 
 #: ../panels/datetime/dt-lockbutton.c:392
+#: ../panels/printers/pp-lockbutton.c:392
 #: ../panels/user-accounts/um-lockbutton.c:392
 msgid ""
 "System policy prevents changes.\n"
@@ -396,13 +402,13 @@ msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:503
+#: ../panels/display/xrandr-capplet.c:497
 msgid "Monitor"
 msgstr "é¡¯ç¤ºå?¨"
 
 #: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:339
-#: ../panels/display/xrandr-capplet.c:378
+#: ../panels/display/xrandr-capplet.c:333
+#: ../panels/display/xrandr-capplet.c:372
 #: ../panels/universal-access/uap.ui.h:58
 msgid "Normal"
 msgstr "æ£å¸¸"
@@ -451,15 +457,15 @@ msgstr ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;è§£æ??åº¦;é??æ?°"
 "æ?´ç??;"
 
-#: ../panels/display/xrandr-capplet.c:340
+#: ../panels/display/xrandr-capplet.c:334
 msgid "Anti-Clockwise"
 msgstr "é??æ??é??"
 
-#: ../panels/display/xrandr-capplet.c:341
+#: ../panels/display/xrandr-capplet.c:335
 msgid "Clockwise"
 msgstr "é ?æ??é??"
 
-#: ../panels/display/xrandr-capplet.c:342
+#: ../panels/display/xrandr-capplet.c:336
 msgid "180 Degrees"
 msgstr "180 åº¦"
 
@@ -468,102 +474,102 @@ msgstr "180 åº¦"
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:479
+#: ../panels/display/xrandr-capplet.c:473
 msgid "Mirror Displays"
 msgstr "é?¡å°?é¡¯ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:612
+#: ../panels/display/xrandr-capplet.c:603
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:614
+#: ../panels/display/xrandr-capplet.c:605
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1527
+#: ../panels/display/xrandr-capplet.c:1518
 msgid "Drag to change primary display."
 msgstr "æ??æ?³ä»¥æ?¹è®?ä¸»è¦?é¡¯ç¤ºå?¨ã??"
 
-#: ../panels/display/xrandr-capplet.c:1585
+#: ../panels/display/xrandr-capplet.c:1576
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é?¸æ??ä¸?å??è?¢å¹?ä»¥æ?¹è®?å®?ç??å±¬æ?§ï¼?æ??æ?³å®?å??è?½é??æ?°æ??å??å®?ç??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1975
+#: ../panels/display/xrandr-capplet.c:1966
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1977
+#: ../panels/display/xrandr-capplet.c:1968
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/xrandr-capplet.c:2262
+#: ../panels/display/xrandr-capplet.c:2214
 msgid "Could not save the monitor configuration"
 msgstr "ç?¡æ³?å?²å?é¡¯ç¤ºå?¨çµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2285
+#: ../panels/display/xrandr-capplet.c:2239
 msgid "Could not get session bus while applying display configuration"
 msgstr "å?¨å¥?ç?¨é¡¯ç¤ºçµ?æ??æ??ç?¡æ³?å??å¾?ä½?æ¥é??æ®µå?¯æµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2330
+#: ../panels/display/xrandr-capplet.c:2284
 msgid "Could not detect displays"
 msgstr "ç?¡æ³?å?µæ¸¬é¡¯ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:2538
+#: ../panels/display/xrandr-capplet.c:2479
 msgid "Could not get screen information"
 msgstr "ç?¡æ³?å??å¾?è?¢å¹?è³?è¨?"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:247
+#: ../panels/info/cc-info-panel.c:417
 #, c-format
 msgid "%d-bit"
 msgstr "%d-ä½?å??"
 
-#: ../panels/info/cc-info-panel.c:261
+#: ../panels/info/cc-info-panel.c:431
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u ä½?å??çµ?"
 
-#: ../panels/info/cc-info-panel.c:269
+#: ../panels/info/cc-info-panel.c:439
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panels/info/cc-info-panel.c:274
+#: ../panels/info/cc-info-panel.c:444
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panels/info/cc-info-panel.c:279
+#: ../panels/info/cc-info-panel.c:449
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panels/info/cc-info-panel.c:284
+#: ../panels/info/cc-info-panel.c:454
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../panels/info/cc-info-panel.c:289
+#: ../panels/info/cc-info-panel.c:459
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../panels/info/cc-info-panel.c:294
+#: ../panels/info/cc-info-panel.c:464
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../panels/info/cc-info-panel.c:404
+#: ../panels/info/cc-info-panel.c:574
 msgid "Unknown model"
 msgstr "ä¸?æ??ç??å??è??"
 
-#: ../panels/info/cc-info-panel.c:466
+#: ../panels/info/cc-info-panel.c:637
 #, c-format
 msgid "Version %s"
 msgstr "ç??æ?¬ %s"
@@ -592,22 +598,26 @@ msgid "Disk:"
 msgstr "ç£?ç¢?ï¼?"
 
 #: ../panels/info/info.ui.h:3
+msgid "Graphics:"
+msgstr "å??å½¢ï¼?"
+
+#: ../panels/info/info.ui.h:4
 msgid "Memory:"
 msgstr "è¨?æ?¶é«?ï¼?"
 
-#: ../panels/info/info.ui.h:4
+#: ../panels/info/info.ui.h:5
 msgid "More Info"
 msgstr "æ?´å¤?è³?è¨?"
 
-#: ../panels/info/info.ui.h:5
+#: ../panels/info/info.ui.h:6
 msgid "OS type:"
 msgstr "OS é¡?å??ï¼?"
 
-#: ../panels/info/info.ui.h:6
+#: ../panels/info/info.ui.h:7
 msgid "Processor:"
 msgstr "è??ç??å?¨ï¼?"
 
-#: ../panels/info/info.ui.h:7
+#: ../panels/info/info.ui.h:8
 msgid "Update Available"
 msgstr "æ??æ?´æ?°å?¯ç?¨"
 
@@ -616,16 +626,12 @@ msgid "Sound and Media"
 msgstr "è?²é?³è??åª?é«?"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
-#, fuzzy
-#| msgid "Launchers and Actions"
 msgid "Launchers"
-msgstr "å?·è¡?å?¨è??å??ä½?"
+msgstr "å?·è¡?å?¨"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#, fuzzy
-#| msgid "System Info"
 msgid "System"
-msgstr "ç³»çµ±è³?è¨?"
+msgstr "ç³»çµ±"
 
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
@@ -978,185 +984,219 @@ msgid "cd;dvd;usb;audio;video;disc;"
 msgstr "cd;dvd;usb;audio;video;disc;å??ç¢?;å½±ç??;é?³æ¨?;"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:220
+#: ../panels/printers/cc-printers-panel.c:224
 msgid "Low on toner"
 msgstr "ç¢³ç²?ä¸?è¶³"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:222
+#: ../panels/printers/cc-printers-panel.c:226
 msgid "Out of toner"
 msgstr "ç¢³ç²?ç?¨å®?"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:225
+#: ../panels/printers/cc-printers-panel.c:229
 msgid "Low on developer"
 msgstr "é¡¯å??å??ä¸?è¶³"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:228
+#: ../panels/printers/cc-printers-panel.c:232
 msgid "Out of developer"
 msgstr "é¡¯å??å??ç?¨å®?"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:230
+#: ../panels/printers/cc-printers-panel.c:234
 msgid "Low on a marker supply"
 msgstr "å¢¨æ°´å?£ä¸?è¶³"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:232
+#: ../panels/printers/cc-printers-panel.c:236
 msgid "Out of a marker supply"
 msgstr "å¢¨æ°´å?£ç?¨å®?"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:234
+#: ../panels/printers/cc-printers-panel.c:238
 #, fuzzy
 #| msgid "Open Folder"
 msgid "Open cover"
 msgstr "å»ºç«?å°?å¥?(_C)"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:236
+#: ../panels/printers/cc-printers-panel.c:240
 #, fuzzy
 #| msgid "Open Folder"
 msgid "Open door"
 msgstr "æ??å??å??ç©ºä½?"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:238
+#: ../panels/printers/cc-printers-panel.c:242
 msgid "Low on paper"
 msgstr "ç´?å¼µä¸?è¶³ã??"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:240
+#: ../panels/printers/cc-printers-panel.c:244
 msgid "Out of paper"
 msgstr "ç´?å¼µç?¨å®?"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:242
+#: ../panels/printers/cc-printers-panel.c:246
+msgctxt "printer state"
 msgid "Offline"
 msgstr "é?¢ç·?"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:244
+#: ../panels/printers/cc-printers-panel.c:248
+msgctxt "printer state"
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:246
+#: ../panels/printers/cc-printers-panel.c:250
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:248
+#: ../panels/printers/cc-printers-panel.c:252
 #, fuzzy
 msgid "Waste receptacle full"
 msgstr "è?«è?? [25 å??]"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:250
+#: ../panels/printers/cc-printers-panel.c:254
 msgid "The optical photo conductor is near end of life"
 msgstr ""
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:252
+#: ../panels/printers/cc-printers-panel.c:256
 msgid "The optical photo conductor is no longer functioning"
 msgstr ""
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:344
-msgid "Idle"
-msgstr "é??ç½®"
+#: ../panels/printers/cc-printers-panel.c:348
+msgctxt "printer state"
+msgid "Ready"
+msgstr ""
 
 #. Translators: Printer's state (jobs are processing)
-#. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:348
-#: ../panels/printers/cc-printers-panel.c:794
+#: ../panels/printers/cc-printers-panel.c:352
+msgctxt "printer state"
 msgid "Processing"
 msgstr "è??ç??ä¸"
 
 #. Translators: Printer's state (no jobs can be processed)
-#. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:352
-#: ../panels/printers/cc-printers-panel.c:798
+#: ../panels/printers/cc-printers-panel.c:356
+msgctxt "printer state"
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
+#. Translators: Toner supply
+#: ../panels/printers/cc-printers-panel.c:454
+msgid "Toner Level"
+msgstr "ç¢³ç²?å?£ç?ç´?"
+
+#. Translators: Ink supply
+#: ../panels/printers/cc-printers-panel.c:457
+msgid "Ink Level"
+msgstr "å¢¨æ°´ç?ç´?"
+
+#. Translators: By supply we mean ink, toner, staples, water, ...
+#: ../panels/printers/cc-printers-panel.c:460
+msgid "Supply Level"
+msgstr "è??æ??ç?ç´?"
+
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:465
+#: ../panels/printers/cc-printers-panel.c:475
 #, c-format
-msgid "%d active"
-msgstr "%d å??ä½¿ç?¨ä¸"
+msgid "%u active"
+msgid_plural "%u active"
+msgstr[0] "%u ä½¿ç?¨ä¸"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:786
+#: ../panels/printers/cc-printers-panel.c:910
+msgctxt "print job"
 msgid "Pending"
-msgstr "ç?å¾?ä¸"
+msgstr "ä¿?ç??ä¸"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:790
+#: ../panels/printers/cc-printers-panel.c:914
+msgctxt "print job"
 msgid "Held"
 msgstr "å·²æ?«å??"
 
+#. Translators: Job's state (job is currently printing)
+#: ../panels/printers/cc-printers-panel.c:918
+msgctxt "print job"
+msgid "Processing"
+msgstr "è??ç??ä¸"
+
+#. Translators: Job's state (job has been stopped)
+#: ../panels/printers/cc-printers-panel.c:922
+msgctxt "print job"
+msgid "Stopped"
+msgstr "å·²å??æ¢"
+
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:802
+#: ../panels/printers/cc-printers-panel.c:926
+msgctxt "print job"
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:806
+#: ../panels/printers/cc-printers-panel.c:930
+msgctxt "print job"
 msgid "Aborted"
 msgstr "å·²æ?¾æ£?"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:810
+#: ../panels/printers/cc-printers-panel.c:934
+msgctxt "print job"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:905
+#: ../panels/printers/cc-printers-panel.c:1029
 msgid "Job Title"
 msgstr "å·¥ä½?å??ç¨±"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:913
+#: ../panels/printers/cc-printers-panel.c:1037
 msgid "Job State"
 msgstr "å·¥ä½?ç??æ??"
 
 #. Translators: Name of column showing names of creators of print jobs
-#: ../panels/printers/cc-printers-panel.c:919
+#: ../panels/printers/cc-printers-panel.c:1043
 msgid "User"
 msgstr "ä½¿ç?¨è??"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:925
+#: ../panels/printers/cc-printers-panel.c:1049
 msgid "Time"
 msgstr "æ??å?»"
 
 #. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1115
+#: ../panels/printers/cc-printers-panel.c:1239
 #, c-format
 msgid "Could not connect to system bus: %s"
 msgstr "ç?¡æ³?é?£ç·?è?³ç³»çµ±å?¯æµ?æ??ï¼?%s"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:1767
+#: ../panels/printers/cc-printers-panel.c:1949
 msgid "Test page"
 msgstr "æ¸¬è©¦é ?"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1775
+#: ../panels/printers/cc-printers-panel.c:1957
 msgid "Clean print heads"
 msgstr "æ¸?ç??å??å?°å?´é "
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1780
+#: ../panels/printers/cc-printers-panel.c:1962
 msgid "An error has occured during a maintenance command."
 msgstr "å?¨ç¶è·æ??ä»¤å?·è¡?æ??ç?¼ç??é?¯èª¤ã??"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:1906
+#: ../panels/printers/cc-printers-panel.c:2088
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
@@ -1178,111 +1218,103 @@ msgstr "å?°è¡¨æ©?"
 msgid "---"
 msgstr "---"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "0 active"
-msgstr "0 ä½¿ç?¨ä¸"
-
-#: ../panels/printers/printers.ui.h:3
-msgid "<b>Allowed users</b>"
-msgstr "<b>å??è¨ç??ä½¿ç?¨è??</b>"
-
 #. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:5
+#: ../panels/printers/printers.ui.h:3
 msgid "Active Print Jobs"
 msgstr "ä½¿ç?¨ä¸ç??å??å?°å·¥ä½?"
 
+#: ../panels/printers/printers.ui.h:4
+msgid "Allowed users"
+msgstr "å??è¨±ç??ä½¿ç?¨è??"
+
 #. Translators: Switch back to printer's info tab
-#: ../panels/printers/printers.ui.h:7
+#: ../panels/printers/printers.ui.h:6
 msgid "Back"
 msgstr "è¿?å??"
 
 #. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:9
+#: ../panels/printers/printers.ui.h:8
 #: ../panels/region/gnome-region-panel-xkbot.c:229
-#: ../panels/sound/gvc-sound-theme-chooser.c:589
+#: ../panels/sound/gvc-sound-theme-chooser.c:581
 msgid "Default"
 msgstr "é ?è¨å?¼"
 
-#: ../panels/printers/printers.ui.h:10
+#: ../panels/printers/printers.ui.h:9
 msgid "IP Address"
 msgstr "IP ä½?å??"
 
-#: ../panels/printers/printers.ui.h:11
+#: ../panels/printers/printers.ui.h:10
 msgid "Info"
 msgstr "è³?è¨?"
 
-#: ../panels/printers/printers.ui.h:12
+#: ../panels/printers/printers.ui.h:11
 msgid "Jobs"
 msgstr "å·¥ä½?"
 
 #. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/printers/printers.ui.h:13
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../panels/printers/printers.ui.h:15
+#: ../panels/printers/printers.ui.h:14
 msgid "Model"
 msgstr "å??è??"
 
 #. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:17
+#: ../panels/printers/printers.ui.h:16
 msgid "Options"
 msgstr "é?¸é ?"
 
 #. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:19
+#: ../panels/printers/printers.ui.h:18
 msgid "Print Test Page"
 msgstr "å??å?°æ¸¬è©¦é ?"
 
-#: ../panels/printers/printers.ui.h:20
+#: ../panels/printers/printers.ui.h:19
 msgid "Printer"
 msgstr "å?°è¡¨æ©?"
 
 #. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:22
+#: ../panels/printers/printers.ui.h:21
 msgid "Printer Options"
 msgstr "å?°è¡¨æ©?é?¸é ?"
 
-#: ../panels/printers/printers.ui.h:23
+#: ../panels/printers/printers.ui.h:22
 msgid "Printing..."
 msgstr "æ£å?¨å??å?°â?¦"
 
 #. Tanslators: Switch to tab containing printer's jobs
-#: ../panels/printers/printers.ui.h:25
+#: ../panels/printers/printers.ui.h:24
 msgid "Show"
 msgstr "é¡¯ç¤º"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:27
+#: ../panels/printers/printers.ui.h:26
 msgid "Supply"
 msgstr "è??æ??"
 
 #: ../panels/region/gnome-region-panel.ui.h:1
+msgid "Allow different layouts for each window"
+msgstr "çµ¦æ¯?ä¸?å??è¦?çª?ç?¨ç«?ç??é??ç½®"
+
+#: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Install languages..."
 msgstr "å®?è£?èª?è¨?â?¦"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Language"
 msgstr "èª?è¨?"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Layouts"
 msgstr "é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "List of keyboard layouts selected for usage"
-msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
-
 #: ../panels/region/gnome-region-panel.ui.h:5
-msgid "New windows u_se active window's layout"
-msgstr "æ?°è¦?çª?å»¶ç?¨ä½¿ç?¨ä¸è¦?çª?ç??é??ç½®(_S)"
-
-#: ../panels/region/gnome-region-panel.ui.h:6
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "å?°å??å??èª?è¨?"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
+#: ../panels/region/gnome-region-panel.ui.h:6
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
@@ -1290,53 +1322,45 @@ msgstr ""
 "ä»¥é ?è¨å?¼æ?¿æ??ç?®å??ç??é?µç?¤é??ç½®\n"
 "è¨å®?å?¼"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
+#: ../panels/region/gnome-region-panel.ui.h:8
 msgid "Reset to De_faults"
 msgstr "é??ç½®ç?ºé ?è¨å?¼(_F)"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Select a display language"
 msgstr "é?¸æ??é¡¯ç¤ºç??èª?è¨?"
 
+#: ../panels/region/gnome-region-panel.ui.h:10
+msgid "Use default layout in new windows"
+msgstr "å?¨æ?°ç??è¦?çª?ä¸ä½¿ç?¨é ?è¨ç??é??ç½®"
+
 #: ../panels/region/gnome-region-panel.ui.h:11
+msgid "Use previous window's layout in new windows"
+msgstr "å?¨æ?°è¦?çª?ä½¿ç?¨å??ä¸?å??è¦?çª?ç??é??ç½®"
+
+#: ../panels/region/gnome-region-panel.ui.h:12
+msgid "Use same layout in all windows"
+msgstr "å?¨æ??æ??è¦?çª?ä¸ä½¿ç?¨ç?¸å??ç??é??ç½®"
+
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "View and edit keyboard layout options"
 msgstr "æª¢è¦?ä¸¦ç·¨è¼¯é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/gnome-region-panel.ui.h:14
 msgid "_Options..."
 msgstr "é?¸é ?(_O)â?¦"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
-msgid "_Separate layout for each window"
-msgstr "çµ¦æ¯?ä¸?å??è¦?çª?ç?¨ç«?ç??é??ç½®(_S)"
-
 #: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
-msgid "By _country"
-msgstr "ä¾?å??å®¶(_C)"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:2
-msgid "By _language"
-msgstr "ä¾?èª?è¨?(_L)"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:3
 msgid "Choose a Layout"
 msgstr "é?¸æ??é??ç½®"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:4
-msgid "Preview:"
-msgstr "é ?è¦½ï¼?"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:5
-msgid "_Country:"
-msgstr "å??å®¶(_C):"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:6
-msgid "_Language:"
-msgstr "èª?è¨?(_L):"
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:2
+msgid "Preview"
+msgstr "é ?è¦½"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:7
-msgid "_Variants:"
-msgstr "è®?é«?(_V):"
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:3
+msgid "Select an input source to add"
+msgstr "é?¸æ??è¦?å? å?¥ç??è¼¸å?¥ä¾?æº?"
 
 #: ../panels/region/gnome-region-panel-options-dialog.ui.h:1
 msgid "Keyboard Layout Options"
@@ -1486,123 +1510,125 @@ msgstr ""
 "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;è§¸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?è§¸;é??"
 "æ??;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/cc-network-panel.c:1086
-#: ../panels/network/cc-network-panel.c:1108
-#, c-format
-msgid "%i Mb/s"
-msgstr "%i Mb/s"
-
-#: ../panels/network/cc-network-panel.c:1088
-#, c-format
-msgid "%i Gb/s"
-msgstr "%i Gb/s"
-
-#: ../panels/network/cc-network-panel.c:1106
-#, c-format
-msgid "%i kb/s"
-msgstr "%i kb/s"
-
-#: ../panels/network/cc-network-panel.c:1763
+#: ../panels/network/cc-network-panel.c:819
 msgid "Network proxy"
 msgstr "ç¶²è·¯ä»£ç??ä¼ºæ??å?¨"
 
-#: ../panels/network/cc-network-panel.c:1772
+#: ../panels/network/cc-network-panel.c:828
 msgid "Set the system proxy settings"
 msgstr "è¨å®?ç³»çµ±ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/network/nm-device.c:117 ../panels/network/nm-access-point.c:65
 #: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:69
+#: ../panels/network/nm-device.c:121 ../panels/network/panel-common.c:69
 msgid "Wired"
 msgstr "æ??ç·?"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:73
+#: ../panels/network/nm-device.c:125 ../panels/network/panel-common.c:73
 msgid "Wireless"
 msgstr "ç?¡ç·?"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:78
+#: ../panels/network/nm-device.c:130 ../panels/network/panel-common.c:78
 msgid "Mobile broadband"
 msgstr "è¡?å??å¯¬é »"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:82
+#: ../panels/network/nm-device.c:134 ../panels/network/panel-common.c:82
 msgid "Bluetooth"
 msgstr "è??ç??"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:86
+#: ../panels/network/nm-device.c:138 ../panels/network/panel-common.c:86
 #, fuzzy
 #| msgid "Models"
 msgid "Mesh"
 msgstr "å??è??"
 
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:142
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:146
-msgid "Infrastructure"
-msgstr "å?ºç¤?æ?¶æ§?"
-
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:164
+#: ../panels/network/nm-device.c:190 ../panels/network/panel-common.c:164
 msgid "Status unknown"
 msgstr "ç??æ??ä¸?æ??"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:168
+#: ../panels/network/nm-device.c:194 ../panels/network/panel-common.c:168
 msgid "Unmanaged"
 msgstr "æ?ªç®¡ç??"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:172
+#: ../panels/network/nm-device.c:198 ../panels/network/panel-common.c:172
 msgid "Unavailable"
 msgstr "ç?¡æ³?ä½¿ç?¨"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:176
+#: ../panels/network/nm-device.c:202 ../panels/network/panel-common.c:176
 msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:180
+#: ../panels/network/nm-device.c:206 ../panels/network/panel-common.c:180
 msgid "Preparing connection"
 msgstr "æ£å?¨æº?å??é?£ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:184
+#: ../panels/network/nm-device.c:210 ../panels/network/panel-common.c:184
 msgid "Configuring connection"
 msgstr "æ£å?¨è¨å®?é?£ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:188
+#: ../panels/network/nm-device.c:214 ../panels/network/panel-common.c:188
 msgid "Authenticating"
 msgstr "æ£å?¨é©?è?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:192
+#: ../panels/network/nm-device.c:218 ../panels/network/panel-common.c:192
 msgid "Getting network address"
 msgstr "æ£å?¨å??å¾?ç¶²è·¯ä½?å??"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:196
+#: ../panels/network/nm-device.c:222 ../panels/network/panel-common.c:196
 msgid "Connected"
 msgstr "å·²é?£ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:200
+#: ../panels/network/nm-device.c:226 ../panels/network/panel-common.c:200
 msgid "Failed to connect"
 msgstr "ç?¡æ³?é?£ç·?"
 
+#: ../panels/network/nm-device.c:837
+#, c-format
+msgid "%i kb/s"
+msgstr "%i kb/s"
+
+#: ../panels/network/nm-device.c:839 ../panels/network/nm-device.c:856
+#, c-format
+msgid "%i Mb/s"
+msgstr "%i Mb/s"
+
+#: ../panels/network/nm-device.c:858
+#, c-format
+msgid "%i Gb/s"
+msgstr "%i Gb/s"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/nm-access-point.c:69 ../panels/network/panel-common.c:142
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/nm-access-point.c:73 ../panels/network/panel-common.c:146
+msgid "Infrastructure"
+msgstr "å?ºç¤?æ?¶æ§?"
+
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
 msgid "Network"
 msgstr "ç¶²è·¯"
@@ -2033,7 +2059,7 @@ msgstr "å³°å?¼æª¢æ¸¬"
 
 #: ../panels/sound/gvc-mixer-dialog.c:1507
 #: ../panels/sound/gvc-mixer-dialog.c:1719
-#: ../panels/sound/gvc-sound-theme-chooser.c:599
+#: ../panels/sound/gvc-sound-theme-chooser.c:591
 msgid "Name"
 msgstr "å??ç¨±"
 
@@ -2129,27 +2155,27 @@ msgstr "é?³æ??å??å¥½è¨å®?(_S)"
 msgid "Muted"
 msgstr "å·²é??é?³"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:189
+#: ../panels/sound/gvc-sound-theme-chooser.c:188
 msgid "Built-in"
 msgstr "å?§å»º"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:459
-#: ../panels/sound/gvc-sound-theme-chooser.c:471
-#: ../panels/sound/gvc-sound-theme-chooser.c:483
+#: ../panels/sound/gvc-sound-theme-chooser.c:451
+#: ../panels/sound/gvc-sound-theme-chooser.c:463
+#: ../panels/sound/gvc-sound-theme-chooser.c:475
 msgid "Sound Preferences"
 msgstr "é?³æ??å??å¥½è¨å®?"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:462
-#: ../panels/sound/gvc-sound-theme-chooser.c:473
-#: ../panels/sound/gvc-sound-theme-chooser.c:485
+#: ../panels/sound/gvc-sound-theme-chooser.c:454
+#: ../panels/sound/gvc-sound-theme-chooser.c:465
+#: ../panels/sound/gvc-sound-theme-chooser.c:477
 msgid "Testing event sound"
 msgstr "æ¸¬è©¦äº?ä»¶è?²é?³"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:590
+#: ../panels/sound/gvc-sound-theme-chooser.c:582
 msgid "From theme"
 msgstr "å¾?ä¸»é¡?"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:778
+#: ../panels/sound/gvc-sound-theme-chooser.c:764
 msgid "C_hoose an alert sound:"
 msgstr "é?¸æ??è¦ç¤ºé?³æ??(_H):"
 
@@ -2851,72 +2877,72 @@ msgstr "ä»¥ã??%sã??ç?ºå??ç??ä½¿ç?¨è??å·²ç¶?å?å?¨ã??"
 msgid "This user does not exist."
 msgstr "é??å??ä½¿ç?¨è??ä¸?å?å?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:359
+#: ../panels/user-accounts/um-user-panel.c:357
 msgid "Failed to delete user"
 msgstr "å?ªé?¤ä½¿ç?¨è??å¤±æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:419
+#: ../panels/user-accounts/um-user-panel.c:417
 msgid "You cannot delete your own account."
 msgstr "æ?¨ä¸?è?½å?ªé?¤è?ªå·±ç??å¸³è??ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:428
+#: ../panels/user-accounts/um-user-panel.c:426
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s ä»?å?¨ç?»å?¥ä¸"
 
-#: ../panels/user-accounts/um-user-panel.c:432
+#: ../panels/user-accounts/um-user-panel.c:430
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "å?¨ä½¿ç?¨è??ç?»å?¥æ??é??å?ªé?¤ä»?æ??ä½¿ç³»çµ±è??æ?¼ä¸?ç©©å®?ç??ç??æ??ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:441
+#: ../panels/user-accounts/um-user-panel.c:439
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "æ?¨æ?³è¦?ä¿?ç?? %s ç??æª?æ¡?å??ï¼?"
 
-#: ../panels/user-accounts/um-user-panel.c:445
+#: ../panels/user-accounts/um-user-panel.c:443
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "ç?¶å?ªé?¤ä½¿ç?¨è??æ??æ?¯å?¯ä»¥ä¿?ç??å®¶ç?®é??ã??æ?°é?²é?µä»¶(mail spool)å??æ?«å?æª?æ¡?ç??ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:448
+#: ../panels/user-accounts/um-user-panel.c:446
 msgid "_Delete Files"
 msgstr "å?ªé?¤æª?æ¡?(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:449
+#: ../panels/user-accounts/um-user-panel.c:447
 msgid "_Keep Files"
 msgstr "ä¿?ç??æª?æ¡?(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:450
+#: ../panels/user-accounts/um-user-panel.c:448
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:474
+#: ../panels/user-accounts/um-user-panel.c:472
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "å¸³è??å·²å??ç?¨"
 
-#: ../panels/user-accounts/um-user-panel.c:483
+#: ../panels/user-accounts/um-user-panel.c:481
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "å?¨ä¸?æ¬¡ç?»å?¥æ??è¨å®?"
 
-#: ../panels/user-accounts/um-user-panel.c:486
+#: ../panels/user-accounts/um-user-panel.c:484
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:808
+#: ../panels/user-accounts/um-user-panel.c:806
 msgid "Failed to contact the accounts service"
 msgstr "ç?¡æ³?é?£æ?¥å¸³è??æ??å??"
 
-#: ../panels/user-accounts/um-user-panel.c:810
+#: ../panels/user-accounts/um-user-panel.c:808
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "è«?ç¢ºå®? AccountService å·²ç¶?å®?è£?ä¸¦å??ç?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:843
+#: ../panels/user-accounts/um-user-panel.c:841
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -2924,12 +2950,12 @@ msgstr ""
 "è¦?é?²è¡?è®?æ?´ï¼?\n"
 "è«?å??é»?é?¸ * å??ç¤º"
 
-#: ../panels/user-accounts/um-user-panel.c:881
+#: ../panels/user-accounts/um-user-panel.c:879
 msgid "Create a user"
 msgstr "å»ºç«?æ?°ç??ä½¿ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:892
-#: ../panels/user-accounts/um-user-panel.c:1191
+#: ../panels/user-accounts/um-user-panel.c:890
+#: ../panels/user-accounts/um-user-panel.c:1189
 msgid ""
 "To create a user,\n"
 "click the * icon first"
@@ -2937,12 +2963,12 @@ msgstr ""
 "è¦?å»ºç«?ä½¿ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??ç¤º"
 
-#: ../panels/user-accounts/um-user-panel.c:901
+#: ../panels/user-accounts/um-user-panel.c:899
 msgid "Delete the selected user"
 msgstr "å?ªé?¤é?¸å??ç??ä½¿ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:913
-#: ../panels/user-accounts/um-user-panel.c:1196
+#: ../panels/user-accounts/um-user-panel.c:911
+#: ../panels/user-accounts/um-user-panel.c:1194
 msgid ""
 "To delete the selected user,\n"
 "click the * icon first"
@@ -2950,11 +2976,11 @@ msgstr ""
 "è¦?å?ªé?¤é?¸å??ç??ä½¿ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??ç¤º"
 
-#: ../panels/user-accounts/um-user-panel.c:1091
+#: ../panels/user-accounts/um-user-panel.c:1089
 msgid "My Account"
 msgstr "æ??ç??å¸³è??"
 
-#: ../panels/user-accounts/um-user-panel.c:1101
+#: ../panels/user-accounts/um-user-panel.c:1099
 msgid "Other Accounts"
 msgstr "å?¶ä»?å¸³è??"
 
@@ -3211,6 +3237,38 @@ msgstr "æ?§å?¶ä¸å¿?"
 msgid "_All Settings"
 msgstr "æ??æ??è¨å®?å?¼(_A)"
 
+#~| msgid "Idle"
+#~ msgctxt "printer state"
+#~ msgid "Idle"
+#~ msgstr "é??ç½®"
+
+#~ msgid "0 active"
+#~ msgstr "0 ä½¿ç?¨ä¸"
+
+#~ msgid "List of keyboard layouts selected for usage"
+#~ msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
+
+#~ msgid "New windows u_se active window's layout"
+#~ msgstr "æ?°è¦?çª?å»¶ç?¨ä½¿ç?¨ä¸è¦?çª?ç??é??ç½®(_S)"
+
+#~ msgid "By _country"
+#~ msgstr "ä¾?å??å®¶(_C)"
+
+#~ msgid "By _language"
+#~ msgstr "ä¾?èª?è¨?(_L)"
+
+#~ msgid "Preview:"
+#~ msgstr "é ?è¦½ï¼?"
+
+#~ msgid "_Country:"
+#~ msgstr "å??å®¶(_C):"
+
+#~ msgid "_Language:"
+#~ msgstr "èª?è¨?(_L):"
+
+#~ msgid "_Variants:"
+#~ msgstr "è®?é«?(_V):"
+
 #~ msgid "Upside Down"
 #~ msgstr "ç?±ä¸?è??ä¸?"
 
@@ -5285,9 +5343,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Menus and Toolbars"
 #~ msgstr "é?¸å?®å??å·¥å?·å??"
 
-#~ msgid "Preview"
-#~ msgstr "é ?è¦½"
-
 #~ msgid "Show _icons in menus"
 #~ msgstr "å?¨é?¸å?®ä¸é¡¯ç¤ºå??ç¤º(_I)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]