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



commit 43dc7e3a7ed90a2552094abd03e14ddfe5d3f293
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Jan 27 18:53:55 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 3145 +++++++++++++++++++++++++++++++++++------------------------
 po/zh_TW.po | 3156 +++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 3719 insertions(+), 2582 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dfc7577..ae24e2a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -11,12 +11,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 2.91.3\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center&component=general\n";
-"POT-Creation-Date: 2010-11-23 22:42+0000\n"
-"PO-Revision-Date: 2010-12-02 21:28+0800\n"
+"Project-Id-Version: gnome-control-center 2.91.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-27 18:53+0800\n"
+"PO-Revision-Date: 2011-01-27 18:53+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"
@@ -35,15 +36,21 @@ 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/gconf-property-editor.c:134
@@ -67,7 +74,8 @@ 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
@@ -75,7 +83,8 @@ 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
@@ -83,7 +92,8 @@ 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
@@ -115,7 +125,8 @@ 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"
@@ -147,199 +158,127 @@ msgid "Background"
 msgstr "è??æ?¯"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-#| msgid "Save _background image"
 msgid "Change the background"
 msgstr "æ?´æ?¹è??æ?¯"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 #, fuzzy
-#| msgid "No Wallpaper"
-msgid "Wallpaper;Screen;"
-msgstr "���"
+#| msgid "Wallpaper;Screen;"
+msgid "Wallpaper;Screen;Desktop;"
+msgstr "Wallpaper;Screen;��;��;"
 
 #: ../panels/background/background.ui.h:1
 msgid "Center"
 msgstr "置中"
 
-#: ../panels/background/background.ui.h:2
-#| msgid "_Full"
+#. This refers to a slideshow background
+#: ../panels/background/background.ui.h:3
+#, fuzzy
+msgid "Changes throughout the day"
+msgstr "å??ç?©ä¸?ä¹?"
+
+#: ../panels/background/background.ui.h:4
 msgid "Fill"
 msgstr "填滿"
 
-#: ../panels/background/background.ui.h:3
+#: ../panels/background/background.ui.h:5
 msgid "Scale"
 msgstr "縮�"
 
-#: ../panels/background/background.ui.h:4
+#: ../panels/background/background.ui.h:6
 msgid "Span"
 msgstr "跨�"
 
-#: ../panels/background/background.ui.h:5
+#: ../panels/background/background.ui.h:7
 msgid "Tile"
 msgstr "é?ªæ??"
 
-#: ../panels/background/background.ui.h:6
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/background/background.ui.h:8
+#: ../panels/universal-access/uap.ui.h:92
 msgid "Zoom"
 msgstr "縮�"
 
-#: ../panels/background/bg-colors-source.c:57
-#| msgid "Mutt"
-msgid "Butter"
-msgstr "奶油"
-
-#: ../panels/background/bg-colors-source.c:58
-#| msgid "Orca"
-msgid "Orange"
-msgstr "æ©?"
-
-#: ../panels/background/bg-colors-source.c:59
-msgid "Chocolate"
-msgstr "å·§å??å??"
+#: ../panels/background/bg-colors-source.c:44
+msgid "Horizontal Gradient"
+msgstr "水平漸��"
 
-#: ../panels/background/bg-colors-source.c:60
-#, fuzzy
-#| msgid "Galeon"
-msgid "Chameleon"
-msgstr "Galeon"
-
-#: ../panels/background/bg-colors-source.c:61
-msgid "Blue"
-msgstr "è??"
-
-#: ../panels/background/bg-colors-source.c:62
-#, fuzzy
-msgid "Plum"
-msgstr "��"
+#: ../panels/background/bg-colors-source.c:45
+msgid "Vertical Gradient"
+msgstr "å??ç?´æ¼¸è®?è?²"
 
-#: ../panels/background/bg-colors-source.c:63
-msgid "Red"
-msgstr "ç´?"
+#: ../panels/background/bg-colors-source.c:46
+msgid "Solid Color"
+msgstr "��"
 
-#: ../panels/background/bg-colors-source.c:64
-msgid "Aluminium"
-msgstr "é??"
-
-#: ../panels/background/bg-colors-source.c:65
-msgid "Gray"
-msgstr "ç?°"
-
-#: ../panels/background/bg-colors-source.c:66
-#| msgid "Callback"
-msgid "Black"
-msgstr "é»?"
-
-#: ../panels/background/cc-background-panel.c:622
-#| msgid "No Wallpaper"
+#: ../panels/background/cc-background-panel.c:747
 msgid "Wallpapers"
 msgstr "��"
 
-#: ../panels/background/cc-background-panel.c:630
+#: ../panels/background/cc-background-panel.c:755
 msgid "Pictures Folder"
 msgstr "å??ç??è³?æ??夾"
 
-#: ../panels/background/cc-background-panel.c:638
-msgid "Colors"
-msgstr "é¡?è?²"
+#: ../panels/background/cc-background-panel.c:763
+msgid "Colors & Gradients"
+msgstr "�� & 漸��"
 
-#: ../panels/background/cc-background-panel.c:647
+#: ../panels/background/cc-background-panel.c:772
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../panels/background/gnome-wp-info.c:50
+#: ../panels/background/cc-background-panel.c:833
+msgid "Current background"
+msgstr "ç?®å??ç??è??æ?¯"
+
+#: ../panels/background/gnome-wp-info.c:59
 msgid "No Desktop Background"
 msgstr "ç?¡æ¡?é?¢è??æ?¯"
 
-#: ../panels/background/gnome-wp-item.c:294
-msgid "Slide Show"
-msgstr "å¹»ç??ç??顯示"
-
-#: ../panels/background/gnome-wp-item.c:296
-msgid "Image"
-msgstr "å??ç??"
-
-#: ../panels/background/gnome-wp-item.c:302
+#: ../panels/background/gnome-wp-item.c:277
 msgid "multiple sizes"
 msgstr "å¤?é??尺寸"
 
-#. translators: x pixel(s) by y pixel(s)
-#: ../panels/background/gnome-wp-item.c:305
-#, c-format
-msgid "%d %s by %d %s"
-msgstr "�%d %s �%d %s"
-
-#: ../panels/background/gnome-wp-item.c:307
-#: ../panels/background/gnome-wp-item.c:309
-msgid "pixel"
-msgid_plural "pixels"
-msgstr[0] "å??ç´ "
-
-#. translators: <b>wallpaper name</b>
-#. * mime type, size
-#. * Folder: /path/to/file
-#.
-#: ../panels/background/gnome-wp-item.c:317
-#, c-format
-msgid ""
-"<b>%s</b>\n"
-"%s, %s\n"
-"Folder: %s"
-msgstr ""
-"<b>%s</b>\n"
-"%s,  %s\n"
-"è³?æ??夾ï¼?%s"
-
-#. translators: <b>wallpaper name</b>
-#. * Image missing
-#. * Folder: /path/to/file
-#.
-#: ../panels/background/gnome-wp-item.c:329
+#. translators: 100 Ã? 100px
+#. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
+#: ../panels/background/gnome-wp-item.c:285
 #, c-format
-msgid ""
-"<b>%s</b>\n"
-"%s\n"
-"Folder: %s"
-msgstr ""
-"<b>%s</b>\n"
-"%s\n"
-"è³?æ??夾ï¼?%s"
+msgid "%d Ã? %d"
+msgstr "%d Ã? %d"
 
-#: ../panels/background/gnome-wp-item.c:333
-msgid "Image missing"
-msgstr "é?ºå¤±å??ç??"
+#: ../panels/common/gdm-languages.c:709
+msgid "Unspecified"
+msgstr "æ?ªæ??å®?"
 
 #: ../panels/datetime/datetime.ui.h:1
-msgid "12 hour format"
-msgstr "12 å°?æ??å?¶"
-
-#: ../panels/datetime/datetime.ui.h:2
 msgid "16"
 msgstr "16"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: ../panels/datetime/datetime.ui.h:2
 msgid "2010"
 msgstr "2010"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: ../panels/datetime/datetime.ui.h:3
 msgid "22"
 msgstr "22"
 
-#: ../panels/datetime/datetime.ui.h:5
-msgid "24 hour format"
+#: ../panels/datetime/datetime.ui.h:4
+msgid "24-Hour Time"
 msgstr "24 å°?æ??å?¶"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: ../panels/datetime/datetime.ui.h:5
 msgid "45"
 msgstr "45"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: ../panels/datetime/datetime.ui.h:6
 msgid ":"
 msgstr ":"
 
+#: ../panels/datetime/datetime.ui.h:7
+msgid "AM"
+msgstr "ä¸?å??"
+
 #: ../panels/datetime/datetime.ui.h:8
-#| msgid "pixel"
-#| msgid_plural "pixels"
 msgid "April"
 msgstr "å??æ??"
 
@@ -348,372 +287,131 @@ msgid "August"
 msgstr "å?«æ??"
 
 #: ../panels/datetime/datetime.ui.h:10
-#| msgid "C_ity:"
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
 #: ../panels/datetime/datetime.ui.h:11
-#| msgid "D_elay:"
-msgid "Day:"
-msgstr "��"
-
-#: ../panels/datetime/datetime.ui.h:12
 msgid "December"
 msgstr "å??äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:13
+#: ../panels/datetime/datetime.ui.h:12
 msgid "February"
 msgstr "äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: ../panels/datetime/datetime.ui.h:13
 msgid "January"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:15
+#: ../panels/datetime/datetime.ui.h:14
 msgid "July"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:16
+#: ../panels/datetime/datetime.ui.h:15
 msgid "June"
 msgstr "å?­æ??"
 
-#: ../panels/datetime/datetime.ui.h:17
-#| msgid "Search"
+#: ../panels/datetime/datetime.ui.h:16
 msgid "March"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: ../panels/datetime/datetime.ui.h:17
 msgid "May"
 msgstr "äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:19
-#| msgid "Monitor"
-msgid "Month:"
-msgstr "æ??ï¼?"
+#: ../panels/datetime/datetime.ui.h:18
+msgid "Network Time"
+msgstr "網絡æ??å?»"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: ../panels/datetime/datetime.ui.h:19
 msgid "November"
 msgstr "å??ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:21
-#| msgid "Other"
+#: ../panels/datetime/datetime.ui.h:20
 msgid "October"
 msgstr "å??æ??"
 
-#: ../panels/datetime/datetime.ui.h:22
-#| msgid "Version:"
+#: ../panels/datetime/datetime.ui.h:21
 msgid "Region:"
 msgstr "å??å??ï¼?"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: ../panels/datetime/datetime.ui.h:22
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../panels/datetime/datetime.ui.h:24
-msgid "Set time automatically"
-msgstr "è?ªå??設å®?æ??å?»"
-
-#: ../panels/datetime/datetime.ui.h:25
-msgid "Year:"
-msgstr "å¹´ï¼?"
-
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-#, fuzzy
 msgid "Clock;Timezone;Location;"
-msgstr "天氣�置��"
+msgstr "Clock;Timezone;Location;æ??é??;æ??å??;ä½?ç½®;"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
-msgid "Date And Time"
-msgstr "æ?¥æ??å??æ??å?»"
+msgid "Date and Time"
+msgstr "æ?¥æ??è??æ??å?»"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
 msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ??å?»å??好設å®?é?¢æ?¿"
 
-#: ../panels/default-applications/gnome-default-applications-panel.desktop.in.in.h:1
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:11
-msgid "Preferred Applications"
-msgstr "é¦?é?¸æ??ç?¨ç¨?å¼?"
-
-#: ../panels/default-applications/gnome-default-applications-panel.desktop.in.in.h:2
-msgid "Select your default applications"
-msgstr "é?¸å??é ?設使ç?¨ç??æ??ç?¨ç¨?å¼?"
-
-#: ../panels/default-applications/gnome-at-session.desktop.in.in.h:1
-msgid "Start the preferred visual assistive technology"
-msgstr "å??å??é¦?é?¸ç??è¦?覺è¼?å?©æ??è¡?"
-
-#: ../panels/default-applications/gnome-at-session.desktop.in.in.h:2
-msgid "Visual Assistance"
-msgstr "�覺��"
-
-#: ../panels/default-applications/gnome-da-capplet.c:83
-#, c-format
-#| msgid "Error parsing arguments: %s\n"
-msgid "Error setting default browser: %s"
-msgstr "設å®?é ?設ç??覽å?¨æ??ç?¼ç??é?¯èª¤ï¼?%s"
-
-#: ../panels/default-applications/gnome-da-capplet.c:106
-#, c-format
-#| msgid "Error parsing arguments: %s\n"
-msgid "Error setting default mailer: %s"
-msgstr "設å®?é ?設é?µä»¶ç¨?å¼?æ??ç?¼ç??é?¯èª¤ï¼?%s"
-
-#: ../panels/default-applications/gnome-da-capplet.c:321
-#: ../panels/sound/sound-theme-file-utils.c:292
-msgid "Custom"
-msgstr "��"
-
-#: ../panels/default-applications/gnome-da-capplet.c:352
-msgid "Could not load the main interface"
-msgstr "����主��"
-
-#: ../panels/default-applications/gnome-da-capplet.c:354
-msgid "Please make sure that the applet is properly installed"
-msgstr "è«?確å®?該é?¢æ?¿ç¨?å¼?å·²ç¶?å®?è£?妥ç?¶ã??"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:1
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Accessibility"
-msgstr "ç?¡é??ç¤?ç?°å¢?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:3
-#, no-c-format
-msgid "All %s occurrences will be replaced with actual link"
-msgstr "æ??æ?? %s é?½æ??å??代ç?ºç??實ç??é?£çµ?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:4
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "C_ommand:"
-msgstr "æ??令(_O):"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:5
-msgid "Co_mmand:"
-msgstr "æ??令(_M):"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:6
-msgid "E_xecute flag:"
-msgstr "å?·è¡?æ??æ¨?(_X):"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:7
-msgid "Instant Messenger"
-msgstr "å?³æ??é??è¨?ç¨?å¼?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:8
-msgid "Internet"
-msgstr "��網"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:9
-msgid "Mail Reader"
-msgstr "���件�信�件"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:10
-msgid "Mobility"
-msgstr "移å??æ?§"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:12
-msgid "Run at st_art"
-msgstr "å??å??æ??å?·è¡?(_A)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:13
-msgid "Run in t_erminal"
-msgstr "��端�中��(_E)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:14
-msgid "System"
-msgstr "系統"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:15
-msgid "Terminal Emulator"
-msgstr "�端�模���"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:16
-msgid "Text Editor"
-msgstr "æ??å­?編輯å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:17
-msgid "Visual"
-msgstr "�覺"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:18
-msgid "Web Browser"
-msgstr "網é ?ç??覽å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:19
-msgid "_Run at start"
-msgstr "å??å??æ??å?·è¡?(_R)"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:1
-msgid "Banshee Music Player"
-msgstr "Banshee ������"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:2
-#: ../panels/universal-access/uap.ui.h:30
-msgid "Dasher"
-msgstr "Dasher"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:3
-msgid "Debian Terminal Emulator"
-msgstr "Debian Terminal Emulator"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:4
-msgid "ETerm"
-msgstr "ETerm"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:5
-msgid "GNOME Magnifier without Screen Reader"
-msgstr "ç?¡è?¢å¹?é?±è®?å?¨ç?? GNOME æ?¾å¤§é?¡"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:6
-msgid "GNOME OnScreen Keyboard"
-msgstr "GNOME ����"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:7
-msgid "GNOME Terminal"
-msgstr "GNOME �端�"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:8
-msgid "Gnopernicus"
-msgstr "Gnopernicus"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:9
-msgid "Gnopernicus with Magnifier"
-msgstr "å?·æ?¾å¤§é?¡ç?? Gnopernicus"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:10
-msgid "KDE Magnifier without Screen Reader"
-msgstr "ç?¡è?¢å¹?é?±è®?å?¨ç?? KDE æ?¾å¤§é?¡"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:11
-msgid "Konsole"
-msgstr "Konsole"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:12
-msgid "Linux Screen Reader"
-msgstr "Linux �����"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:13
-msgid "Linux Screen Reader with Magnifier"
-msgstr "å?·æ?¾å¤§é?¡ç?? Linux è?¢å¹?é?±è®?å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:14
-msgid "Listen"
-msgstr "è?½å??"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:15
-msgid "Muine Music Player"
-msgstr "Muine ������"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:16
-msgid "NXterm"
-msgstr "NXterm"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:17
-msgid "Orca"
-msgstr "Orca"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:18
-msgid "Orca with Magnifier"
-msgstr "å?·æ?¾å¤§é?¡ç?? Orca"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:19
-msgid "RXVT"
-msgstr "RXVT"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:20
-msgid "Rhythmbox Music Player"
-msgstr "Rhythmbox ������"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:21
-msgid "Standard XTerminal"
-msgstr "æ¨?æº?ç?? X çµ?端æ©?"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:22
-msgid "Terminator"
-msgstr "Terminator"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:23
-msgid "Totem Movie Player"
-msgstr "Totem å½±ç??æ?­æ?¾ç¨?å¼?"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:24
-msgid "aterm"
-msgstr "aterm"
-
 #: ../panels/display/display-capplet.ui.h:1
-msgid "<i>Note: may limit resolution options</i>"
-msgstr "<i>注æ??ï¼?å?¯è?½æ??é??å?¶è§£å??度é?¸é ?</i>"
-
-#: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:317
+#: ../panels/display/xrandr-capplet.c:321
 msgid "Left"
 msgstr "å·¦"
 
-#: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:469
+#: ../panels/display/display-capplet.ui.h:2
+#: ../panels/display/xrandr-capplet.c:484
 msgid "Monitor"
 msgstr "顯示�"
 
-#: ../panels/display/display-capplet.ui.h:4
-#: ../panels/display/xrandr-capplet.c:316
-#: ../panels/display/xrandr-capplet.c:355
+#: ../panels/display/display-capplet.ui.h:3
+#: ../panels/display/xrandr-capplet.c:320
+#: ../panels/display/xrandr-capplet.c:359
 #: ../panels/universal-access/uap.ui.h:58
 msgid "Normal"
 msgstr "正常"
 
-#: ../panels/display/display-capplet.ui.h:5
-#: ../panels/universal-access/uap.ui.h:59
-msgid "Off"
-msgstr "é??é??"
-
-#: ../panels/display/display-capplet.ui.h:6
-#: ../panels/universal-access/uap.ui.h:60
-msgid "On"
-msgstr "é??"
+#: ../panels/display/display-capplet.ui.h:4
+msgid "Note: may limit resolution options"
+msgstr "注æ??ï¼?å?¯è?½æ??é??å?¶è§£å??度é?¸é ?"
 
-#: ../panels/display/display-capplet.ui.h:7
+#: ../panels/display/display-capplet.ui.h:5
 msgid "R_otation:"
 msgstr "æ??è½?(_O):"
 
-#: ../panels/display/display-capplet.ui.h:8
-#: ../panels/display/xrandr-capplet.c:318
+#: ../panels/display/display-capplet.ui.h:6
+#: ../panels/display/xrandr-capplet.c:322
 msgid "Right"
 msgstr "å?³"
 
-#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/display-capplet.ui.h:7
 msgid "Upside-down"
 msgstr "ç?±ä¸?è??ä¸?"
 
+#: ../panels/display/display-capplet.ui.h:8
+msgid "_Detect Displays"
+msgstr "�測顯示�(_D)"
+
+#. Note that mirror is a verb in this string
 #: ../panels/display/display-capplet.ui.h:10
-msgid "_Detect monitors"
-msgstr "�測��(_D)"
+msgid "_Mirror displays"
+msgstr "��顯示�(_M)"
 
 #: ../panels/display/display-capplet.ui.h:11
-#| msgid "Mirror Screens"
-msgid "_Mirror Screens"
-msgstr "����(_M)"
-
-#: ../panels/display/display-capplet.ui.h:12
 msgid "_Resolution:"
 msgstr "解å??度(_R):"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-#| msgid "Change resolution and position of monitors"
 msgid "Change resolution and position of monitors and projectors"
 msgstr "æ?¹è®?顯示å?¨å??æ??å½±æ©?ç??解å??度å??ä½?ç½®"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-#| msgid "Display"
 msgid "Displays"
 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 ""
+msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;解å??度;é??æ?°æ?´ç??;"
 
-#: ../panels/display/xrandr-capplet.c:319
+#: ../panels/display/xrandr-capplet.c:323
 msgid "Upside Down"
 msgstr "ç?±ä¸?è??ä¸?"
 
@@ -722,62 +420,154 @@ msgstr "ç?±ä¸?è??ä¸?"
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:458
-#: ../panels/display/xrandr-capplet.c:1719
-msgid "Mirror Screens"
-msgstr "����"
+#: ../panels/display/xrandr-capplet.c:460
+msgid "Mirror Displays"
+msgstr "��顯示�"
 
-#: ../panels/display/xrandr-capplet.c:574
+#: ../panels/display/xrandr-capplet.c:593
 #, c-format
-#| msgid "%d x %d"
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:576
+#: ../panels/display/xrandr-capplet.c:595
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1482
+#: ../panels/display/xrandr-capplet.c:1505
 msgid "Drag to change primary display."
 msgstr "æ??æ?³ä»¥æ?¹è®?主è¦?顯示å?¨ã??"
 
-#: ../panels/display/xrandr-capplet.c:1540
-msgid "Select a monitor to change its properties; drag it to rearrange its placement."
+#: ../panels/display/xrandr-capplet.c:1563
+msgid ""
+"Select a monitor to change its properties; drag it to rearrange its "
+"placement."
 msgstr "é?¸æ??ä¸?å??è?¢å¹?以æ?¹è®?å®?ç??屬æ?§ï¼?æ??æ?³å®?å??è?½é??æ?°æ??å??å®?ç??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1945
+#: ../panels/display/xrandr-capplet.c:1953
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1947
+#: ../panels/display/xrandr-capplet.c:1955
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/xrandr-capplet.c:2232
+#: ../panels/display/xrandr-capplet.c:2240
 msgid "Could not save the monitor configuration"
 msgstr "ç?¡æ³?å?²å­?顯示å?¨çµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2255
+#: ../panels/display/xrandr-capplet.c:2263
 msgid "Could not get session bus while applying display configuration"
 msgstr "å?¨å¥?ç?¨é¡¯ç¤ºçµ?æ??æ??ç?¡æ³?å??å¾?ä½?業é??段å?¯æµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2300
+#: ../panels/display/xrandr-capplet.c:2308
 msgid "Could not detect displays"
 msgstr "���測顯示�"
 
-#: ../panels/display/xrandr-capplet.c:2507
+#: ../panels/display/xrandr-capplet.c:2516
 msgid "Could not get screen information"
 msgstr "ç?¡æ³?å??å¾?è?¢å¹?è³?è¨?"
 
+#. translators: This is the type of architecture, for example:
+#. * "64-bit" or "32-bit"
+#: ../panels/info/cc-info-panel.c:247
+#, c-format
+msgid "%d-bit"
+msgstr "%d-ä½?å??"
+
+#: ../panels/info/cc-info-panel.c:261
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u ä½?å??çµ?"
+
+#: ../panels/info/cc-info-panel.c:269
+#, c-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
+
+#: ../panels/info/cc-info-panel.c:274
+#, c-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../panels/info/cc-info-panel.c:279
+#, c-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: ../panels/info/cc-info-panel.c:284
+#, c-format
+msgid "%.1f TB"
+msgstr "%.1f TB"
+
+#: ../panels/info/cc-info-panel.c:289
+#, c-format
+msgid "%.1f PB"
+msgstr "%.1f PB"
+
+#: ../panels/info/cc-info-panel.c:294
+#, c-format
+msgid "%.1f EB"
+msgstr "%.1f EB"
+
+#: ../panels/info/cc-info-panel.c:404
+msgid "Unknown model"
+msgstr "ä¸?æ??ç??å??è??"
+
+#: ../panels/info/cc-info-panel.c:466
+#, c-format
+msgid "Version %s"
+msgstr "ç??æ?¬ %s"
+
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
+msgid "System Info"
+msgstr "系統��"
+
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "System Information"
+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;è£?ç½®;系統;è³?è¨?;è¨?æ?¶é«?;è??ç??å?¨;ç??æ?¬;"
+
+#: ../panels/info/info.ui.h:1
+msgid "Device name:"
+msgstr "è£?ç½®å??稱ï¼?"
+
+#: ../panels/info/info.ui.h:2
+msgid "Disk:"
+msgstr "���"
+
+#: ../panels/info/info.ui.h:3
+msgid "Memory:"
+msgstr "����"
+
+#: ../panels/info/info.ui.h:4
+msgid "More Info"
+msgstr "����"
+
+#: ../panels/info/info.ui.h:5
+msgid "OS type:"
+msgstr "OS é¡?å??ï¼?"
+
+#: ../panels/info/info.ui.h:6
+msgid "Processor:"
+msgstr "è??ç??å?¨ï¼?"
+
+#: ../panels/info/info.ui.h:7
+msgid "Update Available"
+msgstr "æ??æ?´æ?°å?¯ç?¨"
+
 #: ../panels/keyboard/00-multimedia-key.xml.in.h:1
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
-msgid "Sound"
-msgstr "é?³æ??"
+msgid "Sound and Media"
+msgstr "è?²é?³è??åª?é«?"
 
 #: ../panels/keyboard/01-desktop-key.xml.in.h:1
-msgid "Desktop"
-msgstr "æ¡?é?¢"
+msgid "Launchers and Actions"
+msgstr "å?·è¡?å?¨è??å??ä½?"
 
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
@@ -809,37 +599,53 @@ msgstr "æ?·å¾?é?µç??é¡?å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/gnome-keyboard-panel.c:102
+#: ../panels/keyboard/keyboard-shortcuts.c:1229
 #: ../panels/sound/gvc-mixer-control.c:1091
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
-#: ../panels/user-accounts/um-login-options.c:355
 msgid "Disabled"
 msgstr "å·²å??ç?¨"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:183
-msgid "<Unknown Action>"
-msgstr "<è¡?å??設å®?ä¸?詳>"
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+msgid "Change keyboard settings"
+msgstr "����設��"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:933
-#: ../panels/keyboard/gnome-keyboard-panel.c:1564
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+msgid "Keyboard"
+msgstr "��"
+
+#. Translators: those are keywords for the keyboard control-center panel
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
+msgid "Shortcut;Repeat;Blink;"
+msgstr "Shortcut;Repeat;Blink;æ?·å¾?é?µ;é??è¤?;é??ç??;"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:736
+#: ../panels/keyboard/keyboard-shortcuts.c:1001
+#: ../panels/keyboard/keyboard-shortcuts.c:1633
+#: ../panels/keyboard/keyboard-shortcuts.c:1637
 msgid "Custom Shortcuts"
 msgstr "�����"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1075
+#: ../panels/keyboard/keyboard-shortcuts.c:848
+msgid "<Unknown Action>"
+msgstr "<è¡?å??設å®?ä¸?詳>"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1255
 msgid "Error saving the new shortcut"
 msgstr "å?²å­?æ?°ç??æ?·å¾?é?µæ??ç?¼ç??é?¯èª¤"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1154
+#: ../panels/keyboard/keyboard-shortcuts.c:1365
 #, c-format
 msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n"
+"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/gnome-keyboard-panel.c:1184
+#: ../panels/keyboard/keyboard-shortcuts.c:1395
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -848,50 +654,42 @@ msgstr ""
 "æ?·å¾?é?µâ??%sâ??å·±ç¶?使ç?¨æ?¼ï¼?\n"
 "â??%sâ??"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1190
+#: ../panels/keyboard/keyboard-shortcuts.c:1401
 #, 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/gnome-keyboard-panel.c:1198
+#: ../panels/keyboard/keyboard-shortcuts.c:1409
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1318
+#: ../panels/keyboard/keyboard-shortcuts.c:1529
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s"
 msgstr "å?¨çµ?æ??è³?æ??庫中å??æ¶?設å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1519
+#: ../panels/keyboard/keyboard-shortcuts.c:1587
 msgid "Too many custom shortcuts"
 msgstr "太������"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1881
+#: ../panels/keyboard/keyboard-shortcuts.c:1866
+#, fuzzy
+#| msgid "Action"
+msgid "Section"
+msgstr "�"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1910
 msgid "Action"
 msgstr "å??ä½?"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1903
+#: ../panels/keyboard/keyboard-shortcuts.c:1932
 msgid "Shortcut"
 msgstr "æ?·å¾?é?µ"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-#| msgid "Keyboard Settings..."
-msgid "Change keyboard settings"
-msgstr "����設��"
-
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-msgid "Keyboard"
-msgstr "��"
-
-#. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
-#, fuzzy
-msgid "Shortcut;Repeat;Blink;"
-msgstr "游æ¨?é??ç??æ??é??"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
+msgid "C_ommand:"
+msgstr "æ??令(_O):"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 msgid "Cursor Blinking"
@@ -902,7 +700,7 @@ msgid "Cursor _blinks in text fields"
 msgstr "æ??å­?輸å?¥æ¬?中ç??游æ¨?å?¯ä»¥é??ç??(_B)"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:1
 #: ../panels/universal-access/uap.ui.h:28
 msgid "Cursor blinks speed"
 msgstr "游æ¨?é??ç??é??度"
@@ -913,13 +711,12 @@ msgstr "�����"
 
 #. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-#: ../panels/region/gnome-region-panel.ui.h:1
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgid "Fast"
 msgstr "å¿«é??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "General"
 msgstr "��"
 
@@ -929,8 +726,7 @@ msgstr "ç?¶æ??ä¸?æ??é?µä¸?æ?¾æ??é??è¤?輸å?ºè©²å­?符(_R)"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/region/gnome-region-panel.ui.h:5
-#: ../panels/mouse/gnome-mouse-properties.ui.h:25
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 #: ../panels/universal-access/uap.ui.h:51
 msgid "Long"
 msgstr "é?·"
@@ -949,31 +745,28 @@ msgstr "é??度(_P):"
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
-#: ../panels/region/gnome-region-panel.ui.h:19
-#: ../panels/mouse/gnome-mouse-properties.ui.h:35
+#: ../panels/mouse/gnome-mouse-properties.ui.h:24
 #: ../panels/universal-access/uap.ui.h:71
 msgid "Short"
 msgstr "ç?­"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
-#| msgid "Shortcut"
 msgid "Shortcuts"
 msgstr "å¿«æ?·é?µ"
 
 #. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
-#: ../panels/region/gnome-region-panel.ui.h:20
-#: ../panels/mouse/gnome-mouse-properties.ui.h:39
+#: ../panels/mouse/gnome-mouse-properties.ui.h:26
 msgid "Slow"
 msgstr "æ?¢é??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-msgid "To edit a shortcut key, click on the corresponding row and type a new key combination, or press backspace to clear."
-msgstr "è¦?編輯æ?·å¾?é?µï¼?é»?é?¸ç?¸æ??ç??è¡?並æ??ä¸?æ?°ç??æ??é?µçµ?å??ï¼?æ??以 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
-#: ../panels/region/gnome-region-panel.ui.h:24
-#: ../panels/mouse/gnome-mouse-properties.ui.h:49
 msgid "_Delay:"
 msgstr "延�(_D):"
 
@@ -982,221 +775,155 @@ msgid "_Name:"
 msgstr "å??稱(_N):"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
-#: ../panels/region/gnome-region-panel.ui.h:28
 msgid "_Speed:"
 msgstr "é??度(_S):"
 
-#: ../panels/media/cc-media-panel.c:513
-#| msgid "_Application font:"
-msgid "No applications found"
-msgstr "æ?¾ä¸?å?°æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/cc-media-panel.c:525
+#: ../panels/media/cc-media-panel.c:322
 msgid "Ask what to do"
 msgstr "è©¢å??è¦?å??ä»?麼"
 
-#: ../panels/media/cc-media-panel.c:537
-#| msgid "Smoothing"
-msgid "Do Nothing"
+#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:8
+msgid "Do nothing"
 msgstr "ä¸?å??ä»»ä½?äº?"
 
-#: ../panels/media/cc-media-panel.c:549
-#| msgid "Open File"
-msgid "Open Folder"
+#: ../panels/media/cc-media-panel.c:330
+msgid "Open folder"
 msgstr "é??å??è³?æ??夾"
 
-#: ../panels/media/cc-media-panel.c:575
-#, c-format
-#| msgid "Open with \"%s\""
-msgid "Open %s"
-msgstr "é??å?? %s"
-
-#: ../panels/media/cc-media-panel.c:608
-#| msgid "Open with Default Application"
-msgid "Open with other Application..."
-msgstr "以å?¶ä»?ç¨?å¼?é??å??..."
-
-#: ../panels/media/nautilus-open-with-dialog.c:160
-#| msgid "Could not get screen information"
-msgid "Could not run application"
-msgstr "ç?¡æ³?å?·è¡?æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/nautilus-open-with-dialog.c:172
-#, c-format
-#| msgid "Could not open %s: %s\n"
-msgid "Could not find '%s'"
-msgstr "æ?¾ä¸?å?°ã??%sã??"
-
-#: ../panels/media/nautilus-open-with-dialog.c:175
-#| msgid "Could not get screen information"
-msgid "Could not find application"
-msgstr "æ?¾ä¸?å?°æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/nautilus-open-with-dialog.c:250
-#, c-format
-msgid "Could not add application to the application database: %s"
-msgstr "ç?¡æ³?å°?ç¨?å¼?å? å?¥æ??ç?¨ç¨?å¼?è³?æ??庫ï¼?%s"
-
-#: ../panels/media/nautilus-open-with-dialog.c:251
-#| msgid "Could not detect displays"
-msgid "Could not add application"
-msgstr "ç?¡æ³?å? å?¥æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/nautilus-open-with-dialog.c:289
-#, c-format
-#| msgid "Could not get information for %s: %s\n"
-msgid "Could not set application as the default: %s"
-msgstr "ç?¡æ³?å°?æ??ç?¨ç¨?å¼?設ç?ºé ?設å?¼ï¼?%s"
-
-#: ../panels/media/nautilus-open-with-dialog.c:290
-#| msgid "Select your default applications"
-msgid "Could not set as default application"
-msgstr "ç?¡æ³?設å®?ç?ºé ?設ç??æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/nautilus-open-with-dialog.c:427
-#| msgid "Set as Application Font"
-msgid "Select an Application"
+#: ../panels/media/cc-media-panel.c:441
+#, fuzzy
+#| msgid "Select an Application"
+msgid "Select an application for audio CDs"
 msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
 
-#: ../panels/media/nautilus-open-with-dialog.c:786
-#| msgid "Open with \"%s\""
-msgid "Open With"
-msgstr "以此é??å??"
+#: ../panels/media/cc-media-panel.c:442
+#, fuzzy
+#| msgid "Select an application to view its description."
+msgid "Select an application for video DVDs"
+msgstr "é?¸å??æ??ç?¨ç¨?å¼?以顯示æ??é??該ç¨?å¼?ç??說æ??ã??"
 
-#: ../panels/media/nautilus-open-with-dialog.c:822
-msgid "Select an application to view its description."
+#: ../panels/media/cc-media-panel.c:443
+#, fuzzy
+#| msgid "Select an application to view its description."
+msgid "Select an application to run when a music player is connected"
 msgstr "é?¸å??æ??ç?¨ç¨?å¼?以顯示æ??é??該ç¨?å¼?ç??說æ??ã??"
 
-#: ../panels/media/nautilus-open-with-dialog.c:847
-msgid "_Use a custom command"
-msgstr "使ç?¨è?ªé?¸æ??令(_U)"
+#: ../panels/media/cc-media-panel.c:444
+#, fuzzy
+#| msgid "Select an application to view its description."
+msgid "Select an application to run when a camera is connected"
+msgstr "é?¸å??æ??ç?¨ç¨?å¼?以顯示æ??é??該ç¨?å¼?ç??說æ??ã??"
 
-#: ../panels/media/nautilus-open-with-dialog.c:864
-msgid "_Browse..."
-msgstr "ç??覽(_B)..."
+#: ../panels/media/cc-media-panel.c:445
+#, fuzzy
+#| msgid "Select an Application"
+msgid "Select an application for software CDs"
+msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
 
-#: ../panels/media/nautilus-open-with-dialog.c:900
-msgid "_Open"
-msgstr "é??å??(_O)"
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: ../panels/media/cc-media-panel.c:457
+msgid "audio DVD"
+msgstr ""
 
-#. first %s is a filename and second %s is a file extension
-#: ../panels/media/nautilus-open-with-dialog.c:980
-#, c-format
-msgid "Open %s and other %s document with:"
-msgstr "以此é??å?? %s å??å?¶ä»? %s æ??件ï¼?"
+#: ../panels/media/cc-media-panel.c:458
+msgid "blank Blu-ray disc"
+msgstr ""
 
-#. the %s here is a file name
-#. %s is a filename
-#: ../panels/media/nautilus-open-with-dialog.c:984
-#: ../panels/media/nautilus-open-with-dialog.c:1015
-#, c-format
-#| msgid "Open with \"%s\""
-msgid "Open %s with:"
-msgstr "以此é??å?? %sï¼?"
+#: ../panels/media/cc-media-panel.c:459
+msgid "blank CD disc"
+msgstr ""
 
-#: ../panels/media/nautilus-open-with-dialog.c:985
-#, c-format
-msgid "_Remember this application for %s documents"
-msgstr "è¨?ä½?é??å??æ??ç?¨ç¨?å¼?ç?¨æ?¼ %s æ??件(_R)"
+#: ../panels/media/cc-media-panel.c:460
+msgid "blank DVD disc"
+msgstr ""
 
-#. Only in add mode - the %s here is a file extension
-#: ../panels/media/nautilus-open-with-dialog.c:994
-#, c-format
-msgid "Open all %s documents with:"
-msgstr "以此é??å??æ??æ?? %s æ??件ï¼?"
+#: ../panels/media/cc-media-panel.c:461
+msgid "blank HD DVD disc"
+msgstr ""
 
-#: ../panels/media/nautilus-open-with-dialog.c:1003
-#: ../panels/region/gnome-region-panel-xkb.c:70
-msgid "Unknown"
-msgstr "ä¸?æ??"
+#: ../panels/media/cc-media-panel.c:462
+msgid "Blu-ray video disc"
+msgstr ""
 
-#. First %s is a filename, second is a description
-#. * of the type, eg "plain text document"
-#: ../panels/media/nautilus-open-with-dialog.c:1011
-#, c-format
-msgid "Open %s and other \"%s\" files with:"
-msgstr "以此é??å?? %s å??å?¶ä»?ã??%sã??æª?æ¡?ï¼?"
+#: ../panels/media/cc-media-panel.c:463
+msgid "e-book reader"
+msgstr ""
 
-#. %s is a file type description
-#: ../panels/media/nautilus-open-with-dialog.c:1017
-#, c-format
-msgid "_Remember this application for \"%s\" files"
-msgstr "è¨?ä½?é??å??æ??ç?¨ç¨?å¼?ç?¨æ?¼ã??%sã??æª?æ¡?(_R)"
+#: ../panels/media/cc-media-panel.c:464
+#, fuzzy
+#| msgid "_DVD video:"
+msgid "HD DVD video disc"
+msgstr "_DVD å½±ç??ï¼?"
 
-#. Only in add mode
-#: ../panels/media/nautilus-open-with-dialog.c:1026
-#, c-format
-msgid "Open all \"%s\" files with:"
-msgstr "以此é??å??æ??æ??ã??%sã??æª?æ¡?ï¼?"
+#: ../panels/media/cc-media-panel.c:465
+#, fuzzy
+#| msgid "Pictures Folder"
+msgid "Picture CD"
+msgstr "å??ç??è³?æ??夾"
 
-#: ../panels/media/nautilus-open-with-dialog.c:1037
-#| msgid "_Add..."
-msgid "_Add"
-msgstr "å? å?¥(_A)"
+#: ../panels/media/cc-media-panel.c:466
+msgid "Super Video CD"
+msgstr ""
 
-#: ../panels/media/nautilus-open-with-dialog.c:1038
-#| msgid "Preferred Applications"
-msgid "Add Application"
-msgstr "å? å?¥æ??ç?¨ç¨?å¼?"
+#: ../panels/media/cc-media-panel.c:467
+#, fuzzy
+#| msgid "Video Mouse"
+msgid "Video CD"
+msgstr "è¦?å??æ»?é¼ "
 
 #: ../panels/media/gnome-media-properties.ui.h:1
-#| msgid "Action"
 msgid "Acti_on:"
 msgstr "å??ä½?(_O):"
 
 #: ../panels/media/gnome-media-properties.ui.h:2
-msgid "B_rowse media when inserted"
-msgstr "æ??å?¥æ??ç??覽åª?é«?(_R)"
+msgid "CD _audio:"
+msgstr "CD ��(_A):"
 
 #: ../panels/media/gnome-media-properties.ui.h:3
-msgid "CD _Audio:"
-msgstr "CD é?³æ??(_A):"
-
-#: ../panels/media/gnome-media-properties.ui.h:4
 msgid "Media and Autorun"
 msgstr "åª?é«?è??è?ªå??å?·è¡?"
 
-#: ../panels/media/gnome-media-properties.ui.h:5
-msgid "Other Media..."
-msgstr "����..."
-
-#: ../panels/media/gnome-media-properties.ui.h:6
+#: ../panels/media/gnome-media-properties.ui.h:4
 msgid "Select how media should be handled"
 msgstr "é?¸æ??è¦?å¦?ä½?è??ç??åª?é«?"
 
-#: ../panels/media/gnome-media-properties.ui.h:7
+#: ../panels/media/gnome-media-properties.ui.h:5
 msgid "Select how other media should be handled"
 msgstr "é?¸æ??è¦?å¦?ä½?è??ç??å?¶ä»?åª?é«?"
 
-#: ../panels/media/gnome-media-properties.ui.h:8
-msgid "_DVD Video:"
+#: ../panels/media/gnome-media-properties.ui.h:6
+msgid "_DVD video:"
 msgstr "_DVD å½±ç??ï¼?"
 
-#: ../panels/media/gnome-media-properties.ui.h:9
-#| msgid "Muine Music Player"
-msgid "_Music Player:"
-msgstr "������(_M):"
+#: ../panels/media/gnome-media-properties.ui.h:7
+msgid "_Music player:"
+msgstr "�����(_M):"
 
-#: ../panels/media/gnome-media-properties.ui.h:10
+#: ../panels/media/gnome-media-properties.ui.h:8
 msgid "_Never prompt or start programs on media insertion"
 msgstr "æ??å?¥åª?é«?æ??æ°¸é? ä¸?æ??示æ??å??å??ç¨?å¼?(_N)"
 
-#: ../panels/media/gnome-media-properties.ui.h:11
-#| msgid "_Yahoo:"
+#: ../panels/media/gnome-media-properties.ui.h:9
+msgid "_Other Media..."
+msgstr "����(_O)�"
+
+#: ../panels/media/gnome-media-properties.ui.h:10
 msgid "_Photos:"
 msgstr "ç?¸ç??(_P):"
 
-#: ../panels/media/gnome-media-properties.ui.h:12
+#: ../panels/media/gnome-media-properties.ui.h:11
 msgid "_Software:"
 msgstr "�件(_S):"
 
-#: ../panels/media/gnome-media-properties.ui.h:13
-#| msgid "Type:"
+#: ../panels/media/gnome-media-properties.ui.h:12
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
 #: ../panels/media/gnome-media-panel.desktop.in.in.h:1
-#| msgid "Set your mouse preferences"
 msgid "Configure media and autorun preferences"
 msgstr "設å®?åª?é«?å??è?ªå??å?·è¡?å??好設å®?"
 
@@ -1204,57 +931,348 @@ msgstr "設å®?åª?é«?å??è?ªå??å?·è¡?å??好設å®?"
 msgid "Removable Media"
 msgstr "�移����"
 
+#. Translators: The printer is low on toner
+#: ../panels/printers/cc-printers-panel.c:210
+msgid "Low on toner"
+msgstr "碳��足"
+
+#. Translators: The printer has no toner left
+#: ../panels/printers/cc-printers-panel.c:212
+msgid "Out of toner"
+msgstr "碳���"
+
+#. Translators: "Developer" like on photo development context
+#: ../panels/printers/cc-printers-panel.c:214
+msgid "Low on developer"
+msgstr "顯å??å??ä¸?足"
+
+#. Translators: "Developer" like on photo development context
+#: ../panels/printers/cc-printers-panel.c:216
+msgid "Out of developer"
+msgstr "顯å??å??ç?¨å®?"
+
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/cc-printers-panel.c:218
+msgid "Low on a marker supply"
+msgstr "墨水��足"
+
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/cc-printers-panel.c:220
+msgid "Out of a marker supply"
+msgstr "墨水���"
+
+#. Translators: One or more covers on the printer are open
+#: ../panels/printers/cc-printers-panel.c:222
+#, 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:224
+#, fuzzy
+#| msgid "Open Folder"
+msgid "Open door"
+msgstr "æ??å??å??空ä½?"
+
+#. Translators: At least one input tray is low on media
+#: ../panels/printers/cc-printers-panel.c:226
+msgid "Low on paper"
+msgstr "ç´?å¼µä¸?足ã??"
+
+#. Translators: At least one input tray is empty
+#: ../panels/printers/cc-printers-panel.c:228
+msgid "Out of paper"
+msgstr "�張��"
+
+#. Translators: The printer is offline
+#: ../panels/printers/cc-printers-panel.c:230
+msgid "Offline"
+msgstr "��"
+
+#. Translators: Someone has paused the Printer
+#: ../panels/printers/cc-printers-panel.c:232
+msgid "Paused"
+msgstr "å·²æ?«å??"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: ../panels/printers/cc-printers-panel.c:234
+msgid "Waste receptacle almost full"
+msgstr ""
+
+#. Translators: The printer marker supply waste receptacle is full
+#: ../panels/printers/cc-printers-panel.c:236
+#, fuzzy
+msgid "Waste receptacle full"
+msgstr "ä¿?è?? [25 å??]"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/cc-printers-panel.c:238
+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:240
+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:329
+msgid "Idle"
+msgstr "é??ç½®"
+
+#. Translators: Printer's state (jobs are processing)
+#. Translators: Job's state (job is currently printing)
+#: ../panels/printers/cc-printers-panel.c:333
+#: ../panels/printers/cc-printers-panel.c:726
+msgid "Processing"
+msgstr "è??ç??中"
+
+#. Translators: Printer's state (no jobs can be processed)
+#. Translators: Job's state (job has been stopped)
+#: ../panels/printers/cc-printers-panel.c:337
+#: ../panels/printers/cc-printers-panel.c:730
+msgid "Stopped"
+msgstr "å·²å??æ­¢"
+
+#. Translators: Job's state (job is waiting to be printed)
+#: ../panels/printers/cc-printers-panel.c:718
+msgid "Pending"
+msgstr "��中"
+
+#. Translators: Job's state (job is held for printing)
+#: ../panels/printers/cc-printers-panel.c:722
+msgid "Held"
+msgstr "å·²æ?«å??"
+
+#. Translators: Job's state (job has been canceled)
+#: ../panels/printers/cc-printers-panel.c:734
+msgid "Canceled"
+msgstr "å·²å??æ¶?"
+
+#. Translators: Job's state (job has aborted due to error)
+#: ../panels/printers/cc-printers-panel.c:738
+msgid "Aborted"
+msgstr "已��"
+
+#. Translators: Job's state (job has completed successfully)
+#: ../panels/printers/cc-printers-panel.c:742
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#. Translators: Name of column showing titles of print jobs
+#: ../panels/printers/cc-printers-panel.c:837
+msgid "Job Title"
+msgstr "å·¥ä½?å??稱"
+
+#. Translators: Name of column showing statuses of print jobs
+#: ../panels/printers/cc-printers-panel.c:845
+msgid "Job State"
+msgstr "å·¥ä½?ç??æ??"
+
+#. Translators: Name of column showing names of creators of print jobs
+#: ../panels/printers/cc-printers-panel.c:851
+msgid "User"
+msgstr "使ç?¨è??"
+
+#. Translators: Name of column showing times of creation of print jobs
+#: ../panels/printers/cc-printers-panel.c:857
+msgid "Time"
+msgstr "æ??å?»"
+
+#. Translators: Program cannot connect to DBus' system bus
+#: ../panels/printers/cc-printers-panel.c:1047
+#, c-format
+msgid "Could not connect to system bus: %s"
+msgstr "ç?¡æ³?é?£ç·?è?³ç³»çµ±å?¯æµ?æ??ï¼?%s"
+
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/cc-printers-panel.c:1657
+msgid "Test page"
+msgstr "測試�"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/cc-printers-panel.c:1665
+msgid "Clean print heads"
+msgstr "æ¸?ç??æ??å?°å?´é ­"
+
+#. Translators: An error has occured during execution of a CUPS maintenance command
+#: ../panels/printers/cc-printers-panel.c:1670
+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:1709
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
+msgid "Change printer settings"
+msgstr "æ?¹è®?æ??å?°æ©?設å®?å?¼"
+
+#. Translators: those are keywords for the printing control-center panel
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+msgid "Printer;Queue;Print;Paper;Ink;Toner;"
+msgstr "Printer;Queue;Print;Paper;Ink;Toner;æ??å?°æ©?;ä½?å??;æ??å?°;ç´?å¼µ;墨水;碳ç²?;"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+msgid "Printers"
+msgstr "æ??å?°æ©?"
+
+#: ../panels/printers/printers.ui.h:1
+msgid "\t"
+msgstr ""
+
+#: ../panels/printers/printers.ui.h:2
+msgid "---"
+msgstr "---"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printers.ui.h:4
+msgid "Clean Print Heads"
+msgstr "æ¸?ç??æ??å?°å?´é ­"
+
+#. Translators: This checkbox is checked when the default printer is selected.
+#: ../panels/printers/printers.ui.h:6
+#: ../panels/region/gnome-region-panel-xkbot.c:229
+#: ../panels/sound/gvc-sound-theme-chooser.c:589
+msgid "Default"
+msgstr "�設�"
+
+#. Translators: Description of the printer.
+#: ../panels/printers/printers.ui.h:8
+msgid "Description:"
+msgstr "æ??è¿°ï¼?"
+
+#. Translators: This button pauses printer.
+#: ../panels/printers/printers.ui.h:10
+msgid "Disable Printer"
+msgstr "å??ç?¨æ??å?°æ©?"
+
+#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
+#: ../panels/printers/printers.ui.h:12
+msgid "Location:"
+msgstr "ä½?ç½®:"
+
+#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:14
+msgid "Print Test Page"
+msgstr "æ??å?°æ¸¬è©¦é ?"
+
+#. Translators: A widget showing list of print jobs for selected printer.
+#: ../panels/printers/printers.ui.h:16
+msgid "Printer Jobs"
+msgstr "æ??å?°æ©?å·¥ä½?"
+
+#. Translators: This shows queue of print jobs.
+#: ../panels/printers/printers.ui.h:18
+msgid "Queue"
+msgstr "ä½?å??"
+
+#. Translators: Users which are allowed to print on this printer.
+#: ../panels/printers/printers.ui.h:20
+msgid "Share with these users:"
+msgstr "è??é??äº?使ç?¨è??å??享ï¼?"
+
+#: ../panels/printers/printers.ui.h:21
+msgid "Show / hide printer's jobs"
+msgstr "顯示 / é?±è??æ??å?°æ©?å·¥ä½?"
+
+#. Translators: Status of the printer.
+#: ../panels/printers/printers.ui.h:23
+msgid "Status:"
+msgstr "ç??æ??ï¼?"
+
+#. Translators: By supply we mean ink, toner, staples, water, ...
+#: ../panels/printers/printers.ui.h:25
+msgid "Supply:"
+msgstr "è??æ??ï¼?"
+
+#: ../panels/printers/printers.ui.h:26
+#, fuzzy
+#| msgid "add-toolbutton"
+msgid "pause-toolbutton"
+msgstr "å? å?¥å·¥å?·æ??é??"
+
+#: ../panels/printers/printers.ui.h:27
+#, fuzzy
+#| msgid "remove-toolbutton"
+msgid "resume-toolbutton"
+msgstr "移é?¤å·¥å?·æ??é??"
+
+#: ../panels/printers/printers.ui.h:28
+#, fuzzy
+#| msgid "add-toolbutton"
+msgid "stop-toolbutton"
+msgstr "å? å?¥å·¥å?·æ??é??"
+
+#: ../panels/printers/printers.ui.h:29
+#, fuzzy
+#| msgid "add-toolbutton"
+msgid "toolbutton1"
+msgstr "å? å?¥å·¥å?·æ??é??"
+
+#: ../panels/printers/printers.ui.h:30
+#, fuzzy
+#| msgid "add-toolbutton"
+msgid "toolbutton2"
+msgstr "å? å?¥å·¥å?·æ??é??"
+
+#: ../panels/region/gnome-region-panel.ui.h:1
+msgid "Install languages..."
+msgstr "�����"
+
 #: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Keyboard _model:"
 msgstr "��模�(_M)"
 
 #: ../panels/region/gnome-region-panel.ui.h:3
+msgid "Language"
+msgstr "��"
+
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Layouts"
 msgstr "é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
+#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "List of keyboard layouts selected for usage"
 msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
 
 #: ../panels/region/gnome-region-panel.ui.h:6
-#: ../panels/universal-access/uap.ui.h:54
-msgid "Mouse Keys"
-msgstr "�鼠���"
-
-#: ../panels/region/gnome-region-panel.ui.h:7
 msgid "Move _Down"
 msgstr "�移(_D)"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
+#: ../panels/region/gnome-region-panel.ui.h:7
 msgid "Move _Up"
 msgstr "�移(_U)"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
+#: ../panels/region/gnome-region-panel.ui.h:8
 msgid "Move the selected keyboard layout down in the list"
 msgstr "å°?æ¸?å?®ä¸­é?¸å??ç??é?µç?¤é??ç½®å??ä¸?移å??"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Move the selected keyboard layout up in the list"
 msgstr "å°?æ¸?å?®ä¸­é?¸å??ç??é?µç?¤é??ç½®å??ä¸?移å??"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/gnome-region-panel.ui.h:10
 msgid "New windows u_se active window's layout"
 msgstr "æ?°è¦?çª?延ç?¨ä½¿ç?¨ä¸­è¦?çª?ç??é??ç½®(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/gnome-region-panel.ui.h:11
 msgid "Print a diagram of the selected keyboard layout"
 msgstr "顯示é?¸å??ç??é?µç?¤é??ç½®ç??å??表"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/gnome-region-panel.ui.h:12
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "å?°å??å??èª?è¨?"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "Remove the selected keyboard layout from the list"
 msgstr "å¾?æ¸?å?®ä¸­ç§»é?¤é?¸å??ç??é?µç?¤é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
+#: ../panels/region/gnome-region-panel.ui.h:14
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
@@ -1262,43 +1280,34 @@ msgstr ""
 "以é ?設å?¼æ?¿æ??ç?®å??ç??é?µç?¤é??ç½®\n"
 "設��"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
+#: ../panels/region/gnome-region-panel.ui.h:16
 msgid "Reset to De_faults"
 msgstr "é??ç½®ç?ºé ?設å?¼(_F)"
 
+#: ../panels/region/gnome-region-panel.ui.h:17
+msgid "Select a display language"
+msgstr "é?¸æ??顯示ç??èª?è¨?"
+
 #: ../panels/region/gnome-region-panel.ui.h:18
 msgid "Select a keyboard layout to be added to the list"
 msgstr "é?¸æ??è¦?å? å?¥æ¸?å?®ç??é?µç?¤é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
+#: ../panels/region/gnome-region-panel.ui.h:19
 msgid "View and edit keyboard layout options"
 msgstr "檢è¦?並編輯é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-#: ../panels/mouse/gnome-mouse-properties.ui.h:48
-msgid "_Acceleration:"
-msgstr "å? é??度(_A):"
-
-#: ../panels/region/gnome-region-panel.ui.h:23
+#: ../panels/region/gnome-region-panel.ui.h:20
 msgid "_Add..."
 msgstr "å? å?¥(_A)â?¦"
 
-#: ../panels/region/gnome-region-panel.ui.h:25
+#: ../panels/region/gnome-region-panel.ui.h:21
 msgid "_Options..."
 msgstr "��(_O)�"
 
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "_Pointer can be controlled using the keypad"
-msgstr "å??許使ç?¨é?µç?¤æ?§å?¶é¼ æ¨?(_P)"
-
-#: ../panels/region/gnome-region-panel.ui.h:27
+#: ../panels/region/gnome-region-panel.ui.h:22
 msgid "_Separate layout for each window"
 msgstr "給æ¯?ä¸?å??è¦?çª?ç?¨ç«?ç??é??ç½®(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid "_Type to test settings:"
-msgstr "è«?輸å?¥æ??å­?ä¾?測試設å®?(_T):"
-
 #: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
 msgid "By _country"
 msgstr "æ ¹æ??å??家(_C)"
@@ -1343,7 +1352,14 @@ msgstr "製é? å??(_V):"
 msgid "Keyboard Layout Options"
 msgstr "é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:218
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/region/gnome-region-panel-xkb.c:70
+#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#: ../panels/region/gnome-region-panel-xkblt.c:220
 msgid "Layout"
 msgstr "é??ç½®"
 
@@ -1355,12 +1371,6 @@ msgstr "製é? å??"
 msgid "Models"
 msgstr "å??è??"
 
-#: ../panels/region/gnome-region-panel-xkbot.c:227
-#: ../panels/network/gnome-network-properties.c:554
-#: ../panels/sound/gvc-sound-theme-chooser.c:589
-msgid "Default"
-msgstr "�設�"
-
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
 msgid "Change your region and language settings"
 msgstr "æ?¹è®?ä½ ç??å?°å??å??èª?è¨?設å®?å?¼"
@@ -1368,338 +1378,376 @@ msgstr "æ?¹è®?ä½ ç??å?°å??å??èª?è¨?設å®?å?¼"
 #. Translators: those are keywords for the region control-center panel
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 #, fuzzy
-#| msgid "_Language:"
-msgid "Language;Layout;"
-msgstr "<b>é?µç?¤é??ç½®</b>"
+#| msgid "Language;Layout;"
+msgid "Language;Layout;Keyboard;"
+msgstr "Language;Layout;èª?è¨?;é??ç½®;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
-msgid "Choose type of click _beforehand"
-msgstr "äº?å??é?¸æ??é»?æ??ç??é¡?å??(_B)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgid "Choose type of click with mo_use gestures"
-msgstr "é?¸æ??æ»?é¼ æ??å?¢ç??é»?æ??é¡?å??(_U)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
-#: ../panels/universal-access/uap.ui.h:29
-msgid "D_elay:"
-msgstr "延�(_E):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "D_ouble click:"
-msgstr "é?£æ??å?©ä¸?(_O):"
-
-#. click to initiate drag-and-drop (like normally click and hold)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
-msgid "D_rag click:"
-msgstr "æ??æ?³é»?æ??(_R):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Disable _touchpad while typing"
 msgstr "æ??å­?æ??å??ç?¨è§¸æ?§æ?¿(_T)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
 msgid "Double-Click Timeout"
 msgstr "é?£æ??å?©ä¸?å??辨æ??é??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Drag and Drop"
 msgstr "æ??æ?¾"
 
-#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
-msgid "Dwell Click"
-msgstr "æ?¿ä»£é»?æ??"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "Enable _mouse clicks with touchpad"
 msgstr "å??ç?¨è§¸æ?§æ?¿ç??æ»?é¼ é»?æ??(_M)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "Enable h_orizontal scrolling"
 msgstr "å??ç?¨æ°´å¹³æ?²å??(_O)"
 
 #. high sensitivity
-#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 #: ../panels/universal-access/uap.ui.h:39
 msgid "High"
 msgstr "é«?"
 
 #. large threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:22
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 #: ../panels/universal-access/uap.ui.h:48
 msgid "Large"
 msgstr "大"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Locate Pointer"
 msgstr "�示鼠��置"
 
 #. low sensitivity
-#: ../panels/mouse/gnome-mouse-properties.ui.h:27
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 #: ../panels/universal-access/uap.ui.h:52
 msgid "Low"
 msgstr "ä½?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+msgid "Mouse"
+msgstr "æ»?é¼ "
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:19
 msgid "Mouse Orientation"
 msgstr "å·¦å?³æ??模å¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:29
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
 msgid "Mouse Preferences"
 msgstr "æ»?é¼ å??好設å®?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
+#: ../panels/mouse/gnome-mouse-properties.ui.h:21
 msgid "Pointer Speed"
 msgstr "æ??æ¨?é??度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:31
+#: ../panels/mouse/gnome-mouse-properties.ui.h:22
 msgid "Scrolling"
 msgstr "æ?²å??æ?¹å¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:32
-msgid "Seco_ndary click:"
-msgstr "次è¦?é»?æ??(_N):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:33
+#: ../panels/mouse/gnome-mouse-properties.ui.h:23
 msgid "Sh_ow position of pointer when the Control key is pressed"
 msgstr "ç?¶æ??ä¸? Control æ??顯示游æ¨?ç??ä½?ç½®(_O)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:36
-msgid "Show click type _window"
-msgstr "顯示é»?æ??é¡?å??è¦?çª?(_W)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:37
-#: ../panels/universal-access/uap.ui.h:73
-msgid "Simulated Secondary Click"
-msgstr "模æ?¬æ¬¡è¦?é»?æ??"
-
 #. small threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:41
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/mouse/gnome-mouse-properties.ui.h:28
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Small"
 msgstr "å°?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:42
+#: ../panels/mouse/gnome-mouse-properties.ui.h:29
 msgid "Thr_eshold:"
 msgstr "å??辨è·?é?¢(_E):"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:43
-#| msgid ""
-#| "To test your double-click settings, try to double-click on the light bulb."
+#: ../panels/mouse/gnome-mouse-properties.ui.h:30
 msgid "To test your settings, try to double-click on the face."
 msgstr "è¦?測試你ç??設å®?å?¼ï¼?è«?å??試å?¨é??å??è??ä¸?é?£æ??å?©ä¸?ã??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:44
+#: ../panels/mouse/gnome-mouse-properties.ui.h:31
 msgid "Touchpad"
 msgstr "觸��"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:45
+#: ../panels/mouse/gnome-mouse-properties.ui.h:32
 msgid "Two-_finger scrolling"
 msgstr "å?©é»?æ?²å??(_F)"
 
-#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:47
-msgid "You can also use the Dwell Click panel applet to choose the click type."
-msgstr "ä½ å?¯ä»¥ä½¿ç?¨ã??æ?¿ä»£é»?æ??ã??é?¢æ?¿ç¨?å¼?ä¾?é?¸æ??é»?æ??ç??é¡?å??ã??"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:33
+msgid "_Acceleration:"
+msgstr "å? é??度(_A):"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:50
+#: ../panels/mouse/gnome-mouse-properties.ui.h:34
 msgid "_Disabled"
 msgstr "å·²å??ç?¨(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:51
+#: ../panels/mouse/gnome-mouse-properties.ui.h:35
 msgid "_Edge scrolling"
 msgstr "é??ç·£æ?²å??(_E)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:52
-msgid "_Initiate click when stopping pointer movement"
-msgstr "ç?¶å??止游æ¨?移å??æ??å??å§?å??é»?æ??(_I)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:53
+#: ../panels/mouse/gnome-mouse-properties.ui.h:36
 msgid "_Left-handed"
 msgstr "æ?£ç?¨å·¦æ??(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:54
-#: ../panels/universal-access/uap.ui.h:96
-msgid "_Motion threshold:"
-msgstr "移å??é??度(_M):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:55
+#: ../panels/mouse/gnome-mouse-properties.ui.h:37
 msgid "_Right-handed"
 msgstr "æ?£ç?¨å?³æ??(_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:56
+#: ../panels/mouse/gnome-mouse-properties.ui.h:38
 msgid "_Sensitivity:"
 msgstr "æ??æ??度(_S):"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:57
-msgid "_Single click:"
-msgstr "é»?é?¸(_S):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:58
+#: ../panels/mouse/gnome-mouse-properties.ui.h:39
 msgid "_Timeout:"
 msgstr "æ??é??(_T):"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:59
-msgid "_Trigger secondary click by holding down the primary button"
-msgstr "æ??ä½?主è¦?é?µæ??觸ç?¼æ¬¡è¦?é»?æ??(_T)"
-
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-#| msgid "Touchpad"
 msgid "Mouse and Touchpad"
 msgstr "æ»?é¼ å??觸æ?§æ?¿"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-#| msgid "Set your mouse preferences"
 msgid "Set your mouse and touchpad preferences"
 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;"
-msgstr ""
+msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
+msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;觸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?觸;é?£æ??å?©ä¸?;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/gnome-network-properties.c:672
-msgid "New Location..."
-msgstr "���置�"
+#: ../panels/network/cc-network-panel.c:1062
+#: ../panels/network/cc-network-panel.c:1084
+#, c-format
+msgid "%i Mb/s"
+msgstr "%i Mb/s"
 
-#: ../panels/network/gnome-network-properties.c:789
-msgid "Location already exists"
-msgstr "�置已���"
+#: ../panels/network/cc-network-panel.c:1064
+#, c-format
+msgid "%i Gb/s"
+msgstr "%i Gb/s"
+
+#: ../panels/network/cc-network-panel.c:1082
+#, c-format
+msgid "%i kb/s"
+msgstr "%i kb/s"
+
+#: ../panels/network/cc-network-panel.c:1739
+msgid "Network proxy"
+msgstr "網絡代ç??伺æ??å?¨"
+
+#: ../panels/network/cc-network-panel.c:1748
+msgid "Set the system proxy settings"
+msgstr "設å®?系統代ç??伺æ??å?¨è¨­å®?å?¼"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:69
+msgid "Wired"
+msgstr "æ??ç·?"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:73
+msgid "Wireless"
+msgstr "ç?¡ç·?"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:78
+msgid "Mobile broadband"
+msgstr "è¡?å??寬頻"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:82
+msgid "Bluetooth"
+msgstr "è??ç??"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:86
+#, fuzzy
+#| msgid "Models"
+msgid "Mesh"
+msgstr "å??è??"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:142
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:146
+msgid "Infrastructure"
+msgstr "����"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:164
+msgid "Status unknown"
+msgstr "ç??æ??ä¸?æ??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:168
+msgid "Unmanaged"
+msgstr "æ?ªç®¡ç??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:172
+msgid "Unavailable"
+msgstr "��使�"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:176
+msgid "Disconnected"
+msgstr "已��"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:180
+msgid "Preparing connection"
+msgstr "æ­£å?¨æº?å??é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:184
+msgid "Configuring connection"
+msgstr "正�設���"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:188
+msgid "Authenticating"
+msgstr "正���"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:192
+msgid "Getting network address"
+msgstr "æ­£å?¨å??å¾?網絡ä½?å??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:196
+msgid "Connected"
+msgstr "已��"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:200
+msgid "Failed to connect"
+msgstr "����"
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-msgid "Network Proxy"
-msgstr "代ç??伺æ??å?¨"
+msgid "Network"
+msgstr "網絡"
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Set your network proxy preferences"
-msgstr "設å®?代ç??伺æ??å?¨"
+msgid "Network settings"
+msgstr "網絡設��"
 
-#. Translators: those are keywords for the network proxy control-center panel
+#. Translators: those are keywords for the network control-center panel
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-#, fuzzy
-#| msgid "Location:"
-msgid "Web;Location;"
-msgstr "��水平�置"
+msgid "Network;Wireless;IP;LAN;"
+msgstr "Network;Wireless;IP;LAN;網絡;ç?¡ç·?;å??å??網絡;"
 
-#: ../panels/network/gnome-network-properties.ui.h:1
-msgid "<b>Di_rect internet connection</b>"
-msgstr "<b>��網絡��(_R)</b>"
+#: ../panels/network/network.ui.h:1
+msgid "Airplane Mode"
+msgstr "��模�"
 
-#: ../panels/network/gnome-network-properties.ui.h:2
-msgid "<b>_Automatic proxy configuration</b>"
-msgstr "<b>è?ªå??設å®?代ç??伺æ??å?¨(_A)</b>"
+#: ../panels/network/network.ui.h:2
+msgid "Configuration URL:"
+msgstr "çµ?æ??網å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:3
-msgid "<b>_Manual proxy configuration</b>"
-msgstr "<b>è?ªé?¸ä»£ç??伺æ??å?¨(_M)</b>"
+#: ../panels/network/network.ui.h:3
+msgid "DNS:"
+msgstr "DNSï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:4
-msgid "<b>_Use authentication</b>"
-msgstr "<b>é??è¦?èª?è­?(_U)</b>"
+#: ../panels/network/network.ui.h:4
+msgid "Default Route:"
+msgstr "�設路��"
 
-#: ../panels/network/gnome-network-properties.ui.h:5
-msgid "Autoconfiguration _URL:"
-msgstr "è?ªå??設å®?æ??é??ç?? _URLï¼?"
+#: ../panels/network/network.ui.h:5
+msgid "FTP Proxy:"
+msgstr "FTP 代ç??伺æ??å?¨ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:6
-msgid "C_reate"
-msgstr "建�(_R)"
+#: ../panels/network/network.ui.h:6
+msgid "Gateway:"
+msgstr "é??è¨?é??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:7
-msgid "Create New Location"
-msgstr "建ç«?æ?°ç??ä½?ç½®"
+#: ../panels/network/network.ui.h:7
+msgid "Group Name:"
+msgstr "ç¾£çµ?å??稱ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:8
-msgid "HTTP Proxy Details"
-msgstr "HTTP 代ç??伺æ??å?¨è¨­å®?"
+#: ../panels/network/network.ui.h:8
+msgid "Group Password:"
+msgstr "羣��碼�"
 
-#: ../panels/network/gnome-network-properties.ui.h:9
-msgid "H_TTP proxy:"
-msgstr "H_TTP 代ç??伺æ??å?¨ï¼?"
+#: ../panels/network/network.ui.h:9
+msgid "HTTP Proxy:"
+msgstr "HTTP 代ç??伺æ??å?¨å¯?碼ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:10
-msgid "Ignore Host List"
-msgstr "忽�主���"
+#: ../panels/network/network.ui.h:10
+msgid "Hardware Address:"
+msgstr "硬件ä½?å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:11
-msgid "Ignored Hosts"
-msgstr "忽ç?¥ç??主æ©?"
-
-#: ../panels/network/gnome-network-properties.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:18
-msgid "Location:"
-msgstr "ä½?ç½®:"
+#: ../panels/network/network.ui.h:11
+msgid "IMEI:"
+msgstr "IMEIï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:13
-msgid "Network Proxy Preferences"
-msgstr "網絡代ç??伺æ??å?¨å??好設å®?"
+#: ../panels/network/network.ui.h:12
+msgid "IP Address:"
+msgstr "IP ä½?å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:14
-msgid "Port:"
-msgstr "���:"
+#: ../panels/network/network.ui.h:13
+msgid "IPv4 Address:"
+msgstr "IPv4 ä½?å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:15
-msgid "Proxy Configuration"
-msgstr "代ç??伺æ??å?¨è¨­å®?"
+#: ../panels/network/network.ui.h:14
+msgid "IPv6 Address:"
+msgstr "IPv6 ä½?å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:16
-msgid "S_ocks host:"
-msgstr "S_ocks 主��"
+#: ../panels/network/network.ui.h:15
+msgid "Method:"
+msgstr "���"
 
-#: ../panels/network/gnome-network-properties.ui.h:17
-msgid "The location already exists."
-msgstr "該ä½?置已ç¶?å­?å?¨ã??"
+#: ../panels/network/network.ui.h:16
+msgid "Network Name:"
+msgstr "網絡å??稱ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:18
-msgid "U_sername:"
-msgstr "使ç?¨è??å??稱(_S):"
+#: ../panels/network/network.ui.h:17
+msgid "Provider:"
+msgstr "ä¾?æ??å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:19
-msgid "_Delete Location"
-msgstr "å??é?¤ä½?ç½®(_D)"
+#: ../panels/network/network.ui.h:18
+msgid "Secure HTTP Proxy:"
+msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:20
-msgid "_Details"
-msgstr "詳細設�(_D)"
+#: ../panels/network/network.ui.h:19
+msgid "Security:"
+msgstr "����"
 
-#: ../panels/network/gnome-network-properties.ui.h:21
-msgid "_FTP proxy:"
-msgstr "_FTP 代ç??伺æ??å?¨ï¼?"
+#: ../panels/network/network.ui.h:20
+msgid "Socks Host:"
+msgstr "Socks 主��"
 
-#: ../panels/network/gnome-network-properties.ui.h:22
-msgid "_Location name:"
-msgstr "ä½?ç½®å??稱(_L):"
+#: ../panels/network/network.ui.h:21
+msgid "Speed:"
+msgstr "é??度ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:23
-msgid "_Password:"
-msgstr "�碼(_P):"
+#: ../panels/network/network.ui.h:22
+msgid "Subnet Mask:"
+msgstr "�網絡�罩�"
 
-#: ../panels/network/gnome-network-properties.ui.h:24
-msgid "_Secure HTTP proxy:"
-msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨(_S):"
+#: ../panels/network/network.ui.h:23
+#: ../panels/user-accounts/um-lockbutton.c:356
+msgid "Unlock"
+msgstr "解é??"
 
-#: ../panels/network/gnome-network-properties.ui.h:25
-msgid "_Use the same proxy for all protocols"
-msgstr "æ??æ??å??å®?ç??使ç?¨ç?¸å??ç??代ç??伺æ??å?¨(_U)"
+#: ../panels/network/network.ui.h:24
+msgid "Username:"
+msgstr "使ç?¨è??å??稱ï¼?"
 
-#. Translators: those are keywords for the brightness and lock control-center panel
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-#, fuzzy
-msgid "Brightness;Lock;Dim;Blank;"
-msgstr "è?¢å¹?亮度è??é??å®?設å®?å?¼"
+#: ../panels/network/network.ui.h:25
+msgctxt "proxy method"
+msgid "Automatic"
+msgstr "è?ªå??"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
-#| msgid "Siren"
-msgid "Screen"
-msgstr "��"
+#: ../panels/network/network.ui.h:26
+msgctxt "proxy method"
+msgid "Manual"
+msgstr "æ??å??"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
-msgid "Screen brightness and lock settings"
-msgstr "è?¢å¹?亮度è??é??å®?設å®?å?¼"
+#: ../panels/network/network.ui.h:27
+msgctxt "proxy method"
+msgid "None"
+msgstr "æ²?æ??"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-#| msgid "Pointer"
 msgid "Power"
 msgstr "��"
 
@@ -1710,17 +1758,16 @@ msgstr "é?»æº?管ç??設å®?å?¼"
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
 #, fuzzy
-msgid "Power;Sleep;Suspend;Hibernate;"
-msgstr "å°?é?»è?¦æ?«å??è??ä¼?ç? "
+#| msgid "Power;Sleep;Suspend;Hibernate;"
+msgid "Power;Sleep;Suspend;Hibernate;Battery;"
+msgstr "Power;Sleep;Suspend;Hibernate;é?»æº?;ç?¡ç? ;æ?«å??;ä¼?ç? ;"
 
 #: ../panels/power/cc-power-panel.c:151
-#| msgid "Unknown"
 msgid "Unknown time"
 msgstr "æ?ªç?¥ç??æ??é??"
 
 #: ../panels/power/cc-power-panel.c:157
 #, c-format
-#| msgid "minutes"
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i å??é??"
@@ -1735,29 +1782,24 @@ msgstr[0] "%i å°?æ??"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
 #: ../panels/power/cc-power-panel.c:177
 #, c-format
-#| msgid "%d %s by %d %s"
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
 #: ../panels/power/cc-power-panel.c:178
-#| msgid "Short"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 
 #: ../panels/power/cc-power-panel.c:179
-#| msgid "minutes"
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 
 #: ../panels/power/cc-power-panel.c:251
-#| msgid "Battery warning"
 msgid "Battery charging"
 msgstr "é?»æ± æ­£å?¨å??é?»"
 
 #: ../panels/power/cc-power-panel.c:254
-#| msgid "Battery warning"
 msgid "Battery discharging"
 msgstr "�池正���"
 
@@ -1788,12 +1830,130 @@ msgstr "è·?é?¢å®?å?¨æ?¾é?»é??æ?? %s (%.0lf%%)"
 msgid "%.0lf%% charged"
 msgstr "å·²å??é?» %.0lf%%"
 
+#: ../panels/power/power.ui.h:1 ../panels/screen/screen.ui.h:1
+msgid "1 hour"
+msgstr "1 å°?æ??"
+
+#: ../panels/power/power.ui.h:2 ../panels/screen/screen.ui.h:3
+msgid "10 minutes"
+msgstr "10 å??é??"
+
+#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
+msgid "30 minutes"
+msgstr "30 å??é??"
+
+#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
+msgid "5 minutes"
+msgstr "5 å??é??"
+
+#: ../panels/power/power.ui.h:5
+msgid "AC power and inactive for:"
+msgstr "AC é?»æº?ä¸?é??ç½®ï¼?"
+
+#: ../panels/power/power.ui.h:6
+msgid "Ask me"
+msgstr "è©¢å??æ??"
+
+#: ../panels/power/power.ui.h:7
+msgid "Battery power and inactive for:"
+msgstr "é?»æ± é?»æº?ä¸?é??ç½®ï¼?"
+
+#: ../panels/power/power.ui.h:9
+msgid "Hibernate"
+msgstr "ä¼?ç? "
+
+#: ../panels/power/power.ui.h:10
+msgid "Put the computer to sleep when inactive for:"
+msgstr "å?¨é??置此æ??é??å¾?è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
+
+#: ../panels/power/power.ui.h:11
+msgid "Put the computer to sleep when on:"
+msgstr "å?¨æ­¤æ??é??è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
+
+#: ../panels/power/power.ui.h:12
+msgid "Shutdown"
+msgstr "é??æ©?"
+
+#: ../panels/power/power.ui.h:13
+msgid "Suspend"
+msgstr "æ?«å??"
+
+#: ../panels/power/power.ui.h:14
+msgid "When power is critically low:"
+msgstr "ç?¶é?»æº?ç??é?»é??極ä½?æ??ï¼?"
+
+#: ../panels/power/power.ui.h:15
+msgid "When the power button is pressed:"
+msgstr "ç?¶é?»æº?é??é??æ??é??被æ??ä¸?æ??ï¼?"
+
+#: ../panels/power/power.ui.h:16
+msgid "When the sleep button is pressed:"
+msgstr "ç?¶ç?¡ç? æ??é??被æ??ä¸?æ??ï¼?"
+
+#. Translators: those are keywords for the brightness and lock control-center panel
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
+#, fuzzy
+#| msgid "Brightness;Lock;Dim;Blank;"
+msgid "Brightness;Lock;Dim;Blank;Monitor;"
+msgstr "Brightness;Lock;Dim;Blank;亮度;é??å®?;調æ??;空ç?½;"
+
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
+msgid "Screen"
+msgstr "��"
+
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
+msgid "Screen brightness and lock settings"
+msgstr "è?¢å¹?亮度è??é??å®?設å®?å?¼"
+
+#: ../panels/screen/screen.ui.h:2
+msgid "1 minute"
+msgstr "1 å??é??"
+
+#: ../panels/screen/screen.ui.h:4
+msgid "2 minutes"
+msgstr "2 å??é??"
+
+#: ../panels/screen/screen.ui.h:5
+msgid "3 minutes"
+msgstr "3 å??é??"
+
+#: ../panels/screen/screen.ui.h:8
+msgid "Brightness"
+msgstr "亮度"
+
+#: ../panels/screen/screen.ui.h:9
+msgid "Dim screen to save power"
+msgstr "調æ??è?¢å¹?以ç¯?ç??é?»æº?"
+
+#: ../panels/screen/screen.ui.h:10
+msgid "Don't lock when at home"
+msgstr "å?¨å®¶æ??ä¸?è¦?é??å®?"
+
+#: ../panels/screen/screen.ui.h:11
+msgid "Locations..."
+msgstr "�置�"
+
+#: ../panels/screen/screen.ui.h:12 ../panels/user-accounts/um-lockbutton.c:347
+msgid "Lock"
+msgstr "é??å®?"
+
+#: ../panels/screen/screen.ui.h:13
+msgid "Lock screen after:"
+msgstr "é??å®?è?¢å¹?æ??é??ï¼?"
+
+#: ../panels/screen/screen.ui.h:14
+msgid "Screen turns off"
+msgstr "è?¢å¹?é??é??"
+
+#: ../panels/screen/screen.ui.h:15
+msgid "Turn off after:"
+msgstr "é??é??æ??é??ï¼?"
+
 #: ../panels/sound/applet-main.c:49
 msgid "Enable debugging code"
 msgstr "å??ç?¨é?¤é?¯ç¢¼"
 
 #: ../panels/sound/applet-main.c:50
-#| msgid "Open with Default Application"
 msgid "Version of this application"
 msgstr "é??å??ç¨?å¼?ç??ç??æ?¬"
 
@@ -1801,19 +1961,15 @@ msgstr "é??å??ç¨?å¼?ç??ç??æ?¬"
 msgid " â?? GNOME Volume Control Applet"
 msgstr " â?? GNOME é?³é??æ?§å?¶é?¢æ?¿ç¨?å¼?"
 
-#: ../panels/sound/gvc-applet.c:276
-#: ../panels/sound/gvc-mixer-dialog.c:1921
-#| msgid "Cloned Output"
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1923
 msgid "Output"
 msgstr "輸�"
 
 #: ../panels/sound/gvc-applet.c:278
-#| msgid "Cloned Output"
 msgid "Sound Output Volume"
 msgstr "é?³æ??輸å?ºé?³é??"
 
-#: ../panels/sound/gvc-applet.c:282
-#: ../panels/sound/gvc-mixer-dialog.c:1838
+#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1840
 msgid "Input"
 msgstr "輸�"
 
@@ -1822,13 +1978,11 @@ msgid "Microphone Volume"
 msgstr "麥å??風é?³é??"
 
 #: ../panels/sound/gvc-balance-bar.c:111
-#| msgid "Left"
 msgctxt "balance"
 msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/sound/gvc-balance-bar.c:112
-#| msgid "Right"
 msgctxt "balance"
 msgid "Right"
 msgstr "å?³"
@@ -1839,56 +1993,47 @@ msgid "Rear"
 msgstr "å¾?"
 
 #: ../panels/sound/gvc-balance-bar.c:116
-#| msgid "Fonts"
 msgctxt "balance"
 msgid "Front"
 msgstr "å??"
 
 #: ../panels/sound/gvc-balance-bar.c:119
-#| msgid "Minimize"
 msgctxt "balance"
 msgid "Minimum"
 msgstr "æ??å°?å?¼"
 
 #: ../panels/sound/gvc-balance-bar.c:120
-#| msgid "Maximize"
 msgctxt "balance"
 msgid "Maximum"
 msgstr "æ??大å?¼"
 
-#: ../panels/sound/gvc-balance-bar.c:296
+#: ../panels/sound/gvc-balance-bar.c:295
 msgid "_Balance:"
 msgstr "平衡(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:299
-#| msgid "_Name:"
+#: ../panels/sound/gvc-balance-bar.c:298
 msgid "_Fade:"
 msgstr "æ·¡å??(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:302
+#: ../panels/sound/gvc-balance-bar.c:301
 msgid "_Subwoofer:"
 msgstr "é??ä½?é?³(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:603
-#: ../panels/sound/gvc-channel-bar.c:612
-#| msgid "100%"
+#: ../panels/sound/gvc-channel-bar.c:602 ../panels/sound/gvc-channel-bar.c:611
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:607
+#: ../panels/sound/gvc-channel-bar.c:606
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "���大"
 
-#: ../panels/sound/gvc-channel-bar.c:901
-#| msgid "Mutt"
+#: ../panels/sound/gvc-channel-bar.c:900
 msgid "Mute"
 msgstr "é??é?³"
 
-#: ../panels/sound/gvc-combo-box.c:167
-#: ../panels/sound/gvc-mixer-dialog.c:1629
-#| msgid "_Mobile:"
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1631
 msgid "_Profile:"
 msgstr "設å®?çµ?å??(_P):"
 
@@ -1896,7 +2041,6 @@ msgstr "設å®?çµ?å??(_P):"
 #. * The number of sound outputs on a particular device
 #: ../panels/sound/gvc-mixer-control.c:1098
 #, c-format
-#| msgid "Cloned Output"
 msgid "%u Output"
 msgid_plural "%u Outputs"
 msgstr[0] "%u 輸�"
@@ -1910,13 +2054,11 @@ msgid_plural "%u Inputs"
 msgstr[0] "%u 輸�"
 
 #: ../panels/sound/gvc-mixer-control.c:1406
-#| msgid "System Settings"
 msgid "System Sounds"
 msgstr "系統é?³æ??"
 
 #: ../panels/sound/gvc-mixer-dialog.c:317
 #: ../panels/sound/gvc-mixer-dialog.c:618
-#| msgid "Co_untry:"
 msgid "Co_nnector:"
 msgstr "���(_N):"
 
@@ -1924,79 +2066,71 @@ msgstr "���(_N):"
 msgid "Peak detect"
 msgstr "峰�檢測"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1506
-#: ../panels/sound/gvc-mixer-dialog.c:1717
+#: ../panels/sound/gvc-mixer-dialog.c:1507
+#: ../panels/sound/gvc-mixer-dialog.c:1719
 #: ../panels/sound/gvc-sound-theme-chooser.c:599
-#| msgid "Name:"
 msgid "Name"
 msgstr "å??稱"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1524
-#| msgid "Devices"
+#: ../panels/sound/gvc-mixer-dialog.c:1525
 msgid "Device"
 msgstr "�置"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1572
+#: ../panels/sound/gvc-mixer-dialog.c:1573
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s ç??å??å?­æ¸¬è©¦"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1630
-#| msgid "Test flash"
+#: ../panels/sound/gvc-mixer-dialog.c:1632
 msgid "Test Speakers"
 msgstr "測試å??å?­"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: ../panels/sound/gvc-mixer-dialog.c:1763
 msgid "_Output volume: "
 msgstr "輸å?ºé?³é??(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1775
-#| msgid "Sound files"
+#: ../panels/sound/gvc-mixer-dialog.c:1777
 msgid "Sound Effects"
 msgstr "è?²é?³æ??æ??"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1782
-#| msgid "Alert sound"
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "_Alert volume: "
 msgstr "警示é?³é??(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1795
+#: ../panels/sound/gvc-mixer-dialog.c:1797
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1800
+#: ../panels/sound/gvc-mixer-dialog.c:1802
 msgid "C_hoose a device to configure:"
 msgstr "é?¸æ??è¦?設å®?ç??è£?ç½®(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1827
-#: ../panels/sound/gvc-mixer-dialog.c:1950
+#: ../panels/sound/gvc-mixer-dialog.c:1829
+#: ../panels/sound/gvc-mixer-dialog.c:1952
 msgid "Settings for the selected device:"
 msgstr "å·²é?¸å??è£?ç½®ç??設å®?å?¼ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1845
-#| msgid "_Input boxes:"
+#: ../panels/sound/gvc-mixer-dialog.c:1847
 msgid "_Input volume: "
 msgstr "輸å?¥é?³é??(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1868
-#| msgid "_Input boxes:"
+#: ../panels/sound/gvc-mixer-dialog.c:1870
 msgid "Input level:"
 msgstr "輸����"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1894
+#: ../panels/sound/gvc-mixer-dialog.c:1896
 msgid "C_hoose a device for sound input:"
 msgstr "é?¸æ??è?²é?³è¼¸å?¥ç??è£?ç½®(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1926
+#: ../panels/sound/gvc-mixer-dialog.c:1928
 msgid "C_hoose a device for sound output:"
 msgstr "é?¸æ??è?²é?³è¼¸å?ºç??è£?ç½®(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1961
-#| msgid "_Application font:"
+#: ../panels/sound/gvc-mixer-dialog.c:1963
 msgid "Applications"
 msgstr "ç¨?å¼?é??"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1965
+#: ../panels/sound/gvc-mixer-dialog.c:1967
 msgid "No application is currently playing or recording audio."
 msgstr "æ²?æ??æ??ç?¨ç¨?å¼?ç?®å??æ­£å?¨æ?­æ?¾æ??é??製é?³æ??ã??"
 
@@ -2006,7 +2140,6 @@ msgstr "å??æ­¢"
 
 #: ../panels/sound/gvc-speaker-test.c:221
 #: ../panels/sound/gvc-speaker-test.c:333
-#| msgid "Test:"
 msgid "Test"
 msgstr "測試"
 
@@ -2014,24 +2147,20 @@ msgstr "測試"
 msgid "Subwoofer"
 msgstr "é??ä½?é?³"
 
-#: ../panels/sound/gvc-stream-status-icon.c:233
+#: ../panels/sound/gvc-stream-status-icon.c:236
 #, c-format
-#| msgid "Sound Preferences"
 msgid "Failed to start Sound Preferences: %s"
 msgstr "å??å??é?³æ??å??好設å®?失æ??ï¼?%s"
 
-#: ../panels/sound/gvc-stream-status-icon.c:256
-#| msgid "Mutt"
+#: ../panels/sound/gvc-stream-status-icon.c:262
 msgid "_Mute"
 msgstr "é??é?³(_M)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:265
-#| msgid "Sound Preferences"
+#: ../panels/sound/gvc-stream-status-icon.c:271
 msgid "_Sound Preferences"
 msgstr "é?³æ??å??好設å®?(_S)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:449
-#| msgid "Multimedia"
+#: ../panels/sound/gvc-stream-status-icon.c:455
 msgid "Muted"
 msgstr "å·²é??é?³"
 
@@ -2052,38 +2181,41 @@ msgid "Testing event sound"
 msgstr "測試�件��"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:590
-#| msgid "Icon theme"
 msgid "From theme"
 msgstr "�主�"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:778
-#| msgid "Play _alert sound"
 msgid "C_hoose an alert sound:"
 msgstr "é?¸æ??警示é?³æ??(_H):"
 
+#: ../panels/sound/sound-theme-file-utils.c:292
+msgid "Custom"
+msgstr "��"
+
 #: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
 msgid "Show desktop volume control"
 msgstr "顯示æ¡?é?¢é?³é??æ?§å?¶"
 
 #: ../panels/sound/data/gnome-sound-applet.desktop.in.h:2
-#| msgid "Unknown Volume Control %d"
 msgid "Volume Control"
 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 ""
+msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;é?³æ??å?¡;麥å??風;é?³é??;æ·¡å??;平衡;è??ç??;è?³æ©?;"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:3
-#| msgid "Enable sound and associate sounds with events"
 msgid "Change sound volume and sound events"
 msgstr "æ?¹è®?é?³æ??ç??é?³é??å??é?³æ??äº?件"
 
+#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
+msgid "Sound"
+msgstr "é?³æ??"
+
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
 #: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
-#| msgid "Callback"
 msgid "Bark"
 msgstr "汪汪"
 
@@ -2102,16 +2234,13 @@ msgstr "æ?²ç?»ç??"
 #. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
 #. You might want to translate it into the equivalent words of your language.
 #: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:12
-#| msgid "Sound"
 msgid "Sonar"
 msgstr "��"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-#, fuzzy
-#| msgid "_Keyboard Accessibility"
 msgid "Keyboard;Mouse;a11y;Accessibility;"
-msgstr "- GNOME æ»?é¼ ç?¡é??ç¤?å??è?½ä¼ºæ??ç¨?å¼?"
+msgstr "Keyboard;Mouse;a11y;Accessibility;é?µç?¤;æ»?é¼ ;ç?¡é??ç¤?;"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Universal Access"
@@ -2181,8 +2310,8 @@ msgid "Caribou"
 msgstr "Caribou"
 
 #: ../panels/universal-access/uap.ui.h:18
-msgid "Change constrast:"
-msgstr "�����"
+msgid "Change contrast:"
+msgstr "����度�"
 
 #: ../panels/universal-access/uap.ui.h:19
 msgid "Closed Captioning"
@@ -2193,7 +2322,6 @@ msgid "Contrast:"
 msgstr "���"
 
 #: ../panels/universal-access/uap.ui.h:21
-#| msgid "Control the pointer using the keypad."
 msgid "Control the pointer using the keypad"
 msgstr "使�����鼠�"
 
@@ -2221,6 +2349,14 @@ msgstr "Ctrl+Alt+8"
 msgid "Ctrl+Alt+="
 msgstr "Ctrl+Alt+="
 
+#: ../panels/universal-access/uap.ui.h:29
+msgid "D_elay:"
+msgstr "延�(_E):"
+
+#: ../panels/universal-access/uap.ui.h:30
+msgid "Dasher"
+msgstr "Dasher"
+
 #: ../panels/universal-access/uap.ui.h:31
 msgid "Decrease size:"
 msgstr "æ¸?å°?å­?å??大å°?ï¼?"
@@ -2234,7 +2370,6 @@ msgid "Display"
 msgstr "顯示"
 
 #: ../panels/universal-access/uap.ui.h:34
-#| msgid "Display a textual description of speech and sounds."
 msgid "Display a textual description of speech and sounds"
 msgstr "顯示èª?é?³å??é?³æ??ç??æ??å­?æ??è¿°"
 
@@ -2290,6 +2425,10 @@ msgstr "�大"
 msgid "LowContrast"
 msgstr "ä½?å??å·®"
 
+#: ../panels/universal-access/uap.ui.h:54
+msgid "Mouse Keys"
+msgstr "�鼠���"
+
 #: ../panels/universal-access/uap.ui.h:55
 msgid "Mouse Settings..."
 msgstr "�鼠設���"
@@ -2302,6 +2441,14 @@ msgstr "Nomon"
 msgid "None"
 msgstr "æ²?æ??"
 
+#: ../panels/universal-access/uap.ui.h:59
+msgid "Off"
+msgstr "é??é??"
+
+#: ../panels/universal-access/uap.ui.h:60
+msgid "On"
+msgstr "é??"
+
 #: ../panels/universal-access/uap.ui.h:61
 msgid "On screen keyboard"
 msgstr "����"
@@ -2319,7 +2466,6 @@ msgid "Pointing and Clicking"
 msgstr "æ??æ¨?å??é»?æ??"
 
 #: ../panels/universal-access/uap.ui.h:65
-#| msgid "Puts a delay between when a key is pressed and when it is accepted."
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "å?¨æ??é?µè¢«æ??ä¸?å?°å®?被æ?¥å??ä¹?é??ç½®å?¥å»¶é?²"
 
@@ -2340,182 +2486,162 @@ msgid "Shift+Ctrl+Alt+="
 msgstr "Shift+Ctrl+Alt+="
 
 #: ../panels/universal-access/uap.ui.h:72
-msgid "Show Universal Access status"
-msgstr "顯示ç?¡é??ç¤?å??è?½ç??æ??"
+msgid "Simulated Secondary Click"
+msgstr "模æ?¬æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Slow Keys"
 msgstr "é?²ç·©æ??é?µ"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Sound Settings..."
 msgstr "é?³æ??設å®?å?¼â?¦"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Sticky Keys"
 msgstr "�����"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:78
 msgid "Test flash"
 msgstr "測試é??å??"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Text size:"
 msgstr "æ??å­?大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:81
-#| msgid "Treats a sequence of modifier keys as a key combination."
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "å°?é?£çº?æ??ç??ç?¹æ®?é?µè¦?ç?ºæ??é?µçµ?å??"
 
-#: ../panels/universal-access/uap.ui.h:82
-#| msgid "Trigger a click when the pointer hovers."
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Trigger a click when the pointer hovers"
 msgstr "ç?¶å??止游æ¨?移å??æ??觸ç?¼é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:83
-#| msgid "Trigger a secondary click by holding down the primary button."
+#: ../panels/universal-access/uap.ui.h:82
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æ??ä½?主è¦?é?µæ??觸ç?¼æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:84
-#| msgid "Beep when _accessibility features are turned on or off"
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Turn on accessibility features from the keyboard"
 msgstr "以é?µç?¤é??å??ç?¡é??ç¤?å??è?½"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Turn on or off:"
 msgstr "é??å??æ??é??é??ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Type here to test settings"
 msgstr "å?¨é??è£?æ??å­?以測試設å®?å?¼"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:86
 msgid "Typing"
 msgstr "輸�"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:87
 msgid "Typing Assistant"
 msgstr "輸å?¥å?©ç??"
 
-#: ../panels/universal-access/uap.ui.h:89
-#| msgid "Use a visual indication when an alert sound occurs."
+#: ../panels/universal-access/uap.ui.h:88
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "ç?¶è­¦ç¤ºé?³æ??ç?¼å?ºæ??使ç?¨è¦?覺å??ç??æ??示"
 
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:89
 msgid "Use an alternative form of text input"
 msgstr "使ç?¨æ??å­?輸å?¥ç??æ?¿ä»£å½¢å¼?"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:90
 msgid "Video Mouse"
 msgstr "è¦?å??æ»?é¼ "
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:91
 msgid "Visual Alerts"
 msgstr "�覺警示"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:93
 msgid "Zoom in:"
 msgstr "æ??è¿?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:94
 msgid "Zoom out:"
 msgstr "æ??é? ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:97
+#: ../panels/universal-access/uap.ui.h:95
+msgid "_Motion threshold:"
+msgstr "移å??é??度(_M):"
+
+#: ../panels/universal-access/uap.ui.h:96
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:98
+#: ../panels/universal-access/uap.ui.h:97
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:99
+#: ../panels/universal-access/uap.ui.h:98
 msgid "rejected"
 msgstr "å·²æ??çµ?"
 
-#: ../panels/user-accounts/gdm-languages.c:613
-msgid "Unspecified"
-msgstr "æ?ªæ??å®?"
-
 #: ../panels/user-accounts/run-passwd.c:426
-#| msgid "Authenticated!"
 msgid "Authentication failed"
 msgstr "é©?è­?失æ??"
 
 #: ../panels/user-accounts/run-passwd.c:506
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:375
 #, c-format
-#| msgid "The password is too short."
 msgid "The new password is too short"
 msgstr "æ?°ç??å¯?碼太ç?­"
 
 #: ../panels/user-accounts/run-passwd.c:512
 #, c-format
-#| msgid "The password is too simple."
 msgid "The new password is too simple"
 msgstr "æ?°ç??å¯?碼太簡å?®"
 
 #: ../panels/user-accounts/run-passwd.c:518
 #, c-format
-#| msgid "The old and new passwords are too similar."
 msgid "The old and new passwords are too similar"
 msgstr "è??å¯?碼è??æ?°å¯?碼太ç?¸ä¼¼äº?"
 
 #: ../panels/user-accounts/run-passwd.c:521
 #, c-format
-#| msgid "The two passwords are not equal."
 msgid "The new password has already been used recently."
 msgstr "æ?°ç??å¯?碼已ç¶?å?¨æ??è¿?使ç?¨é??äº?ã??"
 
 #: ../panels/user-accounts/run-passwd.c:524
 #, c-format
-#| msgid "The new password must contain numeric or special character(s)."
 msgid "The new password must contain numeric or special characters"
 msgstr "æ?°ç??å¯?碼å¿?é ?å??å?«æ?¸å­?æ??ç?¹æ®?å­?符"
 
 #: ../panels/user-accounts/run-passwd.c:528
 #, c-format
-#| msgid "The old and new passwords are the same."
 msgid "The old and new passwords are the same"
 msgstr "è??å¯?碼è??æ?°å¯?碼æ?¯ç?¸å??ç??"
 
 #: ../panels/user-accounts/run-passwd.c:532
 #, c-format
-#| msgid ""
-#| "Your password has been changed since you initially authenticated! Please "
-#| "re-authenticate."
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "ä½ ç??å¯?碼å?¨ç¬¬ä¸?次é©?è­?å¾?å·²ç¶?æ?¹è®?é??äº?ï¼?"
 
 #: ../panels/user-accounts/run-passwd.c:536
 #, c-format
-#| msgid "The new password must contain numeric or special character(s)."
 msgid "The new password does not contain enough different characters"
 msgstr "æ?°ç??å¯?碼並æ?ªå??å?«è¶³å¤ ç??ä¸?å??å­?符"
 
 #: ../panels/user-accounts/run-passwd.c:540
 #, c-format
-#| msgid "Unknown"
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 #: ../panels/user-accounts/um-account-dialog.c:78
-#| msgid "Failed to create temporary directory"
 msgid "Failed to create user"
 msgstr "建ç«?使ç?¨è??失æ??"
 
 #: ../panels/user-accounts/um-account-dialog.c:185
 #, c-format
-#| msgid "A bookmark for URI '%s' already exists"
 msgid "A user with the username '%s' already exists"
 msgstr "以使ç?¨è??å??稱ã??%sã??ç?ºå??ç??使ç?¨è??å·²ç¶?å­?å?¨"
 
 #: ../panels/user-accounts/um-account-dialog.c:189
 #, c-format
-#| msgid "The password is too short."
 msgid "The username is too long"
 msgstr "使ç?¨è??å??稱太é?·äº?"
 
@@ -2537,29 +2663,28 @@ msgstr ""
 
 #: ../panels/user-accounts/um-account-type.c:35
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-#| msgid "Standard XTerminal"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgctxt "Account type"
 msgid "Standard"
 msgstr "��"
 
 #: ../panels/user-accounts/um-account-type.c:37
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-#| msgid "Terminator"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "管ç??å?¡"
 
 #: ../panels/user-accounts/um-account-type.c:39
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgctxt "Account type"
 msgid "Supervised"
-msgstr ""
+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
@@ -2567,13 +2692,11 @@ msgid "The device is already in use."
 msgstr "該è£?置已ç¶?å?¨ä½¿ç?¨ä¸­ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:111
-#| msgid "An internal error occured"
 msgid "An internal error occurred."
 msgstr "ç?¼ç??å?§é?¨ç??é?¯èª¤ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:181
 #: ../panels/user-accounts/um-fingerprint-dialog.c:182
-#| msgid "Disabled"
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
@@ -2586,7 +2709,9 @@ 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
@@ -2599,7 +2724,6 @@ msgstr "å®?æ??ï¼?"
 #: ../panels/user-accounts/um-fingerprint-dialog.c:409
 #: ../panels/user-accounts/um-fingerprint-dialog.c:431
 #, c-format
-#| msgid "Could not start finger capture on '%s' device"
 msgid "Could not access '%s' device"
 msgstr "ç?¡æ³?å­?å??ã??%sã??è£?ç½®"
 
@@ -2611,15 +2735,15 @@ msgstr "ç?¡æ³?å­?å??ã??%sã??è£?ç½®"
 msgid "Could not start finger capture on '%s' device"
 msgstr "ç?¡æ³?使ç?¨ã??%sã??è£?ç½®ä¸?ç??æ??ç´?æ??æ??"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:550
+#: ../panels/user-accounts/um-fingerprint-dialog.c:549
 msgid "Could not access any fingerprint readers"
 msgstr "ç?¡æ³?å­?å??ä»»ä½?æ??ç´?辨è­?å?¨"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:551
+#: ../panels/user-accounts/um-fingerprint-dialog.c:550
 msgid "Please contact your system administrator for help."
 msgstr "è«?è?¯çµ¡ä½ ç??系統管ç??å?¡ä¾?幫å¿?ã??"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:588
+#: ../panels/user-accounts/um-fingerprint-dialog.c:587
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Enable Fingerprint Login"
 msgstr "å??ç?¨æ??ç´?ç?»å?¥"
@@ -2628,35 +2752,32 @@ msgstr "å??ç?¨æ??ç´?ç?»å?¥"
 #. * The variable is the name of the device, for example:
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
-#: ../panels/user-accounts/um-fingerprint-dialog.c:625
+#.
+#: ../panels/user-accounts/um-fingerprint-dialog.c: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:633
+#: ../panels/user-accounts/um-fingerprint-dialog.c:629
 #, c-format
 msgid ""
 "Enrolling fingerprints for\n"
 "<b><big>%s</big></b>"
 msgstr ""
+"ç?»è¨?æ??ç´?ï¼?\n"
+"<b><big>%s</big></b>"
 
-#: ../panels/user-accounts/um-language-dialog.c:328
+#: ../panels/user-accounts/um-language-dialog.c:180
 msgid "Other..."
-msgstr "��..."
+msgstr "���"
 
-#: ../panels/user-accounts/um-lockbutton.c:355
-msgid "Lock"
-msgstr "é??å®?"
-
-#: ../panels/user-accounts/um-lockbutton.c:364
-msgid "Unlock"
-msgstr "解é??"
-
-#: ../panels/user-accounts/um-lockbutton.c:373
+#: ../panels/user-accounts/um-lockbutton.c:365
 msgid "Locked"
 msgstr "å·²é??å®?"
 
-#: ../panels/user-accounts/um-lockbutton.c:382
+#: ../panels/user-accounts/um-lockbutton.c:374
 msgid ""
 "Dialog is unlocked.\n"
 "Click to prevent further changes"
@@ -2664,7 +2785,7 @@ msgstr ""
 "å°?話ç??已解é??ã??\n"
 "é»?é?¸ä»¥é?²æ­¢é?²ä¸?æ­¥ç??æ?´æ?¹"
 
-#: ../panels/user-accounts/um-lockbutton.c:391
+#: ../panels/user-accounts/um-lockbutton.c:383
 msgid ""
 "Dialog is locked.\n"
 "Click to make changes"
@@ -2672,8 +2793,7 @@ msgstr ""
 "å°?話ç??å·²é??å®?ã??\n"
 "������"
 
-#: ../panels/user-accounts/um-lockbutton.c:400
-#| msgid "Please contact your system administrator for help."
+#: ../panels/user-accounts/um-lockbutton.c:392
 msgid ""
 "System policy prevents changes.\n"
 "Contact your system administrator"
@@ -2681,92 +2801,83 @@ msgstr ""
 "系統å??å??æ?¯é?²æ­¢é?²è¡?æ?´æ?¹ç??ã??\n"
 "è«?è?¯çµ¡ä½ ç??系統管ç??å?¡"
 
-#: ../panels/user-accounts/um-password-dialog.c:185
+#: ../panels/user-accounts/um-password-dialog.c:179
 msgid "More choices..."
 msgstr "æ?´å¤?é?¸æ??..."
 
-#: ../panels/user-accounts/um-password-dialog.c:291
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "Please choose another password."
 msgstr "è«?é?¸æ??å?¶ä»?å¯?碼ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:300
-#| msgid "Please type your password in the <b>New password</b> field."
+#: ../panels/user-accounts/um-password-dialog.c:294
 msgid "Please type your current password again."
 msgstr "è«?å??次輸å?¥ä½ ç?®å??ç??å¯?碼ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:306
-#| msgid "Your password has been changed."
+#: ../panels/user-accounts/um-password-dialog.c:300
 msgid "Password could not be changed"
 msgstr "�碼����"
 
-#: ../panels/user-accounts/um-password-dialog.c:378
-#| msgid "_Retype new password:"
+#: ../panels/user-accounts/um-password-dialog.c:372
 msgid "You need to enter a new password"
 msgstr "ä½ é??è¦?輸å?¥æ?°ç??å¯?碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:387
+#: ../panels/user-accounts/um-password-dialog.c:381
 msgid "You need to confirm the password"
 msgstr "ä½ é??è¦?確èª?å¯?碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:390
-#| msgid "The password is too short."
+#: ../panels/user-accounts/um-password-dialog.c:384
 msgid "The passwords do not match"
 msgstr "�碼��符"
 
-#: ../panels/user-accounts/um-password-dialog.c:396
+#: ../panels/user-accounts/um-password-dialog.c:390
 msgid "You need to enter your current password"
 msgstr "ä½ é??è¦?輸å?¥ä½ ç?®å??ç??å¯?碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:399
-#| msgid "That password was incorrect."
+#: ../panels/user-accounts/um-password-dialog.c:393
 msgid "The current password is not correct"
 msgstr "ç?®å??ç??å¯?碼並ä¸?正確"
 
-#: ../panels/user-accounts/um-password-dialog.c:472
-#: ../panels/user-accounts/um-password-dialog.c:689
+#: ../panels/user-accounts/um-password-dialog.c:466
+#: ../panels/user-accounts/um-password-dialog.c:683
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "太�"
 
-#: ../panels/user-accounts/um-password-dialog.c:475
-#: ../panels/user-accounts/um-password-dialog.c:690
+#: ../panels/user-accounts/um-password-dialog.c:469
+#: ../panels/user-accounts/um-password-dialog.c:684
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: ../panels/user-accounts/um-password-dialog.c:477
-#: ../panels/user-accounts/um-password-dialog.c:691
-#| msgid "Filter"
+#: ../panels/user-accounts/um-password-dialog.c:471
+#: ../panels/user-accounts/um-password-dialog.c:685
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "��"
 
-#: ../panels/user-accounts/um-password-dialog.c:479
-#: ../panels/user-accounts/um-password-dialog.c:692
+#: ../panels/user-accounts/um-password-dialog.c:473
+#: ../panels/user-accounts/um-password-dialog.c:686
 msgctxt "Password strength"
 msgid "Good"
 msgstr "�好"
 
-#: ../panels/user-accounts/um-password-dialog.c:481
-#: ../panels/user-accounts/um-password-dialog.c:693
-#| msgid "Scrolling"
+#: ../panels/user-accounts/um-password-dialog.c:475
+#: ../panels/user-accounts/um-password-dialog.c:687
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "å¼·å?º"
 
-#: ../panels/user-accounts/um-password-dialog.c:520
+#: ../panels/user-accounts/um-password-dialog.c:514
 msgid "Passwords do not match"
 msgstr "�碼��符"
 
-#: ../panels/user-accounts/um-password-dialog.c:546
-#| msgid "Change password"
+#: ../panels/user-accounts/um-password-dialog.c:540
 msgid "Wrong password"
 msgstr "é?¯èª¤ç??å¯?碼"
 
 #: ../panels/user-accounts/um-photo-dialog.c:97
 #: ../panels/user-accounts/data/language-chooser.ui.h:2
 #: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#| msgid "_Select"
 msgid "Select"
 msgstr "é?¸æ??"
 
@@ -2776,7 +2887,6 @@ msgid "Browse for more pictures"
 msgstr "ç??覽æ?´å¤?ç?§ç??"
 
 #: ../panels/user-accounts/um-photo-dialog.c:429
-#| msgid "Disabled"
 msgid "Disable image"
 msgstr "å??ç?¨å??ç??"
 
@@ -2788,90 +2898,86 @@ msgstr "��張�..."
 msgid "Browse for more pictures..."
 msgstr "ç??覽æ?´å¤?ç?§ç??..."
 
-#: ../panels/user-accounts/um-photo-dialog.c:693
+#: ../panels/user-accounts/um-photo-dialog.c:690
 #, c-format
 msgid "Used by %s"
 msgstr "� %s 使�"
 
 #: ../panels/user-accounts/um-user-manager.c:430
 #, c-format
-#| msgid "A bookmark for URI '%s' already exists"
 msgid "A user with name '%s' already exists."
 msgstr "以ã??%sã??ç?ºå??ç??使ç?¨è??å·²ç¶?å­?å?¨ã??"
 
 #: ../panels/user-accounts/um-user-manager.c:525
-#| msgid "The sound file for this event does not exist."
 msgid "This user does not exist."
 msgstr "é??å??使ç?¨è??ä¸?å­?å?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:349
+#: ../panels/user-accounts/um-user-panel.c:359
 msgid "Failed to delete user"
 msgstr "å?ªé?¤ä½¿ç?¨è??失æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:409
+#: ../panels/user-accounts/um-user-panel.c:419
 msgid "You cannot delete your own account."
 msgstr "ä½ ä¸?è?½å?ªé?¤è?ªå·±ç??帳è??ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:418
+#: ../panels/user-accounts/um-user-panel.c:428
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s ����中"
 
-#: ../panels/user-accounts/um-user-panel.c:422
-msgid "Deleting a user while they are logged in can leave the system in an inconsistent state."
+#: ../panels/user-accounts/um-user-panel.c:432
+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:431
+#: ../panels/user-accounts/um-user-panel.c:441
 #, c-format
-#| msgid "Do you want to keep this resolution?"
 msgid "Do you want to keep %s's files?"
 msgstr "ä½ æ?³è¦?ä¿?ç?? %s ç??æª?æ¡?å??ï¼?"
 
-#: ../panels/user-accounts/um-user-panel.c:435
-msgid "It is possible to keep the home directory, mail spool and temporary files around when deleting a user account."
+#: ../panels/user-accounts/um-user-panel.c:445
+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:438
-#| msgid "_Delete Fingerprints"
+#: ../panels/user-accounts/um-user-panel.c:448
 msgid "_Delete Files"
 msgstr "����(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:439
-#| msgid "New File"
+#: ../panels/user-accounts/um-user-panel.c:449
 msgid "_Keep Files"
 msgstr "ä¿?ç??æª?æ¡?(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:440
+#: ../panels/user-accounts/um-user-panel.c:450
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:464
+#: ../panels/user-accounts/um-user-panel.c:474
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳è??å·²å??ç?¨"
 
-#: ../panels/user-accounts/um-user-panel.c:473
+#: ../panels/user-accounts/um-user-panel.c:483
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "å?¨ä¸?次ç?»å?¥æ??設å®?"
 
-#: ../panels/user-accounts/um-user-panel.c:476
-#| msgid "None"
+#: ../panels/user-accounts/um-user-panel.c:486
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:818
-#| msgid "Failed to construct test pipeline for '%s'"
+#: ../panels/user-accounts/um-user-panel.c:808
 msgid "Failed to contact the accounts service"
 msgstr "ç?¡æ³?é?£æ?¥å¸³è??æ??å??"
 
-#: ../panels/user-accounts/um-user-panel.c:820
-#| msgid "Please make sure that the applet is properly installed"
+#: ../panels/user-accounts/um-user-panel.c:810
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "è«?確å®? AccountService å·²ç¶?å®?è£?並å??ç?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:853
+#: ../panels/user-accounts/um-user-panel.c:843
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -2879,14 +2985,12 @@ msgstr ""
 "������\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:891
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
-#| msgid "C_reate"
+#: ../panels/user-accounts/um-user-panel.c:881
 msgid "Create a user"
 msgstr "建ç«?æ?°ç??使ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:902
-#: ../panels/user-accounts/um-user-panel.c:1178
+#: ../panels/user-accounts/um-user-panel.c:892
+#: ../panels/user-accounts/um-user-panel.c:1191
 msgid ""
 "To create a user,\n"
 "click the * icon first"
@@ -2894,13 +2998,12 @@ msgstr ""
 "è¦?建ç«?使ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:911
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+#: ../panels/user-accounts/um-user-panel.c:901
 msgid "Delete the selected user"
 msgstr "å?ªé?¤é?¸å??ç??使ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:923
-#: ../panels/user-accounts/um-user-panel.c:1183
+#: ../panels/user-accounts/um-user-panel.c:913
+#: ../panels/user-accounts/um-user-panel.c:1196
 msgid ""
 "To delete the selected user,\n"
 "click the * icon first"
@@ -2908,12 +3011,11 @@ msgstr ""
 "è¦?å?ªé?¤é?¸å??ç??使ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:1087
-#| msgid "By _country"
+#: ../panels/user-accounts/um-user-panel.c:1091
 msgid "My Account"
 msgstr "æ??ç??帳è??"
 
-#: ../panels/user-accounts/um-user-panel.c:1096
+#: ../panels/user-accounts/um-user-panel.c:1101
 msgid "Other Accounts"
 msgstr "å?¶ä»?帳è??"
 
@@ -2924,35 +3026,29 @@ 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 ""
+msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;ç?»å?¥;å§?å??;æ??ç´?;大頭貼;æ¨?èª?;è??;å¯?碼;"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
-#| msgid "seconds"
 msgid "User Accounts"
 msgstr "使ç?¨è??帳è??"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:4
-#| msgid "C_reate"
 msgid "Cr_eate"
 msgstr "建�(_E)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-#| msgid "Create New Location"
 msgid "Create new account"
 msgstr "建ç«?æ?°ç??帳è??"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
-#| msgid "_Country:"
 msgid "_Account Type:"
 msgstr "帳è??é¡?å??(_A):"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#| msgid "Full Name"
 msgid "_Full name:"
 msgstr "å?¨å??(_F):"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
-#| msgid "U_sername:"
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -2962,30 +3058,31 @@ msgid "Cancel"
 msgstr "å??æ¶?"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
-msgid "<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a 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 "_New password:"
 msgid "C_onfirm password:"
 msgstr "確��碼(_O):"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:4
-#| msgid "Change set"
 msgid "Ch_ange"
 msgstr "��(_A)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:5
-#| msgid "Change password"
 msgid "Changing password for:"
 msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å¯?碼ï¼?"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-#| msgid "Change password"
 msgid "Choose a generated password"
 msgstr "é?¸æ??ç?¢ç??ç??å¯?碼"
 
@@ -3006,7 +3103,6 @@ msgid "Enable this account"
 msgstr "å??ç?¨é??å??帳è??"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:11
-#| msgid "Filter"
 msgid "Fair"
 msgstr "��"
 
@@ -3015,17 +3111,14 @@ msgid "Log in without a password"
 msgstr "�使��碼��"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:13
-#| msgid "_New password:"
 msgid "Set a password now"
 msgstr "��設��碼"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:14
-#| msgid "Action"
 msgid "_Action:"
 msgstr "å??ä½?(_A):"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:15
-#| msgid "_Print"
 msgid "_Hint:"
 msgstr "æ??示(_H):"
 
@@ -3034,12 +3127,10 @@ msgid "_New password:"
 msgstr "��碼(_N):"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:17
-#| msgid "_New password:"
 msgid "_Show password"
 msgstr "顯示�碼(_S)"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:1
-#| msgid "Web Browser"
 msgid "Browse"
 msgstr "ç??覽"
 
@@ -3048,11 +3139,11 @@ 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
-#| msgid "Galeon"
 msgid "Gallery"
 msgstr "è??å»?"
 
@@ -3061,92 +3152,45 @@ msgid "Photograph"
 msgstr "ç?¸ç??"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:9
-#| msgid "Take a break!"
 msgid "Take a photograph"
 msgstr "ç?§ä¸?å¼µç?¸ç??"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-msgid ""
-"A guest account will allow anyone to temporarily log in to this computer without a password.  For security, remote logins to this account are not allowed.\n"
-"\n"
-"<b>When the guest user logs out, all files and data associated with the account will be deleted.</b>"
-msgstr ""
-"訪客帳è??æ??å??許任ä½?人å?¯ä»¥ä¸?ç?¨å¯?碼就æ?«æ??ç?»å?¥é??è?ºé?»è?¦ã??å? ç?ºå®?å?¨æ?§ç??ç??ç?±ï¼?é??å??帳è??æ?¯ä¸?å??許é? ç«¯ç?»å?¥ç??ã??\n"
-"\n"
-"<b>ç?¶è¨ªå®¢ä½¿ç?¨è??ç?»å?ºå¾?ï¼?æ??æ??è??é??å??帳è??ç?¸é??ç??æª?æ¡?å??è³?æ??é?½æ??被å?ªé?¤ã??</b>"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Account type:"
 msgstr "帳è??é¡?å??ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
-#| msgid "About %s"
-msgid "Accounts"
-msgstr "帳è??"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-msgid "Address Book Card:"
-msgstr "é??è¨?é??å?¡ç??ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "Allow guests to log in to this computer"
-msgstr "å??許訪客ç?»å?¥é??è?ºé?»è?¦"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Automatic Login:"
 msgstr "è?ªå??ç?»å?¥ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:15
-msgid "E-mail address:"
-msgstr "é?»å­?é?µä»¶ä½?å??ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:16
-#| msgid "Enable Fingerprint Login"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "Fingerprint Login:"
 msgstr "æ??ç´?ç?»å?¥ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:17
-#| msgid "_Language:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "Language:"
 msgstr "���"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:19
-#| msgid "Layout _Options..."
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "Login Options"
 msgstr "����"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:20
-#| msgid "_Open"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "Open"
 msgstr "é??å??"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:21
-#| msgid "_Password:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Password:"
 msgstr "�碼� "
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:22
-#| msgid "Description:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Restrictions:"
 msgstr "é??å?¶ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:23
-msgid "Show Shutdown, Suspend and Restart actions"
-msgstr "顯示é??æ©?ã??æ?«å??å??é??æ?°å??å??ç­?å??ä½?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:24
-msgid "Show list of users"
-msgstr "顯示使ç?¨è??æ¸?å?®"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:25
-#| msgid "The password is too short."
-msgid "Show password hints"
-msgstr "顯示å¯?碼æ??示"
-
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:2
 msgid "Left index finger"
 msgstr "å·¦æ??é£?æ??"
@@ -3192,11 +3236,33 @@ 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/gnome-control-center.desktop.in.in.h:1
-#: ../shell/shell.ui.h:1
+#: ../shell/control-center.c:47
+msgid "Show the overview"
+msgstr "顯示�覽"
+
+#: ../shell/control-center.c:48
+msgid "Panel to display"
+msgstr "è¦?顯示ç??é?¢æ?¿"
+
+#: ../shell/control-center.c:65
+msgid "- System Settings"
+msgstr "- 系統設��"
+
+#: ../shell/control-center.c:72
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"å?·è¡? ã??%s --helpã??以æ?¥ç??å®?æ?´ç??å?½ä»¤å??å?¯ç?¨é?¸é ?æ¸?å?®ã??\n"
+
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
 msgid "System Settings"
 msgstr "系統設��"
 
@@ -3204,23 +3270,498 @@ msgstr "系統設��"
 msgid "Control Center"
 msgstr "��中�"
 
-#: ../examples/gnome-example-panel.desktop.in.in.h:1
-msgid "Example Panel"
-msgstr "����"
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "æ??æ??設å®?å?¼(_A)"
+
+#~ 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 "
+#~| "allowed.\n"
+#~| "\n"
+#~| "<b>When the guest user logs out, all files and data associated with the "
+#~| "account will be deleted.</b>"
+#~ msgid ""
+#~ "A guest account will allow anyone to temporarily log in to this computer "
+#~ "without a password.  For security, remote logins to this account are not "
+#~ "allowed.\n"
+#~ "\n"
+#~ "                    <b>When the guest user logs out, all files and data "
+#~ "associated with the account will be deleted.</b>"
+#~ msgstr ""
+#~ "訪客帳è??æ??å??許任ä½?人å?¯ä»¥ä¸?ç?¨å¯?碼就æ?«æ??ç?»å?¥é??è?ºé?»è?¦ã??å? ç?ºå®?å?¨æ?§ç??ç??ç?±ï¼?é??å??"
+#~ "帳è??æ?¯ä¸?å??許é? ç«¯ç?»å?¥ç??ã??\n"
+#~ "\n"
+#~ "                    <b>ç?¶è¨ªå®¢ä½¿ç?¨è??ç?»å?ºå¾?ï¼?æ??æ??è??é??å??帳è??ç?¸é??ç??æª?æ¡?å??è³?æ??"
+#~ "é?½æ??被å?ªé?¤ã??</b>"
+
+#~ msgid "Accounts"
+#~ msgstr "帳è??"
+
+#~ msgid "Address Book Card:"
+#~ msgstr "é??è¨?é??å??ç??ï¼?"
+
+#~ msgid "Allow guests to log in to this computer"
+#~ msgstr "å??許訪客ç?»å?¥é??è?ºé?»è?¦"
 
-#: ../examples/gnome-example-panel.desktop.in.in.h:2
-msgid "Example preferences panel"
-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"
 
-#. Translators: those are keywords for the example control-center panel
-#: ../examples/gnome-example-panel.desktop.in.in.h:4
 #, fuzzy
-msgid "Foo;Bar;Baz;"
-msgstr "令é?²åº¦å??å?§ç??æ?¹å¡?ä¾?å??移å??"
+#~ msgid "Plum"
+#~ msgstr "��"
 
-#: ../shell/shell.ui.h:2
-msgid "_All Settings"
-msgstr "æ??æ??設å®?å?¼(_A)"
+#~ msgid "Red"
+#~ msgstr "ç´?"
+
+#~ msgid "Aluminium"
+#~ msgstr "é??"
+
+#~ msgid "Gray"
+#~ msgstr "ç?°"
+
+#~| msgid "Callback"
+#~ msgid "Black"
+#~ msgstr "é»?"
+
+#~ msgid "Colors"
+#~ msgstr "é¡?è?²"
+
+#~ msgid "Slide Show"
+#~ msgstr "å¹»ç??ç??顯示"
+
+#~ msgid "Image"
+#~ msgstr "å??ç??"
+
+#~ msgid "%d %s by %d %s"
+#~ msgstr "�%d %s �%d %s"
+
+#~ msgid "pixel"
+#~ msgid_plural "pixels"
+#~ msgstr[0] "å??ç´ "
+
+#~ msgid ""
+#~ "<b>%s</b>\n"
+#~ "%s, %s\n"
+#~ "Folder: %s"
+#~ msgstr ""
+#~ "<b>%s</b>\n"
+#~ "%s,  %s\n"
+#~ "è³?æ??夾ï¼?%s"
+
+#~ msgid ""
+#~ "<b>%s</b>\n"
+#~ "%s\n"
+#~ "Folder: %s"
+#~ msgstr ""
+#~ "<b>%s</b>\n"
+#~ "%s\n"
+#~ "è³?æ??夾ï¼?%s"
+
+#~ msgid "Image missing"
+#~ msgstr "é?ºå¤±å??ç??"
+
+#~ msgid "12 hour format"
+#~ msgstr "12 å°?æ??å?¶"
+
+#~ msgid "24 hour format"
+#~ msgstr "24 å°?æ??å?¶"
+
+#~| 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 "令é?²åº¦å??å?§ç??æ?¹å¡?ä¾?å??移å??"
 
 #~ msgid "Error saving configuration: %s"
 #~ msgstr "å?²å­?設å®?æ??å?ºç?¾é?¯èª¤ï¼?%s"
@@ -3261,9 +3802,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Evolution Mail Reader"
 #~ msgstr "Evolution ���件�信��"
 
-#~ msgid "Firebird"
-#~ msgstr "Firebird"
-
 #~ msgid "Firefox"
 #~ msgstr "Firefox"
 
@@ -3276,9 +3814,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Icedove"
 #~ msgstr "Icedove"
 
-#~ msgid "Iceweasel"
-#~ msgstr "Iceweasel"
-
 #~ msgid "KMail"
 #~ msgstr "KMail"
 
@@ -3380,9 +3915,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Could not open %s/%s: %s\n"
 #~ msgstr "ç?¡æ³?é??å?? %s/%sï¼?%s\n"
 
-#~ msgid "Could not rename %s to %s: %s\n"
-#~ msgstr "ç?¡æ³?å°? %s ç??å??稱æ?´æ?¹ç?º %sï¼?%s\n"
-
 #~ msgid ""
 #~ "Authentication is required to install multi-monitor settings for all users"
 #~ msgstr "å®?è£?å¤?è?¢å¹?設å®?å?¼çµ¦æ??æ??使ç?¨è??é??è¦?é©?è­?"
@@ -3523,7 +4055,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgstr "ç?¾å?¨ä¼?æ?¯ï¼?å?©ä¸? %då??ï¼?"
 
 #~ msgid "%d minute until the next break"
-
 #~ msgid_plural "%d minutes until the next break"
 #~ msgstr[0] "è·?é?¢ä¼?æ?¯æ??é??é??æ?? %d å??é??"
 
@@ -3595,9 +4126,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Could not set the default configuration for monitors"
 #~ msgstr "ç?¡æ³?設å®?é ?設ç??顯示å?¨çµ?æ??"
 
-#~ msgid "Mouse"
-#~ msgstr "æ»?é¼ "
-
 #~ msgid "Close the control-center when a task is activated"
 #~ msgstr "å?·è¡?設å®?å¾?é??é??æ?§å?¶ä¸­å¿?"
 
@@ -3708,9 +4236,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Whether to thumbnail Type1 fonts"
 #~ msgstr "æ?¯å?¦ç?º Type1 å­?å??製ä½?縮å??"
 
-#~ msgid "Style:"
-#~ msgstr "�款�"
-
 #~ msgid "Size:"
 #~ msgstr "大��"
 
@@ -3871,12 +4396,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "A_IM/iChat:"
 #~ msgstr "A_IM/iChat:"
 
-#~ msgid "A_ddress:"
-#~ msgstr "å?°å??(_A):"
-
-#~ msgid "About Me"
-#~ msgstr "é??æ?¼è?ªå·±"
-
 #~ msgid "Address"
 #~ msgstr "å?°å??"
 
@@ -3967,9 +4486,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "_Department:"
 #~ msgstr "é?¨é??(_D):"
 
-#~ msgid "_Groupwise:"
-#~ msgstr "_Groupwise:"
-
 #~ msgid "_Home page:"
 #~ msgstr "��(_H):"
 
@@ -3982,15 +4498,9 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "_Manager:"
 #~ msgstr "總管(_M):"
 
-#~ msgid "_Profession:"
-#~ msgstr "�業(_P):"
-
 #~ msgid "_State/Province:"
 #~ msgstr "å·?/ç??(_S):"
 
-#~ msgid "_Title:"
-#~ msgstr "�稱(_T):"
-
 #~ msgid "_Work:"
 #~ msgstr "工�(_W)"
 
@@ -4056,9 +4566,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "é??é??èª?è­?å¾?ï¼?å?¯ä»¥è¼¸å?¥æ?°ç??å¯?碼ï¼?輸å?¥å¾?å??輸å?¥ä¸?次ä½?ç?ºæª¢æ?¥ï¼?æ?¥è??æ??<b>è®?æ?´å¯?碼"
 #~ "</b>ã??"
 
-#~ msgid "_Authenticate"
-#~ msgstr "��(_A)"
-
 #~ msgid "Accessible Lo_gin"
 #~ msgstr "ç?¡é??ç¤?ç?»å?¥(_G)"
 
@@ -4116,7 +4623,6 @@ 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 "
@@ -4129,7 +4635,6 @@ 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 "
@@ -4143,9 +4648,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Use selected font"
 #~ msgstr "使ç?¨å·²é?¸å­?å??"
 
-#~ msgid "Could not load user interface file: %s"
-#~ msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
-
 #~ msgid "Specify the filename of a theme to install"
 #~ msgstr "æ??å®?è¦?å®?è£?ç??ä½?æ?¯ä¸»é¡?å??稱"
 
@@ -4162,9 +4664,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "[WALLPAPER...]"
 #~ msgstr "[���]"
 
-#~ msgid "Default Pointer"
-#~ msgstr "�設鼠�"
-
 #~ msgid "Install"
 #~ msgstr "��"
 
@@ -4254,9 +4753,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Hinting"
 #~ msgstr "å­?å??æ??示"
 
-#~ msgid "Horizontal gradient"
-#~ msgstr "水平漸層"
-
 #~ msgid "Icons"
 #~ msgstr "å??示"
 
@@ -4278,9 +4774,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Save _As..."
 #~ msgstr "����(_A)�"
 
-#~ msgid "Solid color"
-#~ msgstr "���彩"
-
 #~ msgid "Stretch"
 #~ msgstr "延伸"
 
@@ -4314,27 +4807,18 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "VB_GR"
 #~ msgstr "VB_GR"
 
-#~ msgid "Vertical gradient"
-#~ msgstr "å??ç?´æ¼¸å±¤"
-
 #~ msgid "Window Border"
 #~ msgstr "è¦?çª?é??æ¡?"
 
 #~ msgid "_BGR"
 #~ msgstr "_BGR"
 
-#~ msgid "_Description:"
-#~ msgstr "æ??è¿°(_D):"
-
 #~ msgid "_Document font:"
 #~ msgstr "æ??件å­?å??(_D):"
 
 #~ msgid "_Fixed width font:"
 #~ msgstr "å?ºå®?寬度å­?å??(_F):"
 
-#~ msgid "_Install..."
-#~ msgstr "��(_I)�"
-
 #~ msgid "_Medium"
 #~ msgstr "中(_M)"
 
@@ -4677,12 +5161,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "No matches found."
 #~ msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ã??"
 
-#~ msgid "Start %s"
-#~ msgstr "å??å?? %s"
-
-#~ msgid "Help"
-#~ msgstr "æ±?å?©"
-
 #~ msgid "Upgrade"
 #~ msgstr "æ?´æ?°"
 
@@ -4713,9 +5191,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "File System"
 #~ msgstr "��系統"
 
-#~ msgid "Network Servers"
-#~ msgstr "網路伺æ??å?¨"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>é??å??</b>"
 
@@ -4773,15 +5248,9 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Drag the monitors to set their place"
 #~ msgstr "æ??æ?³é¡¯ç¤ºå?¨ä¾?設å®?å®?å??ç??ä½?ç½®"
 
-#~ msgid "_Mirror screens"
-#~ msgstr "����(_M)"
-
 #~ msgid "Change screen resolution"
 #~ msgstr "è®?æ?´è?¢å¹?解æ??度"
 
-#~ msgid "Edit"
-#~ msgstr "編輯"
-
 #~ msgid "Fill screen"
 #~ msgstr "���"
 
@@ -4830,8 +5299,10 @@ 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"
@@ -4850,58 +5321,85 @@ 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>C_olors</b>"
 #~ msgstr "<b>���彩(_O)</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"
@@ -4910,6 +5408,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "���彩\n"
 #~ "水平漸層\n"
 #~ "å??ç?´æ¼¸å±¤"
+
 #~ msgid ""
 #~ "Text below items\n"
 #~ "Text beside items\n"
@@ -4920,6 +5419,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "æ??å­?å?¨é ?ç?®æ??\n"
 #~ "å?ªæ??å??示\n"
 #~ "å?ªæ??æ??å­?"
+
 #~ msgid ""
 #~ "Tiled\n"
 #~ "Zoom\n"
@@ -4932,14 +5432,19 @@ 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"
@@ -4950,135 +5455,187 @@ 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 "Not connected"
-#~ 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 "S_ound playback:"
 #~ msgstr "����(_O):"
+
 #~ 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 "_Device:"
-#~ msgstr "�置(_D):"
+
 #~ msgid "_Play alerts and sound effects"
 #~ msgstr "æ?­æ?¾è­¦ç¤ºè??è?²é?³æ??æ??(_P)"
+
 #~ msgid "_Sound playback:"
 #~ msgstr "����(_S):"
+
 #~ msgid "Select Sound File"
 #~ msgstr "é?¸å??é?³æ??æª?"
+
 #~ msgid "Custom..."
 #~ msgstr "���"
-#~ msgid "Lock Screen"
-#~ msgstr "é??å®?è?¢å¹?"
+
 #~ msgid "Logout"
 #~ msgstr "��"
-#~ msgid "Shutdown"
-#~ 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"
@@ -5091,21 +5648,25 @@ 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 49f52e9..38c234d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,12 +11,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 2.91.3\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center&component=general\n";
-"POT-Creation-Date: 2010-11-23 22:42+0000\n"
-"PO-Revision-Date: 2010-12-01 20:50+0800\n"
+"Project-Id-Version: gnome-control-center 2.91.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-27 18:53+0800\n"
+"PO-Revision-Date: 2011-01-27 16:18+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"
@@ -35,15 +36,21 @@ 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/gconf-property-editor.c:134
@@ -67,7 +74,8 @@ 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
@@ -75,7 +83,8 @@ 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
@@ -83,7 +92,8 @@ 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
@@ -115,7 +125,8 @@ 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"
@@ -147,199 +158,127 @@ msgid "Background"
 msgstr "è??æ?¯"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-#| msgid "Save _background image"
 msgid "Change the background"
 msgstr "æ?´æ?¹è??æ?¯"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 #, fuzzy
-#| msgid "No Wallpaper"
-msgid "Wallpaper;Screen;"
-msgstr "���"
+#| msgid "Wallpaper;Screen;"
+msgid "Wallpaper;Screen;Desktop;"
+msgstr "Wallpaper;Screen;��;��;"
 
 #: ../panels/background/background.ui.h:1
 msgid "Center"
 msgstr "置中"
 
-#: ../panels/background/background.ui.h:2
-#| msgid "_Full"
+#. This refers to a slideshow background
+#: ../panels/background/background.ui.h:3
+#, fuzzy
+msgid "Changes throughout the day"
+msgstr "å??ç?©ä¸?ä¹?"
+
+#: ../panels/background/background.ui.h:4
 msgid "Fill"
 msgstr "填滿"
 
-#: ../panels/background/background.ui.h:3
+#: ../panels/background/background.ui.h:5
 msgid "Scale"
 msgstr "縮�"
 
-#: ../panels/background/background.ui.h:4
+#: ../panels/background/background.ui.h:6
 msgid "Span"
 msgstr "跨�"
 
-#: ../panels/background/background.ui.h:5
+#: ../panels/background/background.ui.h:7
 msgid "Tile"
 msgstr "é?ªæ??"
 
-#: ../panels/background/background.ui.h:6
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/background/background.ui.h:8
+#: ../panels/universal-access/uap.ui.h:92
 msgid "Zoom"
 msgstr "縮�"
 
-#: ../panels/background/bg-colors-source.c:57
-#| msgid "Mutt"
-msgid "Butter"
-msgstr "奶油"
-
-#: ../panels/background/bg-colors-source.c:58
-#| msgid "Orca"
-msgid "Orange"
-msgstr "æ©?"
-
-#: ../panels/background/bg-colors-source.c:59
-msgid "Chocolate"
-msgstr "å·§å??å??"
+#: ../panels/background/bg-colors-source.c:44
+msgid "Horizontal Gradient"
+msgstr "水平漸層"
 
-#: ../panels/background/bg-colors-source.c:60
-#, fuzzy
-#| msgid "Galeon"
-msgid "Chameleon"
-msgstr "Galeon"
-
-#: ../panels/background/bg-colors-source.c:61
-msgid "Blue"
-msgstr "è??"
-
-#: ../panels/background/bg-colors-source.c:62
-#, fuzzy
-msgid "Plum"
-msgstr "��"
+#: ../panels/background/bg-colors-source.c:45
+msgid "Vertical Gradient"
+msgstr "å??ç?´æ¼¸å±¤"
 
-#: ../panels/background/bg-colors-source.c:63
-msgid "Red"
-msgstr "ç´?"
+#: ../panels/background/bg-colors-source.c:46
+msgid "Solid Color"
+msgstr "��"
 
-#: ../panels/background/bg-colors-source.c:64
-msgid "Aluminium"
-msgstr "é??"
-
-#: ../panels/background/bg-colors-source.c:65
-msgid "Gray"
-msgstr "ç?°"
-
-#: ../panels/background/bg-colors-source.c:66
-#| msgid "Callback"
-msgid "Black"
-msgstr "é»?"
-
-#: ../panels/background/cc-background-panel.c:622
-#| msgid "No Wallpaper"
+#: ../panels/background/cc-background-panel.c:747
 msgid "Wallpapers"
 msgstr "��"
 
-#: ../panels/background/cc-background-panel.c:630
+#: ../panels/background/cc-background-panel.c:755
 msgid "Pictures Folder"
 msgstr "å??ç??è³?æ??夾"
 
-#: ../panels/background/cc-background-panel.c:638
-msgid "Colors"
-msgstr "é¡?è?²"
+#: ../panels/background/cc-background-panel.c:763
+msgid "Colors & Gradients"
+msgstr "�� & 漸層"
 
-#: ../panels/background/cc-background-panel.c:647
+#: ../panels/background/cc-background-panel.c:772
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../panels/background/gnome-wp-info.c:50
+#: ../panels/background/cc-background-panel.c:833
+msgid "Current background"
+msgstr "ç?®å??ç??è??æ?¯"
+
+#: ../panels/background/gnome-wp-info.c:59
 msgid "No Desktop Background"
 msgstr "ç?¡æ¡?é?¢è??æ?¯"
 
-#: ../panels/background/gnome-wp-item.c:294
-msgid "Slide Show"
-msgstr "å¹»ç??ç??顯示"
-
-#: ../panels/background/gnome-wp-item.c:296
-msgid "Image"
-msgstr "å??ç??"
-
-#: ../panels/background/gnome-wp-item.c:302
+#: ../panels/background/gnome-wp-item.c:277
 msgid "multiple sizes"
 msgstr "å¤?é??尺寸"
 
-#. translators: x pixel(s) by y pixel(s)
-#: ../panels/background/gnome-wp-item.c:305
-#, c-format
-msgid "%d %s by %d %s"
-msgstr "�%d %s �%d %s"
-
-#: ../panels/background/gnome-wp-item.c:307
-#: ../panels/background/gnome-wp-item.c:309
-msgid "pixel"
-msgid_plural "pixels"
-msgstr[0] "å??ç´ "
-
-#. translators: <b>wallpaper name</b>
-#. * mime type, size
-#. * Folder: /path/to/file
-#.
-#: ../panels/background/gnome-wp-item.c:317
-#, c-format
-msgid ""
-"<b>%s</b>\n"
-"%s, %s\n"
-"Folder: %s"
-msgstr ""
-"<b>%s</b>\n"
-"%s,  %s\n"
-"è³?æ??夾ï¼?%s"
-
-#. translators: <b>wallpaper name</b>
-#. * Image missing
-#. * Folder: /path/to/file
-#.
-#: ../panels/background/gnome-wp-item.c:329
+#. translators: 100 Ã? 100px
+#. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
+#: ../panels/background/gnome-wp-item.c:285
 #, c-format
-msgid ""
-"<b>%s</b>\n"
-"%s\n"
-"Folder: %s"
-msgstr ""
-"<b>%s</b>\n"
-"%s\n"
-"è³?æ??夾ï¼?%s"
+msgid "%d Ã? %d"
+msgstr "%d Ã? %d"
 
-#: ../panels/background/gnome-wp-item.c:333
-msgid "Image missing"
-msgstr "é?ºå¤±å??ç??"
+#: ../panels/common/gdm-languages.c:709
+msgid "Unspecified"
+msgstr "æ?ªæ??å®?"
 
 #: ../panels/datetime/datetime.ui.h:1
-msgid "12 hour format"
-msgstr "12 å°?æ??å?¶"
-
-#: ../panels/datetime/datetime.ui.h:2
 msgid "16"
 msgstr "16"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: ../panels/datetime/datetime.ui.h:2
 msgid "2010"
 msgstr "2010"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: ../panels/datetime/datetime.ui.h:3
 msgid "22"
 msgstr "22"
 
-#: ../panels/datetime/datetime.ui.h:5
-msgid "24 hour format"
+#: ../panels/datetime/datetime.ui.h:4
+msgid "24-Hour Time"
 msgstr "24 å°?æ??å?¶"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: ../panels/datetime/datetime.ui.h:5
 msgid "45"
 msgstr "45"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: ../panels/datetime/datetime.ui.h:6
 msgid ":"
 msgstr ":"
 
+#: ../panels/datetime/datetime.ui.h:7
+msgid "AM"
+msgstr "ä¸?å??"
+
 #: ../panels/datetime/datetime.ui.h:8
-#| msgid "pixel"
-#| msgid_plural "pixels"
 msgid "April"
 msgstr "å??æ??"
 
@@ -348,363 +287,122 @@ msgid "August"
 msgstr "å?«æ??"
 
 #: ../panels/datetime/datetime.ui.h:10
-#| msgid "C_ity:"
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
 #: ../panels/datetime/datetime.ui.h:11
-#| msgid "D_elay:"
-msgid "Day:"
-msgstr "��"
-
-#: ../panels/datetime/datetime.ui.h:12
 msgid "December"
 msgstr "å??äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:13
+#: ../panels/datetime/datetime.ui.h:12
 msgid "February"
 msgstr "äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: ../panels/datetime/datetime.ui.h:13
 msgid "January"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:15
+#: ../panels/datetime/datetime.ui.h:14
 msgid "July"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:16
+#: ../panels/datetime/datetime.ui.h:15
 msgid "June"
 msgstr "å?­æ??"
 
-#: ../panels/datetime/datetime.ui.h:17
-#| msgid "Search"
+#: ../panels/datetime/datetime.ui.h:16
 msgid "March"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: ../panels/datetime/datetime.ui.h:17
 msgid "May"
 msgstr "äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:19
-#| msgid "Monitor"
-msgid "Month:"
-msgstr "æ??ï¼?"
+#: ../panels/datetime/datetime.ui.h:18
+msgid "Network Time"
+msgstr "網路æ??å?»"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: ../panels/datetime/datetime.ui.h:19
 msgid "November"
 msgstr "å??ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:21
-#| msgid "Other"
+#: ../panels/datetime/datetime.ui.h:20
 msgid "October"
 msgstr "å??æ??"
 
-#: ../panels/datetime/datetime.ui.h:22
-#| msgid "Version:"
+#: ../panels/datetime/datetime.ui.h:21
 msgid "Region:"
 msgstr "å??å??ï¼?"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: ../panels/datetime/datetime.ui.h:22
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../panels/datetime/datetime.ui.h:24
-msgid "Set time automatically"
-msgstr "è?ªå??設å®?æ??å?»"
-
-#: ../panels/datetime/datetime.ui.h:25
-msgid "Year:"
-msgstr "å¹´ï¼?"
-
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-#, fuzzy
 msgid "Clock;Timezone;Location;"
-msgstr "天氣�置��"
+msgstr "Clock;Timezone;Location;æ??é??;æ??å??;ä½?ç½®;"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
-msgid "Date And Time"
-msgstr "æ?¥æ??å??æ??å?»"
+msgid "Date and Time"
+msgstr "æ?¥æ??è??æ??å?»"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
 msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ??å?»å??好設å®?é?¢æ?¿"
 
-#: ../panels/default-applications/gnome-default-applications-panel.desktop.in.in.h:1
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:11
-msgid "Preferred Applications"
-msgstr "é¦?é?¸æ??ç?¨ç¨?å¼?"
-
-#: ../panels/default-applications/gnome-default-applications-panel.desktop.in.in.h:2
-msgid "Select your default applications"
-msgstr "é?¸å??é ?設使ç?¨ç??æ??ç?¨ç¨?å¼?"
-
-#: ../panels/default-applications/gnome-at-session.desktop.in.in.h:1
-msgid "Start the preferred visual assistive technology"
-msgstr "å??å??é¦?é?¸ç??è¦?覺è¼?å?©æ??è¡?"
-
-#: ../panels/default-applications/gnome-at-session.desktop.in.in.h:2
-msgid "Visual Assistance"
-msgstr "�覺��"
-
-#: ../panels/default-applications/gnome-da-capplet.c:83
-#, c-format
-#| msgid "Error parsing arguments: %s\n"
-msgid "Error setting default browser: %s"
-msgstr "設å®?é ?設ç??覽å?¨æ??ç?¼ç??é?¯èª¤ï¼?%s"
-
-#: ../panels/default-applications/gnome-da-capplet.c:106
-#, c-format
-#| msgid "Error parsing arguments: %s\n"
-msgid "Error setting default mailer: %s"
-msgstr "設å®?é ?設é?µä»¶ç¨?å¼?æ??ç?¼ç??é?¯èª¤ï¼?%s"
-
-#: ../panels/default-applications/gnome-da-capplet.c:321
-#: ../panels/sound/sound-theme-file-utils.c:292
-msgid "Custom"
-msgstr "��"
-
-#: ../panels/default-applications/gnome-da-capplet.c:352
-msgid "Could not load the main interface"
-msgstr "����主��"
-
-#: ../panels/default-applications/gnome-da-capplet.c:354
-msgid "Please make sure that the applet is properly installed"
-msgstr "è«?確å®?該é?¢æ?¿ç¨?å¼?å·²ç¶?å®?è£?妥ç?¶ã??"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:1
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Accessibility"
-msgstr "ç?¡é??ç¤?ç?°å¢?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:3
-#, no-c-format
-msgid "All %s occurrences will be replaced with actual link"
-msgstr "æ??æ?? %s é?½æ??å??代ç?ºç??實ç??é?£çµ?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:4
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "C_ommand:"
-msgstr "æ??令(_O):"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:5
-msgid "Co_mmand:"
-msgstr "æ??令(_M):"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:6
-msgid "E_xecute flag:"
-msgstr "å?·è¡?æ??æ¨?(_X):"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:7
-msgid "Instant Messenger"
-msgstr "å?³æ??é??è¨?ç¨?å¼?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:8
-msgid "Internet"
-msgstr "網é??網路"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:9
-msgid "Mail Reader"
-msgstr "���件�信��"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:10
-msgid "Mobility"
-msgstr "移å??æ?§"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:12
-msgid "Run at st_art"
-msgstr "å??å??æ??å?·è¡?(_A)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:13
-msgid "Run in t_erminal"
-msgstr "��端�中��(_E)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:14
-msgid "System"
-msgstr "系統"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:15
-msgid "Terminal Emulator"
-msgstr "�端�模���"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:16
-msgid "Text Editor"
-msgstr "æ??å­?編輯å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:17
-msgid "Visual"
-msgstr "�覺"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:18
-msgid "Web Browser"
-msgstr "網é ?ç??覽å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:19
-msgid "_Run at start"
-msgstr "å??å??æ??å?·è¡?(_R)"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:1
-msgid "Banshee Music Player"
-msgstr "Banshee ������"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:2
-#: ../panels/universal-access/uap.ui.h:30
-msgid "Dasher"
-msgstr "Dasher"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:3
-msgid "Debian Terminal Emulator"
-msgstr "Debian Terminal Emulator"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:4
-msgid "ETerm"
-msgstr "ETerm"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:5
-msgid "GNOME Magnifier without Screen Reader"
-msgstr "ç?¡è?¢å¹?é?±è®?å?¨ç?? GNOME æ?¾å¤§é?¡"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:6
-msgid "GNOME OnScreen Keyboard"
-msgstr "GNOME ����"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:7
-msgid "GNOME Terminal"
-msgstr "GNOME �端�"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:8
-msgid "Gnopernicus"
-msgstr "Gnopernicus"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:9
-msgid "Gnopernicus with Magnifier"
-msgstr "å?·æ?¾å¤§é?¡ç?? Gnopernicus"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:10
-msgid "KDE Magnifier without Screen Reader"
-msgstr "ç?¡è?¢å¹?é?±è®?å?¨ç?? KDE æ?¾å¤§é?¡"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:11
-msgid "Konsole"
-msgstr "Konsole"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:12
-msgid "Linux Screen Reader"
-msgstr "Linux �����"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:13
-msgid "Linux Screen Reader with Magnifier"
-msgstr "å?·æ?¾å¤§é?¡ç?? Linux è?¢å¹?é?±è®?å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:14
-msgid "Listen"
-msgstr "è?½å??"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:15
-msgid "Muine Music Player"
-msgstr "Muine ������"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:16
-msgid "NXterm"
-msgstr "NXterm"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:17
-msgid "Orca"
-msgstr "Orca"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:18
-msgid "Orca with Magnifier"
-msgstr "å?·æ?¾å¤§é?¡ç?? Orca"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:19
-msgid "RXVT"
-msgstr "RXVT"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:20
-msgid "Rhythmbox Music Player"
-msgstr "Rhythmbox ������"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:21
-msgid "Standard XTerminal"
-msgstr "æ¨?æº?ç?? X çµ?端æ©?"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:22
-msgid "Terminator"
-msgstr "Terminator"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:23
-msgid "Totem Movie Player"
-msgstr "Totem å½±ç??æ?­æ?¾ç¨?å¼?"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:24
-msgid "aterm"
-msgstr "aterm"
-
 #: ../panels/display/display-capplet.ui.h:1
-msgid "<i>Note: may limit resolution options</i>"
-msgstr "<i>注æ??ï¼?å?¯è?½æ??é??å?¶è§£æ??度é?¸é ?</i>"
-
-#: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:317
+#: ../panels/display/xrandr-capplet.c:321
 msgid "Left"
 msgstr "å·¦"
 
-#: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:469
+#: ../panels/display/display-capplet.ui.h:2
+#: ../panels/display/xrandr-capplet.c:484
 msgid "Monitor"
 msgstr "顯示�"
 
-#: ../panels/display/display-capplet.ui.h:4
-#: ../panels/display/xrandr-capplet.c:316
-#: ../panels/display/xrandr-capplet.c:355
+#: ../panels/display/display-capplet.ui.h:3
+#: ../panels/display/xrandr-capplet.c:320
+#: ../panels/display/xrandr-capplet.c:359
 #: ../panels/universal-access/uap.ui.h:58
 msgid "Normal"
 msgstr "正常"
 
-#: ../panels/display/display-capplet.ui.h:5
-#: ../panels/universal-access/uap.ui.h:59
-msgid "Off"
-msgstr "é??é??"
-
-#: ../panels/display/display-capplet.ui.h:6
-#: ../panels/universal-access/uap.ui.h:60
-msgid "On"
-msgstr "é??"
+#: ../panels/display/display-capplet.ui.h:4
+msgid "Note: may limit resolution options"
+msgstr "注æ??ï¼?å?¯è?½æ??é??å?¶è§£æ??度é?¸é ?"
 
-#: ../panels/display/display-capplet.ui.h:7
+#: ../panels/display/display-capplet.ui.h:5
 msgid "R_otation:"
 msgstr "æ??è½?(_O):"
 
-#: ../panels/display/display-capplet.ui.h:8
-#: ../panels/display/xrandr-capplet.c:318
+#: ../panels/display/display-capplet.ui.h:6
+#: ../panels/display/xrandr-capplet.c:322
 msgid "Right"
 msgstr "å?³"
 
-#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/display-capplet.ui.h:7
 msgid "Upside-down"
 msgstr "ç?±ä¸?è??ä¸?"
 
+#: ../panels/display/display-capplet.ui.h:8
+msgid "_Detect Displays"
+msgstr "�測顯示�(_D)"
+
+#. Note that mirror is a verb in this string
 #: ../panels/display/display-capplet.ui.h:10
-msgid "_Detect monitors"
-msgstr "�測��(_D)"
+msgid "_Mirror displays"
+msgstr "��顯示�(_M)"
 
 #: ../panels/display/display-capplet.ui.h:11
-#| msgid "Mirror Screens"
-msgid "_Mirror Screens"
-msgstr "����(_M)"
-
-#: ../panels/display/display-capplet.ui.h:12
 msgid "_Resolution:"
 msgstr "解æ??度(_R):"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-#| msgid "Change resolution and position of monitors"
 msgid "Change resolution and position of monitors and projectors"
 msgstr "æ?¹è®?顯示å?¨å??æ??å½±æ©?ç??解æ??度å??ä½?ç½®"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-#| msgid "Display"
 msgid "Displays"
 msgstr "顯示�"
 
@@ -712,8 +410,10 @@ msgstr "顯示�"
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr ""
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;解æ??度;é??æ?°"
+"æ?´ç??;"
 
-#: ../panels/display/xrandr-capplet.c:319
+#: ../panels/display/xrandr-capplet.c:323
 msgid "Upside Down"
 msgstr "ç?±ä¸?è??ä¸?"
 
@@ -722,62 +422,156 @@ msgstr "ç?±ä¸?è??ä¸?"
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:458
-#: ../panels/display/xrandr-capplet.c:1719
-msgid "Mirror Screens"
-msgstr "����"
+#: ../panels/display/xrandr-capplet.c:460
+msgid "Mirror Displays"
+msgstr "��顯示�"
 
-#: ../panels/display/xrandr-capplet.c:574
+#: ../panels/display/xrandr-capplet.c:593
 #, c-format
-#| msgid "%d x %d"
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:576
+#: ../panels/display/xrandr-capplet.c:595
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1482
+#: ../panels/display/xrandr-capplet.c:1505
 msgid "Drag to change primary display."
 msgstr "æ??æ?³ä»¥æ?¹è®?主è¦?顯示å?¨ã??"
 
-#: ../panels/display/xrandr-capplet.c:1540
-msgid "Select a monitor to change its properties; drag it to rearrange its placement."
+#: ../panels/display/xrandr-capplet.c:1563
+msgid ""
+"Select a monitor to change its properties; drag it to rearrange its "
+"placement."
 msgstr "é?¸æ??ä¸?å??è?¢å¹?以æ?¹è®?å®?ç??屬æ?§ï¼?æ??æ?³å®?å??è?½é??æ?°æ??å??å®?ç??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1945
+#: ../panels/display/xrandr-capplet.c:1953
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1947
+#: ../panels/display/xrandr-capplet.c:1955
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/xrandr-capplet.c:2232
+#: ../panels/display/xrandr-capplet.c:2240
 msgid "Could not save the monitor configuration"
 msgstr "ç?¡æ³?å?²å­?顯示å?¨çµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2255
+#: ../panels/display/xrandr-capplet.c:2263
 msgid "Could not get session bus while applying display configuration"
 msgstr "å?¨å¥?ç?¨é¡¯ç¤ºçµ?æ??æ??ç?¡æ³?å??å¾?ä½?業é??段å?¯æµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2300
+#: ../panels/display/xrandr-capplet.c:2308
 msgid "Could not detect displays"
 msgstr "���測顯示�"
 
-#: ../panels/display/xrandr-capplet.c:2507
+#: ../panels/display/xrandr-capplet.c:2516
 msgid "Could not get screen information"
 msgstr "ç?¡æ³?å??å¾?è?¢å¹?è³?è¨?"
 
+#. translators: This is the type of architecture, for example:
+#. * "64-bit" or "32-bit"
+#: ../panels/info/cc-info-panel.c:247
+#, c-format
+msgid "%d-bit"
+msgstr "%d-ä½?å??"
+
+#: ../panels/info/cc-info-panel.c:261
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u ä½?å??çµ?"
+
+#: ../panels/info/cc-info-panel.c:269
+#, c-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
+
+#: ../panels/info/cc-info-panel.c:274
+#, c-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../panels/info/cc-info-panel.c:279
+#, c-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: ../panels/info/cc-info-panel.c:284
+#, c-format
+msgid "%.1f TB"
+msgstr "%.1f TB"
+
+#: ../panels/info/cc-info-panel.c:289
+#, c-format
+msgid "%.1f PB"
+msgstr "%.1f PB"
+
+#: ../panels/info/cc-info-panel.c:294
+#, c-format
+msgid "%.1f EB"
+msgstr "%.1f EB"
+
+#: ../panels/info/cc-info-panel.c:404
+msgid "Unknown model"
+msgstr "ä¸?æ??ç??å??è??"
+
+#: ../panels/info/cc-info-panel.c:466
+#, c-format
+msgid "Version %s"
+msgstr "ç??æ?¬ %s"
+
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
+msgid "System Info"
+msgstr "系統��"
+
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "System Information"
+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;è£?ç½®;系統;è³?è¨?;è¨?æ?¶é«?;è??ç??"
+"å?¨;ç??æ?¬;"
+
+#: ../panels/info/info.ui.h:1
+msgid "Device name:"
+msgstr "è£?ç½®å??稱ï¼?"
+
+#: ../panels/info/info.ui.h:2
+msgid "Disk:"
+msgstr "���"
+
+#: ../panels/info/info.ui.h:3
+msgid "Memory:"
+msgstr "����"
+
+#: ../panels/info/info.ui.h:4
+msgid "More Info"
+msgstr "����"
+
+#: ../panels/info/info.ui.h:5
+msgid "OS type:"
+msgstr "OS é¡?å??ï¼?"
+
+#: ../panels/info/info.ui.h:6
+msgid "Processor:"
+msgstr "è??ç??å?¨ï¼?"
+
+#: ../panels/info/info.ui.h:7
+msgid "Update Available"
+msgstr "æ??æ?´æ?°å?¯ç?¨"
+
 #: ../panels/keyboard/00-multimedia-key.xml.in.h:1
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
-msgid "Sound"
-msgstr "é?³æ??"
+msgid "Sound and Media"
+msgstr "è?²é?³è??åª?é«?"
 
 #: ../panels/keyboard/01-desktop-key.xml.in.h:1
-msgid "Desktop"
-msgstr "æ¡?é?¢"
+msgid "Launchers and Actions"
+msgstr "å?·è¡?å?¨è??å??ä½?"
 
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
@@ -809,37 +603,53 @@ msgstr "æ?·å¾?é?µç??é¡?å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/gnome-keyboard-panel.c:102
+#: ../panels/keyboard/keyboard-shortcuts.c:1229
 #: ../panels/sound/gvc-mixer-control.c:1091
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
-#: ../panels/user-accounts/um-login-options.c:355
 msgid "Disabled"
 msgstr "å·²å??ç?¨"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:183
-msgid "<Unknown Action>"
-msgstr "<è¡?å??設å®?ä¸?詳>"
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
+msgid "Change keyboard settings"
+msgstr "����設��"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:933
-#: ../panels/keyboard/gnome-keyboard-panel.c:1564
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+msgid "Keyboard"
+msgstr "��"
+
+#. Translators: those are keywords for the keyboard control-center panel
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
+msgid "Shortcut;Repeat;Blink;"
+msgstr "Shortcut;Repeat;Blink;æ?·å¾?é?µ;é??è¤?;é??ç??;"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:736
+#: ../panels/keyboard/keyboard-shortcuts.c:1001
+#: ../panels/keyboard/keyboard-shortcuts.c:1633
+#: ../panels/keyboard/keyboard-shortcuts.c:1637
 msgid "Custom Shortcuts"
 msgstr "�����"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1075
+#: ../panels/keyboard/keyboard-shortcuts.c:848
+msgid "<Unknown Action>"
+msgstr "<è¡?å??設å®?ä¸?詳>"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1255
 msgid "Error saving the new shortcut"
 msgstr "å?²å­?æ?°ç??æ?·å¾?é?µæ??ç?¼ç??é?¯èª¤"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1154
+#: ../panels/keyboard/keyboard-shortcuts.c:1365
 #, c-format
 msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n"
+"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/gnome-keyboard-panel.c:1184
+#: ../panels/keyboard/keyboard-shortcuts.c:1395
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -848,50 +658,42 @@ msgstr ""
 "æ?·å¾?é?µâ??%sâ??å·±ç¶?使ç?¨æ?¼ï¼?\n"
 "â??%sâ??"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1190
+#: ../panels/keyboard/keyboard-shortcuts.c:1401
 #, 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/gnome-keyboard-panel.c:1198
+#: ../panels/keyboard/keyboard-shortcuts.c:1409
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1318
+#: ../panels/keyboard/keyboard-shortcuts.c:1529
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s"
 msgstr "å?¨çµ?æ??è³?æ??庫中å??æ¶?設å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1519
+#: ../panels/keyboard/keyboard-shortcuts.c:1587
 msgid "Too many custom shortcuts"
 msgstr "太������"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1881
+#: ../panels/keyboard/keyboard-shortcuts.c:1866
+#, fuzzy
+#| msgid "Action"
+msgid "Section"
+msgstr "�"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1910
 msgid "Action"
 msgstr "å??ä½?"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:1903
+#: ../panels/keyboard/keyboard-shortcuts.c:1932
 msgid "Shortcut"
 msgstr "æ?·å¾?é?µ"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-#| msgid "Keyboard Settings..."
-msgid "Change keyboard settings"
-msgstr "����設��"
-
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-msgid "Keyboard"
-msgstr "��"
-
-#. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
-#, fuzzy
-msgid "Shortcut;Repeat;Blink;"
-msgstr "游æ¨?é??ç??æ??é??"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
+msgid "C_ommand:"
+msgstr "æ??令(_O):"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 msgid "Cursor Blinking"
@@ -902,7 +704,7 @@ msgid "Cursor _blinks in text fields"
 msgstr "æ??å­?輸å?¥æ¬?中ç??游æ¨?å?¯ä»¥é??ç??(_B)"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:1
 #: ../panels/universal-access/uap.ui.h:28
 msgid "Cursor blinks speed"
 msgstr "游æ¨?é??ç??é??度"
@@ -913,13 +715,12 @@ msgstr "�����"
 
 #. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-#: ../panels/region/gnome-region-panel.ui.h:1
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgid "Fast"
 msgstr "å¿«é??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "General"
 msgstr "��"
 
@@ -929,8 +730,7 @@ msgstr "ç?¶æ??ä¸?æ??é?µä¸?æ?¾æ??é??è¤?輸å?ºè©²å­?å??(_R)"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/region/gnome-region-panel.ui.h:5
-#: ../panels/mouse/gnome-mouse-properties.ui.h:25
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 #: ../panels/universal-access/uap.ui.h:51
 msgid "Long"
 msgstr "é?·"
@@ -949,31 +749,29 @@ msgstr "é??度(_P):"
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
-#: ../panels/region/gnome-region-panel.ui.h:19
-#: ../panels/mouse/gnome-mouse-properties.ui.h:35
+#: ../panels/mouse/gnome-mouse-properties.ui.h:24
 #: ../panels/universal-access/uap.ui.h:71
 msgid "Short"
 msgstr "ç?­"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
-#| msgid "Shortcut"
 msgid "Shortcuts"
 msgstr "å¿«æ?·é?µ"
 
 #. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
-#: ../panels/region/gnome-region-panel.ui.h:20
-#: ../panels/mouse/gnome-mouse-properties.ui.h:39
+#: ../panels/mouse/gnome-mouse-properties.ui.h:26
 msgid "Slow"
 msgstr "æ?¢é??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-msgid "To edit a shortcut key, click on the corresponding row and type a new key combination, or press backspace to clear."
-msgstr "è¦?編輯æ?·å¾?é?µï¼?é»?é?¸ç?¸æ??ç??è¡?並æ??ä¸?æ?°ç??æ??é?µçµ?å??ï¼?æ??以 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
-#: ../panels/region/gnome-region-panel.ui.h:24
-#: ../panels/mouse/gnome-mouse-properties.ui.h:49
 msgid "_Delay:"
 msgstr "延�(_D):"
 
@@ -982,221 +780,155 @@ msgid "_Name:"
 msgstr "å??稱(_N):"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
-#: ../panels/region/gnome-region-panel.ui.h:28
 msgid "_Speed:"
 msgstr "é??度(_S):"
 
-#: ../panels/media/cc-media-panel.c:513
-#| msgid "_Application font:"
-msgid "No applications found"
-msgstr "æ?¾ä¸?å?°æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/cc-media-panel.c:525
+#: ../panels/media/cc-media-panel.c:322
 msgid "Ask what to do"
 msgstr "è©¢å??è¦?å??ä»?麼"
 
-#: ../panels/media/cc-media-panel.c:537
-#| msgid "Smoothing"
-msgid "Do Nothing"
+#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:8
+msgid "Do nothing"
 msgstr "ä¸?å??ä»»ä½?äº?"
 
-#: ../panels/media/cc-media-panel.c:549
-#| msgid "Open File"
-msgid "Open Folder"
+#: ../panels/media/cc-media-panel.c:330
+msgid "Open folder"
 msgstr "é??å??è³?æ??夾"
 
-#: ../panels/media/cc-media-panel.c:575
-#, c-format
-#| msgid "Open with \"%s\""
-msgid "Open %s"
-msgstr "é??å?? %s"
-
-#: ../panels/media/cc-media-panel.c:608
-#| msgid "Open with Default Application"
-msgid "Open with other Application..."
-msgstr "以å?¶ä»?ç¨?å¼?é??å??..."
-
-#: ../panels/media/nautilus-open-with-dialog.c:160
-#| msgid "Could not get screen information"
-msgid "Could not run application"
-msgstr "ç?¡æ³?å?·è¡?æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/nautilus-open-with-dialog.c:172
-#, c-format
-#| msgid "Could not open %s: %s\n"
-msgid "Could not find '%s'"
-msgstr "æ?¾ä¸?å?°ã??%sã??"
-
-#: ../panels/media/nautilus-open-with-dialog.c:175
-#| msgid "Could not get screen information"
-msgid "Could not find application"
-msgstr "æ?¾ä¸?å?°æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/nautilus-open-with-dialog.c:250
-#, c-format
-msgid "Could not add application to the application database: %s"
-msgstr "ç?¡æ³?å°?ç¨?å¼?å? å?¥æ??ç?¨ç¨?å¼?è³?æ??庫ï¼?%s"
-
-#: ../panels/media/nautilus-open-with-dialog.c:251
-#| msgid "Could not detect displays"
-msgid "Could not add application"
-msgstr "ç?¡æ³?å? å?¥æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/nautilus-open-with-dialog.c:289
-#, c-format
-#| msgid "Could not get information for %s: %s\n"
-msgid "Could not set application as the default: %s"
-msgstr "ç?¡æ³?å°?æ??ç?¨ç¨?å¼?設ç?ºé ?設å?¼ï¼?%s"
-
-#: ../panels/media/nautilus-open-with-dialog.c:290
-#| msgid "Select your default applications"
-msgid "Could not set as default application"
-msgstr "ç?¡æ³?設å®?ç?ºé ?設ç??æ??ç?¨ç¨?å¼?"
-
-#: ../panels/media/nautilus-open-with-dialog.c:427
-#| msgid "Set as Application Font"
-msgid "Select an Application"
+#: ../panels/media/cc-media-panel.c:441
+#, fuzzy
+#| msgid "Select an Application"
+msgid "Select an application for audio CDs"
 msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
 
-#: ../panels/media/nautilus-open-with-dialog.c:786
-#| msgid "Open with \"%s\""
-msgid "Open With"
-msgstr "以此é??å??"
+#: ../panels/media/cc-media-panel.c:442
+#, fuzzy
+#| msgid "Select an application to view its description."
+msgid "Select an application for video DVDs"
+msgstr "é?¸å??æ??ç?¨ç¨?å¼?以顯示æ??é??該ç¨?å¼?ç??說æ??ã??"
 
-#: ../panels/media/nautilus-open-with-dialog.c:822
-msgid "Select an application to view its description."
+#: ../panels/media/cc-media-panel.c:443
+#, fuzzy
+#| msgid "Select an application to view its description."
+msgid "Select an application to run when a music player is connected"
 msgstr "é?¸å??æ??ç?¨ç¨?å¼?以顯示æ??é??該ç¨?å¼?ç??說æ??ã??"
 
-#: ../panels/media/nautilus-open-with-dialog.c:847
-msgid "_Use a custom command"
-msgstr "使ç?¨è?ªè¨?æ??令(_U)"
+#: ../panels/media/cc-media-panel.c:444
+#, fuzzy
+#| msgid "Select an application to view its description."
+msgid "Select an application to run when a camera is connected"
+msgstr "é?¸å??æ??ç?¨ç¨?å¼?以顯示æ??é??該ç¨?å¼?ç??說æ??ã??"
 
-#: ../panels/media/nautilus-open-with-dialog.c:864
-msgid "_Browse..."
-msgstr "ç??覽(_B)..."
+#: ../panels/media/cc-media-panel.c:445
+#, fuzzy
+#| msgid "Select an Application"
+msgid "Select an application for software CDs"
+msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
 
-#: ../panels/media/nautilus-open-with-dialog.c:900
-msgid "_Open"
-msgstr "é??å??(_O)"
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: ../panels/media/cc-media-panel.c:457
+msgid "audio DVD"
+msgstr ""
 
-#. first %s is a filename and second %s is a file extension
-#: ../panels/media/nautilus-open-with-dialog.c:980
-#, c-format
-msgid "Open %s and other %s document with:"
-msgstr "以此é??å?? %s å??å?¶ä»? %s æ??件ï¼?"
+#: ../panels/media/cc-media-panel.c:458
+msgid "blank Blu-ray disc"
+msgstr ""
 
-#. the %s here is a file name
-#. %s is a filename
-#: ../panels/media/nautilus-open-with-dialog.c:984
-#: ../panels/media/nautilus-open-with-dialog.c:1015
-#, c-format
-#| msgid "Open with \"%s\""
-msgid "Open %s with:"
-msgstr "以此é??å?? %sï¼?"
+#: ../panels/media/cc-media-panel.c:459
+msgid "blank CD disc"
+msgstr ""
 
-#: ../panels/media/nautilus-open-with-dialog.c:985
-#, c-format
-msgid "_Remember this application for %s documents"
-msgstr "è¨?ä½?é??å??æ??ç?¨ç¨?å¼?ç?¨æ?¼ %s æ??件(_R)"
+#: ../panels/media/cc-media-panel.c:460
+msgid "blank DVD disc"
+msgstr ""
 
-#. Only in add mode - the %s here is a file extension
-#: ../panels/media/nautilus-open-with-dialog.c:994
-#, c-format
-msgid "Open all %s documents with:"
-msgstr "以此é??å??æ??æ?? %s æ??件ï¼?"
+#: ../panels/media/cc-media-panel.c:461
+msgid "blank HD DVD disc"
+msgstr ""
 
-#: ../panels/media/nautilus-open-with-dialog.c:1003
-#: ../panels/region/gnome-region-panel-xkb.c:70
-msgid "Unknown"
-msgstr "ä¸?æ??"
+#: ../panels/media/cc-media-panel.c:462
+msgid "Blu-ray video disc"
+msgstr ""
 
-#. First %s is a filename, second is a description
-#. * of the type, eg "plain text document"
-#: ../panels/media/nautilus-open-with-dialog.c:1011
-#, c-format
-msgid "Open %s and other \"%s\" files with:"
-msgstr "以此é??å?? %s å??å?¶ä»?ã??%sã??æª?æ¡?ï¼?"
+#: ../panels/media/cc-media-panel.c:463
+msgid "e-book reader"
+msgstr ""
 
-#. %s is a file type description
-#: ../panels/media/nautilus-open-with-dialog.c:1017
-#, c-format
-msgid "_Remember this application for \"%s\" files"
-msgstr "è¨?ä½?é??å??æ??ç?¨ç¨?å¼?ç?¨æ?¼ã??%sã??æª?æ¡?(_R)"
+#: ../panels/media/cc-media-panel.c:464
+#, fuzzy
+#| msgid "_DVD video:"
+msgid "HD DVD video disc"
+msgstr "_DVD å½±ç??ï¼?"
 
-#. Only in add mode
-#: ../panels/media/nautilus-open-with-dialog.c:1026
-#, c-format
-msgid "Open all \"%s\" files with:"
-msgstr "以此é??å??æ??æ??ã??%sã??æª?æ¡?ï¼?"
+#: ../panels/media/cc-media-panel.c:465
+#, fuzzy
+#| msgid "Pictures Folder"
+msgid "Picture CD"
+msgstr "å??ç??è³?æ??夾"
 
-#: ../panels/media/nautilus-open-with-dialog.c:1037
-#| msgid "_Add..."
-msgid "_Add"
-msgstr "å? å?¥(_A)"
+#: ../panels/media/cc-media-panel.c:466
+msgid "Super Video CD"
+msgstr ""
 
-#: ../panels/media/nautilus-open-with-dialog.c:1038
-#| msgid "Preferred Applications"
-msgid "Add Application"
-msgstr "å? å?¥æ??ç?¨ç¨?å¼?"
+#: ../panels/media/cc-media-panel.c:467
+#, fuzzy
+#| msgid "Video Mouse"
+msgid "Video CD"
+msgstr "���鼠"
 
 #: ../panels/media/gnome-media-properties.ui.h:1
-#| msgid "Action"
 msgid "Acti_on:"
 msgstr "å??ä½?(_O):"
 
 #: ../panels/media/gnome-media-properties.ui.h:2
-msgid "B_rowse media when inserted"
-msgstr "æ??å?¥æ??ç??覽åª?é«?(_R)"
+msgid "CD _audio:"
+msgstr "CD ��(_A):"
 
 #: ../panels/media/gnome-media-properties.ui.h:3
-msgid "CD _Audio:"
-msgstr "CD é?³æ??(_A):"
-
-#: ../panels/media/gnome-media-properties.ui.h:4
 msgid "Media and Autorun"
 msgstr "åª?é«?è??è?ªå??å?·è¡?"
 
-#: ../panels/media/gnome-media-properties.ui.h:5
-msgid "Other Media..."
-msgstr "����..."
-
-#: ../panels/media/gnome-media-properties.ui.h:6
+#: ../panels/media/gnome-media-properties.ui.h:4
 msgid "Select how media should be handled"
 msgstr "é?¸æ??è¦?å¦?ä½?è??ç??åª?é«?"
 
-#: ../panels/media/gnome-media-properties.ui.h:7
+#: ../panels/media/gnome-media-properties.ui.h:5
 msgid "Select how other media should be handled"
 msgstr "é?¸æ??è¦?å¦?ä½?è??ç??å?¶ä»?åª?é«?"
 
-#: ../panels/media/gnome-media-properties.ui.h:8
-msgid "_DVD Video:"
+#: ../panels/media/gnome-media-properties.ui.h:6
+msgid "_DVD video:"
 msgstr "_DVD å½±ç??ï¼?"
 
-#: ../panels/media/gnome-media-properties.ui.h:9
-#| msgid "Muine Music Player"
-msgid "_Music Player:"
-msgstr "������(_M):"
+#: ../panels/media/gnome-media-properties.ui.h:7
+msgid "_Music player:"
+msgstr "�����(_M):"
 
-#: ../panels/media/gnome-media-properties.ui.h:10
+#: ../panels/media/gnome-media-properties.ui.h:8
 msgid "_Never prompt or start programs on media insertion"
 msgstr "æ??å?¥åª?é«?æ??æ°¸é? ä¸?æ??示æ??å??å??ç¨?å¼?(_N)"
 
-#: ../panels/media/gnome-media-properties.ui.h:11
-#| msgid "_Yahoo:"
+#: ../panels/media/gnome-media-properties.ui.h:9
+msgid "_Other Media..."
+msgstr "����(_O)�"
+
+#: ../panels/media/gnome-media-properties.ui.h:10
 msgid "_Photos:"
 msgstr "ç?¸ç??(_P):"
 
-#: ../panels/media/gnome-media-properties.ui.h:12
+#: ../panels/media/gnome-media-properties.ui.h:11
 msgid "_Software:"
 msgstr "è»?é«?(_S):"
 
-#: ../panels/media/gnome-media-properties.ui.h:13
-#| msgid "Type:"
+#: ../panels/media/gnome-media-properties.ui.h:12
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
 #: ../panels/media/gnome-media-panel.desktop.in.in.h:1
-#| msgid "Set your mouse preferences"
 msgid "Configure media and autorun preferences"
 msgstr "設å®?åª?é«?å??è?ªå??å?·è¡?å??好設å®?"
 
@@ -1204,57 +936,348 @@ msgstr "設å®?åª?é«?å??è?ªå??å?·è¡?å??好設å®?"
 msgid "Removable Media"
 msgstr "�移����"
 
+#. Translators: The printer is low on toner
+#: ../panels/printers/cc-printers-panel.c:210
+msgid "Low on toner"
+msgstr "碳��足"
+
+#. Translators: The printer has no toner left
+#: ../panels/printers/cc-printers-panel.c:212
+msgid "Out of toner"
+msgstr "碳���"
+
+#. Translators: "Developer" like on photo development context
+#: ../panels/printers/cc-printers-panel.c:214
+msgid "Low on developer"
+msgstr "顯å??å??ä¸?足"
+
+#. Translators: "Developer" like on photo development context
+#: ../panels/printers/cc-printers-panel.c:216
+msgid "Out of developer"
+msgstr "顯å??å??ç?¨å®?"
+
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/cc-printers-panel.c:218
+msgid "Low on a marker supply"
+msgstr "墨水��足"
+
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/cc-printers-panel.c:220
+msgid "Out of a marker supply"
+msgstr "墨水���"
+
+#. Translators: One or more covers on the printer are open
+#: ../panels/printers/cc-printers-panel.c:222
+#, 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:224
+#, fuzzy
+#| msgid "Open Folder"
+msgid "Open door"
+msgstr "æ??å??å??空ä½?"
+
+#. Translators: At least one input tray is low on media
+#: ../panels/printers/cc-printers-panel.c:226
+msgid "Low on paper"
+msgstr "ç´?å¼µä¸?足ã??"
+
+#. Translators: At least one input tray is empty
+#: ../panels/printers/cc-printers-panel.c:228
+msgid "Out of paper"
+msgstr "�張��"
+
+#. Translators: The printer is offline
+#: ../panels/printers/cc-printers-panel.c:230
+msgid "Offline"
+msgstr "��"
+
+#. Translators: Someone has paused the Printer
+#: ../panels/printers/cc-printers-panel.c:232
+msgid "Paused"
+msgstr "å·²æ?«å??"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: ../panels/printers/cc-printers-panel.c:234
+msgid "Waste receptacle almost full"
+msgstr ""
+
+#. Translators: The printer marker supply waste receptacle is full
+#: ../panels/printers/cc-printers-panel.c:236
+#, fuzzy
+msgid "Waste receptacle full"
+msgstr "è?«è?? [25 å??]"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/cc-printers-panel.c:238
+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:240
+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:329
+msgid "Idle"
+msgstr "é??ç½®"
+
+#. Translators: Printer's state (jobs are processing)
+#. Translators: Job's state (job is currently printing)
+#: ../panels/printers/cc-printers-panel.c:333
+#: ../panels/printers/cc-printers-panel.c:726
+msgid "Processing"
+msgstr "è??ç??中"
+
+#. Translators: Printer's state (no jobs can be processed)
+#. Translators: Job's state (job has been stopped)
+#: ../panels/printers/cc-printers-panel.c:337
+#: ../panels/printers/cc-printers-panel.c:730
+msgid "Stopped"
+msgstr "å·²å??æ­¢"
+
+#. Translators: Job's state (job is waiting to be printed)
+#: ../panels/printers/cc-printers-panel.c:718
+msgid "Pending"
+msgstr "��中"
+
+#. Translators: Job's state (job is held for printing)
+#: ../panels/printers/cc-printers-panel.c:722
+msgid "Held"
+msgstr "å·²æ?«å??"
+
+#. Translators: Job's state (job has been canceled)
+#: ../panels/printers/cc-printers-panel.c:734
+msgid "Canceled"
+msgstr "å·²å??æ¶?"
+
+#. Translators: Job's state (job has aborted due to error)
+#: ../panels/printers/cc-printers-panel.c:738
+msgid "Aborted"
+msgstr "已��"
+
+#. Translators: Job's state (job has completed successfully)
+#: ../panels/printers/cc-printers-panel.c:742
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#. Translators: Name of column showing titles of print jobs
+#: ../panels/printers/cc-printers-panel.c:837
+msgid "Job Title"
+msgstr "å·¥ä½?å??稱"
+
+#. Translators: Name of column showing statuses of print jobs
+#: ../panels/printers/cc-printers-panel.c:845
+msgid "Job State"
+msgstr "å·¥ä½?ç??æ??"
+
+#. Translators: Name of column showing names of creators of print jobs
+#: ../panels/printers/cc-printers-panel.c:851
+msgid "User"
+msgstr "使ç?¨è??"
+
+#. Translators: Name of column showing times of creation of print jobs
+#: ../panels/printers/cc-printers-panel.c:857
+msgid "Time"
+msgstr "æ??å?»"
+
+#. Translators: Program cannot connect to DBus' system bus
+#: ../panels/printers/cc-printers-panel.c:1047
+#, c-format
+msgid "Could not connect to system bus: %s"
+msgstr "ç?¡æ³?é?£ç·?è?³ç³»çµ±å?¯æµ?æ??ï¼?%s"
+
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/cc-printers-panel.c:1657
+msgid "Test page"
+msgstr "測試�"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/cc-printers-panel.c:1665
+msgid "Clean print heads"
+msgstr "æ¸?ç??å??å?°å?´é ­"
+
+#. Translators: An error has occured during execution of a CUPS maintenance command
+#: ../panels/printers/cc-printers-panel.c:1670
+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:1709
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
+msgid "Change printer settings"
+msgstr "���表�設��"
+
+#. Translators: those are keywords for the printing control-center panel
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+msgid "Printer;Queue;Print;Paper;Ink;Toner;"
+msgstr "Printer;Queue;Print;Paper;Ink;Toner;å?°è¡¨æ©?;ä½?å??;å??å?°;ç´?å¼µ;墨水;碳ç²?;"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+msgid "Printers"
+msgstr "�表�"
+
+#: ../panels/printers/printers.ui.h:1
+msgid "\t"
+msgstr ""
+
+#: ../panels/printers/printers.ui.h:2
+msgid "---"
+msgstr "---"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printers.ui.h:4
+msgid "Clean Print Heads"
+msgstr "æ¸?ç??å??å?°å?´é ­"
+
+#. Translators: This checkbox is checked when the default printer is selected.
+#: ../panels/printers/printers.ui.h:6
+#: ../panels/region/gnome-region-panel-xkbot.c:229
+#: ../panels/sound/gvc-sound-theme-chooser.c:589
+msgid "Default"
+msgstr "�設�"
+
+#. Translators: Description of the printer.
+#: ../panels/printers/printers.ui.h:8
+msgid "Description:"
+msgstr "æ??è¿°ï¼?"
+
+#. Translators: This button pauses printer.
+#: ../panels/printers/printers.ui.h:10
+msgid "Disable Printer"
+msgstr "å??ç?¨å?°è¡¨æ©?"
+
+#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
+#: ../panels/printers/printers.ui.h:12
+msgid "Location:"
+msgstr "ä½?ç½®:"
+
+#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:14
+msgid "Print Test Page"
+msgstr "å??å?°æ¸¬è©¦é ?"
+
+#. Translators: A widget showing list of print jobs for selected printer.
+#: ../panels/printers/printers.ui.h:16
+msgid "Printer Jobs"
+msgstr "�表�工�"
+
+#. Translators: This shows queue of print jobs.
+#: ../panels/printers/printers.ui.h:18
+msgid "Queue"
+msgstr "ä½?å??"
+
+#. Translators: Users which are allowed to print on this printer.
+#: ../panels/printers/printers.ui.h:20
+msgid "Share with these users:"
+msgstr "è??é??äº?使ç?¨è??å??享ï¼?"
+
+#: ../panels/printers/printers.ui.h:21
+msgid "Show / hide printer's jobs"
+msgstr "顯示 / é?±è??å?°è¡¨æ©?å·¥ä½?"
+
+#. Translators: Status of the printer.
+#: ../panels/printers/printers.ui.h:23
+msgid "Status:"
+msgstr "ç??æ??ï¼?"
+
+#. Translators: By supply we mean ink, toner, staples, water, ...
+#: ../panels/printers/printers.ui.h:25
+msgid "Supply:"
+msgstr "è??æ??ï¼?"
+
+#: ../panels/printers/printers.ui.h:26
+#, fuzzy
+#| msgid "add-toolbutton"
+msgid "pause-toolbutton"
+msgstr "å? å?¥å·¥å?·æ??é??"
+
+#: ../panels/printers/printers.ui.h:27
+#, fuzzy
+#| msgid "remove-toolbutton"
+msgid "resume-toolbutton"
+msgstr "移é?¤å·¥å?·æ??é??"
+
+#: ../panels/printers/printers.ui.h:28
+#, fuzzy
+#| msgid "add-toolbutton"
+msgid "stop-toolbutton"
+msgstr "å? å?¥å·¥å?·æ??é??"
+
+#: ../panels/printers/printers.ui.h:29
+#, fuzzy
+#| msgid "add-toolbutton"
+msgid "toolbutton1"
+msgstr "å? å?¥å·¥å?·æ??é??"
+
+#: ../panels/printers/printers.ui.h:30
+#, fuzzy
+#| msgid "add-toolbutton"
+msgid "toolbutton2"
+msgstr "å? å?¥å·¥å?·æ??é??"
+
+#: ../panels/region/gnome-region-panel.ui.h:1
+msgid "Install languages..."
+msgstr "�����"
+
 #: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Keyboard _model:"
 msgstr "��模�(_M)"
 
 #: ../panels/region/gnome-region-panel.ui.h:3
+msgid "Language"
+msgstr "��"
+
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Layouts"
 msgstr "é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
+#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "List of keyboard layouts selected for usage"
 msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
 
 #: ../panels/region/gnome-region-panel.ui.h:6
-#: ../panels/universal-access/uap.ui.h:54
-msgid "Mouse Keys"
-msgstr "�鼠���"
-
-#: ../panels/region/gnome-region-panel.ui.h:7
 msgid "Move _Down"
 msgstr "�移(_D)"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
+#: ../panels/region/gnome-region-panel.ui.h:7
 msgid "Move _Up"
 msgstr "�移(_U)"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
+#: ../panels/region/gnome-region-panel.ui.h:8
 msgid "Move the selected keyboard layout down in the list"
 msgstr "å°?æ¸?å?®ä¸­é?¸å??ç??é?µç?¤é??ç½®å??ä¸?移å??"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Move the selected keyboard layout up in the list"
 msgstr "å°?æ¸?å?®ä¸­é?¸å??ç??é?µç?¤é??ç½®å??ä¸?移å??"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/gnome-region-panel.ui.h:10
 msgid "New windows u_se active window's layout"
 msgstr "æ?°è¦?çª?延ç?¨ä½¿ç?¨ä¸­è¦?çª?ç??é??ç½®(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/gnome-region-panel.ui.h:11
 msgid "Print a diagram of the selected keyboard layout"
 msgstr "顯示é?¸å??ç??é?µç?¤é??ç½®ç??å??表"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/gnome-region-panel.ui.h:12
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "å?°å??å??èª?è¨?"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "Remove the selected keyboard layout from the list"
 msgstr "å¾?æ¸?å?®ä¸­ç§»é?¤é?¸å??ç??é?µç?¤é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
+#: ../panels/region/gnome-region-panel.ui.h:14
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
@@ -1262,43 +1285,34 @@ msgstr ""
 "以é ?設å?¼æ?¿æ??ç?®å??ç??é?µç?¤é??ç½®\n"
 "設��"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
+#: ../panels/region/gnome-region-panel.ui.h:16
 msgid "Reset to De_faults"
 msgstr "é??ç½®ç?ºé ?設å?¼(_F)"
 
+#: ../panels/region/gnome-region-panel.ui.h:17
+msgid "Select a display language"
+msgstr "é?¸æ??顯示ç??èª?è¨?"
+
 #: ../panels/region/gnome-region-panel.ui.h:18
 msgid "Select a keyboard layout to be added to the list"
 msgstr "é?¸æ??è¦?å? å?¥æ¸?å?®ç??é?µç?¤é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
+#: ../panels/region/gnome-region-panel.ui.h:19
 msgid "View and edit keyboard layout options"
 msgstr "檢è¦?並編輯é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-#: ../panels/mouse/gnome-mouse-properties.ui.h:48
-msgid "_Acceleration:"
-msgstr "å? é??度(_A):"
-
-#: ../panels/region/gnome-region-panel.ui.h:23
+#: ../panels/region/gnome-region-panel.ui.h:20
 msgid "_Add..."
 msgstr "å? å?¥(_A)â?¦"
 
-#: ../panels/region/gnome-region-panel.ui.h:25
+#: ../panels/region/gnome-region-panel.ui.h:21
 msgid "_Options..."
 msgstr "��(_O)�"
 
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "_Pointer can be controlled using the keypad"
-msgstr "å??許使ç?¨é?µç?¤æ?§å?¶æ»?é¼ æ??æ¨?(_P)"
-
-#: ../panels/region/gnome-region-panel.ui.h:27
+#: ../panels/region/gnome-region-panel.ui.h:22
 msgid "_Separate layout for each window"
 msgstr "給æ¯?ä¸?å??è¦?çª?ç?¨ç«?ç??é??ç½®(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid "_Type to test settings:"
-msgstr "è«?輸å?¥æ??å­?ä¾?測試設å®?(_T):"
-
 #: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
 msgid "By _country"
 msgstr "ä¾?å??家(_C)"
@@ -1343,7 +1357,14 @@ msgstr "製é? å??(_V):"
 msgid "Keyboard Layout Options"
 msgstr "é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:218
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/region/gnome-region-panel-xkb.c:70
+#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#: ../panels/region/gnome-region-panel-xkblt.c:220
 msgid "Layout"
 msgstr "é??ç½®"
 
@@ -1355,12 +1376,6 @@ msgstr "製é? å??"
 msgid "Models"
 msgstr "å??è??"
 
-#: ../panels/region/gnome-region-panel-xkbot.c:227
-#: ../panels/network/gnome-network-properties.c:554
-#: ../panels/sound/gvc-sound-theme-chooser.c:589
-msgid "Default"
-msgstr "�設�"
-
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
 msgid "Change your region and language settings"
 msgstr "æ?¹è®?æ?¨ç??å?°å??å??èª?è¨?設å®?å?¼"
@@ -1368,338 +1383,378 @@ msgstr "æ?¹è®?æ?¨ç??å?°å??å??èª?è¨?設å®?å?¼"
 #. Translators: those are keywords for the region control-center panel
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 #, fuzzy
-#| msgid "_Language:"
-msgid "Language;Layout;"
-msgstr "<b>é?µç?¤é??ç½®</b>"
+#| msgid "Language;Layout;"
+msgid "Language;Layout;Keyboard;"
+msgstr "Language;Layout;èª?è¨?;é??ç½®;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
-msgid "Choose type of click _beforehand"
-msgstr "äº?å??é?¸æ??é»?æ??ç??é¡?å??(_B)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgid "Choose type of click with mo_use gestures"
-msgstr "é?¸æ??æ»?é¼ æ??å?¢ç??é»?æ??é¡?å??(_U)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
-#: ../panels/universal-access/uap.ui.h:29
-msgid "D_elay:"
-msgstr "延�(_E):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "D_ouble click:"
-msgstr "é??æ??(_O):"
-
-#. click to initiate drag-and-drop (like normally click and hold)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
-msgid "D_rag click:"
-msgstr "æ??æ?³é»?æ??(_R):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Disable _touchpad while typing"
 msgstr "æ??å­?æ??å??ç?¨è§¸æ?§æ?¿(_T)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
 msgid "Double-Click Timeout"
 msgstr "é??æ??å??辨æ??é??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Drag and Drop"
 msgstr "æ??æ?¾"
 
-#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
-msgid "Dwell Click"
-msgstr "æ?¿ä»£é»?æ??"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "Enable _mouse clicks with touchpad"
 msgstr "å??ç?¨è§¸æ?§æ?¿ç??æ»?é¼ é»?æ??(_M)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "Enable h_orizontal scrolling"
 msgstr "å??ç?¨æ°´å¹³æ?²å??(_O)"
 
 #. high sensitivity
-#: ../panels/mouse/gnome-mouse-properties.ui.h:20
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 #: ../panels/universal-access/uap.ui.h:39
 msgid "High"
 msgstr "é«?"
 
 #. large threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:22
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 #: ../panels/universal-access/uap.ui.h:48
 msgid "Large"
 msgstr "大"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Locate Pointer"
 msgstr "�示鼠��置"
 
 #. low sensitivity
-#: ../panels/mouse/gnome-mouse-properties.ui.h:27
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 #: ../panels/universal-access/uap.ui.h:52
 msgid "Low"
 msgstr "ä½?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+msgid "Mouse"
+msgstr "æ»?é¼ "
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:19
 msgid "Mouse Orientation"
 msgstr "å·¦å?³æ??模å¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:29
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
 msgid "Mouse Preferences"
 msgstr "æ»?é¼ å??好設å®?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
+#: ../panels/mouse/gnome-mouse-properties.ui.h:21
 msgid "Pointer Speed"
 msgstr "æ??æ¨?é??度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:31
+#: ../panels/mouse/gnome-mouse-properties.ui.h:22
 msgid "Scrolling"
 msgstr "æ?²å??æ?¹å¼?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:32
-msgid "Seco_ndary click:"
-msgstr "次è¦?é»?æ??(_N):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:33
+#: ../panels/mouse/gnome-mouse-properties.ui.h:23
 msgid "Sh_ow position of pointer when the Control key is pressed"
 msgstr "ç?¶æ??ä¸? Control æ??顯示游æ¨?ç??ä½?ç½®(_O)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:36
-msgid "Show click type _window"
-msgstr "顯示é»?æ??é¡?å??è¦?çª?(_W)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:37
-#: ../panels/universal-access/uap.ui.h:73
-msgid "Simulated Secondary Click"
-msgstr "模æ?¬æ¬¡è¦?é»?æ??"
-
 #. small threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:41
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/mouse/gnome-mouse-properties.ui.h:28
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Small"
 msgstr "å°?"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:42
+#: ../panels/mouse/gnome-mouse-properties.ui.h:29
 msgid "Thr_eshold:"
 msgstr "å??辨è·?é?¢(_E):"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:43
-#| msgid ""
-#| "To test your double-click settings, try to double-click on the light bulb."
+#: ../panels/mouse/gnome-mouse-properties.ui.h:30
 msgid "To test your settings, try to double-click on the face."
 msgstr "è¦?測試æ?¨ç??設å®?å?¼ï¼?è«?試è??å?¨é??å??è??ä¸?é??æ??ã??"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:44
+#: ../panels/mouse/gnome-mouse-properties.ui.h:31
 msgid "Touchpad"
 msgstr "觸��"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:45
+#: ../panels/mouse/gnome-mouse-properties.ui.h:32
 msgid "Two-_finger scrolling"
 msgstr "å?©é»?æ?²å??(_F)"
 
-#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
-#: ../panels/mouse/gnome-mouse-properties.ui.h:47
-msgid "You can also use the Dwell Click panel applet to choose the click type."
-msgstr "æ?¨å?¯ä»¥ä½¿ç?¨ã??æ?¿ä»£é»?æ??ã??é?¢æ?¿ç¨?å¼?ä¾?é?¸æ??é»?æ??ç??é¡?å??ã??"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:33
+msgid "_Acceleration:"
+msgstr "å? é??度(_A):"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:50
+#: ../panels/mouse/gnome-mouse-properties.ui.h:34
 msgid "_Disabled"
 msgstr "å·²å??ç?¨(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:51
+#: ../panels/mouse/gnome-mouse-properties.ui.h:35
 msgid "_Edge scrolling"
 msgstr "é??ç·£æ?²å??(_E)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:52
-msgid "_Initiate click when stopping pointer movement"
-msgstr "ç?¶å??止游æ¨?移å??æ??å??å§?å??é»?æ??(_I)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:53
+#: ../panels/mouse/gnome-mouse-properties.ui.h:36
 msgid "_Left-handed"
 msgstr "æ?£ç?¨å·¦æ??(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:54
-#: ../panels/universal-access/uap.ui.h:96
-msgid "_Motion threshold:"
-msgstr "移å??é??度(_M):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:55
+#: ../panels/mouse/gnome-mouse-properties.ui.h:37
 msgid "_Right-handed"
 msgstr "æ?£ç?¨å?³æ??(_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:56
+#: ../panels/mouse/gnome-mouse-properties.ui.h:38
 msgid "_Sensitivity:"
 msgstr "æ??æ??度(_S):"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:57
-msgid "_Single click:"
-msgstr "å?®æ??(_S):"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:58
+#: ../panels/mouse/gnome-mouse-properties.ui.h:39
 msgid "_Timeout:"
 msgstr "æ??é??(_T):"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:59
-msgid "_Trigger secondary click by holding down the primary button"
-msgstr "æ??ä½?主è¦?é?µæ??觸ç?¼æ¬¡è¦?é»?æ??(_T)"
-
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-#| msgid "Touchpad"
 msgid "Mouse and Touchpad"
 msgstr "æ»?é¼ å??觸æ?§æ?¿"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-#| msgid "Set your mouse preferences"
 msgid "Set your mouse and touchpad preferences"
 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;"
+msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr ""
+"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;觸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?觸;é??"
+"æ??;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/gnome-network-properties.c:672
-msgid "New Location..."
-msgstr "���置�"
+#: ../panels/network/cc-network-panel.c:1062
+#: ../panels/network/cc-network-panel.c:1084
+#, c-format
+msgid "%i Mb/s"
+msgstr "%i Mb/s"
 
-#: ../panels/network/gnome-network-properties.c:789
-msgid "Location already exists"
-msgstr "�置已���"
+#: ../panels/network/cc-network-panel.c:1064
+#, c-format
+msgid "%i Gb/s"
+msgstr "%i Gb/s"
+
+#: ../panels/network/cc-network-panel.c:1082
+#, c-format
+msgid "%i kb/s"
+msgstr "%i kb/s"
+
+#: ../panels/network/cc-network-panel.c:1739
+msgid "Network proxy"
+msgstr "網路代ç??伺æ??å?¨"
+
+#: ../panels/network/cc-network-panel.c:1748
+msgid "Set the system proxy settings"
+msgstr "設å®?系統代ç??伺æ??å?¨è¨­å®?å?¼"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:69
+msgid "Wired"
+msgstr "æ??ç·?"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:73
+msgid "Wireless"
+msgstr "ç?¡ç·?"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:78
+msgid "Mobile broadband"
+msgstr "è¡?å??寬頻"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:82
+msgid "Bluetooth"
+msgstr "è??ç??"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:86
+#, fuzzy
+#| msgid "Models"
+msgid "Mesh"
+msgstr "å??è??"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:142
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:146
+msgid "Infrastructure"
+msgstr "����"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:164
+msgid "Status unknown"
+msgstr "ç??æ??ä¸?æ??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:168
+msgid "Unmanaged"
+msgstr "æ?ªç®¡ç??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:172
+msgid "Unavailable"
+msgstr "��使�"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:176
+msgid "Disconnected"
+msgstr "已��"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:180
+msgid "Preparing connection"
+msgstr "æ­£å?¨æº?å??é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:184
+msgid "Configuring connection"
+msgstr "正�設���"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:188
+msgid "Authenticating"
+msgstr "正���"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:192
+msgid "Getting network address"
+msgstr "æ­£å?¨å??å¾?網路ä½?å??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:196
+msgid "Connected"
+msgstr "已��"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:200
+msgid "Failed to connect"
+msgstr "����"
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-msgid "Network Proxy"
-msgstr "代ç??伺æ??å?¨"
+msgid "Network"
+msgstr "網路"
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Set your network proxy preferences"
-msgstr "設å®?代ç??伺æ??å?¨"
+msgid "Network settings"
+msgstr "網路設��"
 
-#. Translators: those are keywords for the network proxy control-center panel
+#. Translators: those are keywords for the network control-center panel
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-#, fuzzy
-#| msgid "Location:"
-msgid "Web;Location;"
-msgstr "��水平�置"
+msgid "Network;Wireless;IP;LAN;"
+msgstr "Network;Wireless;IP;LAN;網路;ç?¡ç·?;å??å??網路;"
 
-#: ../panels/network/gnome-network-properties.ui.h:1
-msgid "<b>Di_rect internet connection</b>"
-msgstr "<b>��網路��(_R)</b>"
+#: ../panels/network/network.ui.h:1
+msgid "Airplane Mode"
+msgstr "��模�"
 
-#: ../panels/network/gnome-network-properties.ui.h:2
-msgid "<b>_Automatic proxy configuration</b>"
-msgstr "<b>è?ªå??設å®?代ç??伺æ??å?¨(_A)</b>"
+#: ../panels/network/network.ui.h:2
+msgid "Configuration URL:"
+msgstr "çµ?æ??網å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:3
-msgid "<b>_Manual proxy configuration</b>"
-msgstr "<b>è?ªè¨?代ç??伺æ??å?¨(_M)</b>"
+#: ../panels/network/network.ui.h:3
+msgid "DNS:"
+msgstr "DNSï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:4
-msgid "<b>_Use authentication</b>"
-msgstr "<b>é??è¦?èª?è­?(_U)</b>"
+#: ../panels/network/network.ui.h:4
+msgid "Default Route:"
+msgstr "�設路��"
 
-#: ../panels/network/gnome-network-properties.ui.h:5
-msgid "Autoconfiguration _URL:"
-msgstr "è?ªå??設å®?æ??é??ç?? _URLï¼?"
+#: ../panels/network/network.ui.h:5
+msgid "FTP Proxy:"
+msgstr "FTP 代ç??伺æ??å?¨ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:6
-msgid "C_reate"
-msgstr "建�(_R)"
+#: ../panels/network/network.ui.h:6
+msgid "Gateway:"
+msgstr "é??è¨?é??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:7
-msgid "Create New Location"
-msgstr "建ç«?æ?°ç??ä½?ç½®"
+#: ../panels/network/network.ui.h:7
+msgid "Group Name:"
+msgstr "群çµ?å??稱ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:8
-msgid "HTTP Proxy Details"
-msgstr "HTTP 代ç??伺æ??å?¨è¨­å®?"
+#: ../panels/network/network.ui.h:8
+msgid "Group Password:"
+msgstr "群��碼�"
 
-#: ../panels/network/gnome-network-properties.ui.h:9
-msgid "H_TTP proxy:"
-msgstr "H_TTP 代ç??伺æ??å?¨ï¼?"
+#: ../panels/network/network.ui.h:9
+msgid "HTTP Proxy:"
+msgstr "HTTP 代ç??伺æ??å?¨å¯?碼ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:10
-msgid "Ignore Host List"
-msgstr "忽�主���"
+#: ../panels/network/network.ui.h:10
+msgid "Hardware Address:"
+msgstr "硬é«?ä½?å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:11
-msgid "Ignored Hosts"
-msgstr "忽ç?¥ç??主æ©?"
-
-#: ../panels/network/gnome-network-properties.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:18
-msgid "Location:"
-msgstr "ä½?ç½®:"
+#: ../panels/network/network.ui.h:11
+msgid "IMEI:"
+msgstr "IMEIï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:13
-msgid "Network Proxy Preferences"
-msgstr "網路代ç??伺æ??å?¨å??好設å®?"
+#: ../panels/network/network.ui.h:12
+msgid "IP Address:"
+msgstr "IP ä½?å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:14
-msgid "Port:"
-msgstr "���:"
+#: ../panels/network/network.ui.h:13
+msgid "IPv4 Address:"
+msgstr "IPv4 ä½?å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:15
-msgid "Proxy Configuration"
-msgstr "代ç??伺æ??å?¨è¨­å®?"
+#: ../panels/network/network.ui.h:14
+msgid "IPv6 Address:"
+msgstr "IPv6 ä½?å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:16
-msgid "S_ocks host:"
-msgstr "S_ocks 主��"
+#: ../panels/network/network.ui.h:15
+msgid "Method:"
+msgstr "���"
 
-#: ../panels/network/gnome-network-properties.ui.h:17
-msgid "The location already exists."
-msgstr "該ä½?置已ç¶?å­?å?¨ã??"
+#: ../panels/network/network.ui.h:16
+msgid "Network Name:"
+msgstr "網路å??稱ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:18
-msgid "U_sername:"
-msgstr "使ç?¨è??å??稱(_S):"
+#: ../panels/network/network.ui.h:17
+msgid "Provider:"
+msgstr "ä¾?æ??å??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:19
-msgid "_Delete Location"
-msgstr "å??é?¤ä½?ç½®(_D)"
+#: ../panels/network/network.ui.h:18
+msgid "Secure HTTP Proxy:"
+msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:20
-msgid "_Details"
-msgstr "詳細設�(_D)"
+#: ../panels/network/network.ui.h:19
+msgid "Security:"
+msgstr "����"
 
-#: ../panels/network/gnome-network-properties.ui.h:21
-msgid "_FTP proxy:"
-msgstr "_FTP 代ç??伺æ??å?¨ï¼?"
+#: ../panels/network/network.ui.h:20
+msgid "Socks Host:"
+msgstr "Socks 主��"
 
-#: ../panels/network/gnome-network-properties.ui.h:22
-msgid "_Location name:"
-msgstr "ä½?ç½®å??稱(_L):"
+#: ../panels/network/network.ui.h:21
+msgid "Speed:"
+msgstr "é??度ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:23
-msgid "_Password:"
-msgstr "�碼(_P):"
+#: ../panels/network/network.ui.h:22
+msgid "Subnet Mask:"
+msgstr "�網路�罩�"
 
-#: ../panels/network/gnome-network-properties.ui.h:24
-msgid "_Secure HTTP proxy:"
-msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨(_S):"
+#: ../panels/network/network.ui.h:23
+#: ../panels/user-accounts/um-lockbutton.c:356
+msgid "Unlock"
+msgstr "解é??"
 
-#: ../panels/network/gnome-network-properties.ui.h:25
-msgid "_Use the same proxy for all protocols"
-msgstr "æ??æ??å??å®?ç??使ç?¨ç?¸å??ç??代ç??伺æ??å?¨(_U)"
+#: ../panels/network/network.ui.h:24
+msgid "Username:"
+msgstr "使ç?¨è??å??稱ï¼?"
 
-#. Translators: those are keywords for the brightness and lock control-center panel
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-#, fuzzy
-msgid "Brightness;Lock;Dim;Blank;"
-msgstr "è?¢å¹?亮度è??é??å®?設å®?å?¼"
+#: ../panels/network/network.ui.h:25
+msgctxt "proxy method"
+msgid "Automatic"
+msgstr "è?ªå??"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
-#| msgid "Siren"
-msgid "Screen"
-msgstr "��"
+#: ../panels/network/network.ui.h:26
+msgctxt "proxy method"
+msgid "Manual"
+msgstr "æ??å??"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
-msgid "Screen brightness and lock settings"
-msgstr "è?¢å¹?亮度è??é??å®?設å®?å?¼"
+#: ../panels/network/network.ui.h:27
+msgctxt "proxy method"
+msgid "None"
+msgstr "æ²?æ??"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-#| msgid "Pointer"
 msgid "Power"
 msgstr "��"
 
@@ -1710,17 +1765,16 @@ msgstr "é?»æº?管ç??設å®?å?¼"
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
 #, fuzzy
-msgid "Power;Sleep;Suspend;Hibernate;"
-msgstr "å°?é?»è?¦æ?«å??è??ä¼?ç? "
+#| msgid "Power;Sleep;Suspend;Hibernate;"
+msgid "Power;Sleep;Suspend;Hibernate;Battery;"
+msgstr "Power;Sleep;Suspend;Hibernate;é?»æº?;ç?¡ç? ;æ?«å??;ä¼?ç? ;"
 
 #: ../panels/power/cc-power-panel.c:151
-#| msgid "Unknown"
 msgid "Unknown time"
 msgstr "æ?ªç?¥ç??æ??é??"
 
 #: ../panels/power/cc-power-panel.c:157
 #, c-format
-#| msgid "minutes"
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i å??é??"
@@ -1735,29 +1789,24 @@ msgstr[0] "%i å°?æ??"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
 #: ../panels/power/cc-power-panel.c:177
 #, c-format
-#| msgid "%d %s by %d %s"
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
 #: ../panels/power/cc-power-panel.c:178
-#| msgid "Short"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 
 #: ../panels/power/cc-power-panel.c:179
-#| msgid "minutes"
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 
 #: ../panels/power/cc-power-panel.c:251
-#| msgid "Battery warning"
 msgid "Battery charging"
 msgstr "é?»æ± æ­£å?¨å??é?»"
 
 #: ../panels/power/cc-power-panel.c:254
-#| msgid "Battery warning"
 msgid "Battery discharging"
 msgstr "�池正���"
 
@@ -1788,12 +1837,130 @@ msgstr "è·?é?¢å®?å?¨æ?¾é?»é??æ?? %s (%.0lf%%)"
 msgid "%.0lf%% charged"
 msgstr "å·²å??é?» %.0lf%%"
 
+#: ../panels/power/power.ui.h:1 ../panels/screen/screen.ui.h:1
+msgid "1 hour"
+msgstr "1 å°?æ??"
+
+#: ../panels/power/power.ui.h:2 ../panels/screen/screen.ui.h:3
+msgid "10 minutes"
+msgstr "10 å??é??"
+
+#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
+msgid "30 minutes"
+msgstr "30 å??é??"
+
+#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
+msgid "5 minutes"
+msgstr "5 å??é??"
+
+#: ../panels/power/power.ui.h:5
+msgid "AC power and inactive for:"
+msgstr "AC é?»æº?ä¸?é??ç½®ï¼?"
+
+#: ../panels/power/power.ui.h:6
+msgid "Ask me"
+msgstr "è©¢å??æ??"
+
+#: ../panels/power/power.ui.h:7
+msgid "Battery power and inactive for:"
+msgstr "é?»æ± é?»æº?ä¸?é??ç½®ï¼?"
+
+#: ../panels/power/power.ui.h:9
+msgid "Hibernate"
+msgstr "ä¼?ç? "
+
+#: ../panels/power/power.ui.h:10
+msgid "Put the computer to sleep when inactive for:"
+msgstr "å?¨é??置此æ??é??å¾?è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
+
+#: ../panels/power/power.ui.h:11
+msgid "Put the computer to sleep when on:"
+msgstr "å?¨æ­¤æ??é??è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
+
+#: ../panels/power/power.ui.h:12
+msgid "Shutdown"
+msgstr "é??æ©?"
+
+#: ../panels/power/power.ui.h:13
+msgid "Suspend"
+msgstr "æ?«å??"
+
+#: ../panels/power/power.ui.h:14
+msgid "When power is critically low:"
+msgstr "ç?¶é?»æº?ç??é?»é??極ä½?æ??ï¼?"
+
+#: ../panels/power/power.ui.h:15
+msgid "When the power button is pressed:"
+msgstr "ç?¶é?»æº?é??é??æ??é??被æ??ä¸?æ??ï¼?"
+
+#: ../panels/power/power.ui.h:16
+msgid "When the sleep button is pressed:"
+msgstr "ç?¶ç?¡ç? æ??é??被æ??ä¸?æ??ï¼?"
+
+#. Translators: those are keywords for the brightness and lock control-center panel
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
+#, fuzzy
+#| msgid "Brightness;Lock;Dim;Blank;"
+msgid "Brightness;Lock;Dim;Blank;Monitor;"
+msgstr "Brightness;Lock;Dim;Blank;亮度;é??å®?;調æ??;空ç?½;"
+
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
+msgid "Screen"
+msgstr "��"
+
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
+msgid "Screen brightness and lock settings"
+msgstr "è?¢å¹?亮度è??é??å®?設å®?å?¼"
+
+#: ../panels/screen/screen.ui.h:2
+msgid "1 minute"
+msgstr "1 å??é??"
+
+#: ../panels/screen/screen.ui.h:4
+msgid "2 minutes"
+msgstr "2 å??é??"
+
+#: ../panels/screen/screen.ui.h:5
+msgid "3 minutes"
+msgstr "3 å??é??"
+
+#: ../panels/screen/screen.ui.h:8
+msgid "Brightness"
+msgstr "亮度"
+
+#: ../panels/screen/screen.ui.h:9
+msgid "Dim screen to save power"
+msgstr "調æ??è?¢å¹?以ç¯?ç??é?»æº?"
+
+#: ../panels/screen/screen.ui.h:10
+msgid "Don't lock when at home"
+msgstr "å?¨å®¶æ??ä¸?è¦?é??å®?"
+
+#: ../panels/screen/screen.ui.h:11
+msgid "Locations..."
+msgstr "�置�"
+
+#: ../panels/screen/screen.ui.h:12 ../panels/user-accounts/um-lockbutton.c:347
+msgid "Lock"
+msgstr "é??å®?"
+
+#: ../panels/screen/screen.ui.h:13
+msgid "Lock screen after:"
+msgstr "é??å®?è?¢å¹?æ??é??ï¼?"
+
+#: ../panels/screen/screen.ui.h:14
+msgid "Screen turns off"
+msgstr "è?¢å¹?é??é??"
+
+#: ../panels/screen/screen.ui.h:15
+msgid "Turn off after:"
+msgstr "é??é??æ??é??ï¼?"
+
 #: ../panels/sound/applet-main.c:49
 msgid "Enable debugging code"
 msgstr "å??ç?¨é?¤é?¯ç¢¼"
 
 #: ../panels/sound/applet-main.c:50
-#| msgid "Open with Default Application"
 msgid "Version of this application"
 msgstr "é??å??ç¨?å¼?ç??ç??æ?¬"
 
@@ -1801,19 +1968,15 @@ msgstr "é??å??ç¨?å¼?ç??ç??æ?¬"
 msgid " â?? GNOME Volume Control Applet"
 msgstr " â?? GNOME é?³é??æ?§å?¶é?¢æ?¿ç¨?å¼?"
 
-#: ../panels/sound/gvc-applet.c:276
-#: ../panels/sound/gvc-mixer-dialog.c:1921
-#| msgid "Cloned Output"
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1923
 msgid "Output"
 msgstr "輸�"
 
 #: ../panels/sound/gvc-applet.c:278
-#| msgid "Cloned Output"
 msgid "Sound Output Volume"
 msgstr "é?³æ??輸å?ºé?³é??"
 
-#: ../panels/sound/gvc-applet.c:282
-#: ../panels/sound/gvc-mixer-dialog.c:1838
+#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1840
 msgid "Input"
 msgstr "輸�"
 
@@ -1822,13 +1985,11 @@ msgid "Microphone Volume"
 msgstr "麥å??風é?³é??"
 
 #: ../panels/sound/gvc-balance-bar.c:111
-#| msgid "Left"
 msgctxt "balance"
 msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/sound/gvc-balance-bar.c:112
-#| msgid "Right"
 msgctxt "balance"
 msgid "Right"
 msgstr "å?³"
@@ -1839,56 +2000,47 @@ msgid "Rear"
 msgstr "å¾?"
 
 #: ../panels/sound/gvc-balance-bar.c:116
-#| msgid "Fonts"
 msgctxt "balance"
 msgid "Front"
 msgstr "å??"
 
 #: ../panels/sound/gvc-balance-bar.c:119
-#| msgid "Minimize"
 msgctxt "balance"
 msgid "Minimum"
 msgstr "æ??å°?å?¼"
 
 #: ../panels/sound/gvc-balance-bar.c:120
-#| msgid "Maximize"
 msgctxt "balance"
 msgid "Maximum"
 msgstr "æ??大å?¼"
 
-#: ../panels/sound/gvc-balance-bar.c:296
+#: ../panels/sound/gvc-balance-bar.c:295
 msgid "_Balance:"
 msgstr "平衡(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:299
-#| msgid "_Name:"
+#: ../panels/sound/gvc-balance-bar.c:298
 msgid "_Fade:"
 msgstr "æ·¡å??(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:302
+#: ../panels/sound/gvc-balance-bar.c:301
 msgid "_Subwoofer:"
 msgstr "é??ä½?é?³(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:603
-#: ../panels/sound/gvc-channel-bar.c:612
-#| msgid "100%"
+#: ../panels/sound/gvc-channel-bar.c:602 ../panels/sound/gvc-channel-bar.c:611
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:607
+#: ../panels/sound/gvc-channel-bar.c:606
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "���大"
 
-#: ../panels/sound/gvc-channel-bar.c:901
-#| msgid "Mutt"
+#: ../panels/sound/gvc-channel-bar.c:900
 msgid "Mute"
 msgstr "é??é?³"
 
-#: ../panels/sound/gvc-combo-box.c:167
-#: ../panels/sound/gvc-mixer-dialog.c:1629
-#| msgid "_Mobile:"
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1631
 msgid "_Profile:"
 msgstr "設å®?çµ?å??(_P):"
 
@@ -1896,7 +2048,6 @@ msgstr "設å®?çµ?å??(_P):"
 #. * The number of sound outputs on a particular device
 #: ../panels/sound/gvc-mixer-control.c:1098
 #, c-format
-#| msgid "Cloned Output"
 msgid "%u Output"
 msgid_plural "%u Outputs"
 msgstr[0] "%u 輸�"
@@ -1910,13 +2061,11 @@ msgid_plural "%u Inputs"
 msgstr[0] "%u 輸�"
 
 #: ../panels/sound/gvc-mixer-control.c:1406
-#| msgid "System Settings"
 msgid "System Sounds"
 msgstr "系統é?³æ??"
 
 #: ../panels/sound/gvc-mixer-dialog.c:317
 #: ../panels/sound/gvc-mixer-dialog.c:618
-#| msgid "Co_untry:"
 msgid "Co_nnector:"
 msgstr "���(_N):"
 
@@ -1924,79 +2073,71 @@ msgstr "���(_N):"
 msgid "Peak detect"
 msgstr "峰�檢測"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1506
-#: ../panels/sound/gvc-mixer-dialog.c:1717
+#: ../panels/sound/gvc-mixer-dialog.c:1507
+#: ../panels/sound/gvc-mixer-dialog.c:1719
 #: ../panels/sound/gvc-sound-theme-chooser.c:599
-#| msgid "Name:"
 msgid "Name"
 msgstr "å??稱"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1524
-#| msgid "Devices"
+#: ../panels/sound/gvc-mixer-dialog.c:1525
 msgid "Device"
 msgstr "�置"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1572
+#: ../panels/sound/gvc-mixer-dialog.c:1573
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s ç??å??å?­æ¸¬è©¦"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1630
-#| msgid "Test flash"
+#: ../panels/sound/gvc-mixer-dialog.c:1632
 msgid "Test Speakers"
 msgstr "測試å??å?­"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: ../panels/sound/gvc-mixer-dialog.c:1763
 msgid "_Output volume: "
 msgstr "輸å?ºé?³é??(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1775
-#| msgid "Sound files"
+#: ../panels/sound/gvc-mixer-dialog.c:1777
 msgid "Sound Effects"
 msgstr "è?²é?³æ??æ??"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1782
-#| msgid "Alert sound"
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "_Alert volume: "
 msgstr "警示é?³é??(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1795
+#: ../panels/sound/gvc-mixer-dialog.c:1797
 msgid "Hardware"
 msgstr "硬�"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1800
+#: ../panels/sound/gvc-mixer-dialog.c:1802
 msgid "C_hoose a device to configure:"
 msgstr "é?¸æ??è¦?設å®?ç??è£?ç½®(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1827
-#: ../panels/sound/gvc-mixer-dialog.c:1950
+#: ../panels/sound/gvc-mixer-dialog.c:1829
+#: ../panels/sound/gvc-mixer-dialog.c:1952
 msgid "Settings for the selected device:"
 msgstr "å·²é?¸å??è£?ç½®ç??設å®?å?¼ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1845
-#| msgid "_Input boxes:"
+#: ../panels/sound/gvc-mixer-dialog.c:1847
 msgid "_Input volume: "
 msgstr "輸å?¥é?³é??(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1868
-#| msgid "_Input boxes:"
+#: ../panels/sound/gvc-mixer-dialog.c:1870
 msgid "Input level:"
 msgstr "輸����"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1894
+#: ../panels/sound/gvc-mixer-dialog.c:1896
 msgid "C_hoose a device for sound input:"
 msgstr "é?¸æ??è?²é?³è¼¸å?¥ç??è£?ç½®(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1926
+#: ../panels/sound/gvc-mixer-dialog.c:1928
 msgid "C_hoose a device for sound output:"
 msgstr "é?¸æ??è?²é?³è¼¸å?ºç??è£?ç½®(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1961
-#| msgid "_Application font:"
+#: ../panels/sound/gvc-mixer-dialog.c:1963
 msgid "Applications"
 msgstr "ç¨?å¼?é??"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1965
+#: ../panels/sound/gvc-mixer-dialog.c:1967
 msgid "No application is currently playing or recording audio."
 msgstr "æ²?æ??æ??ç?¨ç¨?å¼?ç?®å??æ­£å?¨æ?­æ?¾æ??é??製é?³æ??ã??"
 
@@ -2006,7 +2147,6 @@ msgstr "å??æ­¢"
 
 #: ../panels/sound/gvc-speaker-test.c:221
 #: ../panels/sound/gvc-speaker-test.c:333
-#| msgid "Test:"
 msgid "Test"
 msgstr "測試"
 
@@ -2014,24 +2154,20 @@ msgstr "測試"
 msgid "Subwoofer"
 msgstr "é??ä½?é?³"
 
-#: ../panels/sound/gvc-stream-status-icon.c:233
+#: ../panels/sound/gvc-stream-status-icon.c:236
 #, c-format
-#| msgid "Sound Preferences"
 msgid "Failed to start Sound Preferences: %s"
 msgstr "å??å??é?³æ??å??好設å®?失æ??ï¼?%s"
 
-#: ../panels/sound/gvc-stream-status-icon.c:256
-#| msgid "Mutt"
+#: ../panels/sound/gvc-stream-status-icon.c:262
 msgid "_Mute"
 msgstr "é??é?³(_M)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:265
-#| msgid "Sound Preferences"
+#: ../panels/sound/gvc-stream-status-icon.c:271
 msgid "_Sound Preferences"
 msgstr "é?³æ??å??好設å®?(_S)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:449
-#| msgid "Multimedia"
+#: ../panels/sound/gvc-stream-status-icon.c:455
 msgid "Muted"
 msgstr "å·²é??é?³"
 
@@ -2052,21 +2188,22 @@ msgid "Testing event sound"
 msgstr "測試�件��"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:590
-#| msgid "Icon theme"
 msgid "From theme"
 msgstr "�主�"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:778
-#| msgid "Play _alert sound"
 msgid "C_hoose an alert sound:"
 msgstr "é?¸æ??警示é?³æ??(_H):"
 
+#: ../panels/sound/sound-theme-file-utils.c:292
+msgid "Custom"
+msgstr "��"
+
 #: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
 msgid "Show desktop volume control"
 msgstr "顯示æ¡?é?¢é?³é??æ?§å?¶"
 
 #: ../panels/sound/data/gnome-sound-applet.desktop.in.h:2
-#| msgid "Unknown Volume Control %d"
 msgid "Volume Control"
 msgstr "é?³é??æ?§å?¶"
 
@@ -2074,16 +2211,20 @@ msgstr "é?³é??æ?§å?¶"
 #: ../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;é?³æ??å?¡;麥å??風;é?³é??;æ·¡"
+"å??;平衡;è??ç??;è?³æ©?;"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:3
-#| msgid "Enable sound and associate sounds with events"
 msgid "Change sound volume and sound events"
 msgstr "æ?¹è®?é?³æ??ç??é?³é??å??é?³æ??äº?件"
 
+#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
+msgid "Sound"
+msgstr "é?³æ??"
+
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
 #: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
-#| msgid "Callback"
 msgid "Bark"
 msgstr "汪汪"
 
@@ -2102,16 +2243,13 @@ msgstr "æ?²ç?»ç??"
 #. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
 #. You might want to translate it into the equivalent words of your language.
 #: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:12
-#| msgid "Sound"
 msgid "Sonar"
 msgstr "��"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-#, fuzzy
-#| msgid "_Keyboard Accessibility"
 msgid "Keyboard;Mouse;a11y;Accessibility;"
-msgstr "- GNOME æ»?é¼ ç?¡é??ç¤?å??è?½ä¼ºæ??ç¨?å¼?"
+msgstr "Keyboard;Mouse;a11y;Accessibility;é?µç?¤;æ»?é¼ ;ç?¡é??ç¤?;"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Universal Access"
@@ -2181,8 +2319,8 @@ msgid "Caribou"
 msgstr "Caribou"
 
 #: ../panels/universal-access/uap.ui.h:18
-msgid "Change constrast:"
-msgstr "�����"
+msgid "Change contrast:"
+msgstr "����度�"
 
 #: ../panels/universal-access/uap.ui.h:19
 msgid "Closed Captioning"
@@ -2193,7 +2331,6 @@ msgid "Contrast:"
 msgstr "���"
 
 #: ../panels/universal-access/uap.ui.h:21
-#| msgid "Control the pointer using the keypad."
 msgid "Control the pointer using the keypad"
 msgstr "使ç?¨é?µç?¤æ?§å?¶æ»?é¼ æ??æ¨?"
 
@@ -2221,6 +2358,14 @@ msgstr "Ctrl+Alt+8"
 msgid "Ctrl+Alt+="
 msgstr "Ctrl+Alt+="
 
+#: ../panels/universal-access/uap.ui.h:29
+msgid "D_elay:"
+msgstr "延�(_E):"
+
+#: ../panels/universal-access/uap.ui.h:30
+msgid "Dasher"
+msgstr "Dasher"
+
 #: ../panels/universal-access/uap.ui.h:31
 msgid "Decrease size:"
 msgstr "æ¸?å°?å­?å??大å°?ï¼?"
@@ -2234,7 +2379,6 @@ msgid "Display"
 msgstr "顯示"
 
 #: ../panels/universal-access/uap.ui.h:34
-#| msgid "Display a textual description of speech and sounds."
 msgid "Display a textual description of speech and sounds"
 msgstr "顯示èª?é?³å??é?³æ??ç??æ??å­?æ??è¿°"
 
@@ -2290,6 +2434,10 @@ msgstr "�大"
 msgid "LowContrast"
 msgstr "ä½?å??å·®"
 
+#: ../panels/universal-access/uap.ui.h:54
+msgid "Mouse Keys"
+msgstr "�鼠���"
+
 #: ../panels/universal-access/uap.ui.h:55
 msgid "Mouse Settings..."
 msgstr "�鼠設���"
@@ -2302,6 +2450,14 @@ msgstr "Nomon"
 msgid "None"
 msgstr "æ²?æ??"
 
+#: ../panels/universal-access/uap.ui.h:59
+msgid "Off"
+msgstr "é??é??"
+
+#: ../panels/universal-access/uap.ui.h:60
+msgid "On"
+msgstr "é??"
+
 #: ../panels/universal-access/uap.ui.h:61
 msgid "On screen keyboard"
 msgstr "����"
@@ -2319,7 +2475,6 @@ msgid "Pointing and Clicking"
 msgstr "æ??æ¨?å??é»?æ??"
 
 #: ../panels/universal-access/uap.ui.h:65
-#| msgid "Puts a delay between when a key is pressed and when it is accepted."
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "å?¨æ??é?µè¢«æ??ä¸?å?°å®?被æ?¥å??ä¹?é??ç½®å?¥å»¶é?²"
 
@@ -2340,182 +2495,162 @@ msgid "Shift+Ctrl+Alt+="
 msgstr "Shift+Ctrl+Alt+="
 
 #: ../panels/universal-access/uap.ui.h:72
-msgid "Show Universal Access status"
-msgstr "顯示ç?¡é??ç¤?å??è?½ç??æ??"
+msgid "Simulated Secondary Click"
+msgstr "模æ?¬æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Slow Keys"
 msgstr "é?²ç·©æ??é?µ"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Sound Settings..."
 msgstr "é?³æ??設å®?å?¼â?¦"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Sticky Keys"
 msgstr "�����"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:78
 msgid "Test flash"
 msgstr "測試é??å??"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Text size:"
 msgstr "æ??å­?大å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:81
-#| msgid "Treats a sequence of modifier keys as a key combination."
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "å°?é?£çº?æ??ç??ç?¹æ®?é?µè¦?ç?ºæ??é?µçµ?å??"
 
-#: ../panels/universal-access/uap.ui.h:82
-#| msgid "Trigger a click when the pointer hovers."
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Trigger a click when the pointer hovers"
 msgstr "ç?¶å??止游æ¨?移å??æ??觸ç?¼é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:83
-#| msgid "Trigger a secondary click by holding down the primary button."
+#: ../panels/universal-access/uap.ui.h:82
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æ??ä½?主è¦?é?µæ??觸ç?¼æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:84
-#| msgid "Beep when _accessibility features are turned on or off"
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Turn on accessibility features from the keyboard"
 msgstr "以é?µç?¤é??å??ç?¡é??ç¤?å??è?½"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Turn on or off:"
 msgstr "é??å??æ??é??é??ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Type here to test settings"
 msgstr "å?¨é??裡æ??å­?以測試設å®?å?¼"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:86
 msgid "Typing"
 msgstr "輸�"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:87
 msgid "Typing Assistant"
 msgstr "輸å?¥å?©ç??"
 
-#: ../panels/universal-access/uap.ui.h:89
-#| msgid "Use a visual indication when an alert sound occurs."
+#: ../panels/universal-access/uap.ui.h:88
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "ç?¶è­¦ç¤ºé?³æ??ç?¼å?ºæ??使ç?¨è¦?覺å??ç??æ??示"
 
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:89
 msgid "Use an alternative form of text input"
 msgstr "使ç?¨æ??å­?輸å?¥ç??æ?¿ä»£å½¢å¼?"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:90
 msgid "Video Mouse"
 msgstr "���鼠"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:91
 msgid "Visual Alerts"
 msgstr "�覺警示"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:93
 msgid "Zoom in:"
 msgstr "æ??è¿?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:94
 msgid "Zoom out:"
 msgstr "æ??é? ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:97
+#: ../panels/universal-access/uap.ui.h:95
+msgid "_Motion threshold:"
+msgstr "移å??é??度(_M):"
+
+#: ../panels/universal-access/uap.ui.h:96
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:98
+#: ../panels/universal-access/uap.ui.h:97
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:99
+#: ../panels/universal-access/uap.ui.h:98
 msgid "rejected"
 msgstr "å·²æ??çµ?"
 
-#: ../panels/user-accounts/gdm-languages.c:613
-msgid "Unspecified"
-msgstr "æ?ªæ??å®?"
-
 #: ../panels/user-accounts/run-passwd.c:426
-#| msgid "Authenticated!"
 msgid "Authentication failed"
 msgstr "é©?è­?失æ??"
 
 #: ../panels/user-accounts/run-passwd.c:506
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:375
 #, c-format
-#| msgid "The password is too short."
 msgid "The new password is too short"
 msgstr "æ?°ç??å¯?碼太ç?­"
 
 #: ../panels/user-accounts/run-passwd.c:512
 #, c-format
-#| msgid "The password is too simple."
 msgid "The new password is too simple"
 msgstr "æ?°ç??å¯?碼太簡å?®"
 
 #: ../panels/user-accounts/run-passwd.c:518
 #, c-format
-#| msgid "The old and new passwords are too similar."
 msgid "The old and new passwords are too similar"
 msgstr "è??å¯?碼è??æ?°å¯?碼太ç?¸ä¼¼äº?"
 
 #: ../panels/user-accounts/run-passwd.c:521
 #, c-format
-#| msgid "The two passwords are not equal."
 msgid "The new password has already been used recently."
 msgstr "æ?°ç??å¯?碼已ç¶?å?¨æ??è¿?使ç?¨é??äº?ã??"
 
 #: ../panels/user-accounts/run-passwd.c:524
 #, c-format
-#| msgid "The new password must contain numeric or special character(s)."
 msgid "The new password must contain numeric or special characters"
 msgstr "æ?°ç??å¯?碼å¿?é ?å??å?«æ?¸å­?æ??ç?¹æ®?å­?å??"
 
 #: ../panels/user-accounts/run-passwd.c:528
 #, c-format
-#| msgid "The old and new passwords are the same."
 msgid "The old and new passwords are the same"
 msgstr "è??å¯?碼è??æ?°å¯?碼æ?¯ç?¸å??ç??"
 
 #: ../panels/user-accounts/run-passwd.c:532
 #, c-format
-#| msgid ""
-#| "Your password has been changed since you initially authenticated! Please "
-#| "re-authenticate."
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "æ?¨ç??å¯?碼å?¨ç¬¬ä¸?次é©?è­?å¾?å·²ç¶?æ?¹è®?é??äº?ï¼?"
 
 #: ../panels/user-accounts/run-passwd.c:536
 #, c-format
-#| msgid "The new password must contain numeric or special character(s)."
 msgid "The new password does not contain enough different characters"
 msgstr "æ?°ç??å¯?碼並æ?ªå??å?«è¶³å¤ ç??ä¸?å??å­?å??"
 
 #: ../panels/user-accounts/run-passwd.c:540
 #, c-format
-#| msgid "Unknown"
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 #: ../panels/user-accounts/um-account-dialog.c:78
-#| msgid "Failed to create temporary directory"
 msgid "Failed to create user"
 msgstr "建ç«?使ç?¨è??失æ??"
 
 #: ../panels/user-accounts/um-account-dialog.c:185
 #, c-format
-#| msgid "A bookmark for URI '%s' already exists"
 msgid "A user with the username '%s' already exists"
 msgstr "以使ç?¨è??å??稱ã??%sã??ç?ºå??ç??使ç?¨è??å·²ç¶?å­?å?¨"
 
 #: ../panels/user-accounts/um-account-dialog.c:189
 #, c-format
-#| msgid "The password is too short."
 msgid "The username is too long"
 msgstr "使ç?¨è??å??稱太é?·äº?"
 
@@ -2537,29 +2672,28 @@ msgstr ""
 
 #: ../panels/user-accounts/um-account-type.c:35
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-#| msgid "Standard XTerminal"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgctxt "Account type"
 msgid "Standard"
 msgstr "��"
 
 #: ../panels/user-accounts/um-account-type.c:37
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-#| msgid "Terminator"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "管ç??å?¡"
 
 #: ../panels/user-accounts/um-account-type.c:39
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgctxt "Account type"
 msgid "Supervised"
-msgstr ""
+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
@@ -2567,13 +2701,11 @@ msgid "The device is already in use."
 msgstr "該è£?置已ç¶?å?¨ä½¿ç?¨ä¸­ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:111
-#| msgid "An internal error occured"
 msgid "An internal error occurred."
 msgstr "ç?¼ç??å?§é?¨ç??é?¯èª¤ã??"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:181
 #: ../panels/user-accounts/um-fingerprint-dialog.c:182
-#| msgid "Disabled"
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
@@ -2586,7 +2718,9 @@ 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
@@ -2599,7 +2733,6 @@ msgstr "å®?æ??ï¼?"
 #: ../panels/user-accounts/um-fingerprint-dialog.c:409
 #: ../panels/user-accounts/um-fingerprint-dialog.c:431
 #, c-format
-#| msgid "Could not start finger capture on '%s' device"
 msgid "Could not access '%s' device"
 msgstr "ç?¡æ³?å­?å??ã??%sã??è£?ç½®"
 
@@ -2611,15 +2744,15 @@ msgstr "ç?¡æ³?å­?å??ã??%sã??è£?ç½®"
 msgid "Could not start finger capture on '%s' device"
 msgstr "ç?¡æ³?使ç?¨ã??%sã??è£?ç½®ä¸?ç??æ??ç´?æ??æ??"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:550
+#: ../panels/user-accounts/um-fingerprint-dialog.c:549
 msgid "Could not access any fingerprint readers"
 msgstr "ç?¡æ³?å­?å??ä»»ä½?æ??ç´?辨è­?å?¨"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:551
+#: ../panels/user-accounts/um-fingerprint-dialog.c:550
 msgid "Please contact your system administrator for help."
 msgstr "è«?é?£çµ¡æ?¨ç??系統管ç??å?¡ä¾?幫å¿?ã??"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:588
+#: ../panels/user-accounts/um-fingerprint-dialog.c:587
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Enable Fingerprint Login"
 msgstr "å??ç?¨æ??ç´?ç?»å?¥"
@@ -2628,35 +2761,32 @@ msgstr "å??ç?¨æ??ç´?ç?»å?¥"
 #. * The variable is the name of the device, for example:
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
-#: ../panels/user-accounts/um-fingerprint-dialog.c:625
+#.
+#: ../panels/user-accounts/um-fingerprint-dialog.c: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:633
+#: ../panels/user-accounts/um-fingerprint-dialog.c:629
 #, c-format
 msgid ""
 "Enrolling fingerprints for\n"
 "<b><big>%s</big></b>"
 msgstr ""
+"ç?»è¨?æ??ç´?ï¼?\n"
+"<b><big>%s</big></b>"
 
-#: ../panels/user-accounts/um-language-dialog.c:328
+#: ../panels/user-accounts/um-language-dialog.c:180
 msgid "Other..."
-msgstr "��..."
+msgstr "���"
 
-#: ../panels/user-accounts/um-lockbutton.c:355
-msgid "Lock"
-msgstr "é??å®?"
-
-#: ../panels/user-accounts/um-lockbutton.c:364
-msgid "Unlock"
-msgstr "解é??"
-
-#: ../panels/user-accounts/um-lockbutton.c:373
+#: ../panels/user-accounts/um-lockbutton.c:365
 msgid "Locked"
 msgstr "å·²é??å®?"
 
-#: ../panels/user-accounts/um-lockbutton.c:382
+#: ../panels/user-accounts/um-lockbutton.c:374
 msgid ""
 "Dialog is unlocked.\n"
 "Click to prevent further changes"
@@ -2664,7 +2794,7 @@ msgstr ""
 "å°?話ç??已解é??ã??\n"
 "é»?é?¸ä»¥é?²æ­¢é?²ä¸?æ­¥ç??è®?æ?´"
 
-#: ../panels/user-accounts/um-lockbutton.c:391
+#: ../panels/user-accounts/um-lockbutton.c:383
 msgid ""
 "Dialog is locked.\n"
 "Click to make changes"
@@ -2672,8 +2802,7 @@ msgstr ""
 "å°?話ç??å·²é??å®?ã??\n"
 "������"
 
-#: ../panels/user-accounts/um-lockbutton.c:400
-#| msgid "Please contact your system administrator for help."
+#: ../panels/user-accounts/um-lockbutton.c:392
 msgid ""
 "System policy prevents changes.\n"
 "Contact your system administrator"
@@ -2681,92 +2810,83 @@ msgstr ""
 "系統å??å??æ?¯é?²æ­¢é?²è¡?è®?æ?´ç??ã??\n"
 "è«?é?£çµ¡æ?¨ç??系統管ç??å?¡"
 
-#: ../panels/user-accounts/um-password-dialog.c:185
+#: ../panels/user-accounts/um-password-dialog.c:179
 msgid "More choices..."
 msgstr "æ?´å¤?é?¸æ??..."
 
-#: ../panels/user-accounts/um-password-dialog.c:291
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "Please choose another password."
 msgstr "è«?é?¸æ??å?¶ä»?å¯?碼ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:300
-#| msgid "Please type your password in the <b>New password</b> field."
+#: ../panels/user-accounts/um-password-dialog.c:294
 msgid "Please type your current password again."
 msgstr "è«?å??次輸å?¥æ?¨ç?®å??ç??å¯?碼ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:306
-#| msgid "Your password has been changed."
+#: ../panels/user-accounts/um-password-dialog.c:300
 msgid "Password could not be changed"
 msgstr "�碼����"
 
-#: ../panels/user-accounts/um-password-dialog.c:378
-#| msgid "_Retype new password:"
+#: ../panels/user-accounts/um-password-dialog.c:372
 msgid "You need to enter a new password"
 msgstr "æ?¨é??è¦?輸å?¥æ?°ç??å¯?碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:387
+#: ../panels/user-accounts/um-password-dialog.c:381
 msgid "You need to confirm the password"
 msgstr "æ?¨é??è¦?確èª?å¯?碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:390
-#| msgid "The password is too short."
+#: ../panels/user-accounts/um-password-dialog.c:384
 msgid "The passwords do not match"
 msgstr "�碼��符"
 
-#: ../panels/user-accounts/um-password-dialog.c:396
+#: ../panels/user-accounts/um-password-dialog.c:390
 msgid "You need to enter your current password"
 msgstr "æ?¨é??è¦?輸å?¥æ?¨ç?®å??ç??å¯?碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:399
-#| msgid "That password was incorrect."
+#: ../panels/user-accounts/um-password-dialog.c:393
 msgid "The current password is not correct"
 msgstr "ç?®å??ç??å¯?碼並ä¸?正確"
 
-#: ../panels/user-accounts/um-password-dialog.c:472
-#: ../panels/user-accounts/um-password-dialog.c:689
+#: ../panels/user-accounts/um-password-dialog.c:466
+#: ../panels/user-accounts/um-password-dialog.c:683
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "太�"
 
-#: ../panels/user-accounts/um-password-dialog.c:475
-#: ../panels/user-accounts/um-password-dialog.c:690
+#: ../panels/user-accounts/um-password-dialog.c:469
+#: ../panels/user-accounts/um-password-dialog.c:684
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: ../panels/user-accounts/um-password-dialog.c:477
-#: ../panels/user-accounts/um-password-dialog.c:691
-#| msgid "Filter"
+#: ../panels/user-accounts/um-password-dialog.c:471
+#: ../panels/user-accounts/um-password-dialog.c:685
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "��"
 
-#: ../panels/user-accounts/um-password-dialog.c:479
-#: ../panels/user-accounts/um-password-dialog.c:692
+#: ../panels/user-accounts/um-password-dialog.c:473
+#: ../panels/user-accounts/um-password-dialog.c:686
 msgctxt "Password strength"
 msgid "Good"
 msgstr "�好"
 
-#: ../panels/user-accounts/um-password-dialog.c:481
-#: ../panels/user-accounts/um-password-dialog.c:693
-#| msgid "Scrolling"
+#: ../panels/user-accounts/um-password-dialog.c:475
+#: ../panels/user-accounts/um-password-dialog.c:687
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "å¼·å?º"
 
-#: ../panels/user-accounts/um-password-dialog.c:520
+#: ../panels/user-accounts/um-password-dialog.c:514
 msgid "Passwords do not match"
 msgstr "�碼��符"
 
-#: ../panels/user-accounts/um-password-dialog.c:546
-#| msgid "Change password"
+#: ../panels/user-accounts/um-password-dialog.c:540
 msgid "Wrong password"
 msgstr "é?¯èª¤ç??å¯?碼"
 
 #: ../panels/user-accounts/um-photo-dialog.c:97
 #: ../panels/user-accounts/data/language-chooser.ui.h:2
 #: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#| msgid "_Select"
 msgid "Select"
 msgstr "é?¸æ??"
 
@@ -2776,7 +2896,6 @@ msgid "Browse for more pictures"
 msgstr "ç??覽æ?´å¤?ç?§ç??"
 
 #: ../panels/user-accounts/um-photo-dialog.c:429
-#| msgid "Disabled"
 msgid "Disable image"
 msgstr "å??ç?¨å??ç??"
 
@@ -2788,90 +2907,86 @@ msgstr "��張�..."
 msgid "Browse for more pictures..."
 msgstr "ç??覽æ?´å¤?ç?§ç??..."
 
-#: ../panels/user-accounts/um-photo-dialog.c:693
+#: ../panels/user-accounts/um-photo-dialog.c:690
 #, c-format
 msgid "Used by %s"
 msgstr "� %s 使�"
 
 #: ../panels/user-accounts/um-user-manager.c:430
 #, c-format
-#| msgid "A bookmark for URI '%s' already exists"
 msgid "A user with name '%s' already exists."
 msgstr "以ã??%sã??ç?ºå??ç??使ç?¨è??å·²ç¶?å­?å?¨ã??"
 
 #: ../panels/user-accounts/um-user-manager.c:525
-#| msgid "The sound file for this event does not exist."
 msgid "This user does not exist."
 msgstr "é??å??使ç?¨è??ä¸?å­?å?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:349
+#: ../panels/user-accounts/um-user-panel.c:359
 msgid "Failed to delete user"
 msgstr "å?ªé?¤ä½¿ç?¨è??失æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:409
+#: ../panels/user-accounts/um-user-panel.c:419
 msgid "You cannot delete your own account."
 msgstr "æ?¨ä¸?è?½å?ªé?¤è?ªå·±ç??帳è??ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:418
+#: ../panels/user-accounts/um-user-panel.c:428
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s ����中"
 
-#: ../panels/user-accounts/um-user-panel.c:422
-msgid "Deleting a user while they are logged in can leave the system in an inconsistent state."
+#: ../panels/user-accounts/um-user-panel.c:432
+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:431
+#: ../panels/user-accounts/um-user-panel.c:441
 #, c-format
-#| msgid "Do you want to keep this resolution?"
 msgid "Do you want to keep %s's files?"
 msgstr "æ?¨æ?³è¦?ä¿?ç?? %s ç??æª?æ¡?å??ï¼?"
 
-#: ../panels/user-accounts/um-user-panel.c:435
-msgid "It is possible to keep the home directory, mail spool and temporary files around when deleting a user account."
+#: ../panels/user-accounts/um-user-panel.c:445
+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:438
-#| msgid "_Delete Fingerprints"
+#: ../panels/user-accounts/um-user-panel.c:448
 msgid "_Delete Files"
 msgstr "����(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:439
-#| msgid "New File"
+#: ../panels/user-accounts/um-user-panel.c:449
 msgid "_Keep Files"
 msgstr "ä¿?ç??æª?æ¡?(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:440
+#: ../panels/user-accounts/um-user-panel.c:450
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:464
+#: ../panels/user-accounts/um-user-panel.c:474
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳è??å·²å??ç?¨"
 
-#: ../panels/user-accounts/um-user-panel.c:473
+#: ../panels/user-accounts/um-user-panel.c:483
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "å?¨ä¸?次ç?»å?¥æ??設å®?"
 
-#: ../panels/user-accounts/um-user-panel.c:476
-#| msgid "None"
+#: ../panels/user-accounts/um-user-panel.c:486
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../panels/user-accounts/um-user-panel.c:818
-#| msgid "Failed to construct test pipeline for '%s'"
+#: ../panels/user-accounts/um-user-panel.c:808
 msgid "Failed to contact the accounts service"
 msgstr "ç?¡æ³?é?£æ?¥å¸³è??æ??å??"
 
-#: ../panels/user-accounts/um-user-panel.c:820
-#| msgid "Please make sure that the applet is properly installed"
+#: ../panels/user-accounts/um-user-panel.c:810
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "è«?確å®? AccountService å·²ç¶?å®?è£?並å??ç?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:853
+#: ../panels/user-accounts/um-user-panel.c:843
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -2879,14 +2994,12 @@ msgstr ""
 "������\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:891
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
-#| msgid "C_reate"
+#: ../panels/user-accounts/um-user-panel.c:881
 msgid "Create a user"
 msgstr "建ç«?æ?°ç??使ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:902
-#: ../panels/user-accounts/um-user-panel.c:1178
+#: ../panels/user-accounts/um-user-panel.c:892
+#: ../panels/user-accounts/um-user-panel.c:1191
 msgid ""
 "To create a user,\n"
 "click the * icon first"
@@ -2894,13 +3007,12 @@ msgstr ""
 "è¦?建ç«?使ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:911
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+#: ../panels/user-accounts/um-user-panel.c:901
 msgid "Delete the selected user"
 msgstr "å?ªé?¤é?¸å??ç??使ç?¨è??"
 
-#: ../panels/user-accounts/um-user-panel.c:923
-#: ../panels/user-accounts/um-user-panel.c:1183
+#: ../panels/user-accounts/um-user-panel.c:913
+#: ../panels/user-accounts/um-user-panel.c:1196
 msgid ""
 "To delete the selected user,\n"
 "click the * icon first"
@@ -2908,12 +3020,11 @@ msgstr ""
 "è¦?å?ªé?¤é?¸å??ç??使ç?¨è??ï¼?\n"
 "è«?å??é»?é?¸ * å??示"
 
-#: ../panels/user-accounts/um-user-panel.c:1087
-#| msgid "By _country"
+#: ../panels/user-accounts/um-user-panel.c:1091
 msgid "My Account"
 msgstr "æ??ç??帳è??"
 
-#: ../panels/user-accounts/um-user-panel.c:1096
+#: ../panels/user-accounts/um-user-panel.c:1101
 msgid "Other Accounts"
 msgstr "å?¶ä»?帳è??"
 
@@ -2925,34 +3036,30 @@ msgstr "å? å?¥æ??移é?¤ä½¿ç?¨è??"
 #: ../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;ç?»å?¥;å§?å??;æ??ç´?;大頭貼;æ¨?èª?;"
+"è??;å¯?碼;"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
-#| msgid "seconds"
 msgid "User Accounts"
 msgstr "使ç?¨è??帳è??"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:4
-#| msgid "C_reate"
 msgid "Cr_eate"
 msgstr "建�(_E)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-#| msgid "Create New Location"
 msgid "Create new account"
 msgstr "建ç«?æ?°ç??帳è??"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
-#| msgid "_Country:"
 msgid "_Account Type:"
 msgstr "帳è??é¡?å??(_A):"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#| msgid "Full Name"
 msgid "_Full name:"
 msgstr "å?¨å??(_F):"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
-#| msgid "U_sername:"
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -2962,30 +3069,35 @@ msgid "Cancel"
 msgstr "å??æ¶?"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
-msgid "<a href=\"http://wolfram.org/writing/howto/password.html\";>How to choose a 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 "_New password:"
 msgid "C_onfirm password:"
 msgstr "確��碼(_O):"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:4
-#| msgid "Change set"
 msgid "Ch_ange"
 msgstr "��(_A)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:5
-#| msgid "Change password"
 msgid "Changing password for:"
 msgstr "æ­£å?¨æ?¹è®?使ç?¨è??å¯?碼ï¼?"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-#| msgid "Change password"
 msgid "Choose a generated password"
 msgstr "é?¸æ??ç?¢ç??ç??å¯?碼"
 
@@ -3006,7 +3118,6 @@ msgid "Enable this account"
 msgstr "å??ç?¨é??å??帳è??"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:11
-#| msgid "Filter"
 msgid "Fair"
 msgstr "��"
 
@@ -3015,17 +3126,14 @@ msgid "Log in without a password"
 msgstr "�使��碼��"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:13
-#| msgid "_New password:"
 msgid "Set a password now"
 msgstr "��設��碼"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:14
-#| msgid "Action"
 msgid "_Action:"
 msgstr "å??ä½?(_A):"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:15
-#| msgid "_Print"
 msgid "_Hint:"
 msgstr "æ??示(_H):"
 
@@ -3034,12 +3142,10 @@ msgid "_New password:"
 msgstr "��碼(_N):"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:17
-#| msgid "_New password:"
 msgid "_Show password"
 msgstr "顯示�碼(_S)"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:1
-#| msgid "Web Browser"
 msgid "Browse"
 msgstr "ç??覽"
 
@@ -3048,11 +3154,11 @@ 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
-#| msgid "Galeon"
 msgid "Gallery"
 msgstr "è??å»?"
 
@@ -3061,92 +3167,45 @@ msgid "Photograph"
 msgstr "ç?¸ç??"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:9
-#| msgid "Take a break!"
 msgid "Take a photograph"
 msgstr "ç?§ä¸?å¼µç?¸ç??"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-msgid ""
-"A guest account will allow anyone to temporarily log in to this computer without a password.  For security, remote logins to this account are not allowed.\n"
-"\n"
-"<b>When the guest user logs out, all files and data associated with the account will be deleted.</b>"
-msgstr ""
-"訪客帳è??æ??å??許任ä½?人å?¯ä»¥ä¸?ç?¨å¯?碼就æ?«æ??ç?»å?¥é??è?ºé?»è?¦ã??å? ç?ºå®?å?¨æ?§ç??ç??ç?±ï¼?é??å??帳è??æ?¯ä¸?å??許é? ç«¯ç?»å?¥ç??ã??\n"
-"\n"
-"<b>ç?¶è¨ªå®¢ä½¿ç?¨è??ç?»å?ºå¾?ï¼?æ??æ??è??é??å??帳è??ç?¸é??ç??æª?æ¡?å??è³?æ??é?½æ??被å?ªé?¤ã??</b>"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Account type:"
 msgstr "帳è??é¡?å??ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
-#| msgid "About %s"
-msgid "Accounts"
-msgstr "帳è??"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-msgid "Address Book Card:"
-msgstr "é??è¨?é??å??ç??ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "Allow guests to log in to this computer"
-msgstr "å??許訪客ç?»å?¥é??è?ºé?»è?¦"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Automatic Login:"
 msgstr "è?ªå??ç?»å?¥ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:15
-msgid "E-mail address:"
-msgstr "é?»å­?é?µä»¶ä½?å??ï¼?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:16
-#| msgid "Enable Fingerprint Login"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "Fingerprint Login:"
 msgstr "æ??ç´?ç?»å?¥ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:17
-#| msgid "_Language:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "Language:"
 msgstr "���"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:19
-#| msgid "Layout _Options..."
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "Login Options"
 msgstr "����"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:20
-#| msgid "_Open"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "Open"
 msgstr "é??å??"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:21
-#| msgid "_Password:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Password:"
 msgstr "�碼� "
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:22
-#| msgid "Description:"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Restrictions:"
 msgstr "é??å?¶ï¼?"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:23
-msgid "Show Shutdown, Suspend and Restart actions"
-msgstr "顯示é??æ©?ã??æ?«å??å??é??æ?°å??å??ç­?å??ä½?"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:24
-msgid "Show list of users"
-msgstr "顯示使ç?¨è??æ¸?å?®"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:25
-#| msgid "The password is too short."
-msgid "Show password hints"
-msgstr "顯示å¯?碼æ??示"
-
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:2
 msgid "Left index finger"
 msgstr "å·¦æ??é£?æ??"
@@ -3192,11 +3251,33 @@ 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/gnome-control-center.desktop.in.in.h:1
-#: ../shell/shell.ui.h:1
+#: ../shell/control-center.c:47
+msgid "Show the overview"
+msgstr "顯示�覽"
+
+#: ../shell/control-center.c:48
+msgid "Panel to display"
+msgstr "è¦?顯示ç??é?¢æ?¿"
+
+#: ../shell/control-center.c:65
+msgid "- System Settings"
+msgstr "- 系統設��"
+
+#: ../shell/control-center.c:72
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"å?·è¡? ã??%s --helpã??以æ?¥ç??å®?æ?´ç??å?½ä»¤å??å?¯ç?¨é?¸é ?æ¸?å?®ã??\n"
+
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
 msgid "System Settings"
 msgstr "系統設��"
 
@@ -3204,23 +3285,498 @@ msgstr "系統設��"
 msgid "Control Center"
 msgstr "��中�"
 
-#: ../examples/gnome-example-panel.desktop.in.in.h:1
-msgid "Example Panel"
-msgstr "����"
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "æ??æ??設å®?å?¼(_A)"
+
+#~ 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 "
+#~| "allowed.\n"
+#~| "\n"
+#~| "<b>When the guest user logs out, all files and data associated with the "
+#~| "account will be deleted.</b>"
+#~ msgid ""
+#~ "A guest account will allow anyone to temporarily log in to this computer "
+#~ "without a password.  For security, remote logins to this account are not "
+#~ "allowed.\n"
+#~ "\n"
+#~ "                    <b>When the guest user logs out, all files and data "
+#~ "associated with the account will be deleted.</b>"
+#~ msgstr ""
+#~ "訪客帳è??æ??å??許任ä½?人å?¯ä»¥ä¸?ç?¨å¯?碼就æ?«æ??ç?»å?¥é??è?ºé?»è?¦ã??å? ç?ºå®?å?¨æ?§ç??ç??ç?±ï¼?é??å??"
+#~ "帳è??æ?¯ä¸?å??許é? ç«¯ç?»å?¥ç??ã??\n"
+#~ "\n"
+#~ "                    <b>ç?¶è¨ªå®¢ä½¿ç?¨è??ç?»å?ºå¾?ï¼?æ??æ??è??é??å??帳è??ç?¸é??ç??æª?æ¡?å??è³?æ??"
+#~ "é?½æ??被å?ªé?¤ã??</b>"
+
+#~ msgid "Accounts"
+#~ msgstr "帳è??"
+
+#~ msgid "Address Book Card:"
+#~ msgstr "é??è¨?é??å??ç??ï¼?"
+
+#~ msgid "Allow guests to log in to this computer"
+#~ msgstr "å??許訪客ç?»å?¥é??è?ºé?»è?¦"
 
-#: ../examples/gnome-example-panel.desktop.in.in.h:2
-msgid "Example preferences panel"
-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"
 
-#. Translators: those are keywords for the example control-center panel
-#: ../examples/gnome-example-panel.desktop.in.in.h:4
 #, fuzzy
-msgid "Foo;Bar;Baz;"
-msgstr "令é?²åº¦å??å?§ç??æ?¹å¡?ä¾?å??移å??"
+#~ msgid "Plum"
+#~ msgstr "��"
 
-#: ../shell/shell.ui.h:2
-msgid "_All Settings"
-msgstr "æ??æ??設å®?å?¼(_A)"
+#~ msgid "Red"
+#~ msgstr "ç´?"
+
+#~ msgid "Aluminium"
+#~ msgstr "é??"
+
+#~ msgid "Gray"
+#~ msgstr "ç?°"
+
+#~| msgid "Callback"
+#~ msgid "Black"
+#~ msgstr "é»?"
+
+#~ msgid "Colors"
+#~ msgstr "é¡?è?²"
+
+#~ msgid "Slide Show"
+#~ msgstr "å¹»ç??ç??顯示"
+
+#~ msgid "Image"
+#~ msgstr "å??ç??"
+
+#~ msgid "%d %s by %d %s"
+#~ msgstr "�%d %s �%d %s"
+
+#~ msgid "pixel"
+#~ msgid_plural "pixels"
+#~ msgstr[0] "å??ç´ "
+
+#~ msgid ""
+#~ "<b>%s</b>\n"
+#~ "%s, %s\n"
+#~ "Folder: %s"
+#~ msgstr ""
+#~ "<b>%s</b>\n"
+#~ "%s,  %s\n"
+#~ "è³?æ??夾ï¼?%s"
+
+#~ msgid ""
+#~ "<b>%s</b>\n"
+#~ "%s\n"
+#~ "Folder: %s"
+#~ msgstr ""
+#~ "<b>%s</b>\n"
+#~ "%s\n"
+#~ "è³?æ??夾ï¼?%s"
+
+#~ msgid "Image missing"
+#~ msgstr "é?ºå¤±å??ç??"
+
+#~ msgid "12 hour format"
+#~ msgstr "12 å°?æ??å?¶"
+
+#~ msgid "24 hour format"
+#~ msgstr "24 å°?æ??å?¶"
+
+#~| 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 "令é?²åº¦å??å?§ç??æ?¹å¡?ä¾?å??移å??"
 
 #~ msgid "Error saving configuration: %s"
 #~ msgstr "å?²å­?設å®?æ??å?ºç?¾é?¯èª¤ï¼?%s"
@@ -3261,9 +3817,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Evolution Mail Reader"
 #~ msgstr "Evolution ���件�信��"
 
-#~ msgid "Firebird"
-#~ msgstr "Firebird"
-
 #~ msgid "Firefox"
 #~ msgstr "Firefox"
 
@@ -3276,9 +3829,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Icedove"
 #~ msgstr "Icedove"
 
-#~ msgid "Iceweasel"
-#~ msgstr "Iceweasel"
-
 #~ msgid "KMail"
 #~ msgstr "KMail"
 
@@ -3380,9 +3930,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Could not open %s/%s: %s\n"
 #~ msgstr "ç?¡æ³?é??å?? %s/%sï¼?%s\n"
 
-#~ msgid "Could not rename %s to %s: %s\n"
-#~ msgstr "ç?¡æ³?å°? %s ç??å??稱æ?´æ?¹ç?º %sï¼?%s\n"
-
 #~ msgid ""
 #~ "Authentication is required to install multi-monitor settings for all users"
 #~ msgstr "å®?è£?å¤?è?¢å¹?設å®?å?¼çµ¦æ??æ??使ç?¨è??é??è¦?é©?è­?"
@@ -3523,7 +4070,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgstr "ç?¾å?¨ä¼?æ?¯ï¼?å?©ä¸? %då??ï¼?"
 
 #~ msgid "%d minute until the next break"
-
 #~ msgid_plural "%d minutes until the next break"
 #~ msgstr[0] "è·?é?¢ä¼?æ?¯æ??é??é??æ?? %d å??é??"
 
@@ -3595,9 +4141,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Could not set the default configuration for monitors"
 #~ msgstr "ç?¡æ³?設å®?é ?設ç??顯示å?¨çµ?æ??"
 
-#~ msgid "Mouse"
-#~ msgstr "æ»?é¼ "
-
 #~ msgid "Close the control-center when a task is activated"
 #~ msgstr "å?·è¡?設å®?å¾?é??é??æ?§å?¶ä¸­å¿?"
 
@@ -3708,9 +4251,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Whether to thumbnail Type1 fonts"
 #~ msgstr "æ?¯å?¦ç?º Type1 å­?å??製ä½?縮å??"
 
-#~ msgid "Style:"
-#~ msgstr "�款�"
-
 #~ msgid "Size:"
 #~ msgstr "大��"
 
@@ -3871,12 +4411,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "A_IM/iChat:"
 #~ msgstr "A_IM/iChat:"
 
-#~ msgid "A_ddress:"
-#~ msgstr "å?°å??(_A):"
-
-#~ msgid "About Me"
-#~ msgstr "é??æ?¼è?ªå·±"
-
 #~ msgid "Address"
 #~ msgstr "å?°å??"
 
@@ -3967,9 +4501,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "_Department:"
 #~ msgstr "é?¨é??(_D):"
 
-#~ msgid "_Groupwise:"
-#~ msgstr "_Groupwise:"
-
 #~ msgid "_Home page:"
 #~ msgstr "��(_H):"
 
@@ -3982,15 +4513,9 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "_Manager:"
 #~ msgstr "總管(_M):"
 
-#~ msgid "_Profession:"
-#~ msgstr "�業(_P):"
-
 #~ msgid "_State/Province:"
 #~ msgstr "å·?/ç??(_S):"
 
-#~ msgid "_Title:"
-#~ msgstr "�稱(_T):"
-
 #~ msgid "_Work:"
 #~ msgstr "工�(_W)"
 
@@ -4056,9 +4581,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "é??é??èª?è­?å¾?ï¼?å?¯ä»¥è¼¸å?¥æ?°ç??å¯?碼ï¼?輸å?¥å¾?å??輸å?¥ä¸?次ä½?ç?ºæª¢æ?¥ï¼?æ?¥è??æ??<b>è®?æ?´å¯?碼"
 #~ "</b>ã??"
 
-#~ msgid "_Authenticate"
-#~ msgstr "��(_A)"
-
 #~ msgid "Accessible Lo_gin"
 #~ msgstr "ç?¡é??ç¤?ç?»å?¥(_G)"
 
@@ -4116,7 +4638,6 @@ 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 "
@@ -4129,7 +4650,6 @@ 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 "
@@ -4143,9 +4663,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Use selected font"
 #~ msgstr "使ç?¨å·²é?¸å­?å??"
 
-#~ msgid "Could not load user interface file: %s"
-#~ msgstr "ç?¡æ³?è¼?å?¥ä½¿ç?¨è??ä»?é?¢æª?æ¡?ï¼?%s"
-
 #~ msgid "Specify the filename of a theme to install"
 #~ msgstr "æ??å®?è¦?å®?è£?ç??ä½?æ?¯ä¸»é¡?å??稱"
 
@@ -4162,9 +4679,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "[WALLPAPER...]"
 #~ msgstr "[���]"
 
-#~ msgid "Default Pointer"
-#~ msgstr "�設鼠�"
-
 #~ msgid "Install"
 #~ msgstr "��"
 
@@ -4254,9 +4768,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Hinting"
 #~ msgstr "å­?å??æ??示"
 
-#~ msgid "Horizontal gradient"
-#~ msgstr "水平漸層"
-
 #~ msgid "Icons"
 #~ msgstr "å??示"
 
@@ -4278,9 +4789,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Save _As..."
 #~ msgstr "����(_A)�"
 
-#~ msgid "Solid color"
-#~ msgstr "���彩"
-
 #~ msgid "Stretch"
 #~ msgstr "延伸"
 
@@ -4314,27 +4822,18 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "VB_GR"
 #~ msgstr "VB_GR"
 
-#~ msgid "Vertical gradient"
-#~ msgstr "å??ç?´æ¼¸å±¤"
-
 #~ msgid "Window Border"
 #~ msgstr "è¦?çª?é??æ¡?"
 
 #~ msgid "_BGR"
 #~ msgstr "_BGR"
 
-#~ msgid "_Description:"
-#~ msgstr "æ??è¿°(_D):"
-
 #~ msgid "_Document font:"
 #~ msgstr "æ??件å­?å??(_D):"
 
 #~ msgid "_Fixed width font:"
 #~ msgstr "å?ºå®?寬度å­?å??(_F):"
 
-#~ msgid "_Install..."
-#~ msgstr "��(_I)�"
-
 #~ msgid "_Medium"
 #~ msgstr "中(_M)"
 
@@ -4677,12 +5176,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "No matches found."
 #~ msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ã??"
 
-#~ msgid "Start %s"
-#~ msgstr "å??å?? %s"
-
-#~ msgid "Help"
-#~ msgstr "æ±?å?©"
-
 #~ msgid "Upgrade"
 #~ msgstr "æ?´æ?°"
 
@@ -4713,9 +5206,6 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "File System"
 #~ msgstr "��系統"
 
-#~ msgid "Network Servers"
-#~ msgstr "網路伺æ??å?¨"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>é??å??</b>"
 
@@ -4773,15 +5263,9 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ msgid "Drag the monitors to set their place"
 #~ msgstr "æ??æ?³é¡¯ç¤ºå?¨ä¾?設å®?å®?å??ç??ä½?ç½®"
 
-#~ msgid "_Mirror screens"
-#~ msgstr "����(_M)"
-
 #~ msgid "Change screen resolution"
 #~ msgstr "è®?æ?´è?¢å¹?解æ??度"
 
-#~ msgid "Edit"
-#~ msgstr "編輯"
-
 #~ msgid "Fill screen"
 #~ msgstr "���"
 
@@ -4830,8 +5314,10 @@ 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"
@@ -4850,58 +5336,85 @@ 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>C_olors</b>"
 #~ msgstr "<b>���彩(_O)</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"
@@ -4910,6 +5423,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "���彩\n"
 #~ "水平漸層\n"
 #~ "å??ç?´æ¼¸å±¤"
+
 #~ msgid ""
 #~ "Text below items\n"
 #~ "Text beside items\n"
@@ -4920,6 +5434,7 @@ msgstr "æ??æ??設å®?å?¼(_A)"
 #~ "æ??å­?å?¨é ?ç?®æ??\n"
 #~ "å?ªæ??å??示\n"
 #~ "å?ªæ??æ??å­?"
+
 #~ msgid ""
 #~ "Tiled\n"
 #~ "Zoom\n"
@@ -4932,14 +5447,19 @@ 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"
@@ -4950,135 +5470,187 @@ 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 "Not connected"
-#~ 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 "S_ound playback:"
 #~ msgstr "����(_O):"
+
 #~ 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 "_Device:"
-#~ msgstr "�置(_D):"
+
 #~ msgid "_Play alerts and sound effects"
 #~ msgstr "æ?­æ?¾è­¦ç¤ºè??è?²é?³æ??æ??(_P)"
+
 #~ msgid "_Sound playback:"
 #~ msgstr "����(_S):"
+
 #~ msgid "Select Sound File"
 #~ msgstr "é?¸å??é?³æ??æª?"
+
 #~ msgid "Custom..."
 #~ msgstr "���"
-#~ msgid "Lock Screen"
-#~ msgstr "é??å®?è?¢å¹?"
+
 #~ msgid "Logout"
 #~ msgstr "��"
-#~ msgid "Shutdown"
-#~ 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"
@@ -5091,21 +5663,25 @@ 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]