[gnome-control-center] Update Chinese (Taiwan) translation



commit acc47bee051b6ad2949a2a9584b5c6a87b0be334
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Sun Aug 27 02:58:22 2017 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 2235 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1213 insertions(+), 1022 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6c22d7a..217188e 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: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-24 16:16+0000\n"
-"PO-Revision-Date: 2017-02-27 09:03+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2017-08-25 14:57+0000\n"
+"PO-Revision-Date: 2017-08-27 10:56+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\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.8.11\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: ../panels/background/background.ui.h:1
 msgid "_Background"
@@ -69,73 +69,73 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "合併"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:430
 msgid "Wallpapers"
 msgstr "桌布"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:439
 msgid "Colors"
 msgstr "顏色"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: ../panels/background/cc-background-chooser-dialog.c:476
 msgid "Select Background"
 msgstr "選擇背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:504
 msgid "Pictures"
 msgstr "影像"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: ../panels/background/cc-background-chooser-dialog.c:536
 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:561
+#: ../panels/background/cc-background-chooser-dialog.c:554
 #: ../panels/search/cc-search-locations-dialog.c:302
 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:573
+#: ../panels/background/cc-background-chooser-dialog.c:566
 #, 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:580
+#: ../panels/background/cc-background-chooser-dialog.c:573
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1580
-#: ../panels/display/cc-display-panel.c:2226
+#: ../panels/display/cc-display-panel.c:2718
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 #: ../panels/network/connection-editor/vpn-helpers.c:181
 #: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1298
-#: ../panels/network/net-device-wifi.c:1535
+#: ../panels/network/net-device-wifi.c:1318
+#: ../panels/network/net-device-wifi.c:1398
+#: ../panels/network/net-device-wifi.c:1633
 #: ../panels/network/network-wifi.ui.h:1
 #: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/printers/pp-details-dialog.c:321
+#: ../panels/printers/pp-details-dialog.c:319
 #: ../panels/privacy/cc-privacy-panel.c:1049
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:637
+#: ../panels/search/cc-search-locations-dialog.c:642
 #: ../panels/sharing/cc-sharing-panel.c:375
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
 #: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
 #: ../panels/user-accounts/um-fingerprint-dialog.c:264
 #: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/user-accounts/um-photo-dialog.c:221
 #: ../panels/user-accounts/um-user-panel.c:644
 #: ../panels/user-accounts/um-user-panel.c:662
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: ../panels/background/cc-background-chooser-dialog.c:574
 msgid "_Select"
 msgstr "選取(_S)"
 
@@ -172,39 +172,39 @@ msgstr "將您的背景影像變更為桌布或相片"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: ../panels/bluetooth/cc-bluetooth-panel.c:268
 msgid "Turn Off Airplane Mode"
 msgstr "關閉飛安模式"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "No Bluetooth Found"
 msgstr "找不到藍牙"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: ../panels/bluetooth/cc-bluetooth-panel.c:334
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "插入藍牙棒以使用藍牙。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Bluetooth Turned Off"
 msgstr "藍牙已關閉"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: ../panels/bluetooth/cc-bluetooth-panel.c:335
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "開啟以連接裝置與接收檔案傳輸。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Airplane Mode is on"
 msgstr "飛安模式已開啟"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: ../panels/bluetooth/cc-bluetooth-panel.c:336
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "當開啟飛安模式時,將停用藍牙。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Hardware Airplane Mode is on"
 msgstr "硬體飛安模式已開啟"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: ../panels/bluetooth/cc-bluetooth-panel.c:337
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "關閉飛安模式開關以啟用藍牙。"
 
@@ -685,7 +685,7 @@ msgid "_Import File…"
 msgstr "載入檔案(_I)…"
 
 #: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
+#: ../panels/network/connection-editor/net-connection-editor.c:519
 #: ../panels/printers/new-printer-dialog.ui.h:4
 #: ../panels/region/input-chooser.ui.h:3
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
@@ -837,7 +837,7 @@ msgstr "D75"
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
 msgid "Co­lor"
-msgstr "顏色"
+msgstr "色彩"
 
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:3
 msgid ""
@@ -856,7 +856,7 @@ msgid "Other…"
 msgstr "其他…"
 
 #: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-format-chooser.c:269
 #: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "更多…"
@@ -866,12 +866,12 @@ msgid "No languages found"
 msgstr "找不到語言"
 
 #: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: ../panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "今日"
 
 #: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "昨日"
 
@@ -905,17 +905,17 @@ msgid "Year"
 msgstr "年"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: ../panels/datetime/cc-datetime-panel.c:339
 msgid "%e %B %Y, %l:%M %p"
-msgstr "%Y年%b%e日, %p %l:%M"
+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:345
+#: ../panels/datetime/cc-datetime-panel.c:344
 msgid "%e %B %Y, %R"
 msgstr "%Y年%b%e日,%R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: ../panels/datetime/cc-datetime-panel.c:522
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -923,7 +923,7 @@ msgstr "%s,%s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: ../panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -931,23 +931,23 @@ msgstr "%s (%s)"
 
 #. 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:561
+#: ../panels/datetime/cc-datetime-panel.c:560
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: ../panels/datetime/cc-datetime-panel.c:565
 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:571
+#: ../panels/datetime/cc-datetime-panel.c:570
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: ../panels/datetime/cc-datetime-panel.c:575
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
@@ -1077,165 +1077,136 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,您需要通過核對。"
 
-#: ../panels/display/cc-display-panel.c:592
-msgid "Lid Closed"
-msgstr "上蓋已經關閉"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:595
-msgid "Mirrored"
-msgstr "相同顯示"
-
-#: ../panels/display/cc-display-panel.c:597
-#: ../panels/display/cc-display-panel.c:2449
-msgid "Primary"
-msgstr "主要"
-
-#: ../panels/display/cc-display-panel.c:599
-#: ../panels/display/cc-display-panel.c:2786
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-#: ../panels/universal-access/uap.ui.h:6
-msgid "Off"
-msgstr "關閉"
-
-#: ../panels/display/cc-display-panel.c:602
-msgid "Secondary"
-msgstr "次要"
+#: ../panels/display/cc-display-panel.c:738
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "橫向"
 
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1577
-msgid "Arrange Combined Displays"
-msgstr "排列顯示器的組合方式"
+#: ../panels/display/cc-display-panel.c:741
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "直向右轉"
 
-#: ../panels/display/cc-display-panel.c:1581
-#: ../panels/display/cc-display-panel.c:2227
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "套用(_A)"
+#: ../panels/display/cc-display-panel.c:744
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "直向左轉"
 
-#: ../panels/display/cc-display-panel.c:1605
-msgid "Drag displays to rearrange them"
-msgstr "拖拉顯示器以重新排列"
+#: ../panels/display/cc-display-panel.c:747
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "橫向(翻轉)"
 
-#. translators: example string is "60 Hz (NTSC)"
-#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1812
-#, c-format
-msgid "%d Hz (NTSC)"
-msgstr "%d Hz (NTSC)"
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/display/cc-display-panel.c:788
+#: ../panels/display/cc-display-panel.c:838
+#: ../panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "方向"
 
-#. translators: example string is "60 Hz"
+#: ../panels/display/cc-display-panel.c:881
+#: ../panels/display/cc-display-panel.c:933
+#: ../panels/display/cc-display-panel.c:1772
 #: ../panels/display/cc-display-panel.c:1818
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
-#: ../panels/display/cc-display-panel.c:2279
-msgid "Rotate counterclockwise by 90°"
-msgstr "逆時針"
-
-#: ../panels/display/cc-display-panel.c:2297
-msgid "Rotate by 180°"
-msgstr "旋轉 180°"
-
-#: ../panels/display/cc-display-panel.c:2315
-msgid "Rotate clockwise by 90°"
-msgstr "順時針旋轉 90°"
-
-#: ../panels/display/cc-display-panel.c:2336
-msgid "Size"
-msgstr "尺寸"
-
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2351
-msgid "Aspect Ratio"
-msgstr "長寬比"
-
-#: ../panels/display/cc-display-panel.c:2374
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "解析度"
 
-#: ../panels/display/cc-display-panel.c:2394
-msgid "Adjust for TV"
-msgstr "調整為電視"
-
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:978
+#: ../panels/display/cc-display-panel.c:1049
 msgid "Refresh Rate"
 msgstr "更新率"
 
-#: ../panels/display/cc-display-panel.c:2450
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "在這個顯示器顯示頂端列與活動概覽"
+#: ../panels/display/cc-display-panel.c:1207
+msgid "Scale"
+msgstr "縮放"
 
-#: ../panels/display/cc-display-panel.c:2456
-msgid "Secondary Display"
-msgstr "次要顯示器"
+#: ../panels/display/cc-display-panel.c:1260
+msgid "Adjust for TV"
+msgstr "調整為電視"
+
+#: ../panels/display/cc-display-panel.c:1472
+#: ../panels/display/cc-display-panel.c:1518
+msgid "Primary Display"
+msgstr "主要顯示器"
 
-#: ../panels/display/cc-display-panel.c:2457
-msgid "Join this display with another to create an extra workspace"
-msgstr "將本顯示器與另一個顯示器組合以建立額外的工作空間"
+#: ../panels/display/cc-display-panel.c:1567
+msgid "Display Arrangement"
+msgstr "排列顯示器組合方式"
 
-#: ../panels/display/cc-display-panel.c:2464
-msgid "Presentation"
-msgstr "展示"
+#: ../panels/display/cc-display-panel.c:1568
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
+msgstr "請拖曳顯示器位置以貼合您的配置。頂端列會放在主要顯示器中。"
 
-#: ../panels/display/cc-display-panel.c:2465
-msgid "Show slideshows and media only"
-msgstr "只顯示投影片與媒體"
+#: ../panels/display/cc-display-panel.c:2006
+msgid "Display Mode"
+msgstr "顯示器模式"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2470
+#: ../panels/display/cc-display-panel.c:2022
+msgid "Join Displays"
+msgstr "接合多臺顯示器"
+
+#: ../panels/display/cc-display-panel.c:2025
 msgid "Mirror"
 msgstr "相同"
 
-#: ../panels/display/cc-display-panel.c:2471
-msgid "Show your existing view on both displays"
-msgstr "兩臺顯示器上皆顯示您現在的檢視畫面"
+#: ../panels/display/cc-display-panel.c:2028
+msgid "Single Display"
+msgstr "單一顯示器"
 
-#: ../panels/display/cc-display-panel.c:2477
-msgid "Turn Off"
-msgstr "關閉"
+#: ../panels/display/cc-display-panel.c:2714
+msgid "Apply Changes?"
+msgstr "要套用變更嗎?"
 
-#: ../panels/display/cc-display-panel.c:2478
-msgid "Don’t use this display"
-msgstr "不使用這臺顯示器"
+#: ../panels/display/cc-display-panel.c:2728
+#: ../panels/network/connection-editor/connection-editor.ui.h:2
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Apply"
+msgstr "套用(_A)"
+
+#: ../panels/display/cc-display-panel.c:3104
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:2786
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/display/cc-display-panel.c:3320
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
 #: ../panels/privacy/cc-privacy-panel.c:190
 #: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/display/cc-display-panel.c:2826
-msgid "Could not get screen information"
-msgstr "無法取得螢幕資訊"
-
-#: ../panels/display/cc-display-panel.c:2857
-msgid "_Arrange Combined Displays"
-msgstr "排列顯示器組合方式(_A)"
+#: ../panels/display/cc-display-panel.c:3320 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+#: ../panels/universal-access/uap.ui.h:7
+msgid "Off"
+msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:2878
+#: ../panels/display/cc-display-panel.c:3341
 msgid "_Night Light"
 msgstr "夜光(_N)"
 
+#: ../panels/display/cc-display-panel.c:3406
+msgid "Could not get screen information"
+msgstr "無法取得螢幕資訊"
+
 #. This cancels the redshift inhibit.
 #: ../panels/display/display.ui.h:2
 msgid "Restart Filter"
@@ -1266,8 +1237,9 @@ msgid "Sunset to Sunrise"
 msgstr "日落到日出"
 
 #: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
 #: ../panels/network/network-wifi.ui.h:26
 #: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
@@ -1315,70 +1287,87 @@ msgstr ""
 "光;藍光;日出;日落;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:384 ../panels/network/panel-common.c:123
+#: ../panels/info/cc-info-overview-panel.c:381
+#: ../panels/info/cc-info-overview-panel.c:468
+#: ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "不明"
 
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture and the build id, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or
-#. * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)"
-#: ../panels/info/cc-info-panel.c:517
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: ../panels/info/cc-info-overview-panel.c:476
 #, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d 位元 (組建 ID:%s)"
+msgid "%s; Build ID: %s"
+msgstr "%s;組建 ID:%s"
 
-#: ../panels/info/cc-info-panel.c:519
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
 #, c-format
-msgid "%d-bit (Build ID: %s)"
-msgstr "%d 位元 (組建 ID:%s)"
+msgid "64-bit"
+msgstr "64位元"
 
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit"
-#: ../panels/info/cc-info-panel.c:527
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
 #, c-format
-msgid "%s %d-bit"
-msgstr "%s %d 位元"
+msgid "32-bit"
+msgstr "32位元"
 
-#: ../panels/info/cc-info-panel.c:529
+#: ../panels/info/cc-info-overview-panel.c:800
 #, c-format
-msgid "%d-bit"
-msgstr "%d 位元"
+msgid "Version %s"
+msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1175
+#: ../panels/info/cc-info-panel.c:138
+msgid "Section"
+msgstr "節"
+
+#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "概覽"
+
+#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "預設應用程式"
+
+#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "可移除式媒體"
+
+#: ../panels/info/cc-info-removable-media-panel.c:312
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1179
+#: ../panels/info/cc-info-removable-media-panel.c:316
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1183
+#: ../panels/info/cc-info-removable-media-panel.c:320
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1274
+#: ../panels/info/cc-info-removable-media-panel.c:411
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-removable-media-panel.c:444
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-removable-media-panel.c:445
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-removable-media-panel.c:446
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-removable-media-panel.c:447
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-removable-media-panel.c:448
 msgid "Select an application for software CDs"
 msgstr "選擇軟體 CD 要用的應用程式"
 
@@ -1387,85 +1376,80 @@ msgstr "選擇軟體 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1321
+#: ../panels/info/cc-info-removable-media-panel.c:460
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-removable-media-panel.c:461
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 碟片"
 
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-removable-media-panel.c:462
 msgid "blank CD disc"
 msgstr "空白 CD 碟片"
 
-#: ../panels/info/cc-info-panel.c:1324
+#: ../panels/info/cc-info-removable-media-panel.c:463
 msgid "blank DVD disc"
 msgstr "空白 DVD 碟片"
 
-#: ../panels/info/cc-info-panel.c:1325
+#: ../panels/info/cc-info-removable-media-panel.c:464
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 碟片"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-removable-media-panel.c:465
 msgid "Blu-ray video disc"
-msgstr "Blu-Ray 影片碟片"
+msgstr "Blu-ray 影片碟片"
 
-#: ../panels/info/cc-info-panel.c:1327
+#: ../panels/info/cc-info-removable-media-panel.c:466
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1328
+#: ../panels/info/cc-info-removable-media-panel.c:467
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片碟片"
 
-#: ../panels/info/cc-info-panel.c:1329
+#: ../panels/info/cc-info-removable-media-panel.c:468
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1330
+#: ../panels/info/cc-info-removable-media-panel.c:469
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1331
+#: ../panels/info/cc-info-removable-media-panel.c:470
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1332
+#: ../panels/info/cc-info-removable-media-panel.c:471
 msgid "Windows software"
 msgstr "Windows 軟體"
 
-#: ../panels/info/cc-info-panel.c:1455
-msgid "Section"
-msgstr "節"
-
-#: ../panels/info/cc-info-panel.c:1464 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "概覽"
-
-#: ../panels/info/cc-info-panel.c:1470 ../panels/info/info.ui.h:21
-msgid "Default Applications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
+msgid "Defa­ult Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1475 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "可移除式媒體"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+msgid "Configure Default Applications"
+msgstr "設定預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1500
-#, c-format
-msgid "Version %s"
-msgstr "版本 %s"
+#. Translators: those are keywords for the Default Applications panel
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+msgid "default;application;preferred;media;"
+msgstr "default;application;preferred;media;預設;應用程式;偏好;首選;媒體;"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "詳細資訊"
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
+msgid "Ab­out"
+msgstr "關於"
 
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 msgid "View information about your system"
 msgstr "檢視您系統的資訊"
 
 #. sure that you use the same "translation" for those keywords
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
@@ -1475,107 +1459,137 @@ msgstr ""
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;裝置;系統;資訊;"
 "記憶體;處理器;版本;預設;應用程式;首選;音訊;視訊;碟片;可移除;媒體;自動執行;"
 
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "選擇要如何處理其他媒體"
-
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "動作(_A):"
-
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "類型(_T):"
-
-#: ../panels/info/info.ui.h:4
-msgid "Device name"
-msgstr "裝置名稱"
-
-#: ../panels/info/info.ui.h:5
-msgid "Memory"
-msgstr "記憶體"
-
-#: ../panels/info/info.ui.h:6
-msgid "Processor"
-msgstr "處理器"
-
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "基礎系統"
-
-#: ../panels/info/info.ui.h:9
-msgid "Disk"
-msgstr "磁碟"
-
-#: ../panels/info/info.ui.h:10
-msgid "Calculating…"
-msgstr "正在計算…"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "De­tails"
+msgstr "詳細資訊"
 
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-msgstr "繪圖"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
+msgid "Remo­vable Media"
+msgstr "可移除式媒體"
 
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "虛擬化"
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+msgid "Configure Removable Media settings"
+msgstr "設定可移除式媒體設定值"
 
-#: ../panels/info/info.ui.h:13
-msgid "Check for updates"
-msgstr "檢查更新"
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;裝置;系統;預設;應用程式;偏好;首選;音訊;視訊;光碟;碟"
+"片;可移除;卸除式;媒體;自動執行;"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info-default-apps.ui.h:1
 msgid "_Web"
 msgstr "網頁(_W)"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info-default-apps.ui.h:2
 msgid "_Mail"
 msgstr "郵件(_M)"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info-default-apps.ui.h:3
 msgid "_Calendar"
 msgstr "日曆(_C)"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info-default-apps.ui.h:4
 msgid "M_usic"
 msgstr "音樂(_U)"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info-default-apps.ui.h:5
 msgid "_Video"
 msgstr "影片(_V)"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info-default-apps.ui.h:6
+#: ../panels/info/info-removable-media.ui.h:5
 msgid "_Photos"
 msgstr "相片(_P)"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-overview.ui.h:1
+msgid "Device name"
+msgstr "裝置名稱"
+
+#: ../panels/info/info-overview.ui.h:2
+msgid "Memory"
+msgstr "記憶體"
+
+#: ../panels/info/info-overview.ui.h:3
+msgid "Processor"
+msgstr "處理器"
+
+#: ../panels/info/info-overview.ui.h:4
+msgid "Graphics"
+msgstr "繪圖"
+
+#. To translators: this field contains the distro name and version
+#: ../panels/info/info-overview.ui.h:6
+msgid "OS name"
+msgstr "作業系統名稱"
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+msgid "OS type"
+msgstr "作業系統類型"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "虛擬化"
+
+#: ../panels/info/info-overview.ui.h:10
+msgid "Disk"
+msgstr "磁碟"
+
+#: ../panels/info/info-overview.ui.h:11
+msgid "Calculating…"
+msgstr "正在計算…"
+
+#: ../panels/info/info-overview.ui.h:12
+msgid "Check for updates"
+msgstr "檢查更新"
+
+#: ../panels/info/info-removable-media.ui.h:1
 msgid "Select how media should be handled"
 msgstr "選擇要如何處理媒體"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
 msgid "CD _audio"
 msgstr "CD 音樂(_A)"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info-removable-media.ui.h:3
 msgid "_DVD video"
 msgstr "_DVD 影片"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info-removable-media.ui.h:4
 msgid "_Music player"
 msgstr "音樂播放器(_M)"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
 msgid "_Software"
 msgstr "軟體(_S)"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
 msgid "_Other Media…"
 msgstr "其他(_O)…"
 
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info-removable-media.ui.h:8
 msgid "_Never prompt or start programs on media insertion"
 msgstr "插入媒體時永遠不提示或啟動程式(_N)"
 
+#: ../panels/info/info-removable-media.ui.h:9
+msgid "Select how other media should be handled"
+msgstr "選擇要如何處理其他媒體"
+
+#: ../panels/info/info-removable-media.ui.h:10
+msgid "_Action:"
+msgstr "動作(_A):"
+
+#: ../panels/info/info-removable-media.ui.h:11
+msgid "_Type:"
+msgstr "類型(_T):"
+
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "聲音與媒體"
@@ -1621,7 +1635,7 @@ msgid "Eject"
 msgstr "退出"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:12
 msgid "Typing"
 msgstr "輸入"
 
@@ -1641,8 +1655,8 @@ msgstr "執行器"
 msgid "Launch help browser"
 msgstr "執行說明文件瀏覽器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:277
-#: ../shell/alt/cc-window.c:830 ../shell/cc-window.c:1590
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
+#: ../shell/cc-window.c:251 ../shell/cc-window.c:794
 #: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "設定值"
@@ -1751,9 +1765,9 @@ msgstr "將文字縮小"
 msgid "High contrast on or off"
 msgstr "高對比開或關"
 
+#: ../panels/keyboard/cc-keyboard-manager.c:506
 #: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:522
-#: ../panels/keyboard/cc-keyboard-manager.c:830
+#: ../panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "自訂快捷鍵"
 
@@ -1764,10 +1778,11 @@ msgstr "自訂快捷鍵"
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/keyboard-shortcuts.c:435
 #: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/network-proxy.ui.h:4
 #: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/sound/gvc/gvc-mixer-control.c:1866
 #: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "已停用"
@@ -1803,7 +1818,7 @@ msgid ""
 msgstr "重設快捷鍵可能會影響您自訂的快捷鍵。這個動作不能撤銷。"
 
 #: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/keyboard/shortcut-editor.ui.h:9
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 msgid "Cancel"
@@ -1817,28 +1832,28 @@ msgstr "全部重設"
 msgid "Reset the shortcut to its default value"
 msgstr "將快捷鍵重設回預設值"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:433
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
 msgstr "%s 已經被 <b>%s</b> 使用。若您希望替換,則 %s 會被停用"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Custom Shortcut"
 msgstr "設定自訂快捷鍵"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Shortcut"
 msgstr "設定快捷鍵"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:608
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "請輸入新的快捷鍵來更改 <b>%s</b>。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1036
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
 msgid "Add Custom Shortcut"
 msgstr "加入自訂快捷鍵"
 
@@ -1853,8 +1868,12 @@ msgstr "檢視與變更鍵盤快捷鍵並設定您的輸入偏好設定"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Shortcut;Repeat;Blink;快捷鍵;重複;閃爍;"
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;捷徑"
+"鍵;快捷鍵;工作區;視窗;重新調整大小;縮放;拉遠;拉近;遠近;輸入;來源;輸入法;鎖定;"
+"上鎖;音量;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
 #: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
@@ -1878,8 +1897,8 @@ msgid "Try a different search"
 msgstr "嘗試不同的搜尋內容"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "按下 Esc 鍵取消。"
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgstr "按下 Esc 取消或按 Backspace 重設鍵盤快捷鍵。"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:3
 #: ../panels/printers/details-dialog.ui.h:1
@@ -1906,16 +1925,14 @@ msgid "None"
 msgstr "沒有"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:8
-msgid "Remove"
-msgstr "移除"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:9
 msgid "Enter the new shortcut"
 msgstr "輸入新的快捷鍵"
 
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Remove"
+msgstr "移除"
+
 #: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
 msgid "Add"
 msgstr "加入"
 
@@ -2042,13 +2059,8 @@ msgstr "雙擊,次要按鈕"
 msgid "Single click, secondary button"
 msgstr "單擊,次要按鈕"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:349
-msgid "Air_plane Mode"
-msgstr "飛安模式(_P)"
-
-#: ../panels/network/cc-network-panel.c:953
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:581
 msgid "Network proxy"
 msgstr "網路代理伺服器"
 
@@ -2056,51 +2068,58 @@ msgstr "網路代理伺服器"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: ../panels/network/cc-network-panel.c:717 ../panels/network/net-vpn.c:192
+#: ../panels/network/net-vpn.c:321
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1194
+#: ../panels/network/cc-network-panel.c:781 ../panels/network/wifi.ui.h:7
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "噢,有問題發生。請聯繫您的軟體供應商。"
 
-#: ../panels/network/cc-network-panel.c:1200
+#: ../panels/network/cc-network-panel.c:787
 msgid "NetworkManager needs to be running."
 msgstr "需要先執行 NetworkManager。"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/cc-wifi-panel.c:209
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
+#: ../panels/network/network-wifi.ui.h:58
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:1
 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:3
+#: ../panels/network/connection-editor/security-page.ui.h:2
 #: ../panels/wacom/wacom-stylus-page.ui.h:8
 msgid "page 1"
 msgstr "頁 1"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 msgid "Anony_mous identity"
 msgstr "匿名識別(_M)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:4
 msgid "Inner _authentication"
 msgstr "內部核對(_A)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
+#: ../panels/network/connection-editor/security-page.ui.h:5
 #: ../panels/wacom/wacom-stylus-page.ui.h:16
 msgid "page 2"
 msgstr "頁 2"
 
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
+#: ../panels/network/connection-editor/ce-page-security.c:445
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
@@ -2116,220 +2135,162 @@ msgid "Profile %d"
 msgstr "設定檔 %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:214
-#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/net-device-wifi.c:407
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:395
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:412
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:222
+#: ../panels/network/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:239
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
 msgid "Enterprise"
 msgstr "企業版"
 
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:232
-#: ../panels/network/net-device-wifi.c:380
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:249
+#: ../panels/network/net-device-wifi.c:397
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/network/connection-editor/ce-page-details.c:95
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "永不"
 
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:110
 #: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/net-device-wifi.c:505
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天以前"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/connection-editor/ce-page-details.c:176
 #: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:542
+#: ../panels/network/net-device-wifi.c:561
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:590
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:592
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:594
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:596
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:598
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:269
+#: ../panels/network/connection-editor/ce-page-details.c:248
+msgid "Forget Connection"
+msgstr "忘記連線"
+
+#: ../panels/network/connection-editor/ce-page-details.c:250
+msgid "Remove Connection Profile"
+msgstr "移除連線個人檔案"
+
+#: ../panels/network/connection-editor/ce-page-details.c:252
+msgid "Remove VPN"
+msgstr "移除 VPN"
+
+#: ../panels/network/connection-editor/ce-page-details.c:280
+#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
 #: ../shell/panel-list.ui.h:2
 msgid "Details"
 msgstr "詳細資料"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:215
-#: ../panels/network/connection-editor/ce-page-vpn.c:221
-#: ../panels/network/connection-editor/ce-page-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-ethernet.c:173
+#: ../panels/network/connection-editor/ce-page-vpn.c:188
+#: ../panels/network/connection-editor/ce-page-wifi.c:194
 #: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "身分"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-#: ../panels/printers/details-dialog.ui.h:3
-msgid "Address"
-msgstr "地址"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
-msgid "Netmask"
-msgstr "網路遮罩"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "通訊閘"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: ../panels/network/connection-editor/ce-page-ip4.c:251
+#: ../panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "刪除位址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "伺服器"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
-msgid "Delete DNS Server"
-msgstr "刪除 DNS 伺服器"
-
-#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "公制"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: ../panels/network/connection-editor/ce-page-ip4.c:422
+#: ../panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "刪除路由"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "自動 (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "只有本機連線"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:980
+#: ../panels/network/connection-editor/ce-page-ip4.c:896
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
-msgid "Prefix"
-msgstr "前綴"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "自動"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "自動,僅使用 DHCP"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
+#: ../panels/network/connection-editor/ce-page-ip6.c:827
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-msgid "Reset"
-msgstr "重設"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: ../panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/connection-editor/ce-page-security.c:271
+#: ../panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元金鑰 (Hex 或 ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:281
+#: ../panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元密語"
 
-#: ../panels/network/connection-editor/ce-page-security.c:294
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: ../panels/network/connection-editor/ce-page-security.c:291
+#: ../panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: ../panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:321
+#: ../panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 和 WPA2 個人版"
 
-#: ../panels/network/connection-editor/ce-page-security.c:335
+#: ../panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 和 WPA2 企業版"
 
@@ -2345,7 +2306,6 @@ msgstr "連線速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
 #: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
@@ -2354,14 +2314,12 @@ msgstr "IPv4 位址"
 #: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
 #: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "硬體位址"
@@ -2369,17 +2327,15 @@ msgstr "硬體位址"
 #: ../panels/network/connection-editor/details-page.ui.h:7
 #: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Default Route"
 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/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
 #: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
 msgid "DNS"
 msgstr "DNS"
@@ -2388,6 +2344,23 @@ msgstr "DNS"
 msgid "Last Used"
 msgstr "最後使用的"
 
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "自動連線(_A)"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "允許其他使用者使用(_O)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "自動"
+
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "雙絞線 (TP)"
@@ -2444,113 +2417,111 @@ msgstr "複製的 MA_C 位址"
 msgid "bytes"
 msgstr "位元組"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "允許其他使用者使用(_U)"
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+msgid "IPv_4 Method"
+msgstr "IPv_4 方法"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "自動連線(_A)"
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "自動 (DHCP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "防火牆界域(_Z)"
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "只有本機連線"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-#: ../panels/network/connection-editor/firewall-helpers.c:118
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "預設"
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+msgid "Disable"
+msgstr "停用"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "界域定義了連線的信任等級"
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Addresses"
+msgstr "位址"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/printers/details-dialog.ui.h:3
+msgid "Address"
+msgstr "地址"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "位址(_A)"
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+msgid "Netmask"
+msgstr "網路遮罩"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "通訊閘"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
 msgid "Automatic DNS"
 msgstr "自動 DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:13
+#: ../panels/network/connection-editor/ip6-page.ui.h:13
+msgid "Separate IP addresses with commas"
+msgstr "請以分號 (;) 分隔 IP 地址"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:14
+#: ../panels/network/connection-editor/ip6-page.ui.h:14
 #: ../panels/network/network-wifi.ui.h:32
 msgid "Routes"
 msgstr "路由"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:15
+#: ../panels/network/connection-editor/ip6-page.ui.h:15
 msgid "Automatic Routes"
 msgstr "自動路由"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ip4-page.ui.h:17
+#: ../panels/network/connection-editor/ip6-page.ui.h:17
+msgid "Metric"
+msgstr "度量權值"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:18
+#: ../panels/network/connection-editor/ip6-page.ui.h:18
 #: ../panels/network/network-wifi.ui.h:34
 msgid "Use this connection _only for resources on its network"
 msgstr "只在使用這個連線的網路資源時才使用此連線(_U)"
 
 #: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv_6"
+msgid "IPv_6 Method"
+msgstr "IPv_6 方法"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "自動,僅使用 DHCP"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "前綴"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "無法開啟連線編輯器"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: ../panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "新增設定檔"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: ../panels/network/connection-editor/net-connection-editor.c:603
+#: ../panels/network/network.ui.h:2
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: ../panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: ../panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "加入 VPN"
 
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "重設(_R)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1536
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "遺忘(_F)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr "重設這個網路的設定值,包含密碼,但將它記住為偏好的網路"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr "移除這個網路的相關詳細資料並且不再嘗試自動連線"
-
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
@@ -2577,9 +2548,9 @@ msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/pp-details-dialog.c:322
+#: ../panels/printers/pp-details-dialog.c:320
 #: ../panels/sharing/cc-sharing-panel.c:376
-#: ../panels/user-accounts/um-photo-dialog.c:219
+#: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -2616,7 +2587,7 @@ msgstr ""
 msgid "Export VPN connection"
 msgstr "匯出 VPN 連線"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(錯誤:無法載入 VPN 連線編輯器)"
 
@@ -2635,10 +2606,6 @@ msgstr "_BSSID"
 msgid "My Home Network"
 msgstr "我的家用網路"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "允許其他使用者使用(_O)"
-
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Net­work"
@@ -2657,18 +2624,28 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;網路;無線網路;區域網路;代理伺服器;寬頻;數據機;藍牙;"
 
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "控制您如何連線至 Wi-Fi 網絡"
+
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;網路;無線網路;區域網路;寬頻;"
+
 #: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-wifi.c:491
 msgid "never"
 msgstr "永不"
 
 #: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:481
+#: ../panels/network/net-device-wifi.c:501
 msgid "today"
 msgstr "今日"
 
 #: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:483
+#: ../panels/network/net-device-wifi.c:503
 msgid "yesterday"
 msgstr "昨日"
 
@@ -2688,84 +2665,89 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:280
+#: ../panels/network/net-device-ethernet.c:275
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1694
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1792
+#: ../panels/network/network-ethernet.ui.h:2
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
 msgid "Options…"
 msgstr "選項…"
 
-#: ../panels/network/net-device-mobile.c:223
+#: ../panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: ../panels/network/net-device-wifi.c:1205
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"如果您有無線網路以外的方式連線到網際網路,您可以使用它來與其他人分享您的網際"
-"網路連線。"
-
-#: ../panels/network/net-device-wifi.c:1209
+#: ../panels/network/net-device-wifi.c:1275
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "切換無線網路熱點會讓您從 <b>%s</b> 斷線。"
 
-#: ../panels/network/net-device-wifi.c:1213
+#: ../panels/network/net-device-wifi.c:1279
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。"
 
-#: ../panels/network/net-device-wifi.c:1296
+#: ../panels/network/net-device-wifi.c:1286
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "開啟 Wi-Fi 熱點?"
+
+#: ../panels/network/net-device-wifi.c:1308
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr "Wi-Fi 熱點常用於透過 Wi-Fi 分享額外網際網路連線。"
+
+#: ../panels/network/net-device-wifi.c:1319
+msgid "_Turn On"
+msgstr "開啟(_T)"
+
+#: ../panels/network/net-device-wifi.c:1396
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1299
+#: ../panels/network/net-device-wifi.c:1399
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1397
+#: ../panels/network/net-device-wifi.c:1496
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: ../panels/network/net-device-wifi.c:1400
+#: ../panels/network/net-device-wifi.c:1499
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: ../panels/network/net-device-wifi.c:1532
+#: ../panels/network/net-device-wifi.c:1630
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網路的詳細資料包含密碼及任何自訂的設定都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1842
-msgid "History"
-msgstr "歷史紀錄"
+#: ../panels/network/net-device-wifi.c:1634
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "遺忘(_F)"
 
-#: ../panels/network/net-device-wifi.c:1846
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:505
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "關閉(_C)"
+#: ../panels/network/net-device-wifi.c:1943
+#: ../panels/network/net-device-wifi.c:1950
+msgid "Known Wi-Fi Networks"
+msgstr "已知 Wi-Fi 網路"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1854
+#: ../panels/network/net-device-wifi.c:1983
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
+#: ../panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "當沒有提供設定 URL 時會使用網頁代理伺服器自動發現。"
@@ -2774,18 +2756,10 @@ msgstr "當沒有提供設定 URL 時會使用網頁代理伺服器自動發現
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:75
+#: ../panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "這不建議用於不信任的公用網路。"
 
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "代理伺服器"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "加入設定檔(_A)…"
-
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -2799,95 +2773,64 @@ msgid "Network"
 msgstr "網路"
 
 #: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "沒有"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "手動"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "自動"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "方法(_M)"
+msgid "Network Proxy"
+msgstr "網路代理伺服器"
 
 #: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "設定網址(_C)"
-
-#: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
 msgstr "_HTTP 代理伺服器"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS 代理伺服器"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
 msgid "_FTP Proxy"
 msgstr "_FTP 代理伺服器"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
 msgid "_Socks Host"
 msgstr "Socks 主機(_S)"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
 msgid "_Ignore Hosts"
 msgstr "忽略主機(_I)"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
 msgid "HTTP proxy port"
 msgstr "HTTP 代理伺服器連接埠"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
 msgid "HTTPS proxy port"
 msgstr "HTTPS 代理伺服器連接埠"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
 msgid "FTP proxy port"
 msgstr "FTP 代理伺服器連接埠"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
 msgid "Socks proxy port"
 msgstr "Socks 代理伺服器通訊埠"
 
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "設定網址(_C)"
+
+#: ../panels/network/network-simple.ui.h:2
 msgid "Turn device off"
 msgstr "關閉裝置"
 
+#. Translators: The found device is a printer connected via Bluetooth
 #: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "加入裝置"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "藍牙"
 
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "移除裝置"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr "尚未設置"
 
 #: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "VPN 類型"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "群組名稱"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "群組密碼"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
-msgid "Username"
-msgstr "使用者名稱"
-
-#: ../panels/network/network-vpn.ui.h:6
 msgid "Turn VPN connection off"
 msgstr "關閉 VPN 連線"
 
@@ -2922,6 +2865,14 @@ msgstr "允許其他使用者使用"
 msgid "identity"
 msgstr "身分"
 
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "位址(_A)"
+
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "只用自動 (DHCP) 位址"
@@ -2942,6 +2893,10 @@ msgstr "忽略自動獲得的路由(_I)"
 msgid "ipv4"
 msgstr "ipv4"
 
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv_6"
+
 #: ../panels/network/network-wifi.ui.h:37
 msgid "ipv6"
 msgstr "ipv6"
@@ -2954,6 +2909,10 @@ msgstr "複製的 MA_C 位址"
 msgid "hardware"
 msgstr "硬體"
 
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "重設(_R)"
+
 #: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
@@ -2984,52 +2943,68 @@ msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi 熱點"
 
 #: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "開啟(_T)"
-
-#: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "關閉 Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "做為熱點(_U)…"
-
-#: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "連接到隱藏的網路(_C)…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "歷史紀錄(_H)"
-
-#: ../panels/network/network-wifi.ui.h:59
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "關閉連線到 Wi-Fi 網路"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:54
 msgid "Network Name"
 msgstr "網路名稱"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: ../panels/network/network-wifi.ui.h:55
 msgid "Connected Devices"
 msgstr "已連線的裝置"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:56
 msgid "Security type"
 msgstr "安全性類型"
 
-#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/network/network-wifi.ui.h:57
 #: ../panels/printers/authentication-dialog.ui.h:5
 #: ../panels/printers/new-printer-dialog.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "Password"
 msgstr "密碼"
 
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Turn Wi-Fi off"
+msgstr "關閉 Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:60
+msgid "_Connect to Hidden Network…"
+msgstr "連接到隱藏的網路(_C)…"
+
+#: ../panels/network/network-wifi.ui.h:61
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "開啟 Wi-Fi 熱點(_T)…"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "_Known Wi-Fi Networks"
+msgstr "已知 Wi-Fi 網路(_K)"
+
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "請確認您的 Wi-Fi 網卡已插入並啟動"
+
+#: ../panels/network/wifi.ui.h:2
+msgid "No Wi-Fi Adapter Found"
+msgstr "找不到 Wi-Fi 網卡"
+
+#: ../panels/network/wifi.ui.h:3
+msgid "Airplane Mode"
+msgstr "飛安模式"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "停用 Wi-Fi、藍牙和行動寬頻"
+
+#: ../panels/network/wifi.ui.h:5
+msgid "Visible Networks"
+msgstr "可見網路"
+
+#: ../panels/network/wifi.ui.h:6
+msgid "NetworkManager needs to be running"
+msgstr "需要先執行 NetworkManager"
+
 #. TRANSLATORS: AP type
 #: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
@@ -3311,23 +3286,23 @@ msgstr "缺少韌體"
 msgid "Cable unplugged"
 msgstr "纜線已拔除"
 
-#: ../panels/network/wireless-security/eap-method.c:69
-msgid "undefined error in 802.1x security (wpa-eap)"
-msgstr "802.1x 加密的未定義錯誤 (wpa-eap)"
+#: ../panels/network/wireless-security/eap-method.c:57
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "802.1X 安全加密的未定義錯誤 (wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:245
+#: ../panels/network/wireless-security/eap-method.c:233
 msgid "no file selected"
 msgstr "未選取檔案"
 
-#: ../panels/network/wireless-security/eap-method.c:276
+#: ../panels/network/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "驗證 eap-method 檔案時未指定的錯誤"
 
-#: ../panels/network/wireless-security/eap-method.c:480
+#: ../panels/network/wireless-security/eap-method.c:439
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, 或 PKCS#12 私密金鑰 (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:483
+#: ../panels/network/wireless-security/eap-method.c:442
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
 
@@ -3337,13 +3312,13 @@ msgstr "缺少 EAP-FAST PAC 檔案"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:268
 #: ../panels/network/wireless-security/eap-method-peap.c:302
-#: ../panels/network/wireless-security/eap-method-ttls.c:333
+#: ../panels/network/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:283
 #: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:288
+#: ../panels/network/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
@@ -3356,37 +3331,28 @@ msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:1
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/authentication-dialog.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Authenticated"
 msgstr "已核對"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Both"
 msgstr "兩者"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 msgid "PAC _file"
 msgstr "PAC 檔案(_F)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
 msgid "_Inner authentication"
 msgstr "內部核對(_I)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
@@ -3423,38 +3389,38 @@ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "無效的 EAP-PEAP CA 憑證:沒有指定憑證"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:318
-#: ../panels/network/wireless-security/wireless-security.c:439
+#: ../panels/network/wireless-security/eap-method-ttls.c:336
+#: ../panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:381
 #: ../panels/network/wireless-security/eap-method-tls.c:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:412
+#: ../panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "選擇憑證授權單位 (CA) 憑證"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "版本 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 msgid "C_A certificate"
 msgstr "憑證(_A)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 憑證(_R)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)"
 
@@ -3495,20 +3461,20 @@ msgstr "無效的 EAP-TLS 使用者憑證:%s"
 
 #: ../panels/network/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
-msgstr "未加密的私密金鑰是不安全的"
+msgstr "未加密的私密金鑰不安全"
 
 #: ../panels/network/wireless-security/eap-method-tls.c:319
 msgid ""
-"The selected private key does not appear to be protected by a password.  "
-"This could allow your security credentials to be compromised.  Please select "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"所選擇的私密金鑰似乎沒有密碼保護。 這可能會導致不安全的後果。請選擇用密碼保護"
-"的私密金鑰。\n"
+"所選的私密金鑰似乎沒有受密碼保護。 這可能導致您的安全憑證受到威脅。請選擇受密"
+"碼保護的私密金鑰。\n"
 "\n"
-"(您可以使用 openssl 來加密您的私密金鑰)"
+"(您可以使用 openssl 來加密您的私密金鑰)"
 
 #: ../panels/network/wireless-security/eap-method-tls.c:495
 msgid "Choose your personal certificate"
@@ -3543,45 +3509,50 @@ msgstr "無效的 EAP-TTLS CA 憑證:%s"
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "無效的 EAP-TTLS CA 憑證:沒有指定憑證"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:258
+#: ../panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:273
+#: ../panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:303
+#: ../panels/network/wireless-security/eap-method-ttls.c:305
+#| msgid "MSCHAPv2"
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2 (無 EAP)"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../panels/network/wireless-security/wireless-security.c:87
-msgid "Unknown error validating 802.1x security"
-msgstr "驗證 802.1x 加密的未知錯誤"
+msgid "Unknown error validating 802.1X security"
+msgstr "驗證 802.1X 安全加密的未知錯誤"
 
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: ../panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: ../panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: ../panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: ../panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: ../panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
 msgid "Au_thentication"
 msgstr "核對(_T)"
 
@@ -3630,34 +3601,22 @@ msgid "1 (Default)"
 msgstr "1 (預設值)"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Open System"
 msgstr "開放系統"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
 msgid "Shared Key"
 msgstr "共享金鑰"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key"
 msgstr "金鑰(_K)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
 msgid "Sho_w key"
 msgstr "顯示金鑰(_W)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
@@ -3750,19 +3709,19 @@ msgstr "其他"
 
 #. translators: This is the title of the "Show Account" dialog. The
 #. * %s is the name of the provider. e.g., 'Google'.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:580
+#: ../panels/online-accounts/cc-online-accounts-panel.c:603
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:872
+#: ../panels/online-accounts/cc-online-accounts-panel.c:895
 msgid "Error removing account"
 msgstr "移除帳號時發生錯誤"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: ../panels/online-accounts/cc-online-accounts-panel.c:937
+#: ../panels/online-accounts/cc-online-accounts-panel.c:960
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> 已移除"
@@ -3786,7 +3745,9 @@ msgstr ""
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;臉書;推特;雅虎奇摩;網頁;線上;聊天;"
 "行事曆;郵件;連絡人;"
 
+#. Translators: This is the button which allows undoing the removal of the printer.
 #: ../panels/online-accounts/online-accounts.ui.h:1
+#: ../panels/printers/printers.ui.h:4
 msgid "Undo"
 msgstr "復原"
 
@@ -3929,7 +3890,7 @@ msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
 #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2366
+#: ../panels/power/cc-power-panel.c:2356
 msgid "Battery"
 msgstr "電池"
 
@@ -3981,84 +3942,88 @@ msgstr "閒置時(_I)"
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1716
+#: ../panels/power/cc-power-panel.c:1712
 msgid "_Screen brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1735
+#: ../panels/power/cc-power-panel.c:1731
 msgid "Automatic brightness"
 msgstr "自動亮度"
 
-#: ../panels/power/cc-power-panel.c:1755
+#: ../panels/power/cc-power-panel.c:1751
 msgid "_Keyboard brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1765
+#: ../panels/power/cc-power-panel.c:1761
 msgid "_Dim screen when inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1790
+#: ../panels/power/cc-power-panel.c:1786
 msgid "_Blank screen"
 msgstr "螢幕轉黑(_B)"
 
-#: ../panels/power/cc-power-panel.c:1827
+#: ../panels/power/cc-power-panel.c:1823
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1832
+#: ../panels/power/cc-power-panel.c:1828
 msgid "Turn off Wi-Fi to save power."
 msgstr "關閉 Wi-Fi 以節省電源。"
 
-#: ../panels/power/cc-power-panel.c:1857
+#: ../panels/power/cc-power-panel.c:1853
 msgid "_Mobile broadband"
 msgstr "行動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1862
+#: ../panels/power/cc-power-panel.c:1858
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr "關閉行動寬頻 (3G、4G、LTE 等等) 以節省電源。"
 
-#: ../panels/power/cc-power-panel.c:1907
+#: ../panels/power/cc-power-panel.c:1903
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1970
+#: ../panels/power/cc-power-panel.c:1966
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1972
+#: ../panels/power/cc-power-panel.c:1968
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:2067
+#: ../panels/power/cc-power-panel.c:2063
 msgid "Suspend"
 msgstr "暫停"
 
-#: ../panels/power/cc-power-panel.c:2068
+#: ../panels/power/cc-power-panel.c:2064
+msgid "Power Off"
+msgstr "關閉電源"
+
+#: ../panels/power/cc-power-panel.c:2065
 msgid "Hibernate"
 msgstr "休眠"
 
-#: ../panels/power/cc-power-panel.c:2069
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Nothing"
 msgstr "沒有"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2183
+#: ../panels/power/cc-power-panel.c:2180
 msgid "Suspend & Power Button"
 msgstr "暫停和電源按鈕"
 
-#: ../panels/power/cc-power-panel.c:2226
+#: ../panels/power/cc-power-panel.c:2219
 msgid "_Automatic suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:2227
+#: ../panels/power/cc-power-panel.c:2220
 msgid "Automatic suspend"
 msgstr "自動暫停"
 
-#: ../panels/power/cc-power-panel.c:2294
+#: ../panels/power/cc-power-panel.c:2287
 msgid "_When the Power Button is pressed"
 msgstr "當按下電源按鈕(_W)"
 
-#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:273
+#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
 #: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "裝置"
@@ -4148,32 +4113,47 @@ msgstr "插入插頭(_P)"
 msgid "On _Battery Power"
 msgstr "使用電池電源(_B)"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
 msgid "Delay"
 msgstr "延遲"
 
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
 msgstr "核對"
 
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+msgstr "使用者名稱"
+
 #: ../panels/printers/authentication-dialog.ui.h:6
 #: ../panels/printers/new-printer-dialog.ui.h:11
 msgid "Authentication Required"
 msgstr "要求核對"
 
+#. Translators: %s is the printer name
+#: ../panels/printers/cc-printers-panel.c:718
+#, c-format
+msgid "Printer “%s” has been deleted"
+msgstr "「%s」印表機已刪除"
+
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Failed to add new printer."
 msgstr "無法加入新的印表機。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:846
+#: ../panels/printers/cc-printers-panel.c:1221
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
 
 #: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:6
+#: ../panels/printers/printer-entry.ui.h:8
 msgid "Location"
 msgstr "位置"
 
@@ -4249,26 +4229,29 @@ msgstr "輸入網路位址或搜尋印表機"
 msgid "Enter username and password to view printers on Print Server."
 msgstr "輸入使用者名稱與密碼以檢視在印表機伺服器上的印表機。"
 
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "正在載入選項…"
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/printers/pp-options-dialog.c:893
+msgid "Test Page"
+msgstr "測試頁"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
 #: ../panels/printers/pp-details-dialog.c:123
-#: ../panels/printers/pp-details-dialog.c:416
+#: ../panels/printers/pp-details-dialog.c:415
 #, c-format
 msgid "%s Details"
 msgstr "%s 詳細資料"
 
-#: ../panels/printers/pp-details-dialog.c:174
+#: ../panels/printers/pp-details-dialog.c:172
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/pp-details-dialog.c:318
+#: ../panels/printers/pp-details-dialog.c:316
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/pp-details-dialog.c:327
+#: ../panels/printers/pp-details-dialog.c:325
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4336,49 +4319,49 @@ msgid "Reverse portrait"
 msgstr "直向倒轉"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:103
+#: ../panels/printers/pp-jobs-dialog.c:104
 msgctxt "print job"
 msgid "Pending"
 msgstr "保留中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:107
+#: ../panels/printers/pp-jobs-dialog.c:108
 msgctxt "print job"
 msgid "Paused"
 msgstr "暫停"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:111
+#: ../panels/printers/pp-jobs-dialog.c:112
 msgctxt "print job"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:115
+#: ../panels/printers/pp-jobs-dialog.c:116
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:119
+#: ../panels/printers/pp-jobs-dialog.c:120
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:123
+#: ../panels/printers/pp-jobs-dialog.c:124
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已放棄"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:127
+#: ../panels/printers/pp-jobs-dialog.c:128
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: ../panels/printers/pp-jobs-dialog.c:289
+#: ../panels/printers/pp-jobs-dialog.c:310
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
@@ -4419,11 +4402,6 @@ msgstr "序列埠"
 msgid "Parallel Port"
 msgstr "串列埠"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "藍牙"
-
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
 #: ../panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
@@ -4441,89 +4419,89 @@ msgstr "位址:%s"
 msgid "Server requires authentication"
 msgstr "伺服器需要核對身份"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "雙面"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "紙張類型"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "紙張來源"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "出紙匣"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 前置過濾器"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: ../panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "每張紙的頁數"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:545
+#: ../panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "雙面"
 
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
-msgid "Orientation"
-msgstr "方向"
-
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../panels/printers/pp-options-dialog.c:655
 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:657
+#: ../panels/printers/pp-options-dialog.c:658
 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:660
+#: ../panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "可安裝選項"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:663
+#: ../panels/printers/pp-options-dialog.c:664
 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:666
+#: ../panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "影像品質"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:669
+#: ../panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "顏色"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:672
+#: ../panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "完成"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:675
+#: ../panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "進階"
 
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "測試頁"
+
 #. Translators: this is an option of "Paper Source"
 #: ../panels/printers/pp-ppd-option-widget.c:76
 #: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4566,121 +4544,126 @@ msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:368
+#: ../panels/printers/pp-printer-entry.c:577
 msgid "No Active Jobs"
 msgstr "沒有進行中的工作"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:373
+#: ../panels/printers/pp-printer-entry.c:582
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u 個工作"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:470
+#: ../panels/printers/pp-printer-entry.c:730
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:472
+#: ../panels/printers/pp-printer-entry.c:732
 msgid "Out of toner"
 msgstr "碳粉用完"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:475
+#: ../panels/printers/pp-printer-entry.c:735
 msgid "Low on developer"
 msgstr "顯像劑不足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/pp-printer-entry.c:478
+#: ../panels/printers/pp-printer-entry.c:738
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:480
+#: ../panels/printers/pp-printer-entry.c:740
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:482
+#: ../panels/printers/pp-printer-entry.c:742
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:484
+#: ../panels/printers/pp-printer-entry.c:744
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:486
+#: ../panels/printers/pp-printer-entry.c:746
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:488
+#: ../panels/printers/pp-printer-entry.c:748
 msgid "Low on paper"
 msgstr "紙張不足。"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:490
+#: ../panels/printers/pp-printer-entry.c:750
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:492
+#: ../panels/printers/pp-printer-entry.c:752
 msgctxt "printer state"
 msgid "Offline"
 msgstr "離線"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/pp-printer-entry.c:494
-#: ../panels/printers/pp-printer-entry.c:624
+#: ../panels/printers/pp-printer-entry.c:754
+#: ../panels/printers/pp-printer-entry.c:884
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:496
+#: ../panels/printers/pp-printer-entry.c:756
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:498
+#: ../panels/printers/pp-printer-entry.c:758
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:500
+#: ../panels/printers/pp-printer-entry.c:760
 msgid "The optical photo conductor is near end of life"
 msgstr "感光鼓接近使用壽命"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:502
+#: ../panels/printers/pp-printer-entry.c:762
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓已無法使用"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/pp-printer-entry.c:610
+#: ../panels/printers/pp-printer-entry.c:870
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備就緒"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/pp-printer-entry.c:615
+#: ../panels/printers/pp-printer-entry.c:875
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "不接受工作"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:620
+#: ../panels/printers/pp-printer-entry.c:880
 msgctxt "printer state"
 msgid "Processing"
 msgstr "處理中"
 
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:904
+msgid "Clean print heads"
+msgstr "清理列印噴頭"
+
 #: ../panels/printers/printer-entry.ui.h:1
 msgid "Printing Options"
 msgstr "印表機選項"
@@ -4693,25 +4676,30 @@ msgstr "印表機詳細資料"
 msgid "Use Printer by Default"
 msgstr "使用預設印表機"
 
-#: ../panels/printers/printer-entry.ui.h:4
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:5
+msgid "Clean Print Heads"
+msgstr "清理列印噴頭"
+
+#: ../panels/printers/printer-entry.ui.h:6
 msgid "Remove Printer"
 msgstr "移除印表機"
 
-#: ../panels/printers/printer-entry.ui.h:5
+#: ../panels/printers/printer-entry.ui.h:7
 msgid "Model"
 msgstr "型號"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: ../panels/printers/printer-entry.ui.h:9
 msgid "Ink Level"
 msgstr "墨水等級"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:9
+#: ../panels/printers/printer-entry.ui.h:11
 msgid "Please restart when the problem is resolved."
 msgstr "請當問題得到解決,請重新啟動。"
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:11
+#: ../panels/printers/printer-entry.ui.h:13
 msgid "Restart"
 msgstr "重新啟動"
 
@@ -4720,17 +4708,17 @@ msgstr "重新啟動"
 msgid "Add…"
 msgstr "加入…"
 
-#: ../panels/printers/printers.ui.h:3
+#: ../panels/printers/printers.ui.h:5
 msgid "No printers"
 msgstr "沒有印表機"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:5
+#: ../panels/printers/printers.ui.h:7
 msgid "Add a Printer…"
 msgstr "加入印表機…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:7
+#: ../panels/printers/printers.ui.h:9
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -4976,17 +4964,17 @@ msgstr "位置服務(_L)"
 msgid "_Automatic Problem Reporting"
 msgstr "自動回報問題(_A)"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../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:287
+#: ../panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "找不到區域"
 
@@ -4994,16 +4982,16 @@ msgstr "找不到區域"
 msgid "No input sources found"
 msgstr "找不到輸入來源"
 
-#: ../panels/region/cc-input-chooser.c:992
+#: ../panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/region/cc-region-panel.c:866
+#: ../panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "尚未選擇輸入來源"
 
-#: ../panels/region/cc-region-panel.c:1757
+#: ../panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "登入畫面(_S)"
 
@@ -5024,14 +5012,18 @@ msgid "Times"
 msgstr "時刻"
 
 #: ../panels/region/format-chooser.ui.h:7
+msgid "Dates & Times"
+msgstr "日期與時刻"
+
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Numbers"
 msgstr "數字"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Measurement"
 msgstr "度量衡"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
 msgid "Paper"
 msgstr "紙張"
 
@@ -5099,24 +5091,22 @@ msgid "Left+Right Alt"
 msgstr "左+右 Alt"
 
 #: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "您的作業階段需要重新啟動以讓變更生效"
-
-#: ../panels/region/region.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Restart Now"
-msgstr "立刻重新啟動"
-
-#: ../panels/region/region.ui.h:3
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "語言(_L)"
 
-#: ../panels/region/region.ui.h:4
+#: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
 msgstr "英文 (英國)"
 
+#: ../panels/region/region.ui.h:3
+msgid "Restart the session for changes to take effect"
+msgstr "須要重新啟動作業階段才能讓變更生效"
+
+#: ../panels/region/region.ui.h:4
+msgid "Restart…"
+msgstr "重新啟動…"
+
 #: ../panels/region/region.ui.h:5
 msgid "_Formats"
 msgstr "格式(_F)"
@@ -5161,15 +5151,15 @@ msgstr "顯示輸入來源鍵盤配置"
 msgid "Login settings are used by all users when logging into the system"
 msgstr "登入設定值是所有的使用者在登入系統時會用到的"
 
-#: ../panels/search/cc-search-locations-dialog.c:634
+#: ../panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "選擇位置"
 
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: ../panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "找不到應用程式"
 
@@ -5483,11 +5473,11 @@ msgstr "未經放大"
 #: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249
 #: ../panels/sound/gvc-mixer-dialog.c:515
 msgid "_Profile:"
-msgstr "設定檔(_P):"
+msgstr "設定檔(_P):"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
+#: ../panels/sound/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -5495,13 +5485,13 @@ msgstr[0] "%u 輸出"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
+#: ../panels/sound/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 輸入"
 
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
+#: ../panels/sound/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "系統音效"
 
@@ -5612,6 +5602,39 @@ msgstr "重低音"
 msgid "Custom"
 msgstr "自訂"
 
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: ../panels/universal-access/cc-ua-panel.c:351
+msgctxt "cursor size"
+msgid "Default"
+msgstr "預設值"
+
+#: ../panels/universal-access/cc-ua-panel.c:354
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "中"
+
+#: ../panels/universal-access/cc-ua-panel.c:357
+msgctxt "cursor size"
+msgid "Large"
+msgstr "大"
+
+#: ../panels/universal-access/cc-ua-panel.c:360
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "較大"
+
+#: ../panels/universal-access/cc-ua-panel.c:363
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "最大"
+
+#: ../panels/universal-access/cc-ua-panel.c:367
+#, c-format
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d 像素"
+
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
 msgid "Uni­ver­sal Access"
@@ -5625,11 +5648,12 @@ msgstr "讓電腦更容易看、聽、輸入、指向與點選"
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
 msgstr ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;"
-"字型;大小;相黏;遲緩;反彈;滑鼠;鍵;按鍵;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
+"鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;反彈;滑鼠;雙擊;兩"
+"下;點按;延遲;助理;輔助;重複;閃動;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5648,280 +5672,293 @@ msgid "_Large Text"
 msgstr "大型文字(_L)"
 
 #: ../panels/universal-access/uap.ui.h:5
+msgid "C_ursor Size"
+msgstr "游標大小(_U)"
+
+#: ../panels/universal-access/uap.ui.h:6
 #: ../panels/universal-access/zoom-options.ui.h:7
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../panels/universal-access/uap.ui.h:7
+#: ../panels/universal-access/uap.ui.h:8
 msgid "Screen _Reader"
 msgstr "螢幕閱讀器(_R)"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:9
 msgid "_Sound Keys"
 msgstr "聲音按鍵(_S)"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: ../panels/universal-access/uap.ui.h:10
 msgid "Hearing"
 msgstr "聽覺"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:11
 msgid "_Visual Alerts"
 msgstr "視覺警示(_V)"
 
-#: ../panels/universal-access/uap.ui.h:12
+#: ../panels/universal-access/uap.ui.h:13
 msgid "Screen _Keyboard"
 msgstr "螢幕鍵盤(_K)"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:14
 msgid "R_epeat Keys"
 msgstr "重複鍵(_E)"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:15
 msgid "Cursor _Blinking"
 msgstr "游標閃爍(_B)"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:16
 msgid "_Typing Assist (AccessX)"
 msgstr "打字助理 [AccessX](_T)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:17
 msgid "Pointing & Clicking"
 msgstr "指向和點選"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:18
 msgid "_Mouse Keys"
 msgstr "滑鼠按鍵(_M)"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:19
 msgid "_Click Assist"
 msgstr "點擊助理(_C)"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:20
 msgid "_Double-Click Delay"
 msgstr "雙擊延遲(_D)"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:21
 msgid "Double-Click Delay"
 msgstr "雙擊延遲"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:22
+msgid "Cursor Size"
+msgstr "游標大小"
+
+#: ../panels/universal-access/uap.ui.h:23
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr "游標大小可以和縮放搭配以輕鬆看出游標位置。"
+
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:25
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "螢幕閱讀器能在您移動焦點時讀出顯示的文字。"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:26
 msgid "_Screen Reader"
 msgstr "螢幕閱讀器(_S)"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Sound Keys"
 msgstr "聲音按鍵"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "當 Num Lock 或 Caps Lock 開啟時發出聲響。"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Visual Alerts"
 msgstr "視覺警示"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:30
 msgid "_Test flash"
 msgstr "測試閃動(_T)"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "當警示音效發出時使用視覺化的指示。"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Flash the _window title"
 msgstr "閃動視窗標題(_W)"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the entire _screen"
 msgstr "閃動整個螢幕(_S)"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Repeat Keys"
 msgstr "重複按鍵"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Key presses repeat when key is held down."
 msgstr "當按下某鍵不放時重複輸出該字元。"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:37
 msgid "Repeat keys delay"
 msgstr "按鍵重複延遲"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Speed"
 msgstr "速度"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Repeat keys speed"
 msgstr "按鍵重複速度"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:40
 msgid "Cursor Blinking"
 msgstr "游標閃爍"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:41
 msgid "Cursor blinks in text fields."
 msgstr "游標在文字欄位中閃爍。"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Cursor blinking speed"
 msgstr "游標閃爍速度"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:43
 msgid "Typing Assist"
 msgstr "打字助理"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:44
 msgid "_Sticky Keys"
 msgstr "黏性特殊鍵(_S)"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "將連續按的特殊鍵視為按鍵組合"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:46
 msgid "_Disable if two keys are pressed together"
 msgstr "如果同時按下任何兩鍵則停用(_D)"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Beep when a _modifier key is pressed"
 msgstr "當按下特殊按鍵時發出聲響(_M)"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:48
 msgid "S_low Keys"
 msgstr "重複按鍵(_L)"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按鍵被按下到它被接受之間置入延遲"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:50
 msgid "A_cceptance delay:"
 msgstr "接受時間延遲(_C):"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:51
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Slow keys typing delay"
 msgstr "降低按鍵輸入延遲"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:53
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "長"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is pr_essed"
 msgstr "當按下按鍵時發出聲響(_E)"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Beep when a key is _accepted"
 msgstr "當接受按鍵動作時發出聲響(_A)"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:56
 msgid "Beep when a key is _rejected"
 msgstr "當拒絕按鍵動作則發出聲響(_R)"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:57
 msgid "_Bounce Keys"
 msgstr "反彈鍵(_B)"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:58
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重複按鍵"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:59
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Bounce keys typing delay"
 msgstr "反彈鍵輸入延遲"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:61
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "長"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:62
 msgid "_Enable by Keyboard"
 msgstr "由鍵盤啟用(_E)"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "以鍵盤開啟和關閉無障礙功能"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Click Assist"
 msgstr "點擊助理"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:65
 msgid "_Simulated Secondary Click"
 msgstr "模擬次要點擊(_S)"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "按住主要鍵時觸發次要點擊"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:67
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Secondary click delay"
 msgstr "第二次點擊延遲"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:69
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "長"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:70
 msgid "_Hover Click"
 msgstr "停駐即點擊(_H)"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Trigger a click when the pointer hovers"
 msgstr "當停止游標移動時觸發點擊"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:72
 msgid "D_elay:"
 msgstr "延遲(_E):"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:73
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:74
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "長"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Motion _threshold:"
 msgstr "移動速度(_M):"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:76
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:77
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
@@ -6293,6 +6330,14 @@ msgstr "立刻設定密碼"
 msgid "_Add User…"
 msgstr "加入使用者(_A)…"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "您的作業階段需要重新啟動以讓變更生效"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "立刻重新啟動"
+
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "自動登入(_U):"
@@ -6405,8 +6450,10 @@ msgstr "試著避免像 1234 或 abcd 等順序。"
 
 #: ../panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "試著加入更多字母、數字和標點符號。"
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr "密碼需要更長。試著加入更多字母、數字和標點符號。"
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
@@ -6416,39 +6463,8 @@ msgstr "混合大寫與小寫字元並嘗試使用一到兩個數字。"
 #: ../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:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "強度:很弱"
-
-#: ../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:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "強度:中度"
-
-#: ../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:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "強度:高度"
+"Adding more letters, numbers and punctuation will make the password stronger."
+msgstr "加入更多字母、數字和標點符號會讓密碼更強。"
 
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
@@ -6507,25 +6523,25 @@ msgstr "應符合您的登入提供者的網路位址。"
 msgid "Failed to add account"
 msgstr "無法加入到帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:463
+#: ../panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-account-dialog.c:718
-#: ../panels/user-accounts/um-account-dialog.c:764
-#: ../panels/user-accounts/um-account-dialog.c:785
+#: ../panels/user-accounts/um-account-dialog.c:717
+#: ../panels/user-accounts/um-account-dialog.c:763
+#: ../panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
 msgstr "無法註冊帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:908
+#: ../panels/user-accounts/um-account-dialog.c:907
 msgid "No supported way to authenticate with this domain"
 msgstr "沒有支援這個網域核對的方式"
 
-#: ../panels/user-accounts/um-account-dialog.c:981
+#: ../panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "無法加入網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1042
+#: ../panels/user-accounts/um-account-dialog.c:1041
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
@@ -6533,7 +6549,7 @@ msgstr ""
 "登入名稱沒有作用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1049
+#: ../panels/user-accounts/um-account-dialog.c:1048
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
@@ -6541,12 +6557,12 @@ msgstr ""
 "登入密碼沒有作用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1057
+#: ../panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
-msgstr "無法登入到網域"
+msgstr "無法登入網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1115
-msgid "Unable find the domain. Maybe you misspelled it?"
+#: ../panels/user-accounts/um-account-dialog.c:1114
+msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "找不到網域。也許您拼錯字了?"
 
 #: ../panels/user-accounts/um-account-type.c:34
@@ -6704,39 +6720,39 @@ msgstr "作業階段開始"
 msgid "%s — Account Activity"
 msgstr "%s — 帳號活動"
 
-#: ../panels/user-accounts/um-password-dialog.c:145
+#: ../panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "請選擇其他密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "請再次輸入您目前的密碼。"
 
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "密碼無法變更"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:215
+#: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "瀏覽更多照片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:449
+#: ../panels/user-accounts/um-photo-dialog.c:452
 msgid "Disable image"
 msgstr "停用影像"
 
-#: ../panels/user-accounts/um-photo-dialog.c:467
+#: ../panels/user-accounts/um-photo-dialog.c:470
 msgid "Take a photo…"
 msgstr "照相…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:485
+#: ../panels/user-accounts/um-photo-dialog.c:488
 msgid "Browse for more pictures…"
 msgstr "瀏覽更多照片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:714
 #, c-format
 msgid "Used by %s"
 msgstr "由 %s 使用"
@@ -6916,6 +6932,11 @@ msgstr "這會成為您家目錄資料夾的名稱,並且不能被改變。"
 msgid "Map Buttons"
 msgstr "對應按鈕"
 
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+msgid "_Close"
+msgstr "關閉(_C)"
+
 #: ../panels/wacom/button-mapping.ui.h:3
 msgid "Map buttons to functions"
 msgstr "功能對應按鈕"
@@ -6982,7 +7003,7 @@ msgstr "映射到單一螢幕"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:502
+#: ../panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "顯示對應"
 
@@ -7125,11 +7146,27 @@ msgstr "點選壓力感應"
 msgid "page 3"
 msgstr "頁 3"
 
-#: ../shell/alt/cc-window.c:766 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1484
+#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:730
 msgid "All Settings"
 msgstr "所有設定值"
 
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "個人"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "硬體"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "系統"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "GNOME 控制中心"
@@ -7184,22 +7221,6 @@ msgstr "求助"
 msgid "Quit"
 msgstr "結束"
 
-#. Add categories
-#: ../shell/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "個人"
-
-#: ../shell/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "硬體"
-
-#: ../shell/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "系統"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
@@ -7244,6 +7265,201 @@ msgstr "熱點"
 msgid "No results found"
 msgstr "找不到結果"
 
+#~ msgid "Lid Closed"
+#~ msgstr "上蓋已經關閉"
+
+#~ msgid "Mirrored"
+#~ msgstr "相同顯示"
+
+#~ msgid "Primary"
+#~ msgstr "主要"
+
+#~ msgid "Secondary"
+#~ msgstr "次要"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "排列顯示器的組合方式"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr "拖拉顯示器以重新排列"
+
+#~ msgid "%d Hz (NTSC)"
+#~ msgstr "%d Hz (NTSC)"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "逆時針"
+
+#~ msgid "Rotate by 180°"
+#~ msgstr "旋轉 180°"
+
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "順時針旋轉 90°"
+
+#~ msgid "Size"
+#~ msgstr "尺寸"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "長寬比"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr "在這個顯示器顯示頂端列與活動概覽"
+
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr "將本顯示器與另一個顯示器組合以建立額外的工作空間"
+
+#~ msgid "Presentation"
+#~ msgstr "展示"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "只顯示投影片與媒體"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "兩臺顯示器上皆顯示您現在的檢視畫面"
+
+#~ msgid "Turn Off"
+#~ msgstr "關閉"
+
+#~ msgid "Don’t use this display"
+#~ msgstr "不使用這臺顯示器"
+
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "排列顯示器組合方式(_A)"
+
+#~ msgid "%s %d-bit (Build ID: %s)"
+#~ msgstr "%s %d 位元 (組建 ID:%s)"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d 位元"
+
+#~ msgid "Base system"
+#~ msgstr "基礎系統"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Shortcut;Repeat;Blink;快捷鍵;重複;閃爍;"
+
+#~ msgid "Press Esc to cancel."
+#~ msgstr "按下 Esc 鍵取消。"
+
+#~ msgid "Server"
+#~ msgstr "伺服器"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "刪除 DNS 伺服器"
+
+#~ msgid "Reset"
+#~ msgstr "重設"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "允許其他使用者使用(_U)"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "防火牆界域(_Z)"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "預設"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "界域定義了連線的信任等級"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr "重設這個網路的設定值,包含密碼,但將它記住為偏好的網路"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr "移除這個網路的相關詳細資料並且不再嘗試自動連線"
+
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "如果您有無線網路以外的方式連線到網際網路,您可以使用它來與其他人分享您的網"
+#~ "際網路連線。"
+
+#~ msgid "History"
+#~ msgstr "歷史紀錄"
+
+#~ msgid "Proxy"
+#~ msgstr "代理伺服器"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "加入設定檔(_A)…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "沒有"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "手動"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "自動"
+
+#~ msgid "Add Device"
+#~ msgstr "加入裝置"
+
+#~ msgid "Remove Device"
+#~ msgstr "移除裝置"
+
+#~ msgid "VPN Type"
+#~ msgstr "VPN 類型"
+
+#~ msgid "Group Name"
+#~ msgstr "群組名稱"
+
+#~ msgid "Group Password"
+#~ msgstr "群組密碼"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "做為熱點(_U)…"
+
+#~ msgid "_History"
+#~ msgstr "歷史紀錄(_H)"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "Loading options…"
+#~ msgstr "正在載入選項…"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "試著加入更多字母、數字和標點符號。"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "強度:很弱"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "強度:低度"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "強度:中度"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "強度:良好"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "強度:高度"
+
 #~ msgid "<small>Your account</small>"
 #~ msgstr "<small>您的帳號</small>"
 
@@ -7322,9 +7538,6 @@ msgstr "找不到結果"
 #~ msgid_plural "%u active"
 #~ msgstr[0] "%u 使用中"
 
-#~ msgid "Test page"
-#~ msgstr "測試頁"
-
 #~ msgid "Supply"
 #~ msgstr "耗材"
 
@@ -7620,9 +7833,6 @@ msgstr "找不到結果"
 #~ msgid "Pause Printing"
 #~ msgstr "暫停列印"
 
-#~ msgid "Cancel Print Job"
-#~ msgstr "取消列印工作"
-
 #~ msgctxt "print job"
 #~ msgid "Held"
 #~ msgstr "已暫停"
@@ -7768,9 +7978,6 @@ msgstr "找不到結果"
 #~ msgid "When battery power is _critical"
 #~ msgstr "當電池的電量極低時(_C)"
 
-#~ msgid "Power Off"
-#~ msgstr "關閉電源"
-
 #~ msgid "Power off"
 #~ msgstr "關閉電源"
 
@@ -7855,9 +8062,6 @@ msgstr "找不到結果"
 #~ msgid "Set Up New Device"
 #~ msgstr "設置新裝置"
 
-#~ msgid "Connection"
-#~ msgstr "連線"
-
 #~ msgid "Paired"
 #~ msgstr "已配對"
 
@@ -8203,10 +8407,6 @@ msgstr "找不到結果"
 #~ msgid "150%"
 #~ msgstr "150%"
 
-#~ msgctxt "universal access, text size"
-#~ msgid "Larger"
-#~ msgstr "較大"
-
 #~ msgid "Beep on Caps and Num Lock"
 #~ msgstr "當 Caps 和 Num Lock 在使用時發出聲響"
 
@@ -8414,9 +8614,6 @@ msgstr "找不到結果"
 #~ msgid "Change the background"
 #~ msgstr "更改背景"
 
-#~ msgid "Configure Bluetooth settings"
-#~ msgstr "設定藍牙設定值"
-
 #~ msgctxt "Power"
 #~ msgid "Bluetooth"
 #~ msgstr "藍牙"
@@ -8472,9 +8669,6 @@ msgstr "找不到結果"
 #~ msgid "Power management settings"
 #~ msgstr "電源管理設定值"
 
-#~ msgid "Change printer settings"
-#~ msgstr "改變印表機設定值"
-
 #~ msgid "Manufacturers"
 #~ msgstr "製造商"
 
@@ -8542,9 +8736,6 @@ msgstr "找不到結果"
 #~ msgid "Shortcut Settings"
 #~ msgstr "捷徑鍵設定值"
 
-#~ msgid "Display language:"
-#~ msgstr "顯示語言:"
-
 #~ msgid "Input source:"
 #~ msgstr "輸入來源:"
 



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