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

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] Update Simplified Chinese translation.
Date: Sun, 12 Dec 2010 08:31:51 +0000 (UTC)
commit bebfc895ea67fd36ec987b924406256fb187d598
Author: Aron Xu <aronxu gnome org>
Date:   Sun Dec 12 08:31:29 2010 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1235 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 584 insertions(+), 651 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eed1fdb..1a824ea 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,18 +12,20 @@
 # Xhacker Liu <liu dongyuan gmail com>, 2010.
 # æ?±æ¶? <bill_zt sina com>, 2010.
 # Aron Xu <happyaron xu gmail com>, 2010.
+# zhang ping <zhangping159 gmail com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&component=general\n"
-"POT-Creation-Date: 2010-11-09 18:54+0000\n"
-"PO-Revision-Date: 2010-11-14 04:04+0800\n"
+"POT-Creation-Date: 2010-12-10 11:04+0000\n"
+"PO-Revision-Date: 2010-12-12 16:28+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gnome-control-center.schemas.in.h:1
@@ -164,6 +166,11 @@ msgstr "è??æ?¯"
 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
+msgid "Wallpaper;Screen;"
+msgstr "å£?çº¸;å±?å¹?;"
+
 #: ../panels/background/background.ui.h:1
 msgid "Center"
 msgstr "å±?ä¸"
@@ -185,7 +192,7 @@ msgid "Tile"
 msgstr "å¹³é?º"
 
 #: ../panels/background/background.ui.h:6
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:93
 msgid "Zoom"
 msgstr "ç¼©æ?¾"
 
@@ -336,24 +343,24 @@ msgstr "45"
 
 #: ../panels/datetime/datetime.ui.h:7
 msgid ":"
-msgstr "ï¼?"
+msgstr ":"
 
 #: ../panels/datetime/datetime.ui.h:8
+msgid "AM"
+msgstr "ä¸?å??"
+
+#: ../panels/datetime/datetime.ui.h:9
 msgid "April"
 msgstr "å??æ??"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: ../panels/datetime/datetime.ui.h:10
 msgid "August"
 msgstr "å?«æ??"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: ../panels/datetime/datetime.ui.h:11
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
-#: ../panels/datetime/datetime.ui.h:11
-msgid "Day:"
-msgstr "æ?¥ï¼?"
-
 #: ../panels/datetime/datetime.ui.h:12
 msgid "December"
 msgstr "å??äº?æ??"
@@ -383,8 +390,8 @@ msgid "May"
 msgstr "äº?æ??"
 
 #: ../panels/datetime/datetime.ui.h:19
-msgid "Month:"
-msgstr "æ??ï¼?"
+msgid "Network Time"
+msgstr "ç½?ç»?æ?¶é?´"
 
 #: ../panels/datetime/datetime.ui.h:20
 msgid "November"
@@ -402,19 +409,16 @@ msgstr "å?°å?ºï¼?"
 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
+msgid "Clock;Timezone;Location;"
+msgstr "æ?¶é??;æ?¶å?º;ä½?ç½®;"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
 msgid "Date And Time"
 msgstr "æ?¥æ??å??æ?¶é?´"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
 msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ?¶é?´é¦?é??é¡¹é?¢æ?¿"
 
@@ -446,9 +450,6 @@ msgid "Error setting default mailer: %s"
 msgstr "è®¾ç½®é»?è®¤ç?µå?é?®ä»¶ç¨?åº?å?ºé??ï¼?%s"
 
 #: ../panels/default-applications/gnome-da-capplet.c:321
-#: ../panels/sound/gvc-sound-theme-chooser.c:623
-#: ../panels/sound/gvc-sound-theme-editor.c:705
-#: ../panels/sound/gvc-sound-theme-editor.c:759
 #: ../panels/sound/sound-theme-file-utils.c:292
 msgid "Custom"
 msgstr "è?ªå®?ä¹?"
@@ -533,207 +534,99 @@ msgid "_Run at start"
 msgstr "å?¯å?¨æ?¶è¿?è¡?(_R)"
 
 #: ../panels/default-applications/gnome-default-applications.xml.in.h:1
-msgid "Balsa"
-msgstr "Balsa"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:2
 msgid "Banshee Music Player"
 msgstr "Banshee é?³ä¹?æ?æ?¾å?¨"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:3
-msgid "Claws Mail"
-msgstr "Claws Mail"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:4
+#: ../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:5
-msgid "Debian Sensible Browser"
-msgstr "Debian Sensible æµ?è§?å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:6
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:3
 msgid "Debian Terminal Emulator"
 msgstr "Debian ç»?ç«¯æ¨¡æ??å?¨"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:7
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:4
 msgid "ETerm"
 msgstr "ETerm"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:8
-msgid "Encompass"
-msgstr "Encompass"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:9
-msgid "Epiphany Web Browser"
-msgstr "Epiphany ç½?ç»?æµ?è§?å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:10
-msgid "Evolution Mail Reader"
-msgstr "Evolution é?®ä»¶é??è¯»ç¨?åº?"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:11
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:12
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:13
+#: ../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:14
+#: ../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:15
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:7
 msgid "GNOME Terminal"
 msgstr "GNOME ç»?ç«¯"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:16
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:17
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:8
 msgid "Gnopernicus"
 msgstr "Gnopernicus"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:18
+#: ../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:19
-msgid "Iceape"
-msgstr "Iceape"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:20
-msgid "Iceape Mail"
-msgstr "Iceape é?®ä»¶"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:21
-msgid "Icedove"
-msgstr "Icedove"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:22
-msgid "Iceweasel"
-msgstr "Iceweasel"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:23
+#: ../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:24
-msgid "KMail"
-msgstr "KMail"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:25
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:26
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:11
 msgid "Konsole"
 msgstr "Konsole"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:27
+#: ../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:28
+#: ../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:29
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:14
 msgid "Listen"
 msgstr "æ?¥å?¬"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:30
-msgid "Midori"
-msgstr "Midori"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:31
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:32
-msgid "Mozilla 1.6"
-msgstr "Mozilla 1.6"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:33
-msgid "Mozilla Mail"
-msgstr "Mozilla é?®ä»¶"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:34
-msgid "Mozilla Thunderbird"
-msgstr "Mozilla Thunderbird"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:35
+#: ../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:36
-msgid "Mutt"
-msgstr "Mutt"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:37
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:16
 msgid "NXterm"
 msgstr "NXterm"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:38
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:39
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:17
 msgid "Orca"
 msgstr "Orca"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:40
+#: ../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:41
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:19
 msgid "RXVT"
 msgstr "RXVT"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:42
+#: ../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:43
-msgid "SeaMonkey"
-msgstr "SeaMonkey"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:44
-msgid "SeaMonkey Mail"
-msgstr "SeaMonkey é?®ä»¶"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:45
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:21
 msgid "Standard XTerminal"
 msgstr "æ ?å?? X ç»?ç«¯"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:46
-msgid "Sylpheed"
-msgstr "Sylpheed"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:47
-msgid "Sylpheed-Claws"
-msgstr "Sylpheed-Claws"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:48
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:22
 msgid "Terminator"
 msgstr "Terminator"
 
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:49
-msgid "Thunderbird"
-msgstr "Thunderbird"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:50
+#: ../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:51
+#: ../panels/default-applications/gnome-default-applications.xml.in.h:24
 msgid "aterm"
 msgstr "aterm"
 
@@ -747,57 +640,40 @@ msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:520
+#: ../panels/display/xrandr-capplet.c:479
 msgid "Monitor"
 msgstr "æ?¾ç¤ºå?¨"
 
 #: ../panels/display/display-capplet.ui.h:4
 #: ../panels/display/xrandr-capplet.c:315
 #: ../panels/display/xrandr-capplet.c:354
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Normal"
 msgstr "æ?®é??"
 
 #: ../panels/display/display-capplet.ui.h:5
-#: ../panels/universal-access/uap.ui.h:60
-msgid "Off"
-msgstr "å?³é?"
-
-#: ../panels/display/display-capplet.ui.h:6
-#: ../panels/universal-access/uap.ui.h:61
-msgid "On"
-msgstr "å¼?"
-
-#: ../panels/display/display-capplet.ui.h:7
 msgid "R_otation:"
 msgstr "æ??è½¬(_O)ï¼?"
 
-#: ../panels/display/display-capplet.ui.h:8
-msgid "Re_fresh rate:"
-msgstr "å?·æ?°ç??(_F)ï¼?"
-
-#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/display-capplet.ui.h:6
 #: ../panels/display/xrandr-capplet.c:317
 msgid "Right"
 msgstr "å?³"
 
-#: ../panels/display/display-capplet.ui.h:10
+#: ../panels/display/display-capplet.ui.h:7
 msgid "Upside-down"
 msgstr "ä¸?ä¸?é¢ å??"
 
-#: ../panels/display/display-capplet.ui.h:11
-msgid "_Detect monitors"
+#: ../panels/display/display-capplet.ui.h:8
+msgid "_Detect Monitors"
 msgstr "æ£?æµ?æ?¾ç¤ºå?¨(_D)"
 
-#: ../panels/display/display-capplet.ui.h:12
-msgid "_Include Top Menu Bar"
-msgstr "å??å?«ç?ä¸?è??å??æ ?(_I)"
-
-#: ../panels/display/display-capplet.ui.h:13
-msgid "_Mirror Screens"
-msgstr "é??å??å±?å¹?(_M)"
+#. Note that mirror is a verb in this string
+#: ../panels/display/display-capplet.ui.h:10
+msgid "_Mirror displays"
+msgstr "é??å??æ?¾ç¤º(_N)"
 
-#: ../panels/display/display-capplet.ui.h:14
+#: ../panels/display/display-capplet.ui.h:11
 msgid "_Resolution:"
 msgstr "å??è¾¨ç??(_R)ï¼?"
 
@@ -809,64 +685,70 @@ msgstr "æ?´æ?¹æ?¾ç¤ºå?¨å??æ??å½±ä»ªç??å??è¾¨ç??å??ä½?ç½®"
 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 "é?¢æ?¿;æ??å½±ä»ª;xrandr;å±?å¹?;å??è¾¨ç??;å?·æ?°;"
+
 #: ../panels/display/xrandr-capplet.c:318
 msgid "Upside Down"
 msgstr "ä¸?ä¸?é¢ å??"
 
-#: ../panels/display/xrandr-capplet.c:360
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
 #. Translators:  this is the feature where what you see on your laptop's
 #. * screen is the same as your external monitor.  Here, "Mirror" is being
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:509
-#: ../panels/display/xrandr-capplet.c:1696
-msgid "Mirror Screens"
-msgstr "é??å??å±?å¹?"
+#: ../panels/display/xrandr-capplet.c:455
+msgid "Mirror Displays"
+msgstr "é??å??æ?¾ç¤º"
 
-#: ../panels/display/xrandr-capplet.c:511
-#, c-format
-msgid "Monitor: %s"
-msgstr "æ?¾ç¤ºå?¨ï¼?%s"
-
-#: ../panels/display/xrandr-capplet.c:625
+#: ../panels/display/xrandr-capplet.c:580
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:627
+#: ../panels/display/xrandr-capplet.c:582
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1551
+#: ../panels/display/xrandr-capplet.c:1485
+msgid "Drag to change primary display."
+msgstr "æ??æ?½ä»¥æ?´æ?¹å?ºç¡?æ?¾ç¤ºè®¾å¤?ã??"
+
+#: ../panels/display/xrandr-capplet.c:1543
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é??æ?©ä¸?ä¸ªæ?¾ç¤ºå?¨æ?¥æ?´æ?¹å®?ç??å±?æ?§ï¼?æ??å?¨å®?æ?¥æ??å??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:2119
+#: ../panels/display/xrandr-capplet.c:1942
+msgid "%a %R"
+msgstr "%a %R"
+
+#: ../panels/display/xrandr-capplet.c:1944
+msgid "%a %l:%M %p"
+msgstr "%A %H%M"
+
+#: ../panels/display/xrandr-capplet.c:2229
 msgid "Could not save the monitor configuration"
 msgstr "æ? æ³?ä¿?å?æ?¾ç¤ºå?¨é??ç½®"
 
-#: ../panels/display/xrandr-capplet.c:2142
+#: ../panels/display/xrandr-capplet.c:2252
 msgid "Could not get session bus while applying display configuration"
 msgstr "åº?ç?¨æ?¾ç¤ºé??ç½®æ?¶æ? æ³?è?·å¾?ä¼?è¯?æ?»çº¿"
 
-#: ../panels/display/xrandr-capplet.c:2187
+#: ../panels/display/xrandr-capplet.c:2297
 msgid "Could not detect displays"
 msgstr "æ? æ³?æ?¢æµ?æ?¾ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:2394
+#: ../panels/display/xrandr-capplet.c:2504
 msgid "Could not get screen information"
 msgstr "æ? æ³?è?·å¾?å±?å¹?ä¿¡æ?¯"
 
 #: ../panels/keyboard/00-multimedia-key.xml.in.h:1
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
+#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
 msgid "Sound"
 msgstr "å£°é?³"
 
@@ -904,78 +786,13 @@ msgstr "å? é??é?®ç±»å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/gnome-keyboard-panel.c:104
-#: ../panels/sound/gvc-mixer-control.c:1087
-#: ../panels/sound/gvc-sound-theme-editor.c:895
-#: ../panels/sound/gvc-sound-theme-editor.c:991
+#: ../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:354
+#: ../panels/user-accounts/um-login-options.c:355
 msgid "Disabled"
 msgstr "ç¦?ç?¨"
 
-#: ../panels/keyboard/gnome-keyboard-panel.c:185
-msgid "<Unknown Action>"
-msgstr "<æ?ªç?¥æ??ä½?>"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:935
-#: ../panels/keyboard/gnome-keyboard-panel.c:1566
-msgid "Custom Shortcuts"
-msgstr "è?ªå®?ä¹?å¿«æ?·é?®"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1077
-msgid "Error saving the new shortcut"
-msgstr "ä¿?å?æ?°å¿«æ?·é?®å?ºé??"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1156
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"æ? æ³?ä½¿ç?¨å¿«æ?·é?®â??%sâ??ï¼?å? ä¸ºä½¿ç?¨æ¤é?®å°?æ? æ³?è¾?å?¥ã??\n"
-"è¯·å??æ?¶ä½¿ç?¨ Ctrlã??Alt æ?? Shift å??è¯?ä¸?æ¬¡ã??"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1186
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"å¿«æ?·é?®â??%sâ??å·²ç»?ç?¨äº?\n"
-"â??%sâ??"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1192
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr "å¦?æ??æ?¨å°?å¿«æ?·é?®é??æ?°æ??æ´¾ç»?â??%sâ??ï¼?â??%sâ??ç??å¿«æ?·é?®å°?è¢«ç¦?ç?¨ã??"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1200
-msgid "_Reassign"
-msgstr "é??æ?°æ??æ´¾(_R)"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1320
-#, c-format
-msgid "Error unsetting accelerator in configuration database: %s"
-msgstr "å?¨é??ç½®æ?°æ?®åº?ä¸å??æ¶?è®¾ç½®æ?°å? é??é?®æ?¶å?ºé??ï¼?%s"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1521
-msgid "Too many custom shortcuts"
-msgstr "å¤ªå¤?ç??è?ªå®?ä¹?å¿«æ?·é?®"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1882
-msgid "Action"
-msgstr "å?¨ä½?"
-
-#: ../panels/keyboard/gnome-keyboard-panel.c:1904
-msgid "Shortcut"
-msgstr "å¿«æ?·é?®"
-
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 msgid "Change keyboard settings"
 msgstr "æ?´æ?¹é?®ç??è®¾ç½®"
@@ -985,6 +802,11 @@ msgstr "æ?´æ?¹é?®ç??è®¾ç½®"
 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 ""
+
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 msgid "Cursor Blinking"
 msgstr "å??æ ?é?ªç??"
@@ -1023,7 +845,7 @@ msgstr "æ??ä½?æ??ä¸?é?®æ?¶é??å¤?è¯¥é?®(_R)"
 #: ../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/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:51
 msgid "Long"
 msgstr "é?¿"
 
@@ -1043,7 +865,7 @@ msgstr "é??åº¦(_P)ï¼?"
 #: ../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/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Short"
 msgstr "ç?"
 
@@ -1079,6 +901,74 @@ msgstr "å??ç§°(_N)ï¼?"
 msgid "_Speed:"
 msgstr "é??åº¦(_S)ï¼?"
 
+#: ../panels/media/cc-media-panel.c:322
+msgid "Ask what to do"
+msgstr "è¯¢é?®å¦?ä½?å¤?ç??"
+
+#: ../panels/media/cc-media-panel.c:328
+msgid "Do Nothing"
+msgstr "ä¸?å¤?ç??"
+
+#: ../panels/media/cc-media-panel.c:334
+msgid "Open Folder"
+msgstr "æ??å¼?æ??ä»¶å¤¹"
+
+#: ../panels/media/gnome-media-properties.ui.h:1
+msgid "Acti_on:"
+msgstr "å?¨ä½?(_O)ï¼?"
+
+#: ../panels/media/gnome-media-properties.ui.h:2
+msgid "CD _audio:"
+msgstr "CD é?³é¢?(_A)"
+
+#: ../panels/media/gnome-media-properties.ui.h:3
+msgid "Media and Autorun"
+msgstr "ä»?è´¨å??è?ªå?¨è¿?è¡?"
+
+#: ../panels/media/gnome-media-properties.ui.h:4
+msgid "Select how media should be handled"
+msgstr "é??æ?©å¦?ä½?å¤?ç??ä»?è´¨"
+
+#: ../panels/media/gnome-media-properties.ui.h:5
+msgid "Select how other media should be handled"
+msgstr "é??æ?©å¦?ä½?å¤?ç??å?¶ä»?ä»?è´¨"
+
+#: ../panels/media/gnome-media-properties.ui.h:6
+msgid "_DVD video:"
+msgstr "_DVD è§?é¢?ï¼?"
+
+#: ../panels/media/gnome-media-properties.ui.h:7
+msgid "_Music player:"
+msgstr "é?³ä¹?æ?æ?¾å?¨(_M)ï¼?"
+
+#: ../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: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:11
+msgid "_Software:"
+msgstr "è½¯ä»¶(_S)ï¼?"
+
+#: ../panels/media/gnome-media-properties.ui.h:12
+msgid "_Type:"
+msgstr "ç±»å??(_T)ï¼?"
+
+#: ../panels/media/gnome-media-panel.desktop.in.in.h:1
+msgid "Configure media and autorun preferences"
+msgstr "é??ç½®ä»?è´¨å??è?ªå?¨è¿?è¡?é¦?é??é¡¹"
+
+#: ../panels/media/gnome-media-panel.desktop.in.in.h:2
+msgid "Removable Media"
+msgstr "å?¯ç§»å?¨ä»?è´¨"
+
 #: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Keyboard _model:"
 msgstr "é?®ç??å??å?·(_M)ï¼?"
@@ -1092,7 +982,7 @@ msgid "List of keyboard layouts selected for usage"
 msgstr "å?¯é??æ?©ä½¿ç?¨ç??é?®ç??å¸?å±?å??è¡¨"
 
 #: ../panels/region/gnome-region-panel.ui.h:6
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Mouse Keys"
 msgstr "é¼ æ ?é?®"
 
@@ -1121,7 +1011,7 @@ msgid "Print a diagram of the selected keyboard layout"
 msgstr "æ??å?°é??ä¸é?®ç??å¸?å±?ç??ä¸?ä»½å?¾ç¤º"
 
 #: ../panels/region/gnome-region-panel.ui.h:13
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "å?ºå??å??è¯è¨?"
 
@@ -1233,10 +1123,8 @@ 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:818
-#: ../panels/sound/gvc-sound-theme-editor.c:891
-#: ../panels/sound/gvc-sound-theme-editor.c:995
+#: ../panels/proxy/gnome-proxy-properties.c:554
+#: ../panels/sound/gvc-sound-theme-chooser.c:589
 msgid "Default"
 msgstr "é»?è®¤"
 
@@ -1244,40 +1132,10 @@ msgstr "é»?è®¤"
 msgid "Change your region and language settings"
 msgstr "æ?´æ?¹æ?¨ç??å?ºå??å??è¯è¨?è®¾ç½®"
 
-#: ../panels/mouse/capplet-stock-icons.c:66
-#, c-format
-msgid "Unable to load stock icon '%s'\n"
-msgstr "æ? æ³?è£?å?¥å?¾æ ?â??%sâ??\n"
-
-#. Translators: this is the gesture to trigger/choose the click type.
-#. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:79
-msgid "gesture|Move left"
-msgstr "å·¦ç§»"
-
-#. Translators: this is the gesture to trigger/choose the click type.
-#. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:84
-msgid "gesture|Move right"
-msgstr "å?³ç§»"
-
-#. Translators: this is the gesture to trigger/choose the click type.
-#. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:89
-msgid "gesture|Move up"
-msgstr "ä¸?ç§»"
-
-#. Translators: this is the gesture to trigger/choose the click type.
-#. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:94
-msgid "gesture|Move down"
-msgstr "ä¸?ç§»"
-
-#. Translators: this is the gesture to trigger/choose the click type.
-#. Don't include the prefix "gesture|" in the translation.
-#: ../panels/mouse/gnome-mouse-accessibility.c:99
-msgid "gesture|Disabled"
-msgstr "ç¦?ç?¨"
+#. Translators: those are keywords for the region control-center panel
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
+msgid "Language;Layout;"
+msgstr "è¯è¨?;å¸?å±?;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "Choose type of click _beforehand"
@@ -1334,7 +1192,7 @@ msgstr "é«?"
 
 #. large threshold
 #: ../panels/mouse/gnome-mouse-properties.ui.h:22
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:48
 msgid "Large"
 msgstr "å¤§"
 
@@ -1344,7 +1202,7 @@ msgstr "å®?ä½?æ??é??"
 
 #. low sensitivity
 #: ../panels/mouse/gnome-mouse-properties.ui.h:27
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Low"
 msgstr "ä½?"
 
@@ -1377,13 +1235,13 @@ msgid "Show click type _window"
 msgstr "æ?¾ç¤ºç?¹å?»ç±»å??çª?å?£(_W)"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:37
-#: ../panels/universal-access/uap.ui.h:74
+#: ../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:77
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Small"
 msgstr "å°?"
 
@@ -1392,9 +1250,8 @@ 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."
-msgstr "è¦?æµ?è¯?æ?¨ç??å??å?»è®¾ç½®ï¼?è¯·è¯?ç??å??å?»å?³ä¾§ç??ç?¯æ³¡ã??"
+msgid "To test your settings, try to double-click on the face."
+msgstr "è¦?æµ?è¯?æ?¨ç??è®¾ç½®ï¼?è¯·è¯?ç??å??å?»å?³ä¾§ç??ç?¯æ³¡ã??"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:44
 msgid "Touchpad"
@@ -1426,7 +1283,7 @@ msgid "_Left-handed"
 msgstr "æ?¯ç?¨å·¦æ??(_L)"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:54
-#: ../panels/universal-access/uap.ui.h:97
+#: ../panels/universal-access/uap.ui.h:96
 msgid "_Motion threshold:"
 msgstr "è¿?å?¨é??å?¼(_M)ï¼?"
 
@@ -1458,123 +1315,300 @@ msgstr "é¼ æ ?å??è§¦æ?¸æ?¿"
 msgid "Set your mouse and touchpad preferences"
 msgstr "è®¾ç½®æ?¨ç??é¼ æ ?å??è§¦æ?¸æ?¿é¦?é??é¡¹"
 
-#: ../panels/network/gnome-network-properties.c:672
+#. Translators: those are keywords for the mouse and touchpad control-center panel
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
+msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
+msgstr "è§¦æ?¸æ?¿;æ??é??;ç?¹å?»;å??å?»;å??å?»;æ??é?®;è½¨è¿¹ç??;"
+
+#: ../panels/proxy/gnome-proxy-properties.c:672
 msgid "New Location..."
 msgstr "æ?°å»ºä½?ç½®..."
 
-#: ../panels/network/gnome-network-properties.c:789
+#: ../panels/proxy/gnome-proxy-properties.c:789
 msgid "Location already exists"
 msgstr "ä½?ç½®å·²å?å?¨"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/proxy/gnome-proxy-panel.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "ç½?ç»?ä»£ç??"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#: ../panels/proxy/gnome-proxy-panel.desktop.in.in.h:2
 msgid "Set your network proxy preferences"
 msgstr "è®¾ç½®æ?¨ç??ç½?ç»?ä»£ç??é¦?é??é¡¹"
 
-#: ../panels/network/gnome-network-properties.ui.h:1
+#. Translators: those are keywords for the proxy control-center panel
+#: ../panels/proxy/gnome-proxy-panel.desktop.in.in.h:4
+msgid "Web;Location;"
+msgstr "Web;ä½?ç½®;"
+
+#: ../panels/proxy/gnome-proxy-properties.ui.h:1
 msgid "<b>Di_rect internet connection</b>"
 msgstr "<b>ç?´æ?¥è¿?æ?¥å?°äº?è??ç½?(_R)</b>"
 
-#: ../panels/network/gnome-network-properties.ui.h:2
+#: ../panels/proxy/gnome-proxy-properties.ui.h:2
 msgid "<b>_Automatic proxy configuration</b>"
 msgstr "<b>è?ªå?¨é??ç½®ä»£ç??(_A)</b>"
 
-#: ../panels/network/gnome-network-properties.ui.h:3
+#: ../panels/proxy/gnome-proxy-properties.ui.h:3
 msgid "<b>_Manual proxy configuration</b>"
 msgstr "<b>æ??å?¨é??ç½®ä»£ç??(_M)</b>"
 
-#: ../panels/network/gnome-network-properties.ui.h:4
+#: ../panels/proxy/gnome-proxy-properties.ui.h:4
 msgid "<b>_Use authentication</b>"
 msgstr "<b>é??è¦?èº«ä»½éª?è¯?(_U)</b>"
 
-#: ../panels/network/gnome-network-properties.ui.h:5
+#: ../panels/proxy/gnome-proxy-properties.ui.h:5
 msgid "Autoconfiguration _URL:"
 msgstr "è?ªå?¨é??ç½® URL(_U)ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:6
+#: ../panels/proxy/gnome-proxy-properties.ui.h:6
 msgid "C_reate"
 msgstr "å??å»º(_R)"
 
-#: ../panels/network/gnome-network-properties.ui.h:7
+#: ../panels/proxy/gnome-proxy-properties.ui.h:7
 msgid "Create New Location"
 msgstr "å??å»ºæ?°ä½?ç½®"
 
-#: ../panels/network/gnome-network-properties.ui.h:8
+#: ../panels/proxy/gnome-proxy-properties.ui.h:8
 msgid "HTTP Proxy Details"
 msgstr "HTTP ä»£ç??ç»?è??"
 
-#: ../panels/network/gnome-network-properties.ui.h:9
+#: ../panels/proxy/gnome-proxy-properties.ui.h:9
 msgid "H_TTP proxy:"
 msgstr "H_TTP ä»£ç??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:10
+#: ../panels/proxy/gnome-proxy-properties.ui.h:10
 msgid "Ignore Host List"
 msgstr "å¿½ç?¥ä¸»æ?ºå??è¡¨"
 
-#: ../panels/network/gnome-network-properties.ui.h:11
+#: ../panels/proxy/gnome-proxy-properties.ui.h:11
 msgid "Ignored Hosts"
 msgstr "å¿½ç?¥ç??ä¸»æ?º"
 
-#: ../panels/network/gnome-network-properties.ui.h:12
+#: ../panels/proxy/gnome-proxy-properties.ui.h:12
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:18
 msgid "Location:"
 msgstr "ä½?ç½®ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:13
+#: ../panels/proxy/gnome-proxy-properties.ui.h:13
 msgid "Network Proxy Preferences"
 msgstr "ç½?ç»?ä»£ç??é¦?é??é¡¹"
 
-#: ../panels/network/gnome-network-properties.ui.h:14
+#: ../panels/proxy/gnome-proxy-properties.ui.h:14
 msgid "Port:"
 msgstr "ç«¯å?£ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:15
+#: ../panels/proxy/gnome-proxy-properties.ui.h:15
 msgid "Proxy Configuration"
 msgstr "ä»£ç??æ??å?¡å?¨é??ç½®"
 
-#: ../panels/network/gnome-network-properties.ui.h:16
+#: ../panels/proxy/gnome-proxy-properties.ui.h:16
 msgid "S_ocks host:"
 msgstr "S_OCKS ä¸»æ?ºï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:17
+#: ../panels/proxy/gnome-proxy-properties.ui.h:17
 msgid "The location already exists."
 msgstr "è¯¥ä½?ç½®å·²å?å?¨ã??"
 
-#: ../panels/network/gnome-network-properties.ui.h:18
+#: ../panels/proxy/gnome-proxy-properties.ui.h:18
 msgid "U_sername:"
 msgstr "ç?¨æ?·å??(_S)ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:19
+#: ../panels/proxy/gnome-proxy-properties.ui.h:19
 msgid "_Delete Location"
 msgstr "å? é?¤ä½?ç½®(_D)"
 
-#: ../panels/network/gnome-network-properties.ui.h:20
+#: ../panels/proxy/gnome-proxy-properties.ui.h:20
 msgid "_Details"
 msgstr "ç»?è??(_D)"
 
-#: ../panels/network/gnome-network-properties.ui.h:21
+#: ../panels/proxy/gnome-proxy-properties.ui.h:21
 msgid "_FTP proxy:"
 msgstr "_FTP ä»£ç??ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:22
+#: ../panels/proxy/gnome-proxy-properties.ui.h:22
 msgid "_Location name:"
 msgstr "ä½?ç½®å??(_L)ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:23
+#: ../panels/proxy/gnome-proxy-properties.ui.h:23
 msgid "_Password:"
 msgstr "å¯?ç ?(_P)ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:24
+#: ../panels/proxy/gnome-proxy-properties.ui.h:24
 msgid "_Secure HTTP proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??(_S)ï¼?"
 
-#: ../panels/network/gnome-network-properties.ui.h:25
+#: ../panels/proxy/gnome-proxy-properties.ui.h:25
 msgid "_Use the same proxy for all protocols"
 msgstr "ä¸ºæ??æ??å??è®®ä½¿ç?¨ç?¸å??ç??ä»£ç??(_U)"
 
+#: ../panels/network/network.ui.h:1
+msgid "Configuration URL:"
+msgstr "è?ªå?¨é??ç½® URLï¼?"
+
+#: ../panels/network/network.ui.h:2
+msgid "FTP Proxy:"
+msgstr "FTP ä»£ç??ï¼?"
+
+#: ../panels/network/network.ui.h:3
+msgid "Flight Mode"
+msgstr "é£?è¡?æ¨¡å¼?"
+
+#: ../panels/network/network.ui.h:4
+msgid "Gateway:"
+msgstr "ç½?å?³ï¼?"
+
+#: ../panels/network/network.ui.h:5
+msgid "Group Name:"
+msgstr "ç»?å??ç§°ï¼?"
+
+#: ../panels/network/network.ui.h:6
+msgid "Group Password:"
+msgstr "ç»?å¯?ç ?ï¼?"
+
+#: ../panels/network/network.ui.h:7
+msgid "HTTP Proxy:"
+msgstr "HTTP ä»£ç??ï¼?"
+
+#: ../panels/network/network.ui.h:8
+msgid "Hardware Address:"
+msgstr "ç¡¬ä»¶å?°å??ï¼?"
+
+#: ../panels/network/network.ui.h:9
+msgid "IP Address:"
+msgstr "IP å?°å??ï¼?"
+
+#: ../panels/network/network.ui.h:10
+msgid "Method:"
+msgstr "æ?¹æ³?ï¼?"
+
+#: ../panels/network/network.ui.h:11
+msgid "Network Name:"
+msgstr "ç½?ç»?å??ç§°ï¼?"
+
+#: ../panels/network/network.ui.h:12
+msgid "Provider:"
+msgstr "æ??ä¾?è??ï¼?"
+
+#: ../panels/network/network.ui.h:13
+msgid "Secure HTTP Proxy:"
+msgstr "å®?å?¨ HTTP ä»£ç??ï¼?"
+
+#: ../panels/network/network.ui.h:14
+msgid "Security:"
+msgstr "å®?å?¨æ?§ï¼?"
+
+#: ../panels/network/network.ui.h:15
+msgid "Socks Host:"
+msgstr "Socks ä¸»æ?ºï¼?"
+
+#: ../panels/network/network.ui.h:16
+msgid "Speed:"
+msgstr "é??åº¦ï¼?"
+
+#: ../panels/network/network.ui.h:17
+#: ../panels/user-accounts/um-lockbutton.c:364
+msgid "Unlock"
+msgstr "è§£é??"
+
+#: ../panels/network/network.ui.h:18
+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
+msgid "Brightness;Lock;Dim;Blank;"
+msgstr "äº®åº¦;é??å®?;æ¸?æ??;ç©ºç?½;"
+
+#: ../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/power/gnome-power-panel.desktop.in.in.h:1
+msgid "Power"
+msgstr "ç?µæº?"
+
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Power management settings"
+msgstr "é??ç½®ç?µæº?ç®¡ç??"
+
+#. Translators: those are keywords for the power control-center panel
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:4
+msgid "Power;Sleep;Suspend;Hibernate;"
+msgstr "ç?µæº?;ç?¡ç? ;æ??èµ·;ä¼?ç? ;"
+
+#: ../panels/power/cc-power-panel.c:151
+msgid "Unknown time"
+msgstr "æ?ªç?¥æ?¶é?´"
+
+#: ../panels/power/cc-power-panel.c:157
+#, c-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i å??é??"
+
+#: ../panels/power/cc-power-panel.c:169
+#, c-format
+msgid "%i hour"
+msgid_plural "%i hours"
+msgstr[0] "%i å°?æ?¶"
+
+#. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
+#. * Swap order with "%2$s %2$i %1$s %1$i if needed
+#: ../panels/power/cc-power-panel.c:177
+#, c-format
+msgid "%i %s %i %s"
+msgstr "%i %s %i %s"
+
+#: ../panels/power/cc-power-panel.c:178
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "æ?¶"
+
+#: ../panels/power/cc-power-panel.c:179
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "å??"
+
+#: ../panels/power/cc-power-panel.c:251
+msgid "Battery charging"
+msgstr "ç?µæ± å??ç?µä¸"
+
+#: ../panels/power/cc-power-panel.c:254
+msgid "Battery discharging"
+msgstr "ç?µæ± æ?¾ç?µä¸"
+
+#: ../panels/power/cc-power-panel.c:265
+msgid "UPS charging"
+msgstr "UPS å??ç?µä¸"
+
+#: ../panels/power/cc-power-panel.c:268
+msgid "UPS discharging"
+msgstr "UPS æ?¾ç?µä¸"
+
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:286
+#, c-format
+msgid "%s until charged (%.0lf%%)"
+msgstr "è¿?é?? %s å??æ»¡(%.0lf%%)"
+
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:292
+#, c-format
+msgid "%s until empty (%.0lf%%)"
+msgstr "è¿?æ?? %s è??å°½(%.0lf%%)"
+
+#. TRANSLATORS: %1 is a percentage value. Note: this string is only
+#. * used when we don't have a time value
+#: ../panels/power/cc-power-panel.c:300
+#, c-format
+msgid "%.0lf%% charged"
+msgstr "å·²å??ç?µ %.0lf%%"
+
 #: ../panels/sound/applet-main.c:49
 msgid "Enable debugging code"
 msgstr "å?¯ç?¨è°?è¯?ä»£ç ?"
@@ -1587,11 +1621,7 @@ msgstr "æ¤åº?ç?¨ç¨?åº?ç??ç??æ?¬"
 msgid " â?? GNOME Volume Control Applet"
 msgstr " - GNOME å£°é?³æ?§å?¶å°?ç¨?åº?"
 
-#: ../panels/sound/cc-sound-panel.c:107
-msgid "Waiting for sound system to respond"
-msgstr "ç?å¾?å£°é?³ç³»ç»?å??åº?"
-
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1883
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1921
 msgid "Output"
 msgstr "è¾?å?º"
 
@@ -1599,7 +1629,7 @@ msgstr "è¾?å?º"
 msgid "Sound Output Volume"
 msgstr "è¾?å?ºé?³é??"
 
-#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1797
+#: ../panels/sound/gvc-applet.c:282 ../panels/sound/gvc-mixer-dialog.c:1838
 msgid "Input"
 msgstr "è¾?å?¥"
 
@@ -1639,7 +1669,7 @@ msgstr "æ??å¤§"
 
 #: ../panels/sound/gvc-balance-bar.c:296
 msgid "_Balance:"
-msgstr ""
+msgstr "å??è¡¡(_B)ï¼?"
 
 #: ../panels/sound/gvc-balance-bar.c:299
 msgid "_Fade:"
@@ -1663,13 +1693,13 @@ msgstr ""
 msgid "Mute"
 msgstr "é??é?³"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1588
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1629
 msgid "_Profile:"
 msgstr "é??ç½®æ??ä»¶(_P)ï¼?"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1094
+#: ../panels/sound/gvc-mixer-control.c:1098
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1677,92 +1707,90 @@ msgstr[0] "%u ä¸ªè¾?å?º"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1104
+#: ../panels/sound/gvc-mixer-control.c:1108
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u ä¸ªè¾?å?¥"
 
-#: ../panels/sound/gvc-mixer-control.c:1402
+#: ../panels/sound/gvc-mixer-control.c:1406
 msgid "System Sounds"
 msgstr "ç³»ç»?å£°é?³"
 
-#: ../panels/sound/gvc-mixer-dialog.c:310
-#: ../panels/sound/gvc-mixer-dialog.c:605
-#, fuzzy
-#| msgid "Co_untry:"
+#: ../panels/sound/gvc-mixer-dialog.c:317
+#: ../panels/sound/gvc-mixer-dialog.c:618
 msgid "Co_nnector:"
-msgstr "å?½å®¶/å?°å?º(_U)ï¼?"
+msgstr "è¿?æ?¥å?¨(_N)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:518
+#: ../panels/sound/gvc-mixer-dialog.c:531
 msgid "Peak detect"
-msgstr ""
+msgstr "å³°å?¼æ£?æµ?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1478
-#: ../panels/sound/gvc-mixer-dialog.c:1676
-#: ../panels/sound/gvc-sound-theme-chooser.c:828
+#: ../panels/sound/gvc-mixer-dialog.c:1506
+#: ../panels/sound/gvc-mixer-dialog.c:1717
+#: ../panels/sound/gvc-sound-theme-chooser.c:599
 msgid "Name"
 msgstr "å??ç§°"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1483
+#: ../panels/sound/gvc-mixer-dialog.c:1524
 msgid "Device"
 msgstr "è®¾å¤?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1531
+#: ../panels/sound/gvc-mixer-dialog.c:1572
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s æ?¬å£°å?¨æµ?è¯?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1589
+#: ../panels/sound/gvc-mixer-dialog.c:1630
 msgid "Test Speakers"
 msgstr "æµ?è¯?æ?¬å£°å?¨"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1720
+#: ../panels/sound/gvc-mixer-dialog.c:1761
 msgid "_Output volume: "
 msgstr "è¾?å?ºé?³é??(_O)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1734
+#: ../panels/sound/gvc-mixer-dialog.c:1775
 msgid "Sound Effects"
 msgstr "å£°é?³æ??æ??..."
 
-#: ../panels/sound/gvc-mixer-dialog.c:1741
+#: ../panels/sound/gvc-mixer-dialog.c:1782
 msgid "_Alert volume: "
 msgstr "è¦å??é?³é??(_A)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1754
+#: ../panels/sound/gvc-mixer-dialog.c:1795
 msgid "Hardware"
 msgstr "ç¡¬ä»¶"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1759
+#: ../panels/sound/gvc-mixer-dialog.c:1800
 msgid "C_hoose a device to configure:"
 msgstr "é??æ?©è¦?é??ç½®ç??è®¾å¤?(_H)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1786
-#: ../panels/sound/gvc-mixer-dialog.c:1915
+#: ../panels/sound/gvc-mixer-dialog.c:1827
+#: ../panels/sound/gvc-mixer-dialog.c:1950
 msgid "Settings for the selected device:"
 msgstr "é??ä¸è®¾å¤?ç??è®¾ç½®ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1804
+#: ../panels/sound/gvc-mixer-dialog.c:1845
 msgid "_Input volume: "
 msgstr "è¾?å?¥é?³é??(_I)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1827
+#: ../panels/sound/gvc-mixer-dialog.c:1868
 msgid "Input level:"
 msgstr "è¾?å?¥ç?çº§ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1853
+#: ../panels/sound/gvc-mixer-dialog.c:1894
 msgid "C_hoose a device for sound input:"
 msgstr "é??æ?©é?³é¢?è¾?å?¥è®¾å¤?(_H)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1888
+#: ../panels/sound/gvc-mixer-dialog.c:1926
 msgid "C_hoose a device for sound output:"
 msgstr "é??æ?©é?³é¢?è¾?å?ºè®¾å¤?(_H)ï¼?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1926
+#: ../panels/sound/gvc-mixer-dialog.c:1961
 msgid "Applications"
 msgstr "åº?ç?¨ç¨?åº?"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1930
+#: ../panels/sound/gvc-mixer-dialog.c:1965
 msgid "No application is currently playing or recording audio."
 msgstr "æ²¡æ??ç¨?åº?æ£å?¨æ?æ?¾æ??å½?å?¶é?³é¢?ã??"
 
@@ -1796,165 +1824,30 @@ msgstr "å£°é?³é¦?é??é¡¹(_S)"
 msgid "Muted"
 msgstr "å·²é??é?³"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:321
-#: ../panels/sound/gvc-sound-theme-editor.c:522
-msgid "No sounds"
-msgstr "æ? å£°é?³"
-
-#: ../panels/sound/gvc-sound-theme-chooser.c:443
+#: ../panels/sound/gvc-sound-theme-chooser.c:189
 msgid "Built-in"
 msgstr "å??å»º"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:688
-#: ../panels/sound/gvc-sound-theme-chooser.c:700
-#: ../panels/sound/gvc-sound-theme-chooser.c:712
-#: ../panels/sound/gvc-sound-theme-editor.c:560
-#: ../panels/sound/gvc-sound-theme-editor.c:949
+#: ../panels/sound/gvc-sound-theme-chooser.c:459
+#: ../panels/sound/gvc-sound-theme-chooser.c:471
+#: ../panels/sound/gvc-sound-theme-chooser.c:483
 msgid "Sound Preferences"
 msgstr "å£°é?³é¦?é??é¡¹"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:691
-#: ../panels/sound/gvc-sound-theme-chooser.c:702
-#: ../panels/sound/gvc-sound-theme-chooser.c:714
-#: ../panels/sound/gvc-sound-theme-editor.c:562
-#: ../panels/sound/gvc-sound-theme-editor.c:951
+#: ../panels/sound/gvc-sound-theme-chooser.c:462
+#: ../panels/sound/gvc-sound-theme-chooser.c:473
+#: ../panels/sound/gvc-sound-theme-chooser.c:485
 msgid "Testing event sound"
 msgstr "æµ?è¯?äº?ä»¶å£°é?³"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:819
+#: ../panels/sound/gvc-sound-theme-chooser.c:590
 msgid "From theme"
 msgstr "æ?¥è?ªä¸»é¢?"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:835
-msgid "Type"
-msgstr "ç±»å??"
-
-#: ../panels/sound/gvc-sound-theme-chooser.c:1039
-msgid "Sound _theme:"
-msgstr "å£°é?³ä¸»é¢?(_T)ï¼?"
-
-#: ../panels/sound/gvc-sound-theme-chooser.c:1047
+#: ../panels/sound/gvc-sound-theme-chooser.c:778
 msgid "C_hoose an alert sound:"
 msgstr "é??æ?©è¦å??å£°é?³(_H)ï¼?"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:1078
-msgid "Enable _window and button sounds"
-msgstr "å?¯ç?¨çª?å?£å??æ??é?®å£°é?³(_W)"
-
-#. Bell
-#: ../panels/sound/gvc-sound-theme-editor.c:79
-msgctxt "Sound event"
-msgid "Alert sound"
-msgstr "è¦å??å£°é?³"
-
-#. Windows and buttons
-#: ../panels/sound/gvc-sound-theme-editor.c:81
-msgctxt "Sound event"
-msgid "Windows and Buttons"
-msgstr "çª?å?£å??æ??é?®"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:82
-msgctxt "Sound event"
-msgid "Button clicked"
-msgstr "æ??ä¸?æ??é?®"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:83
-msgctxt "Sound event"
-msgid "Toggle button clicked"
-msgstr "ç?¹å?»å??æ?¢æ??é?®"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:84
-msgctxt "Sound event"
-msgid "Window maximized"
-msgstr "æ??å¤§å??çª?å?£"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:85
-msgctxt "Sound event"
-msgid "Window unmaximized"
-msgstr "è¿?å??çª?å?£"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:86
-msgctxt "Sound event"
-msgid "Window minimised"
-msgstr "æ??å°?å??çª?å?£"
-
-#. Desktop
-#: ../panels/sound/gvc-sound-theme-editor.c:88
-msgctxt "Sound event"
-msgid "Desktop"
-msgstr "æ¡?é?¢"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:89
-msgctxt "Sound event"
-msgid "Login"
-msgstr "ç?»å½?"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:90
-msgctxt "Sound event"
-msgid "Logout"
-msgstr "æ³¨é??"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:91
-msgctxt "Sound event"
-msgid "New e-mail"
-msgstr "æ?°é?®ä»¶å?°è¾¾"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:92
-msgctxt "Sound event"
-msgid "Empty trash"
-msgstr "æ¸?ç©ºå??æ?¶ç«?"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:93
-msgctxt "Sound event"
-msgid "Long action completed (download, CD burning, etc.)"
-msgstr "é?¿æ??ä½?å®?æ??(ä¸?è½½ã??å?»å½? CD ç?ã??)"
-
-#. Alerts?
-#: ../panels/sound/gvc-sound-theme-editor.c:95
-msgctxt "Sound event"
-msgid "Alerts"
-msgstr "è§?è§?æ??ç¤º"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:96
-msgctxt "Sound event"
-msgid "Information or question"
-msgstr "ä¿¡æ?¯æ??é?®é¢?"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:97
-msgctxt "Sound event"
-msgid "Warning"
-msgstr "è¦å??"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:98
-msgctxt "Sound event"
-msgid "Error"
-msgstr "é??è¯¯"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:99
-msgctxt "Sound event"
-msgid "Battery warning"
-msgstr "ç?µæ± è¦å??"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:592
-msgid "Select Sound File"
-msgstr "é??æ?©å£°é?³æ??ä»¶"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:603
-msgid "Sound files"
-msgstr "å£°é?³æ??ä»¶"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:899
-msgid "Customâ?¦"
-msgstr "è?ªå®?ä¹?..."
-
-#: ../panels/sound/gvc-sound-theme-editor.c:1302
-msgid "Sound Theme:"
-msgstr "å£°é?³ä¸»é¢?ï¼?"
-
-#: ../panels/sound/gvc-sound-theme-editor.c:1330
-msgid "Enable window and button sounds"
-msgstr "å?¯ç?¨çª?å?£å??æ??é?®å£°é?³"
-
 #: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
 msgid "Show desktop volume control"
 msgstr "æ?¾ç¤ºæ¡?é?¢é?³é??æ?§å?¶"
@@ -1963,7 +1856,12 @@ msgstr "æ?¾ç¤ºæ¡?é?¢é?³é??æ?§å?¶"
 msgid "Volume Control"
 msgstr "é?³é??æ?§å?¶"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
+#. 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 "å£°å?¡;éº¦å??é£?;é?³é??;æ·¡å?¥æ·¡å?º;å??è¡¡;è??ç??;è?³æ?º;"
+
+#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:3
 msgid "Change sound volume and sound events"
 msgstr "æ?´æ?¹é?³é??å??å£°é?³äº?ä»¶"
 
@@ -1991,11 +1889,16 @@ msgstr "ç?»ç??"
 msgid "Sonar"
 msgstr "å£°çº³"
 
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
+#. Translators: those are keywords for the universal access control-center panel
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+msgid "Keyboard;Mouse;a11y;Accessibility;"
+msgstr "é?®ç??;é¼ æ ?;a11y;è¾?å?©å??è?½;"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Universal Access"
 msgstr "é??ç?¨è¾?å?©å??è?½"
 
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
 msgid "Universal Access Preferences"
 msgstr "é??ç?¨è¾?å?©å??è?½é¦?é??é¡¹"
 
@@ -2071,7 +1974,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 "ä½¿ç?¨å°?é?®ç??æ?§å?¶é¼ æ ?æ??é??ã??"
 
@@ -2112,7 +2014,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 "æ?¾ç¤ºè¯é?³å??å£°é?³ç??æ??å?æ??è¿°ã??"
 
@@ -2149,166 +2050,170 @@ msgid "Hover Click"
 msgstr "æ?¬å??ç?¹å?»"
 
 #: ../panels/universal-access/uap.ui.h:44
-msgid "I need assistance with:"
-msgstr "æ??é??è¦?å¸®å?©ä½¿ç?¨ï¼?"
-
-#: ../panels/universal-access/uap.ui.h:45
 msgid "Ignores fast duplicate keypresses"
 msgstr "å¿½ç?¥å¿«é??é??å¤?æ??é?®"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Increase size:"
 msgstr "å¢?å? å¤§å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Keyboard Settings..."
 msgstr "é?®ç??è®¾ç½®..."
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Larger"
 msgstr "è¾?å¤§"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:53
 msgid "LowContrast"
 msgstr "ä½?å¯¹æ¯?åº¦"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Mouse Settings..."
 msgstr "é¼ æ ?è®¾ç½®..."
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Nomon"
 msgstr "æ?¥å??å®?ä½?"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:57
 msgid "None"
 msgstr "æ? "
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../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 "å±?å¹?é?®ç??"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:62
 msgid "OnBoard"
 msgstr "æ?¿è½½"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Options..."
 msgstr "é??é¡¹..."
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Pointing and Clicking"
 msgstr "æ??å??å??å??å?»"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "å½?æ??é?®æ??ä¸?å??æ?¥æ?¶ä¹?é?´æ?¾ç½®å»¶è¿?"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Screen Reader"
 msgstr "å±?å¹?é??è¯»å?¨"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Seeing"
 msgstr "è§?è§?"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Shift+Ctrl+Alt+-"
 msgstr "Shift+Ctrl+Alt+-"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Shift+Ctrl+Alt+="
 msgstr "Shift+Ctrl+Alt+="
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Show Universal Access status"
 msgstr "æ?¾ç¤ºé??ç?¨è¾?å?©å??è?½ç?¶æ??"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Slow Keys"
 msgstr "æ?¢é??é?®"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Sound Settings..."
 msgstr "å£°é?³è®¾ç½®..."
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:78
 msgid "Sticky Keys"
 msgstr "ç²?æ»?é?®"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Test flash"
 msgstr "æ??å?é?ªç??"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Text size:"
 msgstr "æ??å?å¤§å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "å°?ä¸?ä¸²ä¿®æ?¹è¿?ç??é?®å½?ä½?ä¸?ä¸ªç»?å??é?®"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:82
 msgid "Trigger a click when the pointer hovers"
 msgstr "æ??é??æ?¬å??æ?¶æ?§è¡?ç?¹å?»ã??"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æ??ä½?é¼ æ ?ä¸»é?®ä¸?æ?¾æ?¶è§¦å??æ¬¡å?»"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Turn on accessibility features from the keyboard"
 msgstr "æ??å¼?é?®ç??è¾?å?©å??è?½ç?¹æ?§"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Turn on or off:"
 msgstr "æ??å¼?æ??å?³é?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:86
 msgid "Type here to test settings"
 msgstr "å?¨æ¤è¾?å?¥å?ç¬¦ä»¥æµ?è¯?è®¾å®?"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:87
 msgid "Typing"
 msgstr "æ??å?ä¸"
 
-#: ../panels/universal-access/uap.ui.h:89
+#: ../panels/universal-access/uap.ui.h:88
 msgid "Typing Assistant"
 msgstr "æ??å?å?©æ??"
 
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:89
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "å½?è¦å??å£°å??ç??æ?¶ä½¿ç?¨è§?è§?æ??ç¤º"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:90
 msgid "Use an alternative form of text input"
 msgstr "ä½¿ç?¨å?¦å¤?æ ¼å¼?ç??æ??å?è¾?å?¥"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:91
 msgid "Video Mouse"
 msgstr "è§?é¢?é¼ æ ?"
 
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:92
 msgid "Visual Alerts"
 msgstr "è§?è§?æ??ç¤º"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:94
 msgid "Zoom in:"
 msgstr "æ?¾å¤§ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:96
+#: ../panels/universal-access/uap.ui.h:95
 msgid "Zoom out:"
 msgstr "ç¼©å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:98
+#: ../panels/universal-access/uap.ui.h:97
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:99
+#: ../panels/universal-access/uap.ui.h:98
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:100
+#: ../panels/universal-access/uap.ui.h:99
 msgid "rejected"
 msgstr "å·²æ??ç»?"
 
@@ -2321,7 +2226,7 @@ msgid "Authentication failed"
 msgstr "è®¤è¯?å¤±è´¥"
 
 #: ../panels/user-accounts/run-passwd.c:506
-#: ../panels/user-accounts/um-password-dialog.c:384
+#: ../panels/user-accounts/um-password-dialog.c:378
 #, c-format
 msgid "The new password is too short"
 msgstr "æ?°å¯?ç ?å¤ªç?"
@@ -2348,7 +2253,6 @@ 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 "æ?°å¯?ç ?å??æ?§å¯?ç ?ç?¸å??"
 
@@ -2506,19 +2410,15 @@ msgstr ""
 msgid "Other..."
 msgstr "å?¶ä»?..."
 
-#: ../panels/user-accounts/um-lockbutton.c:343
+#: ../panels/user-accounts/um-lockbutton.c:355
 msgid "Lock"
 msgstr "é??å®?"
 
-#: ../panels/user-accounts/um-lockbutton.c:352
-msgid "Unlock"
-msgstr "è§£é??"
-
-#: ../panels/user-accounts/um-lockbutton.c:361
+#: ../panels/user-accounts/um-lockbutton.c:373
 msgid "Locked"
 msgstr "å·²é??å®?"
 
-#: ../panels/user-accounts/um-lockbutton.c:370
+#: ../panels/user-accounts/um-lockbutton.c:382
 msgid ""
 "Dialog is unlocked.\n"
 "Click to prevent further changes"
@@ -2526,7 +2426,7 @@ msgstr ""
 "ä¼?è¯?å·²è§£é??ã??\n"
 "ç?¹å?»ä»¥é?»æ¢å?¶ä»?æ?´æ?¹"
 
-#: ../panels/user-accounts/um-lockbutton.c:379
+#: ../panels/user-accounts/um-lockbutton.c:391
 msgid ""
 "Dialog is locked.\n"
 "Click to make changes"
@@ -2534,7 +2434,7 @@ msgstr ""
 "ä¼?è¯?å·²é??å®?ã??\n"
 "ç?¹å?»ä»¥è¿?è¡?æ?´æ?¹"
 
-#: ../panels/user-accounts/um-lockbutton.c:388
+#: ../panels/user-accounts/um-lockbutton.c:400
 msgid ""
 "System policy prevents changes.\n"
 "Contact your system administrator"
@@ -2542,77 +2442,77 @@ msgstr ""
 "ç³»ç»?ç?ç?¥é?»æ¢æ?´æ?¹ã??\n"
 "è¯·è??ç³»ç³»ç»?ç®¡ç??å??ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:188
+#: ../panels/user-accounts/um-password-dialog.c:182
 msgid "More choices..."
 msgstr "æ?´å¤?é??é¡¹..."
 
-#: ../panels/user-accounts/um-password-dialog.c:294
+#: ../panels/user-accounts/um-password-dialog.c:288
 msgid "Please choose another password."
 msgstr "è¯·é??æ?©å?¶ä»?ç??å¯?ç ?ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:303
+#: ../panels/user-accounts/um-password-dialog.c:297
 msgid "Please type your current password again."
 msgstr "è¯·å??æ¬¡è¾?å?¥æ?¨ç??å½?å??å¯?ç ?ã??"
 
-#: ../panels/user-accounts/um-password-dialog.c:309
+#: ../panels/user-accounts/um-password-dialog.c:303
 msgid "Password could not be changed"
 msgstr "æ? æ³?æ?´æ?¹å¯?ç ?"
 
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:375
 msgid "You need to enter a new password"
 msgstr "æ?¨é??è¦?è¾?å?¥ä¸?ä¸ªæ?°å¯?ç ?"
 
-#: ../panels/user-accounts/um-password-dialog.c:390
+#: ../panels/user-accounts/um-password-dialog.c:384
 msgid "You need to confirm the password"
 msgstr "ä½ é??è¦?é??æ?°è¾?å?¥å¯?ç ?ä»¥ä¾¿ç¡®è®¤"
 
-#: ../panels/user-accounts/um-password-dialog.c:393
+#: ../panels/user-accounts/um-password-dialog.c:387
 msgid "The passwords do not match"
 msgstr "å¯?ç ?ä¸?å?¹é??"
 
-#: ../panels/user-accounts/um-password-dialog.c:399
+#: ../panels/user-accounts/um-password-dialog.c:393
 msgid "You need to enter your current password"
 msgstr "æ?¨é??è¦?è¾?å?¥å½?å??å¯?ç ?"
 
-#: ../panels/user-accounts/um-password-dialog.c:402
+#: ../panels/user-accounts/um-password-dialog.c:396
 msgid "The current password is not correct"
 msgstr "å½?å??å¯?ç ?é??è¯¯"
 
-#: ../panels/user-accounts/um-password-dialog.c:475
-#: ../panels/user-accounts/um-password-dialog.c:692
+#: ../panels/user-accounts/um-password-dialog.c:469
+#: ../panels/user-accounts/um-password-dialog.c:686
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "å¤ªç?"
 
-#: ../panels/user-accounts/um-password-dialog.c:478
-#: ../panels/user-accounts/um-password-dialog.c:693
+#: ../panels/user-accounts/um-password-dialog.c:472
+#: ../panels/user-accounts/um-password-dialog.c:687
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "å¼±"
 
-#: ../panels/user-accounts/um-password-dialog.c:480
-#: ../panels/user-accounts/um-password-dialog.c:694
+#: ../panels/user-accounts/um-password-dialog.c:474
+#: ../panels/user-accounts/um-password-dialog.c:688
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "ä¸?è?¬"
 
-#: ../panels/user-accounts/um-password-dialog.c:482
-#: ../panels/user-accounts/um-password-dialog.c:695
+#: ../panels/user-accounts/um-password-dialog.c:476
+#: ../panels/user-accounts/um-password-dialog.c:689
 msgctxt "Password strength"
 msgid "Good"
 msgstr "å¥½"
 
-#: ../panels/user-accounts/um-password-dialog.c:484
-#: ../panels/user-accounts/um-password-dialog.c:696
+#: ../panels/user-accounts/um-password-dialog.c:478
+#: ../panels/user-accounts/um-password-dialog.c:690
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "å¼º"
 
-#: ../panels/user-accounts/um-password-dialog.c:523
+#: ../panels/user-accounts/um-password-dialog.c:517
 msgid "Passwords do not match"
 msgstr "å¯?ç ?ä¸?å?¹é??"
 
-#: ../panels/user-accounts/um-password-dialog.c:549
+#: ../panels/user-accounts/um-password-dialog.c:543
 msgid "Wrong password"
 msgstr "å¯?ç ?é??è¯¯"
 
@@ -2622,20 +2522,24 @@ msgstr "å¯?ç ?é??è¯¯"
 msgid "Select"
 msgstr "é??æ?©"
 
-#: ../panels/user-accounts/um-photo-dialog.c:212
+#: ../panels/user-accounts/um-photo-dialog.c:216
 #: ../panels/user-accounts/data/photo-dialog.ui.h:2
 msgid "Browse for more pictures"
 msgstr "æµ?è§?æ?´å¤?å?¾ç??"
 
-#: ../panels/user-accounts/um-photo-dialog.c:431
+#: ../panels/user-accounts/um-photo-dialog.c:429
+msgid "Disable image"
+msgstr "ç¦?ç?¨å?¾å??"
+
+#: ../panels/user-accounts/um-photo-dialog.c:447
 msgid "Take a photo..."
 msgstr "ç?§ç?¸..."
 
-#: ../panels/user-accounts/um-photo-dialog.c:449
+#: ../panels/user-accounts/um-photo-dialog.c:465
 msgid "Browse for more pictures..."
 msgstr "æµ?è§?æ?´å¤?å?¾ç??..."
 
-#: ../panels/user-accounts/um-photo-dialog.c:680
+#: ../panels/user-accounts/um-photo-dialog.c:693
 #, c-format
 msgid "Used by %s"
 msgstr "å·²è¢« %s ä½¿ç?¨"
@@ -2649,74 +2553,73 @@ msgstr "å??ä¸º %s ç??ç?¨æ?·å·²å?å?¨ã??"
 msgid "This user does not exist."
 msgstr "è¯¥ç?¨æ?·ä¸?å?å?¨ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:349
+#: ../panels/user-accounts/um-user-panel.c:352
 msgid "Failed to delete user"
 msgstr "å? é?¤ç?¨æ?·å¤±è´¥"
 
-#: ../panels/user-accounts/um-user-panel.c:409
+#: ../panels/user-accounts/um-user-panel.c:412
 msgid "You cannot delete your own account."
 msgstr "æ?¨ä¸?è?½å? é?¤è?ªå·±ç??å¸?æ?·ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:418
+#: ../panels/user-accounts/um-user-panel.c:421
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s å·²ç»?ç?»å½?"
 
-#: ../panels/user-accounts/um-user-panel.c:422
+#: ../panels/user-accounts/um-user-panel.c:425
 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:434
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "æ?¨æ?³è¦?ä¿?æ?? %s ç??æ??ä»¶å??ï¼?"
 
-#: ../panels/user-accounts/um-user-panel.c:435
+#: ../panels/user-accounts/um-user-panel.c:438
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
-msgstr ""
-"å? é?¤ç?¨æ?·æ?¶å?¯ä»¥ä¿?ç??ç?¨æ?·ä¸»ç?®å½?ã??ç?µå?é?®ä»¶ç?®å½?å??ä¸´æ?¶æ??ä»¶ã??"
+msgstr "å? é?¤ç?¨æ?·æ?¶å?¯ä»¥ä¿?ç??ç?¨æ?·ä¸»ç?®å½?ã??ç?µå?é?®ä»¶ç?®å½?å??ä¸´æ?¶æ??ä»¶ã??"
 
-#: ../panels/user-accounts/um-user-panel.c:438
+#: ../panels/user-accounts/um-user-panel.c:441
 msgid "_Delete Files"
 msgstr "å? é?¤æ??ä»¶(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:439
+#: ../panels/user-accounts/um-user-panel.c:442
 msgid "_Keep Files"
 msgstr "ä¿?ç??æ??ä»¶(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:440
+#: ../panels/user-accounts/um-user-panel.c:443
 msgid "_Cancel"
 msgstr "å??æ¶?(_C)"
 
-#: ../panels/user-accounts/um-user-panel.c:464
+#: ../panels/user-accounts/um-user-panel.c:467
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "å¸?æ?·å·²ç¦?ç?¨"
 
-#: ../panels/user-accounts/um-user-panel.c:473
+#: ../panels/user-accounts/um-user-panel.c:476
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "ä¸?æ¬¡ç?»å½?æ?¶è®¾ç½®"
 
-#: ../panels/user-accounts/um-user-panel.c:476
+#: ../panels/user-accounts/um-user-panel.c:479
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ? "
 
-#: ../panels/user-accounts/um-user-panel.c:818
+#: ../panels/user-accounts/um-user-panel.c:821
 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:823
 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:856
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -2724,13 +2627,13 @@ msgstr ""
 "è¦?è¿?è¡?æ?´æ?¹ï¼?\n"
 "è¯·å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:890
+#: ../panels/user-accounts/um-user-panel.c:894
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "Create a user"
 msgstr "å??å»ºç?¨æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:901
-#: ../panels/user-accounts/um-user-panel.c:1177
+#: ../panels/user-accounts/um-user-panel.c:905
+#: ../panels/user-accounts/um-user-panel.c:1181
 msgid ""
 "To create a user,\n"
 "click the * icon first"
@@ -2738,13 +2641,13 @@ msgstr ""
 "è¦?å??å»ºç?¨æ?·ï¼?\n"
 "è¯·å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:910
+#: ../panels/user-accounts/um-user-panel.c:914
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
 msgid "Delete the selected user"
 msgstr "å? é?¤é??ä¸ç??ç?¨æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:922
-#: ../panels/user-accounts/um-user-panel.c:1182
+#: ../panels/user-accounts/um-user-panel.c:926
+#: ../panels/user-accounts/um-user-panel.c:1186
 msgid ""
 "To delete the selected user,\n"
 "click the * icon first"
@@ -2752,11 +2655,11 @@ msgstr ""
 "è¦?å? é?¤é??ä¸ç??ç?¨æ?·ï¼?\n"
 "è¯·å??ç?¹å?» * å?¾æ ?"
 
-#: ../panels/user-accounts/um-user-panel.c:1086
+#: ../panels/user-accounts/um-user-panel.c:1090
 msgid "My Account"
 msgstr "æ??ç??å¸?æ?·"
 
-#: ../panels/user-accounts/um-user-panel.c:1095
+#: ../panels/user-accounts/um-user-panel.c:1099
 msgid "Other Accounts"
 msgstr "å?¶ä»?å¸?æ?·"
 
@@ -2764,7 +2667,12 @@ msgstr "å?¶ä»?å¸?æ?·"
 msgid "Add or remove users"
 msgstr "æ·»å? æ??å? é?¤ç?¨æ?·"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
+#. Translators: those are keywords for the user accounts control-center panel
+#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:3
+msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
+msgstr "ç?»å½?;å??ç§°;æ??çº¹;Avatar;Logo;å?£ä»¤;"
+
+#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "User Accounts"
 msgstr "ç?¨æ?·å¸?æ?·"
 
@@ -2798,8 +2706,8 @@ 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>"
+"<a href=\"http://wolfram.org/writing/howto/password.html\";>å¦?ä½?é??æ?©ä¸?ä¸ªå¥½å¯?ç ?"
+"</a>"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
 msgid ""
@@ -2807,8 +2715,8 @@ msgid ""
 "to all users of this system.  Do <b>not</b> include the password here.</"
 "small>"
 msgstr ""
-"<small>è¿?ä¸ªæ??ç¤ºå?¯è?½æ?¾ç¤ºå?¨ç?»å½?å±?å¹?ã??å®?å°?å¯¹æ¤ç³»ç»?ç??æ??æ??ç?¨æ?·å?¯è§?ã??"
-"è¯· <b>ä¸?è¦?</b> æ??å¯?ç ?å??å?¨è¿?é??ã??</small>"
+"<small>è¿?ä¸ªæ??ç¤ºå?¯è?½æ?¾ç¤ºå?¨ç?»å½?å±?å¹?ã??å®?å°?å¯¹æ¤ç³»ç»?ç??æ??æ??ç?¨æ?·å?¯è§?ã??è¯· <b>ä¸?è¦?</"
+"b> æ??å¯?ç ?å??å?¨è¿?é??ã??</small>"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:3
 msgid "C_onfirm password:"
@@ -2848,7 +2756,7 @@ msgstr "ä¸?è?¬"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "Log in without a password"
-msgstr ""
+msgstr "ä¸?ä½¿ç?¨å¯?ç ?ç?»å½?"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:13
 msgid "Set a password now"
@@ -2881,8 +2789,7 @@ 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."
-msgstr ""
-"é??æ?©ä¸?ä¸ªå?¨ç?»å½?å±?å¹?ä¸?å??æ¤å¸?æ?·ä¸?å??æ?¾ç¤ºç??å?¾ç??ã??"
+msgstr "é??æ?©ä¸?ä¸ªå?¨ç?»å½?å±?å¹?ä¸?å??æ¤å¸?æ?·ä¸?å??æ?¾ç¤ºç??å?¾ç??ã??"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:6
 msgid "Gallery"
@@ -2948,7 +2855,7 @@ msgstr "ç?»å½?é??é¡¹"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:20
 msgid "Open"
-msgstr ""
+msgstr "æ??å¼?"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:21
 msgid "Password:"
@@ -3020,6 +2927,27 @@ msgid ""
 "using your fingerprint reader."
 msgstr "æ?¨ç??æ??çº¹å·²æ??å??ä¿?å?ã??æ?¨ç?°å?¨åº?è¯¥å?¯ä»¥ä½¿ç?¨æ??çº¹è¯»å??å?¨ç?»å½?äº?ã??"
 
+#: ../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 "ç³»ç»?è®¾ç½®"
@@ -3036,6 +2964,11 @@ msgstr "ç¤ºä¾?é?¢æ?¿"
 msgid "Example preferences panel"
 msgstr "ç¤ºä¾?é¦?é??é¡¹é?¢æ?¿"
 
+#. Translators: those are keywords for the example control-center panel
+#: ../examples/gnome-example-panel.desktop.in.in.h:4
+msgid "Foo;Bar;Baz;"
+msgstr "Foo;Bar;Baz;"
+
 #: ../shell/shell.ui.h:2
 msgid "_All Settings"
 msgstr "å?¨é?¨è®¾ç½®(_A)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]