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



commit c30358bea1fb8480b8e81e1a56953c265a10f7ff
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Thu Jun 3 01:51:07 2021 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 2539 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1341 insertions(+), 1198 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a9e86b3c1..ef055bcd3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.91\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
 "issues\n"
-"POT-Creation-Date: 2020-09-15 07:24+0000\n"
-"PO-Revision-Date: 2020-09-22 22:56+0800\n"
+"POT-Creation-Date: 2021-04-23 17:42+0000\n"
+"PO-Revision-Date: 2021-06-03 09:46+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese <zh-l10n linux org tw>\n"
 "Language: zh_TW\n"
@@ -24,71 +24,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.4.2\n"
 
-#: panels/applications/cc-applications-panel.c:815
+#: panels/applications/cc-applications-panel.c:823
 msgid "System Bus"
 msgstr "系統匯流排"
 
-#: panels/applications/cc-applications-panel.c:815
-#: panels/applications/cc-applications-panel.c:817
-#: panels/applications/cc-applications-panel.c:830
-#: panels/applications/cc-applications-panel.c:835
+#: panels/applications/cc-applications-panel.c:823
+#: panels/applications/cc-applications-panel.c:825
+#: panels/applications/cc-applications-panel.c:838
+#: panels/applications/cc-applications-panel.c:843
 msgid "Full access"
 msgstr "完整存取權限"
 
-#: panels/applications/cc-applications-panel.c:817
+#: panels/applications/cc-applications-panel.c:825
 msgid "Session Bus"
 msgstr "工作階段匯流排"
 
-#: panels/applications/cc-applications-panel.c:821
-#: panels/power/cc-power-panel.c:2325 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/applications/cc-applications-panel.c:829
+#: panels/power/cc-power-panel.c:1790 panels/thunderbolt/cc-bolt-panel.ui:466
 #: panels/thunderbolt/cc-bolt-panel.ui:525
 msgid "Devices"
 msgstr "裝置"
 
-#: panels/applications/cc-applications-panel.c:821
+#: panels/applications/cc-applications-panel.c:829
 msgid "Full access to /dev"
 msgstr "完整 /dev 存取權限"
 
-#: panels/applications/cc-applications-panel.c:825
+#: panels/applications/cc-applications-panel.c:833
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:252
+#: panels/network/network-mobile.ui:288
 msgid "Network"
 msgstr "網路"
 
-#: panels/applications/cc-applications-panel.c:825
+#: panels/applications/cc-applications-panel.c:833
 msgid "Has network access"
 msgstr "有網路存取權限"
 
-#: panels/applications/cc-applications-panel.c:830
-#: panels/applications/cc-applications-panel.c:832
-#: panels/search/cc-search-locations-dialog.c:361
+#: panels/applications/cc-applications-panel.c:838
+#: panels/applications/cc-applications-panel.c:840
+#: panels/search/cc-search-locations-dialog.c:362
 msgid "Home"
 msgstr "家"
 
-#: panels/applications/cc-applications-panel.c:832
-#: panels/applications/cc-applications-panel.c:837
+#: panels/applications/cc-applications-panel.c:840
+#: panels/applications/cc-applications-panel.c:845
 msgid "Read-only"
 msgstr "唯讀"
 
-#: panels/applications/cc-applications-panel.c:835
-#: panels/applications/cc-applications-panel.c:837
+#: panels/applications/cc-applications-panel.c:843
+#: panels/applications/cc-applications-panel.c:845
 msgid "File System"
 msgstr "檔案系統"
 
-#: panels/applications/cc-applications-panel.c:841
+#: panels/applications/cc-applications-panel.c:849
 #: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:279
-#: shell/cc-window.c:933 shell/cc-window.ui:121
+#: shell/cc-window.c:938 shell/cc-window.ui:121
 #: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "設定值"
 
-#: panels/applications/cc-applications-panel.c:841
+#: panels/applications/cc-applications-panel.c:849
 msgid "Can change settings"
 msgstr "可以變更設定"
 
-#: panels/applications/cc-applications-panel.c:843
+#: panels/applications/cc-applications-panel.c:851
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
@@ -97,69 +97,69 @@ msgstr ""
 "%s 內建以下權限。這部分無法變更。如果您對這些存取權設定有顧慮,請考慮移除此應"
 "用程式。"
 
-#: panels/applications/cc-applications-panel.c:1016
+#: panels/applications/cc-applications-panel.c:1024
 msgid "Web Links"
 msgstr "網頁連結"
 
-#: panels/applications/cc-applications-panel.c:1026
+#: panels/applications/cc-applications-panel.c:1034
 msgid "Git Links"
 msgstr "Git 連結"
 
-#: panels/applications/cc-applications-panel.c:1032
+#: panels/applications/cc-applications-panel.c:1040
 #, c-format
 msgid "%s Links"
 msgstr "%s 連結"
 
-#: panels/applications/cc-applications-panel.c:1040
-#: panels/applications/cc-applications-panel.c:1076
+#: panels/applications/cc-applications-panel.c:1048
+#: panels/applications/cc-applications-panel.c:1084
 msgid "Unset"
 msgstr "取消設定"
 
-#: panels/applications/cc-applications-panel.c:1131
+#: panels/applications/cc-applications-panel.c:1139
 msgid "Links"
 msgstr "連結"
 
-#: panels/applications/cc-applications-panel.c:1139
+#: panels/applications/cc-applications-panel.c:1147
 msgid "Hypertext Files"
 msgstr "超文字檔案"
 
-#: panels/applications/cc-applications-panel.c:1153
+#: panels/applications/cc-applications-panel.c:1161
 msgid "Text Files"
 msgstr "文字檔案"
 
-#: panels/applications/cc-applications-panel.c:1167
+#: panels/applications/cc-applications-panel.c:1175
 msgid "Image Files"
 msgstr "圖片檔案"
 
-#: panels/applications/cc-applications-panel.c:1183
+#: panels/applications/cc-applications-panel.c:1191
 msgid "Font Files"
 msgstr "字型檔案"
 
-#: panels/applications/cc-applications-panel.c:1244
+#: panels/applications/cc-applications-panel.c:1252
 msgid "Archive Files"
 msgstr "封存檔案"
 
-#: panels/applications/cc-applications-panel.c:1264
+#: panels/applications/cc-applications-panel.c:1272
 msgid "Package Files"
 msgstr "軟體包檔案"
 
-#: panels/applications/cc-applications-panel.c:1287
+#: panels/applications/cc-applications-panel.c:1295
 msgid "Audio Files"
 msgstr "音訊檔案"
 
-#: panels/applications/cc-applications-panel.c:1304
+#: panels/applications/cc-applications-panel.c:1312
 msgid "Video Files"
 msgstr "視訊檔案"
 
-#: panels/applications/cc-applications-panel.c:1312
+#: panels/applications/cc-applications-panel.c:1320
 msgid "Other Files"
 msgstr "其他檔案"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1652
+#: panels/applications/cc-applications-panel.c:1660
 #: panels/applications/cc-applications-panel.ui:416
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
-#: panels/notifications/cc-notifications-panel.ui:78
+#: panels/notifications/cc-notifications-panel.ui:79
 msgid "Applications"
 msgstr "程式集"
 
@@ -198,13 +198,12 @@ msgstr "相機"
 #: panels/applications/cc-applications-panel.ui:152
 #: panels/applications/cc-applications-panel.ui:232
 #: panels/applications/cc-applications-panel.ui:262
-#: panels/keyboard/cc-keyboard-option.c:259
-#: panels/keyboard/cc-keyboard-option.c:378
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:85
-#: panels/keyboard/keyboard-shortcuts.c:368 panels/network/network-proxy.ui:126
-#: panels/user-accounts/cc-user-panel.c:865
-#: panels/user-accounts/cc-user-panel.c:957
-#: subprojects/gvc/gvc-mixer-control.c:1876
+#: panels/keyboard/cc-xkb-modifier-dialog.c:355
+#: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:129
+#: panels/user-accounts/cc-user-panel.c:843
+#: panels/user-accounts/cc-user-panel.c:938
+#: subprojects/gvc/gvc-mixer-control.c:1900
 msgid "Disabled"
 msgstr "已停用"
 
@@ -293,7 +292,7 @@ msgid "How much resources this application is using."
 msgstr "應用程式正在使用多少資源。"
 
 #: panels/applications/cc-applications-panel.ui:391
-#: panels/applications/cc-applications-panel.ui:535
+#: panels/applications/cc-applications-panel.ui:536
 msgid "Storage"
 msgstr "儲存空間"
 
@@ -306,32 +305,33 @@ msgid "No results found"
 msgstr "找不到結果"
 
 #: panels/applications/cc-applications-panel.ui:484
-#: panels/keyboard/cc-keyboard-panel.ui:189 shell/cc-panel-list.ui:132
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:177
+#: shell/cc-panel-list.ui:132
 msgid "Try a different search"
 msgstr "嘗試不同的搜尋內容"
 
-#: panels/applications/cc-applications-panel.ui:552
+#: panels/applications/cc-applications-panel.ui:554
 msgid ""
 "How much disk space this application is occupying with app data and caches."
 msgstr "此應用程式的應用程式資料及快取所佔用的磁碟空間。"
 
-#: panels/applications/cc-applications-panel.ui:561
+#: panels/applications/cc-applications-panel.ui:563
 msgid "Application"
 msgstr "應用程式"
 
-#: panels/applications/cc-applications-panel.ui:567
+#: panels/applications/cc-applications-panel.ui:569
 msgid "Data"
 msgstr "資料"
 
-#: panels/applications/cc-applications-panel.ui:573
+#: panels/applications/cc-applications-panel.ui:575
 msgid "Cache"
 msgstr "快取"
 
-#: panels/applications/cc-applications-panel.ui:579
+#: panels/applications/cc-applications-panel.ui:581
 msgid "<b>Total</b>"
 msgstr "<b>總計</b>"
 
-#: panels/applications/cc-applications-panel.ui:596
+#: panels/applications/cc-applications-panel.ui:598
 msgid "Clear Cache…"
 msgstr "清除快取…"
 
@@ -345,43 +345,44 @@ msgstr "控制各應用程式的權限與設定值"
 msgid "application;flatpak;permission;setting;"
 msgstr "application;flatpak;permission;setting;應用程式;權限;應用;設定;設置;"
 
-#: panels/background/cc-background-chooser.c:346
+#: panels/background/cc-background-chooser.c:345
 msgid "Select a picture"
 msgstr "請選擇圖片"
 
-#: panels/background/cc-background-chooser.c:349
+#: panels/background/cc-background-chooser.c:348
 #: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:238
 #: panels/color/cc-color-panel.c:886 panels/color/cc-color-panel.ui:657
-#: panels/common/cc-language-chooser.ui:24
-#: panels/display/cc-display-panel.c:943
-#: panels/info-overview/cc-info-overview-panel.ui:234
+#: panels/common/cc-language-chooser.ui:25
+#: panels/display/cc-display-panel.c:1003
+#: panels/info-overview/cc-info-overview-panel.ui:242
+#: panels/keyboard/cc-input-chooser.ui:11
 #: panels/network/cc-wifi-hotspot-dialog.ui:122
-#: panels/network/cc-wifi-panel.c:865
+#: panels/network/cc-wifi-panel.c:866
 #: panels/network/connection-editor/connection-editor.ui:17
 #: panels/network/connection-editor/vpn-helpers.c:176
 #: panels/network/connection-editor/vpn-helpers.c:299
 #: panels/network/net-device-wifi.c:854
 #: panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:251
-#: panels/region/cc-format-chooser.ui:28 panels/region/cc-input-chooser.ui:11
-#: panels/search/cc-search-locations-dialog.c:638
+#: panels/printers/pp-details-dialog.c:235
+#: panels/region/cc-format-chooser.ui:28
+#: panels/search/cc-search-locations-dialog.c:639
 #: panels/sharing/cc-sharing-panel.c:396 panels/usage/cc-usage-panel.c:133
 #: panels/user-accounts/cc-add-user-dialog.ui:28
-#: panels/user-accounts/cc-avatar-chooser.c:107
-#: panels/user-accounts/cc-avatar-chooser.c:235
+#: panels/user-accounts/cc-avatar-chooser.c:105
+#: panels/user-accounts/cc-avatar-chooser.c:223
 #: panels/user-accounts/cc-fingerprint-dialog.ui:36
 #: panels/user-accounts/cc-password-dialog.ui:20
-#: panels/user-accounts/cc-user-panel.c:652
-#: panels/user-accounts/cc-user-panel.c:670
+#: panels/user-accounts/cc-user-panel.c:633
+#: panels/user-accounts/cc-user-panel.c:651
 #: panels/user-accounts/data/join-dialog.ui:20
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: panels/background/cc-background-chooser.c:350
+#: panels/background/cc-background-chooser.c:349
 #: panels/network/connection-editor/vpn-helpers.c:177
-#: panels/printers/pp-details-dialog.c:252
+#: panels/printers/pp-details-dialog.c:236
 #: panels/sharing/cc-sharing-panel.c:397
-#: panels/user-accounts/cc-avatar-chooser.c:236
+#: panels/user-accounts/cc-avatar-chooser.c:224
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -463,7 +464,7 @@ msgstr "關閉飛安模式開關以啟用藍牙。"
 
 #. Translators: The found device is a printer connected via Bluetooth
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
-#: panels/printers/pp-new-printer-dialog.c:1628
+#: panels/printers/pp-new-printer-dialog.c:1595
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -894,10 +895,9 @@ msgstr "加入描述檔"
 msgid "_Import File…"
 msgstr "載入檔案(_I)…"
 
-#: panels/color/cc-color-panel.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:510
+#: panels/color/cc-color-panel.ui:672 panels/keyboard/cc-input-chooser.ui:20
+#: panels/network/connection-editor/net-connection-editor.c:504
 #: panels/printers/new-printer-dialog.ui:80
-#: panels/region/cc-input-chooser.ui:20
 #: panels/user-accounts/cc-add-user-dialog.ui:47
 msgid "_Add"
 msgstr "加入(_A)"
@@ -1142,31 +1142,32 @@ msgstr ""
 msgid "Other…"
 msgstr "其他…"
 
-#: panels/common/cc-language-chooser.c:127 panels/region/cc-input-chooser.c:178
-msgid "More…"
-msgstr "更多…"
-
-#: panels/common/cc-language-chooser.c:144
-msgid "No languages found"
-msgstr "找不到語言"
-
 #: panels/common/cc-language-chooser.ui:5
 msgid "Select Language"
 msgstr "選擇語言"
 
-#: panels/common/cc-language-chooser.ui:12
+#: panels/common/cc-language-chooser.ui:13
 msgid "_Select"
 msgstr "選取(_S)"
 
-#: panels/common/cc-permission-infobar.ui:20
-msgid "Unlock…"
-msgstr "解除鎖定…"
+#: panels/common/cc-language-chooser.ui:69
+msgid "No languages found"
+msgstr "找不到語言"
+
+#: panels/common/cc-language-chooser.ui:82
+#: panels/keyboard/cc-input-chooser.c:178
+msgid "More…"
+msgstr "更多…"
 
-#: panels/common/cc-permission-infobar.ui:45
+#: panels/common/cc-permission-infobar.c:107
 msgid "Unlock to Change Settings"
 msgstr "解除鎖定以變更設定"
 
-#: panels/common/cc-permission-infobar.ui:55
+#: panels/common/cc-permission-infobar.ui:20
+msgid "Unlock…"
+msgstr "解除鎖定…"
+
+#: panels/common/cc-permission-infobar.ui:56
 msgid "Some settings must be unlocked before they can be changed."
 msgstr "部份設定需要先解鎖才能變更。"
 
@@ -1199,12 +1200,12 @@ msgid "Select _All"
 msgstr "全部選取(_A)"
 
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:158
+#: panels/network/connection-editor/ce-page-details.c:160
 msgid "Today"
 msgstr "今日"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:160
+#: panels/network/connection-editor/ce-page-details.c:162
 msgid "Yesterday"
 msgstr "昨日"
 
@@ -1282,33 +1283,18 @@ msgctxt "hotspot"
 msgid "Hotspot"
 msgstr "熱點"
 
-#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
-#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
-msgid "Day"
-msgstr "日"
-
-#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
-#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
-msgid "Month"
-msgstr "月"
-
-#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
-#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
-msgid "Year"
-msgstr "年"
-
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:258
+#: panels/datetime/cc-datetime-panel.c:262
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%b%e日,%p %l:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: panels/datetime/cc-datetime-panel.c:263
+#: panels/datetime/cc-datetime-panel.c:267
 msgid "%e %B %Y, %R"
 msgstr "%Y年%b%e日,%R"
 
 #. Translators: "city, country"
-#: panels/datetime/cc-datetime-panel.c:432
+#: panels/datetime/cc-datetime-panel.c:449
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -1316,7 +1302,7 @@ msgstr "%s,%s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: panels/datetime/cc-datetime-panel.c:459
+#: panels/datetime/cc-datetime-panel.c:476
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -1324,122 +1310,134 @@ 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:466
+#: panels/datetime/cc-datetime-panel.c:483
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:471
+#: panels/datetime/cc-datetime-panel.c:488
 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:476
+#: panels/datetime/cc-datetime-panel.c:493
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: panels/datetime/cc-datetime-panel.c:481
+#: panels/datetime/cc-datetime-panel.c:498
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: panels/datetime/cc-datetime-panel.ui:26
+#: panels/datetime/cc-datetime-panel.ui:38
 msgid "January"
 msgstr "一月"
 
-#: panels/datetime/cc-datetime-panel.ui:29
+#: panels/datetime/cc-datetime-panel.ui:46
 msgid "February"
 msgstr "二月"
 
-#: panels/datetime/cc-datetime-panel.ui:32
+#: panels/datetime/cc-datetime-panel.ui:54
 msgid "March"
 msgstr "三月"
 
-#: panels/datetime/cc-datetime-panel.ui:35
+#: panels/datetime/cc-datetime-panel.ui:62
 msgid "April"
 msgstr "四月"
 
-#: panels/datetime/cc-datetime-panel.ui:38
+#: panels/datetime/cc-datetime-panel.ui:70
 msgid "May"
 msgstr "五月"
 
-#: panels/datetime/cc-datetime-panel.ui:41
+#: panels/datetime/cc-datetime-panel.ui:78
 msgid "June"
 msgstr "六月"
 
-#: panels/datetime/cc-datetime-panel.ui:44
+#: panels/datetime/cc-datetime-panel.ui:86
 msgid "July"
 msgstr "七月"
 
-#: panels/datetime/cc-datetime-panel.ui:47
+#: panels/datetime/cc-datetime-panel.ui:94
 msgid "August"
 msgstr "八月"
 
-#: panels/datetime/cc-datetime-panel.ui:50
+#: panels/datetime/cc-datetime-panel.ui:102
 msgid "September"
 msgstr "九月"
 
-#: panels/datetime/cc-datetime-panel.ui:53
+#: panels/datetime/cc-datetime-panel.ui:110
 msgid "October"
 msgstr "十月"
 
-#: panels/datetime/cc-datetime-panel.ui:56
+#: panels/datetime/cc-datetime-panel.ui:118
 msgid "November"
 msgstr "十一月"
 
-#: panels/datetime/cc-datetime-panel.ui:59
+#: panels/datetime/cc-datetime-panel.ui:126
 msgid "December"
 msgstr "十二月"
 
-#: panels/datetime/cc-datetime-panel.ui:65
+#: panels/datetime/cc-datetime-panel.ui:136
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "日期與時刻"
 
-#: panels/datetime/cc-datetime-panel.ui:102
+#: panels/datetime/cc-datetime-panel.ui:187
+msgid "Year"
+msgstr "年"
+
+#: panels/datetime/cc-datetime-panel.ui:220
+msgid "Month"
+msgstr "月"
+
+#: panels/datetime/cc-datetime-panel.ui:257
+msgid "Day"
+msgstr "日"
+
+#: panels/datetime/cc-datetime-panel.ui:286
 msgid "Time Zone"
 msgstr "時區"
 
-#: panels/datetime/cc-datetime-panel.ui:123
+#: panels/datetime/cc-datetime-panel.ui:307
 msgid "Search for a city"
 msgstr "搜尋城市"
 
-#: panels/datetime/cc-datetime-panel.ui:194
+#: panels/datetime/cc-datetime-panel.ui:378
 msgid "Automatic _Date & Time"
 msgstr "自動調整日期與時刻(_D)"
 
-#: panels/datetime/cc-datetime-panel.ui:195
+#: panels/datetime/cc-datetime-panel.ui:379
 msgid "Requires internet access"
 msgstr "需要網際網路連線"
 
-#: panels/datetime/cc-datetime-panel.ui:215
+#: panels/datetime/cc-datetime-panel.ui:399
 msgid "Date & _Time"
 msgstr "日期與時刻(_T)"
 
-#: panels/datetime/cc-datetime-panel.ui:254
+#: panels/datetime/cc-datetime-panel.ui:438
 msgid "Automatic Time _Zone"
 msgstr "自動調整時區(_Z)"
 
-#: panels/datetime/cc-datetime-panel.ui:255
+#: panels/datetime/cc-datetime-panel.ui:439
 msgid "Requires location services enabled and internet access"
 msgstr "需要啟用位置服務及網際網路連線"
 
-#: panels/datetime/cc-datetime-panel.ui:270
+#: panels/datetime/cc-datetime-panel.ui:454
 msgid "Time Z_one"
 msgstr "時區(_O)"
 
-#: panels/datetime/cc-datetime-panel.ui:310
+#: panels/datetime/cc-datetime-panel.ui:494
 msgid "Time _Format"
 msgstr "時刻格式(_F)"
 
-#: panels/datetime/cc-datetime-panel.ui:319
+#: panels/datetime/cc-datetime-panel.ui:503
 msgid "24-hour"
 msgstr "24小時"
 
-#: panels/datetime/cc-datetime-panel.ui:320
+#: panels/datetime/cc-datetime-panel.ui:504
 msgid "AM / PM"
 msgstr "AM / PM"
 
@@ -1538,20 +1536,20 @@ msgstr ""
 "network;identity;privacy;螢幕;鎖定;診斷;當掉;崩潰;私人;隱私;最近;暫存;索引;名"
 "稱;網路;身分;"
 
-#: panels/display/cc-display-panel.c:954
+#: panels/display/cc-display-panel.c:1014
 #: panels/network/connection-editor/connection-editor.ui:27
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: panels/display/cc-display-panel.c:975
+#: panels/display/cc-display-panel.c:1035
 msgid "Apply Changes?"
 msgstr "要套用變更嗎?"
 
-#: panels/display/cc-display-panel.c:980
+#: panels/display/cc-display-panel.c:1040
 msgid "Changes Cannot be Applied"
 msgstr "變更無法套用"
 
-#: panels/display/cc-display-panel.c:981
+#: panels/display/cc-display-panel.c:1041
 msgid "This could be due to hardware limitations."
 msgstr "這可能是因為硬體限制。"
 
@@ -1694,7 +1692,7 @@ msgid "Manual Schedule"
 msgstr "手動排程"
 
 #: panels/display/cc-night-light-page.ui:148
-#: panels/region/cc-format-chooser.ui:344
+#: panels/region/cc-format-preview.ui:40
 msgid "Times"
 msgstr "時刻"
 
@@ -1751,11 +1749,11 @@ msgstr ""
 "redshift;color;sunset;sunrise;面板;投影機;螢幕;解析度;重新整理;螢幕;夜晚;夜"
 "光;藍光;日出;日落;"
 
-#: panels/info-overview/cc-info-overview-panel.c:416
-#: panels/info-overview/cc-info-overview-panel.c:431
-#: panels/info-overview/cc-info-overview-panel.c:443
-#: panels/info-overview/cc-info-overview-panel.c:489
-#: panels/info-overview/cc-info-overview-panel.c:519
+#: panels/info-overview/cc-info-overview-panel.c:414
+#: panels/info-overview/cc-info-overview-panel.c:429
+#: panels/info-overview/cc-info-overview-panel.c:441
+#: panels/info-overview/cc-info-overview-panel.c:487
+#: panels/info-overview/cc-info-overview-panel.c:517
 msgid "Unknown"
 msgstr "不明"
 
@@ -1763,96 +1761,100 @@ msgstr "不明"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info-overview/cc-info-overview-panel.c:451
+#: panels/info-overview/cc-info-overview-panel.c:449
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s;組建 ID:%s"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:466
+#: panels/info-overview/cc-info-overview-panel.c:464
 #, c-format
 msgid "64-bit"
 msgstr "64位元"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:469
+#: panels/info-overview/cc-info-overview-panel.c:467
 #, c-format
 msgid "32-bit"
 msgstr "32位元"
 
-#: panels/info-overview/cc-info-overview-panel.c:675
+#: panels/info-overview/cc-info-overview-panel.c:724
 msgid "X11"
 msgstr "X11"
 
-#: panels/info-overview/cc-info-overview-panel.c:679
+#: panels/info-overview/cc-info-overview-panel.c:728
 msgid "Wayland"
 msgstr "Wayland"
 
-#: panels/info-overview/cc-info-overview-panel.c:681
+#: panels/info-overview/cc-info-overview-panel.c:730
 msgctxt "Windowing system (Wayland, X11, or Unknown)"
 msgid "Unknown"
 msgstr "不明"
 
-#: panels/info-overview/cc-info-overview-panel.ui:52
+#: panels/info-overview/cc-info-overview-panel.ui:51
 msgid "Device Name"
 msgstr "裝置名稱"
 
-#: panels/info-overview/cc-info-overview-panel.ui:74
+#: panels/info-overview/cc-info-overview-panel.ui:73
+msgid "Hardware Model"
+msgstr "硬體型號"
+
+#: panels/info-overview/cc-info-overview-panel.ui:82
 msgid "Memory"
 msgstr "記憶體"
 
-#: panels/info-overview/cc-info-overview-panel.ui:83
+#: panels/info-overview/cc-info-overview-panel.ui:91
 msgid "Processor"
 msgstr "處理器"
 
-#: panels/info-overview/cc-info-overview-panel.ui:92
+#: panels/info-overview/cc-info-overview-panel.ui:100
 msgid "Graphics"
 msgstr "繪圖"
 
-#: panels/info-overview/cc-info-overview-panel.ui:101
+#: panels/info-overview/cc-info-overview-panel.ui:109
 msgid "Disk Capacity"
 msgstr "磁碟空間"
 
-#: panels/info-overview/cc-info-overview-panel.ui:102
+#: panels/info-overview/cc-info-overview-panel.ui:110
 msgid "Calculating…"
 msgstr "正在計算…"
 
 #. translators: this field contains the distro name and version
-#: panels/info-overview/cc-info-overview-panel.ui:124
+#: panels/info-overview/cc-info-overview-panel.ui:132
 msgid "OS Name"
 msgstr "作業系統名稱"
 
-#: panels/info-overview/cc-info-overview-panel.ui:133
+#: panels/info-overview/cc-info-overview-panel.ui:141
 msgid "OS Type"
 msgstr "作業系統類型"
 
-#: panels/info-overview/cc-info-overview-panel.ui:142
+#: panels/info-overview/cc-info-overview-panel.ui:150
 msgid "GNOME Version"
 msgstr "GNOME 版本"
 
-#: panels/info-overview/cc-info-overview-panel.ui:152
+#: panels/info-overview/cc-info-overview-panel.ui:160
 msgid "Windowing System"
 msgstr "視窗系統"
 
-#: panels/info-overview/cc-info-overview-panel.ui:160
+#: panels/info-overview/cc-info-overview-panel.ui:168
 msgid "Virtualization"
 msgstr "虛擬化"
 
-#: panels/info-overview/cc-info-overview-panel.ui:169
+#: panels/info-overview/cc-info-overview-panel.ui:177
 msgid "Software Updates"
 msgstr "軟體更新"
 
-#: panels/info-overview/cc-info-overview-panel.ui:190
+#: panels/info-overview/cc-info-overview-panel.ui:198
 msgid "Rename Device"
 msgstr "重新命名裝置"
 
-#: panels/info-overview/cc-info-overview-panel.ui:207
+#: panels/info-overview/cc-info-overview-panel.ui:215
 msgid ""
 "The device name is used to identify this device when it is viewed over the "
 "network, or when pairing Bluetooth devices."
 msgstr "裝置名稱用來在網路上檢視裝置,或是配對藍牙裝置時識別裝置。"
 
-#: panels/info-overview/cc-info-overview-panel.ui:225
+#: panels/info-overview/cc-info-overview-panel.ui:233
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
@@ -1928,7 +1930,7 @@ msgid "Eject"
 msgstr "退出"
 
 #: panels/keyboard/01-input-sources.xml.in:4
-#: panels/universal-access/cc-ua-panel.ui:563
+#: panels/universal-access/cc-ua-panel.ui:542
 msgid "Typing"
 msgstr "輸入"
 
@@ -2050,163 +2052,256 @@ msgstr "將文字縮小"
 msgid "High contrast on or off"
 msgstr "高對比開或關"
 
-#: panels/keyboard/cc-alt-chars-key-dialog.ui:8
-#: panels/keyboard/cc-keyboard-panel.ui:72
+#: panels/keyboard/cc-input-chooser.c:193
+msgid "No input sources found"
+msgstr "找不到輸入來源"
+
+#: panels/keyboard/cc-input-chooser.c:964
+msgctxt "Input Source"
+msgid "Other"
+msgstr "其他"
+
+#: panels/keyboard/cc-input-chooser.ui:5
+msgid "Add an Input Source"
+msgstr "加入輸入來源"
+
+#: panels/keyboard/cc-input-chooser.ui:77
+msgid "Input methods can’t be used on the login screen"
+msgstr "輸入法無法在登入畫面中使用"
+
+#: panels/keyboard/cc-input-list-box.ui:20
+msgid "No input source selected"
+msgstr "尚未選擇輸入來源"
+
+#: panels/keyboard/cc-input-row.ui:75
+msgid "Move up"
+msgstr "往上移"
+
+#: panels/keyboard/cc-input-row.ui:86
+msgid "Move down"
+msgstr "往下移"
+
+#: panels/keyboard/cc-input-row.ui:103
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: panels/keyboard/cc-input-row.ui:120
+msgid "View Keyboard Layout"
+msgstr "檢視鍵盤配置"
+
+#: panels/keyboard/cc-input-row.ui:137
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:286
+msgid "Remove"
+msgstr "移除"
+
+#: panels/keyboard/cc-keyboard-manager.c:486
+#: panels/keyboard/cc-keyboard-manager.c:494
+#: panels/keyboard/cc-keyboard-manager.c:779
+msgid "Custom Shortcuts"
+msgstr "自訂快捷鍵"
+
+#: panels/keyboard/cc-keyboard-panel.c:71
+#: panels/keyboard/cc-keyboard-panel.ui:179
 msgid "Alternate Characters Key"
 msgstr "替代字元鍵"
 
-#: panels/keyboard/cc-alt-chars-key-dialog.ui:28
+#: panels/keyboard/cc-keyboard-panel.c:72
 msgid ""
 "The alternate characters key can be used to enter additional characters. "
 "These are sometimes printed as a third-option on your keyboard."
 msgstr ""
 "可以用來輸入額外字元的代用字元。這些字元通常會以第三選項方式印在您的鍵盤上。"
 
-#: panels/keyboard/cc-alt-chars-key-dialog.ui:45
+#: panels/keyboard/cc-keyboard-panel.c:74
+#: panels/keyboard/cc-keyboard-panel.c:92
+msgctxt "keyboard key"
 msgid "Left Alt"
 msgstr "左 Alt"
 
-#: panels/keyboard/cc-alt-chars-key-dialog.ui:61
+#: panels/keyboard/cc-keyboard-panel.c:75
+#: panels/keyboard/cc-keyboard-panel.c:93
+msgctxt "keyboard key"
 msgid "Right Alt"
 msgstr "右 Alt"
 
-#: panels/keyboard/cc-alt-chars-key-dialog.ui:77
+#: panels/keyboard/cc-keyboard-panel.c:76
+#: panels/keyboard/cc-keyboard-panel.c:94
+msgctxt "keyboard key"
 msgid "Left Super"
 msgstr "左 Super"
 
-#: panels/keyboard/cc-alt-chars-key-dialog.ui:93
+#: panels/keyboard/cc-keyboard-panel.c:77
+#: panels/keyboard/cc-keyboard-panel.c:95
+msgctxt "keyboard key"
 msgid "Right Super"
 msgstr "右 Super"
 
-#: panels/keyboard/cc-alt-chars-key-dialog.ui:109
+#: panels/keyboard/cc-keyboard-panel.c:78
+#: panels/keyboard/cc-keyboard-panel.c:96
+msgctxt "keyboard key"
 msgid "Menu key"
 msgstr "選單鍵"
 
-#: panels/keyboard/cc-alt-chars-key-dialog.ui:125
+#: panels/keyboard/cc-keyboard-panel.c:79
+#: panels/keyboard/cc-keyboard-panel.c:97
+msgctxt "keyboard key"
 msgid "Right Ctrl"
 msgstr "右 Ctrl"
 
-#: panels/keyboard/cc-keyboard-manager.c:486
-#: panels/keyboard/cc-keyboard-manager.c:494
-#: panels/keyboard/cc-keyboard-manager.c:779
-msgid "Custom Shortcuts"
-msgstr "自訂快捷鍵"
-
-#. Translators: This key is also known as 'third level
-#. * chooser'. AltGr is often used for this purpose. See
-#. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
-#.
-#: panels/keyboard/cc-keyboard-option.c:337
-msgid "Alternative Characters Key"
-msgstr "替代的字元鍵"
-
-#. Translators: The Compose key is used to initiate key
-#. * sequences that are combined to form a single character.
-#. * See http://en.wikipedia.org/wiki/Compose_key
-#.
-#: panels/keyboard/cc-keyboard-option.c:346
+#: panels/keyboard/cc-keyboard-panel.c:87
+#: panels/keyboard/cc-keyboard-panel.ui:204
 msgid "Compose Key"
 msgstr "組合鍵"
 
-#: panels/keyboard/cc-keyboard-option.c:351
-msgid "Modifiers-only switch to next source"
-msgstr "只以修飾鍵切換至下個來源"
+#: panels/keyboard/cc-keyboard-panel.c:88
+msgid ""
+"The compose key allows a wide variety of characters to be entered. To use "
+"it, press compose then a sequence of characters.  For example, compose key "
+"followed by <b>C</b> and <b>o</b> will enter <b>©</b>, <b>a</b> followed by "
+"<b>'</b> will enter <b>á</b>."
+msgstr ""
+"組合鍵讓您可以輸入更多種字元。若要使用此功能,請先按組合鍵,再輸入一段字元順"
+"序。舉例,先按組合鍵,再按 <b>C</b> 和 <b>o</b>,可以輸入 <b>©</b>,而再按 "
+"<b>a</b> 和 <b>'</b> 則會輸入 <b>á</b>。"
 
-#: panels/keyboard/cc-keyboard-panel.c:94
+#: panels/keyboard/cc-keyboard-panel.c:98
+#| msgid "Caps"
 msgctxt "keyboard key"
-msgid "Right Ctrl"
-msgstr "右 Ctrl"
+msgid "Caps Lock"
+msgstr "大寫鎖定"
 
-#: panels/keyboard/cc-keyboard-panel.c:95
+#: panels/keyboard/cc-keyboard-panel.c:99
 msgctxt "keyboard key"
-msgid "Menu Key"
-msgstr "選單鍵"
+msgid "Scroll Lock"
+msgstr "捲動鎖定"
 
-#: panels/keyboard/cc-keyboard-panel.c:96
+#: panels/keyboard/cc-keyboard-panel.c:100
 msgctxt "keyboard key"
-msgid "Left Super"
-msgstr "左 Super"
+msgid "Print Screen"
+msgstr "列印畫面"
 
-#: panels/keyboard/cc-keyboard-panel.c:97
-msgctxt "keyboard key"
-msgid "Right Super"
-msgstr "右 Super"
+#: panels/keyboard/cc-keyboard-panel.ui:43
+msgid "Input Sources"
+msgstr "輸入來源"
 
-#: panels/keyboard/cc-keyboard-panel.c:98
-msgctxt "keyboard key"
-msgid "Left Alt"
-msgstr "左 Alt"
+#: panels/keyboard/cc-keyboard-panel.ui:66
+msgid "Input Source Switching"
+msgstr "輸入來源切換"
 
-#: panels/keyboard/cc-keyboard-panel.c:99
-msgctxt "keyboard key"
-msgid "Right Alt"
-msgstr "右 Alt"
+#: panels/keyboard/cc-keyboard-panel.ui:99
+msgid "Use the _same source for all windows"
+msgstr "所有視窗皆使用相同的來源(_S)"
+
+#: panels/keyboard/cc-keyboard-panel.ui:126
+msgid "Switch input sources _individually for each window"
+msgstr "每個視窗各自切換獨立的輸入來源(_D)"
+
+#: panels/keyboard/cc-keyboard-panel.ui:138
+msgid "Keyboard Shortcut"
+msgstr "鍵盤快捷鍵"
+
+#: panels/keyboard/cc-keyboard-panel.ui:139
+msgid "This can be changed in Customize Shortcuts"
+msgstr "這可以在「自訂快捷鍵」中變更"
+
+#: panels/keyboard/cc-keyboard-panel.ui:157
+msgid "Type Special Characters"
+msgstr "輸入特殊字元"
+
+#: panels/keyboard/cc-keyboard-panel.ui:180
+msgid "Hold down and type to enter different characters"
+msgstr "按下並輸入以輸入不同字元"
+
+#: panels/keyboard/cc-keyboard-panel.ui:232
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:301
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:317 shell/cc-window.ui:326
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤快捷鍵"
 
-#: panels/keyboard/cc-keyboard-panel.c:201
+#: panels/keyboard/cc-keyboard-panel.ui:253
+msgid "Customize Shortcuts"
+msgstr "自訂快捷鍵"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:281
+msgid "modified"
+msgstr "已修改"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:423
 msgid "Reset All Shortcuts?"
 msgstr "重設所有的快捷鍵?"
 
-#: panels/keyboard/cc-keyboard-panel.c:204
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:426
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 msgstr "重設快捷鍵可能會影響您自訂的快捷鍵。這個動作不能撤銷。"
 
-#: panels/keyboard/cc-keyboard-panel.c:208
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:430
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:275
 #: panels/printers/authentication-dialog.ui:29
 #: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "取消"
 
-#: panels/keyboard/cc-keyboard-panel.c:209
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:431
 msgid "Reset All"
 msgstr "全部重設"
 
-#: panels/keyboard/cc-keyboard-panel.c:305
-msgid "Reset the shortcut to its default value"
-msgstr "將快捷鍵重設回預設值"
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:115
+msgid "Add Custom Shortcuts"
+msgstr "加入自訂快捷鍵"
 
-#: panels/keyboard/cc-keyboard-panel.ui:73
-msgid "Hold down and type to enter different characters"
-msgstr "按下並輸入以輸入不同字元"
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:124
+msgid "Set up custom shortcuts for launching apps, running scripts, and more."
+msgstr "設置自訂快捷鍵方便啟動程式、執行指令稿…等。"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:131
+msgid "Add Shortcut"
+msgstr "加入捷徑鍵"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:166
+msgid "No keyboard shortcut found"
+msgstr "找不到鍵盤快捷鍵"
 
-#: panels/keyboard/cc-keyboard-panel.ui:148
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:211
+#: panels/region/cc-format-chooser.ui:48
+#: panels/user-accounts/cc-fingerprint-dialog.ui:53
+#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:230
+msgid "Back"
+msgstr "上一頁"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:235
 msgid "Reset All…"
 msgstr "全部重設…"
 
-#: panels/keyboard/cc-keyboard-panel.ui:149
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:236
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "將快捷鍵重設回它們預設的按鍵組合"
 
-#: panels/keyboard/cc-keyboard-panel.ui:178
-msgid "No keyboard shortcut found"
-msgstr "找不到鍵盤快捷鍵"
-
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:404
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:391
 #, c-format
 msgid "%s is already being used for %s. If you replace it, %s will be disabled"
 msgstr "%s 已經被 %s 使用。如您替換,則 %s 會被停用"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:547
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:535
 msgid "Enter the new shortcut"
 msgstr "輸入新的快捷鍵"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:564
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:550
 msgid "Set Custom Shortcut"
 msgstr "設定自訂快捷鍵"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:564
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:550
 msgid "Set Shortcut"
 msgstr "設定快捷鍵"
 
 #. TRANSLATORS: %s is replaced with a description of the keyboard shortcut
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:575
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:561
 #, c-format
 msgid "Enter new shortcut to change %s."
 msgstr "請輸入新的快捷鍵來更改 %s。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:1002
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:987
 msgid "Add Custom Shortcut"
 msgstr "加入自訂快捷鍵"
 
@@ -2235,10 +2330,6 @@ msgstr "設定快捷鍵…"
 msgid "None"
 msgstr "沒有"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:286
-msgid "Remove"
-msgstr "移除"
-
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:296
 msgid "Add"
 msgstr "加入"
@@ -2247,14 +2338,17 @@ msgstr "加入"
 msgid "Replace"
 msgstr "取代"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:324
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:325
 msgid "Set"
 msgstr "設定"
 
+#: panels/keyboard/cc-keyboard-shortcut-row.ui:27
+msgid "Reset the shortcut to its default value"
+msgstr "將快捷鍵重設回預設值"
+
 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
-#: panels/region/cc-region-panel.ui:392 shell/cc-window.ui:326
-msgid "Keyboard Shortcuts"
-msgstr "鍵盤快捷鍵"
+msgid "Keyboard"
+msgstr "鍵盤"
 
 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 msgid "View and change keyboard shortcuts and set your typing preferences"
@@ -2293,11 +2387,11 @@ msgstr ""
 "使用 Mozilla 位置服務:<a href='https://location.services.mozilla.com/";
 "privacy'>隱私服務</a>"
 
-#: panels/location/cc-location-panel.ui:93
+#: panels/location/cc-location-panel.ui:94
 msgid "Allow the applications below to determine your location."
 msgstr "允許下列應用程式判斷位置。"
 
-#: panels/location/cc-location-panel.ui:113
+#: panels/location/cc-location-panel.ui:114
 msgid "No Applications Have Asked for Location Access"
 msgstr "沒有應用程式請求位置存取權限"
 
@@ -2559,35 +2653,35 @@ msgstr "邊緣捲動"
 msgid "Test Your _Settings"
 msgstr "測試您的設定值(_S)"
 
-#: panels/mouse/cc-mouse-test.c:132 panels/mouse/cc-mouse-test.ui:25
+#: panels/mouse/cc-mouse-test.c:131 panels/mouse/cc-mouse-test.ui:25
 msgid "Try clicking, double clicking, scrolling"
 msgstr "試著單擊、雙擊、捲動"
 
-#: panels/mouse/cc-mouse-test.c:137
+#: panels/mouse/cc-mouse-test.c:136
 msgid "Five clicks, GEGL time!"
 msgstr "五次點擊,GEGL 時間!"
 
-#: panels/mouse/cc-mouse-test.c:142
+#: panels/mouse/cc-mouse-test.c:141
 msgid "Double click, primary button"
 msgstr "雙擊,主要按鈕"
 
-#: panels/mouse/cc-mouse-test.c:142
+#: panels/mouse/cc-mouse-test.c:141
 msgid "Single click, primary button"
 msgstr "單擊,主要按鈕"
 
-#: panels/mouse/cc-mouse-test.c:145
+#: panels/mouse/cc-mouse-test.c:144
 msgid "Double click, middle button"
 msgstr "雙擊,中央按鈕"
 
-#: panels/mouse/cc-mouse-test.c:145
+#: panels/mouse/cc-mouse-test.c:144
 msgid "Single click, middle button"
 msgstr "單擊,中央按鈕"
 
-#: panels/mouse/cc-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:147
 msgid "Double click, secondary button"
 msgstr "雙擊,次要按鈕"
 
-#: panels/mouse/cc-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:147
 msgid "Single click, secondary button"
 msgstr "單擊,次要按鈕"
 
@@ -2607,11 +2701,11 @@ msgstr ""
 "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;觸控板;指標;點擊;輕"
 "觸;雙擊;按鈕;軌跡球;捲動;"
 
-#: panels/network/cc-network-panel.c:648 panels/network/cc-wifi-panel.ui:359
+#: panels/network/cc-network-panel.c:661 panels/network/cc-wifi-panel.ui:307
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "噢,有問題發生。請聯繫您的軟體供應商。"
 
-#: panels/network/cc-network-panel.c:654
+#: panels/network/cc-network-panel.c:667
 msgid "NetworkManager needs to be running."
 msgstr "需要先執行 NetworkManager。"
 
@@ -2620,7 +2714,7 @@ msgid "Other Devices"
 msgstr "其他裝置"
 
 #: panels/network/cc-network-panel.ui:107
-#: panels/network/connection-editor/net-connection-editor.c:593
+#: panels/network/connection-editor/net-connection-editor.c:587
 msgid "VPN"
 msgstr "VPN"
 
@@ -2629,53 +2723,58 @@ msgid "Not set up"
 msgstr "尚未設置"
 
 #. TRANSLATORS: This happens when the connection name does not contain the SSID.
-#: panels/network/cc-wifi-connection-row.c:207
+#: panels/network/cc-wifi-connection-row.c:208
 #, c-format
 msgctxt "Wi-Fi Connection"
 msgid "%s (SSID: %s)"
 msgstr "%s (SSID: %s)"
 
-#: panels/network/cc-wifi-connection-row.c:267
+#: panels/network/cc-wifi-connection-row.c:268
 msgid "Insecure network (WEP)"
 msgstr "不安全網路 (WEP)"
 
-#: panels/network/cc-wifi-connection-row.c:272
+#: panels/network/cc-wifi-connection-row.c:273
 msgid "Secure network (WPA)"
 msgstr "安全網路 (WPA)"
 
-#: panels/network/cc-wifi-connection-row.c:277
+#: panels/network/cc-wifi-connection-row.c:278
 msgid "Secure network (WPA2)"
 msgstr "安全網路 (WPA2)"
 
-#: panels/network/cc-wifi-connection-row.c:282
+#: panels/network/cc-wifi-connection-row.c:283
 msgid "Secure network (WPA3)"
 msgstr "安全網路 (WPA3)"
 
-#: panels/network/cc-wifi-connection-row.c:287
+#: panels/network/cc-wifi-connection-row.c:288
 msgid "Secure network"
 msgstr "安全網路"
 
-#: panels/network/cc-wifi-connection-row.ui:102
-#: panels/network/net-device-ethernet.c:316
+#. TRANSLATORS: device status
+#: panels/network/cc-wifi-connection-row.ui:68 panels/network/panel-common.c:63
+msgid "Connected"
+msgstr "已連線"
+
+#: panels/network/cc-wifi-connection-row.ui:100
+#: panels/network/net-device-ethernet.c:327
 #: panels/network/network-bluetooth.ui:76
-#: panels/network/network-ethernet.ui:111 panels/network/network-mobile.ui:414
-#: panels/network/network-vpn.ui:75
+#: panels/network/network-ethernet.ui:111 panels/network/network-mobile.ui:450
+#: panels/network/network-vpn.ui:77
 msgid "Options…"
 msgstr "選項…"
 
 #. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name
-#: panels/network/cc-wifi-hotspot-dialog.c:132
+#: panels/network/cc-wifi-hotspot-dialog.c:134
 #, c-format
 msgid ""
 "Turning on the hotspot will disconnect from %s, and it will not be possible "
 "to access the internet through Wi-Fi."
 msgstr "開啟熱點會斷開 %s 的連線,且會不能透過 Wi-Fi 連線網路。"
 
-#: panels/network/cc-wifi-hotspot-dialog.c:248
+#: panels/network/cc-wifi-hotspot-dialog.c:265
 msgid "Must have a minimum of 8 characters"
 msgstr "必須至少有 8 個字元"
 
-#: panels/network/cc-wifi-hotspot-dialog.c:458
+#: panels/network/cc-wifi-hotspot-dialog.c:479
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "開啟 Wi-Fi 熱點?"
 
@@ -2695,7 +2794,7 @@ msgstr "網路名稱"
 #. Translators: This is a password needed for printing.
 #: panels/network/cc-wifi-hotspot-dialog.ui:69
 #: panels/printers/authentication-dialog.ui:96
-#: panels/printers/new-printer-dialog.ui:383
+#: panels/printers/new-printer-dialog.ui:389
 #: panels/printers/pp-jobs-dialog.ui:70
 #: panels/user-accounts/cc-add-user-dialog.ui:249
 msgid "Password"
@@ -2713,61 +2812,61 @@ msgstr "自動產生密碼"
 msgid "_Turn On"
 msgstr "開啟(_T)"
 
-#: panels/network/cc-wifi-panel.c:543
+#: panels/network/cc-wifi-panel.c:544
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
 #: panels/network/network-wifi.ui:53
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: panels/network/cc-wifi-panel.c:863
+#: panels/network/cc-wifi-panel.c:864
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: panels/network/cc-wifi-panel.c:866
+#: panels/network/cc-wifi-panel.c:867
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: panels/network/cc-wifi-panel.ui:54
+#: panels/network/cc-wifi-panel.ui:46
 msgid "Airplane Mode"
 msgstr "飛安模式"
 
-#: panels/network/cc-wifi-panel.ui:70
+#: panels/network/cc-wifi-panel.ui:47
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "停用 Wi-Fi、藍牙與行動寬頻"
 
-#: panels/network/cc-wifi-panel.ui:139
+#: panels/network/cc-wifi-panel.ui:87
 msgid "No Wi-Fi Adapter Found"
 msgstr "找不到 Wi-Fi 網卡"
 
-#: panels/network/cc-wifi-panel.ui:151
+#: panels/network/cc-wifi-panel.ui:99
 msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
 msgstr "請確認您的 Wi-Fi 網卡已插入並啟動"
 
-#: panels/network/cc-wifi-panel.ui:186
+#: panels/network/cc-wifi-panel.ui:134
 msgid "Airplane Mode On"
 msgstr "開啟飛安模式"
 
-#: panels/network/cc-wifi-panel.ui:198
+#: panels/network/cc-wifi-panel.ui:146
 msgid "Turn off to use Wi-Fi"
 msgstr "關閉以使用 Wi-Fi"
 
-#: panels/network/cc-wifi-panel.ui:236
+#: panels/network/cc-wifi-panel.ui:184
 msgid "Wi-Fi Hotspot Active"
 msgstr "Wi-Fi 熱點作用中"
 
-#: panels/network/cc-wifi-panel.ui:247
+#: panels/network/cc-wifi-panel.ui:195
 msgid "Mobile devices can scan the QR code to connect."
 msgstr "行動裝置可以掃描 QR 碼來連線。"
 
-#: panels/network/cc-wifi-panel.ui:257
+#: panels/network/cc-wifi-panel.ui:205
 msgid "Turn Off Hotspot…"
 msgstr "關閉熱點…"
 
-#: panels/network/cc-wifi-panel.ui:279
+#: panels/network/cc-wifi-panel.ui:227
 msgid "Visible Networks"
 msgstr "可見網路"
 
-#: panels/network/cc-wifi-panel.ui:348
+#: panels/network/cc-wifi-panel.ui:296
 msgid "NetworkManager needs to be running"
 msgstr "需要先執行 NetworkManager"
 
@@ -2776,7 +2875,7 @@ msgid "802.1x _Security"
 msgstr "802.1x 防護(_S)"
 
 #: panels/network/connection-editor/ce-page-8021x-security.c:112
-#: panels/network/connection-editor/ce-page-security.c:423
+#: panels/network/connection-editor/ce-page-security.c:424
 #: panels/network/connection-editor/details-page.ui:90
 msgid "Security"
 msgstr "安全性"
@@ -2812,63 +2911,63 @@ msgid "Profile %d"
 msgstr "設定檔 %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:93
-#: panels/network/net-device-wifi.c:229
+#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/network/net-device-wifi.c:228
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:97
-#: panels/network/net-device-wifi.c:234
+#: panels/network/connection-editor/ce-page-details.c:99
+#: panels/network/net-device-wifi.c:233
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA3 WiFi security
-#: panels/network/connection-editor/ce-page-details.c:103
+#: panels/network/connection-editor/ce-page-details.c:105
 msgid "WPA3"
 msgstr "WPA3"
 
 #. TRANSLATORS: this Enhanced Open WiFi security
-#: panels/network/connection-editor/ce-page-details.c:108
-#: panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-details.c:110
+#: panels/network/connection-editor/ce-page-security.c:279
 msgid "Enhanced Open"
 msgstr "Enhanced Open"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:115
+#: panels/network/connection-editor/ce-page-details.c:117
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:121
+#: panels/network/connection-editor/ce-page-details.c:123
 msgid "Enterprise"
 msgstr "企業版"
 
-#: panels/network/connection-editor/ce-page-details.c:126
-#: panels/network/net-device-wifi.c:219
+#: panels/network/connection-editor/ce-page-details.c:128
+#: panels/network/net-device-wifi.c:218
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
 
-#: panels/network/connection-editor/ce-page-details.c:147
+#: panels/network/connection-editor/ce-page-details.c:149
 msgid "Never"
 msgstr "永不"
 
-#: panels/network/connection-editor/ce-page-details.c:162
+#: panels/network/connection-editor/ce-page-details.c:164
 #: panels/network/net-device-ethernet.c:107
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天以前"
 
-#: panels/network/connection-editor/ce-page-details.c:287
+#: panels/network/connection-editor/ce-page-details.c:291
 #, c-format
 msgid "%d Mb/s (%1.1f GHz)"
 msgstr "%d Mb/s (%1.1f GHz)"
 
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:289
-#: panels/network/net-device-ethernet.c:201
+#: panels/network/connection-editor/ce-page-details.c:293
+#: panels/network/net-device-ethernet.c:214
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
@@ -2910,42 +3009,68 @@ msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: panels/network/connection-editor/ce-page-details.c:396
+#: panels/network/connection-editor/ce-page-details.c:410
 #: panels/network/connection-editor/details-page.ui:108
-#: panels/network/net-device-ethernet.c:142
-#: panels/network/net-device-mobile.c:430
+#: panels/network/net-device-ethernet.c:149
+#: panels/network/net-device-mobile.c:447
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
-#: panels/network/connection-editor/ce-page-details.c:397
+#: panels/network/connection-editor/ce-page-details.c:411
 #: panels/network/connection-editor/details-page.ui:126
-#: panels/network/net-device-ethernet.c:143
-#: panels/network/net-device-ethernet.c:147
-#: panels/network/net-device-mobile.c:431 panels/network/network-mobile.ui:200
+#: panels/network/net-device-ethernet.c:150
+#: panels/network/net-device-mobile.c:448 panels/network/network-mobile.ui:218
 msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
-#: panels/network/connection-editor/ce-page-details.c:400
-#: panels/network/connection-editor/ce-page-details.c:401
-#: panels/network/net-device-ethernet.c:145
-#: panels/network/net-device-mobile.c:434
-#: panels/network/net-device-mobile.c:435 panels/network/network-mobile.ui:183
+#: panels/network/connection-editor/ce-page-details.c:414
+#: panels/network/connection-editor/ce-page-details.c:415
+#: panels/network/net-device-ethernet.c:152
+#: panels/network/net-device-ethernet.c:154
+#: panels/network/net-device-mobile.c:451
+#: panels/network/net-device-mobile.c:452 panels/network/network-mobile.ui:201
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: panels/network/connection-editor/ce-page-details.c:434
+#: panels/network/connection-editor/ce-page-details.c:419
+#: panels/network/net-device-ethernet.c:163
+#: panels/network/net-device-mobile.c:456
+msgid "DNS4"
+msgstr "DNS4"
+
+#: panels/network/connection-editor/ce-page-details.c:420
+#: panels/network/net-device-ethernet.c:164
+#: panels/network/net-device-mobile.c:457
+msgid "DNS6"
+msgstr "DNS6"
+
+#: panels/network/connection-editor/ce-page-details.c:423
+#: panels/network/connection-editor/ce-page-details.c:424
+#: panels/network/connection-editor/details-page.ui:199
+#: panels/network/connection-editor/details-page.ui:218
+#: panels/network/connection-editor/ip4-page.ui:211
+#: panels/network/connection-editor/ip6-page.ui:225
+#: panels/network/net-device-ethernet.c:166
+#: panels/network/net-device-ethernet.c:168
+#: panels/network/net-device-mobile.c:459
+#: panels/network/net-device-mobile.c:460 panels/network/network-mobile.ui:253
+#: panels/network/network-mobile.ui:271
+msgid "DNS"
+msgstr "DNS"
+
+#: panels/network/connection-editor/ce-page-details.c:457
 msgid "Forget Connection"
 msgstr "忘記連線"
 
-#: panels/network/connection-editor/ce-page-details.c:436
+#: panels/network/connection-editor/ce-page-details.c:459
 msgid "Remove Connection Profile"
 msgstr "移除連線個人檔案"
 
-#: panels/network/connection-editor/ce-page-details.c:438
+#: panels/network/connection-editor/ce-page-details.c:461
 msgid "Remove VPN"
 msgstr "移除 VPN"
 
-#: panels/network/connection-editor/ce-page-details.c:456
+#: panels/network/connection-editor/ce-page-details.c:479
 msgid "Details"
 msgstr "詳細資料"
 
@@ -2959,56 +3084,56 @@ msgstr "自動"
 msgid "Identity"
 msgstr "身分"
 
-#: panels/network/connection-editor/ce-page-ip4.c:246
-#: panels/network/connection-editor/ce-page-ip6.c:227
+#: panels/network/connection-editor/ce-page-ip4.c:244
+#: panels/network/connection-editor/ce-page-ip6.c:225
 msgid "Delete Address"
 msgstr "刪除位址"
 
-#: panels/network/connection-editor/ce-page-ip4.c:405
-#: panels/network/connection-editor/ce-page-ip6.c:375
+#: panels/network/connection-editor/ce-page-ip4.c:399
+#: panels/network/connection-editor/ce-page-ip6.c:369
 msgid "Delete Route"
 msgstr "刪除路由"
 
-#: panels/network/connection-editor/ce-page-ip4.c:827
+#: panels/network/connection-editor/ce-page-ip4.c:750
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:760
+#: panels/network/connection-editor/ce-page-ip6.c:722
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:267
+#: panels/network/connection-editor/ce-page-security.c:268
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: panels/network/connection-editor/ce-page-security.c:302
+#: panels/network/connection-editor/ce-page-security.c:303
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元金鑰 (Hex 或 ASCII)"
 
-#: panels/network/connection-editor/ce-page-security.c:312
+#: panels/network/connection-editor/ce-page-security.c:313
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元密語"
 
-#: panels/network/connection-editor/ce-page-security.c:325
+#: panels/network/connection-editor/ce-page-security.c:326
 #: panels/network/wireless-security/ws-dynamic-wep.ui:20
 #: panels/network/wireless-security/ws-wpa-eap.ui:25
 msgid "LEAP"
 msgstr "LEAP"
 
-#: panels/network/connection-editor/ce-page-security.c:338
+#: panels/network/connection-editor/ce-page-security.c:339
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP (802.1x)"
 
-#: panels/network/connection-editor/ce-page-security.c:352
+#: panels/network/connection-editor/ce-page-security.c:353
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 與 WPA2 個人版"
 
-#: panels/network/connection-editor/ce-page-security.c:366
+#: panels/network/connection-editor/ce-page-security.c:367
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 與 WPA2 企業版"
 
-#: panels/network/connection-editor/ce-page-security.c:380
+#: panels/network/connection-editor/ce-page-security.c:381
 msgid "WPA3 Personal"
 msgstr "WPA3 個人版"
 
@@ -3021,7 +3146,7 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: panels/network/connection-editor/details-page.ui:144
-#: panels/network/net-device-ethernet.c:150
+#: panels/network/net-device-ethernet.c:157
 msgid "Hardware Address"
 msgstr "硬體位址"
 
@@ -3030,36 +3155,28 @@ msgid "Supported Frequencies"
 msgstr "支援的頻率"
 
 #: panels/network/connection-editor/details-page.ui:180
-#: panels/network/net-device-ethernet.c:154
-#: panels/network/network-mobile.ui:217
+#: panels/network/net-device-ethernet.c:160
+#: panels/network/network-mobile.ui:235
 msgid "Default Route"
 msgstr "預設路由"
 
-#: panels/network/connection-editor/details-page.ui:199
-#: panels/network/connection-editor/ip4-page.ui:211
-#: panels/network/connection-editor/ip6-page.ui:225
-#: panels/network/net-device-ethernet.c:156
-#: panels/network/network-mobile.ui:235
-msgid "DNS"
-msgstr "DNS"
-
-#: panels/network/connection-editor/details-page.ui:217
+#: panels/network/connection-editor/details-page.ui:236
 msgid "Last Used"
 msgstr "最後使用的"
 
-#: panels/network/connection-editor/details-page.ui:376
+#: panels/network/connection-editor/details-page.ui:415
 msgid "Connect _automatically"
 msgstr "自動連線(_A)"
 
-#: panels/network/connection-editor/details-page.ui:395
+#: panels/network/connection-editor/details-page.ui:434
 msgid "Make available to _other users"
 msgstr "允許其他使用者使用(_O)"
 
-#: panels/network/connection-editor/details-page.ui:428
+#: panels/network/connection-editor/details-page.ui:467
 msgid "_Metered connection: has data limits or can incur charges"
 msgstr "計量連線(_M):有資料限制或可能會收取費用"
 
-#: panels/network/connection-editor/details-page.ui:439
+#: panels/network/connection-editor/details-page.ui:478
 msgid ""
 "Software updates and other large downloads will not be started automatically."
 msgstr "軟體更新及其他大型下載不會自動開始。"
@@ -3102,7 +3219,7 @@ msgstr "只有本機連線"
 
 #: panels/network/connection-editor/ip4-page.ui:69
 #: panels/network/connection-editor/ip6-page.ui:83
-#: panels/network/net-proxy.c:72 panels/network/network-proxy.ui:116
+#: panels/network/net-proxy.c:71 panels/network/network-proxy.ui:118
 msgid "Manual"
 msgstr "手動"
 
@@ -3146,7 +3263,7 @@ msgstr "通訊閘"
 #: panels/network/connection-editor/ip6-page.ui:42
 #: panels/network/connection-editor/ip6-page.ui:237
 #: panels/network/connection-editor/ip6-page.ui:305
-#: panels/network/net-proxy.c:74 panels/network/network-proxy.ui:106
+#: panels/network/net-proxy.c:73 panels/network/network-proxy.ui:107
 #: panels/network/wireless-security/eap-method-peap.ui:33
 msgid "Automatic"
 msgstr "自動"
@@ -3195,19 +3312,19 @@ msgstr "自動,僅使用 DHCP"
 msgid "Prefix"
 msgstr "前綴"
 
-#: panels/network/connection-editor/net-connection-editor.c:288
+#: panels/network/connection-editor/net-connection-editor.c:280
 msgid "Unable to open connection editor"
 msgstr "無法開啟連線編輯器"
 
-#: panels/network/connection-editor/net-connection-editor.c:304
+#: panels/network/connection-editor/net-connection-editor.c:296
 msgid "New Profile"
 msgstr "新增設定檔"
 
-#: panels/network/connection-editor/net-connection-editor.c:737
+#: panels/network/connection-editor/net-connection-editor.c:731
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: panels/network/connection-editor/net-connection-editor.c:769
+#: panels/network/connection-editor/net-connection-editor.c:763
 msgid "Add VPN"
 msgstr "加入 VPN"
 
@@ -3314,7 +3431,7 @@ msgstr "今日"
 msgid "yesterday"
 msgstr "昨日"
 
-#: panels/network/net-device-ethernet.c:161
+#: panels/network/net-device-ethernet.c:174
 msgid "Last used"
 msgstr "最後使用的"
 
@@ -3323,12 +3440,12 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:250
+#: panels/network/net-device-ethernet.c:261
 #: panels/network/network-bluetooth.ui:38 panels/network/network-ethernet.ui:18
 msgid "Wired"
 msgstr "有線"
 
-#: panels/network/net-device-mobile.c:207
+#: panels/network/net-device-mobile.c:209
 msgid "Add new connection"
 msgstr "加入新連線"
 
@@ -3342,45 +3459,45 @@ msgstr "選取網路的詳細資料包含密碼及任何自訂的設定都會消
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
-#: panels/network/net-device-wifi.c:1011 panels/network/net-device-wifi.c:1018
+#: panels/network/net-device-wifi.c:1034 panels/network/net-device-wifi.c:1041
 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:1053
+#: panels/network/net-device-wifi.c:1076
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
-#: panels/network/net-device-wifi.c:1193
+#: panels/network/net-device-wifi.c:1217
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: panels/network/net-device-wifi.c:1196
+#: panels/network/net-device-wifi.c:1220
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: panels/network/net-proxy.c:70
-#: panels/notifications/cc-notifications-panel.c:268
-#: panels/power/cc-power-panel.c:1728 panels/power/cc-power-panel.c:1739
-#: panels/universal-access/cc-ua-panel.c:480
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
-#: panels/universal-access/cc-ua-panel.ui:321
-#: panels/universal-access/cc-ua-panel.ui:367
-#: panels/universal-access/cc-ua-panel.ui:413
-#: panels/universal-access/cc-ua-panel.ui:519
-#: panels/universal-access/cc-ua-panel.ui:672
-#: panels/universal-access/cc-ua-panel.ui:718
-#: panels/universal-access/cc-ua-panel.ui:764
-#: panels/universal-access/cc-ua-panel.ui:948
+#: panels/network/net-proxy.c:69
+#: panels/notifications/cc-notifications-panel.c:266
+#: panels/power/cc-power-panel.c:1133 panels/power/cc-power-panel.c:1144
+#: panels/universal-access/cc-ua-panel.c:328
+#: panels/universal-access/cc-ua-panel.c:603
+#: panels/universal-access/cc-ua-panel.c:613
+#: panels/universal-access/cc-ua-panel.c:625
+#: panels/universal-access/cc-ua-panel.c:668
+#: panels/universal-access/cc-ua-panel.ui:300
+#: panels/universal-access/cc-ua-panel.ui:346
+#: panels/universal-access/cc-ua-panel.ui:392
+#: panels/universal-access/cc-ua-panel.ui:498
+#: panels/universal-access/cc-ua-panel.ui:651
+#: panels/universal-access/cc-ua-panel.ui:697
+#: panels/universal-access/cc-ua-panel.ui:743
+#: panels/universal-access/cc-ua-panel.ui:927
 msgid "Off"
 msgstr "關閉"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: panels/network/net-proxy.c:113
+#: panels/network/net-proxy.c:112
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "當沒有提供設定 URL 時會使用網頁代理伺服器自動發現。"
@@ -3389,7 +3506,7 @@ 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:121
+#: panels/network/net-proxy.c:120
 msgid "This is not recommended for untrusted public networks."
 msgstr "這不建議用於不信任的公用網路。"
 
@@ -3398,7 +3515,7 @@ msgstr "這不建議用於不信任的公用網路。"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: panels/network/net-vpn.c:66 panels/network/net-vpn.c:163
+#: panels/network/net-vpn.c:65 panels/network/net-vpn.c:158
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
@@ -3415,51 +3532,51 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "供應商"
 
-#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:95
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:96
 msgid "Network Proxy"
 msgstr "網路代理伺服器"
 
-#: panels/network/network-proxy.ui:176
+#: panels/network/network-proxy.ui:180
 msgid "_HTTP Proxy"
 msgstr "_HTTP 代理伺服器"
 
-#: panels/network/network-proxy.ui:195
+#: panels/network/network-proxy.ui:199
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS 代理伺服器"
 
-#: panels/network/network-proxy.ui:214
+#: panels/network/network-proxy.ui:218
 msgid "_FTP Proxy"
 msgstr "_FTP 代理伺服器"
 
-#: panels/network/network-proxy.ui:233
+#: panels/network/network-proxy.ui:237
 msgid "_Socks Host"
 msgstr "Socks 主機(_S)"
 
-#: panels/network/network-proxy.ui:252
+#: panels/network/network-proxy.ui:256
 msgid "_Ignore Hosts"
 msgstr "忽略主機(_I)"
 
-#: panels/network/network-proxy.ui:290
+#: panels/network/network-proxy.ui:294
 msgid "HTTP proxy port"
 msgstr "HTTP 代理伺服器連接埠"
 
-#: panels/network/network-proxy.ui:367
+#: panels/network/network-proxy.ui:371
 msgid "HTTPS proxy port"
 msgstr "HTTPS 代理伺服器連接埠"
 
-#: panels/network/network-proxy.ui:388
+#: panels/network/network-proxy.ui:392
 msgid "FTP proxy port"
 msgstr "FTP 代理伺服器連接埠"
 
-#: panels/network/network-proxy.ui:409
+#: panels/network/network-proxy.ui:413
 msgid "Socks proxy port"
 msgstr "Socks 代理伺服器通訊埠"
 
-#: panels/network/network-proxy.ui:438
+#: panels/network/network-proxy.ui:442
 msgid "_Configuration URL"
 msgstr "設定網址(_C)"
 
-#: panels/network/network-vpn.ui:55
+#: panels/network/network-vpn.ui:56
 msgid "Turn VPN connection off"
 msgstr "關閉 VPN 連線"
 
@@ -3506,7 +3623,7 @@ msgstr "未管理"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: Status of Parental Controls setup
-#: panels/network/panel-common.c:45 panels/user-accounts/cc-user-panel.c:950
+#: panels/network/panel-common.c:45 panels/user-accounts/cc-user-panel.c:928
 msgid "Unavailable"
 msgstr "無法使用"
 
@@ -3520,11 +3637,6 @@ msgstr "連線中"
 msgid "Authentication required"
 msgstr "需要核對"
 
-#. TRANSLATORS: device status
-#: panels/network/panel-common.c:63
-msgid "Connected"
-msgstr "已連線"
-
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:67
 msgid "Disconnecting"
@@ -3746,12 +3858,12 @@ msgid "Connection dependency failed"
 msgstr "連線相依性解析失敗"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:351
+#: panels/network/panel-common.c:327
 msgid "Firmware missing"
 msgstr "缺少韌體"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:355
+#: panels/network/panel-common.c:331
 msgid "Cable unplugged"
 msgstr "纜線已拔除"
 
@@ -3831,11 +3943,11 @@ msgstr "內部核對(_I)"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: panels/network/wireless-security/eap-method-leap.c:64
+#: panels/network/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
 msgstr "缺少 EAP-LEAP 使用者名稱"
 
-#: panels/network/wireless-security/eap-method-leap.c:73
+#: panels/network/wireless-security/eap-method-leap.c:80
 msgid "missing EAP-LEAP password"
 msgstr "缺少 EAP-LEAP 密碼"
 
@@ -3850,11 +3962,12 @@ msgstr "使用者名稱(_U)"
 #: panels/network/wireless-security/eap-method-leap.ui:31
 #: panels/network/wireless-security/eap-method-simple.ui:31
 #: panels/network/wireless-security/ws-leap.ui:32
+#: panels/network/wireless-security/ws-sae.ui:14
 #: panels/network/wireless-security/ws-wpa-psk.ui:14
 #: panels/sharing/cc-sharing-panel.ui:202
 #: panels/user-accounts/cc-add-user-dialog.ui:310
 #: panels/user-accounts/cc-add-user-dialog.ui:547
-#: panels/user-accounts/cc-user-panel.ui:436
+#: panels/user-accounts/cc-user-panel.ui:478
 msgid "_Password"
 msgstr "密碼(_P)"
 
@@ -3862,6 +3975,7 @@ msgstr "密碼(_P)"
 #: panels/network/wireless-security/eap-method-simple.ui:73
 #: panels/network/wireless-security/eap-method-tls.ui:157
 #: panels/network/wireless-security/ws-leap.ui:56
+#: panels/network/wireless-security/ws-sae.ui:54
 #: panels/network/wireless-security/ws-wpa-psk.ui:64
 msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
@@ -3876,7 +3990,7 @@ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "無效的 EAP-PEAP CA 憑證:沒有指定憑證"
 
 #: panels/network/wireless-security/eap-method-peap.c:328
-#: panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-tls.c:513
 #: panels/network/wireless-security/eap-method-ttls.c:336
 msgid "Choose a Certificate Authority certificate"
 msgstr "選擇憑證授權單位 (CA) 憑證"
@@ -3919,34 +4033,34 @@ msgstr "缺少 EAP 使用者名稱"
 msgid "missing EAP password"
 msgstr "缺少 EAP 密碼"
 
-#: panels/network/wireless-security/eap-method-tls.c:91
+#: panels/network/wireless-security/eap-method-tls.c:92
 msgid "missing EAP-TLS identity"
 msgstr "缺少 EAP-TLS 身分"
 
-#: panels/network/wireless-security/eap-method-tls.c:101
+#: panels/network/wireless-security/eap-method-tls.c:102
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "無效的 EAP-TLS CA 憑證:%s"
 
-#: panels/network/wireless-security/eap-method-tls.c:111
+#: panels/network/wireless-security/eap-method-tls.c:112
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "無效的 EAP-TLS CA 憑證:沒有指定憑證"
 
-#: panels/network/wireless-security/eap-method-tls.c:125
+#: panels/network/wireless-security/eap-method-tls.c:129
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "無效的 EAP-TLS 私鑰:%s"
 
-#: panels/network/wireless-security/eap-method-tls.c:135
+#: panels/network/wireless-security/eap-method-tls.c:139
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "無效的 EAP-TLS 使用者憑證:%s"
 
-#: panels/network/wireless-security/eap-method-tls.c:266
+#: panels/network/wireless-security/eap-method-tls.c:272
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私密金鑰不安全"
 
-#: panels/network/wireless-security/eap-method-tls.c:269
+#: panels/network/wireless-security/eap-method-tls.c:275
 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 "
@@ -3959,11 +4073,11 @@ msgstr ""
 "\n"
 "(您可以使用 openssl 來加密您的私密金鑰)"
 
-#: panels/network/wireless-security/eap-method-tls.c:500
+#: panels/network/wireless-security/eap-method-tls.c:506
 msgid "Choose your personal certificate"
 msgstr "選擇您的個人憑證"
 
-#: panels/network/wireless-security/eap-method-tls.c:514
+#: panels/network/wireless-security/eap-method-tls.c:520
 msgid "Choose your private key"
 msgstr "選擇您的私密金鑰"
 
@@ -4049,30 +4163,39 @@ msgstr "保護式 EAP (PEAP)"
 msgid "Au_thentication"
 msgstr "核對(_T)"
 
-#: panels/network/wireless-security/ws-leap.c:65
+#: panels/network/wireless-security/ws-leap.c:66
 msgid "missing leap-username"
 msgstr "缺少 leap 使用者名稱"
 
-#: panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:81
 msgid "missing leap-password"
 msgstr "缺少 leap 密碼"
 
-#: panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-sae.c:77
+msgid "Wi-Fi password is missing."
+msgstr "缺少 Wi-Fi 密碼"
+
+#: panels/network/wireless-security/ws-sae.ui:42
+#: panels/network/wireless-security/ws-wpa-psk.ui:42
+msgid "_Type"
+msgstr "類型(_T)"
+
+#: panels/network/wireless-security/ws-wep-key.c:114
 msgid "missing wep-key"
 msgstr "缺少 wep-key"
 
-#: panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:123
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "無效的 wep-key:長度為 %zu 的金鑰只能包含十六進位數字"
 
-#: panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "無效的 wep-key:長度為 %zu 的金鑰只能包含 ascii 字元"
 
-#: panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:137
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4081,11 +4204,11 @@ msgstr ""
 "無效的 wep-key:錯誤的金鑰長度 %zu。金鑰長度必須為 5/13 (ascii) 或 10/26 (十"
 "六進位)"
 
-#: panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:144
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無效的 wep-key︰密語必須為非空"
 
-#: panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:146
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無效的 wep-key︰密語必須少於 64 個字元"
 
@@ -4113,21 +4236,17 @@ msgstr "顯示金鑰(_W)"
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:77
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr "無效的 wpa-psk:無效的長度 %zu。必須為 [8,63] 位元組或 64 十六進位數字"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:86
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無效的 wpa-psk:不能將 64 位元組金鑰轉譯為十六進位"
 
-#: panels/network/wireless-security/ws-wpa-psk.ui:42
-msgid "_Type"
-msgstr "類型(_T)"
-
 #. This is the per application switch for message tray usage.
 #: panels/notifications/cc-app-notifications-dialog.ui:60
 msgctxt "notifications"
@@ -4167,21 +4286,21 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "在鎖定畫面中顯示訊息內容(_O)"
 
-#: panels/notifications/cc-notifications-panel.c:268
-#: panels/power/cc-power-panel.c:1734 panels/power/cc-power-panel.c:1741
-#: panels/universal-access/cc-ua-panel.c:480
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/notifications/cc-notifications-panel.c:266
+#: panels/power/cc-power-panel.c:1139 panels/power/cc-power-panel.c:1146
+#: panels/universal-access/cc-ua-panel.c:328
+#: panels/universal-access/cc-ua-panel.c:603
+#: panels/universal-access/cc-ua-panel.c:613
+#: panels/universal-access/cc-ua-panel.c:625
+#: panels/universal-access/cc-ua-panel.c:668
 msgid "On"
 msgstr "開啟"
 
-#: panels/notifications/cc-notifications-panel.ui:47
+#: panels/notifications/cc-notifications-panel.ui:48
 msgid "_Do Not Disturb"
 msgstr "不要打擾(_D)"
 
-#: panels/notifications/cc-notifications-panel.ui:55
+#: panels/notifications/cc-notifications-panel.ui:56
 msgid "_Lock Screen Notifications"
 msgstr "鎖定畫面通知(_L)"
 
@@ -4206,14 +4325,14 @@ msgstr "其他"
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:918
+#: panels/online-accounts/cc-online-accounts-panel.c:916
 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:984
+#: panels/online-accounts/cc-online-accounts-panel.c:982
 #, c-format
 msgid "%s removed"
 msgstr "已移除 %s"
@@ -4260,17 +4379,17 @@ msgstr "加入帳號"
 msgid "Remove Account"
 msgstr "移除帳號"
 
-#: panels/power/cc-power-panel.c:331
+#: panels/power/cc-battery-row.c:80
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: panels/power/cc-power-panel.c:337
+#: panels/power/cc-battery-row.c:83
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: panels/power/cc-power-panel.c:349
+#: panels/power/cc-battery-row.c:92
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -4278,262 +4397,173 @@ msgstr[0] "%i 小時"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: panels/power/cc-power-panel.c:357
+#: panels/power/cc-battery-row.c:98
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: panels/power/cc-power-panel.c:358
+#: panels/power/cc-battery-row.c:99
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: panels/power/cc-power-panel.c:359
+#: panels/power/cc-battery-row.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:377
+#: panels/power/cc-battery-row.c:117
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s後完全充飽"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:384
+#: panels/power/cc-battery-row.c:124
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意:剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:389
+#: panels/power/cc-battery-row.c:129
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424
+#: panels/power/cc-battery-row.c:134 panels/power/cc-battery-row.c:164
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428
+#: panels/power/cc-battery-row.c:138 panels/power/cc-battery-row.c:168
 msgid "Not charging"
 msgstr "未充電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:402 panels/power/cc-power-panel.c:432
+#: panels/power/cc-battery-row.c:142 panels/power/cc-battery-row.c:172
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:415
+#: panels/power/cc-battery-row.c:155
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:420
+#: panels/power/cc-battery-row.c:160
 msgid "Discharging"
 msgstr "放電中"
 
-#: panels/power/cc-power-panel.c:566
-msgctxt "Battery name"
-msgid "Main"
-msgstr "主要"
-
-#: panels/power/cc-power-panel.c:568
-msgctxt "Battery name"
-msgid "Extra"
-msgstr "額外"
-
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:643
+#: panels/power/cc-battery-row.c:191
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:646
+#: panels/power/cc-battery-row.c:194
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:649
+#: panels/power/cc-battery-row.c:197
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:652
+#: panels/power/cc-battery-row.c:200
 msgid "Personal digital assistant"
 msgstr "個人數位助理"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:655
+#: panels/power/cc-battery-row.c:203
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:658
+#: panels/power/cc-battery-row.c:206
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:661 panels/wacom/cc-wacom-panel.c:728
+#: panels/power/cc-battery-row.c:209 panels/wacom/cc-wacom-panel.c:728
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:664
+#: panels/power/cc-battery-row.c:212
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:667
+#: panels/power/cc-battery-row.c:215
 msgid "Gaming input device"
 msgstr "遊戲輸入裝置"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:670 panels/power/cc-power-panel.c:962
-#: panels/power/cc-power-panel.c:2278
+#: panels/power/cc-battery-row.c:218 panels/power/cc-power-panel.c:413
+#: panels/power/cc-power-panel.c:1780
 msgid "Battery"
 msgstr "電池"
 
-#. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:731
-msgctxt "Battery power"
-msgid "Charging"
-msgstr "充電"
+#: panels/power/cc-battery-row.c:266
+msgctxt "Battery name"
+msgid "Main"
+msgstr "主要"
 
-#. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:738
-msgctxt "Battery power"
-msgid "Caution"
-msgstr "注意"
+#: panels/power/cc-battery-row.c:268
+msgctxt "Battery name"
+msgid "Extra"
+msgstr "額外"
 
-#. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:743
-msgctxt "Battery power"
-msgid "Low"
-msgstr "低"
+#: panels/power/cc-power-panel.c:411
+msgid "Batteries"
+msgstr "電池"
 
-#. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:748
-msgctxt "Battery power"
-msgid "Good"
-msgstr "良好"
+#: panels/power/cc-power-panel.c:632
+msgid "When _idle"
+msgstr "閒置時(_I)"
 
-#. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:753
-msgctxt "Battery power"
-msgid "Fully charged"
-msgstr "已完全充飽"
-
-#. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:757
-msgctxt "Battery power"
-msgid "Empty"
-msgstr "沒電"
-
-#: panels/power/cc-power-panel.c:960
-msgid "Batteries"
-msgstr "電池"
-
-#: panels/power/cc-power-panel.c:1182
-msgid "When _idle"
-msgstr "閒置時(_I)"
-
-#: panels/power/cc-power-panel.c:1676
+#: panels/power/cc-power-panel.c:1081
 msgid "Suspend"
 msgstr "暫停"
 
-#: panels/power/cc-power-panel.c:1677
+#: panels/power/cc-power-panel.c:1082
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: panels/power/cc-power-panel.c:1678
+#: panels/power/cc-power-panel.c:1083
 msgid "Hibernate"
 msgstr "休眠"
 
-#: panels/power/cc-power-panel.c:1679
+#: panels/power/cc-power-panel.c:1084
 msgid "Nothing"
 msgstr "沒有"
 
-#: panels/power/cc-power-panel.c:1730
+#: panels/power/cc-power-panel.c:1135
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: panels/power/cc-power-panel.c:1732
+#: panels/power/cc-power-panel.c:1137
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: panels/power/cc-power-panel.c:1836
-msgid "Power Saving"
-msgstr "節省電源"
-
-#: panels/power/cc-power-panel.c:1872
-msgid "_Screen Brightness"
-msgstr "螢幕亮度(_S)"
-
-#: panels/power/cc-power-panel.c:1895
-msgid "Automatic Brightness"
-msgstr "自動亮度"
-
-#: panels/power/cc-power-panel.c:1908
-msgid "_Keyboard Brightness"
-msgstr "鍵盤亮度(_K)"
-
-#: panels/power/cc-power-panel.c:1921
-msgid "_Dim Screen When Inactive"
-msgstr "當不活動後降低螢幕亮度(_D)"
-
-#: panels/power/cc-power-panel.c:1939
-msgid "_Blank Screen"
-msgstr "螢幕轉黑(_B)"
-
-#: panels/power/cc-power-panel.c:1985
-msgid "_Automatic Suspend"
-msgstr "自動暫停(_A)"
-
-#: panels/power/cc-power-panel.c:1986
+#: panels/power/cc-power-panel.c:1277
 msgid "Automatic suspend"
 msgstr "自動暫停"
 
-#: panels/power/cc-power-panel.c:2038
-msgid "_Wi-Fi"
-msgstr "_Wi-Fi"
-
-#: panels/power/cc-power-panel.c:2039
-msgid "Wi-Fi can be turned off to save power."
-msgstr "可以關閉 Wi-Fi 以省電。"
-
-#: panels/power/cc-power-panel.c:2055
-msgid "_Mobile Broadband"
-msgstr "行動寬頻(_M)"
-
-#: panels/power/cc-power-panel.c:2056
-msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
-msgstr "可以關閉行動數據 (3G、4G、LTE 等等) 以省電。"
+#: panels/power/cc-power-panel.c:1800
+msgid "Power Mode"
+msgstr "電源模式"
 
-#: panels/power/cc-power-panel.c:2106
-msgid "_Bluetooth"
-msgstr "藍牙(_B)"
-
-#: panels/power/cc-power-panel.c:2107
-msgid "Bluetooth can be turned off to save power."
-msgstr "可以關閉藍牙以省電。"
-
-#: panels/power/cc-power-panel.c:2144
-msgid "Show Battery _Percentage"
-msgstr "顯示電池百分比(_P)"
+#: panels/power/cc-power-panel.c:1810
+msgid "Power Saving"
+msgstr "節省電源"
 
-#. Frame header
-#: panels/power/cc-power-panel.c:2170
+#: panels/power/cc-power-panel.c:1818
 msgid "Suspend & Power Button"
 msgstr "暫停與電源按鈕"
 
-#: panels/power/cc-power-panel.c:2220
-msgid "Po_wer Button Behavior"
-msgstr "電源鍵行為(_W)"
-
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:13
 msgctxt "automatic_suspend"
@@ -4594,23 +4624,120 @@ msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 小時"
 
-#: panels/power/cc-power-panel.ui:145
+#: panels/power/cc-power-panel.ui:227
+msgid "Affects system performance and power usage."
+msgstr "會影響系統效能與電量使用。"
+
+#: panels/power/cc-power-panel.ui:297
+msgid "_Screen Brightness"
+msgstr "螢幕亮度(_S)"
+
+#: panels/power/cc-power-panel.ui:346
+msgid "Automatic Brightness"
+msgstr "自動亮度"
+
+#: panels/power/cc-power-panel.ui:382
+msgid "_Keyboard Brightness"
+msgstr "鍵盤亮度(_K)"
+
+#: panels/power/cc-power-panel.ui:431
+msgid "Dim Screen When Inactive"
+msgstr "當不活動後降低螢幕亮度"
+
+#: panels/power/cc-power-panel.ui:466
+msgid "_Blank Screen"
+msgstr "螢幕轉黑(_B)"
+
+#: panels/power/cc-power-panel.ui:502
+msgid "_Automatic Suspend"
+msgstr "自動暫停(_A)"
+
+#: panels/power/cc-power-panel.ui:547
+msgid "_Wi-Fi"
+msgstr "_Wi-Fi"
+
+#: panels/power/cc-power-panel.ui:559
+msgid "Wi-Fi can be turned off to save power."
+msgstr "可以關閉 Wi-Fi 以省電。"
+
+#: panels/power/cc-power-panel.ui:609
+msgid "_Mobile Broadband"
+msgstr "行動寬頻(_M)"
+
+#: panels/power/cc-power-panel.ui:621
+msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
+msgstr "可以關閉行動數據 (3G、4G、LTE 等等) 以省電。"
+
+#: panels/power/cc-power-panel.ui:671
+msgid "_Bluetooth"
+msgstr "藍牙(_B)"
+
+#: panels/power/cc-power-panel.ui:683
+msgid "Bluetooth can be turned off to save power."
+msgstr "可以關閉藍牙以省電。"
+
+#: panels/power/cc-power-panel.ui:759
+msgid "Po_wer Button Behavior"
+msgstr "電源鍵行為(_W)"
+
+#: panels/power/cc-power-panel.ui:797
+msgid "Show Battery _Percentage"
+msgstr "顯示電池百分比(_P)"
+
+#: panels/power/cc-power-panel.ui:872
 msgid "Automatic Suspend"
 msgstr "自動暫停"
 
-#: panels/power/cc-power-panel.ui:170
+#: panels/power/cc-power-panel.ui:897
 msgid "_Plugged In"
 msgstr "插入插頭(_P)"
 
-#: panels/power/cc-power-panel.ui:186
+#: panels/power/cc-power-panel.ui:913
 msgid "On _Battery Power"
 msgstr "使用電池電源(_B)"
 
-#: panels/power/cc-power-panel.ui:231 panels/power/cc-power-panel.ui:291
-#: panels/universal-access/cc-ua-panel.ui:1525
+#: panels/power/cc-power-panel.ui:958 panels/power/cc-power-panel.ui:1018
+#: panels/universal-access/cc-repeat-keys-dialog.ui:74
 msgid "Delay"
 msgstr "延遲"
 
+#: panels/power/cc-power-profile-row.c:62
+msgid "Lap detected: performance mode unavailable"
+msgstr "偵測到放置腿上:無法使用效能模式"
+
+#: panels/power/cc-power-profile-row.c:64
+msgid "High hardware temperature: performance mode unavailable"
+msgstr "硬體高溫:無法使用效能模式"
+
+#: panels/power/cc-power-profile-row.c:65
+msgid "Performance mode unavailable"
+msgstr "無法使用效能模式"
+
+#: panels/power/cc-power-profile-row.c:87
+#: panels/power/cc-power-profile-row.c:187
+msgid "High performance and power usage."
+msgstr "高效能與高度電量使用。"
+
+#: panels/power/cc-power-profile-row.c:186
+msgid "Performance"
+msgstr "效能"
+
+#: panels/power/cc-power-profile-row.c:192
+msgid "Balanced Power"
+msgstr "平衡電能"
+
+#: panels/power/cc-power-profile-row.c:193
+msgid "Standard performance and power usage."
+msgstr "標準效能與電量使用。"
+
+#: panels/power/cc-power-profile-row.c:198
+msgid "Power Saver"
+msgstr "節省電能"
+
+#: panels/power/cc-power-profile-row.c:199
+msgid "Reduced performance and power usage."
+msgstr "降低效能與電量使用。"
+
 #: panels/power/gnome-power-panel.desktop.in.in:3
 msgid "Power"
 msgstr "電源"
@@ -4638,29 +4765,29 @@ msgstr "核對"
 
 #. Translators: This is a username on a print server.
 #: panels/printers/authentication-dialog.ui:80
-#: panels/printers/new-printer-dialog.ui:362
+#: panels/printers/new-printer-dialog.ui:366
 #: panels/printers/pp-jobs-dialog.ui:57
 msgid "Username"
 msgstr "使用者名稱"
 
 #: panels/printers/authentication-dialog.ui:139
-#: panels/printers/new-printer-dialog.ui:337
+#: panels/printers/new-printer-dialog.ui:339
 msgid "Authentication Required"
 msgstr "要求核對"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:707
+#: panels/printers/cc-printers-panel.c:682
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "「%s」印表機已刪除"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:970
+#: panels/printers/cc-printers-panel.c:930
 msgid "Failed to add new printer."
 msgstr "無法加入新的印表機。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1273
+#: panels/printers/cc-printers-panel.c:1209
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
@@ -4680,8 +4807,8 @@ msgstr "Printer;Queue;Print;Paper;Ink;Toner;印表機;佇列;列印;紙張;墨
 
 #. Translators: This is the title presented at top of the dialog.
 #: panels/printers/new-printer-dialog.ui:29
-#: panels/printers/pp-new-printer-dialog.c:348
-#: panels/printers/pp-new-printer-dialog.c:405
+#: panels/printers/pp-new-printer-dialog.c:344
+#: panels/printers/pp-new-printer-dialog.c:401
 msgid "Add Printer"
 msgstr "加入印表機"
 
@@ -4702,26 +4829,26 @@ msgstr "找不到印表機"
 msgid "Enter a network address or search for a printer"
 msgstr "輸入網路位址或搜尋印表機"
 
-#: panels/printers/new-printer-dialog.ui:353
+#: panels/printers/new-printer-dialog.ui:356
 msgid "Enter username and password to view printers on Print Server."
 msgstr "輸入使用者名稱與密碼以檢視在印表機伺服器上的印表機。"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
 #: panels/printers/pp-details-dialog.c:74
-#: panels/printers/pp-details-dialog.c:367
+#: panels/printers/pp-details-dialog.c:351
 #, c-format
 msgid "%s Details"
 msgstr "%s 詳細資料"
 
-#: panels/printers/pp-details-dialog.c:121
+#: panels/printers/pp-details-dialog.c:101
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: panels/printers/pp-details-dialog.c:248
+#: panels/printers/pp-details-dialog.c:232
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: panels/printers/pp-details-dialog.c:257
+#: panels/printers/pp-details-dialog.c:241
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4733,7 +4860,7 @@ msgstr "位置"
 
 #. Translators: Name of column showing printer drivers
 #: panels/printers/pp-details-dialog.ui:122
-#: panels/printers/pp-ppd-selection-dialog.c:248
+#: panels/printers/pp-ppd-selection-dialog.c:239
 msgid "Driver"
 msgstr "驅動程式"
 
@@ -4758,11 +4885,11 @@ msgid "Select Printer Driver"
 msgstr "選擇印表機驅動程式"
 
 #: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/cc-avatar-chooser.c:109
+#: panels/user-accounts/cc-avatar-chooser.c:107
 msgid "Select"
 msgstr "選取"
 
-#: panels/printers/ppd-selection-dialog.ui:73
+#: panels/printers/ppd-selection-dialog.ui:75
 msgid "Loading drivers database…"
 msgstr "正在載入驅動程式資料庫…"
 
@@ -4815,69 +4942,69 @@ msgid "Reverse portrait"
 msgstr "直向倒轉"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: panels/printers/pp-jobs-dialog.c:222
+#: panels/printers/pp-job-row.c:106
 msgctxt "print job"
 msgid "Pending"
 msgstr "保留中"
 
 #. Translators: Job's state (job is held for printing)
-#: panels/printers/pp-jobs-dialog.c:228
+#: panels/printers/pp-job-row.c:112
 msgctxt "print job"
 msgid "Paused"
 msgstr "暫停"
 
 #. Translators: Job's state (job needs authentication to proceed further)
-#: panels/printers/pp-jobs-dialog.c:233
+#: panels/printers/pp-job-row.c:117
 msgctxt "print job"
 msgid "Authentication required"
 msgstr "需要核對"
 
 #. Translators: Job's state (job is currently printing)
-#: panels/printers/pp-jobs-dialog.c:238
+#: panels/printers/pp-job-row.c:122
 msgctxt "print job"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Job's state (job has been stopped)
-#: panels/printers/pp-jobs-dialog.c:242
+#: panels/printers/pp-job-row.c:126
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: panels/printers/pp-jobs-dialog.c:246
+#: panels/printers/pp-job-row.c:130
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: panels/printers/pp-jobs-dialog.c:250
+#: panels/printers/pp-job-row.c:134
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已放棄"
 
 #. Translators: Job's state (job has completed successfully)
-#: panels/printers/pp-jobs-dialog.c:254
+#: panels/printers/pp-job-row.c:138
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
-#: panels/printers/pp-jobs-dialog.c:363
+#: panels/printers/pp-jobs-dialog.c:249
 #, c-format
 msgid "%u Job Requires Authentication"
 msgid_plural "%u Jobs Require Authentication"
 msgstr[0] "有 %u 份工作需要核對身份"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: panels/printers/pp-jobs-dialog.c:520
+#: panels/printers/pp-jobs-dialog.c:401
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — 進行中的工作"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:524
+#: panels/printers/pp-jobs-dialog.c:405
 #, c-format
 msgid "Enter credentials to print from %s."
 msgstr "請輸入憑證以從 %s 列印。"
@@ -4907,55 +5034,55 @@ msgstr "核對(_A)"
 msgid "No Active Printer Jobs"
 msgstr "沒有使用中的印表機工作"
 
-#: panels/printers/pp-new-printer-dialog.c:363
+#: panels/printers/pp-new-printer-dialog.c:359
 msgid "Unlock Print Server"
 msgstr "解鎖印表機伺服器"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:367
+#: panels/printers/pp-new-printer-dialog.c:363
 #, c-format
 msgid "Unlock %s."
 msgstr "解除鎖定 %s。"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:371
+#: panels/printers/pp-new-printer-dialog.c:367
 #, c-format
 msgid "Enter username and password to view printers on %s."
 msgstr "輸入使用者名稱與密碼以檢視在 %s 的印表機。"
 
-#: panels/printers/pp-new-printer-dialog.c:794
+#: panels/printers/pp-new-printer-dialog.c:790
 msgid "Searching for Printers"
 msgstr "正在搜尋印表機"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1611
+#: panels/printers/pp-new-printer-dialog.c:1578
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1616
+#: panels/printers/pp-new-printer-dialog.c:1583
 msgid "Serial Port"
 msgstr "序列埠"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1623
+#: panels/printers/pp-new-printer-dialog.c:1590
 msgid "Parallel Port"
 msgstr "串列埠"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1665
+#: panels/printers/pp-new-printer-dialog.c:1632
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1670
+#: panels/printers/pp-new-printer-dialog.c:1637
 #, c-format
 msgid "Address: %s"
 msgstr "位址:%s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: panels/printers/pp-new-printer-dialog.c:1697
+#: panels/printers/pp-new-printer-dialog.c:1664
 msgid "Server requires authentication"
 msgstr "伺服器需要核對身份"
 
@@ -5049,13 +5176,13 @@ msgstr "進階"
 
 #. Translators: Name of job which makes printer to print test page
 #. Translators: This button triggers the printing of a test page.
-#: panels/printers/pp-options-dialog.c:863
+#: panels/printers/pp-options-dialog.c:857
 #: panels/printers/pp-options-dialog.ui:18
 msgid "Test Page"
 msgstr "測試頁"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:876
+#: panels/printers/pp-options-dialog.c:870
 msgid "Test page"
 msgstr "測試頁"
 
@@ -5096,127 +5223,127 @@ msgid "No pre-filtering"
 msgstr "無前置過濾器"
 
 #. Translators: Name of column showing printer manufacturers
-#: panels/printers/pp-ppd-selection-dialog.c:231
+#: panels/printers/pp-ppd-selection-dialog.c:223
 msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:588 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:523 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "沒有進行中的工作"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:593
+#: panels/printers/pp-printer-entry.c:528
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u 個工作"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:711
+#: panels/printers/pp-printer-entry.c:648
 msgid "Clean print heads"
 msgstr "清理列印噴頭"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:762
+#: panels/printers/pp-printer-entry.c:713
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:764
+#: panels/printers/pp-printer-entry.c:715
 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:767
+#: panels/printers/pp-printer-entry.c:718
 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:770
+#: panels/printers/pp-printer-entry.c:721
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:772
+#: panels/printers/pp-printer-entry.c:723
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:774
+#: panels/printers/pp-printer-entry.c:725
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: panels/printers/pp-printer-entry.c:776
+#: panels/printers/pp-printer-entry.c:727
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:778
+#: panels/printers/pp-printer-entry.c:729
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:780
+#: panels/printers/pp-printer-entry.c:731
 msgid "Low on paper"
 msgstr "紙張不足"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:733
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:784
+#: panels/printers/pp-printer-entry.c:735
 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:786
-#: panels/printers/pp-printer-entry.c:929
+#: panels/printers/pp-printer-entry.c:737
+#: panels/printers/pp-printer-entry.c:880
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:788
+#: panels/printers/pp-printer-entry.c:739
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:741
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:743
 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:794
+#: panels/printers/pp-printer-entry.c:745
 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:915
+#: panels/printers/pp-printer-entry.c:866
 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:920
+#: panels/printers/pp-printer-entry.c:871
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "不接受工作"
 
 #. Translators: Printer's state (jobs are processing)
-#: panels/printers/pp-printer-entry.c:925
+#: panels/printers/pp-printer-entry.c:876
 msgctxt "printer state"
 msgid "Processing"
 msgstr "處理中"
@@ -5252,12 +5379,12 @@ msgid "Ink Level"
 msgstr "墨水等級"
 
 #. Translators: This is the message which follows the printer error.
-#: panels/printers/printer-entry.ui:312
+#: panels/printers/printer-entry.ui:313
 msgid "Please restart when the problem is resolved."
 msgstr "若問題解決後請重新啟動機器。"
 
 #. Translators: This is the button which restarts the printer.
-#: panels/printers/printer-entry.ui:319
+#: panels/printers/printer-entry.ui:320
 msgid "Restart"
 msgstr "重新啟動"
 
@@ -5266,17 +5393,17 @@ msgstr "重新啟動"
 msgid "Add…"
 msgstr "加入…"
 
-#: panels/printers/printers.ui:186
+#: panels/printers/printers.ui:187
 msgid "No printers"
 msgstr "沒有印表機"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:200
+#: panels/printers/printers.ui:201
 msgid "Add a Printer…"
 msgstr "加入印表機…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:232
+#: panels/printers/printers.ui:233
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -5284,27 +5411,11 @@ msgstr ""
 "抱歉!系統列印服務\n"
 "似乎無法使用。"
 
-#: panels/region/cc-format-chooser.c:149
-msgctxt "measurement format"
-msgid "Imperial"
-msgstr "英制"
-
-#: panels/region/cc-format-chooser.c:151
-msgctxt "measurement format"
-msgid "Metric"
-msgstr "公制"
-
-#: panels/region/cc-format-chooser.c:256 panels/region/cc-format-chooser.c:297
-#: panels/region/cc-format-chooser.ui:6
+#: panels/region/cc-format-chooser.c:148 panels/region/cc-format-chooser.c:189
+#: panels/region/cc-format-chooser.ui:6 panels/region/cc-region-panel.ui:159
 msgid "Formats"
 msgstr "格式"
 
-#: panels/region/cc-format-chooser.ui:48
-#: panels/user-accounts/cc-fingerprint-dialog.ui:53
-#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:230
-msgid "Back"
-msgstr "上一頁"
-
 #: panels/region/cc-format-chooser.ui:101
 msgid ""
 "Choose the format for numbers, dates and currencies. Changes take effect on "
@@ -5331,120 +5442,77 @@ msgstr "沒有搜尋結果"
 msgid "Searches can be for countries or languages."
 msgstr "可以搜尋國家或語言。"
 
-#: panels/region/cc-format-chooser.ui:307
+#: panels/region/cc-format-chooser.ui:300
 msgid "Preview"
 msgstr "預覽"
 
-#: panels/region/cc-format-chooser.ui:322
+#: panels/region/cc-format-preview.c:135
+msgctxt "measurement format"
+msgid "Imperial"
+msgstr "英制"
+
+#: panels/region/cc-format-preview.c:137
+msgctxt "measurement format"
+msgid "Metric"
+msgstr "公制"
+
+#: panels/region/cc-format-preview.ui:18
 msgid "Dates"
 msgstr "日期"
 
-#: panels/region/cc-format-chooser.ui:366
+#: panels/region/cc-format-preview.ui:62
 msgid "Dates & Times"
 msgstr "日期與時刻"
 
-#: panels/region/cc-format-chooser.ui:388
+#: panels/region/cc-format-preview.ui:84
 msgid "Numbers"
 msgstr "數字"
 
-#: panels/region/cc-format-chooser.ui:410
+#: panels/region/cc-format-preview.ui:106
 msgid "Measurement"
 msgstr "度量衡"
 
-#: panels/region/cc-format-chooser.ui:432
+#: panels/region/cc-format-preview.ui:128
 msgid "Paper"
 msgstr "紙張"
 
-#: panels/region/cc-input-chooser.c:193
-msgid "No input sources found"
-msgstr "找不到輸入來源"
-
-#: panels/region/cc-input-chooser.c:948
-msgctxt "Input Source"
-msgid "Other"
-msgstr "其他"
-
-#: panels/region/cc-input-chooser.ui:5
-msgid "Add an Input Source"
-msgstr "加入輸入來源"
-
-#: panels/region/cc-input-chooser.ui:77
-msgid "Input methods can’t be used on the login screen"
-msgstr "輸入法無法在登入畫面中使用"
-
-#: panels/region/cc-region-panel.c:1507
+#: panels/region/cc-region-panel.c:740
 msgid "Login _Screen"
 msgstr "登入畫面(_S)"
 
-#: panels/region/cc-region-panel.ui:62
-#: panels/user-accounts/cc-user-panel.ui:364
+#: panels/region/cc-region-panel.ui:34
+msgid "Language"
+msgstr "語言"
+
+#: panels/region/cc-region-panel.ui:45
+msgid "The language used for text in windows and web pages."
+msgstr "視窗與網頁內文所使用的語言。"
+
+#: panels/region/cc-region-panel.ui:85
+#: panels/user-accounts/cc-user-panel.ui:406
 msgid "_Language"
 msgstr "語言(_L)"
 
-#: panels/region/cc-region-panel.ui:97
+#: panels/region/cc-region-panel.ui:120
 msgid "Restart the session for changes to take effect"
 msgstr "須要重新啟動作業階段才能讓變更生效"
 
-#: panels/region/cc-region-panel.ui:112
+#: panels/region/cc-region-panel.ui:135
 msgid "Restart…"
 msgstr "重新啟動…"
 
-#: panels/region/cc-region-panel.ui:145
+#: panels/region/cc-region-panel.ui:170
+msgid "The format used for numbers, dates, and currencies."
+msgstr "數字、日期、貨幣等所使用的格式。"
+
+#: panels/region/cc-region-panel.ui:204
 msgid "_Formats"
 msgstr "格式(_F)"
 
-#: panels/region/cc-region-panel.ui:193
-msgid "Input Sources"
-msgstr "輸入來源"
-
-#: panels/region/cc-region-panel.ui:207
-msgid "Choose keyboard layouts or input methods."
-msgstr "請選取鍵盤配置或輸入法。"
-
-#: panels/region/cc-region-panel.ui:264
-msgid "No input source selected"
-msgstr "尚未選擇輸入來源"
-
-#: panels/region/cc-region-panel.ui:298
+#: panels/region/cc-region-panel.ui:231
 msgid "Login settings are used by all users when logging into the system"
 msgstr "登入設定值是所有的使用者在登入系統時會用到的"
 
-#: panels/region/cc-region-panel.ui:335
-msgid "Input Source Options"
-msgstr "輸入來源選項"
-
-#: panels/region/cc-region-panel.ui:350
-msgid "Use the _same source for all windows"
-msgstr "在所有視窗中使用相同的來源(_S)"
-
-#: panels/region/cc-region-panel.ui:368
-msgid "Allow _different sources for each window"
-msgstr "每個視窗使用不同的輸入來源(_D)"
-
-#: panels/region/cc-region-panel.ui:410
-msgid "Previous source"
-msgstr "上一個來源"
-
-#: panels/region/cc-region-panel.ui:428
-msgid "Super+Shift+Space"
-msgstr "Super+Shift+Space"
-
-#: panels/region/cc-region-panel.ui:443
-msgid "Next source"
-msgstr "下一個來源"
-
-#: panels/region/cc-region-panel.ui:461
-msgid "Super+Space"
-msgstr "Super+Space"
-
-#: panels/region/cc-region-panel.ui:476
-msgid "Left+Right Alt"
-msgstr "左+右 Alt"
-
-#: panels/region/cc-region-panel.ui:492
-msgid "These keyboard shortcuts can be changed in the keyboard settings"
-msgstr "可以在鍵盤設定中變更這些鍵盤快捷鍵"
-
 #: panels/region/gnome-region-panel.desktop.in.in:3
 msgid "Region & Language"
 msgstr "地區和語言"
@@ -5606,11 +5674,11 @@ msgstr ""
 "removable;media;autorun;裝置;系統;預設;應用程式;偏好;首選;音訊;視訊;光碟;碟"
 "片;可移除;可移除式;媒體;自動執行;"
 
-#: panels/search/cc-search-locations-dialog.c:635
+#: panels/search/cc-search-locations-dialog.c:636
 msgid "Select Location"
 msgstr "選擇位置"
 
-#: panels/search/cc-search-locations-dialog.c:639
+#: panels/search/cc-search-locations-dialog.c:640
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -5929,7 +5997,7 @@ msgstr "音量"
 msgid "Alert Sound"
 msgstr "警示音效"
 
-#: panels/sound/cc-volume-slider.c:115
+#: panels/sound/cc-volume-slider.c:117
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
@@ -6014,7 +6082,7 @@ msgstr "登錄於:"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:264
 msgid "Failed to authorize device: "
-msgstr "認證裝置失敗:"
+msgstr "裝置授權失敗:"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:333
 msgid "Failed to forget device: "
@@ -6121,551 +6189,551 @@ msgstr "管理 Thunderbolt 裝置"
 msgid "Thunderbolt;privacy;"
 msgstr "Thunderbolt;privacy;隱私;"
 
-#. translators: the labels will read:
-#. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:500
-msgctxt "cursor size"
-msgid "Default"
-msgstr "預設值"
-
-#: panels/universal-access/cc-ua-panel.c:503
-msgctxt "cursor size"
-msgid "Medium"
-msgstr "中"
-
-#: panels/universal-access/cc-ua-panel.c:506
-msgctxt "cursor size"
-msgid "Large"
-msgstr "大"
-
-#: panels/universal-access/cc-ua-panel.c:509
-msgctxt "cursor size"
-msgid "Larger"
-msgstr "較大"
-
-#: panels/universal-access/cc-ua-panel.c:512
-msgctxt "cursor size"
-msgid "Largest"
-msgstr "最大"
-
-#: panels/universal-access/cc-ua-panel.c:516
-#, c-format
-msgid "%d pixel"
-msgid_plural "%d pixels"
-msgstr[0] "%d 像素"
-
-#: panels/universal-access/cc-ua-panel.ui:76
-msgid "_Always Show Accessibility Menu"
-msgstr "永遠顯示無障礙存取選單(_A)"
-
-#: panels/universal-access/cc-ua-panel.ui:118
-msgid "Seeing"
-msgstr "視覺"
-
-#: panels/universal-access/cc-ua-panel.ui:164
-msgid "_High Contrast"
-msgstr "高反差(_H)"
-
-#: panels/universal-access/cc-ua-panel.ui:211
-msgid "_Large Text"
-msgstr "大型文字(_L)"
-
-#: panels/universal-access/cc-ua-panel.ui:256
-msgid "C_ursor Size"
-msgstr "游標大小(_U)"
-
-#: panels/universal-access/cc-ua-panel.ui:303
-#: panels/universal-access/zoom-options.ui:99
-msgid "_Zoom"
-msgstr "縮放(_Z)"
-
-#: panels/universal-access/cc-ua-panel.ui:349
-msgid "Screen _Reader"
-msgstr "螢幕閱讀器(_R)"
-
-#: panels/universal-access/cc-ua-panel.ui:395
-#: panels/universal-access/cc-ua-panel.ui:1261
-msgid "_Sound Keys"
-msgstr "聲音按鍵(_S)"
-
-#: panels/universal-access/cc-ua-panel.ui:457
-msgid "Hearing"
-msgstr "聽覺"
-
-#: panels/universal-access/cc-ua-panel.ui:501
-#: panels/universal-access/cc-ua-panel.ui:1364
-msgid "_Visual Alerts"
-msgstr "視覺警示(_V)"
-
-#: panels/universal-access/cc-ua-panel.ui:609
-msgid "Screen _Keyboard"
-msgstr "螢幕鍵盤(_K)"
-
-#: panels/universal-access/cc-ua-panel.ui:654
-msgid "R_epeat Keys"
-msgstr "重複鍵(_E)"
-
-#: panels/universal-access/cc-ua-panel.ui:700
-msgid "Cursor _Blinking"
-msgstr "游標閃爍(_B)"
-
-#: panels/universal-access/cc-ua-panel.ui:746
-msgid "_Typing Assist (AccessX)"
-msgstr "打字助理 [AccessX](_T)"
-
-#: panels/universal-access/cc-ua-panel.ui:807
-msgid "Pointing & Clicking"
-msgstr "指向與點選"
-
-#: panels/universal-access/cc-ua-panel.ui:853
-msgid "_Mouse Keys"
-msgstr "滑鼠按鍵(_M)"
-
-#: panels/universal-access/cc-ua-panel.ui:898
-msgid "_Locate Pointer"
-msgstr "定位印表機(_L)"
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:7
+msgid "Cursor Blinking"
+msgstr "游標閃爍"
 
-#: panels/universal-access/cc-ua-panel.ui:930
-msgid "_Click Assist"
-msgstr "點擊助理(_C)"
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:37
+msgid "Cursor blinks in text fields."
+msgstr "游標在文字欄位中閃爍。"
 
-#: panels/universal-access/cc-ua-panel.ui:976
-msgid "_Double-Click Delay"
-msgstr "雙擊延遲(_D)"
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:74
+#: panels/universal-access/cc-repeat-keys-dialog.ui:145
+msgid "Speed"
+msgstr "速度"
 
-#: panels/universal-access/cc-ua-panel.ui:996
-msgid "Double-Click Delay"
-msgstr "雙擊延遲"
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:101
+msgid "Cursor blinking speed"
+msgstr "游標閃爍速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1066
+#: panels/universal-access/cc-cursor-size-dialog.ui:7
 msgid "Cursor Size"
 msgstr "游標大小"
 
-#: panels/universal-access/cc-ua-panel.ui:1093
+#: panels/universal-access/cc-cursor-size-dialog.ui:29
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr "游標大小可以與縮放搭配以輕鬆看出游標位置。"
 
-#: panels/universal-access/cc-ua-panel.ui:1129
-msgid "Screen Reader"
-msgstr "螢幕閱讀器"
+#: panels/universal-access/cc-pointing-dialog.ui:7
+msgid "Click Assist"
+msgstr "點擊助理"
 
-#: panels/universal-access/cc-ua-panel.ui:1146
-msgid "The screen reader reads displayed text as you move the focus."
-msgstr "螢幕閱讀器能在您移動焦點時讀出顯示的文字。"
+#: panels/universal-access/cc-pointing-dialog.ui:43
+msgid "_Simulated Secondary Click"
+msgstr "模擬次要點擊(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1179
-msgid "_Screen Reader"
-msgstr "螢幕閱讀器(_S)"
+#: panels/universal-access/cc-pointing-dialog.ui:56
+msgid "Trigger a secondary click by holding down the primary button"
+msgstr "按住主要鍵時觸發次要點擊"
 
-#: panels/universal-access/cc-ua-panel.ui:1218
-msgid "Sound Keys"
-msgstr "聲音按鍵"
+#: panels/universal-access/cc-pointing-dialog.ui:79
+#: panels/universal-access/cc-typing-dialog.ui:158
+#: panels/universal-access/cc-typing-dialog.ui:307
+msgid "A_cceptance delay:"
+msgstr "接受時間延遲(_C):"
 
-#: panels/universal-access/cc-ua-panel.ui:1236
-msgid "Beep when Num Lock or Caps Lock are turned on or off."
-msgstr "當 Num Lock 或 Caps Lock 開啟時發出聲響。"
+#: panels/universal-access/cc-pointing-dialog.ui:95
+msgctxt "secondary click"
+msgid "Short"
+msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:1306
-msgid "Visual Alerts"
-msgstr "視覺警示"
+#: panels/universal-access/cc-pointing-dialog.ui:110
+msgid "Secondary click delay"
+msgstr "第二次點擊延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:1310
-msgid "_Test flash"
-msgstr "測試閃動(_T)"
+#: panels/universal-access/cc-pointing-dialog.ui:120
+msgctxt "secondary click delay"
+msgid "Long"
+msgstr "長"
+
+#: panels/universal-access/cc-pointing-dialog.ui:157
+msgid "_Hover Click"
+msgstr "停駐即點擊(_H)"
+
+#: panels/universal-access/cc-pointing-dialog.ui:170
+msgid "Trigger a click when the pointer hovers"
+msgstr "當停止游標移動時觸發點擊"
+
+#: panels/universal-access/cc-pointing-dialog.ui:193
+msgid "D_elay:"
+msgstr "延遲(_E):"
+
+#: panels/universal-access/cc-pointing-dialog.ui:210
+msgctxt "dwell click delay"
+msgid "Short"
+msgstr "短"
+
+#: panels/universal-access/cc-pointing-dialog.ui:232
+msgctxt "dwell click delay"
+msgid "Long"
+msgstr "長"
 
-#: panels/universal-access/cc-ua-panel.ui:1339
-msgid "Use a visual indication when an alert sound occurs."
-msgstr "當警示音效發出時使用視覺化的指示。"
+#: panels/universal-access/cc-pointing-dialog.ui:253
+msgid "Motion _threshold:"
+msgstr "移動速度(_M):"
 
-#: panels/universal-access/cc-ua-panel.ui:1390
-msgid "Flash the entire _window"
-msgstr "閃動整個視窗(_W)"
+#: panels/universal-access/cc-pointing-dialog.ui:270
+msgctxt "dwell click threshold"
+msgid "Small"
+msgstr "小"
 
-#: panels/universal-access/cc-ua-panel.ui:1408
-msgid "Flash the entire _screen"
-msgstr "閃動整個螢幕(_S)"
+#: panels/universal-access/cc-pointing-dialog.ui:292
+msgctxt "dwell click threshold"
+msgid "Large"
+msgstr "大"
 
-#: panels/universal-access/cc-ua-panel.ui:1453
+#: panels/universal-access/cc-repeat-keys-dialog.ui:7
 msgid "Repeat Keys"
 msgstr "重複按鍵"
 
-#: panels/universal-access/cc-ua-panel.ui:1483
+#: panels/universal-access/cc-repeat-keys-dialog.ui:37
 msgid "Key presses repeat when key is held down."
 msgstr "當按下某鍵不放時重複輸出該字元。"
 
-#: panels/universal-access/cc-ua-panel.ui:1563
+#: panels/universal-access/cc-repeat-keys-dialog.ui:102
 msgid "Repeat keys delay"
 msgstr "按鍵重複延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:1611
-#: panels/universal-access/cc-ua-panel.ui:1746
-msgid "Speed"
-msgstr "速度"
-
-#: panels/universal-access/cc-ua-panel.ui:1650
+#: panels/universal-access/cc-repeat-keys-dialog.ui:174
 msgid "Repeat keys speed"
 msgstr "按鍵重複速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1674
-msgid "Cursor Blinking"
-msgstr "游標閃爍"
+#: panels/universal-access/cc-sound-keys-dialog.ui:7
+msgid "Sound Keys"
+msgstr "聲音按鍵"
 
-#: panels/universal-access/cc-ua-panel.ui:1704
-msgid "Cursor blinks in text fields."
-msgstr "游標在文字欄位中閃爍。"
+#: panels/universal-access/cc-sound-keys-dialog.ui:25
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
+msgstr "當 Num Lock 或 Caps Lock 開啟時發出聲響。"
 
-#: panels/universal-access/cc-ua-panel.ui:1783
-msgid "Cursor blinking speed"
-msgstr "游標閃爍速度"
+#: panels/universal-access/cc-sound-keys-dialog.ui:45
+#: panels/universal-access/cc-ua-panel.ui:374
+msgid "_Sound Keys"
+msgstr "聲音按鍵(_S)"
+
+#: panels/universal-access/cc-screen-reader-dialog.ui:7
+msgid "Screen Reader"
+msgstr "螢幕閱讀器"
+
+#: panels/universal-access/cc-screen-reader-dialog.ui:24
+msgid "The screen reader reads displayed text as you move the focus."
+msgstr "螢幕閱讀器能在您移動焦點時讀出顯示的文字。"
 
-#: panels/universal-access/cc-ua-panel.ui:1819
+#: panels/universal-access/cc-screen-reader-dialog.ui:52
+msgid "_Screen Reader"
+msgstr "螢幕閱讀器(_S)"
+
+#: panels/universal-access/cc-typing-dialog.ui:7
 msgid "Typing Assist"
 msgstr "打字助理"
 
-#: panels/universal-access/cc-ua-panel.ui:1858
+#: panels/universal-access/cc-typing-dialog.ui:46
 msgid "_Sticky Keys"
 msgstr "黏性特殊鍵(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1875
+#: panels/universal-access/cc-typing-dialog.ui:58
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "將連續按的特殊鍵視為按鍵組合"
 
-#: panels/universal-access/cc-ua-panel.ui:1899
+#: panels/universal-access/cc-typing-dialog.ui:72
 msgid "_Disable if two keys are pressed together"
 msgstr "如果同時按下任何兩鍵則停用(_D)"
 
-#: panels/universal-access/cc-ua-panel.ui:1917
+#: panels/universal-access/cc-typing-dialog.ui:85
 msgid "Beep when a _modifier key is pressed"
 msgstr "當按下特殊按鍵時發出聲響(_M)"
 
-#: panels/universal-access/cc-ua-panel.ui:1965
+#: panels/universal-access/cc-typing-dialog.ui:123
 msgid "S_low Keys"
 msgstr "重複按鍵(_L)"
 
-#: panels/universal-access/cc-ua-panel.ui:1982
+#: panels/universal-access/cc-typing-dialog.ui:135
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按鍵被按下到它被接受之間置入延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:2015
-#: panels/universal-access/cc-ua-panel.ui:2228
-#: panels/universal-access/cc-ua-panel.ui:2565
-msgid "A_cceptance delay:"
-msgstr "接受時間延遲(_C):"
-
-#: panels/universal-access/cc-ua-panel.ui:2037
+#: panels/universal-access/cc-typing-dialog.ui:175
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2056
+#: panels/universal-access/cc-typing-dialog.ui:190
 msgid "Slow keys typing delay"
 msgstr "降低按鍵輸入延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:2071
+#: panels/universal-access/cc-typing-dialog.ui:200
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/cc-ua-panel.ui:2098
+#: panels/universal-access/cc-typing-dialog.ui:212
 msgid "Beep when a key is pr_essed"
 msgstr "當按下按鍵時發出聲響(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:2115
+#: panels/universal-access/cc-typing-dialog.ui:224
 msgid "Beep when a key is _accepted"
 msgstr "當接受按鍵動作時發出聲響(_A)"
 
-#: panels/universal-access/cc-ua-panel.ui:2132
-#: panels/universal-access/cc-ua-panel.ui:2311
+#: panels/universal-access/cc-typing-dialog.ui:236
+#: panels/universal-access/cc-typing-dialog.ui:361
 msgid "Beep when a key is _rejected"
 msgstr "當拒絕按鍵動作則發出聲響(_R)"
 
-#: panels/universal-access/cc-ua-panel.ui:2178
+#: panels/universal-access/cc-typing-dialog.ui:272
 msgid "_Bounce Keys"
 msgstr "反彈鍵(_B)"
 
-#: panels/universal-access/cc-ua-panel.ui:2195
+#: panels/universal-access/cc-typing-dialog.ui:284
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重複按鍵"
 
-#: panels/universal-access/cc-ua-panel.ui:2250
+#: panels/universal-access/cc-typing-dialog.ui:324
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2269
+#: panels/universal-access/cc-typing-dialog.ui:339
 msgid "Bounce keys typing delay"
 msgstr "反彈鍵輸入延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:2284
+#: panels/universal-access/cc-typing-dialog.ui:349
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/cc-ua-panel.ui:2397
+#: panels/universal-access/cc-typing-dialog.ui:437
 msgid "_Enable by Keyboard"
 msgstr "由鍵盤啟用(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:2414
+#: panels/universal-access/cc-typing-dialog.ui:449
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "以鍵盤開啟與關閉無障礙功能"
 
-#: panels/universal-access/cc-ua-panel.ui:2478
-msgid "Click Assist"
-msgstr "點擊助理"
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: panels/universal-access/cc-ua-panel.c:348
+msgctxt "cursor size"
+msgid "Default"
+msgstr "預設值"
 
-#: panels/universal-access/cc-ua-panel.ui:2514
-msgid "_Simulated Secondary Click"
-msgstr "模擬次要點擊(_S)"
+#: panels/universal-access/cc-ua-panel.c:351
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "中"
 
-#: panels/universal-access/cc-ua-panel.ui:2532
-msgid "Trigger a secondary click by holding down the primary button"
-msgstr "按住主要鍵時觸發次要點擊"
+#: panels/universal-access/cc-ua-panel.c:354
+msgctxt "cursor size"
+msgid "Large"
+msgstr "大"
 
-#: panels/universal-access/cc-ua-panel.ui:2586
-msgctxt "secondary click"
-msgid "Short"
-msgstr "短"
+#: panels/universal-access/cc-ua-panel.c:357
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "較大"
 
-#: panels/universal-access/cc-ua-panel.ui:2605
-msgid "Secondary click delay"
-msgstr "第二次點擊延遲"
+#: panels/universal-access/cc-ua-panel.c:360
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "最大"
 
-#: panels/universal-access/cc-ua-panel.ui:2620
-msgctxt "secondary click delay"
-msgid "Long"
-msgstr "長"
+#: panels/universal-access/cc-ua-panel.c:364
+#, c-format
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d 像素"
 
-#: panels/universal-access/cc-ua-panel.ui:2677
-msgid "_Hover Click"
-msgstr "停駐即點擊(_H)"
+#: panels/universal-access/cc-ua-panel.ui:55
+msgid "_Always Show Accessibility Menu"
+msgstr "永遠顯示無障礙存取選單(_A)"
 
-#: panels/universal-access/cc-ua-panel.ui:2695
-msgid "Trigger a click when the pointer hovers"
-msgstr "當停止游標移動時觸發點擊"
+#: panels/universal-access/cc-ua-panel.ui:97
+msgid "Seeing"
+msgstr "視覺"
 
-#: panels/universal-access/cc-ua-panel.ui:2728
-msgid "D_elay:"
-msgstr "延遲(_E):"
+#: panels/universal-access/cc-ua-panel.ui:143
+msgid "_High Contrast"
+msgstr "高反差(_H)"
 
-#: panels/universal-access/cc-ua-panel.ui:2750
-msgctxt "dwell click delay"
-msgid "Short"
-msgstr "短"
+#: panels/universal-access/cc-ua-panel.ui:190
+msgid "_Large Text"
+msgstr "大型文字(_L)"
 
-#: panels/universal-access/cc-ua-panel.ui:2781
-msgctxt "dwell click delay"
-msgid "Long"
-msgstr "長"
+#: panels/universal-access/cc-ua-panel.ui:235
+msgid "C_ursor Size"
+msgstr "游標大小(_U)"
 
-#: panels/universal-access/cc-ua-panel.ui:2817
-msgid "Motion _threshold:"
-msgstr "移動速度(_M):"
+#: panels/universal-access/cc-ua-panel.ui:282
+#: panels/universal-access/cc-zoom-options-dialog.ui:91
+msgid "_Zoom"
+msgstr "縮放(_Z)"
 
-#: panels/universal-access/cc-ua-panel.ui:2839
-msgctxt "dwell click threshold"
-msgid "Small"
-msgstr "小"
+#: panels/universal-access/cc-ua-panel.ui:328
+msgid "Screen _Reader"
+msgstr "螢幕閱讀器(_R)"
 
-#: panels/universal-access/cc-ua-panel.ui:2870
-msgctxt "dwell click threshold"
-msgid "Large"
-msgstr "大"
+#: panels/universal-access/cc-ua-panel.ui:436
+msgid "Hearing"
+msgstr "聽覺"
 
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
-msgid "Make it easier to see, hear, type, point and click"
-msgstr "讓電腦更容易看、聽、輸入、指向與點選"
+#: panels/universal-access/cc-ua-panel.ui:480
+#: panels/universal-access/cc-visual-alerts-dialog.ui:68
+msgid "_Visual Alerts"
+msgstr "視覺警示(_V)"
 
-#. Translators: Search terms to find the Accessibility panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
-msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Universal Access;Contrast;Cursor;Sound;"
-"Zoom;Screen;Reader;big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;"
-"Bounce;Mouse;Double;click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;"
-"audio;typing;"
-msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
-"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
-"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;鍵盤;滑鼠;"
-"無障礙輔助存取;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;反彈;滑鼠;雙擊;兩下;"
-"點按;延遲;助理;輔助;重複;閃動;游標;音效;大;高;速度;視覺;聽覺;音訊;音樂;輸入;"
+#: panels/universal-access/cc-ua-panel.ui:588
+msgid "Screen _Keyboard"
+msgstr "螢幕鍵盤(_K)"
+
+#: panels/universal-access/cc-ua-panel.ui:633
+msgid "R_epeat Keys"
+msgstr "重複鍵(_E)"
+
+#: panels/universal-access/cc-ua-panel.ui:679
+msgid "Cursor _Blinking"
+msgstr "游標閃爍(_B)"
+
+#: panels/universal-access/cc-ua-panel.ui:725
+msgid "_Typing Assist (AccessX)"
+msgstr "打字助理 [AccessX](_T)"
+
+#: panels/universal-access/cc-ua-panel.ui:786
+msgid "Pointing & Clicking"
+msgstr "指向與點選"
+
+#: panels/universal-access/cc-ua-panel.ui:832
+msgid "_Mouse Keys"
+msgstr "滑鼠按鍵(_M)"
+
+#: panels/universal-access/cc-ua-panel.ui:877
+msgid "_Locate Pointer"
+msgstr "定位印表機(_L)"
+
+#: panels/universal-access/cc-ua-panel.ui:909
+msgid "_Click Assist"
+msgstr "點擊助理(_C)"
+
+#: panels/universal-access/cc-ua-panel.ui:955
+msgid "_Double-Click Delay"
+msgstr "雙擊延遲(_D)"
+
+#: panels/universal-access/cc-ua-panel.ui:975
+msgid "Double-Click Delay"
+msgstr "雙擊延遲"
 
-#: panels/universal-access/zoom-options.c:303
+#: panels/universal-access/cc-visual-alerts-dialog.ui:15
+msgid "Visual Alerts"
+msgstr "視覺警示"
+
+#: panels/universal-access/cc-visual-alerts-dialog.ui:19
+msgid "_Test flash"
+msgstr "測試閃動(_T)"
+
+#: panels/universal-access/cc-visual-alerts-dialog.ui:48
+msgid "Use a visual indication when an alert sound occurs."
+msgstr "當警示音效發出時使用視覺化的指示。"
+
+#: panels/universal-access/cc-visual-alerts-dialog.ui:94
+msgid "Flash the entire _window"
+msgstr "閃動整個視窗(_W)"
+
+#: panels/universal-access/cc-visual-alerts-dialog.ui:112
+msgid "Flash the entire _screen"
+msgstr "閃動整個螢幕(_S)"
+
+#: panels/universal-access/cc-zoom-options-dialog.c:303
 msgctxt "Distance"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/zoom-options.c:304
+#: panels/universal-access/cc-zoom-options-dialog.c:304
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ 螢幕"
 
-#: panels/universal-access/zoom-options.c:305
+#: panels/universal-access/cc-zoom-options-dialog.c:305
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ 螢幕"
 
-#: panels/universal-access/zoom-options.c:306
+#: panels/universal-access/cc-zoom-options-dialog.c:306
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ 螢幕"
 
-#: panels/universal-access/zoom-options.c:307
+#: panels/universal-access/cc-zoom-options-dialog.c:307
 msgctxt "Distance"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/zoom-options.ui:48
+#: panels/universal-access/cc-zoom-options-dialog.ui:40
 msgid "Full Screen"
 msgstr "全螢幕"
 
-#: panels/universal-access/zoom-options.ui:53
+#: panels/universal-access/cc-zoom-options-dialog.ui:45
 msgid "Top Half"
 msgstr "上半部"
 
-#: panels/universal-access/zoom-options.ui:58
+#: panels/universal-access/cc-zoom-options-dialog.ui:50
 msgid "Bottom Half"
 msgstr "下半部"
 
-#: panels/universal-access/zoom-options.ui:63
+#: panels/universal-access/cc-zoom-options-dialog.ui:55
 msgid "Left Half"
 msgstr "左半"
 
-#: panels/universal-access/zoom-options.ui:68
+#: panels/universal-access/cc-zoom-options-dialog.ui:60
 msgid "Right Half"
 msgstr "右半"
 
-#: panels/universal-access/zoom-options.ui:78
+#: panels/universal-access/cc-zoom-options-dialog.ui:70
 msgid "Zoom Options"
 msgstr "放大鏡選項"
 
-#: panels/universal-access/zoom-options.ui:185
+#: panels/universal-access/cc-zoom-options-dialog.ui:151
 msgid "_Magnification:"
 msgstr "放大率(_M):"
 
-#: panels/universal-access/zoom-options.ui:249
+#: panels/universal-access/cc-zoom-options-dialog.ui:201
 msgid "_Follow mouse cursor"
 msgstr "跟隨滑鼠遊標(_F)"
 
-#: panels/universal-access/zoom-options.ui:269
+#: panels/universal-access/cc-zoom-options-dialog.ui:221
 msgid "_Screen part:"
 msgstr "螢幕部分(_S):"
 
-#: panels/universal-access/zoom-options.ui:331
+#: panels/universal-access/cc-zoom-options-dialog.ui:278
 msgid "Magnifier _extends outside of screen"
 msgstr "放大鏡延伸到螢幕外(_E)"
 
-#: panels/universal-access/zoom-options.ui:350
+#: panels/universal-access/cc-zoom-options-dialog.ui:292
 msgid "_Keep magnifier cursor centered"
 msgstr "保持放大鏡游標置中(_K)"
 
-#: panels/universal-access/zoom-options.ui:370
+#: panels/universal-access/cc-zoom-options-dialog.ui:307
 msgid "Magnifier cursor _pushes contents around"
 msgstr "放大鏡游標將內容推到周圍(_P)"
 
-#: panels/universal-access/zoom-options.ui:390
+#: panels/universal-access/cc-zoom-options-dialog.ui:322
 msgid "Magnifier cursor moves with _contents"
 msgstr "放大鏡游標隨內容移動(_C)"
 
-#: panels/universal-access/zoom-options.ui:425
+#: panels/universal-access/cc-zoom-options-dialog.ui:347
 msgid "Magnifier Position:"
 msgstr "放大鏡位置:"
 
-#: panels/universal-access/zoom-options.ui:446
+#: panels/universal-access/cc-zoom-options-dialog.ui:362
 msgid "Magnifier"
 msgstr "放大鏡"
 
-#: panels/universal-access/zoom-options.ui:493
+#: panels/universal-access/cc-zoom-options-dialog.ui:410
 msgid "_Thickness:"
 msgstr "厚度(_T):"
 
-#: panels/universal-access/zoom-options.ui:519
+#: panels/universal-access/cc-zoom-options-dialog.ui:436
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "薄"
 
-#: panels/universal-access/zoom-options.ui:551
+#: panels/universal-access/cc-zoom-options-dialog.ui:458
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "厚"
 
-#: panels/universal-access/zoom-options.ui:577
+#: panels/universal-access/cc-zoom-options-dialog.ui:479
 msgid "_Length:"
 msgstr "長度(_L):"
 
 #. The color of the accessibility crosshair
-#: panels/universal-access/zoom-options.ui:626
+#: panels/universal-access/cc-zoom-options-dialog.ui:523
 msgid "Co_lor:"
 msgstr "色彩(_L):"
 
-#: panels/universal-access/zoom-options.ui:690
+#: panels/universal-access/cc-zoom-options-dialog.ui:577
 msgid "_Crosshairs:"
 msgstr "十字準星(_C):"
 
-#: panels/universal-access/zoom-options.ui:738
+#: panels/universal-access/cc-zoom-options-dialog.ui:610
 msgid "_Overlaps mouse cursor"
 msgstr "重疊滑鼠遊標(_O)"
 
-#: panels/universal-access/zoom-options.ui:776
+#: panels/universal-access/cc-zoom-options-dialog.ui:634
 msgid "Crosshairs"
 msgstr "十字準星"
 
-#: panels/universal-access/zoom-options.ui:825
+#: panels/universal-access/cc-zoom-options-dialog.ui:683
 msgid "_White on black:"
 msgstr "黑底白字(_W):"
 
-#: panels/universal-access/zoom-options.ui:845
+#: panels/universal-access/cc-zoom-options-dialog.ui:703
 msgid "_Brightness:"
 msgstr "亮度(_B):"
 
-#: panels/universal-access/zoom-options.ui:866
+#: panels/universal-access/cc-zoom-options-dialog.ui:724
 msgid "_Contrast:"
 msgstr "對比(_C):"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: panels/universal-access/zoom-options.ui:886
+#: panels/universal-access/cc-zoom-options-dialog.ui:744
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "色彩(_L)"
 
-#: panels/universal-access/zoom-options.ui:911
+#: panels/universal-access/cc-zoom-options-dialog.ui:769
 msgctxt "universal access, color"
 msgid "None"
 msgstr "沒有"
 
-#: panels/universal-access/zoom-options.ui:943
+#: panels/universal-access/cc-zoom-options-dialog.ui:791
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "完全"
 
-#: panels/universal-access/zoom-options.ui:1006
+#: panels/universal-access/cc-zoom-options-dialog.ui:844
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "低"
 
-#: panels/universal-access/zoom-options.ui:1039
+#: panels/universal-access/cc-zoom-options-dialog.ui:867
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "高"
 
-#: panels/universal-access/zoom-options.ui:1070
+#: panels/universal-access/cc-zoom-options-dialog.ui:893
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低"
 
-#: panels/universal-access/zoom-options.ui:1103
+#: panels/universal-access/cc-zoom-options-dialog.ui:916
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高"
 
-#: panels/universal-access/zoom-options.ui:1139
+#: panels/universal-access/cc-zoom-options-dialog.ui:942
 msgid "Color Effects:"
 msgstr "色彩效果:"
 
-#: panels/universal-access/zoom-options.ui:1164
+#: panels/universal-access/cc-zoom-options-dialog.ui:958
 msgid "Color Effects"
 msgstr "色彩效果"
 
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "讓電腦更容易看、聽、輸入、指向與點選"
+
+#. Translators: Search terms to find the Accessibility panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
+msgid ""
+"Keyboard;Mouse;a11y;Accessibility;Universal Access;Contrast;Cursor;Sound;"
+"Zoom;Screen;Reader;big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;"
+"Bounce;Mouse;Double;click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;"
+"audio;typing;"
+msgstr ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;鍵盤;滑鼠;"
+"無障礙輔助存取;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;反彈;滑鼠;雙擊;兩下;"
+"點按;延遲;助理;輔助;重複;閃動;游標;音效;大;高;速度;視覺;聽覺;音訊;音樂;輸入;"
+
 #: panels/usage/cc-usage-panel.c:154
 msgid "Empty all items from Trash?"
 msgstr "要清除垃圾桶中所有的項目?"
@@ -6842,30 +6910,30 @@ msgstr "不留下追蹤"
 msgid "Should match the web address of your login provider."
 msgstr "應符合您的登入提供者的網路位址。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:205
+#: panels/user-accounts/cc-add-user-dialog.c:204
 msgid "Failed to add account"
 msgstr "無法加入到帳號"
 
-#: panels/user-accounts/cc-add-user-dialog.c:676
+#: panels/user-accounts/cc-add-user-dialog.c:661
 #: panels/user-accounts/cc-password-dialog.c:261
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:896
-#: panels/user-accounts/cc-add-user-dialog.c:942
-#: panels/user-accounts/cc-add-user-dialog.c:963
+#: panels/user-accounts/cc-add-user-dialog.c:875
+#: panels/user-accounts/cc-add-user-dialog.c:914
+#: panels/user-accounts/cc-add-user-dialog.c:932
 msgid "Failed to register account"
 msgstr "無法註冊帳號"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1084
+#: panels/user-accounts/cc-add-user-dialog.c:1047
 msgid "No supported way to authenticate with this domain"
 msgstr "沒有支援這個網域核對的方式"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1157
+#: panels/user-accounts/cc-add-user-dialog.c:1111
 msgid "Failed to join domain"
 msgstr "無法加入網域"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1218
+#: panels/user-accounts/cc-add-user-dialog.c:1166
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
@@ -6873,7 +6941,7 @@ msgstr ""
 "登入名稱沒有作用。\n"
 "請再試一次。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1225
+#: panels/user-accounts/cc-add-user-dialog.c:1173
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
@@ -6881,11 +6949,11 @@ msgstr ""
 "登入密碼沒有作用。\n"
 "請再試一次。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1233
+#: panels/user-accounts/cc-add-user-dialog.c:1181
 msgid "Failed to log into domain"
 msgstr "無法登入網域"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1291
+#: panels/user-accounts/cc-add-user-dialog.c:1236
 msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "找不到網域。也許您拼錯字?"
 
@@ -6944,7 +7012,7 @@ msgstr "請上線以加入企業登入使用者。"
 msgid "_Enterprise Login"
 msgstr "企業登入(_E)"
 
-#: panels/user-accounts/cc-avatar-chooser.c:232
+#: panels/user-accounts/cc-avatar-chooser.c:220
 msgid "Browse for more pictures"
 msgstr "瀏覽更多照片"
 
@@ -6976,7 +7044,7 @@ msgstr "是(_Y)"
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
-msgstr "您是否要刪除註冊的指紋?這將會停用指紋登入。"
+msgstr "您是否要刪除您註冊的指紋?這將會停用指紋登入。"
 
 #. Translators: This is the empty state page label which states that there are no devices ready.
 #: panels/user-accounts/cc-fingerprint-dialog.ui:249
@@ -7021,119 +7089,147 @@ msgstr "指紋登錄"
 msgid "_Re-enroll this finger…"
 msgstr "重新登錄這隻手指(_R)…"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:470
+#: panels/user-accounts/cc-fingerprint-dialog.c:236
+msgid "the device needs to be claimed to perform this action"
+msgstr "需要索取裝置才能執行此動作"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:238
+msgid "the device is already claimed by another process"
+msgstr "該裝置已經被其他程序索取"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:240
+msgid "you do not have permission to perform the action"
+msgstr "您尚未取得執行該動作的授權"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:242
+msgid "no prints have been enrolled"
+msgstr "尚未有指紋登錄"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:251
+msgid "Failed to communicate with the device during enrollment"
+msgstr "在登錄期間無法與裝置溝通"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:255
+msgid "Failed to communicate with the fingerprint reader"
+msgstr "無法與指紋讀取器溝通"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:257
+msgid "Failed to communicate with the fingerprint daemon"
+msgstr "無法與指紋幕後程式溝通"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:585
 #, c-format
 msgid "Failed to list fingerprints: %s"
 msgstr "無法列出指紋:%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:536
+#: panels/user-accounts/cc-fingerprint-dialog.c:652
 #, c-format
 msgid "Failed to delete saved fingerprints: %s"
 msgstr "無法刪除儲存的指紋:%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:565
+#: panels/user-accounts/cc-fingerprint-dialog.c:683
 msgid "Left thumb"
 msgstr "左手姆指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:567
+#: panels/user-accounts/cc-fingerprint-dialog.c:685
 msgid "Left middle finger"
 msgstr "左手中指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:569
+#: panels/user-accounts/cc-fingerprint-dialog.c:687
 msgid "_Left index finger"
 msgstr "左手食指(_L)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:571
+#: panels/user-accounts/cc-fingerprint-dialog.c:689
 msgid "Left ring finger"
 msgstr "左手無名指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:573
+#: panels/user-accounts/cc-fingerprint-dialog.c:691
 msgid "Left little finger"
 msgstr "左手小指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:575
+#: panels/user-accounts/cc-fingerprint-dialog.c:693
 msgid "Right thumb"
 msgstr "右手姆指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:577
+#: panels/user-accounts/cc-fingerprint-dialog.c:695
 msgid "Right middle finger"
 msgstr "右手中指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:579
+#: panels/user-accounts/cc-fingerprint-dialog.c:697
 msgid "_Right index finger"
 msgstr "右手食指(_R)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:581
+#: panels/user-accounts/cc-fingerprint-dialog.c:699
 msgid "Right ring finger"
 msgstr "右手無名指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:583
+#: panels/user-accounts/cc-fingerprint-dialog.c:701
 msgid "Right little finger"
 msgstr "右手小指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:585
+#: panels/user-accounts/cc-fingerprint-dialog.c:703
 msgid "Unknown Finger"
 msgstr "未知的手指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:719
+#: panels/user-accounts/cc-fingerprint-dialog.c:837
 msgctxt "Fingerprint enroll state"
 msgid "Complete"
 msgstr "完成"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:729
+#: panels/user-accounts/cc-fingerprint-dialog.c:848
 msgid "Fingerprint device disconnected"
 msgstr "指紋裝置已中斷連接"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:731
+#: panels/user-accounts/cc-fingerprint-dialog.c:854
 msgid "Fingerprint device storage is full"
 msgstr "指紋裝置儲存空間已滿"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:733
+#: panels/user-accounts/cc-fingerprint-dialog.c:858
 msgid "Failed to enroll new fingerprint"
 msgstr "無法登錄新的指紋"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:764
+#: panels/user-accounts/cc-fingerprint-dialog.c:889
 #, c-format
 msgid "Failed to start enrollment: %s"
 msgstr "無法啟動登錄:%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:772
+#: panels/user-accounts/cc-fingerprint-dialog.c:897
 msgctxt "Fingerprint enroll state"
 msgid "Failed to enroll new fingerprint"
 msgstr "無法登錄新的指紋"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:803
+#: panels/user-accounts/cc-fingerprint-dialog.c:928
 #, c-format
 msgid "Failed to stop enrollment: %s"
 msgstr "無法停止登錄:%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:847
+#: panels/user-accounts/cc-fingerprint-dialog.c:974
 msgid ""
 "Repeatedly lift and place your finger on the reader to enroll your "
 "fingerprint"
 msgstr "請反複提起您的手指再重放到閱讀器上,以登錄您的指紋"
 
 #. TRANSLATORS: This is the label for the button to enroll a new finger
-#: panels/user-accounts/cc-fingerprint-dialog.c:989
+#: panels/user-accounts/cc-fingerprint-dialog.c:1118
 msgid "Scan new fingerprint"
 msgstr "掃描新的指紋"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1029
+#: panels/user-accounts/cc-fingerprint-dialog.c:1157
 #, c-format
 msgid "Failed to release fingerprint device %s: %s"
 msgstr "無法釋放指紋裝置 %s:%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1100
+#: panels/user-accounts/cc-fingerprint-dialog.c:1229
 msgctxt "Fingerprint enroll state"
 msgid "Problem Reading Device"
 msgstr "讀取裝置有問題"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1133
+#: panels/user-accounts/cc-fingerprint-dialog.c:1264
 #, c-format
 msgid "Failed to claim fingerprint device %s: %s"
 msgstr "無法索取指紋裝置 %s:%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1270
+#: panels/user-accounts/cc-fingerprint-dialog.c:1413
 #, c-format
 msgid "Failed to get fingerprint devices: %s"
 msgstr "無法取得指紋裝置:%s"
@@ -7174,7 +7270,7 @@ msgstr "%s — %s"
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
 #: panels/user-accounts/cc-login-history-dialog.c:173
-#: panels/user-accounts/cc-user-panel.c:782
+#: panels/user-accounts/cc-user-panel.c:766
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -7182,7 +7278,7 @@ msgstr "%k:%M"
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
 #: panels/user-accounts/cc-login-history-dialog.c:176
-#: panels/user-accounts/cc-user-panel.c:786
+#: panels/user-accounts/cc-user-panel.c:770
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -7243,117 +7339,117 @@ msgstr "允許使用者在下次登入時改變他們的密碼"
 msgid "Set a password now"
 msgstr "立刻設定密碼"
 
-#: panels/user-accounts/cc-realm-manager.c:306
+#: panels/user-accounts/cc-realm-manager.c:303
 msgid "Cannot automatically join this type of domain"
 msgstr "不能自動加入這個類型的網域"
 
-#: panels/user-accounts/cc-realm-manager.c:309
+#: panels/user-accounts/cc-realm-manager.c:306
 msgid "No such domain or realm found"
 msgstr "找不到這個網域或領域名稱"
 
-#: panels/user-accounts/cc-realm-manager.c:731
-#: panels/user-accounts/cc-realm-manager.c:745
+#: panels/user-accounts/cc-realm-manager.c:712
+#: panels/user-accounts/cc-realm-manager.c:726
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "不能以 %s 身分登入 %s 網域"
 
-#: panels/user-accounts/cc-realm-manager.c:737
+#: panels/user-accounts/cc-realm-manager.c:718
 msgid "Invalid password, please try again"
 msgstr "密碼錯誤,請再試一次"
 
-#: panels/user-accounts/cc-realm-manager.c:750
+#: panels/user-accounts/cc-realm-manager.c:731
 #, c-format
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "無法連接到 %s 網域:%s"
 
-#: panels/user-accounts/cc-user-panel.c:220
+#: panels/user-accounts/cc-user-panel.c:222
 msgid "Your account"
 msgstr "您的帳號"
 
-#: panels/user-accounts/cc-user-panel.c:401
+#: panels/user-accounts/cc-user-panel.c:397
 msgid "Failed to delete user"
 msgstr "刪除使用者失敗"
 
-#: panels/user-accounts/cc-user-panel.c:459
-#: panels/user-accounts/cc-user-panel.c:518
-#: panels/user-accounts/cc-user-panel.c:570
+#: panels/user-accounts/cc-user-panel.c:452
+#: panels/user-accounts/cc-user-panel.c:507
+#: panels/user-accounts/cc-user-panel.c:553
 msgid "Failed to revoke remotely managed user"
 msgstr "註銷遠端管理的使用者失敗"
 
-#: panels/user-accounts/cc-user-panel.c:621
+#: panels/user-accounts/cc-user-panel.c:602
 msgid "You cannot delete your own account."
 msgstr "您不能刪除自己的帳號。"
 
-#: panels/user-accounts/cc-user-panel.c:630
+#: panels/user-accounts/cc-user-panel.c:611
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 仍在登入中"
 
-#: panels/user-accounts/cc-user-panel.c:634
+#: panels/user-accounts/cc-user-panel.c:615
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "在使用者登入期間刪除他會使系統處於不穩定的狀態。"
 
-#: panels/user-accounts/cc-user-panel.c:643
+#: panels/user-accounts/cc-user-panel.c:624
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "您想要保留 %s 的檔案嗎?"
 
-#: panels/user-accounts/cc-user-panel.c:647
+#: panels/user-accounts/cc-user-panel.c:628
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr ""
 "刪除使用者時,可以選擇保留家目錄、新進郵件 (mail spool) 與暫存檔案等資料。"
 
-#: panels/user-accounts/cc-user-panel.c:650
+#: panels/user-accounts/cc-user-panel.c:631
 msgid "_Delete Files"
 msgstr "刪除檔案(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:651
+#: panels/user-accounts/cc-user-panel.c:632
 msgid "_Keep Files"
 msgstr "保留檔案(_K)"
 
-#: panels/user-accounts/cc-user-panel.c:665
+#: panels/user-accounts/cc-user-panel.c:646
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "確定要註銷遠端管理的 %s 帳號?"
 
-#: panels/user-accounts/cc-user-panel.c:669
+#: panels/user-accounts/cc-user-panel.c:650
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:719
+#: panels/user-accounts/cc-user-panel.c:700
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳號已停用"
 
-#: panels/user-accounts/cc-user-panel.c:727
+#: panels/user-accounts/cc-user-panel.c:708
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "在下次登入時設定"
 
-#: panels/user-accounts/cc-user-panel.c:730
+#: panels/user-accounts/cc-user-panel.c:711
 msgctxt "Password mode"
 msgid "None"
 msgstr "沒有"
 
-#: panels/user-accounts/cc-user-panel.c:775
+#: panels/user-accounts/cc-user-panel.c:754
 msgid "Logged in"
 msgstr "已登入"
 
 #. TRANSLATORS: Status of Parental Controls setup
-#: panels/user-accounts/cc-user-panel.c:863
-#: panels/user-accounts/cc-user-panel.c:954
+#: panels/user-accounts/cc-user-panel.c:841
+#: panels/user-accounts/cc-user-panel.c:935
 msgid "Enabled"
 msgstr "已啟用"
 
-#: panels/user-accounts/cc-user-panel.c:1265
+#: panels/user-accounts/cc-user-panel.c:1254
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: panels/user-accounts/cc-user-panel.c:1267
+#: panels/user-accounts/cc-user-panel.c:1256
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
@@ -7361,7 +7457,7 @@ msgstr "請確定 AccountService 已經安裝並啟用。"
 #. * We split the line in 2 here to "make it look good", as there's
 #. * no good way to do this in GTK+ for tooltips. See:
 #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
-#: panels/user-accounts/cc-user-panel.c:1299
+#: panels/user-accounts/cc-user-panel.c:1288
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -7369,12 +7465,12 @@ msgstr ""
 "要進行變更,\n"
 "請先點選 * 圖示"
 
-#: panels/user-accounts/cc-user-panel.c:1373
+#: panels/user-accounts/cc-user-panel.c:1361
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: panels/user-accounts/cc-user-panel.c:1385
-#: panels/user-accounts/cc-user-panel.c:1506
+#: panels/user-accounts/cc-user-panel.c:1373
+#: panels/user-accounts/cc-user-panel.c:1492
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7382,71 +7478,79 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: panels/user-accounts/cc-user-panel.ui:5
+#: panels/user-accounts/cc-user-panel.c:1545
+msgid "Unlock to Add Users and Change Settings"
+msgstr "請解除鎖定以加入使用者與變更設定"
+
+#: panels/user-accounts/cc-user-panel.ui:6
 msgid "_Add User…"
 msgstr "加入使用者(_A)…"
 
-#: panels/user-accounts/cc-user-panel.ui:8
+#: panels/user-accounts/cc-user-panel.ui:9
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: panels/user-accounts/cc-user-panel.ui:63
+#: panels/user-accounts/cc-user-panel.ui:64
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "您的作業階段需要重新啟動以讓變更生效"
 
-#: panels/user-accounts/cc-user-panel.ui:71
+#: panels/user-accounts/cc-user-panel.ui:72
 msgid "Restart Now"
 msgstr "立刻重新啟動"
 
-#: panels/user-accounts/cc-user-panel.ui:152
-#: panels/user-accounts/cc-user-panel.ui:168
+#: panels/user-accounts/cc-user-panel.ui:153
+#: panels/user-accounts/cc-user-panel.ui:169
 msgid "User Icon"
 msgstr "使用者圖示"
 
-#: panels/user-accounts/cc-user-panel.ui:244
+#: panels/user-accounts/cc-user-panel.ui:245
 msgid "Account Settings"
 msgstr "帳號設定值"
 
-#: panels/user-accounts/cc-user-panel.ui:271
+#: panels/user-accounts/cc-user-panel.ui:272
 msgid "_Administrator"
 msgstr "管理員(_A)"
 
-#: panels/user-accounts/cc-user-panel.ui:291
+#: panels/user-accounts/cc-user-panel.ui:301
 msgid ""
 "Administrators can add and remove other users, and can change settings for "
 "all users."
 msgstr "管理員可以加入與移除其他使用者,並且可以改變所有使用者的設定值。"
 
-#: panels/user-accounts/cc-user-panel.ui:320
+#: panels/user-accounts/cc-user-panel.ui:333
 msgid "_Parental Controls"
 msgstr "家長控制(_P)"
 
-#: panels/user-accounts/cc-user-panel.ui:410
+#: panels/user-accounts/cc-user-panel.ui:377
+msgid "Open the Parental Controls application."
+msgstr "開啟家長控制應用程式。"
+
+#: panels/user-accounts/cc-user-panel.ui:452
 msgid "Authentication & Login"
 msgstr "身分核對與登入"
 
-#: panels/user-accounts/cc-user-panel.ui:479
+#: panels/user-accounts/cc-user-panel.ui:521
 msgid "_Fingerprint Login"
 msgstr "指紋登入(_F)"
 
-#: panels/user-accounts/cc-user-panel.ui:521
+#: panels/user-accounts/cc-user-panel.ui:563
 msgid "A_utomatic Login"
 msgstr "自動登入(_U)"
 
-#: panels/user-accounts/cc-user-panel.ui:551
+#: panels/user-accounts/cc-user-panel.ui:593
 msgid "Account Activity"
 msgstr "帳號活動"
 
-#: panels/user-accounts/cc-user-panel.ui:592
+#: panels/user-accounts/cc-user-panel.ui:634
 msgid "Remove User…"
 msgstr "移除使用者…"
 
 #. Translators: This is the empty state page label which states that there are no users to show in the panel.
-#: panels/user-accounts/cc-user-panel.ui:631
+#: panels/user-accounts/cc-user-panel.ui:673
 msgid "No Users Found"
 msgstr "找不到使用者"
 
-#: panels/user-accounts/cc-user-panel.ui:641
+#: panels/user-accounts/cc-user-panel.ui:683
 msgid "Unlock to add a user account."
 msgstr "解除使用者帳號的新增鎖定。"
 
@@ -7600,70 +7704,70 @@ msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
 msgstr "加入更多字母、數字與標點符號會讓密碼更強。"
 
-#: panels/user-accounts/run-passwd.c:424
+#: panels/user-accounts/run-passwd.c:413
 msgid "Authentication failed"
 msgstr "核對失敗"
 
-#: panels/user-accounts/run-passwd.c:504
+#: panels/user-accounts/run-passwd.c:492
 #, c-format
 msgid "The new password is too short"
 msgstr "新的密碼太短"
 
-#: panels/user-accounts/run-passwd.c:510
+#: panels/user-accounts/run-passwd.c:498
 #, c-format
 msgid "The new password is too simple"
 msgstr "新的密碼太簡單"
 
-#: panels/user-accounts/run-passwd.c:516
+#: panels/user-accounts/run-passwd.c:504
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "舊密碼與新密碼太相似"
 
-#: panels/user-accounts/run-passwd.c:519
+#: panels/user-accounts/run-passwd.c:507
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "新的密碼已在最近使用過。"
 
-#: panels/user-accounts/run-passwd.c:522
+#: panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "新的密碼必須包含數字或特殊字元"
 
-#: panels/user-accounts/run-passwd.c:526
+#: panels/user-accounts/run-passwd.c:514
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "舊密碼與新密碼相同"
 
-#: panels/user-accounts/run-passwd.c:530
+#: panels/user-accounts/run-passwd.c:518
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "您的密碼在第一次通過身分核對後已經更改!"
 
-#: panels/user-accounts/run-passwd.c:534
+#: panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "新的密碼並未包含足夠的不同字元"
 
-#: panels/user-accounts/run-passwd.c:538
+#: panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: panels/user-accounts/user-utils.c:435
+#: panels/user-accounts/user-utils.c:432
 msgid ""
 "The username should usually only consist of lower case letters from a-z, "
 "digits and the following characters: - _"
 msgstr "使用者名稱通常只能有小寫英文字母 a 到 z、數字與下述字元:- _"
 
-#: panels/user-accounts/user-utils.c:439
+#: panels/user-accounts/user-utils.c:436
 msgid "Sorry, that user name isn’t available. Please try another."
 msgstr "抱歉,使用者名稱無法使用。請嘗試另一個。"
 
-#: panels/user-accounts/user-utils.c:484
+#: panels/user-accounts/user-utils.c:478
 msgid "The username is too long."
 msgstr "使用者名稱太長。"
 
-#: panels/user-accounts/user-utils.c:546
+#: panels/user-accounts/user-utils.c:537
 msgid "This will be used to name your home folder and can’t be changed."
 msgstr "這會成為您家目錄資料夾的名稱,並且不能被改變。"
 
@@ -7951,8 +8055,8 @@ msgid ""
 "may experience incorrect system behavior, data loss, and other unexpected "
 "issues. "
 msgstr ""
-"這版本的《設定值》應只作為開發目的使用。您可能會遇到不正常的系統行為、資料遺"
-"失與其他預期之外的問題。"
+"這個版本的《設定值》應只作為開發目的使用。您可能會遇到不正常的系統行為、資料"
+"遺失,或其他預期之外的問題。"
 
 #: shell/cc-window.ui:330
 msgid "Help"
@@ -7973,7 +8077,7 @@ msgctxt "shortcut window"
 msgid "Quit"
 msgstr "結束"
 
-#: shell/help-overlay.ui:27 shell/help-overlay.ui:48
+#: shell/help-overlay.ui:27 shell/help-overlay.ui:57
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "搜尋"
@@ -7983,12 +8087,12 @@ msgctxt "shortcut window"
 msgid "Panels"
 msgstr "面板"
 
-#: shell/help-overlay.ui:40
+#: shell/help-overlay.ui:41 shell/help-overlay.ui:49
 msgctxt "shortcut window"
 msgid "Go back to previous panel"
 msgstr "回到上一個面板"
 
-#: shell/help-overlay.ui:53
+#: shell/help-overlay.ui:62
 msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "取消搜尋"
@@ -8016,7 +8120,7 @@ msgstr "當執行開發構建版本時,是否在設定中顯示警告。"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1883
+#: subprojects/gvc/gvc-mixer-control.c:1907
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -8024,16 +8128,86 @@ msgstr[0] "%u 輸出"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1893
+#: subprojects/gvc/gvc-mixer-control.c:1917
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 輸入"
 
-#: subprojects/gvc/gvc-mixer-control.c:2750
+#: subprojects/gvc/gvc-mixer-control.c:2867
 msgid "System Sounds"
 msgstr "系統音效"
 
+#~ msgid "Left Alt"
+#~ msgstr "左 Alt"
+
+#~ msgid "Right Alt"
+#~ msgstr "右 Alt"
+
+#~ msgid "Left Super"
+#~ msgstr "左 Super"
+
+#~ msgid "Right Super"
+#~ msgstr "右 Super"
+
+#~ msgid "Right Ctrl"
+#~ msgstr "右 Ctrl"
+
+#~ msgid "Alternative Characters Key"
+#~ msgstr "替代的字元鍵"
+
+#~ msgid "Modifiers-only switch to next source"
+#~ msgstr "只以修飾鍵切換至下個來源"
+
+#~ msgctxt "keyboard key"
+#~ msgid "Menu Key"
+#~ msgstr "選單鍵"
+
+#~ msgctxt "Battery power"
+#~ msgid "Charging"
+#~ msgstr "充電"
+
+#~ msgctxt "Battery power"
+#~ msgid "Caution"
+#~ msgstr "注意"
+
+#~ msgctxt "Battery power"
+#~ msgid "Low"
+#~ msgstr "低"
+
+#~ msgctxt "Battery power"
+#~ msgid "Good"
+#~ msgstr "良好"
+
+#~ msgctxt "Battery power"
+#~ msgid "Fully charged"
+#~ msgstr "已完全充飽"
+
+#~ msgctxt "Battery power"
+#~ msgid "Empty"
+#~ msgstr "沒電"
+
+#~ msgid "Choose keyboard layouts or input methods."
+#~ msgstr "請選取鍵盤配置或輸入法。"
+
+#~ msgid "Previous source"
+#~ msgstr "上一個來源"
+
+#~ msgid "Super+Shift+Space"
+#~ msgstr "Super+Shift+Space"
+
+#~ msgid "Next source"
+#~ msgstr "下一個來源"
+
+#~ msgid "Super+Space"
+#~ msgstr "Super+Space"
+
+#~ msgid "Left+Right Alt"
+#~ msgstr "左+右 Alt"
+
+#~ msgid "These keyboard shortcuts can be changed in the keyboard settings"
+#~ msgstr "可以在鍵盤設定中變更這些鍵盤快捷鍵"
+
 #~ msgid "∶"
 #~ msgstr "∶"
 
@@ -8063,9 +8237,6 @@ msgstr "系統音效"
 #~ "administrator."
 #~ msgstr "您不被允許使用這個裝置。請連絡您的管理員。"
 
-#~ msgid "The device is already in use."
-#~ msgstr "該裝置已經在使用中。"
-
 #~ msgid "An internal error occurred."
 #~ msgstr "發生內部的錯誤。"
 
@@ -8599,9 +8770,6 @@ msgstr "系統音效"
 #~ msgid "preferences-color"
 #~ msgstr "preferences-color"
 
-#~ msgid "Language"
-#~ msgstr "語言"
-
 #~ msgid "preferences-system-time"
 #~ msgstr "preferences-system-time"
 
@@ -8623,9 +8791,6 @@ msgstr "系統音效"
 #~ msgid "media-removable"
 #~ msgstr "media-removable"
 
-#~ msgid "Keyboard"
-#~ msgstr "鍵盤"
-
 #~ msgid "input-keyboard"
 #~ msgstr "input-keyboard"
 
@@ -8704,9 +8869,6 @@ msgstr "系統音效"
 #~ msgid "preferences-system-search"
 #~ msgstr "preferences-system-search"
 
-#~ msgid "Preferences"
-#~ msgstr "偏好設定"
-
 #~ msgid "preferences-system-sharing"
 #~ msgstr "preferences-system-sharing"
 
@@ -8732,10 +8894,6 @@ msgstr "系統音效"
 #~ msgid "_Subwoofer:"
 #~ msgstr "重低音(_S):"
 
-#~ msgctxt "volume"
-#~ msgid "Unamplified"
-#~ msgstr "未經放大"
-
 #~ msgid "_Profile:"
 #~ msgstr "設定檔(_P):"
 
@@ -8863,9 +9021,6 @@ msgstr "系統音效"
 #~ msgid "Net­work"
 #~ msgstr "網路"
 
-#~ msgid "invalid EAP-TLS password: missing"
-#~ msgstr "無效的 EAP-TLS 密碼:缺少"
-
 #~ msgid "No­ti­fi­ca­tions"
 #~ msgstr "通知"
 
@@ -9259,15 +9414,9 @@ msgstr "系統音效"
 #~ msgid "Scroll Down"
 #~ msgstr "向下捲動"
 
-#~ msgid "Scroll Left"
-#~ msgstr "向左捲動"
-
 #~ msgid "Scroll Right"
 #~ msgstr "向右捲動"
 
-#~ msgid "Add Shortcut"
-#~ msgstr "加入捷徑鍵"
-
 #~ msgid "Remove Shortcut"
 #~ msgstr "移除捷徑鍵"
 
@@ -9566,9 +9715,6 @@ msgstr "系統音效"
 #~ msgid "When battery power is _critical"
 #~ msgstr "當電池的電量極低時(_C)"
 
-#~ msgid "Power off"
-#~ msgstr "關閉電源"
-
 #~ msgid "Show help options"
 #~ msgstr "顯示說明的選項"
 
@@ -9900,9 +10046,6 @@ msgstr "系統音效"
 #~ msgid "Alt+Ctrl"
 #~ msgstr "Alt+Ctrl"
 
-#~ msgid "Caps"
-#~ msgstr "Caps"
-
 #~ msgid "Shift+Caps"
 #~ msgstr "Shift+Caps"
 


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