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

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Thu, 3 Feb 2011 06:33:31 +0000 (UTC)
commit b415a03a8ffb4b2abcc9bf8e6546b09eb0e6fe15
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Feb 3 14:33:22 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  717 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po |  717 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 724 insertions(+), 710 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ae24e2a..c443aea 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 2.91.5\n"
+"Project-Id-Version: gnome-control-center 2.91.7\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"
+"POT-Creation-Date: 2011-02-03 14:32+0800\n"
+"PO-Revision-Date: 2011-02-03 14:32+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"
@@ -163,10 +163,8 @@ msgstr "æ?´æ?¹è??æ?¯"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
-#, fuzzy
-#| msgid "Wallpaper;Screen;"
 msgid "Wallpaper;Screen;Desktop;"
-msgstr "Wallpaper;Screen;æ¡?å¸?;è?¢å¹?;"
+msgstr "Wallpaper;Screen;Desktop;æ¡?å¸?;è?¢å¹?;æ¡?é?¢;"
 
 #: ../panels/background/background.ui.h:1
 msgid "Center"
@@ -338,6 +336,48 @@ msgstr "å??å??ï¼?"
 msgid "September"
 msgstr "ä¹?æ??"
 
+#: ../panels/datetime/dt-lockbutton.c:347 ../panels/screen/screen.ui.h:13
+#: ../panels/user-accounts/um-lockbutton.c:347
+msgid "Lock"
+msgstr "é??å®?"
+
+#: ../panels/datetime/dt-lockbutton.c:356 ../panels/network/network.ui.h:23
+#: ../panels/user-accounts/um-lockbutton.c:356
+msgid "Unlock"
+msgstr "è§£é??"
+
+#: ../panels/datetime/dt-lockbutton.c:365
+#: ../panels/user-accounts/um-lockbutton.c:365
+msgid "Locked"
+msgstr "å·²é??å®?"
+
+#: ../panels/datetime/dt-lockbutton.c:374
+#: ../panels/user-accounts/um-lockbutton.c:374
+msgid ""
+"Dialog is unlocked.\n"
+"Click to prevent further changes"
+msgstr ""
+"å°?è©±ç??å·²è§£é??ã??\n"
+"é»?é?¸ä»¥é?²æ¢é?²ä¸?æ¥ç??æ?´æ?¹"
+
+#: ../panels/datetime/dt-lockbutton.c:383
+#: ../panels/user-accounts/um-lockbutton.c:383
+msgid ""
+"Dialog is locked.\n"
+"Click to make changes"
+msgstr ""
+"å°?è©±ç??å·²é??å®?ã??\n"
+"é»?é?¸é?²è¡?æ?´æ?¹"
+
+#: ../panels/datetime/dt-lockbutton.c:392
+#: ../panels/user-accounts/um-lockbutton.c:392
+msgid ""
+"System policy prevents changes.\n"
+"Contact your system administrator"
+msgstr ""
+"ç³»çµ±å??å??æ?¯é?²æ¢é?²è¡?æ?´æ?¹ç??ã??\n"
+"è«?è?¯çµ¡ä½ ç??ç³»çµ±ç®¡ç??å?¡"
+
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Clock;Timezone;Location;"
@@ -352,18 +392,17 @@ msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ??å?»å??å¥½è¨å®?é?¢æ?¿"
 
 #: ../panels/display/display-capplet.ui.h:1
-#: ../panels/display/xrandr-capplet.c:321
 msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:484
+#: ../panels/display/xrandr-capplet.c:503
 msgid "Monitor"
 msgstr "é¡¯ç¤ºå?¨"
 
 #: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:320
-#: ../panels/display/xrandr-capplet.c:359
+#: ../panels/display/xrandr-capplet.c:339
+#: ../panels/display/xrandr-capplet.c:378
 #: ../panels/universal-access/uap.ui.h:58
 msgid "Normal"
 msgstr "æ£å¸¸"
@@ -377,7 +416,6 @@ msgid "R_otation:"
 msgstr "æ??è½?(_O):"
 
 #: ../panels/display/display-capplet.ui.h:6
-#: ../panels/display/xrandr-capplet.c:322
 msgid "Right"
 msgstr "å?³"
 
@@ -411,60 +449,68 @@ msgstr "é¡¯ç¤ºå?¨"
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;è§£å??åº¦;é??æ?°æ?´ç??;"
 
-#: ../panels/display/xrandr-capplet.c:323
-msgid "Upside Down"
-msgstr "ç?±ä¸?è??ä¸?"
+#: ../panels/display/xrandr-capplet.c:340
+msgid "Anti-Clockwise"
+msgstr "é??æ??é??"
+
+#: ../panels/display/xrandr-capplet.c:341
+msgid "Clockwise"
+msgstr "é ?æ??é??"
+
+#: ../panels/display/xrandr-capplet.c:342
+msgid "180 Degrees"
+msgstr "180 åº¦"
 
 #. Translators:  this is the feature where what you see on your laptop's
 #. * screen is the same as your external monitor.  Here, "Mirror" is being
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:460
+#: ../panels/display/xrandr-capplet.c:479
 msgid "Mirror Displays"
 msgstr "é?¡å°?é¡¯ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:593
+#: ../panels/display/xrandr-capplet.c:612
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:595
+#: ../panels/display/xrandr-capplet.c:614
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1505
+#: ../panels/display/xrandr-capplet.c:1527
 msgid "Drag to change primary display."
 msgstr "æ??æ?³ä»¥æ?¹è®?ä¸»è¦?é¡¯ç¤ºå?¨ã??"
 
-#: ../panels/display/xrandr-capplet.c:1563
+#: ../panels/display/xrandr-capplet.c:1585
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é?¸æ??ä¸?å??è?¢å¹?ä»¥æ?¹è®?å®?ç??å±¬æ?§ï¼?æ??æ?³å®?å??è?½é??æ?°æ??å??å®?ç??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1953
+#: ../panels/display/xrandr-capplet.c:1975
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1955
+#: ../panels/display/xrandr-capplet.c:1977
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/xrandr-capplet.c:2240
+#: ../panels/display/xrandr-capplet.c:2262
 msgid "Could not save the monitor configuration"
 msgstr "ç?¡æ³?å?²å?é¡¯ç¤ºå?¨çµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2263
+#: ../panels/display/xrandr-capplet.c:2285
 msgid "Could not get session bus while applying display configuration"
 msgstr "å?¨å¥?ç?¨é¡¯ç¤ºçµ?æ??æ??ç?¡æ³?å??å¾?ä½?æ¥é??æ®µå?¯æµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2308
+#: ../panels/display/xrandr-capplet.c:2330
 msgid "Could not detect displays"
 msgstr "ç?¡æ³?å?µæ¸¬é¡¯ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:2516
+#: ../panels/display/xrandr-capplet.c:2538
 msgid "Could not get screen information"
 msgstr "ç?¡æ³?å??å¾?è?¢å¹?è³?è¨?"
 
@@ -561,14 +607,22 @@ msgstr "è??ç??å?¨ï¼?"
 msgid "Update Available"
 msgstr "æ??æ?´æ?°å?¯ç?¨"
 
-#: ../panels/keyboard/00-multimedia-key.xml.in.h:1
+#: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "è?²é?³è??åª?é«?"
 
-#: ../panels/keyboard/01-desktop-key.xml.in.h:1
-msgid "Launchers and Actions"
+#: ../panels/keyboard/01-launchers.xml.in.h:1
+#, fuzzy
+#| msgid "Launchers and Actions"
+msgid "Launchers"
 msgstr "å?·è¡?å?¨è??å??ä½?"
 
+#: ../panels/keyboard/01-system.xml.in.h:1
+#, fuzzy
+#| msgid "System Info"
+msgid "System"
+msgstr "ç³»çµ±è³?è¨?"
+
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
 msgstr "æ?°å¢?æ?·å¾?é?µâ?¦"
@@ -599,7 +653,7 @@ msgstr "æ?·å¾?é?µç??é¡?å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1229
+#: ../panels/keyboard/keyboard-shortcuts.c:1268
 #: ../panels/sound/gvc-mixer-control.c:1091
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
@@ -620,22 +674,22 @@ msgstr "é?µç?¤"
 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
+#: ../panels/keyboard/keyboard-shortcuts.c:775
+#: ../panels/keyboard/keyboard-shortcuts.c:1040
+#: ../panels/keyboard/keyboard-shortcuts.c:1674
+#: ../panels/keyboard/keyboard-shortcuts.c:1678
 msgid "Custom Shortcuts"
 msgstr "è?ªé?¸æ?·å¾?é?µ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:848
+#: ../panels/keyboard/keyboard-shortcuts.c:887
 msgid "<Unknown Action>"
 msgstr "<è¡?å??è¨å®?ä¸?è©³>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1255
+#: ../panels/keyboard/keyboard-shortcuts.c:1294
 msgid "Error saving the new shortcut"
 msgstr "å?²å?æ?°ç??æ?·å¾?é?µæ??ç?¼ç??é?¯èª¤"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1365
+#: ../panels/keyboard/keyboard-shortcuts.c:1404
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -645,7 +699,7 @@ msgstr ""
 "æ?·å¾?â??%sâ??ç?¡æ³?ä½¿ç?¨ï¼?å??å? æ?¯æ??ç?¡æ³?æ??ä¸?æ¤æ??é?µã??\n"
 "è«?è©¦ç?¨å?¶å®?ç??æ??é?µï¼?å¦?å??æ??ä½¿ç?¨ Controlï¼?Alt  æ?? Shiftã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1395
+#: ../panels/keyboard/keyboard-shortcuts.c:1434
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -654,36 +708,34 @@ msgstr ""
 "æ?·å¾?é?µâ??%sâ??å·±ç¶?ä½¿ç?¨æ?¼ï¼?\n"
 "â??%sâ??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1401
+#: ../panels/keyboard/keyboard-shortcuts.c:1440
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??ä½ é??æ?°æ??æ´¾æ?·å¾?é?µç?ºã??%sã??ï¼?ã??%sã??ç??æ?·å¾?é?µå°±æ??å??ç?¨ã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1409
+#: ../panels/keyboard/keyboard-shortcuts.c:1448
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1529
+#: ../panels/keyboard/keyboard-shortcuts.c:1568
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s"
 msgstr "å?¨çµ?æ??è³?æ??åº«ä¸å??æ¶?è¨å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1587
+#: ../panels/keyboard/keyboard-shortcuts.c:1626
 msgid "Too many custom shortcuts"
 msgstr "å¤ªå¤?è?ªé?¸æ?·å¾?é?µ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1866
-#, fuzzy
-#| msgid "Action"
+#: ../panels/keyboard/keyboard-shortcuts.c:1907
 msgid "Section"
 msgstr "ç¯?"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1910
+#: ../panels/keyboard/keyboard-shortcuts.c:1956
 msgid "Action"
 msgstr "å??ä½?"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1932
+#: ../panels/keyboard/keyboard-shortcuts.c:1979
 msgid "Shortcut"
 msgstr "æ?·å¾?é?µ"
 
@@ -782,7 +834,7 @@ msgstr "é??åº¦(_S):"
 msgid "Ask what to do"
 msgstr "è©¢å??è¦?å??ä»?éº¼"
 
-#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:8
+#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:6
 msgid "Do nothing"
 msgstr "ä¸?å??ä»»ä½?äº?"
 
@@ -791,34 +843,24 @@ msgid "Open folder"
 msgstr "é??å??è³?æ??å¤¾"
 
 #: ../panels/media/cc-media-panel.c:441
-#, fuzzy
-#| msgid "Select an Application"
 msgid "Select an application for audio CDs"
-msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
+msgstr "é?¸æ??æ?æ?¾é?³æ¨? CD ç??æ??ç?¨ç¨?å¼?"
 
 #: ../panels/media/cc-media-panel.c:442
-#, fuzzy
-#| msgid "Select an application to view its description."
 msgid "Select an application for video DVDs"
-msgstr "é?¸å??æ??ç?¨ç¨?å¼?ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
+msgstr "é?¸æ??æ?æ?¾å½±ç?? DVD ç??æ??ç?¨ç¨?å¼?"
 
 #: ../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 "é?¸å??æ??ç?¨ç¨?å¼?ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
+msgstr "é?¸æ??ç?¶é?³æ¨?æ?æ?¾å?¨é?£æ?¥æ??è¦?å?·è¡?ç??æ??ç?¨ç¨?å¼?"
 
 #: ../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 "é?¸å??æ??ç?¨ç¨?å¼?ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
+msgstr "é?¸æ??ç?¶æ??å½±æ©?é?£æ?¥æ??è¦?å?·è¡?ç??æ??ç?¨ç¨?å¼?"
 
 #: ../panels/media/cc-media-panel.c:445
-#, fuzzy
-#| msgid "Select an Application"
 msgid "Select an application for software CDs"
-msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
+msgstr "é?¸æ??è»?ä»¶ CD è¦?ç?¨ç??æ??ç?¨ç¨?å¼?"
 
 #. translators: these strings are duplicates of shared-mime-info
 #. * strings, just here to fix capitalization of the English originals.
@@ -827,53 +869,47 @@ msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
 #.
 #: ../panels/media/cc-media-panel.c:457
 msgid "audio DVD"
-msgstr ""
+msgstr "é?³æ¨? DVD"
 
 #: ../panels/media/cc-media-panel.c:458
 msgid "blank Blu-ray disc"
-msgstr ""
+msgstr "ç©ºç?½ Blu-ray å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:459
 msgid "blank CD disc"
-msgstr ""
+msgstr "ç©ºç?½ CD å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:460
 msgid "blank DVD disc"
-msgstr ""
+msgstr "ç©ºç?½ DVD å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:461
 msgid "blank HD DVD disc"
-msgstr ""
+msgstr "ç©ºç?½ HD DVD å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:462
 msgid "Blu-ray video disc"
-msgstr ""
+msgstr "Blu-Ray å½±ç??å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:463
 msgid "e-book reader"
-msgstr ""
+msgstr "é?»å?æ?¸é?±è®?å?¨"
 
 #: ../panels/media/cc-media-panel.c:464
-#, fuzzy
-#| msgid "_DVD video:"
 msgid "HD DVD video disc"
-msgstr "_DVD å½±ç??ï¼?"
+msgstr "HD DVD å½±ç??å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:465
-#, fuzzy
-#| msgid "Pictures Folder"
 msgid "Picture CD"
-msgstr "å??ç??è³?æ??å¤¾"
+msgstr "ç?§ç?? CD"
 
 #: ../panels/media/cc-media-panel.c:466
 msgid "Super Video CD"
-msgstr ""
+msgstr "SVCD"
 
 #: ../panels/media/cc-media-panel.c:467
-#, fuzzy
-#| msgid "Video Mouse"
 msgid "Video CD"
-msgstr "è¦?å??æ»?é¼ "
+msgstr "å½±ç?? CD"
 
 #: ../panels/media/gnome-media-properties.ui.h:1
 msgid "Acti_on:"
@@ -931,178 +967,191 @@ msgstr "è¨å®?åª?é«?å??è?ªå??å?·è¡?å??å¥½è¨å®?"
 msgid "Removable Media"
 msgstr "å?¯ç§»é?¤å¼?åª?é«?"
 
+#. Translators: those are keywords for the media control-center panel
+#: ../panels/media/gnome-media-panel.desktop.in.in.h:4
+msgid "cd;dvd;usb;audio;video;disc;"
+msgstr "cd;dvd;usb;audio;video;disc;å??ç¢?;å½±ç??;é?³æ¨?;"
+
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:210
+#: ../panels/printers/cc-printers-panel.c:220
 msgid "Low on toner"
 msgstr "ç¢³ç²?ä¸?è¶³"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:212
+#: ../panels/printers/cc-printers-panel.c:222
 msgid "Out of toner"
 msgstr "ç¢³ç²?ç?¨å®?"
 
-#. Translators: "Developer" like on photo development context
-#: ../panels/printers/cc-printers-panel.c:214
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/cc-printers-panel.c:225
 msgid "Low on developer"
 msgstr "é¡¯å??å??ä¸?è¶³"
 
-#. Translators: "Developer" like on photo development context
-#: ../panels/printers/cc-printers-panel.c:216
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/cc-printers-panel.c:228
 msgid "Out of developer"
 msgstr "é¡¯å??å??ç?¨å®?"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:218
+#: ../panels/printers/cc-printers-panel.c:230
 msgid "Low on a marker supply"
 msgstr "å¢¨æ°´å?£ä¸?è¶³"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:220
+#: ../panels/printers/cc-printers-panel.c:232
 msgid "Out of a marker supply"
 msgstr "å¢¨æ°´å?£ç?¨å®?"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:222
+#: ../panels/printers/cc-printers-panel.c:234
 #, 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
+#: ../panels/printers/cc-printers-panel.c:236
 #, 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
+#: ../panels/printers/cc-printers-panel.c:238
 msgid "Low on paper"
 msgstr "ç´?å¼µä¸?è¶³ã??"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:228
+#: ../panels/printers/cc-printers-panel.c:240
 msgid "Out of paper"
 msgstr "ç´?å¼µç?¨å®?"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:230
+#: ../panels/printers/cc-printers-panel.c:242
 msgid "Offline"
 msgstr "é?¢ç·?"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:232
+#: ../panels/printers/cc-printers-panel.c:244
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:234
+#: ../panels/printers/cc-printers-panel.c:246
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:236
+#: ../panels/printers/cc-printers-panel.c:248
 #, fuzzy
 msgid "Waste receptacle full"
 msgstr "ä¿?è?? [25 å??]"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:238
+#: ../panels/printers/cc-printers-panel.c:250
 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
+#: ../panels/printers/cc-printers-panel.c:252
 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
+#: ../panels/printers/cc-printers-panel.c:344
 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
+#: ../panels/printers/cc-printers-panel.c:348
+#: ../panels/printers/cc-printers-panel.c:794
 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
+#: ../panels/printers/cc-printers-panel.c:352
+#: ../panels/printers/cc-printers-panel.c:798
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
+#. Translators: there is n active print jobs on this printer
+#: ../panels/printers/cc-printers-panel.c:465
+#, c-format
+msgid "%d active"
+msgstr "%d å??ä½¿ç?¨ä¸"
+
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:718
+#: ../panels/printers/cc-printers-panel.c:786
 msgid "Pending"
 msgstr "ç?å¾?ä¸"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:722
+#: ../panels/printers/cc-printers-panel.c:790
 msgid "Held"
 msgstr "å·²æ?«å??"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:734
+#: ../panels/printers/cc-printers-panel.c:802
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:738
+#: ../panels/printers/cc-printers-panel.c:806
 msgid "Aborted"
 msgstr "å·²æ?¾æ£?"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:742
+#: ../panels/printers/cc-printers-panel.c:810
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:837
+#: ../panels/printers/cc-printers-panel.c:905
 msgid "Job Title"
 msgstr "å·¥ä½?å??ç¨±"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:845
+#: ../panels/printers/cc-printers-panel.c:913
 msgid "Job State"
 msgstr "å·¥ä½?ç??æ??"
 
 #. Translators: Name of column showing names of creators of print jobs
-#: ../panels/printers/cc-printers-panel.c:851
+#: ../panels/printers/cc-printers-panel.c:919
 msgid "User"
 msgstr "ä½¿ç?¨è??"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:857
+#: ../panels/printers/cc-printers-panel.c:925
 msgid "Time"
 msgstr "æ??å?»"
 
 #. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1047
+#: ../panels/printers/cc-printers-panel.c:1115
 #, 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
+#: ../panels/printers/cc-printers-panel.c:1767
 msgid "Test page"
 msgstr "æ¸¬è©¦é ?"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1665
+#: ../panels/printers/cc-printers-panel.c:1775
 msgid "Clean print heads"
 msgstr "æ¸?ç??æ??å?°å?´é "
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1670
+#: ../panels/printers/cc-printers-panel.c:1780
 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
+#: ../panels/printers/cc-printers-panel.c:1906
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
@@ -1121,158 +1170,114 @@ 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 "æ¸?ç??æ??å?°å?´é "
+#: ../panels/printers/printers.ui.h:2
+msgid "0 active"
+msgstr "0 ä½¿ç?¨ä¸"
+
+#: ../panels/printers/printers.ui.h:3
+msgid "<b>Allowed users</b>"
+msgstr "<b>å??è¨ç??ä½¿ç?¨è??</b>"
+
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/printers.ui.h:5
+msgid "Active Print Jobs"
+msgstr "ä½¿ç?¨ä¸ç??æ??å?°å·¥ä½?"
+
+#. Translators: Switch back to printer's info tab
+#: ../panels/printers/printers.ui.h:7
+msgid "Back"
+msgstr "è¿?å??"
 
 #. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:6
+#: ../panels/printers/printers.ui.h:9
 #: ../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 "å??ç?¨æ??å?°æ©?"
+msgid "IP Address"
+msgstr "IP ä½?å??"
+
+#: ../panels/printers/printers.ui.h:11
+msgid "Info"
+msgstr "è³?è¨?"
 
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
 #: ../panels/printers/printers.ui.h:12
-msgid "Location:"
-msgstr "ä½?ç½®:"
+msgid "Jobs"
+msgstr "å·¥ä½?"
 
-#. Translators: This button executes command which prints test page.
+#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
 #: ../panels/printers/printers.ui.h:14
-msgid "Print Test Page"
-msgstr "æ??å?°æ¸¬è©¦é ?"
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#: ../panels/printers/printers.ui.h:15
+msgid "Model"
+msgstr "å??è??"
 
-#. Translators: A widget showing list of print jobs for selected printer.
-#: ../panels/printers/printers.ui.h:16
-msgid "Printer Jobs"
-msgstr "æ??å?°æ©?å·¥ä½?"
+#. Translators: This button opens printer's options tab
+#: ../panels/printers/printers.ui.h:17
+msgid "Options"
+msgstr "é?¸é ?"
 
-#. Translators: This shows queue of print jobs.
-#: ../panels/printers/printers.ui.h:18
-msgid "Queue"
-msgstr "ä½?å??"
+#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:19
+msgid "Print Test Page"
+msgstr "æ??å?°æ¸¬è©¦é ?"
 
-#. Translators: Users which are allowed to print on this printer.
 #: ../panels/printers/printers.ui.h:20
-msgid "Share with these users:"
-msgstr "è??é??äº?ä½¿ç?¨è??å??äº«ï¼?"
+msgid "Printer"
+msgstr "æ??å?°æ©?"
 
-#: ../panels/printers/printers.ui.h:21
-msgid "Show / hide printer's jobs"
-msgstr "é¡¯ç¤º / é?±è??æ??å?°æ©?å·¥ä½?"
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/printers.ui.h:22
+msgid "Printer Options"
+msgstr "æ??å?°æ©?é?¸é ?"
 
-#. Translators: Status of the printer.
 #: ../panels/printers/printers.ui.h:23
-msgid "Status:"
-msgstr "ç??æ??ï¼?"
+msgid "Printing..."
+msgstr "æ£å?¨æ??å?°â?¦"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
+#. Tanslators: Switch to tab containing printer's jobs
 #: ../panels/printers/printers.ui.h:25
-msgid "Supply:"
-msgstr "è??æ??ï¼?"
-
-#: ../panels/printers/printers.ui.h:26
-#, fuzzy
-#| msgid "add-toolbutton"
-msgid "pause-toolbutton"
-msgstr "å? å?¥å·¥å?·æ??é??"
+msgid "Show"
+msgstr "é¡¯ç¤º"
 
+#. Translators: By supply we mean ink, toner, staples, water, ...
 #: ../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 "å? å?¥å·¥å?·æ??é??"
+msgid "Supply"
+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
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Layouts"
 msgstr "é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "List of keyboard layouts selected for usage"
 msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Move _Down"
-msgstr "ä¸?ç§»(_D)"
-
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Move _Up"
-msgstr "ä¸?ç§»(_U)"
-
-#: ../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:9
-msgid "Move the selected keyboard layout up in the list"
-msgstr "å°?æ¸?å?®ä¸é?¸å??ç??é?µç?¤é??ç½®å??ä¸?ç§»å??"
-
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "New windows u_se active window's layout"
 msgstr "æ?°è¦?çª?å»¶ç?¨ä½¿ç?¨ä¸è¦?çª?ç??é??ç½®(_S)"
 
-#: ../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:12
+#: ../panels/region/gnome-region-panel.ui.h:6
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "å?°å??å??èª?è¨?"
 
-#: ../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:14
+#: ../panels/region/gnome-region-panel.ui.h:7
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
@@ -1280,31 +1285,23 @@ msgstr ""
 "ä»¥é ?è¨å?¼æ?¿æ??ç?®å??ç??é?µç?¤é??ç½®\n"
 "è¨å®?å?¼"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Reset to De_faults"
 msgstr "é??ç½®ç?ºé ?è¨å?¼(_F)"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
+#: ../panels/region/gnome-region-panel.ui.h:10
 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:19
+#: ../panels/region/gnome-region-panel.ui.h:11
 msgid "View and edit keyboard layout options"
 msgstr "æª¢è¦?ä¸¦ç·¨è¼¯é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "_Add..."
-msgstr "å? å?¥(_A)â?¦"
-
-#: ../panels/region/gnome-region-panel.ui.h:21
+#: ../panels/region/gnome-region-panel.ui.h:12
 msgid "_Options..."
 msgstr "é?¸é ?(_O)â?¦"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "_Separate layout for each window"
 msgstr "çµ¦æ¯?ä¸?å??è¦?çª?ç?¨ç«?ç??é??ç½®(_S)"
 
@@ -1336,51 +1333,22 @@ msgstr "èª?è¨?(_L):"
 msgid "_Variants:"
 msgstr "è®?é«?(_V):"
 
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:1
-msgid "Choose a Keyboard Model"
-msgstr "é?¸æ??é?µç?¤å??è??"
-
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:2
-msgid "_Models:"
-msgstr "å??è??(_M):"
-
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:3
-msgid "_Vendors:"
-msgstr "è£½é? å??(_V):"
-
 #: ../panels/region/gnome-region-panel-options-dialog.ui.h:1
 msgid "Keyboard Layout Options"
 msgstr "é?µç?¤é??ç½®é?¸é ?"
 
-#. TRANSLATORS: device type
-#. TRANSLATORS: AP type
-#: ../panels/region/gnome-region-panel-xkb.c:70
-#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
 #: ../panels/region/gnome-region-panel-xkblt.c:220
 msgid "Layout"
 msgstr "é??ç½®"
 
-#: ../panels/region/gnome-region-panel-xkbmc.c:163
-msgid "Vendors"
-msgstr "è£½é? å??"
-
-#: ../panels/region/gnome-region-panel-xkbmc.c:229
-msgid "Models"
-msgstr "å??è??"
-
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
 msgid "Change your region and language settings"
 msgstr "æ?¹è®?ä½ ç??å?°å??å??èª?è¨?è¨å®?å?¼"
 
 #. Translators: those are keywords for the region control-center panel
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:3
-#, fuzzy
-#| msgid "Language;Layout;"
 msgid "Language;Layout;Keyboard;"
-msgstr "Language;Layout;èª?è¨?;é??ç½®;"
+msgstr "Language;Layout;Keyboard;èª?è¨?;é??ç½®;é?µç?¤;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "Disable _touchpad while typing"
@@ -1511,31 +1479,37 @@ msgstr "è¨å®?ä½ ç??æ»?é¼ è??è§¸æ?§æ?¿å??å¥½è¨å®?"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;è§¸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?è§¸;é?£æ??å?©ä¸?;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/cc-network-panel.c:1062
-#: ../panels/network/cc-network-panel.c:1084
+#: ../panels/network/cc-network-panel.c:1086
+#: ../panels/network/cc-network-panel.c:1108
 #, c-format
 msgid "%i Mb/s"
 msgstr "%i Mb/s"
 
-#: ../panels/network/cc-network-panel.c:1064
+#: ../panels/network/cc-network-panel.c:1088
 #, c-format
 msgid "%i Gb/s"
 msgstr "%i Gb/s"
 
-#: ../panels/network/cc-network-panel.c:1082
+#: ../panels/network/cc-network-panel.c:1106
 #, c-format
 msgid "%i kb/s"
 msgstr "%i kb/s"
 
-#: ../panels/network/cc-network-panel.c:1739
+#: ../panels/network/cc-network-panel.c:1763
 msgid "Network proxy"
 msgstr "ç¶²çµ¡ä»£ç??ä¼ºæ??å?¨"
 
-#: ../panels/network/cc-network-panel.c:1748
+#: ../panels/network/cc-network-panel.c:1772
 msgid "Set the system proxy settings"
 msgstr "è¨å®?ç³»çµ±ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼"
 
 #. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#. TRANSLATORS: device type
 #: ../panels/network/panel-common.c:69
 msgid "Wired"
 msgstr "æ??ç·?"
@@ -1723,11 +1697,6 @@ msgstr "é??åº¦ï¼?"
 msgid "Subnet Mask:"
 msgstr "å?ç¶²çµ¡é?®ç½©ï¼?"
 
-#: ../panels/network/network.ui.h:23
-#: ../panels/user-accounts/um-lockbutton.c:356
-msgid "Unlock"
-msgstr "è§£é??"
-
 #: ../panels/network/network.ui.h:24
 msgid "Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
@@ -1757,10 +1726,8 @@ 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;"
 msgid "Power;Sleep;Suspend;Hibernate;Battery;"
-msgstr "Power;Sleep;Suspend;Hibernate;é?»æº?;ç?¡ç? ;æ?«å??;ä¼?ç? ;"
+msgstr "Power;Sleep;Suspend;Hibernate;Battery;é?»æº?;ç?¡ç? ;æ?«å??;ä¼?ç? ;é?»æ± ;"
 
 #: ../panels/power/cc-power-panel.c:151
 msgid "Unknown time"
@@ -1847,55 +1814,49 @@ 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:8
+msgid "On AC power:"
+msgstr "ä½¿ç?¨ AC é?»æº?ï¼?"
+
+#: ../panels/power/power.ui.h:9
+msgid "On battery power:"
+msgstr "ä½¿ç?¨é?»æ± æ??ï¼?"
+
 #: ../panels/power/power.ui.h:10
-msgid "Put the computer to sleep when inactive for:"
+msgid "Put the computer to sleep when inactive:"
 msgstr "å?¨é??ç½®æ¤æ??é??å¾?è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
 
 #: ../panels/power/power.ui.h:11
-msgid "Put the computer to sleep when on:"
-msgstr "å?¨æ¤æ??é??è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
-
-#: ../panels/power/power.ui.h:12
 msgid "Shutdown"
 msgstr "é??æ©?"
 
-#: ../panels/power/power.ui.h:13
+#: ../panels/power/power.ui.h:12
 msgid "Suspend"
 msgstr "æ?«å??"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:13
 msgid "When power is critically low:"
 msgstr "ç?¶é?»æº?ç??é?»é??æ¥µä½?æ??ï¼?"
 
-#: ../panels/power/power.ui.h:15
+#: ../panels/power/power.ui.h:14
 msgid "When the power button is pressed:"
 msgstr "ç?¶é?»æº?é??é??æ??é??è¢«æ??ä¸?æ??ï¼?"
 
-#: ../panels/power/power.ui.h:16
+#: ../panels/power/power.ui.h:15
 msgid "When the sleep button is pressed:"
 msgstr "ç?¶ç?¡ç? æ??é??è¢«æ??ä¸?æ??ï¼?"
 
 #. Translators: those are keywords for the brightness and lock control-center panel
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-#, fuzzy
-#| msgid "Brightness;Lock;Dim;Blank;"
 msgid "Brightness;Lock;Dim;Blank;Monitor;"
-msgstr "Brightness;Lock;Dim;Blank;äº®åº¦;é??å®?;èª¿æ??;ç©ºç?½;"
+msgstr "Brightness;Lock;Dim;Blank;Monitor;äº®åº¦;é??å®?;èª¿æ??;ç©ºç?½;ç?£è¦?å?¨;"
 
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
 msgid "Screen"
@@ -1925,27 +1886,24 @@ msgstr "äº®åº¦"
 msgid "Dim screen to save power"
 msgstr "èª¿æ??è?¢å¹?ä»¥ç¯?ç??é?»æº?"
 
-#: ../panels/screen/screen.ui.h:10
+#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're detected to be physically in your home (your house, etc.)
+#: ../panels/screen/screen.ui.h:11
 msgid "Don't lock when at home"
 msgstr "å?¨å®¶æ??ä¸?è¦?é??å®?"
 
-#: ../panels/screen/screen.ui.h:11
+#: ../panels/screen/screen.ui.h:12
 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
+#: ../panels/screen/screen.ui.h:14
 msgid "Lock screen after:"
 msgstr "é??å®?è?¢å¹?æ??é??ï¼?"
 
-#: ../panels/screen/screen.ui.h:14
+#: ../panels/screen/screen.ui.h:15
 msgid "Screen turns off"
 msgstr "è?¢å¹?é??é??"
 
-#: ../panels/screen/screen.ui.h:15
+#: ../panels/screen/screen.ui.h:16
 msgid "Turn off after:"
 msgstr "é??é??æ??é??ï¼?"
 
@@ -2773,34 +2731,6 @@ msgstr ""
 msgid "Other..."
 msgstr "å?¶ä»?â?¦"
 
-#: ../panels/user-accounts/um-lockbutton.c:365
-msgid "Locked"
-msgstr "å·²é??å®?"
-
-#: ../panels/user-accounts/um-lockbutton.c:374
-msgid ""
-"Dialog is unlocked.\n"
-"Click to prevent further changes"
-msgstr ""
-"å°?è©±ç??å·²è§£é??ã??\n"
-"é»?é?¸ä»¥é?²æ¢é?²ä¸?æ¥ç??æ?´æ?¹"
-
-#: ../panels/user-accounts/um-lockbutton.c:383
-msgid ""
-"Dialog is locked.\n"
-"Click to make changes"
-msgstr ""
-"å°?è©±ç??å·²é??å®?ã??\n"
-"é»?é?¸é?²è¡?æ?´æ?¹"
-
-#: ../panels/user-accounts/um-lockbutton.c:392
-msgid ""
-"System policy prevents changes.\n"
-"Contact your system administrator"
-msgstr ""
-"ç³»çµ±å??å??æ?¯é?²æ¢é?²è¡?æ?´æ?¹ç??ã??\n"
-"è«?è?¯çµ¡ä½ ç??ç³»çµ±ç®¡ç??å?¡"
-
 #: ../panels/user-accounts/um-password-dialog.c:179
 msgid "More choices..."
 msgstr "æ?´å¤?é?¸æ??..."
@@ -3180,17 +3110,9 @@ msgid "Login Options"
 msgstr "ç?»å?¥é?¸é ?"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-msgid "Open"
-msgstr "é??å??"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Password:"
 msgstr "å¯?ç¢¼ï¼? "
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
-msgid "Restrictions:"
-msgstr "é??å?¶ï¼?"
-
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:2
 msgid "Left index finger"
 msgstr "å·¦æ??é£?æ??"
@@ -3274,6 +3196,104 @@ msgstr "æ?§å?¶ä¸å¿?"
 msgid "_All Settings"
 msgstr "æ??æ??è¨å®?å?¼(_A)"
 
+#~ msgid "Upside Down"
+#~ msgstr "ç?±ä¸?è??ä¸?"
+
+#~ msgid "Clean Print Heads"
+#~ msgstr "æ¸?ç??å??å?°å?´é "
+
+#~ msgid "Description:"
+#~ msgstr "æ??è¿°ï¼?"
+
+#~ msgid "Disable Printer"
+#~ msgstr "å??ç?¨å?°è¡¨æ©?"
+
+#~ msgid "Queue"
+#~ msgstr "ä½?å??"
+
+#~ msgid "Share with these users:"
+#~ msgstr "è??é??äº?ä½¿ç?¨è??å??äº«ï¼?"
+
+#~ msgid "Show / hide printer's jobs"
+#~ msgstr "é¡¯ç¤º / é?±è??å?°è¡¨æ©?å·¥ä½?"
+
+#~ msgid "Status:"
+#~ msgstr "ç??æ??ï¼?"
+
+#~| msgid "add-toolbutton"
+#~ msgid "pause-toolbutton"
+#~ msgstr "å? å?¥å·¥å?·æ??é??"
+
+#~| msgid "remove-toolbutton"
+#~ msgid "resume-toolbutton"
+#~ msgstr "ç§»é?¤å·¥å?·æ??é??"
+
+#~| msgid "add-toolbutton"
+#~ msgid "stop-toolbutton"
+#~ msgstr "å? å?¥å·¥å?·æ??é??"
+
+#~| msgid "add-toolbutton"
+#~ msgid "toolbutton1"
+#~ msgstr "å? å?¥å·¥å?·æ??é??"
+
+#~| msgid "add-toolbutton"
+#~ msgid "toolbutton2"
+#~ msgstr "å? å?¥å·¥å?·æ??é??"
+
+#~ msgid "Keyboard _model:"
+#~ msgstr "é?µç?¤æ¨¡å¼?(_M)"
+
+#~ msgid "Move _Down"
+#~ msgstr "ä¸?ç§»(_D)"
+
+#~ msgid "Move _Up"
+#~ msgstr "ä¸?ç§»(_U)"
+
+#~ msgid "Move the selected keyboard layout down in the list"
+#~ msgstr "å°?æ¸?å?®ä¸é?¸å??ç??é?µç?¤é??ç½®å??ä¸?ç§»å??"
+
+#~ msgid "Move the selected keyboard layout up in the list"
+#~ msgstr "å°?æ¸?å?®ä¸é?¸å??ç??é?µç?¤é??ç½®å??ä¸?ç§»å??"
+
+#~ msgid "Print a diagram of the selected keyboard layout"
+#~ msgstr "é¡¯ç¤ºé?¸å??ç??é?µç?¤é??ç½®ç??å??è¡¨"
+
+#~ msgid "Remove the selected keyboard layout from the list"
+#~ msgstr "å¾?æ¸?å?®ä¸ç§»é?¤é?¸å??ç??é?µç?¤é??ç½®"
+
+#~ msgid "Select a keyboard layout to be added to the list"
+#~ msgstr "é?¸æ??è¦?å? å?¥æ¸?å?®ç??é?µç?¤é??ç½®"
+
+#~ msgid "_Add..."
+#~ msgstr "å? å?¥(_A)â?¦"
+
+#~ msgid "Choose a Keyboard Model"
+#~ msgstr "é?¸æ??é?µç?¤å??è??"
+
+#~ msgid "_Models:"
+#~ msgstr "å??è??(_M):"
+
+#~ msgid "_Vendors:"
+#~ msgstr "è£½é? å??(_V):"
+
+#~ msgid "Vendors"
+#~ msgstr "è£½é? å??"
+
+#~ msgid "AC power and inactive for:"
+#~ msgstr "AC é?»æº?ä¸?é??ç½®ï¼?"
+
+#~ msgid "Battery power and inactive for:"
+#~ msgstr "é?»æ± é?»æº?ä¸?é??ç½®ï¼?"
+
+#~ msgid "Put the computer to sleep when on:"
+#~ msgstr "å?¨æ¤æ??é??è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
+
+#~ msgid "Open"
+#~ msgstr "é??å??"
+
+#~ msgid "Restrictions:"
+#~ msgstr "é??å?¶ï¼?"
+
 #~ msgid "Hold"
 #~ msgstr "ä¿?ç??"
 
@@ -3351,10 +3371,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Gray"
 #~ msgstr "ç?°"
 
-#~| msgid "Callback"
-#~ msgid "Black"
-#~ msgstr "é»?"
-
 #~ msgid "Colors"
 #~ msgstr "é¡?è?²"
 
@@ -4435,9 +4451,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Instant Messaging"
 #~ msgstr "å?³æ??è¨?æ?¯"
 
-#~ msgid "Job"
-#~ msgstr "è?·æ¥"
-
 #~ msgid "M_SN:"
 #~ msgstr "M_SN:"
 
@@ -4750,9 +4763,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Gra_yscale"
 #~ msgstr "ç?°é??(_Y)"
 
-#~ msgid "Hinting"
-#~ msgstr "å?å??æ??ç¤º"
-
 #~ msgid "Icons"
 #~ msgstr "å??ç¤º"
 
@@ -5346,9 +5356,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>å??å¥½è¨å®?</b>"
 
-#~ msgid "<b>C_olors</b>"
-#~ msgstr "<b>æ¡?é?¢è?²å½©(_O)</b>"
-
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>é ?è¦½</b>"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 38c234d..38c639a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 2.91.5\n"
+"Project-Id-Version: gnome-control-center 2.91.7\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"
+"POT-Creation-Date: 2011-02-03 14:32+0800\n"
+"PO-Revision-Date: 2011-02-02 14:57+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"
@@ -163,10 +163,8 @@ msgstr "æ?´æ?¹è??æ?¯"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
-#, fuzzy
-#| msgid "Wallpaper;Screen;"
 msgid "Wallpaper;Screen;Desktop;"
-msgstr "Wallpaper;Screen;æ¡?å¸?;è?¢å¹?;"
+msgstr "Wallpaper;Screen;Desktop;æ¡?å¸?;è?¢å¹?;æ¡?é?¢;"
 
 #: ../panels/background/background.ui.h:1
 msgid "Center"
@@ -338,6 +336,48 @@ msgstr "å??å??ï¼?"
 msgid "September"
 msgstr "ä¹?æ??"
 
+#: ../panels/datetime/dt-lockbutton.c:347 ../panels/screen/screen.ui.h:13
+#: ../panels/user-accounts/um-lockbutton.c:347
+msgid "Lock"
+msgstr "é??å®?"
+
+#: ../panels/datetime/dt-lockbutton.c:356 ../panels/network/network.ui.h:23
+#: ../panels/user-accounts/um-lockbutton.c:356
+msgid "Unlock"
+msgstr "è§£é??"
+
+#: ../panels/datetime/dt-lockbutton.c:365
+#: ../panels/user-accounts/um-lockbutton.c:365
+msgid "Locked"
+msgstr "å·²é??å®?"
+
+#: ../panels/datetime/dt-lockbutton.c:374
+#: ../panels/user-accounts/um-lockbutton.c:374
+msgid ""
+"Dialog is unlocked.\n"
+"Click to prevent further changes"
+msgstr ""
+"å°?è©±ç??å·²è§£é??ã??\n"
+"é»?é?¸ä»¥é?²æ¢é?²ä¸?æ¥ç??è®?æ?´"
+
+#: ../panels/datetime/dt-lockbutton.c:383
+#: ../panels/user-accounts/um-lockbutton.c:383
+msgid ""
+"Dialog is locked.\n"
+"Click to make changes"
+msgstr ""
+"å°?è©±ç??å·²é??å®?ã??\n"
+"é»?é?¸é?²è¡?è®?æ?´"
+
+#: ../panels/datetime/dt-lockbutton.c:392
+#: ../panels/user-accounts/um-lockbutton.c:392
+msgid ""
+"System policy prevents changes.\n"
+"Contact your system administrator"
+msgstr ""
+"ç³»çµ±å??å??æ?¯é?²æ¢é?²è¡?è®?æ?´ç??ã??\n"
+"è«?é?£çµ¡æ?¨ç??ç³»çµ±ç®¡ç??å?¡"
+
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Clock;Timezone;Location;"
@@ -352,18 +392,17 @@ msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ??å?»å??å¥½è¨å®?é?¢æ?¿"
 
 #: ../panels/display/display-capplet.ui.h:1
-#: ../panels/display/xrandr-capplet.c:321
 msgid "Left"
 msgstr "å·¦"
 
 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/xrandr-capplet.c:484
+#: ../panels/display/xrandr-capplet.c:503
 msgid "Monitor"
 msgstr "é¡¯ç¤ºå?¨"
 
 #: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/xrandr-capplet.c:320
-#: ../panels/display/xrandr-capplet.c:359
+#: ../panels/display/xrandr-capplet.c:339
+#: ../panels/display/xrandr-capplet.c:378
 #: ../panels/universal-access/uap.ui.h:58
 msgid "Normal"
 msgstr "æ£å¸¸"
@@ -377,7 +416,6 @@ msgid "R_otation:"
 msgstr "æ??è½?(_O):"
 
 #: ../panels/display/display-capplet.ui.h:6
-#: ../panels/display/xrandr-capplet.c:322
 msgid "Right"
 msgstr "å?³"
 
@@ -413,60 +451,68 @@ msgstr ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;é?¢æ?¿;æ??å½±æ©?;è?¢å¹?;è§£æ??åº¦;é??æ?°"
 "æ?´ç??;"
 
-#: ../panels/display/xrandr-capplet.c:323
-msgid "Upside Down"
-msgstr "ç?±ä¸?è??ä¸?"
+#: ../panels/display/xrandr-capplet.c:340
+msgid "Anti-Clockwise"
+msgstr "é??æ??é??"
+
+#: ../panels/display/xrandr-capplet.c:341
+msgid "Clockwise"
+msgstr "é ?æ??é??"
+
+#: ../panels/display/xrandr-capplet.c:342
+msgid "180 Degrees"
+msgstr "180 åº¦"
 
 #. Translators:  this is the feature where what you see on your laptop's
 #. * screen is the same as your external monitor.  Here, "Mirror" is being
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/xrandr-capplet.c:460
+#: ../panels/display/xrandr-capplet.c:479
 msgid "Mirror Displays"
 msgstr "é?¡å°?é¡¯ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:593
+#: ../panels/display/xrandr-capplet.c:612
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/xrandr-capplet.c:595
+#: ../panels/display/xrandr-capplet.c:614
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1505
+#: ../panels/display/xrandr-capplet.c:1527
 msgid "Drag to change primary display."
 msgstr "æ??æ?³ä»¥æ?¹è®?ä¸»è¦?é¡¯ç¤ºå?¨ã??"
 
-#: ../panels/display/xrandr-capplet.c:1563
+#: ../panels/display/xrandr-capplet.c:1585
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é?¸æ??ä¸?å??è?¢å¹?ä»¥æ?¹è®?å®?ç??å±¬æ?§ï¼?æ??æ?³å®?å??è?½é??æ?°æ??å??å®?ç??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1953
+#: ../panels/display/xrandr-capplet.c:1975
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1955
+#: ../panels/display/xrandr-capplet.c:1977
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/xrandr-capplet.c:2240
+#: ../panels/display/xrandr-capplet.c:2262
 msgid "Could not save the monitor configuration"
 msgstr "ç?¡æ³?å?²å?é¡¯ç¤ºå?¨çµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2263
+#: ../panels/display/xrandr-capplet.c:2285
 msgid "Could not get session bus while applying display configuration"
 msgstr "å?¨å¥?ç?¨é¡¯ç¤ºçµ?æ??æ??ç?¡æ³?å??å¾?ä½?æ¥é??æ®µå?¯æµ?æ??"
 
-#: ../panels/display/xrandr-capplet.c:2308
+#: ../panels/display/xrandr-capplet.c:2330
 msgid "Could not detect displays"
 msgstr "ç?¡æ³?å?µæ¸¬é¡¯ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:2516
+#: ../panels/display/xrandr-capplet.c:2538
 msgid "Could not get screen information"
 msgstr "ç?¡æ³?å??å¾?è?¢å¹?è³?è¨?"
 
@@ -565,14 +611,22 @@ msgstr "è??ç??å?¨ï¼?"
 msgid "Update Available"
 msgstr "æ??æ?´æ?°å?¯ç?¨"
 
-#: ../panels/keyboard/00-multimedia-key.xml.in.h:1
+#: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "è?²é?³è??åª?é«?"
 
-#: ../panels/keyboard/01-desktop-key.xml.in.h:1
-msgid "Launchers and Actions"
+#: ../panels/keyboard/01-launchers.xml.in.h:1
+#, fuzzy
+#| msgid "Launchers and Actions"
+msgid "Launchers"
 msgstr "å?·è¡?å?¨è??å??ä½?"
 
+#: ../panels/keyboard/01-system.xml.in.h:1
+#, fuzzy
+#| msgid "System Info"
+msgid "System"
+msgstr "ç³»çµ±è³?è¨?"
+
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
 msgstr "æ?°å¢?æ?·å¾?é?µâ?¦"
@@ -603,7 +657,7 @@ msgstr "æ?·å¾?é?µç??é¡?å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1229
+#: ../panels/keyboard/keyboard-shortcuts.c:1268
 #: ../panels/sound/gvc-mixer-control.c:1091
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
@@ -624,22 +678,22 @@ msgstr "é?µç?¤"
 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
+#: ../panels/keyboard/keyboard-shortcuts.c:775
+#: ../panels/keyboard/keyboard-shortcuts.c:1040
+#: ../panels/keyboard/keyboard-shortcuts.c:1674
+#: ../panels/keyboard/keyboard-shortcuts.c:1678
 msgid "Custom Shortcuts"
 msgstr "è?ªè¨?æ?·å¾?é?µ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:848
+#: ../panels/keyboard/keyboard-shortcuts.c:887
 msgid "<Unknown Action>"
 msgstr "<è¡?å??è¨å®?ä¸?è©³>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1255
+#: ../panels/keyboard/keyboard-shortcuts.c:1294
 msgid "Error saving the new shortcut"
 msgstr "å?²å?æ?°ç??æ?·å¾?é?µæ??ç?¼ç??é?¯èª¤"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1365
+#: ../panels/keyboard/keyboard-shortcuts.c:1404
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -649,7 +703,7 @@ msgstr ""
 "æ?·å¾?â??%sâ??ç?¡æ³?ä½¿ç?¨ï¼?å??å? æ?¯æ??ç?¡æ³?æ??ä¸?æ¤æ??é?µã??\n"
 "è«?è©¦ç?¨å?¶å®?ç??æ??é?µï¼?å¦?å??æ??ä½¿ç?¨ Controlï¼?Alt  æ?? Shiftã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1395
+#: ../panels/keyboard/keyboard-shortcuts.c:1434
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -658,36 +712,34 @@ msgstr ""
 "æ?·å¾?é?µâ??%sâ??å·±ç¶?ä½¿ç?¨æ?¼ï¼?\n"
 "â??%sâ??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1401
+#: ../panels/keyboard/keyboard-shortcuts.c:1440
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??æ?¨é??æ?°æ??æ´¾æ?·å¾?é?µç?ºã??%sã??ï¼?ã??%sã??ç??æ?·å¾?é?µå°±æ??å??ç?¨ã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1409
+#: ../panels/keyboard/keyboard-shortcuts.c:1448
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1529
+#: ../panels/keyboard/keyboard-shortcuts.c:1568
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s"
 msgstr "å?¨çµ?æ??è³?æ??åº«ä¸å??æ¶?è¨å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1587
+#: ../panels/keyboard/keyboard-shortcuts.c:1626
 msgid "Too many custom shortcuts"
 msgstr "å¤ªå¤?è?ªè¨?æ?·å¾?é?µ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1866
-#, fuzzy
-#| msgid "Action"
+#: ../panels/keyboard/keyboard-shortcuts.c:1907
 msgid "Section"
 msgstr "ç¯?"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1910
+#: ../panels/keyboard/keyboard-shortcuts.c:1956
 msgid "Action"
 msgstr "å??ä½?"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1932
+#: ../panels/keyboard/keyboard-shortcuts.c:1979
 msgid "Shortcut"
 msgstr "æ?·å¾?é?µ"
 
@@ -787,7 +839,7 @@ msgstr "é??åº¦(_S):"
 msgid "Ask what to do"
 msgstr "è©¢å??è¦?å??ä»?éº¼"
 
-#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:8
+#: ../panels/media/cc-media-panel.c:326 ../panels/power/power.ui.h:6
 msgid "Do nothing"
 msgstr "ä¸?å??ä»»ä½?äº?"
 
@@ -796,34 +848,24 @@ msgid "Open folder"
 msgstr "é??å??è³?æ??å¤¾"
 
 #: ../panels/media/cc-media-panel.c:441
-#, fuzzy
-#| msgid "Select an Application"
 msgid "Select an application for audio CDs"
-msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
+msgstr "é?¸æ??æ?æ?¾é?³æ¨? CD ç??æ??ç?¨ç¨?å¼?"
 
 #: ../panels/media/cc-media-panel.c:442
-#, fuzzy
-#| msgid "Select an application to view its description."
 msgid "Select an application for video DVDs"
-msgstr "é?¸å??æ??ç?¨ç¨?å¼?ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
+msgstr "é?¸æ??æ?æ?¾å½±ç?? DVD ç??æ??ç?¨ç¨?å¼?"
 
 #: ../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 "é?¸å??æ??ç?¨ç¨?å¼?ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
+msgstr "é?¸æ??ç?¶é?³æ¨?æ?æ?¾å?¨é?£æ?¥æ??è¦?å?·è¡?ç??æ??ç?¨ç¨?å¼?"
 
 #: ../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 "é?¸å??æ??ç?¨ç¨?å¼?ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
+msgstr "é?¸æ??ç?¶æ??å½±æ©?é?£æ?¥æ??è¦?å?·è¡?ç??æ??ç?¨ç¨?å¼?"
 
 #: ../panels/media/cc-media-panel.c:445
-#, fuzzy
-#| msgid "Select an Application"
 msgid "Select an application for software CDs"
-msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
+msgstr "é?¸æ??è»?é«? CD è¦?ç?¨ç??æ??ç?¨ç¨?å¼?"
 
 #. translators: these strings are duplicates of shared-mime-info
 #. * strings, just here to fix capitalization of the English originals.
@@ -832,53 +874,47 @@ msgstr "é?¸æ??ä¸?å??æ??ç?¨ç¨?å¼?"
 #.
 #: ../panels/media/cc-media-panel.c:457
 msgid "audio DVD"
-msgstr ""
+msgstr "é?³æ¨? DVD"
 
 #: ../panels/media/cc-media-panel.c:458
 msgid "blank Blu-ray disc"
-msgstr ""
+msgstr "ç©ºç?½ Blu-ray å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:459
 msgid "blank CD disc"
-msgstr ""
+msgstr "ç©ºç?½ CD å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:460
 msgid "blank DVD disc"
-msgstr ""
+msgstr "ç©ºç?½ DVD å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:461
 msgid "blank HD DVD disc"
-msgstr ""
+msgstr "ç©ºç?½ HD DVD å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:462
 msgid "Blu-ray video disc"
-msgstr ""
+msgstr "Blu-Ray å½±ç??å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:463
 msgid "e-book reader"
-msgstr ""
+msgstr "é?»å?æ?¸é?±è®?å?¨"
 
 #: ../panels/media/cc-media-panel.c:464
-#, fuzzy
-#| msgid "_DVD video:"
 msgid "HD DVD video disc"
-msgstr "_DVD å½±ç??ï¼?"
+msgstr "HD DVD å½±ç??å??ç¢?"
 
 #: ../panels/media/cc-media-panel.c:465
-#, fuzzy
-#| msgid "Pictures Folder"
 msgid "Picture CD"
-msgstr "å??ç??è³?æ??å¤¾"
+msgstr "ç?§ç?? CD"
 
 #: ../panels/media/cc-media-panel.c:466
 msgid "Super Video CD"
-msgstr ""
+msgstr "SVCD"
 
 #: ../panels/media/cc-media-panel.c:467
-#, fuzzy
-#| msgid "Video Mouse"
 msgid "Video CD"
-msgstr "è¦?è¨?æ»?é¼ "
+msgstr "å½±ç?? CD"
 
 #: ../panels/media/gnome-media-properties.ui.h:1
 msgid "Acti_on:"
@@ -936,178 +972,191 @@ msgstr "è¨å®?åª?é«?å??è?ªå??å?·è¡?å??å¥½è¨å®?"
 msgid "Removable Media"
 msgstr "å?¯ç§»é?¤å¼?åª?é«?"
 
+#. Translators: those are keywords for the media control-center panel
+#: ../panels/media/gnome-media-panel.desktop.in.in.h:4
+msgid "cd;dvd;usb;audio;video;disc;"
+msgstr "cd;dvd;usb;audio;video;disc;å??ç¢?;å½±ç??;é?³æ¨?;"
+
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:210
+#: ../panels/printers/cc-printers-panel.c:220
 msgid "Low on toner"
 msgstr "ç¢³ç²?ä¸?è¶³"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:212
+#: ../panels/printers/cc-printers-panel.c:222
 msgid "Out of toner"
 msgstr "ç¢³ç²?ç?¨å®?"
 
-#. Translators: "Developer" like on photo development context
-#: ../panels/printers/cc-printers-panel.c:214
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/cc-printers-panel.c:225
 msgid "Low on developer"
 msgstr "é¡¯å??å??ä¸?è¶³"
 
-#. Translators: "Developer" like on photo development context
-#: ../panels/printers/cc-printers-panel.c:216
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/cc-printers-panel.c:228
 msgid "Out of developer"
 msgstr "é¡¯å??å??ç?¨å®?"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:218
+#: ../panels/printers/cc-printers-panel.c:230
 msgid "Low on a marker supply"
 msgstr "å¢¨æ°´å?£ä¸?è¶³"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:220
+#: ../panels/printers/cc-printers-panel.c:232
 msgid "Out of a marker supply"
 msgstr "å¢¨æ°´å?£ç?¨å®?"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:222
+#: ../panels/printers/cc-printers-panel.c:234
 #, 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
+#: ../panels/printers/cc-printers-panel.c:236
 #, 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
+#: ../panels/printers/cc-printers-panel.c:238
 msgid "Low on paper"
 msgstr "ç´?å¼µä¸?è¶³ã??"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:228
+#: ../panels/printers/cc-printers-panel.c:240
 msgid "Out of paper"
 msgstr "ç´?å¼µç?¨å®?"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:230
+#: ../panels/printers/cc-printers-panel.c:242
 msgid "Offline"
 msgstr "é?¢ç·?"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:232
+#: ../panels/printers/cc-printers-panel.c:244
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:234
+#: ../panels/printers/cc-printers-panel.c:246
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:236
+#: ../panels/printers/cc-printers-panel.c:248
 #, fuzzy
 msgid "Waste receptacle full"
 msgstr "è?«è?? [25 å??]"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:238
+#: ../panels/printers/cc-printers-panel.c:250
 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
+#: ../panels/printers/cc-printers-panel.c:252
 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
+#: ../panels/printers/cc-printers-panel.c:344
 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
+#: ../panels/printers/cc-printers-panel.c:348
+#: ../panels/printers/cc-printers-panel.c:794
 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
+#: ../panels/printers/cc-printers-panel.c:352
+#: ../panels/printers/cc-printers-panel.c:798
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
+#. Translators: there is n active print jobs on this printer
+#: ../panels/printers/cc-printers-panel.c:465
+#, c-format
+msgid "%d active"
+msgstr "%d å??ä½¿ç?¨ä¸"
+
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:718
+#: ../panels/printers/cc-printers-panel.c:786
 msgid "Pending"
 msgstr "ç?å¾?ä¸"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:722
+#: ../panels/printers/cc-printers-panel.c:790
 msgid "Held"
 msgstr "å·²æ?«å??"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:734
+#: ../panels/printers/cc-printers-panel.c:802
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:738
+#: ../panels/printers/cc-printers-panel.c:806
 msgid "Aborted"
 msgstr "å·²æ?¾æ£?"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:742
+#: ../panels/printers/cc-printers-panel.c:810
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:837
+#: ../panels/printers/cc-printers-panel.c:905
 msgid "Job Title"
 msgstr "å·¥ä½?å??ç¨±"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:845
+#: ../panels/printers/cc-printers-panel.c:913
 msgid "Job State"
 msgstr "å·¥ä½?ç??æ??"
 
 #. Translators: Name of column showing names of creators of print jobs
-#: ../panels/printers/cc-printers-panel.c:851
+#: ../panels/printers/cc-printers-panel.c:919
 msgid "User"
 msgstr "ä½¿ç?¨è??"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:857
+#: ../panels/printers/cc-printers-panel.c:925
 msgid "Time"
 msgstr "æ??å?»"
 
 #. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1047
+#: ../panels/printers/cc-printers-panel.c:1115
 #, 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
+#: ../panels/printers/cc-printers-panel.c:1767
 msgid "Test page"
 msgstr "æ¸¬è©¦é ?"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1665
+#: ../panels/printers/cc-printers-panel.c:1775
 msgid "Clean print heads"
 msgstr "æ¸?ç??å??å?°å?´é "
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1670
+#: ../panels/printers/cc-printers-panel.c:1780
 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
+#: ../panels/printers/cc-printers-panel.c:1906
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
@@ -1126,158 +1175,114 @@ 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 "æ¸?ç??å??å?°å?´é "
+#: ../panels/printers/printers.ui.h:2
+msgid "0 active"
+msgstr "0 ä½¿ç?¨ä¸"
+
+#: ../panels/printers/printers.ui.h:3
+msgid "<b>Allowed users</b>"
+msgstr "<b>å??è¨ç??ä½¿ç?¨è??</b>"
+
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/printers.ui.h:5
+msgid "Active Print Jobs"
+msgstr "ä½¿ç?¨ä¸ç??å??å?°å·¥ä½?"
+
+#. Translators: Switch back to printer's info tab
+#: ../panels/printers/printers.ui.h:7
+msgid "Back"
+msgstr "è¿?å??"
 
 #. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:6
+#: ../panels/printers/printers.ui.h:9
 #: ../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 "å??ç?¨å?°è¡¨æ©?"
+msgid "IP Address"
+msgstr "IP ä½?å??"
+
+#: ../panels/printers/printers.ui.h:11
+msgid "Info"
+msgstr "è³?è¨?"
 
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
 #: ../panels/printers/printers.ui.h:12
-msgid "Location:"
-msgstr "ä½?ç½®:"
+msgid "Jobs"
+msgstr "å·¥ä½?"
 
-#. Translators: This button executes command which prints test page.
+#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
 #: ../panels/printers/printers.ui.h:14
-msgid "Print Test Page"
-msgstr "å??å?°æ¸¬è©¦é ?"
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#: ../panels/printers/printers.ui.h:15
+msgid "Model"
+msgstr "å??è??"
 
-#. Translators: A widget showing list of print jobs for selected printer.
-#: ../panels/printers/printers.ui.h:16
-msgid "Printer Jobs"
-msgstr "å?°è¡¨æ©?å·¥ä½?"
+#. Translators: This button opens printer's options tab
+#: ../panels/printers/printers.ui.h:17
+msgid "Options"
+msgstr "é?¸é ?"
 
-#. Translators: This shows queue of print jobs.
-#: ../panels/printers/printers.ui.h:18
-msgid "Queue"
-msgstr "ä½?å??"
+#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:19
+msgid "Print Test Page"
+msgstr "å??å?°æ¸¬è©¦é ?"
 
-#. Translators: Users which are allowed to print on this printer.
 #: ../panels/printers/printers.ui.h:20
-msgid "Share with these users:"
-msgstr "è??é??äº?ä½¿ç?¨è??å??äº«ï¼?"
+msgid "Printer"
+msgstr "å?°è¡¨æ©?"
 
-#: ../panels/printers/printers.ui.h:21
-msgid "Show / hide printer's jobs"
-msgstr "é¡¯ç¤º / é?±è??å?°è¡¨æ©?å·¥ä½?"
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/printers.ui.h:22
+msgid "Printer Options"
+msgstr "å?°è¡¨æ©?é?¸é ?"
 
-#. Translators: Status of the printer.
 #: ../panels/printers/printers.ui.h:23
-msgid "Status:"
-msgstr "ç??æ??ï¼?"
+msgid "Printing..."
+msgstr "æ£å?¨å??å?°â?¦"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
+#. Tanslators: Switch to tab containing printer's jobs
 #: ../panels/printers/printers.ui.h:25
-msgid "Supply:"
-msgstr "è??æ??ï¼?"
-
-#: ../panels/printers/printers.ui.h:26
-#, fuzzy
-#| msgid "add-toolbutton"
-msgid "pause-toolbutton"
-msgstr "å? å?¥å·¥å?·æ??é??"
+msgid "Show"
+msgstr "é¡¯ç¤º"
 
+#. Translators: By supply we mean ink, toner, staples, water, ...
 #: ../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 "å? å?¥å·¥å?·æ??é??"
+msgid "Supply"
+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
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Layouts"
 msgstr "é??ç½®"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "List of keyboard layouts selected for usage"
 msgstr "ç?¨ä¾?é?¸å??é?µç?¤é??ç½®ç??æ¸?å?®"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Move _Down"
-msgstr "ä¸?ç§»(_D)"
-
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Move _Up"
-msgstr "ä¸?ç§»(_U)"
-
-#: ../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:9
-msgid "Move the selected keyboard layout up in the list"
-msgstr "å°?æ¸?å?®ä¸é?¸å??ç??é?µç?¤é??ç½®å??ä¸?ç§»å??"
-
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "New windows u_se active window's layout"
 msgstr "æ?°è¦?çª?å»¶ç?¨ä½¿ç?¨ä¸è¦?çª?ç??é??ç½®(_S)"
 
-#: ../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:12
+#: ../panels/region/gnome-region-panel.ui.h:6
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "å?°å??å??èª?è¨?"
 
-#: ../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:14
+#: ../panels/region/gnome-region-panel.ui.h:7
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
@@ -1285,31 +1290,23 @@ msgstr ""
 "ä»¥é ?è¨å?¼æ?¿æ??ç?®å??ç??é?µç?¤é??ç½®\n"
 "è¨å®?å?¼"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Reset to De_faults"
 msgstr "é??ç½®ç?ºé ?è¨å?¼(_F)"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
+#: ../panels/region/gnome-region-panel.ui.h:10
 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:19
+#: ../panels/region/gnome-region-panel.ui.h:11
 msgid "View and edit keyboard layout options"
 msgstr "æª¢è¦?ä¸¦ç·¨è¼¯é?µç?¤é??ç½®é?¸é ?"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "_Add..."
-msgstr "å? å?¥(_A)â?¦"
-
-#: ../panels/region/gnome-region-panel.ui.h:21
+#: ../panels/region/gnome-region-panel.ui.h:12
 msgid "_Options..."
 msgstr "é?¸é ?(_O)â?¦"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "_Separate layout for each window"
 msgstr "çµ¦æ¯?ä¸?å??è¦?çª?ç?¨ç«?ç??é??ç½®(_S)"
 
@@ -1341,51 +1338,22 @@ msgstr "èª?è¨?(_L):"
 msgid "_Variants:"
 msgstr "è®?é«?(_V):"
 
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:1
-msgid "Choose a Keyboard Model"
-msgstr "é?¸æ??é?µç?¤å??è??"
-
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:2
-msgid "_Models:"
-msgstr "å??è??(_M):"
-
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:3
-msgid "_Vendors:"
-msgstr "è£½é? å??(_V):"
-
 #: ../panels/region/gnome-region-panel-options-dialog.ui.h:1
 msgid "Keyboard Layout Options"
 msgstr "é?µç?¤é??ç½®é?¸é ?"
 
-#. TRANSLATORS: device type
-#. TRANSLATORS: AP type
-#: ../panels/region/gnome-region-panel-xkb.c:70
-#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
 #: ../panels/region/gnome-region-panel-xkblt.c:220
 msgid "Layout"
 msgstr "é??ç½®"
 
-#: ../panels/region/gnome-region-panel-xkbmc.c:163
-msgid "Vendors"
-msgstr "è£½é? å??"
-
-#: ../panels/region/gnome-region-panel-xkbmc.c:229
-msgid "Models"
-msgstr "å??è??"
-
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
 msgid "Change your region and language settings"
 msgstr "æ?¹è®?æ?¨ç??å?°å??å??èª?è¨?è¨å®?å?¼"
 
 #. Translators: those are keywords for the region control-center panel
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:3
-#, fuzzy
-#| msgid "Language;Layout;"
 msgid "Language;Layout;Keyboard;"
-msgstr "Language;Layout;èª?è¨?;é??ç½®;"
+msgstr "Language;Layout;Keyboard;èª?è¨?;é??ç½®;é?µç?¤;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "Disable _touchpad while typing"
@@ -1518,31 +1486,37 @@ msgstr ""
 "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;è§¸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?è§¸;é??"
 "æ??;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/cc-network-panel.c:1062
-#: ../panels/network/cc-network-panel.c:1084
+#: ../panels/network/cc-network-panel.c:1086
+#: ../panels/network/cc-network-panel.c:1108
 #, c-format
 msgid "%i Mb/s"
 msgstr "%i Mb/s"
 
-#: ../panels/network/cc-network-panel.c:1064
+#: ../panels/network/cc-network-panel.c:1088
 #, c-format
 msgid "%i Gb/s"
 msgstr "%i Gb/s"
 
-#: ../panels/network/cc-network-panel.c:1082
+#: ../panels/network/cc-network-panel.c:1106
 #, c-format
 msgid "%i kb/s"
 msgstr "%i kb/s"
 
-#: ../panels/network/cc-network-panel.c:1739
+#: ../panels/network/cc-network-panel.c:1763
 msgid "Network proxy"
 msgstr "ç¶²è·¯ä»£ç??ä¼ºæ??å?¨"
 
-#: ../panels/network/cc-network-panel.c:1748
+#: ../panels/network/cc-network-panel.c:1772
 msgid "Set the system proxy settings"
 msgstr "è¨å®?ç³»çµ±ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼"
 
 #. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#. TRANSLATORS: device type
 #: ../panels/network/panel-common.c:69
 msgid "Wired"
 msgstr "æ??ç·?"
@@ -1730,11 +1704,6 @@ msgstr "é??åº¦ï¼?"
 msgid "Subnet Mask:"
 msgstr "å?ç¶²è·¯é?®ç½©ï¼?"
 
-#: ../panels/network/network.ui.h:23
-#: ../panels/user-accounts/um-lockbutton.c:356
-msgid "Unlock"
-msgstr "è§£é??"
-
 #: ../panels/network/network.ui.h:24
 msgid "Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
@@ -1764,10 +1733,8 @@ 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;"
 msgid "Power;Sleep;Suspend;Hibernate;Battery;"
-msgstr "Power;Sleep;Suspend;Hibernate;é?»æº?;ç?¡ç? ;æ?«å??;ä¼?ç? ;"
+msgstr "Power;Sleep;Suspend;Hibernate;Battery;é?»æº?;ç?¡ç? ;æ?«å??;ä¼?ç? ;é?»æ± ;"
 
 #: ../panels/power/cc-power-panel.c:151
 msgid "Unknown time"
@@ -1854,55 +1821,49 @@ 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:8
+msgid "On AC power:"
+msgstr "ä½¿ç?¨ AC é?»æº?ï¼?"
+
+#: ../panels/power/power.ui.h:9
+msgid "On battery power:"
+msgstr "ä½¿ç?¨é?»æ± æ??ï¼?"
+
 #: ../panels/power/power.ui.h:10
-msgid "Put the computer to sleep when inactive for:"
+msgid "Put the computer to sleep when inactive:"
 msgstr "å?¨é??ç½®æ¤æ??é??å¾?è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
 
 #: ../panels/power/power.ui.h:11
-msgid "Put the computer to sleep when on:"
-msgstr "å?¨æ¤æ??é??è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
-
-#: ../panels/power/power.ui.h:12
 msgid "Shutdown"
 msgstr "é??æ©?"
 
-#: ../panels/power/power.ui.h:13
+#: ../panels/power/power.ui.h:12
 msgid "Suspend"
 msgstr "æ?«å??"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:13
 msgid "When power is critically low:"
 msgstr "ç?¶é?»æº?ç??é?»é??æ¥µä½?æ??ï¼?"
 
-#: ../panels/power/power.ui.h:15
+#: ../panels/power/power.ui.h:14
 msgid "When the power button is pressed:"
 msgstr "ç?¶é?»æº?é??é??æ??é??è¢«æ??ä¸?æ??ï¼?"
 
-#: ../panels/power/power.ui.h:16
+#: ../panels/power/power.ui.h:15
 msgid "When the sleep button is pressed:"
 msgstr "ç?¶ç?¡ç? æ??é??è¢«æ??ä¸?æ??ï¼?"
 
 #. Translators: those are keywords for the brightness and lock control-center panel
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-#, fuzzy
-#| msgid "Brightness;Lock;Dim;Blank;"
 msgid "Brightness;Lock;Dim;Blank;Monitor;"
-msgstr "Brightness;Lock;Dim;Blank;äº®åº¦;é??å®?;èª¿æ??;ç©ºç?½;"
+msgstr "Brightness;Lock;Dim;Blank;Monitor;äº®åº¦;é??å®?;èª¿æ??;ç©ºç?½;ç?£è¦?å?¨;"
 
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
 msgid "Screen"
@@ -1932,27 +1893,24 @@ msgstr "äº®åº¦"
 msgid "Dim screen to save power"
 msgstr "èª¿æ??è?¢å¹?ä»¥ç¯?ç??é?»æº?"
 
-#: ../panels/screen/screen.ui.h:10
+#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're detected to be physically in your home (your house, etc.)
+#: ../panels/screen/screen.ui.h:11
 msgid "Don't lock when at home"
 msgstr "å?¨å®¶æ??ä¸?è¦?é??å®?"
 
-#: ../panels/screen/screen.ui.h:11
+#: ../panels/screen/screen.ui.h:12
 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
+#: ../panels/screen/screen.ui.h:14
 msgid "Lock screen after:"
 msgstr "é??å®?è?¢å¹?æ??é??ï¼?"
 
-#: ../panels/screen/screen.ui.h:14
+#: ../panels/screen/screen.ui.h:15
 msgid "Screen turns off"
 msgstr "è?¢å¹?é??é??"
 
-#: ../panels/screen/screen.ui.h:15
+#: ../panels/screen/screen.ui.h:16
 msgid "Turn off after:"
 msgstr "é??é??æ??é??ï¼?"
 
@@ -2782,34 +2740,6 @@ msgstr ""
 msgid "Other..."
 msgstr "å?¶ä»?â?¦"
 
-#: ../panels/user-accounts/um-lockbutton.c:365
-msgid "Locked"
-msgstr "å·²é??å®?"
-
-#: ../panels/user-accounts/um-lockbutton.c:374
-msgid ""
-"Dialog is unlocked.\n"
-"Click to prevent further changes"
-msgstr ""
-"å°?è©±ç??å·²è§£é??ã??\n"
-"é»?é?¸ä»¥é?²æ¢é?²ä¸?æ¥ç??è®?æ?´"
-
-#: ../panels/user-accounts/um-lockbutton.c:383
-msgid ""
-"Dialog is locked.\n"
-"Click to make changes"
-msgstr ""
-"å°?è©±ç??å·²é??å®?ã??\n"
-"é»?é?¸é?²è¡?è®?æ?´"
-
-#: ../panels/user-accounts/um-lockbutton.c:392
-msgid ""
-"System policy prevents changes.\n"
-"Contact your system administrator"
-msgstr ""
-"ç³»çµ±å??å??æ?¯é?²æ¢é?²è¡?è®?æ?´ç??ã??\n"
-"è«?é?£çµ¡æ?¨ç??ç³»çµ±ç®¡ç??å?¡"
-
 #: ../panels/user-accounts/um-password-dialog.c:179
 msgid "More choices..."
 msgstr "æ?´å¤?é?¸æ??..."
@@ -3195,17 +3125,9 @@ msgid "Login Options"
 msgstr "ç?»å?¥é?¸é ?"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-msgid "Open"
-msgstr "é??å??"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Password:"
 msgstr "å¯?ç¢¼ï¼? "
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
-msgid "Restrictions:"
-msgstr "é??å?¶ï¼?"
-
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:2
 msgid "Left index finger"
 msgstr "å·¦æ??é£?æ??"
@@ -3289,6 +3211,104 @@ msgstr "æ?§å?¶ä¸å¿?"
 msgid "_All Settings"
 msgstr "æ??æ??è¨å®?å?¼(_A)"
 
+#~ msgid "Upside Down"
+#~ msgstr "ç?±ä¸?è??ä¸?"
+
+#~ msgid "Clean Print Heads"
+#~ msgstr "æ¸?ç??å??å?°å?´é "
+
+#~ msgid "Description:"
+#~ msgstr "æ??è¿°ï¼?"
+
+#~ msgid "Disable Printer"
+#~ msgstr "å??ç?¨å?°è¡¨æ©?"
+
+#~ msgid "Queue"
+#~ msgstr "ä½?å??"
+
+#~ msgid "Share with these users:"
+#~ msgstr "è??é??äº?ä½¿ç?¨è??å??äº«ï¼?"
+
+#~ msgid "Show / hide printer's jobs"
+#~ msgstr "é¡¯ç¤º / é?±è??å?°è¡¨æ©?å·¥ä½?"
+
+#~ msgid "Status:"
+#~ msgstr "ç??æ??ï¼?"
+
+#~| msgid "add-toolbutton"
+#~ msgid "pause-toolbutton"
+#~ msgstr "å? å?¥å·¥å?·æ??é??"
+
+#~| msgid "remove-toolbutton"
+#~ msgid "resume-toolbutton"
+#~ msgstr "ç§»é?¤å·¥å?·æ??é??"
+
+#~| msgid "add-toolbutton"
+#~ msgid "stop-toolbutton"
+#~ msgstr "å? å?¥å·¥å?·æ??é??"
+
+#~| msgid "add-toolbutton"
+#~ msgid "toolbutton1"
+#~ msgstr "å? å?¥å·¥å?·æ??é??"
+
+#~| msgid "add-toolbutton"
+#~ msgid "toolbutton2"
+#~ msgstr "å? å?¥å·¥å?·æ??é??"
+
+#~ msgid "Keyboard _model:"
+#~ msgstr "é?µç?¤æ¨¡å¼?(_M)"
+
+#~ msgid "Move _Down"
+#~ msgstr "ä¸?ç§»(_D)"
+
+#~ msgid "Move _Up"
+#~ msgstr "ä¸?ç§»(_U)"
+
+#~ msgid "Move the selected keyboard layout down in the list"
+#~ msgstr "å°?æ¸?å?®ä¸é?¸å??ç??é?µç?¤é??ç½®å??ä¸?ç§»å??"
+
+#~ msgid "Move the selected keyboard layout up in the list"
+#~ msgstr "å°?æ¸?å?®ä¸é?¸å??ç??é?µç?¤é??ç½®å??ä¸?ç§»å??"
+
+#~ msgid "Print a diagram of the selected keyboard layout"
+#~ msgstr "é¡¯ç¤ºé?¸å??ç??é?µç?¤é??ç½®ç??å??è¡¨"
+
+#~ msgid "Remove the selected keyboard layout from the list"
+#~ msgstr "å¾?æ¸?å?®ä¸ç§»é?¤é?¸å??ç??é?µç?¤é??ç½®"
+
+#~ msgid "Select a keyboard layout to be added to the list"
+#~ msgstr "é?¸æ??è¦?å? å?¥æ¸?å?®ç??é?µç?¤é??ç½®"
+
+#~ msgid "_Add..."
+#~ msgstr "å? å?¥(_A)â?¦"
+
+#~ msgid "Choose a Keyboard Model"
+#~ msgstr "é?¸æ??é?µç?¤å??è??"
+
+#~ msgid "_Models:"
+#~ msgstr "å??è??(_M):"
+
+#~ msgid "_Vendors:"
+#~ msgstr "è£½é? å??(_V):"
+
+#~ msgid "Vendors"
+#~ msgstr "è£½é? å??"
+
+#~ msgid "AC power and inactive for:"
+#~ msgstr "AC é?»æº?ä¸?é??ç½®ï¼?"
+
+#~ msgid "Battery power and inactive for:"
+#~ msgstr "é?»æ± é?»æº?ä¸?é??ç½®ï¼?"
+
+#~ msgid "Put the computer to sleep when on:"
+#~ msgstr "å?¨æ¤æ??é??è®?é?»è?¦é?²å?¥ç?¡ç? ï¼?"
+
+#~ msgid "Open"
+#~ msgstr "é??å??"
+
+#~ msgid "Restrictions:"
+#~ msgstr "é??å?¶ï¼?"
+
 #~ msgid "Hold"
 #~ msgstr "ä¿?ç??"
 
@@ -3366,10 +3386,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Gray"
 #~ msgstr "ç?°"
 
-#~| msgid "Callback"
-#~ msgid "Black"
-#~ msgstr "é»?"
-
 #~ msgid "Colors"
 #~ msgstr "é¡?è?²"
 
@@ -4450,9 +4466,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Instant Messaging"
 #~ msgstr "å?³æ??è¨?æ?¯"
 
-#~ msgid "Job"
-#~ msgstr "è?·æ¥"
-
 #~ msgid "M_SN:"
 #~ msgstr "M_SN:"
 
@@ -4765,9 +4778,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Gra_yscale"
 #~ msgstr "ç?°é??(_Y)"
 
-#~ msgid "Hinting"
-#~ msgstr "å?å??æ??ç¤º"
-
 #~ msgid "Icons"
 #~ msgstr "å??ç¤º"
 
@@ -5361,9 +5371,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>å??å¥½è¨å®?</b>"
 
-#~ msgid "<b>C_olors</b>"
-#~ msgstr "<b>æ¡?é?¢è?²å½©(_O)</b>"
-
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>é ?è¦½</b>"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]