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



commit ea4bb37914cb6b8be37bb7d70c7461d48d3a3d00
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Mar 18 15:05:54 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1735 ++++++++++++++++++++++++++--------------------------------
 po/zh_TW.po | 1764 +++++++++++++++++++++++++++--------------------------------
 2 files changed, 1587 insertions(+), 1912 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 12a6cbb..e7e09cb 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -11,16 +11,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 2.91.90\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 19:22+0800\n"
-"PO-Revision-Date: 2011-02-23 19:22+0800\n"
+"Project-Id-Version: gnome-control-center 2.91.91\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center&keywords=I18N+L10N&component=general\n";
+"POT-Creation-Date: 2011-03-18 02:58+0000\n"
+"PO-Revision-Date: 2011-03-18 15:05+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gnome-control-center.schemas.in.h:1
@@ -36,23 +36,55 @@ msgid "More themes URL"
 msgstr "����主� URL"
 
 #: ../gnome-control-center.schemas.in.h:4
-msgid ""
-"Set this to your current location name. This is used to determine the "
-"appropriate network proxy configuration."
+msgid "Set this to your current location name. This is used to determine the appropriate network proxy configuration."
 msgstr "å°?æ­¤é ?設å®?ç?ºä½ ç?®å??ç??ä½?ç½®å??稱ã??é??æ?¯ç?¨ä¾?決å®?å??é?©ç??網絡代ç??伺æ??å?¨çµ?æ??ã??"
 
 #: ../gnome-control-center.schemas.in.h:5
-msgid ""
-"URL for where to get more desktop backgrounds. If set to an empty string the "
-"link will not appear."
+msgid "URL for where to get more desktop backgrounds. If set to an empty string the link will not appear."
 msgstr "å?¯ä»¥å??å¾?æ?´å¤?æ¡?é?¢è??æ?¯ç?? URLã??å¦?æ??設å®?ç?ºç©ºå­?串å??ä¸?æ??顯示é?£çµ?ã??"
 
 #: ../gnome-control-center.schemas.in.h:6
-msgid ""
-"URL for where to get more desktop themes. If set to an empty string the link "
-"will not appear."
+msgid "URL for where to get more desktop themes. If set to an empty string the link will not appear."
 msgstr "å?¯ä»¥å??å¾?æ?´å¤?æ¡?é?¢ä¸»é¡?ç?? URLã??å¦?æ??設å®?ç?ºç©ºå­?串å??ä¸?æ??顯示é?£çµ?ã??"
 
+#: ../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 "設��"
@@ -74,8 +106,7 @@ msgid "Change set"
 msgstr "Change set"
 
 #: ../libgnome-control-center/gconf-property-editor.c:148
-msgid ""
-"GConf change set containing data to be forwarded to the gconf client on apply"
+msgid "GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr "å?¨å¥?ç?¨æ??å°? Gconf change set 中å??å?«ç??è³?æ??æ??å?³é??給 gconf 客æ?¶ç«¯"
 
 #: ../libgnome-control-center/gconf-property-editor.c:153
@@ -83,8 +114,7 @@ msgid "Conversion to widget callback"
 msgstr "è½?å??ç?ºè¦?çª?å??件ç??æ?¹è®?æ??é??ç?? callback"
 
 #: ../libgnome-control-center/gconf-property-editor.c:154
-msgid ""
-"Callback to be issued when data are to be converted from GConf to the widget"
+msgid "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr "é??è¦?å°?æ?´æ?¹å¾?ç?? GConf è³?æ??è½?å??ç?ºè¦?çª?å??件ç??æ?¹è®?æ??ï¼?æ??ç?¼å?ºç?? callback"
 
 #: ../libgnome-control-center/gconf-property-editor.c:159
@@ -92,8 +122,7 @@ msgid "Conversion from widget callback"
 msgstr "ç?±è¦?çª?å??件ç??æ?¹è®?æ??é??ç?? callback è½?å??"
 
 #: ../libgnome-control-center/gconf-property-editor.c:160
-msgid ""
-"Callback to be issued when data are to be converted to GConf from the widget"
+msgid "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr "é??è¦?å°?è¦?çª?å??件ç??æ?¹è®?è½?å??ç?ºæ?´æ?¹å¾?ç?? GConf è³?æ??æ??ï¼?æ??ç?¼å?ºç?? callback"
 
 #: ../libgnome-control-center/gconf-property-editor.c:165
@@ -125,8 +154,7 @@ msgstr "ç?¶å±¬æ?§ä¿®æ?¹ç¨?å¼?é??æ?¾ç?©ä»¶è³?æ??æ??ï¼?ç?¼å?º callback"
 msgid ""
 "Couldn't find the file '%s'.\n"
 "\n"
-"Please make sure it exists and try again, or choose a different background "
-"picture."
+"Please make sure it exists and try again, or choose a different background picture."
 msgstr ""
 "æ?¾ä¸?å?°æª?æ¡?â??%sâ??ã??\n"
 "\n"
@@ -193,7 +221,6 @@ msgid "Tile"
 msgstr "é?ªæ??"
 
 #: ../panels/background/background.ui.h:8
-#: ../panels/universal-access/uap.ui.h:90
 msgid "Zoom"
 msgstr "縮�"
 
@@ -209,29 +236,29 @@ msgstr "å??ç?´æ¼¸è®?è?²"
 msgid "Solid Color"
 msgstr "��"
 
-#: ../panels/background/cc-background-panel.c:960
+#: ../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:1051
+#: ../panels/background/cc-background-panel.c:1049
 msgid "Current background"
 msgstr "ç?®å??ç??è??æ?¯"
 
-#: ../panels/background/cc-background-panel.c:1115
+#: ../panels/background/cc-background-panel.c:1113
 msgid "Wallpapers"
 msgstr "��"
 
-#: ../panels/background/cc-background-panel.c:1122
+#: ../panels/background/cc-background-panel.c:1120
 msgid "Pictures Folder"
 msgstr "å??ç??è³?æ??夾"
 
-#: ../panels/background/cc-background-panel.c:1129
+#: ../panels/background/cc-background-panel.c:1127
 msgid "Colors & Gradients"
 msgstr "�� & 漸��"
 
-#: ../panels/background/cc-background-panel.c:1137
+#: ../panels/background/cc-background-panel.c:1135
 msgid "Flickr"
 msgstr "Flickr"
 
@@ -255,141 +282,74 @@ msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
 
 #: ../panels/datetime/datetime.ui.h:1
-msgid "16"
-msgstr "16"
-
-#: ../panels/datetime/datetime.ui.h:2
-msgid "2010"
-msgstr "2010"
-
-#: ../panels/datetime/datetime.ui.h:3
-msgid "22"
-msgstr "22"
-
-#: ../panels/datetime/datetime.ui.h:4
 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 "ä¹?æ??"
 
-#: ../panels/datetime/dt-lockbutton.c:347
-#: ../panels/printers/pp-lockbutton.c:347 ../panels/screen/screen.ui.h:13
-#: ../panels/user-accounts/um-lockbutton.c:347
-msgid "Lock"
-msgstr "é??å®?"
-
-#: ../panels/datetime/dt-lockbutton.c:356
-#: ../panels/printers/pp-lockbutton.c:356 ../panels/network/network.ui.h:23
-#: ../panels/user-accounts/um-lockbutton.c:356
-msgid "Unlock"
-msgstr "解é??"
-
-#: ../panels/datetime/dt-lockbutton.c:365
-#: ../panels/printers/pp-lockbutton.c:365
-#: ../panels/user-accounts/um-lockbutton.c:365
-msgid "Locked"
-msgstr "å·²é??å®?"
-
-#: ../panels/datetime/dt-lockbutton.c:374
-#: ../panels/printers/pp-lockbutton.c:374
-#: ../panels/user-accounts/um-lockbutton.c:374
-msgid ""
-"Dialog is unlocked.\n"
-"Click to prevent further changes"
-msgstr ""
-"å°?話ç??已解é??ã??\n"
-"é»?é?¸ä»¥é?²æ­¢é?²ä¸?æ­¥ç??æ?´æ?¹"
-
-#: ../panels/datetime/dt-lockbutton.c:383
-#: ../panels/printers/pp-lockbutton.c:383
-#: ../panels/user-accounts/um-lockbutton.c:383
-msgid ""
-"Dialog is locked.\n"
-"Click to make changes"
-msgstr ""
-"å°?話ç??å·²é??å®?ã??\n"
-"������"
-
-#: ../panels/datetime/dt-lockbutton.c:392
-#: ../panels/printers/pp-lockbutton.c:392
-#: ../panels/user-accounts/um-lockbutton.c:392
-msgid ""
-"System policy prevents changes.\n"
-"Contact your system administrator"
-msgstr ""
-"系統å??å??æ?¯é?²æ­¢é?²è¡?æ?´æ?¹ç??ã??\n"
-"è«?è?¯çµ¡ä½ ç??系統管ç??å?¡"
-
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Clock;Timezone;Location;"
@@ -408,14 +368,14 @@ msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:497
+#: ../panels/display/xrandr-capplet.c:491
 msgid "Monitor"
 msgstr "顯示�"
 
 #: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:333
-#: ../panels/display/xrandr-capplet.c:372
-#: ../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 "正常"
 
@@ -461,15 +421,15 @@ msgstr "顯示�"
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;解å??度;é??æ?°æ?´ç??;"
 
-#: ../panels/display/xrandr-capplet.c:334
+#: ../panels/display/xrandr-capplet.c:328
 msgid "Anti-Clockwise"
 msgstr "é??æ??é??"
 
-#: ../panels/display/xrandr-capplet.c:335
+#: ../panels/display/xrandr-capplet.c:329
 msgid "Clockwise"
 msgstr "é ?æ??é??"
 
-#: ../panels/display/xrandr-capplet.c:336
+#: ../panels/display/xrandr-capplet.c:330
 msgid "180 Degrees"
 msgstr "180 度"
 
@@ -478,143 +438,156 @@ msgstr "180 度"
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:473
+#: ../panels/display/xrandr-capplet.c:467
 msgid "Mirror Displays"
 msgstr "��顯示�"
 
-#: ../panels/display/xrandr-capplet.c:603
+#: ../panels/display/xrandr-capplet.c:597
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:605
+#: ../panels/display/xrandr-capplet.c:599
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1518
+#: ../panels/display/xrandr-capplet.c:1500
 msgid "Drag to change primary display."
 msgstr "æ??æ?³ä»¥æ?¹è®?主è¦?顯示å?¨ã??"
 
-#: ../panels/display/xrandr-capplet.c:1576
-msgid ""
-"Select a monitor to change its properties; drag it to rearrange its "
-"placement."
+#: ../panels/display/xrandr-capplet.c:1558
+msgid "Select a monitor to change its properties; drag it to rearrange its placement."
 msgstr "é?¸æ??ä¸?å??è?¢å¹?以æ?¹è®?å®?ç??屬æ?§ï¼?æ??æ?³å®?å??è?½é??æ?°æ??å??å®?ç??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1966
+#: ../panels/display/xrandr-capplet.c:1947
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1968
+#: ../panels/display/xrandr-capplet.c:1949
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/xrandr-capplet.c:2214
+#: ../panels/display/xrandr-capplet.c:2195
 msgid "Could not save the monitor configuration"
 msgstr "ç?¡æ³?å?²å­?顯示å?¨çµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2239
+#: ../panels/display/xrandr-capplet.c:2220
 msgid "Could not get session bus while applying display configuration"
 msgstr "å?¨å¥?ç?¨é¡¯ç¤ºçµ?æ??æ??ç?¡æ³?å??å¾?ä½?業é??段å?¯æµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2284
+#: ../panels/display/xrandr-capplet.c:2265
 msgid "Could not detect displays"
 msgstr "���測顯示�"
 
-#: ../panels/display/xrandr-capplet.c:2479
+#: ../panels/display/xrandr-capplet.c:2460
 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 "VESAï¼?%s"
+
+#. 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:479
+#: ../panels/info/cc-info-panel.c:528
 #, c-format
 msgid "%d-bit"
 msgstr "%d-ä½?å??"
 
-#: ../panels/info/cc-info-panel.c:493
+#: ../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:501
+#: ../panels/info/cc-info-panel.c:550
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panels/info/cc-info-panel.c:506
+#: ../panels/info/cc-info-panel.c:555
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panels/info/cc-info-panel.c:511
+#: ../panels/info/cc-info-panel.c:560
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panels/info/cc-info-panel.c:516
+#: ../panels/info/cc-info-panel.c:565
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../panels/info/cc-info-panel.c:521
+#: ../panels/info/cc-info-panel.c:570
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../panels/info/cc-info-panel.c:526
+#: ../panels/info/cc-info-panel.c:575
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../panels/info/cc-info-panel.c:637
+#: ../panels/info/cc-info-panel.c:686
 msgid "Unknown model"
 msgstr "ä¸?æ??ç??å??è??"
 
-#: ../panels/info/cc-info-panel.c:720
+#: ../panels/info/cc-info-panel.c:769
 msgid "The next login will attempt to use the standard experience."
 msgstr "ä¸?次ç?»å?¥æ??å??試使ç?¨æ¨?æº?é«?é©?ã??"
 
-#: ../panels/info/cc-info-panel.c:722
-msgid ""
-"The next login will use the fallback mode intended for unsupported graphics "
-"hardware."
+#: ../panels/info/cc-info-panel.c:771
+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:771
+#: ../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:777
+#: ../panels/info/cc-info-panel.c:819
 msgctxt "Experience"
 msgid "Standard"
 msgstr "��"
 
-#: ../panels/info/cc-info-panel.c:909
-#: ../panels/keyboard/keyboard-shortcuts.c:1711
+#: ../panels/info/cc-info-panel.c:951
+#: ../panels/keyboard/keyboard-shortcuts.c:1712
 msgid "Section"
 msgstr "�"
 
-#: ../panels/info/cc-info-panel.c:918 ../panels/info/info.ui.h:15
+#: ../panels/info/cc-info-panel.c:960
+#: ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "�覽"
 
-#: ../panels/info/cc-info-panel.c:924 ../panels/info/info.ui.h:3
+#: ../panels/info/cc-info-panel.c:966
+#: ../panels/info/info.ui.h:2
 msgid "Default Applications"
 msgstr "é ?設æ??ç?¨ç¨?å¼?"
 
-#: ../panels/info/cc-info-panel.c:929 ../panels/info/info.ui.h:10
+#: ../panels/info/cc-info-panel.c:971
+#: ../panels/info/info.ui.h:9
 msgid "Graphics"
 msgstr "繪å??"
 
-#: ../panels/info/cc-info-panel.c:954
+#: ../panels/info/cc-info-panel.c:996
 #, c-format
 msgid "Version %s"
 msgstr "ç??æ?¬ %s"
@@ -629,71 +602,67 @@ 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;"
-msgstr "device;system;information;memory;processor;version;è£?ç½®;系統;è³?è¨?;è¨?æ?¶é«?;è??ç??å?¨;ç??æ?¬;"
+msgid "device;system;information;memory;processor;version;default;application;fallback;"
+msgstr "device;system;information;memory;processor;version;default;application;fallback;è£?ç½®;系統;è³?è¨?;è¨?æ?¶é«?;è??ç??å?¨;ç??æ?¬;é ?設;æ??ç?¨ç¨?å¼?;å¾?å??;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Calendar"
 msgstr "æ?¥æ??"
 
-#: ../panels/info/info.ui.h:2
-msgid "Chipset"
-msgstr "æ?¶ç??"
-
-#: ../panels/info/info.ui.h:4
+#: ../panels/info/info.ui.h:3
 msgid "Device name"
 msgstr "è£?ç½®å??稱"
 
-#: ../panels/info/info.ui.h:5
+#: ../panels/info/info.ui.h:4
 msgid "Disk"
 msgstr "��"
 
-#: ../panels/info/info.ui.h:6
+#: ../panels/info/info.ui.h:5
 msgid "Driver"
 msgstr "���"
 
-#: ../panels/info/info.ui.h:7
+#: ../panels/info/info.ui.h:6
 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:9
+#: ../panels/info/info.ui.h:8
 msgid "Forced Fallback Mode"
 msgstr "å¼·å?¶å¾?å??模å¼?"
 
-#: ../panels/info/info.ui.h:11
+#: ../panels/info/info.ui.h:10
 msgid "Mail"
 msgstr "�件"
 
-#: ../panels/info/info.ui.h:12
+#: ../panels/info/info.ui.h:11
 msgid "Memory"
 msgstr "���"
 
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info.ui.h:12
 msgid "Music"
 msgstr "��"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:13
 msgid "OS type"
 msgstr "OS é¡?å??"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:15
 msgid "Photos"
 msgstr "ç?¸ç??"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:16
 msgid "Processor"
 msgstr "è??ç??å?¨"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info.ui.h:17
 msgid "Updates Available"
 msgstr "å?¯ç?¨ç??æ?´æ?°"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:18
 msgid "Video"
 msgstr "å½±ç??"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info.ui.h:19
 msgid "Web"
 msgstr "網�"
 
@@ -790,22 +759,30 @@ 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:4
+#: ../panels/keyboard/50-accessibility.xml.in.h:6
 msgid "Toggle magnifier"
 msgstr "å??æ??æ?¾å¤§é?¡"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: ../panels/keyboard/50-accessibility.xml.in.h:7
 msgid "Toggle on-screen keyboard"
 msgstr "å??æ??è?¢å¹?é?µç?¤"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: ../panels/keyboard/50-accessibility.xml.in.h:8
 msgid "Toggle screen reader"
 msgstr "å??æ??è?¢å¹?é?±è®?å?¨"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: ../panels/keyboard/50-accessibility.xml.in.h:9
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Universal Access"
 msgstr "ç?¡é??ç¤?å??è?½"
@@ -840,8 +817,8 @@ msgstr "æ?·å¾?é?µç??é¡?å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1141
-#: ../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
 msgid "Disabled"
@@ -861,32 +838,31 @@ msgstr "��"
 msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;æ?·å¾?é?µ;é??è¤?;é??ç??;"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:643
-#: ../panels/keyboard/keyboard-shortcuts.c:916
-#: ../panels/keyboard/keyboard-shortcuts.c:1503
-#: ../panels/keyboard/keyboard-shortcuts.c:1507
+#: ../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:768
+#: ../panels/keyboard/keyboard-shortcuts.c:780
 msgid "<Unknown Action>"
 msgstr "<è¡?å??設å®?ä¸?詳>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1167
+#: ../panels/keyboard/keyboard-shortcuts.c:1179
 msgid "Error saving the new shortcut"
 msgstr "å?²å­?æ?°ç??æ?·å¾?é?µæ??ç?¼ç??é?¯èª¤"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1282
+#: ../panels/keyboard/keyboard-shortcuts.c:1292
 #, c-format
 msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
+"The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n"
 "Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
 "æ?·å¾?â??%sâ??ç?¡æ³?使ç?¨ï¼?å??å? æ?¯æ??ç?¡æ³?æ??ä¸?æ­¤æ??é?µã??\n"
 "è«?試ç?¨å?¶å®?ç??æ??é?µï¼?å¦?å??æ??使ç?¨ Controlï¼?Alt  æ?? Shiftã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1314
+#: ../panels/keyboard/keyboard-shortcuts.c:1322
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -895,25 +871,24 @@ msgstr ""
 "æ?·å¾?é?µâ??%sâ??å·±ç¶?使ç?¨æ?¼ï¼?\n"
 "â??%sâ??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1320
+#: ../panels/keyboard/keyboard-shortcuts.c:1327
 #, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
+msgid "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??ä½ é??æ?°æ??æ´¾æ?·å¾?é?µç?ºã??%sã??ï¼?ã??%sã??ç??æ?·å¾?é?µå°±æ??å??ç?¨ã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1328
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1442
+#: ../panels/keyboard/keyboard-shortcuts.c:1445
 msgid "Too many custom shortcuts"
 msgstr "太������"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1761
+#: ../panels/keyboard/keyboard-shortcuts.c:1765
 msgid "Action"
 msgstr "å??ä½?"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1784
+#: ../panels/keyboard/keyboard-shortcuts.c:1788
 msgid "Shortcut"
 msgstr "æ?·å¾?é?µ"
 
@@ -931,7 +906,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 "游æ¨?é??ç??é??度"
 
@@ -957,7 +932,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 "é?·"
 
@@ -976,7 +951,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:69
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Short"
 msgstr "ç?­"
 
@@ -991,9 +966,7 @@ msgid "Slow"
 msgstr "æ?¢é??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-msgid ""
-"To edit a shortcut, click the row and hold down the new keys or press "
-"Backspace to clear."
+msgid "To edit a shortcut, click the row and hold down the new keys or press Backspace to clear."
 msgstr "è¦?編輯æ?·å¾?é?µï¼?é»?é?¸ç?¸æ??ç??å??並æ??ä¸?æ?°ç??æ??é?µçµ?å??ï¼?æ??以 Backspace é?µä¾?æ¸?é?¤ã??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
@@ -1012,7 +985,8 @@ msgstr "é??度(_S):"
 msgid "Ask what to do"
 msgstr "è©¢å??è¦?å??ä»?麼"
 
-#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:6
+#: ../panels/media/cc-media-panel.c:326
+#: ../panels/power/power.ui.h:6
 msgid "Do nothing"
 msgstr "ä¸?å??ä»»ä½?äº?"
 
@@ -1151,214 +1125,211 @@ 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:261
+#: ../panels/printers/cc-printers-panel.c:239
 msgid "Low on toner"
 msgstr "碳��足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:263
+#: ../panels/printers/cc-printers-panel.c:241
 msgid "Out of toner"
 msgstr "碳���"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:266
+#: ../panels/printers/cc-printers-panel.c:244
 msgid "Low on developer"
 msgstr "顯å??å??ä¸?足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:269
+#: ../panels/printers/cc-printers-panel.c:247
 msgid "Out of developer"
 msgstr "顯å??å??ç?¨å®?"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:271
+#: ../panels/printers/cc-printers-panel.c:249
 msgid "Low on a marker supply"
 msgstr "墨水��足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:273
+#: ../panels/printers/cc-printers-panel.c:251
 msgid "Out of a marker supply"
 msgstr "墨水���"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:275
+#: ../panels/printers/cc-printers-panel.c:253
 #, fuzzy
-#| msgid "Open Folder"
 msgid "Open cover"
 msgstr "建���(_C)"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:277
+#: ../panels/printers/cc-printers-panel.c:255
 #, fuzzy
-#| msgid "Open Folder"
 msgid "Open door"
 msgstr "æ??å??å??空ä½?"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:279
+#: ../panels/printers/cc-printers-panel.c:257
 msgid "Low on paper"
 msgstr "ç´?å¼µä¸?足ã??"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:281
+#: ../panels/printers/cc-printers-panel.c:259
 msgid "Out of paper"
 msgstr "�張��"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:283
+#: ../panels/printers/cc-printers-panel.c:261
 msgctxt "printer state"
 msgid "Offline"
 msgstr "��"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:285
+#: ../panels/printers/cc-printers-panel.c:263
 msgctxt "printer state"
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:287
+#: ../panels/printers/cc-printers-panel.c:265
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:289
+#: ../panels/printers/cc-printers-panel.c:267
 #, fuzzy
 msgid "Waste receptacle full"
 msgstr "ä¿?è?? [25 å??]"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:291
+#: ../panels/printers/cc-printers-panel.c:269
 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:293
+#: ../panels/printers/cc-printers-panel.c:271
 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:430
+#: ../panels/printers/cc-printers-panel.c:408
 msgctxt "printer state"
 msgid "Ready"
 msgstr "æº?å??å°±ç·?"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:434
+#: ../panels/printers/cc-printers-panel.c:412
 msgctxt "printer state"
 msgid "Processing"
 msgstr "è??ç??中"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:438
+#: ../panels/printers/cc-printers-panel.c:416
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "å·²å??æ­¢"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:536
+#: ../panels/printers/cc-printers-panel.c:514
 msgid "Toner Level"
 msgstr "碳����"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:539
+#: ../panels/printers/cc-printers-panel.c:517
 msgid "Ink Level"
 msgstr "墨水��"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:542
+#: ../panels/printers/cc-printers-panel.c:520
 msgid "Supply Level"
 msgstr "è??æ??ç­?ç´?"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:557
+#: ../panels/printers/cc-printers-panel.c:535
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 使�中"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1024
+#: ../panels/printers/cc-printers-panel.c:1002
 msgctxt "print job"
 msgid "Pending"
 msgstr "ä¿?ç??中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1028
+#: ../panels/printers/cc-printers-panel.c:1006
 msgctxt "print job"
 msgid "Held"
 msgstr "å·²æ?«å??"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1032
+#: ../panels/printers/cc-printers-panel.c:1010
 msgctxt "print job"
 msgid "Processing"
 msgstr "è??ç??中"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1036
+#: ../panels/printers/cc-printers-panel.c:1014
 msgctxt "print job"
 msgid "Stopped"
 msgstr "å·²å??æ­¢"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1040
+#: ../panels/printers/cc-printers-panel.c:1018
 msgctxt "print job"
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1044
+#: ../panels/printers/cc-printers-panel.c:1022
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已��"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1048
+#: ../panels/printers/cc-printers-panel.c:1026
 msgctxt "print job"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1140
+#: ../panels/printers/cc-printers-panel.c:1118
 msgid "Job Title"
 msgstr "å·¥ä½?å??稱"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1149
+#: ../panels/printers/cc-printers-panel.c:1127
 msgid "Job State"
 msgstr "å·¥ä½?ç??æ??"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1155
+#: ../panels/printers/cc-printers-panel.c:1133
 msgid "Time"
 msgstr "æ??å?»"
 
-#. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1345
-#, 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:1848
+msgid "Failed to add new printer."
+msgstr "ç?¡æ³?å? å?¥æ?°ç??æ??å?°æ©?ã??"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2055
+#: ../panels/printers/cc-printers-panel.c:1948
 msgid "Test page"
 msgstr "測試�"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:2063
+#: ../panels/printers/cc-printers-panel.c:1956
 msgid "Clean print heads"
 msgstr "æ¸?ç??æ??å?°å?´é ­"
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:2068
+#: ../panels/printers/cc-printers-panel.c:1961
 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:2195
+#: ../panels/printers/cc-printers-panel.c:2090
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
@@ -1376,6 +1347,60 @@ msgstr "Printer;Queue;Print;Paper;Ink;Toner;æ??å?°æ©?;ä½?å??;æ??å?°;ç´?å¼µ;墨
 msgid "Printers"
 msgstr "æ??å?°æ©?"
 
+#: ../panels/printers/new-printer-dialog.ui.h:1
+msgid "Add"
+msgstr "å? å?¥"
+
+#: ../panels/printers/new-printer-dialog.ui.h:2
+msgid "Add a New Printer"
+msgstr "å? å?¥æ?°ç??æ??å?°æ©?"
+
+#: ../panels/printers/new-printer-dialog.ui.h:3
+msgid "Address"
+msgstr "å?°å??"
+
+#: ../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 "å??æ¶?"
+
+#: ../panels/printers/new-printer-dialog.ui.h:5
+msgid "Search by Address"
+msgstr "æ ¹æ??ä½?å??æ??å°?"
+
+#: ../panels/printers/pp-new-printer-dialog.c:381
+msgid "Getting devices..."
+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
+msgid "Devices"
+msgstr "�置"
+
+#. Translators: Local means local printers
+#: ../panels/printers/pp-new-printer-dialog.c:669
+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
+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
+msgid "Automatic configuration"
+msgstr "è?ªå??çµ?æ??"
+
 #: ../panels/printers/printers.ui.h:1
 msgid "---"
 msgstr "---"
@@ -1402,6 +1427,9 @@ msgid "Default"
 msgstr "�設�"
 
 #: ../panels/printers/printers.ui.h:9
+#: ../panels/network/cc-network-panel.c:1318
+#: ../panels/network/cc-network-panel.c:1321
+#: ../panels/network/network.ui.h:12
 msgid "IP Address"
 msgstr "IP ä½?å??"
 
@@ -1464,6 +1492,7 @@ msgid "Install languages..."
 msgstr "�����"
 
 #: ../panels/region/gnome-region-panel.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "Language"
 msgstr "��"
 
@@ -1509,6 +1538,7 @@ msgid "View and edit keyboard layout options"
 msgstr "檢è¦?並編輯é?µç?¤é??ç½®é?¸é ?"
 
 #: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/network/network.ui.h:32
 msgid "_Options..."
 msgstr "��(_O)�"
 
@@ -1528,7 +1558,7 @@ msgstr "é?¸æ??è¦?å? å?¥ç??輸å?¥ä¾?æº?"
 msgid "Keyboard Layout Options"
 msgstr "é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:220
+#: ../panels/region/gnome-region-panel-xkblt.c:222
 msgid "Layout"
 msgstr "é??ç½®"
 
@@ -1563,13 +1593,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 "大"
 
@@ -1579,7 +1608,6 @@ msgstr "�示鼠��置"
 
 #. low sensitivity
 #: ../panels/mouse/gnome-mouse-properties.ui.h:17
-#: ../panels/universal-access/uap.ui.h:52
 msgid "Low"
 msgstr "ä½?"
 
@@ -1609,7 +1637,7 @@ msgstr "ç?¶æ??ä¸? Control æ??顯示游æ¨?ç??ä½?ç½®(_O)"
 
 #. small threshold
 #: ../panels/mouse/gnome-mouse-properties.ui.h:28
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Small"
 msgstr "å°?"
 
@@ -1670,27 +1698,66 @@ msgstr "設å®?ä½ ç??æ»?é¼ è??觸æ?§æ?¿å??好設å®?"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;觸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?觸;é?£æ??å?©ä¸?;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/cc-network-panel.c:962
-msgid "Network proxy"
-msgstr "網絡代ç??伺æ??å?¨"
+#. TRANSLATORS: this WEP WiFi security
+#: ../panels/network/cc-network-panel.c:824
+msgid "WEP"
+msgstr "WEP"
 
-#: ../panels/network/cc-network-panel.c:971
-msgid "Set the system proxy settings"
-msgstr "設å®?系統代ç??伺æ??å?¨è¨­å®?å?¼"
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/cc-network-panel.c:828
+msgid "WPA"
+msgstr "WPA"
 
-#. TRANSLATORS: the user is running a NM that is too new and API compatible
-#: ../panels/network/cc-network-panel.c:1115
-msgid "The running NetworkManager version is not compatible (too new)."
-msgstr ""
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/cc-network-panel.c:832
+msgid "WPA2"
+msgstr "WPA2"
 
-#. TRANSLATORS: the user is running a NM that is too old and API compatible
-#: ../panels/network/cc-network-panel.c:1121
-msgid "The running NetworkManager version is not compatible (too old)."
-msgstr ""
+#. TRANSLATORS: this Enterprise WiFi security
+#: ../panels/network/cc-network-panel.c:837
+msgid "Enterprise"
+msgstr "ä¼?業ç??"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-msgid "Network"
-msgstr "網絡"
+#. TRANSLATORS: this no (!) WiFi security
+#: ../panels/network/cc-network-panel.c:843
+#: ../panels/universal-access/uap.ui.h:43
+msgid "None"
+msgstr "æ²?æ??"
+
+#. Translators: network device speed
+#: ../panels/network/cc-network-panel.c:1125
+#: ../panels/network/cc-network-panel.c:1150
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../panels/network/cc-network-panel.c:1314
+#: ../panels/network/network.ui.h:13
+msgid "IPv4 Address"
+msgstr "IPv4 ä½?å??"
+
+#: ../panels/network/cc-network-panel.c:1315
+#: ../panels/network/network.ui.h:14
+msgid "IPv6 Address"
+msgstr "IPv6 ä½?å??"
+
+#: ../panels/network/cc-network-panel.c:1449
+msgid "Proxy"
+msgstr "代ç??伺æ??å?¨"
+
+#: ../panels/network/cc-network-panel.c:1512
+msgid "Network proxy"
+msgstr "網絡代ç??伺æ??å?¨"
+
+#: ../panels/network/cc-network-panel.c:1661
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
+
+#. TRANSLATORS: the user is running a NM that is not API compatible
+#: ../panels/network/cc-network-panel.c:1728
+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"
@@ -1702,225 +1769,231 @@ msgid "Network;Wireless;IP;LAN;"
 msgstr "Network;Wireless;IP;LAN;網絡;ç?¡ç·?;å??å??網絡;"
 
 #: ../panels/network/network.ui.h:1
-msgid "Airplane Mode"
-msgstr "��模�"
+msgid "Air_plane Mode"
+msgstr "��模�(_P)"
 
 #: ../panels/network/network.ui.h:2
-msgid "Configuration URL:"
-msgstr "çµ?æ??網å??ï¼?"
+msgid "Create..."
+msgstr "建��"
 
 #: ../panels/network/network.ui.h:3
-msgid "DNS:"
-msgstr "DNSï¼?"
+msgid "DNS"
+msgstr "DNS"
 
 #: ../panels/network/network.ui.h:4
-msgid "Default Route:"
-msgstr "�設路��"
+msgid "DSL"
+msgstr "DSL"
 
 #: ../panels/network/network.ui.h:5
-msgid "FTP Proxy:"
-msgstr "FTP 代ç??伺æ??å?¨ï¼?"
+msgid "Default Route"
+msgstr "�設路�"
 
 #: ../panels/network/network.ui.h:6
-msgid "Gateway:"
-msgstr "é??è¨?é??ï¼?"
+msgid "Gateway"
+msgstr "é??è¨?é??"
 
 #: ../panels/network/network.ui.h:7
-msgid "Group Name:"
-msgstr "ç¾£çµ?å??稱ï¼?"
+msgid "Group Name"
+msgstr "ç¾£çµ?å??稱"
 
 #: ../panels/network/network.ui.h:8
-msgid "Group Password:"
-msgstr "羣��碼�"
+msgid "Group Password"
+msgstr "羣��碼"
 
 #: ../panels/network/network.ui.h:9
-msgid "HTTP Proxy:"
-msgstr "HTTP 代ç??伺æ??å?¨å¯?碼ï¼?"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS 代ç??伺æ??å?¨"
 
 #: ../panels/network/network.ui.h:10
-msgid "Hardware Address:"
-msgstr "硬件ä½?å??ï¼?"
+msgid "Hardware Address"
+msgstr "硬件ä½?å??"
 
 #: ../panels/network/network.ui.h:11
-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 ä½?å??ï¼?"
+msgid "IMEI"
+msgstr "IMEI"
 
 #: ../panels/network/network.ui.h:15
-msgid "Method:"
-msgstr "���"
+msgid "Interface"
+msgstr "ä»?é?¢"
 
 #: ../panels/network/network.ui.h:16
-msgid "Network Name:"
-msgstr "網絡å??稱ï¼?"
+msgid "Mobile Broadband"
+msgstr "è¡?å??寬頻"
 
 #: ../panels/network/network.ui.h:17
-msgid "Provider:"
-msgstr "ä¾?æ??å??ï¼?"
+msgid "Provider"
+msgstr "ä¾?æ??å??"
 
 #: ../panels/network/network.ui.h:18
-msgid "Secure HTTP Proxy:"
-msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨ï¼?"
+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 主��"
+msgid "Speed"
+msgstr "é??度"
 
 #: ../panels/network/network.ui.h:21
-msgid "Speed:"
-msgstr "é??度ï¼?"
+msgid "Subnet Mask"
+msgstr "�網絡�罩"
 
-#: ../panels/network/network.ui.h:22
-msgid "Subnet Mask:"
-msgstr "�網絡�罩�"
+#: ../panels/network/network.ui.h:23
+msgid "Username"
+msgstr "使ç?¨è??å??稱"
 
 #: ../panels/network/network.ui.h:24
-msgid "Username:"
-msgstr "使ç?¨è??å??稱ï¼?"
+msgid "VPN"
+msgstr "VPN"
 
+#. 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:27
+msgid "_Configuration URL"
+msgstr "çµ?æ??網å??(_C)"
+
+#: ../panels/network/network.ui.h:28
+msgid "_FTP Proxy"
+msgstr "_FTP 代ç??伺æ??å?¨"
+
+#: ../panels/network/network.ui.h:29
+msgid "_HTTP Proxy"
+msgstr "_HTTP 代ç??伺æ??å?¨"
+
+#: ../panels/network/network.ui.h:30
+msgid "_Method"
+msgstr "��(_M)"
+
+#: ../panels/network/network.ui.h:31
+msgid "_Network Name"
+msgstr "網絡å??稱(_N)"
+
+#: ../panels/network/network.ui.h:33
+msgid "_Socks Host"
+msgstr "Socks 主�(_S)"
+
+#: ../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
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:64 ../panels/network/panel-common.c:136
-msgid "Unknown"
-msgstr "ä¸?æ??"
+#: ../panels/network/panel-common.c:93
+msgid "Mobile broadband"
+msgstr "è¡?å??寬頻"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:68
-msgid "Wired"
-msgstr "æ??ç·?"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:72
-msgid "Wireless"
-msgstr "ç?¡ç·?"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:77
-msgid "Mobile broadband"
-msgstr "è¡?å??寬頻"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:81
+#: ../panels/network/panel-common.c:98
 msgid "Bluetooth"
 msgstr "è??ç??"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:85
+#: ../panels/network/panel-common.c:102
 #, fuzzy
-#| msgid "Models"
 msgid "Mesh"
 msgstr "å??è??"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:140
+#: ../panels/network/panel-common.c:161
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:144
+#: ../panels/network/panel-common.c:165
 msgid "Infrastructure"
 msgstr "����"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:162
+#. 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:166
+#: ../panels/network/panel-common.c:187
 msgid "Unmanaged"
 msgstr "æ?ªç®¡ç??"
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:170
+#: ../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:174
+#: ../panels/network/panel-common.c:198
 msgid "Disconnected"
 msgstr "已��"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:178
-msgid "Preparing connection"
-msgstr "æ­£å?¨æº?å??é?£ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:182
-msgid "Configuring connection"
-msgstr "正�設���"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:186
-msgid "Authenticating"
-msgstr "正���"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:190
-msgid "Getting network address"
-msgstr "æ­£å?¨å??å¾?網絡ä½?å??"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:247
+msgid "Connecting"
+msgstr "��中"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:194
-#, fuzzy
-#| msgid "Getting network address"
-msgid "Checking network address"
-msgstr "æ­£å?¨å??å¾?網絡ä½?å??"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:209
+#: ../panels/network/panel-common.c:251
+msgid "Authentication required"
+msgstr "é??è¦?é©?è­?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:198
+#. 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:202
-#, fuzzy
-#| msgid "Disconnected"
+#: ../panels/network/panel-common.c:217
 msgid "Disconnecting"
-msgstr "已��"
+msgstr "æ?·ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:206
-msgid "Failed to connect"
-msgstr "����"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:221
+#: ../panels/network/panel-common.c:259
+msgid "Connection failed"
+msgstr "é?£ç·?失æ??"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:210
-#, fuzzy
-#| msgid "Status unknown"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:225
+#: ../panels/network/panel-common.c:267
 msgid "Status unknown (missing)"
-msgstr "ç??æ??ä¸?æ??"
+msgstr "ç??æ??ä¸?詳ï¼?缺ä¹?ï¼?"
+
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:263
+msgid "Not connected"
+msgstr "���"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -1935,17 +2008,17 @@ msgstr "é?»æº?管ç??設å®?å?¼"
 msgid "Power;Sleep;Suspend;Hibernate;Battery;"
 msgstr "Power;Sleep;Suspend;Hibernate;Battery;é?»æº?;ç?¡ç? ;æ?«å??;ä¼?ç? ;é?»æ± ;"
 
-#: ../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"
@@ -1953,69 +2026,73 @@ 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 "ä¸?æ?·é?»ç³»çµ±æ­£å?¨å??é?»"
 
-#: ../panels/power/cc-power-panel.c:268
+#: ../panels/power/cc-power-panel.c:270
 msgid "UPS discharging"
 msgstr "���系統正���"
 
 #. 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%%"
 
-#: ../panels/power/power.ui.h:1 ../panels/screen/screen.ui.h:1
+#: ../panels/power/power.ui.h:1
+#: ../panels/screen/screen.ui.h:1
 msgid "1 hour"
 msgstr "1 å°?æ??"
 
-#: ../panels/power/power.ui.h:2 ../panels/screen/screen.ui.h:3
+#: ../panels/power/power.ui.h:2
+#: ../panels/screen/screen.ui.h:3
 msgid "10 minutes"
 msgstr "10 å??é??"
 
-#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
+#: ../panels/power/power.ui.h:3
+#: ../panels/screen/screen.ui.h:6
 msgid "30 minutes"
 msgstr "30 å??é??"
 
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
+#: ../panels/power/power.ui.h:4
+#: ../panels/screen/screen.ui.h:8
 msgid "5 minutes"
 msgstr "5 å??é??"
 
@@ -2084,32 +2161,36 @@ msgstr "2 å??é??"
 msgid "3 minutes"
 msgstr "3 å??é??"
 
-#: ../panels/screen/screen.ui.h:8
+#: ../panels/screen/screen.ui.h:7
+msgid "30 seconds"
+msgstr "30 �"
+
+#: ../panels/screen/screen.ui.h:9
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../panels/screen/screen.ui.h:9
+#: ../panels/screen/screen.ui.h:10
 msgid "Dim screen to save power"
 msgstr "調æ??è?¢å¹?以ç¯?ç??é?»æº?"
 
 #. 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:11
+#: ../panels/screen/screen.ui.h:12
 msgid "Don't lock when at home"
 msgstr "å?¨å®¶æ??ä¸?è¦?é??å®?"
 
-#: ../panels/screen/screen.ui.h:12
+#: ../panels/screen/screen.ui.h:13
 msgid "Locations..."
 msgstr "�置�"
 
-#: ../panels/screen/screen.ui.h:14
+#: ../panels/screen/screen.ui.h:15
 msgid "Lock screen after:"
 msgstr "é??å®?è?¢å¹?æ??é??ï¼?"
 
-#: ../panels/screen/screen.ui.h:15
+#: ../panels/screen/screen.ui.h:16
 msgid "Screen turns off"
 msgstr "è?¢å¹?é??é??"
 
-#: ../panels/screen/screen.ui.h:16
+#: ../panels/screen/screen.ui.h:17
 msgid "Turn off after:"
 msgstr "é??é??æ??é??ï¼?"
 
@@ -2125,7 +2206,8 @@ msgstr "é??å??ç¨?å¼?ç??ç??æ?¬"
 msgid " â?? GNOME Volume Control Applet"
 msgstr " â?? GNOME é?³é??æ?§å?¶é?¢æ?¿ç¨?å¼?"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1923
+#: ../panels/sound/gvc-applet.c:276
+#: ../panels/sound/gvc-mixer-dialog.c:1923
 msgid "Output"
 msgstr "輸�"
 
@@ -2133,7 +2215,8 @@ msgstr "輸�"
 msgid "Sound Output Volume"
 msgstr "é?³æ??輸å?ºé?³é??"
 
-#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1840
+#: ../panels/sound/gvc-applet.c:282
+#: ../panels/sound/gvc-mixer-dialog.c:1840
 msgid "Input"
 msgstr "輸�"
 
@@ -2183,27 +2266,29 @@ 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 "é??é?³"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1631
+#: ../panels/sound/gvc-combo-box.c:167
+#: ../panels/sound/gvc-mixer-dialog.c:1631
 msgid "_Profile:"
 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"
@@ -2211,13 +2296,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 "系統é?³æ??"
 
@@ -2401,6 +2486,11 @@ msgstr "æ?²ç?»ç??"
 msgid "Sonar"
 msgstr "��"
 
+#: ../panels/universal-access/cc-ua-panel.c:470
+#: ../panels/universal-access/cc-ua-panel.c:475
+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;"
@@ -2425,314 +2515,303 @@ 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 "75%"
 
 #: ../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 å?? 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 "GOK"
 
-#: ../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..."
-msgstr "��設���"
+#: ../panels/universal-access/uap.ui.h:34
+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..."
-msgstr "�鼠設���"
+#: ../panels/universal-access/uap.ui.h:41
+msgid "Mouse Settings"
+msgstr "�鼠設��"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Nomon"
 msgstr "Nomon"
 
-#: ../panels/universal-access/uap.ui.h:57
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:45
 msgid "On screen keyboard"
 msgstr "����"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:46
 msgid "OnBoard"
 msgstr "OnBoard"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Options..."
 msgstr "���"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:48
 msgid "Pointing and Clicking"
 msgstr "æ??æ¨?å??é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../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:64
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Screen Reader"
 msgstr "�����"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:51
+msgid "Screen keyboard"
+msgstr "����"
+
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Seeing"
 msgstr "�覺"
 
-#: ../panels/universal-access/uap.ui.h:66
-msgid "Shift+Ctrl+Alt+-"
-msgstr "Shift+Ctrl+Alt+-"
-
-#: ../panels/universal-access/uap.ui.h:67
-msgid "Shift+Ctrl+Alt+="
-msgstr "Shift+Ctrl+Alt+="
-
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Simulated Secondary Click"
 msgstr "模æ?¬æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Slow Keys"
 msgstr "é?²ç·©æ??é?µ"
 
-#: ../panels/universal-access/uap.ui.h:74
-msgid "Sound Settings..."
-msgstr "é?³æ??設å®?å?¼â?¦"
+#: ../panels/universal-access/uap.ui.h:59
+msgid "Sound Settings"
+msgstr "é?³æ??設å®?å?¼"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Sticky Keys"
 msgstr "�����"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Test flash"
 msgstr "測試é??å??"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Text size:"
 msgstr "æ??å­?大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../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:79
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Trigger a click when the pointer hovers"
 msgstr "ç?¶å??止游æ¨?移å??æ??觸ç?¼é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../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:81
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Turn on accessibility features from the keyboard"
 msgstr "以é?µç?¤é??å??ç?¡é??ç¤?å??è?½"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Turn on or off:"
 msgstr "é??å??æ??é??é??ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Type here to test settings"
 msgstr "å?¨é??è£?æ??å­?以測試設å®?å?¼"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Typing"
 msgstr "輸�"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Typing Assistant"
 msgstr "輸å?¥å?©ç??"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "ç?¶è­¦ç¤ºé?³æ??ç?¼å?ºæ??使ç?¨è¦?覺å??ç??æ??示"
 
-#: ../panels/universal-access/uap.ui.h:87
-msgid "Use an alternative form of text input"
-msgstr "使ç?¨æ??å­?輸å?¥ç??æ?¿ä»£å½¢å¼?"
-
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Video Mouse"
 msgstr "è¦?å??æ»?é¼ "
 
-#: ../panels/universal-access/uap.ui.h:89
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Visual Alerts"
 msgstr "�覺警示"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Zoom in:"
 msgstr "æ??è¿?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Zoom out:"
 msgstr "æ??é? ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:76
 msgid "_Motion threshold:"
 msgstr "移å??é??度(_M):"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:77
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:78
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:96
+#: ../panels/universal-access/uap.ui.h:79
 msgid "rejected"
 msgstr "å·²æ??çµ?"
 
+#: ../panels/universal-access/uap.ui.h:80
+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
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">High</span>"
+msgstr "<span size=\"x-large\">é«?</span>"
+
+#: ../panels/universal-access/uap.ui.h:82
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">Low</span>"
+msgstr "<span size=\"x-large\">ä½?</span>"
+
+#: ../panels/universal-access/uap.ui.h:83
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">Normal</span>"
+msgstr "<span size=\"x-large\">��</span>"
+
+#: ../panels/universal-access/uap.ui.h:84
+msgctxt "universal access, contrast"
+msgid "High"
+msgstr "é«?"
+
+#: ../panels/universal-access/uap.ui.h:85
+msgctxt "universal access, contrast"
+msgid "High/Inverse"
+msgstr "é«?/å??å·®"
+
+#: ../panels/universal-access/uap.ui.h:86
+msgctxt "universal access, contrast"
+msgid "Low"
+msgstr "ä½?"
+
+#: ../panels/universal-access/uap.ui.h:87
+msgctxt "universal access, contrast"
+msgid "Normal"
+msgstr "��"
+
+#. Translators: this refers to theme contrast and font size
+#: ../panels/universal-access/uap.ui.h:89
+msgctxt "universal access, seeing"
+msgid "Display"
+msgstr "顯示"
+
+#. Translators: this refers to screen magnifier
+#: ../panels/universal-access/uap.ui.h:91
+msgctxt "universal access, seeing"
+msgid "Zoom"
+msgstr "縮�"
+
 #: ../panels/user-accounts/run-passwd.c:426
 msgid "Authentication failed"
 msgstr "é©?è­?失æ??"
@@ -2815,28 +2894,20 @@ 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:3
+#: ../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:2
+#: ../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:4
-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."
+msgid "You are not allowed to access the device. Contact your system administrator."
 msgstr "ä½ ä¸?被å??許使ç?¨é??å??è£?ç½®ã??è«?è?¯çµ¡ä½ ç??系統管ç??è??ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:109
@@ -2861,9 +2932,7 @@ msgid "_Delete Fingerprints"
 msgstr "å?ªé?¤æ??ç´?(_D)"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:235
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
+msgid "Do you want to delete your registered fingerprints so fingerprint login is disabled?"
 msgstr "你確å®?è¦?å?ªé?¤å·²è¨»å??ç??æ??ç´?å??ï¼?é??麼ä¸?ä¾?å°?æ??å??ç?¨æ??ç´?ç?»å?¥ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:363
@@ -2907,9 +2976,7 @@ msgstr "å??ç?¨æ??ç´?ç?»å?¥"
 #.
 #: ../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."
+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:629
@@ -3045,9 +3112,7 @@ msgid "%s is still logged in"
 msgstr "%s ����中"
 
 #: ../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."
+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:439
@@ -3056,9 +3121,7 @@ msgid "Do you want to keep %s's files?"
 msgstr "ä½ æ?³è¦?ä¿?ç?? %s ç??æª?æ¡?å??ï¼?"
 
 #: ../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."
+msgid "It is possible to keep the home directory, mail spool and temporary files around when deleting a user account."
 msgstr "ç?¶å?ªé?¤ä½¿ç?¨è??æ??æ?¯å?¯ä»¥ä¿?ç??家ç?®é??ã??æ?°é?²é?µä»¶(mail spool)å??æ?«å­?æª?æ¡?ç??ã??"
 
 #: ../panels/user-accounts/um-user-panel.c:446
@@ -3073,30 +3136,30 @@ msgstr "ä¿?ç??æª?æ¡?(_K)"
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:472
+#: ../panels/user-accounts/um-user-panel.c:498
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳è??å·²å??ç?¨"
 
-#: ../panels/user-accounts/um-user-panel.c:481
+#: ../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:484
+#: ../panels/user-accounts/um-user-panel.c:509
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:806
+#: ../panels/user-accounts/um-user-panel.c:831
 msgid "Failed to contact the accounts service"
 msgstr "ç?¡æ³?é?£æ?¥å¸³è??æ??å??"
 
-#: ../panels/user-accounts/um-user-panel.c:808
+#: ../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:841
+#: ../panels/user-accounts/um-user-panel.c:866
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -3104,12 +3167,12 @@ msgstr ""
 "������\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:879
+#: ../panels/user-accounts/um-user-panel.c:904
 msgid "Create a user"
 msgstr "建ç«?æ?°ç??使ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:890
-#: ../panels/user-accounts/um-user-panel.c:1189
+#: ../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"
@@ -3117,12 +3180,12 @@ msgstr ""
 "è¦?建ç«?使ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:899
+#: ../panels/user-accounts/um-user-panel.c:924
 msgid "Delete the selected user"
 msgstr "å?ªé?¤é?¸å??ç??使ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:911
-#: ../panels/user-accounts/um-user-panel.c:1194
+#: ../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"
@@ -3130,11 +3193,11 @@ msgstr ""
 "è¦?å?ªé?¤é?¸å??ç??使ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:1089
+#: ../panels/user-accounts/um-user-panel.c:1114
 msgid "My Account"
 msgstr "æ??ç??帳è??"
 
-#: ../panels/user-accounts/um-user-panel.c:1099
+#: ../panels/user-accounts/um-user-panel.c:1124
 msgid "Other Accounts"
 msgstr "å?¶ä»?帳è??"
 
@@ -3151,55 +3214,45 @@ msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;ç?»å?¥;å§?å??;æ??ç´?;
 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:5
+msgid "_Account Type"
+msgstr "帳è??é¡?å??(_A)"
+
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Account Type:"
-msgstr "帳è??é¡?å??(_A):"
+msgid "_Full name"
+msgstr "å?¨å??(_F)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-msgid "_Full name:"
-msgstr "å?¨å??(_F):"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-msgid "_Username:"
-msgstr "使ç?¨è??å??稱(_U):"
-
-#: ../panels/user-accounts/data/language-chooser.ui.h:1
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Cancel"
-msgstr "å??æ¶?"
+msgid "_Username"
+msgstr "使ç?¨è??å??稱(_U)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
-msgid ""
-"<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a "
-"strong password</a>"
+msgid "<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a strong password</a>"
 msgstr "<a href=\"http://wolfram.org/writing/howto/password.html\";>å¦?ä½?é?¸æ??強度é«?ç??å¯?碼</a>"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-msgid ""
-"<small>This hint may be displayed at the login screen.  It will be visible "
-"to all users of this system.  Do <b>not</b> include the password here.</"
-"small>"
+msgid "<small>This hint may be displayed at the login screen.  It will be visible to all users of this system.  Do <b>not</b> include the password here.</small>"
 msgstr "<small>é??å??æ??示å?¯è?½æ??顯示å?¨ç?»å?¥ç?«é?¢ã??å®?å°?æ??顯示給é??å??系統ä¸?ç??æ??æ??使ç?¨è??ã??è«?<b>ä¸?è¦?</b>å?¨é??è£?寫å?¥å¯?碼ã??</small>"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:3
-msgid "C_onfirm password:"
-msgstr "確��碼(_O):"
+msgid "C_onfirm password"
+msgstr "確��碼(_O)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:4
 msgid "Ch_ange"
 msgstr "��(_A)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:5
-msgid "Changing password for:"
-msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å¯?碼ï¼?"
+msgid "Changing password for"
+msgstr "正����碼�"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
 msgid "Choose a generated password"
@@ -3210,8 +3263,8 @@ msgid "Choose password at next login"
 msgstr "å?¨ä¸?次ç?»å?¥æ??é?¸æ??å¯?碼"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
-msgid "Current _password:"
-msgstr "ç?®å??å¯?碼(_P):"
+msgid "Current _password"
+msgstr "ç?®å??ç??å¯?碼(_P)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Disable this account"
@@ -3234,16 +3287,16 @@ msgid "Set a password now"
 msgstr "��設��碼"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:14
-msgid "_Action:"
-msgstr "å??ä½?(_A):"
+msgid "_Action"
+msgstr "å??ä½?(_A)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:15
-msgid "_Hint:"
-msgstr "æ??示(_H):"
+msgid "_Hint"
+msgstr "æ??示(_H)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:16
-msgid "_New password:"
-msgstr "��碼(_N):"
+msgid "_New password"
+msgstr "��碼(_N)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:17
 msgid "_Show password"
@@ -3258,8 +3311,7 @@ msgid "Changing photo for:"
 msgstr "æ­£å?¨æ?¹è®?ç?¸ç??ï¼?"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid ""
-"Choose a picture that will be shown at the login screen for this account."
+msgid "Choose a picture that will be shown at the login screen for this account."
 msgstr "é?¸æ??é??å??帳è??è¦?顯示å?¨ç?»å?¥ç?«é?¢ç??ç?§ç??ã??"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:6
@@ -3278,29 +3330,25 @@ msgstr "ç?§ä¸?å¼µç?¸ç??"
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Account type"
+msgstr "帳è??é¡?å??"
+
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-msgid "Account type:"
-msgstr "帳è??é¡?å??ï¼?"
+msgid "Automatic Login"
+msgstr "è?ªå??ç?»å?¥"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Automatic Login:"
-msgstr "è?ªå??ç?»å?¥ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
-msgid "Fingerprint Login:"
-msgstr "æ??ç´?ç?»å?¥ï¼?"
+msgid "Fingerprint Login"
+msgstr "æ??ç´?ç?»å?¥"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "Language:"
-msgstr "���"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "Login Options"
 msgstr "����"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-msgid "Password:"
-msgstr "�碼� "
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+msgid "Password"
+msgstr "�碼"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:2
 msgid "Left index finger"
@@ -3347,9 +3395,7 @@ msgid "Right thumb"
 msgstr "å?³æ??å§?æ??"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:13
-msgid ""
-"Your fingerprint was successfully saved. You should now be able to log in "
-"using your fingerprint reader."
+msgid "Your fingerprint was successfully saved. You should now be able to log in using your fingerprint reader."
 msgstr "ä½ ç??æ??ç´?å·²æ??å??ç??å?²å­?äº?ã??ç?¾å?¨æ??該å?¯ä»¥ä½¿ç?¨ä½ ç??æ??ç´?辨è­?å?¨ä¾?ç?»å?¥ã??"
 
 #: ../shell/control-center.c:47
@@ -3373,7 +3419,8 @@ msgstr ""
 "%s\n"
 "å?·è¡? ã??%s --helpã??以æ?¥ç??å®?æ?´ç??å?½ä»¤å??å?¯ç?¨é?¸é ?æ¸?å?®ã??\n"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
+#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../shell/shell.ui.h:1
 msgid "System Settings"
 msgstr "系統設��"
 
@@ -3385,167 +3432,198 @@ msgstr "��中�"
 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 "Set the system proxy settings"
+#~ msgstr "設å®?系統代ç??伺æ??å?¨è¨­å®?å?¼"
+
+#~ msgid "Virtual private network"
+#~ 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 "Options"
+#~ msgid "_Options"
+#~ msgstr "��(_O)"
+#~ msgid "Preparing connection"
+#~ msgstr "æ­£å?¨æº?å??é?£ç·?"
+#~ msgid "Configuring connection"
+#~ msgstr "正�設���"
+#~ msgid "Authenticating"
+#~ msgstr "正���"
+#~ msgid "Getting network address"
+#~ msgstr "æ­£å?¨å??å¾?網路ä½?å??"
+#~| msgid "Getting network address"
+#~ msgid "Checking network address"
+#~ msgstr "æ­£å?¨æª¢æ?¥ç¶²è·¯ä½?å??"
+#~ msgid "Failed to connect"
+#~ msgstr "����"
+#~| msgid "Hearing"
+#~ msgid "Preparing"
+#~ msgstr "æ­£å?¨æº?å??"
+#~| msgid "0 active"
+#~ msgid "Active"
+#~ msgstr "使�中"
+#~| msgid "_File"
+#~ msgid "Failed"
+#~ msgstr "失æ??"
+#~ msgctxt "Account type"
+#~ msgid "Supervised"
+#~ msgstr "已��"
+#~ msgid "Chipset"
+#~ msgstr "æ?¶ç??"
+#~ msgid "Could not connect to system bus: %s"
+#~ msgstr "ç?¡æ³?é?£ç·?è?³ç³»çµ±å?¯æµ?æ??ï¼?%s"
+#~ msgid "Secure HTTP Proxy:"
+#~ msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨ï¼?"
+#~ 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 "HighContrast"
+#~ msgstr "���"
+#~ msgid "HighContrastInverse"
+#~ msgstr "é«?å??å·®"
+#~ msgid "LowContrast"
+#~ msgstr "���"
+#~ msgid "Shift+Ctrl+Alt+-"
+#~ msgstr "Shift+Ctrl+Alt+-"
+#~ msgid "Shift+Ctrl+Alt+="
+#~ msgstr "Shift+Ctrl+Alt+="
+#~ msgid "Use an alternative form of text input"
+#~ msgstr "使ç?¨æ??å­?輸å?¥ç??æ?¿ä»£å½¢å¼?"
+#~ msgid "Language:"
+#~ msgstr "���"
 #~ msgid "%i kb/s"
 #~ msgstr "%i kb/s"
-
-#~ msgid "%i Mb/s"
-#~ msgstr "%i Mb/s"
-
 #~ msgid "%i Gb/s"
 #~ msgstr "%i Gb/s"
-
 #~ msgid "More Info"
 #~ msgstr "����"
-
 #~ msgid "Error unsetting accelerator in configuration database: %s"
 #~ msgstr "å?¨çµ?æ??è³?æ??庫中å??æ¶?設å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
-
 #~ msgid "User"
 #~ msgstr "使ç?¨è??"
-
 #~ msgid "Off"
 #~ msgstr "é??é??"
-
 #~ msgid "On"
 #~ msgstr "é??"
-
 #~| msgid "Idle"
 #~ msgctxt "printer state"
 #~ msgid "Idle"
 #~ msgstr "é??ç½®"
-
-#~ msgid "0 active"
-#~ msgstr "0 使�中"
-
 #~ msgid "List of keyboard layouts selected for usage"
 #~ msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
-
 #~ msgid "New windows u_se active window's layout"
 #~ msgstr "æ?°è¦?çª?延ç?¨ä½¿ç?¨ä¸­è¦?çª?ç??é??ç½®(_S)"
-
 #~ msgid "By _country"
 #~ msgstr "ä¾?å??家(_C)"
-
 #~ msgid "By _language"
 #~ msgstr "���(_L)"
-
 #~ msgid "Preview:"
 #~ msgstr "�覽�"
-
 #~ msgid "_Country:"
 #~ msgstr "å??家(_C):"
-
 #~ msgid "_Language:"
 #~ msgstr "��(_L):"
-
 #~ msgid "_Variants:"
 #~ msgstr "è®?é«?(_V):"
-
 #~ msgid "Upside Down"
 #~ msgstr "ç?±ä¸?è??ä¸?"
-
 #~ msgid "Clean Print Heads"
 #~ msgstr "æ¸?ç??å??å?°å?´é ­"
-
 #~ msgid "Description:"
 #~ msgstr "æ??è¿°ï¼?"
-
-#~ msgid "Disable Printer"
-#~ msgstr "å??ç?¨å?°è¡¨æ©?"
-
 #~ msgid "Queue"
 #~ msgstr "ä½?å??"
-
 #~ msgid "Share with these users:"
 #~ msgstr "è??é??äº?使ç?¨è??å??享ï¼?"
-
 #~ msgid "Show / hide printer's jobs"
 #~ msgstr "顯示 / é?±è??å?°è¡¨æ©?å·¥ä½?"
-
 #~ msgid "Status:"
 #~ msgstr "ç??æ??ï¼?"
-
 #~| msgid "add-toolbutton"
 #~ msgid "pause-toolbutton"
 #~ msgstr "å? å?¥å·¥å?·æ??é??"
-
 #~| msgid "remove-toolbutton"
 #~ msgid "resume-toolbutton"
 #~ msgstr "移é?¤å·¥å?·æ??é??"
-
 #~| msgid "add-toolbutton"
 #~ msgid "stop-toolbutton"
 #~ msgstr "å? å?¥å·¥å?·æ??é??"
-
 #~| msgid "add-toolbutton"
 #~ msgid "toolbutton1"
 #~ msgstr "å? å?¥å·¥å?·æ??é??"
-
 #~| msgid "add-toolbutton"
 #~ msgid "toolbutton2"
 #~ msgstr "å? å?¥å·¥å?·æ??é??"
-
 #~ msgid "Keyboard _model:"
 #~ msgstr "��模�(_M)"
-
 #~ 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 "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 "_Add..."
 #~ msgstr "å? å?¥(_A)â?¦"
-
 #~ msgid "Choose a Keyboard Model"
 #~ msgstr "é?¸æ??é?µç?¤å??è??"
-
 #~ msgid "_Models:"
 #~ msgstr "å??è??(_M):"
-
 #~ msgid "_Vendors:"
 #~ msgstr "製é? å??(_V):"
-
 #~ msgid "Vendors"
 #~ msgstr "製é? å??"
-
 #~ msgid "AC power and inactive for:"
 #~ msgstr "AC é?»æº?ä¸?é??ç½®ï¼?"
-
 #~ msgid "Battery power and inactive for:"
 #~ msgstr "é?»æ± é?»æº?ä¸?é??ç½®ï¼?"
-
 #~ msgid "Put the computer to sleep when on:"
 #~ msgstr "å?¨æ­¤æ??é??è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
-
 #~ msgid "Open"
 #~ msgstr "é??å??"
-
 #~ msgid "Restrictions:"
 #~ msgstr "é??å?¶ï¼?"
-
 #~ msgid "Hold"
 #~ msgstr "ä¿?ç??"
-
 #~| msgid "Iceweasel"
 #~ msgid "Release"
 #~ msgstr "é??æ?¾"
-
 #~| 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 "
@@ -3566,43 +3644,31 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "\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 "Show Shutdown, Suspend and Restart actions"
 #~ msgstr "顯示é??æ©?ã??æ?«å??å??é??æ?°å??å??ç­?å??ä½?"
-
 #~ msgid "Show list of users"
 #~ msgstr "顯示使ç?¨è??æ¸?å?®"
-
 #~ msgid "Show password hints"
 #~ msgstr "顯示å¯?碼æ??示"
-
 #~| msgid "Mutt"
 #~ msgid "Butter"
 #~ msgstr "奶油"
-
 #~| msgid "Orca"
 #~ msgid "Orange"
 #~ msgstr "æ©?"
-
 #~ msgid "Chocolate"
 #~ msgstr "å·§å??å??"
-
 #~| msgid "Galeon"
 #~ msgid "Chameleon"
 #~ msgstr "Galeon"
-
 #, fuzzy
 #~ msgid "Plum"
 #~ msgstr "��"
@@ -3629,6 +3695,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgstr "�%d %s �%d %s"
 
 #~ msgid "pixel"
+
 #~ msgid_plural "pixels"
 #~ msgstr[0] "å??ç´ "
 
@@ -3662,364 +3729,245 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~| msgid "D_elay:"
 #~ msgid "Day:"
 #~ msgstr "��"
-
 #~ msgid "Set time automatically"
 #~ msgstr "è?ªå??設å®?æ??å?»"
-
 #~ msgid "Year:"
 #~ msgstr "å¹´ï¼?"
-
 #~ msgid "Preferred Applications"
 #~ msgstr "é¦?é?¸æ??ç?¨ç¨?å¼?"
-
 #~ msgid "Select your default applications"
 #~ msgstr "é?¸å??é ?設使ç?¨ç??æ??ç?¨ç¨?å¼?"
-
 #~ msgid "Start the preferred visual assistive technology"
 #~ msgstr "å??å??é¦?é?¸ç??è¦?覺è¼?å?©æ??è¡?"
-
 #~ msgid "Visual Assistance"
 #~ msgstr "�覺��"
-
 #~| msgid "Error parsing arguments: %s\n"
 #~ msgid "Error setting default browser: %s"
 #~ msgstr "設å®?é ?設ç??覽å?¨æ??ç?¼ç??é?¯èª¤ï¼?%s"
-
 #~| msgid "Error parsing arguments: %s\n"
 #~ msgid "Error setting default mailer: %s"
 #~ msgstr "設å®?é ?設é?µä»¶ç¨?å¼?æ??ç?¼ç??é?¯èª¤ï¼?%s"
-
 #~ msgid "Could not load the main interface"
 #~ msgstr "����主��"
-
 #~ msgid "Please make sure that the applet is properly installed"
 #~ msgstr "è«?確å®?該é?¢æ?¿ç¨?å¼?å·²ç¶?å®?è£?妥ç?¶ã??"
-
 #~ msgid "Accessibility"
 #~ msgstr "ç?¡é??ç¤?ç?°å¢?"
-
 #~ msgid "All %s occurrences will be replaced with actual link"
 #~ msgstr "æ??æ?? %s é?½æ??å??代ç?ºç??實ç??é?£çµ?"
-
 #~ msgid "Co_mmand:"
 #~ msgstr "æ??令(_M):"
-
 #~ msgid "E_xecute flag:"
 #~ msgstr "å?·è¡?æ??æ¨?(_X):"
-
 #~ msgid "Instant Messenger"
 #~ msgstr "å?³æ??é??è¨?ç¨?å¼?"
-
 #~ msgid "Internet"
 #~ msgstr "網é??網路"
-
 #~ msgid "Mail Reader"
 #~ msgstr "���件�信��"
-
 #~ msgid "Mobility"
 #~ msgstr "移å??æ?§"
-
 #~ msgid "Run at st_art"
 #~ msgstr "å??å??æ??å?·è¡?(_A)"
-
 #~ msgid "Run in t_erminal"
 #~ msgstr "��端�中��(_E)"
-
 #~ msgid "Terminal Emulator"
 #~ msgstr "�端�模���"
-
 #~ msgid "Text Editor"
 #~ msgstr "æ??å­?編輯å?¨"
-
 #~ msgid "Visual"
 #~ msgstr "�覺"
-
 #~ msgid "Web Browser"
 #~ msgstr "網é ?ç??覽å?¨"
-
 #~ msgid "_Run at start"
 #~ msgstr "å??å??æ??å?·è¡?(_R)"
-
 #~ msgid "Banshee Music Player"
 #~ msgstr "Banshee ������"
-
 #~ msgid "Debian Terminal Emulator"
 #~ msgstr "Debian Terminal Emulator"
-
 #~ msgid "ETerm"
 #~ msgstr "ETerm"
-
 #~ msgid "GNOME Magnifier without Screen Reader"
 #~ msgstr "ç?¡è?¢å¹?é?±è®?å?¨ç?? GNOME æ?¾å¤§é?¡"
-
 #~ msgid "GNOME OnScreen Keyboard"
 #~ msgstr "GNOME ����"
-
 #~ msgid "GNOME Terminal"
 #~ msgstr "GNOME �端�"
-
 #~ msgid "Gnopernicus"
 #~ msgstr "Gnopernicus"
-
 #~ msgid "Gnopernicus with Magnifier"
 #~ msgstr "å?·æ?¾å¤§é?¡ç?? Gnopernicus"
-
 #~ msgid "KDE Magnifier without Screen Reader"
 #~ msgstr "ç?¡è?¢å¹?é?±è®?å?¨ç?? KDE æ?¾å¤§é?¡"
-
 #~ msgid "Konsole"
 #~ msgstr "Konsole"
-
 #~ msgid "Linux Screen Reader"
 #~ msgstr "Linux �����"
-
 #~ msgid "Linux Screen Reader with Magnifier"
 #~ msgstr "å?·æ?¾å¤§é?¡ç?? Linux è?¢å¹?é?±è®?å?¨"
-
 #~ msgid "Listen"
 #~ msgstr "è?½å??"
-
 #~ msgid "Muine Music Player"
 #~ msgstr "Muine ������"
-
 #~ msgid "NXterm"
 #~ msgstr "NXterm"
-
 #~ msgid "Orca"
 #~ msgstr "Orca"
-
 #~ msgid "Orca with Magnifier"
 #~ msgstr "å?·æ?¾å¤§é?¡ç?? Orca"
-
 #~ msgid "RXVT"
 #~ msgstr "RXVT"
-
 #~ msgid "Rhythmbox Music Player"
 #~ msgstr "Rhythmbox ������"
-
 #~ msgid "Standard XTerminal"
 #~ msgstr "æ¨?æº?ç?? X çµ?端æ©?"
-
 #~ msgid "Terminator"
 #~ msgstr "Terminator"
-
 #~ msgid "Totem Movie Player"
 #~ msgstr "Totem å½±ç??æ?­æ?¾ç¨?å¼?"
-
 #~ msgid "aterm"
 #~ msgstr "aterm"
-
 #~ msgid "_Detect monitors"
 #~ msgstr "�測��(_D)"
-
 #~| msgid "Mirror Screens"
 #~ msgid "_Mirror Screens"
 #~ msgstr "����(_M)"
-
 #~ msgid "Mirror Screens"
 #~ msgstr "����"
-
 #~ msgid "Desktop"
 #~ msgstr "æ¡?é?¢"
-
 #~| msgid "_Application font:"
 #~ msgid "No applications found"
 #~ msgstr "æ?¾ä¸?å?°æ??ç?¨ç¨?å¼?"
-
 #~| msgid "Open with \"%s\""
 #~ msgid "Open %s"
 #~ msgstr "é??å?? %s"
-
 #~| msgid "Open with Default Application"
 #~ msgid "Open with other Application..."
 #~ msgstr "以å?¶ä»?ç¨?å¼?é??å??..."
-
 #~| msgid "Could not get screen information"
 #~ msgid "Could not run application"
 #~ msgstr "ç?¡æ³?å?·è¡?æ??ç?¨ç¨?å¼?"
-
 #~| msgid "Could not open %s: %s\n"
 #~ msgid "Could not find '%s'"
 #~ msgstr "æ?¾ä¸?å?°ã??%sã??"
-
 #~| msgid "Could not get screen information"
 #~ msgid "Could not find application"
 #~ msgstr "æ?¾ä¸?å?°æ??ç?¨ç¨?å¼?"
-
 #~ msgid "Could not add application to the application database: %s"
 #~ msgstr "ç?¡æ³?å°?ç¨?å¼?å? å?¥æ??ç?¨ç¨?å¼?è³?æ??庫ï¼?%s"
-
 #~| msgid "Could not detect displays"
 #~ msgid "Could not add application"
 #~ msgstr "ç?¡æ³?å? å?¥æ??ç?¨ç¨?å¼?"
-
 #~| msgid "Could not get information for %s: %s\n"
 #~ msgid "Could not set application as the default: %s"
 #~ msgstr "ç?¡æ³?å°?æ??ç?¨ç¨?å¼?設ç?ºé ?設å?¼ï¼?%s"
-
 #~| msgid "Select your default applications"
 #~ msgid "Could not set as default application"
 #~ msgstr "ç?¡æ³?設å®?ç?ºé ?設ç??æ??ç?¨ç¨?å¼?"
-
 #~| msgid "Open with \"%s\""
 #~ msgid "Open With"
 #~ msgstr "以此é??å??"
-
 #~ msgid "_Use a custom command"
 #~ msgstr "使ç?¨è?ªè¨?æ??令(_U)"
-
 #~ msgid "_Browse..."
 #~ msgstr "ç??覽(_B)..."
-
 #~ msgid "_Open"
 #~ msgstr "é??å??(_O)"
-
 #~ msgid "Open %s and other %s document with:"
 #~ msgstr "以此é??å?? %s å??å?¶ä»? %s æ??件ï¼?"
-
 #~| msgid "Open with \"%s\""
 #~ msgid "Open %s with:"
 #~ msgstr "以此é??å?? %sï¼?"
-
 #~ msgid "_Remember this application for %s documents"
 #~ msgstr "è¨?ä½?é??å??æ??ç?¨ç¨?å¼?ç?¨æ?¼ %s æ??件(_R)"
-
 #~ msgid "Open all %s documents with:"
 #~ msgstr "以此é??å??æ??æ?? %s æ??件ï¼?"
-
 #~ msgid "Open %s and other \"%s\" files with:"
 #~ msgstr "以此é??å?? %s å??å?¶ä»?ã??%sã??æª?æ¡?ï¼?"
-
 #~ msgid "_Remember this application for \"%s\" files"
 #~ msgstr "è¨?ä½?é??å??æ??ç?¨ç¨?å¼?ç?¨æ?¼ã??%sã??æª?æ¡?(_R)"
-
 #~ msgid "Open all \"%s\" files with:"
 #~ msgstr "以此é??å??æ??æ??ã??%sã??æª?æ¡?ï¼?"
-
-#~| msgid "_Add..."
-#~ msgid "_Add"
-#~ msgstr "å? å?¥(_A)"
-
 #~| msgid "Preferred Applications"
 #~ msgid "Add Application"
 #~ msgstr "å? å?¥æ??ç?¨ç¨?å¼?"
-
 #~ msgid "B_rowse media when inserted"
 #~ msgstr "æ??å?¥æ??ç??覽åª?é«?(_R)"
-
 #~ msgid "_Pointer can be controlled using the keypad"
 #~ msgstr "å??許使ç?¨é?µç?¤æ?§å?¶æ»?é¼ æ??æ¨?(_P)"
-
 #~ msgid "_Type to test settings:"
 #~ msgstr "è«?輸å?¥æ??å­?ä¾?測試設å®?(_T):"
-
 #~ msgid "Choose type of click _beforehand"
 #~ msgstr "äº?å??é?¸æ??é»?æ??ç??é¡?å??(_B)"
-
 #~ msgid "Choose type of click with mo_use gestures"
 #~ msgstr "é?¸æ??æ»?é¼ æ??å?¢ç??é»?æ??é¡?å??(_U)"
-
 #~ msgid "D_ouble click:"
 #~ msgstr "é??æ??(_O):"
-
 #~ msgid "D_rag click:"
 #~ msgstr "æ??æ?³é»?æ??(_R):"
-
 #~ msgid "Dwell Click"
 #~ msgstr "æ?¿ä»£é»?æ??"
-
 #~ msgid "Seco_ndary click:"
 #~ msgstr "次è¦?é»?æ??(_N):"
-
 #~ msgid "Show click type _window"
 #~ msgstr "顯示é»?æ??é¡?å??è¦?çª?(_W)"
-
 #~ msgid ""
 #~ "You can also use the Dwell Click panel applet to choose the click type."
 #~ msgstr "æ?¨å?¯ä»¥ä½¿ç?¨ã??æ?¿ä»£é»?æ??ã??é?¢æ?¿ç¨?å¼?ä¾?é?¸æ??é»?æ??ç??é¡?å??ã??"
-
 #~ msgid "_Initiate click when stopping pointer movement"
 #~ msgstr "ç?¶å??止游æ¨?移å??æ??å??å§?å??é»?æ??(_I)"
-
 #~ msgid "_Single click:"
 #~ msgstr "å?®æ??(_S):"
-
 #~ msgid "_Trigger secondary click by holding down the primary button"
 #~ msgstr "æ??ä½?主è¦?é?µæ??觸ç?¼æ¬¡è¦?é»?æ??(_T)"
-
 #~ msgid "Location already exists"
 #~ msgstr "�置已���"
-
 #~ msgid "Set your network proxy preferences"
 #~ msgstr "設å®?代ç??伺æ??å?¨"
-
 #~| msgid "Location:"
 #~ msgid "Web;Location;"
 #~ msgstr "��水平�置"
-
 #~ msgid "<b>Di_rect internet connection</b>"
 #~ msgstr "<b>��網路��(_R)</b>"
-
-#~ msgid "<b>_Automatic proxy configuration</b>"
-#~ msgstr "<b>è?ªå??設å®?代ç??伺æ??å?¨(_A)</b>"
-
 #~ msgid "<b>_Manual proxy configuration</b>"
 #~ msgstr "<b>è?ªè¨?代ç??伺æ??å?¨(_M)</b>"
-
 #~ msgid "<b>_Use authentication</b>"
 #~ msgstr "<b>é??è¦?èª?è­?(_U)</b>"
-
 #~ msgid "C_reate"
 #~ msgstr "建�(_R)"
-
 #~ msgid "Create New Location"
 #~ msgstr "建ç«?æ?°ç??ä½?ç½®"
-
 #~ msgid "HTTP Proxy Details"
 #~ msgstr "HTTP 代ç??伺æ??å?¨è¨­å®?"
-
 #~ msgid "Ignore Host List"
 #~ msgstr "忽�主���"
-
 #~ msgid "Ignored Hosts"
 #~ msgstr "忽ç?¥ç??主æ©?"
-
 #~ msgid "Network Proxy Preferences"
 #~ msgstr "網路代ç??伺æ??å?¨å??好設å®?"
-
 #~ msgid "Port:"
 #~ msgstr "���:"
-
 #~ msgid "Proxy Configuration"
 #~ msgstr "代ç??伺æ??å?¨è¨­å®?"
-
 #~ msgid "The location already exists."
 #~ msgstr "該ä½?置已ç¶?å­?å?¨ã??"
-
 #~ msgid "_Delete Location"
 #~ msgstr "å??é?¤ä½?ç½®(_D)"
-
 #~ msgid "_Details"
 #~ msgstr "詳細設�(_D)"
-
 #~ msgid "_Location name:"
 #~ msgstr "ä½?ç½®å??稱(_L):"
-
 #~ msgid "_Password:"
 #~ msgstr "�碼(_P):"
-
 #~ msgid "_Use the same proxy for all protocols"
 #~ msgstr "æ??æ??å??å®?ç??使ç?¨ç?¸å??ç??代ç??伺æ??å?¨(_U)"
-
 #~ msgid "Show Universal Access status"
 #~ msgstr "顯示ç?¡é??ç¤?å??è?½ç??æ??"
-
 #~ msgid "Example Panel"
 #~ msgstr "����"
-
 #~ msgid "Example preferences panel"
 #~ msgstr "ç¯?ä¾?å??好設å®?é?¢æ?¿"
-
 #, fuzzy
 #~ msgid "Foo;Bar;Baz;"
 #~ msgstr "令é?²åº¦å??å?§ç??æ?¹å¡?ä¾?å??移å??"
@@ -4310,6 +4258,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgstr "ç?¾å?¨ä¼?æ?¯ï¼?å?©ä¸? %då??ï¼?"
 
 #~ msgid "%d minute until the next break"
+
 #~ msgid_plural "%d minutes until the next break"
 #~ msgstr[0] "è·?é?¢ä¼?æ?¯æ??é??é??æ?? %d å??é??"
 
@@ -4651,9 +4600,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "A_IM/iChat:"
 #~ msgstr "A_IM/iChat:"
 
-#~ msgid "Address"
-#~ msgstr "å?°å??"
-
 #~ msgid "C_ompany:"
 #~ msgstr "��(_O):"
 
@@ -4869,6 +4815,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "The font selected is %d point large, and may make it difficult to "
 #~ "effectively use the computer.  It is recommended that you select a size "
 #~ "smaller than %d."
+
 #~ msgid_plural ""
 #~ "The font selected is %d points large, and may make it difficult to "
 #~ "effectively use the computer. It is recommended that you select a size "
@@ -4881,6 +4828,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "The font selected is %d point large, and may make it difficult to "
 #~ "effectively use the computer.  It is recommended that you select a "
 #~ "smaller sized font."
+
 #~ msgid_plural ""
 #~ "The font selected is %d points large, and may make it difficult to "
 #~ "effectively use the computer. It is recommended that you select a smaller "
@@ -5488,9 +5436,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Fill screen"
 #~ msgstr "���"
 
-#~ msgid "Interface"
-#~ msgstr "ä»?é?¢"
-
 #~ msgid "Menus and Toolbars"
 #~ msgstr "é?¸å?®å??å·¥å?·å??"
 
@@ -5503,9 +5448,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "_Editable menu shortcut keys"
 #~ msgstr "�編輯�����(_E)"
 
-#~ msgid "_File"
-#~ msgstr "��(_F)"
-
 #~ msgid "A_cceleration:"
 #~ msgstr "å? é??度(_C):"
 
@@ -5530,10 +5472,8 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgstr ""
 #~ "æ?¾ä¸?å?°ç?¸ç¬¦ã??\n"
 #~ "篩é?¸ â??%sâ?? æ??æ²?æ??ä»»ä½?å?¹é??ç??é ?ç?®ã??"
-
 #~ msgid "Unknown login ID, the user database might be corrupted"
 #~ msgstr "ä¸?æ??ç??ç?»å?¥ IDï¼?使ç?¨è??è³?æ??庫å?¯è?½å·²ç¶?å??æ??"
-
 #~ msgid ""
 #~ "Left thumb\n"
 #~ "Left middle finger\n"
@@ -5552,82 +5492,56 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "å?³æ??中æ??\n"
 #~ "å?³æ??ç?¡å??æ??\n"
 #~ "å?³æ??å°?æ??"
-
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>���件</b>"
-
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>�家</b>"
-
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>�業</b>"
-
 #~ msgid "<b>Web</b>"
 #~ msgstr "<b>Web</b>"
-
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>工�</b>"
-
 #~ msgid "<span size=\"larger\" weight=\"bold\">Change your password</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\">���碼</span>"
-
 #~ msgid "<b>Assistive Technologies</b>"
 #~ msgstr "<b>è¼?å?©ç§?æ??</b>"
-
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>å??好設å®?</b>"
-
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>�覽</b>"
-
 #~ msgid "<b>_Desktop Background</b>"
 #~ msgstr "<b>æ¡?é?¢è??æ?¯(_D)</b>"
-
 #~ msgid "<b>Visual</b>"
 #~ msgstr "<b>�覺</b>"
-
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>å??ç?¨å??é?µ</b>"
-
 #~ msgid "<b>General</b>"
 #~ msgstr "<b>��</b>"
-
 #~ msgid "<small><i>Fast</i></small>"
 #~ msgstr "<small><i>å¿«</i></small>"
-
 #~ msgid "<small><i>Long</i></small>"
 #~ msgstr "<small><i>é?·</i></small>"
-
 #~ msgid "<small><i>Short</i></small>"
 #~ msgstr "<small><i>ç?­</i></small>"
-
 #~ msgid "<small><i>Slow</i></small>"
 #~ msgstr "<small><i>æ?¢</i></small>"
-
 #~ msgid "<b>Locate Pointer</b>"
 #~ msgstr "<b>顯示鼠��置</b>"
-
 #~ msgid "<small><i>High</i></small>"
 #~ msgstr "<small><i>é?·</i></small>"
-
 #~ msgid "<small><i>Large</i></small>"
 #~ msgstr "<small><i>å¿«</i></small>"
-
 #~ msgid "<small><i>Low</i></small>"
 #~ msgstr "<small><i>ç?­</i></small>"
-
 #~ msgid "<small><i>Small</i></small>"
 #~ msgstr "<small><i>æ?¢</i></small>"
-
 #~ msgid "<b>Ignore Host List</b>"
 #~ msgstr "<b>忽ç?¥ä¸»æ©?å??表</b>"
-
 #~ msgid "C_ut"
 #~ msgstr "��(_U)"
-
 #~ msgid "Save File"
 #~ msgstr "����"
-
 #~ msgid ""
 #~ "Solid color\n"
 #~ "Horizontal gradient\n"
@@ -5636,7 +5550,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "���彩\n"
 #~ "水平漸層\n"
 #~ "å??ç?´æ¼¸å±¤"
-
 #~ msgid ""
 #~ "Text below items\n"
 #~ "Text beside items\n"
@@ -5647,7 +5560,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "æ??å­?å?¨é ?ç?®æ??\n"
 #~ "å?ªæ??å??示\n"
 #~ "å?ªæ??æ??å­?"
-
 #~ msgid ""
 #~ "Tiled\n"
 #~ "Zoom\n"
@@ -5660,19 +5572,14 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "置中\n"
 #~ "縮�\n"
 #~ "填滿��"
-
 #~ msgid "_Copy"
 #~ msgstr "�製(_C)"
-
 #~ msgid "_New"
 #~ msgstr "��(_N)"
-
 #~ msgid "_Quit"
 #~ msgstr "çµ?æ??(_Q)"
-
 #~ msgid "_Save"
 #~ msgstr "��(_S)"
-
 #~ msgid ""
 #~ "Normal\n"
 #~ "Left\n"
@@ -5683,181 +5590,123 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "å·¦é??\n"
 #~ "å?³é??\n"
 #~ "ç?±ä¸?è??ä¸?\n"
-
 #~ msgid "Could not apply the selected configuration"
 #~ msgstr "ç?¡æ³?å¥?ç?¨é?¸å??ç??çµ?æ??"
-
 #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR"
 #~ msgstr "ç?¡æ³?å??å¾? org.gnome.SettingsDaemon.XRANDR"
-
 #~ msgid "_Command:"
 #~ msgstr "æ??令(_C):"
-
 #~ msgid "/_About"
 #~ msgstr "/é??æ?¼(_A)"
-
 #~ msgid "Screen Resolution"
 #~ msgstr "è?¢å¹?解æ??度"
-
 #~ msgid "<b>_Wallpaper</b>"
 #~ msgstr "<b>��(_W)</b>"
-
 #~ msgid "Monitor Resolution Settings"
 #~ msgstr "è?¢å¹?解æ??度設å®?å?¼"
-
 #~ msgid "Retrieve and store legacy settings"
 #~ msgstr "è®?å?¥è??ç??æ?¬ç??設å®?"
-
 #~ msgid "Autodetect"
 #~ msgstr "è?ªå??å?µæ¸¬"
-
 #~ msgid "ALSA - Advanced Linux Sound Architecture"
 #~ msgstr "ALSA - å??é?² Linux é?³æ??æ?¶æ§?"
-
 #~ msgid "Artsd - ART Sound Daemon"
 #~ msgstr "Artsd - ART é?³æ??æ??å??ç¨?å¼?"
-
 #~ msgid "ESD - Enlightened Sound Daemon"
 #~ msgstr "ESD - Enlightenment é?³æ??æ??å??ç¨?å¼?"
-
 #~ msgid "OSS - Open Sound System"
 #~ msgstr "OSS - é??æ?¾é?³æ??系統"
-
 #~ msgid "PulseAudio Sound Server"
 #~ msgstr "Polypaudio é?³æ??伺æ??å?¨"
-
 #~ msgid "Silence"
 #~ msgstr "ç?¡è?²"
-
 #~ msgid "- GNOME Sound Preferences"
 #~ msgstr " - GNOME é?³æ??å??好設å®?"
-
 #~ msgid "<b>Alerts and Sound Effects</b>"
 #~ msgstr "<b>警示è??è?²é?³æ??æ??</b>"
-
 #~ msgid "<b>Audio Conferencing</b>"
 #~ msgstr "<b>é?³è¨?æ??è­°</b>"
-
 #~ msgid "<b>Default Mixer Tracks</b>"
 #~ msgstr "<b>é ?設混é?³å?¨è?²é??</b>"
-
 #~ msgid "<b>Music and Movies</b>"
 #~ msgstr "<b>é?³æ¨?å??å½±ç??</b>"
-
 #~ msgid "<b>Sound Events</b>"
 #~ msgstr "<b>äº?件é?³æ??</b>"
-
 #~ msgid "<b>Sound Theme</b>"
 #~ msgstr "<b>é?³æ??ä½?æ?¯ä¸»é¡?</b>"
-
 #~ msgid "Click OK to finish."
 #~ msgstr "æ??確å®?ä¾?å®?æ??"
-
 #~ msgid "Play _sound effects when buttons are clicked"
 #~ msgstr "ç?¶æ??é??被é»?æ??æ??æ?­æ?¾é?³æ??(_S)"
-
 #~ msgid ""
 #~ "Select the device and tracks to control with the keyboard. Use the Shift "
 #~ "and Control keys to select multiple tracks if required."
 #~ msgstr ""
 #~ "以é?µç?¤é?¸å??è£?ç½®å??è?²é??ã??å¦?é??è¦?æ??使ç?¨ Shift å?? Control é?µä¾?é?¸æ??å¤?æ¢?è?²é??ã??"
-
 #~ msgid "So_und playback:"
 #~ msgstr "����(_U):"
-
 #~ msgid "Sou_nd capture:"
 #~ msgstr "è?²é?³æ?·å??(_N):"
-
 #~ msgid "Sounds"
 #~ msgstr "é?³æ??"
-
 #~ msgid "Testing Pipeline"
 #~ msgstr "管é??測試"
-
 #~ msgid "_Play alerts and sound effects"
 #~ msgstr "æ?­æ?¾è­¦ç¤ºè??è?²é?³æ??æ??(_P)"
-
 #~ msgid "_Sound playback:"
 #~ msgstr "����(_S):"
-
 #~ msgid "Select Sound File"
 #~ msgstr "é?¸å??é?³æ??æª?"
-
 #~ msgid "Custom..."
 #~ msgstr "���"
-
 #~ msgid "Enable support for GNOME assistive technologies at login"
 #~ msgstr "ç?»å?¥æ??å??ç?¨ GNOME è¼?å?©ç§?æ??æ?¯æ?´"
-
 #~ msgid "New accelerator..."
 #~ msgstr "������"
-
 #~ msgid "Windows and Buttons"
 #~ msgstr "è¦?çª?è??æ??é??"
-
 #~ msgid "Button clicked"
 #~ msgstr "æ??é??被é»?æ??"
-
 #~ msgid "Toggle button clicked"
 #~ msgstr "å??æ??æ??é??é»?æ??"
-
 #~ msgid "Window maximized"
 #~ msgstr "è¦?çª?æ??大å??"
-
 #~ msgid "Window unmaximized"
 #~ msgstr "è¦?çª?å??æ¶?æ??大å??"
-
 #~ msgid "Window minimised"
 #~ msgstr "è¦?çª?æ??å°?å??"
-
 #~ msgid "New e-mail"
 #~ msgstr "æ?°é?µä»¶é??ç?¥"
-
 #~ msgid "Empty trash"
 #~ msgstr "æ¸?ç??å??æ?¶ç­?"
-
 #~ msgid "Long action completed (download, CD burning, etc.)"
 #~ msgstr "é?·æ??é??å??ä½?å·²å®?æ??ï¼?ä¸?è¼?ã??ç??é?? CD ç­?ç­?ï¼?"
-
 #~ msgid "Alerts"
 #~ msgstr "警示"
-
 #~ msgid "Information or question"
 #~ msgstr "è³?è¨?æ??å??é¡?"
-
 #~ msgid "Error"
 #~ msgstr "�誤"
-
 #~ msgid "Unexpected attribute '%s' for element '%s'"
 #~ msgstr "å??件ã??%2$sã??中æ??æ?ªé ?æ??ç??屬æ?§ã??%1$sã??"
-
 #~ msgid "Attribute '%s' of element '%s' not found"
 #~ msgstr "æ?¾ä¸?å?°å??件ã??%2$sã??中ç??屬æ?§ã??%1$sã??"
-
 #~ msgid "Unexpected tag '%s', tag '%s' expected"
 #~ msgstr "æ?ªé ?æ??ç??æ¨?籤ã??%sã??ï¼?æ??ç?ºæ¨?籤ã??%sã??"
-
 #~ msgid "Unexpected tag '%s' inside '%s'"
 #~ msgstr "ã??%2$sã??中æ??æ?ªé ?æ??ç??æ¨?籤ã??%1$sã??"
-
 #~ msgid "No valid bookmark file found in data dirs"
 #~ msgstr "å?¨è³?æ??ç?®é??中æ?¾ä¸?å?°æ??æ??ç??æ?¸ç±¤æª?æ¡?"
-
 #~ msgid "No bookmark found for URI '%s'"
 #~ msgstr "æ?¾ä¸?å?° URIã??%sã??ç??æ?¸ç±¤"
-
 #~ msgid "No MIME type defined in the bookmark for URI '%s'"
 #~ msgstr "URIã??%sã??æ?¸ç±¤ä¸­æ²?æ??å®?義 MIME é¡?å??"
-
 #~ msgid "No private flag has been defined in bookmark for URI '%s'"
 #~ msgstr "URIã??%sã??æ?¸ç±¤ä¸­æ²?æ??ç§?æ??æ??å¹?"
-
 #~ msgid "No groups set in bookmark for URI '%s'"
 #~ msgstr "URIã??%sã??æ?¸ç±¤ä¸­æ²?æ??設å®?群çµ?"
-
 #~ msgid "No application with name '%s' registered a bookmark for '%s'"
 #~ msgstr "æ²?æ??å??ç?ºã??%sã??ç??æ??ç?¨ç¨?å¼?註å??æ?¸ç±¤ã??%sã??"
-
 #~ msgid ""
 #~ "Centered\n"
 #~ "Fill screen\n"
@@ -5870,25 +5719,21 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "縮�\n"
 #~ "�大\n"
 #~ "並æ??顯示"
-
 #~ msgid ""
 #~ "%s is the path where the theme files will be installed. This can not be "
 #~ "selected as the source location"
 #~ msgstr "ä½?æ?¯ä¸»é¡?æª?æ¡?æ??å®?è£?å?¨ %s 中ã??ä¸?è?½å°?å?¶é?¸æ??æ?¯å??å§?æª?ç??ä½?ç½®"
-
 #~ msgid "Just apply settings and quit"
 #~ msgstr "å¥?ç?¨è¨­å®?並é?¢é??"
-
 #~ msgid "Screen Resolution Preferences"
 #~ msgstr "ç?«é?¢è§£æ??度å??好設å®?"
-
 #~ msgid "_Make default for this computer (%s) only"
 #~ msgstr "å?ªå?¨é??é?¨é?»è?¦ (%s) 中æ??ç?ºé ?設å?¼(_M)"
-
 #, fuzzy
 #~ msgid ""
 #~ "Testing the new settings. If you don't respond in %d second the previous "
 #~ "settings will be restored."
+
 #~ msgid_plural ""
 #~ "Testing the new settings. If you don't respond in %d seconds the previous "
 #~ "settings will be restored."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 83656fa..a863d1e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,16 +11,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 2.91.90\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 19:22+0800\n"
-"PO-Revision-Date: 2011-02-20 21:43+0800\n"
+"Project-Id-Version: gnome-control-center 2.91.91\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center&keywords=I18N+L10N&component=general\n";
+"POT-Creation-Date: 2011-03-18 02:58+0000\n"
+"PO-Revision-Date: 2011-03-18 14:08+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gnome-control-center.schemas.in.h:1
@@ -36,23 +36,55 @@ msgid "More themes URL"
 msgstr "����主� URL"
 
 #: ../gnome-control-center.schemas.in.h:4
-msgid ""
-"Set this to your current location name. This is used to determine the "
-"appropriate network proxy configuration."
+msgid "Set this to your current location name. This is used to determine the appropriate network proxy configuration."
 msgstr "å°?æ­¤é ?設å®?ç?ºæ?¨ç?®å??ç??ä½?ç½®å??稱ã??é??æ?¯ç?¨ä¾?決å®?å??é?©ç??網路代ç??伺æ??å?¨çµ?æ??ã??"
 
 #: ../gnome-control-center.schemas.in.h:5
-msgid ""
-"URL for where to get more desktop backgrounds. If set to an empty string the "
-"link will not appear."
+msgid "URL for where to get more desktop backgrounds. If set to an empty string the link will not appear."
 msgstr "å?¯ä»¥å??å¾?æ?´å¤?æ¡?é?¢è??æ?¯ç?? URLã??å¦?æ??設å®?ç?ºç©ºå­?串å??ä¸?æ??顯示é?£çµ?ã??"
 
 #: ../gnome-control-center.schemas.in.h:6
-msgid ""
-"URL for where to get more desktop themes. If set to an empty string the link "
-"will not appear."
+msgid "URL for where to get more desktop themes. If set to an empty string the link will not appear."
 msgstr "å?¯ä»¥å??å¾?æ?´å¤?æ¡?é?¢ä¸»é¡?ç?? URLã??å¦?æ??設å®?ç?ºç©ºå­?串å??ä¸?æ??顯示é?£çµ?ã??"
 
+#: ../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 "設��"
@@ -74,8 +106,7 @@ msgid "Change set"
 msgstr "Change set"
 
 #: ../libgnome-control-center/gconf-property-editor.c:148
-msgid ""
-"GConf change set containing data to be forwarded to the gconf client on apply"
+msgid "GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr "å?¨å¥?ç?¨æ??å°? Gconf change set 中å??å?«ç??è³?æ??æ??å?³é??給 gconf 客æ?¶ç«¯"
 
 #: ../libgnome-control-center/gconf-property-editor.c:153
@@ -83,8 +114,7 @@ msgid "Conversion to widget callback"
 msgstr "è½?å??ç?ºè¦?çª?å??件ç??æ?¹è®?æ??é??ç?? callback"
 
 #: ../libgnome-control-center/gconf-property-editor.c:154
-msgid ""
-"Callback to be issued when data are to be converted from GConf to the widget"
+msgid "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr "é??è¦?å°?è®?æ?´å¾?ç?? GConf è³?æ??è½?å??ç?ºè¦?çª?å??件ç??æ?¹è®?æ??ï¼?æ??ç?¼å?ºç?? callback"
 
 #: ../libgnome-control-center/gconf-property-editor.c:159
@@ -92,8 +122,7 @@ msgid "Conversion from widget callback"
 msgstr "ç?±è¦?çª?å??件ç??æ?¹è®?æ??é??ç?? callback è½?å??"
 
 #: ../libgnome-control-center/gconf-property-editor.c:160
-msgid ""
-"Callback to be issued when data are to be converted to GConf from the widget"
+msgid "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr "é??è¦?å°?è¦?çª?å??件ç??æ?¹è®?è½?å??ç?ºè®?æ?´å¾?ç?? GConf è³?æ??æ??ï¼?æ??ç?¼å?ºç?? callback"
 
 #: ../libgnome-control-center/gconf-property-editor.c:165
@@ -125,8 +154,7 @@ msgstr "ç?¶å±¬æ?§ä¿®æ?¹ç¨?å¼?é??æ?¾ç?©ä»¶è³?æ??æ??ï¼?ç?¼å?º callback"
 msgid ""
 "Couldn't find the file '%s'.\n"
 "\n"
-"Please make sure it exists and try again, or choose a different background "
-"picture."
+"Please make sure it exists and try again, or choose a different background picture."
 msgstr ""
 "æ?¾ä¸?å?°æª?æ¡?â??%sâ??ã??\n"
 "\n"
@@ -193,7 +221,6 @@ msgid "Tile"
 msgstr "é?ªæ??"
 
 #: ../panels/background/background.ui.h:8
-#: ../panels/universal-access/uap.ui.h:90
 msgid "Zoom"
 msgstr "縮�"
 
@@ -209,29 +236,29 @@ msgstr "å??ç?´æ¼¸å±¤"
 msgid "Solid Color"
 msgstr "��"
 
-#: ../panels/background/cc-background-panel.c:960
+#: ../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:1051
+#: ../panels/background/cc-background-panel.c:1049
 msgid "Current background"
 msgstr "ç?®å??ç??è??æ?¯"
 
-#: ../panels/background/cc-background-panel.c:1115
+#: ../panels/background/cc-background-panel.c:1113
 msgid "Wallpapers"
 msgstr "��"
 
-#: ../panels/background/cc-background-panel.c:1122
+#: ../panels/background/cc-background-panel.c:1120
 msgid "Pictures Folder"
 msgstr "å??ç??è³?æ??夾"
 
-#: ../panels/background/cc-background-panel.c:1129
+#: ../panels/background/cc-background-panel.c:1127
 msgid "Colors & Gradients"
 msgstr "�� & 漸層"
 
-#: ../panels/background/cc-background-panel.c:1137
+#: ../panels/background/cc-background-panel.c:1135
 msgid "Flickr"
 msgstr "Flickr"
 
@@ -255,141 +282,74 @@ msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
 
 #: ../panels/datetime/datetime.ui.h:1
-msgid "16"
-msgstr "16"
-
-#: ../panels/datetime/datetime.ui.h:2
-msgid "2010"
-msgstr "2010"
-
-#: ../panels/datetime/datetime.ui.h:3
-msgid "22"
-msgstr "22"
-
-#: ../panels/datetime/datetime.ui.h:4
 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 "ä¹?æ??"
 
-#: ../panels/datetime/dt-lockbutton.c:347
-#: ../panels/printers/pp-lockbutton.c:347 ../panels/screen/screen.ui.h:13
-#: ../panels/user-accounts/um-lockbutton.c:347
-msgid "Lock"
-msgstr "é??å®?"
-
-#: ../panels/datetime/dt-lockbutton.c:356
-#: ../panels/printers/pp-lockbutton.c:356 ../panels/network/network.ui.h:23
-#: ../panels/user-accounts/um-lockbutton.c:356
-msgid "Unlock"
-msgstr "解é??"
-
-#: ../panels/datetime/dt-lockbutton.c:365
-#: ../panels/printers/pp-lockbutton.c:365
-#: ../panels/user-accounts/um-lockbutton.c:365
-msgid "Locked"
-msgstr "å·²é??å®?"
-
-#: ../panels/datetime/dt-lockbutton.c:374
-#: ../panels/printers/pp-lockbutton.c:374
-#: ../panels/user-accounts/um-lockbutton.c:374
-msgid ""
-"Dialog is unlocked.\n"
-"Click to prevent further changes"
-msgstr ""
-"å°?話ç??已解é??ã??\n"
-"é»?é?¸ä»¥é?²æ­¢é?²ä¸?æ­¥ç??è®?æ?´"
-
-#: ../panels/datetime/dt-lockbutton.c:383
-#: ../panels/printers/pp-lockbutton.c:383
-#: ../panels/user-accounts/um-lockbutton.c:383
-msgid ""
-"Dialog is locked.\n"
-"Click to make changes"
-msgstr ""
-"å°?話ç??å·²é??å®?ã??\n"
-"������"
-
-#: ../panels/datetime/dt-lockbutton.c:392
-#: ../panels/printers/pp-lockbutton.c:392
-#: ../panels/user-accounts/um-lockbutton.c:392
-msgid ""
-"System policy prevents changes.\n"
-"Contact your system administrator"
-msgstr ""
-"系統å??å??æ?¯é?²æ­¢é?²è¡?è®?æ?´ç??ã??\n"
-"è«?é?£çµ¡æ?¨ç??系統管ç??å?¡"
-
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Clock;Timezone;Location;"
@@ -408,14 +368,14 @@ msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:497
+#: ../panels/display/xrandr-capplet.c:491
 msgid "Monitor"
 msgstr "顯示�"
 
 #: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:333
-#: ../panels/display/xrandr-capplet.c:372
-#: ../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 "正常"
 
@@ -459,19 +419,17 @@ msgstr "顯示�"
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
-msgstr ""
-"Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;解æ??度;é??æ?°"
-"æ?´ç??;"
+msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;解æ??度;é??æ?°æ?´ç??;"
 
-#: ../panels/display/xrandr-capplet.c:334
+#: ../panels/display/xrandr-capplet.c:328
 msgid "Anti-Clockwise"
 msgstr "é??æ??é??"
 
-#: ../panels/display/xrandr-capplet.c:335
+#: ../panels/display/xrandr-capplet.c:329
 msgid "Clockwise"
 msgstr "é ?æ??é??"
 
-#: ../panels/display/xrandr-capplet.c:336
+#: ../panels/display/xrandr-capplet.c:330
 msgid "180 Degrees"
 msgstr "180 度"
 
@@ -480,143 +438,156 @@ msgstr "180 度"
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:473
+#: ../panels/display/xrandr-capplet.c:467
 msgid "Mirror Displays"
 msgstr "��顯示�"
 
-#: ../panels/display/xrandr-capplet.c:603
+#: ../panels/display/xrandr-capplet.c:597
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:605
+#: ../panels/display/xrandr-capplet.c:599
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1518
+#: ../panels/display/xrandr-capplet.c:1500
 msgid "Drag to change primary display."
 msgstr "æ??æ?³ä»¥æ?¹è®?主è¦?顯示å?¨ã??"
 
-#: ../panels/display/xrandr-capplet.c:1576
-msgid ""
-"Select a monitor to change its properties; drag it to rearrange its "
-"placement."
+#: ../panels/display/xrandr-capplet.c:1558
+msgid "Select a monitor to change its properties; drag it to rearrange its placement."
 msgstr "é?¸æ??ä¸?å??è?¢å¹?以æ?¹è®?å®?ç??屬æ?§ï¼?æ??æ?³å®?å??è?½é??æ?°æ??å??å®?ç??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1966
+#: ../panels/display/xrandr-capplet.c:1947
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1968
+#: ../panels/display/xrandr-capplet.c:1949
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/xrandr-capplet.c:2214
+#: ../panels/display/xrandr-capplet.c:2195
 msgid "Could not save the monitor configuration"
 msgstr "ç?¡æ³?å?²å­?顯示å?¨çµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2239
+#: ../panels/display/xrandr-capplet.c:2220
 msgid "Could not get session bus while applying display configuration"
 msgstr "å?¨å¥?ç?¨é¡¯ç¤ºçµ?æ??æ??ç?¡æ³?å??å¾?ä½?業é??段å?¯æµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2284
+#: ../panels/display/xrandr-capplet.c:2265
 msgid "Could not detect displays"
 msgstr "���測顯示�"
 
-#: ../panels/display/xrandr-capplet.c:2479
+#: ../panels/display/xrandr-capplet.c:2460
 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 "VESAï¼?%s"
+
+#. 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:479
+#: ../panels/info/cc-info-panel.c:528
 #, c-format
 msgid "%d-bit"
 msgstr "%d-ä½?å??"
 
-#: ../panels/info/cc-info-panel.c:493
+#: ../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:501
+#: ../panels/info/cc-info-panel.c:550
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panels/info/cc-info-panel.c:506
+#: ../panels/info/cc-info-panel.c:555
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panels/info/cc-info-panel.c:511
+#: ../panels/info/cc-info-panel.c:560
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panels/info/cc-info-panel.c:516
+#: ../panels/info/cc-info-panel.c:565
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../panels/info/cc-info-panel.c:521
+#: ../panels/info/cc-info-panel.c:570
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../panels/info/cc-info-panel.c:526
+#: ../panels/info/cc-info-panel.c:575
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../panels/info/cc-info-panel.c:637
+#: ../panels/info/cc-info-panel.c:686
 msgid "Unknown model"
 msgstr "ä¸?æ??ç??å??è??"
 
-#: ../panels/info/cc-info-panel.c:720
+#: ../panels/info/cc-info-panel.c:769
 msgid "The next login will attempt to use the standard experience."
 msgstr "ä¸?次ç?»å?¥æ??å??試使ç?¨æ¨?æº?é«?é©?ã??"
 
-#: ../panels/info/cc-info-panel.c:722
-msgid ""
-"The next login will use the fallback mode intended for unsupported graphics "
-"hardware."
+#: ../panels/info/cc-info-panel.c:771
+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:771
+#: ../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:777
+#: ../panels/info/cc-info-panel.c:819
 msgctxt "Experience"
 msgid "Standard"
 msgstr "��"
 
-#: ../panels/info/cc-info-panel.c:909
-#: ../panels/keyboard/keyboard-shortcuts.c:1711
+#: ../panels/info/cc-info-panel.c:951
+#: ../panels/keyboard/keyboard-shortcuts.c:1712
 msgid "Section"
 msgstr "�"
 
-#: ../panels/info/cc-info-panel.c:918 ../panels/info/info.ui.h:15
+#: ../panels/info/cc-info-panel.c:960
+#: ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "�覽"
 
-#: ../panels/info/cc-info-panel.c:924 ../panels/info/info.ui.h:3
+#: ../panels/info/cc-info-panel.c:966
+#: ../panels/info/info.ui.h:2
 msgid "Default Applications"
 msgstr "é ?設æ??ç?¨ç¨?å¼?"
 
-#: ../panels/info/cc-info-panel.c:929 ../panels/info/info.ui.h:10
+#: ../panels/info/cc-info-panel.c:971
+#: ../panels/info/info.ui.h:9
 msgid "Graphics"
 msgstr "繪å??"
 
-#: ../panels/info/cc-info-panel.c:954
+#: ../panels/info/cc-info-panel.c:996
 #, c-format
 msgid "Version %s"
 msgstr "ç??æ?¬ %s"
@@ -631,73 +602,67 @@ 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;"
-msgstr ""
-"device;system;information;memory;processor;version;è£?ç½®;系統;è³?è¨?;è¨?æ?¶é«?;è??ç??"
-"å?¨;ç??æ?¬;"
+msgid "device;system;information;memory;processor;version;default;application;fallback;"
+msgstr "device;system;information;memory;processor;version;default;application;fallback;è£?ç½®;系統;è³?è¨?;è¨?æ?¶é«?;è??ç??å?¨;ç??æ?¬;é ?設;æ??ç?¨ç¨?å¼?;å¾?å??;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Calendar"
 msgstr "æ?¥æ??"
 
-#: ../panels/info/info.ui.h:2
-msgid "Chipset"
-msgstr "æ?¶ç??"
-
-#: ../panels/info/info.ui.h:4
+#: ../panels/info/info.ui.h:3
 msgid "Device name"
 msgstr "è£?ç½®å??稱"
 
-#: ../panels/info/info.ui.h:5
+#: ../panels/info/info.ui.h:4
 msgid "Disk"
 msgstr "��"
 
-#: ../panels/info/info.ui.h:6
+#: ../panels/info/info.ui.h:5
 msgid "Driver"
 msgstr "���"
 
-#: ../panels/info/info.ui.h:7
+#: ../panels/info/info.ui.h:6
 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:9
+#: ../panels/info/info.ui.h:8
 msgid "Forced Fallback Mode"
 msgstr "å¼·å?¶å¾?å??模å¼?"
 
-#: ../panels/info/info.ui.h:11
+#: ../panels/info/info.ui.h:10
 msgid "Mail"
 msgstr "�件"
 
-#: ../panels/info/info.ui.h:12
+#: ../panels/info/info.ui.h:11
 msgid "Memory"
 msgstr "���"
 
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info.ui.h:12
 msgid "Music"
 msgstr "��"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:13
 msgid "OS type"
 msgstr "OS é¡?å??"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:15
 msgid "Photos"
 msgstr "ç?¸ç??"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:16
 msgid "Processor"
 msgstr "è??ç??å?¨"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info.ui.h:17
 msgid "Updates Available"
 msgstr "å?¯ç?¨ç??æ?´æ?°"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:18
 msgid "Video"
 msgstr "å½±ç??"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info.ui.h:19
 msgid "Web"
 msgstr "網�"
 
@@ -794,22 +759,30 @@ 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:4
+#: ../panels/keyboard/50-accessibility.xml.in.h:6
 msgid "Toggle magnifier"
 msgstr "å??æ??æ?¾å¤§é?¡"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: ../panels/keyboard/50-accessibility.xml.in.h:7
 msgid "Toggle on-screen keyboard"
 msgstr "å??æ??è?¢å¹?é?µç?¤"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: ../panels/keyboard/50-accessibility.xml.in.h:8
 msgid "Toggle screen reader"
 msgstr "å??æ??è?¢å¹?é?±è®?å?¨"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: ../panels/keyboard/50-accessibility.xml.in.h:9
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Universal Access"
 msgstr "ç?¡é??ç¤?å??è?½"
@@ -844,8 +817,8 @@ msgstr "æ?·å¾?é?µç??é¡?å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1141
-#: ../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
 msgid "Disabled"
@@ -865,32 +838,31 @@ msgstr "��"
 msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;æ?·å¾?é?µ;é??è¤?;é??ç??;"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:643
-#: ../panels/keyboard/keyboard-shortcuts.c:916
-#: ../panels/keyboard/keyboard-shortcuts.c:1503
-#: ../panels/keyboard/keyboard-shortcuts.c:1507
+#: ../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:768
+#: ../panels/keyboard/keyboard-shortcuts.c:780
 msgid "<Unknown Action>"
 msgstr "<è¡?å??設å®?ä¸?詳>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1167
+#: ../panels/keyboard/keyboard-shortcuts.c:1179
 msgid "Error saving the new shortcut"
 msgstr "å?²å­?æ?°ç??æ?·å¾?é?µæ??ç?¼ç??é?¯èª¤"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1282
+#: ../panels/keyboard/keyboard-shortcuts.c:1292
 #, c-format
 msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
+"The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n"
 "Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
 "æ?·å¾?â??%sâ??ç?¡æ³?使ç?¨ï¼?å??å? æ?¯æ??ç?¡æ³?æ??ä¸?æ­¤æ??é?µã??\n"
 "è«?試ç?¨å?¶å®?ç??æ??é?µï¼?å¦?å??æ??使ç?¨ Controlï¼?Alt  æ?? Shiftã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1314
+#: ../panels/keyboard/keyboard-shortcuts.c:1322
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -899,25 +871,24 @@ msgstr ""
 "æ?·å¾?é?µâ??%sâ??å·±ç¶?使ç?¨æ?¼ï¼?\n"
 "â??%sâ??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1320
+#: ../panels/keyboard/keyboard-shortcuts.c:1327
 #, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
+msgid "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??æ?¨é??æ?°æ??æ´¾æ?·å¾?é?µç?ºã??%sã??ï¼?ã??%sã??ç??æ?·å¾?é?µå°±æ??å??ç?¨ã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1328
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1442
+#: ../panels/keyboard/keyboard-shortcuts.c:1445
 msgid "Too many custom shortcuts"
 msgstr "太������"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1761
+#: ../panels/keyboard/keyboard-shortcuts.c:1765
 msgid "Action"
 msgstr "å??ä½?"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1784
+#: ../panels/keyboard/keyboard-shortcuts.c:1788
 msgid "Shortcut"
 msgstr "æ?·å¾?é?µ"
 
@@ -935,7 +906,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 "游æ¨?é??ç??é??度"
 
@@ -961,7 +932,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 "é?·"
 
@@ -980,7 +951,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:69
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Short"
 msgstr "ç?­"
 
@@ -995,11 +966,8 @@ msgid "Slow"
 msgstr "æ?¢é??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-msgid ""
-"To edit a shortcut, click the row and hold down the new keys or press "
-"Backspace to clear."
-msgstr ""
-"è¦?編輯æ?·å¾?é?µï¼?é»?é?¸ç?¸æ??ç??å??並æ??ä¸?æ?°ç??æ??é?µçµ?å??ï¼?æ??以 Backspace é?µä¾?æ¸?é?¤ã??"
+msgid "To edit a shortcut, click the row and hold down the new keys or press Backspace to clear."
+msgstr "è¦?編輯æ?·å¾?é?µï¼?é»?é?¸ç?¸æ??ç??å??並æ??ä¸?æ?°ç??æ??é?µçµ?å??ï¼?æ??以 Backspace é?µä¾?æ¸?é?¤ã??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 msgid "_Delay:"
@@ -1017,7 +985,8 @@ msgstr "é??度(_S):"
 msgid "Ask what to do"
 msgstr "è©¢å??è¦?å??ä»?麼"
 
-#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:6
+#: ../panels/media/cc-media-panel.c:326
+#: ../panels/power/power.ui.h:6
 msgid "Do nothing"
 msgstr "ä¸?å??ä»»ä½?äº?"
 
@@ -1156,214 +1125,211 @@ 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:261
+#: ../panels/printers/cc-printers-panel.c:239
 msgid "Low on toner"
 msgstr "碳��足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:263
+#: ../panels/printers/cc-printers-panel.c:241
 msgid "Out of toner"
 msgstr "碳���"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:266
+#: ../panels/printers/cc-printers-panel.c:244
 msgid "Low on developer"
 msgstr "顯å??å??ä¸?足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:269
+#: ../panels/printers/cc-printers-panel.c:247
 msgid "Out of developer"
 msgstr "顯å??å??ç?¨å®?"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:271
+#: ../panels/printers/cc-printers-panel.c:249
 msgid "Low on a marker supply"
 msgstr "墨水��足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:273
+#: ../panels/printers/cc-printers-panel.c:251
 msgid "Out of a marker supply"
 msgstr "墨水���"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:275
+#: ../panels/printers/cc-printers-panel.c:253
 #, fuzzy
-#| msgid "Open Folder"
 msgid "Open cover"
 msgstr "建���(_C)"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:277
+#: ../panels/printers/cc-printers-panel.c:255
 #, fuzzy
-#| msgid "Open Folder"
 msgid "Open door"
 msgstr "æ??å??å??空ä½?"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:279
+#: ../panels/printers/cc-printers-panel.c:257
 msgid "Low on paper"
 msgstr "ç´?å¼µä¸?足ã??"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:281
+#: ../panels/printers/cc-printers-panel.c:259
 msgid "Out of paper"
 msgstr "�張��"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:283
+#: ../panels/printers/cc-printers-panel.c:261
 msgctxt "printer state"
 msgid "Offline"
 msgstr "��"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:285
+#: ../panels/printers/cc-printers-panel.c:263
 msgctxt "printer state"
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:287
+#: ../panels/printers/cc-printers-panel.c:265
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:289
+#: ../panels/printers/cc-printers-panel.c:267
 #, fuzzy
 msgid "Waste receptacle full"
 msgstr "è?«è?? [25 å??]"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:291
+#: ../panels/printers/cc-printers-panel.c:269
 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:293
+#: ../panels/printers/cc-printers-panel.c:271
 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:430
+#: ../panels/printers/cc-printers-panel.c:408
 msgctxt "printer state"
 msgid "Ready"
 msgstr "æº?å??å°±ç·?"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:434
+#: ../panels/printers/cc-printers-panel.c:412
 msgctxt "printer state"
 msgid "Processing"
 msgstr "è??ç??中"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:438
+#: ../panels/printers/cc-printers-panel.c:416
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "å·²å??æ­¢"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:536
+#: ../panels/printers/cc-printers-panel.c:514
 msgid "Toner Level"
 msgstr "碳����"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:539
+#: ../panels/printers/cc-printers-panel.c:517
 msgid "Ink Level"
 msgstr "墨水��"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:542
+#: ../panels/printers/cc-printers-panel.c:520
 msgid "Supply Level"
 msgstr "è??æ??ç­?ç´?"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:557
+#: ../panels/printers/cc-printers-panel.c:535
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 使�中"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1024
+#: ../panels/printers/cc-printers-panel.c:1002
 msgctxt "print job"
 msgid "Pending"
 msgstr "ä¿?ç??中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1028
+#: ../panels/printers/cc-printers-panel.c:1006
 msgctxt "print job"
 msgid "Held"
 msgstr "å·²æ?«å??"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1032
+#: ../panels/printers/cc-printers-panel.c:1010
 msgctxt "print job"
 msgid "Processing"
 msgstr "è??ç??中"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1036
+#: ../panels/printers/cc-printers-panel.c:1014
 msgctxt "print job"
 msgid "Stopped"
 msgstr "å·²å??æ­¢"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1040
+#: ../panels/printers/cc-printers-panel.c:1018
 msgctxt "print job"
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1044
+#: ../panels/printers/cc-printers-panel.c:1022
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已��"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1048
+#: ../panels/printers/cc-printers-panel.c:1026
 msgctxt "print job"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1140
+#: ../panels/printers/cc-printers-panel.c:1118
 msgid "Job Title"
 msgstr "å·¥ä½?å??稱"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1149
+#: ../panels/printers/cc-printers-panel.c:1127
 msgid "Job State"
 msgstr "å·¥ä½?ç??æ??"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1155
+#: ../panels/printers/cc-printers-panel.c:1133
 msgid "Time"
 msgstr "æ??å?»"
 
-#. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1345
-#, 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:1848
+msgid "Failed to add new printer."
+msgstr "ç?¡æ³?å? å?¥æ?°ç??å?°è¡¨æ©?ã??"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2055
+#: ../panels/printers/cc-printers-panel.c:1948
 msgid "Test page"
 msgstr "測試�"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:2063
+#: ../panels/printers/cc-printers-panel.c:1956
 msgid "Clean print heads"
 msgstr "æ¸?ç??å??å?°å?´é ­"
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:2068
+#: ../panels/printers/cc-printers-panel.c:1961
 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:2195
+#: ../panels/printers/cc-printers-panel.c:2090
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
@@ -1381,6 +1347,60 @@ msgstr "Printer;Queue;Print;Paper;Ink;Toner;å?°è¡¨æ©?;ä½?å??;å??å?°;ç´?å¼µ;墨
 msgid "Printers"
 msgstr "�表�"
 
+#: ../panels/printers/new-printer-dialog.ui.h:1
+msgid "Add"
+msgstr "å? å?¥"
+
+#: ../panels/printers/new-printer-dialog.ui.h:2
+msgid "Add a New Printer"
+msgstr "å? å?¥æ?°ç??å?°è¡¨æ©?"
+
+#: ../panels/printers/new-printer-dialog.ui.h:3
+msgid "Address"
+msgstr "å?°å??"
+
+#: ../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 "å??æ¶?"
+
+#: ../panels/printers/new-printer-dialog.ui.h:5
+msgid "Search by Address"
+msgstr "ä¾?ä½?å??æ??å°?"
+
+#: ../panels/printers/pp-new-printer-dialog.c:381
+msgid "Getting devices..."
+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
+msgid "Devices"
+msgstr "�置"
+
+#. Translators: Local means local printers
+#: ../panels/printers/pp-new-printer-dialog.c:669
+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
+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
+msgid "Automatic configuration"
+msgstr "è?ªå??çµ?æ??"
+
 #: ../panels/printers/printers.ui.h:1
 msgid "---"
 msgstr "---"
@@ -1407,6 +1427,9 @@ msgid "Default"
 msgstr "�設�"
 
 #: ../panels/printers/printers.ui.h:9
+#: ../panels/network/cc-network-panel.c:1318
+#: ../panels/network/cc-network-panel.c:1321
+#: ../panels/network/network.ui.h:12
 msgid "IP Address"
 msgstr "IP ä½?å??"
 
@@ -1469,6 +1492,7 @@ msgid "Install languages..."
 msgstr "�����"
 
 #: ../panels/region/gnome-region-panel.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "Language"
 msgstr "��"
 
@@ -1514,6 +1538,7 @@ msgid "View and edit keyboard layout options"
 msgstr "檢è¦?並編輯é?µç?¤é??ç½®é?¸é ?"
 
 #: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/network/network.ui.h:32
 msgid "_Options..."
 msgstr "��(_O)�"
 
@@ -1533,7 +1558,7 @@ msgstr "é?¸æ??è¦?å? å?¥ç??輸å?¥ä¾?æº?"
 msgid "Keyboard Layout Options"
 msgstr "é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:220
+#: ../panels/region/gnome-region-panel-xkblt.c:222
 msgid "Layout"
 msgstr "é??ç½®"
 
@@ -1568,13 +1593,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 "大"
 
@@ -1584,7 +1608,6 @@ msgstr "�示鼠��置"
 
 #. low sensitivity
 #: ../panels/mouse/gnome-mouse-properties.ui.h:17
-#: ../panels/universal-access/uap.ui.h:52
 msgid "Low"
 msgstr "ä½?"
 
@@ -1614,7 +1637,7 @@ msgstr "ç?¶æ??ä¸? Control æ??顯示游æ¨?ç??ä½?ç½®(_O)"
 
 #. small threshold
 #: ../panels/mouse/gnome-mouse-properties.ui.h:28
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Small"
 msgstr "å°?"
 
@@ -1673,31 +1696,68 @@ msgstr "設å®?æ?¨ç??æ»?é¼ è??觸æ?§æ?¿å??好設å®?"
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
-msgstr ""
-"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;觸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?觸;é??"
-"æ??;æ??é??;è»?è·¡ç??;"
+msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;觸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?觸;é??æ??;æ??é??;è»?è·¡ç??;"
+
+#. TRANSLATORS: this WEP WiFi security
+#: ../panels/network/cc-network-panel.c:824
+msgid "WEP"
+msgstr "WEP"
+
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/cc-network-panel.c:828
+msgid "WPA"
+msgstr "WPA"
+
+#. TRANSLATORS: this WPA WiFi security
+#: ../panels/network/cc-network-panel.c:832
+msgid "WPA2"
+msgstr "WPA2"
+
+#. TRANSLATORS: this Enterprise WiFi security
+#: ../panels/network/cc-network-panel.c:837
+msgid "Enterprise"
+msgstr "ä¼?業ç??"
+
+#. TRANSLATORS: this no (!) WiFi security
+#: ../panels/network/cc-network-panel.c:843
+#: ../panels/universal-access/uap.ui.h:43
+msgid "None"
+msgstr "æ²?æ??"
 
-#: ../panels/network/cc-network-panel.c:962
-msgid "Network proxy"
-msgstr "網路代ç??伺æ??å?¨"
+#. Translators: network device speed
+#: ../panels/network/cc-network-panel.c:1125
+#: ../panels/network/cc-network-panel.c:1150
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
 
-#: ../panels/network/cc-network-panel.c:971
-msgid "Set the system proxy settings"
-msgstr "設å®?系統代ç??伺æ??å?¨è¨­å®?å?¼"
+#: ../panels/network/cc-network-panel.c:1314
+#: ../panels/network/network.ui.h:13
+msgid "IPv4 Address"
+msgstr "IPv4 ä½?å??"
 
-#. TRANSLATORS: the user is running a NM that is too new and API compatible
-#: ../panels/network/cc-network-panel.c:1115
-msgid "The running NetworkManager version is not compatible (too new)."
-msgstr ""
+#: ../panels/network/cc-network-panel.c:1315
+#: ../panels/network/network.ui.h:14
+msgid "IPv6 Address"
+msgstr "IPv6 ä½?å??"
 
-#. TRANSLATORS: the user is running a NM that is too old and API compatible
-#: ../panels/network/cc-network-panel.c:1121
-msgid "The running NetworkManager version is not compatible (too old)."
-msgstr ""
+#: ../panels/network/cc-network-panel.c:1449
+msgid "Proxy"
+msgstr "代ç??伺æ??å?¨"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-msgid "Network"
-msgstr "網路"
+#: ../panels/network/cc-network-panel.c:1512
+msgid "Network proxy"
+msgstr "網路代ç??伺æ??å?¨"
+
+#: ../panels/network/cc-network-panel.c:1661
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
+
+#. TRANSLATORS: the user is running a NM that is not API compatible
+#: ../panels/network/cc-network-panel.c:1728
+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"
@@ -1709,225 +1769,231 @@ msgid "Network;Wireless;IP;LAN;"
 msgstr "Network;Wireless;IP;LAN;網路;ç?¡ç·?;å??å??網路;"
 
 #: ../panels/network/network.ui.h:1
-msgid "Airplane Mode"
-msgstr "��模�"
+msgid "Air_plane Mode"
+msgstr "��模�(_P)"
 
 #: ../panels/network/network.ui.h:2
-msgid "Configuration URL:"
-msgstr "çµ?æ??網å??ï¼?"
+msgid "Create..."
+msgstr "建��"
 
 #: ../panels/network/network.ui.h:3
-msgid "DNS:"
-msgstr "DNSï¼?"
+msgid "DNS"
+msgstr "DNS"
 
 #: ../panels/network/network.ui.h:4
-msgid "Default Route:"
-msgstr "�設路��"
+msgid "DSL"
+msgstr "DSL"
 
 #: ../panels/network/network.ui.h:5
-msgid "FTP Proxy:"
-msgstr "FTP 代ç??伺æ??å?¨ï¼?"
+msgid "Default Route"
+msgstr "�設路�"
 
 #: ../panels/network/network.ui.h:6
-msgid "Gateway:"
-msgstr "é??è¨?é??ï¼?"
+msgid "Gateway"
+msgstr "é??è¨?é??"
 
 #: ../panels/network/network.ui.h:7
-msgid "Group Name:"
-msgstr "群çµ?å??稱ï¼?"
+msgid "Group Name"
+msgstr "群çµ?å??稱"
 
 #: ../panels/network/network.ui.h:8
-msgid "Group Password:"
-msgstr "群��碼�"
+msgid "Group Password"
+msgstr "群��碼"
 
 #: ../panels/network/network.ui.h:9
-msgid "HTTP Proxy:"
-msgstr "HTTP 代ç??伺æ??å?¨å¯?碼ï¼?"
+msgid "H_TTPS Proxy"
+msgstr "H_TTPS 代ç??伺æ??å?¨"
 
 #: ../panels/network/network.ui.h:10
-msgid "Hardware Address:"
-msgstr "硬é«?ä½?å??ï¼?"
+msgid "Hardware Address"
+msgstr "硬é«?ä½?å??"
 
 #: ../panels/network/network.ui.h:11
-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 ä½?å??ï¼?"
+msgid "IMEI"
+msgstr "IMEI"
 
 #: ../panels/network/network.ui.h:15
-msgid "Method:"
-msgstr "���"
+msgid "Interface"
+msgstr "ä»?é?¢"
 
 #: ../panels/network/network.ui.h:16
-msgid "Network Name:"
-msgstr "網路å??稱ï¼?"
+msgid "Mobile Broadband"
+msgstr "è¡?å??寬頻"
 
 #: ../panels/network/network.ui.h:17
-msgid "Provider:"
-msgstr "ä¾?æ??å??ï¼?"
+msgid "Provider"
+msgstr "ä¾?æ??å??"
 
 #: ../panels/network/network.ui.h:18
-msgid "Secure HTTP Proxy:"
-msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨ï¼?"
+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 主��"
+msgid "Speed"
+msgstr "é??度"
 
 #: ../panels/network/network.ui.h:21
-msgid "Speed:"
-msgstr "é??度ï¼?"
+msgid "Subnet Mask"
+msgstr "�網路�罩"
 
-#: ../panels/network/network.ui.h:22
-msgid "Subnet Mask:"
-msgstr "�網路�罩�"
+#: ../panels/network/network.ui.h:23
+msgid "Username"
+msgstr "使ç?¨è??å??稱"
 
 #: ../panels/network/network.ui.h:24
-msgid "Username:"
-msgstr "使ç?¨è??å??稱ï¼?"
+msgid "VPN"
+msgstr "VPN"
 
+#. 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:27
+msgid "_Configuration URL"
+msgstr "çµ?æ??網å??(_C)"
+
+#: ../panels/network/network.ui.h:28
+msgid "_FTP Proxy"
+msgstr "_FTP 代ç??伺æ??å?¨"
+
+#: ../panels/network/network.ui.h:29
+msgid "_HTTP Proxy"
+msgstr "_HTTP 代ç??伺æ??å?¨"
+
+#: ../panels/network/network.ui.h:30
+msgid "_Method"
+msgstr "��(_M)"
+
+#: ../panels/network/network.ui.h:31
+msgid "_Network Name"
+msgstr "網路å??稱(_N)"
+
+#: ../panels/network/network.ui.h:33
+msgid "_Socks Host"
+msgstr "Socks 主�(_S)"
+
+#: ../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
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:64 ../panels/network/panel-common.c:136
-msgid "Unknown"
-msgstr "ä¸?æ??"
+#: ../panels/network/panel-common.c:93
+msgid "Mobile broadband"
+msgstr "è¡?å??寬頻"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:68
-msgid "Wired"
-msgstr "æ??ç·?"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:72
-msgid "Wireless"
-msgstr "ç?¡ç·?"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:77
-msgid "Mobile broadband"
-msgstr "è¡?å??寬頻"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:81
+#: ../panels/network/panel-common.c:98
 msgid "Bluetooth"
 msgstr "è??ç??"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:85
+#: ../panels/network/panel-common.c:102
 #, fuzzy
-#| msgid "Models"
 msgid "Mesh"
 msgstr "å??è??"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:140
+#: ../panels/network/panel-common.c:161
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:144
+#: ../panels/network/panel-common.c:165
 msgid "Infrastructure"
 msgstr "����"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:162
+#. 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:166
+#: ../panels/network/panel-common.c:187
 msgid "Unmanaged"
 msgstr "æ?ªç®¡ç??"
 
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:170
+#: ../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:174
+#: ../panels/network/panel-common.c:198
 msgid "Disconnected"
 msgstr "已��"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:178
-msgid "Preparing connection"
-msgstr "æ­£å?¨æº?å??é?£ç·?"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:247
+msgid "Connecting"
+msgstr "��中"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:182
-msgid "Configuring connection"
-msgstr "正�設���"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:209
+#: ../panels/network/panel-common.c:251
+msgid "Authentication required"
+msgstr "é??è¦?é©?è­?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:186
-msgid "Authenticating"
-msgstr "正���"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:190
-msgid "Getting network address"
-msgstr "æ­£å?¨å??å¾?網路ä½?å??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:194
-#, fuzzy
-#| msgid "Getting network address"
-msgid "Checking network address"
-msgstr "æ­£å?¨å??å¾?網路ä½?å??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:198
+#. 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:202
-#, fuzzy
-#| msgid "Disconnected"
+#: ../panels/network/panel-common.c:217
 msgid "Disconnecting"
-msgstr "已��"
+msgstr "æ?·ç·?"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:206
-msgid "Failed to connect"
-msgstr "����"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:221
+#: ../panels/network/panel-common.c:259
+msgid "Connection failed"
+msgstr "é?£ç·?失æ??"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:210
-#, fuzzy
-#| msgid "Status unknown"
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:225
+#: ../panels/network/panel-common.c:267
 msgid "Status unknown (missing)"
-msgstr "ç??æ??ä¸?æ??"
+msgstr "ç??æ??ä¸?詳ï¼?缺ä¹?ï¼?"
+
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:263
+msgid "Not connected"
+msgstr "���"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -1942,17 +2008,17 @@ msgstr "é?»æº?管ç??設å®?å?¼"
 msgid "Power;Sleep;Suspend;Hibernate;Battery;"
 msgstr "Power;Sleep;Suspend;Hibernate;Battery;é?»æº?;ç?¡ç? ;æ?«å??;ä¼?ç? ;é?»æ± ;"
 
-#: ../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"
@@ -1960,69 +2026,73 @@ 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 "ä¸?æ?·é?»ç³»çµ±æ­£å?¨å??é?»"
 
-#: ../panels/power/cc-power-panel.c:268
+#: ../panels/power/cc-power-panel.c:270
 msgid "UPS discharging"
 msgstr "���系統正���"
 
 #. 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%%"
 
-#: ../panels/power/power.ui.h:1 ../panels/screen/screen.ui.h:1
+#: ../panels/power/power.ui.h:1
+#: ../panels/screen/screen.ui.h:1
 msgid "1 hour"
 msgstr "1 å°?æ??"
 
-#: ../panels/power/power.ui.h:2 ../panels/screen/screen.ui.h:3
+#: ../panels/power/power.ui.h:2
+#: ../panels/screen/screen.ui.h:3
 msgid "10 minutes"
 msgstr "10 å??é??"
 
-#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
+#: ../panels/power/power.ui.h:3
+#: ../panels/screen/screen.ui.h:6
 msgid "30 minutes"
 msgstr "30 å??é??"
 
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
+#: ../panels/power/power.ui.h:4
+#: ../panels/screen/screen.ui.h:8
 msgid "5 minutes"
 msgstr "5 å??é??"
 
@@ -2091,32 +2161,36 @@ msgstr "2 å??é??"
 msgid "3 minutes"
 msgstr "3 å??é??"
 
-#: ../panels/screen/screen.ui.h:8
+#: ../panels/screen/screen.ui.h:7
+msgid "30 seconds"
+msgstr "30 �"
+
+#: ../panels/screen/screen.ui.h:9
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../panels/screen/screen.ui.h:9
+#: ../panels/screen/screen.ui.h:10
 msgid "Dim screen to save power"
 msgstr "調æ??è?¢å¹?以ç¯?ç??é?»æº?"
 
 #. 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:11
+#: ../panels/screen/screen.ui.h:12
 msgid "Don't lock when at home"
 msgstr "å?¨å®¶æ??ä¸?è¦?é??å®?"
 
-#: ../panels/screen/screen.ui.h:12
+#: ../panels/screen/screen.ui.h:13
 msgid "Locations..."
 msgstr "�置�"
 
-#: ../panels/screen/screen.ui.h:14
+#: ../panels/screen/screen.ui.h:15
 msgid "Lock screen after:"
 msgstr "é??å®?è?¢å¹?æ??é??ï¼?"
 
-#: ../panels/screen/screen.ui.h:15
+#: ../panels/screen/screen.ui.h:16
 msgid "Screen turns off"
 msgstr "è?¢å¹?é??é??"
 
-#: ../panels/screen/screen.ui.h:16
+#: ../panels/screen/screen.ui.h:17
 msgid "Turn off after:"
 msgstr "é??é??æ??é??ï¼?"
 
@@ -2132,7 +2206,8 @@ msgstr "é??å??ç¨?å¼?ç??ç??æ?¬"
 msgid " â?? GNOME Volume Control Applet"
 msgstr " â?? GNOME é?³é??æ?§å?¶é?¢æ?¿ç¨?å¼?"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1923
+#: ../panels/sound/gvc-applet.c:276
+#: ../panels/sound/gvc-mixer-dialog.c:1923
 msgid "Output"
 msgstr "輸�"
 
@@ -2140,7 +2215,8 @@ msgstr "輸�"
 msgid "Sound Output Volume"
 msgstr "é?³æ??輸å?ºé?³é??"
 
-#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1840
+#: ../panels/sound/gvc-applet.c:282
+#: ../panels/sound/gvc-mixer-dialog.c:1840
 msgid "Input"
 msgstr "輸�"
 
@@ -2190,27 +2266,29 @@ 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 "é??é?³"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1631
+#: ../panels/sound/gvc-combo-box.c:167
+#: ../panels/sound/gvc-mixer-dialog.c:1631
 msgid "_Profile:"
 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"
@@ -2218,13 +2296,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 "系統é?³æ??"
 
@@ -2374,9 +2452,7 @@ msgstr "é?³é??æ?§å?¶"
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;"
-msgstr ""
-"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;é?³æ??å?¡;麥å??風;é?³é??;æ·¡"
-"å??;平衡;è??ç??;è?³æ©?;"
+msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;é?³æ??å?¡;麥å??風;é?³é??;æ·¡å??;平衡;è??ç??;è?³æ©?;"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:3
 msgid "Change sound volume and sound events"
@@ -2410,6 +2486,11 @@ msgstr "æ?²ç?»ç??"
 msgid "Sonar"
 msgstr "��"
 
+#: ../panels/universal-access/cc-ua-panel.c:470
+#: ../panels/universal-access/cc-ua-panel.c:475
+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;"
@@ -2434,314 +2515,303 @@ 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 "75%"
 
 #: ../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 å?? 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 "GOK"
 
-#: ../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..."
-msgstr "��設���"
+#: ../panels/universal-access/uap.ui.h:34
+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..."
-msgstr "�鼠設���"
+#: ../panels/universal-access/uap.ui.h:41
+msgid "Mouse Settings"
+msgstr "�鼠設��"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Nomon"
 msgstr "Nomon"
 
-#: ../panels/universal-access/uap.ui.h:57
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:45
 msgid "On screen keyboard"
 msgstr "����"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:46
 msgid "OnBoard"
 msgstr "OnBoard"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Options..."
 msgstr "���"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:48
 msgid "Pointing and Clicking"
 msgstr "æ??æ¨?å??é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../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:64
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Screen Reader"
 msgstr "�����"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:51
+msgid "Screen keyboard"
+msgstr "����"
+
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Seeing"
 msgstr "�覺"
 
-#: ../panels/universal-access/uap.ui.h:66
-msgid "Shift+Ctrl+Alt+-"
-msgstr "Shift+Ctrl+Alt+-"
-
-#: ../panels/universal-access/uap.ui.h:67
-msgid "Shift+Ctrl+Alt+="
-msgstr "Shift+Ctrl+Alt+="
-
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Simulated Secondary Click"
 msgstr "模æ?¬æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Slow Keys"
 msgstr "é?²ç·©æ??é?µ"
 
-#: ../panels/universal-access/uap.ui.h:74
-msgid "Sound Settings..."
-msgstr "é?³æ??設å®?å?¼â?¦"
+#: ../panels/universal-access/uap.ui.h:59
+msgid "Sound Settings"
+msgstr "é?³æ??設å®?å?¼"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Sticky Keys"
 msgstr "�����"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Test flash"
 msgstr "測試é??å??"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Text size:"
 msgstr "æ??å­?大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../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:79
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Trigger a click when the pointer hovers"
 msgstr "ç?¶å??止游æ¨?移å??æ??觸ç?¼é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../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:81
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Turn on accessibility features from the keyboard"
 msgstr "以é?µç?¤é??å??ç?¡é??ç¤?å??è?½"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Turn on or off:"
 msgstr "é??å??æ??é??é??ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Type here to test settings"
 msgstr "å?¨é??裡æ??å­?以測試設å®?å?¼"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Typing"
 msgstr "輸�"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Typing Assistant"
 msgstr "輸å?¥å?©ç??"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "ç?¶è­¦ç¤ºé?³æ??ç?¼å?ºæ??使ç?¨è¦?覺å??ç??æ??示"
 
-#: ../panels/universal-access/uap.ui.h:87
-msgid "Use an alternative form of text input"
-msgstr "使ç?¨æ??å­?輸å?¥ç??æ?¿ä»£å½¢å¼?"
-
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Video Mouse"
 msgstr "���鼠"
 
-#: ../panels/universal-access/uap.ui.h:89
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Visual Alerts"
 msgstr "�覺警示"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Zoom in:"
 msgstr "æ??è¿?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Zoom out:"
 msgstr "æ??é? ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:76
 msgid "_Motion threshold:"
 msgstr "移å??é??度(_M):"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:77
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:78
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:96
+#: ../panels/universal-access/uap.ui.h:79
 msgid "rejected"
 msgstr "å·²æ??çµ?"
 
+#: ../panels/universal-access/uap.ui.h:80
+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
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">High</span>"
+msgstr "<span size=\"x-large\">é«?</span>"
+
+#: ../panels/universal-access/uap.ui.h:82
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">Low</span>"
+msgstr "<span size=\"x-large\">ä½?</span>"
+
+#: ../panels/universal-access/uap.ui.h:83
+msgctxt "universal access, contrast"
+msgid "<span size=\"x-large\">Normal</span>"
+msgstr "<span size=\"x-large\">��</span>"
+
+#: ../panels/universal-access/uap.ui.h:84
+msgctxt "universal access, contrast"
+msgid "High"
+msgstr "é«?"
+
+#: ../panels/universal-access/uap.ui.h:85
+msgctxt "universal access, contrast"
+msgid "High/Inverse"
+msgstr "é«?/å??å·®"
+
+#: ../panels/universal-access/uap.ui.h:86
+msgctxt "universal access, contrast"
+msgid "Low"
+msgstr "ä½?"
+
+#: ../panels/universal-access/uap.ui.h:87
+msgctxt "universal access, contrast"
+msgid "Normal"
+msgstr "��"
+
+#. Translators: this refers to theme contrast and font size
+#: ../panels/universal-access/uap.ui.h:89
+msgctxt "universal access, seeing"
+msgid "Display"
+msgstr "顯示"
+
+#. Translators: this refers to screen magnifier
+#: ../panels/universal-access/uap.ui.h:91
+msgctxt "universal access, seeing"
+msgid "Zoom"
+msgstr "縮�"
+
 #: ../panels/user-accounts/run-passwd.c:426
 msgid "Authentication failed"
 msgstr "é©?è­?失æ??"
@@ -2824,28 +2894,20 @@ 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:3
+#: ../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:2
+#: ../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:4
-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."
+msgid "You are not allowed to access the device. Contact your system administrator."
 msgstr "æ?¨ä¸?被å??許使ç?¨é??å??è£?ç½®ã??è«?é?£çµ¡æ?¨ç??系統管ç??è??ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:109
@@ -2870,9 +2932,7 @@ msgid "_Delete Fingerprints"
 msgstr "å?ªé?¤æ??ç´?(_D)"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:235
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
+msgid "Do you want to delete your registered fingerprints so fingerprint login is disabled?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤å·²è¨»å??ç??æ??ç´?å??ï¼?é??麼ä¸?ä¾?å°?æ??å??ç?¨æ??ç´?ç?»å?¥ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:363
@@ -2916,9 +2976,7 @@ msgstr "å??ç?¨æ??ç´?ç?»å?¥"
 #.
 #: ../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."
+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:629
@@ -3054,9 +3112,7 @@ msgid "%s is still logged in"
 msgstr "%s ����中"
 
 #: ../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."
+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:439
@@ -3065,9 +3121,7 @@ msgid "Do you want to keep %s's files?"
 msgstr "æ?¨æ?³è¦?ä¿?ç?? %s ç??æª?æ¡?å??ï¼?"
 
 #: ../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."
+msgid "It is possible to keep the home directory, mail spool and temporary files around when deleting a user account."
 msgstr "ç?¶å?ªé?¤ä½¿ç?¨è??æ??æ?¯å?¯ä»¥ä¿?ç??家ç?®é??ã??æ?°é?²é?µä»¶(mail spool)å??æ?«å­?æª?æ¡?ç??ã??"
 
 #: ../panels/user-accounts/um-user-panel.c:446
@@ -3082,30 +3136,30 @@ msgstr "ä¿?ç??æª?æ¡?(_K)"
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:472
+#: ../panels/user-accounts/um-user-panel.c:498
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳è??å·²å??ç?¨"
 
-#: ../panels/user-accounts/um-user-panel.c:481
+#: ../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:484
+#: ../panels/user-accounts/um-user-panel.c:509
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:806
+#: ../panels/user-accounts/um-user-panel.c:831
 msgid "Failed to contact the accounts service"
 msgstr "ç?¡æ³?é?£æ?¥å¸³è??æ??å??"
 
-#: ../panels/user-accounts/um-user-panel.c:808
+#: ../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:841
+#: ../panels/user-accounts/um-user-panel.c:866
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -3113,12 +3167,12 @@ msgstr ""
 "������\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:879
+#: ../panels/user-accounts/um-user-panel.c:904
 msgid "Create a user"
 msgstr "建ç«?æ?°ç??使ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:890
-#: ../panels/user-accounts/um-user-panel.c:1189
+#: ../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"
@@ -3126,12 +3180,12 @@ msgstr ""
 "è¦?建ç«?使ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:899
+#: ../panels/user-accounts/um-user-panel.c:924
 msgid "Delete the selected user"
 msgstr "å?ªé?¤é?¸å??ç??使ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:911
-#: ../panels/user-accounts/um-user-panel.c:1194
+#: ../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"
@@ -3139,11 +3193,11 @@ msgstr ""
 "è¦?å?ªé?¤é?¸å??ç??使ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:1089
+#: ../panels/user-accounts/um-user-panel.c:1114
 msgid "My Account"
 msgstr "æ??ç??帳è??"
 
-#: ../panels/user-accounts/um-user-panel.c:1099
+#: ../panels/user-accounts/um-user-panel.c:1124
 msgid "Other Accounts"
 msgstr "å?¶ä»?帳è??"
 
@@ -3154,67 +3208,51 @@ msgstr "å? å?¥æ??移é?¤ä½¿ç?¨è??"
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:3
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
-msgstr ""
-"Login;Name;Fingerprint;Avatar;Logo;Face;Password;ç?»å?¥;å§?å??;æ??ç´?;大頭貼;æ¨?èª?;"
-"è??;å¯?碼;"
+msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;ç?»å?¥;å§?å??;æ??ç´?;大頭貼;æ¨?èª?;è??;å¯?碼;"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 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:5
+msgid "_Account Type"
+msgstr "帳è??é¡?å??(_A)"
+
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Account Type:"
-msgstr "帳è??é¡?å??(_A):"
+msgid "_Full name"
+msgstr "å?¨å??(_F)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-msgid "_Full name:"
-msgstr "å?¨å??(_F):"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-msgid "_Username:"
-msgstr "使ç?¨è??å??稱(_U):"
-
-#: ../panels/user-accounts/data/language-chooser.ui.h:1
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Cancel"
-msgstr "å??æ¶?"
+msgid "_Username"
+msgstr "使ç?¨è??å??稱(_U)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
-msgid ""
-"<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a "
-"strong password</a>"
-msgstr ""
-"<a href=\"http://wolfram.org/writing/howto/password.html\";>å¦?ä½?é?¸æ??強度é«?ç??å¯?"
-"碼</a>"
+msgid "<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a strong password</a>"
+msgstr "<a href=\"http://wolfram.org/writing/howto/password.html\";>å¦?ä½?é?¸æ??強度é«?ç??å¯?碼</a>"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-msgid ""
-"<small>This hint may be displayed at the login screen.  It will be visible "
-"to all users of this system.  Do <b>not</b> include the password here.</"
-"small>"
-msgstr ""
-"<small>é??å??æ??示å?¯è?½æ??顯示å?¨ç?»å?¥ç?«é?¢ã??å®?å°?æ??顯示給é??å??系統ä¸?ç??æ??æ??使ç?¨è??ã??è«?"
-"<b>ä¸?è¦?</b>å?¨é??裡寫å?¥å¯?碼ã??</small>"
+msgid "<small>This hint may be displayed at the login screen.  It will be visible to all users of this system.  Do <b>not</b> include the password here.</small>"
+msgstr "<small>é??å??æ??示å?¯è?½æ??顯示å?¨ç?»å?¥ç?«é?¢ã??å®?å°?æ??顯示給é??å??系統ä¸?ç??æ??æ??使ç?¨è??ã??è«?<b>ä¸?è¦?</b>å?¨é??裡寫å?¥å¯?碼ã??</small>"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:3
-msgid "C_onfirm password:"
-msgstr "確��碼(_O):"
+msgid "C_onfirm password"
+msgstr "確��碼(_O)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:4
 msgid "Ch_ange"
 msgstr "��(_A)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:5
-msgid "Changing password for:"
-msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å¯?碼ï¼?"
+msgid "Changing password for"
+msgstr "正����碼�"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
 msgid "Choose a generated password"
@@ -3225,8 +3263,8 @@ msgid "Choose password at next login"
 msgstr "å?¨ä¸?次ç?»å?¥æ??é?¸æ??å¯?碼"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
-msgid "Current _password:"
-msgstr "ç?®å??å¯?碼(_P):"
+msgid "Current _password"
+msgstr "ç?®å??ç??å¯?碼(_P)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Disable this account"
@@ -3249,16 +3287,16 @@ msgid "Set a password now"
 msgstr "��設��碼"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:14
-msgid "_Action:"
-msgstr "å??ä½?(_A):"
+msgid "_Action"
+msgstr "å??ä½?(_A)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:15
-msgid "_Hint:"
-msgstr "æ??示(_H):"
+msgid "_Hint"
+msgstr "æ??示(_H)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:16
-msgid "_New password:"
-msgstr "��碼(_N):"
+msgid "_New password"
+msgstr "��碼(_N)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:17
 msgid "_Show password"
@@ -3273,8 +3311,7 @@ msgid "Changing photo for:"
 msgstr "æ­£å?¨æ?¹è®?ç?¸ç??ï¼?"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid ""
-"Choose a picture that will be shown at the login screen for this account."
+msgid "Choose a picture that will be shown at the login screen for this account."
 msgstr "é?¸æ??é??å??帳è??è¦?顯示å?¨ç?»å?¥ç?«é?¢ç??ç?§ç??ã??"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:6
@@ -3293,29 +3330,25 @@ msgstr "ç?§ä¸?å¼µç?¸ç??"
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Account type"
+msgstr "帳è??é¡?å??"
+
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-msgid "Account type:"
-msgstr "帳è??é¡?å??ï¼?"
+msgid "Automatic Login"
+msgstr "è?ªå??ç?»å?¥"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Automatic Login:"
-msgstr "è?ªå??ç?»å?¥ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
-msgid "Fingerprint Login:"
-msgstr "æ??ç´?ç?»å?¥ï¼?"
+msgid "Fingerprint Login"
+msgstr "æ??ç´?ç?»å?¥"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "Language:"
-msgstr "���"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "Login Options"
 msgstr "����"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-msgid "Password:"
-msgstr "�碼� "
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+msgid "Password"
+msgstr "�碼"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:2
 msgid "Left index finger"
@@ -3362,9 +3395,7 @@ msgid "Right thumb"
 msgstr "å?³æ??å§?æ??"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:13
-msgid ""
-"Your fingerprint was successfully saved. You should now be able to log in "
-"using your fingerprint reader."
+msgid "Your fingerprint was successfully saved. You should now be able to log in using your fingerprint reader."
 msgstr "æ?¨ç??æ??ç´?å·²æ??å??ç??å?²å­?äº?ã??ç?¾å?¨æ??該å?¯ä»¥ä½¿ç?¨æ?¨ç??æ??ç´?辨è­?å?¨ä¾?ç?»å?¥ã??"
 
 #: ../shell/control-center.c:47
@@ -3388,7 +3419,8 @@ msgstr ""
 "%s\n"
 "å?·è¡? ã??%s --helpã??以æ?¥ç??å®?æ?´ç??å?½ä»¤å??å?¯ç?¨é?¸é ?æ¸?å?®ã??\n"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
+#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../shell/shell.ui.h:1
 msgid "System Settings"
 msgstr "系統設��"
 
@@ -3400,167 +3432,198 @@ msgstr "��中�"
 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 "Set the system proxy settings"
+#~ msgstr "設å®?系統代ç??伺æ??å?¨è¨­å®?å?¼"
+
+#~ msgid "Virtual private network"
+#~ 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 "Options"
+#~ msgid "_Options"
+#~ msgstr "��(_O)"
+#~ msgid "Preparing connection"
+#~ msgstr "æ­£å?¨æº?å??é?£ç·?"
+#~ msgid "Configuring connection"
+#~ msgstr "正�設���"
+#~ msgid "Authenticating"
+#~ msgstr "正���"
+#~ msgid "Getting network address"
+#~ msgstr "æ­£å?¨å??å¾?網路ä½?å??"
+#~| msgid "Getting network address"
+#~ msgid "Checking network address"
+#~ msgstr "æ­£å?¨æª¢æ?¥ç¶²è·¯ä½?å??"
+#~ msgid "Failed to connect"
+#~ msgstr "����"
+#~| msgid "Hearing"
+#~ msgid "Preparing"
+#~ msgstr "æ­£å?¨æº?å??"
+#~| msgid "0 active"
+#~ msgid "Active"
+#~ msgstr "使�中"
+#~| msgid "_File"
+#~ msgid "Failed"
+#~ msgstr "失æ??"
+#~ msgctxt "Account type"
+#~ msgid "Supervised"
+#~ msgstr "已��"
+#~ msgid "Chipset"
+#~ msgstr "æ?¶ç??"
+#~ msgid "Could not connect to system bus: %s"
+#~ msgstr "ç?¡æ³?é?£ç·?è?³ç³»çµ±å?¯æµ?æ??ï¼?%s"
+#~ msgid "Secure HTTP Proxy:"
+#~ msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨ï¼?"
+#~ 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 "HighContrast"
+#~ msgstr "���"
+#~ msgid "HighContrastInverse"
+#~ msgstr "é«?å??å·®"
+#~ msgid "LowContrast"
+#~ msgstr "���"
+#~ msgid "Shift+Ctrl+Alt+-"
+#~ msgstr "Shift+Ctrl+Alt+-"
+#~ msgid "Shift+Ctrl+Alt+="
+#~ msgstr "Shift+Ctrl+Alt+="
+#~ msgid "Use an alternative form of text input"
+#~ msgstr "使ç?¨æ??å­?輸å?¥ç??æ?¿ä»£å½¢å¼?"
+#~ msgid "Language:"
+#~ msgstr "���"
 #~ msgid "%i kb/s"
 #~ msgstr "%i kb/s"
-
-#~ msgid "%i Mb/s"
-#~ msgstr "%i Mb/s"
-
 #~ msgid "%i Gb/s"
 #~ msgstr "%i Gb/s"
-
 #~ msgid "More Info"
 #~ msgstr "����"
-
 #~ msgid "Error unsetting accelerator in configuration database: %s"
 #~ msgstr "å?¨çµ?æ??è³?æ??庫中å??æ¶?設å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
-
 #~ msgid "User"
 #~ msgstr "使ç?¨è??"
-
 #~ msgid "Off"
 #~ msgstr "é??é??"
-
 #~ msgid "On"
 #~ msgstr "é??"
-
 #~| msgid "Idle"
 #~ msgctxt "printer state"
 #~ msgid "Idle"
 #~ msgstr "é??ç½®"
-
-#~ msgid "0 active"
-#~ msgstr "0 使�中"
-
 #~ msgid "List of keyboard layouts selected for usage"
 #~ msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
-
 #~ msgid "New windows u_se active window's layout"
 #~ msgstr "æ?°è¦?çª?延ç?¨ä½¿ç?¨ä¸­è¦?çª?ç??é??ç½®(_S)"
-
 #~ msgid "By _country"
 #~ msgstr "ä¾?å??家(_C)"
-
 #~ msgid "By _language"
 #~ msgstr "���(_L)"
-
 #~ msgid "Preview:"
 #~ msgstr "�覽�"
-
 #~ msgid "_Country:"
 #~ msgstr "å??家(_C):"
-
 #~ msgid "_Language:"
 #~ msgstr "��(_L):"
-
 #~ msgid "_Variants:"
 #~ msgstr "è®?é«?(_V):"
-
 #~ msgid "Upside Down"
 #~ msgstr "ç?±ä¸?è??ä¸?"
-
 #~ msgid "Clean Print Heads"
 #~ msgstr "æ¸?ç??å??å?°å?´é ­"
-
 #~ msgid "Description:"
 #~ msgstr "æ??è¿°ï¼?"
-
-#~ msgid "Disable Printer"
-#~ msgstr "å??ç?¨å?°è¡¨æ©?"
-
 #~ msgid "Queue"
 #~ msgstr "ä½?å??"
-
 #~ msgid "Share with these users:"
 #~ msgstr "è??é??äº?使ç?¨è??å??享ï¼?"
-
 #~ msgid "Show / hide printer's jobs"
 #~ msgstr "顯示 / é?±è??å?°è¡¨æ©?å·¥ä½?"
-
 #~ msgid "Status:"
 #~ msgstr "ç??æ??ï¼?"
-
 #~| msgid "add-toolbutton"
 #~ msgid "pause-toolbutton"
 #~ msgstr "å? å?¥å·¥å?·æ??é??"
-
 #~| msgid "remove-toolbutton"
 #~ msgid "resume-toolbutton"
 #~ msgstr "移é?¤å·¥å?·æ??é??"
-
 #~| msgid "add-toolbutton"
 #~ msgid "stop-toolbutton"
 #~ msgstr "å? å?¥å·¥å?·æ??é??"
-
 #~| msgid "add-toolbutton"
 #~ msgid "toolbutton1"
 #~ msgstr "å? å?¥å·¥å?·æ??é??"
-
 #~| msgid "add-toolbutton"
 #~ msgid "toolbutton2"
 #~ msgstr "å? å?¥å·¥å?·æ??é??"
-
 #~ msgid "Keyboard _model:"
 #~ msgstr "��模�(_M)"
-
 #~ 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 "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 "_Add..."
 #~ msgstr "å? å?¥(_A)â?¦"
-
 #~ msgid "Choose a Keyboard Model"
 #~ msgstr "é?¸æ??é?µç?¤å??è??"
-
 #~ msgid "_Models:"
 #~ msgstr "å??è??(_M):"
-
 #~ msgid "_Vendors:"
 #~ msgstr "製é? å??(_V):"
-
 #~ msgid "Vendors"
 #~ msgstr "製é? å??"
-
 #~ msgid "AC power and inactive for:"
 #~ msgstr "AC é?»æº?ä¸?é??ç½®ï¼?"
-
 #~ msgid "Battery power and inactive for:"
 #~ msgstr "é?»æ± é?»æº?ä¸?é??ç½®ï¼?"
-
 #~ msgid "Put the computer to sleep when on:"
 #~ msgstr "å?¨æ­¤æ??é??è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
-
 #~ msgid "Open"
 #~ msgstr "é??å??"
-
 #~ msgid "Restrictions:"
 #~ msgstr "é??å?¶ï¼?"
-
 #~ msgid "Hold"
 #~ msgstr "ä¿?ç??"
-
 #~| msgid "Iceweasel"
 #~ msgid "Release"
 #~ msgstr "é??æ?¾"
-
 #~| 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 "
@@ -3581,43 +3644,31 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "\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 "Show Shutdown, Suspend and Restart actions"
 #~ msgstr "顯示é??æ©?ã??æ?«å??å??é??æ?°å??å??ç­?å??ä½?"
-
 #~ msgid "Show list of users"
 #~ msgstr "顯示使ç?¨è??æ¸?å?®"
-
 #~ msgid "Show password hints"
 #~ msgstr "顯示å¯?碼æ??示"
-
 #~| msgid "Mutt"
 #~ msgid "Butter"
 #~ msgstr "奶油"
-
 #~| msgid "Orca"
 #~ msgid "Orange"
 #~ msgstr "æ©?"
-
 #~ msgid "Chocolate"
 #~ msgstr "å·§å??å??"
-
 #~| msgid "Galeon"
 #~ msgid "Chameleon"
 #~ msgstr "Galeon"
-
 #, fuzzy
 #~ msgid "Plum"
 #~ msgstr "��"
@@ -3644,6 +3695,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgstr "�%d %s �%d %s"
 
 #~ msgid "pixel"
+
 #~ msgid_plural "pixels"
 #~ msgstr[0] "å??ç´ "
 
@@ -3677,364 +3729,245 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~| msgid "D_elay:"
 #~ msgid "Day:"
 #~ msgstr "��"
-
 #~ msgid "Set time automatically"
 #~ msgstr "è?ªå??設å®?æ??å?»"
-
 #~ msgid "Year:"
 #~ msgstr "å¹´ï¼?"
-
 #~ msgid "Preferred Applications"
 #~ msgstr "é¦?é?¸æ??ç?¨ç¨?å¼?"
-
 #~ msgid "Select your default applications"
 #~ msgstr "é?¸å??é ?設使ç?¨ç??æ??ç?¨ç¨?å¼?"
-
 #~ msgid "Start the preferred visual assistive technology"
 #~ msgstr "å??å??é¦?é?¸ç??è¦?覺è¼?å?©æ??è¡?"
-
 #~ msgid "Visual Assistance"
 #~ msgstr "�覺��"
-
 #~| msgid "Error parsing arguments: %s\n"
 #~ msgid "Error setting default browser: %s"
 #~ msgstr "設å®?é ?設ç??覽å?¨æ??ç?¼ç??é?¯èª¤ï¼?%s"
-
 #~| msgid "Error parsing arguments: %s\n"
 #~ msgid "Error setting default mailer: %s"
 #~ msgstr "設å®?é ?設é?µä»¶ç¨?å¼?æ??ç?¼ç??é?¯èª¤ï¼?%s"
-
 #~ msgid "Could not load the main interface"
 #~ msgstr "����主��"
-
 #~ msgid "Please make sure that the applet is properly installed"
 #~ msgstr "è«?確å®?該é?¢æ?¿ç¨?å¼?å·²ç¶?å®?è£?妥ç?¶ã??"
-
 #~ msgid "Accessibility"
 #~ msgstr "ç?¡é??ç¤?ç?°å¢?"
-
 #~ msgid "All %s occurrences will be replaced with actual link"
 #~ msgstr "æ??æ?? %s é?½æ??å??代ç?ºç??實ç??é?£çµ?"
-
 #~ msgid "Co_mmand:"
 #~ msgstr "æ??令(_M):"
-
 #~ msgid "E_xecute flag:"
 #~ msgstr "å?·è¡?æ??æ¨?(_X):"
-
 #~ msgid "Instant Messenger"
 #~ msgstr "å?³æ??é??è¨?ç¨?å¼?"
-
 #~ msgid "Internet"
 #~ msgstr "網é??網路"
-
 #~ msgid "Mail Reader"
 #~ msgstr "���件�信��"
-
 #~ msgid "Mobility"
 #~ msgstr "移å??æ?§"
-
 #~ msgid "Run at st_art"
 #~ msgstr "å??å??æ??å?·è¡?(_A)"
-
 #~ msgid "Run in t_erminal"
 #~ msgstr "��端�中��(_E)"
-
 #~ msgid "Terminal Emulator"
 #~ msgstr "�端�模���"
-
 #~ msgid "Text Editor"
 #~ msgstr "æ??å­?編輯å?¨"
-
 #~ msgid "Visual"
 #~ msgstr "�覺"
-
 #~ msgid "Web Browser"
 #~ msgstr "網é ?ç??覽å?¨"
-
 #~ msgid "_Run at start"
 #~ msgstr "å??å??æ??å?·è¡?(_R)"
-
 #~ msgid "Banshee Music Player"
 #~ msgstr "Banshee ������"
-
 #~ msgid "Debian Terminal Emulator"
 #~ msgstr "Debian Terminal Emulator"
-
 #~ msgid "ETerm"
 #~ msgstr "ETerm"
-
 #~ msgid "GNOME Magnifier without Screen Reader"
 #~ msgstr "ç?¡è?¢å¹?é?±è®?å?¨ç?? GNOME æ?¾å¤§é?¡"
-
 #~ msgid "GNOME OnScreen Keyboard"
 #~ msgstr "GNOME ����"
-
 #~ msgid "GNOME Terminal"
 #~ msgstr "GNOME �端�"
-
 #~ msgid "Gnopernicus"
 #~ msgstr "Gnopernicus"
-
 #~ msgid "Gnopernicus with Magnifier"
 #~ msgstr "å?·æ?¾å¤§é?¡ç?? Gnopernicus"
-
 #~ msgid "KDE Magnifier without Screen Reader"
 #~ msgstr "ç?¡è?¢å¹?é?±è®?å?¨ç?? KDE æ?¾å¤§é?¡"
-
 #~ msgid "Konsole"
 #~ msgstr "Konsole"
-
 #~ msgid "Linux Screen Reader"
 #~ msgstr "Linux �����"
-
 #~ msgid "Linux Screen Reader with Magnifier"
 #~ msgstr "å?·æ?¾å¤§é?¡ç?? Linux è?¢å¹?é?±è®?å?¨"
-
 #~ msgid "Listen"
 #~ msgstr "è?½å??"
-
 #~ msgid "Muine Music Player"
 #~ msgstr "Muine ������"
-
 #~ msgid "NXterm"
 #~ msgstr "NXterm"
-
 #~ msgid "Orca"
 #~ msgstr "Orca"
-
 #~ msgid "Orca with Magnifier"
 #~ msgstr "å?·æ?¾å¤§é?¡ç?? Orca"
-
 #~ msgid "RXVT"
 #~ msgstr "RXVT"
-
 #~ msgid "Rhythmbox Music Player"
 #~ msgstr "Rhythmbox ������"
-
 #~ msgid "Standard XTerminal"
 #~ msgstr "æ¨?æº?ç?? X çµ?端æ©?"
-
 #~ msgid "Terminator"
 #~ msgstr "Terminator"
-
 #~ msgid "Totem Movie Player"
 #~ msgstr "Totem å½±ç??æ?­æ?¾ç¨?å¼?"
-
 #~ msgid "aterm"
 #~ msgstr "aterm"
-
 #~ msgid "_Detect monitors"
 #~ msgstr "�測��(_D)"
-
 #~| msgid "Mirror Screens"
 #~ msgid "_Mirror Screens"
 #~ msgstr "����(_M)"
-
 #~ msgid "Mirror Screens"
 #~ msgstr "����"
-
 #~ msgid "Desktop"
 #~ msgstr "æ¡?é?¢"
-
 #~| msgid "_Application font:"
 #~ msgid "No applications found"
 #~ msgstr "æ?¾ä¸?å?°æ??ç?¨ç¨?å¼?"
-
 #~| msgid "Open with \"%s\""
 #~ msgid "Open %s"
 #~ msgstr "é??å?? %s"
-
 #~| msgid "Open with Default Application"
 #~ msgid "Open with other Application..."
 #~ msgstr "以å?¶ä»?ç¨?å¼?é??å??..."
-
 #~| msgid "Could not get screen information"
 #~ msgid "Could not run application"
 #~ msgstr "ç?¡æ³?å?·è¡?æ??ç?¨ç¨?å¼?"
-
 #~| msgid "Could not open %s: %s\n"
 #~ msgid "Could not find '%s'"
 #~ msgstr "æ?¾ä¸?å?°ã??%sã??"
-
 #~| msgid "Could not get screen information"
 #~ msgid "Could not find application"
 #~ msgstr "æ?¾ä¸?å?°æ??ç?¨ç¨?å¼?"
-
 #~ msgid "Could not add application to the application database: %s"
 #~ msgstr "ç?¡æ³?å°?ç¨?å¼?å? å?¥æ??ç?¨ç¨?å¼?è³?æ??庫ï¼?%s"
-
 #~| msgid "Could not detect displays"
 #~ msgid "Could not add application"
 #~ msgstr "ç?¡æ³?å? å?¥æ??ç?¨ç¨?å¼?"
-
 #~| msgid "Could not get information for %s: %s\n"
 #~ msgid "Could not set application as the default: %s"
 #~ msgstr "ç?¡æ³?å°?æ??ç?¨ç¨?å¼?設ç?ºé ?設å?¼ï¼?%s"
-
 #~| msgid "Select your default applications"
 #~ msgid "Could not set as default application"
 #~ msgstr "ç?¡æ³?設å®?ç?ºé ?設ç??æ??ç?¨ç¨?å¼?"
-
 #~| msgid "Open with \"%s\""
 #~ msgid "Open With"
 #~ msgstr "以此é??å??"
-
 #~ msgid "_Use a custom command"
 #~ msgstr "使ç?¨è?ªè¨?æ??令(_U)"
-
 #~ msgid "_Browse..."
 #~ msgstr "ç??覽(_B)..."
-
 #~ msgid "_Open"
 #~ msgstr "é??å??(_O)"
-
 #~ msgid "Open %s and other %s document with:"
 #~ msgstr "以此é??å?? %s å??å?¶ä»? %s æ??件ï¼?"
-
 #~| msgid "Open with \"%s\""
 #~ msgid "Open %s with:"
 #~ msgstr "以此é??å?? %sï¼?"
-
 #~ msgid "_Remember this application for %s documents"
 #~ msgstr "è¨?ä½?é??å??æ??ç?¨ç¨?å¼?ç?¨æ?¼ %s æ??件(_R)"
-
 #~ msgid "Open all %s documents with:"
 #~ msgstr "以此é??å??æ??æ?? %s æ??件ï¼?"
-
 #~ msgid "Open %s and other \"%s\" files with:"
 #~ msgstr "以此é??å?? %s å??å?¶ä»?ã??%sã??æª?æ¡?ï¼?"
-
 #~ msgid "_Remember this application for \"%s\" files"
 #~ msgstr "è¨?ä½?é??å??æ??ç?¨ç¨?å¼?ç?¨æ?¼ã??%sã??æª?æ¡?(_R)"
-
 #~ msgid "Open all \"%s\" files with:"
 #~ msgstr "以此é??å??æ??æ??ã??%sã??æª?æ¡?ï¼?"
-
-#~| msgid "_Add..."
-#~ msgid "_Add"
-#~ msgstr "å? å?¥(_A)"
-
 #~| msgid "Preferred Applications"
 #~ msgid "Add Application"
 #~ msgstr "å? å?¥æ??ç?¨ç¨?å¼?"
-
 #~ msgid "B_rowse media when inserted"
 #~ msgstr "æ??å?¥æ??ç??覽åª?é«?(_R)"
-
 #~ msgid "_Pointer can be controlled using the keypad"
 #~ msgstr "å??許使ç?¨é?µç?¤æ?§å?¶æ»?é¼ æ??æ¨?(_P)"
-
 #~ msgid "_Type to test settings:"
 #~ msgstr "è«?輸å?¥æ??å­?ä¾?測試設å®?(_T):"
-
 #~ msgid "Choose type of click _beforehand"
 #~ msgstr "äº?å??é?¸æ??é»?æ??ç??é¡?å??(_B)"
-
 #~ msgid "Choose type of click with mo_use gestures"
 #~ msgstr "é?¸æ??æ»?é¼ æ??å?¢ç??é»?æ??é¡?å??(_U)"
-
 #~ msgid "D_ouble click:"
 #~ msgstr "é??æ??(_O):"
-
 #~ msgid "D_rag click:"
 #~ msgstr "æ??æ?³é»?æ??(_R):"
-
 #~ msgid "Dwell Click"
 #~ msgstr "æ?¿ä»£é»?æ??"
-
 #~ msgid "Seco_ndary click:"
 #~ msgstr "次è¦?é»?æ??(_N):"
-
 #~ msgid "Show click type _window"
 #~ msgstr "顯示é»?æ??é¡?å??è¦?çª?(_W)"
-
 #~ msgid ""
 #~ "You can also use the Dwell Click panel applet to choose the click type."
 #~ msgstr "æ?¨å?¯ä»¥ä½¿ç?¨ã??æ?¿ä»£é»?æ??ã??é?¢æ?¿ç¨?å¼?ä¾?é?¸æ??é»?æ??ç??é¡?å??ã??"
-
 #~ msgid "_Initiate click when stopping pointer movement"
 #~ msgstr "ç?¶å??止游æ¨?移å??æ??å??å§?å??é»?æ??(_I)"
-
 #~ msgid "_Single click:"
 #~ msgstr "å?®æ??(_S):"
-
 #~ msgid "_Trigger secondary click by holding down the primary button"
 #~ msgstr "æ??ä½?主è¦?é?µæ??觸ç?¼æ¬¡è¦?é»?æ??(_T)"
-
 #~ msgid "Location already exists"
 #~ msgstr "�置已���"
-
 #~ msgid "Set your network proxy preferences"
 #~ msgstr "設å®?代ç??伺æ??å?¨"
-
 #~| msgid "Location:"
 #~ msgid "Web;Location;"
 #~ msgstr "��水平�置"
-
 #~ msgid "<b>Di_rect internet connection</b>"
 #~ msgstr "<b>��網路��(_R)</b>"
-
-#~ msgid "<b>_Automatic proxy configuration</b>"
-#~ msgstr "<b>è?ªå??設å®?代ç??伺æ??å?¨(_A)</b>"
-
 #~ msgid "<b>_Manual proxy configuration</b>"
 #~ msgstr "<b>è?ªè¨?代ç??伺æ??å?¨(_M)</b>"
-
 #~ msgid "<b>_Use authentication</b>"
 #~ msgstr "<b>é??è¦?èª?è­?(_U)</b>"
-
 #~ msgid "C_reate"
 #~ msgstr "建�(_R)"
-
 #~ msgid "Create New Location"
 #~ msgstr "建ç«?æ?°ç??ä½?ç½®"
-
 #~ msgid "HTTP Proxy Details"
 #~ msgstr "HTTP 代ç??伺æ??å?¨è¨­å®?"
-
 #~ msgid "Ignore Host List"
 #~ msgstr "忽�主���"
-
 #~ msgid "Ignored Hosts"
 #~ msgstr "忽ç?¥ç??主æ©?"
-
 #~ msgid "Network Proxy Preferences"
 #~ msgstr "網路代ç??伺æ??å?¨å??好設å®?"
-
 #~ msgid "Port:"
 #~ msgstr "���:"
-
 #~ msgid "Proxy Configuration"
 #~ msgstr "代ç??伺æ??å?¨è¨­å®?"
-
 #~ msgid "The location already exists."
 #~ msgstr "該ä½?置已ç¶?å­?å?¨ã??"
-
 #~ msgid "_Delete Location"
 #~ msgstr "å??é?¤ä½?ç½®(_D)"
-
 #~ msgid "_Details"
 #~ msgstr "詳細設�(_D)"
-
 #~ msgid "_Location name:"
 #~ msgstr "ä½?ç½®å??稱(_L):"
-
 #~ msgid "_Password:"
 #~ msgstr "�碼(_P):"
-
 #~ msgid "_Use the same proxy for all protocols"
 #~ msgstr "æ??æ??å??å®?ç??使ç?¨ç?¸å??ç??代ç??伺æ??å?¨(_U)"
-
 #~ msgid "Show Universal Access status"
 #~ msgstr "顯示ç?¡é??ç¤?å??è?½ç??æ??"
-
 #~ msgid "Example Panel"
 #~ msgstr "����"
-
 #~ msgid "Example preferences panel"
 #~ msgstr "ç¯?ä¾?å??好設å®?é?¢æ?¿"
-
 #, fuzzy
 #~ msgid "Foo;Bar;Baz;"
 #~ msgstr "令é?²åº¦å??å?§ç??æ?¹å¡?ä¾?å??移å??"
@@ -4325,6 +4258,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgstr "ç?¾å?¨ä¼?æ?¯ï¼?å?©ä¸? %då??ï¼?"
 
 #~ msgid "%d minute until the next break"
+
 #~ msgid_plural "%d minutes until the next break"
 #~ msgstr[0] "è·?é?¢ä¼?æ?¯æ??é??é??æ?? %d å??é??"
 
@@ -4666,9 +4600,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "A_IM/iChat:"
 #~ msgstr "A_IM/iChat:"
 
-#~ msgid "Address"
-#~ msgstr "å?°å??"
-
 #~ msgid "C_ompany:"
 #~ msgstr "��(_O):"
 
@@ -4884,6 +4815,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "The font selected is %d point large, and may make it difficult to "
 #~ "effectively use the computer.  It is recommended that you select a size "
 #~ "smaller than %d."
+
 #~ msgid_plural ""
 #~ "The font selected is %d points large, and may make it difficult to "
 #~ "effectively use the computer. It is recommended that you select a size "
@@ -4896,6 +4828,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "The font selected is %d point large, and may make it difficult to "
 #~ "effectively use the computer.  It is recommended that you select a "
 #~ "smaller sized font."
+
 #~ msgid_plural ""
 #~ "The font selected is %d points large, and may make it difficult to "
 #~ "effectively use the computer. It is recommended that you select a smaller "
@@ -5503,9 +5436,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Fill screen"
 #~ msgstr "���"
 
-#~ msgid "Interface"
-#~ msgstr "ä»?é?¢"
-
 #~ msgid "Menus and Toolbars"
 #~ msgstr "é?¸å?®å??å·¥å?·å??"
 
@@ -5518,9 +5448,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "_Editable menu shortcut keys"
 #~ msgstr "�編輯�����(_E)"
 
-#~ msgid "_File"
-#~ msgstr "��(_F)"
-
 #~ msgid "A_cceleration:"
 #~ msgstr "å? é??度(_C):"
 
@@ -5545,10 +5472,8 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgstr ""
 #~ "æ?¾ä¸?å?°ç?¸ç¬¦ã??\n"
 #~ "篩é?¸ â??%sâ?? æ??æ²?æ??ä»»ä½?å?¹é??ç??é ?ç?®ã??"
-
 #~ msgid "Unknown login ID, the user database might be corrupted"
 #~ msgstr "ä¸?æ??ç??ç?»å?¥ IDï¼?使ç?¨è??è³?æ??庫å?¯è?½å·²ç¶?å??æ??"
-
 #~ msgid ""
 #~ "Left thumb\n"
 #~ "Left middle finger\n"
@@ -5567,82 +5492,56 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "å?³æ??中æ??\n"
 #~ "å?³æ??ç?¡å??æ??\n"
 #~ "å?³æ??å°?æ??"
-
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>���件</b>"
-
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>�家</b>"
-
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>�業</b>"
-
 #~ msgid "<b>Web</b>"
 #~ msgstr "<b>Web</b>"
-
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>工�</b>"
-
 #~ msgid "<span size=\"larger\" weight=\"bold\">Change your password</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\">���碼</span>"
-
 #~ msgid "<b>Assistive Technologies</b>"
 #~ msgstr "<b>è¼?å?©ç§?æ??</b>"
-
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>å??好設å®?</b>"
-
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>�覽</b>"
-
 #~ msgid "<b>_Desktop Background</b>"
 #~ msgstr "<b>æ¡?é?¢è??æ?¯(_D)</b>"
-
 #~ msgid "<b>Visual</b>"
 #~ msgstr "<b>�覺</b>"
-
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>å??ç?¨å??é?µ</b>"
-
 #~ msgid "<b>General</b>"
 #~ msgstr "<b>��</b>"
-
 #~ msgid "<small><i>Fast</i></small>"
 #~ msgstr "<small><i>å¿«</i></small>"
-
 #~ msgid "<small><i>Long</i></small>"
 #~ msgstr "<small><i>é?·</i></small>"
-
 #~ msgid "<small><i>Short</i></small>"
 #~ msgstr "<small><i>ç?­</i></small>"
-
 #~ msgid "<small><i>Slow</i></small>"
 #~ msgstr "<small><i>æ?¢</i></small>"
-
 #~ msgid "<b>Locate Pointer</b>"
 #~ msgstr "<b>顯示鼠��置</b>"
-
 #~ msgid "<small><i>High</i></small>"
 #~ msgstr "<small><i>é?·</i></small>"
-
 #~ msgid "<small><i>Large</i></small>"
 #~ msgstr "<small><i>å¿«</i></small>"
-
 #~ msgid "<small><i>Low</i></small>"
 #~ msgstr "<small><i>ç?­</i></small>"
-
 #~ msgid "<small><i>Small</i></small>"
 #~ msgstr "<small><i>æ?¢</i></small>"
-
 #~ msgid "<b>Ignore Host List</b>"
 #~ msgstr "<b>忽ç?¥ä¸»æ©?å??表</b>"
-
 #~ msgid "C_ut"
 #~ msgstr "��(_U)"
-
 #~ msgid "Save File"
 #~ msgstr "����"
-
 #~ msgid ""
 #~ "Solid color\n"
 #~ "Horizontal gradient\n"
@@ -5651,7 +5550,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "���彩\n"
 #~ "水平漸層\n"
 #~ "å??ç?´æ¼¸å±¤"
-
 #~ msgid ""
 #~ "Text below items\n"
 #~ "Text beside items\n"
@@ -5662,7 +5560,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "æ??å­?å?¨é ?ç?®æ??\n"
 #~ "å?ªæ??å??示\n"
 #~ "å?ªæ??æ??å­?"
-
 #~ msgid ""
 #~ "Tiled\n"
 #~ "Zoom\n"
@@ -5675,19 +5572,14 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "置中\n"
 #~ "縮�\n"
 #~ "填滿��"
-
 #~ msgid "_Copy"
 #~ msgstr "�製(_C)"
-
 #~ msgid "_New"
 #~ msgstr "��(_N)"
-
 #~ msgid "_Quit"
 #~ msgstr "çµ?æ??(_Q)"
-
 #~ msgid "_Save"
 #~ msgstr "��(_S)"
-
 #~ msgid ""
 #~ "Normal\n"
 #~ "Left\n"
@@ -5698,181 +5590,123 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "å·¦é??\n"
 #~ "å?³é??\n"
 #~ "ç?±ä¸?è??ä¸?\n"
-
 #~ msgid "Could not apply the selected configuration"
 #~ msgstr "ç?¡æ³?å¥?ç?¨é?¸å??ç??çµ?æ??"
-
 #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR"
 #~ msgstr "ç?¡æ³?å??å¾? org.gnome.SettingsDaemon.XRANDR"
-
 #~ msgid "_Command:"
 #~ msgstr "æ??令(_C):"
-
 #~ msgid "/_About"
 #~ msgstr "/é??æ?¼(_A)"
-
 #~ msgid "Screen Resolution"
 #~ msgstr "è?¢å¹?解æ??度"
-
 #~ msgid "<b>_Wallpaper</b>"
 #~ msgstr "<b>��(_W)</b>"
-
 #~ msgid "Monitor Resolution Settings"
 #~ msgstr "è?¢å¹?解æ??度設å®?å?¼"
-
 #~ msgid "Retrieve and store legacy settings"
 #~ msgstr "è®?å?¥è??ç??æ?¬ç??設å®?"
-
 #~ msgid "Autodetect"
 #~ msgstr "è?ªå??å?µæ¸¬"
-
 #~ msgid "ALSA - Advanced Linux Sound Architecture"
 #~ msgstr "ALSA - å??é?² Linux é?³æ??æ?¶æ§?"
-
 #~ msgid "Artsd - ART Sound Daemon"
 #~ msgstr "Artsd - ART é?³æ??æ??å??ç¨?å¼?"
-
 #~ msgid "ESD - Enlightened Sound Daemon"
 #~ msgstr "ESD - Enlightenment é?³æ??æ??å??ç¨?å¼?"
-
 #~ msgid "OSS - Open Sound System"
 #~ msgstr "OSS - é??æ?¾é?³æ??系統"
-
 #~ msgid "PulseAudio Sound Server"
 #~ msgstr "Polypaudio é?³æ??伺æ??å?¨"
-
 #~ msgid "Silence"
 #~ msgstr "ç?¡è?²"
-
 #~ msgid "- GNOME Sound Preferences"
 #~ msgstr " - GNOME é?³æ??å??好設å®?"
-
 #~ msgid "<b>Alerts and Sound Effects</b>"
 #~ msgstr "<b>警示è??è?²é?³æ??æ??</b>"
-
 #~ msgid "<b>Audio Conferencing</b>"
 #~ msgstr "<b>é?³è¨?æ??è­°</b>"
-
 #~ msgid "<b>Default Mixer Tracks</b>"
 #~ msgstr "<b>é ?設混é?³å?¨è?²é??</b>"
-
 #~ msgid "<b>Music and Movies</b>"
 #~ msgstr "<b>é?³æ¨?å??å½±ç??</b>"
-
 #~ msgid "<b>Sound Events</b>"
 #~ msgstr "<b>äº?件é?³æ??</b>"
-
 #~ msgid "<b>Sound Theme</b>"
 #~ msgstr "<b>é?³æ??ä½?æ?¯ä¸»é¡?</b>"
-
 #~ msgid "Click OK to finish."
 #~ msgstr "æ??確å®?ä¾?å®?æ??"
-
 #~ msgid "Play _sound effects when buttons are clicked"
 #~ msgstr "ç?¶æ??é??被é»?æ??æ??æ?­æ?¾é?³æ??(_S)"
-
 #~ msgid ""
 #~ "Select the device and tracks to control with the keyboard. Use the Shift "
 #~ "and Control keys to select multiple tracks if required."
 #~ msgstr ""
 #~ "以é?µç?¤é?¸å??è£?ç½®å??è?²é??ã??å¦?é??è¦?æ??使ç?¨ Shift å?? Control é?µä¾?é?¸æ??å¤?æ¢?è?²é??ã??"
-
 #~ msgid "So_und playback:"
 #~ msgstr "����(_U):"
-
 #~ msgid "Sou_nd capture:"
 #~ msgstr "è?²é?³æ?·å??(_N):"
-
 #~ msgid "Sounds"
 #~ msgstr "é?³æ??"
-
 #~ msgid "Testing Pipeline"
 #~ msgstr "管é??測試"
-
 #~ msgid "_Play alerts and sound effects"
 #~ msgstr "æ?­æ?¾è­¦ç¤ºè??è?²é?³æ??æ??(_P)"
-
 #~ msgid "_Sound playback:"
 #~ msgstr "����(_S):"
-
 #~ msgid "Select Sound File"
 #~ msgstr "é?¸å??é?³æ??æª?"
-
 #~ msgid "Custom..."
 #~ msgstr "���"
-
 #~ msgid "Enable support for GNOME assistive technologies at login"
 #~ msgstr "ç?»å?¥æ??å??ç?¨ GNOME è¼?å?©ç§?æ??æ?¯æ?´"
-
 #~ msgid "New accelerator..."
 #~ msgstr "������"
-
 #~ msgid "Windows and Buttons"
 #~ msgstr "è¦?çª?è??æ??é??"
-
 #~ msgid "Button clicked"
 #~ msgstr "æ??é??被é»?æ??"
-
 #~ msgid "Toggle button clicked"
 #~ msgstr "å??æ??æ??é??é»?æ??"
-
 #~ msgid "Window maximized"
 #~ msgstr "è¦?çª?æ??大å??"
-
 #~ msgid "Window unmaximized"
 #~ msgstr "è¦?çª?å??æ¶?æ??大å??"
-
 #~ msgid "Window minimised"
 #~ msgstr "è¦?çª?æ??å°?å??"
-
 #~ msgid "New e-mail"
 #~ msgstr "æ?°é?µä»¶é??ç?¥"
-
 #~ msgid "Empty trash"
 #~ msgstr "æ¸?ç??å??æ?¶ç­?"
-
 #~ msgid "Long action completed (download, CD burning, etc.)"
 #~ msgstr "é?·æ??é??å??ä½?å·²å®?æ??ï¼?ä¸?è¼?ã??ç??é?? CD ç­?ç­?ï¼?"
-
 #~ msgid "Alerts"
 #~ msgstr "警示"
-
 #~ msgid "Information or question"
 #~ msgstr "è³?è¨?æ??å??é¡?"
-
 #~ msgid "Error"
 #~ msgstr "�誤"
-
 #~ msgid "Unexpected attribute '%s' for element '%s'"
 #~ msgstr "å??件ã??%2$sã??中æ??æ?ªé ?æ??ç??屬æ?§ã??%1$sã??"
-
 #~ msgid "Attribute '%s' of element '%s' not found"
 #~ msgstr "æ?¾ä¸?å?°å??件ã??%2$sã??中ç??屬æ?§ã??%1$sã??"
-
 #~ msgid "Unexpected tag '%s', tag '%s' expected"
 #~ msgstr "æ?ªé ?æ??ç??æ¨?籤ã??%sã??ï¼?æ??ç?ºæ¨?籤ã??%sã??"
-
 #~ msgid "Unexpected tag '%s' inside '%s'"
 #~ msgstr "ã??%2$sã??中æ??æ?ªé ?æ??ç??æ¨?籤ã??%1$sã??"
-
 #~ msgid "No valid bookmark file found in data dirs"
 #~ msgstr "å?¨è³?æ??ç?®é??中æ?¾ä¸?å?°æ??æ??ç??æ?¸ç±¤æª?æ¡?"
-
 #~ msgid "No bookmark found for URI '%s'"
 #~ msgstr "æ?¾ä¸?å?° URIã??%sã??ç??æ?¸ç±¤"
-
 #~ msgid "No MIME type defined in the bookmark for URI '%s'"
 #~ msgstr "URIã??%sã??æ?¸ç±¤ä¸­æ²?æ??å®?義 MIME é¡?å??"
-
 #~ msgid "No private flag has been defined in bookmark for URI '%s'"
 #~ msgstr "URIã??%sã??æ?¸ç±¤ä¸­æ²?æ??ç§?æ??æ??å¹?"
-
 #~ msgid "No groups set in bookmark for URI '%s'"
 #~ msgstr "URIã??%sã??æ?¸ç±¤ä¸­æ²?æ??設å®?群çµ?"
-
 #~ msgid "No application with name '%s' registered a bookmark for '%s'"
 #~ msgstr "æ²?æ??å??ç?ºã??%sã??ç??æ??ç?¨ç¨?å¼?註å??æ?¸ç±¤ã??%sã??"
-
 #~ msgid ""
 #~ "Centered\n"
 #~ "Fill screen\n"
@@ -5885,25 +5719,21 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "縮�\n"
 #~ "�大\n"
 #~ "並æ??顯示"
-
 #~ msgid ""
 #~ "%s is the path where the theme files will be installed. This can not be "
 #~ "selected as the source location"
 #~ msgstr "ä½?æ?¯ä¸»é¡?æª?æ¡?æ??å®?è£?å?¨ %s 中ã??ä¸?è?½å°?å?¶é?¸æ??æ?¯å??å§?æª?ç??ä½?ç½®"
-
 #~ msgid "Just apply settings and quit"
 #~ msgstr "å¥?ç?¨è¨­å®?並é?¢é??"
-
 #~ msgid "Screen Resolution Preferences"
 #~ msgstr "ç?«é?¢è§£æ??度å??好設å®?"
-
 #~ msgid "_Make default for this computer (%s) only"
 #~ msgstr "å?ªå?¨é??é?¨é?»è?¦ (%s) 中æ??ç?ºé ?設å?¼(_M)"
-
 #, fuzzy
 #~ msgid ""
 #~ "Testing the new settings. If you don't respond in %d second the previous "
 #~ "settings will be restored."
+
 #~ msgid_plural ""
 #~ "Testing the new settings. If you don't respond in %d seconds the previous "
 #~ "settings will be restored."



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