[gnome-control-center] Update Simplified Chinese translation.



commit eb1fec869ff085e8fc4ff013c4bd76771ee211fc
Author: Aron Xu <aronxu gnome org>
Date:   Sat Mar 19 23:07:47 2011 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 2490 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1582 insertions(+), 908 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8afb829..fa2a252 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,15 +15,16 @@
 # zhang ping <zhangping159 gmail com>, 2010.
 # Aron Xu <happyaron xu gmail com>, 2010, 2011.
 # æ??å?·ç??ç¬?å¯? (dhyang) <dhyang555 gmail com>, 2011.
+# Lele Long <schemacs gmail com>, 2011.
 #
 msgid ""
 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-21 21:10+0000\n"
-"PO-Revision-Date: 2011-01-23 12:03+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"control-center&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-18 16:03+0000\n"
+"PO-Revision-Date: 2011-03-19 22:42+0800\n"
+"Last-Translator: Lele Long <schemacs gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,6 +62,44 @@ msgid ""
 "will not appear."
 msgstr "è?·å¾?æ?´å¤?æ¡?é?¢ä¸»é¢?ç??ç½?å??ã??å¦?æ??设å®?为空å­?符串ï¼?é?£ä¹?é?¾æ?¥å°?ä¸?ä¼?å?ºç?°ã??"
 
+#: ../libgnome-control-center/cc-lockbutton.c:347
+#: ../panels/screen/screen.ui.h:14
+msgid "Lock"
+msgstr "é??å®?"
+
+#: ../libgnome-control-center/cc-lockbutton.c:356
+#: ../panels/network/network.ui.h:22
+msgid "Unlock"
+msgstr "解é??"
+
+#: ../libgnome-control-center/cc-lockbutton.c:365
+msgid "Locked"
+msgstr "å·²é??å®?"
+
+#: ../libgnome-control-center/cc-lockbutton.c:374
+msgid ""
+"Dialog is unlocked.\n"
+"Click to prevent further changes"
+msgstr ""
+"ä¼?è¯?已解é??ã??\n"
+"��以�止����"
+
+#: ../libgnome-control-center/cc-lockbutton.c:383
+msgid ""
+"Dialog is locked.\n"
+"Click to make changes"
+msgstr ""
+"ä¼?è¯?å·²é??å®?ã??\n"
+"��以����"
+
+#: ../libgnome-control-center/cc-lockbutton.c:392
+msgid ""
+"System policy prevents changes.\n"
+"Contact your system administrator"
+msgstr ""
+"ç³»ç»?ç­?ç?¥é?»æ­¢æ?´æ?¹ã??\n"
+"请è??系系ç»?管ç??å??ã??"
+
 #: ../libgnome-control-center/gconf-property-editor.c:134
 msgid "Key"
 msgstr "é?®"
@@ -128,7 +167,7 @@ msgstr "å±?æ?§ç¼?è¾?å?¨æ?°æ?®é??æ?¾å??è°?å?½æ?°"
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr "å½?å±?æ?§ç¼?è¾?å?¨å¯¹è±¡æ?°æ?®è¦?被é??æ?¾æ?¶è¦?è°?ç?¨ç??å??è°?å?½æ?°"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1406
+#: ../libgnome-control-center/gconf-property-editor.c:1474
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -140,7 +179,7 @@ msgstr ""
 "\n"
 "请确å®?该æ??件å­?å?¨å??é??è¯?ï¼?æ??é??æ?©å?¦ä¸?è??æ?¯å?¾ç??ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1414
+#: ../libgnome-control-center/gconf-property-editor.c:1482
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -153,11 +192,11 @@ msgstr ""
 "\n"
 "请é??æ?©å?¶ä»?å?¾ç??ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1536
+#: ../libgnome-control-center/gconf-property-editor.c:1604
 msgid "Please select an image."
 msgstr "请é??æ?©å?¾ç??ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1541
+#: ../libgnome-control-center/gconf-property-editor.c:1609
 msgid "_Select"
 msgstr "é??æ?©(_S)"
 
@@ -171,8 +210,8 @@ msgstr "æ?´æ?¹è??æ?¯å?¾å??"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
-msgid "Wallpaper;Screen;"
-msgstr "�纸;��;"
+msgid "Wallpaper;Screen;Desktop;"
+msgstr "�纸;��;��;Wallpaper;Screen;Desktop;"
 
 #: ../panels/background/background.ui.h:1
 msgid "Center"
@@ -200,142 +239,132 @@ msgid "Tile"
 msgstr "平�"
 
 #: ../panels/background/background.ui.h:8
-#: ../panels/universal-access/uap.ui.h:92
 msgid "Zoom"
 msgstr "缩�"
 
-#: ../panels/background/bg-colors-source.c:44
+#: ../panels/background/bg-colors-source.c:46
 msgid "Horizontal Gradient"
 msgstr "æ°´å¹³æ??度"
 
-#: ../panels/background/bg-colors-source.c:45
+#: ../panels/background/bg-colors-source.c:47
 msgid "Vertical Gradient"
 msgstr "ç«?ç?´æ??度"
 
-#: ../panels/background/bg-colors-source.c:46
+#: ../panels/background/bg-colors-source.c:48
 msgid "Solid Color"
 msgstr "纯�"
 
-#: ../panels/background/cc-background-panel.c:747
+#: ../panels/background/cc-background-panel.c:958
+#: ../panels/user-accounts/um-photo-dialog.c:216
+#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+msgid "Browse for more pictures"
+msgstr "æµ?è§?æ?´å¤?å?¾ç??"
+
+#: ../panels/background/cc-background-panel.c:1049
+msgid "Current background"
+msgstr "å½?å??è??æ?¯"
+
+#: ../panels/background/cc-background-panel.c:1113
 msgid "Wallpapers"
 msgstr "�纸"
 
-#: ../panels/background/cc-background-panel.c:755
+#: ../panels/background/cc-background-panel.c:1120
 msgid "Pictures Folder"
 msgstr "å?¾ç??æ??件夹"
 
-#: ../panels/background/cc-background-panel.c:763
+#: ../panels/background/cc-background-panel.c:1127
 msgid "Colors & Gradients"
 msgstr "é¢?è?²å??æ¸?å??"
 
-#: ../panels/background/cc-background-panel.c:772
+#: ../panels/background/cc-background-panel.c:1135
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../panels/background/cc-background-panel.c:833
-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:148
 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:152
 #, c-format
 msgid "%d Ã? %d"
 msgstr "%d x %d"
 
-#: ../panels/datetime/datetime.ui.h:1
-msgid "16"
-msgstr "16"
-
-#: ../panels/datetime/datetime.ui.h:2
-msgid "2010"
-msgstr "2010"
+#: ../panels/background/cc-background-item.c:255
+msgid "No Desktop Background"
+msgstr "æ? æ¡?é?¢è??æ?¯"
 
-#: ../panels/datetime/datetime.ui.h:3
-msgid "22"
-msgstr "22"
+#: ../panels/common/gdm-languages.c:709
+msgid "Unspecified"
+msgstr "æ?ªæ??å®?"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: ../panels/datetime/datetime.ui.h:1
 msgid "24-Hour Time"
 msgstr "24 ��格�"
 
-#: ../panels/datetime/datetime.ui.h:5
-msgid "45"
-msgstr "45"
-
-#: ../panels/datetime/datetime.ui.h:6
+#. Translator: this is the separator between hours and minutes, like in HH:MM
+#: ../panels/datetime/datetime.ui.h:3
 msgid ":"
 msgstr ":"
 
-#: ../panels/datetime/datetime.ui.h:7
-msgid "AM"
-msgstr "ä¸?å??"
-
-#: ../panels/datetime/datetime.ui.h:8
+#: ../panels/datetime/datetime.ui.h:4
 msgid "April"
 msgstr "å??æ??"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: ../panels/datetime/datetime.ui.h:5
 msgid "August"
 msgstr "å?«æ??"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: ../panels/datetime/datetime.ui.h:6
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: ../panels/datetime/datetime.ui.h:7
 msgid "December"
 msgstr "å??äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: ../panels/datetime/datetime.ui.h:8
 msgid "February"
 msgstr "äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:13
+#: ../panels/datetime/datetime.ui.h:9
 msgid "January"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: ../panels/datetime/datetime.ui.h:10
 msgid "July"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:15
+#: ../panels/datetime/datetime.ui.h:11
 msgid "June"
 msgstr "å?­æ??"
 
-#: ../panels/datetime/datetime.ui.h:16
+#: ../panels/datetime/datetime.ui.h:12
 msgid "March"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: ../panels/datetime/datetime.ui.h:13
 msgid "May"
 msgstr "äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: ../panels/datetime/datetime.ui.h:14
 msgid "Network Time"
 msgstr "����"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: ../panels/datetime/datetime.ui.h:15
 msgid "November"
 msgstr "å??ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: ../panels/datetime/datetime.ui.h:16
 msgid "October"
 msgstr "å??æ??"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: ../panels/datetime/datetime.ui.h:17
 msgid "Region:"
 msgstr "���"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: ../panels/datetime/datetime.ui.h:18
 msgid "September"
 msgstr "ä¹?æ??"
 
@@ -353,19 +382,18 @@ msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ?¶é?´é¦?é??项é?¢æ?¿"
 
 #: ../panels/display/display-capplet.ui.h:1
-#: ../panels/display/xrandr-capplet.c:321
 msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:484
+#: ../panels/display/xrandr-capplet.c:491
 msgid "Monitor"
 msgstr "�示�"
 
 #: ../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
+#: ../panels/display/xrandr-capplet.c:327
+#: ../panels/display/xrandr-capplet.c:366
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Normal"
 msgstr "æ?®é??"
 
@@ -378,7 +406,6 @@ msgid "R_otation:"
 msgstr "æ??转(_O)ï¼?"
 
 #: ../panels/display/display-capplet.ui.h:6
-#: ../panels/display/xrandr-capplet.c:322
 msgid "Right"
 msgstr "å?³"
 
@@ -412,111 +439,177 @@ msgstr "�示"
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "é?¢æ?¿;æ??影仪;xrandr;å±?å¹?;å??辨ç??;å?·æ?°;"
 
-#: ../panels/display/xrandr-capplet.c:323
-msgid "Upside Down"
-msgstr "ä¸?ä¸?颠å??"
+#: ../panels/display/xrandr-capplet.c:328
+msgid "Anti-Clockwise"
+msgstr "é??æ?¶é??"
+
+#: ../panels/display/xrandr-capplet.c:329
+msgid "Clockwise"
+msgstr "顺æ?¶é??"
+
+#: ../panels/display/xrandr-capplet.c:330
+msgid "180 Degrees"
+msgstr "180 度"
 
 #. Translators:  this is the feature where what you see on your laptop's
 #. * screen is the same as your external monitor.  Here, "Mirror" is being
 #. * 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:460
+#: ../panels/display/xrandr-capplet.c:467
 msgid "Mirror Displays"
 msgstr "é??å??æ?¾ç¤º"
 
-#: ../panels/display/xrandr-capplet.c:585
+#: ../panels/display/xrandr-capplet.c:597
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:587
+#: ../panels/display/xrandr-capplet.c:599
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1497
+#: ../panels/display/xrandr-capplet.c:1510
 msgid "Drag to change primary display."
 msgstr "æ??æ?½ä»¥æ?´æ?¹å?ºç¡?æ?¾ç¤ºè®¾å¤?ã??"
 
-#: ../panels/display/xrandr-capplet.c:1555
+#: ../panels/display/xrandr-capplet.c:1568
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é??æ?©ä¸?个æ?¾ç¤ºå?¨æ?¥æ?´æ?¹å®?ç??å±?æ?§ï¼?æ??å?¨å®?æ?¥æ??å??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1943
+#: ../panels/display/xrandr-capplet.c:1957
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1945
+#: ../panels/display/xrandr-capplet.c:1959
 msgid "%a %l:%M %p"
 msgstr "%A %H%M"
 
-#: ../panels/display/xrandr-capplet.c:2230
+#: ../panels/display/xrandr-capplet.c:2205
 msgid "Could not save the monitor configuration"
 msgstr "æ? æ³?ä¿?å­?æ?¾ç¤ºå?¨é??ç½®"
 
-#: ../panels/display/xrandr-capplet.c:2253
+#: ../panels/display/xrandr-capplet.c:2230
 msgid "Could not get session bus while applying display configuration"
 msgstr "åº?ç?¨æ?¾ç¤ºé??ç½®æ?¶æ? æ³?è?·å¾?ä¼?è¯?æ?»çº¿"
 
-#: ../panels/display/xrandr-capplet.c:2298
+#: ../panels/display/xrandr-capplet.c:2275
 msgid "Could not detect displays"
 msgstr "�����示�"
 
-#: ../panels/display/xrandr-capplet.c:2506
+#: ../panels/display/xrandr-capplet.c:2470
 msgid "Could not get screen information"
 msgstr "æ? æ³?è?·å¾?å±?å¹?ä¿¡æ?¯"
 
+#. Translators: VESA is an techncial acronym, don't translate it.
+#: ../panels/info/cc-info-panel.c:366
+#, c-format
+msgid "VESA: %s"
+msgstr ""
+
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/info/cc-info-panel.c:390 ../panels/network/panel-common.c:78
+#: ../panels/network/panel-common.c:157
+msgid "Unknown"
+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:528
 #, c-format
 msgid "%d-bit"
 msgstr "%d ä½?"
 
-#: ../panels/info/cc-info-panel.c:261
+#: ../panels/info/cc-info-panel.c:542
 #, 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:550
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panels/info/cc-info-panel.c:274
+#: ../panels/info/cc-info-panel.c:555
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panels/info/cc-info-panel.c:279
+#: ../panels/info/cc-info-panel.c:560
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panels/info/cc-info-panel.c:284
+#: ../panels/info/cc-info-panel.c:565
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../panels/info/cc-info-panel.c:289
+#: ../panels/info/cc-info-panel.c:570
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../panels/info/cc-info-panel.c:294
+#: ../panels/info/cc-info-panel.c:575
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../panels/info/cc-info-panel.c:404
+#: ../panels/info/cc-info-panel.c:686
 msgid "Unknown model"
 msgstr "æ?ªç?¥å??å?·"
 
-#: ../panels/info/cc-info-panel.c:466
+#: ../panels/info/cc-info-panel.c:769
+#, fuzzy
+msgid "The next login will attempt to use the standard experience."
+msgstr "ä¸?次ç?»é??å°?å°?è¯?æ ?å??ç?¨æ?·ä½?éª?ã??"
+
+#: ../panels/info/cc-info-panel.c:771
+#, fuzzy
+msgid ""
+"The next login will use the fallback mode intended for unsupported graphics "
+"hardware."
+msgstr "ä¸?次ç?»å½?å°?使ç?¨ä¸?æ?¯æ??å?¾å½¢ç¡¬ä»¶ç??å¤?ç?¨æ¨¡å¼?ã??"
+
+#. translators: The hardware is not able to run GNOME 3's
+#. * shell, so we use the GNOME "Fallback" session
+#: ../panels/info/cc-info-panel.c:813
+msgctxt "Experience"
+msgid "Fallback"
+msgstr "��"
+
+#. translators: The hardware is able to run GNOME 3's
+#. * shell, also called "Standard" experience
+#: ../panels/info/cc-info-panel.c:819
+msgctxt "Experience"
+msgid "Standard"
+msgstr "æ ?å??"
+
+#: ../panels/info/cc-info-panel.c:951
+#: ../panels/keyboard/keyboard-shortcuts.c:1712
+msgid "Section"
+msgstr "è??"
+
+#: ../panels/info/cc-info-panel.c:960 ../panels/info/info.ui.h:14
+msgid "Overview"
+msgstr "��"
+
+#: ../panels/info/cc-info-panel.c:966 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "�认����"
+
+# �示
+#: ../panels/info/cc-info-panel.c:971 ../panels/info/info.ui.h:9
+#, fuzzy
+msgid "Graphics"
+msgstr "�形"
+
+#: ../panels/info/cc-info-panel.c:996
 #, c-format
 msgid "Version %s"
 msgstr "ç??æ?¬ %s"
@@ -531,44 +624,196 @@ msgstr "系�信�"
 
 #. Translators: those are keywords for the System Information panel
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
-msgid "device;system;information;memory;processor;version;"
+#, fuzzy
+#| msgid "device;system;information;memory;processor;version;"
+msgid ""
+"device;system;information;memory;processor;version;default;application;"
+"fallback;"
 msgstr "设å¤?;ç³»ç»?;ä¿¡æ?¯;主å­?;å¤?ç??å?¨;ç??æ?¬;"
 
 #: ../panels/info/info.ui.h:1
-msgid "Device name:"
-msgstr "设å¤?å??称ï¼?"
-
-#: ../panels/info/info.ui.h:2
-msgid "Disk:"
-msgstr "ç£?ç??ï¼?"
+msgid "Calendar"
+msgstr "æ?¥å??"
 
 #: ../panels/info/info.ui.h:3
-msgid "Memory:"
-msgstr "å??å­?ï¼?"
+msgid "Device name"
+msgstr "设å¤?å??称"
 
 #: ../panels/info/info.ui.h:4
-msgid "More Info"
-msgstr "��信�"
+msgid "Disk"
+msgstr "ç£?ç??"
 
 #: ../panels/info/info.ui.h:5
-msgid "OS type:"
-msgstr "æ??ä½?ç³»ç»?ç±»å??ï¼?"
+msgid "Driver"
+msgstr "驱�"
 
 #: ../panels/info/info.ui.h:6
-msgid "Processor:"
-msgstr "å¤?ç??å?¨ï¼?"
+msgid "Experience"
+msgstr "����"
+
+#. Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.
+#: ../panels/info/info.ui.h:8
+#, fuzzy
+msgid "Forced Fallback Mode"
+msgstr "强���模�"
+
+#: ../panels/info/info.ui.h:10
+msgid "Mail"
+msgstr "�件"
+
+#: ../panels/info/info.ui.h:11
+msgid "Memory"
+msgstr "å??å­?"
+
+#: ../panels/info/info.ui.h:12
+msgid "Music"
+msgstr "��"
+
+#: ../panels/info/info.ui.h:13
+msgid "OS type"
+msgstr "æ??ä½?ç³»ç»?ç±»å??"
+
+#: ../panels/info/info.ui.h:15
+msgid "Photos"
+msgstr "ç?§ç??"
+
+#: ../panels/info/info.ui.h:16
+msgid "Processor"
+msgstr "å¤?ç??å?¨"
 
-#: ../panels/info/info.ui.h:7
-msgid "Update Available"
+#: ../panels/info/info.ui.h:17
+msgid "Updates Available"
 msgstr "����"
 
-#: ../panels/keyboard/00-multimedia-key.xml.in.h:1
+#: ../panels/info/info.ui.h:18
+msgid "Video"
+msgstr "��"
+
+#: ../panels/info/info.ui.h:19
+#, fuzzy
+msgid "Web"
+msgstr "���"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:1
+msgid "Eject"
+msgstr "弹�"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:2
+msgid "Launch media player"
+msgstr "�������"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:3
+msgid "Next track"
+msgstr "���轨"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:4
+msgid "Pause playback"
+msgstr "æ??å??æ?­æ?¾"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:5
+msgid "Play (or play/pause)"
+msgstr "æ?­æ?¾(æ??è?? æ?­æ?¾/æ??å??ï¼?"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:6
+msgid "Previous track"
+msgstr "���轨"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:7
 msgid "Sound and Media"
 msgstr "声é?³å??åª?ä½?"
 
-#: ../panels/keyboard/01-desktop-key.xml.in.h:1
-msgid "Launchers and Actions"
-msgstr "å?¯å?¨å?¨å??å?¨ä½?"
+#: ../panels/keyboard/00-multimedia.xml.in.h:8
+msgid "Stop playback"
+msgstr "å??æ­¢æ?­æ?¾"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:9
+msgid "Volume down"
+msgstr "å??å°?é?³é??"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:10
+msgid "Volume mute"
+msgstr "é??é?³"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:11
+msgid "Volume up"
+msgstr "å¢?大é?³é??"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:1
+msgid "Home folder"
+msgstr "主æ??件夹"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:2
+msgid "Launch calculator"
+msgstr "��计��"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:3
+msgid "Launch email client"
+msgstr "���件客�端"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:4
+msgid "Launch help browser"
+msgstr "��帮����"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:5
+msgid "Launch web browser"
+msgstr "���页���"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:6
+msgid "Launchers"
+msgstr "���"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:7
+msgid "Search"
+msgstr "æ??ç´¢"
+
+#: ../panels/keyboard/01-system.xml.in.h:1
+msgid "Lock screen"
+msgstr "é??å®?å±?å¹?"
+
+#: ../panels/keyboard/01-system.xml.in.h:2
+msgid "Log out"
+msgstr "注é??"
+
+#: ../panels/keyboard/01-system.xml.in.h:3
+msgid "System"
+msgstr "系�"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:1
+msgid "Decrease text size"
+msgstr "å??å°?æ??æ?¬å­?å?·å¤§å°?"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:2
+msgid "Increase text size"
+msgstr "å¢?å? æ??æ?¬å­?å?·ç??大å°?"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:3
+msgid "Magnifier zoom in"
+msgstr "æ?¾å¤§é?? æ?¾å¤§"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:4
+msgid "Magnifier zoom out"
+msgstr "æ?¾å¤§é?? 缩å°?"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:5
+msgid "Toggle contrast"
+msgstr "å??æ?¢å¯¹æ¯?度"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:6
+msgid "Toggle magnifier"
+msgstr "å??æ?¢æ?¾å¤§é??"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:7
+msgid "Toggle on-screen keyboard"
+msgstr "å??æ?¢å±?å¹?é?®ç??"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:8
+msgid "Toggle screen reader"
+msgstr "å??æ?¢å±?å¹?é??读å?¨"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:9
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
+msgid "Universal Access"
+msgstr "é??ç?¨è¾?å?©å??è?½"
 
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
@@ -600,11 +845,10 @@ msgstr "å? é??é?®ç±»å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1229
-#: ../panels/sound/gvc-mixer-control.c:1091
+#: ../panels/keyboard/keyboard-shortcuts.c:1153
+#: ../panels/sound/gvc-mixer-control.c:1084
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
-#: ../panels/user-accounts/um-login-options.c:355
 msgid "Disabled"
 msgstr "��"
 
@@ -622,22 +866,22 @@ msgstr "é?®ç??"
 msgid "Shortcut;Repeat;Blink;"
 msgstr "å¿«æ?·é?®;é??å¤?;é?ªç??;"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:736
-#: ../panels/keyboard/keyboard-shortcuts.c:1001
-#: ../panels/keyboard/keyboard-shortcuts.c:1633
-#: ../panels/keyboard/keyboard-shortcuts.c:1637
+#: ../panels/keyboard/keyboard-shortcuts.c:646
+#: ../panels/keyboard/keyboard-shortcuts.c:928
+#: ../panels/keyboard/keyboard-shortcuts.c:1506
+#: ../panels/keyboard/keyboard-shortcuts.c:1510
 msgid "Custom Shortcuts"
 msgstr "���快��"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:848
+#: ../panels/keyboard/keyboard-shortcuts.c:780
 msgid "<Unknown Action>"
 msgstr "<����>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1255
+#: ../panels/keyboard/keyboard-shortcuts.c:1179
 msgid "Error saving the new shortcut"
 msgstr "ä¿?å­?æ?°å¿«æ?·é?®å?ºé??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1365
+#: ../panels/keyboard/keyboard-shortcuts.c:1292
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -647,7 +891,7 @@ msgstr ""
 "ä¸?è?½ä½¿ç?¨â??%sâ??为快æ?·é?®ï¼?å? ä¸ºä½¿ç?¨æ­¤é?®å°?æ? æ³?正常è¾?å?¥ã??\n"
 "请ç»?å?? Ctrlã??Alt æ?? Shift é?®å??è¯?ä¸?次"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1395
+#: ../panels/keyboard/keyboard-shortcuts.c:1322
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -656,34 +900,25 @@ msgstr ""
 "å¿«æ?·é?®â??%sâ??已被ç?¨äº?\n"
 "%s"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1401
+#: ../panels/keyboard/keyboard-shortcuts.c:1327
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??ä½ é??æ?°è®¾å®?å¿«æ?·é?® %sï¼?å??å¿«æ?·é?® %s å°?被ç¦?ç?¨"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1409
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 msgid "_Reassign"
 msgstr "é??设(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1529
-#, c-format
-msgid "Error unsetting accelerator in configuration database: %s"
-msgstr "å?¨é??ç½®æ?°æ?®åº? %s 中解é?¤è®¾å®?æ?¶å?ºé??"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1587
+#: ../panels/keyboard/keyboard-shortcuts.c:1445
 msgid "Too many custom shortcuts"
 msgstr "���快����"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1865
-msgid "Section"
-msgstr "è??"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1909
+#: ../panels/keyboard/keyboard-shortcuts.c:1765
 msgid "Action"
 msgstr "��"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1931
+#: ../panels/keyboard/keyboard-shortcuts.c:1788
 msgid "Shortcut"
 msgstr "å¿«æ?·é?®"
 
@@ -701,7 +936,7 @@ msgstr "æ??æ?¬å??中å??æ ?é?ªç??(_B)"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:21
 msgid "Cursor blinks speed"
 msgstr "å??æ ?é?ªç??é??度"
 
@@ -727,7 +962,7 @@ msgstr "æ??ä½?æ??ä¸?é?®æ?¶é??å¤?该é?®(_R)"
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Long"
 msgstr "é?¿"
 
@@ -746,7 +981,7 @@ msgstr "é??度(_P)ï¼?"
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 #: ../panels/mouse/gnome-mouse-properties.ui.h:24
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Short"
 msgstr "ç?­"
 
@@ -764,7 +999,8 @@ msgstr "æ?¢"
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
-msgstr "è¦?ç¼?è¾?å¿«æ?·é?®ï¼?请å??å?»ç?¸åº?ç??è¡?ï¼?ç?¶å??è¾?å?¥æ?°æ??é?®ç»?å??ï¼?æ??æ?? Backspace æ¸?é?¤ã??"
+msgstr ""
+"è¦?ç¼?è¾?å¿«æ?·é?®ï¼?请å??å?»ç?¸åº?ç??è¡?ï¼?ç?¶å??è¾?å?¥æ?°æ??é?®ç»?å??ï¼?æ??æ?? Backspace æ¸?é?¤ã??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 msgid "_Delay:"
@@ -778,26 +1014,92 @@ msgstr "å??称(_N)ï¼?"
 msgid "_Speed:"
 msgstr "é??度(_S)ï¼?"
 
-#: ../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
+#: ../panels/media/cc-media-panel.c:322
 msgid "Ask what to do"
 msgstr "询é?®å¦?ä½?å¤?ç??"
 
-#: ../panels/media/cc-media-panel.c:325 ../panels/power/power.ui.h:8
+#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:6
 msgid "Do nothing"
 msgstr "ä¸?å¤?ç??"
 
-#: ../panels/media/cc-media-panel.c:329
+#: ../panels/media/cc-media-panel.c:330
 msgid "Open folder"
 msgstr "æ??å¼?æ??件夹"
 
+#: ../panels/media/cc-media-panel.c:441
+msgid "Select an application for audio CDs"
+msgstr "é??æ?©æ?­æ?¾é?³é¢? CD ç??åº?ç?¨ç¨?åº?"
+
+#: ../panels/media/cc-media-panel.c:442
+msgid "Select an application for video DVDs"
+msgstr "é??æ?©æ?­æ?¾è§?é¢? DVD ç??åº?ç?¨ç¨?åº?"
+
+#: ../panels/media/cc-media-panel.c:443
+#, fuzzy
+msgid "Select an application to run when a music player is connected"
+msgstr "é??æ?©è¿?æ?¥å?°é?³ä¹?æ?­æ?¾å?¨æ?¶è¿?è¡?ç??åº?ç?¨ç¨?åº?"
+
+#: ../panels/media/cc-media-panel.c:444
+#, fuzzy
+msgid "Select an application to run when a camera is connected"
+msgstr "é??æ?©ç?¸æ?ºè¿?æ?¥ä¸?æ?¶è¿?è¡?ç??åº?ç?¨ç¨?åº?"
+
+# è¿?个翻è¯?太æ??æ­§ä¹?äº?
+#: ../panels/media/cc-media-panel.c:445
+msgid "Select an application for software CDs"
+msgstr "é??æ?©è¿?è¡?软件 CD ç??åº?ç?¨ç¨?åº?"
+
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: ../panels/media/cc-media-panel.c:457
+msgid "audio DVD"
+msgstr "�� DVD"
+
+#: ../panels/media/cc-media-panel.c:458
+msgid "blank Blu-ray disc"
+msgstr "空ç?½è??å??å??ç??"
+
+#: ../panels/media/cc-media-panel.c:459
+msgid "blank CD disc"
+msgstr "空ç?½CDå??ç??"
+
+#: ../panels/media/cc-media-panel.c:460
+msgid "blank DVD disc"
+msgstr "空ç?½ DVD å??ç??"
+
+# 空ç?½ HD DVD å??ç??
+#: ../panels/media/cc-media-panel.c:461
+#, fuzzy
+msgid "blank HD DVD disc"
+msgstr "空ç?½é«?æ¸? DVD å??ç??"
+
+#: ../panels/media/cc-media-panel.c:462
+msgid "Blu-ray video disc"
+msgstr "è??å??è§?é¢?å??ç??"
+
+#: ../panels/media/cc-media-panel.c:463
+msgid "e-book reader"
+msgstr "ç?µå­?æ??é??读å?¨"
+
+#: ../panels/media/cc-media-panel.c:464
+msgid "HD DVD video disc"
+msgstr "HD DVD è§?é¢?å??ç??"
+
+#: ../panels/media/cc-media-panel.c:465
+msgid "Picture CD"
+msgstr "å?¾ç?? CD"
+
+#: ../panels/media/cc-media-panel.c:466
+msgid "Super Video CD"
+msgstr "�级VCD"
+
+#: ../panels/media/cc-media-panel.c:467
+msgid "Video CD"
+msgstr "�� CD"
+
 #: ../panels/media/gnome-media-properties.ui.h:1
 msgid "Acti_on:"
 msgstr "��(_O)�"
@@ -854,175 +1156,225 @@ msgstr "é??ç½®ä»?è´¨å??è?ªå?¨è¿?è¡?é¦?é??项"
 msgid "Removable Media"
 msgstr "�移��质"
 
+#. Translators: those are keywords for the media control-center panel
+#: ../panels/media/gnome-media-panel.desktop.in.in.h:4
+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:175
+#: ../panels/printers/cc-printers-panel.c:251
 msgid "Low on toner"
 msgstr "墨��足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:177
+#: ../panels/printers/cc-printers-panel.c:253
 msgid "Out of toner"
 msgstr "墨��尽"
 
-#. Translators: "Developer" like on photo development context
-#: ../panels/printers/cc-printers-panel.c:179
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/cc-printers-panel.c:256
 msgid "Low on developer"
 msgstr "墨水�足"
 
-#. Translators: "Developer" like on photo development context
-#: ../panels/printers/cc-printers-panel.c:181
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/cc-printers-panel.c:259
 msgid "Out of developer"
 msgstr "墨水�尽"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:183
+#: ../panels/printers/cc-printers-panel.c:261
+#, fuzzy
 msgid "Low on a marker supply"
-msgstr ""
+msgstr "�记��紧缺"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:185
+#: ../panels/printers/cc-printers-panel.c:263
+#, fuzzy
 msgid "Out of a marker supply"
-msgstr ""
+msgstr "�记����"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:187
+#: ../panels/printers/cc-printers-panel.c:265
 msgid "Open cover"
 msgstr "æ??å¼?ä¸?ç??"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:189
+#: ../panels/printers/cc-printers-panel.c:267
 msgid "Open door"
 msgstr "æ??å¼?å??é?¨"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:191
+#: ../panels/printers/cc-printers-panel.c:269
 msgid "Low on paper"
 msgstr "纸张�足"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:193
+#: ../panels/printers/cc-printers-panel.c:271
 msgid "Out of paper"
 msgstr "纸张�尽"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:195
+#: ../panels/printers/cc-printers-panel.c:273
+msgctxt "printer state"
 msgid "Offline"
-msgstr "��"
+msgstr "离线"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:197
+#: ../panels/printers/cc-printers-panel.c:275
+msgctxt "printer state"
 msgid "Paused"
 msgstr "å·²æ??å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:199
+#: ../panels/printers/cc-printers-panel.c:277
 msgid "Waste receptacle almost full"
 msgstr "����满"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:201
+#: ../panels/printers/cc-printers-panel.c:279
 msgid "Waste receptacle full"
 msgstr "���已满"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:203
+#: ../panels/printers/cc-printers-panel.c:281
 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
+#: ../panels/printers/cc-printers-panel.c:283
 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 "å¾?æ?º"
+#: ../panels/printers/cc-printers-panel.c:429
+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:298
-#: ../panels/printers/cc-printers-panel.c:689
+#: ../panels/printers/cc-printers-panel.c:433
+msgctxt "printer state"
 msgid "Processing"
-msgstr "æ­£å?¨å¤?ç??"
+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
+#: ../panels/printers/cc-printers-panel.c:437
+msgctxt "printer state"
 msgid "Stopped"
 msgstr "å·²å??æ­¢"
 
-#. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:681
+#. Translators: Toner supply
+#: ../panels/printers/cc-printers-panel.c:573
+msgid "Toner Level"
+msgstr "碳�级�"
+
+#. Translators: Ink supply
+#: ../panels/printers/cc-printers-panel.c:576
+msgid "Ink Level"
+msgstr "墨水�级�"
+
+#. Translators: By supply we mean ink, toner, staples, water, ...
+#: ../panels/printers/cc-printers-panel.c:579
 #, fuzzy
-#| msgid "Seeing"
+msgid "Supply Level"
+msgstr "è??æ??级å?«"
+
+#. Translators: there is n active print jobs on this printer
+#: ../panels/printers/cc-printers-panel.c:594
+#, fuzzy, c-format
+msgid "%u active"
+msgid_plural "%u active"
+msgstr[0] "%u å¤?äº?æ´»å?¨ç?¶æ??"
+
+#. Translators: There are no printers available (none is configured or CUPS is not running)
+#: ../panels/printers/cc-printers-panel.c:744
+msgid "No printers available"
+msgstr "æ? å?¯ç?¨æ??å?°æ?º"
+
+#. Translators: Job's state (job is waiting to be printed)
+#: ../panels/printers/cc-printers-panel.c:1035
+msgctxt "print job"
 msgid "Pending"
-msgstr "��"
+msgstr "��中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:685
+#: ../panels/printers/cc-printers-panel.c:1039
+#, fuzzy
+msgctxt "print job"
 msgid "Held"
 msgstr ""
 
+#. Translators: Job's state (job is currently printing)
+#: ../panels/printers/cc-printers-panel.c:1043
+msgctxt "print job"
+msgid "Processing"
+msgstr "å¤?ç??中"
+
+#. Translators: Job's state (job has been stopped)
+#: ../panels/printers/cc-printers-panel.c:1047
+msgctxt "print job"
+msgid "Stopped"
+msgstr "å·²å??æ­¢"
+
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:697
+#: ../panels/printers/cc-printers-panel.c:1051
+msgctxt "print job"
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:701
+#: ../panels/printers/cc-printers-panel.c:1055
+msgctxt "print job"
 msgid "Aborted"
-msgstr "已�止"
+msgstr "已中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:705
+#: ../panels/printers/cc-printers-panel.c:1059
+msgctxt "print job"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:796
+#: ../panels/printers/cc-printers-panel.c:1151
 msgid "Job Title"
 msgstr "任���"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:804
+#: ../panels/printers/cc-printers-panel.c:1160
 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
+#: ../panels/printers/cc-printers-panel.c:1166
 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: Addition of the new printer failed.
+#: ../panels/printers/cc-printers-panel.c:1881
+#, fuzzy
+#| msgid "Failed to create user"
+msgid "Failed to add new printer."
+msgstr "å??建ç?¨æ?·å¤±è´¥"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:1589
+#: ../panels/printers/cc-printers-panel.c:1981
 msgid "Test page"
 msgstr "��页"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1597
+#: ../panels/printers/cc-printers-panel.c:1989
 msgid "Clean print heads"
 msgstr "����"
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1600
+#: ../panels/printers/cc-printers-panel.c:1994
 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
+#: ../panels/printers/cc-printers-panel.c:2118
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "æ? æ³?è£?å?¥ç??é?¢ï¼?%s"
@@ -1040,230 +1392,251 @@ msgstr "æ??å?°æ?º;é??å??;æ??å?°;纸张;墨水;墨ç²?;"
 msgid "Printers"
 msgstr "æ??å?°æ?º"
 
-#: ../panels/printers/printers.ui.h:1
-msgid "---"
-msgstr "---"
+#: ../panels/printers/new-printer-dialog.ui.h:1
+#, fuzzy
+#| msgid "_Add..."
+msgid "Add"
+msgstr "添�(_A)..."
 
-#. Translators: Cancel selected print job.
-#: ../panels/printers/printers.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#, fuzzy
+#| msgid "Disable Printer"
+msgid "Add a New Printer"
+msgstr "ç¦?ç?¨æ??å?°æ?º"
+
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#, fuzzy
+#| msgid "IP Address"
+msgid "Address"
+msgstr "IP å?°å??"
+
+#: ../panels/printers/new-printer-dialog.ui.h:4
 #: ../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 "ç¦?ç?¨æ??å?°æ?º"
+#: ../panels/printers/new-printer-dialog.ui.h:5
+msgid "Search by Address"
+msgstr ""
 
-#. Translators: Pause (hold) selected print job.
-#: ../panels/printers/printers.ui.h:13
-msgid "Hold"
+#: ../panels/printers/pp-new-printer-dialog.c:381
+msgid "Getting devices..."
 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: Column of devices which can be installed
+#: ../panels/printers/pp-new-printer-dialog.c:639
+#: ../panels/printers/pp-new-printer-dialog.c:644
+#, fuzzy
+#| msgid "Device"
+msgid "Devices"
+msgstr "设�"
 
-#. Translators: This button executes command which prints test page.
+#. Translators: Local means local printers
+#: ../panels/printers/pp-new-printer-dialog.c:669
+#, fuzzy
+#| msgid "Lock"
+msgid "Local"
+msgstr "é??å®?"
+
+#. Translators: Network means network printers
+#: ../panels/printers/pp-new-printer-dialog.c:671
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+msgid "Network"
+msgstr "ç½?ç»?"
+
+#. Translators: Device types column (network or local)
+#: ../panels/printers/pp-new-printer-dialog.c:712
+#, fuzzy
+#| msgid "Device name"
+msgid "Device types"
+msgstr "设å¤?å??称"
+
+#. Translators: Name of job which makes printer to autoconfigure itself
+#: ../panels/printers/pp-new-printer-dialog.c:865
+#: ../panels/printers/pp-new-printer-dialog.c:1033
+#, fuzzy
+#| msgid "Automatic Login:"
+msgid "Automatic configuration"
+msgstr "�����"
+
+#: ../panels/printers/printers.ui.h:1
+msgid "---"
+msgstr "---"
+
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/printers.ui.h:3
+msgid "Active Print Jobs"
+msgstr "æ´»è·?ç??æ??å?°æ?ºä»»å?¡"
+
+#. Translators: This button adds new printer.
+#: ../panels/printers/printers.ui.h:5
+#, fuzzy
+#| msgid "Printer"
+msgid "Add New Printer"
+msgstr "æ??å?°æ?º"
+
+#: ../panels/printers/printers.ui.h:6
+msgid "Allowed users"
+msgstr "å??许ç??ç?¨æ?·"
+
+#. Translators: Switch back to printer's info tab
+#: ../panels/printers/printers.ui.h:8
+msgid "Back"
+msgstr "å??é??"
+
+#. Translators: This checkbox is checked when the default printer is selected.
+#: ../panels/printers/printers.ui.h:10
+#: ../panels/region/gnome-region-panel-xkbot.c:229
+#: ../panels/sound/gvc-sound-theme-chooser.c:581
+msgid "Default"
+msgstr "�认"
+
+#: ../panels/printers/printers.ui.h:11
+#: ../panels/network/cc-network-panel.c:1367
+#: ../panels/network/cc-network-panel.c:1370 ../panels/network/network.ui.h:12
+msgid "IP Address"
+msgstr "IP å?°å??"
+
+#: ../panels/printers/printers.ui.h:12
+msgid "Jobs"
+msgstr "��"
+
+#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
+#: ../panels/printers/printers.ui.h:14
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#: ../panels/printers/printers.ui.h:15
+msgid "Model"
+msgstr "å??å?·"
+
+#. Translators: This button opens printer's options tab
 #: ../panels/printers/printers.ui.h:17
+msgid "Options"
+msgstr "é??项"
+
+#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:19
 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 "æ??å?°æ?ºä»»å?¡"
+#: ../panels/printers/printers.ui.h:20
+msgid "Printer"
+msgstr "æ??å?°æ?º"
 
-#. Translators: Print paused print job.
-#: ../panels/printers/printers.ui.h:21
-msgid "Release"
-msgstr "继续"
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/printers.ui.h:22
+msgid "Printer Options"
+msgstr "æ??å?°æ?ºé??项"
 
-#. Translators: Users which are allowed to print on this printer.
 #: ../panels/printers/printers.ui.h:23
-msgid "Share with these users:"
-msgstr "������享�"
+msgid "Printing..."
+msgstr "æ??å?°..."
 
-#: ../panels/printers/printers.ui.h:24
-msgid "Show / hide printer's jobs"
-msgstr "æ?¾ç¤º/é??è??æ??å?°æ?ºç??ä»»å?¡"
+#. Tanslators: Switch to tab containing printer's jobs
+#: ../panels/printers/printers.ui.h:25
+msgid "Show"
+msgstr "�示"
 
-#. Translators: Status of the printer.
-#: ../panels/printers/printers.ui.h:26
-msgid "Status:"
-msgstr "ç?¶æ??ï¼?"
+#. Translators: The CUPS server is not running (we can not connect to it).
+#: ../panels/printers/printers.ui.h:27
+msgid ""
+"Sorry! The system printing service\n"
+"doesn't seem to be available."
+msgstr ""
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:28
-msgid "Supply:"
-msgstr "è??æ??ï¼?"
+#: ../panels/printers/printers.ui.h:30
+#, fuzzy
+msgid "Supply"
+msgstr "��"
 
 #: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Keyboard _model:"
-msgstr "é?®ç??å??å?·(_M)ï¼?"
+msgid "Allow different layouts for each window"
+msgstr "å??许æ¯?个çª?å?£æ?¥æ??ä¸?å??ç??å¸?å±?"
 
 #: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Layouts"
-msgstr "��"
+msgid "Install languages..."
+msgstr "��语�..."
 
 #: ../panels/region/gnome-region-panel.ui.h:3
-msgid "List of keyboard layouts selected for usage"
-msgstr "å?¯é??æ?©ä½¿ç?¨ç??é?®ç??å¸?å±?å??表"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+msgid "Language"
+msgstr "语�"
 
 #: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Move _Down"
-msgstr "å??ä¸?移å?¨(_D)"
+msgid "Layouts"
+msgstr "��"
 
 #: ../panels/region/gnome-region-panel.ui.h:5
-msgid "Move _Up"
-msgstr "å??ä¸?移å?¨(_U)"
-
-#: ../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:7
-msgid "Move the selected keyboard layout up in the list"
-msgstr "å?¨å??表中ä¸?移é??å®?ç??é?®ç??å¸?å±?"
-
-#: ../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:9
-msgid "Print a diagram of the selected keyboard layout"
-msgstr "æ??å?°é??中é?®ç??å¸?å±?ç??ä¸?份å?¾ç¤º"
-
-#: ../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:11
-msgid "Remove the selected keyboard layout from the list"
-msgstr "ä»?å??表中å? é?¤é??中ç??é?®ç??å¸?å±?"
-
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/gnome-region-panel.ui.h:6
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
 msgstr "使ç?¨é»?认设å®?æ?¿æ?¢å½?å??é?®ç??å¸?å±?"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/region/gnome-region-panel.ui.h:8
 msgid "Reset to De_faults"
 msgstr "é??置为é»?认å?¼(_F)"
 
-#: ../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: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:16
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "View and edit keyboard layout options"
 msgstr "æ?¥ç??并ç¼?è¾?é?®ç??å¸?å±?é??项"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
-msgid "_Add..."
-msgstr "添�(_A)..."
-
-#: ../panels/region/gnome-region-panel.ui.h:18
+#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/network/network.ui.h:32
 msgid "_Options..."
 msgstr "é??项(_O)..."
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-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:7
-msgid "_Variants:"
-msgstr "å??ä½?(_V)ï¼?"
-
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:1
-msgid "Choose a Keyboard Model"
-msgstr "é??æ?©é?®ç??å??å?·"
-
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:2
-msgid "_Models:"
-msgstr "å??å?·(_M)ï¼?"
+#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:2
+msgid "Preview"
+msgstr "��"
 
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:3
-msgid "_Vendors:"
-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"
 msgstr "é?®ç??å¸?å±?é??项"
 
-#. TRANSLATORS: device type
-#. TRANSLATORS: AP type
-#: ../panels/region/gnome-region-panel-xkb.c:70
-#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
-msgid "Unknown"
-msgstr "��"
-
-#: ../panels/region/gnome-region-panel-xkblt.c:220
+#: ../panels/region/gnome-region-panel-xkblt.c:222
 msgid "Layout"
 msgstr "��"
 
-#: ../panels/region/gnome-region-panel-xkbmc.c:163
-msgid "Vendors"
-msgstr "å?¶é? å??"
-
-#: ../panels/region/gnome-region-panel-xkbmc.c:229
-msgid "Models"
-msgstr "å??å?·"
-
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
 msgid "Change your region and language settings"
 msgstr "æ?´æ?¹æ?¨ç??å?ºå??å??语è¨?设置"
 
 #. Translators: those are keywords for the region control-center panel
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:3
-msgid "Language;Layout;"
-msgstr "语�;��;"
+msgid "Language;Layout;Keyboard;"
+msgstr "语è¨?ï¼?å¸?å±?ï¼?é?®ç??ï¼?"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "Disable _touchpad while typing"
@@ -1287,13 +1660,12 @@ msgstr "��水平��(_O)"
 
 #. high sensitivity
 #: ../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:13
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:36
 msgid "Large"
 msgstr "大"
 
@@ -1303,7 +1675,6 @@ msgstr "å®?ä½?æ??é??"
 
 #. low sensitivity
 #: ../panels/mouse/gnome-mouse-properties.ui.h:17
-#: ../panels/universal-access/uap.ui.h:52
 msgid "Low"
 msgstr "ä½?"
 
@@ -1333,7 +1704,7 @@ msgstr "æ??ä½? Ctrl é?®æ?¶æ?¾ç¤ºæ??é??ä½?ç½®(_O)"
 
 #. small threshold
 #: ../panels/mouse/gnome-mouse-properties.ui.h:28
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Small"
 msgstr "å°?"
 
@@ -1394,118 +1765,85 @@ msgstr "设置æ?¨ç??é¼ æ ?å??触æ?¸æ?¿é¦?é??项"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr "触æ?¸æ?¿;æ??é??;ç?¹å?»;å??å?»;å??å?»;æ??é?®;轨迹ç??;"
 
-#: ../panels/network/cc-network-panel.c:1062
-#: ../panels/network/cc-network-panel.c:1084
-#, c-format
-msgid "%i Mb/s"
-msgstr "%i Mb/�"
-
-#: ../panels/network/cc-network-panel.c:1064
-#, c-format
-msgid "%i Gb/s"
-msgstr "%i Gb/�"
-
-#: ../panels/network/cc-network-panel.c:1082
-#, c-format
-msgid "%i kb/s"
-msgstr "%i kb/�"
-
-#: ../panels/network/cc-network-panel.c:1739
-msgid "Network proxy"
-msgstr "ç½?ç»?代ç??"
-
-#: ../panels/network/cc-network-panel.c:1748
-msgid "Set the system proxy settings"
-msgstr "ç³»ç»?代ç??设置"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:69
-msgid "Wired"
-msgstr "æ??线"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:73
-msgid "Wireless"
-msgstr "�线"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:78
-msgid "Mobile broadband"
-msgstr "移�宽带"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:82
-msgid "Bluetooth"
-msgstr "è??ç??"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:86
-msgid "Mesh"
-msgstr "ç½?æ ¼"
+#. TRANSLATORS: this is when the use leaves the PAC textbox blank
+#: ../panels/network/cc-network-panel.c:190
+msgid ""
+"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+msgstr ""
 
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:142
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
+#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
+#. * network, then anyone else on that network can tell your
+#. * machine that it should proxy all of your web traffic
+#. * through them.
+#: ../panels/network/cc-network-panel.c:198
+msgid "This is not recommended for untrusted public networks."
+msgstr ""
 
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:146
-msgid "Infrastructure"
-msgstr "æ?¶æ??"
+#. TRANSLATORS: this WEP WiFi security
+#: ../panels/network/cc-network-panel.c:873
+msgid "WEP"
+msgstr ""
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:164
-msgid "Status unknown"
-msgstr "æ?ªç?¥ç?¶æ??"
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/cc-network-panel.c:877
+msgid "WPA"
+msgstr ""
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:168
-msgid "Unmanaged"
-msgstr "æ?ªæ??管"
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/cc-network-panel.c:881
+msgid "WPA2"
+msgstr ""
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:172
-msgid "Unavailable"
-msgstr "���"
+#. TRANSLATORS: this Enterprise WiFi security
+#: ../panels/network/cc-network-panel.c:886
+msgid "Enterprise"
+msgstr ""
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:176
-msgid "Disconnected"
-msgstr "已��"
+#. TRANSLATORS: this no (!) WiFi security
+#: ../panels/network/cc-network-panel.c:892
+#: ../panels/universal-access/uap.ui.h:43
+msgid "None"
+msgstr "æ? "
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:180
-msgid "Preparing connection"
-msgstr "å??å¤?è¿?æ?¥"
+#. Translators: network device speed
+#: ../panels/network/cc-network-panel.c:1174
+#: ../panels/network/cc-network-panel.c:1199
+#, fuzzy, c-format
+#| msgid "%i Mb/s"
+msgid "%d Mb/s"
+msgstr "%i Mb/�"
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:184
-msgid "Configuring connection"
-msgstr "é??ç½®è¿?æ?¥"
+#: ../panels/network/cc-network-panel.c:1363 ../panels/network/network.ui.h:13
+#, fuzzy
+#| msgid "IPv4 Address:"
+msgid "IPv4 Address"
+msgstr "IPv4 å?°å??ï¼?"
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:188
-msgid "Authenticating"
-msgstr "正�认�"
+#: ../panels/network/cc-network-panel.c:1364 ../panels/network/network.ui.h:14
+#, fuzzy
+#| msgid "IPv6 Address:"
+msgid "IPv6 Address"
+msgstr "IPv6å?°å??ï¼?"
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:192
-msgid "Getting network address"
-msgstr "æ­£å?¨è?·å¾?ç½?ç»?å?°å??"
+#: ../panels/network/cc-network-panel.c:1498
+#, fuzzy
+#| msgid "FTP Proxy:"
+msgid "Proxy"
+msgstr "FTP 代ç??ï¼?"
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:196
-msgid "Connected"
-msgstr "已��"
+#: ../panels/network/cc-network-panel.c:1561
+msgid "Network proxy"
+msgstr "ç½?ç»?代ç??"
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:200
-msgid "Failed to connect"
-msgstr "��失败"
+#: ../panels/network/cc-network-panel.c:1710
+#, c-format
+msgid "%s VPN"
+msgstr ""
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-msgid "Network"
-msgstr "ç½?ç»?"
+#. TRANSLATORS: the user is running a NM that is not API compatible
+#: ../panels/network/cc-network-panel.c:1777
+msgid "The system network services are not compatible with this version."
+msgstr ""
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Network settings"
@@ -1517,117 +1855,275 @@ msgid "Network;Wireless;IP;LAN;"
 msgstr "��;�线;IP;LAN;"
 
 #: ../panels/network/network.ui.h:1
-msgid "Airplane Mode"
+#, fuzzy
+#| msgid "Airplane Mode"
+msgid "Air_plane Mode"
 msgstr "��模�"
 
 #: ../panels/network/network.ui.h:2
-msgid "Configuration URL:"
-msgstr "é??ç½® URLï¼?"
+#, fuzzy
+#| msgid "Cr_eate"
+msgid "Create..."
+msgstr "å??建(_E)"
 
 #: ../panels/network/network.ui.h:3
-msgid "DNS:"
+#, fuzzy
+#| msgid "DNS:"
+msgid "DNS"
 msgstr "DNSï¼?"
 
 #: ../panels/network/network.ui.h:4
-msgid "Default Route:"
-msgstr "�认路�"
+msgid "DSL"
+msgstr ""
 
 #: ../panels/network/network.ui.h:5
-msgid "FTP Proxy:"
-msgstr "FTP 代ç??ï¼?"
+#, fuzzy
+#| msgid "Default Route:"
+msgid "Default Route"
+msgstr "�认路�"
 
 #: ../panels/network/network.ui.h:6
-msgid "Gateway:"
+#, fuzzy
+#| msgid "Gateway:"
+msgid "Gateway"
 msgstr "���"
 
 #: ../panels/network/network.ui.h:7
-msgid "Group Name:"
+#, fuzzy
+#| msgid "Group Name:"
+msgid "Group Name"
 msgstr "ç»?å??称ï¼?"
 
 #: ../panels/network/network.ui.h:8
-msgid "Group Password:"
+#, fuzzy
+#| msgid "Group Password:"
+msgid "Group Password"
 msgstr "����"
 
 #: ../panels/network/network.ui.h:9
-msgid "HTTP Proxy:"
+#, fuzzy
+#| msgid "HTTP Proxy:"
+msgid "H_TTPS Proxy"
 msgstr "HTTP 代ç??ï¼?"
 
 #: ../panels/network/network.ui.h:10
-msgid "Hardware Address:"
+#, fuzzy
+#| msgid "Hardware Address:"
+msgid "Hardware Address"
 msgstr "硬件å?°å??ï¼?"
 
 #: ../panels/network/network.ui.h:11
-msgid "IMEI:"
+#, fuzzy
+#| msgid "IMEI:"
+msgid "IMEI"
 msgstr "IMEIï¼?"
 
-#: ../panels/network/network.ui.h:12
-msgid "IP Address:"
-msgstr "IP å?°å??ï¼?"
-
-#: ../panels/network/network.ui.h:13
-msgid "IPv4 Address:"
-msgstr "IPv4 å?°å??ï¼?"
-
-#: ../panels/network/network.ui.h:14
-msgid "IPv6 Address:"
-msgstr "IPv6å?°å??ï¼?"
-
 #: ../panels/network/network.ui.h:15
-msgid "Method:"
-msgstr "���"
+msgid "Interface"
+msgstr ""
 
 #: ../panels/network/network.ui.h:16
-msgid "Network Name:"
-msgstr "ç½?ç»?å??称ï¼?"
+#, fuzzy
+#| msgid "Mobile broadband"
+msgid "Mobile Broadband"
+msgstr "移�宽带"
 
 #: ../panels/network/network.ui.h:17
-msgid "Provider:"
+#, fuzzy
+#| msgid "Provider:"
+msgid "Provider"
 msgstr "æ??ä¾?è??ï¼?"
 
 #: ../panels/network/network.ui.h:18
-msgid "Secure HTTP Proxy:"
-msgstr "å®?å?¨ HTTP 代ç??ï¼?"
+#, fuzzy
+#| msgid "Security:"
+msgid "Security"
+msgstr "����"
 
 #: ../panels/network/network.ui.h:19
-msgid "Security:"
-msgstr "����"
+msgid "Select the interface to use for the new service"
+msgstr ""
 
 #: ../panels/network/network.ui.h:20
-msgid "Socks Host:"
-msgstr "Socks 主��"
-
-#: ../panels/network/network.ui.h:21
-msgid "Speed:"
+#, fuzzy
+#| msgid "Speed:"
+msgid "Speed"
 msgstr "é??度ï¼?"
 
-#: ../panels/network/network.ui.h:22
-msgid "Subnet Mask:"
+#: ../panels/network/network.ui.h:21
+#, fuzzy
+#| msgid "Subnet Mask:"
+msgid "Subnet Mask"
 msgstr "å­?ç½?æ?©ç ?ï¼?"
 
 #: ../panels/network/network.ui.h:23
-#: ../panels/user-accounts/um-lockbutton.c:364
-msgid "Unlock"
-msgstr "解é??"
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "ç?¨æ?·å??ï¼?"
 
 #: ../panels/network/network.ui.h:24
-msgid "Username:"
-msgstr "ç?¨æ?·å??ï¼?"
+msgid "VPN"
+msgstr ""
+
+#. TRANSLATORS: device type
+#: ../panels/network/network.ui.h:25 ../panels/network/panel-common.c:82
+msgid "Wired"
+msgstr "æ??线"
+
+#. TRANSLATORS: device type
+#: ../panels/network/network.ui.h:26 ../panels/network/panel-common.c:86
+msgid "Wireless"
+msgstr "�线"
 
-#: ../panels/network/network.ui.h:25
+#: ../panels/network/network.ui.h:27
+#, fuzzy
+#| msgid "Configuration URL:"
+msgid "_Configuration URL"
+msgstr "é??ç½® URLï¼?"
+
+#: ../panels/network/network.ui.h:28
+#, fuzzy
+#| msgid "FTP Proxy:"
+msgid "_FTP Proxy"
+msgstr "FTP 代ç??ï¼?"
+
+#: ../panels/network/network.ui.h:29
+#, fuzzy
+#| msgid "HTTP Proxy:"
+msgid "_HTTP Proxy"
+msgstr "HTTP 代ç??ï¼?"
+
+#: ../panels/network/network.ui.h:30
+#, fuzzy
+#| msgid "Method:"
+msgid "_Method"
+msgstr "���"
+
+#: ../panels/network/network.ui.h:31
+#, fuzzy
+#| msgid "Network Name:"
+msgid "_Network Name"
+msgstr "ç½?ç»?å??称ï¼?"
+
+#: ../panels/network/network.ui.h:33
+#, fuzzy
+#| msgid "Socks Host:"
+msgid "_Socks Host"
+msgstr "Socks 主��"
+
+#: ../panels/network/network.ui.h:34
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "��"
 
-#: ../panels/network/network.ui.h:26
+#: ../panels/network/network.ui.h:35
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "æ??å?¨"
 
-#: ../panels/network/network.ui.h:27
+#: ../panels/network/network.ui.h:36
 msgctxt "proxy method"
 msgid "None"
 msgstr "æ? "
 
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:93
+msgid "Mobile broadband"
+msgstr "移�宽带"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:98
+msgid "Bluetooth"
+msgstr "è??ç??"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:102
+msgid "Mesh"
+msgstr "ç½?æ ¼"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:161
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:165
+msgid "Infrastructure"
+msgstr "æ?¶æ??"
+
+#. TRANSLATORS: device status
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:183 ../panels/network/panel-common.c:241
+msgid "Status unknown"
+msgstr "æ?ªç?¥ç?¶æ??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:187
+msgid "Unmanaged"
+msgstr "æ?ªæ??管"
+
+#: ../panels/network/panel-common.c:192
+msgid "Cable unplugged"
+msgstr ""
+
+#: ../panels/network/panel-common.c:194
+msgid "Unavailable"
+msgstr "���"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:198
+msgid "Disconnected"
+msgstr "已��"
+
+#. TRANSLATORS: device status
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:205 ../panels/network/panel-common.c:247
+#, fuzzy
+#| msgid "Disconnecting"
+msgid "Connecting"
+msgstr "正���"
+
+#. TRANSLATORS: device status
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:209 ../panels/network/panel-common.c:251
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Authentication required"
+msgstr "认�失败"
+
+#. TRANSLATORS: device status
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:213 ../panels/network/panel-common.c:255
+msgid "Connected"
+msgstr "已��"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:217
+msgid "Disconnecting"
+msgstr "正���"
+
+#. TRANSLATORS: device status
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:221 ../panels/network/panel-common.c:259
+#, fuzzy
+#| msgid "Connected"
+msgid "Connection failed"
+msgstr "已��"
+
+#. TRANSLATORS: device status
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:225 ../panels/network/panel-common.c:267
+msgid "Status unknown (missing)"
+msgstr "æ?ªç?¥ç?¶æ??(丢失)"
+
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:263
+#, fuzzy
+#| msgid "Connected"
+msgid "Not connected"
+msgstr "已��"
+
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "��"
@@ -1638,20 +2134,20 @@ 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 "ç?µæº?;ç?¡ç? ;æ??èµ·;ä¼?ç? ;"
+msgid "Power;Sleep;Suspend;Hibernate;Battery;"
+msgstr "ç?µæº?ï¼?ç?¡ç? ï¼?æ??èµ·ï¼?ä¼?ç? ï¼?ç?µæ± ï¼?"
 
-#: ../panels/power/cc-power-panel.c:151
+#: ../panels/power/cc-power-panel.c:153
 msgid "Unknown time"
 msgstr "����"
 
-#: ../panels/power/cc-power-panel.c:157
+#: ../panels/power/cc-power-panel.c:159
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i å??é??"
 
-#: ../panels/power/cc-power-panel.c:169
+#: ../panels/power/cc-power-panel.c:171
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -1659,52 +2155,52 @@ msgstr[0] "%i å°?æ?¶"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:177
+#: ../panels/power/cc-power-panel.c:179
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:178
+#: ../panels/power/cc-power-panel.c:180
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "æ?¶"
 
-#: ../panels/power/cc-power-panel.c:179
+#: ../panels/power/cc-power-panel.c:181
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??"
 
-#: ../panels/power/cc-power-panel.c:251
+#: ../panels/power/cc-power-panel.c:253
 msgid "Battery charging"
 msgstr "ç?µæ± å??ç?µä¸­"
 
-#: ../panels/power/cc-power-panel.c:254
+#: ../panels/power/cc-power-panel.c:256
 msgid "Battery discharging"
 msgstr "�池��中"
 
-#: ../panels/power/cc-power-panel.c:265
+#: ../panels/power/cc-power-panel.c:267
 msgid "UPS charging"
 msgstr "UPS å??ç?µä¸­"
 
-#: ../panels/power/cc-power-panel.c:268
+#: ../panels/power/cc-power-panel.c:270
 msgid "UPS discharging"
 msgstr "UPS ��中"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:286
+#: ../panels/power/cc-power-panel.c:288
 #, c-format
 msgid "%s until charged (%.0lf%%)"
 msgstr "è¿?é?? %s å??满(%.0lf%%)"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:292
+#: ../panels/power/cc-power-panel.c:294
 #, c-format
 msgid "%s until empty (%.0lf%%)"
 msgstr "è¿?æ?? %s è??å°½(%.0lf%%)"
 
 #. TRANSLATORS: %1 is a percentage value. Note: this string is only
 #. * used when we don't have a time value
-#: ../panels/power/cc-power-panel.c:300
+#: ../panels/power/cc-power-panel.c:302
 #, c-format
 msgid "%.0lf%% charged"
 msgstr "å·²å??ç?µ %.0lf%%"
@@ -1721,58 +2217,55 @@ msgstr "10 å??é??"
 msgid "30 minutes"
 msgstr "30 å??é??"
 
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
+#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:8
 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:8
+msgid "On AC power:"
+msgstr "使�交����"
+
+#: ../panels/power/power.ui.h:9
+msgid "On battery power:"
+msgstr "使��池���"
+
 #: ../panels/power/power.ui.h:10
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
+#, fuzzy
+msgid "Put the computer to sleep when inactive:"
+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
+#: ../panels/power/power.ui.h:12
 msgid "Suspend"
 msgstr "æ??èµ·"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:13
 msgid "When power is critically low:"
 msgstr "ç?µé??ä½?æ?¶ï¼?"
 
-#: ../panels/power/power.ui.h:15
+#: ../panels/power/power.ui.h:14
 msgid "When the power button is pressed:"
 msgstr "æ??ä¸?ç?µæº?æ??é?®æ?¶ï¼?"
 
-#: ../panels/power/power.ui.h:16
+#: ../panels/power/power.ui.h:15
 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;"
-msgstr "亮度;é??å®?;æ¸?æ??;空ç?½;"
+msgid "Brightness;Lock;Dim;Blank;Monitor;"
+msgstr "亮度ï¼?é??å®?ï¼?æ¸?æ??ï¼?空ç?½ï¼?æ?¾ç¤ºå?¨ï¼?"
 
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
 msgid "Screen"
@@ -1794,39 +2287,41 @@ msgstr "2 å??é??"
 msgid "3 minutes"
 msgstr "3 å??é??"
 
-#: ../panels/screen/screen.ui.h:8
+#: ../panels/screen/screen.ui.h:7
+msgid "30 seconds"
+msgstr ""
+
+#: ../panels/screen/screen.ui.h:9
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../panels/screen/screen.ui.h:9
+#: ../panels/screen/screen.ui.h:10
+#, fuzzy
 msgid "Dim screen to save power"
-msgstr ""
+msgstr "è°?æ??å±?å¹?以è??ç??ç?µå??"
 
-#: ../panels/screen/screen.ui.h:10
+#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're detected to be physically in your home (your house, etc.)
+#: ../panels/screen/screen.ui.h:12
+#, fuzzy
 msgid "Don't lock when at home"
-msgstr ""
+msgstr "å?¨å®¶ä½¿ç?¨æ?¶æ? é??é??å®?å±?å¹?"
 
-#: ../panels/screen/screen.ui.h:11
+#: ../panels/screen/screen.ui.h:13
 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
+#: ../panels/screen/screen.ui.h:15
+#, fuzzy
 msgid "Lock screen after:"
-msgstr ""
+msgstr "é??å®?å±?å¹?å??ç??æ?¶é?´ï¼?"
 
-#: ../panels/screen/screen.ui.h:14
+#: ../panels/screen/screen.ui.h:16
 msgid "Screen turns off"
 msgstr "����"
 
-#: ../panels/screen/screen.ui.h:15
-#, fuzzy
-#| msgid "Turn on or off:"
+#: ../panels/screen/screen.ui.h:17
 msgid "Turn off after:"
-msgstr "æ??å¼?æ??å?³é?­ï¼?"
+msgstr "���"
 
 #: ../panels/sound/applet-main.c:49
 msgid "Enable debugging code"
@@ -1898,17 +2393,17 @@ msgstr "淡�淡�(_F)�"
 msgid "_Subwoofer:"
 msgstr "é??ä½?é?³(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:602 ../panels/sound/gvc-channel-bar.c:611
+#: ../panels/sound/gvc-channel-bar.c:603 ../panels/sound/gvc-channel-bar.c:612
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:606
+#: ../panels/sound/gvc-channel-bar.c:607
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "å??å¼±"
 
-#: ../panels/sound/gvc-channel-bar.c:900
+#: ../panels/sound/gvc-channel-bar.c:901
 msgid "Mute"
 msgstr "é??é?³"
 
@@ -1918,7 +2413,7 @@ msgstr "é??ç½®æ??件(_P)ï¼?"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1098
+#: ../panels/sound/gvc-mixer-control.c:1091
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1926,13 +2421,13 @@ msgstr[0] "%u 个��"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1108
+#: ../panels/sound/gvc-mixer-control.c:1101
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 个��"
 
-#: ../panels/sound/gvc-mixer-control.c:1406
+#: ../panels/sound/gvc-mixer-control.c:1399
 msgid "System Sounds"
 msgstr "系�声�"
 
@@ -1947,7 +2442,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 "å??称"
 
@@ -2043,27 +2538,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)ï¼?"
 
@@ -2116,15 +2611,18 @@ msgstr "ç?»ç??"
 msgid "Sonar"
 msgstr "声纳"
 
+#: ../panels/universal-access/cc-ua-panel.c:470
+#: ../panels/universal-access/cc-ua-panel.c:475
+#, fuzzy
+#| msgid "New shortcut..."
+msgid "No shortcut set"
+msgstr "�建快��..."
+
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
 msgid "Keyboard;Mouse;a11y;Accessibility;"
 msgstr "é?®ç??;é¼ æ ?;a11y;è¾?å?©å??è?½;"
 
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
-msgid "Universal Access"
-msgstr "é??ç?¨è¾?å?©å??è?½"
-
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
 msgid "Universal Access Preferences"
 msgstr "é??ç?¨è¾?å?©å??è?½é¦?é??项"
@@ -2144,332 +2642,337 @@ msgstr "125%"
 msgid "150%"
 msgstr "150%"
 
-#: ../panels/universal-access/uap.ui.h:7
-msgid "<span size=\"x-large\">High/Inverse</span>"
-msgstr "<span size=\"x-large\">é«?/å??è?²</span>"
-
 #: ../panels/universal-access/uap.ui.h:8
-msgid "<span size=\"x-large\">High</span>"
-msgstr "<span size=\"x-large\">é«?</span>"
+#, no-c-format
+msgid "75%"
+msgstr ""
 
 #: ../panels/universal-access/uap.ui.h:9
-msgid "<span size=\"x-large\">Low</span>"
-msgstr "<span size=\"x-large\">ä½?</span>"
-
-#: ../panels/universal-access/uap.ui.h:10
-msgid "<span size=\"x-large\">Normal</span>"
-msgstr "<span size=\"x-large\">正常</span>"
-
-#: ../panels/universal-access/uap.ui.h:11
 msgid "Acceptance delay:"
 msgstr "å?¯æ?¥å??延è¿?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:12
+#: ../panels/universal-access/uap.ui.h:10
 msgid "Beep when Caps and Num Lock are used"
 msgstr "å½?使ç?¨ Caps Lock é?®æ?? Num Lock é?®æ?¶å??å?ºè??鸣声"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:11
 msgid "Beep when a key is"
 msgstr "å??å?ºè??鸣声å½?使ç?¨é?®"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:12
 msgid "Beep when a key is rejected"
 msgstr "å½?æ??个é?®è¢«æ??ç»?æ?¶å??å?ºè??鸣声"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:13
 msgid "Beep when a modifer key is pressed"
 msgstr "å½?æ??ä¸?修饰é?®æ?¶å??å?ºè??鸣声"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:14
 msgid "Bounce Keys"
 msgstr "å??å¼¹é?®"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:15
 msgid "Caribou"
 msgstr "Caribou"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:16
 msgid "Change contrast:"
 msgstr "æ?¹å??对æ¯?度ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:17
 msgid "Closed Captioning"
 msgstr "é?­å??注é??"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:18
 msgid "Contrast:"
 msgstr "对�度�"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:19
 msgid "Control the pointer using the keypad"
 msgstr "使ç?¨å°?é?®ç??æ?§å?¶é¼ æ ?æ??é??ã??"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:20
 msgid "Control the pointer using the video camera."
 msgstr "使ç?¨æ??å??头æ?§å?¶é¼ æ ?æ??é??"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Ctrl+Alt+-"
-msgstr "Ctrl+Alt+-"
-
-#: ../panels/universal-access/uap.ui.h:24
-msgid "Ctrl+Alt+0"
-msgstr "Ctrl+Alt+0"
-
-#: ../panels/universal-access/uap.ui.h:25
-msgid "Ctrl+Alt+4"
-msgstr "Ctrl+Alt+4"
-
-#: ../panels/universal-access/uap.ui.h:26
-msgid "Ctrl+Alt+8"
-msgstr "Ctrl+Alt+8"
-
-#: ../panels/universal-access/uap.ui.h:27
-msgid "Ctrl+Alt+="
-msgstr "Ctrl+Alt+="
-
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:22
 msgid "D_elay:"
 msgstr "延�(_E)�"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:23
 msgid "Dasher"
 msgstr "Dasher"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Decrease size:"
 msgstr "å??å°?大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:25
 msgid "Disable if two keys are pressed together"
 msgstr "è?¥å??æ?¶æ??ä¸?两个é?®å??ç¦?ç?¨"
 
-#: ../panels/universal-access/uap.ui.h:33
-msgid "Display"
-msgstr "�示"
-
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:26
 msgid "Display a textual description of speech and sounds"
 msgstr "æ?¾ç¤ºè¯­é?³å??声é?³ç??æ??å­?æ??è¿°ã??"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Flash the entire screen"
 msgstr "é?ªç??æ?´ä¸ªå±?å¹?"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Flash the window title"
 msgstr "é?ªç??çª?å?£æ ?é¢?æ ?"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:29
 msgid "GOK"
 msgstr "GNOME å±?å¹?é?®ç??"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Hearing"
 msgstr "��"
 
-#: ../panels/universal-access/uap.ui.h:40
-msgid "High/Inverse"
-msgstr "é«?/å??è?²"
-
-#: ../panels/universal-access/uap.ui.h:41
-msgid "HighContrast"
-msgstr "�对�度"
-
-#: ../panels/universal-access/uap.ui.h:42
-msgid "HighContrastInverse"
-msgstr "é«?对æ¯?å??è?²"
-
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Hover Click"
 msgstr "æ?¬å??ç?¹å?»"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽ç?¥å¿«é??é??å¤?æ??é?®"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Increase size:"
 msgstr "��大��"
 
-#: ../panels/universal-access/uap.ui.h:46
-msgid "Keyboard Settings..."
+#: ../panels/universal-access/uap.ui.h:34
+#, fuzzy
+#| msgid "Keyboard Settings..."
+msgid "Keyboard Settings"
 msgstr "é?®ç??设置..."
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:37
 msgid "Larger"
 msgstr "�大"
 
-#: ../panels/universal-access/uap.ui.h:53
-msgid "LowContrast"
-msgstr "�对�度"
-
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:40
 msgid "Mouse Keys"
 msgstr "é¼ æ ?é?®"
 
-#: ../panels/universal-access/uap.ui.h:55
-msgid "Mouse Settings..."
+#: ../panels/universal-access/uap.ui.h:41
+#, fuzzy
+#| msgid "Mouse Settings..."
+msgid "Mouse Settings"
 msgstr "鼠�设置..."
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Nomon"
 msgstr "æ?¥å??å®?ä½?"
 
-#: ../panels/universal-access/uap.ui.h:57
-msgid "None"
-msgstr "æ? "
-
-#: ../panels/universal-access/uap.ui.h:59
-msgid "Off"
-msgstr "��"
-
-#: ../panels/universal-access/uap.ui.h:60
-msgid "On"
-msgstr "å¼?"
-
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:45
 msgid "On screen keyboard"
 msgstr "å±?å¹?é?®ç??"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:46
 msgid "OnBoard"
 msgstr "æ?¿è½½"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Options..."
 msgstr "é??项..."
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:48
 msgid "Pointing and Clicking"
 msgstr "æ??å??å??å??å?»"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "å½?æ??é?®æ??ä¸?å??æ?¥æ?¶ä¹?é?´æ?¾ç½®å»¶è¿?"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Screen Reader"
 msgstr "å±?å¹?é??读å?¨"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:51
+#, fuzzy
+#| msgid "On screen keyboard"
+msgid "Screen keyboard"
+msgstr "å±?å¹?é?®ç??"
+
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Seeing"
 msgstr "��"
 
-#: ../panels/universal-access/uap.ui.h:68
-msgid "Shift+Ctrl+Alt+-"
-msgstr "Shift+Ctrl+Alt+-"
-
-#: ../panels/universal-access/uap.ui.h:69
-msgid "Shift+Ctrl+Alt+="
-msgstr "Shift+Ctrl+Alt+="
-
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Simulated Secondary Click"
 msgstr "模æ??å??次ç?¹å?»"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Slow Keys"
 msgstr "æ?¢é??é?®"
 
-#: ../panels/universal-access/uap.ui.h:76
-msgid "Sound Settings..."
+#: ../panels/universal-access/uap.ui.h:59
+#, fuzzy
+#| msgid "Sound Settings..."
+msgid "Sound Settings"
 msgstr "声�设置..."
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Sticky Keys"
 msgstr "ç²?æ»?é?®"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Test flash"
 msgstr "æ??å­?é?ªç??"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Text size:"
 msgstr "æ??å­?大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "å°?ä¸?串修æ?¹è¿?ç??é?®å½?ä½?ä¸?个ç»?å??é?®"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Trigger a click when the pointer hovers"
 msgstr "æ??é??æ?¬å??æ?¶æ?§è¡?ç?¹å?»ã??"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æ??ä½?é¼ æ ?主é?®ä¸?æ?¾æ?¶è§¦å??次å?»"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Turn on accessibility features from the keyboard"
 msgstr "æ??å¼?é?®ç??è¾?å?©å??è?½ç?¹æ?§"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Turn on or off:"
 msgstr "æ??å¼?æ??å?³é?­ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Type here to test settings"
 msgstr "�此���符以��设�"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Typing"
 msgstr "æ??å­?中"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Typing Assistant"
 msgstr "æ??å­?å?©æ??"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "å½?è­¦å??声å??ç??æ?¶ä½¿ç?¨è§?è§?æ??示"
 
-#: ../panels/universal-access/uap.ui.h:89
-msgid "Use an alternative form of text input"
-msgstr "使ç?¨å?¦å¤?æ ¼å¼?ç??æ??å­?è¾?å?¥"
-
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Video Mouse"
 msgstr "��鼠�"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Visual Alerts"
 msgstr "è§?è§?æ??示"
 
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Zoom in:"
 msgstr "�大�"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Zoom out:"
 msgstr "缩��"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:76
 msgid "_Motion threshold:"
 msgstr "è¿?å?¨é??å?¼(_M)ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:96
+#: ../panels/universal-access/uap.ui.h:77
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:97
+#: ../panels/universal-access/uap.ui.h:78
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:98
+#: ../panels/universal-access/uap.ui.h:79
 msgid "rejected"
 msgstr "å·²æ??ç»?"
 
-#: ../panels/user-accounts/gdm-languages.c:709
-msgid "Unspecified"
-msgstr "æ?ªæ??å®?"
+#: ../panels/universal-access/uap.ui.h:80
+#, fuzzy
+#| msgid "<span size=\"x-large\">High/Inverse</span>"
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">High/Inverse</span>"
+msgstr "<span size=\"x-large\">é«?/å??è?²</span>"
+
+#: ../panels/universal-access/uap.ui.h:81
+#, fuzzy
+#| msgid "<span size=\"x-large\">High</span>"
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">High</span>"
+msgstr "<span size=\"x-large\">é«?</span>"
+
+#: ../panels/universal-access/uap.ui.h:82
+#, fuzzy
+#| msgid "<span size=\"x-large\">Low</span>"
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">Low</span>"
+msgstr "<span size=\"x-large\">ä½?</span>"
+
+#: ../panels/universal-access/uap.ui.h:83
+#, fuzzy
+#| msgid "<span size=\"x-large\">Normal</span>"
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">Normal</span>"
+msgstr "<span size=\"x-large\">正常</span>"
+
+#: ../panels/universal-access/uap.ui.h:84
+#, fuzzy
+#| msgid "High"
+msgctxt "universal access, contrast"
+msgid "High"
+msgstr "é«?"
+
+#: ../panels/universal-access/uap.ui.h:85
+#, fuzzy
+#| msgid "High/Inverse"
+msgctxt "universal access, contrast"
+msgid "High/Inverse"
+msgstr "é«?/å??è?²"
+
+#: ../panels/universal-access/uap.ui.h:86
+#, fuzzy
+#| msgid "Low"
+msgctxt "universal access, contrast"
+msgid "Low"
+msgstr "ä½?"
+
+#: ../panels/universal-access/uap.ui.h:87
+#, fuzzy
+#| msgid "Normal"
+msgctxt "universal access, contrast"
+msgid "Normal"
+msgstr "æ?®é??"
+
+#. Translators: this refers to theme contrast and font size
+#: ../panels/universal-access/uap.ui.h:89
+#, fuzzy
+#| msgid "Display"
+msgctxt "universal access, seeing"
+msgid "Display"
+msgstr "�示"
+
+#. Translators: this refers to screen magnifier
+#: ../panels/universal-access/uap.ui.h:91
+#, fuzzy
+#| msgid "Zoom"
+msgctxt "universal access, seeing"
+msgid "Zoom"
+msgstr "缩�"
 
 #: ../panels/user-accounts/run-passwd.c:426
 msgid "Authentication failed"
 msgstr "认�失败"
 
 #: ../panels/user-accounts/run-passwd.c:506
-#: ../panels/user-accounts/um-password-dialog.c:378
+#: ../panels/user-accounts/um-password-dialog.c:375
 #, c-format
 msgid "The new password is too short"
 msgstr "���太�"
@@ -2546,25 +3049,18 @@ msgstr ""
 
 #: ../panels/user-accounts/um-account-type.c:35
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgctxt "Account type"
 msgid "Standard"
 msgstr "æ ?å??"
 
 #: ../panels/user-accounts/um-account-type.c:37
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "管ç??å??"
 
-#: ../panels/user-accounts/um-account-type.c:39
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
-msgctxt "Account type"
-msgid "Supervised"
-msgstr "ç?¹æ??"
-
 #: ../panels/user-accounts/um-fingerprint-dialog.c:107
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -2618,15 +3114,15 @@ msgstr "æ? æ³?访é?®â??%sâ??设å¤?"
 msgid "Could not start finger capture on '%s' device"
 msgstr "æ? æ³?å?¨â??%sâ??设å¤?ä¸?å?¯å?¨æ??æ??æ??æ??"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:550
+#: ../panels/user-accounts/um-fingerprint-dialog.c:549
 msgid "Could not access any fingerprint readers"
 msgstr "æ? æ³?访é?®æ??纹读å??å?¨"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:551
+#: ../panels/user-accounts/um-fingerprint-dialog.c:550
 msgid "Please contact your system administrator for help."
 msgstr "请è??系系ç»?管ç??å??以寻æ±?帮å?©ã??"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:588
+#: ../panels/user-accounts/um-fingerprint-dialog.c:587
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Enable Fingerprint Login"
 msgstr "å?¯ç?¨æ??纹ç?»å½?"
@@ -2635,14 +3131,15 @@ 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:626
+#.
+#: ../panels/user-accounts/um-fingerprint-dialog.c:621
 #, 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:634
+#: ../panels/user-accounts/um-fingerprint-dialog.c:629
 #, c-format
 msgid ""
 "Enrolling fingerprints for\n"
@@ -2651,109 +3148,81 @@ msgstr ""
 "为 <b><big>%s</big></b>\n"
 "å? å?¥æ??纹è¯?å?«"
 
-#: ../panels/user-accounts/um-language-dialog.c:299
+#: ../panels/user-accounts/um-language-dialog.c:180
 msgid "Other..."
 msgstr "��..."
 
-#: ../panels/user-accounts/um-lockbutton.c:373
-msgid "Locked"
-msgstr "å·²é??å®?"
-
-#: ../panels/user-accounts/um-lockbutton.c:382
-msgid ""
-"Dialog is unlocked.\n"
-"Click to prevent further changes"
-msgstr ""
-"ä¼?è¯?已解é??ã??\n"
-"��以�止����"
-
-#: ../panels/user-accounts/um-lockbutton.c:391
-msgid ""
-"Dialog is locked.\n"
-"Click to make changes"
-msgstr ""
-"ä¼?è¯?å·²é??å®?ã??\n"
-"��以����"
-
-#: ../panels/user-accounts/um-lockbutton.c:400
-msgid ""
-"System policy prevents changes.\n"
-"Contact your system administrator"
-msgstr ""
-"ç³»ç»?ç­?ç?¥é?»æ­¢æ?´æ?¹ã??\n"
-"请è??系系ç»?管ç??å??ã??"
-
-#: ../panels/user-accounts/um-password-dialog.c:182
+#: ../panels/user-accounts/um-password-dialog.c:179
 msgid "More choices..."
 msgstr "æ?´å¤?é??项..."
 
-#: ../panels/user-accounts/um-password-dialog.c:288
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "Please choose another password."
 msgstr "请é??æ?©å?¶ä»?ç??å¯?ç ?ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:297
+#: ../panels/user-accounts/um-password-dialog.c:294
 msgid "Please type your current password again."
 msgstr "请å??次è¾?å?¥æ?¨ç??å½?å??å¯?ç ?ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:303
+#: ../panels/user-accounts/um-password-dialog.c:300
 msgid "Password could not be changed"
 msgstr "������"
 
-#: ../panels/user-accounts/um-password-dialog.c:375
+#: ../panels/user-accounts/um-password-dialog.c:372
 msgid "You need to enter a new password"
 msgstr "æ?¨é??è¦?è¾?å?¥ä¸?个æ?°å¯?ç ?"
 
-#: ../panels/user-accounts/um-password-dialog.c:384
+#: ../panels/user-accounts/um-password-dialog.c:381
 msgid "You need to confirm the password"
 msgstr "ä½ é??è¦?é??æ?°è¾?å?¥å¯?ç ?以便确认"
 
-#: ../panels/user-accounts/um-password-dialog.c:387
+#: ../panels/user-accounts/um-password-dialog.c:384
 msgid "The passwords do not match"
 msgstr "å¯?ç ?ä¸?å?¹é??"
 
-#: ../panels/user-accounts/um-password-dialog.c:393
+#: ../panels/user-accounts/um-password-dialog.c:390
 msgid "You need to enter your current password"
 msgstr "æ?¨é??è¦?è¾?å?¥å½?å??å¯?ç ?"
 
-#: ../panels/user-accounts/um-password-dialog.c:396
+#: ../panels/user-accounts/um-password-dialog.c:393
 msgid "The current password is not correct"
 msgstr "å½?å??å¯?ç ?é??误"
 
-#: ../panels/user-accounts/um-password-dialog.c:469
-#: ../panels/user-accounts/um-password-dialog.c:686
+#: ../panels/user-accounts/um-password-dialog.c:466
+#: ../panels/user-accounts/um-password-dialog.c:683
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "太�"
 
-#: ../panels/user-accounts/um-password-dialog.c:472
-#: ../panels/user-accounts/um-password-dialog.c:687
+#: ../panels/user-accounts/um-password-dialog.c:469
+#: ../panels/user-accounts/um-password-dialog.c:684
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "å¼±"
 
-#: ../panels/user-accounts/um-password-dialog.c:474
-#: ../panels/user-accounts/um-password-dialog.c:688
+#: ../panels/user-accounts/um-password-dialog.c:471
+#: ../panels/user-accounts/um-password-dialog.c:685
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "��"
 
-#: ../panels/user-accounts/um-password-dialog.c:476
-#: ../panels/user-accounts/um-password-dialog.c:689
+#: ../panels/user-accounts/um-password-dialog.c:473
+#: ../panels/user-accounts/um-password-dialog.c:686
 msgctxt "Password strength"
 msgid "Good"
 msgstr "好"
 
-#: ../panels/user-accounts/um-password-dialog.c:478
-#: ../panels/user-accounts/um-password-dialog.c:690
+#: ../panels/user-accounts/um-password-dialog.c:475
+#: ../panels/user-accounts/um-password-dialog.c:687
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "强"
 
-#: ../panels/user-accounts/um-password-dialog.c:517
+#: ../panels/user-accounts/um-password-dialog.c:514
 msgid "Passwords do not match"
 msgstr "å¯?ç ?ä¸?å?¹é??"
 
-#: ../panels/user-accounts/um-password-dialog.c:543
+#: ../panels/user-accounts/um-password-dialog.c:540
 msgid "Wrong password"
 msgstr "å¯?ç ?é??误"
 
@@ -2763,11 +3232,6 @@ msgstr "å¯?ç ?é??误"
 msgid "Select"
 msgstr "é??æ?©"
 
-#: ../panels/user-accounts/um-photo-dialog.c:216
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
-msgid "Browse for more pictures"
-msgstr "æµ?è§?æ?´å¤?å?¾ç??"
-
 #: ../panels/user-accounts/um-photo-dialog.c:429
 msgid "Disable image"
 msgstr "ç¦?ç?¨å?¾å??"
@@ -2780,86 +3244,86 @@ msgstr "��..."
 msgid "Browse for more pictures..."
 msgstr "æµ?è§?æ?´å¤?å?¾ç??..."
 
-#: ../panels/user-accounts/um-photo-dialog.c:693
+#: ../panels/user-accounts/um-photo-dialog.c:690
 #, c-format
 msgid "Used by %s"
 msgstr "已被 %s 使�"
 
-#: ../panels/user-accounts/um-user-manager.c:430
+#: ../panels/user-accounts/um-user-manager.c:432
 #, c-format
 msgid "A user with name '%s' already exists."
 msgstr "å??为 %s ç??ç?¨æ?·å·²å­?å?¨ã??"
 
-#: ../panels/user-accounts/um-user-manager.c:525
+#: ../panels/user-accounts/um-user-manager.c:527
 msgid "This user does not exist."
 msgstr "该ç?¨æ?·ä¸?å­?å?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:353
+#: ../panels/user-accounts/um-user-panel.c:357
 msgid "Failed to delete user"
 msgstr "����失败"
 
-#: ../panels/user-accounts/um-user-panel.c:413
+#: ../panels/user-accounts/um-user-panel.c:417
 msgid "You cannot delete your own account."
 msgstr "æ?¨ä¸?è?½å? é?¤è?ªå·±ç??å¸?æ?·ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:422
+#: ../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:426
+#: ../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:435
+#: ../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:439
+#: ../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 "å? é?¤ç?¨æ?·æ?¶å?¯ä»¥ä¿?ç??ç?¨æ?·ä¸»ç?®å½?ã??ç?µå­?é?®ä»¶ç?®å½?å??临æ?¶æ??件ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:442
+#: ../panels/user-accounts/um-user-panel.c:446
 msgid "_Delete Files"
 msgstr "å? é?¤æ??件(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:443
+#: ../panels/user-accounts/um-user-panel.c:447
 msgid "_Keep Files"
 msgstr "ä¿?ç??æ??件(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:444
+#: ../panels/user-accounts/um-user-panel.c:448
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:468
+#: ../panels/user-accounts/um-user-panel.c:498
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "��已��"
 
-#: ../panels/user-accounts/um-user-panel.c:477
+#: ../panels/user-accounts/um-user-panel.c:506
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "�次���设置"
 
-#: ../panels/user-accounts/um-user-panel.c:480
+#: ../panels/user-accounts/um-user-panel.c:509
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ? "
 
-#: ../panels/user-accounts/um-user-panel.c:828
+#: ../panels/user-accounts/um-user-panel.c:831
 msgid "Failed to contact the accounts service"
 msgstr "è??ç³»å¸?æ?·æ??å?¡å¤±è´¥"
 
-#: ../panels/user-accounts/um-user-panel.c:830
+#: ../panels/user-accounts/um-user-panel.c:833
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "请确å®? AccountService å·²ç»?正确å®?è£?并å?¯ç?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:863
+#: ../panels/user-accounts/um-user-panel.c:866
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -2867,13 +3331,12 @@ msgstr ""
 "������\n"
 "请å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:901
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: ../panels/user-accounts/um-user-panel.c:904
 msgid "Create a user"
 msgstr "å??建ç?¨æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:912
-#: ../panels/user-accounts/um-user-panel.c:1188
+#: ../panels/user-accounts/um-user-panel.c:915
+#: ../panels/user-accounts/um-user-panel.c:1214
 msgid ""
 "To create a user,\n"
 "click the * icon first"
@@ -2881,13 +3344,12 @@ msgstr ""
 "è¦?å??建ç?¨æ?·ï¼?\n"
 "请å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:921
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+#: ../panels/user-accounts/um-user-panel.c:924
 msgid "Delete the selected user"
 msgstr "å? é?¤é??中ç??ç?¨æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:933
-#: ../panels/user-accounts/um-user-panel.c:1193
+#: ../panels/user-accounts/um-user-panel.c:936
+#: ../panels/user-accounts/um-user-panel.c:1219
 msgid ""
 "To delete the selected user,\n"
 "click the * icon first"
@@ -2895,11 +3357,11 @@ msgstr ""
 "è¦?å? é?¤é??中ç??ç?¨æ?·ï¼?\n"
 "请å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:1097
+#: ../panels/user-accounts/um-user-panel.c:1114
 msgid "My Account"
 msgstr "æ??ç??å¸?æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:1106
+#: ../panels/user-accounts/um-user-panel.c:1124
 msgid "Other Accounts"
 msgstr "����"
 
@@ -2916,24 +3378,30 @@ msgstr "ç?»å½?;å??称;æ??纹;头å??;æ ?å¿?;å¯?ç ?;"
 msgid "User Accounts"
 msgstr "����"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "å??建(_E)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "Create new account"
 msgstr "å??建æ?°å¸?æ?·"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Account Type:"
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#, fuzzy
+#| msgid "_Account Type:"
+msgid "_Account Type"
 msgstr "å¸?æ?·ç±»å??(_A)ï¼?"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
-msgid "_Full name:"
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#, fuzzy
+#| msgid "_Full name:"
+msgid "_Full name"
 msgstr "å?¨å??(_F)ï¼?"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-msgid "_Username:"
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#, fuzzy
+#| msgid "_Username:"
+msgid "_Username"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
@@ -2954,7 +3422,9 @@ msgstr ""
 "b> æ??å¯?ç ?å??å?¨è¿?é??ã??</small>"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:3
-msgid "C_onfirm password:"
+#, fuzzy
+#| msgid "C_onfirm password:"
+msgid "C_onfirm password"
 msgstr "确认��(_O)�"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:4
@@ -2962,7 +3432,9 @@ msgid "Ch_ange"
 msgstr "æ?´æ?¹(_A)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:5
-msgid "Changing password for:"
+#, fuzzy
+#| msgid "Changing password for:"
+msgid "Changing password for"
 msgstr "�����"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
@@ -2974,7 +3446,9 @@ msgid "Choose password at next login"
 msgstr "�次�������"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
-msgid "Current _password:"
+#, fuzzy
+#| msgid "Current _password:"
+msgid "Current _password"
 msgstr "å½?å??å¯?ç ?(_P)ï¼?"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:9
@@ -2998,15 +3472,21 @@ msgid "Set a password now"
 msgstr "��设置��"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:14
-msgid "_Action:"
+#, fuzzy
+#| msgid "_Action:"
+msgid "_Action"
 msgstr "��(_A)�"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:15
-msgid "_Hint:"
+#, fuzzy
+#| msgid "_Hint:"
+msgid "_Hint"
 msgstr "å¯?ç ?æ??示(_H)ï¼?"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:16
-msgid "_New password:"
+#, fuzzy
+#| msgid "_New password:"
+msgid "_New password"
 msgstr "���(_N)�"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:17
@@ -3039,82 +3519,37 @@ msgid "Take a photograph"
 msgstr "��"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-msgid ""
-"A guest account will allow anyone to temporarily log in to this computer "
-"without a password.  For security, remote logins to this account are not "
-"allowed.\n"
-"\n"
-"<b>When the guest user logs out, all files and data associated with the "
-"account will be deleted.</b>"
-msgstr ""
-"æ?¥å®¾å¸?æ?·å°?å??许任ä½?人ä¸?使ç?¨å¯?ç ?临æ?¶ç?»å½?此计ç®?æ?ºã??å? å®?å?¨èµ·è§?ï¼?ä¸?å??许ä»?è¿?ç¨?ç?»å½?æ­¤ç?¨æ?·ã??\n"
-"\n"
-"<b>å½?æ?¥å®¾å¸?æ?·ç?»å?ºæ?¶ï¼?æ??æ??ä¸?æ­¤å¸?æ?·æ??å?³ç??æ??件å??æ?°æ?®é?½å°?被å? é?¤ã??</b>"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Account Information"
 msgstr "��信�"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "Account type:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#, fuzzy
+#| msgid "Account type:"
+msgid "Account type"
 msgstr "å¸?æ?·ç±»å??ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
-msgid "Accounts"
-msgstr "��"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-msgid "Address Book Card:"
-msgstr "å?°å??ç°¿å?¡ç??ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "Allow guests to log in to this computer"
-msgstr "å??许æ?¥å®¾ç?»å½?此计ç®?æ?º"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
-msgid "Automatic Login:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#, fuzzy
+#| msgid "Automatic Login:"
+msgid "Automatic Login"
 msgstr "�����"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:15
-msgid "E-mail address:"
-msgstr "ç?µå­?é?®ä»¶å?°å??ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:16
-msgid "Fingerprint Login:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#, fuzzy
+#| msgid "Fingerprint Login:"
+msgid "Fingerprint Login"
 msgstr "æ??纹ç?»å½?ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:17
-msgid "Language:"
-msgstr "语��"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:19
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "Login Options"
 msgstr "ç?»å½?é??项"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:20
-msgid "Open"
-msgstr "æ??å¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:21
-msgid "Password:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#, fuzzy
+#| msgid "Password:"
+msgid "Password"
 msgstr "���"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:22
-msgid "Restrictions:"
-msgstr "é??å?¶ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:23
-msgid "Show Shutdown, Suspend and Restart actions"
-msgstr "æ?¾ç¤ºå?³é?­ã??ä¼?ç? å??é??å?¯æ??ä½?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:24
-msgid "Show list of users"
-msgstr "æ?¾ç¤ºç?¨æ?·å??表"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:25
-msgid "Show password hints"
-msgstr "æ?¾ç¤ºå¯?ç ?æ??示"
-
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:2
 msgid "Left index finger"
 msgstr "å·¦æ??é£?æ??"
@@ -3197,3 +3632,242 @@ msgstr "��中�"
 #: ../shell/shell.ui.h:2
 msgid "_All Settings"
 msgstr "��设置(_A)"
+
+#~ msgid "16"
+#~ msgstr "16"
+
+#~ msgid "2010"
+#~ msgstr "2010"
+
+#~ msgid "22"
+#~ msgstr "22"
+
+#~ msgid "45"
+#~ msgstr "45"
+
+#~ msgid "AM"
+#~ msgstr "ä¸?å??"
+
+#~ msgid "Chipset"
+#~ msgstr "è?¯ç??ç»?"
+
+#~ msgid "Could not connect to system bus: %s"
+#~ msgstr "�����系��线�%s"
+
+#, fuzzy
+#~ msgid "Info"
+#~ msgstr "��信�"
+
+#~ msgid "Set the system proxy settings"
+#~ msgstr "ç³»ç»?代ç??设置"
+
+# 太� ���为 太�
+#~ msgid "The running NetworkManager version is not compatible (too new)."
+#~ msgstr "è¿?è¡?中ç?? NetworkManager ç??æ?¬ä¸?å?¼å®¹(太æ?°)ã??"
+
+# 太� �
+#~ msgid "The running NetworkManager version is not compatible (too old)."
+#~ msgstr "è¿?è¡?中ç?? NetworkManager ç??æ?¬ä¸?å?¼å®¹(太æ?§)ã??"
+
+#~ msgid "IP Address:"
+#~ msgstr "IP å?°å??ï¼?"
+
+#~ msgid "Secure HTTP Proxy:"
+#~ msgstr "å®?å?¨ HTTP 代ç??ï¼?"
+
+#~ msgid "Preparing connection"
+#~ msgstr "å??å¤?è¿?æ?¥"
+
+#~ msgid "Configuring connection"
+#~ msgstr "é??ç½®è¿?æ?¥"
+
+#~ msgid "Authenticating"
+#~ msgstr "正�认�"
+
+#~ msgid "Getting network address"
+#~ msgstr "æ­£å?¨è?·å¾?ç½?ç»?å?°å??"
+
+#~ msgid "Checking network address"
+#~ msgstr "æ­£å?¨æ£?æ?¥ç½?ç»?å?°å??"
+
+#~ msgid "Failed to connect"
+#~ msgstr "��失败"
+
+#~ msgid "HighContrast"
+#~ msgstr "�对�度"
+
+#~ msgid "HighContrastInverse"
+#~ msgstr "é«?对æ¯?å??è?²"
+
+#~ msgid "LowContrast"
+#~ msgstr "�对�度"
+
+#~ msgid "Use an alternative form of text input"
+#~ msgstr "使ç?¨å?¦å¤?æ ¼å¼?ç??æ??å­?è¾?å?¥"
+
+#~ msgctxt "Account type"
+#~ msgid "Supervised"
+#~ msgstr "ç?¹æ??"
+
+#~ msgid "Language:"
+#~ msgstr "语��"
+
+#~ msgid "Upside Down"
+#~ msgstr "ä¸?ä¸?颠å??"
+
+#~ msgid "Error unsetting accelerator in configuration database: %s"
+#~ msgstr "å?¨é??ç½®æ?°æ?®åº? %s 中解é?¤è®¾å®?æ?¶å?ºé??"
+
+#~ msgid "Idle"
+#~ msgstr "å¾?æ?º"
+
+#~ msgid "User"
+#~ msgstr "��"
+
+#~ msgid "Clean Print Heads"
+#~ msgstr "����"
+
+#~ msgid "Description:"
+#~ msgstr "æ??è¿°ï¼?"
+
+#~ msgid "Release"
+#~ msgstr "继续"
+
+#~ msgid "Share with these users:"
+#~ msgstr "������享�"
+
+#~ msgid "Show / hide printer's jobs"
+#~ msgstr "æ?¾ç¤º/é??è??æ??å?°æ?ºç??ä»»å?¡"
+
+#~ msgid "Status:"
+#~ msgstr "ç?¶æ??ï¼?"
+
+#~ msgid "Keyboard _model:"
+#~ msgstr "é?®ç??å??å?·(_M)ï¼?"
+
+#~ msgid "List of keyboard layouts selected for usage"
+#~ msgstr "å?¯é??æ?©ä½¿ç?¨ç??é?®ç??å¸?å±?å??表"
+
+#~ msgid "Move _Down"
+#~ msgstr "å??ä¸?移å?¨(_D)"
+
+#~ msgid "Move _Up"
+#~ msgstr "å??ä¸?移å?¨(_U)"
+
+#~ msgid "Move the selected keyboard layout down in the list"
+#~ msgstr "å?¨å??表中ä¸?移é??å®?ç??é?®ç??å¸?å±?"
+
+#~ msgid "Move the selected keyboard layout up in the list"
+#~ msgstr "å?¨å??表中ä¸?移é??å®?ç??é?®ç??å¸?å±?"
+
+#~ msgid "New windows u_se active window's layout"
+#~ msgstr "æ?°çª?å?£ä½¿ç?¨æ´»å?¨çª?å?£ç??å¸?å±?(_S)"
+
+#~ msgid "Print a diagram of the selected keyboard layout"
+#~ msgstr "æ??å?°é??中é?®ç??å¸?å±?ç??ä¸?份å?¾ç¤º"
+
+#~ msgid "Remove the selected keyboard layout from the list"
+#~ msgstr "ä»?å??表中å? é?¤é??中ç??é?®ç??å¸?å±?"
+
+#~ msgid "Select a keyboard layout to be added to the list"
+#~ msgstr "请é??æ?©è¦?æ·»å? å?°å??表ç??é?®ç??å¸?å±?"
+
+#~ msgid "By _country"
+#~ msgstr "æ??å?½å®¶/å?°å?º(_C)"
+
+#~ msgid "By _language"
+#~ msgstr "æ??语è¨?(_L)"
+
+#~ msgid "_Country:"
+#~ msgstr "�家/��(_C)�"
+
+#~ msgid "_Language:"
+#~ msgstr "语�(_L)�"
+
+#~ msgid "_Variants:"
+#~ msgstr "å??ä½?(_V)ï¼?"
+
+#~ msgid "Choose a Keyboard Model"
+#~ msgstr "é??æ?©é?®ç??å??å?·"
+
+#~ msgid "_Models:"
+#~ msgstr "å??å?·(_M)ï¼?"
+
+#~ msgid "_Vendors:"
+#~ msgstr "å?¶é? å??(_V)ï¼?"
+
+#~ msgid "Vendors"
+#~ msgstr "å?¶é? å??"
+
+#~ msgid "%i Gb/s"
+#~ msgstr "%i Gb/�"
+
+#~ msgid "%i kb/s"
+#~ msgstr "%i kb/�"
+
+#~ msgid "Ctrl+Alt+-"
+#~ msgstr "Ctrl+Alt+-"
+
+#~ msgid "Ctrl+Alt+0"
+#~ msgstr "Ctrl+Alt+0"
+
+#~ msgid "Ctrl+Alt+4"
+#~ msgstr "Ctrl+Alt+4"
+
+#~ msgid "Ctrl+Alt+8"
+#~ msgstr "Ctrl+Alt+8"
+
+#~ msgid "Ctrl+Alt+="
+#~ msgstr "Ctrl+Alt+="
+
+#~ msgid "Off"
+#~ msgstr "��"
+
+#~ msgid "On"
+#~ msgstr "å¼?"
+
+#~ msgid "Shift+Ctrl+Alt+-"
+#~ msgstr "Shift+Ctrl+Alt+-"
+
+#~ msgid "Shift+Ctrl+Alt+="
+#~ msgstr "Shift+Ctrl+Alt+="
+
+#~ msgid ""
+#~ "A guest account will allow anyone to temporarily log in to this computer "
+#~ "without a password.  For security, remote logins to this account are not "
+#~ "allowed.\n"
+#~ "\n"
+#~ "<b>When the guest user logs out, all files and data associated with the "
+#~ "account will be deleted.</b>"
+#~ msgstr ""
+#~ "æ?¥å®¾å¸?æ?·å°?å??许任ä½?人ä¸?使ç?¨å¯?ç ?临æ?¶ç?»å½?此计ç®?æ?ºã??å? å®?å?¨èµ·è§?ï¼?ä¸?å??许ä»?è¿?ç¨?ç?»"
+#~ "å½?æ­¤ç?¨æ?·ã??\n"
+#~ "\n"
+#~ "<b>å½?æ?¥å®¾å¸?æ?·ç?»å?ºæ?¶ï¼?æ??æ??ä¸?æ­¤å¸?æ?·æ??å?³ç??æ??件å??æ?°æ?®é?½å°?被å? é?¤ã??</b>"
+
+#~ msgid "Accounts"
+#~ msgstr "��"
+
+#~ msgid "Address Book Card:"
+#~ msgstr "å?°å??ç°¿å?¡ç??ï¼?"
+
+#~ msgid "Allow guests to log in to this computer"
+#~ msgstr "å??许æ?¥å®¾ç?»å½?此计ç®?æ?º"
+
+#~ msgid "E-mail address:"
+#~ msgstr "ç?µå­?é?®ä»¶å?°å??ï¼?"
+
+#~ msgid "Open"
+#~ msgstr "æ??å¼?"
+
+#~ msgid "Restrictions:"
+#~ msgstr "é??å?¶ï¼?"
+
+#~ msgid "Show Shutdown, Suspend and Restart actions"
+#~ msgstr "æ?¾ç¤ºå?³é?­ã??ä¼?ç? å??é??å?¯æ??ä½?"
+
+#~ msgid "Show list of users"
+#~ msgstr "æ?¾ç¤ºç?¨æ?·å??表"
+
+#~ msgid "Show password hints"
+#~ msgstr "æ?¾ç¤ºå¯?ç ?æ??示"



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