[gnome-control-center] Updated zh_CN translation.



commit 813cdc062dcefca30d6c7e7131e3ed10d767e7ad
Author: Funda Wang <fundawang gmail com>
Date:   Sun Jan 23 05:14:06 2011 +0100

    Updated zh_CN translation.

 po/zh_CN.po | 1293 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 681 insertions(+), 612 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ce786e7..8afb829 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&component=general\n"
-"POT-Creation-Date: 2011-01-12 00:12+0000\n"
-"PO-Revision-Date: 2011-01-14 15:11+0800\n"
+"POT-Creation-Date: 2011-01-21 21:10+0000\n"
+"PO-Revision-Date: 2011-01-23 12:03+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -200,7 +200,7 @@ msgid "Tile"
 msgstr "平�"
 
 #: ../panels/background/background.ui.h:8
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:92
 msgid "Zoom"
 msgstr "缩�"
 
@@ -353,32 +353,32 @@ msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ?¶é?´é¦?é??项é?¢æ?¿"
 
 #: ../panels/display/display-capplet.ui.h:1
-msgid "<i>Note: may limit resolution options</i>"
-msgstr "<i>æ??é??ï¼?å?¯è?½ä¼?é??å?¶å??辨ç??é??项</i>"
-
-#: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:316
+#: ../panels/display/xrandr-capplet.c:321
 msgid "Left"
 msgstr "å·¦"
 
-#: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:479
+#: ../panels/display/display-capplet.ui.h:2
+#: ../panels/display/xrandr-capplet.c:484
 msgid "Monitor"
 msgstr "�示�"
 
-#: ../panels/display/display-capplet.ui.h:4
-#: ../panels/display/xrandr-capplet.c:315
-#: ../panels/display/xrandr-capplet.c:354
+#: ../panels/display/display-capplet.ui.h:3
+#: ../panels/display/xrandr-capplet.c:320
+#: ../panels/display/xrandr-capplet.c:359
 #: ../panels/universal-access/uap.ui.h:58
 msgid "Normal"
 msgstr "æ?®é??"
 
+#: ../panels/display/display-capplet.ui.h:4
+msgid "Note: may limit resolution options"
+msgstr "æ??é??ï¼?å?¯è?½ä¼?é??å?¶å??辨ç??é??项"
+
 #: ../panels/display/display-capplet.ui.h:5
 msgid "R_otation:"
 msgstr "æ??转(_O)ï¼?"
 
 #: ../panels/display/display-capplet.ui.h:6
-#: ../panels/display/xrandr-capplet.c:317
+#: ../panels/display/xrandr-capplet.c:322
 msgid "Right"
 msgstr "å?³"
 
@@ -412,7 +412,7 @@ msgstr "�示"
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "é?¢æ?¿;æ??影仪;xrandr;å±?å¹?;å??辨ç??;å?·æ?°;"
 
-#: ../panels/display/xrandr-capplet.c:318
+#: ../panels/display/xrandr-capplet.c:323
 msgid "Upside Down"
 msgstr "ä¸?ä¸?颠å??"
 
@@ -421,63 +421,106 @@ msgstr "ä¸?ä¸?颠å??"
 #. * 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:455
+#: ../panels/display/xrandr-capplet.c:460
 msgid "Mirror Displays"
 msgstr "é??å??æ?¾ç¤º"
 
-#: ../panels/display/xrandr-capplet.c:580
+#: ../panels/display/xrandr-capplet.c:585
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:582
+#: ../panels/display/xrandr-capplet.c:587
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1492
+#: ../panels/display/xrandr-capplet.c:1497
 msgid "Drag to change primary display."
 msgstr "æ??æ?½ä»¥æ?´æ?¹å?ºç¡?æ?¾ç¤ºè®¾å¤?ã??"
 
-#: ../panels/display/xrandr-capplet.c:1550
+#: ../panels/display/xrandr-capplet.c:1555
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é??æ?©ä¸?个æ?¾ç¤ºå?¨æ?¥æ?´æ?¹å®?ç??å±?æ?§ï¼?æ??å?¨å®?æ?¥æ??å??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1935
+#: ../panels/display/xrandr-capplet.c:1943
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1937
+#: ../panels/display/xrandr-capplet.c:1945
 msgid "%a %l:%M %p"
 msgstr "%A %H%M"
 
-#: ../panels/display/xrandr-capplet.c:2222
+#: ../panels/display/xrandr-capplet.c:2230
 msgid "Could not save the monitor configuration"
 msgstr "æ? æ³?ä¿?å­?æ?¾ç¤ºå?¨é??ç½®"
 
-#: ../panels/display/xrandr-capplet.c:2245
+#: ../panels/display/xrandr-capplet.c:2253
 msgid "Could not get session bus while applying display configuration"
 msgstr "åº?ç?¨æ?¾ç¤ºé??ç½®æ?¶æ? æ³?è?·å¾?ä¼?è¯?æ?»çº¿"
 
-#: ../panels/display/xrandr-capplet.c:2290
+#: ../panels/display/xrandr-capplet.c:2298
 msgid "Could not detect displays"
 msgstr "�����示�"
 
-#: ../panels/display/xrandr-capplet.c:2494
+#: ../panels/display/xrandr-capplet.c:2506
 msgid "Could not get screen information"
 msgstr "æ? æ³?è?·å¾?å±?å¹?ä¿¡æ?¯"
 
-#: ../panels/info/cc-info-panel.c:242
+#. translators: This is the type of architecture, for example:
+#. * "64-bit" or "32-bit"
+#: ../panels/info/cc-info-panel.c:247
 #, c-format
 msgid "%d-bit"
 msgstr "%d ä½?"
 
-#: ../panels/info/cc-info-panel.c:290
+#: ../panels/info/cc-info-panel.c:261
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u å­?è??"
+
+#: ../panels/info/cc-info-panel.c:269
+#, c-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
+
+#: ../panels/info/cc-info-panel.c:274
+#, c-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../panels/info/cc-info-panel.c:279
+#, c-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: ../panels/info/cc-info-panel.c:284
+#, c-format
+msgid "%.1f TB"
+msgstr "%.1f TB"
+
+#: ../panels/info/cc-info-panel.c:289
+#, c-format
+msgid "%.1f PB"
+msgstr "%.1f PB"
+
+#: ../panels/info/cc-info-panel.c:294
+#, c-format
+msgid "%.1f EB"
+msgstr "%.1f EB"
+
+#: ../panels/info/cc-info-panel.c:404
 msgid "Unknown model"
 msgstr "æ?ªç?¥å??å?·"
 
+#: ../panels/info/cc-info-panel.c:466
+#, c-format
+msgid "Version %s"
+msgstr "ç??æ?¬ %s"
+
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
 msgid "System Info"
 msgstr "系�信�"
@@ -491,14 +534,41 @@ msgstr "系�信�"
 msgid "device;system;information;memory;processor;version;"
 msgstr "设å¤?;ç³»ç»?;ä¿¡æ?¯;主å­?;å¤?ç??å?¨;ç??æ?¬;"
 
+#: ../panels/info/info.ui.h:1
+msgid "Device name:"
+msgstr "设å¤?å??称ï¼?"
+
+#: ../panels/info/info.ui.h:2
+msgid "Disk:"
+msgstr "ç£?ç??ï¼?"
+
+#: ../panels/info/info.ui.h:3
+msgid "Memory:"
+msgstr "å??å­?ï¼?"
+
+#: ../panels/info/info.ui.h:4
+msgid "More Info"
+msgstr "��信�"
+
+#: ../panels/info/info.ui.h:5
+msgid "OS type:"
+msgstr "æ??ä½?ç³»ç»?ç±»å??ï¼?"
+
+#: ../panels/info/info.ui.h:6
+msgid "Processor:"
+msgstr "å¤?ç??å?¨ï¼?"
+
+#: ../panels/info/info.ui.h:7
+msgid "Update Available"
+msgstr "����"
+
 #: ../panels/keyboard/00-multimedia-key.xml.in.h:1
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
-msgid "Sound"
-msgstr "声�"
+msgid "Sound and Media"
+msgstr "声é?³å??åª?ä½?"
 
 #: ../panels/keyboard/01-desktop-key.xml.in.h:1
-msgid "Desktop"
-msgstr "æ¡?é?¢"
+msgid "Launchers and Actions"
+msgstr "å?¯å?¨å?¨å??å?¨ä½?"
 
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
@@ -530,7 +600,7 @@ msgstr "å? é??é?®ç±»å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1140
+#: ../panels/keyboard/keyboard-shortcuts.c:1229
 #: ../panels/sound/gvc-mixer-control.c:1091
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
@@ -550,69 +620,70 @@ msgstr "é?®ç??"
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
 msgid "Shortcut;Repeat;Blink;"
-msgstr "å¿«æ?·é?®;é??å??;é?ªç??;"
+msgstr "å¿«æ?·é?®;é??å¤?;é?ªç??;"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:659
-#: ../panels/keyboard/keyboard-shortcuts.c:1544
-#: ../panels/keyboard/keyboard-shortcuts.c:1548
+#: ../panels/keyboard/keyboard-shortcuts.c:736
+#: ../panels/keyboard/keyboard-shortcuts.c:1001
+#: ../panels/keyboard/keyboard-shortcuts.c:1633
+#: ../panels/keyboard/keyboard-shortcuts.c:1637
 msgid "Custom Shortcuts"
 msgstr "���快��"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:767
+#: ../panels/keyboard/keyboard-shortcuts.c:848
 msgid "<Unknown Action>"
 msgstr "<����>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1166
+#: ../panels/keyboard/keyboard-shortcuts.c:1255
 msgid "Error saving the new shortcut"
 msgstr "ä¿?å­?æ?°å¿«æ?·é?®å?ºé??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1276
+#: ../panels/keyboard/keyboard-shortcuts.c:1365
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
 "using this key.\n"
 "Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
-"ä¸?è?½ä½¿ç?¨ %s 为快æ?·é?®ï¼?å? ä¸ºä½¿ç?¨æ­¤é?®å°?æ? æ³?正常è¾?å?¥ã??\n"
-"请ç»?å?? Controlã??Alt æ?? Shift é?®å??è¯?ä¸?次"
+"ä¸?è?½ä½¿ç?¨â??%sâ??为快æ?·é?®ï¼?å? ä¸ºä½¿ç?¨æ­¤é?®å°?æ? æ³?正常è¾?å?¥ã??\n"
+"请ç»?å?? Ctrlã??Alt æ?? Shift é?®å??è¯?ä¸?次"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1306
+#: ../panels/keyboard/keyboard-shortcuts.c:1395
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
 "\"%s\""
 msgstr ""
-"快�� %s 已被��\n"
+"å¿«æ?·é?®â??%sâ??已被ç?¨äº?\n"
 "%s"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1312
+#: ../panels/keyboard/keyboard-shortcuts.c:1401
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??ä½ é??æ?°è®¾å®?å¿«æ?·é?® %sï¼?å??å¿«æ?·é?® %s å°?被ç¦?ç?¨"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1320
+#: ../panels/keyboard/keyboard-shortcuts.c:1409
 msgid "_Reassign"
 msgstr "é??设(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1440
+#: ../panels/keyboard/keyboard-shortcuts.c:1529
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s"
 msgstr "å?¨é??ç½®æ?°æ?®åº? %s 中解é?¤è®¾å®?æ?¶å?ºé??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1498
+#: ../panels/keyboard/keyboard-shortcuts.c:1587
 msgid "Too many custom shortcuts"
 msgstr "���快����"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1706
+#: ../panels/keyboard/keyboard-shortcuts.c:1865
 msgid "Section"
 msgstr "è??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1737
+#: ../panels/keyboard/keyboard-shortcuts.c:1909
 msgid "Action"
 msgstr "��"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1759
+#: ../panels/keyboard/keyboard-shortcuts.c:1931
 msgid "Shortcut"
 msgstr "å¿«æ?·é?®"
 
@@ -629,7 +700,7 @@ msgid "Cursor _blinks in text fields"
 msgstr "æ??æ?¬å??中å??æ ?é?ªç??(_B)"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:1
 #: ../panels/universal-access/uap.ui.h:28
 msgid "Cursor blinks speed"
 msgstr "å??æ ?é?ªç??é??度"
@@ -640,13 +711,12 @@ msgstr "���快��"
 
 #. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-#: ../panels/region/gnome-region-panel.ui.h:1
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgid "Fast"
 msgstr "å¿«"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "General"
 msgstr "常�"
 
@@ -656,8 +726,7 @@ msgstr "æ??ä½?æ??ä¸?é?®æ?¶é??å¤?该é?®(_R)"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/region/gnome-region-panel.ui.h:5
-#: ../panels/mouse/gnome-mouse-properties.ui.h:25
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 #: ../panels/universal-access/uap.ui.h:51
 msgid "Long"
 msgstr "é?¿"
@@ -676,8 +745,7 @@ msgstr "é??度(_P)ï¼?"
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
-#: ../panels/region/gnome-region-panel.ui.h:19
-#: ../panels/mouse/gnome-mouse-properties.ui.h:35
+#: ../panels/mouse/gnome-mouse-properties.ui.h:24
 #: ../panels/universal-access/uap.ui.h:71
 msgid "Short"
 msgstr "ç?­"
@@ -688,20 +756,17 @@ msgstr "å¿«æ?·é?®"
 
 #. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
-#: ../panels/region/gnome-region-panel.ui.h:20
-#: ../panels/mouse/gnome-mouse-properties.ui.h:39
+#: ../panels/mouse/gnome-mouse-properties.ui.h:26
 msgid "Slow"
 msgstr "æ?¢"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 msgid ""
-"To edit a shortcut key, click on the corresponding row and type a new key "
-"combination, or press backspace to clear."
-msgstr "è¦?ç¼?è¾?å¿«æ?·é?®ï¼?请å??å?»ç?¸åº?ç??è¡?ï¼?ç?¶å??è¾?å?¥æ?°æ??é?®ç»?å??ï¼?æ??æ??é??æ ¼é?®æ¸?é?¤ã??"
+"To edit a shortcut, click the row and hold down the new keys or press "
+"Backspace to clear."
+msgstr "è¦?ç¼?è¾?å¿«æ?·é?®ï¼?请å??å?»ç?¸åº?ç??è¡?ï¼?ç?¶å??è¾?å?¥æ?°æ??é?®ç»?å??ï¼?æ??æ?? Backspace æ¸?é?¤ã??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-#: ../panels/region/gnome-region-panel.ui.h:24
-#: ../panels/mouse/gnome-mouse-properties.ui.h:49
 msgid "_Delay:"
 msgstr "延�(_D)�"
 
@@ -710,20 +775,27 @@ msgid "_Name:"
 msgstr "å??称(_N)ï¼?"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
-#: ../panels/region/gnome-region-panel.ui.h:28
 msgid "_Speed:"
 msgstr "é??度(_S)ï¼?"
 
-#: ../panels/media/cc-media-panel.c:322
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+msgid "add-toolbutton"
+msgstr ""
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+msgid "remove-toolbutton"
+msgstr ""
+
+#: ../panels/media/cc-media-panel.c:321
 msgid "Ask what to do"
 msgstr "询é?®å¦?ä½?å¤?ç??"
 
-#: ../panels/media/cc-media-panel.c:328
-msgid "Do Nothing"
+#: ../panels/media/cc-media-panel.c:325 ../panels/power/power.ui.h:8
+msgid "Do nothing"
 msgstr "ä¸?å¤?ç??"
 
-#: ../panels/media/cc-media-panel.c:334
-msgid "Open Folder"
+#: ../panels/media/cc-media-panel.c:329
+msgid "Open folder"
 msgstr "æ??å¼?æ??件夹"
 
 #: ../panels/media/gnome-media-properties.ui.h:1
@@ -782,99 +854,345 @@ msgstr "é??ç½®ä»?è´¨å??è?ªå?¨è¿?è¡?é¦?é??项"
 msgid "Removable Media"
 msgstr "�移��质"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
+#. Translators: The printer is low on toner
+#: ../panels/printers/cc-printers-panel.c:175
+msgid "Low on toner"
+msgstr "墨��足"
+
+#. Translators: The printer has no toner left
+#: ../panels/printers/cc-printers-panel.c:177
+msgid "Out of toner"
+msgstr "墨��尽"
+
+#. Translators: "Developer" like on photo development context
+#: ../panels/printers/cc-printers-panel.c:179
+msgid "Low on developer"
+msgstr "墨水�足"
+
+#. Translators: "Developer" like on photo development context
+#: ../panels/printers/cc-printers-panel.c:181
+msgid "Out of developer"
+msgstr "墨水�尽"
+
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/cc-printers-panel.c:183
+msgid "Low on a marker supply"
+msgstr ""
+
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/cc-printers-panel.c:185
+msgid "Out of a marker supply"
+msgstr ""
+
+#. Translators: One or more covers on the printer are open
+#: ../panels/printers/cc-printers-panel.c:187
+msgid "Open cover"
+msgstr "æ??å¼?ä¸?ç??"
+
+#. Translators: One or more doors on the printer are open
+#: ../panels/printers/cc-printers-panel.c:189
+msgid "Open door"
+msgstr "æ??å¼?å??é?¨"
+
+#. Translators: At least one input tray is low on media
+#: ../panels/printers/cc-printers-panel.c:191
+msgid "Low on paper"
+msgstr "纸张�足"
+
+#. Translators: At least one input tray is empty
+#: ../panels/printers/cc-printers-panel.c:193
+msgid "Out of paper"
+msgstr "纸张�尽"
+
+#. Translators: The printer is offline
+#: ../panels/printers/cc-printers-panel.c:195
+msgid "Offline"
+msgstr "��"
+
+#. Translators: Someone has paused the Printer
+#: ../panels/printers/cc-printers-panel.c:197
+msgid "Paused"
+msgstr "å·²æ??å??"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: ../panels/printers/cc-printers-panel.c:199
+msgid "Waste receptacle almost full"
+msgstr "����满"
+
+#. Translators: The printer marker supply waste receptacle is full
+#: ../panels/printers/cc-printers-panel.c:201
+msgid "Waste receptacle full"
+msgstr "���已满"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/cc-printers-panel.c:203
+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:205
+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:294
+msgid "Idle"
+msgstr "å¾?æ?º"
+
+#. Translators: Printer's state (jobs are processing)
+#. Translators: Job's state (job is currently printing)
+#: ../panels/printers/cc-printers-panel.c:298
+#: ../panels/printers/cc-printers-panel.c:689
+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:302
+#: ../panels/printers/cc-printers-panel.c:693
+msgid "Stopped"
+msgstr "å·²å??æ­¢"
+
+#. Translators: Job's state (job is waiting to be printed)
+#: ../panels/printers/cc-printers-panel.c:681
+#, fuzzy
+#| msgid "Seeing"
+msgid "Pending"
+msgstr "��"
+
+#. Translators: Job's state (job is held for printing)
+#: ../panels/printers/cc-printers-panel.c:685
+msgid "Held"
+msgstr ""
+
+#. Translators: Job's state (job has been canceled)
+#: ../panels/printers/cc-printers-panel.c:697
+msgid "Canceled"
+msgstr "å·²å??æ¶?"
+
+#. Translators: Job's state (job has aborted due to error)
+#: ../panels/printers/cc-printers-panel.c:701
+msgid "Aborted"
+msgstr "已�止"
+
+#. Translators: Job's state (job has completed successfully)
+#: ../panels/printers/cc-printers-panel.c:705
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#. Translators: Name of column showing titles of print jobs
+#: ../panels/printers/cc-printers-panel.c:796
+msgid "Job Title"
+msgstr "任���"
+
+#. Translators: Name of column showing statuses of print jobs
+#: ../panels/printers/cc-printers-panel.c:804
+msgid "Job State"
+msgstr "ä»»å?¡ç?¶æ??"
+
+#. Translators: Name of column showing names of creators of print jobs
+#: ../panels/printers/cc-printers-panel.c:810
+msgid "User"
+msgstr "��"
+
+#. Translators: Name of column showing times of creation of print jobs
+#: ../panels/printers/cc-printers-panel.c:816
+msgid "Time"
+msgstr "��"
+
+#. Translators: Program cannot connect to DBus' system bus
+#: ../panels/printers/cc-printers-panel.c:1000
+#, 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:1589
+msgid "Test page"
+msgstr "��页"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/cc-printers-panel.c:1597
+msgid "Clean print heads"
+msgstr "����"
+
+#. Translators: An error has occured during execution of a CUPS maintenance command
+#: ../panels/printers/cc-printers-panel.c:1600
+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:1636
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "æ? æ³?è£?å?¥ç??é?¢ï¼?%s"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
+msgid "Change printer settings"
+msgstr "æ?´æ?¹æ??å?°æ?ºè®¾ç½®"
+
+#. Translators: those are keywords for the printing control-center panel
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+msgid "Printer;Queue;Print;Paper;Ink;Toner;"
+msgstr "æ??å?°æ?º;é??å??;æ??å?°;纸张;墨水;墨ç²?;"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+msgid "Printers"
+msgstr "æ??å?°æ?º"
+
+#: ../panels/printers/printers.ui.h:1
+msgid "---"
+msgstr "---"
+
+#. Translators: Cancel selected print job.
+#: ../panels/printers/printers.ui.h:3
+#: ../panels/user-accounts/data/language-chooser.ui.h:1
+#: ../panels/user-accounts/data/photo-dialog.ui.h:3
+msgid "Cancel"
+msgstr "å??æ¶?"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printers.ui.h:5
+msgid "Clean Print Heads"
+msgstr "����"
+
+#. Translators: This checkbox is checked when the default printer is selected.
+#: ../panels/printers/printers.ui.h:7
+#: ../panels/region/gnome-region-panel-xkbot.c:229
+#: ../panels/sound/gvc-sound-theme-chooser.c:589
+msgid "Default"
+msgstr "�认"
+
+#. Translators: Description of the printer.
+#: ../panels/printers/printers.ui.h:9
+msgid "Description:"
+msgstr "æ??è¿°ï¼?"
+
+#. Translators: This button pauses printer.
+#: ../panels/printers/printers.ui.h:11
+msgid "Disable Printer"
+msgstr "ç¦?ç?¨æ??å?°æ?º"
+
+#. Translators: Pause (hold) selected print job.
+#: ../panels/printers/printers.ui.h:13
+msgid "Hold"
+msgstr ""
+
+#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
+#: ../panels/printers/printers.ui.h:15
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:18
+msgid "Location:"
+msgstr "�置�"
+
+#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:17
+msgid "Print Test Page"
+msgstr "æ??å?°æµ?è¯?页"
+
+#. Translators: A widget showing list of print jobs for selected printer.
+#: ../panels/printers/printers.ui.h:19
+msgid "Printer Jobs"
+msgstr "æ??å?°æ?ºä»»å?¡"
+
+#. Translators: Print paused print job.
+#: ../panels/printers/printers.ui.h:21
+msgid "Release"
+msgstr "继续"
+
+#. Translators: Users which are allowed to print on this printer.
+#: ../panels/printers/printers.ui.h:23
+msgid "Share with these users:"
+msgstr "������享�"
+
+#: ../panels/printers/printers.ui.h:24
+msgid "Show / hide printer's jobs"
+msgstr "æ?¾ç¤º/é??è??æ??å?°æ?ºç??ä»»å?¡"
+
+#. Translators: Status of the printer.
+#: ../panels/printers/printers.ui.h:26
+msgid "Status:"
+msgstr "ç?¶æ??ï¼?"
+
+#. Translators: By supply we mean ink, toner, staples, water, ...
+#: ../panels/printers/printers.ui.h:28
+msgid "Supply:"
+msgstr "è??æ??ï¼?"
+
+#: ../panels/region/gnome-region-panel.ui.h:1
 msgid "Keyboard _model:"
 msgstr "é?®ç??å??å?·(_M)ï¼?"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
+#: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Layouts"
 msgstr "��"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "List of keyboard layouts selected for usage"
 msgstr "å?¯é??æ?©ä½¿ç?¨ç??é?®ç??å¸?å±?å??表"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-#: ../panels/universal-access/uap.ui.h:54
-msgid "Mouse Keys"
-msgstr "é¼ æ ?é?®"
-
-#: ../panels/region/gnome-region-panel.ui.h:7
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Move _Down"
 msgstr "å??ä¸?移å?¨(_D)"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
+#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "Move _Up"
 msgstr "å??ä¸?移å?¨(_U)"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
+#: ../panels/region/gnome-region-panel.ui.h:6
 msgid "Move the selected keyboard layout down in the list"
 msgstr "å?¨å??表中ä¸?移é??å®?ç??é?®ç??å¸?å±?"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:7
 msgid "Move the selected keyboard layout up in the list"
 msgstr "å?¨å??表中ä¸?移é??å®?ç??é?®ç??å¸?å±?"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/gnome-region-panel.ui.h:8
 msgid "New windows u_se active window's layout"
 msgstr "æ?°çª?å?£ä½¿ç?¨æ´»å?¨çª?å?£ç??å¸?å±?(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Print a diagram of the selected keyboard layout"
 msgstr "æ??å?°é??中é?®ç??å¸?å±?ç??ä¸?份å?¾ç¤º"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/gnome-region-panel.ui.h:10
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "å?ºå??å??语è¨?"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/region/gnome-region-panel.ui.h:11
 msgid "Remove the selected keyboard layout from the list"
 msgstr "ä»?å??表中å? é?¤é??中ç??é?®ç??å¸?å±?"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
+#: ../panels/region/gnome-region-panel.ui.h:12
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
 msgstr "使ç?¨é»?认设å®?æ?¿æ?¢å½?å??é?®ç??å¸?å±?"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
+#: ../panels/region/gnome-region-panel.ui.h:14
 msgid "Reset to De_faults"
 msgstr "é??置为é»?认å?¼(_F)"
 
-#: ../panels/region/gnome-region-panel.ui.h:18
+#: ../panels/region/gnome-region-panel.ui.h:15
 msgid "Select a keyboard layout to be added to the list"
 msgstr "请é??æ?©è¦?æ·»å? å?°å??表ç??é?®ç??å¸?å±?"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
+#: ../panels/region/gnome-region-panel.ui.h:16
 msgid "View and edit keyboard layout options"
 msgstr "æ?¥ç??并ç¼?è¾?é?®ç??å¸?å±?é??项"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-#: ../panels/mouse/gnome-mouse-properties.ui.h:48
-msgid "_Acceleration:"
-msgstr "å? é??(_A)ï¼?"
-
-#: ../panels/region/gnome-region-panel.ui.h:23
+#: ../panels/region/gnome-region-panel.ui.h:17
 msgid "_Add..."
 msgstr "添�(_A)..."
 
-#: ../panels/region/gnome-region-panel.ui.h:25
+#: ../panels/region/gnome-region-panel.ui.h:18
 msgid "_Options..."
 msgstr "é??项(_O)..."
 
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "_Pointer can be controlled using the keypad"
-msgstr "å??许使ç?¨é?®ç??æ?§å?¶æ??é??(_P)"
-
-#: ../panels/region/gnome-region-panel.ui.h:27
+#: ../panels/region/gnome-region-panel.ui.h:19
 msgid "_Separate layout for each window"
 msgstr "�个������(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid "_Type to test settings:"
-msgstr "���符���设置(_T)�"
-
 #: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
 msgid "By _country"
 msgstr "æ??å?½å®¶/å?°å?º(_C)"
@@ -926,7 +1244,7 @@ msgstr "é?®ç??å¸?å±?é??项"
 msgid "Unknown"
 msgstr "��"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:218
+#: ../panels/region/gnome-region-panel-xkblt.c:220
 msgid "Layout"
 msgstr "��"
 
@@ -938,11 +1256,6 @@ msgstr "å?¶é? å??"
 msgid "Models"
 msgstr "å??å?·"
 
-#: ../panels/region/gnome-region-panel-xkbot.c:227
-#: ../panels/sound/gvc-sound-theme-chooser.c:589
-msgid "Default"
-msgstr "�认"
-
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
 msgid "Change your region and language settings"
 msgstr "æ?´æ?¹æ?¨ç??å?ºå??å??语è¨?设置"
@@ -952,180 +1265,122 @@ msgstr "æ?´æ?¹æ?¨ç??å?ºå??å??语è¨?设置"
 msgid "Language;Layout;"
 msgstr "语�;��;"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Accessibility"
-msgstr "è¾?å?©å??è?½"
-
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
-msgid "Choose type of click _beforehand"
-msgstr "é??æ?©é¢?设ç??ç?¹å?»ç±»å??(_B)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgid "Choose type of click with mo_use gestures"
-msgstr "é¼ æ ?æ??å?¿é??æ?©å??å?»ç±»å??(_U)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
-#: ../panels/universal-access/uap.ui.h:29
-msgid "D_elay:"
-msgstr "延�(_E)�"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "D_ouble click:"
-msgstr "å??å?»(_O)ï¼?"
-
-#. click to initiate drag-and-drop (like normally click and hold)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
-msgid "D_rag click:"
-msgstr "æ??æ?³å?»(_R)ï¼?"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Disable _touchpad while typing"
 msgstr "æ??å­?æ?¶ç¦?ç?¨è§¦æ?¸æ?¿(_T)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
 msgid "Double-Click Timeout"
 msgstr "å??å?»è¶?æ?¶"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Drag and Drop"
 msgstr "æ??æ?¾"
 
-#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
-msgid "Dwell Click"
-msgstr "æ?¬å??ç?¹å?»"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "Enable _mouse clicks with touchpad"
 msgstr "å?¯ç?¨è§¦æ?¸æ?¿ç??é¼ æ ?ç?¹å?»(_M)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "Enable h_orizontal scrolling"
 msgstr "��水平��(_O)"
 
 #. high sensitivity
-#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 #: ../panels/universal-access/uap.ui.h:39
 msgid "High"
 msgstr "é«?"
 
 #. large threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:22
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 #: ../panels/universal-access/uap.ui.h:48
 msgid "Large"
 msgstr "大"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Locate Pointer"
 msgstr "å®?ä½?æ??é??"
 
 #. low sensitivity
-#: ../panels/mouse/gnome-mouse-properties.ui.h:27
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 #: ../panels/universal-access/uap.ui.h:52
 msgid "Low"
 msgstr "ä½?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+msgid "Mouse"
+msgstr "é¼ æ ?"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:19
 msgid "Mouse Orientation"
 msgstr "é¼ æ ?æ?¹å??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:29
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
 msgid "Mouse Preferences"
 msgstr "é¼ æ ?é¦?é??项"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
+#: ../panels/mouse/gnome-mouse-properties.ui.h:21
 msgid "Pointer Speed"
 msgstr "æ??é??é??度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:31
+#: ../panels/mouse/gnome-mouse-properties.ui.h:22
 msgid "Scrolling"
 msgstr "æ»?å?¨"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:32
-msgid "Seco_ndary click:"
-msgstr "第��(_N)�"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:33
+#: ../panels/mouse/gnome-mouse-properties.ui.h:23
 msgid "Sh_ow position of pointer when the Control key is pressed"
 msgstr "æ??ä½? Ctrl é?®æ?¶æ?¾ç¤ºæ??é??ä½?ç½®(_O)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:36
-msgid "Show click type _window"
-msgstr "æ?¾ç¤ºç?¹å?»ç±»å??çª?å?£(_W)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:37
-#: ../panels/universal-access/uap.ui.h:73
-msgid "Simulated Secondary Click"
-msgstr "模æ??å??次ç?¹å?»"
-
 #. small threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:41
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/mouse/gnome-mouse-properties.ui.h:28
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Small"
 msgstr "å°?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:42
+#: ../panels/mouse/gnome-mouse-properties.ui.h:29
 msgid "Thr_eshold:"
 msgstr "é??å?¼(_E)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:43
+#: ../panels/mouse/gnome-mouse-properties.ui.h:30
 msgid "To test your settings, try to double-click on the face."
 msgstr "è¦?æµ?è¯?æ?¨ç??设置ï¼?请è¯?ç??å??å?»å?³ä¾§ç??ç?¯æ³¡ã??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:44
+#: ../panels/mouse/gnome-mouse-properties.ui.h:31
 msgid "Touchpad"
 msgstr "触��"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:45
+#: ../panels/mouse/gnome-mouse-properties.ui.h:32
 msgid "Two-_finger scrolling"
 msgstr "å??æ??æ»?å?¨(_F)"
 
-#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:47
-msgid "You can also use the Dwell Click panel applet to choose the click type."
-msgstr "æ?¨ä¹?å?¯ä»¥ä½¿ç?¨æ?¬å??ç?¹å?»é?¢æ?¿å°?ç¨?åº?æ?¥é??æ?©ç?¹å?»ç??ç±»å??ã??"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:33
+msgid "_Acceleration:"
+msgstr "å? é??(_A)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:50
+#: ../panels/mouse/gnome-mouse-properties.ui.h:34
 msgid "_Disabled"
 msgstr "��(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:51
+#: ../panels/mouse/gnome-mouse-properties.ui.h:35
 msgid "_Edge scrolling"
 msgstr "è¾¹ç??æ»?å?¨(_E)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:52
-msgid "_Initiate click when stopping pointer movement"
-msgstr "æ??é??å??æ­¢è¿?å?¨æ?¶æ?§è¡?ç?¹å?»(_I)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:53
+#: ../panels/mouse/gnome-mouse-properties.ui.h:36
 msgid "_Left-handed"
 msgstr "æ?¯ç?¨å·¦æ??(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:54
-#: ../panels/universal-access/uap.ui.h:96
-msgid "_Motion threshold:"
-msgstr "è¿?å?¨é??å?¼(_M)ï¼?"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:55
+#: ../panels/mouse/gnome-mouse-properties.ui.h:37
 msgid "_Right-handed"
 msgstr "æ?¯ç?¨å?³æ??(_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:56
+#: ../panels/mouse/gnome-mouse-properties.ui.h:38
 msgid "_Sensitivity:"
 msgstr "ç?µæ??度(_S)ï¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:57
-msgid "_Single click:"
-msgstr "å??å?»(_S)ï¼?"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:58
+#: ../panels/mouse/gnome-mouse-properties.ui.h:39
 msgid "_Timeout:"
 msgstr "��(_T)�"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:59
-msgid "_Trigger secondary click by holding down the primary button"
-msgstr "æ??ä½?é¼ æ ?主é?®ä¸?æ?¾æ?¶è§¦å??次å?»(_T)"
-
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
 msgid "Mouse and Touchpad"
 msgstr "é¼ æ ?å??触æ?¸æ?¿"
@@ -1185,7 +1440,6 @@ msgstr "è??ç??"
 
 #. TRANSLATORS: device type
 #: ../panels/network/panel-common.c:86
-#| msgid "Models"
 msgid "Mesh"
 msgstr "ç½?æ ¼"
 
@@ -1348,7 +1602,7 @@ msgstr "é??度ï¼?"
 
 #: ../panels/network/network.ui.h:22
 msgid "Subnet Mask:"
-msgstr "å­?ç½?æ?©ç ?"
+msgstr "å­?ç½?æ?©ç ?ï¼?"
 
 #: ../panels/network/network.ui.h:23
 #: ../panels/user-accounts/um-lockbutton.c:364
@@ -1359,6 +1613,21 @@ msgstr "解é??"
 msgid "Username:"
 msgstr "ç?¨æ?·å??ï¼?"
 
+#: ../panels/network/network.ui.h:25
+msgctxt "proxy method"
+msgid "Automatic"
+msgstr "��"
+
+#: ../panels/network/network.ui.h:26
+msgctxt "proxy method"
+msgid "Manual"
+msgstr "æ??å?¨"
+
+#: ../panels/network/network.ui.h:27
+msgctxt "proxy method"
+msgid "None"
+msgstr "æ? "
+
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "��"
@@ -1370,7 +1639,7 @@ msgstr "ç?µæº?管ç??设置"
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
 msgid "Power;Sleep;Suspend;Hibernate;"
-msgstr "å? ç?µ;ç?¡ç? ;æ??èµ·;ä¼?ç? ;"
+msgstr "ç?µæº?;ç?¡ç? ;æ??èµ·;ä¼?ç? ;"
 
 #: ../panels/power/cc-power-panel.c:151
 msgid "Unknown time"
@@ -1440,6 +1709,66 @@ msgstr "è¿?æ?? %s è??å°½(%.0lf%%)"
 msgid "%.0lf%% charged"
 msgstr "å·²å??ç?µ %.0lf%%"
 
+#: ../panels/power/power.ui.h:1 ../panels/screen/screen.ui.h:1
+msgid "1 hour"
+msgstr "1 å°?æ?¶"
+
+#: ../panels/power/power.ui.h:2 ../panels/screen/screen.ui.h:3
+msgid "10 minutes"
+msgstr "10 å??é??"
+
+#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
+msgid "30 minutes"
+msgstr "30 å??é??"
+
+#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
+msgid "5 minutes"
+msgstr "5 å??é??"
+
+#: ../panels/power/power.ui.h:5
+msgid "AC power and inactive for:"
+msgstr ""
+
+#: ../panels/power/power.ui.h:6
+msgid "Ask me"
+msgstr "询é?®æ??"
+
+#: ../panels/power/power.ui.h:7
+msgid "Battery power and inactive for:"
+msgstr ""
+
+#: ../panels/power/power.ui.h:9
+msgid "Hibernate"
+msgstr "ä¼?ç? "
+
+#: ../panels/power/power.ui.h:10
+msgid "Put the computer to sleep when inactive for:"
+msgstr ""
+
+#: ../panels/power/power.ui.h:11
+msgid "Put the computer to sleep when on:"
+msgstr ""
+
+#: ../panels/power/power.ui.h:12
+msgid "Shutdown"
+msgstr "��"
+
+#: ../panels/power/power.ui.h:13
+msgid "Suspend"
+msgstr "æ??èµ·"
+
+#: ../panels/power/power.ui.h:14
+msgid "When power is critically low:"
+msgstr "ç?µé??ä½?æ?¶ï¼?"
+
+#: ../panels/power/power.ui.h:15
+msgid "When the power button is pressed:"
+msgstr "æ??ä¸?ç?µæº?æ??é?®æ?¶ï¼?"
+
+#: ../panels/power/power.ui.h:16
+msgid "When the sleep button is pressed:"
+msgstr "æ??ä¸?ç?¡ç? æ??é?®æ?¶ï¼?"
+
 #. Translators: those are keywords for the brightness and lock control-center panel
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
 msgid "Brightness;Lock;Dim;Blank;"
@@ -1453,6 +1782,52 @@ msgstr "å±?å¹?"
 msgid "Screen brightness and lock settings"
 msgstr "é??ç½®å±?å¹?亮度å??é??å®?"
 
+#: ../panels/screen/screen.ui.h:2
+msgid "1 minute"
+msgstr "1 å??é??"
+
+#: ../panels/screen/screen.ui.h:4
+msgid "2 minutes"
+msgstr "2 å??é??"
+
+#: ../panels/screen/screen.ui.h:5
+msgid "3 minutes"
+msgstr "3 å??é??"
+
+#: ../panels/screen/screen.ui.h:8
+msgid "Brightness"
+msgstr "亮度"
+
+#: ../panels/screen/screen.ui.h:9
+msgid "Dim screen to save power"
+msgstr ""
+
+#: ../panels/screen/screen.ui.h:10
+msgid "Don't lock when at home"
+msgstr ""
+
+#: ../panels/screen/screen.ui.h:11
+msgid "Locations..."
+msgstr "ä½?ç½®..."
+
+#: ../panels/screen/screen.ui.h:12 ../panels/user-accounts/um-lockbutton.c:355
+msgid "Lock"
+msgstr "é??å®?"
+
+#: ../panels/screen/screen.ui.h:13
+msgid "Lock screen after:"
+msgstr ""
+
+#: ../panels/screen/screen.ui.h:14
+msgid "Screen turns off"
+msgstr "����"
+
+#: ../panels/screen/screen.ui.h:15
+#, fuzzy
+#| msgid "Turn on or off:"
+msgid "Turn off after:"
+msgstr "æ??å¼?æ??å?³é?­ï¼?"
+
 #: ../panels/sound/applet-main.c:49
 msgid "Enable debugging code"
 msgstr "����代�"
@@ -1465,7 +1840,7 @@ msgstr "æ­¤åº?ç?¨ç¨?åº?ç??ç??æ?¬"
 msgid " â?? GNOME Volume Control Applet"
 msgstr " - GNOME é?³é??æ?§å?¶å°?ç¨?åº?"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1921
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1923
 msgid "Output"
 msgstr "è¾?å?º"
 
@@ -1473,7 +1848,7 @@ msgstr "è¾?å?º"
 msgid "Sound Output Volume"
 msgstr "è¾?å?ºé?³é??"
 
-#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1838
+#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1840
 msgid "Input"
 msgstr "è¾?å?¥"
 
@@ -1537,7 +1912,7 @@ msgstr "å??å¼±"
 msgid "Mute"
 msgstr "é??é?³"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1629
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1631
 msgid "_Profile:"
 msgstr "é??ç½®æ??件(_P)ï¼?"
 
@@ -1570,71 +1945,71 @@ msgstr "���(_N)�"
 msgid "Peak detect"
 msgstr "峰���"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1506
-#: ../panels/sound/gvc-mixer-dialog.c:1717
+#: ../panels/sound/gvc-mixer-dialog.c:1507
+#: ../panels/sound/gvc-mixer-dialog.c:1719
 #: ../panels/sound/gvc-sound-theme-chooser.c:599
 msgid "Name"
 msgstr "å??称"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1524
+#: ../panels/sound/gvc-mixer-dialog.c:1525
 msgid "Device"
 msgstr "设�"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1572
+#: ../panels/sound/gvc-mixer-dialog.c:1573
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s �声���"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1630
+#: ../panels/sound/gvc-mixer-dialog.c:1632
 msgid "Test Speakers"
 msgstr "���声�"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: ../panels/sound/gvc-mixer-dialog.c:1763
 msgid "_Output volume: "
 msgstr "è¾?å?ºé?³é??(_O)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1775
+#: ../panels/sound/gvc-mixer-dialog.c:1777
 msgid "Sound Effects"
-msgstr "声é?³æ??æ??..."
+msgstr "声é?³æ??æ??"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1782
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "_Alert volume: "
 msgstr "è­¦å??é?³é??(_A)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1795
+#: ../panels/sound/gvc-mixer-dialog.c:1797
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1800
+#: ../panels/sound/gvc-mixer-dialog.c:1802
 msgid "C_hoose a device to configure:"
 msgstr "é??æ?©è¦?é??ç½®ç??设å¤?(_H)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1827
-#: ../panels/sound/gvc-mixer-dialog.c:1950
+#: ../panels/sound/gvc-mixer-dialog.c:1829
+#: ../panels/sound/gvc-mixer-dialog.c:1952
 msgid "Settings for the selected device:"
 msgstr "é??中设å¤?ç??设置ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1845
+#: ../panels/sound/gvc-mixer-dialog.c:1847
 msgid "_Input volume: "
 msgstr "è¾?å?¥é?³é??(_I)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1868
+#: ../panels/sound/gvc-mixer-dialog.c:1870
 msgid "Input level:"
 msgstr "���级�"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1894
+#: ../panels/sound/gvc-mixer-dialog.c:1896
 msgid "C_hoose a device for sound input:"
 msgstr "é??æ?©é?³é¢?è¾?å?¥è®¾å¤?(_H)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1926
+#: ../panels/sound/gvc-mixer-dialog.c:1928
 msgid "C_hoose a device for sound output:"
 msgstr "é??æ?©é?³é¢?è¾?å?ºè®¾å¤?(_H)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1961
+#: ../panels/sound/gvc-mixer-dialog.c:1963
 msgid "Applications"
 msgstr "����"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1965
+#: ../panels/sound/gvc-mixer-dialog.c:1967
 msgid "No application is currently playing or recording audio."
 msgstr "没æ??ç¨?åº?æ­£å?¨æ?­æ?¾æ??å½?å?¶é?³é¢?ã??"
 
@@ -1670,7 +2045,7 @@ msgstr "å·²é??é?³"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:189
 msgid "Built-in"
-msgstr "å??建"
+msgstr "å??ç½®"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:459
 #: ../panels/sound/gvc-sound-theme-chooser.c:471
@@ -1713,6 +2088,10 @@ msgstr "声å?¡;麦å??é£?;é?³é??;æ·¡å?¥æ·¡å?º;å??è¡¡;è??ç??;è?³æ?º;"
 msgid "Change sound volume and sound events"
 msgstr "æ?´æ?¹é?³é??å??声é?³äº?件"
 
+#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
+msgid "Sound"
+msgstr "声�"
+
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
 #: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
@@ -1810,8 +2189,8 @@ msgid "Caribou"
 msgstr "Caribou"
 
 #: ../panels/universal-access/uap.ui.h:18
-msgid "Change constrast:"
-msgstr "æ?¹å??对æ¯?度"
+msgid "Change contrast:"
+msgstr "æ?¹å??对æ¯?度ï¼?"
 
 #: ../panels/universal-access/uap.ui.h:19
 msgid "Closed Captioning"
@@ -1849,6 +2228,10 @@ msgstr "Ctrl+Alt+8"
 msgid "Ctrl+Alt+="
 msgstr "Ctrl+Alt+="
 
+#: ../panels/universal-access/uap.ui.h:29
+msgid "D_elay:"
+msgstr "延�(_E)�"
+
 #: ../panels/universal-access/uap.ui.h:30
 msgid "Dasher"
 msgstr "Dasher"
@@ -1921,6 +2304,10 @@ msgstr "�大"
 msgid "LowContrast"
 msgstr "�对�度"
 
+#: ../panels/universal-access/uap.ui.h:54
+msgid "Mouse Keys"
+msgstr "é¼ æ ?é?®"
+
 #: ../panels/universal-access/uap.ui.h:55
 msgid "Mouse Settings..."
 msgstr "鼠�设置..."
@@ -1978,98 +2365,102 @@ msgid "Shift+Ctrl+Alt+="
 msgstr "Shift+Ctrl+Alt+="
 
 #: ../panels/universal-access/uap.ui.h:72
-msgid "Show Universal Access status"
-msgstr "æ?¾ç¤ºé??ç?¨è¾?å?©å??è?½ç?¶æ??"
+msgid "Simulated Secondary Click"
+msgstr "模æ??å??次ç?¹å?»"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Slow Keys"
 msgstr "æ?¢é??é?®"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Sound Settings..."
 msgstr "声�设置..."
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Sticky Keys"
 msgstr "ç²?æ»?é?®"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:78
 msgid "Test flash"
 msgstr "æ??å­?é?ªç??"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Text size:"
 msgstr "æ??å­?大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "å°?ä¸?串修æ?¹è¿?ç??é?®å½?ä½?ä¸?个ç»?å??é?®"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Trigger a click when the pointer hovers"
 msgstr "æ??é??æ?¬å??æ?¶æ?§è¡?ç?¹å?»ã??"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:82
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æ??ä½?é¼ æ ?主é?®ä¸?æ?¾æ?¶è§¦å??次å?»"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Turn on accessibility features from the keyboard"
 msgstr "æ??å¼?é?®ç??è¾?å?©å??è?½ç?¹æ?§"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Turn on or off:"
 msgstr "æ??å¼?æ??å?³é?­ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Type here to test settings"
 msgstr "�此���符以��设�"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:86
 msgid "Typing"
 msgstr "æ??å­?中"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:87
 msgid "Typing Assistant"
 msgstr "æ??å­?å?©æ??"
 
-#: ../panels/universal-access/uap.ui.h:89
+#: ../panels/universal-access/uap.ui.h:88
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "å½?è­¦å??声å??ç??æ?¶ä½¿ç?¨è§?è§?æ??示"
 
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:89
 msgid "Use an alternative form of text input"
 msgstr "使ç?¨å?¦å¤?æ ¼å¼?ç??æ??å­?è¾?å?¥"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:90
 msgid "Video Mouse"
 msgstr "��鼠�"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:91
 msgid "Visual Alerts"
 msgstr "è§?è§?æ??示"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:93
 msgid "Zoom in:"
 msgstr "�大�"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:94
 msgid "Zoom out:"
 msgstr "缩��"
 
-#: ../panels/universal-access/uap.ui.h:97
+#: ../panels/universal-access/uap.ui.h:95
+msgid "_Motion threshold:"
+msgstr "è¿?å?¨é??å?¼(_M)ï¼?"
+
+#: ../panels/universal-access/uap.ui.h:96
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:98
+#: ../panels/universal-access/uap.ui.h:97
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:99
+#: ../panels/universal-access/uap.ui.h:98
 msgid "rejected"
 msgstr "å·²æ??ç»?"
 
-#: ../panels/user-accounts/gdm-languages.c:613
+#: ../panels/user-accounts/gdm-languages.c:709
 msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
 
@@ -2204,11 +2595,11 @@ msgstr "å? é?¤æ??纹(_D)"
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
-msgstr "ä½ æ?³å? é?¤å·²ç?»è®°ç??æ??纹å??ï¼?è¿?æ ·å??å°?ç¦?ç?¨æ??纹ç?»å½?ã??"
+msgstr "æ?¨æ?³è¦?æ?³å? é?¤å·²ç?»è®°ç??æ??纹å??ï¼?è¿?æ ·å??å°?ç¦?ç?¨æ??纹ç?»å½?ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:363
 msgid "Done!"
-msgstr "æ??å®?ï¼?"
+msgstr "å®?æ??ï¼?"
 
 #. translators:
 #. * The variable is the name of the device, for example:
@@ -2244,14 +2635,14 @@ msgstr "å?¯ç?¨æ??纹ç?»å½?"
 #. * The variable is the name of the device, for example:
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
-#: ../panels/user-accounts/um-fingerprint-dialog.c:625
+#: ../panels/user-accounts/um-fingerprint-dialog.c:626
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
 msgstr "è¦?å?¯ç?¨æ??纹ç?»å½?ï¼?ä½ é??è¦?使ç?¨â??%sâ??设å¤?æ?¥ä¿?å­?æ?¨ç??ä¸?个æ??纹ã??"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:633
+#: ../panels/user-accounts/um-fingerprint-dialog.c:634
 #, c-format
 msgid ""
 "Enrolling fingerprints for\n"
@@ -2260,14 +2651,10 @@ msgstr ""
 "为 <b><big>%s</big></b>\n"
 "å? å?¥æ??纹è¯?å?«"
 
-#: ../panels/user-accounts/um-language-dialog.c:328
+#: ../panels/user-accounts/um-language-dialog.c:299
 msgid "Other..."
 msgstr "��..."
 
-#: ../panels/user-accounts/um-lockbutton.c:355
-msgid "Lock"
-msgstr "é??å®?"
-
 #: ../panels/user-accounts/um-lockbutton.c:373
 msgid "Locked"
 msgstr "å·²é??å®?"
@@ -2407,72 +2794,72 @@ msgstr "å??为 %s ç??ç?¨æ?·å·²å­?å?¨ã??"
 msgid "This user does not exist."
 msgstr "该ç?¨æ?·ä¸?å­?å?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:352
+#: ../panels/user-accounts/um-user-panel.c:353
 msgid "Failed to delete user"
 msgstr "����失败"
 
-#: ../panels/user-accounts/um-user-panel.c:412
+#: ../panels/user-accounts/um-user-panel.c:413
 msgid "You cannot delete your own account."
 msgstr "æ?¨ä¸?è?½å? é?¤è?ªå·±ç??å¸?æ?·ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:421
+#: ../panels/user-accounts/um-user-panel.c:422
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 已���"
 
-#: ../panels/user-accounts/um-user-panel.c:425
+#: ../panels/user-accounts/um-user-panel.c:426
 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:434
+#: ../panels/user-accounts/um-user-panel.c:435
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "æ?¨æ?³è¦?ä¿?æ?? %s ç??æ??件å??ï¼?"
 
-#: ../panels/user-accounts/um-user-panel.c:438
+#: ../panels/user-accounts/um-user-panel.c:439
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "å? é?¤ç?¨æ?·æ?¶å?¯ä»¥ä¿?ç??ç?¨æ?·ä¸»ç?®å½?ã??ç?µå­?é?®ä»¶ç?®å½?å??临æ?¶æ??件ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:441
+#: ../panels/user-accounts/um-user-panel.c:442
 msgid "_Delete Files"
 msgstr "å? é?¤æ??件(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:442
+#: ../panels/user-accounts/um-user-panel.c:443
 msgid "_Keep Files"
 msgstr "ä¿?ç??æ??件(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:443
+#: ../panels/user-accounts/um-user-panel.c:444
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:467
+#: ../panels/user-accounts/um-user-panel.c:468
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "��已��"
 
-#: ../panels/user-accounts/um-user-panel.c:476
+#: ../panels/user-accounts/um-user-panel.c:477
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "�次���设置"
 
-#: ../panels/user-accounts/um-user-panel.c:479
+#: ../panels/user-accounts/um-user-panel.c:480
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ? "
 
-#: ../panels/user-accounts/um-user-panel.c:821
+#: ../panels/user-accounts/um-user-panel.c:828
 msgid "Failed to contact the accounts service"
 msgstr "è??ç³»å¸?æ?·æ??å?¡å¤±è´¥"
 
-#: ../panels/user-accounts/um-user-panel.c:823
+#: ../panels/user-accounts/um-user-panel.c:830
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "请确å®? AccountService å·²ç»?正确å®?è£?并å?¯ç?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:856
+#: ../panels/user-accounts/um-user-panel.c:863
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -2480,13 +2867,13 @@ msgstr ""
 "������\n"
 "请å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:894
+#: ../panels/user-accounts/um-user-panel.c:901
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "Create a user"
 msgstr "å??建ç?¨æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:905
-#: ../panels/user-accounts/um-user-panel.c:1181
+#: ../panels/user-accounts/um-user-panel.c:912
+#: ../panels/user-accounts/um-user-panel.c:1188
 msgid ""
 "To create a user,\n"
 "click the * icon first"
@@ -2494,13 +2881,13 @@ msgstr ""
 "è¦?å??建ç?¨æ?·ï¼?\n"
 "请å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:914
+#: ../panels/user-accounts/um-user-panel.c:921
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
 msgid "Delete the selected user"
 msgstr "å? é?¤é??中ç??ç?¨æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:926
-#: ../panels/user-accounts/um-user-panel.c:1186
+#: ../panels/user-accounts/um-user-panel.c:933
+#: ../panels/user-accounts/um-user-panel.c:1193
 msgid ""
 "To delete the selected user,\n"
 "click the * icon first"
@@ -2508,11 +2895,11 @@ msgstr ""
 "è¦?å? é?¤é??中ç??ç?¨æ?·ï¼?\n"
 "请å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:1090
+#: ../panels/user-accounts/um-user-panel.c:1097
 msgid "My Account"
 msgstr "æ??ç??å¸?æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:1099
+#: ../panels/user-accounts/um-user-panel.c:1106
 msgid "Other Accounts"
 msgstr "����"
 
@@ -2523,7 +2910,7 @@ msgstr "æ·»å? æ??å? é?¤ç?¨æ?·"
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:3
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
-msgstr "ç?»å½?;å??称;æ??纹;Avatar;Logo;å?£ä»¤;"
+msgstr "ç?»å½?;å??称;æ??纹;头å??;æ ?å¿?;å¯?ç ?;"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "User Accounts"
@@ -2549,11 +2936,6 @@ msgstr "å?¨å??(_F)ï¼?"
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
-#: ../panels/user-accounts/data/language-chooser.ui.h:1
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Cancel"
-msgstr "å??æ¶?"
-
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid ""
 "<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a "
@@ -2637,7 +3019,7 @@ msgstr "��"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:4
 msgid "Changing photo for:"
-msgstr "�����"
+msgstr "æ?´æ?¢ç?§ç??ï¼?"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:5
 msgid ""
@@ -2665,8 +3047,7 @@ msgid ""
 "<b>When the guest user logs out, all files and data associated with the "
 "account will be deleted.</b>"
 msgstr ""
-"å?¶ç?¨æ?¥å®¾å¸?æ?·å°?å??许任ä½?人ä¸?使ç?¨å¯?ç ?临æ?¶ç?»å½?此计ç®?æ?ºã??å? å®?å?¨èµ·è§?ï¼?ä¸?å??许è¿?ç¨?"
-"ç?»å½?è?³æ­¤è®¡ç®?æ?ºã??\n"
+"æ?¥å®¾å¸?æ?·å°?å??许任ä½?人ä¸?使ç?¨å¯?ç ?临æ?¶ç?»å½?此计ç®?æ?ºã??å? å®?å?¨èµ·è§?ï¼?ä¸?å??许ä»?è¿?ç¨?ç?»å½?æ­¤ç?¨æ?·ã??\n"
 "\n"
 "<b>å½?æ?¥å®¾å¸?æ?·ç?»å?ºæ?¶ï¼?æ??æ??ä¸?æ­¤å¸?æ?·æ??å?³ç??æ??件å??æ?°æ?®é?½å°?被å? é?¤ã??</b>"
 
@@ -2706,10 +3087,6 @@ msgstr "æ??纹ç?»å½?ï¼?"
 msgid "Language:"
 msgstr "语��"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:18
-msgid "Location:"
-msgstr "�置�"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:19
 msgid "Login Options"
 msgstr "ç?»å½?é??项"
@@ -2790,7 +3167,7 @@ msgstr "æ?¨ç??æ??纹已æ??å??ä¿?å­?ã??æ?¨ç?°å?¨åº?该å?¯ä»¥ä½¿ç?¨æ??纹读å??å?¨
 
 #: ../shell/control-center.c:47
 msgid "Show the overview"
-msgstr "�示�述"
+msgstr "æ?¾ç¤ºæ??è¦?"
 
 #: ../shell/control-center.c:48
 msgid "Panel to display"
@@ -2817,314 +3194,6 @@ msgstr "系�设置"
 msgid "Control Center"
 msgstr "��中�"
 
-#: ../examples/gnome-example-panel.desktop.in.in.h:1
-msgid "Example Panel"
-msgstr "示���"
-
-#: ../examples/gnome-example-panel.desktop.in.in.h:2
-msgid "Example preferences panel"
-msgstr "示ä¾?é¦?é??项é?¢æ?¿"
-
-#. Translators: those are keywords for the example control-center panel
-#: ../examples/gnome-example-panel.desktop.in.in.h:4
-msgid "Foo;Bar;Baz;"
-msgstr "Foo;Bar;Baz;"
-
 #: ../shell/shell.ui.h:2
 msgid "_All Settings"
 msgstr "��设置(_A)"
-
-#~ msgid "12 hour format"
-#~ msgstr "12 ��格�"
-
-#~ msgid "24 hour format"
-#~ msgstr "24 ��格�"
-
-#~ msgid "Preferred Applications"
-#~ msgstr "é¦?é??åº?ç?¨ç¨?åº?"
-
-#~ msgid "Select your default applications"
-#~ msgstr "é??æ?©é»?认ç??åº?ç?¨ç¨?åº?"
-
-#~ msgid "Start the preferred visual assistive technology"
-#~ msgstr "å?¯å?¨é¦?é??ç??è§?è§?è¾?å?©æ??æ?¯"
-
-#~ msgid "Visual Assistance"
-#~ msgstr "����"
-
-#~ msgid "Error setting default browser: %s"
-#~ msgstr "设置é»?认æµ?è§?å?¨å?ºé??ï¼?%s"
-
-#~ msgid "Error setting default mailer: %s"
-#~ msgstr "设置é»?认ç?µå­?é?®ä»¶ç¨?åº?å?ºé??ï¼?%s"
-
-#~ msgid "Could not load the main interface"
-#~ msgstr "æ? æ³?è£?å?¥ä¸»ç??é?¢"
-
-#~ msgid "Please make sure that the applet is properly installed"
-#~ msgstr "请确����已�正确��"
-
-#~ msgid "All %s occurrences will be replaced with actual link"
-#~ msgstr "å?ºç?°ç??å?¨é?¨ %s é?½å°?被æ?¿æ?¢ä¸ºå®?é??é?¾æ?¥"
-
-#~ msgid "Co_mmand:"
-#~ msgstr "�令(_M)�"
-
-#~ msgid "E_xecute flag:"
-#~ msgstr "����(_X)�"
-
-#~ msgid "Instant Messenger"
-#~ msgstr "å?³æ?¶é??讯工å?·"
-
-#~ msgid "Internet"
-#~ msgstr "äº?è??ç½?"
-
-#~ msgid "Mail Reader"
-#~ msgstr "é?®ä»¶é??读å?¨"
-
-#~ msgid "Mobility"
-#~ msgstr "移�� "
-
-#~ msgid "Run at st_art"
-#~ msgstr "�����(_A)"
-
-#~ msgid "Run in t_erminal"
-#~ msgstr "��端中��(_E)"
-
-#~ msgid "System"
-#~ msgstr "系�"
-
-#~ msgid "Terminal Emulator"
-#~ msgstr "ç»?端模æ??å?¨"
-
-#~ msgid "Text Editor"
-#~ msgstr "æ??æ?¬ç¼?è¾?å?¨"
-
-#~ msgid "Visual"
-#~ msgstr "è§?è§?æ??æ??"
-
-#~ msgid "Web Browser"
-#~ msgstr "�����"
-
-#~ msgid "_Run at start"
-#~ msgstr "�����(_R)"
-
-#~ msgid "Banshee Music Player"
-#~ msgstr "Banshee �����"
-
-#~ msgid "Debian Terminal Emulator"
-#~ msgstr "Debian ç»?端模æ??å?¨"
-
-#~ msgid "ETerm"
-#~ msgstr "ETerm"
-
-#~ msgid "GNOME Magnifier without Screen Reader"
-#~ msgstr "ä¸?带å±?å¹?é??读å?¨ç?? GNOME æ?¾å¤§é??"
-
-#~ msgid "GNOME OnScreen Keyboard"
-#~ msgstr "GNOME å±?å¹?é?®ç??"
-
-#~ msgid "GNOME Terminal"
-#~ msgstr "GNOME �端"
-
-#~ msgid "Gnopernicus"
-#~ msgstr "Gnopernicus"
-
-#~ msgid "Gnopernicus with Magnifier"
-#~ msgstr "带æ?¾å¤§é??ç?? Gnopernicus"
-
-#~ msgid "KDE Magnifier without Screen Reader"
-#~ msgstr "ä¸?带å±?å¹?é??读å?¨ç?? KDE æ?¾å¤§é??"
-
-#~ msgid "Konsole"
-#~ msgstr "Konsole"
-
-#~ msgid "Linux Screen Reader"
-#~ msgstr "Linux å±?å¹?é??读å?¨"
-
-#~ msgid "Linux Screen Reader with Magnifier"
-#~ msgstr "带æ?¾å¤§é??ç?? Linux å±?å¹?é??读å?¨"
-
-#~ msgid "Listen"
-#~ msgstr "��"
-
-#~ msgid "Muine Music Player"
-#~ msgstr "Muine �����"
-
-#~ msgid "NXterm"
-#~ msgstr "NXterm"
-
-#~ msgid "Orca"
-#~ msgstr "Orca"
-
-#~ msgid "Orca with Magnifier"
-#~ msgstr "带æ?¾å¤§é??ç?? Orca"
-
-#~ msgid "RXVT"
-#~ msgstr "RXVT"
-
-#~ msgid "Rhythmbox Music Player"
-#~ msgstr "Rhythmbox �����"
-
-#~ msgid "Standard XTerminal"
-#~ msgstr "æ ?å?? X ç»?端"
-
-#~ msgid "Terminator"
-#~ msgstr "Terminator"
-
-#~ msgid "Totem Movie Player"
-#~ msgstr "Totem �影���"
-
-#~ msgid "aterm"
-#~ msgstr "aterm"
-
-#~ msgid "Orange"
-#~ msgstr "æ©?è?²"
-
-#~ msgid "Chocolate"
-#~ msgstr "èµ­è?²"
-
-# �������
-#, fuzzy
-#~ msgid "Plum"
-#~ msgstr "æ??å­?"
-
-#~ msgid "Red"
-#~ msgstr "红�"
-
-# ��
-#~ msgid "Aluminium"
-#~ msgstr "é??ç?½"
-
-#~ msgid "Gray"
-#~ msgstr "ç?°è?²"
-
-#~ msgid "Black"
-#~ msgstr "é»?è?²"
-
-#~ msgid "Colors"
-#~ msgstr "��"
-
-#~ msgid "Slide Show"
-#~ msgstr "å¹»ç?¯ç??æ¼?示"
-
-#~ msgid "Image"
-#~ msgstr "å?¾å??"
-
-#~ msgid "%d %s by %d %s"
-#~ msgstr "%d %s * %d %s"
-
-#~ msgid "pixel"
-#~ msgid_plural "pixels"
-#~ msgstr[0] "å??ç´ "
-
-#~ msgid ""
-#~ "<b>%s</b>\n"
-#~ "%s, %s\n"
-#~ "Folder: %s"
-#~ msgstr ""
-#~ "<b>%s</b>\n"
-#~ "%sï¼?%s\n"
-#~ "æ??件夹ï¼?%s"
-
-#~ msgid ""
-#~ "<b>%s</b>\n"
-#~ "%s\n"
-#~ "Folder: %s"
-#~ msgstr ""
-#~ "<b>%s</b>\n"
-#~ "%s\n"
-#~ "æ??件夹ï¼?%s"
-
-#~ msgid "Image missing"
-#~ msgstr "å?¾å??丢失"
-
-#~ msgid "_Detect Monitors"
-#~ msgstr "���示�(_D)"
-
-#~ msgid "New Location..."
-#~ msgstr "�建�置..."
-
-#~ msgid "Location already exists"
-#~ msgstr "�置已��"
-
-#~ msgid "Set your network proxy preferences"
-#~ msgstr "设置æ?¨ç??ç½?ç»?代ç??é¦?é??项"
-
-#~ msgid "Web;Location;"
-#~ msgstr "Web;ä½?ç½®;"
-
-#~ msgid "<b>Di_rect internet connection</b>"
-#~ msgstr "<b>ç?´æ?¥è¿?æ?¥å?°äº?è??ç½?(_R)</b>"
-
-#~ msgid "<b>_Automatic proxy configuration</b>"
-#~ msgstr "<b>è?ªå?¨é??置代ç??(_A)</b>"
-
-#~ msgid "<b>_Manual proxy configuration</b>"
-#~ msgstr "<b>æ??å?¨é??置代ç??(_M)</b>"
-
-#~ msgid "<b>_Use authentication</b>"
-#~ msgstr "<b>é??è¦?身份éª?è¯?(_U)</b>"
-
-#~ msgid "Autoconfiguration _URL:"
-#~ msgstr "è?ªå?¨é??ç½® URL(_U)ï¼?"
-
-#~ msgid "C_reate"
-#~ msgstr "å??建(_R)"
-
-#~ msgid "Create New Location"
-#~ msgstr "å??建æ?°ä½?ç½®"
-
-#~ msgid "HTTP Proxy Details"
-#~ msgstr "HTTP 代ç??ç»?è??"
-
-#~ msgid "H_TTP proxy:"
-#~ msgstr "H_TTP 代ç??ï¼?"
-
-#~ msgid "Ignore Host List"
-#~ msgstr "忽ç?¥ä¸»æ?ºå??表"
-
-#~ msgid "Ignored Hosts"
-#~ msgstr "忽ç?¥ç??主æ?º"
-
-#~ msgid "Network Proxy Preferences"
-#~ msgstr "ç½?ç»?代ç??é¦?é??项"
-
-#~ msgid "Port:"
-#~ msgstr "端��"
-
-#~ msgid "Proxy Configuration"
-#~ msgstr "代ç??æ??å?¡å?¨é??ç½®"
-
-#~ msgid "S_ocks host:"
-#~ msgstr "S_OCKS 主��"
-
-#~ msgid "The location already exists."
-#~ msgstr "该ä½?置已å­?å?¨ã??"
-
-#~ msgid "U_sername:"
-#~ msgstr "ç?¨æ?·å??(_S)ï¼?"
-
-#~ msgid "_Delete Location"
-#~ msgstr "���置(_D)"
-
-#~ msgid "_Details"
-#~ msgstr "ç»?è??(_D)"
-
-#~ msgid "_FTP proxy:"
-#~ msgstr "_FTP 代ç??ï¼?"
-
-#~ msgid "_Location name:"
-#~ msgstr "ä½?ç½®å??(_L)ï¼?"
-
-#~ msgid "_Password:"
-#~ msgstr "��(_P)�"
-
-#~ msgid "_Secure HTTP proxy:"
-#~ msgstr "å®?å?¨ HTTP 代ç??(_S)ï¼?"
-
-#~ msgid "_Use the same proxy for all protocols"
-#~ msgstr "为æ??æ??å??议使ç?¨ç?¸å??ç??代ç??(_U)"
-
-#~ msgid "Flight Mode"
-#~ msgstr "��模�"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]