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



commit cb979995597712bcd32c22cb481ace73ca90cb57
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Feb 27 22:42:56 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1904 +++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po | 1909 +++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 2152 insertions(+), 1661 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 03f7057..6b3368d 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,15 +14,15 @@ msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-02 03:01+0000\n"
-"PO-Revision-Date: 2013-02-03 08:03+0800\n"
+"POT-Creation-Date: 2013-02-26 14:07+0000\n"
+"PO-Revision-Date: 2013-02-27 22:42+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #. This refers to a slideshow background
 #: ../panels/background/background.ui.h:2
@@ -111,86 +111,70 @@ msgid "Background"
 msgstr "背景"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Change the background"
-msgstr "更改背景"
+msgid "Change your background image to a wallpaper or photo"
+msgstr "將你的背景影像更改為桌布或相片"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-msgid "Bluetooth"
-msgstr "藍牙"
-
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "Configure Bluetooth settings"
-msgstr "設定藍牙設定值"
-
-#. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth 
radio's on the device.
-#: ../panels/bluetooth/bluetooth.ui.h:2
-msgctxt "Power"
-msgid "Bluetooth"
-msgstr "藍牙"
-
-#: ../panels/bluetooth/bluetooth.ui.h:3
+#: ../panels/bluetooth/bluetooth.ui.h:1
 msgid "Set Up New Device"
 msgstr "設置新裝置"
 
-#: ../panels/bluetooth/bluetooth.ui.h:4 ../panels/network/network.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
 msgid "Remove Device"
 msgstr "移除裝置"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:3
 msgid "Connection"
 msgstr "連線"
 
-#: ../panels/bluetooth/bluetooth.ui.h:6
+#: ../panels/bluetooth/bluetooth.ui.h:4
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
 #: ../panels/network/connection-editor/security-page.ui.h:2
 #: ../panels/printers/printers.ui.h:14
-#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "page 1"
 msgstr "頁 1"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7
+#: ../panels/bluetooth/bluetooth.ui.h:5
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
 #: ../panels/network/connection-editor/security-page.ui.h:5
 #: ../panels/printers/printers.ui.h:16
-#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "page 2"
 msgstr "頁 2"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/bluetooth/bluetooth.ui.h:6
 msgid "Paired"
 msgstr "已配對"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/wacom/cc-wacom-page.c:789
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
 msgid "Type"
 msgstr "類型"
 
-#: ../panels/bluetooth/bluetooth.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:180
-#: ../panels/network/connection-editor/ce-page-ip4.c:416
-#: ../panels/network/connection-editor/ce-page-ip6.c:182
-#: ../panels/network/connection-editor/ce-page-ip6.c:420
+#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/network/connection-editor/ce-page-ip4.c:189
+#: ../panels/network/connection-editor/ce-page-ip4.c:441
+#: ../panels/network/connection-editor/ce-page-ip6.c:191
+#: ../panels/network/connection-editor/ce-page-ip6.c:445
 msgid "Address"
 msgstr "地址"
 
-#: ../panels/bluetooth/bluetooth.ui.h:11
+#: ../panels/bluetooth/bluetooth.ui.h:9
 msgid "Mouse & Touchpad Settings"
 msgstr "滑鼠與觸控板設定值"
 
-#: ../panels/bluetooth/bluetooth.ui.h:12
+#: ../panels/bluetooth/bluetooth.ui.h:10
 #: ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "音效設定值"
 
-#: ../panels/bluetooth/bluetooth.ui.h:13
+#: ../panels/bluetooth/bluetooth.ui.h:11
 msgid "Keyboard Settings"
 msgstr "鍵盤設定值"
 
-#: ../panels/bluetooth/bluetooth.ui.h:14
+#: ../panels/bluetooth/bluetooth.ui.h:12
 msgid "Send Files…"
 msgstr "傳送檔案…"
 
@@ -235,6 +219,14 @@ msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr "如果你刪除此裝置,下次使用時必須再次設定它。"
 
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+msgid "Bluetooth"
+msgstr "藍牙"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Turn Bluetooth on and off and connect your devices"
+msgstr "開啟或關閉藍牙與連接你的裝置"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: ../panels/color/cc-color-calibrate.c:360
 msgid "Place your calibration device over the square and press 'Start'"
@@ -351,77 +343,87 @@ msgstr "%s 打印機"
 msgid "%s Webcam"
 msgstr "%s 網絡攝影機"
 
+#: ../panels/color/cc-color-device.c:89
+#, c-format
+msgid "Enable color management for %s"
+msgstr "啟用 %s 的顏色管理"
+
+#: ../panels/color/cc-color-device.c:93
+#, c-format
+msgid "Show color profiles for %s"
+msgstr "顯示 %s 的顏色描述檔"
+
 #. not calibrated
-#: ../panels/color/cc-color-device.c:303
+#: ../panels/color/cc-color-device.c:322
 msgid "Not calibrated"
 msgstr "尚未校準"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:131
+#: ../panels/color/cc-color-panel.c:133
 msgid "Default: "
 msgstr "預設值:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:139
+#: ../panels/color/cc-color-panel.c:141
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:146
+#: ../panels/color/cc-color-panel.c:148
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:214
+#: ../panels/color/cc-color-panel.c:216
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: ../panels/color/cc-color-panel.c:217
+#: ../panels/color/cc-color-panel.c:219
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:228
+#: ../panels/color/cc-color-panel.c:230
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:235
+#: ../panels/color/cc-color-panel.c:237
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../panels/color/cc-color-panel.c:506
+#: ../panels/color/cc-color-panel.c:581
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:776
+#: ../panels/color/cc-color-panel.c:853
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1137
+#: ../panels/color/cc-color-panel.c:1214
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1152 ../panels/color/cc-color-panel.c:1176
+#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr "尚未偵測到測量儀器。請檢查它是否已開啟並正確的連接。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1186
+#: ../panels/color/cc-color-panel.c:1263
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援打印機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1197
+#: ../panels/color/cc-color-panel.c:1274
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
@@ -506,6 +508,7 @@ msgid "Display Calibration"
 msgstr "顯示校準"
 
 #: ../panels/color/color-calibrate.ui.h:2
+#: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 #: ../panels/user-accounts/data/photo-dialog.ui.h:8
 #: ../panels/user-accounts/um-account-dialog.c:1067
@@ -559,20 +562,20 @@ msgid "Calibration Quality"
 msgstr "校準品質"
 
 #: ../panels/color/color.ui.h:9
-msgid "Select the type of display that is connected."
-msgstr "選擇連接的顯示器類型。"
+msgid "Select the sensor device you want to use for calibration."
+msgstr "選擇你想要使用的校準偵測裝置。"
 
 #: ../panels/color/color.ui.h:10
-msgid "Display Type"
-msgstr "顯示類型"
+msgid "Calibration Device"
+msgstr "校準裝置"
 
 #: ../panels/color/color.ui.h:11
-msgid "Select the sensor device you want to use for calibration."
-msgstr "選擇你想要使用的校準偵測裝置。"
+msgid "Select the type of display that is connected."
+msgstr "選擇連接的顯示器類型。"
 
 #: ../panels/color/color.ui.h:12
-msgid "Calibration Device"
-msgstr "校準裝置"
+msgid "Display Type"
+msgstr "顯示類型"
 
 #: ../panels/color/color.ui.h:13
 msgid ""
@@ -733,116 +736,203 @@ msgid "Projector"
 msgstr "投影機"
 
 #: ../panels/color/color.ui.h:48
+#, fuzzy
+msgid "Plasma"
+msgstr "等離子"
+
+#: ../panels/color/color.ui.h:49
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:50
 msgid "40 minutes"
 msgstr "40 分鐘"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:51
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:51 ../panels/power/power.ui.h:5
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 分鐘"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:53
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "15 分鐘"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:55
 msgid "Native to display"
 msgstr "原生顯示"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:56
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (列印與出版)"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:57
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:58
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (攝影與繪圖)"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:59
 msgid "D75"
 msgstr "D75"
 
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Color management settings"
-msgstr "顏色管理設定值"
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr "校準你裝置的顏色,像是顯示器、攝影機或打印機"
 
 #. Translators: those are keywords for the color control-center panel
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:4
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;打印機;顯示器;"
 
-#: ../panels/common/cc-common-language.c:639
-msgid "British English"
-msgstr "英式英文"
-
-#: ../panels/common/cc-common-language.c:642
-msgid "Spanish"
-msgstr "西班牙文"
-
-#: ../panels/common/cc-common-language.c:643
-msgid "Chinese (simplified)"
-msgstr "簡體中文"
-
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:687
+#: ../panels/common/cc-common-language.c:677
 msgid "United States"
 msgstr "美國"
 
-#: ../panels/common/cc-common-language.c:688
+#: ../panels/common/cc-common-language.c:678
 msgid "Germany"
 msgstr "德國"
 
-#: ../panels/common/cc-common-language.c:689
+#: ../panels/common/cc-common-language.c:679
 msgid "France"
 msgstr "法國"
 
-#: ../panels/common/cc-common-language.c:690
+#: ../panels/common/cc-common-language.c:680
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../panels/common/cc-common-language.c:691
+#: ../panels/common/cc-common-language.c:681
 msgid "China"
 msgstr "中國"
 
-#: ../panels/common/cc-language-chooser.c:120
+#: ../panels/common/cc-common-language.c:747
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:292
-msgid "Select a region"
-msgstr "選擇地區"
+#: ../panels/common/cc-language-chooser.c:169
+#: ../panels/region/cc-format-chooser.c:259
+#: ../panels/region/cc-input-chooser.c:171
+msgid "More…"
+msgstr "更多…"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Select a language"
-msgstr "選擇語言"
+#: ../panels/common/cc-language-chooser.c:178
+msgid "No languages found"
+msgstr "找不到語言"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:1
-#: ../panels/user-accounts/um-user-panel.c:467
-msgid "_Cancel"
-msgstr "取消(_C)"
+#. translators:
+#. * The device has been disabled
+#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:408
+#: ../panels/keyboard/keyboard-shortcuts.c:1160
+#: ../panels/network/network-wifi.ui.h:30
+#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "已停用"
+
+#: ../panels/common/cc-util.c:29
+msgid "Left Shift"
+msgstr "左 Shift"
+
+#: ../panels/common/cc-util.c:30
+msgid "Left Alt"
+msgstr "左 Alt"
+
+#: ../panels/common/cc-util.c:31
+msgid "Left Ctrl"
+msgstr "左 Ctrl"
+
+#: ../panels/common/cc-util.c:32
+msgid "Right Shift"
+msgstr "右 Shift"
+
+#: ../panels/common/cc-util.c:33
+msgid "Right Alt"
+msgstr "右 Alt"
+
+#: ../panels/common/cc-util.c:34
+msgid "Right Ctrl"
+msgstr "右 Ctrl"
 
-#: ../panels/common/language-chooser.ui.h:3
-msgid "_Select"
-msgstr "選取(_S)"
+#: ../panels/common/cc-util.c:35
+msgid "Left Alt+Shift"
+msgstr "左 Alt+Shift"
+
+#: ../panels/common/cc-util.c:36
+msgid "Right Alt+Shift"
+msgstr "右 Alt+Shift"
+
+#: ../panels/common/cc-util.c:37
+msgid "Left Ctrl+Shift"
+msgstr "左 Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:38
+msgid "Right Ctrl+Shift"
+msgstr "右 Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:39
+msgid "Left+Right Shift"
+msgstr "左+右 Shift"
+
+#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "左+右 Alt"
+
+#: ../panels/common/cc-util.c:41
+msgid "Left+Right Ctrl"
+msgstr "左+右 Ctrl"
+
+#: ../panels/common/cc-util.c:42
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../panels/common/cc-util.c:43
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:44
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../panels/common/cc-util.c:45
+msgid "Caps"
+msgstr "Caps"
+
+#: ../panels/common/cc-util.c:46
+msgid "Shift+Caps"
+msgstr "Shift+Caps"
+
+#: ../panels/common/cc-util.c:47
+msgid "Alt+Caps"
+msgstr "Alt+Caps"
+
+#: ../panels/common/cc-util.c:48
+msgid "Ctrl+Caps"
+msgstr "Ctrl+Caps"
+
+#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+msgid "Language"
+msgstr "語言"
+
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "完成(_D)"
 
 #: ../panels/datetime/datetime.ui.h:1
 msgid "_Region:"
@@ -954,8 +1044,8 @@ msgid "Date & Time"
 msgstr "日期與時刻"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-msgid "Date and Time preferences panel"
-msgstr "日期和時刻偏好設定面板"
+msgid "Change the date and time, including time zone"
+msgstr "改變時刻與日期,包含時區"
 
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
@@ -1003,7 +1093,7 @@ msgstr "180 度"
 #. * the Spanish translation could be "Pantallas en Espejo".
 #.
 #: ../panels/display/cc-display-panel.c:625
-#: ../panels/display/cc-rr-labeler.c:449
+#: ../panels/display/cc-rr-labeler.c:418
 msgid "Mirrored Displays"
 msgstr "鏡射顯示器"
 
@@ -1074,8 +1164,8 @@ msgid "Displays"
 msgstr "顯示器"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Change resolution and position of monitors and projectors"
-msgstr "改變顯示器和投影機的解像度和位置"
+msgid "Choose how to use connected monitors and projectors"
+msgstr "選擇如何使用連接的顯示器和投影機"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
@@ -1083,53 +1173,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;面板;投影機;螢幕;解像度;重新整理;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:441 ../panels/network/panel-common.c:120
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "不明"
 
-#: ../panels/info/cc-info-panel.c:542
+#: ../panels/info/cc-info-panel.c:541
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d-位元"
 
-#: ../panels/info/cc-info-panel.c:544
+#: ../panels/info/cc-info-panel.c:543
 #, c-format
 msgid "%d-bit"
 msgstr "%d-位元"
 
-#: ../panels/info/cc-info-panel.c:1219
+#: ../panels/info/cc-info-panel.c:1218
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1223
+#: ../panels/info/cc-info-panel.c:1222
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1227
+#: ../panels/info/cc-info-panel.c:1226
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1318
+#: ../panels/info/cc-info-panel.c:1317
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1352
+#: ../panels/info/cc-info-panel.c:1351
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1353
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for software CDs"
 msgstr "選擇軟件 CD 要用的應用程式"
 
@@ -1138,108 +1228,108 @@ msgstr "選擇軟件 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1364
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1369
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1370
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1371
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Windows software"
 msgstr "Windows 軟件"
 
-#: ../panels/info/cc-info-panel.c:1377
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Software"
 msgstr "軟件"
 
-#: ../panels/info/cc-info-panel.c:1500
+#: ../panels/info/cc-info-panel.c:1499
 #: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1509 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1520 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1545
+#: ../panels/info/cc-info-panel.c:1544
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1595
+#: ../panels/info/cc-info-panel.c:1594
 msgid "Install Updates"
 msgstr "安裝更新"
 
-#: ../panels/info/cc-info-panel.c:1599
+#: ../panels/info/cc-info-panel.c:1598
 msgid "System Up-To-Date"
 msgstr "系統已是最新"
 
-#: ../panels/info/cc-info-panel.c:1603
+#: ../panels/info/cc-info-panel.c:1602
 msgid "Checking for Updates"
 msgstr "正在檢查更新"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#: ../panels/network/connection-editor/ce-page-details.c:238
+#: ../panels/network/connection-editor/ce-page-details.c:240
 #: ../panels/network/network-wifi.ui.h:58
 msgid "Details"
 msgstr "詳細資料"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "System Information"
-msgstr "系統資訊"
+msgid "View information about your system"
+msgstr "檢視你系統的資訊"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-msgstr 
"device;system;information;memory;processor;version;default;application;fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;裝置;系統;資訊;記憶體;處理器;版本;預設;應用程式;後備;首選;音訊;視像;光碟;可移除;媒體;自動執行;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+msgstr 
"device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;裝置;系統;資訊;記憶體;處理器;版本;預設;應用程式;首選;音訊;視像;光碟;可移除;媒體;自動執行;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1389,14 +1479,12 @@ msgid "Typing"
 msgstr "輸入"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#: ../panels/region/gnome-region-panel.ui.h:27
-msgid "Switch to next source"
-msgstr "切換至下個來源"
+msgid "Switch to next input source"
+msgstr "切換到下一個輸入來源"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#: ../panels/region/gnome-region-panel.ui.h:25
-msgid "Switch to previous source"
-msgstr "切換至上個來源"
+msgid "Switch to previous input source"
+msgstr "切換到上一個輸入來源"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
 msgid "Launchers"
@@ -1459,7 +1547,6 @@ msgid "Copy a screenshot of an area to clipboard"
 msgstr "將區域的螢幕截圖複製到剪貼簿"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:43
 msgid "System"
 msgstr "系統"
 
@@ -1508,108 +1595,15 @@ msgstr "將文字縮小"
 msgid "High contrast on or off"
 msgstr "高對比開或關"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:254
-#: ../panels/keyboard/cc-keyboard-option.c:304
-#: ../panels/keyboard/cc-keyboard-option.c:436
-#: ../panels/keyboard/keyboard-shortcuts.c:1160
-#: ../panels/network/network-wifi.ui.h:30
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "已停用"
-
-#: ../panels/keyboard/cc-keyboard-option.c:255
-msgid "Left Shift"
-msgstr "左 Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:256
-msgid "Left Alt"
-msgstr "左 Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:257
-msgid "Left Ctrl"
-msgstr "左 Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:258
-msgid "Right Shift"
-msgstr "右 Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:259
-msgid "Right Alt"
-msgstr "右 Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:260
-msgid "Right Ctrl"
-msgstr "右 Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:261
-msgid "Left Alt+Shift"
-msgstr "左 Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:262
-msgid "Right Alt+Shift"
-msgstr "右 Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:263
-msgid "Left Ctrl+Shift"
-msgstr "左 Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:264
-msgid "Right Ctrl+Shift"
-msgstr "右 Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:265
-msgid "Left+Right Shift"
-msgstr "左+右 Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:266
-msgid "Left+Right Alt"
-msgstr "左+右 Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:267
-msgid "Left+Right Ctrl"
-msgstr "左+右 Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:268
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:269
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:270
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:271
-msgid "Caps"
-msgstr "Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:272
-msgid "Shift+Caps"
-msgstr "Shift+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:273
-msgid "Alt+Caps"
-msgstr "Alt+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:274
-msgid "Ctrl+Caps"
-msgstr "Ctrl+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:390
+#: ../panels/keyboard/cc-keyboard-option.c:362
 msgid "Alternative Characters Key"
 msgstr "替代的字符鍵"
 
-#: ../panels/keyboard/cc-keyboard-option.c:395
+#: ../panels/keyboard/cc-keyboard-option.c:367
 msgid "Compose Key"
 msgstr "組合鍵"
 
-#: ../panels/keyboard/cc-keyboard-option.c:399
+#: ../panels/keyboard/cc-keyboard-option.c:371
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
@@ -1619,8 +1613,8 @@ msgid "Keyboard"
 msgstr "鍵盤"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Change keyboard settings"
-msgstr "改變鍵盤設定值"
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "檢視與更改鍵盤捷徑鍵並設定你的輸入偏好設定"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
@@ -1696,8 +1690,9 @@ msgid "Cursor blink speed"
 msgstr "游標閃爍速度"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Layout Settings"
-msgstr "配置設定值"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "輸入來源"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
@@ -1715,7 +1710,6 @@ msgid ""
 msgstr "要編輯捷徑鍵,點選相應的列並按下新的按鍵組合,或以 Backspace 鍵來清除。"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-#: ../panels/region/gnome-region-panel.ui.h:30
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
@@ -1766,8 +1760,9 @@ msgid "Mouse & Touchpad"
 msgstr "滑鼠和觸控板"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse and touchpad preferences"
-msgstr "設定你的滑鼠與觸控板偏好設定"
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr "改變你的滑鼠或控制板靈敏度並選擇慣用右手或左手"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
@@ -1877,21 +1872,21 @@ msgstr "點選,次要按鈕"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:336
+#: ../panels/network/cc-network-panel.c:347
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:869
+#: ../panels/network/cc-network-panel.c:912
 msgid "Network proxy"
 msgstr "網絡代理伺服器"
 
-#: ../panels/network/cc-network-panel.c:1048 ../panels/network/net-vpn.c:280
+#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:280
 #, 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:1181
+#: ../panels/network/cc-network-panel.c:1225
 msgid "The system network services are not compatible with this version."
 msgstr "系統網絡服務與這個版本不兼容。"
 
@@ -1919,6 +1914,10 @@ msgstr "內部驗證(_A)"
 msgid "Security"
 msgstr "安全性"
 
+#: ../panels/network/connection-editor/ce-page.c:502
+msgid "automatic"
+msgstr "自動"
+
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
 #: ../panels/network/net-device-wifi.c:224
@@ -1954,7 +1953,7 @@ msgid "None"
 msgstr "沒有"
 
 #: ../panels/network/connection-editor/ce-page-details.c:91
-#: ../panels/power/power.ui.h:9
+#: ../panels/power/power.ui.h:19
 msgid "Never"
 msgstr "永不"
 
@@ -1979,38 +1978,37 @@ msgstr[0] "%i 天以前"
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
 #: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-mobile.c:278
-#: ../panels/network/net-device-wifi.c:538
+#: ../panels/network/net-device-wifi.c:537
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:568
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:570
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:572
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:189
+#: ../panels/network/net-device-wifi.c:574
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
@@ -2022,58 +2020,78 @@ msgstr "很好"
 msgid "Identity"
 msgstr "身分"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:183
-#: ../panels/network/connection-editor/ce-page-ip4.c:419
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:454
 msgid "Netmask"
 msgstr "網絡遮罩"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:186
-#: ../panels/network/connection-editor/ce-page-ip4.c:422
-#: ../panels/network/connection-editor/ce-page-ip6.c:188
-#: ../panels/network/connection-editor/ce-page-ip6.c:426
+#: ../panels/network/connection-editor/ce-page-ip4.c:216
+#: ../panels/network/connection-editor/ce-page-ip4.c:467
+#: ../panels/network/connection-editor/ce-page-ip6.c:217
+#: ../panels/network/connection-editor/ce-page-ip6.c:475
 #: ../panels/network/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:330
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
+#: ../panels/network/connection-editor/ce-page-ip4.c:233
+#: ../panels/network/connection-editor/ce-page-ip6.c:234
+msgid "Delete Address"
+msgstr "刪除位址"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:285
+#: ../panels/network/connection-editor/ce-page-ip6.c:286
+msgid "Add"
+msgstr "加入"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:350
+#: ../panels/network/connection-editor/ce-page-ip6.c:354
 msgid "Server"
 msgstr "伺服器"
 
-#. Translators: Please see http://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:426
-#: ../panels/network/connection-editor/ce-page-ip6.c:430
+#: ../panels/network/connection-editor/ce-page-ip4.c:367
+#: ../panels/network/connection-editor/ce-page-ip6.c:371
+msgid "Delete DNS Server"
+msgstr "刪除 DNS 伺服器"
+
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ce-page-ip4.c:481
+#: ../panels/network/connection-editor/ce-page-ip6.c:489
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:579
+#: ../panels/network/connection-editor/ce-page-ip4.c:502
+#: ../panels/network/connection-editor/ce-page-ip6.c:510
+msgid "Delete Route"
+msgstr "刪除路由"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:616
 #: ../panels/network/network-wifi.ui.h:26
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:583
-#: ../panels/network/connection-editor/ce-page-ip6.c:585
+#: ../panels/network/connection-editor/ce-page-ip4.c:620
+#: ../panels/network/connection-editor/ce-page-ip6.c:622
 #: ../panels/network/network-wifi.ui.h:25
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:587
-#: ../panels/network/connection-editor/ce-page-ip6.c:589
+#: ../panels/network/connection-editor/ce-page-ip4.c:624
+#: ../panels/network/connection-editor/ce-page-ip6.c:626
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:888
+#: ../panels/network/connection-editor/ce-page-ip4.c:925
 #: ../panels/network/network-wifi.ui.h:60
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:185
-#: ../panels/network/connection-editor/ce-page-ip6.c:423
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:458
 msgid "Prefix"
 msgstr "前綴"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:577
+#: ../panels/network/connection-editor/ce-page-ip6.c:614
 #: ../panels/network/connection-editor/ethernet-page.ui.h:1
 #: ../panels/network/connection-editor/ip4-page.ui.h:4
 #: ../panels/network/connection-editor/ip6-page.ui.h:4
@@ -2081,11 +2099,11 @@ msgstr "前綴"
 msgid "Automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:581
+#: ../panels/network/connection-editor/ce-page-ip6.c:618
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:849
+#: ../panels/network/connection-editor/ce-page-ip6.c:886
 #: ../panels/network/network-wifi.ui.h:61
 msgid "IPv6"
 msgstr "IPv6"
@@ -2125,10 +2143,6 @@ msgstr "WPA & WPA2 個人版"
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: ../panels/network/connection-editor/ce-page.c:502
-msgid "automatic"
-msgstr "自動"
-
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "套用(_A)"
@@ -2146,7 +2160,7 @@ msgstr "連線速度"
 #: ../panels/network/connection-editor/details-page.ui.h:4
 #: ../panels/network/net-device-ethernet.c:159
 #: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:643
+#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
@@ -2155,7 +2169,7 @@ msgstr "IPv4 位址"
 #: ../panels/network/net-device-ethernet.c:164
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:644
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
 msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
@@ -2266,12 +2280,22 @@ msgstr "位址(_A)"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:5
 #: ../panels/network/connection-editor/ip6-page.ui.h:5
+msgid "Automatic DNS"
+msgstr "自動 DNS"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
 #: ../panels/network/network-wifi.ui.h:39
 msgid "Routes"
 msgstr "路由"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Automatic Routes"
+msgstr "自動路由"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
 #: ../panels/network/network-wifi.ui.h:45
 msgid "Use this connection _only for resources on its network"
 msgstr "只在使用這個連線的網絡資源時才使用此連線(_U)"
@@ -2289,38 +2313,38 @@ msgstr "無法開啟連線編輯器"
 msgid "New Profile"
 msgstr "新增設定組合"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:502
-#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/user-accounts/um-account-dialog.c:1068
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:586
 #: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:584
+#: ../panels/network/connection-editor/net-connection-editor.c:587
 msgid "Bond"
 msgstr "繫結"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:585
+#: ../panels/network/connection-editor/net-connection-editor.c:588
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:586
+#: ../panels/network/connection-editor/net-connection-editor.c:589
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:736
+#: ../panels/network/connection-editor/net-connection-editor.c:739
 msgid "Could not load VPN plugins"
 msgstr "無法載入 VPN 外掛程式"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:800
+#: ../panels/network/connection-editor/net-connection-editor.c:803
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:867
+#: ../panels/network/connection-editor/net-connection-editor.c:870
 msgid "Add Network Connection"
 msgstr "加入網絡連線"
 
@@ -2330,7 +2354,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1402
+#: ../panels/network/net-device-wifi.c:1411
 #: ../panels/network/network-wifi.ui.h:54
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2434,8 +2458,8 @@ msgid "Network"
 msgstr "網絡"
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "網絡設定值"
+msgid "Control how you connect to the Internet"
+msgstr "控制你如何連線至網際網絡"
 
 #. Translators: those are keywords for the network control-center panel
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
@@ -2469,7 +2493,7 @@ msgstr "昨日"
 
 #: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:646 ../panels/network/panel-common.c:648
+#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 位址"
@@ -2479,53 +2503,68 @@ msgstr "IP 位址"
 msgid "Last used"
 msgstr "最後使用的"
 
-#: ../panels/network/net-device-ethernet.c:477
+#: ../panels/network/net-device-ethernet.c:337
+#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/network-ethernet.ui.h:2
+#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+msgid "Options…"
+msgstr "選項…"
+
+#: ../panels/network/net-device-ethernet.c:472
 #, c-format
 msgid "Profile %d"
 msgstr "設定組合 %d"
 
-#: ../panels/network/net-device-mobile.c:220
+#: ../panels/network/net-device-mobile.c:241
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: ../panels/network/net-device-wifi.c:1123
+#: ../panels/network/net-device-wifi.c:1120
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
 msgstr "如果你有無線網絡以外的方式連線到互聯網,你可以使用它來與其他人分享你的互聯網連線。"
 
-#: ../panels/network/net-device-wifi.c:1127
+#: ../panels/network/net-device-wifi.c:1124
 #, 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:1131
+#: ../panels/network/net-device-wifi.c:1128
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過你的無線網絡存取互聯網的。"
 
-#: ../panels/network/net-device-wifi.c:1205
+#: ../panels/network/net-device-wifi.c:1202
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1208
+#: ../panels/network/net-device-wifi.c:1205
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1398
+#: ../panels/network/net-device-wifi.c:1277
+msgid "System policy prohibits use as a Hotspot"
+msgstr "系統原則禁止做為熱點"
+
+#: ../panels/network/net-device-wifi.c:1280
+msgid "Wireless device does not support Hotspot mode"
+msgstr "無線裝置不支援熱點模式"
+
+#: ../panels/network/net-device-wifi.c:1407
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網絡的詳細資料包含密碼及任何自選的組態都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1703
+#: ../panels/network/net-device-wifi.c:1714
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
 msgid "History"
 msgstr "歷史紀錄"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1715
+#: ../panels/network/net-device-wifi.c:1726
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2544,7 +2583,7 @@ msgstr "當沒有提供組態 URL 時會使用網頁代理伺服器自動發現
 msgid "This is not recommended for untrusted public networks."
 msgstr "這不建議用於不信任的公用網絡。"
 
-#: ../panels/network/net-proxy.c:406
+#: ../panels/network/net-proxy.c:408
 msgid "Proxy"
 msgstr "代理伺服器"
 
@@ -2561,7 +2600,7 @@ msgid "Provider"
 msgstr "供應商"
 
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:6
+#: ../panels/network/network-simple.ui.h:7
 msgid "_Options…"
 msgstr "選項(_O)…"
 
@@ -2608,6 +2647,26 @@ msgstr "Socks 主機(_S)"
 msgid "_Ignore Hosts"
 msgstr "忽略主機(_I)"
 
+#: ../panels/network/network-proxy.ui.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP 代理伺服器連接埠"
+
+#: ../panels/network/network-proxy.ui.h:12
+msgid "HTTPS proxy port"
+msgstr "HTTPS 代理伺服器連接埠"
+
+#: ../panels/network/network-proxy.ui.h:13
+msgid "FTP proxy port"
+msgstr "FTP 代理伺服器連接埠"
+
+#: ../panels/network/network-proxy.ui.h:14
+msgid "Socks proxy port"
+msgstr "Socks 代理伺服器通訊埠"
+
+#: ../panels/network/network-simple.ui.h:6
+msgid "Turn device off"
+msgstr "關閉裝置"
+
 #: ../panels/network/network.ui.h:1
 msgid "Select the interface to use for the new service"
 msgstr "選擇要用於新服務的介面"
@@ -2637,9 +2696,14 @@ msgid "Group Password"
 msgstr "羣組密碼"
 
 #: ../panels/network/network-vpn.ui.h:6
+#: ../panels/printers/authentication-dialog.ui.h:4
 msgid "Username"
 msgstr "使用者名稱"
 
+#: ../panels/network/network-vpn.ui.h:7
+msgid "Turn VPN connection off"
+msgstr "關閉 VPN 連線"
+
 #: ../panels/network/network-wifi.ui.h:1
 msgid "Automatic _Connect"
 msgstr "自動連線(_C)"
@@ -2784,328 +2848,354 @@ msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: ../panels/network/network-wifi.ui.h:67
+msgid "Turn Wi-Fi off"
+msgstr "關閉 Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:68
 msgid "_Use as Hotspot…"
 msgstr "做為熱點(_U)…"
 
-#: ../panels/network/network-wifi.ui.h:68
+#: ../panels/network/network-wifi.ui.h:69
 msgid "_Connect to Hidden Network…"
 msgstr "連接到隱藏的網絡(_C)…"
 
-#: ../panels/network/network-wifi.ui.h:69
+#: ../panels/network/network-wifi.ui.h:70
 msgid "_History"
 msgstr "歷史紀錄(_H)"
 
-#: ../panels/network/network-wifi.ui.h:70
+#: ../panels/network/network-wifi.ui.h:71
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "關閉連線到 Wi-Fi 網絡"
 
-#: ../panels/network/network-wifi.ui.h:71
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "網絡名稱"
 
-#: ../panels/network/network-wifi.ui.h:72
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "已連線的裝置"
 
-#: ../panels/network/network-wifi.ui.h:73
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "安全性類型"
 
-#: ../panels/network/network-wifi.ui.h:74
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "安全密碼匙"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:124
+#: ../panels/network/panel-common.c:131
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:128
+#: ../panels/network/panel-common.c:135
 msgid "Infrastructure"
 msgstr "基礎架構"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:152 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
 msgid "Status unknown"
 msgstr "狀態不明"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:156
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "未管理"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:161
-msgid "Firmware missing"
-msgstr "缺少韌體"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:165
-msgid "Cable unplugged"
-msgstr "纜線已拔除"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:168
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "無法使用"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:179 ../panels/network/panel-common.c:221
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Connecting"
 msgstr "連線中"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:183 ../panels/network/panel-common.c:225
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Authentication required"
 msgstr "需要驗證"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:187 ../panels/network/panel-common.c:229
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connected"
 msgstr "已連線"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:191
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "斷線"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:195 ../panels/network/panel-common.c:233
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
 msgid "Connection failed"
 msgstr "連線失敗"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:199 ../panels/network/panel-common.c:241
+#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
 msgid "Status unknown (missing)"
 msgstr "狀態不詳(缺乏)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:237
+#: ../panels/network/panel-common.c:227
 msgid "Not connected"
 msgstr "未連線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:261
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "設定失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:265
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "IP 組態失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:269
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "IP 組態過期"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:273
+#: ../panels/network/panel-common.c:264
 msgid "Secrets were required, but not provided"
 msgstr "需要機密,但沒有提供"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:277
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x 請求已斷線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:281
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x 請求組態失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:285
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr "802.1x 請求已失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:289
+#: ../panels/network/panel-common.c:280
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x 請求花了太長時間驗證"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:293
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "無法啟動 PPP 服務"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:297
+#: ../panels/network/panel-common.c:288
 msgid "PPP service disconnected"
 msgstr "PPP 服務已斷線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:301
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "PPP 失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:305
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client failed to start"
 msgstr "DHCP 客戶端啟動失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:309
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "DHCP 客戶端錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:313
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "DHCP 客戶端失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:317
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed to start"
 msgstr "分享的連線服務啟動失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:321
+#: ../panels/network/panel-common.c:312
 msgid "Shared connection service failed"
 msgstr "分享的連線服務失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:325
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service failed to start"
 msgstr "無法啟動 AutoIP 服務"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:329
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "AutoIP 服務錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:333
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "AutoIP 服務失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:337
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "線路忙碌"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:341
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "沒有撥號音"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:345
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr "無法建立載體"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:349
+#: ../panels/network/panel-common.c:340
 msgid "Dialing request timed out"
 msgstr "撥號要求逾時"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:353
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "嘗試撥號失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:357
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "數據機初始化失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:361
+#: ../panels/network/panel-common.c:352
 msgid "Failed to select the specified APN"
 msgstr "無法選擇指定的 APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:365
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "不要搜尋網絡"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:369
+#: ../panels/network/panel-common.c:360
 msgid "Network registration denied"
 msgstr "網絡登記被禁止"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:373
+#: ../panels/network/panel-common.c:364
 msgid "Network registration timed out"
 msgstr "網絡登記逾時"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:377
+#: ../panels/network/panel-common.c:368
 msgid "Failed to register with the requested network"
 msgstr "無法向要求的網絡登記"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:381
+#: ../panels/network/panel-common.c:372
 msgid "PIN check failed"
 msgstr "PIN 檢查失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:385
+#: ../panels/network/panel-common.c:376
 msgid "Firmware for the device may be missing"
 msgstr "可能缺少裝置的韌體"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:389
+#: ../panels/network/panel-common.c:380
 msgid "Connection disappeared"
 msgstr "連線已消失"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:393
-msgid "Carrier/link changed"
-msgstr "載體/連結已更改"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:397
+#: ../panels/network/panel-common.c:384
 msgid "Existing connection was assumed"
 msgstr "優先使用現有的連線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:401
+#: ../panels/network/panel-common.c:388
 msgid "Modem not found"
 msgstr "找不到數據機"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:405
+#: ../panels/network/panel-common.c:392
 msgid "Bluetooth connection failed"
 msgstr "藍牙連線失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:409
+#: ../panels/network/panel-common.c:396
 msgid "SIM Card not inserted"
 msgstr "SIM 卡尚未插入"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:413
+#: ../panels/network/panel-common.c:400
 msgid "SIM Pin required"
 msgstr "需要 SIM PIN 碼"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:417
+#: ../panels/network/panel-common.c:404
 msgid "SIM Puk required"
 msgstr "需要 SIM PUK 碼"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:421
+#: ../panels/network/panel-common.c:408
 msgid "SIM wrong"
 msgstr "SIM 錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:425
+#: ../panels/network/panel-common.c:412
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand 裝置不支援已連接模式"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:429
+#: ../panels/network/panel-common.c:416
 msgid "Connection dependency failed"
 msgstr "連線相根據性解析失敗"
 
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "缺少韌體"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+msgid "Cable unplugged"
+msgstr "纜線已拔除"
+
+#: ../panels/network/wireless-security/eap-method.c:275
+msgid "No Certificate Authority certificate chosen"
+msgstr "未選擇任何證書授權單位(CA)證書"
+
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid ""
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
+msgstr "不使用證書中心 (CA) 的證書會造成連線不安全、流氓 Wi-Fi 網絡。是否要選擇一個證書中心的證書?"
+
+#: ../panels/network/wireless-security/eap-method.c:281
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../panels/network/wireless-security/eap-method.c:285
+msgid "Choose CA Certificate"
+msgstr "選擇 CA 證書"
+
+#: ../panels/network/wireless-security/eap-method.c:645
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr "DER, PEM, 或 PKCS#12 私密密碼匙(*.der, *.pem, *.p12)"
+
+#: ../panels/network/wireless-security/eap-method.c:648
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER 或 PEM 證書 (*.der, *.pem, *.crt, *.cer)"
+
 #: ../panels/network/wireless-security/eap-method-fast.c:261
 #: ../panels/network/wireless-security/eap-method-peap.c:280
 msgid "GTC"
@@ -3144,9 +3234,7 @@ msgstr "允許自動供應 PAC (_V)"
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
 #: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/jobs-dialog.ui.h:1
-#: ../panels/printers/options-dialog.ui.h:1
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
+#: ../panels/printers/authentication-dialog.ui.h:1
 msgid " "
 msgstr " "
 
@@ -3262,33 +3350,6 @@ msgstr "MSCHAP"
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "未選擇任何證書授權單位(CA)證書"
-
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr "不使用證書中心 (CA) 的證書會造成連線不安全、流氓 Wi-Fi 網絡。是否要選擇一個證書中心的證書?"
-
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "忽略"
-
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "選擇 CA 證書"
-
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, 或 PKCS#12 私密密碼匙(*.der, *.pem, *.p12)"
-
-#: ../panels/network/wireless-security/eap-method.c:648
-msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER 或 PEM 證書 (*.der, *.pem, *.crt, *.cer)"
-
 #: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
 msgid "Don't _warn me again"
 msgstr "不要再警告我(_W)"
@@ -3389,14 +3450,14 @@ msgid "Show Details in Lock Screen"
 msgstr "在鎖定畫面中顯示詳細資料"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1628 ../panels/power/cc-power-panel.c:1635
+#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
 #: ../panels/privacy/cc-privacy-panel.c:78
 #: ../panels/privacy/cc-privacy-panel.c:145
 msgid "On"
 msgstr "開啟"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1622 ../panels/power/cc-power-panel.c:1633
+#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
 #: ../panels/privacy/cc-privacy-panel.c:78
 #: ../panels/privacy/cc-privacy-panel.c:145
 msgid "Off"
@@ -3407,8 +3468,8 @@ msgid "Notifications"
 msgstr "通知"
 
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
-msgid "Manage notifications"
-msgstr "管理通知"
+msgid "Control which notifications are displayed and what they show"
+msgstr "控制要顯示哪種通知及要顯示什麼"
 
 #. Translators: those are keywords for the notifications control-center panel
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
@@ -3466,8 +3527,8 @@ msgid "Online Accounts"
 msgstr "網上帳號"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "Manage online accounts"
-msgstr "管理網上帳號"
+msgid "Connect to your online accounts and decide what to use them for"
+msgstr "連接到你的網上帳號並決定要用它們來做什麼"
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
@@ -3568,159 +3629,159 @@ msgstr "放電中"
 msgid "Estimated battery capacity: %s"
 msgstr "預估電池電力:%s"
 
-#: ../panels/power/cc-power-panel.c:400
+#: ../panels/power/cc-power-panel.c:404
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: ../panels/power/cc-power-panel.c:402
+#: ../panels/power/cc-power-panel.c:406
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:484
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:488
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:492
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:497
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "個人數碼助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:501
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:505
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:509
+#: ../panels/power/cc-power-panel.c:518
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:513
+#: ../panels/power/cc-power-panel.c:522
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:517 ../panels/power/cc-power-panel.c:725
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+#: ../panels/power/cc-power-panel.c:1938
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:533
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:538
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:548
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:552
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: ../panels/power/cc-power-panel.c:723
+#: ../panels/power/cc-power-panel.c:732
 msgid "Batteries"
 msgstr "電池"
 
-#: ../panels/power/cc-power-panel.c:1065
+#: ../panels/power/cc-power-panel.c:1074
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1392
+#: ../panels/power/cc-power-panel.c:1401
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1421
+#: ../panels/power/cc-power-panel.c:1430
 msgid "_Screen Brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1449
+#: ../panels/power/cc-power-panel.c:1458
 msgid "_Dim Screen when Inactive"
 msgstr "當不活動多久後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1472
-msgid "_Mark As Inactive After"
-msgstr "標記為不活動於(_M)"
+#: ../panels/power/cc-power-panel.c:1481
+msgid "_Blank Screen"
+msgstr "空白螢幕(_B)"
 
-#: ../panels/power/cc-power-panel.c:1507
+#: ../panels/power/cc-power-panel.c:1516
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1535
+#: ../panels/power/cc-power-panel.c:1544
 msgid "_Mobile Broadband"
 msgstr "流動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1573
+#: ../panels/power/cc-power-panel.c:1582
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1624
+#: ../panels/power/cc-power-panel.c:1633
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1626
+#: ../panels/power/cc-power-panel.c:1635
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:1753
+#: ../panels/power/cc-power-panel.c:1762
 msgid "Suspend & Power Off"
 msgstr "暫停與關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1784
+#: ../panels/power/cc-power-panel.c:1793
 msgid "_Automatic Suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:1806
+#: ../panels/power/cc-power-panel.c:1815
 msgid "When Battery Power is _Critical"
 msgstr "當電池的電量極低時(_C)"
 
-#: ../panels/power/cc-power-panel.c:1839
+#: ../panels/power/cc-power-panel.c:1848
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1981
+#: ../panels/power/cc-power-panel.c:1990
 msgid "Devices"
 msgstr "裝置"
 
@@ -3729,8 +3790,8 @@ msgid "Power"
 msgstr "電源"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Power management settings"
-msgstr "電源管理設定值"
+msgid "View your battery status and change power saving settings"
+msgstr "檢視你的電池狀態並改變電源節省設定值"
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
@@ -3746,46 +3807,95 @@ msgstr "休眠"
 msgid "Power off"
 msgstr "關閉電源"
 
-#: ../panels/power/power.ui.h:3 ../panels/privacy/privacy.ui.h:6
-msgid "5 minutes"
-msgstr "5 分鐘"
-
-#: ../panels/power/power.ui.h:4
-msgid "10 minutes"
-msgstr "10 分鐘"
-
+#: ../panels/power/power.ui.h:5
+msgid "45 minutes"
+msgstr "45 分鐘"
+
 #: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 小時"
 
-#: ../panels/power/power.ui.h:7 ../panels/privacy/privacy.ui.h:3
+#: ../panels/power/power.ui.h:7
+msgid "80 minutes"
+msgstr "80 分鐘"
+
+#: ../panels/power/power.ui.h:8
+msgid "90 minutes"
+msgstr "90 分鐘"
+
+#: ../panels/power/power.ui.h:9
+msgid "100 minutes"
+msgstr "100 分鐘"
+
+#: ../panels/power/power.ui.h:10
+msgid "2 hours"
+msgstr "2 小時"
+
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
 msgid "1 minute"
 msgstr "1 分鐘"
 
-#: ../panels/power/power.ui.h:8 ../panels/privacy/privacy.ui.h:4
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
 msgid "2 minutes"
 msgstr "2 分鐘"
 
-#: ../panels/power/power.ui.h:10
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 分鐘"
+
+#: ../panels/power/power.ui.h:14
+msgid "4 minutes"
+msgstr "4 分鐘"
+
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 分鐘"
+
+#: ../panels/power/power.ui.h:16
+msgid "8 minutes"
+msgstr "8 分鐘"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 分鐘"
+
+#: ../panels/power/power.ui.h:18
+msgid "12 minutes"
+msgstr "12 分鐘"
+
+#: ../panels/power/power.ui.h:20
 msgid "Automatic Suspend"
 msgstr "自動暫停"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:10
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../panels/power/power.ui.h:12
-msgid "When on _Battery Power"
-msgstr "使用電池時(_B)"
+#: ../panels/power/power.ui.h:22
+msgid "_Plugged In"
+msgstr "插入插頭(_P)"
 
-#: ../panels/power/power.ui.h:13
-msgid "When _Plugged In"
-msgstr "當插入電源線時(_P)"
+#: ../panels/power/power.ui.h:23
+msgid "On _Battery Power"
+msgstr "使用電池電源(_B)"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:24
 msgid "Delay"
 msgstr "延遲"
 
+#: ../panels/printers/authentication-dialog.ui.h:3
+msgid "Authenticate"
+msgstr "驗證"
+
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/sharing/sharing.ui.h:21
+msgid "Password"
+msgstr "密碼"
+
+#: ../panels/printers/authentication-dialog.ui.h:6
+msgid "Authentication Required"
+msgstr "要求驗證"
+
 #. Translators: The printer is low on toner
 #: ../panels/printers/cc-printers-panel.c:591
 msgid "Low on toner"
@@ -3934,40 +4044,40 @@ msgstr[0] "%u 使用中"
 msgid "Failed to add new printer."
 msgstr "無法加入新的打印機。"
 
-#: ../panels/printers/cc-printers-panel.c:1938
+#: ../panels/printers/cc-printers-panel.c:1940
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/cc-printers-panel.c:1947
+#: ../panels/printers/cc-printers-panel.c:1949
 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:2252
+#: ../panels/printers/cc-printers-panel.c:2254
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/cc-printers-panel.c:2321
+#: ../panels/printers/cc-printers-panel.c:2323
 msgid "Searching for preferred drivers…"
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: ../panels/printers/cc-printers-panel.c:2336
+#: ../panels/printers/cc-printers-panel.c:2338
 msgid "Select from database…"
 msgstr "從資料庫搜尋…"
 
-#: ../panels/printers/cc-printers-panel.c:2345
+#: ../panels/printers/cc-printers-panel.c:2347
 msgid "Provide PPD File…"
 msgstr "提供 PPD 檔案…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2496
-#: ../panels/printers/cc-printers-panel.c:2519
+#: ../panels/printers/cc-printers-panel.c:2498
+#: ../panels/printers/cc-printers-panel.c:2521
 msgid "Test page"
 msgstr "測試頁"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2923
+#: ../panels/printers/cc-printers-panel.c:2929
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
@@ -3977,62 +4087,62 @@ msgid "Printers"
 msgstr "打印機"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "改變打印機設定值"
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr "加入打印機、檢視打印機工作並決定你要如何列印"
 
 #. Translators: those are keywords for the printing control-center panel
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Printer;Queue;Print;Paper;Ink;Toner;打印機;佇列;列印;紙張;墨水;碳粉;"
 
+#. Translators: This dialog contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:2
-#: ../panels/printers/options-dialog.ui.h:4
+msgid "Active Jobs"
+msgstr "使用中的工作"
+
+#: ../panels/printers/jobs-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:2
 #: ../panels/user-accounts/data/history-dialog.ui.h:1
 msgid "Close"
 msgstr "關閉"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Active Jobs"
-msgstr "使用中的工作"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "繼續列印"
 
-#: ../panels/printers/jobs-dialog.ui.h:6
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Pause Printing"
 msgstr "暫停列印"
 
-#: ../panels/printers/jobs-dialog.ui.h:7
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Cancel Print Job"
 msgstr "取消打印工作"
 
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
 msgstr "加入新的打印機"
 
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-user-panel.c:467
+msgid "_Cancel"
+msgstr "取消(_C)"
+
 #: ../panels/printers/new-printer-dialog.ui.h:4
 msgid "Search for network printers or filter result"
 msgstr "搜尋網絡打印機或過濾器結果"
 
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/region/gnome-region-panel.ui.h:33
-msgid "Options"
-msgstr "選項"
-
-#: ../panels/printers/options-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:1
 msgid "Loading options…"
 msgstr "正在載入選項…"
 
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid "Select Printer Driver"
+msgstr "選擇打印機驅動程式"
+
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "載入驅動程式資料庫…"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:5
-msgid "Select Printer Driver"
-msgstr "選擇打印機驅動程式"
-
 #. Translators: this is an option of "Two Sided"
 #: ../panels/printers/pp-ipp-option-widget.c:65
 #: ../panels/printers/pp-ppd-option-widget.c:69
@@ -4128,13 +4238,13 @@ msgstr "工作狀態"
 msgid "Time"
 msgstr "時刻"
 
-#: ../panels/printers/pp-jobs-dialog.c:498
+#: ../panels/printers/pp-jobs-dialog.c:496
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s 使用中的工作"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1291
+#: ../panels/printers/pp-new-printer-dialog.c:1465
 msgid "No printers detected."
 msgstr "未偵測到打印機。"
 
@@ -4225,12 +4335,6 @@ msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "進階"
 
-#. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:936
-#, c-format
-msgid "%s Options"
-msgstr "%s 選項"
-
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:75
 #: ../panels/printers/pp-ppd-option-widget.c:77
@@ -4268,15 +4372,21 @@ msgid "No pre-filtering"
 msgstr "無前置過濾器"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:230
-msgid "Manufacturers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
+msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:242
-msgid "Drivers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
 msgstr "驅動程式"
 
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-samba.c:247
+#, c-format
+msgid "Enter your username and password to view printers available on %s."
+msgstr "輸入你的使用者名稱與密碼以檢視在 %s 可用的打印機。"
+
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
 msgstr "加入打印機"
@@ -4357,7 +4467,7 @@ msgstr "隱藏"
 msgid "Visible"
 msgstr "顯示"
 
-#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
@@ -4365,11 +4475,11 @@ msgstr "螢幕鎖定"
 msgid "Name & Visibility"
 msgstr "名稱與可見度"
 
-#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
 msgid "Usage & History"
 msgstr "使月與歷史紀錄"
 
-#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
 msgid "Purge Trash & Temporary Files"
 msgstr "清除回收筒與暫存檔案"
 
@@ -4378,8 +4488,8 @@ msgid "Privacy"
 msgstr "私隱"
 
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
-msgid "Privacy settings"
-msgstr "私隱設定值"
+msgid "Protect your personal information and control what others might see"
+msgstr "保護你的個人資料並控制其他人能看到什麼"
 
 #. Translators: those are keywords for the privacy control-center panel
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
@@ -4396,10 +4506,6 @@ msgstr "螢幕關閉"
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: ../panels/privacy/privacy.ui.h:5
-msgid "3 minutes"
-msgstr "3 分鐘"
-
 #: ../panels/privacy/privacy.ui.h:11
 msgid "Control how you appear on the screen and the network."
 msgstr "控制你在螢幕及網絡上如何顯示。"
@@ -4457,256 +4563,223 @@ msgid "30 days"
 msgstr "30 天"
 
 #: ../panels/privacy/privacy.ui.h:25
-msgid "Don't retain history"
-msgstr "不要保留歷史紀錄"
-
-#: ../panels/privacy/privacy.ui.h:26
 msgid "Forever"
 msgstr "永遠"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:27
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 msgstr "記住你的歷史紀錄會讓需要再次找到某樣東西時更簡單。這些項目永遠不會透過網絡分享出去。"
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Cl_ear Recent History"
 msgstr "清除最近使用紀錄(_E)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:29
 msgid "_Recently Used"
 msgstr "最近使用的(_R)"
 
-#: ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/privacy.ui.h:30
 msgid "Retain _History"
 msgstr "保留歷史紀錄(_H)"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/privacy.ui.h:32
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "螢幕鎖可以在你離開時保護你的私隱。"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:33
 msgid "Automatic Screen _Lock"
 msgstr "自動鎖定螢幕(_L)"
 
-#: ../panels/privacy/privacy.ui.h:35
-msgid "Lock Screen _After"
-msgstr "鎖定螢幕於(_A)"
+#: ../panels/privacy/privacy.ui.h:34
+msgid "Lock Screen _After Blank For"
+msgstr "讓螢幕空白於(_A)"
 
-#: ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/privacy.ui.h:35
 msgid "Show _Notifications"
 msgstr "顯示通知(_N)"
 
-#: ../panels/privacy/privacy.ui.h:38
+#: ../panels/privacy/privacy.ui.h:37
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../panels/privacy/privacy.ui.h:39
+#: ../panels/privacy/privacy.ui.h:38
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: ../panels/privacy/privacy.ui.h:39
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr "自動清除回收筒和暫存檔案可以保護你的電腦減少不必要的敏感資訊。"
 
-#: ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/privacy.ui.h:40
 msgid "Automatically Empty _Trash"
 msgstr "自動清空回收筒(_T)"
 
-#: ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/privacy.ui.h:41
 msgid "Automatically Purge Temporary _Files"
 msgstr "自動清除暫存檔案(_F)"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: ../panels/privacy/privacy.ui.h:42
 msgid "Purge _After"
 msgstr "清除於(_A)"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "地區和語言"
-
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Change your region and language settings"
-msgstr "改變你的地區和語言設定值"
-
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
-
-#: ../panels/region/gnome-region-panel-formats.c:144
+#: ../panels/region/cc-format-chooser.c:122
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/gnome-region-panel-formats.c:146
+#: ../panels/region/cc-format-chooser.c:124
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
-msgid "Select an input source"
-msgstr "選擇一個輸入來源"
+#: ../panels/region/cc-format-chooser.c:268
+msgid "No regions found"
+msgstr "找不到區域"
 
-#: ../panels/region/gnome-region-panel-lang.c:115
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Log out for changes to take effect"
-msgstr "登出以讓更改生效"
+#: ../panels/region/cc-input-chooser.c:179
+msgid "No input sources found"
+msgstr "找不到輸入來源"
 
-#: ../panels/region/gnome-region-panel-system.c:471
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings."
-msgstr "登入畫面、系統帳號和新使用者帳號使用系統的地區和語言設定值。"
+#: ../panels/region/cc-input-chooser.c:997
+#: ../panels/search/cc-search-locations-dialog.c:479
+msgid "Other"
+msgstr "其他"
 
-#: ../panels/region/gnome-region-panel-system.c:476
-#: ../panels/region/gnome-region-panel.ui.h:35
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings. You may change the system settings to match "
-"yours."
-msgstr "登入畫面、系統帳號和新使用者帳號使用系統的地區和語言設定值。你可以將系統設定值改變以符合你的需求。"
-
-#: ../panels/region/gnome-region-panel-system.c:479
-msgid "Copy Settings"
-msgstr "複製設定值"
-
-#: ../panels/region/gnome-region-panel-system.c:482
-#: ../panels/region/gnome-region-panel.ui.h:42
-msgid "Copy Settings…"
-msgstr "複製設定值…"
-
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
-msgstr "地區和語言"
+#: ../panels/region/cc-region-panel.c:225
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "你的作業階段需要重新啟動以讓更改生效"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Select a display language"
-msgstr "選擇顯示的語言"
+#: ../panels/region/cc-region-panel.c:226
+msgid "Restart Now"
+msgstr "立刻重新啟動"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Add Language"
-msgstr "加入語言"
+#: ../panels/region/cc-region-panel.c:436
+msgctxt "Language"
+msgid "None"
+msgstr "沒有"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Language"
-msgstr "語言"
+#: ../panels/region/cc-region-panel.c:898
+msgid "Sorry"
+msgstr "抱敟"
+
+#: ../panels/region/cc-region-panel.c:900
+msgid "Input methods can't be used on the login screen"
+msgstr "輸入法不能用在登入畫面"
+
+#: ../panels/region/cc-region-panel.c:1345
+msgctxt "Input source"
+msgid "None"
+msgstr "沒有"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
-msgid "Select a region (change will be applied the next time you log in)"
-msgstr "選擇地區 (更改會在你下次登入時套用)"
+#: ../panels/region/cc-region-panel.c:1502
+msgid "Login Screen"
+msgstr "登入畫面"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Add Region"
-msgstr "加入區域"
+#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+msgid "Formats"
+msgstr "格式"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
-msgid "Remove Region"
-msgstr "移除區域"
+#: ../panels/region/format-chooser.ui.h:3
+msgid "Preview"
+msgstr "預覽"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Dates"
 msgstr "日期"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Times"
 msgstr "時刻"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Numbers"
 msgstr "數字"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
-msgid "Currency"
-msgstr "貨幣"
-
-#: ../panels/region/gnome-region-panel.ui.h:15
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Measurement"
 msgstr "度量衡"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
-msgid "Examples"
-msgstr "範例"
+#: ../panels/region/format-chooser.ui.h:8
+msgid "Paper"
+msgstr "紙張"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
-msgid "Formats"
-msgstr "格式"
-
-#: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Select keyboards or other input sources"
-msgstr "選取鍵盤或其他輸入來源"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
+msgid "Region & Language"
+msgstr "地區和語言"
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Add Input Source"
-msgstr "加入輸入來源"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr "選擇你的顯示語言、格式、鍵盤配置和輸入來源"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Remove Input Source"
-msgstr "移除輸入來源"
+#. Translators: those are keywords for the region control-center panel
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Move Input Source Up"
-msgstr "將輸入來源往上移"
+#: ../panels/region/input-chooser.ui.h:1
+msgid "Add an Input Source"
+msgstr "加入輸入來源"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Move Input Source Down"
-msgstr "將輸入來源往下移"
+#: ../panels/region/input-options.ui.h:1
+msgid "Input Source Options"
+msgstr "輸入來源選項"
 
-#: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Input Source Settings"
-msgstr "輸入來源設定值"
+#: ../panels/region/input-options.ui.h:2
+msgid "Use the _same source for all windows"
+msgstr "在所有視窗中使用相同的來源(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "Show Keyboard Layout"
-msgstr "顯示鍵盤配置"
+#: ../panels/region/input-options.ui.h:3
+msgid "Allow _different sources for each window"
+msgstr "每個視窗使用不同的輸入來源(_D)"
 
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "Ctrl+Alt+Space"
-msgstr "Ctrl+Alt+Space"
+#: ../panels/region/input-options.ui.h:4
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤捷徑鍵"
 
-#: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Ctrl+Alt+Shift+Space"
-msgstr "Ctrl+Alt+Shift+Space"
+#: ../panels/region/input-options.ui.h:5
+msgid "Switch to previous source"
+msgstr "切換至上個來源"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid "Shortcut Settings"
-msgstr "快捷鍵設定值"
+#: ../panels/region/input-options.ui.h:6
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Space"
 
-#: ../panels/region/gnome-region-panel.ui.h:31
-msgid "Use the same source for all windows"
-msgstr "在所有視窗中使用相同的來源"
+#: ../panels/region/input-options.ui.h:7
+msgid "Switch to next source"
+msgstr "切換至下個來源"
 
-#: ../panels/region/gnome-region-panel.ui.h:32
-msgid "Allow different sources for each window"
-msgstr "每個視窗使用不同的輸入來源"
+#: ../panels/region/input-options.ui.h:8
+msgid "Super+Space"
+msgstr "Super+Space"
 
-#: ../panels/region/gnome-region-panel.ui.h:34
-msgid "Input Sources"
-msgstr "輸入來源"
+#: ../panels/region/input-options.ui.h:9
+msgid "You can change these shortcuts in the keyboard settings"
+msgstr "你可以在鍵盤設定值中改變這些捷徑鍵"
 
-#. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:37
-msgid "Display language:"
-msgstr "顯示語言:"
+#: ../panels/region/input-options.ui.h:10
+msgid "Alternative switch to next source"
+msgstr "切換至下個來源的替代鍵"
 
-#: ../panels/region/gnome-region-panel.ui.h:38
-msgid "Input source:"
-msgstr "輸入來源:"
+#: ../panels/region/region.ui.h:2
+msgid "English (United Kingdom)"
+msgstr "英文 (英國)"
 
-#: ../panels/region/gnome-region-panel.ui.h:39
-msgid "Format:"
-msgstr "格式:"
+#: ../panels/region/region.ui.h:4
+msgid "United Kingdom"
+msgstr "英國"
 
-#: ../panels/region/gnome-region-panel.ui.h:40
-msgid "Your settings"
-msgstr "你的設定值"
+#: ../panels/region/region.ui.h:6
+msgid "Options"
+msgstr "選項"
 
-#: ../panels/region/gnome-region-panel.ui.h:41
-msgid "System settings"
-msgstr "系統設定值"
+#: ../panels/region/region.ui.h:7
+msgid "Login settings are used by all users when logging into the system"
+msgstr "登入設定值是所有的使用者在登入系統時會用到的"
 
 #: ../panels/search/cc-search-locations-dialog.c:275
 msgid "Home"
@@ -4720,10 +4793,6 @@ msgstr "位置"
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../panels/search/cc-search-locations-dialog.c:479
-msgid "Other"
-msgstr "其他"
-
 #: ../panels/search/cc-search-locations-dialog.c:675
 msgid "Select Location"
 msgstr "選擇位置"
@@ -4732,19 +4801,14 @@ msgstr "選擇位置"
 msgid "No applications found"
 msgstr "找不到應用程式"
 
-#: ../panels/search/cc-search-panel.c:551
-#: ../panels/user-accounts/um-fingerprint-dialog.c:219
-#: ../panels/user-accounts/um-fingerprint-dialog.c:220
-msgid "Enabled"
-msgstr "已啟用"
-
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:1
 msgid "Search"
 msgstr "搜尋"
 
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:2
-msgid "Search settings"
-msgstr "搜尋設定值"
+msgid ""
+"Control which applications show search results in the Activities Overview"
+msgstr "控制在活動概覽中哪些應用程式會顯示在搜尋結果中"
 
 #. Translators: those are keywords for the search control-center panel
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:4
@@ -4767,21 +4831,21 @@ msgstr "往下移"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../panels/sharing/cc-sharing-panel.c:220
+#: ../panels/sharing/cc-sharing-panel.c:259
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/sharing/cc-sharing-panel.c:222
+#: ../panels/sharing/cc-sharing-panel.c:261
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/sharing/cc-sharing-panel.c:362
+#: ../panels/sharing/cc-sharing-panel.c:407
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: ../panels/sharing/cc-sharing-panel.c:540
+#: ../panels/sharing/cc-sharing-panel.c:585
 msgid "Copy"
 msgstr "複製"
 
@@ -4789,8 +4853,12 @@ msgstr "複製"
 msgid "Sharing"
 msgstr "分享"
 
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Control what you want to share with others"
+msgstr "控制你想要與其他人分享什麼"
+
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
 "pictures;photos;movies;server;renderer;"
@@ -4885,10 +4953,6 @@ msgstr "在這個網絡分享公開資料夾"
 msgid "Require Password"
 msgstr "需要密碼"
 
-#: ../panels/sharing/sharing.ui.h:21
-msgid "Password"
-msgstr "密碼"
-
 #: ../panels/sharing/sharing.ui.h:22
 msgid "Remote Login"
 msgstr "遠端登入"
@@ -4934,8 +4998,8 @@ msgid "Sound"
 msgstr "音效"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-msgid "Change sound volume and event sounds"
-msgstr "改變音效的音量和音效事件"
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "改變音效的音量、輸入、輸出和警示音效"
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
@@ -5039,7 +5103,7 @@ msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 輸入"
 
-#: ../panels/sound/gvc/gvc-mixer-control.c:2371
+#: ../panels/sound/gvc/gvc-mixer-control.c:2373
 msgid "System Sounds"
 msgstr "系統音效"
 
@@ -5051,65 +5115,65 @@ msgstr "測試喇叭(_T)"
 msgid "Peak detect"
 msgstr "峰值檢測"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1511
+#: ../panels/sound/gvc-mixer-dialog.c:1508
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "名稱"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1530
+#: ../panels/sound/gvc-mixer-dialog.c:1527
 msgid "Device"
 msgstr "裝置"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1593
+#: ../panels/sound/gvc-mixer-dialog.c:1590
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s 的喇叭測試"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1647
+#: ../panels/sound/gvc-mixer-dialog.c:1644
 msgid "_Output volume:"
 msgstr "輸出音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1661
+#: ../panels/sound/gvc-mixer-dialog.c:1658
 msgid "Output"
 msgstr "輸出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1666
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "C_hoose a device for sound output:"
 msgstr "選擇聲音輸出的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1691
+#: ../panels/sound/gvc-mixer-dialog.c:1688
 msgid "Settings for the selected device:"
 msgstr "已選取裝置的設定值:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1702
+#: ../panels/sound/gvc-mixer-dialog.c:1699
 msgid "Input"
 msgstr "輸入"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1709
+#: ../panels/sound/gvc-mixer-dialog.c:1706
 msgid "_Input volume:"
 msgstr "輸入音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1732
+#: ../panels/sound/gvc-mixer-dialog.c:1729
 msgid "Input level:"
 msgstr "輸入等級:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1760
+#: ../panels/sound/gvc-mixer-dialog.c:1757
 msgid "C_hoose a device for sound input:"
 msgstr "選擇聲音輸入的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1787
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "Sound Effects"
 msgstr "聲音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1794
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "_Alert volume:"
 msgstr "警示音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1807
+#: ../panels/sound/gvc-mixer-dialog.c:1804
 msgid "Applications"
 msgstr "程式集"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1811
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "No application is currently playing or recording audio."
 msgstr "沒有應用程式目前正在播放或錄製音效。"
 
@@ -5164,8 +5228,8 @@ msgid "No shortcut set"
 msgstr "沒有設定捷徑鍵"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Universal Access Preferences"
-msgstr "無障礙偏好設定"
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "讓電腦更容易看、聽、輸入、指向與點選"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
@@ -5256,10 +5320,6 @@ msgstr "高對比"
 msgid "Beep on Caps and Num Lock"
 msgstr "當 Caps 和 Num Lock 在使用時發出聲響"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Options…"
-msgstr "選項…"
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
@@ -5773,14 +5833,26 @@ msgid "Users"
 msgstr "使用者"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users"
-msgstr "加入或移除使用者"
+msgid "Add or remove users and change your password"
+msgstr "加入或移除使用者並改變你的密碼"
 
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;登入;姓名;指紋;大頭貼;標誌;臉;密碼;"
 
+#: ../panels/user-accounts/data/history-dialog.ui.h:2
+msgid "Previous Week"
+msgstr "前一週"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+msgid "Next Week"
+msgstr "下一週"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+msgid "Next week"
+msgstr "下一週"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
 msgstr "立刻設定密碼"
@@ -5802,52 +5874,38 @@ msgid "Enable this account"
 msgstr "啟用這個帳號"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "_Hint"
-msgstr "提示(_H)"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid ""
-"This hint may be displayed at the login screen.  It will be visible to all "
-"users of this system.  Do <b>not</b> include the password here."
-msgstr "這個提示可能會顯示在登入畫面。它將會顯示給這個系統上的所有使用者。請<b>不要</b>在這裏寫入密碼。"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
 msgstr "確認密碼(_O)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "_New password"
 msgstr "新密碼(_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Generate a password"
 msgstr "產生密碼"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Fair"
-msgstr "一般"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Current _password"
 msgstr "目前的密碼(_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
 msgid "_Action"
 msgstr "動作(_A)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Changing password for"
 msgstr "正在改變密碼:"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:15
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "_Show password"
 msgstr "顯示密碼(_S)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:16
+#: ../panels/user-accounts/data/password-dialog.ui.h:13
 msgid "How to choose a strong password"
 msgstr "如何選擇強度高的密碼"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
 msgid "Ch_ange"
 msgstr "改變(_A)"
 
@@ -5926,7 +5984,7 @@ msgid "Authentication is required to change user data"
 msgstr "改變使用者資料需要驗證"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:601
+#: ../panels/user-accounts/um-password-dialog.c:597
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "太短"
@@ -5937,25 +5995,25 @@ msgid "Not good enough"
 msgstr "不夠好"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:602
+#: ../panels/user-accounts/um-password-dialog.c:598
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "太弱"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:603
+#: ../panels/user-accounts/um-password-dialog.c:599
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "一般"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:604
+#: ../panels/user-accounts/um-password-dialog.c:600
 msgctxt "Password strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:605
+#: ../panels/user-accounts/um-password-dialog.c:601
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "強固"
@@ -5965,7 +6023,6 @@ msgid "Authentication failed"
 msgstr "驗證失敗"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:273
 #, c-format
 msgid "The new password is too short"
 msgstr "新的密碼太短"
@@ -6044,6 +6101,11 @@ msgstr "該裝置已經在使用中。"
 msgid "An internal error occurred."
 msgstr "發生內部的錯誤。"
 
+#: ../panels/user-accounts/um-fingerprint-dialog.c:219
+#: ../panels/user-accounts/um-fingerprint-dialog.c:220
+msgid "Enabled"
+msgstr "已啟用"
+
 #: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "Delete registered fingerprints?"
 msgstr "是否刪除已註冊的指紋?"
@@ -6115,47 +6177,51 @@ msgstr "本週"
 msgid "Last Week"
 msgstr "上週"
 
-#: ../panels/user-accounts/um-password-dialog.c:105
+#: ../panels/user-accounts/um-password-dialog.c:128
 msgid "_Generate a password"
 msgstr "產生密碼(_G)"
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:181
 msgid "Please choose another password."
 msgstr "請選擇其他密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:168
+#: ../panels/user-accounts/um-password-dialog.c:190
 msgid "Please type your current password again."
 msgstr "請再次輸入你目前的密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:174
+#: ../panels/user-accounts/um-password-dialog.c:196
 msgid "Password could not be changed"
 msgstr "密碼無法更改"
 
-#: ../panels/user-accounts/um-password-dialog.c:270
+#: ../panels/user-accounts/um-password-dialog.c:301
 msgid "You need to enter a new password"
 msgstr "你需要輸入新的密碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:279
+#: ../panels/user-accounts/um-password-dialog.c:304
+msgid "The new password is not strong enough"
+msgstr "新的密碼強度不夠"
+
+#: ../panels/user-accounts/um-password-dialog.c:310
 msgid "You need to confirm the password"
 msgstr "你需要確認密碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:282
+#: ../panels/user-accounts/um-password-dialog.c:313
 msgid "The passwords do not match"
 msgstr "密碼不相符"
 
-#: ../panels/user-accounts/um-password-dialog.c:288
+#: ../panels/user-accounts/um-password-dialog.c:319
 msgid "You need to enter your current password"
 msgstr "你需要輸入你目前的密碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:291
+#: ../panels/user-accounts/um-password-dialog.c:322
 msgid "The current password is not correct"
 msgstr "目前的密碼並不正確"
 
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
-#: ../panels/user-accounts/um-password-dialog.c:443
+#: ../panels/user-accounts/um-password-dialog.c:439
 msgid "Wrong password"
 msgstr "錯誤的密碼"
 
@@ -6256,15 +6322,15 @@ msgstr "沒有"
 msgid "Logged in"
 msgstr "已登入"
 
-#: ../panels/user-accounts/um-user-panel.c:941
+#: ../panels/user-accounts/um-user-panel.c:942
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: ../panels/user-accounts/um-user-panel.c:943
+#: ../panels/user-accounts/um-user-panel.c:944
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
-#: ../panels/user-accounts/um-user-panel.c:984
+#: ../panels/user-accounts/um-user-panel.c:985
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6272,12 +6338,12 @@ msgstr ""
 "要進行更改,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1022
+#: ../panels/user-accounts/um-user-panel.c:1023
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1033
-#: ../panels/user-accounts/um-user-panel.c:1319
+#: ../panels/user-accounts/um-user-panel.c:1034
+#: ../panels/user-accounts/um-user-panel.c:1320
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6285,12 +6351,12 @@ msgstr ""
 "要建立使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1042
+#: ../panels/user-accounts/um-user-panel.c:1043
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1054
-#: ../panels/user-accounts/um-user-panel.c:1324
+#: ../panels/user-accounts/um-user-panel.c:1055
+#: ../panels/user-accounts/um-user-panel.c:1325
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6298,11 +6364,11 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1228
+#: ../panels/user-accounts/um-user-panel.c:1229
 msgid "My Account"
 msgstr "我的帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1237
+#: ../panels/user-accounts/um-user-panel.c:1238
 msgid "Other Accounts"
 msgstr "其他帳號"
 
@@ -6422,8 +6488,8 @@ msgid "Wacom Tablet"
 msgstr "Wacom 繪圖板"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Set your Wacom tablet preferences"
-msgstr "設定你的 Wacom 繪圖板偏好設定"
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr "設定繪圖板的按鈕對映與調整觸控筆的靈敏度"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
@@ -6627,40 +6693,40 @@ msgstr "較低的按鈕"
 msgid "Tip Pressure Feel"
 msgstr "點選壓力感應"
 
-#: ../shell/control-center.c:66
+#: ../shell/cc-application.c:67
 msgid "Enable verbose mode"
 msgstr "啟用詳細模式"
 
-#: ../shell/control-center.c:67
+#: ../shell/cc-application.c:68
 msgid "Show the overview"
 msgstr "顯示概覽"
 
-#: ../shell/control-center.c:68
+#: ../shell/cc-application.c:69
 msgid "Search for the string"
 msgstr "搜尋字串"
 
-#: ../shell/control-center.c:69
+#: ../shell/cc-application.c:70
 msgid "List possible panel names and exit"
 msgstr "列出可能的面板名稱並結束"
 
-#: ../shell/control-center.c:70 ../shell/control-center.c:71
-#: ../shell/control-center.c:72
+#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
+#: ../shell/cc-application.c:73
 msgid "Show help options"
 msgstr "顯示說明的選項"
 
-#: ../shell/control-center.c:73
+#: ../shell/cc-application.c:74
 msgid "Panel to display"
 msgstr "要顯示的面板"
 
-#: ../shell/control-center.c:73
+#: ../shell/cc-application.c:74
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[面板] [引數…]"
 
-#: ../shell/control-center.c:95
+#: ../shell/cc-application.c:116
 msgid "- Settings"
 msgstr "- 設定值)"
 
-#: ../shell/control-center.c:103
+#: ../shell/cc-application.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -6669,49 +6735,231 @@ msgstr ""
 "%s\n"
 "執行 「%s --help」以查看完整的命令列可用選項清單。\n"
 
-#: ../shell/control-center.c:133
+#: ../shell/cc-application.c:154
 msgid "Available panels:"
 msgstr "可用的面板:"
 
-#: ../shell/control-center.c:244
+#: ../shell/cc-application.c:273
 msgid "Help"
 msgstr "求助"
 
-#: ../shell/control-center.c:245
+#: ../shell/cc-application.c:274
 msgid "Quit"
 msgstr "結束"
 
+#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "設定值"
+
 #. Add categories
-#: ../shell/gnome-control-center.c:887
+#: ../shell/cc-window.c:845
 msgctxt "category"
 msgid "Personal"
 msgstr "個人"
 
-#: ../shell/gnome-control-center.c:888
+#: ../shell/cc-window.c:846
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../shell/gnome-control-center.c:889
+#: ../shell/cc-window.c:847
 msgctxt "category"
 msgid "System"
 msgstr "系統"
 
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "控制中心"
-
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
-msgid "Settings"
-msgstr "設定值"
+#: ../shell/cc-window.c:1401
+msgid "All Settings"
+msgstr "所有設定值"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
 
-#: ../shell/shell.ui.h:2
-msgid "All Settings"
-msgstr "所有設定值"
+#~ msgid "Change the background"
+#~ msgstr "更改背景"
+
+#~ msgid "Configure Bluetooth settings"
+#~ msgstr "設定藍牙設定值"
+
+#~ msgctxt "Power"
+#~ msgid "Bluetooth"
+#~ msgstr "藍牙"
+
+#~ msgid "Color management settings"
+#~ msgstr "顏色管理設定值"
+
+#~ msgid "British English"
+#~ msgstr "英式英文"
+
+#~ msgid "Spanish"
+#~ msgstr "西班牙文"
+
+#~ msgid "Chinese (simplified)"
+#~ msgstr "簡體中文"
+
+#~ msgid "Select a region"
+#~ msgstr "選擇地區"
+
+#~ msgid "Select a language"
+#~ msgstr "選擇語言"
+
+#~ msgid "_Select"
+#~ msgstr "選取(_S)"
+
+#~ msgid "Date and Time preferences panel"
+#~ msgstr "日期和時刻偏好設定面板"
+
+#~ msgid "System Information"
+#~ msgstr "系統資訊"
+
+#~ msgid "Change keyboard settings"
+#~ msgstr "改變鍵盤設定值"
+
+#~ msgid "Layout Settings"
+#~ msgstr "配置設定值"
+
+#~ msgid "Set your mouse and touchpad preferences"
+#~ msgstr "設定您的滑鼠與觸控板偏好設定"
+
+#~ msgid "Network settings"
+#~ msgstr "網路設定值"
+
+#~ msgid "Carrier/link changed"
+#~ msgstr "載體/連結已變更"
+
+#~ msgid "Manage notifications"
+#~ msgstr "管理通知"
+
+#~ msgid "Manage online accounts"
+#~ msgstr "管理線上帳號"
+
+#~ msgid "_Mark As Inactive After"
+#~ msgstr "標記為不活動於(_M)"
+
+#~ msgid "Power management settings"
+#~ msgstr "電源管理設定值"
+
+#~ msgid "Change printer settings"
+#~ msgstr "改變印表機設定值"
+
+#~ msgid "%s Options"
+#~ msgstr "%s 選項"
+
+#~ msgid "Manufacturers"
+#~ msgstr "製造商"
+
+#~ msgid "Privacy settings"
+#~ msgstr "隱私設定值"
+
+#~ msgid "Don't retain history"
+#~ msgstr "不要保留歷史紀錄"
+
+#~ msgid "Change your region and language settings"
+#~ msgstr "改變您的地區和語言設定值"
+
+#~ msgid "Select an input source"
+#~ msgstr "選擇一個輸入來源"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings."
+#~ msgstr "登入畫面、系統帳號和新使用者帳號使用系統的地區和語言設定值。"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings. You may change the system settings to "
+#~ "match yours."
+#~ msgstr ""
+#~ "登入畫面、系統帳號和新使用者帳號使用系統的地區和語言設定值。您可以將系統設"
+#~ "定值改變以符合您的需求。"
+
+#~ msgid "Copy Settings"
+#~ msgstr "複製設定值"
+
+#~ msgid "Copy Settings…"
+#~ msgstr "複製設定值…"
+
+#~ msgid "Region and Language"
+#~ msgstr "地區和語言"
+
+#~ msgid "Select a display language"
+#~ msgstr "選擇顯示的語言"
+
+#~ msgid "Add Language"
+#~ msgstr "加入語言"
+
+#~ msgid "Select a region (change will be applied the next time you log in)"
+#~ msgstr "選擇地區 (變更會在您下次登入時套用)"
+
+#~ msgid "Add Region"
+#~ msgstr "加入區域"
+
+#~ msgid "Remove Region"
+#~ msgstr "移除區域"
+
+#~ msgid "Currency"
+#~ msgstr "貨幣"
+
+#~ msgid "Examples"
+#~ msgstr "範例"
+
+#~ msgid "Select keyboards or other input sources"
+#~ msgstr "選取鍵盤或其他輸入來源"
+
+#~ msgid "Remove Input Source"
+#~ msgstr "移除輸入來源"
+
+#~ msgid "Move Input Source Up"
+#~ msgstr "將輸入來源往上移"
+
+#~ msgid "Show Keyboard Layout"
+#~ msgstr "顯示鍵盤配置"
+
+#~ msgid "Ctrl+Alt+Space"
+#~ msgstr "Ctrl+Alt+Space"
+
+#~ msgid "Shortcut Settings"
+#~ msgstr "快捷鍵設定值"
+
+#~ msgid "Display language:"
+#~ msgstr "顯示語言:"
+
+#~ msgid "Input source:"
+#~ msgstr "輸入來源:"
+
+#~ msgid "Format:"
+#~ msgstr "格式:"
+
+#~ msgid "Your settings"
+#~ msgstr "您的設定值"
+
+#~ msgid "System settings"
+#~ msgstr "系統設定值"
+
+#~ msgid "Search settings"
+#~ msgstr "搜尋設定值"
+
+#~ msgid "Universal Access Preferences"
+#~ msgstr "無障礙偏好設定"
+
+#~ msgid "_Hint"
+#~ msgstr "提示(_H)"
+
+#~ msgid ""
+#~ "This hint may be displayed at the login screen.  It will be visible to "
+#~ "all users of this system.  Do <b>not</b> include the password here."
+#~ msgstr ""
+#~ "這個提示可能會顯示在登入畫面。它將會顯示給這個系統上的所有使用者。請<b>不"
+#~ "要</b>在這裡寫入密碼。"
+
+#~ msgid "Fair"
+#~ msgstr "一般"
+
+#~ msgid "Set your Wacom tablet preferences"
+#~ msgstr "設定您的 Wacom 繪圖板偏好設定"
+
+#~ msgid "Control Center"
+#~ msgstr "控制中心"
 
 #~ msgid "Out of range"
 #~ msgstr "超過範圍"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c6b5126..7f502fa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,15 +14,15 @@ msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-02 03:01+0000\n"
-"PO-Revision-Date: 2013-02-02 23:01+0800\n"
+"POT-Creation-Date: 2013-02-26 14:07+0000\n"
+"PO-Revision-Date: 2013-02-27 19:32+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #. This refers to a slideshow background
 #: ../panels/background/background.ui.h:2
@@ -111,86 +111,70 @@ msgid "Background"
 msgstr "背景"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Change the background"
-msgstr "更改背景"
+msgid "Change your background image to a wallpaper or photo"
+msgstr "將您的背景影像變更為桌布或相片"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-msgid "Bluetooth"
-msgstr "藍牙"
-
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "Configure Bluetooth settings"
-msgstr "設定藍牙設定值"
-
-#. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth 
radio's on the device.
-#: ../panels/bluetooth/bluetooth.ui.h:2
-msgctxt "Power"
-msgid "Bluetooth"
-msgstr "藍牙"
-
-#: ../panels/bluetooth/bluetooth.ui.h:3
+#: ../panels/bluetooth/bluetooth.ui.h:1
 msgid "Set Up New Device"
 msgstr "設置新裝置"
 
-#: ../panels/bluetooth/bluetooth.ui.h:4 ../panels/network/network.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
 msgid "Remove Device"
 msgstr "移除裝置"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:3
 msgid "Connection"
 msgstr "連線"
 
-#: ../panels/bluetooth/bluetooth.ui.h:6
+#: ../panels/bluetooth/bluetooth.ui.h:4
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
 #: ../panels/network/connection-editor/security-page.ui.h:2
 #: ../panels/printers/printers.ui.h:14
-#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "page 1"
 msgstr "頁 1"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7
+#: ../panels/bluetooth/bluetooth.ui.h:5
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
 #: ../panels/network/connection-editor/security-page.ui.h:5
 #: ../panels/printers/printers.ui.h:16
-#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "page 2"
 msgstr "頁 2"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/bluetooth/bluetooth.ui.h:6
 msgid "Paired"
 msgstr "已配對"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/wacom/cc-wacom-page.c:789
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
 msgid "Type"
 msgstr "類型"
 
-#: ../panels/bluetooth/bluetooth.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:180
-#: ../panels/network/connection-editor/ce-page-ip4.c:416
-#: ../panels/network/connection-editor/ce-page-ip6.c:182
-#: ../panels/network/connection-editor/ce-page-ip6.c:420
+#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/network/connection-editor/ce-page-ip4.c:189
+#: ../panels/network/connection-editor/ce-page-ip4.c:441
+#: ../panels/network/connection-editor/ce-page-ip6.c:191
+#: ../panels/network/connection-editor/ce-page-ip6.c:445
 msgid "Address"
 msgstr "地址"
 
-#: ../panels/bluetooth/bluetooth.ui.h:11
+#: ../panels/bluetooth/bluetooth.ui.h:9
 msgid "Mouse & Touchpad Settings"
 msgstr "滑鼠與觸控板設定值"
 
-#: ../panels/bluetooth/bluetooth.ui.h:12
+#: ../panels/bluetooth/bluetooth.ui.h:10
 #: ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "音效設定值"
 
-#: ../panels/bluetooth/bluetooth.ui.h:13
+#: ../panels/bluetooth/bluetooth.ui.h:11
 msgid "Keyboard Settings"
 msgstr "鍵盤設定值"
 
-#: ../panels/bluetooth/bluetooth.ui.h:14
+#: ../panels/bluetooth/bluetooth.ui.h:12
 msgid "Send Files…"
 msgstr "傳送檔案…"
 
@@ -235,6 +219,14 @@ msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr "如果您刪除此裝置,下次使用時必須再次設定它。"
 
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+msgid "Bluetooth"
+msgstr "藍牙"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Turn Bluetooth on and off and connect your devices"
+msgstr "開啟或關閉藍牙與連接您的裝置"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: ../panels/color/cc-color-calibrate.c:360
 msgid "Place your calibration device over the square and press 'Start'"
@@ -351,77 +343,87 @@ msgstr "%s 印表機"
 msgid "%s Webcam"
 msgstr "%s 網路攝影機"
 
+#: ../panels/color/cc-color-device.c:89
+#, c-format
+msgid "Enable color management for %s"
+msgstr "啟用 %s 的顏色管理"
+
+#: ../panels/color/cc-color-device.c:93
+#, c-format
+msgid "Show color profiles for %s"
+msgstr "顯示 %s 的顏色描述檔"
+
 #. not calibrated
-#: ../panels/color/cc-color-device.c:303
+#: ../panels/color/cc-color-device.c:322
 msgid "Not calibrated"
 msgstr "尚未校準"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:131
+#: ../panels/color/cc-color-panel.c:133
 msgid "Default: "
 msgstr "預設值:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:139
+#: ../panels/color/cc-color-panel.c:141
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:146
+#: ../panels/color/cc-color-panel.c:148
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:214
+#: ../panels/color/cc-color-panel.c:216
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: ../panels/color/cc-color-panel.c:217
+#: ../panels/color/cc-color-panel.c:219
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:228
+#: ../panels/color/cc-color-panel.c:230
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:235
+#: ../panels/color/cc-color-panel.c:237
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../panels/color/cc-color-panel.c:506
+#: ../panels/color/cc-color-panel.c:581
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:776
+#: ../panels/color/cc-color-panel.c:853
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1137
+#: ../panels/color/cc-color-panel.c:1214
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1152 ../panels/color/cc-color-panel.c:1176
+#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr "尚未偵測到測量儀器。請檢查它是否已開啟並正確的連接。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1186
+#: ../panels/color/cc-color-panel.c:1263
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援印表機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1197
+#: ../panels/color/cc-color-panel.c:1274
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
@@ -506,6 +508,7 @@ msgid "Display Calibration"
 msgstr "顯示校準"
 
 #: ../panels/color/color-calibrate.ui.h:2
+#: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 #: ../panels/user-accounts/data/photo-dialog.ui.h:8
 #: ../panels/user-accounts/um-account-dialog.c:1067
@@ -561,20 +564,20 @@ msgid "Calibration Quality"
 msgstr "校準品質"
 
 #: ../panels/color/color.ui.h:9
-msgid "Select the type of display that is connected."
-msgstr "選擇連接的顯示器類型。"
+msgid "Select the sensor device you want to use for calibration."
+msgstr "選擇您想要使用的校準偵測裝置。"
 
 #: ../panels/color/color.ui.h:10
-msgid "Display Type"
-msgstr "顯示類型"
+msgid "Calibration Device"
+msgstr "校準裝置"
 
 #: ../panels/color/color.ui.h:11
-msgid "Select the sensor device you want to use for calibration."
-msgstr "選擇您想要使用的校準偵測裝置。"
+msgid "Select the type of display that is connected."
+msgstr "選擇連接的顯示器類型。"
 
 #: ../panels/color/color.ui.h:12
-msgid "Calibration Device"
-msgstr "校準裝置"
+msgid "Display Type"
+msgstr "顯示類型"
 
 #: ../panels/color/color.ui.h:13
 msgid ""
@@ -738,56 +741,62 @@ msgid "Projector"
 msgstr "投影機"
 
 #: ../panels/color/color.ui.h:48
+#, fuzzy
+msgid "Plasma"
+msgstr "電漿"
+
+#: ../panels/color/color.ui.h:49
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:50
 msgid "40 minutes"
 msgstr "40 分鐘"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:51
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:51 ../panels/power/power.ui.h:5
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 分鐘"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:53
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "15 分鐘"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:55
 msgid "Native to display"
 msgstr "原生顯示"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:56
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (列印與出版)"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:57
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:58
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (攝影與繪圖)"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:59
 msgid "D75"
 msgstr "D75"
 
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Color management settings"
-msgstr "顏色管理設定值"
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr "校準您裝置的顏色,像是顯示器、攝影機或印表機"
 
 #. Translators: those are keywords for the color control-center panel
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:4
@@ -796,60 +805,141 @@ msgstr ""
 "Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;印表機;顯示"
 "器;"
 
-#: ../panels/common/cc-common-language.c:639
-msgid "British English"
-msgstr "英式英文"
-
-#: ../panels/common/cc-common-language.c:642
-msgid "Spanish"
-msgstr "西班牙文"
-
-#: ../panels/common/cc-common-language.c:643
-msgid "Chinese (simplified)"
-msgstr "簡體中文"
-
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:687
+#: ../panels/common/cc-common-language.c:677
 msgid "United States"
 msgstr "美國"
 
-#: ../panels/common/cc-common-language.c:688
+#: ../panels/common/cc-common-language.c:678
 msgid "Germany"
 msgstr "德國"
 
-#: ../panels/common/cc-common-language.c:689
+#: ../panels/common/cc-common-language.c:679
 msgid "France"
 msgstr "法國"
 
-#: ../panels/common/cc-common-language.c:690
+#: ../panels/common/cc-common-language.c:680
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../panels/common/cc-common-language.c:691
+#: ../panels/common/cc-common-language.c:681
 msgid "China"
 msgstr "中國"
 
-#: ../panels/common/cc-language-chooser.c:120
+#: ../panels/common/cc-common-language.c:747
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:292
-msgid "Select a region"
-msgstr "選擇地區"
+#: ../panels/common/cc-language-chooser.c:169
+#: ../panels/region/cc-format-chooser.c:259
+#: ../panels/region/cc-input-chooser.c:171
+msgid "More…"
+msgstr "更多…"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Select a language"
-msgstr "選擇語言"
+#: ../panels/common/cc-language-chooser.c:178
+msgid "No languages found"
+msgstr "找不到語言"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:1
-#: ../panels/user-accounts/um-user-panel.c:467
-msgid "_Cancel"
-msgstr "取消(_C)"
+#. translators:
+#. * The device has been disabled
+#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:408
+#: ../panels/keyboard/keyboard-shortcuts.c:1160
+#: ../panels/network/network-wifi.ui.h:30
+#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "已停用"
 
-#: ../panels/common/language-chooser.ui.h:3
-msgid "_Select"
-msgstr "選取(_S)"
+#: ../panels/common/cc-util.c:29
+msgid "Left Shift"
+msgstr "左 Shift"
+
+#: ../panels/common/cc-util.c:30
+msgid "Left Alt"
+msgstr "左 Alt"
+
+#: ../panels/common/cc-util.c:31
+msgid "Left Ctrl"
+msgstr "左 Ctrl"
+
+#: ../panels/common/cc-util.c:32
+msgid "Right Shift"
+msgstr "右 Shift"
+
+#: ../panels/common/cc-util.c:33
+msgid "Right Alt"
+msgstr "右 Alt"
+
+#: ../panels/common/cc-util.c:34
+msgid "Right Ctrl"
+msgstr "右 Ctrl"
+
+#: ../panels/common/cc-util.c:35
+msgid "Left Alt+Shift"
+msgstr "左 Alt+Shift"
+
+#: ../panels/common/cc-util.c:36
+msgid "Right Alt+Shift"
+msgstr "右 Alt+Shift"
+
+#: ../panels/common/cc-util.c:37
+msgid "Left Ctrl+Shift"
+msgstr "左 Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:38
+msgid "Right Ctrl+Shift"
+msgstr "右 Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:39
+msgid "Left+Right Shift"
+msgstr "左+右 Shift"
+
+#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "左+右 Alt"
+
+#: ../panels/common/cc-util.c:41
+msgid "Left+Right Ctrl"
+msgstr "左+右 Ctrl"
+
+#: ../panels/common/cc-util.c:42
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../panels/common/cc-util.c:43
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:44
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../panels/common/cc-util.c:45
+msgid "Caps"
+msgstr "Caps"
+
+#: ../panels/common/cc-util.c:46
+msgid "Shift+Caps"
+msgstr "Shift+Caps"
+
+#: ../panels/common/cc-util.c:47
+msgid "Alt+Caps"
+msgstr "Alt+Caps"
+
+#: ../panels/common/cc-util.c:48
+msgid "Ctrl+Caps"
+msgstr "Ctrl+Caps"
+
+#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+msgid "Language"
+msgstr "語言"
+
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "完成(_D)"
 
 #: ../panels/datetime/datetime.ui.h:1
 msgid "_Region:"
@@ -961,8 +1051,8 @@ msgid "Date & Time"
 msgstr "日期與時刻"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-msgid "Date and Time preferences panel"
-msgstr "日期和時刻偏好設定面板"
+msgid "Change the date and time, including time zone"
+msgstr "改變時刻與日期,包含時區"
 
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
@@ -1010,7 +1100,7 @@ msgstr "180 度"
 #. * the Spanish translation could be "Pantallas en Espejo".
 #.
 #: ../panels/display/cc-display-panel.c:625
-#: ../panels/display/cc-rr-labeler.c:449
+#: ../panels/display/cc-rr-labeler.c:418
 msgid "Mirrored Displays"
 msgstr "鏡射顯示器"
 
@@ -1081,8 +1171,8 @@ msgid "Displays"
 msgstr "顯示器"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Change resolution and position of monitors and projectors"
-msgstr "改變顯示器和投影機的解析度和位置"
+msgid "Choose how to use connected monitors and projectors"
+msgstr "選擇如何使用連接的顯示器和投影機"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
@@ -1092,53 +1182,53 @@ msgstr ""
 "整理;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:441 ../panels/network/panel-common.c:120
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "不明"
 
-#: ../panels/info/cc-info-panel.c:542
+#: ../panels/info/cc-info-panel.c:541
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d-位元"
 
-#: ../panels/info/cc-info-panel.c:544
+#: ../panels/info/cc-info-panel.c:543
 #, c-format
 msgid "%d-bit"
 msgstr "%d-位元"
 
-#: ../panels/info/cc-info-panel.c:1219
+#: ../panels/info/cc-info-panel.c:1218
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1223
+#: ../panels/info/cc-info-panel.c:1222
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1227
+#: ../panels/info/cc-info-panel.c:1226
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1318
+#: ../panels/info/cc-info-panel.c:1317
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1352
+#: ../panels/info/cc-info-panel.c:1351
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1353
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for software CDs"
 msgstr "選擇軟體 CD 要用的應用程式"
 
@@ -1147,112 +1237,111 @@ msgstr "選擇軟體 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1364
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1369
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1370
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1371
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Windows software"
 msgstr "Windows 軟體"
 
-#: ../panels/info/cc-info-panel.c:1377
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Software"
 msgstr "軟體"
 
-#: ../panels/info/cc-info-panel.c:1500
+#: ../panels/info/cc-info-panel.c:1499
 #: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1509 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1520 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1545
+#: ../panels/info/cc-info-panel.c:1544
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1595
+#: ../panels/info/cc-info-panel.c:1594
 msgid "Install Updates"
 msgstr "安裝更新"
 
-#: ../panels/info/cc-info-panel.c:1599
+#: ../panels/info/cc-info-panel.c:1598
 msgid "System Up-To-Date"
 msgstr "系統已是最新"
 
-#: ../panels/info/cc-info-panel.c:1603
+#: ../panels/info/cc-info-panel.c:1602
 msgid "Checking for Updates"
 msgstr "正在檢查更新"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#: ../panels/network/connection-editor/ce-page-details.c:238
+#: ../panels/network/connection-editor/ce-page-details.c:240
 #: ../panels/network/network-wifi.ui.h:58
 msgid "Details"
 msgstr "詳細資料"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "System Information"
-msgstr "系統資訊"
+msgid "View information about your system"
+msgstr "檢視您系統的資訊"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
 "device;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;裝置;"
-"系統;資訊;記憶體;處理器;版本;預設;應用程式;後備;首選;音訊;視訊;光碟;可移除;媒"
-"體;自動執行;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;裝置;系統;資訊;"
+"記憶體;處理器;版本;預設;應用程式;首選;音訊;視訊;光碟;可移除;媒體;自動執行;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1402,14 +1491,12 @@ msgid "Typing"
 msgstr "輸入"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#: ../panels/region/gnome-region-panel.ui.h:27
-msgid "Switch to next source"
-msgstr "切換至下個來源"
+msgid "Switch to next input source"
+msgstr "切換到下一個輸入來源"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#: ../panels/region/gnome-region-panel.ui.h:25
-msgid "Switch to previous source"
-msgstr "切換至上個來源"
+msgid "Switch to previous input source"
+msgstr "切換到上一個輸入來源"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
 msgid "Launchers"
@@ -1472,7 +1559,6 @@ msgid "Copy a screenshot of an area to clipboard"
 msgstr "將區域的螢幕截圖複製到剪貼簿"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:43
 msgid "System"
 msgstr "系統"
 
@@ -1521,108 +1607,15 @@ msgstr "將文字縮小"
 msgid "High contrast on or off"
 msgstr "高對比開或關"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:254
-#: ../panels/keyboard/cc-keyboard-option.c:304
-#: ../panels/keyboard/cc-keyboard-option.c:436
-#: ../panels/keyboard/keyboard-shortcuts.c:1160
-#: ../panels/network/network-wifi.ui.h:30
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "已停用"
-
-#: ../panels/keyboard/cc-keyboard-option.c:255
-msgid "Left Shift"
-msgstr "左 Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:256
-msgid "Left Alt"
-msgstr "左 Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:257
-msgid "Left Ctrl"
-msgstr "左 Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:258
-msgid "Right Shift"
-msgstr "右 Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:259
-msgid "Right Alt"
-msgstr "右 Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:260
-msgid "Right Ctrl"
-msgstr "右 Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:261
-msgid "Left Alt+Shift"
-msgstr "左 Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:262
-msgid "Right Alt+Shift"
-msgstr "右 Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:263
-msgid "Left Ctrl+Shift"
-msgstr "左 Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:264
-msgid "Right Ctrl+Shift"
-msgstr "右 Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:265
-msgid "Left+Right Shift"
-msgstr "左+右 Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:266
-msgid "Left+Right Alt"
-msgstr "左+右 Alt"
-
-#: ../panels/keyboard/cc-keyboard-option.c:267
-msgid "Left+Right Ctrl"
-msgstr "左+右 Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:268
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:269
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
-
-#: ../panels/keyboard/cc-keyboard-option.c:270
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
-
-#: ../panels/keyboard/cc-keyboard-option.c:271
-msgid "Caps"
-msgstr "Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:272
-msgid "Shift+Caps"
-msgstr "Shift+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:273
-msgid "Alt+Caps"
-msgstr "Alt+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:274
-msgid "Ctrl+Caps"
-msgstr "Ctrl+Caps"
-
-#: ../panels/keyboard/cc-keyboard-option.c:390
+#: ../panels/keyboard/cc-keyboard-option.c:362
 msgid "Alternative Characters Key"
 msgstr "替代的字元鍵"
 
-#: ../panels/keyboard/cc-keyboard-option.c:395
+#: ../panels/keyboard/cc-keyboard-option.c:367
 msgid "Compose Key"
 msgstr "組合鍵"
 
-#: ../panels/keyboard/cc-keyboard-option.c:399
+#: ../panels/keyboard/cc-keyboard-option.c:371
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
@@ -1632,8 +1625,8 @@ msgid "Keyboard"
 msgstr "鍵盤"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Change keyboard settings"
-msgstr "改變鍵盤設定值"
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "檢視與變更鍵盤捷徑鍵並設定您的輸入偏好設定"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
@@ -1709,8 +1702,9 @@ msgid "Cursor blink speed"
 msgstr "游標閃爍速度"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Layout Settings"
-msgstr "配置設定值"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "輸入來源"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
@@ -1729,7 +1723,6 @@ msgstr ""
 "要編輯捷徑鍵,點選相應的列並按下新的按鍵組合,或以 Backspace 鍵來清除。"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-#: ../panels/region/gnome-region-panel.ui.h:30
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
@@ -1780,8 +1773,9 @@ msgid "Mouse & Touchpad"
 msgstr "滑鼠和觸控板"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse and touchpad preferences"
-msgstr "設定您的滑鼠與觸控板偏好設定"
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr "改變您的滑鼠或控制板靈敏度並選擇慣用右手或左手"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
@@ -1893,21 +1887,21 @@ msgstr "單擊,次要按鈕"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:336
+#: ../panels/network/cc-network-panel.c:347
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:869
+#: ../panels/network/cc-network-panel.c:912
 msgid "Network proxy"
 msgstr "網路代理伺服器"
 
-#: ../panels/network/cc-network-panel.c:1048 ../panels/network/net-vpn.c:280
+#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:280
 #, 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:1181
+#: ../panels/network/cc-network-panel.c:1225
 msgid "The system network services are not compatible with this version."
 msgstr "系統網路服務與這個版本不相容。"
 
@@ -1935,6 +1929,10 @@ msgstr "內部驗證(_A)"
 msgid "Security"
 msgstr "安全性"
 
+#: ../panels/network/connection-editor/ce-page.c:502
+msgid "automatic"
+msgstr "自動"
+
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
 #: ../panels/network/net-device-wifi.c:224
@@ -1970,7 +1968,7 @@ msgid "None"
 msgstr "沒有"
 
 #: ../panels/network/connection-editor/ce-page-details.c:91
-#: ../panels/power/power.ui.h:9
+#: ../panels/power/power.ui.h:19
 msgid "Never"
 msgstr "永不"
 
@@ -1995,38 +1993,37 @@ msgstr[0] "%i 天以前"
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
 #: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-mobile.c:278
-#: ../panels/network/net-device-wifi.c:538
+#: ../panels/network/net-device-wifi.c:537
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:568
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:570
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:572
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:189
+#: ../panels/network/net-device-wifi.c:574
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
@@ -2038,58 +2035,78 @@ msgstr "很好"
 msgid "Identity"
 msgstr "身分"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:183
-#: ../panels/network/connection-editor/ce-page-ip4.c:419
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:454
 msgid "Netmask"
 msgstr "網路遮罩"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:186
-#: ../panels/network/connection-editor/ce-page-ip4.c:422
-#: ../panels/network/connection-editor/ce-page-ip6.c:188
-#: ../panels/network/connection-editor/ce-page-ip6.c:426
+#: ../panels/network/connection-editor/ce-page-ip4.c:216
+#: ../panels/network/connection-editor/ce-page-ip4.c:467
+#: ../panels/network/connection-editor/ce-page-ip6.c:217
+#: ../panels/network/connection-editor/ce-page-ip6.c:475
 #: ../panels/network/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:330
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
+#: ../panels/network/connection-editor/ce-page-ip4.c:233
+#: ../panels/network/connection-editor/ce-page-ip6.c:234
+msgid "Delete Address"
+msgstr "刪除位址"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:285
+#: ../panels/network/connection-editor/ce-page-ip6.c:286
+msgid "Add"
+msgstr "加入"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:350
+#: ../panels/network/connection-editor/ce-page-ip6.c:354
 msgid "Server"
 msgstr "伺服器"
 
-#. Translators: Please see http://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:426
-#: ../panels/network/connection-editor/ce-page-ip6.c:430
+#: ../panels/network/connection-editor/ce-page-ip4.c:367
+#: ../panels/network/connection-editor/ce-page-ip6.c:371
+msgid "Delete DNS Server"
+msgstr "刪除 DNS 伺服器"
+
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ce-page-ip4.c:481
+#: ../panels/network/connection-editor/ce-page-ip6.c:489
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:579
+#: ../panels/network/connection-editor/ce-page-ip4.c:502
+#: ../panels/network/connection-editor/ce-page-ip6.c:510
+msgid "Delete Route"
+msgstr "刪除路由"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:616
 #: ../panels/network/network-wifi.ui.h:26
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:583
-#: ../panels/network/connection-editor/ce-page-ip6.c:585
+#: ../panels/network/connection-editor/ce-page-ip4.c:620
+#: ../panels/network/connection-editor/ce-page-ip6.c:622
 #: ../panels/network/network-wifi.ui.h:25
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:587
-#: ../panels/network/connection-editor/ce-page-ip6.c:589
+#: ../panels/network/connection-editor/ce-page-ip4.c:624
+#: ../panels/network/connection-editor/ce-page-ip6.c:626
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:888
+#: ../panels/network/connection-editor/ce-page-ip4.c:925
 #: ../panels/network/network-wifi.ui.h:60
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:185
-#: ../panels/network/connection-editor/ce-page-ip6.c:423
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:458
 msgid "Prefix"
 msgstr "前綴"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:577
+#: ../panels/network/connection-editor/ce-page-ip6.c:614
 #: ../panels/network/connection-editor/ethernet-page.ui.h:1
 #: ../panels/network/connection-editor/ip4-page.ui.h:4
 #: ../panels/network/connection-editor/ip6-page.ui.h:4
@@ -2097,11 +2114,11 @@ msgstr "前綴"
 msgid "Automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:581
+#: ../panels/network/connection-editor/ce-page-ip6.c:618
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:849
+#: ../panels/network/connection-editor/ce-page-ip6.c:886
 #: ../panels/network/network-wifi.ui.h:61
 msgid "IPv6"
 msgstr "IPv6"
@@ -2141,10 +2158,6 @@ msgstr "WPA & WPA2 個人版"
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: ../panels/network/connection-editor/ce-page.c:502
-msgid "automatic"
-msgstr "自動"
-
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "套用(_A)"
@@ -2162,7 +2175,7 @@ msgstr "連線速度"
 #: ../panels/network/connection-editor/details-page.ui.h:4
 #: ../panels/network/net-device-ethernet.c:159
 #: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:643
+#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
@@ -2171,7 +2184,7 @@ msgstr "IPv4 位址"
 #: ../panels/network/net-device-ethernet.c:164
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:644
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
 msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
@@ -2282,12 +2295,22 @@ msgstr "位址(_A)"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:5
 #: ../panels/network/connection-editor/ip6-page.ui.h:5
+msgid "Automatic DNS"
+msgstr "自動 DNS"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
 #: ../panels/network/network-wifi.ui.h:39
 msgid "Routes"
 msgstr "路由"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Automatic Routes"
+msgstr "自動路由"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
 #: ../panels/network/network-wifi.ui.h:45
 msgid "Use this connection _only for resources on its network"
 msgstr "只在使用這個連線的網路資源時才使用此連線(_U)"
@@ -2305,38 +2328,38 @@ msgstr "無法開啟連線編輯器"
 msgid "New Profile"
 msgstr "新增設定組合"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:502
-#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/user-accounts/um-account-dialog.c:1068
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:586
 #: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:584
+#: ../panels/network/connection-editor/net-connection-editor.c:587
 msgid "Bond"
 msgstr "繫結"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:585
+#: ../panels/network/connection-editor/net-connection-editor.c:588
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:586
+#: ../panels/network/connection-editor/net-connection-editor.c:589
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:736
+#: ../panels/network/connection-editor/net-connection-editor.c:739
 msgid "Could not load VPN plugins"
 msgstr "無法載入 VPN 外掛程式"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:800
+#: ../panels/network/connection-editor/net-connection-editor.c:803
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:867
+#: ../panels/network/connection-editor/net-connection-editor.c:870
 msgid "Add Network Connection"
 msgstr "加入網路連線"
 
@@ -2346,7 +2369,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1402
+#: ../panels/network/net-device-wifi.c:1411
 #: ../panels/network/network-wifi.ui.h:54
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2450,8 +2473,8 @@ msgid "Network"
 msgstr "網路"
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "網路設定值"
+msgid "Control how you connect to the Internet"
+msgstr "控制您如何連線至網際網絡"
 
 #. Translators: those are keywords for the network control-center panel
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
@@ -2487,7 +2510,7 @@ msgstr "昨日"
 
 #: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:646 ../panels/network/panel-common.c:648
+#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 位址"
@@ -2497,16 +2520,23 @@ msgstr "IP 位址"
 msgid "Last used"
 msgstr "最後使用的"
 
-#: ../panels/network/net-device-ethernet.c:477
+#: ../panels/network/net-device-ethernet.c:337
+#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/network-ethernet.ui.h:2
+#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+msgid "Options…"
+msgstr "選項…"
+
+#: ../panels/network/net-device-ethernet.c:472
 #, c-format
 msgid "Profile %d"
 msgstr "設定組合 %d"
 
-#: ../panels/network/net-device-mobile.c:220
+#: ../panels/network/net-device-mobile.c:241
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: ../panels/network/net-device-wifi.c:1123
+#: ../panels/network/net-device-wifi.c:1120
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
@@ -2514,38 +2544,46 @@ msgstr ""
 "如果您有無線網路以外的方式連線到網際網路,您可以使用它來與其他人分享您的網際"
 "網路連線。"
 
-#: ../panels/network/net-device-wifi.c:1127
+#: ../panels/network/net-device-wifi.c:1124
 #, 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:1131
+#: ../panels/network/net-device-wifi.c:1128
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。"
 
-#: ../panels/network/net-device-wifi.c:1205
+#: ../panels/network/net-device-wifi.c:1202
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1208
+#: ../panels/network/net-device-wifi.c:1205
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1398
+#: ../panels/network/net-device-wifi.c:1277
+msgid "System policy prohibits use as a Hotspot"
+msgstr "系統原則禁止做為熱點"
+
+#: ../panels/network/net-device-wifi.c:1280
+msgid "Wireless device does not support Hotspot mode"
+msgstr "無線裝置不支援熱點模式"
+
+#: ../panels/network/net-device-wifi.c:1407
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網路的詳細資料包含密碼及任何自訂的組態都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1703
+#: ../panels/network/net-device-wifi.c:1714
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
 msgid "History"
 msgstr "歷史紀錄"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1715
+#: ../panels/network/net-device-wifi.c:1726
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2564,7 +2602,7 @@ msgstr "當沒有提供組態 URL 時會使用網頁代理伺服器自動發現
 msgid "This is not recommended for untrusted public networks."
 msgstr "這不建議用於不信任的公用網路。"
 
-#: ../panels/network/net-proxy.c:406
+#: ../panels/network/net-proxy.c:408
 msgid "Proxy"
 msgstr "代理伺服器"
 
@@ -2581,7 +2619,7 @@ msgid "Provider"
 msgstr "供應商"
 
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:6
+#: ../panels/network/network-simple.ui.h:7
 msgid "_Options…"
 msgstr "選項(_O)…"
 
@@ -2628,6 +2666,26 @@ msgstr "Socks 主機(_S)"
 msgid "_Ignore Hosts"
 msgstr "忽略主機(_I)"
 
+#: ../panels/network/network-proxy.ui.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP 代理伺服器連接埠"
+
+#: ../panels/network/network-proxy.ui.h:12
+msgid "HTTPS proxy port"
+msgstr "HTTPS 代理伺服器連接埠"
+
+#: ../panels/network/network-proxy.ui.h:13
+msgid "FTP proxy port"
+msgstr "FTP 代理伺服器連接埠"
+
+#: ../panels/network/network-proxy.ui.h:14
+msgid "Socks proxy port"
+msgstr "Socks 代理伺服器通訊埠"
+
+#: ../panels/network/network-simple.ui.h:6
+msgid "Turn device off"
+msgstr "關閉裝置"
+
 #: ../panels/network/network.ui.h:1
 msgid "Select the interface to use for the new service"
 msgstr "選擇要用於新服務的介面"
@@ -2657,9 +2715,14 @@ msgid "Group Password"
 msgstr "群組密碼"
 
 #: ../panels/network/network-vpn.ui.h:6
+#: ../panels/printers/authentication-dialog.ui.h:4
 msgid "Username"
 msgstr "使用者名稱"
 
+#: ../panels/network/network-vpn.ui.h:7
+msgid "Turn VPN connection off"
+msgstr "關閉 VPN 連線"
+
 #: ../panels/network/network-wifi.ui.h:1
 msgid "Automatic _Connect"
 msgstr "自動連線(_C)"
@@ -2804,328 +2867,356 @@ msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: ../panels/network/network-wifi.ui.h:67
+msgid "Turn Wi-Fi off"
+msgstr "關閉 Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:68
 msgid "_Use as Hotspot…"
 msgstr "做為熱點(_U)…"
 
-#: ../panels/network/network-wifi.ui.h:68
+#: ../panels/network/network-wifi.ui.h:69
 msgid "_Connect to Hidden Network…"
 msgstr "連接到隱藏的網路(_C)…"
 
-#: ../panels/network/network-wifi.ui.h:69
+#: ../panels/network/network-wifi.ui.h:70
 msgid "_History"
 msgstr "歷史紀錄(_H)"
 
-#: ../panels/network/network-wifi.ui.h:70
+#: ../panels/network/network-wifi.ui.h:71
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "關閉連線到 Wi-Fi 網路"
 
-#: ../panels/network/network-wifi.ui.h:71
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "網路名稱"
 
-#: ../panels/network/network-wifi.ui.h:72
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "已連線的裝置"
 
-#: ../panels/network/network-wifi.ui.h:73
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "安全性類型"
 
-#: ../panels/network/network-wifi.ui.h:74
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "安全金鑰"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:124
+#: ../panels/network/panel-common.c:131
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:128
+#: ../panels/network/panel-common.c:135
 msgid "Infrastructure"
 msgstr "基礎架構"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:152 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
 msgid "Status unknown"
 msgstr "狀態不明"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:156
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "未管理"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:161
-msgid "Firmware missing"
-msgstr "缺少韌體"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:165
-msgid "Cable unplugged"
-msgstr "纜線已拔除"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:168
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "無法使用"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:179 ../panels/network/panel-common.c:221
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Connecting"
 msgstr "連線中"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:183 ../panels/network/panel-common.c:225
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Authentication required"
 msgstr "需要驗證"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:187 ../panels/network/panel-common.c:229
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connected"
 msgstr "已連線"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:191
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "斷線"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:195 ../panels/network/panel-common.c:233
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
 msgid "Connection failed"
 msgstr "連線失敗"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:199 ../panels/network/panel-common.c:241
+#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
 msgid "Status unknown (missing)"
 msgstr "狀態不詳(缺乏)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:237
+#: ../panels/network/panel-common.c:227
 msgid "Not connected"
 msgstr "未連線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:261
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "設定失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:265
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "IP 組態失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:269
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "IP 組態過期"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:273
+#: ../panels/network/panel-common.c:264
 msgid "Secrets were required, but not provided"
 msgstr "需要機密,但沒有提供"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:277
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x 請求已斷線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:281
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x 請求組態失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:285
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr "802.1x 請求已失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:289
+#: ../panels/network/panel-common.c:280
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x 請求花了太長時間驗證"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:293
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "無法啟動 PPP 服務"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:297
+#: ../panels/network/panel-common.c:288
 msgid "PPP service disconnected"
 msgstr "PPP 服務已斷線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:301
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "PPP 失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:305
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client failed to start"
 msgstr "DHCP 客戶端啟動失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:309
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "DHCP 客戶端錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:313
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "DHCP 客戶端失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:317
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed to start"
 msgstr "分享的連線服務啟動失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:321
+#: ../panels/network/panel-common.c:312
 msgid "Shared connection service failed"
 msgstr "分享的連線服務失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:325
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service failed to start"
 msgstr "無法啟動 AutoIP 服務"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:329
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "AutoIP 服務錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:333
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "AutoIP 服務失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:337
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "線路忙碌"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:341
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "沒有撥號音"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:345
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr "無法建立載體"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:349
+#: ../panels/network/panel-common.c:340
 msgid "Dialing request timed out"
 msgstr "撥號要求逾時"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:353
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "嘗試撥號失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:357
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "數據機初始化失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:361
+#: ../panels/network/panel-common.c:352
 msgid "Failed to select the specified APN"
 msgstr "無法選擇指定的 APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:365
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "不要搜尋網路"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:369
+#: ../panels/network/panel-common.c:360
 msgid "Network registration denied"
 msgstr "網路登記被禁止"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:373
+#: ../panels/network/panel-common.c:364
 msgid "Network registration timed out"
 msgstr "網路登記逾時"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:377
+#: ../panels/network/panel-common.c:368
 msgid "Failed to register with the requested network"
 msgstr "無法向要求的網路登記"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:381
+#: ../panels/network/panel-common.c:372
 msgid "PIN check failed"
 msgstr "PIN 檢查失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:385
+#: ../panels/network/panel-common.c:376
 msgid "Firmware for the device may be missing"
 msgstr "可能缺少裝置的韌體"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:389
+#: ../panels/network/panel-common.c:380
 msgid "Connection disappeared"
 msgstr "連線已消失"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:393
-msgid "Carrier/link changed"
-msgstr "載體/連結已變更"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:397
+#: ../panels/network/panel-common.c:384
 msgid "Existing connection was assumed"
 msgstr "優先使用現有的連線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:401
+#: ../panels/network/panel-common.c:388
 msgid "Modem not found"
 msgstr "找不到數據機"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:405
+#: ../panels/network/panel-common.c:392
 msgid "Bluetooth connection failed"
 msgstr "藍牙連線失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:409
+#: ../panels/network/panel-common.c:396
 msgid "SIM Card not inserted"
 msgstr "SIM 卡尚未插入"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:413
+#: ../panels/network/panel-common.c:400
 msgid "SIM Pin required"
 msgstr "需要 SIM PIN 碼"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:417
+#: ../panels/network/panel-common.c:404
 msgid "SIM Puk required"
 msgstr "需要 SIM PUK 碼"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:421
+#: ../panels/network/panel-common.c:408
 msgid "SIM wrong"
 msgstr "SIM 錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:425
+#: ../panels/network/panel-common.c:412
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand 裝置不支援已連接模式"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:429
+#: ../panels/network/panel-common.c:416
 msgid "Connection dependency failed"
 msgstr "連線相依性解析失敗"
 
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "缺少韌體"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+msgid "Cable unplugged"
+msgstr "纜線已拔除"
+
+#: ../panels/network/wireless-security/eap-method.c:275
+msgid "No Certificate Authority certificate chosen"
+msgstr "未選擇任何憑證授權單位(CA)憑證"
+
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid ""
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
+msgstr ""
+"不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路。是否要選擇一個憑"
+"證中心的憑證?"
+
+#: ../panels/network/wireless-security/eap-method.c:281
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../panels/network/wireless-security/eap-method.c:285
+msgid "Choose CA Certificate"
+msgstr "選擇 CA 憑證"
+
+#: ../panels/network/wireless-security/eap-method.c:645
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr "DER, PEM, 或 PKCS#12 私密金鑰(*.der, *.pem, *.p12)"
+
+#: ../panels/network/wireless-security/eap-method.c:648
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
+
 #: ../panels/network/wireless-security/eap-method-fast.c:261
 #: ../panels/network/wireless-security/eap-method-peap.c:280
 msgid "GTC"
@@ -3164,9 +3255,7 @@ msgstr "允許自動供應 PAC (_V)"
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
 #: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/jobs-dialog.ui.h:1
-#: ../panels/printers/options-dialog.ui.h:1
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
+#: ../panels/printers/authentication-dialog.ui.h:1
 msgid " "
 msgstr " "
 
@@ -3283,35 +3372,6 @@ msgstr "MSCHAP"
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "未選擇任何憑證授權單位(CA)憑證"
-
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路。是否要選擇一個憑"
-"證中心的憑證?"
-
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "忽略"
-
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "選擇 CA 憑證"
-
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, 或 PKCS#12 私密金鑰(*.der, *.pem, *.p12)"
-
-#: ../panels/network/wireless-security/eap-method.c:648
-msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
-
 #: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
 msgid "Don't _warn me again"
 msgstr "不要再警告我(_W)"
@@ -3412,14 +3472,14 @@ msgid "Show Details in Lock Screen"
 msgstr "在鎖定畫面中顯示詳細資料"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1628 ../panels/power/cc-power-panel.c:1635
+#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
 #: ../panels/privacy/cc-privacy-panel.c:78
 #: ../panels/privacy/cc-privacy-panel.c:145
 msgid "On"
 msgstr "開啟"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1622 ../panels/power/cc-power-panel.c:1633
+#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
 #: ../panels/privacy/cc-privacy-panel.c:78
 #: ../panels/privacy/cc-privacy-panel.c:145
 msgid "Off"
@@ -3430,8 +3490,8 @@ msgid "Notifications"
 msgstr "通知"
 
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
-msgid "Manage notifications"
-msgstr "管理通知"
+msgid "Control which notifications are displayed and what they show"
+msgstr "控制要顯示哪種通知及要顯示什麼"
 
 #. Translators: those are keywords for the notifications control-center panel
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
@@ -3489,8 +3549,8 @@ msgid "Online Accounts"
 msgstr "線上帳號"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "Manage online accounts"
-msgstr "管理線上帳號"
+msgid "Connect to your online accounts and decide what to use them for"
+msgstr "連接到您的線上帳號並決定要用它們來做什麼"
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
@@ -3595,159 +3655,159 @@ msgstr "放電中"
 msgid "Estimated battery capacity: %s"
 msgstr "預估電池電力:%s"
 
-#: ../panels/power/cc-power-panel.c:400
+#: ../panels/power/cc-power-panel.c:404
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: ../panels/power/cc-power-panel.c:402
+#: ../panels/power/cc-power-panel.c:406
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:484
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:488
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:492
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:497
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "個人數位助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:501
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:505
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:509
+#: ../panels/power/cc-power-panel.c:518
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:513
+#: ../panels/power/cc-power-panel.c:522
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:517 ../panels/power/cc-power-panel.c:725
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+#: ../panels/power/cc-power-panel.c:1938
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:533
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:538
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:548
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:552
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: ../panels/power/cc-power-panel.c:723
+#: ../panels/power/cc-power-panel.c:732
 msgid "Batteries"
 msgstr "電池"
 
-#: ../panels/power/cc-power-panel.c:1065
+#: ../panels/power/cc-power-panel.c:1074
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1392
+#: ../panels/power/cc-power-panel.c:1401
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1421
+#: ../panels/power/cc-power-panel.c:1430
 msgid "_Screen Brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1449
+#: ../panels/power/cc-power-panel.c:1458
 msgid "_Dim Screen when Inactive"
 msgstr "當不活動多久後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1472
-msgid "_Mark As Inactive After"
-msgstr "標記為不活動於(_M)"
+#: ../panels/power/cc-power-panel.c:1481
+msgid "_Blank Screen"
+msgstr "空白螢幕(_B)"
 
-#: ../panels/power/cc-power-panel.c:1507
+#: ../panels/power/cc-power-panel.c:1516
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1535
+#: ../panels/power/cc-power-panel.c:1544
 msgid "_Mobile Broadband"
 msgstr "行動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1573
+#: ../panels/power/cc-power-panel.c:1582
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1624
+#: ../panels/power/cc-power-panel.c:1633
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1626
+#: ../panels/power/cc-power-panel.c:1635
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:1753
+#: ../panels/power/cc-power-panel.c:1762
 msgid "Suspend & Power Off"
 msgstr "暫停與關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1784
+#: ../panels/power/cc-power-panel.c:1793
 msgid "_Automatic Suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:1806
+#: ../panels/power/cc-power-panel.c:1815
 msgid "When Battery Power is _Critical"
 msgstr "當電池的電量極低時(_C)"
 
-#: ../panels/power/cc-power-panel.c:1839
+#: ../panels/power/cc-power-panel.c:1848
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1981
+#: ../panels/power/cc-power-panel.c:1990
 msgid "Devices"
 msgstr "裝置"
 
@@ -3756,8 +3816,8 @@ msgid "Power"
 msgstr "電源"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Power management settings"
-msgstr "電源管理設定值"
+msgid "View your battery status and change power saving settings"
+msgstr "檢視您的電池狀態並改變電源節省設定值"
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
@@ -3775,46 +3835,95 @@ msgstr "休眠"
 msgid "Power off"
 msgstr "關閉電源"
 
-#: ../panels/power/power.ui.h:3 ../panels/privacy/privacy.ui.h:6
-msgid "5 minutes"
-msgstr "5 分鐘"
-
-#: ../panels/power/power.ui.h:4
-msgid "10 minutes"
-msgstr "10 分鐘"
+#: ../panels/power/power.ui.h:5
+msgid "45 minutes"
+msgstr "45 分鐘"
 
 #: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 小時"
 
-#: ../panels/power/power.ui.h:7 ../panels/privacy/privacy.ui.h:3
+#: ../panels/power/power.ui.h:7
+msgid "80 minutes"
+msgstr "80 分鐘"
+
+#: ../panels/power/power.ui.h:8
+msgid "90 minutes"
+msgstr "90 分鐘"
+
+#: ../panels/power/power.ui.h:9
+msgid "100 minutes"
+msgstr "100 分鐘"
+
+#: ../panels/power/power.ui.h:10
+msgid "2 hours"
+msgstr "2 小時"
+
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
 msgid "1 minute"
 msgstr "1 分鐘"
 
-#: ../panels/power/power.ui.h:8 ../panels/privacy/privacy.ui.h:4
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
 msgid "2 minutes"
 msgstr "2 分鐘"
 
-#: ../panels/power/power.ui.h:10
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 分鐘"
+
+#: ../panels/power/power.ui.h:14
+msgid "4 minutes"
+msgstr "4 分鐘"
+
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 分鐘"
+
+#: ../panels/power/power.ui.h:16
+msgid "8 minutes"
+msgstr "8 分鐘"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 分鐘"
+
+#: ../panels/power/power.ui.h:18
+msgid "12 minutes"
+msgstr "12 分鐘"
+
+#: ../panels/power/power.ui.h:20
 msgid "Automatic Suspend"
 msgstr "自動暫停"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:10
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../panels/power/power.ui.h:12
-msgid "When on _Battery Power"
-msgstr "使用電池時(_B)"
+#: ../panels/power/power.ui.h:22
+msgid "_Plugged In"
+msgstr "插入插頭(_P)"
 
-#: ../panels/power/power.ui.h:13
-msgid "When _Plugged In"
-msgstr "當插入電源線時(_P)"
+#: ../panels/power/power.ui.h:23
+msgid "On _Battery Power"
+msgstr "使用電池電源(_B)"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:24
 msgid "Delay"
 msgstr "延遲"
 
+#: ../panels/printers/authentication-dialog.ui.h:3
+msgid "Authenticate"
+msgstr "驗證"
+
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/sharing/sharing.ui.h:21
+msgid "Password"
+msgstr "密碼"
+
+#: ../panels/printers/authentication-dialog.ui.h:6
+msgid "Authentication Required"
+msgstr "要求驗證"
+
 #. Translators: The printer is low on toner
 #: ../panels/printers/cc-printers-panel.c:591
 msgid "Low on toner"
@@ -3963,40 +4072,40 @@ msgstr[0] "%u 使用中"
 msgid "Failed to add new printer."
 msgstr "無法加入新的印表機。"
 
-#: ../panels/printers/cc-printers-panel.c:1938
+#: ../panels/printers/cc-printers-panel.c:1940
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/cc-printers-panel.c:1947
+#: ../panels/printers/cc-printers-panel.c:1949
 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:2252
+#: ../panels/printers/cc-printers-panel.c:2254
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/cc-printers-panel.c:2321
+#: ../panels/printers/cc-printers-panel.c:2323
 msgid "Searching for preferred drivers…"
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: ../panels/printers/cc-printers-panel.c:2336
+#: ../panels/printers/cc-printers-panel.c:2338
 msgid "Select from database…"
 msgstr "從資料庫搜尋…"
 
-#: ../panels/printers/cc-printers-panel.c:2345
+#: ../panels/printers/cc-printers-panel.c:2347
 msgid "Provide PPD File…"
 msgstr "提供 PPD 檔案…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2496
-#: ../panels/printers/cc-printers-panel.c:2519
+#: ../panels/printers/cc-printers-panel.c:2498
+#: ../panels/printers/cc-printers-panel.c:2521
 msgid "Test page"
 msgstr "測試頁"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2923
+#: ../panels/printers/cc-printers-panel.c:2929
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
@@ -4006,62 +4115,62 @@ msgid "Printers"
 msgstr "印表機"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "改變印表機設定值"
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr "加入印表機、檢視印表機工作並決定您要如何列印"
 
 #. Translators: those are keywords for the printing control-center panel
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Printer;Queue;Print;Paper;Ink;Toner;印表機;佇列;列印;紙張;墨水;碳粉;"
 
+#. Translators: This dialog contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:2
-#: ../panels/printers/options-dialog.ui.h:4
+msgid "Active Jobs"
+msgstr "使用中的工作"
+
+#: ../panels/printers/jobs-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:2
 #: ../panels/user-accounts/data/history-dialog.ui.h:1
 msgid "Close"
 msgstr "關閉"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Active Jobs"
-msgstr "使用中的工作"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "繼續列印"
 
-#: ../panels/printers/jobs-dialog.ui.h:6
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Pause Printing"
 msgstr "暫停列印"
 
-#: ../panels/printers/jobs-dialog.ui.h:7
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Cancel Print Job"
 msgstr "取消列印工作"
 
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
 msgstr "加入新的印表機"
 
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-user-panel.c:467
+msgid "_Cancel"
+msgstr "取消(_C)"
+
 #: ../panels/printers/new-printer-dialog.ui.h:4
 msgid "Search for network printers or filter result"
 msgstr "搜尋網路印表機或過濾器結果"
 
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/region/gnome-region-panel.ui.h:33
-msgid "Options"
-msgstr "選項"
-
-#: ../panels/printers/options-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:1
 msgid "Loading options…"
 msgstr "正在載入選項…"
 
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid "Select Printer Driver"
+msgstr "選擇印表機驅動程式"
+
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "載入驅動程式資料庫…"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:5
-msgid "Select Printer Driver"
-msgstr "選擇印表機驅動程式"
-
 #. Translators: this is an option of "Two Sided"
 #: ../panels/printers/pp-ipp-option-widget.c:65
 #: ../panels/printers/pp-ppd-option-widget.c:69
@@ -4157,13 +4266,13 @@ msgstr "工作狀態"
 msgid "Time"
 msgstr "時刻"
 
-#: ../panels/printers/pp-jobs-dialog.c:498
+#: ../panels/printers/pp-jobs-dialog.c:496
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s 使用中的工作"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1291
+#: ../panels/printers/pp-new-printer-dialog.c:1465
 msgid "No printers detected."
 msgstr "未偵測到印表機。"
 
@@ -4254,12 +4363,6 @@ msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "進階"
 
-#. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:936
-#, c-format
-msgid "%s Options"
-msgstr "%s 選項"
-
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:75
 #: ../panels/printers/pp-ppd-option-widget.c:77
@@ -4297,15 +4400,21 @@ msgid "No pre-filtering"
 msgstr "無前置過濾器"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:230
-msgid "Manufacturers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
+msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:242
-msgid "Drivers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
 msgstr "驅動程式"
 
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-samba.c:247
+#, c-format
+msgid "Enter your username and password to view printers available on %s."
+msgstr "輸入您的使用者名稱與密碼以檢視在 %s 可用的印表機。"
+
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
 msgstr "加入印表機"
@@ -4386,7 +4495,7 @@ msgstr "隱藏"
 msgid "Visible"
 msgstr "顯示"
 
-#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
@@ -4394,11 +4503,11 @@ msgstr "螢幕鎖定"
 msgid "Name & Visibility"
 msgstr "名稱與可見度"
 
-#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
 msgid "Usage & History"
 msgstr "使月與歷史紀錄"
 
-#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
 msgid "Purge Trash & Temporary Files"
 msgstr "清除回收筒與暫存檔案"
 
@@ -4407,8 +4516,8 @@ msgid "Privacy"
 msgstr "隱私"
 
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
-msgid "Privacy settings"
-msgstr "隱私設定值"
+msgid "Protect your personal information and control what others might see"
+msgstr "保護您的個人資訊並控制其他人能看到什麼"
 
 #. Translators: those are keywords for the privacy control-center panel
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
@@ -4427,10 +4536,6 @@ msgstr "螢幕關閉"
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: ../panels/privacy/privacy.ui.h:5
-msgid "3 minutes"
-msgstr "3 分鐘"
-
 #: ../panels/privacy/privacy.ui.h:11
 msgid "Control how you appear on the screen and the network."
 msgstr "控制您在螢幕及網路上如何顯示。"
@@ -4488,14 +4593,10 @@ msgid "30 days"
 msgstr "30 天"
 
 #: ../panels/privacy/privacy.ui.h:25
-msgid "Don't retain history"
-msgstr "不要保留歷史紀錄"
-
-#: ../panels/privacy/privacy.ui.h:26
 msgid "Forever"
 msgstr "永遠"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:27
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -4503,245 +4604,214 @@ msgstr ""
 "記住您的歷史紀錄會讓需要再次找到某樣東西時更簡單。這些項目永遠不會透過網路分"
 "享出去。"
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Cl_ear Recent History"
 msgstr "清除最近使用紀錄(_E)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:29
 msgid "_Recently Used"
 msgstr "最近使用的(_R)"
 
-#: ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/privacy.ui.h:30
 msgid "Retain _History"
 msgstr "保留歷史紀錄(_H)"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/privacy.ui.h:32
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "螢幕鎖可以在您離開時保護您的隱私。"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:33
 msgid "Automatic Screen _Lock"
 msgstr "自動鎖定螢幕(_L)"
 
-#: ../panels/privacy/privacy.ui.h:35
-msgid "Lock Screen _After"
-msgstr "鎖定螢幕於(_A)"
+#: ../panels/privacy/privacy.ui.h:34
+msgid "Lock Screen _After Blank For"
+msgstr "讓螢幕空白於(_A)"
 
-#: ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/privacy.ui.h:35
 msgid "Show _Notifications"
 msgstr "顯示通知(_N)"
 
-#: ../panels/privacy/privacy.ui.h:38
+#: ../panels/privacy/privacy.ui.h:37
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../panels/privacy/privacy.ui.h:39
+#: ../panels/privacy/privacy.ui.h:38
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: ../panels/privacy/privacy.ui.h:39
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr "自動清除回收筒和暫存檔案可以保護您的電腦減少不必要的敏感資訊。"
 
-#: ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/privacy.ui.h:40
 msgid "Automatically Empty _Trash"
 msgstr "自動清空回收筒(_T)"
 
-#: ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/privacy.ui.h:41
 msgid "Automatically Purge Temporary _Files"
 msgstr "自動清除暫存檔案(_F)"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: ../panels/privacy/privacy.ui.h:42
 msgid "Purge _After"
 msgstr "清除於(_A)"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "地區和語言"
-
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Change your region and language settings"
-msgstr "改變您的地區和語言設定值"
-
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
-
-#: ../panels/region/gnome-region-panel-formats.c:144
+#: ../panels/region/cc-format-chooser.c:122
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/gnome-region-panel-formats.c:146
+#: ../panels/region/cc-format-chooser.c:124
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
-msgid "Select an input source"
-msgstr "選擇一個輸入來源"
+#: ../panels/region/cc-format-chooser.c:268
+msgid "No regions found"
+msgstr "找不到區域"
 
-#: ../panels/region/gnome-region-panel-lang.c:115
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Log out for changes to take effect"
-msgstr "登出以讓變更生效"
-
-#: ../panels/region/gnome-region-panel-system.c:471
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings."
-msgstr "登入畫面、系統帳號和新使用者帳號使用系統的地區和語言設定值。"
+#: ../panels/region/cc-input-chooser.c:179
+msgid "No input sources found"
+msgstr "找不到輸入來源"
 
-#: ../panels/region/gnome-region-panel-system.c:476
-#: ../panels/region/gnome-region-panel.ui.h:35
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings. You may change the system settings to match "
-"yours."
-msgstr ""
-"登入畫面、系統帳號和新使用者帳號使用系統的地區和語言設定值。您可以將系統設定"
-"值改變以符合您的需求。"
+#: ../panels/region/cc-input-chooser.c:997
+#: ../panels/search/cc-search-locations-dialog.c:479
+msgid "Other"
+msgstr "其他"
 
-#: ../panels/region/gnome-region-panel-system.c:479
-msgid "Copy Settings"
-msgstr "複製設定值"
+#: ../panels/region/cc-region-panel.c:225
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "您的作業階段需要重新啟動以讓變更生效"
 
-#: ../panels/region/gnome-region-panel-system.c:482
-#: ../panels/region/gnome-region-panel.ui.h:42
-msgid "Copy Settings…"
-msgstr "複製設定值…"
+#: ../panels/region/cc-region-panel.c:226
+msgid "Restart Now"
+msgstr "立刻重新啟動"
 
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
-msgstr "地區和語言"
+#: ../panels/region/cc-region-panel.c:436
+msgctxt "Language"
+msgid "None"
+msgstr "沒有"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Select a display language"
-msgstr "選擇顯示的語言"
+#: ../panels/region/cc-region-panel.c:898
+msgid "Sorry"
+msgstr "抱敟"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Add Language"
-msgstr "加入語言"
+#: ../panels/region/cc-region-panel.c:900
+msgid "Input methods can't be used on the login screen"
+msgstr "輸入法不能用在登入畫面"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Language"
-msgstr "語言"
+#: ../panels/region/cc-region-panel.c:1345
+msgctxt "Input source"
+msgid "None"
+msgstr "沒有"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
-msgid "Select a region (change will be applied the next time you log in)"
-msgstr "選擇地區 (變更會在您下次登入時套用)"
+#: ../panels/region/cc-region-panel.c:1502
+msgid "Login Screen"
+msgstr "登入畫面"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Add Region"
-msgstr "加入區域"
+#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+msgid "Formats"
+msgstr "格式"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
-msgid "Remove Region"
-msgstr "移除區域"
+#: ../panels/region/format-chooser.ui.h:3
+msgid "Preview"
+msgstr "預覽"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Dates"
 msgstr "日期"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Times"
 msgstr "時刻"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Numbers"
 msgstr "數字"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
-msgid "Currency"
-msgstr "貨幣"
-
-#: ../panels/region/gnome-region-panel.ui.h:15
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Measurement"
 msgstr "度量衡"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
-msgid "Examples"
-msgstr "範例"
-
-#: ../panels/region/gnome-region-panel.ui.h:17
-msgid "Formats"
-msgstr "格式"
+#: ../panels/region/format-chooser.ui.h:8
+msgid "Paper"
+msgstr "紙張"
 
-#: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Select keyboards or other input sources"
-msgstr "選取鍵盤或其他輸入來源"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
+msgid "Region & Language"
+msgstr "地區和語言"
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Add Input Source"
-msgstr "加入輸入來源"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr "選擇您的顯示語言、格式、鍵盤配置和輸入來源"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Remove Input Source"
-msgstr "移除輸入來源"
+#. Translators: those are keywords for the region control-center panel
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Move Input Source Up"
-msgstr "將輸入來源往上移"
+#: ../panels/region/input-chooser.ui.h:1
+msgid "Add an Input Source"
+msgstr "加入輸入來源"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Move Input Source Down"
-msgstr "將輸入來源往下移"
+#: ../panels/region/input-options.ui.h:1
+msgid "Input Source Options"
+msgstr "輸入來源選項"
 
-#: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Input Source Settings"
-msgstr "輸入來源設定值"
+#: ../panels/region/input-options.ui.h:2
+msgid "Use the _same source for all windows"
+msgstr "在所有視窗中使用相同的來源(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "Show Keyboard Layout"
-msgstr "顯示鍵盤配置"
+#: ../panels/region/input-options.ui.h:3
+msgid "Allow _different sources for each window"
+msgstr "每個視窗使用不同的輸入來源(_D)"
 
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "Ctrl+Alt+Space"
-msgstr "Ctrl+Alt+Space"
+#: ../panels/region/input-options.ui.h:4
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤捷徑鍵"
 
-#: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Ctrl+Alt+Shift+Space"
-msgstr "Ctrl+Alt+Shift+Space"
+#: ../panels/region/input-options.ui.h:5
+msgid "Switch to previous source"
+msgstr "切換至上個來源"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid "Shortcut Settings"
-msgstr "快捷鍵設定值"
+#: ../panels/region/input-options.ui.h:6
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Space"
 
-#: ../panels/region/gnome-region-panel.ui.h:31
-msgid "Use the same source for all windows"
-msgstr "在所有視窗中使用相同的來源"
+#: ../panels/region/input-options.ui.h:7
+msgid "Switch to next source"
+msgstr "切換至下個來源"
 
-#: ../panels/region/gnome-region-panel.ui.h:32
-msgid "Allow different sources for each window"
-msgstr "每個視窗使用不同的輸入來源"
+#: ../panels/region/input-options.ui.h:8
+msgid "Super+Space"
+msgstr "Super+Space"
 
-#: ../panels/region/gnome-region-panel.ui.h:34
-msgid "Input Sources"
-msgstr "輸入來源"
+#: ../panels/region/input-options.ui.h:9
+msgid "You can change these shortcuts in the keyboard settings"
+msgstr "您可以在鍵盤設定值中改變這些捷徑鍵"
 
-#. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:37
-msgid "Display language:"
-msgstr "顯示語言:"
+#: ../panels/region/input-options.ui.h:10
+msgid "Alternative switch to next source"
+msgstr "切換至下個來源的替代鍵"
 
-#: ../panels/region/gnome-region-panel.ui.h:38
-msgid "Input source:"
-msgstr "輸入來源:"
+#: ../panels/region/region.ui.h:2
+msgid "English (United Kingdom)"
+msgstr "英文 (英國)"
 
-#: ../panels/region/gnome-region-panel.ui.h:39
-msgid "Format:"
-msgstr "格式:"
+#: ../panels/region/region.ui.h:4
+msgid "United Kingdom"
+msgstr "英國"
 
-#: ../panels/region/gnome-region-panel.ui.h:40
-msgid "Your settings"
-msgstr "您的設定值"
+#: ../panels/region/region.ui.h:6
+msgid "Options"
+msgstr "選項"
 
-#: ../panels/region/gnome-region-panel.ui.h:41
-msgid "System settings"
-msgstr "系統設定值"
+#: ../panels/region/region.ui.h:7
+msgid "Login settings are used by all users when logging into the system"
+msgstr "登入設定值是所有的使用者在登入系統時會用到的"
 
 #: ../panels/search/cc-search-locations-dialog.c:275
 msgid "Home"
@@ -4755,10 +4825,6 @@ msgstr "位置"
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../panels/search/cc-search-locations-dialog.c:479
-msgid "Other"
-msgstr "其他"
-
 #: ../panels/search/cc-search-locations-dialog.c:675
 msgid "Select Location"
 msgstr "選擇位置"
@@ -4767,19 +4833,14 @@ msgstr "選擇位置"
 msgid "No applications found"
 msgstr "找不到應用程式"
 
-#: ../panels/search/cc-search-panel.c:551
-#: ../panels/user-accounts/um-fingerprint-dialog.c:219
-#: ../panels/user-accounts/um-fingerprint-dialog.c:220
-msgid "Enabled"
-msgstr "已啟用"
-
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:1
 msgid "Search"
 msgstr "搜尋"
 
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:2
-msgid "Search settings"
-msgstr "搜尋設定值"
+msgid ""
+"Control which applications show search results in the Activities Overview"
+msgstr "控制在活動概覽中哪些應用程式會顯示在搜尋結果中"
 
 #. Translators: those are keywords for the search control-center panel
 #: ../panels/search/gnome-search-panel.desktop.in.in.h:4
@@ -4802,21 +4863,21 @@ msgstr "往下移"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../panels/sharing/cc-sharing-panel.c:220
+#: ../panels/sharing/cc-sharing-panel.c:259
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/sharing/cc-sharing-panel.c:222
+#: ../panels/sharing/cc-sharing-panel.c:261
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/sharing/cc-sharing-panel.c:362
+#: ../panels/sharing/cc-sharing-panel.c:407
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: ../panels/sharing/cc-sharing-panel.c:540
+#: ../panels/sharing/cc-sharing-panel.c:585
 msgid "Copy"
 msgstr "複製"
 
@@ -4824,8 +4885,12 @@ msgstr "複製"
 msgid "Sharing"
 msgstr "分享"
 
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Control what you want to share with others"
+msgstr "控制您想要與其他人分享什麼"
+
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
 "pictures;photos;movies;server;renderer;"
@@ -4925,10 +4990,6 @@ msgstr "在這個網路分享公開資料夾"
 msgid "Require Password"
 msgstr "需要密碼"
 
-#: ../panels/sharing/sharing.ui.h:21
-msgid "Password"
-msgstr "密碼"
-
 #: ../panels/sharing/sharing.ui.h:22
 msgid "Remote Login"
 msgstr "遠端登入"
@@ -4975,8 +5036,8 @@ msgid "Sound"
 msgstr "音效"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-msgid "Change sound volume and event sounds"
-msgstr "改變音效的音量和音效事件"
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "改變音效的音量、輸入、輸出和警示音效"
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
@@ -5082,7 +5143,7 @@ msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 輸入"
 
-#: ../panels/sound/gvc/gvc-mixer-control.c:2371
+#: ../panels/sound/gvc/gvc-mixer-control.c:2373
 msgid "System Sounds"
 msgstr "系統音效"
 
@@ -5094,65 +5155,65 @@ msgstr "測試喇叭(_T)"
 msgid "Peak detect"
 msgstr "峰值檢測"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1511
+#: ../panels/sound/gvc-mixer-dialog.c:1508
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "名稱"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1530
+#: ../panels/sound/gvc-mixer-dialog.c:1527
 msgid "Device"
 msgstr "裝置"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1593
+#: ../panels/sound/gvc-mixer-dialog.c:1590
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s 的喇叭測試"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1647
+#: ../panels/sound/gvc-mixer-dialog.c:1644
 msgid "_Output volume:"
 msgstr "輸出音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1661
+#: ../panels/sound/gvc-mixer-dialog.c:1658
 msgid "Output"
 msgstr "輸出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1666
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "C_hoose a device for sound output:"
 msgstr "選擇聲音輸出的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1691
+#: ../panels/sound/gvc-mixer-dialog.c:1688
 msgid "Settings for the selected device:"
 msgstr "已選取裝置的設定值:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1702
+#: ../panels/sound/gvc-mixer-dialog.c:1699
 msgid "Input"
 msgstr "輸入"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1709
+#: ../panels/sound/gvc-mixer-dialog.c:1706
 msgid "_Input volume:"
 msgstr "輸入音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1732
+#: ../panels/sound/gvc-mixer-dialog.c:1729
 msgid "Input level:"
 msgstr "輸入等級:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1760
+#: ../panels/sound/gvc-mixer-dialog.c:1757
 msgid "C_hoose a device for sound input:"
 msgstr "選擇聲音輸入的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1787
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "Sound Effects"
 msgstr "聲音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1794
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "_Alert volume:"
 msgstr "警示音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1807
+#: ../panels/sound/gvc-mixer-dialog.c:1804
 msgid "Applications"
 msgstr "程式集"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1811
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "No application is currently playing or recording audio."
 msgstr "沒有應用程式目前正在播放或錄製音效。"
 
@@ -5207,8 +5268,8 @@ msgid "No shortcut set"
 msgstr "沒有設定捷徑鍵"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Universal Access Preferences"
-msgstr "無障礙偏好設定"
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "讓電腦更容易看、聽、輸入、指向與點選"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
@@ -5302,10 +5363,6 @@ msgstr "高對比"
 msgid "Beep on Caps and Num Lock"
 msgstr "當 Caps 和 Num Lock 在使用時發出聲響"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Options…"
-msgstr "選項…"
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
@@ -5819,8 +5876,8 @@ msgid "Users"
 msgstr "使用者"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users"
-msgstr "加入或移除使用者"
+msgid "Add or remove users and change your password"
+msgstr "加入或移除使用者並改變您的密碼"
 
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
@@ -5829,6 +5886,18 @@ msgstr ""
 "Login;Name;Fingerprint;Avatar;Logo;Face;Password;登入;姓名;指紋;大頭貼;標誌;"
 "臉;密碼;"
 
+#: ../panels/user-accounts/data/history-dialog.ui.h:2
+msgid "Previous Week"
+msgstr "前一週"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+msgid "Next Week"
+msgstr "下一週"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+msgid "Next week"
+msgstr "下一週"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
 msgstr "立刻設定密碼"
@@ -5850,54 +5919,38 @@ msgid "Enable this account"
 msgstr "啟用這個帳號"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "_Hint"
-msgstr "提示(_H)"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid ""
-"This hint may be displayed at the login screen.  It will be visible to all "
-"users of this system.  Do <b>not</b> include the password here."
-msgstr ""
-"這個提示可能會顯示在登入畫面。它將會顯示給這個系統上的所有使用者。請<b>不要</"
-"b>在這裡寫入密碼。"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
 msgstr "確認密碼(_O)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "_New password"
 msgstr "新密碼(_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Generate a password"
 msgstr "產生密碼"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Fair"
-msgstr "一般"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Current _password"
 msgstr "目前的密碼(_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
 msgid "_Action"
 msgstr "動作(_A)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Changing password for"
 msgstr "正在改變密碼:"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:15
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "_Show password"
 msgstr "顯示密碼(_S)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:16
+#: ../panels/user-accounts/data/password-dialog.ui.h:13
 msgid "How to choose a strong password"
 msgstr "如何選擇強度高的密碼"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
 msgid "Ch_ange"
 msgstr "改變(_A)"
 
@@ -5976,7 +6029,7 @@ msgid "Authentication is required to change user data"
 msgstr "改變使用者資料需要驗證"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:601
+#: ../panels/user-accounts/um-password-dialog.c:597
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "太短"
@@ -5987,25 +6040,25 @@ msgid "Not good enough"
 msgstr "不夠好"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:602
+#: ../panels/user-accounts/um-password-dialog.c:598
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "太弱"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:603
+#: ../panels/user-accounts/um-password-dialog.c:599
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "一般"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:604
+#: ../panels/user-accounts/um-password-dialog.c:600
 msgctxt "Password strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:605
+#: ../panels/user-accounts/um-password-dialog.c:601
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "強固"
@@ -6015,7 +6068,6 @@ msgid "Authentication failed"
 msgstr "驗證失敗"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:273
 #, c-format
 msgid "The new password is too short"
 msgstr "新的密碼太短"
@@ -6094,6 +6146,11 @@ msgstr "該裝置已經在使用中。"
 msgid "An internal error occurred."
 msgstr "發生內部的錯誤。"
 
+#: ../panels/user-accounts/um-fingerprint-dialog.c:219
+#: ../panels/user-accounts/um-fingerprint-dialog.c:220
+msgid "Enabled"
+msgstr "已啟用"
+
 #: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "Delete registered fingerprints?"
 msgstr "是否刪除已註冊的指紋?"
@@ -6165,47 +6222,51 @@ msgstr "本週"
 msgid "Last Week"
 msgstr "上週"
 
-#: ../panels/user-accounts/um-password-dialog.c:105
+#: ../panels/user-accounts/um-password-dialog.c:128
 msgid "_Generate a password"
 msgstr "產生密碼(_G)"
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:181
 msgid "Please choose another password."
 msgstr "請選擇其他密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:168
+#: ../panels/user-accounts/um-password-dialog.c:190
 msgid "Please type your current password again."
 msgstr "請再次輸入您目前的密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:174
+#: ../panels/user-accounts/um-password-dialog.c:196
 msgid "Password could not be changed"
 msgstr "密碼無法變更"
 
-#: ../panels/user-accounts/um-password-dialog.c:270
+#: ../panels/user-accounts/um-password-dialog.c:301
 msgid "You need to enter a new password"
 msgstr "您需要輸入新的密碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:279
+#: ../panels/user-accounts/um-password-dialog.c:304
+msgid "The new password is not strong enough"
+msgstr "新的密碼強度不夠"
+
+#: ../panels/user-accounts/um-password-dialog.c:310
 msgid "You need to confirm the password"
 msgstr "您需要確認密碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:282
+#: ../panels/user-accounts/um-password-dialog.c:313
 msgid "The passwords do not match"
 msgstr "密碼不相符"
 
-#: ../panels/user-accounts/um-password-dialog.c:288
+#: ../panels/user-accounts/um-password-dialog.c:319
 msgid "You need to enter your current password"
 msgstr "您需要輸入您目前的密碼"
 
-#: ../panels/user-accounts/um-password-dialog.c:291
+#: ../panels/user-accounts/um-password-dialog.c:322
 msgid "The current password is not correct"
 msgstr "目前的密碼並不正確"
 
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
-#: ../panels/user-accounts/um-password-dialog.c:443
+#: ../panels/user-accounts/um-password-dialog.c:439
 msgid "Wrong password"
 msgstr "錯誤的密碼"
 
@@ -6306,15 +6367,15 @@ msgstr "沒有"
 msgid "Logged in"
 msgstr "已登入"
 
-#: ../panels/user-accounts/um-user-panel.c:941
+#: ../panels/user-accounts/um-user-panel.c:942
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: ../panels/user-accounts/um-user-panel.c:943
+#: ../panels/user-accounts/um-user-panel.c:944
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
-#: ../panels/user-accounts/um-user-panel.c:984
+#: ../panels/user-accounts/um-user-panel.c:985
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6322,12 +6383,12 @@ msgstr ""
 "要進行變更,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1022
+#: ../panels/user-accounts/um-user-panel.c:1023
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1033
-#: ../panels/user-accounts/um-user-panel.c:1319
+#: ../panels/user-accounts/um-user-panel.c:1034
+#: ../panels/user-accounts/um-user-panel.c:1320
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6335,12 +6396,12 @@ msgstr ""
 "要建立使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1042
+#: ../panels/user-accounts/um-user-panel.c:1043
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1054
-#: ../panels/user-accounts/um-user-panel.c:1324
+#: ../panels/user-accounts/um-user-panel.c:1055
+#: ../panels/user-accounts/um-user-panel.c:1325
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6348,11 +6409,11 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1228
+#: ../panels/user-accounts/um-user-panel.c:1229
 msgid "My Account"
 msgstr "我的帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1237
+#: ../panels/user-accounts/um-user-panel.c:1238
 msgid "Other Accounts"
 msgstr "其他帳號"
 
@@ -6472,8 +6533,8 @@ msgid "Wacom Tablet"
 msgstr "Wacom 繪圖板"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Set your Wacom tablet preferences"
-msgstr "設定您的 Wacom 繪圖板偏好設定"
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr "設定繪圖板的按鈕對映與調整觸控筆的靈敏度"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
@@ -6677,40 +6738,40 @@ msgstr "較低的按鈕"
 msgid "Tip Pressure Feel"
 msgstr "點選壓力感應"
 
-#: ../shell/control-center.c:66
+#: ../shell/cc-application.c:67
 msgid "Enable verbose mode"
 msgstr "啟用詳細模式"
 
-#: ../shell/control-center.c:67
+#: ../shell/cc-application.c:68
 msgid "Show the overview"
 msgstr "顯示概覽"
 
-#: ../shell/control-center.c:68
+#: ../shell/cc-application.c:69
 msgid "Search for the string"
 msgstr "搜尋字串"
 
-#: ../shell/control-center.c:69
+#: ../shell/cc-application.c:70
 msgid "List possible panel names and exit"
 msgstr "列出可能的面板名稱並結束"
 
-#: ../shell/control-center.c:70 ../shell/control-center.c:71
-#: ../shell/control-center.c:72
+#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
+#: ../shell/cc-application.c:73
 msgid "Show help options"
 msgstr "顯示說明的選項"
 
-#: ../shell/control-center.c:73
+#: ../shell/cc-application.c:74
 msgid "Panel to display"
 msgstr "要顯示的面板"
 
-#: ../shell/control-center.c:73
+#: ../shell/cc-application.c:74
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[面板] [引數…]"
 
-#: ../shell/control-center.c:95
+#: ../shell/cc-application.c:116
 msgid "- Settings"
 msgstr "- 設定值)"
 
-#: ../shell/control-center.c:103
+#: ../shell/cc-application.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -6719,49 +6780,231 @@ msgstr ""
 "%s\n"
 "執行 「%s --help」以查看完整的命令列可用選項清單。\n"
 
-#: ../shell/control-center.c:133
+#: ../shell/cc-application.c:154
 msgid "Available panels:"
 msgstr "可用的面板:"
 
-#: ../shell/control-center.c:244
+#: ../shell/cc-application.c:273
 msgid "Help"
 msgstr "求助"
 
-#: ../shell/control-center.c:245
+#: ../shell/cc-application.c:274
 msgid "Quit"
 msgstr "結束"
 
+#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "設定值"
+
 #. Add categories
-#: ../shell/gnome-control-center.c:887
+#: ../shell/cc-window.c:845
 msgctxt "category"
 msgid "Personal"
 msgstr "個人"
 
-#: ../shell/gnome-control-center.c:888
+#: ../shell/cc-window.c:846
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../shell/gnome-control-center.c:889
+#: ../shell/cc-window.c:847
 msgctxt "category"
 msgid "System"
 msgstr "系統"
 
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "控制中心"
-
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
-msgid "Settings"
-msgstr "設定值"
+#: ../shell/cc-window.c:1401
+msgid "All Settings"
+msgstr "所有設定值"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
 
-#: ../shell/shell.ui.h:2
-msgid "All Settings"
-msgstr "所有設定值"
+#~ msgid "Change the background"
+#~ msgstr "更改背景"
+
+#~ msgid "Configure Bluetooth settings"
+#~ msgstr "設定藍牙設定值"
+
+#~ msgctxt "Power"
+#~ msgid "Bluetooth"
+#~ msgstr "藍牙"
+
+#~ msgid "Color management settings"
+#~ msgstr "顏色管理設定值"
+
+#~ msgid "British English"
+#~ msgstr "英式英文"
+
+#~ msgid "Spanish"
+#~ msgstr "西班牙文"
+
+#~ msgid "Chinese (simplified)"
+#~ msgstr "簡體中文"
+
+#~ msgid "Select a region"
+#~ msgstr "選擇地區"
+
+#~ msgid "Select a language"
+#~ msgstr "選擇語言"
+
+#~ msgid "_Select"
+#~ msgstr "選取(_S)"
+
+#~ msgid "Date and Time preferences panel"
+#~ msgstr "日期和時刻偏好設定面板"
+
+#~ msgid "System Information"
+#~ msgstr "系統資訊"
+
+#~ msgid "Change keyboard settings"
+#~ msgstr "改變鍵盤設定值"
+
+#~ msgid "Layout Settings"
+#~ msgstr "配置設定值"
+
+#~ msgid "Set your mouse and touchpad preferences"
+#~ msgstr "設定您的滑鼠與觸控板偏好設定"
+
+#~ msgid "Network settings"
+#~ msgstr "網路設定值"
+
+#~ msgid "Carrier/link changed"
+#~ msgstr "載體/連結已變更"
+
+#~ msgid "Manage notifications"
+#~ msgstr "管理通知"
+
+#~ msgid "Manage online accounts"
+#~ msgstr "管理線上帳號"
+
+#~ msgid "_Mark As Inactive After"
+#~ msgstr "標記為不活動於(_M)"
+
+#~ msgid "Power management settings"
+#~ msgstr "電源管理設定值"
+
+#~ msgid "Change printer settings"
+#~ msgstr "改變印表機設定值"
+
+#~ msgid "%s Options"
+#~ msgstr "%s 選項"
+
+#~ msgid "Manufacturers"
+#~ msgstr "製造商"
+
+#~ msgid "Privacy settings"
+#~ msgstr "隱私設定值"
+
+#~ msgid "Don't retain history"
+#~ msgstr "不要保留歷史紀錄"
+
+#~ msgid "Change your region and language settings"
+#~ msgstr "改變您的地區和語言設定值"
+
+#~ msgid "Select an input source"
+#~ msgstr "選擇一個輸入來源"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings."
+#~ msgstr "登入畫面、系統帳號和新使用者帳號使用系統的地區和語言設定值。"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings. You may change the system settings to "
+#~ "match yours."
+#~ msgstr ""
+#~ "登入畫面、系統帳號和新使用者帳號使用系統的地區和語言設定值。您可以將系統設"
+#~ "定值改變以符合您的需求。"
+
+#~ msgid "Copy Settings"
+#~ msgstr "複製設定值"
+
+#~ msgid "Copy Settings…"
+#~ msgstr "複製設定值…"
+
+#~ msgid "Region and Language"
+#~ msgstr "地區和語言"
+
+#~ msgid "Select a display language"
+#~ msgstr "選擇顯示的語言"
+
+#~ msgid "Add Language"
+#~ msgstr "加入語言"
+
+#~ msgid "Select a region (change will be applied the next time you log in)"
+#~ msgstr "選擇地區 (變更會在您下次登入時套用)"
+
+#~ msgid "Add Region"
+#~ msgstr "加入區域"
+
+#~ msgid "Remove Region"
+#~ msgstr "移除區域"
+
+#~ msgid "Currency"
+#~ msgstr "貨幣"
+
+#~ msgid "Examples"
+#~ msgstr "範例"
+
+#~ msgid "Select keyboards or other input sources"
+#~ msgstr "選取鍵盤或其他輸入來源"
+
+#~ msgid "Remove Input Source"
+#~ msgstr "移除輸入來源"
+
+#~ msgid "Move Input Source Up"
+#~ msgstr "將輸入來源往上移"
+
+#~ msgid "Show Keyboard Layout"
+#~ msgstr "顯示鍵盤配置"
+
+#~ msgid "Ctrl+Alt+Space"
+#~ msgstr "Ctrl+Alt+Space"
+
+#~ msgid "Shortcut Settings"
+#~ msgstr "快捷鍵設定值"
+
+#~ msgid "Display language:"
+#~ msgstr "顯示語言:"
+
+#~ msgid "Input source:"
+#~ msgstr "輸入來源:"
+
+#~ msgid "Format:"
+#~ msgstr "格式:"
+
+#~ msgid "Your settings"
+#~ msgstr "您的設定值"
+
+#~ msgid "System settings"
+#~ msgstr "系統設定值"
+
+#~ msgid "Search settings"
+#~ msgstr "搜尋設定值"
+
+#~ msgid "Universal Access Preferences"
+#~ msgstr "無障礙偏好設定"
+
+#~ msgid "_Hint"
+#~ msgstr "提示(_H)"
+
+#~ msgid ""
+#~ "This hint may be displayed at the login screen.  It will be visible to "
+#~ "all users of this system.  Do <b>not</b> include the password here."
+#~ msgstr ""
+#~ "這個提示可能會顯示在登入畫面。它將會顯示給這個系統上的所有使用者。請<b>不"
+#~ "要</b>在這裡寫入密碼。"
+
+#~ msgid "Fair"
+#~ msgstr "一般"
+
+#~ msgid "Set your Wacom tablet preferences"
+#~ msgstr "設定您的 Wacom 繪圖板偏好設定"
+
+#~ msgid "Control Center"
+#~ msgstr "控制中心"
 
 #~ msgid "Out of range"
 #~ msgstr "超過範圍"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]