diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9a8910a1d..781719468 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 19:27+0800\n"
-"PO-Revision-Date: 2012-08-21 19:27+0800\n"
+"POT-Creation-Date: 2012-09-05 19:58+0800\n"
+"PO-Revision-Date: 2012-09-05 19:58+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"
@@ -101,7 +101,7 @@ msgstr "%d × %d"
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: ../panels/background/cc-background-panel.c:390
+#: ../panels/background/cc-background-panel.c:387
 msgid "Current background"
 msgstr "目前的背景"
 
@@ -144,7 +144,7 @@ msgstr "連線"
 msgid "Paired"
 msgstr "已配對"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/wacom/cc-wacom-page.c:756
 msgid "Type"
 msgstr "類型"
 
@@ -156,7 +156,7 @@ msgstr "地址"
 msgid "Mouse and Touchpad Settings"
 msgstr "滑鼠和觸控板設定值"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:41
+#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "音效設定值"
 
@@ -178,41 +178,41 @@ msgctxt "Power"
 msgid "Bluetooth"
 msgstr "藍牙"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:285
 msgid "Yes"
 msgstr "是"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:285
 msgid "No"
 msgstr "否"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:402
+#: ../panels/bluetooth/cc-bluetooth-panel.c:397
 msgid "Bluetooth is disabled"
 msgstr "藍牙已停用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:407
+#: ../panels/bluetooth/cc-bluetooth-panel.c:402
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "藍牙已被硬件開關停用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:411
+#: ../panels/bluetooth/cc-bluetooth-panel.c:406
 msgid "No Bluetooth adapters found"
 msgstr "找不到藍牙接配器"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:544
+#: ../panels/bluetooth/cc-bluetooth-panel.c:539
 msgid "Visibility"
 msgstr "顯示狀態"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:548
+#: ../panels/bluetooth/cc-bluetooth-panel.c:543
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "「%s」的顯示狀態"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:592
+#: ../panels/bluetooth/cc-bluetooth-panel.c:587
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "是否從裝置的清單中移除「%s」？"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:594
+#: ../panels/bluetooth/cc-bluetooth-panel.c:589
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr "如果你刪除此裝置，下次使用時必須再次設定它。"
@@ -303,7 +303,7 @@ msgstr "可用的描述檔"
 
 #. TRANSLATORS: column for device list
 #: ../panels/color/cc-color-panel.c:824
-#: ../panels/sound/gvc-mixer-dialog.c:1516
+#: ../panels/sound/gvc-mixer-dialog.c:1525
 msgid "Device"
 msgstr "裝置"
 
@@ -444,7 +444,6 @@ msgstr "網絡攝影機"
 
 #: ../panels/color/color.ui.h:3
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-#: ../panels/universal-access/zoom-options.ui.h:30
 msgid "Color"
 msgstr "顏色"
 
@@ -551,24 +550,32 @@ msgstr "西班牙文"
 msgid "Chinese (simplified)"
 msgstr "簡體中文"
 
+#: ../panels/common/cc-common-language.c:539
+msgid "Russian"
+msgstr "俄文"
+
+#: ../panels/common/cc-common-language.c:542
+msgid "Arabic"
+msgstr "阿拉伯文"
+
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:565
+#: ../panels/common/cc-common-language.c:571
 msgid "United States"
 msgstr "美國"
 
-#: ../panels/common/cc-common-language.c:566
+#: ../panels/common/cc-common-language.c:572
 msgid "Germany"
 msgstr "德國"
 
-#: ../panels/common/cc-common-language.c:567
+#: ../panels/common/cc-common-language.c:573
 msgid "France"
 msgstr "法國"
 
-#: ../panels/common/cc-common-language.c:568
+#: ../panels/common/cc-common-language.c:574
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../panels/common/cc-common-language.c:569
+#: ../panels/common/cc-common-language.c:575
 msgid "China"
 msgstr "中國"
 
@@ -589,7 +596,7 @@ msgid "Select a language"
 msgstr "選擇語言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:1
 #: ../panels/user-accounts/um-user-panel.c:462
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -724,83 +731,84 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值，你需要通過驗證。"
 
-#: ../panels/display/cc-display-panel.c:482
+#: ../panels/display/cc-display-panel.c:481
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "正常"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:482
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "逆時針"
 
-#: ../panels/display/cc-display-panel.c:484
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "順時針"
 
-#: ../panels/display/cc-display-panel.c:485
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 度"
 
+#. Keep this string in sync with gnome-desktop/libgnome-desktop/gnome-rr-labeler.c
 #. 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".
+#. * screen is the same as your external projector.  Here, "Mirrored" is being
+#. * used as an adjective.  For example, the Spanish translation could be
+#. * "Pantallas en Espejo".
 #.
-#: ../panels/display/cc-display-panel.c:622
-msgid "Mirror Displays"
+#: ../panels/display/cc-display-panel.c:623
+msgid "Mirrored Displays"
 msgstr "鏡射顯示器"
 
-#: ../panels/display/cc-display-panel.c:646
+#: ../panels/display/cc-display-panel.c:647
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "顯示器"
 
-#: ../panels/display/cc-display-panel.c:747
+#: ../panels/display/cc-display-panel.c:748
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/cc-display-panel.c:749
+#: ../panels/display/cc-display-panel.c:750
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/cc-display-panel.c:1658
+#: ../panels/display/cc-display-panel.c:1659
 msgid "Drag to change primary display."
 msgstr "拖曳以改變主要顯示器。"
 
-#: ../panels/display/cc-display-panel.c:1716
+#: ../panels/display/cc-display-panel.c:1717
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "選擇一個螢幕以改變它的屬性；拖曳它則能重新排列它的位置。"
 
-#: ../panels/display/cc-display-panel.c:2104
+#: ../panels/display/cc-display-panel.c:2105
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2106
+#: ../panels/display/cc-display-panel.c:2107
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/cc-display-panel.c:2268
-#: ../panels/display/cc-display-panel.c:2320
+#: ../panels/display/cc-display-panel.c:2269
+#: ../panels/display/cc-display-panel.c:2321
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "無法套用組態：%s"
 
-#: ../panels/display/cc-display-panel.c:2348
+#: ../panels/display/cc-display-panel.c:2349
 msgid "Could not save the monitor configuration"
 msgstr "無法儲存顯示器組態"
 
-#: ../panels/display/cc-display-panel.c:2408
+#: ../panels/display/cc-display-panel.c:2409
 msgid "Could not detect displays"
 msgstr "無法偵測顯示器"
 
-#: ../panels/display/cc-display-panel.c:2602
+#: ../panels/display/cc-display-panel.c:2603
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
@@ -839,34 +847,34 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;面板;投影機;螢幕;解像度;重新整理;"
 
 #. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:402
+#: ../panels/info/cc-info-panel.c:413
 #, c-format
 msgid "VESA: %s"
 msgstr "VESA：%s"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:426 ../panels/network/panel-common.c:82
+#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:82
 #: ../panels/network/panel-common.c:162
 msgid "Unknown"
 msgstr "不明"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:587
+#: ../panels/info/cc-info-panel.c:593
 #, c-format
 msgid "%d-bit"
 msgstr "%d-位元"
 
-#: ../panels/info/cc-info-panel.c:746
+#: ../panels/info/cc-info-panel.c:752
 msgid "Unknown model"
 msgstr "不明的型號"
 
-#: ../panels/info/cc-info-panel.c:829
+#: ../panels/info/cc-info-panel.c:835
 msgid "The next login will attempt to use the standard experience."
 msgstr "下次登入會嘗試使用標準體驗。"
 
-#: ../panels/info/cc-info-panel.c:831
+#: ../panels/info/cc-info-panel.c:837
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -874,51 +882,51 @@ 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:873
+#: ../panels/info/cc-info-panel.c:879
 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:879
+#: ../panels/info/cc-info-panel.c:885
 msgctxt "Experience"
 msgid "Standard"
 msgstr "標準"
 
-#: ../panels/info/cc-info-panel.c:1202
+#: ../panels/info/cc-info-panel.c:1227
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1206
+#: ../panels/info/cc-info-panel.c:1231
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1210
+#: ../panels/info/cc-info-panel.c:1235
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1301
+#: ../panels/info/cc-info-panel.c:1326
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1332
+#: ../panels/info/cc-info-panel.c:1357
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1333
+#: ../panels/info/cc-info-panel.c:1358
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1334
+#: ../panels/info/cc-info-panel.c:1359
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1335
+#: ../panels/info/cc-info-panel.c:1360
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1336
+#: ../panels/info/cc-info-panel.c:1361
 msgid "Select an application for software CDs"
 msgstr "選擇軟件 CD 要用的應用程式"
 
@@ -927,93 +935,93 @@ msgstr "選擇軟件 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1373
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1374
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1375
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1376
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1352
+#: ../panels/info/cc-info-panel.c:1377
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1353
+#: ../panels/info/cc-info-panel.c:1378
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1354
+#: ../panels/info/cc-info-panel.c:1379
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1355
+#: ../panels/info/cc-info-panel.c:1380
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1356
+#: ../panels/info/cc-info-panel.c:1381
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1382
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1383
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1384
 msgid "Windows software"
 msgstr "Windows 軟件"
 
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1385
 msgid "Software"
 msgstr "軟件"
 
-#: ../panels/info/cc-info-panel.c:1483
+#: ../panels/info/cc-info-panel.c:1508
 #: ../panels/keyboard/keyboard-shortcuts.c:1647
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1492 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:11
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1498 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1523 ../panels/info/info.ui.h:18
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1503 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1528 ../panels/info/info.ui.h:26
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:10
+#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
 msgid "Graphics"
 msgstr "繪圖"
 
-#: ../panels/info/cc-info-panel.c:1710
+#: ../panels/info/cc-info-panel.c:1735
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1760
+#: ../panels/info/cc-info-panel.c:1785
 msgid "Install Updates"
 msgstr "安裝更新"
 
-#: ../panels/info/cc-info-panel.c:1764
+#: ../panels/info/cc-info-panel.c:1789
 msgid "System Up-To-Date"
 msgstr "系統已是最新"
 
-#: ../panels/info/cc-info-panel.c:1768
+#: ../panels/info/cc-info-panel.c:1793
 msgid "Checking for Updates"
 msgstr "正在檢查更新"
 
@@ -1180,7 +1188,7 @@ msgstr "退出"
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 #: ../panels/keyboard/keyboard-shortcuts.c:858
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Typing"
 msgstr "輸入"
 
@@ -1366,7 +1374,7 @@ msgstr "速度(_S)："
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Short"
 msgstr "短"
 
@@ -1382,7 +1390,7 @@ msgstr "按鍵重複速度"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Long"
 msgstr "長"
 
@@ -1473,7 +1481,7 @@ msgstr "如果你重新指派捷徑鍵為「%s」，「%s」的捷徑鍵就會
 msgid "_Reassign"
 msgstr "重新指派(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:158
+#: ../panels/mouse/cc-mouse-panel.c:152
 msgid "_Test Your Settings"
 msgstr "測試你的設定值(_T)"
 
@@ -1546,27 +1554,52 @@ msgstr "兩指捲動(_F)"
 msgid "C_ontent sticks to fingers"
 msgstr "連結到手指的內容(_O)"
 
+#: ../panels/mouse/gnome-mouse-test.c:117
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
-msgid "To test your settings, try to double-click on the face."
-msgstr "要測試你的設定值，請嘗試在這個臉上連按兩下。"
+msgid "Try clicking, double clicking, scrolling"
+msgstr "嘗試點選、連按兩下、捲動"
 
-#: ../panels/network/cc-network-panel.c:627
+#: ../panels/mouse/gnome-mouse-test.c:124
+msgid "Double click, primary button"
+msgstr "連按兩下，主要按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:124
+msgid "Single click, primary button"
+msgstr "點選，主要按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:127
+msgid "Double click, middle button"
+msgstr "連按兩下，中央按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:127
+msgid "Single click, middle button"
+msgstr "點選，中央按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:130
+msgid "Double click, secondary button"
+msgstr "連按兩下，次要按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:130
+msgid "Single click, secondary button"
+msgstr "點選，次要按鈕"
+
+#: ../panels/network/cc-network-panel.c:615
 msgid "Network proxy"
 msgstr "網絡代理伺服器"
 
-#: ../panels/network/cc-network-panel.c:811 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:799 ../panels/network/net-vpn.c:278
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:878
+#: ../panels/network/cc-network-panel.c:866
 msgid "The system network services are not compatible with this version."
 msgstr "系統網絡服務與這個版本不兼容。"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:1013
+#: ../panels/network/cc-network-panel.c:1001
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
@@ -1590,7 +1623,7 @@ msgstr "加入新連線"
 
 #. Translators: network device speed
 #: ../panels/network/net-device-mobile.c:261
-#: ../panels/network/net-device-wifi.c:700
+#: ../panels/network/net-device-wifi.c:699
 #: ../panels/network/net-device-wired.c:126
 #, c-format
 msgid "%d Mb/s"
@@ -1605,13 +1638,13 @@ msgstr "連接到隱藏的無線網絡"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/net-device-wifi.c:293
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-wifi.c:472
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/net-device-wifi.c:297
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/net-device-wifi.c:476
 msgid "WPA"
 msgstr "WPA"
 
@@ -1625,84 +1658,80 @@ msgstr "WPA2"
 msgid "Enterprise"
 msgstr "企業版"
 
-#. TRANSLATORS: this no (!) WiFi security
-#. short delay
-#: ../panels/network/net-device-wifi.c:312
-#: ../panels/network/net-device-wifi.c:468
-#: ../panels/universal-access/uap.ui.h:8
-#: ../panels/universal-access/zoom-options.ui.h:32
-#: ../panels/wacom/cc-wacom-page.c:335 ../panels/wacom/cc-wacom-page.c:352
+#: ../panels/network/net-device-wifi.c:311
+#: ../panels/network/net-device-wifi.c:467
+msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/net-device-wifi.c:734
+#: ../panels/network/net-device-wifi.c:733
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/net-device-wifi.c:736
+#: ../panels/network/net-device-wifi.c:735
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: ../panels/network/net-device-wifi.c:738
+#: ../panels/network/net-device-wifi.c:737
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
-#: ../panels/network/net-device-wifi.c:740
+#: ../panels/network/net-device-wifi.c:739
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: ../panels/network/net-device-wifi.c:742
+#: ../panels/network/net-device-wifi.c:741
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: ../panels/network/net-device-wifi.c:902
+#: ../panels/network/net-device-wifi.c:901
 #, c-format
 msgid ""
 "Network details for %s including password and any custom configuration will "
 "be lost"
 msgstr "%s 的網絡詳細資料包含密碼及任何自選的組態都會消失"
 
-#: ../panels/network/net-device-wifi.c:913
+#: ../panels/network/net-device-wifi.c:912
 msgid "Forget"
 msgstr "遺忘"
 
-#: ../panels/network/net-device-wifi.c:1438
+#: ../panels/network/net-device-wifi.c:1437
 msgid ""
 "If you have a connection to the Internet other than wireless, you can use it "
 "to share your internet connection with others."
 msgstr "如果你有無線網絡以外的方式連線到互聯網，你可以使用它來與其他人分享你的互聯網連線。"
 
-#: ../panels/network/net-device-wifi.c:1442
+#: ../panels/network/net-device-wifi.c:1441
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "切換無線網絡熱點會讓你從 <b>%s</b> 斷線。"
 
-#: ../panels/network/net-device-wifi.c:1446
+#: ../panels/network/net-device-wifi.c:1445
 msgid ""
 "It is not possible to access the internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過無線網絡存取互聯網的。"
 
-#: ../panels/network/net-device-wifi.c:1512
+#: ../panels/network/net-device-wifi.c:1511
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線？"
 
-#: ../panels/network/net-device-wifi.c:1515
+#: ../panels/network/net-device-wifi.c:1514
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1580
+#: ../panels/network/net-device-wifi.c:1579
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天以前"
 
-#: ../panels/network/net-device-wifi.c:1934
+#: ../panels/network/net-device-wifi.c:1933
 #: ../panels/network/network-wifi.ui.h:19
 msgid "Out of range"
 msgstr "超過範圍"
@@ -2240,35 +2269,35 @@ msgstr "連線相根據性解析失敗"
 msgid "Add Account"
 msgstr "加入帳號"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:376
+#: ../panels/online-accounts/cc-online-accounts-panel.c:383
 msgid "Error logging into the account"
 msgstr "登入帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:430
+#: ../panels/online-accounts/cc-online-accounts-panel.c:437
 msgid "Expired credentials. Please log in again."
 msgstr "證書已逾期。請重新登入。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:433
+#: ../panels/online-accounts/cc-online-accounts-panel.c:440
 msgid "_Log In"
 msgstr "登入(_L)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:617
+#: ../panels/online-accounts/cc-online-accounts-panel.c:676
 msgid "Error creating account"
 msgstr "建立帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:659
+#: ../panels/online-accounts/cc-online-accounts-panel.c:718
 msgid "Error removing account"
 msgstr "移除帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:695
+#: ../panels/online-accounts/cc-online-accounts-panel.c:754
 msgid "Are you sure you want to remove the account?"
 msgstr "確定要刪除這個帳號？"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:697
+#: ../panels/online-accounts/cc-online-accounts-panel.c:756
 msgid "This will not remove the account on the server."
 msgstr "這不會移除伺服器上的帳號。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:698
+#: ../panels/online-accounts/cc-online-accounts-panel.c:757
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -2303,17 +2332,17 @@ msgid ""
 "contacts, calendar, chat and more."
 msgstr "加入一個帳號以允許你的應用程式存取它用於文件、郵件、聯絡人、行事曆、聊天等等。"
 
-#: ../panels/power/cc-power-panel.c:170
+#: ../panels/power/cc-power-panel.c:165
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: ../panels/power/cc-power-panel.c:176
+#: ../panels/power/cc-power-panel.c:171
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:183
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2321,168 +2350,168 @@ msgstr[0] "%i 小時"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:196
+#: ../panels/power/cc-power-panel.c:191
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:197
+#: ../panels/power/cc-power-panel.c:192
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../panels/power/cc-power-panel.c:198
+#: ../panels/power/cc-power-panel.c:193
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:236
 #, c-format
 msgid "Charging - %s until fully charged"
 msgstr "充電 - 到完全充飽前還有 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:249
+#: ../panels/power/cc-power-panel.c:244
 #, c-format
 msgid "Caution low battery, %s remaining"
 msgstr "注意電池電力低落，剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:257
+#: ../panels/power/cc-power-panel.c:252
 #, c-format
 msgid "Using battery power - %s remaining"
 msgstr "使用電池電力 - 剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:274
+#: ../panels/power/cc-power-panel.c:269
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:279
+#: ../panels/power/cc-power-panel.c:274
 msgid "Using battery power"
 msgstr "使用電池電力"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:278
 msgid "Charging - fully charged"
 msgstr "充電 - 已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:287
+#: ../panels/power/cc-power-panel.c:282
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:355
+#: ../panels/power/cc-power-panel.c:350
 #, c-format
 msgid "Caution low UPS, %s remaining"
 msgstr "注意 UPS 電力低落，剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:361
+#: ../panels/power/cc-power-panel.c:356
 #, c-format
 msgid "Using UPS power - %s remaining"
 msgstr "使用 UPS 電力 - 剩下 %s"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:379
+#: ../panels/power/cc-power-panel.c:374
 msgid "Caution low UPS"
 msgstr "注意 UPS 電力低落"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:384
+#: ../panels/power/cc-power-panel.c:379
 msgid "Using UPS power"
 msgstr "使用 UPS 電力"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:436
+#: ../panels/power/cc-power-panel.c:431
 msgid "Your secondary battery is fully charged"
 msgstr "你的第二電池已完全充飽"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:440
+#: ../panels/power/cc-power-panel.c:435
 msgid "Your secondary battery is empty"
 msgstr "你的第二電池已經沒電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:523
+#: ../panels/power/cc-power-panel.c:518
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:527
+#: ../panels/power/cc-power-panel.c:522
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:531
+#: ../panels/power/cc-power-panel.c:526
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
+#: ../panels/power/cc-power-panel.c:530
 msgid "Personal digital assistant"
 msgstr "個人數碼助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:539
+#: ../panels/power/cc-power-panel.c:534
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: ../panels/power/cc-power-panel.c:538
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:542
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:551
+#: ../panels/power/cc-power-panel.c:546
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:555
+#: ../panels/power/cc-power-panel.c:550
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:566
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:573
+#: ../panels/power/cc-power-panel.c:568
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:578
+#: ../panels/power/cc-power-panel.c:573
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:583
+#: ../panels/power/cc-power-panel.c:578
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:588
+#: ../panels/power/cc-power-panel.c:583
 msgctxt "Battery power"
 msgid "Charging - fully charged"
 msgstr "充電 - 已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:592
+#: ../panels/power/cc-power-panel.c:587
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
@@ -2545,179 +2574,190 @@ msgid "When power is _critically low"
 msgstr "當電源的電量極低時(_C)"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:587
+#: ../panels/printers/cc-printers-panel.c:589
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:589
+#: ../panels/printers/cc-printers-panel.c:591
 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:592
+#: ../panels/printers/cc-printers-panel.c:594
 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:595
+#: ../panels/printers/cc-printers-panel.c:597
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:597
+#: ../panels/printers/cc-printers-panel.c:599
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:599
+#: ../panels/printers/cc-printers-panel.c:601
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:603
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:603
+#: ../panels/printers/cc-printers-panel.c:605
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:607
 msgid "Low on paper"
 msgstr "紙張不足。"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:609
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:611
 msgctxt "printer state"
 msgid "Offline"
 msgstr "離線"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:613
 msgctxt "printer state"
 msgid "Paused"
 msgstr "已暫停"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:613
+#: ../panels/printers/cc-printers-panel.c:615
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:617
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:619
 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:619
+#: ../panels/printers/cc-printers-panel.c:621
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓已無法使用"
 
+#. Translators: Printer's state (printer is being configured right now)
+#: ../panels/printers/cc-printers-panel.c:724
+msgctxt "printer state"
+msgid "Configuring"
+msgstr "正在設定"
+
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:770
+#: ../panels/printers/cc-printers-panel.c:781
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備就緒"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:774
+#: ../panels/printers/cc-printers-panel.c:785
 msgctxt "printer state"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:778
+#: ../panels/printers/cc-printers-panel.c:789
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:897
+#: ../panels/printers/cc-printers-panel.c:906
 msgid "Toner Level"
 msgstr "碳粉匣等級"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:900
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Ink Level"
 msgstr "墨水等級"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:903
+#: ../panels/printers/cc-printers-panel.c:912
 msgid "Supply Level"
 msgstr "耗材等級"
 
+#. Translators: Printer's state (printer is being installed right now)
+#: ../panels/printers/cc-printers-panel.c:930
+msgctxt "printer state"
+msgid "Installing"
+msgstr "正在安裝"
+
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1014
+#: ../panels/printers/cc-printers-panel.c:1107
 msgid "No printers available"
 msgstr "沒有可用的打印機"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1290
+#: ../panels/printers/cc-printers-panel.c:1411
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 使用中"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1586
+#: ../panels/printers/cc-printers-panel.c:1731
 msgid "Failed to add new printer."
 msgstr "無法加入新的打印機。"
 
-#: ../panels/printers/cc-printers-panel.c:1744
+#: ../panels/printers/cc-printers-panel.c:1896
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/cc-printers-panel.c:1753
+#: ../panels/printers/cc-printers-panel.c:1905
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript 打印機描述檔 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2058
+#: ../panels/printers/cc-printers-panel.c:2210
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/cc-printers-panel.c:2127
+#: ../panels/printers/cc-printers-panel.c:2279
 msgid "Searching for preferred drivers..."
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: ../panels/printers/cc-printers-panel.c:2142
+#: ../panels/printers/cc-printers-panel.c:2294
 msgid "Select from database..."
 msgstr "從資料庫搜尋…"
 
-#: ../panels/printers/cc-printers-panel.c:2151
+#: ../panels/printers/cc-printers-panel.c:2303
 msgid "Provide PPD File..."
 msgstr "提供 PPD 檔案…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2289
-#: ../panels/printers/cc-printers-panel.c:2303
+#: ../panels/printers/cc-printers-panel.c:2454
+#: ../panels/printers/cc-printers-panel.c:2477
 msgid "Test page"
 msgstr "測試頁"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2673
+#: ../panels/printers/cc-printers-panel.c:2880
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui：%s"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:155
 msgid "Printers"
 msgstr "打印機"
 
@@ -2758,23 +2798,19 @@ msgstr "暫停列印"
 msgid "Cancel Print Job"
 msgstr "取消打印工作"
 
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "加入新的打印機"
-
 #: ../panels/printers/new-printer-dialog.ui.h:2
-msgid "A_ddress:"
-msgstr "位址(_D)："
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
-msgid "_Search by Address"
-msgstr "根據位址搜尋(_S)"
-
-#: ../panels/printers/new-printer-dialog.ui.h:5
 #: ../panels/user-accounts/um-account-dialog.c:1017
 msgid "_Add"
 msgstr "加入(_A)"
 
+#: ../panels/printers/new-printer-dialog.ui.h:3
+msgid "Add a New Printer"
+msgstr "加入新的打印機"
+
+#: ../panels/printers/new-printer-dialog.ui.h:4
+msgid "Search for network printers or filter result"
+msgstr "搜尋網絡打印機或過濾器結果"
+
 #: ../panels/printers/options-dialog.ui.h:2
 msgid "Options"
 msgstr "選項"
@@ -2897,65 +2933,10 @@ msgstr "時刻"
 msgid "%s Active Jobs"
 msgstr "%s 使用中的工作"
 
-#: ../panels/printers/pp-new-printer-dialog.c:659
-msgid "Getting devices..."
-msgstr "正在取得裝置…"
-
-#. Translators: No localy connected printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1242
-msgid "No local printers found"
-msgstr "找不到本地打印機"
-
-#. Translators: No network printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1255
-msgid "No network printers found"
-msgstr "找不到網絡打印機"
-
-#: ../panels/printers/pp-new-printer-dialog.c:1347
-msgid ""
-"FirewallD is not running. Network printer detection needs services mdns, "
-"ipp, ipp-client and samba-client enabled on firewall."
-msgstr "FirewallD 尚未執行。網絡打印機的偵測需要在防火牆上啟用 mdns、ipp、ipp-client 和 samba-client 服務。"
-
-#. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:1375
-#: ../panels/printers/pp-new-printer-dialog.c:1380
-msgid "Devices"
-msgstr "裝置"
-
-#. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1405
-msgctxt "printer type"
-msgid "Local"
-msgstr "本機"
-
-#. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1407
-msgctxt "printer type"
-msgid "Network"
-msgstr "網絡"
-
-#. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1448
-msgid "Device types"
-msgstr "裝置類型"
-
-#. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1768
-msgid "Automatic configuration"
-msgstr "自動組態"
-
-#: ../panels/printers/pp-new-printer-dialog.c:1791
-msgid "Opening firewall for mDNS connections"
-msgstr "開啟防火牆的 mDNS 連線"
-
-#: ../panels/printers/pp-new-printer-dialog.c:1800
-msgid "Opening firewall for Samba connections"
-msgstr "開啟防火牆的 Samba 連線"
-
-#: ../panels/printers/pp-new-printer-dialog.c:1809
-msgid "Opening firewall for IPP connections"
-msgstr "開啟防火牆的 IPP 連線"
+#. Translators: No printers were found
+#: ../panels/printers/pp-new-printer-dialog.c:1291
+msgid "No printers detected."
+msgstr "未偵測到打印機。"
 
 #: ../panels/printers/pp-options-dialog.c:82
 msgid "Two Sided"
@@ -3045,7 +3026,7 @@ msgid "Advanced"
 msgstr "進階"
 
 #. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:934
+#: ../panels/printers/pp-options-dialog.c:936
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
@@ -3480,7 +3461,7 @@ msgstr "敲玻璃"
 msgid "Sonar"
 msgstr "聲納"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1768
+#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
 msgid "Output"
 msgstr "輸出"
 
@@ -3488,7 +3469,7 @@ msgstr "輸出"
 msgid "Sound Output Volume"
 msgstr "音效輸出音量"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1809
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
 msgid "Input"
 msgstr "輸入"
 
@@ -3548,7 +3529,8 @@ msgctxt "volume"
 msgid "Unamplified"
 msgstr "未經放大"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1622
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
+#: ../panels/sound/gvc-mixer-dialog.c:521
 msgid "_Profile:"
 msgstr "設定組合(_P):"
 
@@ -3572,76 +3554,61 @@ msgstr[0] "%u 輸入"
 msgid "System Sounds"
 msgstr "系統音效"
 
-#: ../panels/sound/gvc-mixer-dialog.c:324
-#: ../panels/sound/gvc-mixer-dialog.c:635
-msgid "Co_nnector:"
-msgstr "連接器(_N)："
+#: ../panels/sound/gvc-mixer-dialog.c:262
+msgid "_Test Speakers"
+msgstr "測試喇叭(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:541
+#: ../panels/sound/gvc-mixer-dialog.c:426
 msgid "Peak detect"
 msgstr "峰值檢測"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1497
-#: ../panels/sound/gvc-mixer-dialog.c:1710
+#: ../panels/sound/gvc-mixer-dialog.c:1506
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "名稱"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1564
+#: ../panels/sound/gvc-mixer-dialog.c:1588
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s 的喇叭測試"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1623
-msgid "_Test Speakers"
-msgstr "測試喇叭(_T)"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1754
+#: ../panels/sound/gvc-mixer-dialog.c:1642
 msgid "_Output volume:"
 msgstr "輸出音量(_O)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1773
+#: ../panels/sound/gvc-mixer-dialog.c:1661
 msgid "C_hoose a device for sound output:"
 msgstr "選擇聲音輸出的裝置(_H)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1798
-#: ../panels/sound/gvc-mixer-dialog.c:1927
+#: ../panels/sound/gvc-mixer-dialog.c:1686
 msgid "Settings for the selected device:"
 msgstr "已選取裝置的設定值："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1816
+#: ../panels/sound/gvc-mixer-dialog.c:1704
 msgid "_Input volume:"
 msgstr "輸入音量(_I)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1839
+#: ../panels/sound/gvc-mixer-dialog.c:1727
 msgid "Input level:"
 msgstr "輸入等級："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1867
+#: ../panels/sound/gvc-mixer-dialog.c:1755
 msgid "C_hoose a device for sound input:"
 msgstr "選擇聲音輸入的裝置(_H)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1894
-msgid "Hardware"
-msgstr "硬件"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1899
-msgid "C_hoose a device to configure:"
-msgstr "選擇要設定的裝置(_H)："
-
-#: ../panels/sound/gvc-mixer-dialog.c:1938
+#: ../panels/sound/gvc-mixer-dialog.c:1782
 msgid "Sound Effects"
 msgstr "聲音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1945
+#: ../panels/sound/gvc-mixer-dialog.c:1789
 msgid "_Alert volume:"
 msgstr "警示音量(_A)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1958
+#: ../panels/sound/gvc-mixer-dialog.c:1802
 msgid "Applications"
 msgstr "程式集"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1962
+#: ../panels/sound/gvc-mixer-dialog.c:1806
 msgid "No application is currently playing or recording audio."
 msgstr "沒有應用程式目前正在播放或錄製音效。"
 
@@ -3673,16 +3640,16 @@ msgstr "從主題"
 msgid "C_hoose an alert sound:"
 msgstr "選擇警示音效(_H)："
 
-#: ../panels/sound/gvc-speaker-test.c:221
+#: ../panels/sound/gvc-speaker-test.c:220
 msgid "Stop"
 msgstr "停止"
 
-#: ../panels/sound/gvc-speaker-test.c:221
-#: ../panels/sound/gvc-speaker-test.c:333
+#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:332
 msgid "Test"
 msgstr "測試"
 
-#: ../panels/sound/gvc-speaker-test.c:229
+#: ../panels/sound/gvc-speaker-test.c:228
 msgid "Subwoofer"
 msgstr "重低音"
 
@@ -3707,8 +3674,8 @@ msgstr "已靜音"
 msgid "Custom"
 msgstr "自選"
 
-#: ../panels/universal-access/cc-ua-panel.c:291
-#: ../panels/universal-access/cc-ua-panel.c:297
+#: ../panels/universal-access/cc-ua-panel.c:286
+#: ../panels/universal-access/cc-ua-panel.c:292
 msgid "No shortcut set"
 msgstr "沒有設定捷徑鍵"
 
@@ -3755,6 +3722,10 @@ msgstr "GOK"
 msgid "OnBoard"
 msgstr "OnBoard"
 
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "沒有"
+
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -3796,233 +3767,221 @@ msgid "Larger"
 msgstr "較大"
 
 #: ../panels/universal-access/uap.ui.h:21
-msgid "Dasher"
-msgstr "Dasher"
-
-#: ../panels/universal-access/uap.ui.h:22
-msgid "Nomon"
-msgstr "Nomon"
-
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Caribou"
-msgstr "Caribou"
-
-#: ../panels/universal-access/uap.ui.h:24
 msgid "High Contrast"
 msgstr "高對比"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:22
 msgid "Beep on Caps and Num Lock"
 msgstr "當 Caps 和 Num Lock 在使用時發出聲響"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:23
 msgid "Options..."
 msgstr "選項…"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:25
 msgid "Turn on or off:"
 msgstr "開啟或關閉："
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:26
 msgctxt "universal access, zoom"
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Zoom in:"
 msgstr "拉近："
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Zoom out:"
 msgstr "拉遠："
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Large Text"
 msgstr "大型文字"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Seeing"
 msgstr "視覺"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Visual Alerts"
 msgstr "視覺警示"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "當警示音效發出時使用視覺化的指示"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the window title"
 msgstr "閃動視窗標題"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Flash the entire screen"
 msgstr "閃動整個螢幕"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Closed Captioning"
 msgstr "關閉說明"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:36
 msgid "Display a textual description of speech and sounds"
 msgstr "顯示語音和音效的文字描述"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:37
 msgid "_Test flash"
 msgstr "測試閃動(_T)"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Hearing"
 msgstr "聽覺"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:40
 msgid "On Screen Keyboard"
 msgstr "螢幕鍵盤"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:41
 msgid "Sticky Keys"
 msgstr "黏性特殊鍵"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "將連續按的特殊鍵視為按鍵組合"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:43
 msgid "_Disable if two keys are pressed together"
 msgstr "如果同時按下任何兩鍵則停用(_D)"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Beep when a _modifer key is pressed"
 msgstr "當按下特殊按鍵時發出聲響(_M)"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Slow Keys"
 msgstr "遲緩按鍵"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按鍵被按下到它被接受之間置入延遲"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:47
 msgid "A_cceptance delay:"
 msgstr "接受時間延遲(_C)："
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Slow keys typing delay"
 msgstr "降低按鍵輸入延遲"
 
 #. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is"
 msgstr "發出聲響條件為按鍵"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:56
 msgid "pressed"
 msgstr "已按下"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:58
 msgid "accepted"
 msgstr "已接受"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:60
 msgid "rejected"
 msgstr "已拒絕"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Bounce Keys"
 msgstr "回鍵"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重複按鍵"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Acc_eptance delay:"
 msgstr "接受時間延遲(_E)："
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Bounce keys typing delay"
 msgstr "回鍵輸入延遲"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Beep when a key is _rejected"
 msgstr "當拒絕按鍵動作則發出聲響(_R)"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Enable by Keyboard"
 msgstr "由鍵盤啟用"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "以鍵盤開啟和關閉無障礙功能"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Mouse Keys"
 msgstr "滑鼠控制鍵"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the keypad"
 msgstr "使用鍵盤控制鼠標"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Video Mouse"
 msgstr "視像滑鼠"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Control the pointer using the video camera."
 msgstr "使用視像攝影機控制指標"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Simulated Secondary Click"
 msgstr "模擬次要點擊"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "按住主要鍵時觸發次要點擊"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Secondary click delay"
 msgstr "第二次點擊延遲"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Hover Click"
 msgstr "停駐即點擊"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Trigger a click when the pointer hovers"
 msgstr "當停止游標移動時觸發點擊"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:78
 msgid "D_elay:"
 msgstr "延遲(_E)："
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Motion _threshold:"
 msgstr "移動速度(_M)："
 
 #. small threshold
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Small"
 msgstr "小"
 
 #. large threshold
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Mouse Settings"
 msgstr "滑鼠設定值"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Pointing and Clicking"
 msgstr "指標和點擊"
 
@@ -4161,26 +4120,36 @@ msgstr "亮度："
 msgid "Contrast:"
 msgstr "對比："
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: ../panels/universal-access/zoom-options.ui.h:30
+msgctxt "Zoom Grayscale"
+msgid "Color"
+msgstr "顏色"
+
+#: ../panels/universal-access/zoom-options.ui.h:31
+msgctxt "Zoom Grayscale"
+msgid "None"
+msgstr "沒有"
+
+#: ../panels/universal-access/zoom-options.ui.h:32
+msgctxt "Zoom Grayscale"
 msgid "Full"
 msgstr "完全"
 
 #. short delay
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: ../panels/universal-access/zoom-options.ui.h:34
 msgid "Low"
 msgstr "低"
 
 #. long delay
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgid "High"
 msgstr "高"
 
-#: ../panels/universal-access/zoom-options.ui.h:39
+#: ../panels/universal-access/zoom-options.ui.h:37
 msgid "Color Effects:"
 msgstr "顏色效果："
 
-#: ../panels/universal-access/zoom-options.ui.h:40
+#: ../panels/universal-access/zoom-options.ui.h:38
 msgid "Color Effects"
 msgstr "顏色效果"
 
@@ -4475,7 +4444,7 @@ msgid "Authentication is required to change user data"
 msgstr "改變使用者資料需要驗證"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:552
+#: ../panels/user-accounts/um-password-dialog.c:569
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "太短"
@@ -4486,75 +4455,75 @@ msgid "Not good enough"
 msgstr "不夠好"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:553
+#: ../panels/user-accounts/um-password-dialog.c:570
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "太弱"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:554
+#: ../panels/user-accounts/um-password-dialog.c:571
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "一般"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:555
+#: ../panels/user-accounts/um-password-dialog.c:572
 msgctxt "Password strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:556
+#: ../panels/user-accounts/um-password-dialog.c:573
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "強固"
 
-#: ../panels/user-accounts/run-passwd.c:426
+#: ../panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../panels/user-accounts/run-passwd.c:506
+#: ../panels/user-accounts/run-passwd.c:504
 #: ../panels/user-accounts/um-password-dialog.c:239
 #, c-format
 msgid "The new password is too short"
 msgstr "新的密碼太短"
 
-#: ../panels/user-accounts/run-passwd.c:512
+#: ../panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "新的密碼太簡單"
 
-#: ../panels/user-accounts/run-passwd.c:518
+#: ../panels/user-accounts/run-passwd.c:516
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "舊密碼與新密碼太相似了"
 
-#: ../panels/user-accounts/run-passwd.c:521
+#: ../panels/user-accounts/run-passwd.c:519
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "新的密碼已經在最近使用過了。"
 
-#: ../panels/user-accounts/run-passwd.c:524
+#: ../panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "新的密碼必須包含數字或特殊字符"
 
-#: ../panels/user-accounts/run-passwd.c:528
+#: ../panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "舊密碼與新密碼是相同的"
 
-#: ../panels/user-accounts/run-passwd.c:532
+#: ../panels/user-accounts/run-passwd.c:530
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "你的密碼在第一次驗證後已經改變過了！"
 
-#: ../panels/user-accounts/run-passwd.c:536
+#: ../panels/user-accounts/run-passwd.c:534
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "新的密碼並未包含足夠的不同字符"
 
-#: ../panels/user-accounts/run-passwd.c:540
+#: ../panels/user-accounts/run-passwd.c:538
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
@@ -4701,11 +4670,11 @@ msgstr "你需要輸入你目前的密碼"
 msgid "The current password is not correct"
 msgstr "目前的密碼並不正確"
 
-#: ../panels/user-accounts/um-password-dialog.c:368
+#: ../panels/user-accounts/um-password-dialog.c:347
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
-#: ../panels/user-accounts/um-password-dialog.c:394
+#: ../panels/user-accounts/um-password-dialog.c:409
 msgid "Wrong password"
 msgstr "錯誤的密碼"
 
@@ -4930,28 +4899,43 @@ msgstr "映射到單一螢幕"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:317
-msgid "Switch Modes"
-msgstr "切換模式"
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+msgctxt "Wacom action-type"
+msgid "None"
+msgstr "沒有"
 
-#: ../panels/wacom/cc-wacom-page.c:564
+#: ../panels/wacom/cc-wacom-page.c:119
+msgctxt "Wacom action-type"
+msgid "Send Keystroke"
+msgstr "傳送筆劃"
+
+#: ../panels/wacom/cc-wacom-page.c:120
+msgctxt "Wacom action-type"
+msgid "Switch Monitor"
+msgstr "切換監視器"
+
+#: ../panels/wacom/cc-wacom-page.c:601
 msgid "Up"
 msgstr "向上"
 
-#: ../panels/wacom/cc-wacom-page.c:564
+#: ../panels/wacom/cc-wacom-page.c:601
 msgid "Down"
 msgstr "向下"
 
-#: ../panels/wacom/cc-wacom-page.c:599
+#: ../panels/wacom/cc-wacom-page.c:638
+msgid "Switch Modes"
+msgstr "切換模式"
+
+#: ../panels/wacom/cc-wacom-page.c:724
 #: ../panels/wacom/cc-wacom-stylus-page.c:376
 msgid "Button"
 msgstr "按鈕"
 
-#: ../panels/wacom/cc-wacom-page.c:620
+#: ../panels/wacom/cc-wacom-page.c:777
 msgid "Action"
 msgstr "動作"
 
-#: ../panels/wacom/cc-wacom-page.c:725
+#: ../panels/wacom/cc-wacom-page.c:886
 msgid "Display Mapping"
 msgstr "顯示對應"
 
@@ -5204,6 +5188,72 @@ msgstr "Preferences;Settings;偏好設定;設定值;"
 msgid "All Settings"
 msgstr "所有設定值"
 
+#~ msgid "To test your settings, try to double-click on the face."
+#~ msgstr "要測試您的設定值，請試著在這個臉上雙擊。"
+
+#~ msgid "A_ddress:"
+#~ msgstr "位址(_D)："
+
+#~ msgid "_Search by Address"
+#~ msgstr "依位址搜尋(_S)"
+
+#~ msgid "Getting devices..."
+#~ msgstr "正在取得裝置…"
+
+#~ msgid "No local printers found"
+#~ msgstr "找不到本地印表機"
+
+#~ msgid ""
+#~ "FirewallD is not running. Network printer detection needs services mdns, "
+#~ "ipp, ipp-client and samba-client enabled on firewall."
+#~ msgstr ""
+#~ "FirewallD 尚未執行。網路印表機的偵測需要在防火牆上啟用 mdns、ipp、ipp-"
+#~ "client 和 samba-client 服務。"
+
+#~ msgid "Devices"
+#~ msgstr "裝置"
+
+#~ msgctxt "printer type"
+#~ msgid "Local"
+#~ msgstr "本機"
+
+#~ msgctxt "printer type"
+#~ msgid "Network"
+#~ msgstr "網路"
+
+#~ msgid "Device types"
+#~ msgstr "裝置類型"
+
+#~ msgid "Automatic configuration"
+#~ msgstr "自動組態"
+
+#~ msgid "Opening firewall for mDNS connections"
+#~ msgstr "開啟防火牆的 mDNS 連線"
+
+#~ msgid "Opening firewall for Samba connections"
+#~ msgstr "開啟防火牆的 Samba 連線"
+
+#~ msgid "Opening firewall for IPP connections"
+#~ msgstr "開啟防火牆的 IPP 連線"
+
+#~ msgid "Co_nnector:"
+#~ msgstr "連接器(_N)："
+
+#~ msgid "Hardware"
+#~ msgstr "硬體"
+
+#~ msgid "C_hoose a device to configure:"
+#~ msgstr "選擇要設定的裝置(_H)："
+
+#~ msgid "Dasher"
+#~ msgstr "Dasher"
+
+#~ msgid "Nomon"
+#~ msgstr "Nomon"
+
+#~ msgid "Caribou"
+#~ msgstr "Caribou"
+
 #~ msgid "_Right-handed"
 #~ msgstr "慣用右手(_R)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c19c84b06..9b7b0ddfb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 19:27+0800\n"
-"PO-Revision-Date: 2012-08-21 14:52+0800\n"
+"POT-Creation-Date: 2012-09-05 19:58+0800\n"
+"PO-Revision-Date: 2012-09-05 15:45+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"
@@ -101,7 +101,7 @@ msgstr "%d × %d"
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: ../panels/background/cc-background-panel.c:390
+#: ../panels/background/cc-background-panel.c:387
 msgid "Current background"
 msgstr "目前的背景"
 
@@ -144,7 +144,7 @@ msgstr "連線"
 msgid "Paired"
 msgstr "已配對"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/wacom/cc-wacom-page.c:756
 msgid "Type"
 msgstr "類型"
 
@@ -156,7 +156,7 @@ msgstr "地址"
 msgid "Mouse and Touchpad Settings"
 msgstr "滑鼠和觸控板設定值"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:41
+#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "音效設定值"
 
@@ -178,41 +178,41 @@ msgctxt "Power"
 msgid "Bluetooth"
 msgstr "藍牙"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:285
 msgid "Yes"
 msgstr "是"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:285
 msgid "No"
 msgstr "否"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:402
+#: ../panels/bluetooth/cc-bluetooth-panel.c:397
 msgid "Bluetooth is disabled"
 msgstr "藍牙已停用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:407
+#: ../panels/bluetooth/cc-bluetooth-panel.c:402
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "藍牙已被硬體開關停用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:411
+#: ../panels/bluetooth/cc-bluetooth-panel.c:406
 msgid "No Bluetooth adapters found"
 msgstr "找不到藍牙接配器"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:544
+#: ../panels/bluetooth/cc-bluetooth-panel.c:539
 msgid "Visibility"
 msgstr "顯示狀態"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:548
+#: ../panels/bluetooth/cc-bluetooth-panel.c:543
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "「%s」的顯示狀態"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:592
+#: ../panels/bluetooth/cc-bluetooth-panel.c:587
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "是否從裝置的清單中移除「%s」？"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:594
+#: ../panels/bluetooth/cc-bluetooth-panel.c:589
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr "如果您刪除此裝置，下次使用時必須再次設定它。"
@@ -303,7 +303,7 @@ msgstr "可用的描述檔"
 
 #. TRANSLATORS: column for device list
 #: ../panels/color/cc-color-panel.c:824
-#: ../panels/sound/gvc-mixer-dialog.c:1516
+#: ../panels/sound/gvc-mixer-dialog.c:1525
 msgid "Device"
 msgstr "裝置"
 
@@ -444,7 +444,6 @@ msgstr "網路攝影機"
 
 #: ../panels/color/color.ui.h:3
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-#: ../panels/universal-access/zoom-options.ui.h:30
 msgid "Color"
 msgstr "顏色"
 
@@ -553,24 +552,32 @@ msgstr "西班牙文"
 msgid "Chinese (simplified)"
 msgstr "簡體中文"
 
+#: ../panels/common/cc-common-language.c:539
+msgid "Russian"
+msgstr "俄文"
+
+#: ../panels/common/cc-common-language.c:542
+msgid "Arabic"
+msgstr "阿拉伯文"
+
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:565
+#: ../panels/common/cc-common-language.c:571
 msgid "United States"
 msgstr "美國"
 
-#: ../panels/common/cc-common-language.c:566
+#: ../panels/common/cc-common-language.c:572
 msgid "Germany"
 msgstr "德國"
 
-#: ../panels/common/cc-common-language.c:567
+#: ../panels/common/cc-common-language.c:573
 msgid "France"
 msgstr "法國"
 
-#: ../panels/common/cc-common-language.c:568
+#: ../panels/common/cc-common-language.c:574
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../panels/common/cc-common-language.c:569
+#: ../panels/common/cc-common-language.c:575
 msgid "China"
 msgstr "中國"
 
@@ -591,7 +598,7 @@ msgid "Select a language"
 msgstr "選擇語言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:1
 #: ../panels/user-accounts/um-user-panel.c:462
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -726,83 +733,84 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值，您需要通過驗證。"
 
-#: ../panels/display/cc-display-panel.c:482
+#: ../panels/display/cc-display-panel.c:481
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "正常"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:482
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "逆時針"
 
-#: ../panels/display/cc-display-panel.c:484
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "順時針"
 
-#: ../panels/display/cc-display-panel.c:485
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 度"
 
+#. Keep this string in sync with gnome-desktop/libgnome-desktop/gnome-rr-labeler.c
 #. 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".
+#. * screen is the same as your external projector.  Here, "Mirrored" is being
+#. * used as an adjective.  For example, the Spanish translation could be
+#. * "Pantallas en Espejo".
 #.
-#: ../panels/display/cc-display-panel.c:622
-msgid "Mirror Displays"
+#: ../panels/display/cc-display-panel.c:623
+msgid "Mirrored Displays"
 msgstr "鏡射顯示器"
 
-#: ../panels/display/cc-display-panel.c:646
+#: ../panels/display/cc-display-panel.c:647
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "顯示器"
 
-#: ../panels/display/cc-display-panel.c:747
+#: ../panels/display/cc-display-panel.c:748
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/cc-display-panel.c:749
+#: ../panels/display/cc-display-panel.c:750
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/cc-display-panel.c:1658
+#: ../panels/display/cc-display-panel.c:1659
 msgid "Drag to change primary display."
 msgstr "拖曳以改變主要顯示器。"
 
-#: ../panels/display/cc-display-panel.c:1716
+#: ../panels/display/cc-display-panel.c:1717
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "選擇一個螢幕以改變它的屬性；拖曳它則能重新排列它的位置。"
 
-#: ../panels/display/cc-display-panel.c:2104
+#: ../panels/display/cc-display-panel.c:2105
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2106
+#: ../panels/display/cc-display-panel.c:2107
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/cc-display-panel.c:2268
-#: ../panels/display/cc-display-panel.c:2320
+#: ../panels/display/cc-display-panel.c:2269
+#: ../panels/display/cc-display-panel.c:2321
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "無法套用組態：%s"
 
-#: ../panels/display/cc-display-panel.c:2348
+#: ../panels/display/cc-display-panel.c:2349
 msgid "Could not save the monitor configuration"
 msgstr "無法儲存顯示器組態"
 
-#: ../panels/display/cc-display-panel.c:2408
+#: ../panels/display/cc-display-panel.c:2409
 msgid "Could not detect displays"
 msgstr "無法偵測顯示器"
 
-#: ../panels/display/cc-display-panel.c:2602
+#: ../panels/display/cc-display-panel.c:2603
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
@@ -843,34 +851,34 @@ msgstr ""
 "整理;"
 
 #. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:402
+#: ../panels/info/cc-info-panel.c:413
 #, c-format
 msgid "VESA: %s"
 msgstr "VESA：%s"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:426 ../panels/network/panel-common.c:82
+#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:82
 #: ../panels/network/panel-common.c:162
 msgid "Unknown"
 msgstr "不明"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:587
+#: ../panels/info/cc-info-panel.c:593
 #, c-format
 msgid "%d-bit"
 msgstr "%d-位元"
 
-#: ../panels/info/cc-info-panel.c:746
+#: ../panels/info/cc-info-panel.c:752
 msgid "Unknown model"
 msgstr "不明的型號"
 
-#: ../panels/info/cc-info-panel.c:829
+#: ../panels/info/cc-info-panel.c:835
 msgid "The next login will attempt to use the standard experience."
 msgstr "下次登入會嘗試使用標準體驗。"
 
-#: ../panels/info/cc-info-panel.c:831
+#: ../panels/info/cc-info-panel.c:837
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -878,51 +886,51 @@ 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:873
+#: ../panels/info/cc-info-panel.c:879
 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:879
+#: ../panels/info/cc-info-panel.c:885
 msgctxt "Experience"
 msgid "Standard"
 msgstr "標準"
 
-#: ../panels/info/cc-info-panel.c:1202
+#: ../panels/info/cc-info-panel.c:1227
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1206
+#: ../panels/info/cc-info-panel.c:1231
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1210
+#: ../panels/info/cc-info-panel.c:1235
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1301
+#: ../panels/info/cc-info-panel.c:1326
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1332
+#: ../panels/info/cc-info-panel.c:1357
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1333
+#: ../panels/info/cc-info-panel.c:1358
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1334
+#: ../panels/info/cc-info-panel.c:1359
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1335
+#: ../panels/info/cc-info-panel.c:1360
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1336
+#: ../panels/info/cc-info-panel.c:1361
 msgid "Select an application for software CDs"
 msgstr "選擇軟體 CD 要用的應用程式"
 
@@ -931,93 +939,93 @@ msgstr "選擇軟體 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1373
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1374
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1375
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1376
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1352
+#: ../panels/info/cc-info-panel.c:1377
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1353
+#: ../panels/info/cc-info-panel.c:1378
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1354
+#: ../panels/info/cc-info-panel.c:1379
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1355
+#: ../panels/info/cc-info-panel.c:1380
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1356
+#: ../panels/info/cc-info-panel.c:1381
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1382
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1383
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1384
 msgid "Windows software"
 msgstr "Windows 軟體"
 
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1385
 msgid "Software"
 msgstr "軟體"
 
-#: ../panels/info/cc-info-panel.c:1483
+#: ../panels/info/cc-info-panel.c:1508
 #: ../panels/keyboard/keyboard-shortcuts.c:1647
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1492 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:11
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1498 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1523 ../panels/info/info.ui.h:18
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1503 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1528 ../panels/info/info.ui.h:26
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:10
+#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
 msgid "Graphics"
 msgstr "繪圖"
 
-#: ../panels/info/cc-info-panel.c:1710
+#: ../panels/info/cc-info-panel.c:1735
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1760
+#: ../panels/info/cc-info-panel.c:1785
 msgid "Install Updates"
 msgstr "安裝更新"
 
-#: ../panels/info/cc-info-panel.c:1764
+#: ../panels/info/cc-info-panel.c:1789
 msgid "System Up-To-Date"
 msgstr "系統已是最新"
 
-#: ../panels/info/cc-info-panel.c:1768
+#: ../panels/info/cc-info-panel.c:1793
 msgid "Checking for Updates"
 msgstr "正在檢查更新"
 
@@ -1188,7 +1196,7 @@ msgstr "退出"
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 #: ../panels/keyboard/keyboard-shortcuts.c:858
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Typing"
 msgstr "輸入"
 
@@ -1374,7 +1382,7 @@ msgstr "速度(_S)："
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Short"
 msgstr "短"
 
@@ -1390,7 +1398,7 @@ msgstr "按鍵重複速度"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Long"
 msgstr "長"
 
@@ -1482,7 +1490,7 @@ msgstr "如果您重新指派捷徑鍵為「%s」，「%s」的捷徑鍵就會
 msgid "_Reassign"
 msgstr "重新指派(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:158
+#: ../panels/mouse/cc-mouse-panel.c:152
 msgid "_Test Your Settings"
 msgstr "測試您的設定值(_T)"
 
@@ -1557,27 +1565,52 @@ msgstr "兩指捲動(_F)"
 msgid "C_ontent sticks to fingers"
 msgstr "連結到手指的內容(_O)"
 
+#: ../panels/mouse/gnome-mouse-test.c:117
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
-msgid "To test your settings, try to double-click on the face."
-msgstr "要測試您的設定值，請試著在這個臉上雙擊。"
+msgid "Try clicking, double clicking, scrolling"
+msgstr "試著單擊、雙擊、捲動"
 
-#: ../panels/network/cc-network-panel.c:627
+#: ../panels/mouse/gnome-mouse-test.c:124
+msgid "Double click, primary button"
+msgstr "雙擊，主要按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:124
+msgid "Single click, primary button"
+msgstr "單擊，主要按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:127
+msgid "Double click, middle button"
+msgstr "雙擊，中央按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:127
+msgid "Single click, middle button"
+msgstr "單擊，中央按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:130
+msgid "Double click, secondary button"
+msgstr "雙擊，次要按鈕"
+
+#: ../panels/mouse/gnome-mouse-test.c:130
+msgid "Single click, secondary button"
+msgstr "單擊，次要按鈕"
+
+#: ../panels/network/cc-network-panel.c:615
 msgid "Network proxy"
 msgstr "網路代理伺服器"
 
-#: ../panels/network/cc-network-panel.c:811 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:799 ../panels/network/net-vpn.c:278
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:878
+#: ../panels/network/cc-network-panel.c:866
 msgid "The system network services are not compatible with this version."
 msgstr "系統網路服務與這個版本不相容。"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:1013
+#: ../panels/network/cc-network-panel.c:1001
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
@@ -1601,7 +1634,7 @@ msgstr "加入新連線"
 
 #. Translators: network device speed
 #: ../panels/network/net-device-mobile.c:261
-#: ../panels/network/net-device-wifi.c:700
+#: ../panels/network/net-device-wifi.c:699
 #: ../panels/network/net-device-wired.c:126
 #, c-format
 msgid "%d Mb/s"
@@ -1616,13 +1649,13 @@ msgstr "連接到隱藏的無線網路"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/net-device-wifi.c:293
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-wifi.c:472
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/net-device-wifi.c:297
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/net-device-wifi.c:476
 msgid "WPA"
 msgstr "WPA"
 
@@ -1636,53 +1669,49 @@ msgstr "WPA2"
 msgid "Enterprise"
 msgstr "企業版"
 
-#. TRANSLATORS: this no (!) WiFi security
-#. short delay
-#: ../panels/network/net-device-wifi.c:312
-#: ../panels/network/net-device-wifi.c:468
-#: ../panels/universal-access/uap.ui.h:8
-#: ../panels/universal-access/zoom-options.ui.h:32
-#: ../panels/wacom/cc-wacom-page.c:335 ../panels/wacom/cc-wacom-page.c:352
+#: ../panels/network/net-device-wifi.c:311
+#: ../panels/network/net-device-wifi.c:467
+msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/net-device-wifi.c:734
+#: ../panels/network/net-device-wifi.c:733
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/net-device-wifi.c:736
+#: ../panels/network/net-device-wifi.c:735
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: ../panels/network/net-device-wifi.c:738
+#: ../panels/network/net-device-wifi.c:737
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
-#: ../panels/network/net-device-wifi.c:740
+#: ../panels/network/net-device-wifi.c:739
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: ../panels/network/net-device-wifi.c:742
+#: ../panels/network/net-device-wifi.c:741
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: ../panels/network/net-device-wifi.c:902
+#: ../panels/network/net-device-wifi.c:901
 #, c-format
 msgid ""
 "Network details for %s including password and any custom configuration will "
 "be lost"
 msgstr "%s 的網路詳細資料包含密碼及任何自訂的組態都會消失"
 
-#: ../panels/network/net-device-wifi.c:913
+#: ../panels/network/net-device-wifi.c:912
 msgid "Forget"
 msgstr "遺忘"
 
-#: ../panels/network/net-device-wifi.c:1438
+#: ../panels/network/net-device-wifi.c:1437
 msgid ""
 "If you have a connection to the Internet other than wireless, you can use it "
 "to share your internet connection with others."
@@ -1690,32 +1719,32 @@ msgstr ""
 "如果您有無線網路以外的方式連線到網際網路，您可以使用它來與其他人分享您的網際"
 "網路連線。"
 
-#: ../panels/network/net-device-wifi.c:1442
+#: ../panels/network/net-device-wifi.c:1441
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "切換無線網路熱點會讓您從 <b>%s</b> 斷線。"
 
-#: ../panels/network/net-device-wifi.c:1446
+#: ../panels/network/net-device-wifi.c:1445
 msgid ""
 "It is not possible to access the internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過無線網路存取網際網路的。"
 
-#: ../panels/network/net-device-wifi.c:1512
+#: ../panels/network/net-device-wifi.c:1511
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線？"
 
-#: ../panels/network/net-device-wifi.c:1515
+#: ../panels/network/net-device-wifi.c:1514
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1580
+#: ../panels/network/net-device-wifi.c:1579
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天以前"
 
-#: ../panels/network/net-device-wifi.c:1934
+#: ../panels/network/net-device-wifi.c:1933
 #: ../panels/network/network-wifi.ui.h:19
 msgid "Out of range"
 msgstr "超過範圍"
@@ -2253,35 +2282,35 @@ msgstr "連線相依性解析失敗"
 msgid "Add Account"
 msgstr "加入帳號"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:376
+#: ../panels/online-accounts/cc-online-accounts-panel.c:383
 msgid "Error logging into the account"
 msgstr "登入帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:430
+#: ../panels/online-accounts/cc-online-accounts-panel.c:437
 msgid "Expired credentials. Please log in again."
 msgstr "憑證已逾期。請重新登入。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:433
+#: ../panels/online-accounts/cc-online-accounts-panel.c:440
 msgid "_Log In"
 msgstr "登入(_L)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:617
+#: ../panels/online-accounts/cc-online-accounts-panel.c:676
 msgid "Error creating account"
 msgstr "建立帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:659
+#: ../panels/online-accounts/cc-online-accounts-panel.c:718
 msgid "Error removing account"
 msgstr "移除帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:695
+#: ../panels/online-accounts/cc-online-accounts-panel.c:754
 msgid "Are you sure you want to remove the account?"
 msgstr "確定要刪除這個帳號？"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:697
+#: ../panels/online-accounts/cc-online-accounts-panel.c:756
 msgid "This will not remove the account on the server."
 msgstr "這不會移除伺服器上的帳號。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:698
+#: ../panels/online-accounts/cc-online-accounts-panel.c:757
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -2320,17 +2349,17 @@ msgstr ""
 "加入一個帳號以允許您的應用程式存取它用於文件、郵件、連絡人、行事曆、聊天等"
 "等。"
 
-#: ../panels/power/cc-power-panel.c:170
+#: ../panels/power/cc-power-panel.c:165
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: ../panels/power/cc-power-panel.c:176
+#: ../panels/power/cc-power-panel.c:171
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:183
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2338,168 +2367,168 @@ msgstr[0] "%i 小時"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:196
+#: ../panels/power/cc-power-panel.c:191
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:197
+#: ../panels/power/cc-power-panel.c:192
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../panels/power/cc-power-panel.c:198
+#: ../panels/power/cc-power-panel.c:193
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:236
 #, c-format
 msgid "Charging - %s until fully charged"
 msgstr "充電 - 到完全充飽前還有 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:249
+#: ../panels/power/cc-power-panel.c:244
 #, c-format
 msgid "Caution low battery, %s remaining"
 msgstr "注意電池電力低落，剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:257
+#: ../panels/power/cc-power-panel.c:252
 #, c-format
 msgid "Using battery power - %s remaining"
 msgstr "使用電池電力 - 剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:274
+#: ../panels/power/cc-power-panel.c:269
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:279
+#: ../panels/power/cc-power-panel.c:274
 msgid "Using battery power"
 msgstr "使用電池電力"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:278
 msgid "Charging - fully charged"
 msgstr "充電 - 已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:287
+#: ../panels/power/cc-power-panel.c:282
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:355
+#: ../panels/power/cc-power-panel.c:350
 #, c-format
 msgid "Caution low UPS, %s remaining"
 msgstr "注意 UPS 電力低落，剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:361
+#: ../panels/power/cc-power-panel.c:356
 #, c-format
 msgid "Using UPS power - %s remaining"
 msgstr "使用 UPS 電力 - 剩下 %s"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:379
+#: ../panels/power/cc-power-panel.c:374
 msgid "Caution low UPS"
 msgstr "注意 UPS 電力低落"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:384
+#: ../panels/power/cc-power-panel.c:379
 msgid "Using UPS power"
 msgstr "使用 UPS 電力"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:436
+#: ../panels/power/cc-power-panel.c:431
 msgid "Your secondary battery is fully charged"
 msgstr "您的第二電池已完全充飽"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:440
+#: ../panels/power/cc-power-panel.c:435
 msgid "Your secondary battery is empty"
 msgstr "您的第二電池已經沒電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:523
+#: ../panels/power/cc-power-panel.c:518
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:527
+#: ../panels/power/cc-power-panel.c:522
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:531
+#: ../panels/power/cc-power-panel.c:526
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
+#: ../panels/power/cc-power-panel.c:530
 msgid "Personal digital assistant"
 msgstr "個人數位助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:539
+#: ../panels/power/cc-power-panel.c:534
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: ../panels/power/cc-power-panel.c:538
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:542
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:551
+#: ../panels/power/cc-power-panel.c:546
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:555
+#: ../panels/power/cc-power-panel.c:550
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:566
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:573
+#: ../panels/power/cc-power-panel.c:568
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:578
+#: ../panels/power/cc-power-panel.c:573
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:583
+#: ../panels/power/cc-power-panel.c:578
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:588
+#: ../panels/power/cc-power-panel.c:583
 msgctxt "Battery power"
 msgid "Charging - fully charged"
 msgstr "充電 - 已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:592
+#: ../panels/power/cc-power-panel.c:587
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
@@ -2562,179 +2591,190 @@ msgid "When power is _critically low"
 msgstr "當電源的電量極低時(_C)"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:587
+#: ../panels/printers/cc-printers-panel.c:589
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:589
+#: ../panels/printers/cc-printers-panel.c:591
 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:592
+#: ../panels/printers/cc-printers-panel.c:594
 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:595
+#: ../panels/printers/cc-printers-panel.c:597
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:597
+#: ../panels/printers/cc-printers-panel.c:599
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:599
+#: ../panels/printers/cc-printers-panel.c:601
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:603
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:603
+#: ../panels/printers/cc-printers-panel.c:605
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:607
 msgid "Low on paper"
 msgstr "紙張不足。"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:609
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:611
 msgctxt "printer state"
 msgid "Offline"
 msgstr "離線"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:613
 msgctxt "printer state"
 msgid "Paused"
 msgstr "已暫停"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:613
+#: ../panels/printers/cc-printers-panel.c:615
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:617
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:619
 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:619
+#: ../panels/printers/cc-printers-panel.c:621
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓已無法使用"
 
+#. Translators: Printer's state (printer is being configured right now)
+#: ../panels/printers/cc-printers-panel.c:724
+msgctxt "printer state"
+msgid "Configuring"
+msgstr "正在設定"
+
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:770
+#: ../panels/printers/cc-printers-panel.c:781
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備就緒"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:774
+#: ../panels/printers/cc-printers-panel.c:785
 msgctxt "printer state"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:778
+#: ../panels/printers/cc-printers-panel.c:789
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:897
+#: ../panels/printers/cc-printers-panel.c:906
 msgid "Toner Level"
 msgstr "碳粉匣等級"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:900
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Ink Level"
 msgstr "墨水等級"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:903
+#: ../panels/printers/cc-printers-panel.c:912
 msgid "Supply Level"
 msgstr "耗材等級"
 
+#. Translators: Printer's state (printer is being installed right now)
+#: ../panels/printers/cc-printers-panel.c:930
+msgctxt "printer state"
+msgid "Installing"
+msgstr "正在安裝"
+
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1014
+#: ../panels/printers/cc-printers-panel.c:1107
 msgid "No printers available"
 msgstr "沒有可用的印表機"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1290
+#: ../panels/printers/cc-printers-panel.c:1411
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 使用中"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1586
+#: ../panels/printers/cc-printers-panel.c:1731
 msgid "Failed to add new printer."
 msgstr "無法加入新的印表機。"
 
-#: ../panels/printers/cc-printers-panel.c:1744
+#: ../panels/printers/cc-printers-panel.c:1896
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/cc-printers-panel.c:1753
+#: ../panels/printers/cc-printers-panel.c:1905
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript 印表機描述檔 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2058
+#: ../panels/printers/cc-printers-panel.c:2210
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/cc-printers-panel.c:2127
+#: ../panels/printers/cc-printers-panel.c:2279
 msgid "Searching for preferred drivers..."
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: ../panels/printers/cc-printers-panel.c:2142
+#: ../panels/printers/cc-printers-panel.c:2294
 msgid "Select from database..."
 msgstr "從資料庫搜尋…"
 
-#: ../panels/printers/cc-printers-panel.c:2151
+#: ../panels/printers/cc-printers-panel.c:2303
 msgid "Provide PPD File..."
 msgstr "提供 PPD 檔案…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2289
-#: ../panels/printers/cc-printers-panel.c:2303
+#: ../panels/printers/cc-printers-panel.c:2454
+#: ../panels/printers/cc-printers-panel.c:2477
 msgid "Test page"
 msgstr "測試頁"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2673
+#: ../panels/printers/cc-printers-panel.c:2880
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui：%s"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:155
 msgid "Printers"
 msgstr "印表機"
 
@@ -2775,23 +2815,19 @@ msgstr "暫停列印"
 msgid "Cancel Print Job"
 msgstr "取消列印工作"
 
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "加入新的印表機"
-
 #: ../panels/printers/new-printer-dialog.ui.h:2
-msgid "A_ddress:"
-msgstr "位址(_D)："
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
-msgid "_Search by Address"
-msgstr "依位址搜尋(_S)"
-
-#: ../panels/printers/new-printer-dialog.ui.h:5
 #: ../panels/user-accounts/um-account-dialog.c:1017
 msgid "_Add"
 msgstr "加入(_A)"
 
+#: ../panels/printers/new-printer-dialog.ui.h:3
+msgid "Add a New Printer"
+msgstr "加入新的印表機"
+
+#: ../panels/printers/new-printer-dialog.ui.h:4
+msgid "Search for network printers or filter result"
+msgstr "搜尋網路印表機或過濾器結果"
+
 #: ../panels/printers/options-dialog.ui.h:2
 msgid "Options"
 msgstr "選項"
@@ -2914,67 +2950,10 @@ msgstr "時刻"
 msgid "%s Active Jobs"
 msgstr "%s 使用中的工作"
 
-#: ../panels/printers/pp-new-printer-dialog.c:659
-msgid "Getting devices..."
-msgstr "正在取得裝置…"
-
-#. Translators: No localy connected printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1242
-msgid "No local printers found"
-msgstr "找不到本地印表機"
-
-#. Translators: No network printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1255
-msgid "No network printers found"
-msgstr "找不到網路印表機"
-
-#: ../panels/printers/pp-new-printer-dialog.c:1347
-msgid ""
-"FirewallD is not running. Network printer detection needs services mdns, "
-"ipp, ipp-client and samba-client enabled on firewall."
-msgstr ""
-"FirewallD 尚未執行。網路印表機的偵測需要在防火牆上啟用 mdns、ipp、ipp-client "
-"和 samba-client 服務。"
-
-#. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:1375
-#: ../panels/printers/pp-new-printer-dialog.c:1380
-msgid "Devices"
-msgstr "裝置"
-
-#. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1405
-msgctxt "printer type"
-msgid "Local"
-msgstr "本機"
-
-#. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1407
-msgctxt "printer type"
-msgid "Network"
-msgstr "網路"
-
-#. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1448
-msgid "Device types"
-msgstr "裝置類型"
-
-#. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1768
-msgid "Automatic configuration"
-msgstr "自動組態"
-
-#: ../panels/printers/pp-new-printer-dialog.c:1791
-msgid "Opening firewall for mDNS connections"
-msgstr "開啟防火牆的 mDNS 連線"
-
-#: ../panels/printers/pp-new-printer-dialog.c:1800
-msgid "Opening firewall for Samba connections"
-msgstr "開啟防火牆的 Samba 連線"
-
-#: ../panels/printers/pp-new-printer-dialog.c:1809
-msgid "Opening firewall for IPP connections"
-msgstr "開啟防火牆的 IPP 連線"
+#. Translators: No printers were found
+#: ../panels/printers/pp-new-printer-dialog.c:1291
+msgid "No printers detected."
+msgstr "未偵測到印表機。"
 
 #: ../panels/printers/pp-options-dialog.c:82
 msgid "Two Sided"
@@ -3064,7 +3043,7 @@ msgid "Advanced"
 msgstr "進階"
 
 #. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:934
+#: ../panels/printers/pp-options-dialog.c:936
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
@@ -3503,7 +3482,7 @@ msgstr "敲玻璃"
 msgid "Sonar"
 msgstr "聲納"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1768
+#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
 msgid "Output"
 msgstr "輸出"
 
@@ -3511,7 +3490,7 @@ msgstr "輸出"
 msgid "Sound Output Volume"
 msgstr "音效輸出音量"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1809
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
 msgid "Input"
 msgstr "輸入"
 
@@ -3571,7 +3550,8 @@ msgctxt "volume"
 msgid "Unamplified"
 msgstr "未經放大"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1622
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
+#: ../panels/sound/gvc-mixer-dialog.c:521
 msgid "_Profile:"
 msgstr "設定組合(_P):"
 
@@ -3595,76 +3575,61 @@ msgstr[0] "%u 輸入"
 msgid "System Sounds"
 msgstr "系統音效"
 
-#: ../panels/sound/gvc-mixer-dialog.c:324
-#: ../panels/sound/gvc-mixer-dialog.c:635
-msgid "Co_nnector:"
-msgstr "連接器(_N)："
+#: ../panels/sound/gvc-mixer-dialog.c:262
+msgid "_Test Speakers"
+msgstr "測試喇叭(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:541
+#: ../panels/sound/gvc-mixer-dialog.c:426
 msgid "Peak detect"
 msgstr "峰值檢測"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1497
-#: ../panels/sound/gvc-mixer-dialog.c:1710
+#: ../panels/sound/gvc-mixer-dialog.c:1506
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "名稱"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1564
+#: ../panels/sound/gvc-mixer-dialog.c:1588
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s 的喇叭測試"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1623
-msgid "_Test Speakers"
-msgstr "測試喇叭(_T)"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1754
+#: ../panels/sound/gvc-mixer-dialog.c:1642
 msgid "_Output volume:"
 msgstr "輸出音量(_O)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1773
+#: ../panels/sound/gvc-mixer-dialog.c:1661
 msgid "C_hoose a device for sound output:"
 msgstr "選擇聲音輸出的裝置(_H)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1798
-#: ../panels/sound/gvc-mixer-dialog.c:1927
+#: ../panels/sound/gvc-mixer-dialog.c:1686
 msgid "Settings for the selected device:"
 msgstr "已選取裝置的設定值："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1816
+#: ../panels/sound/gvc-mixer-dialog.c:1704
 msgid "_Input volume:"
 msgstr "輸入音量(_I)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1839
+#: ../panels/sound/gvc-mixer-dialog.c:1727
 msgid "Input level:"
 msgstr "輸入等級："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1867
+#: ../panels/sound/gvc-mixer-dialog.c:1755
 msgid "C_hoose a device for sound input:"
 msgstr "選擇聲音輸入的裝置(_H)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1894
-msgid "Hardware"
-msgstr "硬體"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1899
-msgid "C_hoose a device to configure:"
-msgstr "選擇要設定的裝置(_H)："
-
-#: ../panels/sound/gvc-mixer-dialog.c:1938
+#: ../panels/sound/gvc-mixer-dialog.c:1782
 msgid "Sound Effects"
 msgstr "聲音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1945
+#: ../panels/sound/gvc-mixer-dialog.c:1789
 msgid "_Alert volume:"
 msgstr "警示音量(_A)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1958
+#: ../panels/sound/gvc-mixer-dialog.c:1802
 msgid "Applications"
 msgstr "程式集"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1962
+#: ../panels/sound/gvc-mixer-dialog.c:1806
 msgid "No application is currently playing or recording audio."
 msgstr "沒有應用程式目前正在播放或錄製音效。"
 
@@ -3696,16 +3661,16 @@ msgstr "從主題"
 msgid "C_hoose an alert sound:"
 msgstr "選擇警示音效(_H)："
 
-#: ../panels/sound/gvc-speaker-test.c:221
+#: ../panels/sound/gvc-speaker-test.c:220
 msgid "Stop"
 msgstr "停止"
 
-#: ../panels/sound/gvc-speaker-test.c:221
-#: ../panels/sound/gvc-speaker-test.c:333
+#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:332
 msgid "Test"
 msgstr "測試"
 
-#: ../panels/sound/gvc-speaker-test.c:229
+#: ../panels/sound/gvc-speaker-test.c:228
 msgid "Subwoofer"
 msgstr "重低音"
 
@@ -3730,8 +3695,8 @@ msgstr "已靜音"
 msgid "Custom"
 msgstr "自訂"
 
-#: ../panels/universal-access/cc-ua-panel.c:291
-#: ../panels/universal-access/cc-ua-panel.c:297
+#: ../panels/universal-access/cc-ua-panel.c:286
+#: ../panels/universal-access/cc-ua-panel.c:292
 msgid "No shortcut set"
 msgstr "沒有設定捷徑鍵"
 
@@ -3781,6 +3746,10 @@ msgstr "GOK"
 msgid "OnBoard"
 msgstr "OnBoard"
 
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "沒有"
+
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -3822,233 +3791,221 @@ msgid "Larger"
 msgstr "較大"
 
 #: ../panels/universal-access/uap.ui.h:21
-msgid "Dasher"
-msgstr "Dasher"
-
-#: ../panels/universal-access/uap.ui.h:22
-msgid "Nomon"
-msgstr "Nomon"
-
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Caribou"
-msgstr "Caribou"
-
-#: ../panels/universal-access/uap.ui.h:24
 msgid "High Contrast"
 msgstr "高對比"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:22
 msgid "Beep on Caps and Num Lock"
 msgstr "當 Caps 和 Num Lock 在使用時發出聲響"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:23
 msgid "Options..."
 msgstr "選項…"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:25
 msgid "Turn on or off:"
 msgstr "開啟或關閉："
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:26
 msgctxt "universal access, zoom"
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Zoom in:"
 msgstr "拉近："
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Zoom out:"
 msgstr "拉遠："
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Large Text"
 msgstr "大型文字"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Seeing"
 msgstr "視覺"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Visual Alerts"
 msgstr "視覺警示"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "當警示音效發出時使用視覺化的指示"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the window title"
 msgstr "閃動視窗標題"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Flash the entire screen"
 msgstr "閃動整個螢幕"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Closed Captioning"
 msgstr "關閉說明"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:36
 msgid "Display a textual description of speech and sounds"
 msgstr "顯示語音和音效的文字描述"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:37
 msgid "_Test flash"
 msgstr "測試閃動(_T)"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Hearing"
 msgstr "聽覺"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:40
 msgid "On Screen Keyboard"
 msgstr "螢幕鍵盤"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:41
 msgid "Sticky Keys"
 msgstr "黏性特殊鍵"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "將連續按的特殊鍵視為按鍵組合"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:43
 msgid "_Disable if two keys are pressed together"
 msgstr "如果同時按下任何兩鍵則停用(_D)"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Beep when a _modifer key is pressed"
 msgstr "當按下特殊按鍵時發出聲響(_M)"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Slow Keys"
 msgstr "遲緩按鍵"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按鍵被按下到它被接受之間置入延遲"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:47
 msgid "A_cceptance delay:"
 msgstr "接受時間延遲(_C)："
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Slow keys typing delay"
 msgstr "降低按鍵輸入延遲"
 
 #. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is"
 msgstr "發出聲響條件為按鍵"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:56
 msgid "pressed"
 msgstr "已按下"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:58
 msgid "accepted"
 msgstr "已接受"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:60
 msgid "rejected"
 msgstr "已拒絕"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Bounce Keys"
 msgstr "回鍵"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重複按鍵"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Acc_eptance delay:"
 msgstr "接受時間延遲(_E)："
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Bounce keys typing delay"
 msgstr "回鍵輸入延遲"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Beep when a key is _rejected"
 msgstr "當拒絕按鍵動作則發出聲響(_R)"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Enable by Keyboard"
 msgstr "由鍵盤啟用"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "以鍵盤開啟和關閉無障礙功能"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Mouse Keys"
 msgstr "滑鼠控制鍵"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the keypad"
 msgstr "使用鍵盤控制滑鼠指標"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Video Mouse"
 msgstr "視訊滑鼠"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Control the pointer using the video camera."
 msgstr "使用視訊攝影機控制指標"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Simulated Secondary Click"
 msgstr "模擬次要點擊"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "按住主要鍵時觸發次要點擊"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Secondary click delay"
 msgstr "第二次點擊延遲"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Hover Click"
 msgstr "停駐即點擊"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Trigger a click when the pointer hovers"
 msgstr "當停止游標移動時觸發點擊"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:78
 msgid "D_elay:"
 msgstr "延遲(_E)："
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Motion _threshold:"
 msgstr "移動速度(_M)："
 
 #. small threshold
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Small"
 msgstr "小"
 
 #. large threshold
-#: ../panels/universal-access/uap.ui.h:86
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Mouse Settings"
 msgstr "滑鼠設定值"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Pointing and Clicking"
 msgstr "指標和點擊"
 
@@ -4187,26 +4144,36 @@ msgstr "亮度："
 msgid "Contrast:"
 msgstr "對比："
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: ../panels/universal-access/zoom-options.ui.h:30
+msgctxt "Zoom Grayscale"
+msgid "Color"
+msgstr "顏色"
+
+#: ../panels/universal-access/zoom-options.ui.h:31
+msgctxt "Zoom Grayscale"
+msgid "None"
+msgstr "沒有"
+
+#: ../panels/universal-access/zoom-options.ui.h:32
+msgctxt "Zoom Grayscale"
 msgid "Full"
 msgstr "完全"
 
 #. short delay
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: ../panels/universal-access/zoom-options.ui.h:34
 msgid "Low"
 msgstr "低"
 
 #. long delay
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgid "High"
 msgstr "高"
 
-#: ../panels/universal-access/zoom-options.ui.h:39
+#: ../panels/universal-access/zoom-options.ui.h:37
 msgid "Color Effects:"
 msgstr "顏色效果："
 
-#: ../panels/universal-access/zoom-options.ui.h:40
+#: ../panels/universal-access/zoom-options.ui.h:38
 msgid "Color Effects"
 msgstr "顏色效果"
 
@@ -4505,7 +4472,7 @@ msgid "Authentication is required to change user data"
 msgstr "改變使用者資料需要驗證"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:552
+#: ../panels/user-accounts/um-password-dialog.c:569
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "太短"
@@ -4516,75 +4483,75 @@ msgid "Not good enough"
 msgstr "不夠好"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:553
+#: ../panels/user-accounts/um-password-dialog.c:570
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "太弱"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:554
+#: ../panels/user-accounts/um-password-dialog.c:571
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "一般"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:555
+#: ../panels/user-accounts/um-password-dialog.c:572
 msgctxt "Password strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:556
+#: ../panels/user-accounts/um-password-dialog.c:573
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "強固"
 
-#: ../panels/user-accounts/run-passwd.c:426
+#: ../panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../panels/user-accounts/run-passwd.c:506
+#: ../panels/user-accounts/run-passwd.c:504
 #: ../panels/user-accounts/um-password-dialog.c:239
 #, c-format
 msgid "The new password is too short"
 msgstr "新的密碼太短"
 
-#: ../panels/user-accounts/run-passwd.c:512
+#: ../panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "新的密碼太簡單"
 
-#: ../panels/user-accounts/run-passwd.c:518
+#: ../panels/user-accounts/run-passwd.c:516
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "舊密碼與新密碼太相似了"
 
-#: ../panels/user-accounts/run-passwd.c:521
+#: ../panels/user-accounts/run-passwd.c:519
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "新的密碼已經在最近使用過了。"
 
-#: ../panels/user-accounts/run-passwd.c:524
+#: ../panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "新的密碼必須包含數字或特殊字元"
 
-#: ../panels/user-accounts/run-passwd.c:528
+#: ../panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "舊密碼與新密碼是相同的"
 
-#: ../panels/user-accounts/run-passwd.c:532
+#: ../panels/user-accounts/run-passwd.c:530
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "您的密碼在第一次驗證後已經改變過了！"
 
-#: ../panels/user-accounts/run-passwd.c:536
+#: ../panels/user-accounts/run-passwd.c:534
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "新的密碼並未包含足夠的不同字元"
 
-#: ../panels/user-accounts/run-passwd.c:540
+#: ../panels/user-accounts/run-passwd.c:538
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
@@ -4731,11 +4698,11 @@ msgstr "您需要輸入您目前的密碼"
 msgid "The current password is not correct"
 msgstr "目前的密碼並不正確"
 
-#: ../panels/user-accounts/um-password-dialog.c:368
+#: ../panels/user-accounts/um-password-dialog.c:347
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
-#: ../panels/user-accounts/um-password-dialog.c:394
+#: ../panels/user-accounts/um-password-dialog.c:409
 msgid "Wrong password"
 msgstr "錯誤的密碼"
 
@@ -4960,28 +4927,43 @@ msgstr "映射到單一螢幕"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:317
-msgid "Switch Modes"
-msgstr "切換模式"
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+msgctxt "Wacom action-type"
+msgid "None"
+msgstr "沒有"
 
-#: ../panels/wacom/cc-wacom-page.c:564
+#: ../panels/wacom/cc-wacom-page.c:119
+msgctxt "Wacom action-type"
+msgid "Send Keystroke"
+msgstr "傳送筆劃"
+
+#: ../panels/wacom/cc-wacom-page.c:120
+msgctxt "Wacom action-type"
+msgid "Switch Monitor"
+msgstr "切換監視器"
+
+#: ../panels/wacom/cc-wacom-page.c:601
 msgid "Up"
 msgstr "向上"
 
-#: ../panels/wacom/cc-wacom-page.c:564
+#: ../panels/wacom/cc-wacom-page.c:601
 msgid "Down"
 msgstr "向下"
 
-#: ../panels/wacom/cc-wacom-page.c:599
+#: ../panels/wacom/cc-wacom-page.c:638
+msgid "Switch Modes"
+msgstr "切換模式"
+
+#: ../panels/wacom/cc-wacom-page.c:724
 #: ../panels/wacom/cc-wacom-stylus-page.c:376
 msgid "Button"
 msgstr "按鈕"
 
-#: ../panels/wacom/cc-wacom-page.c:620
+#: ../panels/wacom/cc-wacom-page.c:777
 msgid "Action"
 msgstr "動作"
 
-#: ../panels/wacom/cc-wacom-page.c:725
+#: ../panels/wacom/cc-wacom-page.c:886
 msgid "Display Mapping"
 msgstr "顯示對應"
 
@@ -5234,6 +5216,72 @@ msgstr "Preferences;Settings;偏好設定;設定值;"
 msgid "All Settings"
 msgstr "所有設定值"
 
+#~ msgid "To test your settings, try to double-click on the face."
+#~ msgstr "要測試您的設定值，請試著在這個臉上雙擊。"
+
+#~ msgid "A_ddress:"
+#~ msgstr "位址(_D)："
+
+#~ msgid "_Search by Address"
+#~ msgstr "依位址搜尋(_S)"
+
+#~ msgid "Getting devices..."
+#~ msgstr "正在取得裝置…"
+
+#~ msgid "No local printers found"
+#~ msgstr "找不到本地印表機"
+
+#~ msgid ""
+#~ "FirewallD is not running. Network printer detection needs services mdns, "
+#~ "ipp, ipp-client and samba-client enabled on firewall."
+#~ msgstr ""
+#~ "FirewallD 尚未執行。網路印表機的偵測需要在防火牆上啟用 mdns、ipp、ipp-"
+#~ "client 和 samba-client 服務。"
+
+#~ msgid "Devices"
+#~ msgstr "裝置"
+
+#~ msgctxt "printer type"
+#~ msgid "Local"
+#~ msgstr "本機"
+
+#~ msgctxt "printer type"
+#~ msgid "Network"
+#~ msgstr "網路"
+
+#~ msgid "Device types"
+#~ msgstr "裝置類型"
+
+#~ msgid "Automatic configuration"
+#~ msgstr "自動組態"
+
+#~ msgid "Opening firewall for mDNS connections"
+#~ msgstr "開啟防火牆的 mDNS 連線"
+
+#~ msgid "Opening firewall for Samba connections"
+#~ msgstr "開啟防火牆的 Samba 連線"
+
+#~ msgid "Opening firewall for IPP connections"
+#~ msgstr "開啟防火牆的 IPP 連線"
+
+#~ msgid "Co_nnector:"
+#~ msgstr "連接器(_N)："
+
+#~ msgid "Hardware"
+#~ msgstr "硬體"
+
+#~ msgid "C_hoose a device to configure:"
+#~ msgstr "選擇要設定的裝置(_H)："
+
+#~ msgid "Dasher"
+#~ msgstr "Dasher"
+
+#~ msgid "Nomon"
+#~ msgstr "Nomon"
+
+#~ msgid "Caribou"
+#~ msgstr "Caribou"
+
 #~ msgid "_Right-handed"
 #~ msgstr "慣用右手(_R)"