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



commit 95fb3a9dc5c890946c7a1a75b969a14d94733abc
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Sat Nov 9 10:20:48 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  883 ++++++++++++++++++++++++++++-------------------------------
 po/zh_TW.po |  885 ++++++++++++++++++++++++++++-------------------------------
 2 files changed, 849 insertions(+), 919 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index b0b761f..d7637b3 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,8 +14,8 @@ 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-09-28 19:50+0000\n"
-"PO-Revision-Date: 2013-09-30 19:35+0800\n"
+"POT-Creation-Date: 2013-10-30 11:45+0000\n"
+"PO-Revision-Date: 2013-11-09 10:20+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -70,7 +70,7 @@ msgid "Span"
 msgstr "合併"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:293
+#: ../panels/background/cc-background-chooser-dialog.c:292
 msgid "Select Background"
 msgstr "選擇背景"
 
@@ -91,32 +91,32 @@ msgid "Flickr"
 msgstr "Flickr"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:393
+#: ../panels/background/cc-background-chooser-dialog.c:385
 msgid "No Pictures Found"
 msgstr "找不到圖片"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:408
+#: ../panels/background/cc-background-chooser-dialog.c:400
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "你可以將影像加入你的%s資料夾,它們會顯示在這裏"
 
-#: ../panels/background/cc-background-chooser-dialog.c:436
+#: ../panels/background/cc-background-chooser-dialog.c:428
 #: ../panels/bluetooth/cc-bluetooth-panel.c:640
-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
-#: ../panels/display/cc-display-panel.c:1495
-#: ../panels/display/cc-display-panel.c:1910
+#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+#: ../panels/display/cc-display-panel.c:1509
+#: ../panels/display/cc-display-panel.c:1924
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1201
-#: ../panels/network/net-device-wifi.c:1407
+#: ../panels/network/net-device-wifi.c:1194
+#: ../panels/network/net-device-wifi.c:1402
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
 #: ../panels/printers/cc-printers-panel.c:1946
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:467
+#: ../panels/privacy/cc-privacy-panel.c:470
 #: ../panels/search/cc-search-locations-dialog.c:682
-#: ../panels/sharing/cc-sharing-panel.c:421
+#: ../panels/sharing/cc-sharing-panel.c:435
 #: ../panels/user-accounts/um-fingerprint-dialog.c:269
 #: ../panels/user-accounts/um-photo-dialog.c:96
 #: ../panels/user-accounts/um-photo-dialog.c:221
@@ -124,9 +124,8 @@ msgstr "你可以將影像加入你的%s資料夾,它們會顯示在這裏"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:429
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
 #: ../panels/user-accounts/um-photo-dialog.c:98
 msgid "Select"
 msgstr "選取"
@@ -146,7 +145,7 @@ msgstr "%d × %d"
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: ../panels/background/cc-background-panel.c:492
+#: ../panels/background/cc-background-panel.c:493
 msgid "Current background"
 msgstr "目前的背景"
 
@@ -163,7 +162,7 @@ msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 msgid "Set Up New Device"
 msgstr "設置新裝置"
 
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
 msgid "Remove Device"
 msgstr "移除裝置"
 
@@ -272,14 +271,14 @@ 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
+#: ../panels/color/cc-color-calibrate.c:361
 msgid "Place your calibration device over the square and press 'Start'"
 msgstr "將你的校準裝置放在矩形上並按「開始」"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:366
+#: ../panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press 'Continue'"
 msgstr "將你的校準裝置移到校準位置並按「繼續」"
@@ -287,7 +286,7 @@ msgstr "將你的校準裝置移到校準位置並按「繼續」"
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:372
+#: ../panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press 'Continue'"
 msgstr "將你的校準裝置移到表面位置並按「繼續」"
@@ -295,54 +294,54 @@ msgstr "將你的校準裝置移到表面位置並按「繼續」"
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:378
+#: ../panels/color/cc-color-calibrate.c:379
 msgid "Shut the laptop lid"
 msgstr "關上手提電腦上蓋"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:409
+#: ../panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
 msgstr "發生內部的錯誤,無法復原。"
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:414
+#: ../panels/color/cc-color-calibrate.c:415
 msgid "Tools required for calibration are not installed."
 msgstr "校準所需的工具尚未安裝。"
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:420
+#: ../panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
 msgstr "無法產生描述檔。"
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:426
+#: ../panels/color/cc-color-calibrate.c:427
 msgid "The target whitepoint was not obtainable."
 msgstr "尚無法獲取目標白點。"
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:466
+#: ../panels/color/cc-color-calibrate.c:467
 msgid "Complete!"
 msgstr "完成!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:474
+#: ../panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "校準已失敗!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:481
+#: ../panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
 msgstr "你可以移除校準裝置。"
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:552
+#: ../panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "過程中請勿干擾校準裝置"
 
@@ -404,48 +403,48 @@ msgstr "尚未校準"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:135
+#: ../panels/color/cc-color-panel.c:137
 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:143
+#: ../panels/color/cc-color-panel.c:145
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:150
+#: ../panels/color/cc-color-panel.c:152
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:218
+#: ../panels/color/cc-color-panel.c:219
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: ../panels/color/cc-color-panel.c:221
+#: ../panels/color/cc-color-panel.c:222
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:232
+#: ../panels/color/cc-color-panel.c:233
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:239
+#: ../panels/color/cc-color-panel.c:240
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../panels/color/cc-color-panel.c:586
+#: ../panels/color/cc-color-panel.c:579
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:912
+#: ../panels/color/cc-color-panel.c:903
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上傳檔案失敗:%s"
@@ -453,51 +452,51 @@ msgstr "上傳檔案失敗:%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:926
+#: ../panels/color/cc-color-panel.c:917
 msgid "The profile has been uploaded to:"
 msgstr "描述檔已經上傳到:"
 
-#: ../panels/color/cc-color-panel.c:928
+#: ../panels/color/cc-color-panel.c:919
 msgid "Write down this URL."
 msgstr "寫下這個 URL。"
 
-#: ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:920
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重新啟動這臺電腦並開機進入你一般的作業系統。"
 
-#: ../panels/color/cc-color-panel.c:930
+#: ../panels/color/cc-color-panel.c:921
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "在你的瀏覽器中輸入 URL 以下載並安裝描述檔。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:964
+#: ../panels/color/cc-color-panel.c:955
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
-#: ../panels/color/cc-color-panel.c:968
+#: ../panels/color/cc-color-panel.c:959
 #: ../panels/network/connection-editor/vpn-helpers.c:375
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1328
+#: ../panels/color/cc-color-panel.c:1315
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
+#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
 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:1377
+#: ../panels/color/cc-color-panel.c:1364
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援打印機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1388
+#: ../panels/color/cc-color-panel.c:1375
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
@@ -584,7 +583,6 @@ 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:1470
 msgid "Cancel"
 msgstr "取消"
@@ -605,7 +603,7 @@ msgid "Done"
 msgstr "完成"
 
 #. Timeout parameters
-#. 5000 = 5 sec
+#. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
 #: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
@@ -737,164 +735,146 @@ msgid ""
 msgstr "偵測到問題。描述檔可能無法正常運作。<a href=\"\">顯示詳細資料。</a>"
 
 #: ../panels/color/color.ui.h:30
-msgid "Device type:"
-msgstr "裝置類型:"
-
-#: ../panels/color/color.ui.h:31
-msgid "Manufacturer:"
-msgstr "製造商:"
-
-#: ../panels/color/color.ui.h:32
-msgid "Model:"
-msgstr "型號:"
-
-#: ../panels/color/color.ui.h:33
-msgid ""
-"Image files can be dragged on this window to auto-complete the above fields."
-msgstr "可以將圖片檔案拖放到這個視窗自動完成上列欄位。"
-
-#: ../panels/color/color.ui.h:34
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "顏色"
-
-#: ../panels/color/color.ui.h:35
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "每個裝置需要最新的色彩描述檔才能被管理顏色。"
 
-#: ../panels/color/color.ui.h:36
+#: ../panels/color/color.ui.h:31
 msgid "Learn more"
 msgstr "了解更多"
 
-#: ../panels/color/color.ui.h:37
+#: ../panels/color/color.ui.h:32
 msgid "Learn more about color management"
 msgstr "了解更多關於顏色管理的資訊"
 
-#: ../panels/color/color.ui.h:38
+#: ../panels/color/color.ui.h:33
 msgid "Set for all users"
 msgstr "所有使用者皆可用"
 
-#: ../panels/color/color.ui.h:39
+#: ../panels/color/color.ui.h:34
 msgid "Set this profile for all users on this computer"
 msgstr "將這個描述檔給電腦上所有使用者"
 
-#: ../panels/color/color.ui.h:40
+#: ../panels/color/color.ui.h:35
 msgid "Enable"
 msgstr "啟用"
 
-#: ../panels/color/color.ui.h:41
+#: ../panels/color/color.ui.h:36
 msgid "Add profile"
 msgstr "加入描述檔"
 
-#: ../panels/color/color.ui.h:42
+#: ../panels/color/color.ui.h:37
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Calibrate…"
 msgstr "校準…"
 
-#: ../panels/color/color.ui.h:43
+#: ../panels/color/color.ui.h:38
 msgid "Calibrate the device"
 msgstr "校準裝置"
 
-#: ../panels/color/color.ui.h:44
+#: ../panels/color/color.ui.h:39
 msgid "Remove profile"
 msgstr "移除描述檔"
 
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:40
 msgid "View details"
 msgstr "檢視詳細資料"
 
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:41
 msgid "Unable to detect any devices that can be color managed"
 msgstr "無法偵測到任何能被管理顏色的裝置"
 
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:42
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:43
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:44
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:45
 msgid "Projector"
 msgstr "投影機"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:46
 msgid "Plasma"
 msgstr "等離子"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:47
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:48
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:49
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED 背光)"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:50
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "廣色域 LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:51
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "廣色域 LCD (RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:52
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:53
 msgid "40 minutes"
 msgstr "40 分鐘"
 
-#: ../panels/color/color.ui.h:59
+#: ../panels/color/color.ui.h:54
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 分鐘"
 
-#: ../panels/color/color.ui.h:61
+#: ../panels/color/color.ui.h:56
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "15 分鐘"
 
-#: ../panels/color/color.ui.h:63
+#: ../panels/color/color.ui.h:58
 msgid "Native to display"
 msgstr "原生顯示"
 
-#: ../panels/color/color.ui.h:64
+#: ../panels/color/color.ui.h:59
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (列印與出版)"
 
-#: ../panels/color/color.ui.h:65
+#: ../panels/color/color.ui.h:60
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:66
+#: ../panels/color/color.ui.h:61
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (攝影與繪圖)"
 
-#: ../panels/color/color.ui.h:67
+#: ../panels/color/color.ui.h:62
 msgid "D75"
 msgstr "D75"
 
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "顏色"
+
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
@@ -945,33 +925,33 @@ msgid "Language"
 msgstr "語言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:112 ../panels/region/format-chooser.ui.h:2
+#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
 msgid "_Done"
 msgstr "完成(_D)"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:352
+#: ../panels/datetime/cc-datetime-panel.c:363
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%b%e日, %p %l:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:357
+#: ../panels/datetime/cc-datetime-panel.c:368
 msgid "%e %B %Y, %R"
 msgstr "%Y年%b%e日,%R"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:573
+#: ../panels/datetime/cc-datetime-panel.c:584
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:578
+#: ../panels/datetime/cc-datetime-panel.c:589
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:583
+#: ../panels/datetime/cc-datetime-panel.c:594
 msgid "%R"
 msgstr "%R"
 
@@ -1110,143 +1090,110 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,你需要通過核對。"
 
-#: ../panels/display/cc-display-panel.c:473
+#: ../panels/display/cc-display-panel.c:485
 msgid "Lid Closed"
 msgstr "上蓋已經關閉"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:476
+#: ../panels/display/cc-display-panel.c:488
 msgid "Mirrored"
 msgstr "鏡射顯示器"
 
-#: ../panels/display/cc-display-panel.c:478
-#: ../panels/display/cc-display-panel.c:2043
-#: ../panels/display/display-capplet.ui.h:1
+#: ../panels/display/cc-display-panel.c:490
+#: ../panels/display/cc-display-panel.c:2057
 msgid "Primary"
 msgstr "主要"
 
-#: ../panels/display/cc-display-panel.c:480
+#: ../panels/display/cc-display-panel.c:492
 #: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:117
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:610
-#: ../panels/universal-access/cc-ua-panel.c:736
+#: ../panels/power/cc-power-panel.c:1718 ../panels/power/cc-power-panel.c:1729
+#: ../panels/privacy/cc-privacy-panel.c:80
+#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:495
 msgid "Secondary"
 msgstr "次要"
 
-#: ../panels/display/cc-display-panel.c:1491
+#: ../panels/display/cc-display-panel.c:1505
 msgid "Arrange Combined Displays"
-msgstr "排列組合的顯示器"
+msgstr "排列顯示器的組合方式"
 
-#: ../panels/display/cc-display-panel.c:1497
-#: ../panels/display/cc-display-panel.c:1913
+#: ../panels/display/cc-display-panel.c:1511
+#: ../panels/display/cc-display-panel.c:1927
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1518
+#: ../panels/display/cc-display-panel.c:1532
 msgid "Drag displays to rearrange them"
 msgstr "拖拉顯示器以重新排列他們"
 
 #. size
-#: ../panels/display/cc-display-panel.c:1977
+#: ../panels/display/cc-display-panel.c:1991
 msgid "Size"
 msgstr "尺寸"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:1992
-#: ../panels/display/display-capplet.ui.h:12
+#: ../panels/display/cc-display-panel.c:2006
 msgid "Aspect Ratio"
 msgstr "長寬比"
 
-#: ../panels/display/cc-display-panel.c:2013
-#: ../panels/display/display-capplet.ui.h:13
+#: ../panels/display/cc-display-panel.c:2027
 #: ../panels/printers/pp-options-dialog.c:86
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../panels/display/cc-display-panel.c:2044
-#: ../panels/display/display-capplet.ui.h:2
+#: ../panels/display/cc-display-panel.c:2058
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "在這個顯示器顯示頂端列與活動概覽"
 
-#: ../panels/display/cc-display-panel.c:2050
+#: ../panels/display/cc-display-panel.c:2064
 msgid "Secondary Display"
 msgstr "次要顯示器"
 
-#: ../panels/display/cc-display-panel.c:2051
+#: ../panels/display/cc-display-panel.c:2065
 msgid "Join this display with another to create an extra workspace"
 msgstr "將這個顯示器與另一個顯示器結合以建立額外的工作區"
 
-#: ../panels/display/cc-display-panel.c:2058
-#: ../panels/display/display-capplet.ui.h:3
+#: ../panels/display/cc-display-panel.c:2072
 msgid "Presentation"
 msgstr "展示"
 
-#: ../panels/display/cc-display-panel.c:2059
-#: ../panels/display/display-capplet.ui.h:4
+#: ../panels/display/cc-display-panel.c:2073
 msgid "Show slideshows and media only"
 msgstr "只顯示投影片與媒體"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2064
-#: ../panels/display/display-capplet.ui.h:5
+#: ../panels/display/cc-display-panel.c:2078
 msgid "Mirror"
 msgstr "鏡射"
 
-#: ../panels/display/cc-display-panel.c:2065
+#: ../panels/display/cc-display-panel.c:2079
 msgid "Show your existing view on both displays"
 msgstr "在兩個顯示器顯示你現有的檢視"
 
-#: ../panels/display/cc-display-panel.c:2071
-#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/cc-display-panel.c:2085
 msgid "Turn Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:2072
+#: ../panels/display/cc-display-panel.c:2086
 msgid "Don't use this display"
 msgstr "不使用這個顯示器"
 
-#: ../panels/display/cc-display-panel.c:2289
+#: ../panels/display/cc-display-panel.c:2302
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
-#: ../panels/display/cc-display-panel.c:2320
+#: ../panels/display/cc-display-panel.c:2333
 msgid "_Arrange Combined Displays"
 msgstr "排列組合的顯示器(_A)"
 
-#: ../panels/display/display-capplet.ui.h:6
-msgid "Show your primary display on this screen also"
-msgstr "也在這個螢幕顯示你的主要顯示"
-
-#: ../panels/display/display-capplet.ui.h:7
-msgid "Combine"
-msgstr "組合"
-
-#: ../panels/display/display-capplet.ui.h:8
-msgid "Join with the primary display to create an extra space"
-msgstr "結合主要顯示器以建立額外的工作區"
-
-#: ../panels/display/display-capplet.ui.h:10
-msgid "Don't use the display"
-msgstr "不使用這個顯示器"
-
-#: ../panels/display/display-capplet.ui.h:11
-#: ../panels/printers/printers.ui.h:12
-msgid "Model"
-msgstr "型號"
-
-#: ../panels/display/display-capplet.ui.h:14
-msgid "Refresh Rate"
-msgstr "更新率"
-
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
 msgid "Displays"
 msgstr "顯示器"
@@ -1261,53 +1208,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;面板;投影機;螢幕;解像度;重新整理;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "不明"
 
-#: ../panels/info/cc-info-panel.c:532
+#: ../panels/info/cc-info-panel.c:534
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位元"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:536
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位元"
 
-#: ../panels/info/cc-info-panel.c:1214
+#: ../panels/info/cc-info-panel.c:1216
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1218
+#: ../panels/info/cc-info-panel.c:1220
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1222
+#: ../panels/info/cc-info-panel.c:1224
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1313
+#: ../panels/info/cc-info-panel.c:1315
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1346
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1347
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application for software CDs"
 msgstr "選擇軟件 CD 要用的應用程式"
 
@@ -1316,89 +1263,85 @@ msgstr "選擇軟件 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1362
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1363
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1364
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1367
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1368
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1369
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1370
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1371
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Windows software"
 msgstr "Windows 軟件"
 
-#: ../panels/info/cc-info-panel.c:1372
-msgid "Software"
-msgstr "軟件"
-
-#: ../panels/info/cc-info-panel.c:1495
+#: ../panels/info/cc-info-panel.c:1496
 #: ../panels/keyboard/keyboard-shortcuts.c:1696
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1505 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1516 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1540
+#: ../panels/info/cc-info-panel.c:1541
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1590
+#: ../panels/info/cc-info-panel.c:1591
 msgid "Install Updates"
 msgstr "安裝更新"
 
-#: ../panels/info/cc-info-panel.c:1594
+#: ../panels/info/cc-info-panel.c:1595
 msgid "System Up-To-Date"
 msgstr "系統已是最新"
 
-#: ../panels/info/cc-info-panel.c:1598
+#: ../panels/info/cc-info-panel.c:1599
 msgid "Checking for Updates"
 msgstr "正在檢查更新"
 
@@ -1561,7 +1504,7 @@ msgid "Eject"
 msgstr "退出"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 #: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "輸入"
@@ -1720,7 +1663,6 @@ msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "鍵盤"
 
@@ -1745,82 +1687,82 @@ msgstr "名稱(_N):"
 msgid "C_ommand:"
 msgstr "指令(_O):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Repeat Keys"
 msgstr "重複按鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
 msgid "Key presses _repeat when key is held down"
 msgstr "當按下某鍵不放時重複輸出該字符(_R)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
 msgid "_Delay:"
 msgstr "延遲(_D):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
 msgid "_Speed:"
 msgstr "速度(_S):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
 msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 msgid "Repeat keys speed"
 msgstr "按鍵重複速度"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
 msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "長"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
 msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
 msgid "Cursor Blinking"
 msgstr "游標閃爍"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 msgid "Cursor _blinks in text fields"
 msgstr "文字輸入欄中的游標可以閃爍(_B)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
 msgid "S_peed:"
 msgstr "速度(_P):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
 msgid "Cursor blink speed"
 msgstr "游標閃爍速度"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 #: ../panels/region/region.ui.h:5
 msgid "Input Sources"
 msgstr "輸入來源"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 msgid "Add Shortcut"
 msgstr "加入捷徑鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Remove Shortcut"
 msgstr "移除捷徑鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
 msgstr "要編輯捷徑鍵,點選相應的列並按下新的按鍵組合,或以 Backspace 鍵來清除。"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
@@ -1862,11 +1804,11 @@ msgstr "如果你重新指派捷徑鍵為「%s」,「%s」的捷徑鍵就會
 msgid "_Reassign"
 msgstr "重新指派(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:96
+#: ../panels/mouse/cc-mouse-panel.c:95
 msgid "Test Your _Settings"
 msgstr "測試你的設定值(_S)"
 
-#: ../panels/mouse/cc-mouse-panel.c:109
+#: ../panels/mouse/cc-mouse-panel.c:108
 msgid "Test Your Settings"
 msgstr "測試你的設定值"
 
@@ -1885,91 +1827,87 @@ msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;觸控板;指標;點擊;輕觸;連按兩下;按鈕;軌跡球;捲動;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Mouse Preferences"
-msgstr "滑鼠偏好設定"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "General"
 msgstr "一般"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgctxt "double click, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
 msgid "Double-click timeout"
 msgstr "連按兩下分辨時間"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgctxt "double click, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "_Double-click"
 msgstr "連按兩下(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "Primary _button"
 msgstr "主要按鈕(_B)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "左(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgctxt "mouse, right button as primary"
 msgid "_Right"
 msgstr "右(_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Mouse"
 msgstr "滑鼠"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "_Pointer speed"
 msgstr "指標速度(_P)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgctxt "mouse pointer, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgctxt "mouse pointer, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Touchpad"
 msgstr "觸控板"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgctxt "touchpad pointer, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgctxt "touchpad pointer, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Disable while _typing"
 msgstr "打字時停用(_T)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 msgid "Tap to _click"
 msgstr "輕觸表示點擊(_C)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
 msgid "Two _finger scroll"
 msgstr "兩指捲動(_F)"
 
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
 msgid "_Natural scrolling"
 msgstr "自然捲動(_N)"
 
@@ -2012,7 +1950,7 @@ msgstr "點選,次要按鈕"
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:928
+#: ../panels/network/cc-network-panel.c:930
 msgid "Network proxy"
 msgstr "網絡代理伺服器"
 
@@ -2020,14 +1958,14 @@ msgstr "網絡代理伺服器"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
-#: ../panels/network/net-vpn.c:438
+#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
+#: ../panels/network/net-vpn.c:431
 #, 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:1242
+#: ../panels/network/cc-network-panel.c:1244
 msgid "The system network services are not compatible with this version."
 msgstr "系統網絡服務與這個版本不兼容。"
 
@@ -2061,34 +1999,34 @@ msgstr "自動"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:221
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/net-device-wifi.c:216
+#: ../panels/network/net-device-wifi.c:377
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:225
-#: ../panels/network/net-device-wifi.c:387
+#: ../panels/network/net-device-wifi.c:220
+#: ../panels/network/net-device-wifi.c:382
 #: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:229
+#: ../panels/network/net-device-wifi.c:224
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/net-device-wifi.c:229
 msgid "Enterprise"
 msgstr "企業版"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:239
-#: ../panels/network/net-device-wifi.c:372
+#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/net-device-wifi.c:367
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
@@ -2109,8 +2047,8 @@ msgid "Yesterday"
 msgstr "昨日"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:125
-#: ../panels/network/net-device-wifi.c:476
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:471
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2119,37 +2057,37 @@ msgstr[0] "%i 天以前"
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
 #: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/net-device-wifi.c:528
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/net-device-wifi.c:557
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/net-device-wifi.c:559
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/net-device-wifi.c:561
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/net-device-wifi.c:563
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/net-device-wifi.c:565
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
@@ -2295,15 +2233,15 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:155
 #: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:159
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/net-device-ethernet.c:160
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
@@ -2311,14 +2249,14 @@ msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:166
+#: ../panels/network/net-device-ethernet.c:163
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:7
 msgid "Hardware Address"
 msgstr "硬件位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:170
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2328,7 +2266,7 @@ msgstr "預設路由"
 #: ../panels/network/connection-editor/details-page.ui.h:8
 #: ../panels/network/connection-editor/ip4-page.ui.h:3
 #: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:172
+#: ../panels/network/net-device-ethernet.c:169
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2474,7 +2412,7 @@ msgid "_Add"
 msgstr "加入(_A)"
 
 #: ../panels/network/connection-editor/net-connection-editor.c:595
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
@@ -2508,7 +2446,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1408
+#: ../panels/network/net-device-wifi.c:1403
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2552,7 +2490,7 @@ msgstr "選擇要匯入的檔案"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
 #: ../panels/printers/cc-printers-panel.c:1947
-#: ../panels/sharing/cc-sharing-panel.c:422
+#: ../panels/sharing/cc-sharing-panel.c:436
 #: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "開啟(_O)"
@@ -2637,29 +2575,29 @@ msgstr "繫結的連線"
 msgid "Bridge slaves"
 msgstr "橋接的連線"
 
-#: ../panels/network/net-device-ethernet.c:111
-#: ../panels/network/net-device-wifi.c:462
+#: ../panels/network/net-device-ethernet.c:108
+#: ../panels/network/net-device-wifi.c:457
 msgid "never"
 msgstr "永不"
 
-#: ../panels/network/net-device-ethernet.c:121
-#: ../panels/network/net-device-wifi.c:472
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:467
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:123
-#: ../panels/network/net-device-wifi.c:474
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:469
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:161
+#: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:3
 #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../panels/network/net-device-ethernet.c:177
+#: ../panels/network/net-device-ethernet.c:174
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "最後使用的"
@@ -2669,14 +2607,14 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:287
+#: ../panels/network/net-device-ethernet.c:284
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:355
-#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/net-device-ethernet.c:352
+#: ../panels/network/net-device-wifi.c:1558
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2684,67 +2622,67 @@ msgstr "有線"
 msgid "Options…"
 msgstr "選項…"
 
-#: ../panels/network/net-device-ethernet.c:492
+#: ../panels/network/net-device-ethernet.c:489
 #, c-format
 msgid "Profile %d"
 msgstr "設定組合 %d"
 
-#: ../panels/network/net-device-mobile.c:239
+#: ../panels/network/net-device-mobile.c:232
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: ../panels/network/net-device-wifi.c:1117
+#: ../panels/network/net-device-wifi.c:1110
 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:1121
+#: ../panels/network/net-device-wifi.c:1114
 #, 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:1125
+#: ../panels/network/net-device-wifi.c:1118
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過你的無線網絡存取互聯網的。"
 
-#: ../panels/network/net-device-wifi.c:1199
+#: ../panels/network/net-device-wifi.c:1192
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1202
+#: ../panels/network/net-device-wifi.c:1195
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1274
+#: ../panels/network/net-device-wifi.c:1267
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: ../panels/network/net-device-wifi.c:1277
+#: ../panels/network/net-device-wifi.c:1270
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: ../panels/network/net-device-wifi.c:1404
+#: ../panels/network/net-device-wifi.c:1399
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網絡的詳細資料包含密碼及任何自選的組態都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1714
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "歷史紀錄"
 
-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
+#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
 #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
-#: ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/wacom/cc-wacom-page.c:534
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/network/net-device-wifi.c:1738
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2763,7 +2701,7 @@ msgstr "當沒有提供組態 URL 時會使用網頁代理伺服器自動發現
 msgid "This is not recommended for untrusted public networks."
 msgstr "這不建議用於不信任的公用網絡。"
 
-#: ../panels/network/net-proxy.c:417
+#: ../panels/network/net-proxy.c:410
 msgid "Proxy"
 msgstr "代理伺服器"
 
@@ -2779,17 +2717,17 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "供應商"
 
-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
 msgctxt "proxy method"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "自動"
@@ -2842,19 +2780,7 @@ msgstr "Socks 代理伺服器通訊埠"
 msgid "Turn device off"
 msgstr "關閉裝置"
 
-#: ../panels/network/network.ui.h:1
-msgid "Select the interface to use for the new service"
-msgstr "選擇要用於新服務的介面"
-
-#: ../panels/network/network.ui.h:2
-msgid "C_reate…"
-msgstr "建立(_R)…"
-
-#: ../panels/network/network.ui.h:3
-msgid "_Interface"
-msgstr "介面(_I)"
-
-#: ../panels/network/network.ui.h:8
+#: ../panels/network/network.ui.h:5
 msgid "Add Device"
 msgstr "加入裝置"
 
@@ -2893,7 +2819,7 @@ msgstr "詳細資料"
 #: ../panels/network/wireless-security/ws-leap.ui.h:2
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Password"
 msgstr "密碼(_P)"
 
@@ -3580,12 +3506,12 @@ msgid "Show Details in Lock Screen"
 msgstr "在鎖定畫面中顯示詳細資料"
 
 #: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:117
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:610
-#: ../panels/universal-access/cc-ua-panel.c:736
+#: ../panels/power/cc-power-panel.c:1724 ../panels/power/cc-power-panel.c:1731
+#: ../panels/privacy/cc-privacy-panel.c:80
+#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
 msgid "On"
 msgstr "開啟"
 
@@ -3702,17 +3628,17 @@ msgid ""
 "contacts, calendar, chat and more."
 msgstr "加入一個帳號以允許你的應用程式存取它用於文件、郵件、聯絡人、行事曆、聊天等等。"
 
-#: ../panels/power/cc-power-panel.c:187
+#: ../panels/power/cc-power-panel.c:195
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: ../panels/power/cc-power-panel.c:193
+#: ../panels/power/cc-power-panel.c:201
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: ../panels/power/cc-power-panel.c:205
+#: ../panels/power/cc-power-panel.c:213
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3720,224 +3646,224 @@ msgstr[0] "%i 小時"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:213
+#: ../panels/power/cc-power-panel.c:221
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:214
+#: ../panels/power/cc-power-panel.c:222
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../panels/power/cc-power-panel.c:215
+#: ../panels/power/cc-power-panel.c:223
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:234
+#: ../panels/power/cc-power-panel.c:242
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s後完全充飽"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:249
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意:剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:246
+#: ../panels/power/cc-power-panel.c:254
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
+#: ../panels/power/cc-power-panel.c:259 ../panels/power/cc-power-panel.c:287
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:263 ../panels/power/cc-power-panel.c:291
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
+#: ../panels/power/cc-power-panel.c:278
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:275
+#: ../panels/power/cc-power-panel.c:283
 msgid "Discharging"
 msgstr "放電中"
 
-#: ../panels/power/cc-power-panel.c:393
+#: ../panels/power/cc-power-panel.c:403
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: ../panels/power/cc-power-panel.c:395
+#: ../panels/power/cc-power-panel.c:405
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:486
+#: ../panels/power/cc-power-panel.c:477
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:490
+#: ../panels/power/cc-power-panel.c:480
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:494
+#: ../panels/power/cc-power-panel.c:483
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:499
+#: ../panels/power/cc-power-panel.c:486
 msgid "Personal digital assistant"
 msgstr "個人數碼助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:503
+#: ../panels/power/cc-power-panel.c:489
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:507
+#: ../panels/power/cc-power-panel.c:492
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:511
+#: ../panels/power/cc-power-panel.c:495
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:515
+#: ../panels/power/cc-power-panel.c:498
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
-#: ../panels/power/cc-power-panel.c:2064
+#: ../panels/power/cc-power-panel.c:501 ../panels/power/cc-power-panel.c:724
+#: ../panels/power/cc-power-panel.c:2055
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:528
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
+#: ../panels/power/cc-power-panel.c:554
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: ../panels/power/cc-power-panel.c:559
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:545
+#: ../panels/power/cc-power-panel.c:564
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:550
+#: ../panels/power/cc-power-panel.c:569
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:554
+#: ../panels/power/cc-power-panel.c:573
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: ../panels/power/cc-power-panel.c:727
+#: ../panels/power/cc-power-panel.c:722
 msgid "Batteries"
 msgstr "電池"
 
-#: ../panels/power/cc-power-panel.c:1133
+#: ../panels/power/cc-power-panel.c:1124
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1502
+#: ../panels/power/cc-power-panel.c:1493
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1530
+#: ../panels/power/cc-power-panel.c:1521
 msgid "_Screen brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1536
+#: ../panels/power/cc-power-panel.c:1527
 msgid "_Keyboard brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1546
+#: ../panels/power/cc-power-panel.c:1537
 msgid "_Dim screen when inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1571
+#: ../panels/power/cc-power-panel.c:1562
 msgid "_Blank screen"
 msgstr "螢幕轉黑(_B)"
 
-#: ../panels/power/cc-power-panel.c:1608
+#: ../panels/power/cc-power-panel.c:1599
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1613
+#: ../panels/power/cc-power-panel.c:1604
 msgid "Turns off wireless devices"
 msgstr "關閉無線裝置"
 
-#: ../panels/power/cc-power-panel.c:1638
+#: ../panels/power/cc-power-panel.c:1629
 msgid "_Mobile broadband"
 msgstr "流動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1643
+#: ../panels/power/cc-power-panel.c:1634
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "關閉流動寬頻 (3G、4G、WiMax 等) 裝置"
 
-#: ../panels/power/cc-power-panel.c:1678
+#: ../panels/power/cc-power-panel.c:1669
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1729
+#: ../panels/power/cc-power-panel.c:1720
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1731
+#: ../panels/power/cc-power-panel.c:1722
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:1860
+#: ../panels/power/cc-power-panel.c:1851
 msgid "Suspend & Power Off"
 msgstr "暫停與關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1893
+#: ../panels/power/cc-power-panel.c:1884
 msgid "_Automatic suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:1917
+#: ../panels/power/cc-power-panel.c:1908
 msgid "When battery power is _critical"
 msgstr "當電池的電量極低時(_C)"
 
-#: ../panels/power/cc-power-panel.c:1974
+#: ../panels/power/cc-power-panel.c:1965
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: ../panels/power/cc-power-panel.c:2111
+#: ../panels/power/cc-power-panel.c:2102
 msgid "Devices"
 msgstr "裝置"
 
@@ -4402,12 +4328,12 @@ msgid "%s Active Jobs"
 msgstr "%s 使用中的工作"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1667
+#: ../panels/printers/pp-new-printer-dialog.c:1669
 msgid "Server requires authentication"
 msgstr "伺服器需要核對"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1704
+#: ../panels/printers/pp-new-printer-dialog.c:1706
 msgid "No printers detected."
 msgstr "未偵測到打印機。"
 
@@ -4578,6 +4504,10 @@ msgstr "工作"
 msgid "Show _Jobs"
 msgstr "顯示工作(_J)"
 
+#: ../panels/printers/printers.ui.h:12
+msgid "Model"
+msgstr "型號"
+
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "標籤"
@@ -4614,39 +4544,39 @@ msgstr ""
 "抱歉!系統列印服務\n"
 "似乎無法使用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
 msgid "Usage & History"
 msgstr "使用與歷史紀錄"
 
-#: ../panels/privacy/cc-privacy-panel.c:486
+#: ../panels/privacy/cc-privacy-panel.c:489
 msgid "Empty all items from Trash?"
 msgstr "要清除回收筒中所有的項目?"
 
-#: ../panels/privacy/cc-privacy-panel.c:487
+#: ../panels/privacy/cc-privacy-panel.c:490
 msgid "All items in the Trash will be permanently deleted."
 msgstr "所有在回收筒中的項目會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:511
+#: ../panels/privacy/cc-privacy-panel.c:514
 msgid "Delete all the temporary files?"
 msgstr "刪除所有暫存檔案?"
 
-#: ../panels/privacy/cc-privacy-panel.c:512
+#: ../panels/privacy/cc-privacy-panel.c:515
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有的暫存檔案會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
 msgid "Purge Trash & Temporary Files"
 msgstr "清除回收筒與暫存檔案"
 
@@ -4792,32 +4722,27 @@ msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/region/cc-region-panel.c:239
+#: ../panels/region/cc-region-panel.c:242
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "你的作業階段需要重新啟動以讓更改生效"
 
-#: ../panels/region/cc-region-panel.c:240
+#: ../panels/region/cc-region-panel.c:243
 msgid "Restart Now"
 msgstr "立刻重新啟動"
 
-#: ../panels/region/cc-region-panel.c:569
-msgctxt "Language"
-msgid "None"
-msgstr "沒有"
-
-#: ../panels/region/cc-region-panel.c:853
+#: ../panels/region/cc-region-panel.c:903
 msgid "No input source selected"
 msgstr "尚未選擇輸入來源"
 
-#: ../panels/region/cc-region-panel.c:1084
+#: ../panels/region/cc-region-panel.c:1134
 msgid "Sorry"
 msgstr "抱歉"
 
-#: ../panels/region/cc-region-panel.c:1086
+#: ../panels/region/cc-region-panel.c:1136
 msgid "Input methods can't be used on the login screen"
 msgstr "輸入法不能用在登入畫面"
 
-#: ../panels/region/cc-region-panel.c:1716
+#: ../panels/region/cc-region-panel.c:1765
 msgid "Login Screen"
 msgstr "登入畫面"
 
@@ -4988,21 +4913,21 @@ msgstr "往下移"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:285
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:287
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/sharing/cc-sharing-panel.c:418
+#: ../panels/sharing/cc-sharing-panel.c:432
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: ../panels/sharing/cc-sharing-panel.c:702
+#: ../panels/sharing/cc-sharing-panel.c:739
 msgid "Copy"
 msgstr "複製"
 
@@ -5386,9 +5311,9 @@ msgstr "讓電腦更容易看、聽、輸入、指向與點選"
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
 msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
-msgstr "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky 
Keys;Slow Keys;Bounce Keys;Mouse Keys;鍵盤;滑鼠;無障礙;對比;螢幕閱讀器;文字;字型;大小;相黏鍵;遲緩鍵;彈跳鍵;滑鼠按鍵;"
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
+msgstr "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen 
Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;彈跳;滑鼠;鍵;按鍵"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5835,7 +5760,7 @@ msgid "_Full Name"
 msgstr "全名(_F)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Account _Type"
 msgstr "帳號類型(_T)"
 
@@ -5986,69 +5911,35 @@ msgstr "目前的密碼(_P)"
 msgid "Ch_ange"
 msgstr "改變(_A)"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
-msgid "Changing photo for:"
-msgstr "正在改變相片:"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
-msgid ""
-"Choose a picture that will be shown at the login screen for this account."
-msgstr "選擇這個帳號要顯示在登入畫面的照片。"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Gallery"
-msgstr "藝廊"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "瀏覽更多照片"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid "Take a photograph"
-msgstr "照一張相片"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
-msgid "Browse"
-msgstr "瀏覽"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
-msgid "Photograph"
-msgstr "相片"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Account Information"
-msgstr "帳號資訊"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Add User Account"
 msgstr "加入使用者帳號"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Remove User Account"
 msgstr "移除使用者帳號"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Login Options"
 msgstr "登入選項"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "自動登入(_U):"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Fingerprint Login"
 msgstr "指紋登入(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "User Icon"
 msgstr "使用者圖示"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "語言(_L)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "上次登入"
 
@@ -6455,6 +6346,10 @@ msgstr "密碼無法更改"
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
+#: ../panels/user-accounts/um-photo-dialog.c:218
+msgid "Browse for more pictures"
+msgstr "瀏覽更多照片"
+
 #: ../panels/user-accounts/um-photo-dialog.c:443
 msgid "Disable image"
 msgstr "停用圖片"
@@ -6706,7 +6601,7 @@ msgstr "映射到單一螢幕"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:522
+#: ../panels/wacom/cc-wacom-page.c:531
 msgid "Display Mapping"
 msgstr "顯示對應"
 
@@ -6841,22 +6736,22 @@ msgstr "右觸控列模式切換"
 msgid "Mode Switch #%d"
 msgstr "模式切換 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1336
+#: ../panels/wacom/gsd-wacom-device.c:1335
 #, c-format
 msgid "Left Button #%d"
 msgstr "左側按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1339
+#: ../panels/wacom/gsd-wacom-device.c:1338
 #, c-format
 msgid "Right Button #%d"
 msgstr "右側按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1342
+#: ../panels/wacom/gsd-wacom-device.c:1341
 #, c-format
 msgid "Top Button #%d"
 msgstr "頂端按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1345
+#: ../panels/wacom/gsd-wacom-device.c:1344
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "底部按鈕 #%d"
@@ -7015,6 +6910,76 @@ msgstr "設定值"
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
 
+#~ msgid "Device type:"
+#~ msgstr "裝置類型:"
+
+#~ msgid "Manufacturer:"
+#~ msgstr "製造商:"
+
+#~ msgid "Model:"
+#~ msgstr "型號:"
+
+#~ msgid ""
+#~ "Image files can be dragged on this window to auto-complete the above "
+#~ "fields."
+#~ msgstr "可以將圖片檔案拖放到這個視窗自動完成上列欄位。"
+
+#~ msgid "Show your primary display on this screen also"
+#~ msgstr "也在這個螢幕顯示您的主要顯示"
+
+#~ msgid "Combine"
+#~ msgstr "組合"
+
+#~ msgid "Join with the primary display to create an extra space"
+#~ msgstr "結合主要顯示器以建立額外的工作區"
+
+#~ msgid "Don't use the display"
+#~ msgstr "不使用這個顯示器"
+
+#~ msgid "Refresh Rate"
+#~ msgstr "更新率"
+
+#~ msgid "Software"
+#~ msgstr "軟體"
+
+#~ msgid "Mouse Preferences"
+#~ msgstr "滑鼠偏好設定"
+
+#~ msgid "Select the interface to use for the new service"
+#~ msgstr "選擇要用於新服務的介面"
+
+#~ msgid "C_reate…"
+#~ msgstr "建立(_R)…"
+
+#~ msgid "_Interface"
+#~ msgstr "介面(_I)"
+
+#~ msgctxt "Language"
+#~ msgid "None"
+#~ msgstr "沒有"
+
+#~ msgid "Changing photo for:"
+#~ msgstr "正在改變相片:"
+
+#~ msgid ""
+#~ "Choose a picture that will be shown at the login screen for this account."
+#~ msgstr "選擇這個帳號要顯示在登入畫面的照片。"
+
+#~ msgid "Gallery"
+#~ msgstr "藝廊"
+
+#~ msgid "Take a photograph"
+#~ msgstr "照一張相片"
+
+#~ msgid "Browse"
+#~ msgstr "瀏覽"
+
+#~ msgid "Photograph"
+#~ msgstr "相片"
+
+#~ msgid "Account Information"
+#~ msgstr "帳號資訊"
+
 #~ msgid "Switch between AM and PM."
 #~ msgstr "在上午與下午之間切換。"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 035a286..1d3935d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,8 +14,8 @@ 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-09-28 19:50+0000\n"
-"PO-Revision-Date: 2013-09-29 16:53+0800\n"
+"POT-Creation-Date: 2013-10-30 11:45+0000\n"
+"PO-Revision-Date: 2013-10-30 23:37+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "Language: \n"
@@ -70,7 +70,7 @@ msgid "Span"
 msgstr "合併"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:293
+#: ../panels/background/cc-background-chooser-dialog.c:292
 msgid "Select Background"
 msgstr "選擇背景"
 
@@ -91,32 +91,32 @@ msgid "Flickr"
 msgstr "Flickr"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:393
+#: ../panels/background/cc-background-chooser-dialog.c:385
 msgid "No Pictures Found"
 msgstr "找不到圖片"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:408
+#: ../panels/background/cc-background-chooser-dialog.c:400
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "您可以將影像加入您的%s資料夾,它們會顯示在這裡"
 
-#: ../panels/background/cc-background-chooser-dialog.c:436
+#: ../panels/background/cc-background-chooser-dialog.c:428
 #: ../panels/bluetooth/cc-bluetooth-panel.c:640
-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
-#: ../panels/display/cc-display-panel.c:1495
-#: ../panels/display/cc-display-panel.c:1910
+#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+#: ../panels/display/cc-display-panel.c:1509
+#: ../panels/display/cc-display-panel.c:1924
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1201
-#: ../panels/network/net-device-wifi.c:1407
+#: ../panels/network/net-device-wifi.c:1194
+#: ../panels/network/net-device-wifi.c:1402
 #: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
 #: ../panels/printers/cc-printers-panel.c:1946
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:467
+#: ../panels/privacy/cc-privacy-panel.c:470
 #: ../panels/search/cc-search-locations-dialog.c:682
-#: ../panels/sharing/cc-sharing-panel.c:421
+#: ../panels/sharing/cc-sharing-panel.c:435
 #: ../panels/user-accounts/um-fingerprint-dialog.c:269
 #: ../panels/user-accounts/um-photo-dialog.c:96
 #: ../panels/user-accounts/um-photo-dialog.c:221
@@ -124,9 +124,8 @@ msgstr "您可以將影像加入您的%s資料夾,它們會顯示在這裡"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:429
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
 #: ../panels/user-accounts/um-photo-dialog.c:98
 msgid "Select"
 msgstr "選取"
@@ -146,7 +145,7 @@ msgstr "%d × %d"
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: ../panels/background/cc-background-panel.c:492
+#: ../panels/background/cc-background-panel.c:493
 msgid "Current background"
 msgstr "目前的背景"
 
@@ -163,7 +162,7 @@ msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 msgid "Set Up New Device"
 msgstr "設置新裝置"
 
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
 msgid "Remove Device"
 msgstr "移除裝置"
 
@@ -272,14 +271,14 @@ 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
+#: ../panels/color/cc-color-calibrate.c:361
 msgid "Place your calibration device over the square and press 'Start'"
 msgstr "將您的校準裝置放在矩形上並按「開始」"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:366
+#: ../panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press 'Continue'"
 msgstr "將您的校準裝置移到校準位置並按「繼續」"
@@ -287,7 +286,7 @@ msgstr "將您的校準裝置移到校準位置並按「繼續」"
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:372
+#: ../panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press 'Continue'"
 msgstr "將您的校準裝置移到表面位置並按「繼續」"
@@ -295,54 +294,54 @@ msgstr "將您的校準裝置移到表面位置並按「繼續」"
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:378
+#: ../panels/color/cc-color-calibrate.c:379
 msgid "Shut the laptop lid"
 msgstr "關上筆記型電腦上蓋"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:409
+#: ../panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
 msgstr "發生內部的錯誤,無法復原。"
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:414
+#: ../panels/color/cc-color-calibrate.c:415
 msgid "Tools required for calibration are not installed."
 msgstr "校準所需的工具尚未安裝。"
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:420
+#: ../panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
 msgstr "無法產生描述檔。"
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:426
+#: ../panels/color/cc-color-calibrate.c:427
 msgid "The target whitepoint was not obtainable."
 msgstr "尚無法獲取目標白點。"
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:466
+#: ../panels/color/cc-color-calibrate.c:467
 msgid "Complete!"
 msgstr "完成!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:474
+#: ../panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "校準已失敗!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:481
+#: ../panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
 msgstr "您可以移除校準裝置。"
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:552
+#: ../panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "過程中請勿干擾校準裝置"
 
@@ -404,48 +403,48 @@ msgstr "尚未校準"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:135
+#: ../panels/color/cc-color-panel.c:137
 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:143
+#: ../panels/color/cc-color-panel.c:145
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:150
+#: ../panels/color/cc-color-panel.c:152
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:218
+#: ../panels/color/cc-color-panel.c:219
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: ../panels/color/cc-color-panel.c:221
+#: ../panels/color/cc-color-panel.c:222
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:232
+#: ../panels/color/cc-color-panel.c:233
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:239
+#: ../panels/color/cc-color-panel.c:240
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../panels/color/cc-color-panel.c:586
+#: ../panels/color/cc-color-panel.c:579
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:912
+#: ../panels/color/cc-color-panel.c:903
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上傳檔案失敗:%s"
@@ -453,51 +452,51 @@ msgstr "上傳檔案失敗:%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:926
+#: ../panels/color/cc-color-panel.c:917
 msgid "The profile has been uploaded to:"
 msgstr "描述檔已經上傳到:"
 
-#: ../panels/color/cc-color-panel.c:928
+#: ../panels/color/cc-color-panel.c:919
 msgid "Write down this URL."
 msgstr "寫下這個 URL。"
 
-#: ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:920
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重新啟動這臺電腦並開機進入您一般的作業系統。"
 
-#: ../panels/color/cc-color-panel.c:930
+#: ../panels/color/cc-color-panel.c:921
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "在您的瀏覽器中輸入 URL 以下載並安裝描述檔。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:964
+#: ../panels/color/cc-color-panel.c:955
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
-#: ../panels/color/cc-color-panel.c:968
+#: ../panels/color/cc-color-panel.c:959
 #: ../panels/network/connection-editor/vpn-helpers.c:375
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1328
+#: ../panels/color/cc-color-panel.c:1315
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
+#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
 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:1377
+#: ../panels/color/cc-color-panel.c:1364
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援印表機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1388
+#: ../panels/color/cc-color-panel.c:1375
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
@@ -584,7 +583,6 @@ 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:1470
 msgid "Cancel"
 msgstr "取消"
@@ -605,7 +603,7 @@ msgid "Done"
 msgstr "完成"
 
 #. Timeout parameters
-#. 5000 = 5 sec
+#. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
 #: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
@@ -742,164 +740,146 @@ msgid ""
 msgstr "偵測到問題。描述檔可能無法正常運作。<a href=\"\">顯示詳細資料。</a>"
 
 #: ../panels/color/color.ui.h:30
-msgid "Device type:"
-msgstr "裝置類型:"
-
-#: ../panels/color/color.ui.h:31
-msgid "Manufacturer:"
-msgstr "製造商:"
-
-#: ../panels/color/color.ui.h:32
-msgid "Model:"
-msgstr "型號:"
-
-#: ../panels/color/color.ui.h:33
-msgid ""
-"Image files can be dragged on this window to auto-complete the above fields."
-msgstr "可以將圖片檔案拖放到這個視窗自動完成上列欄位。"
-
-#: ../panels/color/color.ui.h:34
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "顏色"
-
-#: ../panels/color/color.ui.h:35
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "每個裝置需要最新的色彩描述檔才能被管理顏色。"
 
-#: ../panels/color/color.ui.h:36
+#: ../panels/color/color.ui.h:31
 msgid "Learn more"
 msgstr "了解更多"
 
-#: ../panels/color/color.ui.h:37
+#: ../panels/color/color.ui.h:32
 msgid "Learn more about color management"
 msgstr "了解更多關於顏色管理的資訊"
 
-#: ../panels/color/color.ui.h:38
+#: ../panels/color/color.ui.h:33
 msgid "Set for all users"
 msgstr "所有使用者皆可用"
 
-#: ../panels/color/color.ui.h:39
+#: ../panels/color/color.ui.h:34
 msgid "Set this profile for all users on this computer"
 msgstr "將這個描述檔給電腦上所有使用者"
 
-#: ../panels/color/color.ui.h:40
+#: ../panels/color/color.ui.h:35
 msgid "Enable"
 msgstr "啟用"
 
-#: ../panels/color/color.ui.h:41
+#: ../panels/color/color.ui.h:36
 msgid "Add profile"
 msgstr "加入描述檔"
 
-#: ../panels/color/color.ui.h:42
+#: ../panels/color/color.ui.h:37
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Calibrate…"
 msgstr "校準…"
 
-#: ../panels/color/color.ui.h:43
+#: ../panels/color/color.ui.h:38
 msgid "Calibrate the device"
 msgstr "校準裝置"
 
-#: ../panels/color/color.ui.h:44
+#: ../panels/color/color.ui.h:39
 msgid "Remove profile"
 msgstr "移除描述檔"
 
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:40
 msgid "View details"
 msgstr "檢視詳細資料"
 
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:41
 msgid "Unable to detect any devices that can be color managed"
 msgstr "無法偵測到任何能被管理顏色的裝置"
 
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:42
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:43
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:44
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:45
 msgid "Projector"
 msgstr "投影機"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:46
 msgid "Plasma"
 msgstr "電漿"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:47
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:48
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:49
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED 背光)"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:50
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "廣色域 LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:51
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "廣色域 LCD (RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:52
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:53
 msgid "40 minutes"
 msgstr "40 分鐘"
 
-#: ../panels/color/color.ui.h:59
+#: ../panels/color/color.ui.h:54
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 分鐘"
 
-#: ../panels/color/color.ui.h:61
+#: ../panels/color/color.ui.h:56
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "15 分鐘"
 
-#: ../panels/color/color.ui.h:63
+#: ../panels/color/color.ui.h:58
 msgid "Native to display"
 msgstr "原生顯示"
 
-#: ../panels/color/color.ui.h:64
+#: ../panels/color/color.ui.h:59
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (列印與出版)"
 
-#: ../panels/color/color.ui.h:65
+#: ../panels/color/color.ui.h:60
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:66
+#: ../panels/color/color.ui.h:61
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (攝影與繪圖)"
 
-#: ../panels/color/color.ui.h:67
+#: ../panels/color/color.ui.h:62
 msgid "D75"
 msgstr "D75"
 
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "顏色"
+
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
@@ -952,33 +932,33 @@ msgid "Language"
 msgstr "語言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:112 ../panels/region/format-chooser.ui.h:2
+#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
 msgid "_Done"
 msgstr "完成(_D)"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:352
+#: ../panels/datetime/cc-datetime-panel.c:363
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%b%e日, %p %l:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:357
+#: ../panels/datetime/cc-datetime-panel.c:368
 msgid "%e %B %Y, %R"
 msgstr "%Y年%b%e日,%R"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:573
+#: ../panels/datetime/cc-datetime-panel.c:584
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:578
+#: ../panels/datetime/cc-datetime-panel.c:589
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:583
+#: ../panels/datetime/cc-datetime-panel.c:594
 msgid "%R"
 msgstr "%R"
 
@@ -1117,143 +1097,110 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,您需要通過核對。"
 
-#: ../panels/display/cc-display-panel.c:473
+#: ../panels/display/cc-display-panel.c:485
 msgid "Lid Closed"
 msgstr "上蓋已經關閉"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:476
+#: ../panels/display/cc-display-panel.c:488
 msgid "Mirrored"
 msgstr "鏡射顯示器"
 
-#: ../panels/display/cc-display-panel.c:478
-#: ../panels/display/cc-display-panel.c:2043
-#: ../panels/display/display-capplet.ui.h:1
+#: ../panels/display/cc-display-panel.c:490
+#: ../panels/display/cc-display-panel.c:2057
 msgid "Primary"
 msgstr "主要"
 
-#: ../panels/display/cc-display-panel.c:480
+#: ../panels/display/cc-display-panel.c:492
 #: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1727 ../panels/power/cc-power-panel.c:1738
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:117
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:610
-#: ../panels/universal-access/cc-ua-panel.c:736
+#: ../panels/power/cc-power-panel.c:1718 ../panels/power/cc-power-panel.c:1729
+#: ../panels/privacy/cc-privacy-panel.c:80
+#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:495
 msgid "Secondary"
 msgstr "次要"
 
-#: ../panels/display/cc-display-panel.c:1491
+#: ../panels/display/cc-display-panel.c:1505
 msgid "Arrange Combined Displays"
-msgstr "排列組合的顯示器"
+msgstr "排列顯示器的組合方式"
 
-#: ../panels/display/cc-display-panel.c:1497
-#: ../panels/display/cc-display-panel.c:1913
+#: ../panels/display/cc-display-panel.c:1511
+#: ../panels/display/cc-display-panel.c:1927
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1518
+#: ../panels/display/cc-display-panel.c:1532
 msgid "Drag displays to rearrange them"
 msgstr "拖拉顯示器以重新排列他們"
 
 #. size
-#: ../panels/display/cc-display-panel.c:1977
+#: ../panels/display/cc-display-panel.c:1991
 msgid "Size"
 msgstr "尺寸"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:1992
-#: ../panels/display/display-capplet.ui.h:12
+#: ../panels/display/cc-display-panel.c:2006
 msgid "Aspect Ratio"
 msgstr "長寬比"
 
-#: ../panels/display/cc-display-panel.c:2013
-#: ../panels/display/display-capplet.ui.h:13
+#: ../panels/display/cc-display-panel.c:2027
 #: ../panels/printers/pp-options-dialog.c:86
 msgid "Resolution"
 msgstr "解析度"
 
-#: ../panels/display/cc-display-panel.c:2044
-#: ../panels/display/display-capplet.ui.h:2
+#: ../panels/display/cc-display-panel.c:2058
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "在這個顯示器顯示頂端列與活動概覽"
 
-#: ../panels/display/cc-display-panel.c:2050
+#: ../panels/display/cc-display-panel.c:2064
 msgid "Secondary Display"
 msgstr "次要顯示器"
 
-#: ../panels/display/cc-display-panel.c:2051
+#: ../panels/display/cc-display-panel.c:2065
 msgid "Join this display with another to create an extra workspace"
 msgstr "將這個顯示器與另一個顯示器結合以建立額外的工作區"
 
-#: ../panels/display/cc-display-panel.c:2058
-#: ../panels/display/display-capplet.ui.h:3
+#: ../panels/display/cc-display-panel.c:2072
 msgid "Presentation"
 msgstr "展示"
 
-#: ../panels/display/cc-display-panel.c:2059
-#: ../panels/display/display-capplet.ui.h:4
+#: ../panels/display/cc-display-panel.c:2073
 msgid "Show slideshows and media only"
 msgstr "只顯示投影片與媒體"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2064
-#: ../panels/display/display-capplet.ui.h:5
+#: ../panels/display/cc-display-panel.c:2078
 msgid "Mirror"
 msgstr "鏡射"
 
-#: ../panels/display/cc-display-panel.c:2065
+#: ../panels/display/cc-display-panel.c:2079
 msgid "Show your existing view on both displays"
 msgstr "在兩個顯示器顯示您現有的檢視"
 
-#: ../panels/display/cc-display-panel.c:2071
-#: ../panels/display/display-capplet.ui.h:9
+#: ../panels/display/cc-display-panel.c:2085
 msgid "Turn Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:2072
+#: ../panels/display/cc-display-panel.c:2086
 msgid "Don't use this display"
 msgstr "不使用這個顯示器"
 
-#: ../panels/display/cc-display-panel.c:2289
+#: ../panels/display/cc-display-panel.c:2302
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
-#: ../panels/display/cc-display-panel.c:2320
+#: ../panels/display/cc-display-panel.c:2333
 msgid "_Arrange Combined Displays"
 msgstr "排列組合的顯示器(_A)"
 
-#: ../panels/display/display-capplet.ui.h:6
-msgid "Show your primary display on this screen also"
-msgstr "也在這個螢幕顯示您的主要顯示"
-
-#: ../panels/display/display-capplet.ui.h:7
-msgid "Combine"
-msgstr "組合"
-
-#: ../panels/display/display-capplet.ui.h:8
-msgid "Join with the primary display to create an extra space"
-msgstr "結合主要顯示器以建立額外的工作區"
-
-#: ../panels/display/display-capplet.ui.h:10
-msgid "Don't use the display"
-msgstr "不使用這個顯示器"
-
-#: ../panels/display/display-capplet.ui.h:11
-#: ../panels/printers/printers.ui.h:12
-msgid "Model"
-msgstr "型號"
-
-#: ../panels/display/display-capplet.ui.h:14
-msgid "Refresh Rate"
-msgstr "更新率"
-
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
 msgid "Displays"
 msgstr "顯示器"
@@ -1270,53 +1217,53 @@ msgstr ""
 "整理;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "不明"
 
-#: ../panels/info/cc-info-panel.c:532
+#: ../panels/info/cc-info-panel.c:534
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位元"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:536
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位元"
 
-#: ../panels/info/cc-info-panel.c:1214
+#: ../panels/info/cc-info-panel.c:1216
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1218
+#: ../panels/info/cc-info-panel.c:1220
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1222
+#: ../panels/info/cc-info-panel.c:1224
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1313
+#: ../panels/info/cc-info-panel.c:1315
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1346
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1347
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application for software CDs"
 msgstr "選擇軟體 CD 要用的應用程式"
 
@@ -1325,89 +1272,85 @@ msgstr "選擇軟體 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1362
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1363
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1364
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1367
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1368
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1369
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1370
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1371
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Windows software"
 msgstr "Windows 軟體"
 
-#: ../panels/info/cc-info-panel.c:1372
-msgid "Software"
-msgstr "軟體"
-
-#: ../panels/info/cc-info-panel.c:1495
+#: ../panels/info/cc-info-panel.c:1496
 #: ../panels/keyboard/keyboard-shortcuts.c:1696
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1505 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1516 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1540
+#: ../panels/info/cc-info-panel.c:1541
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1590
+#: ../panels/info/cc-info-panel.c:1591
 msgid "Install Updates"
 msgstr "安裝更新"
 
-#: ../panels/info/cc-info-panel.c:1594
+#: ../panels/info/cc-info-panel.c:1595
 msgid "System Up-To-Date"
 msgstr "系統已是最新"
 
-#: ../panels/info/cc-info-panel.c:1598
+#: ../panels/info/cc-info-panel.c:1599
 msgid "Checking for Updates"
 msgstr "正在檢查更新"
 
@@ -1573,7 +1516,7 @@ msgid "Eject"
 msgstr "退出"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 #: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "輸入"
@@ -1732,7 +1675,6 @@ msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "鍵盤"
 
@@ -1757,83 +1699,83 @@ msgstr "名稱(_N):"
 msgid "C_ommand:"
 msgstr "指令(_O):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Repeat Keys"
 msgstr "重複按鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
 msgid "Key presses _repeat when key is held down"
 msgstr "當按下某鍵不放時重複輸出該字元(_R)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
 msgid "_Delay:"
 msgstr "延遲(_D):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
 msgid "_Speed:"
 msgstr "速度(_S):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
 msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 msgid "Repeat keys speed"
 msgstr "按鍵重複速度"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
 msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "長"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
 msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
 msgid "Cursor Blinking"
 msgstr "游標閃爍"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 msgid "Cursor _blinks in text fields"
 msgstr "文字輸入欄中的游標可以閃爍(_B)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
 msgid "S_peed:"
 msgstr "速度(_P):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
 msgid "Cursor blink speed"
 msgstr "游標閃爍速度"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 #: ../panels/region/region.ui.h:5
 msgid "Input Sources"
 msgstr "輸入來源"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 msgid "Add Shortcut"
 msgstr "加入捷徑鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Remove Shortcut"
 msgstr "移除捷徑鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
 msgstr ""
 "要編輯捷徑鍵,點選相應的列並按下新的按鍵組合,或以 Backspace 鍵來清除。"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
@@ -1875,11 +1817,11 @@ msgstr "如果您重新指派捷徑鍵為「%s」,「%s」的捷徑鍵就會
 msgid "_Reassign"
 msgstr "重新指派(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:96
+#: ../panels/mouse/cc-mouse-panel.c:95
 msgid "Test Your _Settings"
 msgstr "測試您的設定值(_S)"
 
-#: ../panels/mouse/cc-mouse-panel.c:109
+#: ../panels/mouse/cc-mouse-panel.c:108
 msgid "Test Your Settings"
 msgstr "測試您的設定值"
 
@@ -1900,91 +1842,87 @@ msgstr ""
 "觸;雙擊;按鈕;軌跡球;捲動;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Mouse Preferences"
-msgstr "滑鼠偏好設定"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "General"
 msgstr "一般"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgctxt "double click, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
 msgid "Double-click timeout"
 msgstr "雙擊分辨時間"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgctxt "double click, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "_Double-click"
 msgstr "雙擊(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "Primary _button"
 msgstr "主要按鈕(_B)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "左(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgctxt "mouse, right button as primary"
 msgid "_Right"
 msgstr "右(_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Mouse"
 msgstr "滑鼠"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "_Pointer speed"
 msgstr "指標速度(_P)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgctxt "mouse pointer, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgctxt "mouse pointer, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Touchpad"
 msgstr "觸控板"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgctxt "touchpad pointer, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgctxt "touchpad pointer, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Disable while _typing"
 msgstr "打字時停用(_T)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 msgid "Tap to _click"
 msgstr "輕觸表示點擊(_C)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
 msgid "Two _finger scroll"
 msgstr "兩指捲動(_F)"
 
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
 msgid "_Natural scrolling"
 msgstr "自然捲動(_N)"
 
@@ -2027,7 +1965,7 @@ msgstr "單擊,次要按鈕"
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:928
+#: ../panels/network/cc-network-panel.c:930
 msgid "Network proxy"
 msgstr "網路代理伺服器"
 
@@ -2035,14 +1973,14 @@ msgstr "網路代理伺服器"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1107 ../panels/network/net-vpn.c:285
-#: ../panels/network/net-vpn.c:438
+#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
+#: ../panels/network/net-vpn.c:431
 #, 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:1242
+#: ../panels/network/cc-network-panel.c:1244
 msgid "The system network services are not compatible with this version."
 msgstr "系統網路服務與這個版本不相容。"
 
@@ -2076,34 +2014,34 @@ msgstr "自動"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:221
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/net-device-wifi.c:216
+#: ../panels/network/net-device-wifi.c:377
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:225
-#: ../panels/network/net-device-wifi.c:387
+#: ../panels/network/net-device-wifi.c:220
+#: ../panels/network/net-device-wifi.c:382
 #: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:229
+#: ../panels/network/net-device-wifi.c:224
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/net-device-wifi.c:229
 msgid "Enterprise"
 msgstr "企業版"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:239
-#: ../panels/network/net-device-wifi.c:372
+#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/net-device-wifi.c:367
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
@@ -2124,8 +2062,8 @@ msgid "Yesterday"
 msgstr "昨日"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:125
-#: ../panels/network/net-device-wifi.c:476
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:471
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2134,37 +2072,37 @@ msgstr[0] "%i 天以前"
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
 #: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/net-device-wifi.c:528
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/net-device-wifi.c:557
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/net-device-wifi.c:559
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/net-device-wifi.c:561
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/net-device-wifi.c:563
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/net-device-wifi.c:565
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
@@ -2310,15 +2248,15 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:155
 #: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:159
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/net-device-ethernet.c:160
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
@@ -2326,14 +2264,14 @@ msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:166
+#: ../panels/network/net-device-ethernet.c:163
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:7
 msgid "Hardware Address"
 msgstr "硬體位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:170
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2343,7 +2281,7 @@ msgstr "預設路由"
 #: ../panels/network/connection-editor/details-page.ui.h:8
 #: ../panels/network/connection-editor/ip4-page.ui.h:3
 #: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:172
+#: ../panels/network/net-device-ethernet.c:169
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2489,7 +2427,7 @@ msgid "_Add"
 msgstr "加入(_A)"
 
 #: ../panels/network/connection-editor/net-connection-editor.c:595
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
@@ -2523,7 +2461,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1408
+#: ../panels/network/net-device-wifi.c:1403
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2567,7 +2505,7 @@ msgstr "選擇要匯入的檔案"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
 #: ../panels/printers/cc-printers-panel.c:1947
-#: ../panels/sharing/cc-sharing-panel.c:422
+#: ../panels/sharing/cc-sharing-panel.c:436
 #: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "開啟(_O)"
@@ -2655,29 +2593,29 @@ msgstr "繫結的連線"
 msgid "Bridge slaves"
 msgstr "橋接的連線"
 
-#: ../panels/network/net-device-ethernet.c:111
-#: ../panels/network/net-device-wifi.c:462
+#: ../panels/network/net-device-ethernet.c:108
+#: ../panels/network/net-device-wifi.c:457
 msgid "never"
 msgstr "永不"
 
-#: ../panels/network/net-device-ethernet.c:121
-#: ../panels/network/net-device-wifi.c:472
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:467
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:123
-#: ../panels/network/net-device-wifi.c:474
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:469
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:161
+#: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:3
 #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../panels/network/net-device-ethernet.c:177
+#: ../panels/network/net-device-ethernet.c:174
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "最後使用的"
@@ -2687,14 +2625,14 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:287
+#: ../panels/network/net-device-ethernet.c:284
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:355
-#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/net-device-ethernet.c:352
+#: ../panels/network/net-device-wifi.c:1558
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2702,16 +2640,16 @@ msgstr "有線"
 msgid "Options…"
 msgstr "選項…"
 
-#: ../panels/network/net-device-ethernet.c:492
+#: ../panels/network/net-device-ethernet.c:489
 #, c-format
 msgid "Profile %d"
 msgstr "設定組合 %d"
 
-#: ../panels/network/net-device-mobile.c:239
+#: ../panels/network/net-device-mobile.c:232
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: ../panels/network/net-device-wifi.c:1117
+#: ../panels/network/net-device-wifi.c:1110
 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."
@@ -2719,52 +2657,52 @@ msgstr ""
 "如果您有無線網路以外的方式連線到網際網路,您可以使用它來與其他人分享您的網際"
 "網路連線。"
 
-#: ../panels/network/net-device-wifi.c:1121
+#: ../panels/network/net-device-wifi.c:1114
 #, 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:1125
+#: ../panels/network/net-device-wifi.c:1118
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。"
 
-#: ../panels/network/net-device-wifi.c:1199
+#: ../panels/network/net-device-wifi.c:1192
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1202
+#: ../panels/network/net-device-wifi.c:1195
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1274
+#: ../panels/network/net-device-wifi.c:1267
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: ../panels/network/net-device-wifi.c:1277
+#: ../panels/network/net-device-wifi.c:1270
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: ../panels/network/net-device-wifi.c:1404
+#: ../panels/network/net-device-wifi.c:1399
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網路的詳細資料包含密碼及任何自訂的組態都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1714
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "歷史紀錄"
 
-#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21
+#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
 #: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
-#: ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/wacom/cc-wacom-page.c:534
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/network/net-device-wifi.c:1738
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2783,7 +2721,7 @@ msgstr "當沒有提供組態 URL 時會使用網頁代理伺服器自動發現
 msgid "This is not recommended for untrusted public networks."
 msgstr "這不建議用於不信任的公用網路。"
 
-#: ../panels/network/net-proxy.c:417
+#: ../panels/network/net-proxy.c:410
 msgid "Proxy"
 msgstr "代理伺服器"
 
@@ -2799,17 +2737,17 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "供應商"
 
-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
 msgctxt "proxy method"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "自動"
@@ -2862,19 +2800,7 @@ msgstr "Socks 代理伺服器通訊埠"
 msgid "Turn device off"
 msgstr "關閉裝置"
 
-#: ../panels/network/network.ui.h:1
-msgid "Select the interface to use for the new service"
-msgstr "選擇要用於新服務的介面"
-
-#: ../panels/network/network.ui.h:2
-msgid "C_reate…"
-msgstr "建立(_R)…"
-
-#: ../panels/network/network.ui.h:3
-msgid "_Interface"
-msgstr "介面(_I)"
-
-#: ../panels/network/network.ui.h:8
+#: ../panels/network/network.ui.h:5
 msgid "Add Device"
 msgstr "加入裝置"
 
@@ -2913,7 +2839,7 @@ msgstr "詳細資料"
 #: ../panels/network/wireless-security/ws-leap.ui.h:2
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Password"
 msgstr "密碼(_P)"
 
@@ -3603,12 +3529,12 @@ msgid "Show Details in Lock Screen"
 msgstr "在鎖定畫面中顯示詳細資料"
 
 #: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1733 ../panels/power/cc-power-panel.c:1740
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:117
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:610
-#: ../panels/universal-access/cc-ua-panel.c:736
+#: ../panels/power/cc-power-panel.c:1724 ../panels/power/cc-power-panel.c:1731
+#: ../panels/privacy/cc-privacy-panel.c:80
+#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
 msgid "On"
 msgstr "開啟"
 
@@ -3729,17 +3655,17 @@ msgstr ""
 "加入一個帳號以允許您的應用程式存取它用於文件、郵件、連絡人、行事曆、聊天等"
 "等。"
 
-#: ../panels/power/cc-power-panel.c:187
+#: ../panels/power/cc-power-panel.c:195
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: ../panels/power/cc-power-panel.c:193
+#: ../panels/power/cc-power-panel.c:201
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: ../panels/power/cc-power-panel.c:205
+#: ../panels/power/cc-power-panel.c:213
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3747,224 +3673,224 @@ msgstr[0] "%i 小時"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:213
+#: ../panels/power/cc-power-panel.c:221
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:214
+#: ../panels/power/cc-power-panel.c:222
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../panels/power/cc-power-panel.c:215
+#: ../panels/power/cc-power-panel.c:223
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:234
+#: ../panels/power/cc-power-panel.c:242
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s後完全充飽"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:249
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意:剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:246
+#: ../panels/power/cc-power-panel.c:254
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
+#: ../panels/power/cc-power-panel.c:259 ../panels/power/cc-power-panel.c:287
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:255 ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:263 ../panels/power/cc-power-panel.c:291
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
+#: ../panels/power/cc-power-panel.c:278
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:275
+#: ../panels/power/cc-power-panel.c:283
 msgid "Discharging"
 msgstr "放電中"
 
-#: ../panels/power/cc-power-panel.c:393
+#: ../panels/power/cc-power-panel.c:403
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: ../panels/power/cc-power-panel.c:395
+#: ../panels/power/cc-power-panel.c:405
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:486
+#: ../panels/power/cc-power-panel.c:477
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:490
+#: ../panels/power/cc-power-panel.c:480
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:494
+#: ../panels/power/cc-power-panel.c:483
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:499
+#: ../panels/power/cc-power-panel.c:486
 msgid "Personal digital assistant"
 msgstr "個人數位助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:503
+#: ../panels/power/cc-power-panel.c:489
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:507
+#: ../panels/power/cc-power-panel.c:492
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:511
+#: ../panels/power/cc-power-panel.c:495
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:515
+#: ../panels/power/cc-power-panel.c:498
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:519 ../panels/power/cc-power-panel.c:729
-#: ../panels/power/cc-power-panel.c:2064
+#: ../panels/power/cc-power-panel.c:501 ../panels/power/cc-power-panel.c:724
+#: ../panels/power/cc-power-panel.c:2055
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:528
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
+#: ../panels/power/cc-power-panel.c:554
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: ../panels/power/cc-power-panel.c:559
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:545
+#: ../panels/power/cc-power-panel.c:564
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:550
+#: ../panels/power/cc-power-panel.c:569
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:554
+#: ../panels/power/cc-power-panel.c:573
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: ../panels/power/cc-power-panel.c:727
+#: ../panels/power/cc-power-panel.c:722
 msgid "Batteries"
 msgstr "電池"
 
-#: ../panels/power/cc-power-panel.c:1133
+#: ../panels/power/cc-power-panel.c:1124
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1502
+#: ../panels/power/cc-power-panel.c:1493
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1530
+#: ../panels/power/cc-power-panel.c:1521
 msgid "_Screen brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1536
+#: ../panels/power/cc-power-panel.c:1527
 msgid "_Keyboard brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1546
+#: ../panels/power/cc-power-panel.c:1537
 msgid "_Dim screen when inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1571
+#: ../panels/power/cc-power-panel.c:1562
 msgid "_Blank screen"
 msgstr "螢幕轉黑(_B)"
 
-#: ../panels/power/cc-power-panel.c:1608
+#: ../panels/power/cc-power-panel.c:1599
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1613
+#: ../panels/power/cc-power-panel.c:1604
 msgid "Turns off wireless devices"
 msgstr "關閉無線裝置"
 
-#: ../panels/power/cc-power-panel.c:1638
+#: ../panels/power/cc-power-panel.c:1629
 msgid "_Mobile broadband"
 msgstr "行動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1643
+#: ../panels/power/cc-power-panel.c:1634
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "關閉行動寬頻 (3G、4G、WiMax 等) 裝置"
 
-#: ../panels/power/cc-power-panel.c:1678
+#: ../panels/power/cc-power-panel.c:1669
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1729
+#: ../panels/power/cc-power-panel.c:1720
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1731
+#: ../panels/power/cc-power-panel.c:1722
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:1860
+#: ../panels/power/cc-power-panel.c:1851
 msgid "Suspend & Power Off"
 msgstr "暫停與關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1893
+#: ../panels/power/cc-power-panel.c:1884
 msgid "_Automatic suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:1917
+#: ../panels/power/cc-power-panel.c:1908
 msgid "When battery power is _critical"
 msgstr "當電池的電量極低時(_C)"
 
-#: ../panels/power/cc-power-panel.c:1974
+#: ../panels/power/cc-power-panel.c:1965
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: ../panels/power/cc-power-panel.c:2111
+#: ../panels/power/cc-power-panel.c:2102
 msgid "Devices"
 msgstr "裝置"
 
@@ -4431,12 +4357,12 @@ msgid "%s Active Jobs"
 msgstr "%s 使用中的工作"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1667
+#: ../panels/printers/pp-new-printer-dialog.c:1669
 msgid "Server requires authentication"
 msgstr "伺服器需要核對"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1704
+#: ../panels/printers/pp-new-printer-dialog.c:1706
 msgid "No printers detected."
 msgstr "未偵測到印表機。"
 
@@ -4607,6 +4533,10 @@ msgstr "工作"
 msgid "Show _Jobs"
 msgstr "顯示工作(_J)"
 
+#: ../panels/printers/printers.ui.h:12
+msgid "Model"
+msgstr "型號"
+
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "標籤"
@@ -4643,39 +4573,39 @@ msgstr ""
 "抱歉!系統列印服務\n"
 "似乎無法使用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
-#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
 msgid "Usage & History"
 msgstr "使用與歷史紀錄"
 
-#: ../panels/privacy/cc-privacy-panel.c:486
+#: ../panels/privacy/cc-privacy-panel.c:489
 msgid "Empty all items from Trash?"
 msgstr "要清除回收筒中所有的項目?"
 
-#: ../panels/privacy/cc-privacy-panel.c:487
+#: ../panels/privacy/cc-privacy-panel.c:490
 msgid "All items in the Trash will be permanently deleted."
 msgstr "所有在回收筒中的項目會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:511
+#: ../panels/privacy/cc-privacy-panel.c:514
 msgid "Delete all the temporary files?"
 msgstr "刪除所有暫存檔案?"
 
-#: ../panels/privacy/cc-privacy-panel.c:512
+#: ../panels/privacy/cc-privacy-panel.c:515
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有的暫存檔案會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
 msgid "Purge Trash & Temporary Files"
 msgstr "清除回收筒與暫存檔案"
 
@@ -4825,32 +4755,27 @@ msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/region/cc-region-panel.c:239
+#: ../panels/region/cc-region-panel.c:242
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "您的作業階段需要重新啟動以讓變更生效"
 
-#: ../panels/region/cc-region-panel.c:240
+#: ../panels/region/cc-region-panel.c:243
 msgid "Restart Now"
 msgstr "立刻重新啟動"
 
-#: ../panels/region/cc-region-panel.c:569
-msgctxt "Language"
-msgid "None"
-msgstr "沒有"
-
-#: ../panels/region/cc-region-panel.c:853
+#: ../panels/region/cc-region-panel.c:903
 msgid "No input source selected"
 msgstr "尚未選擇輸入來源"
 
-#: ../panels/region/cc-region-panel.c:1084
+#: ../panels/region/cc-region-panel.c:1134
 msgid "Sorry"
 msgstr "抱歉"
 
-#: ../panels/region/cc-region-panel.c:1086
+#: ../panels/region/cc-region-panel.c:1136
 msgid "Input methods can't be used on the login screen"
 msgstr "輸入法不能用在登入畫面"
 
-#: ../panels/region/cc-region-panel.c:1716
+#: ../panels/region/cc-region-panel.c:1765
 msgid "Login Screen"
 msgstr "登入畫面"
 
@@ -5021,21 +4946,21 @@ msgstr "往下移"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:285
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:287
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/sharing/cc-sharing-panel.c:418
+#: ../panels/sharing/cc-sharing-panel.c:432
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: ../panels/sharing/cc-sharing-panel.c:702
+#: ../panels/sharing/cc-sharing-panel.c:739
 msgid "Copy"
 msgstr "複製"
 
@@ -5427,12 +5352,12 @@ msgstr "讓電腦更容易看、聽、輸入、指向與點選"
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
 msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
 msgstr ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;鍵盤;滑鼠;無障礙;對比;螢"
-"幕閱讀器;文字;字型;大小;相黏鍵;遲緩鍵;彈跳鍵;滑鼠按鍵;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;"
+"字型;大小;相黏;遲緩;彈跳;滑鼠;鍵;按鍵"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5879,7 +5804,7 @@ msgid "_Full Name"
 msgstr "全名(_F)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Account _Type"
 msgstr "帳號類型(_T)"
 
@@ -6032,69 +5957,35 @@ msgstr "目前的密碼(_P)"
 msgid "Ch_ange"
 msgstr "改變(_A)"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
-msgid "Changing photo for:"
-msgstr "正在改變相片:"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
-msgid ""
-"Choose a picture that will be shown at the login screen for this account."
-msgstr "選擇這個帳號要顯示在登入畫面的照片。"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Gallery"
-msgstr "藝廊"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "瀏覽更多照片"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid "Take a photograph"
-msgstr "照一張相片"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
-msgid "Browse"
-msgstr "瀏覽"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
-msgid "Photograph"
-msgstr "相片"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Account Information"
-msgstr "帳號資訊"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Add User Account"
 msgstr "加入使用者帳號"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Remove User Account"
 msgstr "移除使用者帳號"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Login Options"
 msgstr "登入選項"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "自動登入(_U):"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Fingerprint Login"
 msgstr "指紋登入(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "User Icon"
 msgstr "使用者圖示"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "語言(_L)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "上次登入"
 
@@ -6501,6 +6392,10 @@ msgstr "密碼無法變更"
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
+#: ../panels/user-accounts/um-photo-dialog.c:218
+msgid "Browse for more pictures"
+msgstr "瀏覽更多照片"
+
 #: ../panels/user-accounts/um-photo-dialog.c:443
 msgid "Disable image"
 msgstr "停用圖片"
@@ -6754,7 +6649,7 @@ msgstr "映射到單一螢幕"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:522
+#: ../panels/wacom/cc-wacom-page.c:531
 msgid "Display Mapping"
 msgstr "顯示對應"
 
@@ -6889,22 +6784,22 @@ msgstr "右觸控列模式切換"
 msgid "Mode Switch #%d"
 msgstr "模式切換 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1336
+#: ../panels/wacom/gsd-wacom-device.c:1335
 #, c-format
 msgid "Left Button #%d"
 msgstr "左側按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1339
+#: ../panels/wacom/gsd-wacom-device.c:1338
 #, c-format
 msgid "Right Button #%d"
 msgstr "右側按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1342
+#: ../panels/wacom/gsd-wacom-device.c:1341
 #, c-format
 msgid "Top Button #%d"
 msgstr "頂端按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1345
+#: ../panels/wacom/gsd-wacom-device.c:1344
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "底部按鈕 #%d"
@@ -7063,6 +6958,76 @@ msgstr "設定值"
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
 
+#~ msgid "Device type:"
+#~ msgstr "裝置類型:"
+
+#~ msgid "Manufacturer:"
+#~ msgstr "製造商:"
+
+#~ msgid "Model:"
+#~ msgstr "型號:"
+
+#~ msgid ""
+#~ "Image files can be dragged on this window to auto-complete the above "
+#~ "fields."
+#~ msgstr "可以將圖片檔案拖放到這個視窗自動完成上列欄位。"
+
+#~ msgid "Show your primary display on this screen also"
+#~ msgstr "也在這個螢幕顯示您的主要顯示"
+
+#~ msgid "Combine"
+#~ msgstr "組合"
+
+#~ msgid "Join with the primary display to create an extra space"
+#~ msgstr "結合主要顯示器以建立額外的工作區"
+
+#~ msgid "Don't use the display"
+#~ msgstr "不使用這個顯示器"
+
+#~ msgid "Refresh Rate"
+#~ msgstr "更新率"
+
+#~ msgid "Software"
+#~ msgstr "軟體"
+
+#~ msgid "Mouse Preferences"
+#~ msgstr "滑鼠偏好設定"
+
+#~ msgid "Select the interface to use for the new service"
+#~ msgstr "選擇要用於新服務的介面"
+
+#~ msgid "C_reate…"
+#~ msgstr "建立(_R)…"
+
+#~ msgid "_Interface"
+#~ msgstr "介面(_I)"
+
+#~ msgctxt "Language"
+#~ msgid "None"
+#~ msgstr "沒有"
+
+#~ msgid "Changing photo for:"
+#~ msgstr "正在改變相片:"
+
+#~ msgid ""
+#~ "Choose a picture that will be shown at the login screen for this account."
+#~ msgstr "選擇這個帳號要顯示在登入畫面的照片。"
+
+#~ msgid "Gallery"
+#~ msgstr "藝廊"
+
+#~ msgid "Take a photograph"
+#~ msgstr "照一張相片"
+
+#~ msgid "Browse"
+#~ msgstr "瀏覽"
+
+#~ msgid "Photograph"
+#~ msgstr "相片"
+
+#~ msgid "Account Information"
+#~ msgstr "帳號資訊"
+
 #~ msgid "Switch between AM and PM."
 #~ msgstr "在上午與下午之間切換。"
 



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