[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: Wed, 23 Feb 2011 11:22:56 +0000 (UTC)
commit 5cc610bef6fd82d8ca7bc023511567cad0d90eeb
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Feb 23 19:22:48 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  776 +++++++++++++++++++++++++++++++++++-----------------------
 po/zh_TW.po |  776 +++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 936 insertions(+), 616 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index e0346d8..12a6cbb 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.7\n"
+"Project-Id-Version: gnome-control-center 2.91.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-11 19:14+0800\n"
-"PO-Revision-Date: 2011-02-11 19:15+0800\n"
+"POT-Creation-Date: 2011-02-23 19:22+0800\n"
+"PO-Revision-Date: 2011-02-23 19:22+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"
@@ -120,7 +120,7 @@ msgstr "å±¬æ?§ä¿®æ?¹ç¨?å¼?é??æ?¾è³?æ??ç?? callback"
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr "ç?¶å±¬æ?§ä¿®æ?¹ç¨?å¼?é??æ?¾ç?©ä»¶è³?æ??æ??ï¼?ç?¼å?º callback"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1406
+#: ../libgnome-control-center/gconf-property-editor.c:1473
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -132,7 +132,7 @@ msgstr ""
 "\n"
 "è«?ç¢ºå®?æª?æ¡?å·²ç¶?å?å?¨ä¸¦å??è©¦ä¸?æ¬¡ï¼?æ??æ?¯é?¸æ??å?¶å®?è??æ?¯å??æ¡?ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1414
+#: ../libgnome-control-center/gconf-property-editor.c:1481
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -145,11 +145,11 @@ msgstr ""
 "\n"
 "è«?é?¸æ??å?¶å®?å??æ¡?ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1536
+#: ../libgnome-control-center/gconf-property-editor.c:1603
 msgid "Please select an image."
 msgstr "è«?é?¸å??å??ç??ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1541
+#: ../libgnome-control-center/gconf-property-editor.c:1608
 msgid "_Select"
 msgstr "é?¸å??(_S)"
 
@@ -193,54 +193,60 @@ msgid "Tile"
 msgstr "é?ªæ??"
 
 #: ../panels/background/background.ui.h:8
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:90
 msgid "Zoom"
 msgstr "ç¸®æ?¾"
 
-#: ../panels/background/bg-colors-source.c:45
+#: ../panels/background/bg-colors-source.c:46
 msgid "Horizontal Gradient"
 msgstr "æ°´å¹³æ¼¸è®?è?²"
 
-#: ../panels/background/bg-colors-source.c:46
+#: ../panels/background/bg-colors-source.c:47
 msgid "Vertical Gradient"
 msgstr "å??ç?´æ¼¸è®?è?²"
 
-#: ../panels/background/bg-colors-source.c:47
+#: ../panels/background/bg-colors-source.c:48
 msgid "Solid Color"
 msgstr "å?®è?²"
 
-#: ../panels/background/cc-background-panel.c:775
+#: ../panels/background/cc-background-panel.c:960
+#: ../panels/user-accounts/um-photo-dialog.c:216
+#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+msgid "Browse for more pictures"
+msgstr "ç??è¦½æ?´å¤?ç?§ç??"
+
+#: ../panels/background/cc-background-panel.c:1051
+msgid "Current background"
+msgstr "ç?®å??ç??è??æ?¯"
+
+#: ../panels/background/cc-background-panel.c:1115
 msgid "Wallpapers"
 msgstr "æ¡?å¸?"
 
-#: ../panels/background/cc-background-panel.c:783
+#: ../panels/background/cc-background-panel.c:1122
 msgid "Pictures Folder"
 msgstr "å??ç??è³?æ??å¤¾"
 
-#: ../panels/background/cc-background-panel.c:791
+#: ../panels/background/cc-background-panel.c:1129
 msgid "Colors & Gradients"
 msgstr "é¡?è?² & æ¼¸è®?è?²"
 
-#: ../panels/background/cc-background-panel.c:800
+#: ../panels/background/cc-background-panel.c:1137
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../panels/background/cc-background-panel.c:854
-msgid "Current background"
-msgstr "ç?®å??ç??è??æ?¯"
-
-#: ../panels/background/cc-background-item.c:146
+#: ../panels/background/cc-background-item.c:148
 msgid "multiple sizes"
 msgstr "å¤?é??å°ºå¯¸"
 
 #. translators: 100 Ã? 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:150
+#: ../panels/background/cc-background-item.c:152
 #, c-format
 msgid "%d Ã? %d"
 msgstr "%d Ã? %d"
 
-#: ../panels/background/cc-background-item.c:252
+#: ../panels/background/cc-background-item.c:255
 msgid "No Desktop Background"
 msgstr "ç?¡æ¡?é?¢è??æ?¯"
 
@@ -522,52 +528,93 @@ msgstr "ç?¡æ³?å??å¾?è?¢å¹?è³?è¨?"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:417
+#: ../panels/info/cc-info-panel.c:479
 #, c-format
 msgid "%d-bit"
 msgstr "%d-ä½?å??"
 
-#: ../panels/info/cc-info-panel.c:431
+#: ../panels/info/cc-info-panel.c:493
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u ä½?å??çµ?"
 
-#: ../panels/info/cc-info-panel.c:439
+#: ../panels/info/cc-info-panel.c:501
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panels/info/cc-info-panel.c:444
+#: ../panels/info/cc-info-panel.c:506
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panels/info/cc-info-panel.c:449
+#: ../panels/info/cc-info-panel.c:511
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panels/info/cc-info-panel.c:454
+#: ../panels/info/cc-info-panel.c:516
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../panels/info/cc-info-panel.c:459
+#: ../panels/info/cc-info-panel.c:521
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../panels/info/cc-info-panel.c:464
+#: ../panels/info/cc-info-panel.c:526
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../panels/info/cc-info-panel.c:574
+#: ../panels/info/cc-info-panel.c:637
 msgid "Unknown model"
 msgstr "ä¸?æ??ç??å??è??"
 
-#: ../panels/info/cc-info-panel.c:637
+#: ../panels/info/cc-info-panel.c:720
+msgid "The next login will attempt to use the standard experience."
+msgstr "ä¸?æ¬¡ç?»å?¥æ??å??è©¦ä½¿ç?¨æ¨?æº?é«?é©?ã??"
+
+#: ../panels/info/cc-info-panel.c:722
+msgid ""
+"The next login will use the fallback mode intended for unsupported graphics "
+"hardware."
+msgstr "ä¸?æ¬¡ç?»å?¥æ??ä½¿ç?¨å¾?å??æ¨¡å¼?ä»¥é??å??ä¸?æ?¯æ?´ç??å??å½¢é¡¯ç¤ºç¡¬ä»¶ã??"
+
+#. translators: The hardware is not able to run GNOME 3's
+#. * shell, so we use the GNOME "Fallback" session
+#: ../panels/info/cc-info-panel.c:771
+msgctxt "Experience"
+msgid "Fallback"
+msgstr "å¾?å??"
+
+#. translators: The hardware is able to run GNOME 3's
+#. * shell, also called "Standard" experience
+#: ../panels/info/cc-info-panel.c:777
+msgctxt "Experience"
+msgid "Standard"
+msgstr "æ¨?æº?"
+
+#: ../panels/info/cc-info-panel.c:909
+#: ../panels/keyboard/keyboard-shortcuts.c:1711
+msgid "Section"
+msgstr "ç¯?"
+
+#: ../panels/info/cc-info-panel.c:918 ../panels/info/info.ui.h:15
+msgid "Overview"
+msgstr "æ¦?è¦½"
+
+#: ../panels/info/cc-info-panel.c:924 ../panels/info/info.ui.h:3
+msgid "Default Applications"
+msgstr "é ?è¨æ??ç?¨ç¨?å¼?"
+
+#: ../panels/info/cc-info-panel.c:929 ../panels/info/info.ui.h:10
+msgid "Graphics"
+msgstr "ç¹ªå??"
+
+#: ../panels/info/cc-info-panel.c:954
 #, c-format
 msgid "Version %s"
 msgstr "ç??æ?¬ %s"
@@ -586,49 +633,183 @@ msgid "device;system;information;memory;processor;version;"
 msgstr "device;system;information;memory;processor;version;è£?ç½®;ç³»çµ±;è³?è¨?;è¨?æ?¶é«?;è??ç??å?¨;ç??æ?¬;"
 
 #: ../panels/info/info.ui.h:1
-msgid "Device name:"
-msgstr "è£?ç½®å??ç¨±ï¼?"
+msgid "Calendar"
+msgstr "æ?¥æ??"
 
 #: ../panels/info/info.ui.h:2
-msgid "Disk:"
-msgstr "ç£?ç¢?ï¼?"
-
-#: ../panels/info/info.ui.h:3
-msgid "Graphics:"
-msgstr "å??å½¢ï¼?"
+msgid "Chipset"
+msgstr "æ?¶ç??"
 
 #: ../panels/info/info.ui.h:4
-msgid "Memory:"
-msgstr "è¨?æ?¶é«?ï¼?"
+msgid "Device name"
+msgstr "è£?ç½®å??ç¨±"
 
 #: ../panels/info/info.ui.h:5
-msgid "More Info"
-msgstr "æ?´å¤?è³?è¨?"
+msgid "Disk"
+msgstr "ç£?ç¢?"
 
 #: ../panels/info/info.ui.h:6
-msgid "OS type:"
-msgstr "OS é¡?å??ï¼?"
+msgid "Driver"
+msgstr "ç£?ç¢?æ©?"
 
 #: ../panels/info/info.ui.h:7
-msgid "Processor:"
-msgstr "è??ç??å?¨ï¼?"
+msgid "Experience"
+msgstr "é«?é©?"
+
+#. Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.
+#: ../panels/info/info.ui.h:9
+msgid "Forced Fallback Mode"
+msgstr "å¼·å?¶å¾?å??æ¨¡å¼?"
+
+#: ../panels/info/info.ui.h:11
+msgid "Mail"
+msgstr "é?µä»¶"
 
-#: ../panels/info/info.ui.h:8
-msgid "Update Available"
-msgstr "æ??æ?´æ?°å?¯ç?¨"
+#: ../panels/info/info.ui.h:12
+msgid "Memory"
+msgstr "è¨?æ?¶é«?"
+
+#: ../panels/info/info.ui.h:13
+msgid "Music"
+msgstr "é?³æ¨?"
+
+#: ../panels/info/info.ui.h:14
+msgid "OS type"
+msgstr "OS é¡?å??"
+
+#: ../panels/info/info.ui.h:16
+msgid "Photos"
+msgstr "ç?¸ç??"
+
+#: ../panels/info/info.ui.h:17
+msgid "Processor"
+msgstr "è??ç??å?¨"
+
+#: ../panels/info/info.ui.h:18
+msgid "Updates Available"
+msgstr "å?¯ç?¨ç??æ?´æ?°"
+
+#: ../panels/info/info.ui.h:19
+msgid "Video"
+msgstr "å½±ç??"
+
+#: ../panels/info/info.ui.h:20
+msgid "Web"
+msgstr "ç¶²é ?"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
+msgid "Eject"
+msgstr "é??å?º"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:2
+msgid "Launch media player"
+msgstr "å?·è¡?åª?é«?æ?æ?¾ç¨?å¼?"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:3
+msgid "Next track"
+msgstr "ä¸?ä¸?é¦?æ?æ?²"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:4
+msgid "Pause playback"
+msgstr "æ?«å??æ?æ?¾"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:5
+msgid "Play (or play/pause)"
+msgstr "æ?æ?¾ï¼?æ??æ?æ?¾/æ?«å??ï¼?"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:6
+msgid "Previous track"
+msgstr "ä¸?ä¸?é¦?æ?æ?²"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:7
 msgid "Sound and Media"
 msgstr "è?²é?³è??åª?é«?"
 
+#: ../panels/keyboard/00-multimedia.xml.in.h:8
+msgid "Stop playback"
+msgstr "å??æ¢æ?æ?¾"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:9
+msgid "Volume down"
+msgstr "èª¿ä½?é?³é??"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:10
+msgid "Volume mute"
+msgstr "é??é?³"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:11
+msgid "Volume up"
+msgstr "èª¿é«?é?³é??"
+
 #: ../panels/keyboard/01-launchers.xml.in.h:1
+msgid "Home folder"
+msgstr "å®¶ç?®é??"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:2
+msgid "Launch calculator"
+msgstr "å?·è¡?è¨?æ?¸æ©?"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:3
+msgid "Launch email client"
+msgstr "å?·è¡?é?»å?é?µä»¶å®¢æ?¶ç«¯"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:4
+msgid "Launch help browser"
+msgstr "å?·è¡?èªªæ??æ??ä»¶ç??è¦½å?¨"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:5
+msgid "Launch web browser"
+msgstr "å?·è¡?ç¶²é ?ç??è¦½å?¨"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launchers"
 msgstr "å?·è¡?å?¨"
 
+#: ../panels/keyboard/01-launchers.xml.in.h:7
+msgid "Search"
+msgstr "æ??å°?"
+
 #: ../panels/keyboard/01-system.xml.in.h:1
+msgid "Lock screen"
+msgstr "é??å®?ç?«é?¢"
+
+#: ../panels/keyboard/01-system.xml.in.h:2
+msgid "Log out"
+msgstr "ç?»å?º"
+
+#: ../panels/keyboard/01-system.xml.in.h:3
 msgid "System"
 msgstr "ç³»çµ±"
 
+#: ../panels/keyboard/50-accessibility.xml.in.h:1
+msgid "Decrease text size"
+msgstr "å°?æ??å?ç¸®å°?"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:2
+msgid "Increase text size"
+msgstr "å°?æ??å?æ?¾å¤§"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:3
+msgid "Toggle contrast"
+msgstr "å??æ??å°?æ¯?"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:4
+msgid "Toggle magnifier"
+msgstr "å??æ??æ?¾å¤§é?¡"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:5
+msgid "Toggle on-screen keyboard"
+msgstr "å??æ??è?¢å¹?é?µç?¤"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:6
+msgid "Toggle screen reader"
+msgstr "å??æ??è?¢å¹?é?±è®?å?¨"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
+msgid "Universal Access"
+msgstr "ç?¡é??ç¤?å??è?½"
+
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
 msgstr "æ?°å¢?æ?·å¾?é?µâ?¦"
@@ -659,7 +840,7 @@ msgstr "æ?·å¾?é?µç??é¡?å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1268
+#: ../panels/keyboard/keyboard-shortcuts.c:1141
 #: ../panels/sound/gvc-mixer-control.c:1091
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
@@ -680,22 +861,22 @@ msgstr "é?µç?¤"
 msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;æ?·å¾?é?µ;é??è¤?;é??ç??;"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:775
-#: ../panels/keyboard/keyboard-shortcuts.c:1040
-#: ../panels/keyboard/keyboard-shortcuts.c:1674
-#: ../panels/keyboard/keyboard-shortcuts.c:1678
+#: ../panels/keyboard/keyboard-shortcuts.c:643
+#: ../panels/keyboard/keyboard-shortcuts.c:916
+#: ../panels/keyboard/keyboard-shortcuts.c:1503
+#: ../panels/keyboard/keyboard-shortcuts.c:1507
 msgid "Custom Shortcuts"
 msgstr "è?ªé?¸æ?·å¾?é?µ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:887
+#: ../panels/keyboard/keyboard-shortcuts.c:768
 msgid "<Unknown Action>"
 msgstr "<è¡?å??è¨å®?ä¸?è©³>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1294
+#: ../panels/keyboard/keyboard-shortcuts.c:1167
 msgid "Error saving the new shortcut"
 msgstr "å?²å?æ?°ç??æ?·å¾?é?µæ??ç?¼ç??é?¯èª¤"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1404
+#: ../panels/keyboard/keyboard-shortcuts.c:1282
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -705,7 +886,7 @@ msgstr ""
 "æ?·å¾?â??%sâ??ç?¡æ³?ä½¿ç?¨ï¼?å??å? æ?¯æ??ç?¡æ³?æ??ä¸?æ¤æ??é?µã??\n"
 "è«?è©¦ç?¨å?¶å®?ç??æ??é?µï¼?å¦?å??æ??ä½¿ç?¨ Controlï¼?Alt  æ?? Shiftã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1434
+#: ../panels/keyboard/keyboard-shortcuts.c:1314
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -714,34 +895,25 @@ msgstr ""
 "æ?·å¾?é?µâ??%sâ??å·±ç¶?ä½¿ç?¨æ?¼ï¼?\n"
 "â??%sâ??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1440
+#: ../panels/keyboard/keyboard-shortcuts.c:1320
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??ä½ é??æ?°æ??æ´¾æ?·å¾?é?µç?ºã??%sã??ï¼?ã??%sã??ç??æ?·å¾?é?µå°±æ??å??ç?¨ã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1448
+#: ../panels/keyboard/keyboard-shortcuts.c:1328
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1568
-#, c-format
-msgid "Error unsetting accelerator in configuration database: %s"
-msgstr "å?¨çµ?æ??è³?æ??åº«ä¸å??æ¶?è¨å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1626
+#: ../panels/keyboard/keyboard-shortcuts.c:1442
 msgid "Too many custom shortcuts"
 msgstr "å¤ªå¤?è?ªé?¸æ?·å¾?é?µ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1907
-msgid "Section"
-msgstr "ç¯?"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1956
+#: ../panels/keyboard/keyboard-shortcuts.c:1761
 msgid "Action"
 msgstr "å??ä½?"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1979
+#: ../panels/keyboard/keyboard-shortcuts.c:1784
 msgid "Shortcut"
 msgstr "æ?·å¾?é?µ"
 
@@ -804,7 +976,7 @@ msgstr "é??åº¦(_P):"
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 #: ../panels/mouse/gnome-mouse-properties.ui.h:24
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Short"
 msgstr "ç?"
 
@@ -979,219 +1151,214 @@ 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:224
+#: ../panels/printers/cc-printers-panel.c:261
 msgid "Low on toner"
 msgstr "ç¢³ç²?ä¸?è¶³"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:226
+#: ../panels/printers/cc-printers-panel.c:263
 msgid "Out of toner"
 msgstr "ç¢³ç²?ç?¨å®?"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:229
+#: ../panels/printers/cc-printers-panel.c:266
 msgid "Low on developer"
 msgstr "é¡¯å??å??ä¸?è¶³"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:232
+#: ../panels/printers/cc-printers-panel.c:269
 msgid "Out of developer"
 msgstr "é¡¯å??å??ç?¨å®?"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:234
+#: ../panels/printers/cc-printers-panel.c:271
 msgid "Low on a marker supply"
 msgstr "å¢¨æ°´å?£ä¸?è¶³"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:236
+#: ../panels/printers/cc-printers-panel.c:273
 msgid "Out of a marker supply"
 msgstr "å¢¨æ°´å?£ç?¨å®?"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:238
+#: ../panels/printers/cc-printers-panel.c:275
 #, 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:240
+#: ../panels/printers/cc-printers-panel.c:277
 #, fuzzy
 #| msgid "Open Folder"
 msgid "Open door"
 msgstr "æ??å??å??ç©ºä½?"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:242
+#: ../panels/printers/cc-printers-panel.c:279
 msgid "Low on paper"
 msgstr "ç´?å¼µä¸?è¶³ã??"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:244
+#: ../panels/printers/cc-printers-panel.c:281
 msgid "Out of paper"
 msgstr "ç´?å¼µç?¨å®?"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:246
+#: ../panels/printers/cc-printers-panel.c:283
 msgctxt "printer state"
 msgid "Offline"
 msgstr "é?¢ç·?"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:248
+#: ../panels/printers/cc-printers-panel.c:285
 msgctxt "printer state"
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:250
+#: ../panels/printers/cc-printers-panel.c:287
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:252
+#: ../panels/printers/cc-printers-panel.c:289
 #, fuzzy
 msgid "Waste receptacle full"
 msgstr "ä¿?è?? [25 å??]"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:254
+#: ../panels/printers/cc-printers-panel.c:291
 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:256
+#: ../panels/printers/cc-printers-panel.c:293
 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:348
+#: ../panels/printers/cc-printers-panel.c:430
 msgctxt "printer state"
 msgid "Ready"
-msgstr ""
+msgstr "æº?å??å°±ç·?"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:352
+#: ../panels/printers/cc-printers-panel.c:434
 msgctxt "printer state"
 msgid "Processing"
 msgstr "è??ç??ä¸"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:356
+#: ../panels/printers/cc-printers-panel.c:438
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:454
+#: ../panels/printers/cc-printers-panel.c:536
 msgid "Toner Level"
 msgstr "ç¢³ç²?å?£ç?ç´?"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:457
+#: ../panels/printers/cc-printers-panel.c:539
 msgid "Ink Level"
 msgstr "å¢¨æ°´ç?ç´?"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:460
+#: ../panels/printers/cc-printers-panel.c:542
 msgid "Supply Level"
 msgstr "è??æ??ç?ç´?"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:475
+#: ../panels/printers/cc-printers-panel.c:557
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u ä½¿ç?¨ä¸"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:910
+#: ../panels/printers/cc-printers-panel.c:1024
 msgctxt "print job"
 msgid "Pending"
 msgstr "ä¿?ç??ä¸"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:914
+#: ../panels/printers/cc-printers-panel.c:1028
 msgctxt "print job"
 msgid "Held"
 msgstr "å·²æ?«å??"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:918
+#: ../panels/printers/cc-printers-panel.c:1032
 msgctxt "print job"
 msgid "Processing"
 msgstr "è??ç??ä¸"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:922
+#: ../panels/printers/cc-printers-panel.c:1036
 msgctxt "print job"
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:926
+#: ../panels/printers/cc-printers-panel.c:1040
 msgctxt "print job"
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:930
+#: ../panels/printers/cc-printers-panel.c:1044
 msgctxt "print job"
 msgid "Aborted"
 msgstr "å·²æ?¾æ£?"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:934
+#: ../panels/printers/cc-printers-panel.c:1048
 msgctxt "print job"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1029
+#: ../panels/printers/cc-printers-panel.c:1140
 msgid "Job Title"
 msgstr "å·¥ä½?å??ç¨±"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1037
+#: ../panels/printers/cc-printers-panel.c:1149
 msgid "Job State"
 msgstr "å·¥ä½?ç??æ??"
 
-#. Translators: Name of column showing names of creators of print jobs
-#: ../panels/printers/cc-printers-panel.c:1043
-msgid "User"
-msgstr "ä½¿ç?¨è??"
-
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1049
+#: ../panels/printers/cc-printers-panel.c:1155
 msgid "Time"
 msgstr "æ??å?»"
 
 #. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1239
+#: ../panels/printers/cc-printers-panel.c:1345
 #, 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:1949
+#: ../panels/printers/cc-printers-panel.c:2055
 msgid "Test page"
 msgstr "æ¸¬è©¦é ?"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1957
+#: ../panels/printers/cc-printers-panel.c:2063
 msgid "Clean print heads"
 msgstr "æ¸?ç??æ??å?°å?´é "
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1962
+#: ../panels/printers/cc-printers-panel.c:2068
 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:2088
+#: ../panels/printers/cc-printers-panel.c:2195
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
@@ -1442,7 +1609,7 @@ msgstr "ç?¶æ??ä¸? Control æ??é¡¯ç¤ºæ¸¸æ¨?ç??ä½?ç½®(_O)"
 
 #. small threshold
 #: ../panels/mouse/gnome-mouse-properties.ui.h:28
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Small"
 msgstr "å°?"
 
@@ -1503,124 +1670,23 @@ msgstr "è¨å®?ä½ ç??æ»?é¼ è??è§¸æ?§æ?¿å??å¥½è¨å®?"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;è§¸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?è§¸;é?£æ??å?©ä¸?;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/cc-network-panel.c:819
+#: ../panels/network/cc-network-panel.c:962
 msgid "Network proxy"
 msgstr "ç¶²çµ¡ä»£ç??ä¼ºæ??å?¨"
 
-#: ../panels/network/cc-network-panel.c:828
+#: ../panels/network/cc-network-panel.c:971
 msgid "Set the system proxy settings"
 msgstr "è¨å®?ç³»çµ±ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼"
 
-#. TRANSLATORS: device type
-#. TRANSLATORS: AP type
-#. TRANSLATORS: device type
-#. TRANSLATORS: AP type
-#: ../panels/network/nm-device.c:117 ../panels/network/nm-access-point.c:65
-#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:121 ../panels/network/panel-common.c:69
-msgid "Wired"
-msgstr "æ??ç·?"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:125 ../panels/network/panel-common.c:73
-msgid "Wireless"
-msgstr "ç?¡ç·?"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:130 ../panels/network/panel-common.c:78
-msgid "Mobile broadband"
-msgstr "è¡?å??å¯¬é »"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:134 ../panels/network/panel-common.c:82
-msgid "Bluetooth"
-msgstr "è??ç??"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:138 ../panels/network/panel-common.c:86
-#, fuzzy
-#| msgid "Models"
-msgid "Mesh"
-msgstr "å??è??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:190 ../panels/network/panel-common.c:164
-msgid "Status unknown"
-msgstr "ç??æ??ä¸?æ??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:194 ../panels/network/panel-common.c:168
-msgid "Unmanaged"
-msgstr "æ?ªç®¡ç??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:198 ../panels/network/panel-common.c:172
-msgid "Unavailable"
-msgstr "ç?¡æ³?ä½¿ç?¨"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:202 ../panels/network/panel-common.c:176
-msgid "Disconnected"
-msgstr "å·²æ?·ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:206 ../panels/network/panel-common.c:180
-msgid "Preparing connection"
-msgstr "æ£å?¨æº?å??é?£ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:210 ../panels/network/panel-common.c:184
-msgid "Configuring connection"
-msgstr "æ£å?¨è¨å®?é?£ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:214 ../panels/network/panel-common.c:188
-msgid "Authenticating"
-msgstr "æ£å?¨é©?è?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:218 ../panels/network/panel-common.c:192
-msgid "Getting network address"
-msgstr "æ£å?¨å??å¾?ç¶²çµ¡ä½?å??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:222 ../panels/network/panel-common.c:196
-msgid "Connected"
-msgstr "å·²é?£ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:226 ../panels/network/panel-common.c:200
-msgid "Failed to connect"
-msgstr "ç?¡æ³?é?£ç·?"
-
-#: ../panels/network/nm-device.c:837
-#, c-format
-msgid "%i kb/s"
-msgstr "%i kb/s"
-
-#: ../panels/network/nm-device.c:839 ../panels/network/nm-device.c:856
-#, c-format
-msgid "%i Mb/s"
-msgstr "%i Mb/s"
-
-#: ../panels/network/nm-device.c:858
-#, c-format
-msgid "%i Gb/s"
-msgstr "%i Gb/s"
-
-#. TRANSLATORS: AP type
-#: ../panels/network/nm-access-point.c:69 ../panels/network/panel-common.c:142
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
+#. TRANSLATORS: the user is running a NM that is too new and API compatible
+#: ../panels/network/cc-network-panel.c:1115
+msgid "The running NetworkManager version is not compatible (too new)."
+msgstr ""
 
-#. TRANSLATORS: AP type
-#: ../panels/network/nm-access-point.c:73 ../panels/network/panel-common.c:146
-msgid "Infrastructure"
-msgstr "å?ºç¤?æ?¶æ§?"
+#. TRANSLATORS: the user is running a NM that is too old and API compatible
+#: ../panels/network/cc-network-panel.c:1121
+msgid "The running NetworkManager version is not compatible (too old)."
+msgstr ""
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
 msgid "Network"
@@ -1742,6 +1808,120 @@ msgctxt "proxy method"
 msgid "None"
 msgstr "æ²?æ??"
 
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:64 ../panels/network/panel-common.c:136
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:68
+msgid "Wired"
+msgstr "æ??ç·?"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:72
+msgid "Wireless"
+msgstr "ç?¡ç·?"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:77
+msgid "Mobile broadband"
+msgstr "è¡?å??å¯¬é »"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:81
+msgid "Bluetooth"
+msgstr "è??ç??"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:85
+#, fuzzy
+#| msgid "Models"
+msgid "Mesh"
+msgstr "å??è??"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:140
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:144
+msgid "Infrastructure"
+msgstr "å?ºç¤?æ?¶æ§?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:162
+msgid "Status unknown"
+msgstr "ç??æ??ä¸?æ??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:166
+msgid "Unmanaged"
+msgstr "æ?ªç®¡ç??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:170
+msgid "Unavailable"
+msgstr "ç?¡æ³?ä½¿ç?¨"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:174
+msgid "Disconnected"
+msgstr "å·²æ?·ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:178
+msgid "Preparing connection"
+msgstr "æ£å?¨æº?å??é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:182
+msgid "Configuring connection"
+msgstr "æ£å?¨è¨å®?é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:186
+msgid "Authenticating"
+msgstr "æ£å?¨é©?è?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:190
+msgid "Getting network address"
+msgstr "æ£å?¨å??å¾?ç¶²çµ¡ä½?å??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:194
+#, fuzzy
+#| msgid "Getting network address"
+msgid "Checking network address"
+msgstr "æ£å?¨å??å¾?ç¶²çµ¡ä½?å??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:198
+msgid "Connected"
+msgstr "å·²é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:202
+#, fuzzy
+#| msgid "Disconnected"
+msgid "Disconnecting"
+msgstr "å·²æ?·ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:206
+msgid "Failed to connect"
+msgstr "ç?¡æ³?é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:210
+#, fuzzy
+#| msgid "Status unknown"
+msgid "Status unknown (missing)"
+msgstr "ç??æ??ä¸?æ??"
+
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "é?»æº?"
@@ -2226,10 +2406,6 @@ msgstr "è?²ç´?"
 msgid "Keyboard;Mouse;a11y;Accessibility;"
 msgstr "Keyboard;Mouse;a11y;Accessibility;é?µç?¤;æ»?é¼ ;ç?¡é??ç¤?;"
 
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
-msgid "Universal Access"
-msgstr "ç?¡é??ç¤?å??è?½"
-
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
 msgid "Universal Access Preferences"
 msgstr "ç?¡é??ç¤?å??å¥½è¨å®?"
@@ -2407,7 +2583,7 @@ msgstr "æ?¾å¤§"
 
 #: ../panels/universal-access/uap.ui.h:53
 msgid "LowContrast"
-msgstr "ä½?å??å·®"
+msgstr "ä½?å°?æ¯?"
 
 #: ../panels/universal-access/uap.ui.h:54
 msgid "Mouse Keys"
@@ -2426,142 +2602,134 @@ msgid "None"
 msgstr "æ²?æ??"
 
 #: ../panels/universal-access/uap.ui.h:59
-msgid "Off"
-msgstr "é??é??"
-
-#: ../panels/universal-access/uap.ui.h:60
-msgid "On"
-msgstr "é??"
-
-#: ../panels/universal-access/uap.ui.h:61
 msgid "On screen keyboard"
 msgstr "è?¢å¹?é?µç?¤"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:60
 msgid "OnBoard"
 msgstr "OnBoard"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Options..."
 msgstr "é?¸é ?â?¦"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Pointing and Clicking"
 msgstr "æ??æ¨?å??é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "å?¨æ??é?µè¢«æ??ä¸?å?°å®?è¢«æ?¥å??ä¹?é??ç½®å?¥å»¶é?²"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Screen Reader"
 msgstr "è?¢å¹?é?±è®?å?¨"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Seeing"
 msgstr "è¦?è¦º"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Shift+Ctrl+Alt+-"
 msgstr "Shift+Ctrl+Alt+-"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Shift+Ctrl+Alt+="
 msgstr "Shift+Ctrl+Alt+="
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Simulated Secondary Click"
 msgstr "æ¨¡æ?¬æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Slow Keys"
 msgstr "é?²ç·©æ??é?µ"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Sound Settings..."
 msgstr "é?³æ??è¨å®?å?¼â?¦"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Sticky Keys"
 msgstr "é»?æ?§ç?¹æ®?é?µ"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Test flash"
 msgstr "æ¸¬è©¦é??å??"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Text size:"
 msgstr "æ??å?å¤§å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:78
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "å°?é?£çº?æ??ç??ç?¹æ®?é?µè¦?ç?ºæ??é?µçµ?å??"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Trigger a click when the pointer hovers"
 msgstr "ç?¶å??æ¢æ¸¸æ¨?ç§»å??æ??è§¸ç?¼é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æ??ä½?ä¸»è¦?é?µæ??è§¸ç?¼æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Turn on accessibility features from the keyboard"
 msgstr "ä»¥é?µç?¤é??å??ç?¡é??ç¤?å??è?½"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:82
 msgid "Turn on or off:"
 msgstr "é??å??æ??é??é??ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Type here to test settings"
 msgstr "å?¨é??è£?æ??å?ä»¥æ¸¬è©¦è¨å®?å?¼"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Typing"
 msgstr "è¼¸å?¥"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Typing Assistant"
 msgstr "è¼¸å?¥å?©ç??"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:86
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "ç?¶è¦ç¤ºé?³æ??ç?¼å?ºæ??ä½¿ç?¨è¦?è¦ºå??ç??æ??ç¤º"
 
-#: ../panels/universal-access/uap.ui.h:89
+#: ../panels/universal-access/uap.ui.h:87
 msgid "Use an alternative form of text input"
 msgstr "ä½¿ç?¨æ??å?è¼¸å?¥ç??æ?¿ä»£å½¢å¼?"
 
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:88
 msgid "Video Mouse"
 msgstr "è¦?å??æ»?é¼ "
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:89
 msgid "Visual Alerts"
 msgstr "è¦?è¦ºè¦ç¤º"
 
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:91
 msgid "Zoom in:"
 msgstr "æ??è¿?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:92
 msgid "Zoom out:"
 msgstr "æ??é? ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:93
 msgid "_Motion threshold:"
 msgstr "ç§»å??é??åº¦(_M):"
 
-#: ../panels/universal-access/uap.ui.h:96
+#: ../panels/universal-access/uap.ui.h:94
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:97
+#: ../panels/universal-access/uap.ui.h:95
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:98
+#: ../panels/universal-access/uap.ui.h:96
 msgid "rejected"
 msgstr "å·²æ??çµ?"
 
@@ -2837,11 +3005,6 @@ msgstr "é?¯èª¤ç??å¯?ç¢¼"
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../panels/user-accounts/um-photo-dialog.c:216
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
-msgid "Browse for more pictures"
-msgstr "ç??è¦½æ?´å¤?ç?§ç??"
-
 #: ../panels/user-accounts/um-photo-dialog.c:429
 msgid "Disable image"
 msgstr "å??ç?¨å??ç??"
@@ -3222,6 +3385,30 @@ msgstr "æ?§å?¶ä¸å¿?"
 msgid "_All Settings"
 msgstr "æ??æ??è¨å®?å?¼(_A)"
 
+#~ msgid "%i kb/s"
+#~ msgstr "%i kb/s"
+
+#~ msgid "%i Mb/s"
+#~ msgstr "%i Mb/s"
+
+#~ msgid "%i Gb/s"
+#~ msgstr "%i Gb/s"
+
+#~ msgid "More Info"
+#~ msgstr "æ?´å¤?è³?è¨?"
+
+#~ msgid "Error unsetting accelerator in configuration database: %s"
+#~ msgstr "å?¨çµ?æ??è³?æ??åº«ä¸å??æ¶?è¨å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
+
+#~ msgid "User"
+#~ msgstr "ä½¿ç?¨è??"
+
+#~ msgid "Off"
+#~ msgstr "é??é??"
+
+#~ msgid "On"
+#~ msgstr "é??"
+
 #~| msgid "Idle"
 #~ msgctxt "printer state"
 #~ msgid "Idle"
@@ -3843,9 +4030,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Image Viewer"
 #~ msgstr "å??ç??ç??è¦½ç¨?å¼?"
 
-#~ msgid "Multimedia Player"
-#~ msgstr "å¤?åª?é«?æ?æ?¾å?¨"
-
 #~ msgid "Open link in new _tab"
 #~ msgstr "å?¨æ?°ç??å??é ?ä¸é??å??é?£çµ?(_T)"
 
@@ -3888,9 +4072,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Icedove"
 #~ msgstr "Icedove"
 
-#~ msgid "KMail"
-#~ msgstr "KMail"
-
 #~ msgid "Konqueror"
 #~ msgstr "Konqueror"
 
@@ -4476,9 +4657,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "C_ompany:"
 #~ msgstr "å?¬å?¸(_O):"
 
-#~ msgid "Cale_ndar:"
-#~ msgstr "è¡?äº?æ??(_N):"
-
 #~ msgid "Change Passwo_rd..."
 #~ msgstr "è®?æ?´å¯?ç¢¼(_R)â?¦"
 
@@ -4533,9 +4711,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "User name:"
 #~ msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
 
-#~ msgid "Web"
-#~ msgstr "ç¶²é ?"
-
 #~ msgid "Web _log:"
 #~ msgstr "ç¶²è·¯æ?¥èª?(_L):"
 
@@ -4929,9 +5104,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "dots per inch"
 #~ msgstr "è§£æ??åº¦(dpi)"
 
-#~ msgid "Appearance"
-#~ msgstr "å¤?è§?"
-
 #~ msgid "Customize the look of the desktop"
 #~ msgstr "è?ªè¨?æ¡?é?¢ç??å¤?è§?"
 
@@ -5126,9 +5298,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ "Specify the name of the page to show (internet|multimedia|system|a11y)"
 #~ msgstr "æ??å®?è¦?é¡¯ç¤ºç??é ?é?¢å??ç¨± (internet|multimedia|system|a11y)"
 
-#~ msgid "- GNOME Default Applications"
-#~ msgstr "- GNOME é ?è¨æ??ç?¨ç¨?å¼?"
-
 #~ msgid "Monitor Preferences"
 #~ msgstr "è?¢å¹?å??å¥½è¨å®?"
 
@@ -5208,9 +5377,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Maximize Horizontally"
 #~ msgstr "æ°´å¹³æ??å¤§å??"
 
-#~ msgid "Roll up"
-#~ msgstr "æ?²èµ·"
-
 #~ msgid "key not found [%s]\n"
 #~ msgstr "æ?¾ä¸?å?°æ??é?µ [%s]\n"
 
@@ -5590,9 +5756,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Play _sound effects when buttons are clicked"
 #~ msgstr "ç?¶æ??é??è¢«é»?æ??æ??æ?æ?¾é?³æ??(_S)"
 
-#~ msgid "S_ound playback:"
-#~ msgstr "è?²é?³æ?æ?¾(_O):"
-
 #~ msgid ""
 #~ "Select the device and tracks to control with the keyboard. Use the Shift "
 #~ "and Control keys to select multiple tracks if required."
@@ -5623,9 +5786,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Custom..."
 #~ msgstr "è?ªè¨?â?¦"
 
-#~ msgid "Logout"
-#~ msgstr "ç?»å?º"
-
 #~ msgid "Enable support for GNOME assistive technologies at login"
 #~ msgstr "ç?»å?¥æ??å??ç?¨ GNOME è¼?å?©ç§?æ??æ?¯æ?´"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 13587ea..83656fa 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.7\n"
+"Project-Id-Version: gnome-control-center 2.91.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-11 19:14+0800\n"
-"PO-Revision-Date: 2011-02-11 08:09+0800\n"
+"POT-Creation-Date: 2011-02-23 19:22+0800\n"
+"PO-Revision-Date: 2011-02-20 21:43+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"
@@ -120,7 +120,7 @@ msgstr "å±¬æ?§ä¿®æ?¹ç¨?å¼?é??æ?¾è³?æ??ç?? callback"
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr "ç?¶å±¬æ?§ä¿®æ?¹ç¨?å¼?é??æ?¾ç?©ä»¶è³?æ??æ??ï¼?ç?¼å?º callback"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1406
+#: ../libgnome-control-center/gconf-property-editor.c:1473
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -132,7 +132,7 @@ msgstr ""
 "\n"
 "è«?ç¢ºå®?æª?æ¡?å·²ç¶?å?å?¨ä¸¦å??è©¦ä¸?æ¬¡ï¼?æ??æ?¯é?¸æ??å?¶å®?è??æ?¯å??æ¡?ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1414
+#: ../libgnome-control-center/gconf-property-editor.c:1481
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -145,11 +145,11 @@ msgstr ""
 "\n"
 "è«?é?¸æ??å?¶å®?å??æ¡?ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1536
+#: ../libgnome-control-center/gconf-property-editor.c:1603
 msgid "Please select an image."
 msgstr "è«?é?¸å??å??ç??ã??"
 
-#: ../libgnome-control-center/gconf-property-editor.c:1541
+#: ../libgnome-control-center/gconf-property-editor.c:1608
 msgid "_Select"
 msgstr "é?¸å??(_S)"
 
@@ -193,54 +193,60 @@ msgid "Tile"
 msgstr "é?ªæ??"
 
 #: ../panels/background/background.ui.h:8
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:90
 msgid "Zoom"
 msgstr "ç¸®æ?¾"
 
-#: ../panels/background/bg-colors-source.c:45
+#: ../panels/background/bg-colors-source.c:46
 msgid "Horizontal Gradient"
 msgstr "æ°´å¹³æ¼¸å±¤"
 
-#: ../panels/background/bg-colors-source.c:46
+#: ../panels/background/bg-colors-source.c:47
 msgid "Vertical Gradient"
 msgstr "å??ç?´æ¼¸å±¤"
 
-#: ../panels/background/bg-colors-source.c:47
+#: ../panels/background/bg-colors-source.c:48
 msgid "Solid Color"
 msgstr "å?®è?²"
 
-#: ../panels/background/cc-background-panel.c:775
+#: ../panels/background/cc-background-panel.c:960
+#: ../panels/user-accounts/um-photo-dialog.c:216
+#: ../panels/user-accounts/data/photo-dialog.ui.h:2
+msgid "Browse for more pictures"
+msgstr "ç??è¦½æ?´å¤?ç?§ç??"
+
+#: ../panels/background/cc-background-panel.c:1051
+msgid "Current background"
+msgstr "ç?®å??ç??è??æ?¯"
+
+#: ../panels/background/cc-background-panel.c:1115
 msgid "Wallpapers"
 msgstr "æ¡?å¸?"
 
-#: ../panels/background/cc-background-panel.c:783
+#: ../panels/background/cc-background-panel.c:1122
 msgid "Pictures Folder"
 msgstr "å??ç??è³?æ??å¤¾"
 
-#: ../panels/background/cc-background-panel.c:791
+#: ../panels/background/cc-background-panel.c:1129
 msgid "Colors & Gradients"
 msgstr "é¡?è?² & æ¼¸å±¤"
 
-#: ../panels/background/cc-background-panel.c:800
+#: ../panels/background/cc-background-panel.c:1137
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../panels/background/cc-background-panel.c:854
-msgid "Current background"
-msgstr "ç?®å??ç??è??æ?¯"
-
-#: ../panels/background/cc-background-item.c:146
+#: ../panels/background/cc-background-item.c:148
 msgid "multiple sizes"
 msgstr "å¤?é??å°ºå¯¸"
 
 #. translators: 100 Ã? 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:150
+#: ../panels/background/cc-background-item.c:152
 #, c-format
 msgid "%d Ã? %d"
 msgstr "%d Ã? %d"
 
-#: ../panels/background/cc-background-item.c:252
+#: ../panels/background/cc-background-item.c:255
 msgid "No Desktop Background"
 msgstr "ç?¡æ¡?é?¢è??æ?¯"
 
@@ -524,52 +530,93 @@ msgstr "ç?¡æ³?å??å¾?è?¢å¹?è³?è¨?"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:417
+#: ../panels/info/cc-info-panel.c:479
 #, c-format
 msgid "%d-bit"
 msgstr "%d-ä½?å??"
 
-#: ../panels/info/cc-info-panel.c:431
+#: ../panels/info/cc-info-panel.c:493
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u ä½?å??çµ?"
 
-#: ../panels/info/cc-info-panel.c:439
+#: ../panels/info/cc-info-panel.c:501
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: ../panels/info/cc-info-panel.c:444
+#: ../panels/info/cc-info-panel.c:506
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../panels/info/cc-info-panel.c:449
+#: ../panels/info/cc-info-panel.c:511
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../panels/info/cc-info-panel.c:454
+#: ../panels/info/cc-info-panel.c:516
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../panels/info/cc-info-panel.c:459
+#: ../panels/info/cc-info-panel.c:521
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../panels/info/cc-info-panel.c:464
+#: ../panels/info/cc-info-panel.c:526
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
-#: ../panels/info/cc-info-panel.c:574
+#: ../panels/info/cc-info-panel.c:637
 msgid "Unknown model"
 msgstr "ä¸?æ??ç??å??è??"
 
-#: ../panels/info/cc-info-panel.c:637
+#: ../panels/info/cc-info-panel.c:720
+msgid "The next login will attempt to use the standard experience."
+msgstr "ä¸?æ¬¡ç?»å?¥æ??å??è©¦ä½¿ç?¨æ¨?æº?é«?é©?ã??"
+
+#: ../panels/info/cc-info-panel.c:722
+msgid ""
+"The next login will use the fallback mode intended for unsupported graphics "
+"hardware."
+msgstr "ä¸?æ¬¡ç?»å?¥æ??ä½¿ç?¨å¾?å??æ¨¡å¼?ä»¥é??å??ä¸?æ?¯æ?´ç??å??å½¢é¡¯ç¤ºç¡¬é«?ã??"
+
+#. translators: The hardware is not able to run GNOME 3's
+#. * shell, so we use the GNOME "Fallback" session
+#: ../panels/info/cc-info-panel.c:771
+msgctxt "Experience"
+msgid "Fallback"
+msgstr "å¾?å??"
+
+#. translators: The hardware is able to run GNOME 3's
+#. * shell, also called "Standard" experience
+#: ../panels/info/cc-info-panel.c:777
+msgctxt "Experience"
+msgid "Standard"
+msgstr "æ¨?æº?"
+
+#: ../panels/info/cc-info-panel.c:909
+#: ../panels/keyboard/keyboard-shortcuts.c:1711
+msgid "Section"
+msgstr "ç¯?"
+
+#: ../panels/info/cc-info-panel.c:918 ../panels/info/info.ui.h:15
+msgid "Overview"
+msgstr "æ¦?è¦½"
+
+#: ../panels/info/cc-info-panel.c:924 ../panels/info/info.ui.h:3
+msgid "Default Applications"
+msgstr "é ?è¨æ??ç?¨ç¨?å¼?"
+
+#: ../panels/info/cc-info-panel.c:929 ../panels/info/info.ui.h:10
+msgid "Graphics"
+msgstr "ç¹ªå??"
+
+#: ../panels/info/cc-info-panel.c:954
 #, c-format
 msgid "Version %s"
 msgstr "ç??æ?¬ %s"
@@ -590,49 +637,183 @@ msgstr ""
 "å?¨;ç??æ?¬;"
 
 #: ../panels/info/info.ui.h:1
-msgid "Device name:"
-msgstr "è£?ç½®å??ç¨±ï¼?"
+msgid "Calendar"
+msgstr "æ?¥æ??"
 
 #: ../panels/info/info.ui.h:2
-msgid "Disk:"
-msgstr "ç£?ç¢?ï¼?"
-
-#: ../panels/info/info.ui.h:3
-msgid "Graphics:"
-msgstr "å??å½¢ï¼?"
+msgid "Chipset"
+msgstr "æ?¶ç??"
 
 #: ../panels/info/info.ui.h:4
-msgid "Memory:"
-msgstr "è¨?æ?¶é«?ï¼?"
+msgid "Device name"
+msgstr "è£?ç½®å??ç¨±"
 
 #: ../panels/info/info.ui.h:5
-msgid "More Info"
-msgstr "æ?´å¤?è³?è¨?"
+msgid "Disk"
+msgstr "ç£?ç¢?"
 
 #: ../panels/info/info.ui.h:6
-msgid "OS type:"
-msgstr "OS é¡?å??ï¼?"
+msgid "Driver"
+msgstr "ç£?ç¢?æ©?"
 
 #: ../panels/info/info.ui.h:7
-msgid "Processor:"
-msgstr "è??ç??å?¨ï¼?"
+msgid "Experience"
+msgstr "é«?é©?"
+
+#. Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.
+#: ../panels/info/info.ui.h:9
+msgid "Forced Fallback Mode"
+msgstr "å¼·å?¶å¾?å??æ¨¡å¼?"
+
+#: ../panels/info/info.ui.h:11
+msgid "Mail"
+msgstr "é?µä»¶"
 
-#: ../panels/info/info.ui.h:8
-msgid "Update Available"
-msgstr "æ??æ?´æ?°å?¯ç?¨"
+#: ../panels/info/info.ui.h:12
+msgid "Memory"
+msgstr "è¨?æ?¶é«?"
+
+#: ../panels/info/info.ui.h:13
+msgid "Music"
+msgstr "é?³æ¨?"
+
+#: ../panels/info/info.ui.h:14
+msgid "OS type"
+msgstr "OS é¡?å??"
+
+#: ../panels/info/info.ui.h:16
+msgid "Photos"
+msgstr "ç?¸ç??"
+
+#: ../panels/info/info.ui.h:17
+msgid "Processor"
+msgstr "è??ç??å?¨"
+
+#: ../panels/info/info.ui.h:18
+msgid "Updates Available"
+msgstr "å?¯ç?¨ç??æ?´æ?°"
+
+#: ../panels/info/info.ui.h:19
+msgid "Video"
+msgstr "å½±ç??"
+
+#: ../panels/info/info.ui.h:20
+msgid "Web"
+msgstr "ç¶²é ?"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
+msgid "Eject"
+msgstr "é??å?º"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:2
+msgid "Launch media player"
+msgstr "å?·è¡?åª?é«?æ?æ?¾ç¨?å¼?"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:3
+msgid "Next track"
+msgstr "ä¸?ä¸?é¦?æ?æ?²"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:4
+msgid "Pause playback"
+msgstr "æ?«å??æ?æ?¾"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:5
+msgid "Play (or play/pause)"
+msgstr "æ?æ?¾ï¼?æ??æ?æ?¾/æ?«å??ï¼?"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:6
+msgid "Previous track"
+msgstr "ä¸?ä¸?é¦?æ?æ?²"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:7
 msgid "Sound and Media"
 msgstr "è?²é?³è??åª?é«?"
 
+#: ../panels/keyboard/00-multimedia.xml.in.h:8
+msgid "Stop playback"
+msgstr "å??æ¢æ?æ?¾"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:9
+msgid "Volume down"
+msgstr "èª¿ä½?é?³é??"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:10
+msgid "Volume mute"
+msgstr "é??é?³"
+
+#: ../panels/keyboard/00-multimedia.xml.in.h:11
+msgid "Volume up"
+msgstr "èª¿é«?é?³é??"
+
 #: ../panels/keyboard/01-launchers.xml.in.h:1
+msgid "Home folder"
+msgstr "å®¶ç?®é??"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:2
+msgid "Launch calculator"
+msgstr "å?·è¡?è¨?ç®?æ©?"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:3
+msgid "Launch email client"
+msgstr "å?·è¡?é?»å?é?µä»¶å®¢æ?¶ç«¯"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:4
+msgid "Launch help browser"
+msgstr "å?·è¡?èªªæ??æ??ä»¶ç??è¦½å?¨"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:5
+msgid "Launch web browser"
+msgstr "å?·è¡?ç¶²é ?ç??è¦½å?¨"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launchers"
 msgstr "å?·è¡?å?¨"
 
+#: ../panels/keyboard/01-launchers.xml.in.h:7
+msgid "Search"
+msgstr "æ??å°?"
+
 #: ../panels/keyboard/01-system.xml.in.h:1
+msgid "Lock screen"
+msgstr "é??å®?ç?«é?¢"
+
+#: ../panels/keyboard/01-system.xml.in.h:2
+msgid "Log out"
+msgstr "ç?»å?º"
+
+#: ../panels/keyboard/01-system.xml.in.h:3
 msgid "System"
 msgstr "ç³»çµ±"
 
+#: ../panels/keyboard/50-accessibility.xml.in.h:1
+msgid "Decrease text size"
+msgstr "å°?æ??å?ç¸®å°?"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:2
+msgid "Increase text size"
+msgstr "å°?æ??å?æ?¾å¤§"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:3
+msgid "Toggle contrast"
+msgstr "å??æ??å°?æ¯?"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:4
+msgid "Toggle magnifier"
+msgstr "å??æ??æ?¾å¤§é?¡"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:5
+msgid "Toggle on-screen keyboard"
+msgstr "å??æ??è?¢å¹?é?µç?¤"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:6
+msgid "Toggle screen reader"
+msgstr "å??æ??è?¢å¹?é?±è®?å?¨"
+
+#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
+msgid "Universal Access"
+msgstr "ç?¡é??ç¤?å??è?½"
+
 #: ../panels/keyboard/eggcellrendererkeys.c:21
 msgid "New shortcut..."
 msgstr "æ?°å¢?æ?·å¾?é?µâ?¦"
@@ -663,7 +844,7 @@ msgstr "æ?·å¾?é?µç??é¡?å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1268
+#: ../panels/keyboard/keyboard-shortcuts.c:1141
 #: ../panels/sound/gvc-mixer-control.c:1091
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
@@ -684,22 +865,22 @@ msgstr "é?µç?¤"
 msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;æ?·å¾?é?µ;é??è¤?;é??ç??;"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:775
-#: ../panels/keyboard/keyboard-shortcuts.c:1040
-#: ../panels/keyboard/keyboard-shortcuts.c:1674
-#: ../panels/keyboard/keyboard-shortcuts.c:1678
+#: ../panels/keyboard/keyboard-shortcuts.c:643
+#: ../panels/keyboard/keyboard-shortcuts.c:916
+#: ../panels/keyboard/keyboard-shortcuts.c:1503
+#: ../panels/keyboard/keyboard-shortcuts.c:1507
 msgid "Custom Shortcuts"
 msgstr "è?ªè¨?æ?·å¾?é?µ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:887
+#: ../panels/keyboard/keyboard-shortcuts.c:768
 msgid "<Unknown Action>"
 msgstr "<è¡?å??è¨å®?ä¸?è©³>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1294
+#: ../panels/keyboard/keyboard-shortcuts.c:1167
 msgid "Error saving the new shortcut"
 msgstr "å?²å?æ?°ç??æ?·å¾?é?µæ??ç?¼ç??é?¯èª¤"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1404
+#: ../panels/keyboard/keyboard-shortcuts.c:1282
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -709,7 +890,7 @@ msgstr ""
 "æ?·å¾?â??%sâ??ç?¡æ³?ä½¿ç?¨ï¼?å??å? æ?¯æ??ç?¡æ³?æ??ä¸?æ¤æ??é?µã??\n"
 "è«?è©¦ç?¨å?¶å®?ç??æ??é?µï¼?å¦?å??æ??ä½¿ç?¨ Controlï¼?Alt  æ?? Shiftã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1434
+#: ../panels/keyboard/keyboard-shortcuts.c:1314
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -718,34 +899,25 @@ msgstr ""
 "æ?·å¾?é?µâ??%sâ??å·±ç¶?ä½¿ç?¨æ?¼ï¼?\n"
 "â??%sâ??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1440
+#: ../panels/keyboard/keyboard-shortcuts.c:1320
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦?æ??æ?¨é??æ?°æ??æ´¾æ?·å¾?é?µç?ºã??%sã??ï¼?ã??%sã??ç??æ?·å¾?é?µå°±æ??å??ç?¨ã??"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1448
+#: ../panels/keyboard/keyboard-shortcuts.c:1328
 msgid "_Reassign"
 msgstr "é??æ?°æ??æ´¾(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1568
-#, c-format
-msgid "Error unsetting accelerator in configuration database: %s"
-msgstr "å?¨çµ?æ??è³?æ??åº«ä¸å??æ¶?è¨å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1626
+#: ../panels/keyboard/keyboard-shortcuts.c:1442
 msgid "Too many custom shortcuts"
 msgstr "å¤ªå¤?è?ªè¨?æ?·å¾?é?µ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1907
-msgid "Section"
-msgstr "ç¯?"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1956
+#: ../panels/keyboard/keyboard-shortcuts.c:1761
 msgid "Action"
 msgstr "å??ä½?"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1979
+#: ../panels/keyboard/keyboard-shortcuts.c:1784
 msgid "Shortcut"
 msgstr "æ?·å¾?é?µ"
 
@@ -808,7 +980,7 @@ msgstr "é??åº¦(_P):"
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 #: ../panels/mouse/gnome-mouse-properties.ui.h:24
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Short"
 msgstr "ç?"
 
@@ -984,219 +1156,214 @@ 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:224
+#: ../panels/printers/cc-printers-panel.c:261
 msgid "Low on toner"
 msgstr "ç¢³ç²?ä¸?è¶³"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:226
+#: ../panels/printers/cc-printers-panel.c:263
 msgid "Out of toner"
 msgstr "ç¢³ç²?ç?¨å®?"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:229
+#: ../panels/printers/cc-printers-panel.c:266
 msgid "Low on developer"
 msgstr "é¡¯å??å??ä¸?è¶³"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:232
+#: ../panels/printers/cc-printers-panel.c:269
 msgid "Out of developer"
 msgstr "é¡¯å??å??ç?¨å®?"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:234
+#: ../panels/printers/cc-printers-panel.c:271
 msgid "Low on a marker supply"
 msgstr "å¢¨æ°´å?£ä¸?è¶³"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:236
+#: ../panels/printers/cc-printers-panel.c:273
 msgid "Out of a marker supply"
 msgstr "å¢¨æ°´å?£ç?¨å®?"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:238
+#: ../panels/printers/cc-printers-panel.c:275
 #, 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:240
+#: ../panels/printers/cc-printers-panel.c:277
 #, fuzzy
 #| msgid "Open Folder"
 msgid "Open door"
 msgstr "æ??å??å??ç©ºä½?"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:242
+#: ../panels/printers/cc-printers-panel.c:279
 msgid "Low on paper"
 msgstr "ç´?å¼µä¸?è¶³ã??"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:244
+#: ../panels/printers/cc-printers-panel.c:281
 msgid "Out of paper"
 msgstr "ç´?å¼µç?¨å®?"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:246
+#: ../panels/printers/cc-printers-panel.c:283
 msgctxt "printer state"
 msgid "Offline"
 msgstr "é?¢ç·?"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:248
+#: ../panels/printers/cc-printers-panel.c:285
 msgctxt "printer state"
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:250
+#: ../panels/printers/cc-printers-panel.c:287
 msgid "Waste receptacle almost full"
 msgstr ""
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:252
+#: ../panels/printers/cc-printers-panel.c:289
 #, fuzzy
 msgid "Waste receptacle full"
 msgstr "è?«è?? [25 å??]"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:254
+#: ../panels/printers/cc-printers-panel.c:291
 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:256
+#: ../panels/printers/cc-printers-panel.c:293
 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:348
+#: ../panels/printers/cc-printers-panel.c:430
 msgctxt "printer state"
 msgid "Ready"
-msgstr ""
+msgstr "æº?å??å°±ç·?"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:352
+#: ../panels/printers/cc-printers-panel.c:434
 msgctxt "printer state"
 msgid "Processing"
 msgstr "è??ç??ä¸"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:356
+#: ../panels/printers/cc-printers-panel.c:438
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:454
+#: ../panels/printers/cc-printers-panel.c:536
 msgid "Toner Level"
 msgstr "ç¢³ç²?å?£ç?ç´?"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:457
+#: ../panels/printers/cc-printers-panel.c:539
 msgid "Ink Level"
 msgstr "å¢¨æ°´ç?ç´?"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:460
+#: ../panels/printers/cc-printers-panel.c:542
 msgid "Supply Level"
 msgstr "è??æ??ç?ç´?"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:475
+#: ../panels/printers/cc-printers-panel.c:557
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u ä½¿ç?¨ä¸"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:910
+#: ../panels/printers/cc-printers-panel.c:1024
 msgctxt "print job"
 msgid "Pending"
 msgstr "ä¿?ç??ä¸"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:914
+#: ../panels/printers/cc-printers-panel.c:1028
 msgctxt "print job"
 msgid "Held"
 msgstr "å·²æ?«å??"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:918
+#: ../panels/printers/cc-printers-panel.c:1032
 msgctxt "print job"
 msgid "Processing"
 msgstr "è??ç??ä¸"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:922
+#: ../panels/printers/cc-printers-panel.c:1036
 msgctxt "print job"
 msgid "Stopped"
 msgstr "å·²å??æ¢"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:926
+#: ../panels/printers/cc-printers-panel.c:1040
 msgctxt "print job"
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:930
+#: ../panels/printers/cc-printers-panel.c:1044
 msgctxt "print job"
 msgid "Aborted"
 msgstr "å·²æ?¾æ£?"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:934
+#: ../panels/printers/cc-printers-panel.c:1048
 msgctxt "print job"
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1029
+#: ../panels/printers/cc-printers-panel.c:1140
 msgid "Job Title"
 msgstr "å·¥ä½?å??ç¨±"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1037
+#: ../panels/printers/cc-printers-panel.c:1149
 msgid "Job State"
 msgstr "å·¥ä½?ç??æ??"
 
-#. Translators: Name of column showing names of creators of print jobs
-#: ../panels/printers/cc-printers-panel.c:1043
-msgid "User"
-msgstr "ä½¿ç?¨è??"
-
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1049
+#: ../panels/printers/cc-printers-panel.c:1155
 msgid "Time"
 msgstr "æ??å?»"
 
 #. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1239
+#: ../panels/printers/cc-printers-panel.c:1345
 #, 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:1949
+#: ../panels/printers/cc-printers-panel.c:2055
 msgid "Test page"
 msgstr "æ¸¬è©¦é ?"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1957
+#: ../panels/printers/cc-printers-panel.c:2063
 msgid "Clean print heads"
 msgstr "æ¸?ç??å??å?°å?´é "
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1962
+#: ../panels/printers/cc-printers-panel.c:2068
 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:2088
+#: ../panels/printers/cc-printers-panel.c:2195
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ç?¡æ³?è¼?å?¥ uiï¼?%s"
@@ -1447,7 +1614,7 @@ msgstr "ç?¶æ??ä¸? Control æ??é¡¯ç¤ºæ¸¸æ¨?ç??ä½?ç½®(_O)"
 
 #. small threshold
 #: ../panels/mouse/gnome-mouse-properties.ui.h:28
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Small"
 msgstr "å°?"
 
@@ -1510,124 +1677,23 @@ msgstr ""
 "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;è§¸æ?§æ?¿;æ??æ¨?;é»?æ??;è¼?è§¸;é??"
 "æ??;æ??é??;è»?è·¡ç??;"
 
-#: ../panels/network/cc-network-panel.c:819
+#: ../panels/network/cc-network-panel.c:962
 msgid "Network proxy"
 msgstr "ç¶²è·¯ä»£ç??ä¼ºæ??å?¨"
 
-#: ../panels/network/cc-network-panel.c:828
+#: ../panels/network/cc-network-panel.c:971
 msgid "Set the system proxy settings"
 msgstr "è¨å®?ç³»çµ±ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼"
 
-#. TRANSLATORS: device type
-#. TRANSLATORS: AP type
-#. TRANSLATORS: device type
-#. TRANSLATORS: AP type
-#: ../panels/network/nm-device.c:117 ../panels/network/nm-access-point.c:65
-#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:121 ../panels/network/panel-common.c:69
-msgid "Wired"
-msgstr "æ??ç·?"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:125 ../panels/network/panel-common.c:73
-msgid "Wireless"
-msgstr "ç?¡ç·?"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:130 ../panels/network/panel-common.c:78
-msgid "Mobile broadband"
-msgstr "è¡?å??å¯¬é »"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:134 ../panels/network/panel-common.c:82
-msgid "Bluetooth"
-msgstr "è??ç??"
-
-#. TRANSLATORS: device type
-#: ../panels/network/nm-device.c:138 ../panels/network/panel-common.c:86
-#, fuzzy
-#| msgid "Models"
-msgid "Mesh"
-msgstr "å??è??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:190 ../panels/network/panel-common.c:164
-msgid "Status unknown"
-msgstr "ç??æ??ä¸?æ??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:194 ../panels/network/panel-common.c:168
-msgid "Unmanaged"
-msgstr "æ?ªç®¡ç??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:198 ../panels/network/panel-common.c:172
-msgid "Unavailable"
-msgstr "ç?¡æ³?ä½¿ç?¨"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:202 ../panels/network/panel-common.c:176
-msgid "Disconnected"
-msgstr "å·²æ?·ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:206 ../panels/network/panel-common.c:180
-msgid "Preparing connection"
-msgstr "æ£å?¨æº?å??é?£ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:210 ../panels/network/panel-common.c:184
-msgid "Configuring connection"
-msgstr "æ£å?¨è¨å®?é?£ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:214 ../panels/network/panel-common.c:188
-msgid "Authenticating"
-msgstr "æ£å?¨é©?è?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:218 ../panels/network/panel-common.c:192
-msgid "Getting network address"
-msgstr "æ£å?¨å??å¾?ç¶²è·¯ä½?å??"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:222 ../panels/network/panel-common.c:196
-msgid "Connected"
-msgstr "å·²é?£ç·?"
-
-#. TRANSLATORS: device status
-#: ../panels/network/nm-device.c:226 ../panels/network/panel-common.c:200
-msgid "Failed to connect"
-msgstr "ç?¡æ³?é?£ç·?"
-
-#: ../panels/network/nm-device.c:837
-#, c-format
-msgid "%i kb/s"
-msgstr "%i kb/s"
-
-#: ../panels/network/nm-device.c:839 ../panels/network/nm-device.c:856
-#, c-format
-msgid "%i Mb/s"
-msgstr "%i Mb/s"
-
-#: ../panels/network/nm-device.c:858
-#, c-format
-msgid "%i Gb/s"
-msgstr "%i Gb/s"
-
-#. TRANSLATORS: AP type
-#: ../panels/network/nm-access-point.c:69 ../panels/network/panel-common.c:142
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
+#. TRANSLATORS: the user is running a NM that is too new and API compatible
+#: ../panels/network/cc-network-panel.c:1115
+msgid "The running NetworkManager version is not compatible (too new)."
+msgstr ""
 
-#. TRANSLATORS: AP type
-#: ../panels/network/nm-access-point.c:73 ../panels/network/panel-common.c:146
-msgid "Infrastructure"
-msgstr "å?ºç¤?æ?¶æ§?"
+#. TRANSLATORS: the user is running a NM that is too old and API compatible
+#: ../panels/network/cc-network-panel.c:1121
+msgid "The running NetworkManager version is not compatible (too old)."
+msgstr ""
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
 msgid "Network"
@@ -1749,6 +1815,120 @@ msgctxt "proxy method"
 msgid "None"
 msgstr "æ²?æ??"
 
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:64 ../panels/network/panel-common.c:136
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:68
+msgid "Wired"
+msgstr "æ??ç·?"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:72
+msgid "Wireless"
+msgstr "ç?¡ç·?"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:77
+msgid "Mobile broadband"
+msgstr "è¡?å??å¯¬é »"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:81
+msgid "Bluetooth"
+msgstr "è??ç??"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:85
+#, fuzzy
+#| msgid "Models"
+msgid "Mesh"
+msgstr "å??è??"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:140
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:144
+msgid "Infrastructure"
+msgstr "å?ºç¤?æ?¶æ§?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:162
+msgid "Status unknown"
+msgstr "ç??æ??ä¸?æ??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:166
+msgid "Unmanaged"
+msgstr "æ?ªç®¡ç??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:170
+msgid "Unavailable"
+msgstr "ç?¡æ³?ä½¿ç?¨"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:174
+msgid "Disconnected"
+msgstr "å·²æ?·ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:178
+msgid "Preparing connection"
+msgstr "æ£å?¨æº?å??é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:182
+msgid "Configuring connection"
+msgstr "æ£å?¨è¨å®?é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:186
+msgid "Authenticating"
+msgstr "æ£å?¨é©?è?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:190
+msgid "Getting network address"
+msgstr "æ£å?¨å??å¾?ç¶²è·¯ä½?å??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:194
+#, fuzzy
+#| msgid "Getting network address"
+msgid "Checking network address"
+msgstr "æ£å?¨å??å¾?ç¶²è·¯ä½?å??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:198
+msgid "Connected"
+msgstr "å·²é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:202
+#, fuzzy
+#| msgid "Disconnected"
+msgid "Disconnecting"
+msgstr "å·²æ?·ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:206
+msgid "Failed to connect"
+msgstr "ç?¡æ³?é?£ç·?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:210
+#, fuzzy
+#| msgid "Status unknown"
+msgid "Status unknown (missing)"
+msgstr "ç??æ??ä¸?æ??"
+
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "é?»æº?"
@@ -2235,10 +2415,6 @@ msgstr "è?²ç´?"
 msgid "Keyboard;Mouse;a11y;Accessibility;"
 msgstr "Keyboard;Mouse;a11y;Accessibility;é?µç?¤;æ»?é¼ ;ç?¡é??ç¤?;"
 
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
-msgid "Universal Access"
-msgstr "ç?¡é??ç¤?å??è?½"
-
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
 msgid "Universal Access Preferences"
 msgstr "ç?¡é??ç¤?å??å¥½è¨å®?"
@@ -2416,7 +2592,7 @@ msgstr "æ?¾å¤§"
 
 #: ../panels/universal-access/uap.ui.h:53
 msgid "LowContrast"
-msgstr "ä½?å??å·®"
+msgstr "ä½?å°?æ¯?"
 
 #: ../panels/universal-access/uap.ui.h:54
 msgid "Mouse Keys"
@@ -2435,142 +2611,134 @@ msgid "None"
 msgstr "æ²?æ??"
 
 #: ../panels/universal-access/uap.ui.h:59
-msgid "Off"
-msgstr "é??é??"
-
-#: ../panels/universal-access/uap.ui.h:60
-msgid "On"
-msgstr "é??"
-
-#: ../panels/universal-access/uap.ui.h:61
 msgid "On screen keyboard"
 msgstr "è?¢å¹?é?µç?¤"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:60
 msgid "OnBoard"
 msgstr "OnBoard"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Options..."
 msgstr "é?¸é ?â?¦"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Pointing and Clicking"
 msgstr "æ??æ¨?å??é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "å?¨æ??é?µè¢«æ??ä¸?å?°å®?è¢«æ?¥å??ä¹?é??ç½®å?¥å»¶é?²"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Screen Reader"
 msgstr "è?¢å¹?é?±è®?å?¨"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Seeing"
 msgstr "è¦?è¦º"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Shift+Ctrl+Alt+-"
 msgstr "Shift+Ctrl+Alt+-"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Shift+Ctrl+Alt+="
 msgstr "Shift+Ctrl+Alt+="
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Simulated Secondary Click"
 msgstr "æ¨¡æ?¬æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Slow Keys"
 msgstr "é?²ç·©æ??é?µ"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Sound Settings..."
 msgstr "é?³æ??è¨å®?å?¼â?¦"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Sticky Keys"
 msgstr "é»?æ?§ç?¹æ®?é?µ"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Test flash"
 msgstr "æ¸¬è©¦é??å??"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Text size:"
 msgstr "æ??å?å¤§å°?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:78
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "å°?é?£çº?æ??ç??ç?¹æ®?é?µè¦?ç?ºæ??é?µçµ?å??"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Trigger a click when the pointer hovers"
 msgstr "ç?¶å??æ¢æ¸¸æ¨?ç§»å??æ??è§¸ç?¼é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æ??ä½?ä¸»è¦?é?µæ??è§¸ç?¼æ¬¡è¦?é»?æ??"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Turn on accessibility features from the keyboard"
 msgstr "ä»¥é?µç?¤é??å??ç?¡é??ç¤?å??è?½"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:82
 msgid "Turn on or off:"
 msgstr "é??å??æ??é??é??ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Type here to test settings"
 msgstr "å?¨é??è£¡æ??å?ä»¥æ¸¬è©¦è¨å®?å?¼"
 
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Typing"
 msgstr "è¼¸å?¥"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Typing Assistant"
 msgstr "è¼¸å?¥å?©ç??"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:86
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "ç?¶è¦ç¤ºé?³æ??ç?¼å?ºæ??ä½¿ç?¨è¦?è¦ºå??ç??æ??ç¤º"
 
-#: ../panels/universal-access/uap.ui.h:89
+#: ../panels/universal-access/uap.ui.h:87
 msgid "Use an alternative form of text input"
 msgstr "ä½¿ç?¨æ??å?è¼¸å?¥ç??æ?¿ä»£å½¢å¼?"
 
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:88
 msgid "Video Mouse"
 msgstr "è¦?è¨?æ»?é¼ "
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:89
 msgid "Visual Alerts"
 msgstr "è¦?è¦ºè¦ç¤º"
 
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:91
 msgid "Zoom in:"
 msgstr "æ??è¿?ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:92
 msgid "Zoom out:"
 msgstr "æ??é? ï¼?"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:93
 msgid "_Motion threshold:"
 msgstr "ç§»å??é??åº¦(_M):"
 
-#: ../panels/universal-access/uap.ui.h:96
+#: ../panels/universal-access/uap.ui.h:94
 msgid "accepted"
 msgstr "å·²æ?¥å??"
 
-#: ../panels/universal-access/uap.ui.h:97
+#: ../panels/universal-access/uap.ui.h:95
 msgid "pressed"
 msgstr "å·²æ??ä¸?"
 
-#: ../panels/universal-access/uap.ui.h:98
+#: ../panels/universal-access/uap.ui.h:96
 msgid "rejected"
 msgstr "å·²æ??çµ?"
 
@@ -2846,11 +3014,6 @@ msgstr "é?¯èª¤ç??å¯?ç¢¼"
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../panels/user-accounts/um-photo-dialog.c:216
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
-msgid "Browse for more pictures"
-msgstr "ç??è¦½æ?´å¤?ç?§ç??"
-
 #: ../panels/user-accounts/um-photo-dialog.c:429
 msgid "Disable image"
 msgstr "å??ç?¨å??ç??"
@@ -3237,6 +3400,30 @@ msgstr "æ?§å?¶ä¸å¿?"
 msgid "_All Settings"
 msgstr "æ??æ??è¨å®?å?¼(_A)"
 
+#~ msgid "%i kb/s"
+#~ msgstr "%i kb/s"
+
+#~ msgid "%i Mb/s"
+#~ msgstr "%i Mb/s"
+
+#~ msgid "%i Gb/s"
+#~ msgstr "%i Gb/s"
+
+#~ msgid "More Info"
+#~ msgstr "æ?´å¤?è³?è¨?"
+
+#~ msgid "Error unsetting accelerator in configuration database: %s"
+#~ msgstr "å?¨çµ?æ??è³?æ??åº«ä¸å??æ¶?è¨å®?æ?·å¾?é?µæ??å?ºç?¾é?¯èª¤ï¼?%s"
+
+#~ msgid "User"
+#~ msgstr "ä½¿ç?¨è??"
+
+#~ msgid "Off"
+#~ msgstr "é??é??"
+
+#~ msgid "On"
+#~ msgstr "é??"
+
 #~| msgid "Idle"
 #~ msgctxt "printer state"
 #~ msgid "Idle"
@@ -3858,9 +4045,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Image Viewer"
 #~ msgstr "å??ç??ç??è¦½ç¨?å¼?"
 
-#~ msgid "Multimedia Player"
-#~ msgstr "å¤?åª?é«?æ?æ?¾å?¨"
-
 #~ msgid "Open link in new _tab"
 #~ msgstr "å?¨æ?°ç??å??é ?ä¸é??å??é?£çµ?(_T)"
 
@@ -3903,9 +4087,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Icedove"
 #~ msgstr "Icedove"
 
-#~ msgid "KMail"
-#~ msgstr "KMail"
-
 #~ msgid "Konqueror"
 #~ msgstr "Konqueror"
 
@@ -4491,9 +4672,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "C_ompany:"
 #~ msgstr "å?¬å?¸(_O):"
 
-#~ msgid "Cale_ndar:"
-#~ msgstr "è¡?äº?æ??(_N):"
-
 #~ msgid "Change Passwo_rd..."
 #~ msgstr "è®?æ?´å¯?ç¢¼(_R)â?¦"
 
@@ -4548,9 +4726,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "User name:"
 #~ msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
 
-#~ msgid "Web"
-#~ msgstr "ç¶²é ?"
-
 #~ msgid "Web _log:"
 #~ msgstr "ç¶²è·¯æ?¥èª?(_L):"
 
@@ -4944,9 +5119,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "dots per inch"
 #~ msgstr "è§£æ??åº¦(dpi)"
 
-#~ msgid "Appearance"
-#~ msgstr "å¤?è§?"
-
 #~ msgid "Customize the look of the desktop"
 #~ msgstr "è?ªè¨?æ¡?é?¢ç??å¤?è§?"
 
@@ -5141,9 +5313,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ "Specify the name of the page to show (internet|multimedia|system|a11y)"
 #~ msgstr "æ??å®?è¦?é¡¯ç¤ºç??é ?é?¢å??ç¨± (internet|multimedia|system|a11y)"
 
-#~ msgid "- GNOME Default Applications"
-#~ msgstr "- GNOME é ?è¨æ??ç?¨ç¨?å¼?"
-
 #~ msgid "Monitor Preferences"
 #~ msgstr "è?¢å¹?å??å¥½è¨å®?"
 
@@ -5223,9 +5392,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Maximize Horizontally"
 #~ msgstr "æ°´å¹³æ??å¤§å??"
 
-#~ msgid "Roll up"
-#~ msgstr "æ?²èµ·"
-
 #~ msgid "key not found [%s]\n"
 #~ msgstr "æ?¾ä¸?å?°æ??é?µ [%s]\n"
 
@@ -5605,9 +5771,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Play _sound effects when buttons are clicked"
 #~ msgstr "ç?¶æ??é??è¢«é»?æ??æ??æ?æ?¾é?³æ??(_S)"
 
-#~ msgid "S_ound playback:"
-#~ msgstr "è?²é?³æ?æ?¾(_O):"
-
 #~ msgid ""
 #~ "Select the device and tracks to control with the keyboard. Use the Shift "
 #~ "and Control keys to select multiple tracks if required."
@@ -5638,9 +5801,6 @@ msgstr "æ??æ??è¨å®?å?¼(_A)"
 #~ msgid "Custom..."
 #~ msgstr "è?ªè¨?â?¦"
 
-#~ msgid "Logout"
-#~ msgstr "ç?»å?º"
-
 #~ msgid "Enable support for GNOME assistive technologies at login"
 #~ msgstr "ç?»å?¥æ??å??ç?¨ GNOME è¼?å?©ç§?æ??æ?¯æ?´"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]