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



commit 07d0e7af32302c796c6f044cdf5edcc2e73d236d
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Mar 4 20:08:34 2014 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1661 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 1663 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 1704 insertions(+), 1620 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d7637b3..e1ed1fc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,16 +14,16 @@ 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-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"
+"POT-Creation-Date: 2014-02-24 23:17+0000\n"
+"PO-Revision-Date: 2014-03-04 20:08+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #: ../panels/background/background.ui.h:1
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
@@ -35,117 +35,121 @@ msgstr "背景"
 msgid "Changes throughout the day"
 msgstr "整天的更改"
 
-#: ../panels/background/background.ui.h:4
+#. To translators: This is a noun, not a verb
+#: ../panels/background/background.ui.h:5
 msgid "Lock Screen"
 msgstr "鎖定畫面"
 
-#: ../panels/background/background.ui.h:5
+#: ../panels/background/background.ui.h:6
 msgctxt "background, style"
 msgid "Tile"
 msgstr "鋪排"
 
-#: ../panels/background/background.ui.h:6
+#: ../panels/background/background.ui.h:7
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../panels/background/background.ui.h:7
+#: ../panels/background/background.ui.h:8
 msgctxt "background, style"
 msgid "Center"
 msgstr "置中"
 
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:9
 msgctxt "background, style"
 msgid "Scale"
 msgstr "縮放"
 
-#: ../panels/background/background.ui.h:9
+#: ../panels/background/background.ui.h:10
 msgctxt "background, style"
 msgid "Fill"
 msgstr "填滿"
 
-#: ../panels/background/background.ui.h:10
+#: ../panels/background/background.ui.h:11
 msgctxt "background, style"
 msgid "Span"
 msgstr "合併"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:292
+#: ../panels/background/cc-background-chooser-dialog.c:277
 msgid "Select Background"
 msgstr "選擇背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:312
+#: ../panels/background/cc-background-chooser-dialog.c:297
 msgid "Wallpapers"
 msgstr "桌布"
 
-#: ../panels/background/cc-background-chooser-dialog.c:321
+#: ../panels/background/cc-background-chooser-dialog.c:306
 msgid "Pictures"
 msgstr "圖片"
 
-#: ../panels/background/cc-background-chooser-dialog.c:329
+#: ../panels/background/cc-background-chooser-dialog.c:314
 msgid "Colors"
 msgstr "顏色"
 
-#: ../panels/background/cc-background-chooser-dialog.c:338
-msgid "Flickr"
-msgstr "Flickr"
-
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:385
+#: ../panels/background/cc-background-chooser-dialog.c:360
 msgid "No Pictures Found"
 msgstr "找不到圖片"
 
+#. translators: "Home" is used in place of the Pictures
+#. * directory in the string below when XDG_PICTURES_DIR is
+#. * undefined
+#: ../panels/background/cc-background-chooser-dialog.c:378
+#: ../panels/search/cc-search-locations-dialog.c:274
+msgid "Home"
+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:400
+#: ../panels/background/cc-background-chooser-dialog.c:390
 #, 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:428
-#: ../panels/bluetooth/cc-bluetooth-panel.c:640
-#: ../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/background/cc-background-chooser-dialog.c:419
+#: ../panels/color/cc-color-panel.c:222 ../panels/color/cc-color-panel.c:959
+#: ../panels/display/cc-display-panel.c:1510
+#: ../panels/display/cc-display-panel.c:1953
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../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/network/net-device-wifi.c:1197
+#: ../panels/network/net-device-wifi.c:1405
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:377
+#: ../panels/printers/cc-printers-panel.c:1945
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:470
-#: ../panels/search/cc-search-locations-dialog.c:682
-#: ../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
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/privacy/cc-privacy-panel.c:471
+#: ../panels/search/cc-search-locations-dialog.c:681
+#: ../panels/sharing/cc-sharing-panel.c:445
+#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-photo-dialog.c:95
+#: ../panels/user-accounts/um-photo-dialog.c:220
+#: ../panels/user-accounts/um-user-panel.c:507
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:429
+#: ../panels/background/cc-background-chooser-dialog.c:420
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:98
+#: ../panels/user-accounts/um-photo-dialog.c:97
 msgid "Select"
 msgstr "選取"
 
-#: ../panels/background/cc-background-item.c:149
+#: ../panels/background/cc-background-item.c:148
 msgid "multiple sizes"
 msgstr "多重尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:153
+#: ../panels/background/cc-background-item.c:152
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:281
+#: ../panels/background/cc-background-item.c:280
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: ../panels/background/cc-background-panel.c:493
+#: ../panels/background/cc-background-panel.c:492
 msgid "Current background"
 msgstr "目前的背景"
 
@@ -158,109 +162,17 @@ msgstr "將你的背景影像更改為桌布或相片"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 
-#: ../panels/bluetooth/bluetooth.ui.h:1
-msgid "Set Up New Device"
-msgstr "設置新裝置"
-
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
-msgid "Remove Device"
-msgstr "移除裝置"
-
-#: ../panels/bluetooth/bluetooth.ui.h:3
-msgid "Connection"
-msgstr "連線"
-
-#: ../panels/bluetooth/bluetooth.ui.h:4
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/printers/printers.ui.h:14
-msgid "page 1"
-msgstr "頁 1"
-
-#: ../panels/bluetooth/bluetooth.ui.h:5
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/printers/printers.ui.h:16
-msgid "page 2"
-msgstr "頁 2"
-
-#: ../panels/bluetooth/bluetooth.ui.h:6
-msgid "Paired"
-msgstr "已配對"
-
-#: ../panels/bluetooth/bluetooth.ui.h:7
-msgid "Type"
-msgstr "類型"
-
-#: ../panels/bluetooth/bluetooth.ui.h:8
-#: ../panels/network/connection-editor/ce-page-ip4.c:194
-#: ../panels/network/connection-editor/ce-page-ip4.c:456
-#: ../panels/network/connection-editor/ce-page-ip6.c:196
-#: ../panels/network/connection-editor/ce-page-ip6.c:460
-msgid "Address"
-msgstr "地址"
-
-#: ../panels/bluetooth/bluetooth.ui.h:9
-msgid "Mouse & Touchpad Settings"
-msgstr "滑鼠與觸控板設定值"
-
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Sound Settings"
-msgstr "音效設定值"
-
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Keyboard Settings"
-msgstr "鍵盤設定值"
-
-#: ../panels/bluetooth/bluetooth.ui.h:12
-msgid "Send Files…"
-msgstr "傳送檔案…"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:366
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "是"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:366
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "否"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+#: ../panels/bluetooth/cc-bluetooth-panel.c:262
 msgid "Bluetooth is disabled"
 msgstr "藍牙已停用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:484
-msgid "Bluetooth is disabled by hardware switch"
-msgstr "藍牙已被硬件開關停用"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+#: ../panels/bluetooth/cc-bluetooth-panel.c:263
 msgid "No Bluetooth adapters found"
 msgstr "找不到藍牙接配器"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:587
-msgid "Visibility"
-msgstr "顯示狀態"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:591
-#, c-format
-msgid "Visibility of “%s”"
-msgstr "「%s」的顯示狀態"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:635
-#, c-format
-msgid "Remove '%s' from the list of devices?"
-msgstr "是否從裝置的清單中移除「%s」?"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:637
-msgid ""
-"If you remove the device, you will have to set it up again before next use."
-msgstr "如果你刪除此裝置,下次使用時必須再次設定它。"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:641
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+msgid "Bluetooth is disabled by hardware switch"
+msgstr "藍牙已被硬件開關停用"
 
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
 msgid "Bluetooth"
@@ -403,48 +315,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:137
+#: ../panels/color/cc-color-panel.c:138
 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:145
+#: ../panels/color/cc-color-panel.c:146
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:152
+#: ../panels/color/cc-color-panel.c:153
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:219
+#: ../panels/color/cc-color-panel.c:220
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: ../panels/color/cc-color-panel.c:222
+#: ../panels/color/cc-color-panel.c:223
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:233
+#: ../panels/color/cc-color-panel.c:234
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:240
+#: ../panels/color/cc-color-panel.c:241
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../panels/color/cc-color-panel.c:579
+#: ../panels/color/cc-color-panel.c:580
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:903
+#: ../panels/color/cc-color-panel.c:904
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上傳檔案失敗:%s"
@@ -452,51 +364,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:917
+#: ../panels/color/cc-color-panel.c:918
 msgid "The profile has been uploaded to:"
 msgstr "描述檔已經上傳到:"
 
-#: ../panels/color/cc-color-panel.c:919
+#: ../panels/color/cc-color-panel.c:920
 msgid "Write down this URL."
 msgstr "寫下這個 URL。"
 
-#: ../panels/color/cc-color-panel.c:920
+#: ../panels/color/cc-color-panel.c:921
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重新啟動這臺電腦並開機進入你一般的作業系統。"
 
-#: ../panels/color/cc-color-panel.c:921
+#: ../panels/color/cc-color-panel.c:922
 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:955
+#: ../panels/color/cc-color-panel.c:956
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
-#: ../panels/color/cc-color-panel.c:959
+#: ../panels/color/cc-color-panel.c:960
 #: ../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:1315
+#: ../panels/color/cc-color-panel.c:1320
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+#: ../panels/color/cc-color-panel.c:1335 ../panels/color/cc-color-panel.c:1359
 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:1364
+#: ../panels/color/cc-color-panel.c:1369
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援打印機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1375
+#: ../panels/color/cc-color-panel.c:1380
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
@@ -583,7 +495,7 @@ 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/um-account-dialog.c:1470
+#: ../panels/user-accounts/um-account-dialog.c:1469
 msgid "Cancel"
 msgstr "取消"
 
@@ -606,7 +518,7 @@ msgstr "完成"
 #. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "螢幕校準"
 
@@ -720,7 +632,7 @@ msgid ""
 msgstr "你可以找到如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple OS X</a> 和 <a 
href=\"windows\">Microsoft Windows</a> 系統上使用描述檔的指引。"
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:742
+#: ../panels/user-accounts/um-fingerprint-dialog.c:740
 msgid "Summary"
 msgstr "摘要"
 
@@ -886,37 +798,37 @@ msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;打印機;顯示器;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:685
+#: ../panels/common/cc-common-language.c:684
 msgid "United States"
 msgstr "美國"
 
-#: ../panels/common/cc-common-language.c:686
+#: ../panels/common/cc-common-language.c:685
 msgid "Germany"
 msgstr "德國"
 
-#: ../panels/common/cc-common-language.c:687
+#: ../panels/common/cc-common-language.c:686
 msgid "France"
 msgstr "法國"
 
-#: ../panels/common/cc-common-language.c:688
+#: ../panels/common/cc-common-language.c:687
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../panels/common/cc-common-language.c:689
+#: ../panels/common/cc-common-language.c:688
 msgid "China"
 msgstr "中國"
 
-#: ../panels/common/cc-common-language.c:759
+#: ../panels/common/cc-common-language.c:758
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:123
-#: ../panels/region/cc-format-chooser.c:268
-#: ../panels/region/cc-input-chooser.c:172
+#: ../panels/common/cc-language-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:266
+#: ../panels/region/cc-input-chooser.c:170
 msgid "More…"
 msgstr "更多…"
 
-#: ../panels/common/cc-language-chooser.c:140
+#: ../panels/common/cc-language-chooser.c:139
 msgid "No languages found"
 msgstr "找不到語言"
 
@@ -925,33 +837,33 @@ msgid "Language"
 msgstr "語言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+#: ../panels/mouse/cc-mouse-panel.c:110 ../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:363
+#: ../panels/datetime/cc-datetime-panel.c:367
 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:368
+#: ../panels/datetime/cc-datetime-panel.c:372
 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:584
+#: ../panels/datetime/cc-datetime-panel.c:588
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:589
+#: ../panels/datetime/cc-datetime-panel.c:593
 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:594
+#: ../panels/datetime/cc-datetime-panel.c:598
 msgid "%R"
 msgstr "%R"
 
@@ -1090,107 +1002,106 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,你需要通過核對。"
 
-#: ../panels/display/cc-display-panel.c:485
+#: ../panels/display/cc-display-panel.c:486
 msgid "Lid Closed"
 msgstr "上蓋已經關閉"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:488
+#: ../panels/display/cc-display-panel.c:489
 msgid "Mirrored"
 msgstr "鏡射顯示器"
 
-#: ../panels/display/cc-display-panel.c:490
-#: ../panels/display/cc-display-panel.c:2057
+#: ../panels/display/cc-display-panel.c:491
+#: ../panels/display/cc-display-panel.c:2122
 msgid "Primary"
 msgstr "主要"
 
-#: ../panels/display/cc-display-panel.c:492
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../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/display/cc-display-panel.c:493
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1702 ../panels/power/cc-power-panel.c:1713
+#: ../panels/privacy/cc-privacy-panel.c:81
+#: ../panels/privacy/cc-privacy-panel.c:121
+#: ../panels/universal-access/cc-ua-panel.c:256
+#: ../panels/universal-access/cc-ua-panel.c:596
+#: ../panels/universal-access/cc-ua-panel.c:721
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:495
+#: ../panels/display/cc-display-panel.c:496
 msgid "Secondary"
 msgstr "次要"
 
-#: ../panels/display/cc-display-panel.c:1505
+#: ../panels/display/cc-display-panel.c:1506
 msgid "Arrange Combined Displays"
 msgstr "排列顯示器的組合方式"
 
-#: ../panels/display/cc-display-panel.c:1511
-#: ../panels/display/cc-display-panel.c:1927
+#: ../panels/display/cc-display-panel.c:1512
+#: ../panels/display/cc-display-panel.c:1956
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1532
+#: ../panels/display/cc-display-panel.c:1533
 msgid "Drag displays to rearrange them"
 msgstr "拖拉顯示器以重新排列他們"
 
-#. size
-#: ../panels/display/cc-display-panel.c:1991
+#: ../panels/display/cc-display-panel.c:2058
 msgid "Size"
 msgstr "尺寸"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2006
+#: ../panels/display/cc-display-panel.c:2071
 msgid "Aspect Ratio"
 msgstr "長寬比"
 
-#: ../panels/display/cc-display-panel.c:2027
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/display/cc-display-panel.c:2092
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../panels/display/cc-display-panel.c:2058
+#: ../panels/display/cc-display-panel.c:2123
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "在這個顯示器顯示頂端列與活動概覽"
 
-#: ../panels/display/cc-display-panel.c:2064
+#: ../panels/display/cc-display-panel.c:2129
 msgid "Secondary Display"
 msgstr "次要顯示器"
 
-#: ../panels/display/cc-display-panel.c:2065
+#: ../panels/display/cc-display-panel.c:2130
 msgid "Join this display with another to create an extra workspace"
 msgstr "將這個顯示器與另一個顯示器結合以建立額外的工作區"
 
-#: ../panels/display/cc-display-panel.c:2072
+#: ../panels/display/cc-display-panel.c:2137
 msgid "Presentation"
 msgstr "展示"
 
-#: ../panels/display/cc-display-panel.c:2073
+#: ../panels/display/cc-display-panel.c:2138
 msgid "Show slideshows and media only"
 msgstr "只顯示投影片與媒體"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2078
+#: ../panels/display/cc-display-panel.c:2143
 msgid "Mirror"
 msgstr "鏡射"
 
-#: ../panels/display/cc-display-panel.c:2079
+#: ../panels/display/cc-display-panel.c:2144
 msgid "Show your existing view on both displays"
 msgstr "在兩個顯示器顯示你現有的檢視"
 
-#: ../panels/display/cc-display-panel.c:2085
+#: ../panels/display/cc-display-panel.c:2150
 msgid "Turn Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:2086
+#: ../panels/display/cc-display-panel.c:2151
 msgid "Don't use this display"
 msgstr "不使用這個顯示器"
 
-#: ../panels/display/cc-display-panel.c:2302
+#: ../panels/display/cc-display-panel.c:2367
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
-#: ../panels/display/cc-display-panel.c:2333
+#: ../panels/display/cc-display-panel.c:2398
 msgid "_Arrange Combined Displays"
 msgstr "排列組合的顯示器(_A)"
 
@@ -1208,53 +1119,53 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;面板;投影機;螢幕;解像度;重新整理;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "不明"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:525
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位元"
 
-#: ../panels/info/cc-info-panel.c:536
+#: ../panels/info/cc-info-panel.c:527
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位元"
 
-#: ../panels/info/cc-info-panel.c:1216
+#: ../panels/info/cc-info-panel.c:1207
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1220
+#: ../panels/info/cc-info-panel.c:1211
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1224
+#: ../panels/info/cc-info-panel.c:1215
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1315
+#: ../panels/info/cc-info-panel.c:1306
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1337
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1338
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1339
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1340
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1341
 msgid "Select an application for software CDs"
 msgstr "選擇軟件 CD 要用的應用程式"
 
@@ -1263,88 +1174,76 @@ msgstr "選擇軟件 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1353
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1354
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1355
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1356
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1357
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1358
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1359
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1360
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1361
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1362
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1363
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1364
 msgid "Windows software"
 msgstr "Windows 軟件"
 
-#: ../panels/info/cc-info-panel.c:1496
-#: ../panels/keyboard/keyboard-shortcuts.c:1696
+#: ../panels/info/cc-info-panel.c:1487
+#: ../panels/keyboard/keyboard-shortcuts.c:1695
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1505 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1496 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1502 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1516 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1507 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1541
+#: ../panels/info/cc-info-panel.c:1532
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1591
-msgid "Install Updates"
-msgstr "安裝更新"
-
-#: ../panels/info/cc-info-panel.c:1595
-msgid "System Up-To-Date"
-msgstr "系統已是最新"
-
-#: ../panels/info/cc-info-panel.c:1599
-msgid "Checking for Updates"
-msgstr "正在檢查更新"
-
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
 #: ../panels/network/connection-editor/ce-page-details.c:240
 #: ../panels/network/network-wifi.ui.h:44
@@ -1407,55 +1306,60 @@ msgstr "繪圖"
 msgid "Virtualization"
 msgstr "虛擬化"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:13
+#| msgid "Checking for Updates"
+msgid "Check for updates"
+msgstr "檢查更新"
+
+#: ../panels/info/info.ui.h:15
 msgid "_Web"
 msgstr "網頁(_W)"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:16
 msgid "_Mail"
 msgstr "郵件(_M)"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:17
 msgid "_Calendar"
 msgstr "日曆(_C)"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:18
 msgid "M_usic"
 msgstr "音樂(_U)"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info.ui.h:19
 msgid "_Video"
 msgstr "影片(_V)"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:20
 msgid "_Photos"
 msgstr "相片(_P)"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:22
 msgid "Select how media should be handled"
 msgstr "選擇要如何處理媒體"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:23
 msgid "CD _audio"
 msgstr "CD 音樂(_A)"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:24
 msgid "_DVD video"
 msgstr "_DVD 影片"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info.ui.h:25
 msgid "_Music player"
 msgstr "音樂播放器(_M)"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:26
 msgid "_Software"
 msgstr "軟件(_S)"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info.ui.h:27
 msgid "_Other Media…"
 msgstr "其他(_O)…"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info.ui.h:28
 msgid "_Never prompt or start programs on media insertion"
 msgstr "插入媒體時永遠不提示或啟動程式(_N)"
 
@@ -1632,13 +1536,13 @@ msgstr "高對比開或關"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:271
-#: ../panels/keyboard/cc-keyboard-option.c:390
-#: ../panels/keyboard/keyboard-shortcuts.c:1159
+#: ../panels/keyboard/cc-keyboard-option.c:274
+#: ../panels/keyboard/cc-keyboard-option.c:393
+#: ../panels/keyboard/keyboard-shortcuts.c:1158
 #: ../panels/network/network-wifi.ui.h:29
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "已停用"
 
@@ -1646,7 +1550,7 @@ msgstr "已停用"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:349
+#: ../panels/keyboard/cc-keyboard-option.c:352
 msgid "Alternative Characters Key"
 msgstr "替代的字符鍵"
 
@@ -1654,11 +1558,11 @@ msgstr "替代的字符鍵"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:358
+#: ../panels/keyboard/cc-keyboard-option.c:361
 msgid "Compose Key"
 msgstr "組合鍵"
 
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: ../panels/keyboard/cc-keyboard-option.c:366
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
@@ -1766,16 +1670,16 @@ msgstr "要編輯捷徑鍵,點選相應的列並按下新的按鍵組合,或
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:585
-#: ../panels/keyboard/keyboard-shortcuts.c:593
+#: ../panels/keyboard/keyboard-shortcuts.c:584
+#: ../panels/keyboard/keyboard-shortcuts.c:592
 msgid "Custom Shortcuts"
 msgstr "自選捷徑鍵"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:804
+#: ../panels/keyboard/keyboard-shortcuts.c:803
 msgid "<Unknown Action>"
 msgstr "<行動設定不詳>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1300
+#: ../panels/keyboard/keyboard-shortcuts.c:1299
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1785,7 +1689,7 @@ msgstr ""
 "捷徑“%s”無法使用,原因是會無法按下此按鍵。\n"
 "請試用其它的按鍵:如同時使用 Control,Alt  或 Shift。"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1332
+#: ../panels/keyboard/keyboard-shortcuts.c:1331
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1794,21 +1698,21 @@ msgstr ""
 "捷徑鍵“%s”己經使用於:\n"
 "“%s”"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1337
+#: ../panels/keyboard/keyboard-shortcuts.c:1336
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "如果你重新指派捷徑鍵為「%s」,「%s」的捷徑鍵就會停用。"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1343
+#: ../panels/keyboard/keyboard-shortcuts.c:1342
 msgid "_Reassign"
 msgstr "重新指派(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:95
+#: ../panels/mouse/cc-mouse-panel.c:94
 msgid "Test Your _Settings"
 msgstr "測試你的設定值(_S)"
 
-#: ../panels/mouse/cc-mouse-panel.c:108
+#: ../panels/mouse/cc-mouse-panel.c:107
 msgid "Test Your Settings"
 msgstr "測試你的設定值"
 
@@ -1911,46 +1815,46 @@ msgstr "兩指捲動(_F)"
 msgid "_Natural scrolling"
 msgstr "自然捲動(_N)"
 
-#: ../panels/mouse/gnome-mouse-test.c:132
+#: ../panels/mouse/gnome-mouse-test.c:130
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
 msgid "Try clicking, double clicking, scrolling"
 msgstr "嘗試點選、連按兩下、捲動"
 
-#: ../panels/mouse/gnome-mouse-test.c:137
+#: ../panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
 msgstr "五次點擊,GEGL 時間!"
 
-#: ../panels/mouse/gnome-mouse-test.c:142
+#: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
 msgstr "連按兩下,主要按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:142
+#: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Single click, primary button"
 msgstr "點選,主要按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:145
+#: ../panels/mouse/gnome-mouse-test.c:143
 msgid "Double click, middle button"
 msgstr "連按兩下,中央按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:145
+#: ../panels/mouse/gnome-mouse-test.c:143
 msgid "Single click, middle button"
 msgstr "點選,中央按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:148
+#: ../panels/mouse/gnome-mouse-test.c:146
 msgid "Double click, secondary button"
 msgstr "連按兩下,次要按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:148
+#: ../panels/mouse/gnome-mouse-test.c:146
 msgid "Single click, secondary button"
 msgstr "點選,次要按鈕"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:357
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:930
+#: ../panels/network/cc-network-panel.c:956
 msgid "Network proxy"
 msgstr "網絡代理伺服器"
 
@@ -1958,14 +1862,14 @@ msgstr "網絡代理伺服器"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1135 ../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:1244
+#: ../panels/network/cc-network-panel.c:1274
 msgid "The system network services are not compatible with this version."
 msgstr "系統網絡服務與這個版本不兼容。"
 
@@ -1973,6 +1877,12 @@ msgstr "系統網絡服務與這個版本不兼容。"
 msgid "802.1x _Security"
 msgstr "802.1x 防護(_S)"
 
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "頁 1"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
 #: ../panels/network/connection-editor/security-page.ui.h:3
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:1
@@ -1986,6 +1896,12 @@ msgstr "匿名識別(_M)"
 msgid "Inner _authentication"
 msgstr "內部核對(_A)"
 
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "頁 2"
+
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:108
 #: ../panels/network/connection-editor/ce-page-security.c:455
 #: ../panels/network/connection-editor/details-page.ui.h:3
@@ -2037,17 +1953,17 @@ msgid "Never"
 msgstr "永不"
 
 #: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:803
+#: ../panels/user-accounts/um-utils.c:819
 msgid "Today"
 msgstr "今日"
 
 #: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:806
+#: ../panels/user-accounts/um-utils.c:822
 msgid "Yesterday"
 msgstr "昨日"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-ethernet.c:125
 #: ../panels/network/net-device-wifi.c:471
 #, c-format
 msgid "%i day ago"
@@ -2099,6 +2015,13 @@ msgstr "很好"
 msgid "Identity"
 msgstr "身分"
 
+#: ../panels/network/connection-editor/ce-page-ip4.c:194
+#: ../panels/network/connection-editor/ce-page-ip4.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:196
+#: ../panels/network/connection-editor/ce-page-ip6.c:460
+msgid "Address"
+msgstr "地址"
+
 #: ../panels/network/connection-editor/ce-page-ip4.c:207
 #: ../panels/network/connection-editor/ce-page-ip4.c:469
 msgid "Netmask"
@@ -2160,7 +2083,7 @@ msgstr "手動"
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:942
+#: ../panels/network/connection-editor/ce-page-ip4.c:934
 #: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
@@ -2182,7 +2105,7 @@ msgstr "自動"
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:902
+#: ../panels/network/connection-editor/ce-page-ip6.c:894
 #: ../panels/network/network-wifi.ui.h:47
 msgid "IPv6"
 msgstr "IPv6"
@@ -2233,15 +2156,15 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:155
+#: ../panels/network/net-device-ethernet.c:158
 #: ../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:156
-#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:159
+#: ../panels/network/net-device-ethernet.c:163
 #: ../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
@@ -2249,14 +2172,14 @@ msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:166
 #: ../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:167
+#: ../panels/network/net-device-ethernet.c:170
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2266,7 +2189,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:169
+#: ../panels/network/net-device-ethernet.c:172
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2407,7 +2330,7 @@ msgstr "新增設定組合"
 
 #: ../panels/network/connection-editor/net-connection-editor.c:511
 #: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1471
+#: ../panels/user-accounts/um-account-dialog.c:1470
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -2420,23 +2343,27 @@ msgstr "VPN"
 msgid "Bond"
 msgstr "繫結"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:597
+#: ../panels/network/connection-editor/net-connection-editor.c:598
+msgid "Team"
+msgstr "隊伍"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:600
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:598
+#: ../panels/network/connection-editor/net-connection-editor.c:601
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:749
+#: ../panels/network/connection-editor/net-connection-editor.c:752
 msgid "Could not load VPN plugins"
 msgstr "無法載入 VPN 外掛程式"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:818
+#: ../panels/network/connection-editor/net-connection-editor.c:821
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:889
+#: ../panels/network/connection-editor/net-connection-editor.c:892
 msgid "Add Network Connection"
 msgstr "加入網絡連線"
 
@@ -2446,7 +2373,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1403
+#: ../panels/network/net-device-wifi.c:1406
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2489,9 +2416,9 @@ msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1947
-#: ../panels/sharing/cc-sharing-panel.c:436
-#: ../panels/user-accounts/um-photo-dialog.c:222
+#: ../panels/printers/cc-printers-panel.c:1946
+#: ../panels/sharing/cc-sharing-panel.c:446
+#: ../panels/user-accounts/um-photo-dialog.c:221
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -2571,33 +2498,39 @@ msgstr "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;v
 msgid "Bond slaves"
 msgstr "繫結的連線"
 
+#: ../panels/network/net-device-bond.c:102
+#: ../panels/network/net-device-bridge.c:102
+#: ../panels/network/net-device-team.c:102
+msgid "(none)"
+msgstr "(沒有)"
+
 #: ../panels/network/net-device-bridge.c:77
 msgid "Bridge slaves"
 msgstr "橋接的連線"
 
-#: ../panels/network/net-device-ethernet.c:108
+#: ../panels/network/net-device-ethernet.c:111
 #: ../panels/network/net-device-wifi.c:457
 msgid "never"
 msgstr "永不"
 
-#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-ethernet.c:121
 #: ../panels/network/net-device-wifi.c:467
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-ethernet.c:123
 #: ../panels/network/net-device-wifi.c:469
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:161
 #: ../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:174
+#: ../panels/network/net-device-ethernet.c:177
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "最後使用的"
@@ -2607,14 +2540,14 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:284
+#: ../panels/network/net-device-ethernet.c:287
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:352
-#: ../panels/network/net-device-wifi.c:1558
+#: ../panels/network/net-device-ethernet.c:355
+#: ../panels/network/net-device-wifi.c:1561
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2622,7 +2555,7 @@ msgstr "有線"
 msgid "Options…"
 msgstr "選項…"
 
-#: ../panels/network/net-device-ethernet.c:489
+#: ../panels/network/net-device-ethernet.c:492
 #, c-format
 msgid "Profile %d"
 msgstr "設定組合 %d"
@@ -2631,6 +2564,11 @@ msgstr "設定組合 %d"
 msgid "Add new connection"
 msgstr "加入新連線"
 
+#: ../panels/network/net-device-team.c:77
+#| msgid "Bridge slaves"
+msgid "Team slaves"
+msgstr "隊伍從屬"
+
 #: ../panels/network/net-device-wifi.c:1110
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
@@ -2648,41 +2586,41 @@ msgid ""
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過你的無線網絡存取互聯網的。"
 
-#: ../panels/network/net-device-wifi.c:1192
+#: ../panels/network/net-device-wifi.c:1195
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1195
+#: ../panels/network/net-device-wifi.c:1198
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1267
+#: ../panels/network/net-device-wifi.c:1270
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1273
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: ../panels/network/net-device-wifi.c:1399
+#: ../panels/network/net-device-wifi.c:1402
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網絡的詳細資料包含密碼及任何自選的組態都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/network/net-device-wifi.c:1729
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "歷史紀錄"
 
-#: ../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:534
+#: ../panels/network/net-device-wifi.c:1733 ../panels/power/power.ui.h:21
+#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1595
+#: ../panels/wacom/cc-wacom-page.c:533
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1738
+#: ../panels/network/net-device-wifi.c:1741
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2784,6 +2722,10 @@ msgstr "關閉裝置"
 msgid "Add Device"
 msgstr "加入裝置"
 
+#: ../panels/network/network.ui.h:6
+msgid "Remove Device"
+msgstr "移除裝置"
+
 #: ../panels/network/network-vpn.ui.h:2
 msgid "VPN Type"
 msgstr "VPN 類型"
@@ -3410,6 +3352,14 @@ msgstr "CHAP"
 msgid "Don't _warn me again"
 msgstr "不要再警告我(_W)"
 
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+msgid "No"
+msgstr "否"
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+msgid "Yes"
+msgstr "是"
+
 #: ../panels/network/wireless-security/wireless-security.c:397
 msgid "TLS"
 msgstr "TLS"
@@ -3473,45 +3423,45 @@ msgid "_Type"
 msgstr "類型(_T)"
 
 #. TRANSLATORS: this is the per application switch for message tray usage.
-#: ../panels/notifications/cc-edit-dialog.c:39
+#: ../panels/notifications/cc-edit-dialog.c:37
 msgctxt "notifications"
 msgid "Notifications"
 msgstr "通知"
 
 #. TRANSLATORS: this is the setting to configure sounds associated with notifications
-#: ../panels/notifications/cc-edit-dialog.c:41
+#: ../panels/notifications/cc-edit-dialog.c:39
 msgctxt "notifications"
 msgid "Sound Alerts"
 msgstr "音效通知"
 
-#: ../panels/notifications/cc-edit-dialog.c:42
+#: ../panels/notifications/cc-edit-dialog.c:40
 msgctxt "notifications"
 msgid "Show Popup Banners"
 msgstr "顯示彈出式橫幅"
 
 #. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
-#: ../panels/notifications/cc-edit-dialog.c:44
+#: ../panels/notifications/cc-edit-dialog.c:42
 msgctxt "notifications"
 msgid "Show Details in Banners"
 msgstr "在橫幅顯示詳細資料"
 
-#: ../panels/notifications/cc-edit-dialog.c:45
+#: ../panels/notifications/cc-edit-dialog.c:43
 msgctxt "notifications"
 msgid "View in Lock Screen"
 msgstr "在鎖定畫面中顯示"
 
-#: ../panels/notifications/cc-edit-dialog.c:46
+#: ../panels/notifications/cc-edit-dialog.c:44
 msgctxt "notifications"
 msgid "Show Details in Lock Screen"
 msgstr "在鎖定畫面中顯示詳細資料"
 
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../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
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1708 ../panels/power/cc-power-panel.c:1715
+#: ../panels/privacy/cc-privacy-panel.c:81
+#: ../panels/privacy/cc-privacy-panel.c:121
+#: ../panels/universal-access/cc-ua-panel.c:256
+#: ../panels/universal-access/cc-ua-panel.c:596
+#: ../panels/universal-access/cc-ua-panel.c:721
 msgid "On"
 msgstr "開啟"
 
@@ -3536,65 +3486,69 @@ msgstr "顯示彈出式橫幅"
 msgid "Show in Lock Screen"
 msgstr "在鎖定畫面中顯示"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:198
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:318
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:316
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "加入帳號"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:357
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:355
 msgid "Mail"
 msgstr "郵件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:361
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:367
 msgid "Chat"
 msgstr "聊天"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:373
 msgid "Resources"
 msgstr "資源"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:425
+#: ../panels/online-accounts/cc-online-accounts-panel.c:423
 msgid "Error logging into the account"
 msgstr "登入帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:495
+#: ../panels/online-accounts/cc-online-accounts-panel.c:493
 msgid "Credentials have expired."
 msgstr "證書已經過期。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:499
+#: ../panels/online-accounts/cc-online-accounts-panel.c:497
 msgid "Sign in to enable this account."
 msgstr "登入以啟用這個帳號。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:504
+#: ../panels/online-accounts/cc-online-accounts-panel.c:502
 msgid "_Sign In"
 msgstr "登入(_S)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:745
+#: ../panels/online-accounts/cc-online-accounts-panel.c:743
 msgid "Error creating account"
 msgstr "建立帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:805
+#: ../panels/online-accounts/cc-online-accounts-panel.c:803
 msgid "Error removing account"
 msgstr "移除帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:841
+#: ../panels/online-accounts/cc-online-accounts-panel.c:839
 msgid "Are you sure you want to remove the account?"
 msgstr "確定要刪除這個帳號?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:843
+#: ../panels/online-accounts/cc-online-accounts-panel.c:841
 msgid "This will not remove the account on the server."
 msgstr "這不會移除伺服器上的帳號。"
 
+#: ../panels/online-accounts/cc-online-accounts-panel.c:842
+msgid "_Remove"
+msgstr "移除(_R)"
+
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
 msgid "Online Accounts"
 msgstr "網上帳號"
@@ -3603,12 +3557,15 @@ msgstr "網上帳號"
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "連接到你的網上帳號並決定要用它們來做什麼"
 
-#. Translators: those are keywords for the online-accounts control-center panel
+#. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#| msgid ""
+#| "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+#| "ownCloud;Kerberos;IMAP;SMTP;"
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;"
-msgstr 
"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;Kerberos;IMAP;SMTP;臉書;推特;雅虎;網頁;網上;聊天;行事曆;郵件;聯絡人;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
+msgstr 
"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;臉書;推特;雅虎奇摩;網頁;網上;聊天;行事曆;郵件;聯絡人;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -3628,17 +3585,17 @@ msgid ""
 "contacts, calendar, chat and more."
 msgstr "加入一個帳號以允許你的應用程式存取它用於文件、郵件、聯絡人、行事曆、聊天等等。"
 
-#: ../panels/power/cc-power-panel.c:195
+#: ../panels/power/cc-power-panel.c:182
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: ../panels/power/cc-power-panel.c:201
+#: ../panels/power/cc-power-panel.c:188
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: ../panels/power/cc-power-panel.c:213
+#: ../panels/power/cc-power-panel.c:200
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3646,224 +3603,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:221
+#: ../panels/power/cc-power-panel.c:208
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:222
+#: ../panels/power/cc-power-panel.c:209
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../panels/power/cc-power-panel.c:223
+#: ../panels/power/cc-power-panel.c:210
 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:242
+#: ../panels/power/cc-power-panel.c:229
 #, 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:249
+#: ../panels/power/cc-power-panel.c:236
 #, 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:254
+#: ../panels/power/cc-power-panel.c:241
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:259 ../panels/power/cc-power-panel.c:287
+#: ../panels/power/cc-power-panel.c:246 ../panels/power/cc-power-panel.c:274
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:263 ../panels/power/cc-power-panel.c:291
+#: ../panels/power/cc-power-panel.c:250 ../panels/power/cc-power-panel.c:278
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:278
+#: ../panels/power/cc-power-panel.c:265
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:270
 msgid "Discharging"
 msgstr "放電中"
 
-#: ../panels/power/cc-power-panel.c:403
+#: ../panels/power/cc-power-panel.c:395
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: ../panels/power/cc-power-panel.c:405
+#: ../panels/power/cc-power-panel.c:397
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:477
+#: ../panels/power/cc-power-panel.c:469
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:480
+#: ../panels/power/cc-power-panel.c:472
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:483
+#: ../panels/power/cc-power-panel.c:475
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:486
+#: ../panels/power/cc-power-panel.c:478
 msgid "Personal digital assistant"
 msgstr "個人數碼助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:489
+#: ../panels/power/cc-power-panel.c:481
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:492
+#: ../panels/power/cc-power-panel.c:484
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:495
+#: ../panels/power/cc-power-panel.c:487
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:498
+#: ../panels/power/cc-power-panel.c:490
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:501 ../panels/power/cc-power-panel.c:724
-#: ../panels/power/cc-power-panel.c:2055
+#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:716
+#: ../panels/power/cc-power-panel.c:2039
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:539
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:554
+#: ../panels/power/cc-power-panel.c:546
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:559
+#: ../panels/power/cc-power-panel.c:551
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:564
+#: ../panels/power/cc-power-panel.c:556
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:569
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:573
+#: ../panels/power/cc-power-panel.c:565
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: ../panels/power/cc-power-panel.c:722
+#: ../panels/power/cc-power-panel.c:714
 msgid "Batteries"
 msgstr "電池"
 
-#: ../panels/power/cc-power-panel.c:1124
+#: ../panels/power/cc-power-panel.c:1116
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1493
+#: ../panels/power/cc-power-panel.c:1463
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1521
+#: ../panels/power/cc-power-panel.c:1491
 msgid "_Screen brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1527
+#: ../panels/power/cc-power-panel.c:1497
 msgid "_Keyboard brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1537
+#: ../panels/power/cc-power-panel.c:1507
 msgid "_Dim screen when inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1562
+#: ../panels/power/cc-power-panel.c:1532
 msgid "_Blank screen"
 msgstr "螢幕轉黑(_B)"
 
-#: ../panels/power/cc-power-panel.c:1599
+#: ../panels/power/cc-power-panel.c:1569
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1604
+#: ../panels/power/cc-power-panel.c:1574
 msgid "Turns off wireless devices"
 msgstr "關閉無線裝置"
 
-#: ../panels/power/cc-power-panel.c:1629
+#: ../panels/power/cc-power-panel.c:1599
 msgid "_Mobile broadband"
 msgstr "流動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1634
+#: ../panels/power/cc-power-panel.c:1604
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "關閉流動寬頻 (3G、4G、WiMax 等) 裝置"
 
-#: ../panels/power/cc-power-panel.c:1669
+#: ../panels/power/cc-power-panel.c:1653
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1720
+#: ../panels/power/cc-power-panel.c:1704
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1722
+#: ../panels/power/cc-power-panel.c:1706
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:1851
+#: ../panels/power/cc-power-panel.c:1835
 msgid "Suspend & Power Off"
 msgstr "暫停與關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1884
+#: ../panels/power/cc-power-panel.c:1868
 msgid "_Automatic suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:1908
+#: ../panels/power/cc-power-panel.c:1892
 msgid "When battery power is _critical"
 msgstr "當電池的電量極低時(_C)"
 
-#: ../panels/power/cc-power-panel.c:1965
+#: ../panels/power/cc-power-panel.c:1949
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: ../panels/power/cc-power-panel.c:2102
+#: ../panels/power/cc-power-panel.c:2086
 msgid "Devices"
 msgstr "裝置"
 
@@ -3966,7 +3923,7 @@ msgid "Authenticate"
 msgstr "核對"
 
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:21
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "Password"
 msgstr "密碼"
@@ -3976,187 +3933,187 @@ msgid "Authentication Required"
 msgstr "要求核對"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:591
+#: ../panels/printers/cc-printers-panel.c:590
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:593
+#: ../panels/printers/cc-printers-panel.c:592
 msgid "Out of toner"
 msgstr "碳粉用完"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:596
+#: ../panels/printers/cc-printers-panel.c:595
 msgid "Low on developer"
 msgstr "顯像劑不足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:599
+#: ../panels/printers/cc-printers-panel.c:598
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:600
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:603
+#: ../panels/printers/cc-printers-panel.c:602
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:604
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:606
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:608
 msgid "Low on paper"
 msgstr "紙張不足。"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:610
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:613
+#: ../panels/printers/cc-printers-panel.c:612
 msgctxt "printer state"
 msgid "Offline"
 msgstr "離線"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:615
-#: ../panels/printers/cc-printers-panel.c:806
+#: ../panels/printers/cc-printers-panel.c:614
+#: ../panels/printers/cc-printers-panel.c:805
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:616
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:619
+#: ../panels/printers/cc-printers-panel.c:618
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:621
+#: ../panels/printers/cc-printers-panel.c:620
 msgid "The optical photo conductor is near end of life"
 msgstr "感光鼓接近使用壽命"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:623
+#: ../panels/printers/cc-printers-panel.c:622
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓已無法使用"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:733
+#: ../panels/printers/cc-printers-panel.c:732
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "正在設定"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:792
+#: ../panels/printers/cc-printers-panel.c:791
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備就緒"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:797
+#: ../panels/printers/cc-printers-panel.c:796
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "不接受工作"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:802
+#: ../panels/printers/cc-printers-panel.c:801
 msgctxt "printer state"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:923
+#: ../panels/printers/cc-printers-panel.c:922
 msgid "Toner Level"
 msgstr "碳粉匣等級"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:926
+#: ../panels/printers/cc-printers-panel.c:925
 msgid "Ink Level"
 msgstr "墨水等級"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:929
+#: ../panels/printers/cc-printers-panel.c:928
 msgid "Supply Level"
 msgstr "耗材等級"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:947
+#: ../panels/printers/cc-printers-panel.c:946
 msgctxt "printer state"
 msgid "Installing"
 msgstr "正在安裝"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1124
+#: ../panels/printers/cc-printers-panel.c:1123
 msgid "No printers available"
 msgstr "沒有可用的打印機"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1432
+#: ../panels/printers/cc-printers-panel.c:1431
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 使用中"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1776
+#: ../panels/printers/cc-printers-panel.c:1775
 msgid "Failed to add new printer."
 msgstr "無法加入新的打印機。"
 
-#: ../panels/printers/cc-printers-panel.c:1943
+#: ../panels/printers/cc-printers-panel.c:1942
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/cc-printers-panel.c:1952
+#: ../panels/printers/cc-printers-panel.c:1951
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript 打印機描述檔 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2257
+#: ../panels/printers/cc-printers-panel.c:2256
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/cc-printers-panel.c:2326
+#: ../panels/printers/cc-printers-panel.c:2325
 msgid "Searching for preferred drivers…"
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: ../panels/printers/cc-printers-panel.c:2341
+#: ../panels/printers/cc-printers-panel.c:2340
 msgid "Select from database…"
 msgstr "從資料庫搜尋…"
 
-#: ../panels/printers/cc-printers-panel.c:2350
+#: ../panels/printers/cc-printers-panel.c:2349
 msgid "Provide PPD File…"
 msgstr "提供 PPD 檔案…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2501
-#: ../panels/printers/cc-printers-panel.c:2524
+#: ../panels/printers/cc-printers-panel.c:2500
+#: ../panels/printers/cc-printers-panel.c:2523
 msgid "Test page"
 msgstr "測試頁"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2932
+#: ../panels/printers/cc-printers-panel.c:2931
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
@@ -4206,12 +4163,13 @@ msgstr "加入新的打印機"
 msgid "A_uthenticate"
 msgstr "核對(_U)"
 
-#: ../panels/printers/new-printer-dialog.ui.h:6
-msgid "Search for network printers or filter result"
-msgstr "搜尋網絡打印機或過濾器結果"
+#. Translators: No printers were found
+#: ../panels/printers/new-printer-dialog.ui.h:7
+msgid "No printers detected."
+msgstr "未偵測到打印機。"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:8
+#: ../panels/printers/new-printer-dialog.ui.h:9
 msgid "Enter address of a printer or a text to filter results"
 msgstr "輸入網絡打印機的位址或過濾器結果文字"
 
@@ -4228,246 +4186,241 @@ msgid "Loading drivers database..."
 msgstr "載入驅動程式資料庫…"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:67
-#: ../panels/printers/pp-ppd-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:66
+#: ../panels/printers/pp-ppd-option-widget.c:70
 msgid "One Sided"
 msgstr "單面"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:69
-#: ../panels/printers/pp-ppd-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:68
+#: ../panels/printers/pp-ppd-option-widget.c:72
 msgid "Long Edge (Standard)"
 msgstr "長邊 (標準)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:71
-#: ../panels/printers/pp-ppd-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:70
+#: ../panels/printers/pp-ppd-option-widget.c:74
 msgid "Short Edge (Flip)"
 msgstr "短邊 (翻轉)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:72
 msgid "Portrait"
 msgstr "直向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:74
 msgid "Landscape"
 msgstr "橫向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:77
+#: ../panels/printers/pp-ipp-option-widget.c:76
 msgid "Reverse landscape"
 msgstr "橫向倒轉"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:79
+#: ../panels/printers/pp-ipp-option-widget.c:78
 msgid "Reverse portrait"
 msgstr "直向倒轉"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:143
+#: ../panels/printers/pp-jobs-dialog.c:142
 msgctxt "print job"
 msgid "Pending"
 msgstr "保留中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:147
+#: ../panels/printers/pp-jobs-dialog.c:146
 msgctxt "print job"
 msgid "Held"
 msgstr "已暫停"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:151
+#: ../panels/printers/pp-jobs-dialog.c:150
 msgctxt "print job"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:155
+#: ../panels/printers/pp-jobs-dialog.c:154
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:159
+#: ../panels/printers/pp-jobs-dialog.c:158
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:163
+#: ../panels/printers/pp-jobs-dialog.c:162
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已放棄"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:167
+#: ../panels/printers/pp-jobs-dialog.c:166
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:289
+#: ../panels/printers/pp-jobs-dialog.c:288
 msgid "Job Title"
 msgstr "工作名稱"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:298
+#: ../panels/printers/pp-jobs-dialog.c:297
 msgid "Job State"
 msgstr "工作狀態"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:304
+#: ../panels/printers/pp-jobs-dialog.c:303
 msgid "Time"
 msgstr "時刻"
 
-#: ../panels/printers/pp-jobs-dialog.c:496
+#: ../panels/printers/pp-jobs-dialog.c:495
 #, c-format
 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:1669
+#: ../panels/printers/pp-new-printer-dialog.c:1752
 msgid "Server requires authentication"
 msgstr "伺服器需要核對"
 
-#. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1706
-msgid "No printers detected."
-msgstr "未偵測到打印機。"
-
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:81
 msgid "Two Sided"
 msgstr "雙面"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:82
 msgid "Paper Type"
 msgstr "紙張類型"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Paper Source"
 msgstr "紙張來源"
 
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Output Tray"
 msgstr "出紙匣"
 
-#: ../panels/printers/pp-options-dialog.c:87
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 前置過濾器"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:532
+#: ../panels/printers/pp-options-dialog.c:531
 msgid "Pages per side"
 msgstr "每張紙的頁數"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:544
+#: ../panels/printers/pp-options-dialog.c:543
 msgid "Two-sided"
 msgstr "雙面"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:556
+#: ../panels/printers/pp-options-dialog.c:555
 msgid "Orientation"
 msgstr "方向"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:653
+#: ../panels/printers/pp-options-dialog.c:652
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "一般"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:656
+#: ../panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "頁面設定"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:659
+#: ../panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "可安裝選項"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:662
+#: ../panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "工作"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:665
+#: ../panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "圖片品質"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:668
+#: ../panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "顏色"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:671
+#: ../panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "完成"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:674
+#: ../panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "進階"
 
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:77
-#: ../panels/printers/pp-ppd-option-widget.c:79
-#: ../panels/printers/pp-ppd-option-widget.c:87
+#: ../panels/printers/pp-ppd-option-widget.c:76
+#: ../panels/printers/pp-ppd-option-widget.c:78
+#: ../panels/printers/pp-ppd-option-widget.c:86
 msgid "Auto Select"
 msgstr "自動選擇"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../panels/printers/pp-ppd-option-widget.c:81
-#: ../panels/printers/pp-ppd-option-widget.c:83
-#: ../panels/printers/pp-ppd-option-widget.c:85
-#: ../panels/printers/pp-ppd-option-widget.c:89
+#: ../panels/printers/pp-ppd-option-widget.c:80
+#: ../panels/printers/pp-ppd-option-widget.c:82
+#: ../panels/printers/pp-ppd-option-widget.c:84
+#: ../panels/printers/pp-ppd-option-widget.c:88
 msgid "Printer Default"
 msgstr "打印機預設"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:91
+#: ../panels/printers/pp-ppd-option-widget.c:90
 msgid "Embed GhostScript fonts only"
 msgstr "只有內嵌的 GhostScript 字型"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:93
+#: ../panels/printers/pp-ppd-option-widget.c:92
 msgid "Convert to PS level 1"
 msgstr "轉換為 PS 等級 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:95
+#: ../panels/printers/pp-ppd-option-widget.c:94
 msgid "Convert to PS level 2"
 msgstr "轉換為 PS 等級 2"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:97
+#: ../panels/printers/pp-ppd-option-widget.c:96
 msgid "No pre-filtering"
 msgstr "無前置過濾器"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#: ../panels/printers/pp-ppd-selection-dialog.c:232
 msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
+#: ../panels/printers/pp-ppd-selection-dialog.c:249
 msgid "Driver"
 msgstr "驅動程式"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:254
+#: ../panels/printers/pp-samba.c:253
 #, c-format
 msgid "Enter your username and password to view printers available on %s."
 msgstr "輸入你的使用者名稱與密碼以檢視在 %s 可用的打印機。"
@@ -4492,8 +4445,9 @@ msgstr "位置"
 
 #. Translators: This checkbox is checked when the default printer is selected.
 #: ../panels/printers/printers.ui.h:8
-msgid "_Default"
-msgstr "預設值(_D)"
+#| msgid "Default Route"
+msgid "_Default printer"
+msgstr "預設打印機(_D)"
 
 #: ../panels/printers/printers.ui.h:9
 msgid "Jobs"
@@ -4544,42 +4498,47 @@ msgstr ""
 "抱歉!系統列印服務\n"
 "似乎無法使用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:249 ../panels/privacy/privacy.ui.h:26
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
-#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:362 ../panels/privacy/privacy.ui.h:20
 msgid "Usage & History"
 msgstr "使用與歷史紀錄"
 
-#: ../panels/privacy/cc-privacy-panel.c:489
+#: ../panels/privacy/cc-privacy-panel.c:490
 msgid "Empty all items from Trash?"
 msgstr "要清除回收筒中所有的項目?"
 
-#: ../panels/privacy/cc-privacy-panel.c:490
+#: ../panels/privacy/cc-privacy-panel.c:491
 msgid "All items in the Trash will be permanently deleted."
 msgstr "所有在回收筒中的項目會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:492 ../panels/privacy/privacy.ui.h:32
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:514
+#: ../panels/privacy/cc-privacy-panel.c:515
 msgid "Delete all the temporary files?"
 msgstr "刪除所有暫存檔案?"
 
-#: ../panels/privacy/cc-privacy-panel.c:515
+#: ../panels/privacy/cc-privacy-panel.c:516
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有的暫存檔案會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:517 ../panels/privacy/privacy.ui.h:33
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:539 ../panels/privacy/privacy.ui.h:31
 msgid "Purge Trash & Temporary Files"
 msgstr "清除回收筒與暫存檔案"
 
+#: ../panels/privacy/cc-privacy-panel.c:578 ../panels/privacy/privacy.ui.h:38
+#| msgid "Software"
+msgid "Software Usage"
+msgstr "軟件使用率"
+
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
 msgid "Privacy"
 msgstr "私隱"
@@ -4699,25 +4658,47 @@ msgstr "自動清除暫存檔案(_F)"
 msgid "Purge _After"
 msgstr "清除於(_A)"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/privacy/privacy.ui.h:39
+msgid ""
+"Sending us information about which software you use helps us provide you "
+"with more accurate recommendations. It also helps us to improve our "
+"software.\n"
+"\n"
+"All the information we collect is made anonymous, and we will never share "
+"your data with third parties."
+msgstr ""
+"傳送你所使用軟件的資訊給我們能幫助我們提供你更準確的建議。它也能協助我們改進我們的軟件。\n"
+"\n"
+"我們所收集的所有資訊都是匿名的,而且我們永遠不會將你的資料與任何第三方分享。"
+
+#: ../panels/privacy/privacy.ui.h:42
+#| msgid "Privacy"
+msgid "Privacy Policy"
+msgstr "私隱權原則"
+
+#: ../panels/privacy/privacy.ui.h:43
+msgid "_Send software usage statistics"
+msgstr "傳送軟件使用率統計(_S)"
+
+#: ../panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/cc-format-chooser.c:285
+#: ../panels/region/cc-format-chooser.c:283
 msgid "No regions found"
 msgstr "找不到區域"
 
-#: ../panels/region/cc-input-chooser.c:186
+#: ../panels/region/cc-input-chooser.c:184
 msgid "No input sources found"
 msgstr "找不到輸入來源"
 
-#: ../panels/region/cc-input-chooser.c:1070
+#: ../panels/region/cc-input-chooser.c:1068
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
@@ -4742,7 +4723,7 @@ msgstr "抱歉"
 msgid "Input methods can't be used on the login screen"
 msgstr "輸入法不能用在登入畫面"
 
-#: ../panels/region/cc-region-panel.c:1765
+#: ../panels/region/cc-region-panel.c:1773
 msgid "Login Screen"
 msgstr "登入畫面"
 
@@ -4852,34 +4833,30 @@ msgstr "選項"
 msgid "Login settings are used by all users when logging into the system"
 msgstr "登入設定值是所有的使用者在登入系統時會用到的"
 
-#: ../panels/search/cc-search-locations-dialog.c:275
-msgid "Home"
-msgstr "家"
-
-#: ../panels/search/cc-search-locations-dialog.c:477
+#: ../panels/search/cc-search-locations-dialog.c:476
 msgctxt "Search Location"
 msgid "Places"
 msgstr "位置"
 
-#: ../panels/search/cc-search-locations-dialog.c:479
+#: ../panels/search/cc-search-locations-dialog.c:478
 msgctxt "Search Location"
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../panels/search/cc-search-locations-dialog.c:481
+#: ../panels/search/cc-search-locations-dialog.c:480
 msgctxt "Search Location"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/search/cc-search-locations-dialog.c:679
+#: ../panels/search/cc-search-locations-dialog.c:678
 msgid "Select Location"
 msgstr "選擇位置"
 
-#: ../panels/search/cc-search-locations-dialog.c:683
+#: ../panels/search/cc-search-locations-dialog.c:682
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:176
 msgid "No applications found"
 msgstr "找不到應用程式"
 
@@ -4913,21 +4890,21 @@ msgstr "往下移"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../panels/sharing/cc-sharing-panel.c:285
+#: ../panels/sharing/cc-sharing-panel.c:276
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/sharing/cc-sharing-panel.c:287
+#: ../panels/sharing/cc-sharing-panel.c:278
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/sharing/cc-sharing-panel.c:432
+#: ../panels/sharing/cc-sharing-panel.c:442
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: ../panels/sharing/cc-sharing-panel.c:739
+#: ../panels/sharing/cc-sharing-panel.c:756
 msgid "Copy"
 msgstr "複製"
 
@@ -4965,85 +4942,77 @@ msgid ""
 msgstr "藍牙分享允許你與其他具有藍牙的裝置分享檔案"
 
 #: ../panels/sharing/sharing.ui.h:3
-msgid "Share Public Folder"
-msgstr "分享公用資料夾"
-
-#: ../panels/sharing/sharing.ui.h:4
 msgid "Only Receive From Trusted Devices"
 msgstr "只接收信任的裝置"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: ../panels/sharing/sharing.ui.h:4
 msgid "Save Received Files to Downloads Folder"
 msgstr "將接收的檔案儲存至下載資料夾"
 
-#: ../panels/sharing/sharing.ui.h:6
-msgid "Only share with Trusted Devices"
-msgstr "只與信任的裝置分享"
-
-#: ../panels/sharing/sharing.ui.h:7
+#: ../panels/sharing/sharing.ui.h:5
 msgid "Computer Name"
 msgstr "電腦名稱"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: ../panels/sharing/sharing.ui.h:6
 msgid "Personal File Sharing"
 msgstr "個人檔案分享"
 
-#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/sharing/sharing.ui.h:7
 msgid "Screen Sharing"
 msgstr "螢幕分享"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: ../panels/sharing/sharing.ui.h:8
 msgid "Media Sharing"
 msgstr "媒體分享"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: ../panels/sharing/sharing.ui.h:9
 msgid "Remote Login"
 msgstr "遠端登入"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Some services are disabled because of no network access."
 msgstr "由於沒有網絡存取,某些服務已停用。"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: ../panels/sharing/sharing.ui.h:11
 msgid "Share Music, Photos and Videos with others on the current network."
 msgstr "與目前網絡的其他人分享音樂、相片和影片。"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: ../panels/sharing/sharing.ui.h:12
 msgid "Share Media On This Network"
 msgstr "在這個網絡分享媒體"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: ../panels/sharing/sharing.ui.h:13
 msgid "Shared Folders"
 msgstr "分享資料夾"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: ../panels/sharing/sharing.ui.h:14
 msgid "column"
 msgstr "欄"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: ../panels/sharing/sharing.ui.h:15
 msgid "Add Folder"
 msgstr "加入資料夾"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: ../panels/sharing/sharing.ui.h:16
 msgid "Remove Folder"
 msgstr "移除資料夾"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:18
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
 "your current network using: <a href=\"dav://%s\">dav://%s</a>"
 msgstr "個人檔案分享允許你使用: <a href=\"dav://%s\">dav://%s</a> 與目前網絡上的其他人分享你的公開資料夾"
 
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:19
 msgid "Share Public Folder On This Network"
 msgstr "在這個網絡分享公開資料夾"
 
-#: ../panels/sharing/sharing.ui.h:22
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Require Password"
 msgstr "需要密碼"
 
-#: ../panels/sharing/sharing.ui.h:25
+#: ../panels/sharing/sharing.ui.h:23
 #, no-c-format
 msgid ""
 "Allow remote users to connect using the Secure Shell command:\n"
@@ -5052,28 +5021,40 @@ msgstr ""
 "允許遠端使用者使用 SSH 指令連線:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/sharing.ui.h:28
+#: ../panels/sharing/sharing.ui.h:26
 #, no-c-format
 msgid ""
 "Allow remote users to view or control your screen by connecting to: <a href="
 "\"vnc://%s\">vnc://%s</a>"
 msgstr "允許遠端使用者連線到:<a href=\"vnc://%s\">vnc://%s</a> 檢視或控制你的螢幕"
 
+#: ../panels/sharing/sharing.ui.h:27
+#| msgid "Remote Control"
+msgid "Allow Remote Control"
+msgstr "允許遙控"
+
+#: ../panels/sharing/sharing.ui.h:28
+#| msgid "Password"
+msgid "Password:"
+msgstr "密碼:"
+
 #: ../panels/sharing/sharing.ui.h:29
-msgid "Remote View"
-msgstr "遠端檢視"
+msgid "Show Password"
+msgstr "顯示密碼"
 
 #: ../panels/sharing/sharing.ui.h:30
-msgid "Remote Control"
-msgstr "遠端控制"
+#| msgid "%s Options"
+msgid "Access Options"
+msgstr "存取選項"
 
 #: ../panels/sharing/sharing.ui.h:31
-msgid "Approve All Connections"
-msgstr "允許所有的連線"
+msgid "New connections must ask for access"
+msgstr "存取新的連線必須詢問"
 
 #: ../panels/sharing/sharing.ui.h:32
-msgid "Show Password"
-msgstr "顯示密碼"
+#| msgid "Require Password"
+msgid "Require a password"
+msgstr "需要密碼"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
@@ -5112,60 +5093,60 @@ msgstr "敲玻璃"
 msgid "Sonar"
 msgstr "聲納"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: ../panels/sound/gvc-balance-bar.c:105
 msgctxt "balance"
 msgid "Left"
 msgstr "左"
 
-#: ../panels/sound/gvc-balance-bar.c:107
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Right"
 msgstr "右"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: ../panels/sound/gvc-balance-bar.c:109
 msgctxt "balance"
 msgid "Rear"
 msgstr "後"
 
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Front"
 msgstr "前"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: ../panels/sound/gvc-balance-bar.c:113
 msgctxt "balance"
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../panels/sound/gvc-balance-bar.c:290
+#: ../panels/sound/gvc-balance-bar.c:289
 msgid "_Balance:"
 msgstr "平衡(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:293
+#: ../panels/sound/gvc-balance-bar.c:292
 msgid "_Fade:"
 msgstr "淡化(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:296
+#: ../panels/sound/gvc-balance-bar.c:295
 msgid "_Subwoofer:"
 msgstr "重低音(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:613 ../panels/sound/gvc-channel-bar.c:622
+#: ../panels/sound/gvc-channel-bar.c:612 ../panels/sound/gvc-channel-bar.c:621
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:617
+#: ../panels/sound/gvc-channel-bar.c:616
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "未經放大"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261
-#: ../panels/sound/gvc-mixer-dialog.c:527
+#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:260
+#: ../panels/sound/gvc-mixer-dialog.c:526
 msgid "_Profile:"
 msgstr "設定組合(_P):"
 
@@ -5189,118 +5170,118 @@ msgstr[0] "%u 輸入"
 msgid "System Sounds"
 msgstr "系統音效"
 
-#: ../panels/sound/gvc-mixer-dialog.c:263
+#: ../panels/sound/gvc-mixer-dialog.c:262
 msgid "_Test Speakers"
 msgstr "測試喇叭(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:432
+#: ../panels/sound/gvc-mixer-dialog.c:431
 msgid "Peak detect"
 msgstr "峰值檢測"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1510
-#: ../panels/sound/gvc-sound-theme-chooser.c:595
+#: ../panels/sound/gvc-mixer-dialog.c:1509
+#: ../panels/sound/gvc-sound-theme-chooser.c:594
 msgid "Name"
 msgstr "名稱"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1529
+#: ../panels/sound/gvc-mixer-dialog.c:1528
 msgid "Device"
 msgstr "裝置"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1592
+#: ../panels/sound/gvc-mixer-dialog.c:1591
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s 的喇叭測試"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1649
+#: ../panels/sound/gvc-mixer-dialog.c:1648
 msgid "_Output volume:"
 msgstr "輸出音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1663
+#: ../panels/sound/gvc-mixer-dialog.c:1662
 msgid "Output"
 msgstr "輸出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1668
+#: ../panels/sound/gvc-mixer-dialog.c:1667
 msgid "C_hoose a device for sound output:"
 msgstr "選擇聲音輸出的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1693
+#: ../panels/sound/gvc-mixer-dialog.c:1692
 msgid "Settings for the selected device:"
 msgstr "已選取裝置的設定值:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1704
+#: ../panels/sound/gvc-mixer-dialog.c:1703
 msgid "Input"
 msgstr "輸入"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: ../panels/sound/gvc-mixer-dialog.c:1710
 msgid "_Input volume:"
 msgstr "輸入音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1734
+#: ../panels/sound/gvc-mixer-dialog.c:1733
 msgid "Input level:"
 msgstr "輸入等級:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1762
+#: ../panels/sound/gvc-mixer-dialog.c:1761
 msgid "C_hoose a device for sound input:"
 msgstr "選擇聲音輸入的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound/gvc-mixer-dialog.c:1788
 msgid "Sound Effects"
 msgstr "聲音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1796
+#: ../panels/sound/gvc-mixer-dialog.c:1795
 msgid "_Alert volume:"
 msgstr "警示音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1809
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "Applications"
 msgstr "程式集"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1813
+#: ../panels/sound/gvc-mixer-dialog.c:1812
 msgid "No application is currently playing or recording audio."
 msgstr "沒有應用程式目前正在播放或錄製音效。"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:189
+#: ../panels/sound/gvc-sound-theme-chooser.c:188
 msgid "Built-in"
 msgstr "內置"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:455
-#: ../panels/sound/gvc-sound-theme-chooser.c:467
-#: ../panels/sound/gvc-sound-theme-chooser.c:479
+#: ../panels/sound/gvc-sound-theme-chooser.c:454
+#: ../panels/sound/gvc-sound-theme-chooser.c:466
+#: ../panels/sound/gvc-sound-theme-chooser.c:478
 msgid "Sound Preferences"
 msgstr "音效偏好設定"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:458
-#: ../panels/sound/gvc-sound-theme-chooser.c:469
-#: ../panels/sound/gvc-sound-theme-chooser.c:481
+#: ../panels/sound/gvc-sound-theme-chooser.c:457
+#: ../panels/sound/gvc-sound-theme-chooser.c:468
+#: ../panels/sound/gvc-sound-theme-chooser.c:480
 msgid "Testing event sound"
 msgstr "測試事件聲音"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:585
+#: ../panels/sound/gvc-sound-theme-chooser.c:584
 msgid "Default"
 msgstr "預設值"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:586
+#: ../panels/sound/gvc-sound-theme-chooser.c:585
 msgid "From theme"
 msgstr "從主題"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:770
+#: ../panels/sound/gvc-sound-theme-chooser.c:769
 msgid "C_hoose an alert sound:"
 msgstr "選擇警示音效(_H):"
 
-#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:219
 msgid "Stop"
 msgstr "停止"
 
-#: ../panels/sound/gvc-speaker-test.c:220
-#: ../panels/sound/gvc-speaker-test.c:332
+#: ../panels/sound/gvc-speaker-test.c:219
+#: ../panels/sound/gvc-speaker-test.c:331
 msgid "Test"
 msgstr "測試"
 
-#: ../panels/sound/gvc-speaker-test.c:228
+#: ../panels/sound/gvc-speaker-test.c:227
 msgid "Subwoofer"
 msgstr "重低音"
 
-#: ../panels/sound/sound-theme-file-utils.c:292
+#: ../panels/sound/sound-theme-file-utils.c:290
 msgid "Custom"
 msgstr "自選"
 
@@ -5360,8 +5341,9 @@ msgid "_Typing Assist (AccessX)"
 msgstr "打字助理 [AccessX](_T)"
 
 #: ../panels/universal-access/uap.ui.h:14
-msgid "Pointing and Clicking"
-msgstr "指標和點擊"
+#| msgid "Pointing and Clicking"
+msgid "Pointing & Clicking"
+msgstr "指向 & 點選"
 
 #: ../panels/universal-access/uap.ui.h:15
 msgid "_Mouse Keys"
@@ -5561,27 +5543,27 @@ msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/zoom-options.c:357
+#: ../panels/universal-access/zoom-options.c:333
 msgctxt "Distance"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/zoom-options.c:358
+#: ../panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ 螢幕"
 
-#: ../panels/universal-access/zoom-options.c:359
+#: ../panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ 螢幕"
 
-#: ../panels/universal-access/zoom-options.c:360
+#: ../panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ 螢幕"
 
-#: ../panels/universal-access/zoom-options.c:361
+#: ../panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "Long"
 msgstr "長"
@@ -5743,14 +5725,14 @@ msgstr "顏色效果"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:35
+#: ../panels/user-accounts/um-account-type.c:34
 msgctxt "Account type"
 msgid "Standard"
 msgstr "標準"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:37
+#: ../panels/user-accounts/um-account-type.c:36
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "管理員"
@@ -5856,7 +5838,7 @@ msgid "Right little finger"
 msgstr "右手小指"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:699
+#: ../panels/user-accounts/um-fingerprint-dialog.c:697
 msgid "Enable Fingerprint Login"
 msgstr "啟用指紋登入"
 
@@ -5951,214 +5933,214 @@ msgstr "管理使用者帳號"
 msgid "Authentication is required to change user data"
 msgstr "改變使用者資料需要核對"
 
-#: ../panels/user-accounts/pw-utils.c:82
+#: ../panels/user-accounts/pw-utils.c:81
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr "新的密碼需要與舊密碼有所差異。"
 
-#: ../panels/user-accounts/pw-utils.c:84
+#: ../panels/user-accounts/pw-utils.c:83
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "嘗試改變某些文字和數字。"
 
-#: ../panels/user-accounts/pw-utils.c:86 ../panels/user-accounts/pw-utils.c:94
+#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "嘗試更常改變密碼。"
 
-#: ../panels/user-accounts/pw-utils.c:88
+#: ../panels/user-accounts/pw-utils.c:87
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "不含你的使用者名稱的密碼強度會比較高。"
 
-#: ../panels/user-accounts/pw-utils.c:90
+#: ../panels/user-accounts/pw-utils.c:89
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "嘗試避免在密碼中使用你的姓名。"
 
-#: ../panels/user-accounts/pw-utils.c:92
+#: ../panels/user-accounts/pw-utils.c:91
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "嘗試避免在密碼中包含某些文字。"
 
-#: ../panels/user-accounts/pw-utils.c:96
+#: ../panels/user-accounts/pw-utils.c:95
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "嘗試避免常見的文字。"
 
-#: ../panels/user-accounts/pw-utils.c:98
+#: ../panels/user-accounts/pw-utils.c:97
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "嘗試避免重新排序現有的文字。"
 
-#: ../panels/user-accounts/pw-utils.c:100
+#: ../panels/user-accounts/pw-utils.c:99
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "嘗試使用更多數字。"
 
-#: ../panels/user-accounts/pw-utils.c:102
+#: ../panels/user-accounts/pw-utils.c:101
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "嘗試使用更多大寫字母。"
 
-#: ../panels/user-accounts/pw-utils.c:104
+#: ../panels/user-accounts/pw-utils.c:103
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "嘗試使用更多小寫字母。"
 
-#: ../panels/user-accounts/pw-utils.c:106
+#: ../panels/user-accounts/pw-utils.c:105
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "嘗試使用更多特殊字符,像是標點符號。"
 
-#: ../panels/user-accounts/pw-utils.c:108
+#: ../panels/user-accounts/pw-utils.c:107
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "嘗試使用混合字母、數字和標點符號。"
 
-#: ../panels/user-accounts/pw-utils.c:110
+#: ../panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "嘗試避免同樣字符。"
 
-#: ../panels/user-accounts/pw-utils.c:112
+#: ../panels/user-accounts/pw-utils.c:111
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
 msgstr "嘗試避免重複同樣類型的字符:你需要混合字母、數字和標點符號。"
 
-#: ../panels/user-accounts/pw-utils.c:114
+#: ../panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "嘗試避免像 1234 或 abcd 等順序。"
 
-#: ../panels/user-accounts/pw-utils.c:116
+#: ../panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
 msgid "Try to add more letters, numbers and symbols."
 msgstr "嘗試加入更多字母、數字和標點符號。"
 
-#: ../panels/user-accounts/pw-utils.c:118
+#: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and use a number or two."
 msgstr "混合大寫與小寫字符並使用一到兩個數字。"
 
-#: ../panels/user-accounts/pw-utils.c:120
+#: ../panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
 "Good password! Adding more letters, numbers and punctuation will make it "
 "stronger."
 msgstr "不錯的密碼!加入更多字母、數字和標點符號會讓它更好。"
 
-#: ../panels/user-accounts/pw-utils.c:142
-#: ../panels/user-accounts/pw-utils.c:172
+#: ../panels/user-accounts/pw-utils.c:141
+#: ../panels/user-accounts/pw-utils.c:171
 msgctxt "Password strength"
 msgid "Strength: Weak"
 msgstr "強度:很弱"
 
-#: ../panels/user-accounts/pw-utils.c:146
-#: ../panels/user-accounts/pw-utils.c:173
+#: ../panels/user-accounts/pw-utils.c:145
+#: ../panels/user-accounts/pw-utils.c:172
 msgctxt "Password strength"
 msgid "Strength: Low"
 msgstr "強度:低度"
 
-#: ../panels/user-accounts/pw-utils.c:149
-#: ../panels/user-accounts/pw-utils.c:174
+#: ../panels/user-accounts/pw-utils.c:148
+#: ../panels/user-accounts/pw-utils.c:173
 msgctxt "Password strength"
 msgid "Strength: Medium"
 msgstr "強度:中度"
 
-#: ../panels/user-accounts/pw-utils.c:152
-#: ../panels/user-accounts/pw-utils.c:175
+#: ../panels/user-accounts/pw-utils.c:151
+#: ../panels/user-accounts/pw-utils.c:174
 msgctxt "Password strength"
 msgid "Strength: Good"
 msgstr "強度:良好"
 
-#: ../panels/user-accounts/pw-utils.c:155
-#: ../panels/user-accounts/pw-utils.c:176
+#: ../panels/user-accounts/pw-utils.c:154
+#: ../panels/user-accounts/pw-utils.c:175
 msgctxt "Password strength"
 msgid "Strength: High"
 msgstr "強度:高度"
 
-#: ../panels/user-accounts/run-passwd.c:424
+#: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "核對失敗"
 
-#: ../panels/user-accounts/run-passwd.c:504
+#: ../panels/user-accounts/run-passwd.c:502
 #, c-format
 msgid "The new password is too short"
 msgstr "新的密碼太短"
 
-#: ../panels/user-accounts/run-passwd.c:510
+#: ../panels/user-accounts/run-passwd.c:508
 #, c-format
 msgid "The new password is too simple"
 msgstr "新的密碼太簡單"
 
-#: ../panels/user-accounts/run-passwd.c:516
+#: ../panels/user-accounts/run-passwd.c:514
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "舊密碼與新密碼太相似了"
 
-#: ../panels/user-accounts/run-passwd.c:519
+#: ../panels/user-accounts/run-passwd.c:517
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "新的密碼已經在最近使用過了。"
 
-#: ../panels/user-accounts/run-passwd.c:522
+#: ../panels/user-accounts/run-passwd.c:520
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "新的密碼必須包含數字或特殊字符"
 
-#: ../panels/user-accounts/run-passwd.c:526
+#: ../panels/user-accounts/run-passwd.c:524
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "舊密碼與新密碼是相同的"
 
-#: ../panels/user-accounts/run-passwd.c:530
+#: ../panels/user-accounts/run-passwd.c:528
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "你的密碼在第一次核對後已經改變過了!"
 
-#: ../panels/user-accounts/run-passwd.c:534
+#: ../panels/user-accounts/run-passwd.c:532
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "新的密碼並未包含足夠的不同字符"
 
-#: ../panels/user-accounts/run-passwd.c:538
+#: ../panels/user-accounts/run-passwd.c:536
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../panels/user-accounts/um-account-dialog.c:35
+#: ../panels/user-accounts/um-account-dialog.c:34
 msgid "Should match the web address of your account provider."
 msgstr "應符合你帳號提供者的網絡位址。"
 
-#: ../panels/user-accounts/um-account-dialog.c:222
+#: ../panels/user-accounts/um-account-dialog.c:221
 msgid "Failed to add account"
 msgstr "無法加入到帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:316
+#: ../panels/user-accounts/um-account-dialog.c:315
 msgid "This will be used to name your home folder and can't be changed."
 msgstr "這會成為你家目錄資料夾的名稱,並且不能被改變。"
 
-#: ../panels/user-accounts/um-account-dialog.c:449
+#: ../panels/user-accounts/um-account-dialog.c:448
 msgid "Passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-account-dialog.c:719
-#: ../panels/user-accounts/um-account-dialog.c:765
+#: ../panels/user-accounts/um-account-dialog.c:718
+#: ../panels/user-accounts/um-account-dialog.c:764
 msgid "Failed to register account"
 msgstr "無法註冊帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:903
+#: ../panels/user-accounts/um-account-dialog.c:902
 msgid "No supported way to authenticate with this domain"
 msgstr "沒有支援這個網域核對的方式"
 
-#: ../panels/user-accounts/um-account-dialog.c:962
+#: ../panels/user-accounts/um-account-dialog.c:961
 msgid "Failed to join domain"
 msgstr "無法加入網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1023
+#: ../panels/user-accounts/um-account-dialog.c:1022
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6166,7 +6148,7 @@ msgstr ""
 "登入名稱沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1030
+#: ../panels/user-accounts/um-account-dialog.c:1029
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6174,64 +6156,64 @@ msgstr ""
 "登入密碼沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1038
+#: ../panels/user-accounts/um-account-dialog.c:1037
 msgid "Failed to log into domain"
 msgstr "無法登入到網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1096
+#: ../panels/user-accounts/um-account-dialog.c:1095
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "找不到網域。也許你拼錯字了?"
 
-#: ../panels/user-accounts/um-account-dialog.c:1446
+#: ../panels/user-accounts/um-account-dialog.c:1445
 msgid "Add User"
 msgstr "加入使用者"
 
 #. Create enterprise toggle button.
-#: ../panels/user-accounts/um-account-dialog.c:1459
+#: ../panels/user-accounts/um-account-dialog.c:1458
 msgid "_Enterprise Login"
 msgstr "企業登入(_E)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:139
+#: ../panels/user-accounts/um-fingerprint-dialog.c:137
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "你不被允許使用這個裝置。請聯絡你的系統管理者。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:141
+#: ../panels/user-accounts/um-fingerprint-dialog.c:139
 msgid "The device is already in use."
 msgstr "該裝置已經在使用中。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:143
+#: ../panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "An internal error occurred."
 msgstr "發生內部的錯誤。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:219
-#: ../panels/user-accounts/um-fingerprint-dialog.c:220
+#: ../panels/user-accounts/um-fingerprint-dialog.c:217
+#: ../panels/user-accounts/um-fingerprint-dialog.c:218
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:268
+#: ../panels/user-accounts/um-fingerprint-dialog.c:266
 msgid "Delete registered fingerprints?"
 msgstr "是否刪除已註冊的指紋?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:272
+#: ../panels/user-accounts/um-fingerprint-dialog.c:270
 msgid "_Delete Fingerprints"
 msgstr "刪除指紋(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:278
+#: ../panels/user-accounts/um-fingerprint-dialog.c:276
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "你確定要刪除已註冊的指紋嗎?這麼一來將會停用指紋登入。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:454
+#: ../panels/user-accounts/um-fingerprint-dialog.c:452
 msgid "Done!"
 msgstr "完成!"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:515
-#: ../panels/user-accounts/um-fingerprint-dialog.c:557
+#: ../panels/user-accounts/um-fingerprint-dialog.c:513
+#: ../panels/user-accounts/um-fingerprint-dialog.c:555
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "無法存取「%s」裝置"
@@ -6239,16 +6221,16 @@ msgstr "無法存取「%s」裝置"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:598
+#: ../panels/user-accounts/um-fingerprint-dialog.c:596
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "無法使用「%s」裝置上的指紋捕捉"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:649
+#: ../panels/user-accounts/um-fingerprint-dialog.c:647
 msgid "Could not access any fingerprint readers"
 msgstr "無法存取任何指紋辨識器"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:650
+#: ../panels/user-accounts/um-fingerprint-dialog.c:648
 msgid "Please contact your system administrator for help."
 msgstr "請聯絡你的系統管理員來幫忙。"
 
@@ -6257,26 +6239,26 @@ msgstr "請聯絡你的系統管理員來幫忙。"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:733
+#: ../panels/user-accounts/um-fingerprint-dialog.c:731
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
 msgstr "要啟用指紋登入,你需要使用「%s」裝置儲存你的指紋。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:740
+#: ../panels/user-accounts/um-fingerprint-dialog.c:738
 msgid "Selecting finger"
 msgstr "選擇手指"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:741
+#: ../panels/user-accounts/um-fingerprint-dialog.c:739
 msgid "Enrolling fingerprints"
 msgstr "登記指紋"
 
-#: ../panels/user-accounts/um-history-dialog.c:88
+#: ../panels/user-accounts/um-history-dialog.c:87
 msgid "This Week"
 msgstr "本週"
 
-#: ../panels/user-accounts/um-history-dialog.c:91
+#: ../panels/user-accounts/um-history-dialog.c:90
 msgid "Last Week"
 msgstr "上週"
 
@@ -6284,22 +6266,22 @@ msgstr "上週"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:97
-#: ../panels/user-accounts/um-history-dialog.c:101
+#: ../panels/user-accounts/um-history-dialog.c:96
+#: ../panels/user-accounts/um-history-dialog.c:100
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%b%e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:106
+#: ../panels/user-accounts/um-history-dialog.c:105
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%Y年%b%e日"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:111
+#: ../panels/user-accounts/um-history-dialog.c:110
 #, c-format
 msgctxt "login history week label"
 msgid "%s - %s"
@@ -6307,160 +6289,160 @@ msgstr "%s - %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:195
-#: ../panels/user-accounts/um-user-panel.c:626
+#: ../panels/user-accounts/um-history-dialog.c:194
+#: ../panels/user-accounts/um-user-panel.c:625
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:198
-#: ../panels/user-accounts/um-user-panel.c:630
+#: ../panels/user-accounts/um-history-dialog.c:197
+#: ../panels/user-accounts/um-user-panel.c:629
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s,%s"
 
-#: ../panels/user-accounts/um-history-dialog.c:267
+#: ../panels/user-accounts/um-history-dialog.c:266
 msgid "Session Ended"
 msgstr "作業階段結束"
 
-#: ../panels/user-accounts/um-history-dialog.c:273
+#: ../panels/user-accounts/um-history-dialog.c:272
 msgid "Session Started"
 msgstr "作業階段開始"
 
-#: ../panels/user-accounts/um-password-dialog.c:146
+#: ../panels/user-accounts/um-password-dialog.c:145
 msgid "Please choose another password."
 msgstr "請選擇其他密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:155
+#: ../panels/user-accounts/um-password-dialog.c:154
 msgid "Please type your current password again."
 msgstr "請再次輸入你目前的密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:161
+#: ../panels/user-accounts/um-password-dialog.c:160
 msgid "Password could not be changed"
 msgstr "密碼無法更改"
 
-#: ../panels/user-accounts/um-password-dialog.c:287
+#: ../panels/user-accounts/um-password-dialog.c:286
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/user-accounts/um-photo-dialog.c:217
 msgid "Browse for more pictures"
 msgstr "瀏覽更多照片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:443
+#: ../panels/user-accounts/um-photo-dialog.c:442
 msgid "Disable image"
 msgstr "停用圖片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:461
+#: ../panels/user-accounts/um-photo-dialog.c:460
 msgid "Take a photo…"
 msgstr "照相…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:479
+#: ../panels/user-accounts/um-photo-dialog.c:478
 msgid "Browse for more pictures…"
 msgstr "瀏覽更多照片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:702
 #, c-format
 msgid "Used by %s"
 msgstr "由 %s 使用"
 
-#: ../panels/user-accounts/um-realm-manager.c:351
+#: ../panels/user-accounts/um-realm-manager.c:350
 msgid "Cannot automatically join this type of domain"
 msgstr "不能自動加入這個類型的網域"
 
-#: ../panels/user-accounts/um-realm-manager.c:414
+#: ../panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
 msgstr "找不到這個網域或領域名稱"
 
-#: ../panels/user-accounts/um-realm-manager.c:814
-#: ../panels/user-accounts/um-realm-manager.c:828
+#: ../panels/user-accounts/um-realm-manager.c:813
+#: ../panels/user-accounts/um-realm-manager.c:827
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "不能以 %s 身分登入 %s 網域"
 
-#: ../panels/user-accounts/um-realm-manager.c:820
+#: ../panels/user-accounts/um-realm-manager.c:819
 msgid "Invalid password, please try again"
 msgstr "密碼錯誤,請再試一次"
 
-#: ../panels/user-accounts/um-realm-manager.c:833
+#: ../panels/user-accounts/um-realm-manager.c:832
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "無法連接到 %s 網域:%s"
 
-#: ../panels/user-accounts/um-user-panel.c:193
+#: ../panels/user-accounts/um-user-panel.c:192
 msgid "Other Accounts"
 msgstr "其他帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:412
+#: ../panels/user-accounts/um-user-panel.c:411
 msgid "Failed to delete user"
 msgstr "刪除使用者失敗"
 
-#: ../panels/user-accounts/um-user-panel.c:477
+#: ../panels/user-accounts/um-user-panel.c:476
 msgid "You cannot delete your own account."
 msgstr "你不能刪除自己的帳號。"
 
-#: ../panels/user-accounts/um-user-panel.c:486
+#: ../panels/user-accounts/um-user-panel.c:485
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 仍在登入中"
 
-#: ../panels/user-accounts/um-user-panel.c:490
+#: ../panels/user-accounts/um-user-panel.c:489
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "在使用者登入期間刪除他會使系統處於不穩定的狀態。"
 
-#: ../panels/user-accounts/um-user-panel.c:499
+#: ../panels/user-accounts/um-user-panel.c:498
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "你想要保留 %s 的檔案嗎?"
 
-#: ../panels/user-accounts/um-user-panel.c:503
+#: ../panels/user-accounts/um-user-panel.c:502
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "當刪除使用者時是可以保留家目錄、新進郵件(mail spool)和暫存檔案的。"
 
-#: ../panels/user-accounts/um-user-panel.c:506
+#: ../panels/user-accounts/um-user-panel.c:505
 msgid "_Delete Files"
 msgstr "刪除檔案(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-user-panel.c:506
 msgid "_Keep Files"
 msgstr "保留檔案(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:559
+#: ../panels/user-accounts/um-user-panel.c:558
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳號已停用"
 
-#: ../panels/user-accounts/um-user-panel.c:567
+#: ../panels/user-accounts/um-user-panel.c:566
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "在下次登入時設定"
 
-#: ../panels/user-accounts/um-user-panel.c:570
+#: ../panels/user-accounts/um-user-panel.c:569
 msgctxt "Password mode"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/user-accounts/um-user-panel.c:619
+#: ../panels/user-accounts/um-user-panel.c:618
 msgid "Logged in"
 msgstr "已登入"
 
-#: ../panels/user-accounts/um-user-panel.c:999
+#: ../panels/user-accounts/um-user-panel.c:998
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: ../panels/user-accounts/um-user-panel.c:1001
+#: ../panels/user-accounts/um-user-panel.c:1000
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1042
+#: ../panels/user-accounts/um-user-panel.c:1041
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6468,12 +6450,12 @@ msgstr ""
 "要進行更改,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1080
+#: ../panels/user-accounts/um-user-panel.c:1079
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1091
-#: ../panels/user-accounts/um-user-panel.c:1380
+#: ../panels/user-accounts/um-user-panel.c:1090
+#: ../panels/user-accounts/um-user-panel.c:1379
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6481,12 +6463,12 @@ msgstr ""
 "要建立使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1101
+#: ../panels/user-accounts/um-user-panel.c:1100
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1113
-#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1112
+#: ../panels/user-accounts/um-user-panel.c:1384
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6494,37 +6476,37 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1295
+#: ../panels/user-accounts/um-user-panel.c:1294
 msgid "My Account"
 msgstr "我的帳號"
 
-#: ../panels/user-accounts/um-utils.c:551
+#: ../panels/user-accounts/um-utils.c:567
 #, c-format
 msgid "A user with the username '%s' already exists"
 msgstr "以使用者名稱「%s」為名的使用者已經存在"
 
-#: ../panels/user-accounts/um-utils.c:555
+#: ../panels/user-accounts/um-utils.c:571
 #, c-format
 msgid "The username is too long"
 msgstr "使用者名稱太長了"
 
-#: ../panels/user-accounts/um-utils.c:558
+#: ../panels/user-accounts/um-utils.c:574
 msgid "The username cannot start with a '-'"
 msgstr "使用者名稱不能以 '-' 字母開頭"
 
-#: ../panels/user-accounts/um-utils.c:561
+#: ../panels/user-accounts/um-utils.c:577
 msgid ""
 "The username should only consist of lower and upper case letters from a-z, "
 "digits and any of characters '.', '-' and '_'"
 msgstr "使用者名稱必須由從 a-z 的大小寫字母、數字、 '.'、 '-' 和 '_' 字符組成"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/user-accounts/um-utils.c:811
+#: ../panels/user-accounts/um-utils.c:827
 msgid "%b %e"
 msgstr "%b%e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/user-accounts/um-utils.c:815
+#: ../panels/user-accounts/um-utils.c:831
 msgid "%b %e, %Y"
 msgstr "%Y年%b%e日"
 
@@ -6542,70 +6524,70 @@ msgid ""
 "shortcut button and hold down the new keys or press Backspace to clear."
 msgstr "要編輯捷徑鍵,選擇「傳送筆劃」動作,按下鍵盤捷徑按鈕與新的按鍵組合,或以 Backspace 鍵來清除。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:82
+#: ../panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 msgstr "請點一下出現在螢幕上的目標標記來校準繪圖板。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:86
+#: ../panels/wacom/calibrator/calibrator-gui.c:87
 msgid "Mis-click detected, restarting..."
 msgstr "偵測到錯誤的點擊,重新開始…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:443
+#: ../panels/wacom/cc-wacom-button-row.c:442
 msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "上"
 
-#: ../panels/wacom/cc-wacom-button-row.c:444
+#: ../panels/wacom/cc-wacom-button-row.c:443
 msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "下"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "傳送筆劃"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
+#: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "切換監視器"
 
-#: ../panels/wacom/cc-wacom-button-row.h:58
+#: ../panels/wacom/cc-wacom-button-row.h:57
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "顯示螢幕求助"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:264
+#: ../panels/wacom/cc-wacom-mapping-panel.c:263
 msgid "Output:"
 msgstr "輸出:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:276
+#: ../panels/wacom/cc-wacom-mapping-panel.c:275
 msgid "Keep aspect ratio (letterbox):"
 msgstr "保持長寬比:"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:287
+#: ../panels/wacom/cc-wacom-mapping-panel.c:286
 msgid "Map to single monitor"
 msgstr "映射到單一螢幕"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:89
+#: ../panels/wacom/cc-wacom-nav-button.c:88
 #, c-format
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:531
+#: ../panels/wacom/cc-wacom-page.c:530
 msgid "Display Mapping"
 msgstr "顯示對應"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:373
+#: ../panels/wacom/cc-wacom-stylus-page.c:372
 msgid "Button"
 msgstr "按鈕"
 
@@ -6672,91 +6654,91 @@ msgid "Left-Handed Orientation"
 msgstr "左手方向"
 
 #. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1063
+#: ../panels/wacom/gsd-wacom-device.c:1062
 msgid "Left Ring"
 msgstr "左環"
 
-#: ../panels/wacom/gsd-wacom-device.c:1074
+#: ../panels/wacom/gsd-wacom-device.c:1073
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "左觸控環模式 #%d"
 
 #. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1094
+#: ../panels/wacom/gsd-wacom-device.c:1093
 msgid "Right Ring"
 msgstr "右環"
 
-#: ../panels/wacom/gsd-wacom-device.c:1105
+#: ../panels/wacom/gsd-wacom-device.c:1104
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "右觸控環模式 #%d"
 
 #. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1147
+#: ../panels/wacom/gsd-wacom-device.c:1146
 msgid "Left Touchstrip"
 msgstr "左觸控列"
 
-#: ../panels/wacom/gsd-wacom-device.c:1158
+#: ../panels/wacom/gsd-wacom-device.c:1157
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "左觸控列模式 #%d"
 
 #. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1178
+#: ../panels/wacom/gsd-wacom-device.c:1177
 msgid "Right Touchstrip"
 msgstr "右觸控列"
 
-#: ../panels/wacom/gsd-wacom-device.c:1189
+#: ../panels/wacom/gsd-wacom-device.c:1188
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "右觸控列模式 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1215
+#: ../panels/wacom/gsd-wacom-device.c:1214
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "左觸控環模式切換"
 
-#: ../panels/wacom/gsd-wacom-device.c:1217
+#: ../panels/wacom/gsd-wacom-device.c:1216
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "右觸控環模式切換"
 
-#: ../panels/wacom/gsd-wacom-device.c:1220
+#: ../panels/wacom/gsd-wacom-device.c:1219
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "左觸控列模式切換"
 
-#: ../panels/wacom/gsd-wacom-device.c:1222
+#: ../panels/wacom/gsd-wacom-device.c:1221
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "右觸控列模式切換"
 
-#: ../panels/wacom/gsd-wacom-device.c:1227
+#: ../panels/wacom/gsd-wacom-device.c:1226
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "模式切換 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1335
+#: ../panels/wacom/gsd-wacom-device.c:1334
 #, c-format
 msgid "Left Button #%d"
 msgstr "左側按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1338
+#: ../panels/wacom/gsd-wacom-device.c:1337
 #, c-format
 msgid "Right Button #%d"
 msgstr "右側按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1341
+#: ../panels/wacom/gsd-wacom-device.c:1340
 #, c-format
 msgid "Top Button #%d"
 msgstr "頂端按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1344
+#: ../panels/wacom/gsd-wacom-device.c:1343
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "底部按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:264
+#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "新增捷徑鍵…"
 
@@ -6857,11 +6839,11 @@ msgstr "要顯示的面板"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[面板] [引數…]"
 
-#: ../shell/cc-application.c:142
+#: ../shell/cc-application.c:145
 msgid "- Settings"
 msgstr "- 設定值)"
 
-#: ../shell/cc-application.c:160
+#: ../shell/cc-application.c:163
 #, c-format
 msgid ""
 "%s\n"
@@ -6870,39 +6852,39 @@ msgstr ""
 "%s\n"
 "執行 「%s --help」以查看完整的命令列可用選項清單。\n"
 
-#: ../shell/cc-application.c:190
+#: ../shell/cc-application.c:193
 msgid "Available panels:"
 msgstr "可用的面板:"
 
-#: ../shell/cc-application.c:325
+#: ../shell/cc-application.c:328
 msgid "Help"
 msgstr "求助"
 
-#: ../shell/cc-application.c:326
+#: ../shell/cc-application.c:329
 msgid "Quit"
 msgstr "結束"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+#: ../shell/cc-window.c:61 ../shell/cc-window.c:1490
 msgid "All Settings"
 msgstr "所有設定值"
 
 #. Add categories
-#: ../shell/cc-window.c:868
+#: ../shell/cc-window.c:872
 msgctxt "category"
 msgid "Personal"
 msgstr "個人"
 
-#: ../shell/cc-window.c:869
+#: ../shell/cc-window.c:873
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../shell/cc-window.c:870
+#: ../shell/cc-window.c:874
 msgctxt "category"
 msgid "System"
 msgstr "系統"
 
-#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../shell/cc-window.c:1601 ../shell/gnome-control-center.desktop.in.in.h:1
 msgid "Settings"
 msgstr "設定值"
 
@@ -6910,6 +6892,71 @@ msgstr "設定值"
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
 
+#~ msgid "Flickr"
+#~ msgstr "Flickr"
+
+#~ msgid "Set Up New Device"
+#~ msgstr "設置新裝置"
+
+#~ msgid "Connection"
+#~ msgstr "連線"
+
+#~ msgid "Paired"
+#~ msgstr "已配對"
+
+#~ msgid "Type"
+#~ msgstr "類型"
+
+#~ msgid "Mouse & Touchpad Settings"
+#~ msgstr "滑鼠與觸控板設定值"
+
+#~ msgid "Sound Settings"
+#~ msgstr "音效設定值"
+
+#~ msgid "Keyboard Settings"
+#~ msgstr "鍵盤設定值"
+
+#~ msgid "Send Files…"
+#~ msgstr "傳送檔案…"
+
+#~ msgid "Visibility"
+#~ msgstr "顯示狀態"
+
+#~ msgid "Visibility of “%s”"
+#~ msgstr "「%s」的顯示狀態"
+
+#~ msgid "Remove '%s' from the list of devices?"
+#~ msgstr "是否從裝置的清單中移除「%s」?"
+
+#~ msgid ""
+#~ "If you remove the device, you will have to set it up again before next "
+#~ "use."
+#~ msgstr "如果您刪除此裝置,下次使用時必須再次設定它。"
+
+#~ msgid "Install Updates"
+#~ msgstr "安裝更新"
+
+#~ msgid "System Up-To-Date"
+#~ msgstr "系統已是最新"
+
+#~ msgid "Search for network printers or filter result"
+#~ msgstr "搜尋網路印表機或過濾器結果"
+
+#~ msgid "_Default"
+#~ msgstr "預設值(_D)"
+
+#~ msgid "Share Public Folder"
+#~ msgstr "分享公用資料夾"
+
+#~ msgid "Only share with Trusted Devices"
+#~ msgstr "只與信任的裝置分享"
+
+#~ msgid "Remote View"
+#~ msgstr "遠端檢視"
+
+#~ msgid "Approve All Connections"
+#~ msgstr "允許所有的連線"
+
 #~ msgid "Device type:"
 #~ msgstr "裝置類型:"
 
@@ -6939,9 +6986,6 @@ msgstr "Preferences;Settings;偏好設定;設定值;"
 #~ msgid "Refresh Rate"
 #~ msgstr "更新率"
 
-#~ msgid "Software"
-#~ msgstr "軟體"
-
 #~ msgid "Mouse Preferences"
 #~ msgstr "滑鼠偏好設定"
 
@@ -7496,9 +7540,6 @@ msgstr "Preferences;Settings;偏好設定;設定值;"
 #~ msgid "Change printer settings"
 #~ msgstr "改變印表機設定值"
 
-#~ msgid "%s Options"
-#~ msgstr "%s 選項"
-
 #~ msgid "Manufacturers"
 #~ msgstr "製造商"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1d3935d..d6fd44f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,16 +14,16 @@ 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-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"
+"POT-Creation-Date: 2014-02-24 23:17+0000\n"
+"PO-Revision-Date: 2014-03-04 16:11+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #: ../panels/background/background.ui.h:1
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
@@ -35,117 +35,121 @@ msgstr "背景"
 msgid "Changes throughout the day"
 msgstr "整天的變更"
 
-#: ../panels/background/background.ui.h:4
+#. To translators: This is a noun, not a verb
+#: ../panels/background/background.ui.h:5
 msgid "Lock Screen"
 msgstr "鎖定畫面"
 
-#: ../panels/background/background.ui.h:5
+#: ../panels/background/background.ui.h:6
 msgctxt "background, style"
 msgid "Tile"
 msgstr "鋪排"
 
-#: ../panels/background/background.ui.h:6
+#: ../panels/background/background.ui.h:7
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../panels/background/background.ui.h:7
+#: ../panels/background/background.ui.h:8
 msgctxt "background, style"
 msgid "Center"
 msgstr "置中"
 
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:9
 msgctxt "background, style"
 msgid "Scale"
 msgstr "縮放"
 
-#: ../panels/background/background.ui.h:9
+#: ../panels/background/background.ui.h:10
 msgctxt "background, style"
 msgid "Fill"
 msgstr "填滿"
 
-#: ../panels/background/background.ui.h:10
+#: ../panels/background/background.ui.h:11
 msgctxt "background, style"
 msgid "Span"
 msgstr "合併"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:292
+#: ../panels/background/cc-background-chooser-dialog.c:277
 msgid "Select Background"
 msgstr "選擇背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:312
+#: ../panels/background/cc-background-chooser-dialog.c:297
 msgid "Wallpapers"
 msgstr "桌布"
 
-#: ../panels/background/cc-background-chooser-dialog.c:321
+#: ../panels/background/cc-background-chooser-dialog.c:306
 msgid "Pictures"
 msgstr "圖片"
 
-#: ../panels/background/cc-background-chooser-dialog.c:329
+#: ../panels/background/cc-background-chooser-dialog.c:314
 msgid "Colors"
 msgstr "顏色"
 
-#: ../panels/background/cc-background-chooser-dialog.c:338
-msgid "Flickr"
-msgstr "Flickr"
-
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:385
+#: ../panels/background/cc-background-chooser-dialog.c:360
 msgid "No Pictures Found"
 msgstr "找不到圖片"
 
+#. translators: "Home" is used in place of the Pictures
+#. * directory in the string below when XDG_PICTURES_DIR is
+#. * undefined
+#: ../panels/background/cc-background-chooser-dialog.c:378
+#: ../panels/search/cc-search-locations-dialog.c:274
+msgid "Home"
+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:400
+#: ../panels/background/cc-background-chooser-dialog.c:390
 #, 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:428
-#: ../panels/bluetooth/cc-bluetooth-panel.c:640
-#: ../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/background/cc-background-chooser-dialog.c:419
+#: ../panels/color/cc-color-panel.c:222 ../panels/color/cc-color-panel.c:959
+#: ../panels/display/cc-display-panel.c:1510
+#: ../panels/display/cc-display-panel.c:1953
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../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/network/net-device-wifi.c:1197
+#: ../panels/network/net-device-wifi.c:1405
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:377
+#: ../panels/printers/cc-printers-panel.c:1945
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:470
-#: ../panels/search/cc-search-locations-dialog.c:682
-#: ../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
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/privacy/cc-privacy-panel.c:471
+#: ../panels/search/cc-search-locations-dialog.c:681
+#: ../panels/sharing/cc-sharing-panel.c:445
+#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-photo-dialog.c:95
+#: ../panels/user-accounts/um-photo-dialog.c:220
+#: ../panels/user-accounts/um-user-panel.c:507
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:429
+#: ../panels/background/cc-background-chooser-dialog.c:420
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:98
+#: ../panels/user-accounts/um-photo-dialog.c:97
 msgid "Select"
 msgstr "選取"
 
-#: ../panels/background/cc-background-item.c:149
+#: ../panels/background/cc-background-item.c:148
 msgid "multiple sizes"
 msgstr "多重尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:153
+#: ../panels/background/cc-background-item.c:152
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:281
+#: ../panels/background/cc-background-item.c:280
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: ../panels/background/cc-background-panel.c:493
+#: ../panels/background/cc-background-panel.c:492
 msgid "Current background"
 msgstr "目前的背景"
 
@@ -158,109 +162,17 @@ msgstr "將您的背景影像變更為桌布或相片"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 
-#: ../panels/bluetooth/bluetooth.ui.h:1
-msgid "Set Up New Device"
-msgstr "設置新裝置"
-
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
-msgid "Remove Device"
-msgstr "移除裝置"
-
-#: ../panels/bluetooth/bluetooth.ui.h:3
-msgid "Connection"
-msgstr "連線"
-
-#: ../panels/bluetooth/bluetooth.ui.h:4
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/printers/printers.ui.h:14
-msgid "page 1"
-msgstr "頁 1"
-
-#: ../panels/bluetooth/bluetooth.ui.h:5
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/printers/printers.ui.h:16
-msgid "page 2"
-msgstr "頁 2"
-
-#: ../panels/bluetooth/bluetooth.ui.h:6
-msgid "Paired"
-msgstr "已配對"
-
-#: ../panels/bluetooth/bluetooth.ui.h:7
-msgid "Type"
-msgstr "類型"
-
-#: ../panels/bluetooth/bluetooth.ui.h:8
-#: ../panels/network/connection-editor/ce-page-ip4.c:194
-#: ../panels/network/connection-editor/ce-page-ip4.c:456
-#: ../panels/network/connection-editor/ce-page-ip6.c:196
-#: ../panels/network/connection-editor/ce-page-ip6.c:460
-msgid "Address"
-msgstr "地址"
-
-#: ../panels/bluetooth/bluetooth.ui.h:9
-msgid "Mouse & Touchpad Settings"
-msgstr "滑鼠與觸控板設定值"
-
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Sound Settings"
-msgstr "音效設定值"
-
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Keyboard Settings"
-msgstr "鍵盤設定值"
-
-#: ../panels/bluetooth/bluetooth.ui.h:12
-msgid "Send Files…"
-msgstr "傳送檔案…"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:366
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "是"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:366
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "否"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+#: ../panels/bluetooth/cc-bluetooth-panel.c:262
 msgid "Bluetooth is disabled"
 msgstr "藍牙已停用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:484
-msgid "Bluetooth is disabled by hardware switch"
-msgstr "藍牙已被硬體開關停用"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+#: ../panels/bluetooth/cc-bluetooth-panel.c:263
 msgid "No Bluetooth adapters found"
 msgstr "找不到藍牙接配器"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:587
-msgid "Visibility"
-msgstr "顯示狀態"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:591
-#, c-format
-msgid "Visibility of “%s”"
-msgstr "「%s」的顯示狀態"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:635
-#, c-format
-msgid "Remove '%s' from the list of devices?"
-msgstr "是否從裝置的清單中移除「%s」?"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:637
-msgid ""
-"If you remove the device, you will have to set it up again before next use."
-msgstr "如果您刪除此裝置,下次使用時必須再次設定它。"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:641
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+msgid "Bluetooth is disabled by hardware switch"
+msgstr "藍牙已被硬體開關停用"
 
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
 msgid "Bluetooth"
@@ -403,48 +315,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:137
+#: ../panels/color/cc-color-panel.c:138
 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:145
+#: ../panels/color/cc-color-panel.c:146
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:152
+#: ../panels/color/cc-color-panel.c:153
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:219
+#: ../panels/color/cc-color-panel.c:220
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: ../panels/color/cc-color-panel.c:222
+#: ../panels/color/cc-color-panel.c:223
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:233
+#: ../panels/color/cc-color-panel.c:234
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:240
+#: ../panels/color/cc-color-panel.c:241
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../panels/color/cc-color-panel.c:579
+#: ../panels/color/cc-color-panel.c:580
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:903
+#: ../panels/color/cc-color-panel.c:904
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上傳檔案失敗:%s"
@@ -452,51 +364,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:917
+#: ../panels/color/cc-color-panel.c:918
 msgid "The profile has been uploaded to:"
 msgstr "描述檔已經上傳到:"
 
-#: ../panels/color/cc-color-panel.c:919
+#: ../panels/color/cc-color-panel.c:920
 msgid "Write down this URL."
 msgstr "寫下這個 URL。"
 
-#: ../panels/color/cc-color-panel.c:920
+#: ../panels/color/cc-color-panel.c:921
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重新啟動這臺電腦並開機進入您一般的作業系統。"
 
-#: ../panels/color/cc-color-panel.c:921
+#: ../panels/color/cc-color-panel.c:922
 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:955
+#: ../panels/color/cc-color-panel.c:956
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
-#: ../panels/color/cc-color-panel.c:959
+#: ../panels/color/cc-color-panel.c:960
 #: ../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:1315
+#: ../panels/color/cc-color-panel.c:1320
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+#: ../panels/color/cc-color-panel.c:1335 ../panels/color/cc-color-panel.c:1359
 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:1364
+#: ../panels/color/cc-color-panel.c:1369
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援印表機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1375
+#: ../panels/color/cc-color-panel.c:1380
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
@@ -583,7 +495,7 @@ 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/um-account-dialog.c:1470
+#: ../panels/user-accounts/um-account-dialog.c:1469
 msgid "Cancel"
 msgstr "取消"
 
@@ -606,7 +518,7 @@ msgstr "完成"
 #. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "螢幕校準"
 
@@ -725,7 +637,7 @@ msgstr ""
 "X</a> 和 <a href=\"windows\">Microsoft Windows</a> 系統上使用描述檔的指引。"
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:742
+#: ../panels/user-accounts/um-fingerprint-dialog.c:740
 msgid "Summary"
 msgstr "摘要"
 
@@ -893,37 +805,37 @@ msgstr ""
 "器;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:685
+#: ../panels/common/cc-common-language.c:684
 msgid "United States"
 msgstr "美國"
 
-#: ../panels/common/cc-common-language.c:686
+#: ../panels/common/cc-common-language.c:685
 msgid "Germany"
 msgstr "德國"
 
-#: ../panels/common/cc-common-language.c:687
+#: ../panels/common/cc-common-language.c:686
 msgid "France"
 msgstr "法國"
 
-#: ../panels/common/cc-common-language.c:688
+#: ../panels/common/cc-common-language.c:687
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../panels/common/cc-common-language.c:689
+#: ../panels/common/cc-common-language.c:688
 msgid "China"
 msgstr "中國"
 
-#: ../panels/common/cc-common-language.c:759
+#: ../panels/common/cc-common-language.c:758
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:123
-#: ../panels/region/cc-format-chooser.c:268
-#: ../panels/region/cc-input-chooser.c:172
+#: ../panels/common/cc-language-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:266
+#: ../panels/region/cc-input-chooser.c:170
 msgid "More…"
 msgstr "更多…"
 
-#: ../panels/common/cc-language-chooser.c:140
+#: ../panels/common/cc-language-chooser.c:139
 msgid "No languages found"
 msgstr "找不到語言"
 
@@ -932,33 +844,33 @@ msgid "Language"
 msgstr "語言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+#: ../panels/mouse/cc-mouse-panel.c:110 ../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:363
+#: ../panels/datetime/cc-datetime-panel.c:367
 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:368
+#: ../panels/datetime/cc-datetime-panel.c:372
 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:584
+#: ../panels/datetime/cc-datetime-panel.c:588
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:589
+#: ../panels/datetime/cc-datetime-panel.c:593
 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:594
+#: ../panels/datetime/cc-datetime-panel.c:598
 msgid "%R"
 msgstr "%R"
 
@@ -1097,107 +1009,106 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,您需要通過核對。"
 
-#: ../panels/display/cc-display-panel.c:485
+#: ../panels/display/cc-display-panel.c:486
 msgid "Lid Closed"
 msgstr "上蓋已經關閉"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:488
+#: ../panels/display/cc-display-panel.c:489
 msgid "Mirrored"
 msgstr "鏡射顯示器"
 
-#: ../panels/display/cc-display-panel.c:490
-#: ../panels/display/cc-display-panel.c:2057
+#: ../panels/display/cc-display-panel.c:491
+#: ../panels/display/cc-display-panel.c:2122
 msgid "Primary"
 msgstr "主要"
 
-#: ../panels/display/cc-display-panel.c:492
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../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/display/cc-display-panel.c:493
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1702 ../panels/power/cc-power-panel.c:1713
+#: ../panels/privacy/cc-privacy-panel.c:81
+#: ../panels/privacy/cc-privacy-panel.c:121
+#: ../panels/universal-access/cc-ua-panel.c:256
+#: ../panels/universal-access/cc-ua-panel.c:596
+#: ../panels/universal-access/cc-ua-panel.c:721
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:495
+#: ../panels/display/cc-display-panel.c:496
 msgid "Secondary"
 msgstr "次要"
 
-#: ../panels/display/cc-display-panel.c:1505
+#: ../panels/display/cc-display-panel.c:1506
 msgid "Arrange Combined Displays"
 msgstr "排列顯示器的組合方式"
 
-#: ../panels/display/cc-display-panel.c:1511
-#: ../panels/display/cc-display-panel.c:1927
+#: ../panels/display/cc-display-panel.c:1512
+#: ../panels/display/cc-display-panel.c:1956
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1532
+#: ../panels/display/cc-display-panel.c:1533
 msgid "Drag displays to rearrange them"
 msgstr "拖拉顯示器以重新排列他們"
 
-#. size
-#: ../panels/display/cc-display-panel.c:1991
+#: ../panels/display/cc-display-panel.c:2058
 msgid "Size"
 msgstr "尺寸"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2006
+#: ../panels/display/cc-display-panel.c:2071
 msgid "Aspect Ratio"
 msgstr "長寬比"
 
-#: ../panels/display/cc-display-panel.c:2027
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/display/cc-display-panel.c:2092
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "解析度"
 
-#: ../panels/display/cc-display-panel.c:2058
+#: ../panels/display/cc-display-panel.c:2123
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "在這個顯示器顯示頂端列與活動概覽"
 
-#: ../panels/display/cc-display-panel.c:2064
+#: ../panels/display/cc-display-panel.c:2129
 msgid "Secondary Display"
 msgstr "次要顯示器"
 
-#: ../panels/display/cc-display-panel.c:2065
+#: ../panels/display/cc-display-panel.c:2130
 msgid "Join this display with another to create an extra workspace"
 msgstr "將這個顯示器與另一個顯示器結合以建立額外的工作區"
 
-#: ../panels/display/cc-display-panel.c:2072
+#: ../panels/display/cc-display-panel.c:2137
 msgid "Presentation"
 msgstr "展示"
 
-#: ../panels/display/cc-display-panel.c:2073
+#: ../panels/display/cc-display-panel.c:2138
 msgid "Show slideshows and media only"
 msgstr "只顯示投影片與媒體"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2078
+#: ../panels/display/cc-display-panel.c:2143
 msgid "Mirror"
 msgstr "鏡射"
 
-#: ../panels/display/cc-display-panel.c:2079
+#: ../panels/display/cc-display-panel.c:2144
 msgid "Show your existing view on both displays"
 msgstr "在兩個顯示器顯示您現有的檢視"
 
-#: ../panels/display/cc-display-panel.c:2085
+#: ../panels/display/cc-display-panel.c:2150
 msgid "Turn Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:2086
+#: ../panels/display/cc-display-panel.c:2151
 msgid "Don't use this display"
 msgstr "不使用這個顯示器"
 
-#: ../panels/display/cc-display-panel.c:2302
+#: ../panels/display/cc-display-panel.c:2367
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
-#: ../panels/display/cc-display-panel.c:2333
+#: ../panels/display/cc-display-panel.c:2398
 msgid "_Arrange Combined Displays"
 msgstr "排列組合的顯示器(_A)"
 
@@ -1217,53 +1128,53 @@ msgstr ""
 "整理;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "不明"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:525
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位元"
 
-#: ../panels/info/cc-info-panel.c:536
+#: ../panels/info/cc-info-panel.c:527
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位元"
 
-#: ../panels/info/cc-info-panel.c:1216
+#: ../panels/info/cc-info-panel.c:1207
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1220
+#: ../panels/info/cc-info-panel.c:1211
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1224
+#: ../panels/info/cc-info-panel.c:1215
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1315
+#: ../panels/info/cc-info-panel.c:1306
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1337
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1338
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1339
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1340
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1341
 msgid "Select an application for software CDs"
 msgstr "選擇軟體 CD 要用的應用程式"
 
@@ -1272,88 +1183,76 @@ msgstr "選擇軟體 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1353
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1354
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1355
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1356
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1357
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1358
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1359
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1360
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1361
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1362
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1363
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1364
 msgid "Windows software"
 msgstr "Windows 軟體"
 
-#: ../panels/info/cc-info-panel.c:1496
-#: ../panels/keyboard/keyboard-shortcuts.c:1696
+#: ../panels/info/cc-info-panel.c:1487
+#: ../panels/keyboard/keyboard-shortcuts.c:1695
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1505 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1496 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1511 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1502 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1516 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1507 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1541
+#: ../panels/info/cc-info-panel.c:1532
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1591
-msgid "Install Updates"
-msgstr "安裝更新"
-
-#: ../panels/info/cc-info-panel.c:1595
-msgid "System Up-To-Date"
-msgstr "系統已是最新"
-
-#: ../panels/info/cc-info-panel.c:1599
-msgid "Checking for Updates"
-msgstr "正在檢查更新"
-
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
 #: ../panels/network/connection-editor/ce-page-details.c:240
 #: ../panels/network/network-wifi.ui.h:44
@@ -1419,55 +1318,60 @@ msgstr "繪圖"
 msgid "Virtualization"
 msgstr "虛擬化"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:13
+#| msgid "Checking for Updates"
+msgid "Check for updates"
+msgstr "檢查更新"
+
+#: ../panels/info/info.ui.h:15
 msgid "_Web"
 msgstr "網頁(_W)"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:16
 msgid "_Mail"
 msgstr "郵件(_M)"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:17
 msgid "_Calendar"
 msgstr "日曆(_C)"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:18
 msgid "M_usic"
 msgstr "音樂(_U)"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info.ui.h:19
 msgid "_Video"
 msgstr "影片(_V)"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:20
 msgid "_Photos"
 msgstr "相片(_P)"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:22
 msgid "Select how media should be handled"
 msgstr "選擇要如何處理媒體"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:23
 msgid "CD _audio"
 msgstr "CD 音樂(_A)"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:24
 msgid "_DVD video"
 msgstr "_DVD 影片"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info.ui.h:25
 msgid "_Music player"
 msgstr "音樂播放器(_M)"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:26
 msgid "_Software"
 msgstr "軟體(_S)"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info.ui.h:27
 msgid "_Other Media…"
 msgstr "其他(_O)…"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info.ui.h:28
 msgid "_Never prompt or start programs on media insertion"
 msgstr "插入媒體時永遠不提示或啟動程式(_N)"
 
@@ -1644,13 +1548,13 @@ msgstr "高對比開或關"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:271
-#: ../panels/keyboard/cc-keyboard-option.c:390
-#: ../panels/keyboard/keyboard-shortcuts.c:1159
+#: ../panels/keyboard/cc-keyboard-option.c:274
+#: ../panels/keyboard/cc-keyboard-option.c:393
+#: ../panels/keyboard/keyboard-shortcuts.c:1158
 #: ../panels/network/network-wifi.ui.h:29
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "已停用"
 
@@ -1658,7 +1562,7 @@ msgstr "已停用"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:349
+#: ../panels/keyboard/cc-keyboard-option.c:352
 msgid "Alternative Characters Key"
 msgstr "替代的字元鍵"
 
@@ -1666,11 +1570,11 @@ msgstr "替代的字元鍵"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:358
+#: ../panels/keyboard/cc-keyboard-option.c:361
 msgid "Compose Key"
 msgstr "組合鍵"
 
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: ../panels/keyboard/cc-keyboard-option.c:366
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
@@ -1779,16 +1683,16 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:585
-#: ../panels/keyboard/keyboard-shortcuts.c:593
+#: ../panels/keyboard/keyboard-shortcuts.c:584
+#: ../panels/keyboard/keyboard-shortcuts.c:592
 msgid "Custom Shortcuts"
 msgstr "自訂捷徑鍵"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:804
+#: ../panels/keyboard/keyboard-shortcuts.c:803
 msgid "<Unknown Action>"
 msgstr "<行動設定不詳>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1300
+#: ../panels/keyboard/keyboard-shortcuts.c:1299
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1798,7 +1702,7 @@ msgstr ""
 "捷徑“%s”無法使用,原因是會無法按下此按鍵。\n"
 "請試用其它的按鍵:如同時使用 Control,Alt  或 Shift。"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1332
+#: ../panels/keyboard/keyboard-shortcuts.c:1331
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1807,21 +1711,21 @@ msgstr ""
 "捷徑鍵“%s”己經使用於:\n"
 "“%s”"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1337
+#: ../panels/keyboard/keyboard-shortcuts.c:1336
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "如果您重新指派捷徑鍵為「%s」,「%s」的捷徑鍵就會停用。"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1343
+#: ../panels/keyboard/keyboard-shortcuts.c:1342
 msgid "_Reassign"
 msgstr "重新指派(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:95
+#: ../panels/mouse/cc-mouse-panel.c:94
 msgid "Test Your _Settings"
 msgstr "測試您的設定值(_S)"
 
-#: ../panels/mouse/cc-mouse-panel.c:108
+#: ../panels/mouse/cc-mouse-panel.c:107
 msgid "Test Your Settings"
 msgstr "測試您的設定值"
 
@@ -1926,46 +1830,46 @@ msgstr "兩指捲動(_F)"
 msgid "_Natural scrolling"
 msgstr "自然捲動(_N)"
 
-#: ../panels/mouse/gnome-mouse-test.c:132
+#: ../panels/mouse/gnome-mouse-test.c:130
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
 msgid "Try clicking, double clicking, scrolling"
 msgstr "試著單擊、雙擊、捲動"
 
-#: ../panels/mouse/gnome-mouse-test.c:137
+#: ../panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
 msgstr "五次點擊,GEGL 時間!"
 
-#: ../panels/mouse/gnome-mouse-test.c:142
+#: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
 msgstr "雙擊,主要按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:142
+#: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Single click, primary button"
 msgstr "單擊,主要按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:145
+#: ../panels/mouse/gnome-mouse-test.c:143
 msgid "Double click, middle button"
 msgstr "雙擊,中央按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:145
+#: ../panels/mouse/gnome-mouse-test.c:143
 msgid "Single click, middle button"
 msgstr "單擊,中央按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:148
+#: ../panels/mouse/gnome-mouse-test.c:146
 msgid "Double click, secondary button"
 msgstr "雙擊,次要按鈕"
 
-#: ../panels/mouse/gnome-mouse-test.c:148
+#: ../panels/mouse/gnome-mouse-test.c:146
 msgid "Single click, secondary button"
 msgstr "單擊,次要按鈕"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:357
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:930
+#: ../panels/network/cc-network-panel.c:956
 msgid "Network proxy"
 msgstr "網路代理伺服器"
 
@@ -1973,14 +1877,14 @@ msgstr "網路代理伺服器"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1135 ../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:1244
+#: ../panels/network/cc-network-panel.c:1274
 msgid "The system network services are not compatible with this version."
 msgstr "系統網路服務與這個版本不相容。"
 
@@ -1988,6 +1892,12 @@ msgstr "系統網路服務與這個版本不相容。"
 msgid "802.1x _Security"
 msgstr "802.1x 防護(_S)"
 
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "頁 1"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
 #: ../panels/network/connection-editor/security-page.ui.h:3
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:1
@@ -2001,6 +1911,12 @@ msgstr "匿名識別(_M)"
 msgid "Inner _authentication"
 msgstr "內部核對(_A)"
 
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "頁 2"
+
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:108
 #: ../panels/network/connection-editor/ce-page-security.c:455
 #: ../panels/network/connection-editor/details-page.ui.h:3
@@ -2052,17 +1968,17 @@ msgid "Never"
 msgstr "永不"
 
 #: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:803
+#: ../panels/user-accounts/um-utils.c:819
 msgid "Today"
 msgstr "今日"
 
 #: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:806
+#: ../panels/user-accounts/um-utils.c:822
 msgid "Yesterday"
 msgstr "昨日"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-ethernet.c:125
 #: ../panels/network/net-device-wifi.c:471
 #, c-format
 msgid "%i day ago"
@@ -2114,6 +2030,13 @@ msgstr "很好"
 msgid "Identity"
 msgstr "身分"
 
+#: ../panels/network/connection-editor/ce-page-ip4.c:194
+#: ../panels/network/connection-editor/ce-page-ip4.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:196
+#: ../panels/network/connection-editor/ce-page-ip6.c:460
+msgid "Address"
+msgstr "地址"
+
 #: ../panels/network/connection-editor/ce-page-ip4.c:207
 #: ../panels/network/connection-editor/ce-page-ip4.c:469
 msgid "Netmask"
@@ -2175,7 +2098,7 @@ msgstr "手動"
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:942
+#: ../panels/network/connection-editor/ce-page-ip4.c:934
 #: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
@@ -2197,7 +2120,7 @@ msgstr "自動"
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:902
+#: ../panels/network/connection-editor/ce-page-ip6.c:894
 #: ../panels/network/network-wifi.ui.h:47
 msgid "IPv6"
 msgstr "IPv6"
@@ -2248,15 +2171,15 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:155
+#: ../panels/network/net-device-ethernet.c:158
 #: ../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:156
-#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:159
+#: ../panels/network/net-device-ethernet.c:163
 #: ../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
@@ -2264,14 +2187,14 @@ msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:166
 #: ../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:167
+#: ../panels/network/net-device-ethernet.c:170
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2281,7 +2204,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:169
+#: ../panels/network/net-device-ethernet.c:172
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2422,7 +2345,7 @@ msgstr "新增設定組合"
 
 #: ../panels/network/connection-editor/net-connection-editor.c:511
 #: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1471
+#: ../panels/user-accounts/um-account-dialog.c:1470
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -2435,23 +2358,27 @@ msgstr "VPN"
 msgid "Bond"
 msgstr "繫結"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:597
+#: ../panels/network/connection-editor/net-connection-editor.c:598
+msgid "Team"
+msgstr "團隊"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:600
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:598
+#: ../panels/network/connection-editor/net-connection-editor.c:601
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:749
+#: ../panels/network/connection-editor/net-connection-editor.c:752
 msgid "Could not load VPN plugins"
 msgstr "無法載入 VPN 外掛程式"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:818
+#: ../panels/network/connection-editor/net-connection-editor.c:821
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:889
+#: ../panels/network/connection-editor/net-connection-editor.c:892
 msgid "Add Network Connection"
 msgstr "加入網路連線"
 
@@ -2461,7 +2388,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1403
+#: ../panels/network/net-device-wifi.c:1406
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2504,9 +2431,9 @@ msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1947
-#: ../panels/sharing/cc-sharing-panel.c:436
-#: ../panels/user-accounts/um-photo-dialog.c:222
+#: ../panels/printers/cc-printers-panel.c:1946
+#: ../panels/sharing/cc-sharing-panel.c:446
+#: ../panels/user-accounts/um-photo-dialog.c:221
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -2589,33 +2516,39 @@ msgstr ""
 msgid "Bond slaves"
 msgstr "繫結的連線"
 
+#: ../panels/network/net-device-bond.c:102
+#: ../panels/network/net-device-bridge.c:102
+#: ../panels/network/net-device-team.c:102
+msgid "(none)"
+msgstr "(沒有)"
+
 #: ../panels/network/net-device-bridge.c:77
 msgid "Bridge slaves"
 msgstr "橋接的連線"
 
-#: ../panels/network/net-device-ethernet.c:108
+#: ../panels/network/net-device-ethernet.c:111
 #: ../panels/network/net-device-wifi.c:457
 msgid "never"
 msgstr "永不"
 
-#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-ethernet.c:121
 #: ../panels/network/net-device-wifi.c:467
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-ethernet.c:123
 #: ../panels/network/net-device-wifi.c:469
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:161
 #: ../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:174
+#: ../panels/network/net-device-ethernet.c:177
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "最後使用的"
@@ -2625,14 +2558,14 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:284
+#: ../panels/network/net-device-ethernet.c:287
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:352
-#: ../panels/network/net-device-wifi.c:1558
+#: ../panels/network/net-device-ethernet.c:355
+#: ../panels/network/net-device-wifi.c:1561
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2640,7 +2573,7 @@ msgstr "有線"
 msgid "Options…"
 msgstr "選項…"
 
-#: ../panels/network/net-device-ethernet.c:489
+#: ../panels/network/net-device-ethernet.c:492
 #, c-format
 msgid "Profile %d"
 msgstr "設定組合 %d"
@@ -2649,6 +2582,11 @@ msgstr "設定組合 %d"
 msgid "Add new connection"
 msgstr "加入新連線"
 
+#: ../panels/network/net-device-team.c:77
+#| msgid "Bridge slaves"
+msgid "Team slaves"
+msgstr "團隊從屬"
+
 #: ../panels/network/net-device-wifi.c:1110
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
@@ -2668,41 +2606,41 @@ msgid ""
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。"
 
-#: ../panels/network/net-device-wifi.c:1192
+#: ../panels/network/net-device-wifi.c:1195
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1195
+#: ../panels/network/net-device-wifi.c:1198
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1267
+#: ../panels/network/net-device-wifi.c:1270
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1273
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: ../panels/network/net-device-wifi.c:1399
+#: ../panels/network/net-device-wifi.c:1402
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網路的詳細資料包含密碼及任何自訂的組態都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/network/net-device-wifi.c:1729
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "歷史紀錄"
 
-#: ../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:534
+#: ../panels/network/net-device-wifi.c:1733 ../panels/power/power.ui.h:21
+#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1595
+#: ../panels/wacom/cc-wacom-page.c:533
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1738
+#: ../panels/network/net-device-wifi.c:1741
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2804,6 +2742,10 @@ msgstr "關閉裝置"
 msgid "Add Device"
 msgstr "加入裝置"
 
+#: ../panels/network/network.ui.h:6
+msgid "Remove Device"
+msgstr "移除裝置"
+
 #: ../panels/network/network-vpn.ui.h:2
 msgid "VPN Type"
 msgstr "VPN 類型"
@@ -3433,6 +3375,14 @@ msgstr "CHAP"
 msgid "Don't _warn me again"
 msgstr "不要再警告我(_W)"
 
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
+msgid "No"
+msgstr "否"
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
+msgid "Yes"
+msgstr "是"
+
 #: ../panels/network/wireless-security/wireless-security.c:397
 msgid "TLS"
 msgstr "TLS"
@@ -3496,45 +3446,45 @@ msgid "_Type"
 msgstr "類型(_T)"
 
 #. TRANSLATORS: this is the per application switch for message tray usage.
-#: ../panels/notifications/cc-edit-dialog.c:39
+#: ../panels/notifications/cc-edit-dialog.c:37
 msgctxt "notifications"
 msgid "Notifications"
 msgstr "通知"
 
 #. TRANSLATORS: this is the setting to configure sounds associated with notifications
-#: ../panels/notifications/cc-edit-dialog.c:41
+#: ../panels/notifications/cc-edit-dialog.c:39
 msgctxt "notifications"
 msgid "Sound Alerts"
 msgstr "音效通知"
 
-#: ../panels/notifications/cc-edit-dialog.c:42
+#: ../panels/notifications/cc-edit-dialog.c:40
 msgctxt "notifications"
 msgid "Show Popup Banners"
 msgstr "顯示彈出式橫幅"
 
 #. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
-#: ../panels/notifications/cc-edit-dialog.c:44
+#: ../panels/notifications/cc-edit-dialog.c:42
 msgctxt "notifications"
 msgid "Show Details in Banners"
 msgstr "在橫幅顯示詳細資料"
 
-#: ../panels/notifications/cc-edit-dialog.c:45
+#: ../panels/notifications/cc-edit-dialog.c:43
 msgctxt "notifications"
 msgid "View in Lock Screen"
 msgstr "在鎖定畫面中顯示"
 
-#: ../panels/notifications/cc-edit-dialog.c:46
+#: ../panels/notifications/cc-edit-dialog.c:44
 msgctxt "notifications"
 msgid "Show Details in Lock Screen"
 msgstr "在鎖定畫面中顯示詳細資料"
 
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../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
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1708 ../panels/power/cc-power-panel.c:1715
+#: ../panels/privacy/cc-privacy-panel.c:81
+#: ../panels/privacy/cc-privacy-panel.c:121
+#: ../panels/universal-access/cc-ua-panel.c:256
+#: ../panels/universal-access/cc-ua-panel.c:596
+#: ../panels/universal-access/cc-ua-panel.c:721
 msgid "On"
 msgstr "開啟"
 
@@ -3559,65 +3509,69 @@ msgstr "顯示彈出式橫幅"
 msgid "Show in Lock Screen"
 msgstr "在鎖定畫面中顯示"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:198
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:318
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:316
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "加入帳號"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:357
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:355
 msgid "Mail"
 msgstr "郵件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:361
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:367
 msgid "Chat"
 msgstr "聊天"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:373
 msgid "Resources"
 msgstr "資源"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:425
+#: ../panels/online-accounts/cc-online-accounts-panel.c:423
 msgid "Error logging into the account"
 msgstr "登入帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:495
+#: ../panels/online-accounts/cc-online-accounts-panel.c:493
 msgid "Credentials have expired."
 msgstr "憑證已經過期。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:499
+#: ../panels/online-accounts/cc-online-accounts-panel.c:497
 msgid "Sign in to enable this account."
 msgstr "登入以啟用這個帳號。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:504
+#: ../panels/online-accounts/cc-online-accounts-panel.c:502
 msgid "_Sign In"
 msgstr "登入(_S)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:745
+#: ../panels/online-accounts/cc-online-accounts-panel.c:743
 msgid "Error creating account"
 msgstr "建立帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:805
+#: ../panels/online-accounts/cc-online-accounts-panel.c:803
 msgid "Error removing account"
 msgstr "移除帳號時發生錯誤"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:841
+#: ../panels/online-accounts/cc-online-accounts-panel.c:839
 msgid "Are you sure you want to remove the account?"
 msgstr "確定要刪除這個帳號?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:843
+#: ../panels/online-accounts/cc-online-accounts-panel.c:841
 msgid "This will not remove the account on the server."
 msgstr "這不會移除伺服器上的帳號。"
 
+#: ../panels/online-accounts/cc-online-accounts-panel.c:842
+msgid "_Remove"
+msgstr "移除(_R)"
+
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
 msgid "Online Accounts"
 msgstr "線上帳號"
@@ -3626,14 +3580,18 @@ msgstr "線上帳號"
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "連接到您的線上帳號並決定要用它們來做什麼"
 
-#. Translators: those are keywords for the online-accounts control-center panel
+#. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#| msgid ""
+#| "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+#| "ownCloud;Kerberos;IMAP;SMTP;"
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;臉書;推特;雅虎;網頁;線上;聊天;行事曆;郵件;連絡人;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;臉書;推特;雅虎奇摩;網頁;線上;聊天;"
+"行事曆;郵件;連絡人;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -3655,17 +3613,17 @@ msgstr ""
 "加入一個帳號以允許您的應用程式存取它用於文件、郵件、連絡人、行事曆、聊天等"
 "等。"
 
-#: ../panels/power/cc-power-panel.c:195
+#: ../panels/power/cc-power-panel.c:182
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: ../panels/power/cc-power-panel.c:201
+#: ../panels/power/cc-power-panel.c:188
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: ../panels/power/cc-power-panel.c:213
+#: ../panels/power/cc-power-panel.c:200
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3673,224 +3631,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:221
+#: ../panels/power/cc-power-panel.c:208
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:222
+#: ../panels/power/cc-power-panel.c:209
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../panels/power/cc-power-panel.c:223
+#: ../panels/power/cc-power-panel.c:210
 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:242
+#: ../panels/power/cc-power-panel.c:229
 #, 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:249
+#: ../panels/power/cc-power-panel.c:236
 #, 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:254
+#: ../panels/power/cc-power-panel.c:241
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:259 ../panels/power/cc-power-panel.c:287
+#: ../panels/power/cc-power-panel.c:246 ../panels/power/cc-power-panel.c:274
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:263 ../panels/power/cc-power-panel.c:291
+#: ../panels/power/cc-power-panel.c:250 ../panels/power/cc-power-panel.c:278
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:278
+#: ../panels/power/cc-power-panel.c:265
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:270
 msgid "Discharging"
 msgstr "放電中"
 
-#: ../panels/power/cc-power-panel.c:403
+#: ../panels/power/cc-power-panel.c:395
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: ../panels/power/cc-power-panel.c:405
+#: ../panels/power/cc-power-panel.c:397
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:477
+#: ../panels/power/cc-power-panel.c:469
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:480
+#: ../panels/power/cc-power-panel.c:472
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:483
+#: ../panels/power/cc-power-panel.c:475
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:486
+#: ../panels/power/cc-power-panel.c:478
 msgid "Personal digital assistant"
 msgstr "個人數位助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:489
+#: ../panels/power/cc-power-panel.c:481
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:492
+#: ../panels/power/cc-power-panel.c:484
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:495
+#: ../panels/power/cc-power-panel.c:487
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:498
+#: ../panels/power/cc-power-panel.c:490
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:501 ../panels/power/cc-power-panel.c:724
-#: ../panels/power/cc-power-panel.c:2055
+#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:716
+#: ../panels/power/cc-power-panel.c:2039
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:539
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:554
+#: ../panels/power/cc-power-panel.c:546
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:559
+#: ../panels/power/cc-power-panel.c:551
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:564
+#: ../panels/power/cc-power-panel.c:556
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:569
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:573
+#: ../panels/power/cc-power-panel.c:565
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: ../panels/power/cc-power-panel.c:722
+#: ../panels/power/cc-power-panel.c:714
 msgid "Batteries"
 msgstr "電池"
 
-#: ../panels/power/cc-power-panel.c:1124
+#: ../panels/power/cc-power-panel.c:1116
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1493
+#: ../panels/power/cc-power-panel.c:1463
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1521
+#: ../panels/power/cc-power-panel.c:1491
 msgid "_Screen brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1527
+#: ../panels/power/cc-power-panel.c:1497
 msgid "_Keyboard brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1537
+#: ../panels/power/cc-power-panel.c:1507
 msgid "_Dim screen when inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1562
+#: ../panels/power/cc-power-panel.c:1532
 msgid "_Blank screen"
 msgstr "螢幕轉黑(_B)"
 
-#: ../panels/power/cc-power-panel.c:1599
+#: ../panels/power/cc-power-panel.c:1569
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1604
+#: ../panels/power/cc-power-panel.c:1574
 msgid "Turns off wireless devices"
 msgstr "關閉無線裝置"
 
-#: ../panels/power/cc-power-panel.c:1629
+#: ../panels/power/cc-power-panel.c:1599
 msgid "_Mobile broadband"
 msgstr "行動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1634
+#: ../panels/power/cc-power-panel.c:1604
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "關閉行動寬頻 (3G、4G、WiMax 等) 裝置"
 
-#: ../panels/power/cc-power-panel.c:1669
+#: ../panels/power/cc-power-panel.c:1653
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1720
+#: ../panels/power/cc-power-panel.c:1704
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1722
+#: ../panels/power/cc-power-panel.c:1706
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:1851
+#: ../panels/power/cc-power-panel.c:1835
 msgid "Suspend & Power Off"
 msgstr "暫停與關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1884
+#: ../panels/power/cc-power-panel.c:1868
 msgid "_Automatic suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:1908
+#: ../panels/power/cc-power-panel.c:1892
 msgid "When battery power is _critical"
 msgstr "當電池的電量極低時(_C)"
 
-#: ../panels/power/cc-power-panel.c:1965
+#: ../panels/power/cc-power-panel.c:1949
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: ../panels/power/cc-power-panel.c:2102
+#: ../panels/power/cc-power-panel.c:2086
 msgid "Devices"
 msgstr "裝置"
 
@@ -3995,7 +3953,7 @@ msgid "Authenticate"
 msgstr "核對"
 
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:21
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "Password"
 msgstr "密碼"
@@ -4005,187 +3963,187 @@ msgid "Authentication Required"
 msgstr "要求核對"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:591
+#: ../panels/printers/cc-printers-panel.c:590
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:593
+#: ../panels/printers/cc-printers-panel.c:592
 msgid "Out of toner"
 msgstr "碳粉用完"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:596
+#: ../panels/printers/cc-printers-panel.c:595
 msgid "Low on developer"
 msgstr "顯像劑不足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:599
+#: ../panels/printers/cc-printers-panel.c:598
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:600
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:603
+#: ../panels/printers/cc-printers-panel.c:602
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:604
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:606
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:608
 msgid "Low on paper"
 msgstr "紙張不足。"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:610
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:613
+#: ../panels/printers/cc-printers-panel.c:612
 msgctxt "printer state"
 msgid "Offline"
 msgstr "離線"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:615
-#: ../panels/printers/cc-printers-panel.c:806
+#: ../panels/printers/cc-printers-panel.c:614
+#: ../panels/printers/cc-printers-panel.c:805
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:616
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:619
+#: ../panels/printers/cc-printers-panel.c:618
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:621
+#: ../panels/printers/cc-printers-panel.c:620
 msgid "The optical photo conductor is near end of life"
 msgstr "感光鼓接近使用壽命"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:623
+#: ../panels/printers/cc-printers-panel.c:622
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓已無法使用"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:733
+#: ../panels/printers/cc-printers-panel.c:732
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "正在設定"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:792
+#: ../panels/printers/cc-printers-panel.c:791
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備就緒"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:797
+#: ../panels/printers/cc-printers-panel.c:796
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "不接受工作"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:802
+#: ../panels/printers/cc-printers-panel.c:801
 msgctxt "printer state"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:923
+#: ../panels/printers/cc-printers-panel.c:922
 msgid "Toner Level"
 msgstr "碳粉匣等級"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:926
+#: ../panels/printers/cc-printers-panel.c:925
 msgid "Ink Level"
 msgstr "墨水等級"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:929
+#: ../panels/printers/cc-printers-panel.c:928
 msgid "Supply Level"
 msgstr "耗材等級"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:947
+#: ../panels/printers/cc-printers-panel.c:946
 msgctxt "printer state"
 msgid "Installing"
 msgstr "正在安裝"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1124
+#: ../panels/printers/cc-printers-panel.c:1123
 msgid "No printers available"
 msgstr "沒有可用的印表機"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1432
+#: ../panels/printers/cc-printers-panel.c:1431
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 使用中"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1776
+#: ../panels/printers/cc-printers-panel.c:1775
 msgid "Failed to add new printer."
 msgstr "無法加入新的印表機。"
 
-#: ../panels/printers/cc-printers-panel.c:1943
+#: ../panels/printers/cc-printers-panel.c:1942
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/cc-printers-panel.c:1952
+#: ../panels/printers/cc-printers-panel.c:1951
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript 印表機描述檔 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2257
+#: ../panels/printers/cc-printers-panel.c:2256
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/cc-printers-panel.c:2326
+#: ../panels/printers/cc-printers-panel.c:2325
 msgid "Searching for preferred drivers…"
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: ../panels/printers/cc-printers-panel.c:2341
+#: ../panels/printers/cc-printers-panel.c:2340
 msgid "Select from database…"
 msgstr "從資料庫搜尋…"
 
-#: ../panels/printers/cc-printers-panel.c:2350
+#: ../panels/printers/cc-printers-panel.c:2349
 msgid "Provide PPD File…"
 msgstr "提供 PPD 檔案…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2501
-#: ../panels/printers/cc-printers-panel.c:2524
+#: ../panels/printers/cc-printers-panel.c:2500
+#: ../panels/printers/cc-printers-panel.c:2523
 msgid "Test page"
 msgstr "測試頁"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2932
+#: ../panels/printers/cc-printers-panel.c:2931
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
@@ -4235,12 +4193,13 @@ msgstr "加入新的印表機"
 msgid "A_uthenticate"
 msgstr "核對(_U)"
 
-#: ../panels/printers/new-printer-dialog.ui.h:6
-msgid "Search for network printers or filter result"
-msgstr "搜尋網路印表機或過濾器結果"
+#. Translators: No printers were found
+#: ../panels/printers/new-printer-dialog.ui.h:7
+msgid "No printers detected."
+msgstr "未偵測到印表機。"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:8
+#: ../panels/printers/new-printer-dialog.ui.h:9
 msgid "Enter address of a printer or a text to filter results"
 msgstr "輸入網路印表機的位址或過濾器結果文字"
 
@@ -4257,246 +4216,241 @@ msgid "Loading drivers database..."
 msgstr "載入驅動程式資料庫…"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:67
-#: ../panels/printers/pp-ppd-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:66
+#: ../panels/printers/pp-ppd-option-widget.c:70
 msgid "One Sided"
 msgstr "單面"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:69
-#: ../panels/printers/pp-ppd-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:68
+#: ../panels/printers/pp-ppd-option-widget.c:72
 msgid "Long Edge (Standard)"
 msgstr "長邊 (標準)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:71
-#: ../panels/printers/pp-ppd-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:70
+#: ../panels/printers/pp-ppd-option-widget.c:74
 msgid "Short Edge (Flip)"
 msgstr "短邊 (翻轉)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:72
 msgid "Portrait"
 msgstr "直向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:74
 msgid "Landscape"
 msgstr "橫向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:77
+#: ../panels/printers/pp-ipp-option-widget.c:76
 msgid "Reverse landscape"
 msgstr "橫向倒轉"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:79
+#: ../panels/printers/pp-ipp-option-widget.c:78
 msgid "Reverse portrait"
 msgstr "直向倒轉"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:143
+#: ../panels/printers/pp-jobs-dialog.c:142
 msgctxt "print job"
 msgid "Pending"
 msgstr "保留中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:147
+#: ../panels/printers/pp-jobs-dialog.c:146
 msgctxt "print job"
 msgid "Held"
 msgstr "已暫停"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:151
+#: ../panels/printers/pp-jobs-dialog.c:150
 msgctxt "print job"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:155
+#: ../panels/printers/pp-jobs-dialog.c:154
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:159
+#: ../panels/printers/pp-jobs-dialog.c:158
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:163
+#: ../panels/printers/pp-jobs-dialog.c:162
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已放棄"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:167
+#: ../panels/printers/pp-jobs-dialog.c:166
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:289
+#: ../panels/printers/pp-jobs-dialog.c:288
 msgid "Job Title"
 msgstr "工作名稱"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:298
+#: ../panels/printers/pp-jobs-dialog.c:297
 msgid "Job State"
 msgstr "工作狀態"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:304
+#: ../panels/printers/pp-jobs-dialog.c:303
 msgid "Time"
 msgstr "時刻"
 
-#: ../panels/printers/pp-jobs-dialog.c:496
+#: ../panels/printers/pp-jobs-dialog.c:495
 #, c-format
 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:1669
+#: ../panels/printers/pp-new-printer-dialog.c:1752
 msgid "Server requires authentication"
 msgstr "伺服器需要核對"
 
-#. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1706
-msgid "No printers detected."
-msgstr "未偵測到印表機。"
-
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:81
 msgid "Two Sided"
 msgstr "雙面"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:82
 msgid "Paper Type"
 msgstr "紙張類型"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Paper Source"
 msgstr "紙張來源"
 
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Output Tray"
 msgstr "出紙匣"
 
-#: ../panels/printers/pp-options-dialog.c:87
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 前置過濾器"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:532
+#: ../panels/printers/pp-options-dialog.c:531
 msgid "Pages per side"
 msgstr "每張紙的頁數"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:544
+#: ../panels/printers/pp-options-dialog.c:543
 msgid "Two-sided"
 msgstr "雙面"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:556
+#: ../panels/printers/pp-options-dialog.c:555
 msgid "Orientation"
 msgstr "方向"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:653
+#: ../panels/printers/pp-options-dialog.c:652
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "一般"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:656
+#: ../panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "頁面設定"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:659
+#: ../panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "可安裝選項"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:662
+#: ../panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "工作"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:665
+#: ../panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "圖片品質"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:668
+#: ../panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "顏色"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:671
+#: ../panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "完成"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:674
+#: ../panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "進階"
 
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:77
-#: ../panels/printers/pp-ppd-option-widget.c:79
-#: ../panels/printers/pp-ppd-option-widget.c:87
+#: ../panels/printers/pp-ppd-option-widget.c:76
+#: ../panels/printers/pp-ppd-option-widget.c:78
+#: ../panels/printers/pp-ppd-option-widget.c:86
 msgid "Auto Select"
 msgstr "自動選擇"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../panels/printers/pp-ppd-option-widget.c:81
-#: ../panels/printers/pp-ppd-option-widget.c:83
-#: ../panels/printers/pp-ppd-option-widget.c:85
-#: ../panels/printers/pp-ppd-option-widget.c:89
+#: ../panels/printers/pp-ppd-option-widget.c:80
+#: ../panels/printers/pp-ppd-option-widget.c:82
+#: ../panels/printers/pp-ppd-option-widget.c:84
+#: ../panels/printers/pp-ppd-option-widget.c:88
 msgid "Printer Default"
 msgstr "印表機預設"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:91
+#: ../panels/printers/pp-ppd-option-widget.c:90
 msgid "Embed GhostScript fonts only"
 msgstr "只有內嵌的 GhostScript 字型"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:93
+#: ../panels/printers/pp-ppd-option-widget.c:92
 msgid "Convert to PS level 1"
 msgstr "轉換為 PS 等級 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:95
+#: ../panels/printers/pp-ppd-option-widget.c:94
 msgid "Convert to PS level 2"
 msgstr "轉換為 PS 等級 2"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:97
+#: ../panels/printers/pp-ppd-option-widget.c:96
 msgid "No pre-filtering"
 msgstr "無前置過濾器"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#: ../panels/printers/pp-ppd-selection-dialog.c:232
 msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
+#: ../panels/printers/pp-ppd-selection-dialog.c:249
 msgid "Driver"
 msgstr "驅動程式"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:254
+#: ../panels/printers/pp-samba.c:253
 #, c-format
 msgid "Enter your username and password to view printers available on %s."
 msgstr "輸入您的使用者名稱與密碼以檢視在 %s 可用的印表機。"
@@ -4521,8 +4475,9 @@ msgstr "位置"
 
 #. Translators: This checkbox is checked when the default printer is selected.
 #: ../panels/printers/printers.ui.h:8
-msgid "_Default"
-msgstr "預設值(_D)"
+#| msgid "Default Route"
+msgid "_Default printer"
+msgstr "預設印表機(_D)"
 
 #: ../panels/printers/printers.ui.h:9
 msgid "Jobs"
@@ -4573,42 +4528,47 @@ msgstr ""
 "抱歉!系統列印服務\n"
 "似乎無法使用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:249 ../panels/privacy/privacy.ui.h:26
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
-#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:362 ../panels/privacy/privacy.ui.h:20
 msgid "Usage & History"
 msgstr "使用與歷史紀錄"
 
-#: ../panels/privacy/cc-privacy-panel.c:489
+#: ../panels/privacy/cc-privacy-panel.c:490
 msgid "Empty all items from Trash?"
 msgstr "要清除回收筒中所有的項目?"
 
-#: ../panels/privacy/cc-privacy-panel.c:490
+#: ../panels/privacy/cc-privacy-panel.c:491
 msgid "All items in the Trash will be permanently deleted."
 msgstr "所有在回收筒中的項目會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:492 ../panels/privacy/privacy.ui.h:32
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:514
+#: ../panels/privacy/cc-privacy-panel.c:515
 msgid "Delete all the temporary files?"
 msgstr "刪除所有暫存檔案?"
 
-#: ../panels/privacy/cc-privacy-panel.c:515
+#: ../panels/privacy/cc-privacy-panel.c:516
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有的暫存檔案會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:517 ../panels/privacy/privacy.ui.h:33
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:539 ../panels/privacy/privacy.ui.h:31
 msgid "Purge Trash & Temporary Files"
 msgstr "清除回收筒與暫存檔案"
 
+#: ../panels/privacy/cc-privacy-panel.c:578 ../panels/privacy/privacy.ui.h:38
+#| msgid "Software"
+msgid "Software Usage"
+msgstr "軟體使用率"
+
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
 msgid "Privacy"
 msgstr "隱私"
@@ -4732,25 +4692,48 @@ msgstr "自動清除暫存檔案(_F)"
 msgid "Purge _After"
 msgstr "清除於(_A)"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/privacy/privacy.ui.h:39
+msgid ""
+"Sending us information about which software you use helps us provide you "
+"with more accurate recommendations. It also helps us to improve our "
+"software.\n"
+"\n"
+"All the information we collect is made anonymous, and we will never share "
+"your data with third parties."
+msgstr ""
+"傳送您所使用軟體的資訊給我們能幫助我們提供您更準確的建議。它也能協助我們改進"
+"我們的軟體。\n"
+"\n"
+"我們所收集的所有資訊都是匿名的,而且我們永遠不會將您的資料與任何第三方分享。"
+
+#: ../panels/privacy/privacy.ui.h:42
+#| msgid "Privacy"
+msgid "Privacy Policy"
+msgstr "隱私權原則"
+
+#: ../panels/privacy/privacy.ui.h:43
+msgid "_Send software usage statistics"
+msgstr "傳送軟體使用率統計(_S)"
+
+#: ../panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/cc-format-chooser.c:285
+#: ../panels/region/cc-format-chooser.c:283
 msgid "No regions found"
 msgstr "找不到區域"
 
-#: ../panels/region/cc-input-chooser.c:186
+#: ../panels/region/cc-input-chooser.c:184
 msgid "No input sources found"
 msgstr "找不到輸入來源"
 
-#: ../panels/region/cc-input-chooser.c:1070
+#: ../panels/region/cc-input-chooser.c:1068
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
@@ -4775,7 +4758,7 @@ msgstr "抱歉"
 msgid "Input methods can't be used on the login screen"
 msgstr "輸入法不能用在登入畫面"
 
-#: ../panels/region/cc-region-panel.c:1765
+#: ../panels/region/cc-region-panel.c:1773
 msgid "Login Screen"
 msgstr "登入畫面"
 
@@ -4885,34 +4868,30 @@ msgstr "選項"
 msgid "Login settings are used by all users when logging into the system"
 msgstr "登入設定值是所有的使用者在登入系統時會用到的"
 
-#: ../panels/search/cc-search-locations-dialog.c:275
-msgid "Home"
-msgstr "家"
-
-#: ../panels/search/cc-search-locations-dialog.c:477
+#: ../panels/search/cc-search-locations-dialog.c:476
 msgctxt "Search Location"
 msgid "Places"
 msgstr "位置"
 
-#: ../panels/search/cc-search-locations-dialog.c:479
+#: ../panels/search/cc-search-locations-dialog.c:478
 msgctxt "Search Location"
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../panels/search/cc-search-locations-dialog.c:481
+#: ../panels/search/cc-search-locations-dialog.c:480
 msgctxt "Search Location"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/search/cc-search-locations-dialog.c:679
+#: ../panels/search/cc-search-locations-dialog.c:678
 msgid "Select Location"
 msgstr "選擇位置"
 
-#: ../panels/search/cc-search-locations-dialog.c:683
+#: ../panels/search/cc-search-locations-dialog.c:682
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:176
 msgid "No applications found"
 msgstr "找不到應用程式"
 
@@ -4946,21 +4925,21 @@ msgstr "往下移"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../panels/sharing/cc-sharing-panel.c:285
+#: ../panels/sharing/cc-sharing-panel.c:276
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/sharing/cc-sharing-panel.c:287
+#: ../panels/sharing/cc-sharing-panel.c:278
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/sharing/cc-sharing-panel.c:432
+#: ../panels/sharing/cc-sharing-panel.c:442
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: ../panels/sharing/cc-sharing-panel.c:739
+#: ../panels/sharing/cc-sharing-panel.c:756
 msgid "Copy"
 msgstr "複製"
 
@@ -5001,70 +4980,62 @@ msgid ""
 msgstr "藍牙分享允許您與其他具有藍牙的裝置分享檔案"
 
 #: ../panels/sharing/sharing.ui.h:3
-msgid "Share Public Folder"
-msgstr "分享公用資料夾"
-
-#: ../panels/sharing/sharing.ui.h:4
 msgid "Only Receive From Trusted Devices"
 msgstr "只接收信任的裝置"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: ../panels/sharing/sharing.ui.h:4
 msgid "Save Received Files to Downloads Folder"
 msgstr "將接收的檔案儲存至下載資料夾"
 
-#: ../panels/sharing/sharing.ui.h:6
-msgid "Only share with Trusted Devices"
-msgstr "只與信任的裝置分享"
-
-#: ../panels/sharing/sharing.ui.h:7
+#: ../panels/sharing/sharing.ui.h:5
 msgid "Computer Name"
 msgstr "電腦名稱"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: ../panels/sharing/sharing.ui.h:6
 msgid "Personal File Sharing"
 msgstr "個人檔案分享"
 
-#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/sharing/sharing.ui.h:7
 msgid "Screen Sharing"
 msgstr "螢幕分享"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: ../panels/sharing/sharing.ui.h:8
 msgid "Media Sharing"
 msgstr "媒體分享"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: ../panels/sharing/sharing.ui.h:9
 msgid "Remote Login"
 msgstr "遠端登入"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Some services are disabled because of no network access."
 msgstr "由於沒有網路存取,某些服務已停用。"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: ../panels/sharing/sharing.ui.h:11
 msgid "Share Music, Photos and Videos with others on the current network."
 msgstr "與目前網路的其他人分享音樂、相片和影片。"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: ../panels/sharing/sharing.ui.h:12
 msgid "Share Media On This Network"
 msgstr "在這個網路分享媒體"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: ../panels/sharing/sharing.ui.h:13
 msgid "Shared Folders"
 msgstr "分享資料夾"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: ../panels/sharing/sharing.ui.h:14
 msgid "column"
 msgstr "欄"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: ../panels/sharing/sharing.ui.h:15
 msgid "Add Folder"
 msgstr "加入資料夾"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: ../panels/sharing/sharing.ui.h:16
 msgid "Remove Folder"
 msgstr "移除資料夾"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:18
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5073,15 +5044,15 @@ msgstr ""
 "個人檔案分享允許您使用: <a href=\"dav://%s\">dav://%s</a> 與目前網路上的其他"
 "人分享您的公開資料夾"
 
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:19
 msgid "Share Public Folder On This Network"
 msgstr "在這個網路分享公開資料夾"
 
-#: ../panels/sharing/sharing.ui.h:22
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Require Password"
 msgstr "需要密碼"
 
-#: ../panels/sharing/sharing.ui.h:25
+#: ../panels/sharing/sharing.ui.h:23
 #, no-c-format
 msgid ""
 "Allow remote users to connect using the Secure Shell command:\n"
@@ -5090,7 +5061,7 @@ msgstr ""
 "允許遠端使用者使用 SSH 指令連線:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/sharing.ui.h:28
+#: ../panels/sharing/sharing.ui.h:26
 #, no-c-format
 msgid ""
 "Allow remote users to view or control your screen by connecting to: <a href="
@@ -5098,21 +5069,33 @@ msgid ""
 msgstr ""
 "允許遠端使用者連線到:<a href=\"vnc://%s\">vnc://%s</a> 檢視或控制您的螢幕"
 
+#: ../panels/sharing/sharing.ui.h:27
+#| msgid "Remote Control"
+msgid "Allow Remote Control"
+msgstr "允許遙控"
+
+#: ../panels/sharing/sharing.ui.h:28
+#| msgid "Password"
+msgid "Password:"
+msgstr "密碼:"
+
 #: ../panels/sharing/sharing.ui.h:29
-msgid "Remote View"
-msgstr "遠端檢視"
+msgid "Show Password"
+msgstr "顯示密碼"
 
 #: ../panels/sharing/sharing.ui.h:30
-msgid "Remote Control"
-msgstr "遠端控制"
+#| msgid "%s Options"
+msgid "Access Options"
+msgstr "存取選項"
 
 #: ../panels/sharing/sharing.ui.h:31
-msgid "Approve All Connections"
-msgstr "允許所有的連線"
+msgid "New connections must ask for access"
+msgstr "存取新的連線必須詢問"
 
 #: ../panels/sharing/sharing.ui.h:32
-msgid "Show Password"
-msgstr "顯示密碼"
+#| msgid "Require Password"
+msgid "Require a password"
+msgstr "需要密碼"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
@@ -5153,60 +5136,60 @@ msgstr "敲玻璃"
 msgid "Sonar"
 msgstr "聲納"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: ../panels/sound/gvc-balance-bar.c:105
 msgctxt "balance"
 msgid "Left"
 msgstr "左"
 
-#: ../panels/sound/gvc-balance-bar.c:107
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Right"
 msgstr "右"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: ../panels/sound/gvc-balance-bar.c:109
 msgctxt "balance"
 msgid "Rear"
 msgstr "後"
 
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Front"
 msgstr "前"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: ../panels/sound/gvc-balance-bar.c:113
 msgctxt "balance"
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../panels/sound/gvc-balance-bar.c:290
+#: ../panels/sound/gvc-balance-bar.c:289
 msgid "_Balance:"
 msgstr "平衡(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:293
+#: ../panels/sound/gvc-balance-bar.c:292
 msgid "_Fade:"
 msgstr "淡化(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:296
+#: ../panels/sound/gvc-balance-bar.c:295
 msgid "_Subwoofer:"
 msgstr "重低音(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:613 ../panels/sound/gvc-channel-bar.c:622
+#: ../panels/sound/gvc-channel-bar.c:612 ../panels/sound/gvc-channel-bar.c:621
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:617
+#: ../panels/sound/gvc-channel-bar.c:616
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "未經放大"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261
-#: ../panels/sound/gvc-mixer-dialog.c:527
+#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:260
+#: ../panels/sound/gvc-mixer-dialog.c:526
 msgid "_Profile:"
 msgstr "設定組合(_P):"
 
@@ -5230,118 +5213,118 @@ msgstr[0] "%u 輸入"
 msgid "System Sounds"
 msgstr "系統音效"
 
-#: ../panels/sound/gvc-mixer-dialog.c:263
+#: ../panels/sound/gvc-mixer-dialog.c:262
 msgid "_Test Speakers"
 msgstr "測試喇叭(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:432
+#: ../panels/sound/gvc-mixer-dialog.c:431
 msgid "Peak detect"
 msgstr "峰值檢測"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1510
-#: ../panels/sound/gvc-sound-theme-chooser.c:595
+#: ../panels/sound/gvc-mixer-dialog.c:1509
+#: ../panels/sound/gvc-sound-theme-chooser.c:594
 msgid "Name"
 msgstr "名稱"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1529
+#: ../panels/sound/gvc-mixer-dialog.c:1528
 msgid "Device"
 msgstr "裝置"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1592
+#: ../panels/sound/gvc-mixer-dialog.c:1591
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s 的喇叭測試"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1649
+#: ../panels/sound/gvc-mixer-dialog.c:1648
 msgid "_Output volume:"
 msgstr "輸出音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1663
+#: ../panels/sound/gvc-mixer-dialog.c:1662
 msgid "Output"
 msgstr "輸出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1668
+#: ../panels/sound/gvc-mixer-dialog.c:1667
 msgid "C_hoose a device for sound output:"
 msgstr "選擇聲音輸出的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1693
+#: ../panels/sound/gvc-mixer-dialog.c:1692
 msgid "Settings for the selected device:"
 msgstr "已選取裝置的設定值:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1704
+#: ../panels/sound/gvc-mixer-dialog.c:1703
 msgid "Input"
 msgstr "輸入"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: ../panels/sound/gvc-mixer-dialog.c:1710
 msgid "_Input volume:"
 msgstr "輸入音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1734
+#: ../panels/sound/gvc-mixer-dialog.c:1733
 msgid "Input level:"
 msgstr "輸入等級:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1762
+#: ../panels/sound/gvc-mixer-dialog.c:1761
 msgid "C_hoose a device for sound input:"
 msgstr "選擇聲音輸入的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound/gvc-mixer-dialog.c:1788
 msgid "Sound Effects"
 msgstr "聲音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1796
+#: ../panels/sound/gvc-mixer-dialog.c:1795
 msgid "_Alert volume:"
 msgstr "警示音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1809
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "Applications"
 msgstr "程式集"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1813
+#: ../panels/sound/gvc-mixer-dialog.c:1812
 msgid "No application is currently playing or recording audio."
 msgstr "沒有應用程式目前正在播放或錄製音效。"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:189
+#: ../panels/sound/gvc-sound-theme-chooser.c:188
 msgid "Built-in"
 msgstr "內建"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:455
-#: ../panels/sound/gvc-sound-theme-chooser.c:467
-#: ../panels/sound/gvc-sound-theme-chooser.c:479
+#: ../panels/sound/gvc-sound-theme-chooser.c:454
+#: ../panels/sound/gvc-sound-theme-chooser.c:466
+#: ../panels/sound/gvc-sound-theme-chooser.c:478
 msgid "Sound Preferences"
 msgstr "音效偏好設定"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:458
-#: ../panels/sound/gvc-sound-theme-chooser.c:469
-#: ../panels/sound/gvc-sound-theme-chooser.c:481
+#: ../panels/sound/gvc-sound-theme-chooser.c:457
+#: ../panels/sound/gvc-sound-theme-chooser.c:468
+#: ../panels/sound/gvc-sound-theme-chooser.c:480
 msgid "Testing event sound"
 msgstr "測試事件聲音"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:585
+#: ../panels/sound/gvc-sound-theme-chooser.c:584
 msgid "Default"
 msgstr "預設值"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:586
+#: ../panels/sound/gvc-sound-theme-chooser.c:585
 msgid "From theme"
 msgstr "從主題"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:770
+#: ../panels/sound/gvc-sound-theme-chooser.c:769
 msgid "C_hoose an alert sound:"
 msgstr "選擇警示音效(_H):"
 
-#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:219
 msgid "Stop"
 msgstr "停止"
 
-#: ../panels/sound/gvc-speaker-test.c:220
-#: ../panels/sound/gvc-speaker-test.c:332
+#: ../panels/sound/gvc-speaker-test.c:219
+#: ../panels/sound/gvc-speaker-test.c:331
 msgid "Test"
 msgstr "測試"
 
-#: ../panels/sound/gvc-speaker-test.c:228
+#: ../panels/sound/gvc-speaker-test.c:227
 msgid "Subwoofer"
 msgstr "重低音"
 
-#: ../panels/sound/sound-theme-file-utils.c:292
+#: ../panels/sound/sound-theme-file-utils.c:290
 msgid "Custom"
 msgstr "自訂"
 
@@ -5404,8 +5387,9 @@ msgid "_Typing Assist (AccessX)"
 msgstr "打字助理 [AccessX](_T)"
 
 #: ../panels/universal-access/uap.ui.h:14
-msgid "Pointing and Clicking"
-msgstr "指標和點擊"
+#| msgid "Pointing and Clicking"
+msgid "Pointing & Clicking"
+msgstr "指向 & 點選"
 
 #: ../panels/universal-access/uap.ui.h:15
 msgid "_Mouse Keys"
@@ -5605,27 +5589,27 @@ msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/zoom-options.c:357
+#: ../panels/universal-access/zoom-options.c:333
 msgctxt "Distance"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/zoom-options.c:358
+#: ../panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ 螢幕"
 
-#: ../panels/universal-access/zoom-options.c:359
+#: ../panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ 螢幕"
 
-#: ../panels/universal-access/zoom-options.c:360
+#: ../panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ 螢幕"
 
-#: ../panels/universal-access/zoom-options.c:361
+#: ../panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "Long"
 msgstr "長"
@@ -5787,14 +5771,14 @@ msgstr "顏色效果"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:35
+#: ../panels/user-accounts/um-account-type.c:34
 msgctxt "Account type"
 msgid "Standard"
 msgstr "標準"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:37
+#: ../panels/user-accounts/um-account-type.c:36
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "管理員"
@@ -5900,7 +5884,7 @@ msgid "Right little finger"
 msgstr "右手小指"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:699
+#: ../panels/user-accounts/um-fingerprint-dialog.c:697
 msgid "Enable Fingerprint Login"
 msgstr "啟用指紋登入"
 
@@ -5997,214 +5981,214 @@ msgstr "管理使用者帳號"
 msgid "Authentication is required to change user data"
 msgstr "改變使用者資料需要核對"
 
-#: ../panels/user-accounts/pw-utils.c:82
+#: ../panels/user-accounts/pw-utils.c:81
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr "新的密碼需要與舊密碼有所差異。"
 
-#: ../panels/user-accounts/pw-utils.c:84
+#: ../panels/user-accounts/pw-utils.c:83
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "試著改變某些文字和數字。"
 
-#: ../panels/user-accounts/pw-utils.c:86 ../panels/user-accounts/pw-utils.c:94
+#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "試著更常改變密碼。"
 
-#: ../panels/user-accounts/pw-utils.c:88
+#: ../panels/user-accounts/pw-utils.c:87
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "不含您的使用者名稱的密碼強度會比較高。"
 
-#: ../panels/user-accounts/pw-utils.c:90
+#: ../panels/user-accounts/pw-utils.c:89
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "試著避免在密碼中使用您的姓名。"
 
-#: ../panels/user-accounts/pw-utils.c:92
+#: ../panels/user-accounts/pw-utils.c:91
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "試著避免在密碼中包含某些文字。"
 
-#: ../panels/user-accounts/pw-utils.c:96
+#: ../panels/user-accounts/pw-utils.c:95
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "試著避免常見的文字。"
 
-#: ../panels/user-accounts/pw-utils.c:98
+#: ../panels/user-accounts/pw-utils.c:97
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "試著避免重新排序現有的文字。"
 
-#: ../panels/user-accounts/pw-utils.c:100
+#: ../panels/user-accounts/pw-utils.c:99
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "試著使用更多數字。"
 
-#: ../panels/user-accounts/pw-utils.c:102
+#: ../panels/user-accounts/pw-utils.c:101
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "試著使用更多大寫字母。"
 
-#: ../panels/user-accounts/pw-utils.c:104
+#: ../panels/user-accounts/pw-utils.c:103
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "試著使用更多小寫字母。"
 
-#: ../panels/user-accounts/pw-utils.c:106
+#: ../panels/user-accounts/pw-utils.c:105
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "試著使用更多特殊字元,像是標點符號。"
 
-#: ../panels/user-accounts/pw-utils.c:108
+#: ../panels/user-accounts/pw-utils.c:107
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "試著使用混合字母、數字和標點符號。"
 
-#: ../panels/user-accounts/pw-utils.c:110
+#: ../panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "試著避免同樣字元。"
 
-#: ../panels/user-accounts/pw-utils.c:112
+#: ../panels/user-accounts/pw-utils.c:111
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
 msgstr "試著避免重複同樣類型的字元:您需要混合字母、數字和標點符號。"
 
-#: ../panels/user-accounts/pw-utils.c:114
+#: ../panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "試著避免像 1234 或 abcd 等順序。"
 
-#: ../panels/user-accounts/pw-utils.c:116
+#: ../panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
 msgid "Try to add more letters, numbers and symbols."
 msgstr "試著加入更多字母、數字和標點符號。"
 
-#: ../panels/user-accounts/pw-utils.c:118
+#: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and use a number or two."
 msgstr "混合大寫與小寫字元並使用一到兩個數字。"
 
-#: ../panels/user-accounts/pw-utils.c:120
+#: ../panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
 "Good password! Adding more letters, numbers and punctuation will make it "
 "stronger."
 msgstr "不錯的密碼!加入更多字母、數字和標點符號會讓它更好。"
 
-#: ../panels/user-accounts/pw-utils.c:142
-#: ../panels/user-accounts/pw-utils.c:172
+#: ../panels/user-accounts/pw-utils.c:141
+#: ../panels/user-accounts/pw-utils.c:171
 msgctxt "Password strength"
 msgid "Strength: Weak"
 msgstr "強度:很弱"
 
-#: ../panels/user-accounts/pw-utils.c:146
-#: ../panels/user-accounts/pw-utils.c:173
+#: ../panels/user-accounts/pw-utils.c:145
+#: ../panels/user-accounts/pw-utils.c:172
 msgctxt "Password strength"
 msgid "Strength: Low"
 msgstr "強度:低度"
 
-#: ../panels/user-accounts/pw-utils.c:149
-#: ../panels/user-accounts/pw-utils.c:174
+#: ../panels/user-accounts/pw-utils.c:148
+#: ../panels/user-accounts/pw-utils.c:173
 msgctxt "Password strength"
 msgid "Strength: Medium"
 msgstr "強度:中度"
 
-#: ../panels/user-accounts/pw-utils.c:152
-#: ../panels/user-accounts/pw-utils.c:175
+#: ../panels/user-accounts/pw-utils.c:151
+#: ../panels/user-accounts/pw-utils.c:174
 msgctxt "Password strength"
 msgid "Strength: Good"
 msgstr "強度:良好"
 
-#: ../panels/user-accounts/pw-utils.c:155
-#: ../panels/user-accounts/pw-utils.c:176
+#: ../panels/user-accounts/pw-utils.c:154
+#: ../panels/user-accounts/pw-utils.c:175
 msgctxt "Password strength"
 msgid "Strength: High"
 msgstr "強度:高度"
 
-#: ../panels/user-accounts/run-passwd.c:424
+#: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "核對失敗"
 
-#: ../panels/user-accounts/run-passwd.c:504
+#: ../panels/user-accounts/run-passwd.c:502
 #, c-format
 msgid "The new password is too short"
 msgstr "新的密碼太短"
 
-#: ../panels/user-accounts/run-passwd.c:510
+#: ../panels/user-accounts/run-passwd.c:508
 #, c-format
 msgid "The new password is too simple"
 msgstr "新的密碼太簡單"
 
-#: ../panels/user-accounts/run-passwd.c:516
+#: ../panels/user-accounts/run-passwd.c:514
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "舊密碼與新密碼太相似了"
 
-#: ../panels/user-accounts/run-passwd.c:519
+#: ../panels/user-accounts/run-passwd.c:517
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "新的密碼已經在最近使用過了。"
 
-#: ../panels/user-accounts/run-passwd.c:522
+#: ../panels/user-accounts/run-passwd.c:520
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "新的密碼必須包含數字或特殊字元"
 
-#: ../panels/user-accounts/run-passwd.c:526
+#: ../panels/user-accounts/run-passwd.c:524
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "舊密碼與新密碼是相同的"
 
-#: ../panels/user-accounts/run-passwd.c:530
+#: ../panels/user-accounts/run-passwd.c:528
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "您的密碼在第一次核對後已經改變過了!"
 
-#: ../panels/user-accounts/run-passwd.c:534
+#: ../panels/user-accounts/run-passwd.c:532
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "新的密碼並未包含足夠的不同字元"
 
-#: ../panels/user-accounts/run-passwd.c:538
+#: ../panels/user-accounts/run-passwd.c:536
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../panels/user-accounts/um-account-dialog.c:35
+#: ../panels/user-accounts/um-account-dialog.c:34
 msgid "Should match the web address of your account provider."
 msgstr "應符合您帳號提供者的網路位址。"
 
-#: ../panels/user-accounts/um-account-dialog.c:222
+#: ../panels/user-accounts/um-account-dialog.c:221
 msgid "Failed to add account"
 msgstr "無法加入到帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:316
+#: ../panels/user-accounts/um-account-dialog.c:315
 msgid "This will be used to name your home folder and can't be changed."
 msgstr "這會成為您家目錄資料夾的名稱,並且不能被改變。"
 
-#: ../panels/user-accounts/um-account-dialog.c:449
+#: ../panels/user-accounts/um-account-dialog.c:448
 msgid "Passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-account-dialog.c:719
-#: ../panels/user-accounts/um-account-dialog.c:765
+#: ../panels/user-accounts/um-account-dialog.c:718
+#: ../panels/user-accounts/um-account-dialog.c:764
 msgid "Failed to register account"
 msgstr "無法註冊帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:903
+#: ../panels/user-accounts/um-account-dialog.c:902
 msgid "No supported way to authenticate with this domain"
 msgstr "沒有支援這個網域核對的方式"
 
-#: ../panels/user-accounts/um-account-dialog.c:962
+#: ../panels/user-accounts/um-account-dialog.c:961
 msgid "Failed to join domain"
 msgstr "無法加入網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1023
+#: ../panels/user-accounts/um-account-dialog.c:1022
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6212,7 +6196,7 @@ msgstr ""
 "登入名稱沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1030
+#: ../panels/user-accounts/um-account-dialog.c:1029
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6220,64 +6204,64 @@ msgstr ""
 "登入密碼沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1038
+#: ../panels/user-accounts/um-account-dialog.c:1037
 msgid "Failed to log into domain"
 msgstr "無法登入到網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1096
+#: ../panels/user-accounts/um-account-dialog.c:1095
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "找不到網域。也許您拼錯字了?"
 
-#: ../panels/user-accounts/um-account-dialog.c:1446
+#: ../panels/user-accounts/um-account-dialog.c:1445
 msgid "Add User"
 msgstr "加入使用者"
 
 #. Create enterprise toggle button.
-#: ../panels/user-accounts/um-account-dialog.c:1459
+#: ../panels/user-accounts/um-account-dialog.c:1458
 msgid "_Enterprise Login"
 msgstr "企業登入(_E)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:139
+#: ../panels/user-accounts/um-fingerprint-dialog.c:137
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "您不被允許使用這個裝置。請連絡您的系統管理者。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:141
+#: ../panels/user-accounts/um-fingerprint-dialog.c:139
 msgid "The device is already in use."
 msgstr "該裝置已經在使用中。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:143
+#: ../panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "An internal error occurred."
 msgstr "發生內部的錯誤。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:219
-#: ../panels/user-accounts/um-fingerprint-dialog.c:220
+#: ../panels/user-accounts/um-fingerprint-dialog.c:217
+#: ../panels/user-accounts/um-fingerprint-dialog.c:218
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:268
+#: ../panels/user-accounts/um-fingerprint-dialog.c:266
 msgid "Delete registered fingerprints?"
 msgstr "是否刪除已註冊的指紋?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:272
+#: ../panels/user-accounts/um-fingerprint-dialog.c:270
 msgid "_Delete Fingerprints"
 msgstr "刪除指紋(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:278
+#: ../panels/user-accounts/um-fingerprint-dialog.c:276
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "您確定要刪除已註冊的指紋嗎?這麼一來將會停用指紋登入。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:454
+#: ../panels/user-accounts/um-fingerprint-dialog.c:452
 msgid "Done!"
 msgstr "完成!"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:515
-#: ../panels/user-accounts/um-fingerprint-dialog.c:557
+#: ../panels/user-accounts/um-fingerprint-dialog.c:513
+#: ../panels/user-accounts/um-fingerprint-dialog.c:555
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "無法存取「%s」裝置"
@@ -6285,16 +6269,16 @@ msgstr "無法存取「%s」裝置"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:598
+#: ../panels/user-accounts/um-fingerprint-dialog.c:596
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "無法使用「%s」裝置上的指紋捕捉"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:649
+#: ../panels/user-accounts/um-fingerprint-dialog.c:647
 msgid "Could not access any fingerprint readers"
 msgstr "無法存取任何指紋辨識器"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:650
+#: ../panels/user-accounts/um-fingerprint-dialog.c:648
 msgid "Please contact your system administrator for help."
 msgstr "請連絡您的系統管理員來幫忙。"
 
@@ -6303,26 +6287,26 @@ msgstr "請連絡您的系統管理員來幫忙。"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:733
+#: ../panels/user-accounts/um-fingerprint-dialog.c:731
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
 msgstr "要啟用指紋登入,您需要使用「%s」裝置儲存您的指紋。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:740
+#: ../panels/user-accounts/um-fingerprint-dialog.c:738
 msgid "Selecting finger"
 msgstr "選擇手指"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:741
+#: ../panels/user-accounts/um-fingerprint-dialog.c:739
 msgid "Enrolling fingerprints"
 msgstr "登記指紋"
 
-#: ../panels/user-accounts/um-history-dialog.c:88
+#: ../panels/user-accounts/um-history-dialog.c:87
 msgid "This Week"
 msgstr "本週"
 
-#: ../panels/user-accounts/um-history-dialog.c:91
+#: ../panels/user-accounts/um-history-dialog.c:90
 msgid "Last Week"
 msgstr "上週"
 
@@ -6330,22 +6314,22 @@ msgstr "上週"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:97
-#: ../panels/user-accounts/um-history-dialog.c:101
+#: ../panels/user-accounts/um-history-dialog.c:96
+#: ../panels/user-accounts/um-history-dialog.c:100
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%b%e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:106
+#: ../panels/user-accounts/um-history-dialog.c:105
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%Y年%b%e日"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:111
+#: ../panels/user-accounts/um-history-dialog.c:110
 #, c-format
 msgctxt "login history week label"
 msgid "%s - %s"
@@ -6353,160 +6337,160 @@ msgstr "%s - %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:195
-#: ../panels/user-accounts/um-user-panel.c:626
+#: ../panels/user-accounts/um-history-dialog.c:194
+#: ../panels/user-accounts/um-user-panel.c:625
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:198
-#: ../panels/user-accounts/um-user-panel.c:630
+#: ../panels/user-accounts/um-history-dialog.c:197
+#: ../panels/user-accounts/um-user-panel.c:629
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s,%s"
 
-#: ../panels/user-accounts/um-history-dialog.c:267
+#: ../panels/user-accounts/um-history-dialog.c:266
 msgid "Session Ended"
 msgstr "作業階段結束"
 
-#: ../panels/user-accounts/um-history-dialog.c:273
+#: ../panels/user-accounts/um-history-dialog.c:272
 msgid "Session Started"
 msgstr "作業階段開始"
 
-#: ../panels/user-accounts/um-password-dialog.c:146
+#: ../panels/user-accounts/um-password-dialog.c:145
 msgid "Please choose another password."
 msgstr "請選擇其他密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:155
+#: ../panels/user-accounts/um-password-dialog.c:154
 msgid "Please type your current password again."
 msgstr "請再次輸入您目前的密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:161
+#: ../panels/user-accounts/um-password-dialog.c:160
 msgid "Password could not be changed"
 msgstr "密碼無法變更"
 
-#: ../panels/user-accounts/um-password-dialog.c:287
+#: ../panels/user-accounts/um-password-dialog.c:286
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/user-accounts/um-photo-dialog.c:217
 msgid "Browse for more pictures"
 msgstr "瀏覽更多照片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:443
+#: ../panels/user-accounts/um-photo-dialog.c:442
 msgid "Disable image"
 msgstr "停用圖片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:461
+#: ../panels/user-accounts/um-photo-dialog.c:460
 msgid "Take a photo…"
 msgstr "照相…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:479
+#: ../panels/user-accounts/um-photo-dialog.c:478
 msgid "Browse for more pictures…"
 msgstr "瀏覽更多照片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:702
 #, c-format
 msgid "Used by %s"
 msgstr "由 %s 使用"
 
-#: ../panels/user-accounts/um-realm-manager.c:351
+#: ../panels/user-accounts/um-realm-manager.c:350
 msgid "Cannot automatically join this type of domain"
 msgstr "不能自動加入這個類型的網域"
 
-#: ../panels/user-accounts/um-realm-manager.c:414
+#: ../panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
 msgstr "找不到這個網域或領域名稱"
 
-#: ../panels/user-accounts/um-realm-manager.c:814
-#: ../panels/user-accounts/um-realm-manager.c:828
+#: ../panels/user-accounts/um-realm-manager.c:813
+#: ../panels/user-accounts/um-realm-manager.c:827
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "不能以 %s 身分登入 %s 網域"
 
-#: ../panels/user-accounts/um-realm-manager.c:820
+#: ../panels/user-accounts/um-realm-manager.c:819
 msgid "Invalid password, please try again"
 msgstr "密碼錯誤,請再試一次"
 
-#: ../panels/user-accounts/um-realm-manager.c:833
+#: ../panels/user-accounts/um-realm-manager.c:832
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "無法連接到 %s 網域:%s"
 
-#: ../panels/user-accounts/um-user-panel.c:193
+#: ../panels/user-accounts/um-user-panel.c:192
 msgid "Other Accounts"
 msgstr "其他帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:412
+#: ../panels/user-accounts/um-user-panel.c:411
 msgid "Failed to delete user"
 msgstr "刪除使用者失敗"
 
-#: ../panels/user-accounts/um-user-panel.c:477
+#: ../panels/user-accounts/um-user-panel.c:476
 msgid "You cannot delete your own account."
 msgstr "您不能刪除自己的帳號。"
 
-#: ../panels/user-accounts/um-user-panel.c:486
+#: ../panels/user-accounts/um-user-panel.c:485
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 仍在登入中"
 
-#: ../panels/user-accounts/um-user-panel.c:490
+#: ../panels/user-accounts/um-user-panel.c:489
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "在使用者登入期間刪除他會使系統處於不穩定的狀態。"
 
-#: ../panels/user-accounts/um-user-panel.c:499
+#: ../panels/user-accounts/um-user-panel.c:498
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "您想要保留 %s 的檔案嗎?"
 
-#: ../panels/user-accounts/um-user-panel.c:503
+#: ../panels/user-accounts/um-user-panel.c:502
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "當刪除使用者時是可以保留家目錄、新進郵件(mail spool)和暫存檔案的。"
 
-#: ../panels/user-accounts/um-user-panel.c:506
+#: ../panels/user-accounts/um-user-panel.c:505
 msgid "_Delete Files"
 msgstr "刪除檔案(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-user-panel.c:506
 msgid "_Keep Files"
 msgstr "保留檔案(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:559
+#: ../panels/user-accounts/um-user-panel.c:558
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳號已停用"
 
-#: ../panels/user-accounts/um-user-panel.c:567
+#: ../panels/user-accounts/um-user-panel.c:566
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "在下次登入時設定"
 
-#: ../panels/user-accounts/um-user-panel.c:570
+#: ../panels/user-accounts/um-user-panel.c:569
 msgctxt "Password mode"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/user-accounts/um-user-panel.c:619
+#: ../panels/user-accounts/um-user-panel.c:618
 msgid "Logged in"
 msgstr "已登入"
 
-#: ../panels/user-accounts/um-user-panel.c:999
+#: ../panels/user-accounts/um-user-panel.c:998
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: ../panels/user-accounts/um-user-panel.c:1001
+#: ../panels/user-accounts/um-user-panel.c:1000
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1042
+#: ../panels/user-accounts/um-user-panel.c:1041
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6514,12 +6498,12 @@ msgstr ""
 "要進行變更,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1080
+#: ../panels/user-accounts/um-user-panel.c:1079
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1091
-#: ../panels/user-accounts/um-user-panel.c:1380
+#: ../panels/user-accounts/um-user-panel.c:1090
+#: ../panels/user-accounts/um-user-panel.c:1379
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6527,12 +6511,12 @@ msgstr ""
 "要建立使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1101
+#: ../panels/user-accounts/um-user-panel.c:1100
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1113
-#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1112
+#: ../panels/user-accounts/um-user-panel.c:1384
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6540,37 +6524,37 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1295
+#: ../panels/user-accounts/um-user-panel.c:1294
 msgid "My Account"
 msgstr "我的帳號"
 
-#: ../panels/user-accounts/um-utils.c:551
+#: ../panels/user-accounts/um-utils.c:567
 #, c-format
 msgid "A user with the username '%s' already exists"
 msgstr "以使用者名稱「%s」為名的使用者已經存在"
 
-#: ../panels/user-accounts/um-utils.c:555
+#: ../panels/user-accounts/um-utils.c:571
 #, c-format
 msgid "The username is too long"
 msgstr "使用者名稱太長了"
 
-#: ../panels/user-accounts/um-utils.c:558
+#: ../panels/user-accounts/um-utils.c:574
 msgid "The username cannot start with a '-'"
 msgstr "使用者名稱不能以 '-' 字母開頭"
 
-#: ../panels/user-accounts/um-utils.c:561
+#: ../panels/user-accounts/um-utils.c:577
 msgid ""
 "The username should only consist of lower and upper case letters from a-z, "
 "digits and any of characters '.', '-' and '_'"
 msgstr "使用者名稱必須由從 a-z 的大小寫字母、數字、 '.'、 '-' 和 '_' 字元組成"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/user-accounts/um-utils.c:811
+#: ../panels/user-accounts/um-utils.c:827
 msgid "%b %e"
 msgstr "%b%e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/user-accounts/um-utils.c:815
+#: ../panels/user-accounts/um-utils.c:831
 msgid "%b %e, %Y"
 msgstr "%Y年%b%e日"
 
@@ -6590,70 +6574,70 @@ msgstr ""
 "要編輯捷徑鍵,選擇「傳送筆劃」動作,按下鍵盤捷徑按鈕與新的按鍵組合,或以 "
 "Backspace 鍵來清除。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:82
+#: ../panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 msgstr "請點一下出現在螢幕上的目標標記來校準繪圖板。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:86
+#: ../panels/wacom/calibrator/calibrator-gui.c:87
 msgid "Mis-click detected, restarting..."
 msgstr "偵測到錯誤的點擊,重新開始…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:443
+#: ../panels/wacom/cc-wacom-button-row.c:442
 msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "上"
 
-#: ../panels/wacom/cc-wacom-button-row.c:444
+#: ../panels/wacom/cc-wacom-button-row.c:443
 msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "下"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "傳送筆劃"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
+#: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "切換監視器"
 
-#: ../panels/wacom/cc-wacom-button-row.h:58
+#: ../panels/wacom/cc-wacom-button-row.h:57
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "顯示螢幕求助"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:264
+#: ../panels/wacom/cc-wacom-mapping-panel.c:263
 msgid "Output:"
 msgstr "輸出:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:276
+#: ../panels/wacom/cc-wacom-mapping-panel.c:275
 msgid "Keep aspect ratio (letterbox):"
 msgstr "保持長寬比:"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:287
+#: ../panels/wacom/cc-wacom-mapping-panel.c:286
 msgid "Map to single monitor"
 msgstr "映射到單一螢幕"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:89
+#: ../panels/wacom/cc-wacom-nav-button.c:88
 #, c-format
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:531
+#: ../panels/wacom/cc-wacom-page.c:530
 msgid "Display Mapping"
 msgstr "顯示對應"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:373
+#: ../panels/wacom/cc-wacom-stylus-page.c:372
 msgid "Button"
 msgstr "按鈕"
 
@@ -6720,91 +6704,91 @@ msgid "Left-Handed Orientation"
 msgstr "左手方向"
 
 #. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1063
+#: ../panels/wacom/gsd-wacom-device.c:1062
 msgid "Left Ring"
 msgstr "左環"
 
-#: ../panels/wacom/gsd-wacom-device.c:1074
+#: ../panels/wacom/gsd-wacom-device.c:1073
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "左觸控環模式 #%d"
 
 #. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1094
+#: ../panels/wacom/gsd-wacom-device.c:1093
 msgid "Right Ring"
 msgstr "右環"
 
-#: ../panels/wacom/gsd-wacom-device.c:1105
+#: ../panels/wacom/gsd-wacom-device.c:1104
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "右觸控環模式 #%d"
 
 #. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1147
+#: ../panels/wacom/gsd-wacom-device.c:1146
 msgid "Left Touchstrip"
 msgstr "左觸控列"
 
-#: ../panels/wacom/gsd-wacom-device.c:1158
+#: ../panels/wacom/gsd-wacom-device.c:1157
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "左觸控列模式 #%d"
 
 #. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1178
+#: ../panels/wacom/gsd-wacom-device.c:1177
 msgid "Right Touchstrip"
 msgstr "右觸控列"
 
-#: ../panels/wacom/gsd-wacom-device.c:1189
+#: ../panels/wacom/gsd-wacom-device.c:1188
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "右觸控列模式 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1215
+#: ../panels/wacom/gsd-wacom-device.c:1214
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "左觸控環模式切換"
 
-#: ../panels/wacom/gsd-wacom-device.c:1217
+#: ../panels/wacom/gsd-wacom-device.c:1216
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "右觸控環模式切換"
 
-#: ../panels/wacom/gsd-wacom-device.c:1220
+#: ../panels/wacom/gsd-wacom-device.c:1219
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "左觸控列模式切換"
 
-#: ../panels/wacom/gsd-wacom-device.c:1222
+#: ../panels/wacom/gsd-wacom-device.c:1221
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "右觸控列模式切換"
 
-#: ../panels/wacom/gsd-wacom-device.c:1227
+#: ../panels/wacom/gsd-wacom-device.c:1226
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "模式切換 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1335
+#: ../panels/wacom/gsd-wacom-device.c:1334
 #, c-format
 msgid "Left Button #%d"
 msgstr "左側按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1338
+#: ../panels/wacom/gsd-wacom-device.c:1337
 #, c-format
 msgid "Right Button #%d"
 msgstr "右側按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1341
+#: ../panels/wacom/gsd-wacom-device.c:1340
 #, c-format
 msgid "Top Button #%d"
 msgstr "頂端按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1344
+#: ../panels/wacom/gsd-wacom-device.c:1343
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "底部按鈕 #%d"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:264
+#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "新增捷徑鍵…"
 
@@ -6905,11 +6889,11 @@ msgstr "要顯示的面板"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[面板] [引數…]"
 
-#: ../shell/cc-application.c:142
+#: ../shell/cc-application.c:145
 msgid "- Settings"
 msgstr "- 設定值)"
 
-#: ../shell/cc-application.c:160
+#: ../shell/cc-application.c:163
 #, c-format
 msgid ""
 "%s\n"
@@ -6918,39 +6902,39 @@ msgstr ""
 "%s\n"
 "執行 「%s --help」以查看完整的命令列可用選項清單。\n"
 
-#: ../shell/cc-application.c:190
+#: ../shell/cc-application.c:193
 msgid "Available panels:"
 msgstr "可用的面板:"
 
-#: ../shell/cc-application.c:325
+#: ../shell/cc-application.c:328
 msgid "Help"
 msgstr "求助"
 
-#: ../shell/cc-application.c:326
+#: ../shell/cc-application.c:329
 msgid "Quit"
 msgstr "結束"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+#: ../shell/cc-window.c:61 ../shell/cc-window.c:1490
 msgid "All Settings"
 msgstr "所有設定值"
 
 #. Add categories
-#: ../shell/cc-window.c:868
+#: ../shell/cc-window.c:872
 msgctxt "category"
 msgid "Personal"
 msgstr "個人"
 
-#: ../shell/cc-window.c:869
+#: ../shell/cc-window.c:873
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../shell/cc-window.c:870
+#: ../shell/cc-window.c:874
 msgctxt "category"
 msgid "System"
 msgstr "系統"
 
-#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../shell/cc-window.c:1601 ../shell/gnome-control-center.desktop.in.in.h:1
 msgid "Settings"
 msgstr "設定值"
 
@@ -6958,6 +6942,71 @@ msgstr "設定值"
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
 
+#~ msgid "Flickr"
+#~ msgstr "Flickr"
+
+#~ msgid "Set Up New Device"
+#~ msgstr "設置新裝置"
+
+#~ msgid "Connection"
+#~ msgstr "連線"
+
+#~ msgid "Paired"
+#~ msgstr "已配對"
+
+#~ msgid "Type"
+#~ msgstr "類型"
+
+#~ msgid "Mouse & Touchpad Settings"
+#~ msgstr "滑鼠與觸控板設定值"
+
+#~ msgid "Sound Settings"
+#~ msgstr "音效設定值"
+
+#~ msgid "Keyboard Settings"
+#~ msgstr "鍵盤設定值"
+
+#~ msgid "Send Files…"
+#~ msgstr "傳送檔案…"
+
+#~ msgid "Visibility"
+#~ msgstr "顯示狀態"
+
+#~ msgid "Visibility of “%s”"
+#~ msgstr "「%s」的顯示狀態"
+
+#~ msgid "Remove '%s' from the list of devices?"
+#~ msgstr "是否從裝置的清單中移除「%s」?"
+
+#~ msgid ""
+#~ "If you remove the device, you will have to set it up again before next "
+#~ "use."
+#~ msgstr "如果您刪除此裝置,下次使用時必須再次設定它。"
+
+#~ msgid "Install Updates"
+#~ msgstr "安裝更新"
+
+#~ msgid "System Up-To-Date"
+#~ msgstr "系統已是最新"
+
+#~ msgid "Search for network printers or filter result"
+#~ msgstr "搜尋網路印表機或過濾器結果"
+
+#~ msgid "_Default"
+#~ msgstr "預設值(_D)"
+
+#~ msgid "Share Public Folder"
+#~ msgstr "分享公用資料夾"
+
+#~ msgid "Only share with Trusted Devices"
+#~ msgstr "只與信任的裝置分享"
+
+#~ msgid "Remote View"
+#~ msgstr "遠端檢視"
+
+#~ msgid "Approve All Connections"
+#~ msgstr "允許所有的連線"
+
 #~ msgid "Device type:"
 #~ msgstr "裝置類型:"
 
@@ -6987,9 +7036,6 @@ msgstr "Preferences;Settings;偏好設定;設定值;"
 #~ msgid "Refresh Rate"
 #~ msgstr "更新率"
 
-#~ msgid "Software"
-#~ msgstr "軟體"
-
 #~ msgid "Mouse Preferences"
 #~ msgstr "滑鼠偏好設定"
 
@@ -7544,9 +7590,6 @@ msgstr "Preferences;Settings;偏好設定;設定值;"
 #~ msgid "Change printer settings"
 #~ msgstr "改變印表機設定值"
 
-#~ msgid "%s Options"
-#~ msgstr "%s 選項"
-
 #~ msgid "Manufacturers"
 #~ msgstr "製造商"
 


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