GNOME.org
 

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

commit 801950a5baf53d1d8f1a3b1a8d39a461d2f1c145
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Sat Oct 1 07:43:01 2022 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 4457 ++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 2717 insertions(+), 1740 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0221566f6..aee3cde44 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,123 +10,125 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2010.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
 # pan93412 <pan93412 gmail com>, 2019.
+# Freddy Cheng <freddy4212 gmail com>, 2022.
+#
 msgid ""
 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: 2022-05-05 13:32+0000\n"
-"PO-Revision-Date: 2022-05-12 15:04+0800\n"
+"POT-Creation-Date: 2022-09-22 15:35+0000\n"
+"PO-Revision-Date: 2022-10-01 15:41+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
-"Language-Team: Chinese <zh-l10n linux org tw>\n"
+"Language-Team: Chinese - Taiwan <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.1.1\n"
 
-#: panels/applications/cc-applications-panel.c:803
+#: panels/applications/cc-applications-panel.c:822
 msgid "System Bus"
 msgstr "系統匯流排"
 
-#: panels/applications/cc-applications-panel.c:803
-#: panels/applications/cc-applications-panel.c:805
-#: panels/applications/cc-applications-panel.c:818
-#: panels/applications/cc-applications-panel.c:823
+#: panels/applications/cc-applications-panel.c:822
+#: panels/applications/cc-applications-panel.c:824
+#: panels/applications/cc-applications-panel.c:837
+#: panels/applications/cc-applications-panel.c:842
 msgid "Full access"
-msgstr "完整存取權限"
+msgstr "可以完全取用"
 
-#: panels/applications/cc-applications-panel.c:805
+#: panels/applications/cc-applications-panel.c:824
 msgid "Session Bus"
-msgstr "工作階段匯流排"
+msgstr "作業階段匯流排"
 
-#: panels/applications/cc-applications-panel.c:809
-#: panels/power/cc-power-panel.ui:75 panels/thunderbolt/cc-bolt-panel.ui:266
-#: panels/thunderbolt/cc-bolt-panel.ui:310
+#: panels/applications/cc-applications-panel.c:828
+#: panels/power/cc-power-panel.ui:75 panels/thunderbolt/cc-bolt-panel.ui:265
+#: panels/thunderbolt/cc-bolt-panel.ui:309
 msgid "Devices"
 msgstr "裝置"
 
-#: panels/applications/cc-applications-panel.c:809
+#: panels/applications/cc-applications-panel.c:828
 msgid "Full access to /dev"
-msgstr "完整 /dev 存取權限"
+msgstr "可以完全取用 /dev"
 
-#: panels/applications/cc-applications-panel.c:813
+#: panels/applications/cc-applications-panel.c:832
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:230 panels/wwan/cc-wwan-device-page.ui:61
+#: panels/network/network-mobile.ui:235 panels/wwan/cc-wwan-device-page.ui:61
 #: panels/wwan/cc-wwan-network-dialog.ui:5
 msgid "Network"
 msgstr "網路"
 
-#: panels/applications/cc-applications-panel.c:813
+#: panels/applications/cc-applications-panel.c:832
 msgid "Has network access"
-msgstr "有網路存取權限"
+msgstr "可以取用網路"
 
-#: panels/applications/cc-applications-panel.c:818
-#: panels/applications/cc-applications-panel.c:820
+#: panels/applications/cc-applications-panel.c:837
+#: panels/applications/cc-applications-panel.c:839
 #: panels/search/cc-search-locations-dialog.c:384
 msgid "Home"
-msgstr "家"
+msgstr "家目錄"
 
-#: panels/applications/cc-applications-panel.c:820
-#: panels/applications/cc-applications-panel.c:825
+#: panels/applications/cc-applications-panel.c:839
+#: panels/applications/cc-applications-panel.c:844
 msgid "Read-only"
-msgstr "唯讀"
+msgstr "僅能讀取"
 
-#: panels/applications/cc-applications-panel.c:823
-#: panels/applications/cc-applications-panel.c:825
+#: panels/applications/cc-applications-panel.c:842
+#: panels/applications/cc-applications-panel.c:844
 msgid "File System"
 msgstr "檔案系統"
 
-#: panels/applications/cc-applications-panel.c:829
+#: panels/applications/cc-applications-panel.c:848
 #: panels/keyboard/01-launchers.xml.in:6
 #: shell/appdata/org.gnome.Settings.appdata.xml.in:7 shell/cc-window.c:246
-#: shell/cc-window.c:878 shell/cc-window.ui:22
+#: shell/cc-window.c:880 shell/cc-window.ui:22
 #: shell/org.gnome.Settings.desktop.in.in:3
 msgid "Settings"
 msgstr "設定值"
 
-#: panels/applications/cc-applications-panel.c:829
+#: panels/applications/cc-applications-panel.c:848
 msgid "Can change settings"
-msgstr "可以變更設定"
+msgstr "可以更改設定值"
 
-#: panels/applications/cc-applications-panel.c:831
+#: panels/applications/cc-applications-panel.c:850
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
 "are concerned about these permissions, consider removing this application."
 msgstr ""
-"%s 內建以下權限。這部分無法變更。如果您對這些存取權設定有顧慮，請考慮移除此應"
-"用程式。"
+"《%s》內建下列權限並且無法更改。若您對這些權限設定有疑慮，請考慮移除應用程"
+"式。"
 
-#: panels/applications/cc-applications-panel.c:1164
+#: panels/applications/cc-applications-panel.c:1192
 #, c-format
 msgid "%u file and link type that is opened by the app"
 msgid_plural "%u file and link types that are opened by the app"
-msgstr[0] "有 %u 種檔案與連結類型由該程式開啟"
+msgstr[0] "有 %u 種類型的檔案與連結使用這個應用程式開啟"
 
-#: panels/applications/cc-applications-panel.c:1171
+#: panels/applications/cc-applications-panel.c:1199
 #, c-format
 msgid "<b>%s</b> is used to open the following types of files and links."
-msgstr "<b>%s</b> 用來開啟下列檔案與連結的類型。"
+msgstr "《%s》用於開啟下列的檔案與連結類型。"
 
 #. Translators: '%s' is the formatted size, e.g. "26.2 MB"
-#: panels/applications/cc-applications-panel.c:1223
+#: panels/applications/cc-applications-panel.c:1251
 #, c-format
-msgid "%s of disk space used"
-msgstr "已使用 %s 磁碟空間"
+msgid "%s of disk space used."
+msgstr "已使用 %s 的磁碟空間。"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1387
+#: panels/applications/cc-applications-panel.c:1415
 #: panels/applications/cc-applications-panel.ui:19
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
 #: panels/notifications/cc-notifications-panel.ui:26
 msgid "Applications"
-msgstr "程式集"
+msgstr "應用程式"
 
 #: panels/applications/cc-applications-panel.ui:31
 msgid "No applications"
-msgstr "無應用程式"
+msgstr "沒有應用程式"
 
 #: panels/applications/cc-applications-panel.ui:34
 msgid "Install some…"
@@ -144,6 +146,10 @@ msgstr "檢視詳細資料"
 #: panels/applications/cc-applications-panel.ui:112
 #: panels/applications/cc-applications-panel.ui:119
 #: panels/keyboard/01-launchers.xml.in:16
+#: panels/keyboard/cc-input-chooser.ui:75
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:63
+#: panels/printers/new-printer-dialog.ui:252
+#: panels/region/cc-format-chooser.ui:82
 #: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:41
 msgid "Search"
 msgstr "搜尋"
@@ -151,7 +157,7 @@ msgstr "搜尋"
 #: panels/applications/cc-applications-panel.ui:113
 #: panels/applications/cc-applications-panel.ui:120
 msgid "Receive system searches and send results."
-msgstr "接收系統搜尋與傳送結果。"
+msgstr "接收系統搜尋請求與傳送搜尋結果。"
 
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
@@ -160,15 +166,15 @@ msgstr "接收系統搜尋與傳送結果。"
 #. translators:
 #. * The device has been disabled
 #: panels/applications/cc-applications-panel.ui:121
-#: panels/applications/cc-applications-panel.ui:156
-#: panels/applications/cc-applications-panel.ui:177
-#: panels/applications/cc-applications-panel.ui:191
-#: panels/applications/cc-applications-panel.ui:205
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:118
+#: panels/applications/cc-applications-panel.ui:163
+#: panels/applications/cc-applications-panel.ui:184
+#: panels/applications/cc-applications-panel.ui:198
+#: panels/applications/cc-applications-panel.ui:212
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:123
 #: panels/keyboard/cc-xkb-modifier-dialog.c:344
-#: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:105
-#: panels/user-accounts/cc-user-panel.c:789
-#: panels/user-accounts/cc-user-panel.c:879
+#: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:107
+#: panels/user-accounts/cc-user-panel.c:804
+#: panels/user-accounts/cc-user-panel.c:907
 #: panels/wwan/cc-wwan-device-page.c:478
 #: subprojects/gvc/gvc-mixer-control.c:1908
 msgid "Disabled"
@@ -184,138 +190,149 @@ msgid "Show system notifications."
 msgstr "顯示系統通知。"
 
 #: panels/applications/cc-applications-panel.ui:133
-msgid "Run in background"
+msgid "Run in Background"
 msgstr "背景執行"
 
 #: panels/applications/cc-applications-panel.ui:134
 msgid "Allow activity when the app is closed."
-msgstr "當程式關閉時仍允許活動。"
+msgstr "應用程式關閉時仍允許活動。"
 
 #: panels/applications/cc-applications-panel.ui:140
-msgid "Change Wallpaper"
-msgstr "變更桌布"
+msgid "Screenshots"
+msgstr "螢幕快照"
 
 #: panels/applications/cc-applications-panel.ui:141
-msgid "Change the desktop wallpaper."
-msgstr "更改桌布。"
+msgid "Take pictures of the screen at any time."
+msgstr "隨時擷取螢幕快照。"
 
 #: panels/applications/cc-applications-panel.ui:147
+msgid "Change Wallpaper"
+msgstr "更換桌布"
+
+#: panels/applications/cc-applications-panel.ui:148
+msgid "Change the desktop wallpaper."
+msgstr "更換桌面背景。"
+
 #: panels/applications/cc-applications-panel.ui:154
+#: panels/applications/cc-applications-panel.ui:161
 msgid "Sounds"
-msgstr "音效"
+msgstr "聲音"
 
-#: panels/applications/cc-applications-panel.ui:148
 #: panels/applications/cc-applications-panel.ui:155
+#: panels/applications/cc-applications-panel.ui:162
 msgid "Reproduce sounds."
 msgstr "發出聲音。"
 
-#: panels/applications/cc-applications-panel.ui:161
+#: panels/applications/cc-applications-panel.ui:168
 msgid "Inhibit Shortcuts"
-msgstr "抑制快捷鍵"
+msgstr "暫時停用快捷鍵"
 
-#: panels/applications/cc-applications-panel.ui:162
+#: panels/applications/cc-applications-panel.ui:169
 msgid "Block standard keyboard shortcuts."
-msgstr "封鎖標準系統快捷鍵。"
+msgstr "封鎖常規的系統快捷鍵。"
 
-#: panels/applications/cc-applications-panel.ui:168
 #: panels/applications/cc-applications-panel.ui:175
+#: panels/applications/cc-applications-panel.ui:182
 #: panels/camera/gnome-camera-panel.desktop.in.in:3
 msgid "Camera"
 msgstr "相機"
 
-#: panels/applications/cc-applications-panel.ui:169
 #: panels/applications/cc-applications-panel.ui:176
+#: panels/applications/cc-applications-panel.ui:183
 msgid "Take pictures with the camera."
-msgstr "透過相機拍照。"
+msgstr "透過相機拍攝相片。"
 
-#: panels/applications/cc-applications-panel.ui:182
 #: panels/applications/cc-applications-panel.ui:189
+#: panels/applications/cc-applications-panel.ui:196
 #: panels/microphone/gnome-microphone-panel.desktop.in.in:3
 msgid "Microphone"
 msgstr "麥克風"
 
-#: panels/applications/cc-applications-panel.ui:183
 #: panels/applications/cc-applications-panel.ui:190
+#: panels/applications/cc-applications-panel.ui:197
 msgid "Record audio with the microphone."
-msgstr "透過麥克風錄音。"
+msgstr "透過麥克風錄製聲音。"
 
-#: panels/applications/cc-applications-panel.ui:196
 #: panels/applications/cc-applications-panel.ui:203
+#: panels/applications/cc-applications-panel.ui:210
 #: panels/location/gnome-location-panel.desktop.in.in:3
 msgid "Location Services"
 msgstr "定位服務"
 
-#: panels/applications/cc-applications-panel.ui:197
 #: panels/applications/cc-applications-panel.ui:204
+#: panels/applications/cc-applications-panel.ui:211
 msgid "Access device location data."
-msgstr "存取裝置的地理位置資料。"
+msgstr "存取裝置的位置資訊。"
 
-#: panels/applications/cc-applications-panel.ui:215
-#: panels/applications/cc-applications-panel.ui:319
+#: panels/applications/cc-applications-panel.ui:222
+#: panels/applications/cc-applications-panel.ui:326
 msgid "Built-in Permissions"
-msgstr "內建權限"
+msgstr "內建的權限"
 
-#: panels/applications/cc-applications-panel.ui:216
+#: panels/applications/cc-applications-panel.ui:223
 msgid "System access that is required by the app"
-msgstr "此程式需要的系統存取權"
+msgstr "應用程式所要求的系統取用權"
 
-#: panels/applications/cc-applications-panel.ui:224
+#: panels/applications/cc-applications-panel.ui:231
 msgid "File &amp; Link Associations"
-msgstr "檔案與連結關聯"
+msgstr "關聯的檔案與連結"
 
-#: panels/applications/cc-applications-panel.ui:232
-#: panels/applications/cc-applications-panel.ui:399
+#: panels/applications/cc-applications-panel.ui:239
+#: panels/applications/cc-applications-panel.ui:406
 msgid "Storage"
 msgstr "儲存空間"
 
-#: panels/applications/cc-applications-panel.ui:294 shell/cc-panel-list.ui:105
+#: panels/applications/cc-applications-panel.ui:301 shell/cc-panel-list.ui:108
 msgid "No results found"
 msgstr "找不到結果"
 
-#: panels/applications/cc-applications-panel.ui:304
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:198
-#: shell/cc-panel-list.ui:114
+#: panels/applications/cc-applications-panel.ui:311
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:210
+#: shell/cc-panel-list.ui:117
 msgid "Try a different search"
 msgstr "嘗試不同的搜尋內容"
 
-#: panels/applications/cc-applications-panel.ui:344
+#: panels/applications/cc-applications-panel.ui:351
 msgid "File & Link Associations"
-msgstr "檔案與連結關聯"
+msgstr "關聯的檔案與連結"
 
-#: panels/applications/cc-applications-panel.ui:367
+#: panels/applications/cc-applications-panel.ui:374
 msgid "File Types"
 msgstr "檔案類型"
 
-#: panels/applications/cc-applications-panel.ui:373
+#: panels/applications/cc-applications-panel.ui:380
 msgid "Link Types"
 msgstr "連結類型"
 
-#: panels/applications/cc-applications-panel.ui:383
+#: panels/applications/cc-applications-panel.ui:390
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:131
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:234
+#: panels/keyboard/cc-keyboard-shortcut-row.ui:25
 msgid "Reset"
 msgstr "重設"
 
-#: panels/applications/cc-applications-panel.ui:410
+#: panels/applications/cc-applications-panel.ui:417
 msgid ""
 "How much disk space this application is occupying with app data and caches."
-msgstr "此應用程式的應用程式資料及快取所佔用的磁碟空間。"
+msgstr "應用程式的資料與快取所佔用的磁碟空間。"
 
-#: panels/applications/cc-applications-panel.ui:413
+#: panels/applications/cc-applications-panel.ui:420
 msgid "Application"
 msgstr "應用程式"
 
-#: panels/applications/cc-applications-panel.ui:419
+#: panels/applications/cc-applications-panel.ui:426
 msgid "Data"
 msgstr "資料"
 
-#: panels/applications/cc-applications-panel.ui:425
+#: panels/applications/cc-applications-panel.ui:432
 msgid "Cache"
 msgstr "快取"
 
-#: panels/applications/cc-applications-panel.ui:431
+#: panels/applications/cc-applications-panel.ui:438
 msgid "<b>Total</b>"
 msgstr "<b>總計</b>"
 
-#: panels/applications/cc-applications-panel.ui:441
+#: panels/applications/cc-applications-panel.ui:448
 msgid "Clear Cache…"
 msgstr "清除快取…"
 
@@ -323,50 +340,53 @@ msgstr "清除快取…"
 msgid "Control various application permissions and settings"
 msgstr "控制各應用程式的權限與設定值"
 
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#. Translators: Search terms to find the Applications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/applications/gnome-applications-panel.desktop.in.in:16
 msgid "application;flatpak;permission;setting;"
-msgstr "application;flatpak;permission;setting;應用程式;權限;應用;設定;設置;"
+msgstr ""
+"application;flatpak;permission;setting;應用程式;權限;應用;設定;設置;安全;快"
+"取;關聯;連結;"
 
-#: panels/background/cc-background-chooser.c:307
+#: panels/background/cc-background-chooser.c:312
 msgid "Select a picture"
-msgstr "請選擇圖片"
+msgstr "選取圖片"
 
-#: panels/background/cc-background-chooser.c:310
+#: panels/background/cc-background-chooser.c:315
 #: panels/color/cc-color-calibrate.ui:22 panels/color/cc-color-panel.c:284
 #: panels/color/cc-color-panel.c:844 panels/common/cc-language-chooser.ui:21
 #: panels/display/cc-display-panel.ui:31
-#: panels/info-overview/cc-info-overview-panel.ui:198
+#: panels/info-overview/cc-info-overview-panel.ui:218
 #: panels/keyboard/cc-input-chooser.ui:11
-#: panels/network/cc-wifi-hotspot-dialog.ui:123
-#: panels/network/cc-wifi-panel.c:881
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:23
+#: panels/network/cc-wifi-hotspot-dialog.ui:125
+#: panels/network/cc-wifi-panel.c:886
 #: panels/network/connection-editor/connection-editor.ui:14
 #: panels/network/connection-editor/vpn-helpers.c:221
 #: panels/network/connection-editor/vpn-helpers.c:341
-#: panels/network/net-device-wifi.c:860
+#: panels/network/net-device-wifi.c:866
 #: panels/printers/new-printer-dialog.ui:50
-#: panels/printers/pp-details-dialog.c:263
+#: panels/printers/pp-details-dialog.c:269
 #: panels/region/cc-format-chooser.ui:24
 #: panels/search/cc-search-locations-dialog.c:677
-#: panels/sharing/cc-sharing-panel.c:526 panels/usage/cc-usage-panel.c:139
+#: panels/sharing/cc-sharing-panel.c:522 panels/usage/cc-usage-panel.c:139
 #: panels/user-accounts/cc-add-user-dialog.ui:25
 #: panels/user-accounts/cc-avatar-chooser.c:96
 #: panels/user-accounts/cc-avatar-chooser.c:167
 #: panels/user-accounts/cc-fingerprint-dialog.ui:32
-#: panels/user-accounts/cc-password-dialog.ui:18
-#: panels/user-accounts/cc-user-panel.c:579
-#: panels/user-accounts/cc-user-panel.c:597
+#: panels/user-accounts/cc-password-dialog.ui:20
+#: panels/user-accounts/cc-user-panel.c:594
+#: panels/user-accounts/cc-user-panel.c:612
 #: panels/user-accounts/data/join-dialog.ui:17
 #: panels/wwan/cc-wwan-mode-dialog.ui:32
-#: panels/wwan/cc-wwan-network-dialog.ui:139
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:268
+#: panels/wwan/cc-wwan-network-dialog.ui:108
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:240
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: panels/background/cc-background-chooser.c:311
+#: panels/background/cc-background-chooser.c:316
 #: panels/network/connection-editor/vpn-helpers.c:222
-#: panels/printers/pp-details-dialog.c:264
-#: panels/sharing/cc-sharing-panel.c:527
+#: panels/printers/pp-details-dialog.c:270
+#: panels/sharing/cc-sharing-panel.c:523
 #: panels/user-accounts/cc-avatar-chooser.c:168
 msgid "_Open"
 msgstr "é–‹å•Ÿ(_O)"
@@ -394,19 +414,20 @@ msgstr "目前的背景"
 msgid "Style"
 msgstr "風格"
 
-#: panels/background/cc-background-panel.ui:46
-msgid "Light"
-msgstr "明亮"
+#: panels/background/cc-background-panel.ui:49
+#: panels/wacom/cc-wacom-stylus-page.ui:133
+msgid "Default"
+msgstr "預設"
 
-#: panels/background/cc-background-panel.ui:73
+#: panels/background/cc-background-panel.ui:79
 msgid "Dark"
-msgstr "黑暗"
+msgstr "深色"
 
-#: panels/background/cc-background-panel.ui:92
+#: panels/background/cc-background-panel.ui:98
 msgid "Background"
 msgstr "背景"
 
-#: panels/background/cc-background-panel.ui:98
+#: panels/background/cc-background-panel.ui:104
 msgid "Add Picture…"
 msgstr "加入圖片…"
 
@@ -416,49 +437,58 @@ msgstr "外觀"
 
 #: panels/background/gnome-background-panel.desktop.in.in:4
 msgid "Change your background image or the UI colors"
-msgstr "變更您的背景影像或使用者介面色彩"
+msgstr "更改背景影像或使用者介面色彩"
 
 #. Translators: Search terms to find the Appearance panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/background/gnome-background-panel.desktop.in.in:15
-#| msgid "Wallpaper;Screen;Desktop;"
-msgid "Background;Wallpaper;Screen;Desktop;Style;Light;Dark;"
+msgid "Background;Wallpaper;Screen;Desktop;Style;Light;Dark;Appearance;"
 msgstr ""
 "Background;Wallpaper;Screen;Desktop;Style;Light;Dark;背景;桌布;螢幕;風格;明"
-"亮;黑暗;亮色;暗色;"
-
-#: panels/bluetooth/cc-bluetooth-panel.ui:21
+"亮;黑暗;亮色;暗色;深色;淺色;"
+
+#: panels/bluetooth/cc-bluetooth-panel.ui:11 panels/camera/cc-camera-panel.ui:8
+#: panels/datetime/cc-datetime-panel.ui:172
+#: panels/diagnostics/cc-diagnostics-panel.ui:18
+#: panels/display/cc-night-light-page.ui:122
+#: panels/microphone/cc-microphone-panel.ui:9
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:15
+#: panels/universal-access/cc-repeat-keys-dialog.ui:15
+msgid "Enable"
+msgstr "啟用"
+
+#: panels/bluetooth/cc-bluetooth-panel.ui:24
 msgid "No Bluetooth Found"
 msgstr "找不到藍牙"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:22
+#: panels/bluetooth/cc-bluetooth-panel.ui:25
 msgid "Plug in a dongle to use Bluetooth."
-msgstr "插入藍牙棒以使用藍牙。"
+msgstr "接上藍牙配接器以使用藍牙。"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:28
+#: panels/bluetooth/cc-bluetooth-panel.ui:31
 msgid "Bluetooth Turned Off"
 msgstr "藍牙已關閉"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:29
+#: panels/bluetooth/cc-bluetooth-panel.ui:32
 msgid "Turn on to connect devices and receive file transfers."
-msgstr "開啟以連接裝置與接收檔案傳輸。"
+msgstr "開啟以連接裝置和接收檔案傳輸。"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:35
+#: panels/bluetooth/cc-bluetooth-panel.ui:38
 msgid "Airplane Mode is On"
 msgstr "飛安模式已開啟"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:36
+#: panels/bluetooth/cc-bluetooth-panel.ui:39
 msgid "Bluetooth is disabled when airplane mode is on."
-msgstr "飛安模式開啟時將會停用藍牙。"
+msgstr "飛安模式開啟時會停用藍牙。"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:39
+#: panels/bluetooth/cc-bluetooth-panel.ui:42
 msgid "Turn Off Airplane Mode"
 msgstr "關閉飛安模式"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:53
+#: panels/bluetooth/cc-bluetooth-panel.ui:56
 msgid "Hardware Airplane Mode is On"
 msgstr "硬體飛安模式已開啟"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:54
+#: panels/bluetooth/cc-bluetooth-panel.ui:57
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "關閉飛安模式開關以啟用藍牙。"
 
@@ -477,43 +507,40 @@ msgstr "開啟或關閉藍牙與連接您的裝置"
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;分享;藍牙;"
 
-#: panels/camera/cc-camera-panel.ui:21
+#: panels/camera/cc-camera-panel.ui:24
 msgid "Camera is Turned Off"
 msgstr "相機已關閉"
 
-#: panels/camera/cc-camera-panel.ui:22
+#: panels/camera/cc-camera-panel.ui:25
 msgid "No applications can capture photos or video."
-msgstr "沒有應用程式能擷取圖片或影片。"
+msgstr "沒有應用程式能拍攝相片或錄製影片。"
 
-#: panels/camera/cc-camera-panel.ui:36
+#: panels/camera/cc-camera-panel.ui:39
 msgid ""
 "Use of the camera allows applications to capture photos and video. Disabling "
 "the camera may cause some applications to not function properly.\n"
 "\n"
 "Allow the applications below to use your camera."
 msgstr ""
-"使用相機可以允許應用程式拍照或錄影。停用相機可能導致部份應用程式不能正常運"
-"作。\n"
+"相機的使用可允許應用程式拍攝相片或錄製影片。停用相機可能導致部分應用程式不能"
+"正常運作。\n"
 "\n"
 "允許下列應用程式使用您的相機。"
 
-#: panels/camera/cc-camera-panel.ui:52
+#: panels/camera/cc-camera-panel.ui:55
 msgid "No Applications Have Asked for Camera Access"
-msgstr "沒有應用程式請求相機存取權"
+msgstr "沒有應用程式請求取用相機"
 
 #: panels/camera/gnome-camera-panel.desktop.in.in:4
 msgid "Protect your pictures"
 msgstr "保護您的照片"
 
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#. Translators: Search terms to find the Camera panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/camera/gnome-camera-panel.desktop.in.in:20
-#: panels/microphone/gnome-microphone-panel.desktop.in.in:20
-msgid ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;"
+msgid "camera;photos;video;webcam;lock;private;privacy;"
 msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;螢幕;鎖定;診斷;隱私;最近使用;暫存;索引;名稱;網路;身分;"
+"camera;photos;video;webcam;lock;private;privacy;相機;照片;影片;網路攝影機;鎖"
+"定相機;隱私權;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: panels/color/cc-color-calibrate.c:347
@@ -526,7 +553,7 @@ msgstr "將您的校準裝置放在方塊上方，並按下「開始」"
 #: panels/color/cc-color-calibrate.c:353
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
-msgstr "將您的校準裝置移到校準位置，並按下「繼續」"
+msgstr "將您的校準裝置移至校準位置，並按下「繼續」"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
@@ -534,20 +561,20 @@ msgstr "將您的校準裝置移到校準位置，並按下「繼續」"
 #: panels/color/cc-color-calibrate.c:359
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
-msgstr "將您的校準裝置移到表面位置，並按下「繼續」"
+msgstr "將您的校準裝置移至表面位置，並按下「繼續」"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
 #: panels/color/cc-color-calibrate.c:365
 msgid "Shut the laptop lid"
-msgstr "關上筆記型電腦上蓋"
+msgstr "請闔上筆記型電腦"
 
 #. TRANSLATORS: We suck, the calibration failed and we have no
 #. * good idea why or any suggestions
 #: panels/color/cc-color-calibrate.c:396
 msgid "An internal error occurred that could not be recovered."
-msgstr "發生內部的錯誤，無法復原。"
+msgstr "發生內部的錯誤，無法還原。"
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
@@ -565,7 +592,7 @@ msgstr "無法產生描述檔。"
 #. * https://en.wikipedia.org/wiki/White_point for details
 #: panels/color/cc-color-calibrate.c:413
 msgid "The target whitepoint was not obtainable."
-msgstr "尚無法獲取目標白點。"
+msgstr "無法取得目標白點。"
 
 #. TRANSLATORS: the display calibration process is finished
 #: panels/color/cc-color-calibrate.c:452
@@ -576,7 +603,7 @@ msgstr "完成！"
 #. * the translated (or untranslated) error string after this
 #: panels/color/cc-color-calibrate.c:460
 msgid "Calibration failed!"
-msgstr "校準已失敗！"
+msgstr "校準失敗！"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
 #: panels/color/cc-color-calibrate.c:467
@@ -588,11 +615,11 @@ msgstr "您可以移除校準裝置。"
 #. * detected early enough)
 #: panels/color/cc-color-calibrate.c:535
 msgid "Do not disturb the calibration device while in progress"
-msgstr "過程中請勿干擾校準裝置"
+msgstr "校準過程中請勿干擾校準裝置"
 
 #: panels/color/cc-color-calibrate.ui:9
 msgid "Display Calibration"
-msgstr "顯示校準"
+msgstr "顯示器校準"
 
 #. This starts the calibration process
 #: panels/color/cc-color-calibrate.ui:28
@@ -606,7 +633,7 @@ msgstr "繼續(_R)"
 
 #. This button returns the user back to the color control panel
 #: panels/color/cc-color-calibrate.ui:40 panels/region/cc-format-chooser.ui:49
-#: panels/user-accounts/cc-fingerprint-dialog.ui:60
+#: panels/user-accounts/cc-fingerprint-dialog.ui:57
 msgid "_Done"
 msgstr "完成(_D)"
 
@@ -618,7 +645,7 @@ msgstr "筆記型電腦螢幕"
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
 #: panels/color/cc-color-common.c:50
 msgid "Built-in Webcam"
-msgstr "內建網路攝影機"
+msgstr "內建的網路攝影機"
 
 #. TRANSLATORS: an externally connected display, where %s is either the
 #. * model, vendor or ID, e.g. 'LP2480zx Monitor'
@@ -682,7 +709,7 @@ msgstr "色彩空間："
 #. * profile is a test profile
 #: panels/color/cc-color-panel.c:175
 msgid "Test profile: "
-msgstr "測試描述檔："
+msgstr "測試用描述檔："
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
 #: panels/color/cc-color-panel.c:282
@@ -705,6 +732,7 @@ msgid "All files"
 msgstr "所有檔案"
 
 #: panels/color/cc-color-panel.c:586
+#: panels/screen/gnome-screen-panel.desktop.in.in:3
 msgid "Screen"
 msgstr "螢幕"
 
@@ -722,24 +750,24 @@ msgstr "儲存(_S)"
 #. TRANSLATORS: this is when the button is sensitive
 #: panels/color/cc-color-panel.c:1146
 msgid "Create a color profile for the selected device"
-msgstr "為已選取裝置建立色彩描述檔"
+msgstr "為所選的裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
 #: panels/color/cc-color-panel.c:1161 panels/color/cc-color-panel.c:1185
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
-msgstr "尚未偵測到測量儀器。請檢查它是否已開啟並正確的連接。"
+msgstr "未偵測到測量儀器，請檢查是否已開啟並正確連接。"
 
 #. TRANSLATORS: this is when the button is insensitive
 #: panels/color/cc-color-panel.c:1195
 msgid "The measuring instrument does not support printer profiling."
-msgstr "測量儀器不支援印表機的分析。"
+msgstr "測量儀器不支援印表機分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
 #: panels/color/cc-color-panel.c:1206
 msgid "The device type is not currently supported."
-msgstr "目刖不支援這個裝置類型。"
+msgstr "目前不支援這個裝置類型。"
 
 #: panels/color/cc-color-panel.ui:4 panels/wacom/calibrator/calibrator.ui:40
 msgid "Screen Calibration"
@@ -755,13 +783,13 @@ msgid ""
 "screen. The longer you spend on calibration, the better the quality of the "
 "color profile."
 msgstr ""
-"校準動作會產生描述檔讓您可以用來管理螢幕的色彩。您花在校準的時間愈長，色彩描"
-"述檔的品質就愈好。"
+"校準能建立用於管理螢幕色彩的描述檔。校準所花費的時間愈長，描述檔的品質就愈"
+"好。"
 
 #: panels/color/cc-color-panel.ui:28
 msgid ""
 "You will not be able to use your computer while calibration takes place."
-msgstr "當校準在進行時將不能使用您的電腦。"
+msgstr "校準進行時無法使用您的電腦。"
 
 #. This is the approximate time it takes to calibrate the display.
 #: panels/color/cc-color-panel.ui:40
@@ -779,7 +807,7 @@ msgstr "校準裝置"
 
 #: panels/color/cc-color-panel.ui:90
 msgid "Select the sensor device you want to use for calibration."
-msgstr "選擇您想要使用的校準偵測裝置。"
+msgstr "選擇您要用於校準的偵測裝置。"
 
 #: panels/color/cc-color-panel.ui:117
 msgid "Display Type"
@@ -797,7 +825,7 @@ msgstr "描述檔白點"
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
-msgstr "選擇一個顯示目標白點。大多數顯示器應該校準到 D65 光源。"
+msgstr "選擇一個顯示目標白點；大多數顯示器應校準至 D65 光源。"
 
 #: panels/color/cc-color-panel.ui:187
 msgid "Display Brightness"
@@ -808,7 +836,8 @@ msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
 msgstr ""
-"請將顯示器的亮度設定為您常用的狀態。色彩管理會以這個亮度等級調整到最正確。"
+"請將顯示器的亮度設定為您常用的狀態，色彩管理會以這個亮度等級進行最正確的調"
+"整。"
 
 #: panels/color/cc-color-panel.ui:202
 msgid ""
@@ -844,7 +873,7 @@ msgstr "複製描述檔"
 
 #: panels/color/cc-color-panel.ui:296
 msgid "Requires writable media"
-msgstr "需要可寫入媒體"
+msgstr "需要可寫入的媒體"
 
 #: panels/color/cc-color-panel.ui:313
 msgid ""
@@ -852,8 +881,9 @@ msgid ""
 "href=\"linux\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a "
 "href=\"windows\">Microsoft Windows</a> systems useful."
 msgstr ""
-"您可以找到如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple OS "
-"X</a> 與 <a href=\"windows\">Microsoft Windows</a> 系統上使用描述檔的指引。"
+"您可以找到如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple "
+"macOS</a> 與 <a href=\"windows\">Microsoft Windows</a> 系統上使用描述檔的指"
+"引。"
 
 #: panels/color/cc-color-panel.ui:335
 msgid "Add Profile"
@@ -863,22 +893,23 @@ msgstr "加入描述檔"
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
-msgstr "偵測到問題。描述檔可能無法正常運作。<a href=\"\">顯示詳細資料。</a>"
+msgstr "偵測到問題，描述檔可能無法正常運作。<a href=\"\">顯示詳細資料。</a>"
 
 #: panels/color/cc-color-panel.ui:384
 msgid "_Import File…"
 msgstr "載入檔案(_I)…"
 
 #: panels/color/cc-color-panel.ui:390 panels/keyboard/cc-input-chooser.ui:18
-#: panels/network/connection-editor/net-connection-editor.c:497
-#: panels/printers/new-printer-dialog.ui:84
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:41
+#: panels/network/connection-editor/net-connection-editor.c:503
+#: panels/printers/new-printer-dialog.ui:87
 #: panels/user-accounts/cc-add-user-dialog.ui:39
 msgid "_Add"
 msgstr "加入(_A)"
 
 #: panels/color/cc-color-panel.ui:424
 msgid "Each device needs an up to date color profile to be color managed."
-msgstr "每個裝置需要最新的色彩描述檔才能被管理色彩。"
+msgstr "每個裝置需要最新的色彩描述檔才能進行色彩管理。"
 
 #. translators: Text used in link to privacy policy
 #: panels/color/cc-color-panel.ui:434
@@ -897,7 +928,7 @@ msgstr "所有使用者皆可用(_S)"
 #: panels/color/cc-color-panel.ui:475 panels/color/cc-color-panel.ui:483
 #: panels/color/cc-color-panel.ui:484
 msgid "Set this profile for all users on this computer"
-msgstr "將這個描述檔給電腦上所有使用者"
+msgstr "將這個描述檔提供給電腦上的所有使用者"
 
 #: panels/color/cc-color-panel.ui:481
 msgid "_Enable"
@@ -905,7 +936,7 @@ msgstr "啟用(_E)"
 
 #: panels/color/cc-color-panel.ui:497
 msgid "_Add profile"
-msgstr "加入設定檔(_A)"
+msgstr "加入描述檔(_A)"
 
 #: panels/color/cc-color-panel.ui:503
 msgid "_Calibrate…"
@@ -925,7 +956,7 @@ msgstr "檢視詳細資料(_V)"
 
 #: panels/color/cc-color-panel.ui:529
 msgid "Unable to detect any devices that can be color managed"
-msgstr "無法偵測到任何能被管理色彩的裝置"
+msgstr "無法偵測到任何能進行色彩管理的裝置"
 
 #: panels/color/cc-color-panel.ui:568
 msgid "LCD"
@@ -949,23 +980,23 @@ msgstr "電漿"
 
 #: panels/color/cc-color-panel.ui:593
 msgid "LCD (CCFL backlight)"
-msgstr "LCD (CCFL 背光)"
+msgstr "LCD（CCFL 背光）"
 
 #: panels/color/cc-color-panel.ui:598
 msgid "LCD (RGB LED backlight)"
-msgstr "LCD (RGB LED 背光)"
+msgstr "LCD（RGB LED 背光）"
 
 #: panels/color/cc-color-panel.ui:603
 msgid "LCD (white LED backlight)"
-msgstr "LCD (白色 LED 背光)"
+msgstr "LCD（白色 LED 背光）"
 
 #: panels/color/cc-color-panel.ui:608
 msgid "Wide gamut LCD (CCFL backlight)"
-msgstr "廣色域 LCD (CCFL 背光)"
+msgstr "廣色域 LCD（CCFL 背光）"
 
 #: panels/color/cc-color-panel.ui:613
 msgid "Wide gamut LCD (RGB LED backlight)"
-msgstr "廣色域 LCD (RGB LED 背光)"
+msgstr "廣色域 LCD（RGB LED 背光）"
 
 #: panels/color/cc-color-panel.ui:630
 msgctxt "Calibration quality"
@@ -996,11 +1027,11 @@ msgstr "15 分鐘"
 
 #: panels/color/cc-color-panel.ui:663
 msgid "Native to display"
-msgstr "原生顯示"
+msgstr "顯示器原生設定"
 
 #: panels/color/cc-color-panel.ui:667
 msgid "D50 (Printing and publishing)"
-msgstr "D50 (列印與出版)"
+msgstr "D50（列印與出版）"
 
 #: panels/color/cc-color-panel.ui:671
 msgid "D55"
@@ -1008,7 +1039,7 @@ msgstr "D55"
 
 #: panels/color/cc-color-panel.ui:675
 msgid "D65 (Photography and graphics)"
-msgstr "D65 (攝影與繪圖)"
+msgstr "D65（攝影與繪圖）"
 
 #: panels/color/cc-color-panel.ui:679
 msgid "D75"
@@ -1018,13 +1049,13 @@ msgstr "D75"
 #. * sRGB, AdobeRGB and ProPhotoRGB
 #: panels/color/cc-color-profile.c:98
 msgid "Standard Space"
-msgstr "標準空間"
+msgstr "標準色彩空間"
 
 #. TRANSLATORS: test profiles do things like changing the screen
 #. * a different color, or swap the red and green channels
 #: panels/color/cc-color-profile.c:104
 msgid "Test Profile"
-msgstr "測試描述檔"
+msgstr "測試用描述檔"
 
 #. TRANSLATORS: automatic profiles are generated automatically
 #. * by the color management system based on manufacturing data,
@@ -1084,7 +1115,7 @@ msgstr "廠商提供的出廠校準資料"
 
 #: panels/color/cc-color-profile.c:197
 msgid "Full-screen display correction not possible with this profile"
-msgstr "這個描述檔無法使用全螢幕顯示校正"
+msgstr "這個描述檔無法使用全螢幕顯示校準"
 
 #: panels/color/cc-color-profile.c:219
 msgid "This profile may no longer be accurate"
@@ -1103,8 +1134,8 @@ msgstr "校準您裝置的色彩，像是顯示器、攝影機或印表機"
 #: panels/color/gnome-color-panel.desktop.in.in:19
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr ""
-"Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;印表機;顯示"
-"器;"
+"Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;校正;印表機;"
+"顯示器;色彩管理;攝影;設計;出版;多媒體;"
 
 #: panels/common/cc-common-language.c:300
 msgid "Other…"
@@ -1116,7 +1147,7 @@ msgstr "選擇語言"
 
 #: panels/common/cc-language-chooser.ui:13
 msgid "_Select"
-msgstr "選取(_S)"
+msgstr "選擇(_S)"
 
 #: panels/common/cc-language-chooser.ui:58
 msgid "No languages found"
@@ -1129,13 +1160,13 @@ msgstr "更多…"
 
 #: panels/common/cc-permission-infobar.c:109
 msgid "Unlock to Change Settings"
-msgstr "解除鎖定以變更設定"
+msgstr "解鎖以更改設定"
 
-#: panels/common/cc-permission-infobar.ui:40
+#: panels/common/cc-permission-infobar.ui:42
 msgid "Some settings must be unlocked before they can be changed."
-msgstr "部份設定需要先解鎖才能變更。"
+msgstr "部分設定需先解鎖才能進行更動。"
 
-#: panels/common/cc-permission-infobar.ui:57
+#: panels/common/cc-permission-infobar.ui:59
 msgid "Unlock…"
 msgstr "解除鎖定…"
 
@@ -1147,9 +1178,10 @@ msgstr "遞增小時"
 msgid "Increment Minute"
 msgstr "遞增分鐘"
 
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
 #: panels/common/cc-time-editor.ui:73
 msgid "Time"
-msgstr "時刻"
+msgstr "時間"
 
 #: panels/common/cc-time-editor.ui:94
 msgid "Decrement Hour"
@@ -1160,24 +1192,24 @@ msgid "Decrement Minute"
 msgstr "遞減分鐘"
 
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:162
+#: panels/network/connection-editor/ce-page-details.c:168
 msgid "Today"
-msgstr "今日"
+msgstr "今天"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:164
+#: panels/network/connection-editor/ce-page-details.c:170
 msgid "Yesterday"
-msgstr "昨日"
+msgstr "昨天"
 
 #. Translators: This is a date format string in the style of "Feb 24".
 #: panels/common/cc-util.c:138
 msgid "%b %e"
-msgstr "%b%eæ—¥"
+msgstr "%-m月%-e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
 #: panels/common/cc-util.c:143
 msgid "%b %e, %Y"
-msgstr "%Yå¹´%b%eæ—¥"
+msgstr "%Y年%-m月%-e日"
 
 #: panels/common/cc-util.c:165
 #, c-format
@@ -1186,7 +1218,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 
 #. Translators: Option for "Blank Screen" in "Power" panel
-#: panels/common/cc-util.c:166 panels/power/cc-power-panel.c:846
+#: panels/common/cc-util.c:166 panels/power/cc-power-panel.c:849
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1246,21 +1278,21 @@ msgstr "熱點"
 
 #: panels/datetime/cc-datetime-panel.c:175
 msgid "24-hour"
-msgstr "24小時"
+msgstr "24 小時制"
 
 #: panels/datetime/cc-datetime-panel.c:177
 msgid "AM / PM"
-msgstr "AM / PM"
+msgstr "12 小時制"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
 #: panels/datetime/cc-datetime-panel.c:248
 msgid "%e %B %Y, %l:%M %p"
-msgstr "%Y年%b%e日，%p %l:%M"
+msgstr "%Y年%-m月%-e日，%p %I:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
 #: panels/datetime/cc-datetime-panel.c:253
 msgid "%e %B %Y, %R"
-msgstr "%Y年%b%e日，%R"
+msgstr "%Y年%-m月%-e日，%R"
 
 #. Translators: "city, country"
 #: panels/datetime/cc-datetime-panel.c:423
@@ -1275,7 +1307,7 @@ msgstr "%s，%s"
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
-msgstr "%s (%s)"
+msgstr "%s（%s）"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
@@ -1286,7 +1318,7 @@ msgstr "UTC%:::z"
 #. Translators: This is the time format used in 12-hour mode.
 #: panels/datetime/cc-datetime-panel.c:462
 msgid "%l:%M %p"
-msgstr "%p %l:%M"
+msgstr "%p %I:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
 #: panels/datetime/cc-datetime-panel.c:467
@@ -1301,70 +1333,71 @@ msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
 #: panels/datetime/cc-datetime-panel.ui:15
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
-msgstr "日期與時刻"
+msgstr "日期與時間"
 
 #: panels/datetime/cc-datetime-panel.ui:50
 msgid "Year"
-msgstr "å¹´"
+msgstr "年份"
 
 #: panels/datetime/cc-datetime-panel.ui:66
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #: panels/datetime/cc-datetime-panel.ui:71
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #: panels/datetime/cc-datetime-panel.ui:72
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #: panels/datetime/cc-datetime-panel.ui:73
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #: panels/datetime/cc-datetime-panel.ui:74
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #: panels/datetime/cc-datetime-panel.ui:75
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #: panels/datetime/cc-datetime-panel.ui:76
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #: panels/datetime/cc-datetime-panel.ui:77
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #: panels/datetime/cc-datetime-panel.ui:78
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #: panels/datetime/cc-datetime-panel.ui:79
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #: panels/datetime/cc-datetime-panel.ui:80
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #: panels/datetime/cc-datetime-panel.ui:81
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #: panels/datetime/cc-datetime-panel.ui:82
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #: panels/datetime/cc-datetime-panel.ui:92
 msgid "Day"
-msgstr "æ—¥"
+msgstr "日期"
 
 #: panels/datetime/cc-datetime-panel.ui:113
 msgid "Time Zone"
@@ -1374,50 +1407,69 @@ msgstr "時區"
 msgid "Search for a city"
 msgstr "搜尋城市"
 
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
 #: panels/datetime/cc-datetime-panel.ui:164
 msgid "Automatic _Date &amp; Time"
-msgstr "自動調校日期與時刻(_D)"
+msgstr "自動調整日期與時間(_D)"
 
 #: panels/datetime/cc-datetime-panel.ui:165
 msgid "Requires internet access"
 msgstr "需要網際網路連線"
 
-#: panels/datetime/cc-datetime-panel.ui:177
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
+#: panels/datetime/cc-datetime-panel.ui:180
 msgid "Date &amp; _Time"
-msgstr "日期與時刻(_T)"
+msgstr "日期與時間(_T)"
 
-#: panels/datetime/cc-datetime-panel.ui:201
+#: panels/datetime/cc-datetime-panel.ui:204
 msgid "Automatic Time _Zone"
 msgstr "自動調整時區(_Z)"
 
-#: panels/datetime/cc-datetime-panel.ui:202
+#: panels/datetime/cc-datetime-panel.ui:205
 msgid "Requires location services enabled and internet access"
-msgstr "需要啟用定位服務及網際網路連線"
+msgstr "需啟用定位服務及網際網路連線"
 
-#: panels/datetime/cc-datetime-panel.ui:214
+#. TRANSLATORS: if the function is enabled through BIOS or OS settings.
+#. TRANSLATORS: Status of Parental Controls setup
+#: panels/datetime/cc-datetime-panel.ui:212
+#: panels/display/cc-display-settings.ui:23
+#: panels/firmware-security/cc-firmware-security-utils.c:247
+#: panels/keyboard/cc-xkb-modifier-dialog.ui:43
+#: panels/location/cc-location-panel.ui:9 panels/screen/cc-screen-panel.ui:40
+#: panels/screen/cc-screen-panel.ui:76 panels/screen/cc-screen-panel.ui:96
+#: panels/user-accounts/cc-user-panel.c:802
+#: panels/user-accounts/cc-user-panel.c:904
+#: panels/wwan/cc-wwan-device-page.c:476
+msgid "Enabled"
+msgstr "已啟用"
+
+#: panels/datetime/cc-datetime-panel.ui:220
 msgid "Time Z_one"
 msgstr "時區(_O)"
 
-#: panels/datetime/cc-datetime-panel.ui:239
+#: panels/datetime/cc-datetime-panel.ui:245
 msgid "Time _Format"
-msgstr "時刻格式(_F)"
+msgstr "時間格式(_F)"
 
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 msgid "Change the date and time, including time zone"
-msgstr "改變時刻與日期，包含時區"
+msgstr "更改日期與時間及調整時區"
 
 #. Translators: Search terms to find the Date and Time panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:15
 msgid "Clock;Timezone;Location;"
-msgstr "Clock;Timezone;Location;時鐘;時區;位置;定位;"
+msgstr "Clock;Timezone;Location;時鐘;時區;位置;定位;時間;時刻;時制;"
 
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
 #: panels/datetime/org.gnome.controlcenter.datetime.policy.in:11
 msgid "Change system time and date settings"
-msgstr "改變系統時刻與日期設定值"
+msgstr "更改系統的時間與日期設定值"
 
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
 #: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 msgid "To change time or date settings, you need to authenticate."
-msgstr "要改變時刻或日期設定值，您需要通過核對。"
+msgstr "欲對日期或時間設定值進行更動需要核對身分。"
 
 #: panels/default-apps/cc-default-apps-panel.ui:23
 msgid "_Web"
@@ -1425,7 +1477,7 @@ msgstr "網頁(_W)"
 
 #: panels/default-apps/cc-default-apps-panel.ui:33
 msgid "_Mail"
-msgstr "郵件(_M)"
+msgstr "電子郵件(_M)"
 
 #: panels/default-apps/cc-default-apps-panel.ui:47
 msgid "_Calendar"
@@ -1464,8 +1516,7 @@ msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
 "anonymously and are scrubbed of personal data. %s"
 msgstr ""
-"傳送技術問題的報告有助於我們改進 %s。報告是以匿名方式傳送，並且會消除個人資"
-"料。%s"
+"傳送技術問題報告有助於我們改進 %s。報告會以匿名方式傳送，並會抹除個人資料。%s"
 
 #: panels/diagnostics/cc-diagnostics-panel.ui:8
 msgid "Problem Reporting"
@@ -1483,22 +1534,14 @@ msgstr "診斷"
 msgid "Report your problems"
 msgstr "回報您遇到的問題"
 
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#. Translators: Search terms to find the Diagnostics panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:20
-#: panels/location/gnome-location-panel.desktop.in.in:20
-#: panels/lock/gnome-lock-panel.desktop.in.in:20
-#: panels/usage/gnome-usage-panel.desktop.in.in:20
-msgid ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;privacy;"
-msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;privacy;螢幕;鎖定;診斷;當掉;崩潰;私人;隱私;最近;暫存;索引;名"
-"稱;網路;身分;"
+msgid "diagnostics;crash;"
+msgstr "diagnostics;crash;診斷;當機;"
 
-#: panels/display/cc-display-panel.c:512
+#: panels/display/cc-display-panel.c:492
 #: panels/notifications/cc-notifications-panel.c:217
-#: panels/power/cc-power-panel.c:734 panels/power/cc-power-panel.c:741
+#: panels/power/cc-power-panel.c:737 panels/power/cc-power-panel.c:744
 #: panels/universal-access/cc-ua-panel.c:336
 #: panels/universal-access/cc-ua-panel.c:468
 #: panels/universal-access/cc-ua-panel.c:478
@@ -1507,9 +1550,9 @@ msgstr ""
 msgid "On"
 msgstr "é–‹å•Ÿ"
 
-#: panels/display/cc-display-panel.c:514 panels/network/net-proxy.c:69
+#: panels/display/cc-display-panel.c:494 panels/network/net-proxy.c:69
 #: panels/notifications/cc-notifications-panel.c:217
-#: panels/power/cc-power-panel.c:728 panels/power/cc-power-panel.c:739
+#: panels/power/cc-power-panel.c:731 panels/power/cc-power-panel.c:742
 #: panels/universal-access/cc-ua-panel.c:336
 #: panels/universal-access/cc-ua-panel.c:468
 #: panels/universal-access/cc-ua-panel.c:478
@@ -1518,58 +1561,65 @@ msgstr "é–‹å•Ÿ"
 msgid "Off"
 msgstr "關閉"
 
-#: panels/display/cc-display-panel.c:945
+#: panels/display/cc-display-panel.c:930
 msgid "Apply Changes?"
-msgstr "要套用變更嗎？"
+msgstr "要套用更動嗎？"
 
-#: panels/display/cc-display-panel.c:950
+#: panels/display/cc-display-panel.c:935
 msgid "Changes Cannot be Applied"
-msgstr "變更無法套用"
+msgstr "無法套用更動"
 
-#: panels/display/cc-display-panel.c:952
+#: panels/display/cc-display-panel.c:937
 msgid "This could be due to hardware limitations."
-msgstr "這可能是因為硬體限制。"
+msgstr "可能是硬體限制所致。"
 
 #: panels/display/cc-display-panel.ui:43
 #: panels/network/connection-editor/connection-editor.ui:21
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: panels/display/cc-display-panel.ui:97
+#: panels/display/cc-display-panel.ui:78 panels/display/cc-display-panel.ui:221
+#: panels/display/cc-display-panel.ui:260 panels/network/cc-wifi-panel.ui:16
+#: panels/printers/new-printer-dialog.ui:64
+#: panels/region/cc-format-chooser.ui:37
+#: panels/user-accounts/cc-fingerprint-dialog.ui:44
+#: panels/user-accounts/cc-user-panel.ui:31
+#: panels/wacom/cc-wacom-stylus-page.ui:136
+#: panels/wwan/cc-wwan-apn-dialog.ui:21
+msgid "Back"
+msgstr "返回"
+
+#: panels/display/cc-display-panel.ui:100
 msgid "Display Settings Disabled"
 msgstr "顯示器設定已停用"
 
-#: panels/display/cc-display-panel.ui:113
-msgid "Display Arrangement"
-msgstr "排列顯示器組合方式"
-
-#: panels/display/cc-display-panel.ui:124
+#: panels/display/cc-display-panel.ui:111
 msgid "Multiple Displays"
 msgstr "多重顯示器"
 
 #. 'Join' as in 'Join displays'
-#: panels/display/cc-display-panel.ui:133
+#: panels/display/cc-display-panel.ui:120
 msgid "Join"
-msgstr "聯結"
+msgstr "銜接顯示"
 
-#: panels/display/cc-display-panel.ui:140
+#: panels/display/cc-display-panel.ui:127
 msgid "Mirror"
-msgstr "相同"
+msgstr "鏡像顯示"
 
-#: panels/display/cc-display-panel.ui:153
+#: panels/display/cc-display-panel.ui:155
 msgid "Contains top bar and Activities"
 msgstr "包含頂端列及概覽"
 
-#: panels/display/cc-display-panel.ui:154
+#: panels/display/cc-display-panel.ui:156
 msgid "Primary Display"
-msgstr "主要顯示器"
+msgstr "主螢幕"
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: panels/display/cc-display-panel.ui:175
-#: panels/display/cc-display-panel.ui:223
-#: panels/display/cc-night-light-page.ui:77
+#: panels/display/cc-display-panel.ui:177
+#: panels/display/cc-display-panel.ui:228
+#: panels/display/cc-night-light-page.ui:115
 msgid "Night Light"
-msgstr "夜光"
+msgstr "夜光模式"
 
 #: panels/display/cc-display-settings.c:110
 msgctxt "Display rotation"
@@ -1596,101 +1646,112 @@ msgstr "橫向（翻轉）"
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
-#: panels/display/cc-display-settings.ui:40
+#: panels/display/cc-display-settings.ui:43
 msgctxt "display setting"
 msgid "Orientation"
 msgstr "方向"
 
-#: panels/display/cc-display-settings.ui:47
+#: panels/display/cc-display-settings.ui:50
 msgctxt "display setting"
 msgid "Resolution"
 msgstr "解析度"
 
-#: panels/display/cc-display-settings.ui:54
+#: panels/display/cc-display-settings.ui:57
 msgid "Refresh Rate"
 msgstr "更新率"
 
-#: panels/display/cc-display-settings.ui:61
+#: panels/display/cc-display-settings.ui:64
 msgid "Adjust for TV"
-msgstr "調整為電視"
+msgstr "為電視進行調整"
 
-#: panels/display/cc-display-settings.ui:75
-#: panels/display/cc-display-settings.ui:90
+#: panels/display/cc-display-settings.ui:78
+#: panels/display/cc-display-settings.ui:93
 msgctxt "display setting"
 msgid "Scale"
 msgstr "縮放"
 
+#: panels/display/cc-night-light-page.ui:22
+msgid "Night Light unavailable"
+msgstr "夜光模式無法使用"
+
+#: panels/display/cc-night-light-page.ui:33
+msgid ""
+"This could be the result of the graphics driver being used, or the desktop "
+"being used remotely"
+msgstr "可能是由於顯示卡的驅動程式不支援夜光模式，亦或是桌面正在遠端使用當中"
+
 #. Inhibit the redshift functionality until the next day starts
-#: panels/display/cc-night-light-page.ui:21
+#: panels/display/cc-night-light-page.ui:58
 msgid "Temporarily Disabled Until Tomorrow"
-msgstr "暫時停用直到明天"
+msgstr "暫時停用至明天"
 
 #. This cancels the redshift inhibit.
-#: panels/display/cc-night-light-page.ui:35
+#: panels/display/cc-night-light-page.ui:72
 msgid "Restart Filter"
-msgstr "重新啟動過濾器"
+msgstr "重啟夜光模式"
 
-#: panels/display/cc-night-light-page.ui:57
+#: panels/display/cc-night-light-page.ui:95
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
-msgstr "夜光讓螢幕色彩變得溫暖。這可以幫助防止眼睛疲勞與失眠。"
+msgstr "夜光模式會讓螢幕色彩變得溫暖，可幫助防止眼睛疲勞與失眠。"
 
-#: panels/display/cc-night-light-page.ui:91
+#: panels/display/cc-night-light-page.ui:132
 msgid "Schedule"
 msgstr "排程"
 
-#: panels/display/cc-night-light-page.ui:99
+#: panels/display/cc-night-light-page.ui:140
 msgid "Sunset to Sunrise"
-msgstr "日落到日出"
+msgstr "日落至日出"
 
-#: panels/display/cc-night-light-page.ui:100
+#: panels/display/cc-night-light-page.ui:141
 msgid "Manual Schedule"
 msgstr "手動排程"
 
-#: panels/display/cc-night-light-page.ui:110
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
+#: panels/display/cc-night-light-page.ui:154
 #: panels/region/cc-format-preview.ui:35
 msgid "Times"
-msgstr "時刻"
+msgstr "時間"
 
-#: panels/display/cc-night-light-page.ui:123
+#: panels/display/cc-night-light-page.ui:167
 msgid "From"
 msgstr "從"
 
-#: panels/display/cc-night-light-page.ui:148
-#: panels/display/cc-night-light-page.ui:235
+#: panels/display/cc-night-light-page.ui:192
+#: panels/display/cc-night-light-page.ui:279
 msgid "Hour"
 msgstr "時"
 
-#: panels/display/cc-night-light-page.ui:154
-#: panels/display/cc-night-light-page.ui:241
+#: panels/display/cc-night-light-page.ui:198
+#: panels/display/cc-night-light-page.ui:285
 msgid ":"
 msgstr ":"
 
-#: panels/display/cc-night-light-page.ui:171
-#: panels/display/cc-night-light-page.ui:258
+#: panels/display/cc-night-light-page.ui:215
+#: panels/display/cc-night-light-page.ui:302
 msgid "Minute"
 msgstr "分"
 
 #. This is the short form for the time period in the morning
-#: panels/display/cc-night-light-page.ui:181
-#: panels/display/cc-night-light-page.ui:268
+#: panels/display/cc-night-light-page.ui:225
+#: panels/display/cc-night-light-page.ui:312
 msgid "AM"
 msgstr "上午"
 
 #. This is the short form for the time period in the afternoon
-#: panels/display/cc-night-light-page.ui:193
-#: panels/display/cc-night-light-page.ui:280
+#: panels/display/cc-night-light-page.ui:237
+#: panels/display/cc-night-light-page.ui:324
 msgid "PM"
 msgstr "下午"
 
-#: panels/display/cc-night-light-page.ui:210
+#: panels/display/cc-night-light-page.ui:254
 msgid "To"
-msgstr "到"
+msgstr "至"
 
-#: panels/display/cc-night-light-page.ui:316
+#: panels/display/cc-night-light-page.ui:360
 msgid "Color Temperature"
-msgstr "色彩溫度"
+msgstr "色溫"
 
 #: panels/display/gnome-display-panel.desktop.in.in:3
 msgid "Displays"
@@ -1710,54 +1771,607 @@ msgstr ""
 "redshift;color;sunset;sunrise;面板;投影機;螢幕;解析度;重新整理;螢幕;夜晚;夜"
 "光;藍光;日出;日落;"
 
-#: panels/info-overview/cc-info-overview-panel.c:411
-#: panels/info-overview/cc-info-overview-panel.c:435
-#: panels/info-overview/cc-info-overview-panel.c:481
-#: panels/info-overview/cc-info-overview-panel.c:511
+#. TRANSLATORS: secure boot refers to the system firmware security mode
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:72
+#: panels/firmware-security/cc-firmware-security-panel.c:112
+msgid "Secure Boot is Active"
+msgstr "安全開機作用中"
+
+#. TRANSLATORS: this is the first section of the decription
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:77
+msgid ""
+"Secure boot prevents malicious software from being loaded when the device "
+"starts. It is currently turned on and is functioning correctly."
+msgstr ""
+"安全開機可防止惡意軟體在裝置啟動階段時悄悄載入。該功能目前為開啟狀態並且運作"
+"正常。"
+
+#. TRANSLATORS: secure boot refers to the system firmware security mode
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:83
+msgid "Secure Boot Has Problems"
+msgstr "安全開機存在問題"
+
+#. TRANSLATORS: this is the first section of the decription.
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:87
+msgid ""
+"Secure boot prevents malicious software from being loaded when the device "
+"starts. It is currently turned on, but will not work due to having an "
+"invalid key."
+msgstr ""
+"安全開機可防止惡意軟體在裝置啟動階段時悄悄載入。該功能目前為開啟狀態但無法正"
+"常運作，原因為金鑰無效。"
+
+#. TRANSLATORS: this is the second section of description.
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:90
+msgid ""
+"Secure boot problems can often be resolved from your computer's UEFI "
+"firmware settings (BIOS) and your hardware manufacturer may provide "
+"information on how to do this."
+msgstr ""
+"安全開機問題大多能透過電腦中的 UEFI (BIOS) 韌體設定來解決，您的硬體製造商可能"
+"會提供解決問題的指引。"
+
+#. TRANSLATORS: this is the third section of description.
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:93
+msgid "For help, contact your hardware manufacturer or IT support provider."
+msgstr "如需協助，請聯絡您的硬體製造商或 IT 技術人員。"
+
+#. TRANSLATORS: secure boot refers to the system firmware security mode
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:99
+msgid "Secure Boot is Turned Off"
+msgstr "安全開機已關閉"
+
+#. TRANSLATORS: this is the first section of the description.
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:103
+msgid ""
+"Secure boot prevents malicious software from being loaded when the device "
+"starts. It is currently turned off."
+msgstr "安全開機可防止惡意軟體在裝置啟動階段時悄悄載入。該功能目前為關閉狀態。"
+
+#. TRANSLATORS: this is the second section of the description.
+#: panels/firmware-security/cc-firmware-security-boot-dialog.c:106
+msgid ""
+"Secure boot can often be turned on from your computer's UEFI firmware "
+"settings (BIOS). For help, contact your hardware manufacturer or IT support "
+"provider."
+msgstr ""
+"安全開機大多能透過電腦中的 UEFI (BIOS) 韌體設定來開啟。如需協助，請聯絡您的硬"
+"體製造商或 IT 技術人員。"
+
+#: panels/firmware-security/cc-firmware-security-boot-dialog.ui:53
+msgid ""
+"Secure boot prevents malicious software from being loaded when the device "
+"starts.\n"
+"\n"
+"For more information, contact the hardware manufacturer or IT support."
+msgstr ""
+"安全開機可防止惡意軟體在裝置啟動階段時悄悄載入。\n"
+"\n"
+"如需了解更多資訊，請聯絡您的硬體製造商或 IT 技術人員。"
+
+#: panels/firmware-security/cc-firmware-security-dialog.c:96
+#: panels/firmware-security/cc-firmware-security-dialog.c:98
+#: panels/firmware-security/cc-firmware-security-dialog.c:100
+msgid "Passed"
+msgstr "測試成功"
+
+#: panels/firmware-security/cc-firmware-security-dialog.c:96
+#: panels/firmware-security/cc-firmware-security-dialog.c:98
+#: panels/firmware-security/cc-firmware-security-dialog.c:100
+msgid "Failed"
+msgstr "測試失敗"
+
+#. TRANSLATORS: HSI stands for Host Security ID and device refers to the computer as a whole
+#: panels/firmware-security/cc-firmware-security-dialog.c:137
+#, c-format
+msgid "Device conforms to HSI level %d"
+msgstr "裝置所符合的 HSI 等級為 %d"
+
+#. TRANSLATORS: in reference to firmware protection: 0/4 stars
+#: panels/firmware-security/cc-firmware-security-dialog.c:149
+#: panels/firmware-security/cc-firmware-security-panel.c:485
+msgid "Security Level 0"
+msgstr "安全性等級 0"
+
+#: panels/firmware-security/cc-firmware-security-dialog.c:150
+msgid ""
+"This device has no protection against hardware security issues. This could "
+"be because of a hardware or firmware configuration issue. It is recommended "
+"to contact your IT support provider."
+msgstr ""
+"本裝置針對硬體安全性相關的問題缺乏防護。可能是硬體或韌體組態所造成的問題，建"
+"議您聯絡 IT 技術人員。"
+
+#. TRANSLATORS: in reference to firmware protection: 1/4 stars
+#: panels/firmware-security/cc-firmware-security-dialog.c:158
+#: panels/firmware-security/cc-firmware-security-dialog.c:357
+#: panels/firmware-security/cc-firmware-security-panel.c:492
+msgid "Security Level 1"
+msgstr "安全性等級 1"
+
+#: panels/firmware-security/cc-firmware-security-dialog.c:159
+msgid ""
+"This device has minimal protection against hardware security issues. This is "
+"the lowest device security level and only provides protection against simple "
+"security threats."
+msgstr ""
+"本裝置針對硬體安全性相關的問題僅提供最小防護。這意味著裝置的安全性等級為最低"
+"等級，只能針對簡單的安全威脅提供防護。"
+
+#. TRANSLATORS: in reference to firmware protection: 2/4 stars
+#: panels/firmware-security/cc-firmware-security-dialog.c:167
+#: panels/firmware-security/cc-firmware-security-dialog.c:362
+#: panels/firmware-security/cc-firmware-security-panel.c:499
+msgid "Security Level 2"
+msgstr "安全性等級 2"
+
+#: panels/firmware-security/cc-firmware-security-dialog.c:168
+msgid ""
+"This device has basic protection against hardware security issues. This "
+"provides protection against some common security threats."
+msgstr ""
+"本裝置針對硬體安全性相關的問題提供基本防護。這意味著裝置能針對常見的安全威脅"
+"提供防護。"
+
+#. TRANSLATORS: in reference to firmware protection: 3/4 stars
+#: panels/firmware-security/cc-firmware-security-dialog.c:176
+#: panels/firmware-security/cc-firmware-security-dialog.c:367
+#: panels/firmware-security/cc-firmware-security-panel.c:506
+msgid "Security Level 3"
+msgstr "安全性等級 3"
+
+#: panels/firmware-security/cc-firmware-security-dialog.c:177
+msgid ""
+"This device has extended protection against hardware security issues. This "
+"is the highest device security level and provides protection against "
+"advanced security threats."
+msgstr ""
+"本裝置針對硬體安全性相關的問題具備延伸防護。這意味著裝置的安全性等級為最高等"
+"級，能針對高階的安全威脅提供防護。"
+
+#. TRANSLATORS: in reference to firmware protection: ??? stars
+#: panels/firmware-security/cc-firmware-security-dialog.c:185
+#: panels/firmware-security/cc-firmware-security-dialog.ui:22
+#: panels/firmware-security/cc-firmware-security-panel.c:521
+msgid "Security Level"
+msgstr "安全性等級"
+
+#: panels/firmware-security/cc-firmware-security-dialog.c:186
+#: panels/firmware-security/cc-firmware-security-panel.c:522
+msgid "Security levels are not available for this device."
+msgstr "該裝置不適用安全性等級。"
+
+#. TRANSLATORS: hardware manufacturer as in OEM
+#: panels/firmware-security/cc-firmware-security-dialog.c:201
+#: panels/firmware-security/cc-firmware-security-dialog.c:211
+#: panels/firmware-security/cc-firmware-security-dialog.c:218
+msgid "Contact your hardware manufacturer for help with security updates."
+msgstr "請聯絡您的硬體製造商以取得安全更新相關的支援訊息。"
+
+#. TRANSLATORS: support technician as in someone with root
+#: panels/firmware-security/cc-firmware-security-dialog.c:203
+msgid ""
+"It might be possible to resolve this issue in the device’s UEFI firmware "
+"settings, or by a support technician."
+msgstr "該問題也許能透過裝置的 UEFI 韌體設定，或是交由 IT 技術人員來解決。"
+
+#: panels/firmware-security/cc-firmware-security-dialog.c:212
+#: panels/firmware-security/cc-firmware-security-dialog.c:223
+msgid ""
+"It might be possible to resolve this issue in the device’s UEFI firmware "
+"settings."
+msgstr "該問題也許能透過裝置的 UEFI 韌體設定來解決。"
+
+#. TRANSLATORS: support technician as in someone with root
+#: panels/firmware-security/cc-firmware-security-dialog.c:229
+msgid "It might be possible for a support technician to resolve this issue."
+msgstr "該問題也許能透過 IT 技術人員來解決。"
+
+#: panels/firmware-security/cc-firmware-security-dialog.ui:88
+msgid "Level 1"
+msgstr "等級 1"
+
+#: panels/firmware-security/cc-firmware-security-dialog.ui:124
+msgid "Level 2"
+msgstr "等級 2"
+
+#: panels/firmware-security/cc-firmware-security-dialog.ui:160
+msgid "Level 3"
+msgstr "等級 3"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:113
+msgid "Protected against malicious software when the device starts."
+msgstr "裝置的啟動階段有針對惡意軟體採取防護措施。"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:119
+msgid "Secure Boot has Problems"
+msgstr "安全開機存在問題"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:120
+msgid "Some protection when the device is started."
+msgstr "裝置的啟動階段僅有部分防護措施。"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:125
+msgid "Secure Boot is Off"
+msgstr "安全開機已關閉"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:126
+msgid "No protection when the device is started."
+msgstr "裝置的啟動階段沒有任何防護措施。"
+
+#. TRANSLATORS: this is to explain an event that has already happened
+#: panels/firmware-security/cc-firmware-security-panel.c:145
+msgid ""
+"This issue could have been caused by a change in UEFI firmware settings, an "
+"operating system configuration change, or because of malicious software on "
+"this system."
+msgstr ""
+"該問題可能是由下列原因所導致：UEFI 韌體設定不正確、作業系統設定不正確，或是系"
+"統遭植入惡意軟體。"
+
+#. TRANSLATORS: this is to explain an event that has already happened
+#: panels/firmware-security/cc-firmware-security-panel.c:153
+msgid ""
+"This issue could have been caused by a change in the UEFI firmware settings, "
+"or because of malicious software on this system."
+msgstr ""
+"該問題可能是由下列原因所導致：UEFI 韌體設定不正確或是系統遭植入惡意軟體。"
+
+#. TRANSLATORS: this is to explain an event that has already happened
+#: panels/firmware-security/cc-firmware-security-panel.c:160
+msgid ""
+"This issue could have been caused by an operating system configuration "
+"change, or because of malicious software on this system."
+msgstr ""
+"該問題可能是由下列原因所導致：作業系統設定不正確或是系統遭植入惡意軟體。"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:486
+msgid "Exposed to serious security threats."
+msgstr "正暴露於嚴重的安全威脅之中。"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:493
+msgid "Limited protection against simple security threats."
+msgstr "能針對簡單的安全威脅提供有限防護。"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:500
+msgid "Protected against common security threats."
+msgstr "能針對常見的安全威脅提供防護。"
+
+#: panels/firmware-security/cc-firmware-security-panel.c:507
+#: panels/firmware-security/cc-firmware-security-panel.c:515
+msgid "Protected against a wide range of security threats."
+msgstr "能針對廣泛的安全威脅提供保護。"
+
+#. TRANSLATORS: in reference to firmware protection: 4/4 stars
+#: panels/firmware-security/cc-firmware-security-panel.c:514
+msgid "Comprehensive Protection"
+msgstr "全面性防護"
+
+#: panels/firmware-security/cc-firmware-security-panel.ui:150
+msgid "No Events"
+msgstr "沒有活動"
+
+#. TRANSLATORS: Title: firmware refers to the flash chip in the computer
+#: panels/firmware-security/cc-firmware-security-utils.c:37
+msgid "Firmware Write Protection"
+msgstr "韌體寫入保護"
+
+#. TRANSLATORS: Title: firmware refers to the flash chip in the computer
+#: panels/firmware-security/cc-firmware-security-utils.c:42
+msgid "Firmware Write Protection Lock"
+msgstr "韌體寫入保護鎖"
+
+#. TRANSLATORS: Title: SPI refers to the flash chip in the computer
+#: panels/firmware-security/cc-firmware-security-utils.c:47
+msgid "Firmware BIOS Region"
+msgstr "韌體 BIOS 領域"
+
+#. TRANSLATORS: Title: firmware refers to the flash chip in the computer
+#: panels/firmware-security/cc-firmware-security-utils.c:52
+msgid "Firmware BIOS Descriptor"
+msgstr "韌體 BIOS 描述元"
+
+#. TRANSLATORS: Title: DMA as in https://en.wikipedia.org/wiki/DMA_attack
+#: panels/firmware-security/cc-firmware-security-utils.c:57
+msgid "Pre-boot DMA Protection"
+msgstr "預先開機 DMA 保護"
+
+#. TRANSLATORS: Title: BootGuard is a trademark from Intel
+#: panels/firmware-security/cc-firmware-security-utils.c:62
+msgid "Intel BootGuard"
+msgstr "Intel BootGuard"
+
+#. TRANSLATORS: Title: BootGuard is a trademark from Intel,
+#. * verified boot refers to the way the boot process is verified
+#: panels/firmware-security/cc-firmware-security-utils.c:68
+msgid "Intel BootGuard Verified Boot"
+msgstr "Intel BootGuard 驗證開機"
+
+#. TRANSLATORS: Title: BootGuard is a trademark from Intel,
+#. * ACM means to verify the integrity of Initial Boot Block
+#: panels/firmware-security/cc-firmware-security-utils.c:74
+msgid "Intel BootGuard ACM Protected"
+msgstr "Intel BootGuard ACM 保護"
+
+#. TRANSLATORS: Title: BootGuard is a trademark from Intel,
+#. * error policy is what to do on failure
+#: panels/firmware-security/cc-firmware-security-utils.c:80
+msgid "Intel BootGuard Error Policy"
+msgstr "Intel BootGuard 錯誤政策"
+
+#. TRANSLATORS: Title: BootGuard is a trademark from Intel
+#: panels/firmware-security/cc-firmware-security-utils.c:85
+msgid "Intel BootGuard Fuse"
+msgstr "Intel BootGuard Fuse"
+
+#. TRANSLATORS: Title: CET = Control-flow Enforcement Technology,
+#. * enabled means supported by the processor
+#: panels/firmware-security/cc-firmware-security-utils.c:91
+msgid "Intel CET Enabled"
+msgstr "Intel CET 已啟用"
+
+#. TRANSLATORS: Title: CET = Control-flow Enforcement Technology,
+#. * active means being used by the OS
+#: panels/firmware-security/cc-firmware-security-utils.c:97
+msgid "Intel CET Active"
+msgstr "Intel CET 作用中"
+
+#. TRANSLATORS: Title: SMAP = Supervisor Mode Access Prevention
+#: panels/firmware-security/cc-firmware-security-utils.c:102
+msgid "Intel SMAP"
+msgstr "Intel SMAP"
+
+#. TRANSLATORS: Title: Memory contents are encrypted, e.g. Intel TME
+#: panels/firmware-security/cc-firmware-security-utils.c:107
+msgid "Encrypted RAM"
+msgstr "記憶體已加密"
+
+#. TRANSLATORS: Title:
+#. * https://en.wikipedia.org/wiki/Input%E2%80%93output_memory_management_unit
+#: panels/firmware-security/cc-firmware-security-utils.c:113
+msgid "IOMMU Protection"
+msgstr "IOMMU 保護"
+
+#. TRANSLATORS: Title: lockdown is a security mode of the kernel
+#: panels/firmware-security/cc-firmware-security-utils.c:118
+msgid "Linux Kernel Lockdown"
+msgstr "Linux 核心鎖定"
+
+#. TRANSLATORS: Title: if it's tainted or not
+#: panels/firmware-security/cc-firmware-security-utils.c:123
+msgid "Linux Kernel Verification"
+msgstr "Linux 核心驗證"
+
+#. TRANSLATORS: Title: swap space or swap partition
+#: panels/firmware-security/cc-firmware-security-utils.c:128
+msgid "Linux Swap"
+msgstr "Linux 交換空間"
+
+#. TRANSLATORS: Title: sleep state
+#: panels/firmware-security/cc-firmware-security-utils.c:133
+msgid "Suspend To RAM"
+msgstr "暫停狀態"
+
+#. TRANSLATORS: Title: a better sleep state
+#: panels/firmware-security/cc-firmware-security-utils.c:138
+msgid "Suspend To Idle"
+msgstr "休眠狀態"
+
+#. TRANSLATORS: Title: PK is the 'platform key' for the machine
+#: panels/firmware-security/cc-firmware-security-utils.c:143
+msgid "UEFI Platform Key"
+msgstr "UEFI 平臺金鑰"
+
+#. TRANSLATORS: Title: SB is a way of locking down UEFI
+#: panels/firmware-security/cc-firmware-security-utils.c:148
+msgid "UEFI Secure Boot"
+msgstr "UEFI 安全開機"
+
+#. TRANSLATORS: Title: PCRs (Platform Configuration Registers) shouldn't be empty
+#: panels/firmware-security/cc-firmware-security-utils.c:153
+msgid "TPM Platform Configuration"
+msgstr "TPM 平臺組態"
+
+#. TRANSLATORS: Title: the PCR is rebuilt from the TPM event log
+#: panels/firmware-security/cc-firmware-security-utils.c:158
+msgid "TPM Reconstruction"
+msgstr "TPM 重構"
+
+#. TRANSLATORS: Title: TPM = Trusted Platform Module
+#: panels/firmware-security/cc-firmware-security-utils.c:163
+msgid "TPM v2.0"
+msgstr "TPM 信賴平臺模組 v2.0"
+
+#. TRANSLATORS: Title: MEI = Intel Management Engine
+#: panels/firmware-security/cc-firmware-security-utils.c:168
+msgid "Intel Management Engine Manufacturing Mode"
+msgstr "Intel 管理引擎製造模式"
+
+#. TRANSLATORS: Title: MEI = Intel Management Engine, and the "override" is enabled
+#. * with a jumper -- luckily it is probably not accessible to end users on consumer
+#. * boards
+#: panels/firmware-security/cc-firmware-security-utils.c:175
+msgid "Intel Management Engine Override"
+msgstr "Intel 管理引擎凌駕"
+
+#. TRANSLATORS: Title: MEI = Intel Management Engine
+#: panels/firmware-security/cc-firmware-security-utils.c:180
+msgid "Intel Management Engine Version"
+msgstr "Intel 管理引擎版本"
+
+#. TRANSLATORS: Title: if firmware updates are available
+#: panels/firmware-security/cc-firmware-security-utils.c:185
+msgid "Firmware Updates"
+msgstr "韌體更新"
+
+#. TRANSLATORS: Title: if we can verify the firmware checksums
+#: panels/firmware-security/cc-firmware-security-utils.c:190
+msgid "Firmware Attestation"
+msgstr ""
+
+#. TRANSLATORS: Title: if the fwupd plugins are all present and correct
+#: panels/firmware-security/cc-firmware-security-utils.c:195
+msgid "Firmware Updater Verification"
+msgstr "韌體更新器驗證"
+
+#. TRANSLATORS: Title: Allows debugging of parts using proprietary hardware
+#: panels/firmware-security/cc-firmware-security-utils.c:201
+msgid "Platform Debugging"
+msgstr "平臺除錯"
+
+#. TRANSLATORS: Title: if fwupd supports HSI on this chip
+#: panels/firmware-security/cc-firmware-security-utils.c:206
+msgid "Processor Security Checks"
+msgstr "處理器安全性檢查"
+
+#. TRANSLATORS: Title: if firmware enforces rollback protection
+#: panels/firmware-security/cc-firmware-security-utils.c:211
+msgid "AMD Rollback Protection"
+msgstr "AMD 降版保護"
+
+#. TRANSLATORS: Title: if hardware enforces control of SPI replays
+#: panels/firmware-security/cc-firmware-security-utils.c:216
+msgid "AMD Firmware Replay Protection"
+msgstr "AMD 韌體重放保護"
+
+#. TRANSLATORS: Title: if hardware enforces control of SPI writes
+#: panels/firmware-security/cc-firmware-security-utils.c:221
+msgid "AMD Firmware Write Protection"
+msgstr "AMD 韌體寫入保護"
+
+#. TRANSLATORS: Title: if the part has been fused
+#: panels/firmware-security/cc-firmware-security-utils.c:226
+msgid "Fused Platform"
+msgstr "融合平臺"
+
+#. TRANSLATORS: if the stauts is valid. For example security check is valid and key is valid.
+#: panels/firmware-security/cc-firmware-security-utils.c:237
+msgid "Valid"
+msgstr "有效"
+
+#. TRANSLATORS: if the status or key is not valid.
+#: panels/firmware-security/cc-firmware-security-utils.c:242
+msgid "Not Valid"
+msgstr "無效"
+
+#. TRANSLATORS: if the function is not enabled through BIOS or OS settings.
+#: panels/firmware-security/cc-firmware-security-utils.c:252
+msgid "Not Enabled"
+msgstr "尚未啟用"
+
+#. TRANSLATORS: the memory space or system mode is locked to prevent from malicious modification.
+#: panels/firmware-security/cc-firmware-security-utils.c:257
+msgid "Locked"
+msgstr "已鎖定"
+
+#. TRANSLATORS: the memory space or system mode is not locked.
+#: panels/firmware-security/cc-firmware-security-utils.c:262
+msgid "Not Locked"
+msgstr "未鎖定"
+
+#. TRANSLATORS: The data is encrypted to prevent from malicious reading.
+#: panels/firmware-security/cc-firmware-security-utils.c:267
+msgid "Encrypted"
+msgstr "已加密"
+
+#. TRANSLATORS: the data in memory is plane text.
+#: panels/firmware-security/cc-firmware-security-utils.c:272
+msgid "Not Encrypted"
+msgstr "未加密"
+
+#. TRANSLATORS: Linux kernel is tainted by third party kernel module.
+#: panels/firmware-security/cc-firmware-security-utils.c:277
+msgid "Tainted"
+msgstr "遭到污染"
+
+#. TRANSLATORS: All the loaded kernel module are licensed.
+#: panels/firmware-security/cc-firmware-security-utils.c:282
+msgid "Not Tainted"
+msgstr "未遭污染"
+
+#. TRANSLATORS: the feature can be detected.
+#: panels/firmware-security/cc-firmware-security-utils.c:287
+msgid "Found"
+msgstr "可以使用"
+
+#. TRANSLATORS: the feature can't be detected.
+#: panels/firmware-security/cc-firmware-security-utils.c:292
+msgid "Not Found"
+msgstr "無法使用"
+
+#. TRANSLATORS: the function is supported by hardware.
+#: panels/firmware-security/cc-firmware-security-utils.c:297
+msgid "Supported"
+msgstr "支援"
+
+#. TRANSLATORS: the function isn't supported by hardware.
+#: panels/firmware-security/cc-firmware-security-utils.c:302
+msgid "Not Supported"
+msgstr "未支援"
+
+#: panels/firmware-security/gnome-firmware-security-panel.desktop.in.in:3
+msgid "Device Security"
+msgstr "裝置安全"
+
+#: panels/firmware-security/gnome-firmware-security-panel.desktop.in.in:4
+msgid "Host firmware security status"
+msgstr "了解主機的安全性狀態"
+
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/firmware-security/gnome-firmware-security-panel.desktop.in.in:20
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;privacy;"
+msgstr ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;privacy;螢幕;鎖定;診斷;當掉;崩潰;私人;隱私;最近;暫存;索引;名"
+"稱;網路;身分;"
+
+#: panels/info-overview/cc-info-overview-panel.c:297
+#: panels/info-overview/cc-info-overview-panel.c:317
+#: panels/info-overview/cc-info-overview-panel.c:358
+#: panels/info-overview/cc-info-overview-panel.c:388
 #: panels/wwan/cc-wwan-details-dialog.c:100
 msgid "Unknown"
 msgstr "不明"
 
-#. translators: This is the name of the OS, followed by the build ID, for
-#. * example:
-#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
-#. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info-overview/cc-info-overview-panel.c:443
-#, 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:458
+#: panels/info-overview/cc-info-overview-panel.c:335
 #, c-format
 msgid "64-bit"
-msgstr "64位元"
+msgstr "64 位元"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:461
+#: panels/info-overview/cc-info-overview-panel.c:338
 #, c-format
 msgid "32-bit"
-msgstr "32位元"
+msgstr "32 位元"
 
-#: panels/info-overview/cc-info-overview-panel.c:720
+#: panels/info-overview/cc-info-overview-panel.c:597
 msgid "X11"
 msgstr "X11"
 
-#: panels/info-overview/cc-info-overview-panel.c:724
+#: panels/info-overview/cc-info-overview-panel.c:601
 msgid "Wayland"
 msgstr "Wayland"
 
-#: panels/info-overview/cc-info-overview-panel.c:726
+#: panels/info-overview/cc-info-overview-panel.c:603
 msgctxt "Windowing system (Wayland, X11, or Unknown)"
 msgid "Unknown"
 msgstr "不明"
 
+#. translators: this is the placeholder string when the GNOME Shell
+#. * version couldn't be loaded, eg. “GNOME Version: Not Available”
+#: panels/info-overview/cc-info-overview-panel.c:681
+msgid "Not Available"
+msgstr "無法取得"
+
 #: panels/info-overview/cc-info-overview-panel.ui:17
 msgid "System Logo"
 msgstr "系統標誌"
 
 #: panels/info-overview/cc-info-overview-panel.ui:32
-#: panels/sharing/cc-sharing-panel.ui:299
+#: panels/sharing/cc-sharing-panel.ui:304
 msgid "Device Name"
 msgstr "裝置名稱"
 
@@ -1775,7 +2389,7 @@ msgstr "處理器"
 
 #: panels/info-overview/cc-info-overview-panel.ui:74
 msgid "Graphics"
-msgstr "繪圖"
+msgstr "顯示卡"
 
 #: panels/info-overview/cc-info-overview-panel.ui:82
 msgid "Disk Capacity"
@@ -1790,37 +2404,51 @@ msgstr "正在計算…"
 msgid "OS Name"
 msgstr "作業系統名稱"
 
-#: panels/info-overview/cc-info-overview-panel.ui:106
+#. translators: this field contains the distro build ID
+#: panels/info-overview/cc-info-overview-panel.ui:107
+msgid "OS Build ID"
+msgstr "作業系統組建 ID"
+
+#: panels/info-overview/cc-info-overview-panel.ui:115
 msgid "OS Type"
 msgstr "作業系統類型"
 
-#: panels/info-overview/cc-info-overview-panel.ui:114
+#: panels/info-overview/cc-info-overview-panel.ui:123
 msgid "GNOME Version"
 msgstr "GNOME 版本"
 
-#: panels/info-overview/cc-info-overview-panel.ui:123
+#. translators: this is a placeholder while the GNOME version is being fetched
+#: panels/info-overview/cc-info-overview-panel.ui:125
+msgid "Loading…"
+msgstr "正在載入…"
+
+#: panels/info-overview/cc-info-overview-panel.ui:133
 msgid "Windowing System"
 msgstr "視窗系統"
 
-#: panels/info-overview/cc-info-overview-panel.ui:131
+#: panels/info-overview/cc-info-overview-panel.ui:141
 msgid "Virtualization"
 msgstr "虛擬化"
 
-#: panels/info-overview/cc-info-overview-panel.ui:139
+#: panels/info-overview/cc-info-overview-panel.ui:150
 msgid "Software Updates"
 msgstr "軟體更新"
 
-#: panels/info-overview/cc-info-overview-panel.ui:158
+#: panels/info-overview/cc-info-overview-panel.ui:174
 msgid "Rename Device"
 msgstr "重新命名裝置"
 
-#: panels/info-overview/cc-info-overview-panel.ui:174
+#: panels/info-overview/cc-info-overview-panel.ui:190
 msgid ""
 "The device name is used to identify this device when it is viewed over the "
 "network, or when pairing Bluetooth devices."
-msgstr "裝置名稱用來在網路上檢視裝置，或是配對藍牙裝置時識別裝置。"
+msgstr "在網路查看或藍牙配對時，裝置名稱能供他人辨識。"
 
-#: panels/info-overview/cc-info-overview-panel.ui:190
+#: panels/info-overview/cc-info-overview-panel.ui:196
+msgid "Device name"
+msgstr "裝置名稱"
+
+#: panels/info-overview/cc-info-overview-panel.ui:210
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
@@ -1849,31 +2477,31 @@ msgstr ""
 
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
-msgstr "聲音與媒體"
+msgstr "音訊與媒體"
 
 #: panels/keyboard/00-multimedia.xml.in:4
 msgid "Volume mute/unmute"
-msgstr "音量 靜音/取消靜音"
+msgstr "音量靜音/取消靜音"
 
 #: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
-msgstr "調低音量"
+msgstr "音量降低"
 
 #: panels/keyboard/00-multimedia.xml.in:8
 msgid "Volume up"
-msgstr "調高音量"
+msgstr "音量提高"
 
 #: panels/keyboard/00-multimedia.xml.in:10
 msgid "Microphone mute/unmute"
-msgstr "麥克風 靜音/取消靜音"
+msgstr "麥克風靜音/取消靜音"
 
 #: panels/keyboard/00-multimedia.xml.in:12
 msgid "Launch media player"
-msgstr "執行媒體播放程式"
+msgstr "啟動媒體播放器"
 
 #: panels/keyboard/00-multimedia.xml.in:14
 msgid "Play (or play/pause)"
-msgstr "播放 (或播放/暫停)"
+msgstr "播放（或播放/暫停）"
 
 #: panels/keyboard/00-multimedia.xml.in:16
 msgid "Pause playback"
@@ -1893,7 +2521,7 @@ msgstr "下一首歌曲"
 
 #: panels/keyboard/00-multimedia.xml.in:24
 msgid "Eject"
-msgstr "退出"
+msgstr "退出光碟"
 
 #: panels/keyboard/01-input-sources.xml.in:4
 #: panels/universal-access/cc-ua-panel.ui:163
@@ -1902,31 +2530,31 @@ msgstr "輸入"
 
 #: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
-msgstr "切換到下一個輸入來源"
+msgstr "切換至下個輸入來源"
 
 #: panels/keyboard/01-input-sources.xml.in:13
 msgid "Switch to previous input source"
-msgstr "切換到上一個輸入來源"
+msgstr "切換至上個輸入來源"
 
 #: panels/keyboard/01-launchers.xml.in:2
 msgid "Launchers"
-msgstr "執行器"
+msgstr "啟動應用程式"
 
 #: panels/keyboard/01-launchers.xml.in:4
 msgid "Launch help browser"
-msgstr "執行說明文件瀏覽器"
+msgstr "求助文件瀏覽器"
 
 #: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
-msgstr "執行計算機"
+msgstr "計算機"
 
 #: panels/keyboard/01-launchers.xml.in:10
 msgid "Launch email client"
-msgstr "執行電子郵件客戶端"
+msgstr "電子郵件客戶端"
 
 #: panels/keyboard/01-launchers.xml.in:12
 msgid "Launch web browser"
-msgstr "執行網頁瀏覽器"
+msgstr "網頁瀏覽器"
 
 #: panels/keyboard/01-launchers.xml.in:14
 msgid "Home folder"
@@ -1947,7 +2575,7 @@ msgstr "登出"
 
 #: panels/keyboard/01-system.xml.in:6
 msgid "Lock screen"
-msgstr "鎖定畫面"
+msgstr "鎖定螢幕"
 
 #: panels/keyboard/50-accessibility.xml.in:2
 #: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
@@ -1956,15 +2584,15 @@ msgstr "無障礙輔助"
 
 #: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
-msgstr "開啟或關閉放大鏡"
+msgstr "開啟或關閉縮放"
 
 #: panels/keyboard/50-accessibility.xml.in:6
 msgid "Zoom in"
-msgstr "拉近"
+msgstr "放大（需啟用縮放）"
 
 #: panels/keyboard/50-accessibility.xml.in:8
 msgid "Zoom out"
-msgstr "拉遠"
+msgstr "縮小（需啟用縮放）"
 
 #: panels/keyboard/50-accessibility.xml.in:10
 msgid "Turn screen reader on or off"
@@ -1984,7 +2612,7 @@ msgstr "將文字縮小"
 
 #: panels/keyboard/50-accessibility.xml.in:18
 msgid "High contrast on or off"
-msgstr "高對比開或關"
+msgstr "開啟或關閉高反差"
 
 #: panels/keyboard/cc-input-chooser.c:186
 msgid "No input sources found"
@@ -1999,32 +2627,36 @@ msgstr "其他"
 msgid "Add an Input Source"
 msgstr "加入輸入來源"
 
-#: panels/keyboard/cc-input-chooser.ui:81
+#: panels/keyboard/cc-input-chooser.ui:84
 msgid "Input methods can’t be used on the login screen"
-msgstr "輸入法無法在登入畫面中使用"
+msgstr "輸入法無法在登入畫面使用"
 
 #: panels/keyboard/cc-input-list-box.ui:24
 msgid "No input source selected"
-msgstr "尚未選擇輸入來源"
+msgstr "未選擇輸入來源"
 
-#: panels/keyboard/cc-input-row.ui:28 panels/search/cc-search-panel-row.ui:49
+#: panels/keyboard/cc-input-row.ui:20
+msgid "Options"
+msgstr "選項"
+
+#: panels/keyboard/cc-input-row.ui:31 panels/search/cc-search-panel-row.ui:52
 msgid "Move Up"
-msgstr "往上移"
+msgstr "上移"
 
-#: panels/keyboard/cc-input-row.ui:32 panels/search/cc-search-panel-row.ui:53
+#: panels/keyboard/cc-input-row.ui:35 panels/search/cc-search-panel-row.ui:56
 msgid "Move Down"
-msgstr "往下移"
+msgstr "下移"
 
-#: panels/keyboard/cc-input-row.ui:38
+#: panels/keyboard/cc-input-row.ui:41
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: panels/keyboard/cc-input-row.ui:45
+#: panels/keyboard/cc-input-row.ui:48
 msgid "View Keyboard Layout"
 msgstr "檢視鍵盤配置"
 
-#: panels/keyboard/cc-input-row.ui:51
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:29
+#: panels/keyboard/cc-input-row.ui:54 panels/sharing/cc-sharing-networks.c:223
+#: panels/sharing/cc-sharing-panel.c:646
 msgid "Remove"
 msgstr "移除"
 
@@ -2035,7 +2667,7 @@ msgid "Custom Shortcuts"
 msgstr "自訂快捷鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:64
-#: panels/keyboard/cc-keyboard-panel.ui:62
+#: panels/keyboard/cc-keyboard-panel.ui:63
 msgid "Alternate Characters Key"
 msgstr "替代字元鍵"
 
@@ -2044,31 +2676,31 @@ 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-keyboard-panel.c:67
 #: panels/keyboard/cc-keyboard-panel.c:85
 msgctxt "keyboard key"
 msgid "Left Alt"
-msgstr "å·¦ Alt"
+msgstr "左側 Alt 鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:68
 #: panels/keyboard/cc-keyboard-panel.c:86
 msgctxt "keyboard key"
 msgid "Right Alt"
-msgstr "右 Alt"
+msgstr "右側 Alt 鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:69
 #: panels/keyboard/cc-keyboard-panel.c:87
 msgctxt "keyboard key"
 msgid "Left Super"
-msgstr "å·¦ Super"
+msgstr "左側超級鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:70
 #: panels/keyboard/cc-keyboard-panel.c:88
 msgctxt "keyboard key"
 msgid "Right Super"
-msgstr "右 Super"
+msgstr "右側超級鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:71
 #: panels/keyboard/cc-keyboard-panel.c:89
@@ -2080,10 +2712,10 @@ msgstr "選單鍵"
 #: panels/keyboard/cc-keyboard-panel.c:90
 msgctxt "keyboard key"
 msgid "Right Ctrl"
-msgstr "右 Ctrl"
+msgstr "右側 Ctrl 鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:80
-#: panels/keyboard/cc-keyboard-panel.ui:79
+#: panels/keyboard/cc-keyboard-panel.ui:80
 msgid "Compose Key"
 msgstr "組合鍵"
 
@@ -2094,24 +2726,25 @@ msgid ""
 "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>。"
+"組合鍵能讓您輸入各式各樣的字元。若要使用此功能，請先按一下組合鍵，再輸入一段"
+"字元順序。\n"
+"舉例：先按一下組合鍵，再按 <b>C</b> 與 <b>o</b>能輸入 <b>©</b>；按下 <b>a</"
+"b> 與 <b>'</b> 則能輸入 <b>á</b>。"
 
 #: panels/keyboard/cc-keyboard-panel.c:91
 msgctxt "keyboard key"
 msgid "Caps Lock"
-msgstr "大寫鎖定"
+msgstr "Caps Lock 鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:92
 msgctxt "keyboard key"
 msgid "Scroll Lock"
-msgstr "捲動鎖定"
+msgstr "Scroll Lock 鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:93
 msgctxt "keyboard key"
 msgid "Print Screen"
-msgstr "列印畫面"
+msgstr "Print Screen 鍵"
 
 #: panels/keyboard/cc-keyboard-panel.c:217
 #, c-format
@@ -2119,8 +2752,8 @@ msgid ""
 "Input sources can be switched using the %s keyboard shortcut.\n"
 "This can be changed in the keyboard shortcut settings."
 msgstr ""
-"輸入來源可以使用 %s 鍵盤快捷鍵切換。\n"
-"這可以在鍵盤快捷鍵設定值中修改。"
+"輸入來源可透過鍵盤快捷鍵 %s 切換。\n"
+"欲修改快捷鍵可至「鍵盤快捷鍵」設定中修改。"
 
 #: panels/keyboard/cc-keyboard-panel.ui:17
 msgid "Input Sources"
@@ -2136,27 +2769,27 @@ msgstr "輸入來源切換"
 
 #: panels/keyboard/cc-keyboard-panel.ui:31
 msgid "Use the _same source for all windows"
-msgstr "所有視窗皆使用相同的來源(_S)"
+msgstr "所有視窗皆使用相同的輸入來源(_S)"
 
 #: panels/keyboard/cc-keyboard-panel.ui:43
 msgid "Switch input sources _individually for each window"
 msgstr "每個視窗各自切換獨立的輸入來源(_D)"
 
-#: panels/keyboard/cc-keyboard-panel.ui:58
+#: panels/keyboard/cc-keyboard-panel.ui:59
 msgid "Special Character Entry"
-msgstr "特殊字元輸入"
+msgstr "輸入特殊字元"
 
-#: panels/keyboard/cc-keyboard-panel.ui:59
+#: panels/keyboard/cc-keyboard-panel.ui:60
 msgid "Methods for entering symbols and letter variants using the keyboard."
-msgstr "使用鍵盤輸入符號、字母變體的輸入法。"
+msgstr "使用鍵盤輸入符號及字母變體的方法。"
 
-#: panels/keyboard/cc-keyboard-panel.ui:97
+#: panels/keyboard/cc-keyboard-panel.ui:98
 #: panels/keyboard/cc-keyboard-shortcut-dialog.c:319
 #: panels/keyboard/cc-keyboard-shortcut-dialog.c:334 shell/cc-window.ui:160
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤快捷鍵"
 
-#: panels/keyboard/cc-keyboard-panel.ui:100
+#: panels/keyboard/cc-keyboard-panel.ui:101
 msgid "View and Customize Shortcuts"
 msgstr "檢視與自訂快捷鍵"
 
@@ -2164,58 +2797,69 @@ msgstr "檢視與自訂快捷鍵"
 #, c-format
 msgid "%d modified"
 msgid_plural "%d modified"
-msgstr[0] "%d 已修改"
+msgstr[0] "已修改 %d 個"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:460
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:463
 msgid "Reset All Shortcuts?"
-msgstr "重設所有的快捷鍵？"
+msgstr "要重設所有快捷鍵嗎？"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:463
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:466
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
-msgstr "重設快捷鍵可能會影響您自訂的快捷鍵。這個動作不能撤銷。"
+msgstr "重設快捷鍵可能會影響您自訂的快捷鍵，且該動作不能還原。"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:467
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:23
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:470
 #: panels/network/wireless-security/ws-file-chooser-button.c:94
 #: panels/printers/ppd-selection-dialog.ui:83
 #: panels/wwan/cc-wwan-device-page.c:189
 msgid "Cancel"
 msgstr "取消"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:468
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:471
 msgid "Reset All"
-msgstr "全部重設"
+msgstr "重設全部"
 
 #: panels/keyboard/cc-keyboard-shortcut-dialog.ui:35
 msgid "Reset All…"
-msgstr "全部重設…"
+msgstr "重設全部…"
 
 #: panels/keyboard/cc-keyboard-shortcut-dialog.ui:36
 msgid "Reset all shortcuts to their default keybindings"
-msgstr "將快捷鍵重設回它們預設的按鍵組合"
+msgstr "將快捷鍵重設為預設的按鍵組合"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:89
+msgid "Section"
+msgstr "節"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:111
+msgid "Shortcuts"
+msgstr "快捷鍵"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:143
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:120
+msgid "Add a shortcut"
+msgstr "加入快捷鍵"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:155
 msgid "Add Custom Shortcuts"
 msgstr "加入自訂快捷鍵"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:151
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:163
 msgid "Set up custom shortcuts for launching apps, running scripts, and more."
-msgstr "設置自訂快捷鍵方便啟動程式、執行指令稿…等。"
+msgstr "設定自訂快捷鍵來啟動應用程式、執行命令稿等。"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:157
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:169
 msgid "Add Shortcut"
-msgstr "加入捷徑鍵"
+msgstr "加入快捷鍵"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:189
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:201
 msgid "No keyboard shortcut found"
 msgstr "找不到鍵盤快捷鍵"
 
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:392
 #, c-format
 msgid "%s is already being used for %s. If you replace it, %s will be disabled"
-msgstr "%s 已經被 %s 使用。如您替換，則 %s 會被停用"
+msgstr "%s 已被「%s」使用。若要取代，則「%s」會被停用"
 
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:536
 msgid "Enter the new shortcut"
@@ -2233,56 +2877,58 @@ msgstr "設定快捷鍵"
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:562
 #, c-format
 msgid "Enter new shortcut to change %s."
-msgstr "請輸入新的快捷鍵來更改 %s。"
+msgstr "請輸入新的按鍵組合來更改「%s」快捷鍵。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:992
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:977
 msgid "Add Custom Shortcut"
 msgstr "加入自訂快捷鍵"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:39
-#: panels/wwan/cc-wwan-apn-dialog.ui:33
-msgid "Add"
-msgstr "加入"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:30
+msgid "_Remove"
+msgstr "移除(_R)"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:46
-msgid "Replace"
-msgstr "取代"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:49
+msgid "Re_place"
+msgstr "取代(_P)"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:52
-msgid "Set"
-msgstr "設定"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:56
+#: panels/wwan/cc-wwan-mode-dialog.ui:39
+#: panels/wwan/cc-wwan-network-dialog.ui:115
+#: panels/wwan/cc-wwan-sim-lock-dialog.c:229
+msgid "_Set"
+msgstr "設定(_S)"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:98
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:103
 msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
-msgstr "按下 Esc 取消或按 Backspace 停用鍵盤快捷鍵。"
+msgstr "按下 Esc 鍵取消或按 Backspace 鍵停用該鍵盤快捷鍵。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:153
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:161
 #: panels/printers/pp-details-dialog.ui:39
 #: panels/user-accounts/cc-add-user-dialog.ui:68
-#: panels/user-accounts/cc-user-panel.ui:132
+#: panels/user-accounts/cc-user-panel.ui:137
 #: panels/wwan/cc-wwan-apn-dialog.ui:96
 msgid "Name"
 msgstr "名稱"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:163
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:172
 msgid "Command"
-msgstr "指令"
+msgstr "命令"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:173
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:183
 msgid "Shortcut"
 msgstr "快捷鍵"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:240
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:253
 msgid "Set Shortcut…"
 msgstr "設定快捷鍵…"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:248
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:261
 msgid "None"
 msgstr "沒有"
 
 #: panels/keyboard/cc-keyboard-shortcut-row.ui:23
 msgid "Reset the shortcut to its default value"
-msgstr "將快捷鍵重設回預設值"
+msgstr "將快捷鍵重設為預設值"
 
 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
 msgid "Keyboard"
@@ -2292,26 +2938,26 @@ msgstr "鍵盤"
 msgid ""
 "Change keyboard shortcuts and set your typing preferences, keyboard layouts "
 "and input sources"
-msgstr "變更鍵盤快捷鍵，並設定您的輸入偏好設定、鍵盤配置、輸入來源等"
+msgstr "更改鍵盤快捷鍵，並設定您的輸入偏好設定、鍵盤配置、輸入來源等"
 
 #. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
 msgid ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
-"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;捷徑"
-"鍵;快捷鍵;工作區;視窗;重新調整大小;縮放;拉遠;拉近;遠近;輸入;來源;輸入法;鎖定;"
-"上鎖;音量;"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;快捷"
+"鍵;快捷鍵;工作區;視窗;重新調整大小;縮放;拉遠;拉近;遠近;對比;反差;輸入;來源;輸"
+"入法;鎖定;上鎖;音量;"
 
-#: panels/location/cc-location-panel.ui:20
+#: panels/location/cc-location-panel.ui:23
 msgid "Location Services Turned Off"
 msgstr "定位服務已關閉"
 
-#: panels/location/cc-location-panel.ui:21
+#: panels/location/cc-location-panel.ui:24
 msgid "No applications can obtain location information."
-msgstr "沒有應用程式可以取得定位資訊。"
+msgstr "沒有應用程式能取得位置資訊。"
 
-#: panels/location/cc-location-panel.ui:35
+#: panels/location/cc-location-panel.ui:38
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy.\n"
@@ -2321,186 +2967,35 @@ msgid ""
 "\n"
 "Allow the applications below to determine your location."
 msgstr ""
-"定位服務允許應用程式知道您的地理位置。使用 Wi-Fi 和寬頻網路能提高準確度。\n"
+"定位服務可允許應用程式知道您的位置。使用 Wi-Fi 和行動寬頻能提高定位準確度。\n"
 "\n"
 "使用 Mozilla 定位服務：<a href='https://location.services.mozilla.com/";
 "privacy'>隱私權政策</a>\n"
 "\n"
-"允許下列應用程式判定您的地理位置。"
-
-#: panels/location/cc-location-panel.ui:53
-msgid "No Applications Have Asked for Location Access"
-msgstr "沒有應用程式請求定位存取權"
-
-#: panels/location/gnome-location-panel.desktop.in.in:4
-msgid "Protect your location information"
-msgstr "保護您的定位資訊"
-
-#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:62
-msgctxt "lock_screen"
-msgid "Screen Turns Off"
-msgstr "螢幕關閉"
-
-#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:65
-msgctxt "lock_screen"
-msgid "30 seconds"
-msgstr "30 秒"
-
-#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:68
-msgctxt "lock_screen"
-msgid "1 minute"
-msgstr "1 分鐘"
-
-#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:71
-msgctxt "lock_screen"
-msgid "2 minutes"
-msgstr "2 分鐘"
-
-#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:74
-msgctxt "lock_screen"
-msgid "3 minutes"
-msgstr "3 分鐘"
-
-#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:77
-msgctxt "lock_screen"
-msgid "5 minutes"
-msgstr "5 分鐘"
-
-#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:80
-msgctxt "lock_screen"
-msgid "30 minutes"
-msgstr "30 分鐘"
-
-#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:83
-msgctxt "lock_screen"
-msgid "1 hour"
-msgstr "1 小時"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:126
-msgctxt "blank_screen"
-msgid "1 minute"
-msgstr "1 分鐘"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:129
-msgctxt "blank_screen"
-msgid "2 minutes"
-msgstr "2 分鐘"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:132
-msgctxt "blank_screen"
-msgid "3 minutes"
-msgstr "3 分鐘"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:135
-msgctxt "blank_screen"
-msgid "4 minutes"
-msgstr "4 分鐘"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:138
-msgctxt "blank_screen"
-msgid "5 minutes"
-msgstr "5 分鐘"
+"允許下列應用程式偵測您的位置。"
 
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:141
-msgctxt "blank_screen"
-msgid "8 minutes"
-msgstr "8 分鐘"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:144
-msgctxt "blank_screen"
-msgid "10 minutes"
-msgstr "10 分鐘"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:147
-msgctxt "blank_screen"
-msgid "12 minutes"
-msgstr "12 分鐘"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:150
-msgctxt "blank_screen"
-msgid "15 minutes"
-msgstr "15 分鐘"
-
-#. Translators: Option for "Blank screen" in "Screen Lock" panel
-#: panels/lock/cc-lock-panel.c:153
-msgctxt "blank_screen"
-msgid "Never"
-msgstr "永不"
-
-#: panels/lock/cc-lock-panel.ui:8
-msgid ""
-"Automatically locking the screen prevents others from accessing the computer "
-"while you're away."
-msgstr "自動鎖定螢幕能防止其他人在您離開時取用您的電腦。"
-
-#: panels/lock/cc-lock-panel.ui:13
-msgid "Blank Screen Delay"
-msgstr "螢幕轉黑延遲"
-
-#: panels/lock/cc-lock-panel.ui:14
-msgid "Period of inactivity after which the screen will go blank."
-msgstr "不活躍多久後螢幕轉黑。"
-
-#: panels/lock/cc-lock-panel.ui:32
-msgid "Automatic Screen _Lock"
-msgstr "自動鎖定螢幕(_L)"
-
-#: panels/lock/cc-lock-panel.ui:46
-msgid "Automatic _Screen Lock Delay"
-msgstr "自動螢幕鎖定延遲(_S)"
-
-#: panels/lock/cc-lock-panel.ui:47
-msgid "Period after the screen blanks when the screen is automatically locked."
-msgstr "螢幕轉黑後，要多久才會自動鎖定螢幕。"
-
-#: panels/lock/cc-lock-panel.ui:65
-msgid "Show _Notifications on Lock Screen"
-msgstr "在鎖定螢幕顯示通知(_N)"
-
-#: panels/lock/cc-lock-panel.ui:80
-msgid "Forbid new _USB devices"
-msgstr "禁止新的 _USB 裝置"
-
-#: panels/lock/cc-lock-panel.ui:81
-msgid ""
-"Prevent new USB devices from interacting with the system when the screen is "
-"locked."
-msgstr "當螢幕鎖定時，防止新的 USB 裝置與系統互動。"
+#: panels/location/cc-location-panel.ui:56
+msgid "No Applications Have Asked for Location Access"
+msgstr "沒有應用程式請求取用位置資訊"
 
-#: panels/lock/gnome-lock-panel.desktop.in.in:3
-msgid "Screen Lock"
-msgstr "螢幕鎖定"
+#: panels/location/gnome-location-panel.desktop.in.in:4
+msgid "Protect your location information"
+msgstr "保護您的位置資訊"
 
-#: panels/lock/gnome-lock-panel.desktop.in.in:4
-msgid "Lock your screen"
-msgstr "鎖定您的螢幕"
+#. Translators: Search terms to find the Location panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/location/gnome-location-panel.desktop.in.in:20
+msgid "location;gps;private;privacy;"
+msgstr "location;gps;private;privacy;定位;隱私權;衛星定位;位置;地理;"
 
-#: panels/microphone/cc-microphone-panel.ui:20
+#: panels/microphone/cc-microphone-panel.ui:23
 msgid "Microphone Turned Off"
 msgstr "麥克風已關閉"
 
-#: panels/microphone/cc-microphone-panel.ui:21
+#: panels/microphone/cc-microphone-panel.ui:24
 msgid "No applications can record sound."
-msgstr "沒有能錄音的應用程式。"
+msgstr "沒有能錄製聲音的應用程式。"
 
-#: panels/microphone/cc-microphone-panel.ui:34
+#: panels/microphone/cc-microphone-panel.ui:37
 msgid ""
 "Use of the microphone allows applications to record and listen to audio. "
 "Disabling the microphone may cause some applications to not function "
@@ -2508,19 +3003,24 @@ msgid ""
 "\n"
 "Allow the applications below to use your microphone."
 msgstr ""
-"使用麥克風可允許應用程式錄音或聆聽聲音。停用麥克風可能導致部份應用程式無法正"
-"常運作。\n"
+"麥克風的使用可允許應用程式錄製或聆聽聲音。停用麥克風可能導致部分應用程式無法"
+"正常運作。\n"
 "\n"
 "允許下列應用程式使用您的麥克風。"
 
-#: panels/microphone/cc-microphone-panel.ui:51
+#: panels/microphone/cc-microphone-panel.ui:54
 msgid "No Applications Have Asked for Microphone Access"
-msgstr "沒有應用程式請求麥克風存取權"
+msgstr "沒有應用程式請求取用麥克風"
 
 #: panels/microphone/gnome-microphone-panel.desktop.in.in:4
 msgid "Protect your conversations"
 msgstr "保護您的對話"
 
+#. Translators: Search terms to find the Microphone panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:20
+msgid "microphone;recording;application;privacy;"
+msgstr "microphone;recording;application;privacy;麥克風;錄音;應用程式;隱私權;"
+
 #: panels/mouse/cc-mouse-panel.ui:9 panels/wacom/cc-wacom-panel.ui:9
 msgid "Test Your _Settings"
 msgstr "測試您的設定值(_S)"
@@ -2532,17 +3032,17 @@ msgstr "一般"
 
 #: panels/mouse/cc-mouse-panel.ui:26
 msgid "Primary Button"
-msgstr "主要按鈕"
+msgstr "主要按鍵"
 
 #: panels/mouse/cc-mouse-panel.ui:27
 msgid "Sets the order of physical buttons on mice and touchpads."
-msgstr "設定滑鼠與觸控板上實體按鈕的順序。"
+msgstr "設定滑鼠與觸控板上實體按鍵所對應的命令。"
 
-#: panels/mouse/cc-mouse-panel.ui:41 panels/sound/cc-balance-slider.ui:13
+#: panels/mouse/cc-mouse-panel.ui:41 panels/sound/cc-balance-slider.ui:16
 msgid "Left"
 msgstr "å·¦"
 
-#: panels/mouse/cc-mouse-panel.ui:48 panels/sound/cc-balance-slider.ui:15
+#: panels/mouse/cc-mouse-panel.ui:48 panels/sound/cc-balance-slider.ui:18
 msgid "Right"
 msgstr "右"
 
@@ -2552,69 +3052,75 @@ msgstr "滑鼠"
 
 #: panels/mouse/cc-mouse-panel.ui:65
 msgid "Mouse Speed"
-msgstr "鼠標速度"
+msgstr "滑鼠速度"
 
 #. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use 
the same translation if possible.
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: panels/mouse/cc-mouse-panel.ui:81 panels/mouse/cc-mouse-panel.ui:108
+#: panels/mouse/cc-mouse-panel.ui:81 panels/mouse/cc-mouse-panel.ui:87
+#: panels/mouse/cc-mouse-panel.ui:114 panels/mouse/cc-mouse-panel.ui:120
 msgid "Natural Scrolling"
 msgstr "自然捲動"
 
-#: panels/mouse/cc-mouse-panel.ui:82 panels/mouse/cc-mouse-panel.ui:109
+#: panels/mouse/cc-mouse-panel.ui:82 panels/mouse/cc-mouse-panel.ui:115
 msgid "Scrolling moves the content, not the view."
-msgstr "捲動會移動內容，而非檢視畫面。"
+msgstr "捲動的方向為內容移動方向，而非畫面移動的方向。"
 
-#: panels/mouse/cc-mouse-panel.ui:95 panels/mouse/cc-mouse-panel.ui:98
+#: panels/mouse/cc-mouse-panel.ui:98 panels/mouse/cc-mouse-panel.ui:101
+#: panels/mouse/cc-mouse-panel.ui:106
 msgid "Touchpad"
 msgstr "觸控板"
 
-#: panels/mouse/cc-mouse-panel.ui:119
+#: panels/mouse/cc-mouse-panel.ui:128
 msgid "Touchpad Speed"
 msgstr "觸控板速度"
 
-#: panels/mouse/cc-mouse-panel.ui:136
+#: panels/mouse/cc-mouse-panel.ui:145
 msgid "Tap to Click"
-msgstr "輕觸表示點擊"
+msgstr "輕觸以點擊"
 
-#: panels/mouse/cc-mouse-panel.ui:147
+#: panels/mouse/cc-mouse-panel.ui:150
+msgid "Tap to click"
+msgstr "輕觸就能進行點擊操作"
+
+#: panels/mouse/cc-mouse-panel.ui:159 panels/mouse/cc-mouse-panel.ui:164
 msgid "Two-finger Scrolling"
 msgstr "兩指捲動"
 
-#: panels/mouse/cc-mouse-panel.ui:159
+#: panels/mouse/cc-mouse-panel.ui:174 panels/mouse/cc-mouse-panel.ui:179
 msgid "Edge Scrolling"
 msgstr "邊緣捲動"
 
 #: panels/mouse/cc-mouse-test.c:131 panels/mouse/cc-mouse-test.ui:62
 msgid "Try clicking, double clicking, scrolling"
-msgstr "試著單擊、雙擊、捲動"
+msgstr "試著按一下、按兩下、捲動"
 
 #: panels/mouse/cc-mouse-test.c:136
 msgid "Five clicks, GEGL time!"
-msgstr "五次點擊，GEGL 時間！"
+msgstr "連按五下，GEGL 時間！"
 
 #: panels/mouse/cc-mouse-test.c:141
 msgid "Double click, primary button"
-msgstr "雙擊，主要按鈕"
+msgstr "按兩下（主要按鍵）"
 
 #: panels/mouse/cc-mouse-test.c:141
 msgid "Single click, primary button"
-msgstr "單擊，主要按鈕"
+msgstr "按一下（主要按鍵）"
 
 #: panels/mouse/cc-mouse-test.c:144
 msgid "Double click, middle button"
-msgstr "雙擊，中央按鈕"
+msgstr "按兩下（中央按鍵）"
 
 #: panels/mouse/cc-mouse-test.c:144
 msgid "Single click, middle button"
-msgstr "單擊，中央按鈕"
+msgstr "按一下（中央按鍵）"
 
 #: panels/mouse/cc-mouse-test.c:147
 msgid "Double click, secondary button"
-msgstr "雙擊，次要按鈕"
+msgstr "按兩下（次要按鍵）"
 
 #: panels/mouse/cc-mouse-test.c:147
 msgid "Single click, secondary button"
-msgstr "單擊，次要按鈕"
+msgstr "按一下（次要按鍵）"
 
 #: panels/mouse/gnome-mouse-panel.desktop.in.in:3
 msgid "Mouse & Touchpad"
@@ -2623,14 +3129,14 @@ msgstr "滑鼠與觸控板"
 #: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
-msgstr "改變您的滑鼠或控制板靈敏度並選擇慣用右手或左手"
+msgstr "更改您的滑鼠或觸控板靈敏度，並選擇慣用右手或慣用左手"
 
 #. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
 #: panels/mouse/gnome-mouse-panel.desktop.in.in:19
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr ""
 "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;觸控板;指標;點擊;輕"
-"觸;雙擊;按鈕;軌跡球;捲動;"
+"觸;雙擊;按鈕;軌跡球;捲動;慣用手;滑鼠;速度;按鍵;"
 
 #: panels/multitasking/cc-multitasking-panel.ui:15
 msgid "_Hot Corner"
@@ -2638,40 +3144,40 @@ msgstr "熱角(_H)"
 
 #: panels/multitasking/cc-multitasking-panel.ui:16
 msgid "Touch the top-left corner to open the Activities Overview."
-msgstr "觸碰左上角可以開啟「活動概覽」。"
+msgstr "觸碰左上角可以開啟「概覽」。"
 
 #: panels/multitasking/cc-multitasking-panel.ui:42
 msgid "_Active Screen Edges"
-msgstr "啟動螢幕邊緣(_A)"
+msgstr "積極邊框(_A)"
 
 #: panels/multitasking/cc-multitasking-panel.ui:43
 msgid ""
 "Drag windows against the top, left, and right screen edges to resize them."
-msgstr "拖曳視窗到螢幕上緣、左緣、右緣可以重新調整視窗大小。"
+msgstr "將視窗拖動至螢幕上緣、左緣、右緣來調整視窗大小。"
 
 #: panels/multitasking/cc-multitasking-panel.ui:70
 msgid "Workspaces"
-msgstr "工作空間"
+msgstr "工作區"
 
 #: panels/multitasking/cc-multitasking-panel.ui:76
 msgid "_Dynamic workspaces"
-msgstr "動態工作空間(_D)"
+msgstr "動態工作區(_D)"
 
 #: panels/multitasking/cc-multitasking-panel.ui:77
 msgid "Automatically removes empty workspaces."
-msgstr "自動移除空的工作空間。"
+msgstr "自動移除空的工作區。"
 
 #: panels/multitasking/cc-multitasking-panel.ui:91
 msgid "_Fixed number of workspaces"
-msgstr "固定數目工作空間(_F)"
+msgstr "固定數目工作區(_F)"
 
 #: panels/multitasking/cc-multitasking-panel.ui:92
 msgid "Specify a number of permanent workspaces."
-msgstr "指定恆定數目的工作空間。"
+msgstr "指定常駐的工作區數目。"
 
 #: panels/multitasking/cc-multitasking-panel.ui:108
 msgid "_Number of Workspaces"
-msgstr "工作空間數目(_N)"
+msgstr "工作區數目(_N)"
 
 #: panels/multitasking/cc-multitasking-panel.ui:124
 msgid "Multi-Monitor"
@@ -2679,11 +3185,11 @@ msgstr "多重顯示器"
 
 #: panels/multitasking/cc-multitasking-panel.ui:130
 msgid "Workspaces on _primary display only"
-msgstr "工作空間只在主要顯示器上(_P)"
+msgstr "只在主要顯示器使用工作區(_P)"
 
 #: panels/multitasking/cc-multitasking-panel.ui:156
 msgid "Workspaces on all d_isplays"
-msgstr "工作空間在所有的顯示器上(_I)"
+msgstr "在所有顯示器上使用工作區(_I)"
 
 #: panels/multitasking/cc-multitasking-panel.ui:184
 msgid "Application Switching"
@@ -2691,11 +3197,11 @@ msgstr "應用程式切換"
 
 #: panels/multitasking/cc-multitasking-panel.ui:190
 msgid "Include applications from all _workspaces"
-msgstr "包含所有工作空間的應用程式(_W)"
+msgstr "包含所有工作區的應用程式(_W)"
 
 #: panels/multitasking/cc-multitasking-panel.ui:204
 msgid "Include applications from the _current workspace only"
-msgstr "僅包含目前工作空間的應用程式(_C)"
+msgstr "僅包含目前工作區的應用程式(_C)"
 
 #: panels/multitasking/gnome-multitasking-panel.desktop.in.in:3
 msgid "Multitasking"
@@ -2707,56 +3213,61 @@ msgstr "管理生產力與多工作業的偏好設定"
 
 #. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/multitasking/gnome-multitasking-panel.desktop.in.in:15
-msgid "Multitasking;Multitask;Productivity;Customize;Desktop;"
+msgid ""
+"Multitasking;Multitask;Productivity;Customize;Desktop;Hot Corner;Workspaces;"
 msgstr ""
 "Multitasking;Multitask;Productivity;Customize;Desktop;多工作業;多工;生產力;自"
 "訂;桌面;"
 
-#: panels/network/cc-network-panel.c:662 panels/network/cc-wifi-panel.ui:300
+#: panels/network/cc-network-panel.c:662 panels/network/cc-wifi-panel.ui:303
 msgid "Oops, something has gone wrong. Please contact your software vendor."
-msgstr "噢，有問題發生。請聯繫您的軟體供應商。"
+msgstr "噢，發生問題。請聯繫您的軟體供應商。"
 
 #: panels/network/cc-network-panel.c:669
 msgid "NetworkManager needs to be running."
-msgstr "需要先執行 NetworkManager。"
+msgstr "需要執行 NetworkManager。"
 
 #: panels/network/cc-network-panel.ui:21 panels/network/cc-network-panel.ui:26
 msgid "Other Devices"
 msgstr "其他裝置"
 
-#: panels/network/cc-network-panel.ui:37 panels/network/cc-network-panel.ui:53
-#: panels/network/connection-editor/net-connection-editor.c:580
+#: panels/network/cc-network-panel.ui:37 panels/network/cc-network-panel.ui:71
+#: panels/network/connection-editor/net-connection-editor.c:586
 msgid "VPN"
 msgstr "VPN"
 
-#: panels/network/cc-network-panel.ui:70
+#: panels/network/cc-network-panel.ui:42
+msgid "Add connection"
+msgstr "加入新連線"
+
+#: panels/network/cc-network-panel.ui:62
 msgid "Not set up"
-msgstr "尚未設置"
+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:216
 #, c-format
 msgctxt "Wi-Fi Connection"
 msgid "%s (SSID: %s)"
 msgstr "%s (SSID: %s)"
 
-#: panels/network/cc-wifi-connection-row.c:263
+#: panels/network/cc-wifi-connection-row.c:275
 msgid "Insecure network (WEP)"
 msgstr "不安全網路 (WEP)"
 
-#: panels/network/cc-wifi-connection-row.c:267
+#: panels/network/cc-wifi-connection-row.c:279
 msgid "Secure network (WPA)"
 msgstr "安全網路 (WPA)"
 
-#: panels/network/cc-wifi-connection-row.c:271
+#: panels/network/cc-wifi-connection-row.c:283
 msgid "Secure network (WPA2)"
 msgstr "安全網路 (WPA2)"
 
-#: panels/network/cc-wifi-connection-row.c:275
+#: panels/network/cc-wifi-connection-row.c:287
 msgid "Secure network (WPA3)"
 msgstr "安全網路 (WPA3)"
 
-#: panels/network/cc-wifi-connection-row.c:279
+#: panels/network/cc-wifi-connection-row.c:291
 msgid "Secure network"
 msgstr "安全網路"
 
@@ -2767,8 +3278,9 @@ msgstr "已連線"
 
 #: panels/network/cc-wifi-connection-row.ui:62
 #: panels/network/net-device-ethernet.c:325
-#: panels/network/network-bluetooth.ui:22 panels/network/network-ethernet.ui:50
-#: panels/network/network-mobile.ui:321 panels/network/network-vpn.ui:21
+#: panels/network/network-bluetooth.ui:22 panels/network/network-ethernet.ui:56
+#: panels/network/network-mobile.ui:329 panels/network/network-proxy.ui:62
+#: panels/network/network-vpn.ui:21
 msgid "Options…"
 msgstr "選項…"
 
@@ -2778,21 +3290,21 @@ msgstr "選項…"
 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 連線網路。"
+msgstr "開啟熱點會中斷與「%s」的連接，並且無法透過 Wi-Fi 使用網路。"
 
 #: panels/network/cc-wifi-hotspot-dialog.c:266
 msgid "Must have a minimum of 8 characters"
-msgstr "必須至少有 8 個字元"
+msgstr "必須至少為 8 個字元"
 
 #: panels/network/cc-wifi-hotspot-dialog.c:271
 #, c-format
 msgid "Must have a maximum of %d character"
 msgid_plural "Must have a maximum of %d characters"
-msgstr[0] "必須至少有 %d 個字元"
+msgstr[0] "必須至少為 %d 個字元"
 
 #: panels/network/cc-wifi-hotspot-dialog.ui:4
 msgid "Turn On Wi-Fi Hotspot?"
-msgstr "開啟 Wi-Fi 熱點？"
+msgstr "要開啟 Wi-Fi 熱點嗎？"
 
 #: panels/network/cc-wifi-hotspot-dialog.ui:28
 msgid ""
@@ -2800,97 +3312,97 @@ msgid ""
 "Wi-Fi network that they can connect to. To do this, you must have an "
 "internet connection through a source other than Wi-Fi."
 msgstr ""
-"Wi-Fi 熱點透過建立其他人能連線的 Wi-Fi 網路，讓其他人能分享您的網路連線。要這"
-"麼做，您必須要有 Wi-Fi 之外的網路連線來源。"
+"Wi-Fi 熱點透過建立能讓其他人連接的 Wi-Fi 網路，與其他人共用您的網路連線。您需"
+"要有 Wi-Fi 之外的網路連線來源。"
 
 #: panels/network/cc-wifi-hotspot-dialog.ui:51
 msgid "Network Name"
 msgstr "網路名稱"
 
 #. Translators: This is a password needed for printing.
-#: panels/network/cc-wifi-hotspot-dialog.ui:74
-#: panels/printers/new-printer-dialog.ui:331
-#: panels/printers/pp-jobs-dialog.ui:52 panels/sharing/cc-sharing-panel.ui:376
+#: panels/network/cc-wifi-hotspot-dialog.ui:75
+#: panels/printers/new-printer-dialog.ui:338
+#: panels/printers/pp-jobs-dialog.ui:54 panels/sharing/cc-sharing-panel.ui:384
 #: panels/user-accounts/cc-add-user-dialog.ui:145
 #: panels/user-accounts/cc-add-user-dialog.ui:181
-#: panels/user-accounts/cc-add-user-dialog.ui:362
-#: panels/wwan/cc-wwan-apn-dialog.ui:172
+#: panels/user-accounts/cc-add-user-dialog.ui:364
+#: panels/wwan/cc-wwan-apn-dialog.ui:175
 msgid "Password"
 msgstr "密碼"
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:86
+#: panels/network/cc-wifi-hotspot-dialog.ui:88
 msgid "Generate Random Password"
 msgstr "產生隨機密碼"
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:87
+#: panels/network/cc-wifi-hotspot-dialog.ui:89
 msgid "Autogenerate Password"
 msgstr "自動產生密碼"
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:129
+#: panels/network/cc-wifi-hotspot-dialog.ui:131
 msgid "_Turn On"
 msgstr "é–‹å•Ÿ(_T)"
 
-#: panels/network/cc-wifi-panel.c:544
+#: panels/network/cc-wifi-panel.c:549
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
 #: panels/network/network-wifi.ui:66
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: panels/network/cc-wifi-panel.c:879
+#: panels/network/cc-wifi-panel.c:884
 msgid "Stop hotspot and disconnect any users?"
-msgstr "停止熱點並中斷任何使用者的連線？"
+msgstr "要停止 Wi-Fi 熱點並中斷任何使用者的連接嗎？"
 
-#: panels/network/cc-wifi-panel.c:882
+#: panels/network/cc-wifi-panel.c:887
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: panels/network/cc-wifi-panel.ui:72
+#: panels/network/cc-wifi-panel.ui:75
 msgid "Airplane Mode"
 msgstr "飛安模式"
 
-#: panels/network/cc-wifi-panel.ui:73
+#: panels/network/cc-wifi-panel.ui:76
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "停用 Wi-Fi、藍牙與行動寬頻"
 
-#: panels/network/cc-wifi-panel.ui:110
+#: panels/network/cc-wifi-panel.ui:113
 msgid "No Wi-Fi Adapter Found"
 msgstr "找不到 Wi-Fi 網卡"
 
-#: panels/network/cc-wifi-panel.ui:120
+#: panels/network/cc-wifi-panel.ui:123
 msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
 msgstr "請確認您的 Wi-Fi 網卡已插入並啟動"
 
-#: panels/network/cc-wifi-panel.ui:152 panels/wwan/cc-wwan-panel.ui:135
+#: panels/network/cc-wifi-panel.ui:155 panels/wwan/cc-wwan-panel.ui:102
 msgid "Airplane Mode On"
 msgstr "開啟飛安模式"
 
-#: panels/network/cc-wifi-panel.ui:162
+#: panels/network/cc-wifi-panel.ui:165
 msgid "Turn off to use Wi-Fi"
 msgstr "關閉以使用 Wi-Fi"
 
-#: panels/network/cc-wifi-panel.ui:199
+#: panels/network/cc-wifi-panel.ui:202
 msgid "Wi-Fi Hotspot Active"
-msgstr "Wi-Fi 熱點作用中"
+msgstr "Wi-Fi 熱點已啟動"
 
-#: panels/network/cc-wifi-panel.ui:209
+#: panels/network/cc-wifi-panel.ui:212
 msgid "Mobile devices can scan the QR code to connect."
-msgstr "行動裝置可以掃描 QR 碼來連線。"
+msgstr "行動裝置可以掃描 QR 碼來連接。"
 
-#: panels/network/cc-wifi-panel.ui:217
+#: panels/network/cc-wifi-panel.ui:220
 msgid "Turn Off Hotspot…"
 msgstr "關閉熱點…"
 
-#: panels/network/cc-wifi-panel.ui:237
+#: panels/network/cc-wifi-panel.ui:240
 msgid "Visible Networks"
-msgstr "可見網路"
+msgstr "可見的網路"
 
-#: panels/network/cc-wifi-panel.ui:294
+#: panels/network/cc-wifi-panel.ui:297
 msgid "NetworkManager needs to be running"
-msgstr "需要先執行 NetworkManager"
+msgstr "需要執行 NetworkManager"
 
 #: panels/network/connection-editor/8021x-security-page.ui:16
 msgid "802.1x _Security"
-msgstr "802.1x 防護(_S)"
+msgstr "802.1x 安全加密(_S)"
 
 #: panels/network/connection-editor/ce-page-8021x-security.c:109
 #: panels/network/connection-editor/ce-page-security.c:419
@@ -2915,6 +3427,7 @@ msgid "Stable"
 msgstr "穩定"
 
 #: panels/network/connection-editor/ce-page.c:241
+#, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
 "network device this connection is activated on. This feature is known as MAC "
@@ -2929,120 +3442,120 @@ msgid "Profile %d"
 msgstr "設定檔 %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:97
+#: panels/network/connection-editor/ce-page-details.c:98
 #: panels/network/net-device-wifi.c:229
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:101
+#: panels/network/connection-editor/ce-page-details.c:102
 #: panels/network/net-device-wifi.c:234
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA3 WiFi security
-#: panels/network/connection-editor/ce-page-details.c:107
+#: panels/network/connection-editor/ce-page-details.c:108
 msgid "WPA3"
 msgstr "WPA3"
 
 #. TRANSLATORS: this Enhanced Open WiFi security
-#: panels/network/connection-editor/ce-page-details.c:112
+#: panels/network/connection-editor/ce-page-details.c:113
 #: panels/network/connection-editor/ce-page-security.c:274
 msgid "Enhanced Open"
 msgstr "Enhanced Open"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:119
+#: panels/network/connection-editor/ce-page-details.c:125
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:125
+#: panels/network/connection-editor/ce-page-details.c:131
 msgid "Enterprise"
 msgstr "企業版"
 
-#: panels/network/connection-editor/ce-page-details.c:130
+#: panels/network/connection-editor/ce-page-details.c:136
 #: panels/network/net-device-wifi.c:219
 msgctxt "Wifi security"
 msgid "None"
-msgstr "沒有"
+msgstr "沒有加密"
 
-#: panels/network/connection-editor/ce-page-details.c:151
+#: panels/network/connection-editor/ce-page-details.c:157
 msgid "Never"
-msgstr "永不"
+msgstr "從不使用"
 
-#: panels/network/connection-editor/ce-page-details.c:166
+#: panels/network/connection-editor/ce-page-details.c:172
 #: panels/network/net-device-ethernet.c:105
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天以前"
 
-#: panels/network/connection-editor/ce-page-details.c:293
+#: panels/network/connection-editor/ce-page-details.c:297
 #, 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:295
+#: panels/network/connection-editor/ce-page-details.c:299
 #: panels/network/net-device-ethernet.c:217
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:310
+#: panels/network/connection-editor/ce-page-details.c:314
 msgid "2.4 GHz / 5 GHz"
 msgstr "2.4 GHz / 5 GHz"
 
-#: panels/network/connection-editor/ce-page-details.c:312
+#: panels/network/connection-editor/ce-page-details.c:316
 msgid "2.4 GHz"
 msgstr "2.4 GHz"
 
-#: panels/network/connection-editor/ce-page-details.c:314
+#: panels/network/connection-editor/ce-page-details.c:318
 msgid "5 GHz"
 msgstr "5 GHz"
 
-#: panels/network/connection-editor/ce-page-details.c:334
+#: panels/network/connection-editor/ce-page-details.c:338
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: panels/network/connection-editor/ce-page-details.c:336
+#: panels/network/connection-editor/ce-page-details.c:340
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: panels/network/connection-editor/ce-page-details.c:338
+#: panels/network/connection-editor/ce-page-details.c:342
 msgctxt "Signal strength"
 msgid "Ok"
-msgstr "確定"
+msgstr "還行"
 
-#: panels/network/connection-editor/ce-page-details.c:340
+#: panels/network/connection-editor/ce-page-details.c:344
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: panels/network/connection-editor/ce-page-details.c:342
+#: panels/network/connection-editor/ce-page-details.c:346
 msgctxt "Signal strength"
 msgid "Excellent"
-msgstr "很好"
+msgstr "優秀"
 
-#: panels/network/connection-editor/ce-page-details.c:409
+#: panels/network/connection-editor/ce-page-details.c:413
 #: panels/network/connection-editor/details-page.ui:94
 #: panels/network/net-device-ethernet.c:144
 #: panels/network/net-device-mobile.c:441
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
-#: panels/network/connection-editor/ce-page-details.c:410
+#: panels/network/connection-editor/ce-page-details.c:414
 #: panels/network/connection-editor/details-page.ui:110
 #: panels/network/net-device-ethernet.c:146
-#: panels/network/net-device-mobile.c:442 panels/network/network-mobile.ui:176
+#: panels/network/net-device-mobile.c:442 panels/network/network-mobile.ui:177
 msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
-#: panels/network/connection-editor/ce-page-details.c:412
-#: panels/network/connection-editor/ce-page-details.c:413
+#: panels/network/connection-editor/ce-page-details.c:416
+#: panels/network/connection-editor/ce-page-details.c:417
 #: panels/network/net-device-ethernet.c:149
 #: panels/network/net-device-ethernet.c:151
 #: panels/network/net-device-mobile.c:445
@@ -3050,20 +3563,20 @@ msgstr "IPv6 位址"
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: panels/network/connection-editor/ce-page-details.c:417
+#: panels/network/connection-editor/ce-page-details.c:421
 #: panels/network/net-device-ethernet.c:166
 #: panels/network/net-device-mobile.c:450
 msgid "DNS4"
 msgstr "DNS4"
 
-#: panels/network/connection-editor/ce-page-details.c:418
+#: panels/network/connection-editor/ce-page-details.c:422
 #: panels/network/net-device-ethernet.c:167
 #: panels/network/net-device-mobile.c:451
 msgid "DNS6"
 msgstr "DNS6"
 
-#: panels/network/connection-editor/ce-page-details.c:420
-#: panels/network/connection-editor/ce-page-details.c:421
+#: panels/network/connection-editor/ce-page-details.c:424
+#: panels/network/connection-editor/ce-page-details.c:425
 #: panels/network/connection-editor/details-page.ui:175
 #: panels/network/connection-editor/details-page.ui:192
 #: panels/network/connection-editor/ip4-page.ui:165
@@ -3071,24 +3584,24 @@ msgstr "DNS6"
 #: panels/network/net-device-ethernet.c:169
 #: panels/network/net-device-ethernet.c:171
 #: panels/network/net-device-mobile.c:453
-#: panels/network/net-device-mobile.c:454 panels/network/network-mobile.ui:203
-#: panels/network/network-mobile.ui:217
+#: panels/network/net-device-mobile.c:454 panels/network/network-mobile.ui:206
+#: panels/network/network-mobile.ui:221
 msgid "DNS"
 msgstr "DNS"
 
-#: panels/network/connection-editor/ce-page-details.c:473
+#: panels/network/connection-editor/ce-page-details.c:477
 msgid "Forget Connection"
-msgstr "忘記連線"
+msgstr "將該連接遺忘"
 
-#: panels/network/connection-editor/ce-page-details.c:475
+#: panels/network/connection-editor/ce-page-details.c:479
 msgid "Remove Connection Profile"
-msgstr "移除連線個人檔案"
+msgstr "移除連線設定檔"
 
-#: panels/network/connection-editor/ce-page-details.c:477
+#: panels/network/connection-editor/ce-page-details.c:481
 msgid "Remove VPN"
 msgstr "移除 VPN"
 
-#: panels/network/connection-editor/ce-page-details.c:495
+#: panels/network/connection-editor/ce-page-details.c:499
 msgid "Details"
 msgstr "詳細資料"
 
@@ -3102,21 +3615,21 @@ msgstr "自動"
 msgid "Identity"
 msgstr "身分"
 
-#: panels/network/connection-editor/ce-page-ip4.c:245
-#: panels/network/connection-editor/ce-page-ip6.c:226
+#: panels/network/connection-editor/ce-page-ip4.c:261
+#: panels/network/connection-editor/ce-page-ip6.c:242
 msgid "Delete Address"
 msgstr "刪除位址"
 
-#: panels/network/connection-editor/ce-page-ip4.c:392
-#: panels/network/connection-editor/ce-page-ip6.c:361
+#: panels/network/connection-editor/ce-page-ip4.c:420
+#: panels/network/connection-editor/ce-page-ip6.c:389
 msgid "Delete Route"
 msgstr "刪除路由"
 
-#: panels/network/connection-editor/ce-page-ip4.c:742
+#: panels/network/connection-editor/ce-page-ip4.c:770
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:712
+#: panels/network/connection-editor/ce-page-ip6.c:740
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -3158,7 +3671,7 @@ msgstr "WPA3 個人版"
 #: panels/network/connection-editor/details-page.ui:14
 #: panels/wwan/cc-wwan-details-dialog.ui:73
 msgid "Signal Strength"
-msgstr "信號強度"
+msgstr "訊號強度"
 
 #: panels/network/connection-editor/details-page.ui:46
 msgid "Link speed"
@@ -3177,13 +3690,13 @@ msgstr "支援的頻率"
 #: panels/network/net-device-ethernet.c:158
 #: panels/network/net-device-ethernet.c:160
 #: panels/network/net-device-ethernet.c:162
-#: panels/network/network-mobile.ui:189
+#: panels/network/network-mobile.ui:191
 msgid "Default Route"
 msgstr "預設路由"
 
 #: panels/network/connection-editor/details-page.ui:208
 msgid "Last Used"
-msgstr "最後使用的"
+msgstr "最後使用時間"
 
 #: panels/network/connection-editor/details-page.ui:369
 msgid "Connect _automatically"
@@ -3193,14 +3706,14 @@ msgstr "自動連線(_A)"
 msgid "Make available to _other users"
 msgstr "允許其他使用者使用(_O)"
 
-#: panels/network/connection-editor/details-page.ui:412
+#: panels/network/connection-editor/details-page.ui:414
 msgid "_Metered connection: has data limits or can incur charges"
-msgstr "計量連線(_M)：有資料限制或可能會收取費用"
+msgstr "計量連線(_M)：有資料傳輸量上限，超過可能會產生額外費用"
 
-#: panels/network/connection-editor/details-page.ui:421
+#: panels/network/connection-editor/details-page.ui:423
 msgid ""
 "Software updates and other large downloads will not be started automatically."
-msgstr "軟體更新及其他大型下載不會自動開始。"
+msgstr "不會自動進行軟體更新及其他大型下載。"
 
 #: panels/network/connection-editor/ethernet-page.ui:21
 #: panels/network/connection-editor/vpn-page.ui:17
@@ -3240,7 +3753,7 @@ msgstr "只有本機連線"
 
 #: panels/network/connection-editor/ip4-page.ui:55
 #: panels/network/connection-editor/ip6-page.ui:65
-#: panels/network/net-proxy.c:71 panels/network/network-proxy.ui:98
+#: panels/network/net-proxy.c:71 panels/network/network-proxy.ui:100
 msgid "Manual"
 msgstr "手動"
 
@@ -3260,33 +3773,33 @@ msgid "Addresses"
 msgstr "位址"
 
 #: panels/network/connection-editor/ip4-page.ui:112
-#: panels/network/connection-editor/ip4-page.ui:246
+#: panels/network/connection-editor/ip4-page.ui:250
 #: panels/network/connection-editor/ip6-page.ui:122
-#: panels/network/connection-editor/ip6-page.ui:255
-#: panels/printers/pp-details-dialog.ui:90
+#: panels/network/connection-editor/ip6-page.ui:260
+#: panels/printers/pp-details-dialog.ui:114
 msgid "Address"
-msgstr "地址"
+msgstr "位址"
 
 #: panels/network/connection-editor/ip4-page.ui:124
-#: panels/network/connection-editor/ip4-page.ui:258
+#: panels/network/connection-editor/ip4-page.ui:262
 msgid "Netmask"
-msgstr "網路遮罩"
+msgstr "子網路遮罩"
 
 #: panels/network/connection-editor/ip4-page.ui:136
-#: panels/network/connection-editor/ip4-page.ui:270
+#: panels/network/connection-editor/ip4-page.ui:274
 #: panels/network/connection-editor/ip6-page.ui:146
-#: panels/network/connection-editor/ip6-page.ui:279
+#: panels/network/connection-editor/ip6-page.ui:284
 msgid "Gateway"
-msgstr "通訊閘"
+msgstr "閘道"
 
 #: panels/network/connection-editor/ip4-page.ui:175
-#: panels/network/connection-editor/ip4-page.ui:223
+#: panels/network/connection-editor/ip4-page.ui:227
 #: panels/network/connection-editor/ip6-page.ui:36
 #: panels/network/connection-editor/ip6-page.ui:185
-#: panels/network/connection-editor/ip6-page.ui:232
-#: panels/network/net-proxy.c:73 panels/network/network-proxy.ui:91
+#: panels/network/connection-editor/ip6-page.ui:237
+#: panels/network/net-proxy.c:73 panels/network/network-proxy.ui:93
 #: panels/network/wireless-security/eap-method-peap.ui:33
-#: panels/wacom/cc-wacom-page.c:621
+#: panels/wacom/cc-wacom-page.c:656
 msgid "Automatic"
 msgstr "自動"
 
@@ -3295,31 +3808,36 @@ msgstr "自動"
 msgid "Automatic DNS"
 msgstr "自動 DNS"
 
-#: panels/network/connection-editor/ip4-page.ui:196
-#: panels/network/connection-editor/ip6-page.ui:205
+#: panels/network/connection-editor/ip4-page.ui:192
+#: panels/network/connection-editor/ip6-page.ui:202
+msgid "DNS server address(es)"
+msgstr "DNS 伺服器位址"
+
+#: panels/network/connection-editor/ip4-page.ui:200
+#: panels/network/connection-editor/ip6-page.ui:210
 msgid "Separate IP addresses with commas"
-msgstr "請以逗號 (,) 分隔 IP 地址"
+msgstr "請以逗號 (,) 分隔 IP 位址"
 
-#: panels/network/connection-editor/ip4-page.ui:213
-#: panels/network/connection-editor/ip6-page.ui:222
+#: panels/network/connection-editor/ip4-page.ui:217
+#: panels/network/connection-editor/ip6-page.ui:227
 msgid "Routes"
 msgstr "路由"
 
-#: panels/network/connection-editor/ip4-page.ui:231
-#: panels/network/connection-editor/ip6-page.ui:240
+#: panels/network/connection-editor/ip4-page.ui:235
+#: panels/network/connection-editor/ip6-page.ui:245
 msgid "Automatic Routes"
 msgstr "自動路由"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: panels/network/connection-editor/ip4-page.ui:281
-#: panels/network/connection-editor/ip6-page.ui:290
+#: panels/network/connection-editor/ip4-page.ui:285
+#: panels/network/connection-editor/ip6-page.ui:295
 msgid "Metric"
-msgstr "度量權值"
+msgstr "權值"
 
-#: panels/network/connection-editor/ip4-page.ui:304
-#: panels/network/connection-editor/ip6-page.ui:313
+#: panels/network/connection-editor/ip4-page.ui:308
+#: panels/network/connection-editor/ip6-page.ui:318
 msgid "Use this connection _only for resources on its network"
-msgstr "只在使用這個連線的網路資源時才使用此連線(_U)"
+msgstr "只在使用該連線的網路資源時才使用此連線(_O)"
 
 #: panels/network/connection-editor/ip6-page.ui:21
 msgid "IPv_6 Method"
@@ -3330,7 +3848,7 @@ msgid "Automatic, DHCP only"
 msgstr "自動，僅使用 DHCP"
 
 #: panels/network/connection-editor/ip6-page.ui:134
-#: panels/network/connection-editor/ip6-page.ui:267
+#: panels/network/connection-editor/ip6-page.ui:272
 msgid "Prefix"
 msgstr "前綴"
 
@@ -3342,11 +3860,21 @@ msgstr "無法開啟連線編輯器"
 msgid "New Profile"
 msgstr "新增設定檔"
 
-#: panels/network/connection-editor/net-connection-editor.c:715
+#: panels/network/connection-editor/net-connection-editor.c:360
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr "無效的設定值「%s」：%s"
+
+#: panels/network/connection-editor/net-connection-editor.c:363
+#, c-format
+msgid "Invalid setting %s"
+msgstr "無效的設定值「%s」"
+
+#: panels/network/connection-editor/net-connection-editor.c:721
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: panels/network/connection-editor/net-connection-editor.c:741
+#: panels/network/connection-editor/net-connection-editor.c:747
 msgid "Add VPN"
 msgstr "加入 VPN"
 
@@ -3377,7 +3905,7 @@ msgstr "選擇要匯入的檔案"
 #: panels/network/connection-editor/vpn-helpers.c:271
 #, c-format
 msgid "A file named “%s” already exists."
-msgstr "名為「%s」的檔案已經存在。"
+msgstr "名為「%s」的檔案已存在。"
 
 #: panels/network/connection-editor/vpn-helpers.c:273
 msgid "_Replace"
@@ -3386,7 +3914,7 @@ msgstr "取代(_R)"
 #: panels/network/connection-editor/vpn-helpers.c:275
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
-msgstr "您是否要以準備儲存的 VPN 連線取代 %s？"
+msgstr "您是否要以正在儲存的 VPN 連線取代「%s」？"
 
 #: panels/network/connection-editor/vpn-helpers.c:310
 msgid "Cannot export VPN connection"
@@ -3409,7 +3937,7 @@ msgstr "匯出 VPN 連線"
 
 #: panels/network/connection-editor/vpn-page.ui:34
 msgid "(Error: unable to load VPN connection editor)"
-msgstr "(錯誤：無法載入 VPN 連線編輯器)"
+msgstr "（錯誤：無法載入 VPN 連線編輯器）"
 
 #: panels/network/connection-editor/wifi-page.ui:16
 msgid "_SSID"
@@ -3428,7 +3956,7 @@ msgstr "控制您如何連線至網際網絡"
 msgid "Network;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;"
 msgstr ""
 "Network;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;網路;區域網路;代理"
-"伺服器;寬頻;數據機;藍牙;區網;代理;藍芽;"
+"伺服器;寬頻;數據機;藍牙;區網;代理;藍牙;"
 
 #: panels/network/gnome-wifi-panel.desktop.in.in:4
 msgid "Control how you connect to Wi-Fi networks"
@@ -3443,19 +3971,19 @@ msgstr ""
 
 #: panels/network/net-device-ethernet.c:93
 msgid "never"
-msgstr "永不"
+msgstr "從未用過"
 
 #: panels/network/net-device-ethernet.c:101
 msgid "today"
-msgstr "今日"
+msgstr "今天"
 
 #: panels/network/net-device-ethernet.c:103
 msgid "yesterday"
-msgstr "昨日"
+msgstr "昨天"
 
 #: panels/network/net-device-ethernet.c:177
 msgid "Last used"
-msgstr "最後使用的"
+msgstr "最後使用時間"
 
 #. Translators: This is used as the title of the connection
 #. * details window for ethernet, if there is only a single
@@ -3465,42 +3993,43 @@ msgstr "最後使用的"
 #: panels/network/net-device-ethernet.c:264
 #: panels/network/network-bluetooth.ui:5 panels/network/network-ethernet.ui:5
 msgid "Wired"
-msgstr "有線"
+msgstr "有線網路"
 
 #: panels/network/net-device-mobile.c:208
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: panels/network/net-device-wifi.c:857
+#: panels/network/net-device-wifi.c:863
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
-msgstr "選取網路的詳細資料包含密碼及任何自訂的設定都會消失。"
+msgstr "所選網路的詳細資料，包含密碼及任何自訂設定都將遺失。"
 
-#: panels/network/net-device-wifi.c:861
+#: panels/network/net-device-wifi.c:867
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
-#: panels/network/net-device-wifi.c:1041
+#: panels/network/net-device-wifi.c:1048
 msgid "Known Wi-Fi Networks"
-msgstr "已知 Wi-Fi 網路"
+msgstr "已知的 Wi-Fi 網路"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: panels/network/net-device-wifi.c:1073
+#: panels/network/net-device-wifi.c:1067
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
-#: panels/network/net-device-wifi.c:1216
+#: panels/network/net-device-wifi.c:1221
 msgid "System policy prohibits use as a Hotspot"
-msgstr "系統原則禁止做為熱點"
+msgstr "系統政策不允許做為熱點"
 
-#: panels/network/net-device-wifi.c:1219
+#: panels/network/net-device-wifi.c:1224
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
 #: panels/network/net-proxy.c:112
+#, fuzzy
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "當沒有提供設定 URL 時會使用網頁代理伺服器自動發現。"
@@ -3510,6 +4039,7 @@ msgstr "當沒有提供設定 URL 時會使用網頁代理伺服器自動發現
 #. * machine that it should proxy all of your web traffic
 #. * through them.
 #: panels/network/net-proxy.c:120
+#, fuzzy
 msgid "This is not recommended for untrusted public networks."
 msgstr "這不建議用於不信任的公用網路。"
 
@@ -3517,6 +4047,11 @@ msgstr "這不建議用於不信任的公用網路。"
 msgid "Turn device off"
 msgstr "關閉裝置"
 
+#: panels/network/network-ethernet.ui:45 panels/network/network-mobile.ui:310
+#: panels/power/cc-power-profile-row.ui:21
+msgid "Active"
+msgstr "使用中"
+
 #: panels/network/network-mobile.ui:27
 #: panels/wwan/cc-wwan-details-dialog.ui:237
 msgid "IMEI"
@@ -3526,49 +4061,49 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "供應商"
 
-#: panels/network/network-proxy.ui:40 panels/network/network-proxy.ui:80
+#: panels/network/network-proxy.ui:40 panels/network/network-proxy.ui:82
 msgid "Network Proxy"
 msgstr "網路代理伺服器"
 
-#: panels/network/network-proxy.ui:139
+#: panels/network/network-proxy.ui:141
 msgid "_HTTP Proxy"
 msgstr "_HTTP 代理伺服器"
 
-#: panels/network/network-proxy.ui:156
+#: panels/network/network-proxy.ui:158
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS 代理伺服器"
 
-#: panels/network/network-proxy.ui:173
+#: panels/network/network-proxy.ui:175
 msgid "_FTP Proxy"
 msgstr "_FTP 代理伺服器"
 
-#: panels/network/network-proxy.ui:190
+#: panels/network/network-proxy.ui:192
 msgid "_Socks Host"
 msgstr "Socks 主機(_S)"
 
-#: panels/network/network-proxy.ui:207
+#: panels/network/network-proxy.ui:209
 msgid "_Ignore Hosts"
 msgstr "忽略主機(_I)"
 
-#: panels/network/network-proxy.ui:244
+#: panels/network/network-proxy.ui:246
 msgid "HTTP proxy port"
-msgstr "HTTP 代理伺服器連接埠"
+msgstr "HTTP 代理伺服器通訊埠"
 
-#: panels/network/network-proxy.ui:307
+#: panels/network/network-proxy.ui:309
 msgid "HTTPS proxy port"
-msgstr "HTTPS 代理伺服器連接埠"
+msgstr "HTTPS 代理伺服器通訊埠"
 
-#: panels/network/network-proxy.ui:322
+#: panels/network/network-proxy.ui:324
 msgid "FTP proxy port"
-msgstr "FTP 代理伺服器連接埠"
+msgstr "FTP 代理伺服器通訊埠"
 
-#: panels/network/network-proxy.ui:337
+#: panels/network/network-proxy.ui:339
 msgid "Socks proxy port"
 msgstr "Socks 代理伺服器通訊埠"
 
-#: panels/network/network-proxy.ui:357
+#: panels/network/network-proxy.ui:359
 msgid "_Configuration URL"
-msgstr "設定網址(_C)"
+msgstr "設定 URL 位址(_C)"
 
 #: panels/network/network-vpn.ui:11
 msgid "Turn VPN connection off"
@@ -3591,19 +4126,24 @@ msgstr "密碼"
 
 #: panels/network/network-wifi.ui:90
 msgid "Turn Wi-Fi off"
-msgstr "關閉 Wi-Fi"
+msgstr "關閉 Wi-Fi 網路"
+
+#: panels/network/network-wifi.ui:99 panels/search/cc-search-panel-row.ui:39
+msgid "More options…"
+msgstr "更多選項…"
 
-#: panels/network/network-wifi.ui:121
+# (Freddy)這項操作會調用 libnma 組件，其翻譯內容需要修正。
+#: panels/network/network-wifi.ui:119
 msgid "_Connect to Hidden Network…"
-msgstr "連接到隱藏的網路(_C)…"
+msgstr "連接隱藏的網路(_C)…"
 
-#: panels/network/network-wifi.ui:128
+#: panels/network/network-wifi.ui:131
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "開啟 Wi-Fi 熱點(_T)…"
 
-#: panels/network/network-wifi.ui:135
+#: panels/network/network-wifi.ui:143
 msgid "_Known Wi-Fi Networks"
-msgstr "已知 Wi-Fi 網路(_K)"
+msgstr "已知的 Wi-Fi 網路(_K)"
 
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:37
@@ -3613,7 +4153,7 @@ msgstr "狀態不明"
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:41
 msgid "Unmanaged"
-msgstr "未管理"
+msgstr "不受管理"
 
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:45
@@ -3623,27 +4163,27 @@ msgstr "無法使用"
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:55
 msgid "Connecting"
-msgstr "連線中"
+msgstr "正在連接"
 
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:59
 msgid "Authentication required"
-msgstr "需要核對"
+msgstr "需要核對身分"
 
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:67
 msgid "Disconnecting"
-msgstr "æ–·ç·š"
+msgstr "連接中斷"
 
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:71
 msgid "Connection failed"
-msgstr "連線失敗"
+msgstr "連接失敗"
 
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:75
 msgid "Status unknown (missing)"
-msgstr "狀態不詳（缺乏）"
+msgstr "狀態不明（缺乏）"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:96
@@ -3663,27 +4203,28 @@ msgstr "IP 設定過期"
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:108
 msgid "Secrets were required, but not provided"
-msgstr "需要機密，但沒有提供"
+msgstr "需要密語，但沒有提供"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:112
 msgid "802.1x supplicant disconnected"
-msgstr "802.1x 請求已斷線"
+msgstr "802.1x 的請求連接中斷"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:116
 msgid "802.1x supplicant configuration failed"
-msgstr "802.1x 請求設定失敗"
+msgstr "802.1x 的請求設定失敗"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:120
 msgid "802.1x supplicant failed"
-msgstr "802.1x 請求已失敗"
+msgstr "802.1x 的請求失敗"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:124
+#, fuzzy
 msgid "802.1x supplicant took too long to authenticate"
-msgstr "802.1x 請求花費太長時間核對身份"
+msgstr "802.1x 的請求花費太長時間認證"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:128
@@ -3693,7 +4234,7 @@ msgstr "無法啟動 PPP 服務"
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:132
 msgid "PPP service disconnected"
-msgstr "PPP 服務已斷線"
+msgstr "PPP 服務連接中斷"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:136
@@ -3703,7 +4244,7 @@ msgstr "PPP 失敗"
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:140
 msgid "DHCP client failed to start"
-msgstr "DHCP 客戶端啟動失敗"
+msgstr "DHCP 客戶端無法啟動"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:144
@@ -3717,11 +4258,13 @@ msgstr "DHCP 客戶端失敗"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:152
+#, fuzzy
 msgid "Shared connection service failed to start"
-msgstr "分享的連線服務啟動失敗"
+msgstr "無法啟動分享的連線服務"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:156
+#, fuzzy
 msgid "Shared connection service failed"
 msgstr "分享的連線服務失敗"
 
@@ -3752,6 +4295,7 @@ msgstr "沒有撥號音"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:180
+#, fuzzy
 msgid "No carrier could be established"
 msgstr "無法建立載體"
 
@@ -3782,33 +4326,36 @@ msgstr "不要搜尋網路"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:204
+#, fuzzy
 msgid "Network registration denied"
 msgstr "網路登記被禁止"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:208
+#, fuzzy
 msgid "Network registration timed out"
 msgstr "網路登記逾時"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:212
+#, fuzzy
 msgid "Failed to register with the requested network"
 msgstr "無法向要求的網路登記"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:216
 msgid "PIN check failed"
-msgstr "PIN 檢查失敗"
+msgstr "PIN 碼檢查失敗"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:220
 msgid "Firmware for the device may be missing"
-msgstr "可能缺少裝置的韌體"
+msgstr "可能由於缺少裝置韌體"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:224
 msgid "Connection disappeared"
-msgstr "連線已消失"
+msgstr "連接已消失"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:228
@@ -3823,7 +4370,7 @@ msgstr "找不到數據機"
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:236
 msgid "Bluetooth connection failed"
-msgstr "藍牙連線失敗"
+msgstr "藍牙連接失敗"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:240
@@ -3833,12 +4380,12 @@ msgstr "SIM 卡尚未插入"
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:244
 msgid "SIM Pin required"
-msgstr "需要 SIM PIN 碼"
+msgstr "需要 SIM 卡的 PIN 碼"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:248
 msgid "SIM Puk required"
-msgstr "需要 SIM PUK 碼"
+msgstr "需要 SIM 卡的 PUK 碼"
 
 #. TRANSLATORS: device status reason
 #: panels/network/panel-common.c:252 panels/wwan/cc-wwan-errors-private.h:53
@@ -3858,27 +4405,31 @@ msgstr "缺少韌體"
 #. TRANSLATORS: device status
 #: panels/network/panel-common.c:331
 msgid "Cable unplugged"
-msgstr "纜線已拔除"
+msgstr "網路線已拔除"
 
 #: panels/network/wireless-security/eap-method.c:92
+#, fuzzy
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X 安全加密的未定義錯誤 (wpa-eap)"
 
 #: panels/network/wireless-security/eap-method.c:196
 msgid "no file selected"
-msgstr "未選取檔案"
+msgstr "未選擇檔案"
 
 #: panels/network/wireless-security/eap-method.c:224
+#, fuzzy
 msgid "unspecified error validating eap-method file"
 msgstr "驗證 eap-method 檔案時未指定的錯誤"
 
-#: panels/network/wireless-security/eap-method.c:389
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "DER, PEM, 或 PKCS#12 私密金鑰 (*.der, *.pem, *.p12, *.key)"
+#: panels/network/wireless-security/eap-method.c:394
+#, fuzzy
+msgid "DER, PEM, PKCS#12, or PGP private keys"
+msgstr "DER、PEM 或 PKCS#12 私密金鑰 (*.der, *.pem, *.p12, *.key)"
 
-#: panels/network/wireless-security/eap-method.c:392
-msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
+#: panels/network/wireless-security/eap-method.c:397
+#, fuzzy
+msgid "DER or PEM certificates"
+msgstr "使用者憑證(_U)"
 
 #: panels/network/wireless-security/eap-method-fast.c:88
 msgid "missing EAP-FAST PAC file"
@@ -3906,15 +4457,17 @@ msgstr "匿名"
 
 #: panels/network/wireless-security/eap-method-fast.ui:32
 msgid "Authenticated"
-msgstr "已核對"
+msgstr "已認證"
 
 #: panels/network/wireless-security/eap-method-fast.ui:35
+#, fuzzy
 msgid "Both"
 msgstr "兩者"
 
 #: panels/network/wireless-security/eap-method-fast.ui:46
 #: panels/network/wireless-security/eap-method-peap.ui:49
 #: panels/network/wireless-security/eap-method-ttls.ui:48
+#, fuzzy
 msgid "Anony_mous identity"
 msgstr "匿名識別(_M)"
 
@@ -3929,12 +4482,13 @@ msgstr "選擇一個 PAC 檔案"
 #: panels/network/wireless-security/eap-method-fast.ui:99
 #: panels/network/wireless-security/eap-method-peap.ui:131
 #: panels/network/wireless-security/eap-method-ttls.ui:122
+#, fuzzy
 msgid "_Inner authentication"
 msgstr "內部核對(_I)"
 
 #: panels/network/wireless-security/eap-method-fast.ui:126
 msgid "Allow automatic PAC pro_visioning"
-msgstr "允許自動供應 PAC (_V)"
+msgstr "允許自動 PAC 規範(_V)"
 
 #: panels/network/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
@@ -3956,7 +4510,7 @@ msgstr "使用者名稱(_U)"
 #: panels/network/wireless-security/ws-sae.ui:10
 #: panels/network/wireless-security/ws-wpa-psk.ui:10
 #: panels/sharing/cc-sharing-panel.ui:152
-#: panels/user-accounts/cc-user-panel.ui:175
+#: panels/user-accounts/cc-user-panel.ui:182
 msgid "_Password"
 msgstr "密碼(_P)"
 
@@ -3996,7 +4550,7 @@ msgstr "版本 1"
 #: panels/network/wireless-security/eap-method-tls.ui:54
 #: panels/network/wireless-security/eap-method-ttls.ui:89
 msgid "C_A certificate"
-msgstr "憑證(_A)"
+msgstr "C_A 憑證"
 
 #: panels/network/wireless-security/eap-method-peap.ui:82
 #: panels/network/wireless-security/eap-method-tls.c:524
@@ -4039,7 +4593,7 @@ msgstr "無效的 EAP-TLS CA 憑證：沒有指定憑證"
 #: panels/network/wireless-security/eap-method-tls.c:130
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
-msgstr "無效的 EAP-TLS 私鑰：%s"
+msgstr "無效的 EAP-TLS 私密金鑰：%s"
 
 #: panels/network/wireless-security/eap-method-tls.c:140
 #, c-format
@@ -4058,7 +4612,7 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"所選的私密金鑰似乎沒有受密碼保護。 這可能導致您的安全憑證受到威脅。請選擇受密"
+"選擇的私密金鑰似乎沒有受密碼保護， 這可能導致您的安全憑證受到威脅。請選擇受密"
 "碼保護的私密金鑰。\n"
 "\n"
 "（您可以使用 openssl 來加密您的私密金鑰）"
@@ -4081,7 +4635,7 @@ msgstr "使用者憑證(_U)"
 
 #: panels/network/wireless-security/eap-method-tls.ui:87
 msgid "Private _key"
-msgstr "私鑰(_K)"
+msgstr "私密金鑰(_K)"
 
 #: panels/network/wireless-security/eap-method-tls.ui:108
 msgid "_Private key password"
@@ -4106,7 +4660,7 @@ msgstr "MSCHAP"
 
 #: panels/network/wireless-security/eap-method-ttls.ui:25
 msgid "MSCHAPv2 (no EAP)"
-msgstr "MSCHAPv2 (ç„¡ EAP)"
+msgstr "MSCHAPv2（無 EAP）"
 
 #: panels/network/wireless-security/eap-method-ttls.ui:29
 msgid "CHAP"
@@ -4119,7 +4673,7 @@ msgstr "網域(_O)"
 
 #: panels/network/wireless-security/wireless-security.c:71
 msgid "Unknown error validating 802.1X security"
-msgstr "驗證 802.1X 安全加密的未知錯誤"
+msgstr "驗證 802.1X 安全加密時遇到未知錯誤"
 
 #: panels/network/wireless-security/ws-dynamic-wep.ui:15
 #: panels/network/wireless-security/ws-wpa-eap.ui:20
@@ -4150,17 +4704,19 @@ msgstr "保護式 EAP (PEAP)"
 #: panels/network/wireless-security/ws-wep-key.ui:87
 #: panels/network/wireless-security/ws-wpa-eap.ui:57
 msgid "Au_thentication"
-msgstr "核對(_T)"
+msgstr "認證協定(_T)"
 
 #: panels/network/wireless-security/ws-file-chooser-button.c:49
 msgid "Select a file"
-msgstr "選取檔案"
+msgstr "選擇檔案"
 
 #: panels/network/wireless-security/ws-leap.c:66
+#, fuzzy
 msgid "missing leap-username"
 msgstr "缺少 leap 使用者名稱"
 
 #: panels/network/wireless-security/ws-leap.c:81
+#, fuzzy
 msgid "missing leap-password"
 msgstr "缺少 leap 密碼"
 
@@ -4178,18 +4734,18 @@ msgid "missing wep-key"
 msgstr "缺少 wep-key"
 
 #: panels/network/wireless-security/ws-wep-key.c:123
-#, c-format
+#, fuzzy, 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:131
-#, c-format
+#, fuzzy, 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:137
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
@@ -4198,10 +4754,12 @@ msgstr ""
 "六進位)"
 
 #: panels/network/wireless-security/ws-wep-key.c:144
+#, fuzzy
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無效的 wep-key︰密語必須為非空"
 
 #: panels/network/wireless-security/ws-wep-key.c:146
+#, fuzzy
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無效的 wep-key︰密語必須少於 64 個字元"
 
@@ -4214,6 +4772,7 @@ msgid "Open System"
 msgstr "開放系統"
 
 #: panels/network/wireless-security/ws-wep-key.ui:34
+#, fuzzy
 msgid "Shared Key"
 msgstr "共享金鑰"
 
@@ -4230,13 +4789,14 @@ msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
 #: panels/network/wireless-security/ws-wpa-psk.c:77
-#, c-format
+#, fuzzy, 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:86
+#, fuzzy
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無效的 wpa-psk：不能將 64 位元組金鑰轉譯為十六進位"
 
@@ -4244,13 +4804,13 @@ msgstr "無效的 wpa-psk：不能將 64 位元組金鑰轉譯為十六進位"
 #: panels/notifications/cc-app-notifications-dialog.ui:15
 msgctxt "notifications"
 msgid "_Notifications"
-msgstr "通知(_N)"
+msgstr "啟用/停用通知(_N)"
 
 #. This is the setting to configure sounds associated with notifications.
 #: panels/notifications/cc-app-notifications-dialog.ui:29
 msgctxt "notifications"
 msgid "Sound _Alerts"
-msgstr "音效警示(_A)"
+msgstr "響鈴通知(_A)"
 
 #: panels/notifications/cc-app-notifications-dialog.ui:42
 msgctxt "notifications"
@@ -4261,23 +4821,23 @@ msgstr "彈出式通知(_P)"
 msgid ""
 "Notifications will continue to appear in the notification list when popups "
 "are disabled."
-msgstr "當彈出視窗被停用時，通知將繼續出現在通知列表中。"
+msgstr "彈出式通知停用時，通知依然會顯示在通知列表中。"
 
 #. Popups here refers to message tray notifications in the middle of the screen.
 #: panels/notifications/cc-app-notifications-dialog.ui:56
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
-msgstr "在彈出視窗中顯示訊息內容(_C)"
+msgstr "在彈出的通知中顯示訊息內容(_C)"
 
 #: panels/notifications/cc-app-notifications-dialog.ui:69
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
-msgstr "鎖定畫面通知(_L)"
+msgstr "螢幕鎖定畫面通知(_L)"
 
 #: panels/notifications/cc-app-notifications-dialog.ui:82
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
-msgstr "在鎖定畫面中顯示訊息內容(_O)"
+msgstr "在螢幕鎖定畫面中顯示訊息內容(_O)"
 
 #: panels/notifications/cc-notifications-panel.ui:10
 msgid "_Do Not Disturb"
@@ -4285,49 +4845,55 @@ msgstr "不要打擾(_D)"
 
 #: panels/notifications/cc-notifications-panel.ui:17
 msgid "_Lock Screen Notifications"
-msgstr "鎖定畫面通知(_L)"
+msgstr "螢幕鎖定時顯示通知(_L)"
 
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
-msgstr "控制要顯示哪種通知及要顯示什麼"
+msgstr "控制要顯示哪些通知及要顯示什麼"
 
 #. Translators: Search terms to find the Notifications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:20
 msgid "Notifications;Banner;Message;Tray;Popup;"
-msgstr "Notifications;Banner;Message;Tray;Popup;通知;橫幅;訊息;匣;彈出;"
+msgstr ""
+"Notifications;Banner;Message;Tray;Popup;通知;橫幅;訊息;匣;彈出;鎖定畫面;不要"
+"打擾;"
+
+#: panels/online-accounts/cc-online-account-provider-row.c:95
+msgctxt "Online Account"
+msgid "Other"
+msgstr "其他"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: panels/online-accounts/cc-online-accounts-panel.c:277
+#: panels/online-accounts/cc-online-accounts-panel.c:280
 #, c-format
 msgid "%s removed"
 msgstr "已移除 %s"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:406
-msgctxt "Online Account"
-msgid "Other"
-msgstr "其他"
-
-#: panels/online-accounts/cc-online-accounts-panel.c:803
+#: panels/online-accounts/cc-online-accounts-panel.c:695
 msgid "Error removing account"
 msgstr "移除帳號時發生錯誤"
 
 #. Translators: This is the button which allows undoing the removal of the printer.
 #: panels/online-accounts/cc-online-accounts-panel.ui:23
-#: panels/printers/printers.ui:51
+#: panels/printers/printers.ui:47
 msgid "Undo"
-msgstr "復原"
+msgstr "還原"
+
+#: panels/online-accounts/cc-online-accounts-panel.ui:31
+msgid "Close the notification"
+msgstr "關閉通知"
 
-#: panels/online-accounts/cc-online-accounts-panel.ui:55
+#: panels/online-accounts/cc-online-accounts-panel.ui:58
 msgid "Connect to your data in the cloud"
-msgstr "連接您雲端上的資料"
+msgstr "連接您在雲端伺服器上的資料"
 
-#: panels/online-accounts/cc-online-accounts-panel.ui:66
+#: panels/online-accounts/cc-online-accounts-panel.ui:69
 msgid "No internet connection — connect to set up new online accounts"
-msgstr "沒有網際網路連線 — 請連線以設定新的線上帳號"
+msgstr "沒有網際網路連線 — 請連接網路以設定新的線上帳號"
 
-#: panels/online-accounts/cc-online-accounts-panel.ui:93
+#: panels/online-accounts/cc-online-accounts-panel.ui:96
 msgid "Add an account"
 msgstr "加入帳號"
 
@@ -4348,7 +4914,7 @@ msgstr "線上帳號"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:4
 msgid "Connect to your online accounts and decide what to use them for"
-msgstr "連接到您的線上帳號並決定要用它們來做什麼"
+msgstr "連接您的線上帳號並設定線上帳號的用途"
 
 #. Translators: Search terms to find the Online Accounts panel.
 #. Do NOT translate or localize the semicolons!
@@ -4365,7 +4931,7 @@ msgstr ""
 
 #: panels/power/cc-battery-row.c:80
 msgid "Unknown time"
-msgstr "不明的時間"
+msgstr "不明時間"
 
 #: panels/power/cc-battery-row.c:83
 #, c-format
@@ -4400,24 +4966,24 @@ msgstr[0] "分鐘"
 #: panels/power/cc-battery-row.c:117
 #, c-format
 msgid "%s until fully charged"
-msgstr "%s後完全充飽"
+msgstr "充飽仍需 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
 #: panels/power/cc-battery-row.c:124
 #, c-format
 msgid "Caution: %s remaining"
-msgstr "注意：剩下 %s"
+msgstr "注意：只能再使用 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
 #: panels/power/cc-battery-row.c:129
 #, c-format
 msgid "%s remaining"
-msgstr "剩下 %s"
+msgstr "還能使用 %s"
 
 #. TRANSLATORS: primary battery
 #: panels/power/cc-battery-row.c:134 panels/power/cc-battery-row.c:164
 msgid "Fully charged"
-msgstr "已完全充飽"
+msgstr "已充飽"
 
 #. TRANSLATORS: primary battery
 #: panels/power/cc-battery-row.c:138 panels/power/cc-battery-row.c:168
@@ -4427,17 +4993,17 @@ msgstr "未充電"
 #. TRANSLATORS: primary battery
 #: panels/power/cc-battery-row.c:142 panels/power/cc-battery-row.c:172
 msgid "Empty"
-msgstr "æ²’é›»"
+msgstr "沒有電池"
 
 #. TRANSLATORS: primary battery
 #: panels/power/cc-battery-row.c:155
 msgid "Charging"
-msgstr "å……é›»"
+msgstr "正在充電"
 
 #. TRANSLATORS: primary battery
 #: panels/power/cc-battery-row.c:160
 msgid "Discharging"
-msgstr "放電中"
+msgstr "未充電"
 
 #. TRANSLATORS: secondary battery
 #: panels/power/cc-battery-row.c:191
@@ -4457,7 +5023,7 @@ msgstr "不斷電系統"
 #. TRANSLATORS: secondary battery
 #: panels/power/cc-battery-row.c:200
 msgid "Personal digital assistant"
-msgstr "個人數位助理"
+msgstr "個人數位助理 (PDA)"
 
 #. TRANSLATORS: secondary battery
 #: panels/power/cc-battery-row.c:203
@@ -4504,74 +5070,73 @@ msgstr "額外"
 msgid "Batteries"
 msgstr "電池"
 
-#: panels/power/cc-power-panel.c:511
+#: panels/power/cc-power-panel.c:514
 msgid "When _idle"
-msgstr "閒置時(_I)"
+msgstr "裝置閒置時(_I)"
 
-#: panels/power/cc-power-panel.c:671
+#: panels/power/cc-power-panel.c:674
 msgid "Suspend"
 msgstr "暫停"
 
-#: panels/power/cc-power-panel.c:672
+#: panels/power/cc-power-panel.c:675
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: panels/power/cc-power-panel.c:673
+#: panels/power/cc-power-panel.c:676
 msgid "Hibernate"
 msgstr "休眠"
 
-#: panels/power/cc-power-panel.c:674
+#: panels/power/cc-power-panel.c:677
 msgid "Nothing"
-msgstr "沒有"
+msgstr "沒有動作"
 
-#: panels/power/cc-power-panel.c:730
+#: panels/power/cc-power-panel.c:733
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: panels/power/cc-power-panel.c:732
+#: panels/power/cc-power-panel.c:735
 msgid "When plugged in"
-msgstr "當插入電源線時"
+msgstr "使用交流電源時"
 
-#: panels/power/cc-power-panel.c:853
+#: panels/power/cc-power-panel.c:856
 msgctxt "Idle time"
 msgid "Never"
 msgstr "永不"
 
-#: panels/power/cc-power-panel.c:937
+#: panels/power/cc-power-panel.c:940
 msgid "Automatic suspend"
 msgstr "自動暫停"
 
-#: panels/power/cc-power-panel.c:1030
+#: panels/power/cc-power-panel.c:1036
 msgid ""
 "Performance mode temporarily disabled due to high operating temperature."
 msgstr "因為系統作業產生高溫，效能模式已暫時停用。"
 
-#: panels/power/cc-power-panel.c:1032
+#: panels/power/cc-power-panel.c:1038
 msgid ""
 "Lap detected: performance mode temporarily unavailable. Move the device to a "
 "stable surface to restore."
 msgstr ""
-"偵測到大腿：效能模式已暫時無法使用。請將裝置移動到穩定的平面上來還原效能模"
-"式。"
+"偵測到大腿：效能模式暫無法使用。請將裝置移動至穩定的平面以重啟效能模式。"
 
-#: panels/power/cc-power-panel.c:1034
+#: panels/power/cc-power-panel.c:1040
 msgid "Performance mode temporarily disabled."
 msgstr "效能模式已暫時停用。"
 
-#: panels/power/cc-power-panel.c:1076
+#: panels/power/cc-power-panel.c:1082
 msgid ""
 "Low battery: power saver enabled. Previous mode will be restored when "
 "battery is sufficiently charged."
-msgstr "低電量：省電模式已啟用。當充電至足夠電量時會回到上個模式。"
+msgstr "低電量：已啟用省電模式。充至足夠電量後會還原為之前所使用的電源模式。"
 
 #. translators: "%s" is an application name
-#: panels/power/cc-power-panel.c:1084
+#: panels/power/cc-power-panel.c:1090
 #, c-format
 msgid "Power Saver mode activated by “%s”."
-msgstr "省電模式已由「%s」啟動。"
+msgstr "「%s」已啟動省電模式。"
 
 #. translators: "%s" is an application name
-#: panels/power/cc-power-panel.c:1088
+#: panels/power/cc-power-panel.c:1094
 #, c-format
 msgid "Performance mode activated by “%s”."
 msgstr "效能模式已由「%s」啟動。"
@@ -4642,103 +5207,103 @@ msgstr "電源模式"
 
 #: panels/power/cc-power-panel.ui:94
 msgid "Affects system performance and power usage."
-msgstr "會影響系統效能與電量使用。"
+msgstr "模式的選擇影響系統效能與耗電量。"
 
 #: panels/power/cc-power-panel.ui:123
 msgid "Power Saving Options"
-msgstr "電源節省選項"
+msgstr "節能選項"
 
 #: panels/power/cc-power-panel.ui:126
 msgid "Automatic Screen Brightness"
-msgstr "自動螢幕亮度"
+msgstr "自動調整螢幕亮度"
 
 #: panels/power/cc-power-panel.ui:127
 msgid "Screen brightness adjusts to the surrounding light."
 msgstr "根據周圍光線調整螢幕亮度。"
 
-#: panels/power/cc-power-panel.ui:138
+#: panels/power/cc-power-panel.ui:139
 msgid "Dim Screen"
 msgstr "調暗螢幕"
 
-#: panels/power/cc-power-panel.ui:139
+#: panels/power/cc-power-panel.ui:140
 msgid "Reduces the screen brightness when the computer is inactive."
-msgstr "電腦不活動時降低螢幕亮度。"
+msgstr "電腦處於非活動狀態時降低螢幕亮度。"
 
-#: panels/power/cc-power-panel.ui:150
+#: panels/power/cc-power-panel.ui:151
 msgid "Screen _Blank"
-msgstr "螢幕轉黑(_B)"
+msgstr "關閉螢幕(_B)"
 
-#: panels/power/cc-power-panel.ui:151
+#: panels/power/cc-power-panel.ui:152
 msgid "Turns the screen off after a period of inactivity."
-msgstr "在一段時間不活動後關閉螢幕。"
+msgstr "一段時間不活動後關閉螢幕。"
 
-#: panels/power/cc-power-panel.ui:159
+#: panels/power/cc-power-panel.ui:160
 msgid "Automatic Power Saver"
-msgstr "自動省電"
+msgstr "自動進入省電模式"
 
-#: panels/power/cc-power-panel.ui:160
+#: panels/power/cc-power-panel.ui:161
 msgid "Enables power saver mode when battery is low."
-msgstr "電量低落時啟用自動省電模式。"
+msgstr "低電量時啟用省電模式。"
 
-#: panels/power/cc-power-panel.ui:173
+#: panels/power/cc-power-panel.ui:174
 msgid "_Automatic Suspend"
 msgstr "自動暫停(_A)"
 
-#: panels/power/cc-power-panel.ui:174
+#: panels/power/cc-power-panel.ui:175
 msgid "Pauses the computer after a period of inactivity."
-msgstr "在一段時間不活動後暫停電腦。"
+msgstr "一段時間不活動後將電腦暫停。"
 
-#: panels/power/cc-power-panel.ui:199
+#: panels/power/cc-power-panel.ui:200
 msgid "Po_wer Button Behavior"
 msgstr "電源鍵行為(_W)"
 
-#: panels/power/cc-power-panel.ui:207
+#: panels/power/cc-power-panel.ui:208
 msgid "Show Battery _Percentage"
-msgstr "顯示電池百分比(_P)"
+msgstr "顯示電量百分比(_P)"
 
-#: panels/power/cc-power-panel.ui:243
+#: panels/power/cc-power-panel.ui:244
 msgid "Automatic Suspend"
 msgstr "自動暫停"
 
-#: panels/power/cc-power-panel.ui:266
+#: panels/power/cc-power-panel.ui:267
 msgid "_Plugged In"
-msgstr "插入插頭(_P)"
+msgstr "使用交流電源(_P)"
 
-#: panels/power/cc-power-panel.ui:278
+#: panels/power/cc-power-panel.ui:279
 msgid "On _Battery Power"
 msgstr "使用電池電源(_B)"
 
-#: panels/power/cc-power-panel.ui:311 panels/power/cc-power-panel.ui:347
-#: panels/universal-access/cc-repeat-keys-dialog.ui:62
+#: panels/power/cc-power-panel.ui:312 panels/power/cc-power-panel.ui:348
+#: panels/universal-access/cc-repeat-keys-dialog.ui:65
 msgid "Delay"
-msgstr "延遲"
+msgstr "等候時間"
 
 #: panels/power/cc-power-profile-row.c:132
 msgctxt "Power profile"
 msgid "Performance"
-msgstr "效能"
+msgstr "效能模式"
 
 #: panels/power/cc-power-profile-row.c:133
 msgid "High performance and power usage."
-msgstr "高效能與高度電量使用。"
+msgstr "提高效能與耗電量。"
 
 #: panels/power/cc-power-profile-row.c:136
 msgctxt "Power profile"
 msgid "Balanced"
-msgstr "平衡"
+msgstr "平衡模式"
 
 #: panels/power/cc-power-profile-row.c:137
 msgid "Standard performance and power usage."
-msgstr "標準效能與電量使用。"
+msgstr "標準效能與耗電量。"
 
 #: panels/power/cc-power-profile-row.c:140
 msgctxt "Power profile"
 msgid "Power Saver"
-msgstr "省電"
+msgstr "省電模式"
 
 #: panels/power/cc-power-profile-row.c:141
 msgid "Reduced performance and power usage."
-msgstr "降低效能與電量使用。"
+msgstr "降低效能與耗電量。"
 
 #: panels/power/gnome-power-panel.desktop.in.in:3
 msgid "Power"
@@ -4746,7 +5311,7 @@ msgstr "電源"
 
 #: panels/power/gnome-power-panel.desktop.in.in:4
 msgid "View your battery status and change power saving settings"
-msgstr "檢視您的電池狀態並改變電源節省設定值"
+msgstr "檢視電量與更改節能設定"
 
 #. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/power/gnome-power-panel.desktop.in.in:19
@@ -4755,28 +5320,28 @@ msgid ""
 "Energy;"
 msgstr ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"Energy;電源;睡眠;暫停;休眠;電池;亮度;轉黑;顯示器;閒置;能源;"
+"Energy;電源;睡眠;暫停;休眠;電池;亮度;轉黑;顯示器;閒置;能源;關閉螢幕;交流電;"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:676
+#: panels/printers/cc-printers-panel.c:685
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "「%s」印表機已刪除"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:928
+#: panels/printers/cc-printers-panel.c:942
 msgid "Failed to add new printer."
 msgstr "無法加入新的印表機。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1229
+#: panels/printers/cc-printers-panel.c:1247
 #, c-format
 msgid "Could not load ui: %s"
-msgstr "無法載入 ui：%s"
+msgstr "無法載入使用者介面：%s"
 
-#: panels/printers/cc-printers-panel.c:1297
+#: panels/printers/cc-printers-panel.c:1315
 msgid "Unlock to Add Printers and Change Settings"
-msgstr "請解除鎖定以加入印表機與變更設定"
+msgstr "解鎖以加入印表機與更改設定"
 
 #: panels/printers/gnome-printers-panel.desktop.in.in:3
 msgid "Printers"
@@ -4801,83 +5366,87 @@ msgstr "加入印表機"
 
 #. Translators: This button opens authentication dialog for selected server.
 #. Translators: This buttons submits the credentials for the selected server.
-#: panels/printers/new-printer-dialog.ui:100
-#: panels/printers/new-printer-dialog.ui:115
+#: panels/printers/new-printer-dialog.ui:103
+#: panels/printers/new-printer-dialog.ui:118
 #: panels/wwan/cc-wwan-device-page.ui:38
 msgid "_Unlock"
 msgstr "解除鎖定(_U)"
 
 #. Translators: No printers were detected
-#: panels/printers/new-printer-dialog.ui:194
+#: panels/printers/new-printer-dialog.ui:197
 msgid "No Printers Found"
 msgstr "找不到印表機"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: panels/printers/new-printer-dialog.ui:244
+#: panels/printers/new-printer-dialog.ui:247
 msgid "Enter a network address or search for a printer"
 msgstr "輸入網路位址或搜尋印表機"
 
-#: panels/printers/new-printer-dialog.ui:286
+#: panels/printers/new-printer-dialog.ui:292
 msgid "Authentication Required"
-msgstr "要求核對"
+msgstr "需要核對身分"
 
-#: panels/printers/new-printer-dialog.ui:302
+#: panels/printers/new-printer-dialog.ui:308
 msgid "Enter username and password to view printers on Print Server."
 msgstr "輸入使用者名稱與密碼以檢視在印表機伺服器上的印表機。"
 
 #. Translators: This is a username on a print server.
-#: panels/printers/new-printer-dialog.ui:311
-#: panels/printers/pp-jobs-dialog.ui:41
+#: panels/printers/new-printer-dialog.ui:317
+#: panels/printers/pp-jobs-dialog.ui:42
 #: panels/user-accounts/cc-add-user-dialog.ui:94
-#: panels/user-accounts/cc-add-user-dialog.ui:342
-#: panels/wwan/cc-wwan-apn-dialog.ui:148
+#: panels/user-accounts/cc-add-user-dialog.ui:343
+#: panels/wwan/cc-wwan-apn-dialog.ui:150
 msgid "Username"
 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:365
+#: panels/printers/pp-details-dialog.c:76
+#: panels/printers/pp-details-dialog.c:372
 #, c-format
 msgid "%s Details"
-msgstr "%s 詳細資料"
+msgstr "「%s」詳細資料"
 
-#: panels/printers/pp-details-dialog.c:101
+#: panels/printers/pp-details-dialog.c:107
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: panels/printers/pp-details-dialog.c:260
+#: panels/printers/pp-details-dialog.c:266
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: panels/printers/pp-details-dialog.c:269
+#: panels/printers/pp-details-dialog.c:275
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript 印表機描述檔 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: panels/printers/pp-details-dialog.ui:65 panels/printers/printer-entry.ui:215
+#: panels/printers/pp-details-dialog.ui:69
+msgid "Printer names cannot contain SPACE, TAB, #, or /"
+msgstr "印表機名稱不能包含空格、TAB 鍵、# 或 /"
+
+#: panels/printers/pp-details-dialog.ui:89 panels/printers/printer-entry.ui:211
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Name of column showing printer drivers
-#: panels/printers/pp-details-dialog.ui:115
+#: panels/printers/pp-details-dialog.ui:139
 #: panels/printers/pp-ppd-selection-dialog.c:236
 msgid "Driver"
 msgstr "驅動程式"
 
-#: panels/printers/pp-details-dialog.ui:154
+#: panels/printers/pp-details-dialog.ui:178
 msgid "Searching for preferred drivers…"
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: panels/printers/pp-details-dialog.ui:173
+#: panels/printers/pp-details-dialog.ui:197
 msgid "Search for Drivers"
-msgstr "正在搜尋驅動程式"
+msgstr "搜尋驅動程式"
 
-#: panels/printers/pp-details-dialog.ui:181
+#: panels/printers/pp-details-dialog.ui:205
 msgid "Select from Database…"
 msgstr "從資料庫選擇…"
 
-#: panels/printers/pp-details-dialog.ui:189
+#: panels/printers/pp-details-dialog.ui:213
 msgid "Install PPD File…"
 msgstr "安裝 PPD 檔案…"
 
@@ -4942,56 +5511,64 @@ msgstr "橫向倒轉"
 msgid "Reverse portrait"
 msgstr "直向倒轉"
 
+#: panels/printers/pp-job-row.c:55
+msgid "Resume"
+msgstr "繼續"
+
+#: panels/printers/pp-job-row.c:55
+msgid "Pause"
+msgstr "暫停"
+
 #. Translators: Job's state (job is waiting to be printed)
-#: panels/printers/pp-job-row.c:134
+#: panels/printers/pp-job-row.c:144
 msgctxt "print job"
 msgid "Pending"
 msgstr "待處理"
 
 #. Translators: Job's state (job is held for printing)
-#: panels/printers/pp-job-row.c:140
+#: panels/printers/pp-job-row.c:150
 msgctxt "print job"
 msgid "Paused"
-msgstr "暫停"
+msgstr "已暫停"
 
 #. Translators: Job's state (job needs authentication to proceed further)
-#: panels/printers/pp-job-row.c:145
+#: panels/printers/pp-job-row.c:155
 msgctxt "print job"
 msgid "Authentication required"
-msgstr "需要核對"
+msgstr "需要核對身分"
 
 #. Translators: Job's state (job is currently printing)
-#: panels/printers/pp-job-row.c:150
+#: panels/printers/pp-job-row.c:160
 msgctxt "print job"
 msgid "Processing"
-msgstr "處理中"
+msgstr "正在處理"
 
 #. Translators: Job's state (job has been stopped)
-#: panels/printers/pp-job-row.c:154
+#: panels/printers/pp-job-row.c:164
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: panels/printers/pp-job-row.c:158
+#: panels/printers/pp-job-row.c:168
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: panels/printers/pp-job-row.c:162
+#: panels/printers/pp-job-row.c:172
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已放棄"
 
 #. Translators: Job's state (job has completed successfully)
-#: panels/printers/pp-job-row.c:166
+#: panels/printers/pp-job-row.c:176
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Clicking this button prioritizes printing of this print job
-#: panels/printers/pp-job-row.c:176
+#: panels/printers/pp-job-row.c:186
 msgid "Move this job to the top of the queue"
 msgstr "將此工作移動至佇列頂端"
 
@@ -5000,7 +5577,7 @@ msgstr "將此工作移動至佇列頂端"
 #, c-format
 msgid "%u Job Requires Authentication"
 msgid_plural "%u Jobs Require Authentication"
-msgstr[0] "有 %u 份工作需要核對身份"
+msgstr[0] "有 %u 份工作需要核對身分"
 
 #. Translators: This is the printer name for which we are showing the active jobs
 #: panels/printers/pp-jobs-dialog.c:456
@@ -5022,24 +5599,24 @@ msgid "Domain"
 msgstr "網域"
 
 #. Translators: This button authenticates all print jobs and send them for printing.
-#: panels/printers/pp-jobs-dialog.ui:100
+#: panels/printers/pp-jobs-dialog.ui:103
 msgid "A_uthenticate"
-msgstr "核對(_U)"
+msgstr "認證(_U)"
 
 #. Translators: this action removes (purges) all the listed jobs from the list.
-#: panels/printers/pp-jobs-dialog.ui:128
+#: panels/printers/pp-jobs-dialog.ui:131
 msgid "Clear All"
 msgstr "全部清除"
 
 #. Translators: This button pop up authentication dialog for print jobs which need credentials.
-#: panels/printers/pp-jobs-dialog.ui:173
+#: panels/printers/pp-jobs-dialog.ui:177
 msgid "_Authenticate"
-msgstr "核對(_A)"
+msgstr "認證(_A)"
 
 #. Translators: this label describes the dialog empty state, with no jobs listed.
-#: panels/printers/pp-jobs-dialog.ui:214
+#: panels/printers/pp-jobs-dialog.ui:221
 msgid "No Active Printer Jobs"
-msgstr "沒有使用中的印表機工作"
+msgstr "沒有正在進行的印表機工作"
 
 #: panels/printers/pp-new-printer-dialog.c:270
 msgid "Unlock Print Server"
@@ -5049,17 +5626,17 @@ msgstr "解鎖印表機伺服器"
 #: panels/printers/pp-new-printer-dialog.c:274
 #, c-format
 msgid "Unlock %s."
-msgstr "解除鎖定 %s。"
+msgstr "解鎖 %s。"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
 #: panels/printers/pp-new-printer-dialog.c:278
 #, c-format
 msgid "Enter username and password to view printers on %s."
-msgstr "輸入使用者名稱與密碼以檢視在 %s 的印表機。"
+msgstr "輸入使用者名稱與密碼以檢視位於 %s 的印表機。"
 
 #: panels/printers/pp-new-printer-dialog.c:578
 msgid "Searching for Printers"
-msgstr "正在搜尋印表機"
+msgstr "搜尋印表機"
 
 #. Translators: The found device is a printer connected via USB
 #: panels/printers/pp-new-printer-dialog.c:1366
@@ -5091,7 +5668,7 @@ msgstr "位址：%s"
 #. Translators: This item is a server which needs authentication to show its printers
 #: panels/printers/pp-new-printer-dialog.c:1452
 msgid "Server requires authentication"
-msgstr "伺服器需要核對身份"
+msgstr "伺服器要求認證"
 
 #: panels/printers/pp-options-dialog.c:87
 msgid "Two Sided"
@@ -5121,7 +5698,7 @@ msgstr "GhostScript 前置過濾器"
 #. Translators: This option sets number of pages printed on one sheet
 #: panels/printers/pp-options-dialog.c:517
 msgid "Pages per side"
-msgstr "每張紙的頁數"
+msgstr "每面的頁數"
 
 #. Translators: This option sets whether to print on both sides of paper
 #: panels/printers/pp-options-dialog.c:529
@@ -5207,12 +5784,12 @@ msgstr "自動選擇"
 #: panels/printers/pp-ppd-option-widget.c:83
 #: panels/printers/pp-ppd-option-widget.c:87
 msgid "Printer Default"
-msgstr "印表機預設"
+msgstr "印表機預設值"
 
 #. Translators: this is an option of "GhostScript"
 #: panels/printers/pp-ppd-option-widget.c:89
 msgid "Embed GhostScript fonts only"
-msgstr "只有內嵌的 GhostScript 字型"
+msgstr "僅嵌入 GhostScript 字型"
 
 #. Translators: this is an option of "GhostScript"
 #: panels/printers/pp-ppd-option-widget.c:91
@@ -5227,7 +5804,7 @@ msgstr "轉換為 PS 等級 2"
 #. Translators: this is an option of "GhostScript"
 #: panels/printers/pp-ppd-option-widget.c:95
 msgid "No pre-filtering"
-msgstr "無前置過濾器"
+msgstr "沒有前置過濾器"
 
 #. Translators: Name of column showing printer manufacturers
 #: panels/printers/pp-ppd-selection-dialog.c:220
@@ -5260,7 +5837,7 @@ msgstr "碳粉不足"
 #. Translators: The printer has no toner left
 #: panels/printers/pp-printer-entry.c:721
 msgid "Out of toner"
-msgstr "碳粉用完"
+msgstr "碳粉已用完"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
@@ -5272,7 +5849,7 @@ msgstr "顯像劑不足"
 #. * http://en.wikipedia.org/wiki/Photographic_developer
 #: panels/printers/pp-printer-entry.c:727
 msgid "Out of developer"
-msgstr "顯像劑用完"
+msgstr "顯像劑已用完"
 
 #. Translators: "marker" is one color bin of the printer
 #: panels/printers/pp-printer-entry.c:729
@@ -5282,7 +5859,7 @@ msgstr "墨水匣不足"
 #. Translators: "marker" is one color bin of the printer
 #: panels/printers/pp-printer-entry.c:731
 msgid "Out of a marker supply"
-msgstr "墨水匣用完"
+msgstr "墨水匣已用完"
 
 #. Translators: One or more covers on the printer are open
 #: panels/printers/pp-printer-entry.c:733
@@ -5302,7 +5879,7 @@ msgstr "紙張不足"
 #. Translators: At least one input tray is empty
 #: panels/printers/pp-printer-entry.c:739
 msgid "Out of paper"
-msgstr "紙張用完"
+msgstr "紙張已用完"
 
 #. Translators: The printer is offline
 #: panels/printers/pp-printer-entry.c:741
@@ -5354,7 +5931,7 @@ msgstr "不接受工作"
 #: panels/printers/pp-printer-entry.c:882
 msgctxt "printer state"
 msgid "Processing"
-msgstr "處理中"
+msgstr "正在處理"
 
 #: panels/printers/printer-entry.ui:18
 msgid "Printing Options"
@@ -5367,7 +5944,7 @@ msgstr "印表機詳細資料"
 #. Set this printer as default
 #: panels/printers/printer-entry.ui:40
 msgid "Use Printer by Default"
-msgstr "使用預設印表機"
+msgstr "作為預設印表機"
 
 #. Translators: This button executes command which cleans print heads of the printer.
 #: panels/printers/printer-entry.ui:52
@@ -5378,89 +5955,78 @@ msgstr "清理列印噴頭"
 msgid "Remove Printer"
 msgstr "移除印表機"
 
-#: panels/printers/printer-entry.ui:187
+#: panels/printers/printer-entry.ui:183
 #: panels/wwan/cc-wwan-details-dialog.ui:184
 msgid "Model"
 msgstr "型號"
 
-#: panels/printers/printer-entry.ui:242
+#: panels/printers/printer-entry.ui:238
 msgid "Ink Level"
-msgstr "墨水等級"
+msgstr "墨水殘餘量"
 
 #. Translators: This is the message which follows the printer error.
-#: panels/printers/printer-entry.ui:304
+#: panels/printers/printer-entry.ui:300
 msgid "Please restart when the problem is resolved."
-msgstr "若問題解決後請重新啟動機器。"
+msgstr "問題解決後請重新啟動機器。"
 
 #. Translators: This is the button which restarts the printer.
-#: panels/printers/printer-entry.ui:310
+#: panels/printers/printer-entry.ui:306
 msgid "Restart"
 msgstr "重新啟動"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:10
+#: panels/printers/printers.ui:10 panels/printers/printers.ui:171
 msgid "Add Printer…"
 msgstr "加入印表機…"
 
-#: panels/printers/printers.ui:168
+#: panels/printers/printers.ui:160
 msgid "No printers"
 msgstr "沒有印表機"
 
-#. Translators: This button adds new printer.
-#: panels/printers/printers.ui:179
-msgid "Add a Printer…"
-msgstr "加入印表機…"
-
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:204
+#: panels/printers/printers.ui:196
 msgid ""
 "Sorry! The system printing service\n"
 "    doesn’t seem to be available."
 msgstr ""
 "抱歉！系統列印服務\n"
-"    似乎無法使用。"
+"  似乎無法使用。"
 
 #: panels/region/cc-format-chooser.c:148 panels/region/cc-format-chooser.c:196
 #: panels/region/cc-format-chooser.ui:4
 msgid "Formats"
 msgstr "格式"
 
-#: panels/region/cc-format-chooser.ui:37
-#: panels/wacom/cc-wacom-stylus-page.ui:136
-#: panels/wwan/cc-wwan-apn-dialog.ui:21
-msgid "Back"
-msgstr "上一頁"
-
 #: panels/region/cc-format-chooser.ui:76
 msgid "Search locales…"
 msgstr "搜尋語言地區…"
 
-#: panels/region/cc-format-chooser.ui:113
+#: panels/region/cc-format-chooser.ui:116
 msgid "Common Formats"
 msgstr "通常格式"
 
-#: panels/region/cc-format-chooser.ui:140
+#: panels/region/cc-format-chooser.ui:143
 msgid "All Formats"
 msgstr "所有格式"
 
-#: panels/region/cc-format-chooser.ui:188
+#: panels/region/cc-format-chooser.ui:191
 msgid "No Search Results"
 msgstr "沒有搜尋結果"
 
-#: panels/region/cc-format-chooser.ui:200
+#: panels/region/cc-format-chooser.ui:203
 msgid "Searches can be for countries or languages."
 msgstr "可以搜尋國家或語言。"
 
-#: panels/region/cc-format-chooser.ui:236
+#: panels/region/cc-format-chooser.ui:239
 msgid "Preview"
 msgstr "預覽"
 
-#: panels/region/cc-format-preview.c:135
+#: panels/region/cc-format-preview.c:137
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: panels/region/cc-format-preview.c:137
+#: panels/region/cc-format-preview.c:139
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
@@ -5469,9 +6035,10 @@ msgstr "公制"
 msgid "Dates"
 msgstr "日期"
 
+# (Freddy)考量到其他作業系統時常混用「時間」與「時刻」，以及蠻多系統模組也都用「時間」而非「時刻」，嘗試做更改。
 #: panels/region/cc-format-preview.ui:53
 msgid "Dates & Times"
-msgstr "日期與時刻"
+msgstr "日期與時間"
 
 #: panels/region/cc-format-preview.ui:71
 msgid "Numbers"
@@ -5487,24 +6054,24 @@ msgstr "紙張"
 
 #: panels/region/cc-region-panel.ui:19
 msgid "Language and format will be changed after next login"
-msgstr "語言與格式會在下次登入後變更"
+msgstr "語言與格式設定會在下次登入後修改"
 
 #: panels/region/cc-region-panel.ui:29
 msgid "Logout…"
-msgstr "登出…"
+msgstr "立即登出…"
 
 #: panels/region/cc-region-panel.ui:45
 msgid ""
-"The language setting is used for interface text and web pages. Formats is "
+"The language setting is used for interface text and web pages. Formats are "
 "used for numbers, dates, and currencies."
-msgstr "語言設定用於介面文字與網頁上。格式用於數字、日期、貨幣等。"
+msgstr "語言設定會用於介面中的文字與網頁，格式則用於數字、日期、貨幣等。"
 
 #: panels/region/cc-region-panel.ui:51
 msgid "Your Account"
 msgstr "您的帳號"
 
 #: panels/region/cc-region-panel.ui:56 panels/region/cc-region-panel.ui:95
-#: panels/user-accounts/cc-user-panel.ui:299
+#: panels/user-accounts/cc-user-panel.ui:306
 msgid "_Language"
 msgstr "語言(_L)"
 
@@ -5522,12 +6089,12 @@ msgstr "地區和語言"
 
 #: panels/region/gnome-region-panel.desktop.in.in:4
 msgid "Select your display language and formats"
-msgstr "選取您要顯示的語言與格式"
+msgstr "選擇您要顯示的語言與格式"
 
 #. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
 #: panels/region/gnome-region-panel.desktop.in.in:19
 msgid "Language;Layout;Keyboard;Input;"
-msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
+msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;格式;顯示;"
 
 #: panels/removable-media/cc-removable-media-panel.c:256
 msgid "Ask what to do"
@@ -5535,7 +6102,7 @@ msgstr "詢問要做什麼"
 
 #: panels/removable-media/cc-removable-media-panel.c:260
 msgid "Do nothing"
-msgstr "不做任何事"
+msgstr "不做任何動作"
 
 #: panels/removable-media/cc-removable-media-panel.c:264
 msgid "Open folder"
@@ -5547,23 +6114,23 @@ msgstr "其他媒體"
 
 #: panels/removable-media/cc-removable-media-panel.c:352
 msgid "Select an application for audio CDs"
-msgstr "選擇播放音樂 CD 的應用程式"
+msgstr "選擇播放 CD 音訊的應用程式"
 
 #: panels/removable-media/cc-removable-media-panel.c:353
 msgid "Select an application for video DVDs"
-msgstr "選擇播放影片 DVD 的應用程式"
+msgstr "選擇播放 DVD 視訊的應用程式"
 
 #: panels/removable-media/cc-removable-media-panel.c:354
 msgid "Select an application to run when a music player is connected"
-msgstr "選擇當音樂播放器連接時要執行的應用程式"
+msgstr "選擇音樂播放器連接時要執行的應用程式"
 
 #: panels/removable-media/cc-removable-media-panel.c:355
 msgid "Select an application to run when a camera is connected"
-msgstr "選擇當攝影機連接時要執行的應用程式"
+msgstr "選擇相機連接時要執行的應用程式"
 
 #: panels/removable-media/cc-removable-media-panel.c:356
 msgid "Select an application for software CDs"
-msgstr "選擇軟體 CD 要用的應用程式"
+msgstr "選擇軟體 CD 放入時要開啟的應用程式"
 
 #. translators: these strings are duplicates of shared-mime-info
 #. * strings, just here to fix capitalization of the English originals.
@@ -5572,27 +6139,27 @@ msgstr "選擇軟體 CD 要用的應用程式"
 #.
 #: panels/removable-media/cc-removable-media-panel.c:368
 msgid "audio DVD"
-msgstr "音樂 DVD"
+msgstr "音訊 (DVD-Audio)"
 
 #: panels/removable-media/cc-removable-media-panel.c:369
 msgid "blank Blu-ray disc"
-msgstr "空白 Blu-ray 碟片"
+msgstr "空白光碟 (Blu-ray)"
 
 #: panels/removable-media/cc-removable-media-panel.c:370
 msgid "blank CD disc"
-msgstr "空白 CD 碟片"
+msgstr "空白光碟 (CD)"
 
 #: panels/removable-media/cc-removable-media-panel.c:371
 msgid "blank DVD disc"
-msgstr "空白 DVD 碟片"
+msgstr "空白光碟 (DVD)"
 
 #: panels/removable-media/cc-removable-media-panel.c:372
 msgid "blank HD DVD disc"
-msgstr "空白 HD DVD 碟片"
+msgstr "空白光碟 (HD DVD)"
 
 #: panels/removable-media/cc-removable-media-panel.c:373
 msgid "Blu-ray video disc"
-msgstr "Blu-ray 影片碟片"
+msgstr "視訊 (Blu-ray)"
 
 #: panels/removable-media/cc-removable-media-panel.c:374
 msgid "e-book reader"
@@ -5600,81 +6167,253 @@ msgstr "電子書閱讀器"
 
 #: panels/removable-media/cc-removable-media-panel.c:375
 msgid "HD DVD video disc"
-msgstr "HD DVD 影片碟片"
+msgstr "視訊 (HD DVD)"
 
 #: panels/removable-media/cc-removable-media-panel.c:376
 msgid "Picture CD"
-msgstr "照片 CD"
+msgstr "影像 (KODAK Picture CD)"
+
+#: panels/removable-media/cc-removable-media-panel.c:377
+msgid "Super Video CD"
+msgstr "視訊 (SVCD)"
+
+# (Freddy)考量臺灣人普遍都講 CD VCD DVD 之類的東西，也都知道誰是視訊誰是音訊，故邏輯上是以括號來補充 CD VCD DVD。
+#: panels/removable-media/cc-removable-media-panel.c:378
+msgid "Video CD"
+msgstr "視訊 (VCD)"
+
+#: panels/removable-media/cc-removable-media-panel.c:379
+msgid "Windows software"
+msgstr "軟體 (Windows)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:32
+msgid "Select how media should be handled"
+msgstr "選擇媒體與裝置接上時要執行的動作"
+
+# (Freddy)考量臺灣人普遍都講 CD VCD DVD 之類的東西，也都知道誰是視訊誰是音訊，故邏輯上是以括號來補充 CD VCD DVD。
+#: panels/removable-media/cc-removable-media-panel.ui:52
+msgid "CD _audio"
+msgstr "音訊 CD(_A)"
+
+# (Freddy)考量臺灣人普遍都講 CD VCD DVD 之類的東西，也都知道誰是視訊誰是音訊，故邏輯上是以括號來補充 CD VCD DVD。
+#: panels/removable-media/cc-removable-media-panel.ui:67
+msgid "_DVD video"
+msgstr "視訊 _DVD"
+
+#: panels/removable-media/cc-removable-media-panel.ui:102
+msgid "_Music player"
+msgstr "音樂播放器(_M)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:152
+msgid "_Software"
+msgstr "軟體(_S)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:178
+msgid "_Other Media…"
+msgstr "其他媒體(_O)…"
+
+#: panels/removable-media/cc-removable-media-panel.ui:195
+msgid "_Never prompt or start programs on media insertion"
+msgstr "接上媒體與裝置時不要提示或啟動程式(_N)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:225
+msgid "Select how other media should be handled"
+msgstr "選擇其他媒體接上時要執行的動作"
+
+#: panels/removable-media/cc-removable-media-panel.ui:259
+msgid "_Action:"
+msgstr "動作(_A)："
+
+#: panels/removable-media/cc-removable-media-panel.ui:278
+msgid "_Type:"
+msgstr "類型(_T)："
+
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "卸除式媒體"
+
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:4
+msgid "Configure Removable Media settings"
+msgstr "修改卸除式媒體的設定值"
+
+#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:19
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;裝置;系統;預設;應用程式;偏好;首選;音訊;視訊;光碟;碟"
+"片;可移除;可移除式;媒體;自動執行;卸除式;"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:70
+msgctxt "lock_screen"
+msgid "Screen Turns Off"
+msgstr "關閉立即鎖定"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:73
+msgctxt "lock_screen"
+msgid "30 seconds"
+msgstr "30 秒"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:76
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 分鐘"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:79
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 分鐘"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:82
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 分鐘"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:85
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 分鐘"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:88
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 分鐘"
+
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:91
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 小時"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:134
+msgctxt "blank_screen"
+msgid "1 minute"
+msgstr "1 分鐘"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:137
+msgctxt "blank_screen"
+msgid "2 minutes"
+msgstr "2 分鐘"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:140
+msgctxt "blank_screen"
+msgid "3 minutes"
+msgstr "3 分鐘"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:143
+msgctxt "blank_screen"
+msgid "4 minutes"
+msgstr "4 分鐘"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:146
+msgctxt "blank_screen"
+msgid "5 minutes"
+msgstr "5 分鐘"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:149
+msgctxt "blank_screen"
+msgid "8 minutes"
+msgstr "8 分鐘"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:152
+msgctxt "blank_screen"
+msgid "10 minutes"
+msgstr "10 分鐘"
+
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:155
+msgctxt "blank_screen"
+msgid "12 minutes"
+msgstr "12 分鐘"
 
-#: panels/removable-media/cc-removable-media-panel.c:377
-msgid "Super Video CD"
-msgstr "SVCD"
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:158
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 分鐘"
 
-#: panels/removable-media/cc-removable-media-panel.c:378
-msgid "Video CD"
-msgstr "影片 CD"
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/screen/cc-screen-panel.c:161
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "永不"
 
-#: panels/removable-media/cc-removable-media-panel.c:379
-msgid "Windows software"
-msgstr "Windows 軟體"
+#: panels/screen/cc-screen-panel.ui:8
+msgid "Screen Lock"
+msgstr "螢幕鎖定"
 
-#: panels/removable-media/cc-removable-media-panel.ui:32
-msgid "Select how media should be handled"
-msgstr "選擇要如何處理媒體"
+#: panels/screen/cc-screen-panel.ui:9
+msgid ""
+"Automatically locking the screen prevents others from accessing the computer "
+"while you're away."
+msgstr "自動鎖定螢幕能防止他人在您離開時取用您的電腦。"
 
-#: panels/removable-media/cc-removable-media-panel.ui:52
-msgid "CD _audio"
-msgstr "CD 音樂(_A)"
+#: panels/screen/cc-screen-panel.ui:14
+msgid "Blank Screen Delay"
+msgstr "螢幕轉黑等候"
 
-#: panels/removable-media/cc-removable-media-panel.ui:67
-msgid "_DVD video"
-msgstr "_DVD 影片"
+#: panels/screen/cc-screen-panel.ui:15
+msgid "Period of inactivity after which the screen will go blank."
+msgstr "多久沒活動後將螢幕轉黑。"
 
-#: panels/removable-media/cc-removable-media-panel.ui:102
-msgid "_Music player"
-msgstr "音樂播放器(_M)"
+#: panels/screen/cc-screen-panel.ui:33
+msgid "Automatic Screen _Lock"
+msgstr "自動鎖定螢幕(_L)"
 
-#: panels/removable-media/cc-removable-media-panel.ui:152
-msgid "_Software"
-msgstr "軟體(_S)"
+#: panels/screen/cc-screen-panel.ui:50
+msgid "Automatic _Screen Lock Delay"
+msgstr "螢幕自動鎖定等候(_S)"
 
-#: panels/removable-media/cc-removable-media-panel.ui:178
-msgid "_Other Media…"
-msgstr "其他(_O)…"
+#: panels/screen/cc-screen-panel.ui:51
+msgid "Period after the screen blanks when the screen is automatically locked."
+msgstr "螢幕轉黑後要隔多久才將螢幕鎖定。"
 
-#: panels/removable-media/cc-removable-media-panel.ui:195
-msgid "_Never prompt or start programs on media insertion"
-msgstr "插入媒體時永遠不提示或啟動程式(_N)"
+#: panels/screen/cc-screen-panel.ui:69
+msgid "Show _Notifications on Lock Screen"
+msgstr "在螢幕鎖定畫面顯示通知(_N)"
 
-#: panels/removable-media/cc-removable-media-panel.ui:225
-msgid "Select how other media should be handled"
-msgstr "選擇要如何處理其他媒體"
+#: panels/screen/cc-screen-panel.ui:87
+msgid "Forbid new _USB devices"
+msgstr "禁止新的 _USB 裝置"
 
-#: panels/removable-media/cc-removable-media-panel.ui:259
-msgid "_Action:"
-msgstr "動作(_A)："
+#: panels/screen/cc-screen-panel.ui:88
+msgid ""
+"Prevent new USB devices from interacting with the system when the screen is "
+"locked."
+msgstr "當螢幕鎖定時，防止新的 USB 裝置與系統互動。"
 
-#: panels/removable-media/cc-removable-media-panel.ui:278
-msgid "_Type:"
-msgstr "類型(_T)："
+#: panels/screen/cc-screen-panel.ui:108
+msgid "Screen Privacy"
+msgstr "螢幕隱私"
 
-#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:3
-msgid "Removable Media"
-msgstr "可移除式媒體"
+#: panels/screen/cc-screen-panel.ui:113
+msgid "Restrict Viewing Angle"
+msgstr "限制螢幕的檢視角度"
 
-#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:4
-msgid "Configure Removable Media settings"
-msgstr "設定可移除式媒體設定值"
+#: panels/screen/gnome-screen-panel.desktop.in.in:4
+msgid "Screen Settings"
+msgstr "螢幕設定"
 
-#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
-#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:19
-msgid ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;"
-msgstr ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;裝置;系統;預設;應用程式;偏好;首選;音訊;視訊;光碟;碟"
-"片;可移除;可移除式;媒體;自動執行;"
+#. Translators: Search terms to find the Screen panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/screen/gnome-screen-panel.desktop.in.in:20
+msgid "screen;lock;private;privacy;"
+msgstr "screen;lock;private;privacy;螢幕鎖定;鎖定畫面;隱私權;"
 
 #: panels/search/cc-search-locations-dialog.c:674
 msgid "Select Location"
@@ -5699,15 +6438,15 @@ msgstr "系統應用程式會搜尋的資料夾，例如「檔案」、「照片
 msgid "Places"
 msgstr "位置"
 
-#: panels/search/cc-search-locations-dialog.ui:33
+#: panels/search/cc-search-locations-dialog.ui:35
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: panels/search/cc-search-locations-dialog.ui:48
+#: panels/search/cc-search-locations-dialog.ui:52
 msgid "Others"
 msgstr "其他"
 
-#: panels/search/cc-search-locations-dialog.ui:55
+#: panels/search/cc-search-locations-dialog.ui:59
 msgid "Add Location"
 msgstr "加入位置"
 
@@ -5738,7 +6477,7 @@ msgstr "結果會根據列表順序顯示。"
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
-msgstr "控制在活動概覽中哪些應用程式會顯示在搜尋結果中"
+msgstr "控制在概覽中哪些應用程式會顯示在搜尋結果"
 
 #. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/search/gnome-search-panel.desktop.in.in:19
@@ -5746,57 +6485,85 @@ msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr "Search;Find;Index;Hide;Privacy;Results;搜尋;尋找;索引;隱藏;隱私;結果;"
 
 #. Label
-#: panels/sharing/cc-sharing-networks.c:265
+#: panels/sharing/cc-sharing-networks.c:268
 msgid "No networks selected for sharing"
-msgstr "沒有選擇用來分享的網路"
+msgstr "沒有選擇用於分享的網路"
 
 #: panels/sharing/cc-sharing-networks.ui:15
 msgid "Networks"
 msgstr "網路"
 
-#: panels/sharing/cc-sharing-panel.c:370
+#: panels/sharing/cc-sharing-panel.c:366
 msgctxt "service is enabled"
 msgid "On"
 msgstr "é–‹å•Ÿ"
 
-#: panels/sharing/cc-sharing-panel.c:372 panels/sharing/cc-sharing-panel.c:399
+#: panels/sharing/cc-sharing-panel.c:368 panels/sharing/cc-sharing-panel.c:395
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: panels/sharing/cc-sharing-panel.c:402
+#: panels/sharing/cc-sharing-panel.c:398
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "已啟用"
 
-#: panels/sharing/cc-sharing-panel.c:405
+#: panels/sharing/cc-sharing-panel.c:401
 msgctxt "service is active"
 msgid "Active"
-msgstr "使用中"
+msgstr "啟動中"
 
-#: panels/sharing/cc-sharing-panel.c:523
+#: panels/sharing/cc-sharing-panel.c:519
 msgid "Choose a Folder"
-msgstr "選擇一個資料夾"
+msgstr "選擇資料夾"
+
+#: panels/sharing/cc-sharing-panel.c:672 panels/wwan/cc-wwan-apn-dialog.ui:33
+msgid "Add"
+msgstr "加入"
+
+#: panels/sharing/cc-sharing-panel.c:736
+msgid "Enable media sharing"
+msgstr "啟用媒體分享"
 
 #. TRANSLATORS: %s is replaced with a link to a dav://<hostname> URL
-#: panels/sharing/cc-sharing-panel.c:751
+#: panels/sharing/cc-sharing-panel.c:756
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
 "current network using: %s"
-msgstr "檔案分享允許您使用下述方式與目前網路上的其他人分享您的公開資料夾：%s"
+msgstr "檔案分享允許您與目前網路上的其他人分享公開資料夾，使用：%s"
 
 #. TRANSLATORS: %s is replaced with a link to a "ssh <hostname>" command to run
-#: panels/sharing/cc-sharing-panel.c:757
+#: panels/sharing/cc-sharing-panel.c:762
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
 "%s"
 msgstr ""
-"啟用遠端登入後，遠端使用者可使用此 SSH 指令連線：\n"
+"啟用遠端登入後，遠端使用者可使用此 SSH 命令來連接：\n"
 "%s"
 
+#: panels/sharing/cc-sharing-panel.c:942
+msgid "Enable personal media sharing"
+msgstr "啟用個人媒體分享"
+
+#: panels/sharing/cc-sharing-panel.c:1308
+msgid "Device name copied"
+msgstr "已複製裝置名稱"
+
+#: panels/sharing/cc-sharing-panel.c:1319
+msgid "Device address copied"
+msgstr "已複製裝置位址"
+
+#: panels/sharing/cc-sharing-panel.c:1330
+msgid "Username copied"
+msgstr "已複製使用者名稱"
+
+#: panels/sharing/cc-sharing-panel.c:1341
+msgid "Password copied"
+msgstr "密碼已複製"
+
 #: panels/sharing/cc-sharing-panel.ui:9
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
@@ -5835,55 +6602,62 @@ msgstr "需要密碼(_R)"
 msgid "Remote Login"
 msgstr "遠端登入"
 
-#: panels/sharing/cc-sharing-panel.ui:250
-#: panels/sharing/cc-sharing-panel.ui:267
+#: panels/sharing/cc-sharing-panel.ui:251
+#: panels/sharing/cc-sharing-panel.ui:270
 msgid "Remote Desktop"
 msgstr "遠端桌面"
 
-#: panels/sharing/cc-sharing-panel.ui:263
+#: panels/sharing/cc-sharing-panel.ui:266
 msgid ""
 "Remote desktop allows viewing and controlling your desktop from another "
 "computer."
-msgstr "遠端桌面允許從另一臺電腦檢視並遙控您的系統。"
+msgstr "遠端桌面允許另一臺電腦檢視與控制您的桌面。"
 
-#: panels/sharing/cc-sharing-panel.ui:268
+#: panels/sharing/cc-sharing-panel.ui:271
 msgid "Enable or disable remote desktop connections to this computer."
-msgstr "啟用或停用此電腦的遠端桌面連線。"
+msgstr "啟用或停用本電機的遠端桌面連線。"
 
-#: panels/sharing/cc-sharing-panel.ui:280
+#: panels/sharing/cc-sharing-panel.ui:284
 msgid "Remote Control"
-msgstr "遠端遙控"
+msgstr "遠端控制"
 
-#: panels/sharing/cc-sharing-panel.ui:281
+#: panels/sharing/cc-sharing-panel.ui:285
 msgid "Allows remote connections to control the screen."
-msgstr "允許遠端連線控制此螢幕。"
+msgstr "允許遠端的連線控制本機。"
 
-#: panels/sharing/cc-sharing-panel.ui:294
+#: panels/sharing/cc-sharing-panel.ui:299
 msgid "How to Connect"
-msgstr "連接方式"
+msgstr "如何連接"
 
-#: panels/sharing/cc-sharing-panel.ui:295
+#: panels/sharing/cc-sharing-panel.ui:300
 msgid ""
 "Connect to this computer using the device name or remote desktop address."
-msgstr "使用裝置名稱或遠端桌面位址來連接至此電腦。"
+msgstr "使用裝置名稱或遠端桌面位址進行連接。"
+
+#: panels/sharing/cc-sharing-panel.ui:318
+#: panels/sharing/cc-sharing-panel.ui:345
+#: panels/sharing/cc-sharing-panel.ui:372
+#: panels/sharing/cc-sharing-panel.ui:390
+msgid "Copy"
+msgstr "複製"
 
-#: panels/sharing/cc-sharing-panel.ui:323
+#: panels/sharing/cc-sharing-panel.ui:331
 msgid "Remote Desktop Address"
 msgstr "遠端桌面位址"
 
-#: panels/sharing/cc-sharing-panel.ui:350
+#: panels/sharing/cc-sharing-panel.ui:361
 msgid "Authentication"
-msgstr "身分核對"
+msgstr "核對身分"
 
-#: panels/sharing/cc-sharing-panel.ui:351
+#: panels/sharing/cc-sharing-panel.ui:362
 msgid "The user name and password are required to connect to this computer."
-msgstr "需要使用者名稱與密碼才能連接至此電腦。"
+msgstr "需要使用者名稱與密碼才能連接本電腦。"
 
-#: panels/sharing/cc-sharing-panel.ui:355
+#: panels/sharing/cc-sharing-panel.ui:366
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: panels/sharing/cc-sharing-panel.ui:401
+#: panels/sharing/cc-sharing-panel.ui:405
 msgid "Verify Encryption"
 msgstr "核驗加密"
 
@@ -5894,8 +6668,8 @@ msgstr "加密指紋"
 #: panels/sharing/cc-sharing-panel.ui:435
 msgid ""
 "The encryption fingerprint can be seen in connecting clients and should be "
-"identical"
-msgstr "加密指紋可以在連接客戶端時查看，而且應該相同"
+"identical."
+msgstr "您可以在已連接的客戶端看見相同的加密指紋。"
 
 #: panels/sharing/cc-sharing-panel.ui:467
 msgid "Media Sharing"
@@ -5911,7 +6685,7 @@ msgstr "資料夾"
 
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:4
 msgid "Control what you want to share with others"
-msgstr "控制您想要與其他人分享什麼"
+msgstr "控制您想與他人分享什麼內容"
 
 #. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:16
@@ -5929,40 +6703,48 @@ msgstr "啟用或停用遠端登入"
 
 #: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
 msgid "Authentication is required to enable or disable remote login"
-msgstr "啟用或停用遠端登入需要核對"
+msgstr "啟用或停用遠端登入需要認證"
 
-#: panels/sound/cc-alert-chooser.c:150
+#: panels/sound/cc-alert-chooser.c:153
 msgid "Custom"
 msgstr "自訂"
 
 #: panels/sound/cc-alert-chooser.ui:12
-msgid "Bark"
-msgstr "汪汪"
+msgid "Click"
+msgstr "喀喀"
 
 #: panels/sound/cc-alert-chooser.ui:20
-msgid "Drip"
-msgstr "水滴聲"
+msgid "String"
+msgstr "å™ å™ "
 
 #: panels/sound/cc-alert-chooser.ui:28
-msgid "Glass"
-msgstr "敲玻璃"
+msgid "Swing"
+msgstr "霍霍"
 
 #: panels/sound/cc-alert-chooser.ui:36
-msgid "Sonar"
-msgstr "聲納"
+msgid "Hum"
+msgstr "å—¡å—¡"
+
+#: panels/sound/cc-balance-slider.ui:13 panels/sound/cc-sound-panel.ui:144
+msgid "Balance"
+msgstr "平衡"
+
+#: panels/sound/cc-fade-slider.ui:13 panels/sound/cc-sound-panel.ui:170
+msgid "Fade"
+msgstr "淡化"
 
-#: panels/sound/cc-fade-slider.ui:13
+#: panels/sound/cc-fade-slider.ui:16
 msgid "Rear"
-msgstr "後"
+msgstr "後方"
 
-#: panels/sound/cc-fade-slider.ui:15
+#: panels/sound/cc-fade-slider.ui:18
 msgid "Front"
-msgstr "前"
+msgstr "前方"
 
 #: panels/sound/cc-output-test-dialog.c:134
 #, c-format
 msgid "Testing %s"
-msgstr "正在測試 %s"
+msgstr "正在測試「%s」"
 
 #: panels/sound/cc-output-test-dialog.ui:131
 msgid "Click a speaker to test"
@@ -5972,66 +6754,66 @@ msgstr "按一下喇叭以測試"
 msgid "System Volume"
 msgstr "系統音量"
 
-#: panels/sound/cc-sound-panel.ui:25
+#: panels/sound/cc-sound-panel.ui:12
+msgid "Master volume"
+msgstr "主音量"
+
+#: panels/sound/cc-sound-panel.ui:28
 msgid "Volume Levels"
-msgstr "音量等級"
+msgstr "個別音量"
 
-#: panels/sound/cc-sound-panel.ui:35
+#: panels/sound/cc-sound-panel.ui:38
 msgid "Output"
 msgstr "輸出"
 
-#: panels/sound/cc-sound-panel.ui:56
+#: panels/sound/cc-sound-panel.ui:59
 msgid "Output Device"
 msgstr "輸出裝置"
 
-#: panels/sound/cc-sound-panel.ui:75
+#: panels/sound/cc-sound-panel.ui:81
 msgid "Test"
 msgstr "測試"
 
-#: panels/sound/cc-sound-panel.ui:104 panels/sound/cc-sound-panel.ui:263
+#: panels/sound/cc-sound-panel.ui:110 panels/sound/cc-sound-panel.ui:275
 msgid "Configuration"
 msgstr "設定"
 
-#: panels/sound/cc-sound-panel.ui:135
-msgid "Balance"
-msgstr "平衡"
-
-#: panels/sound/cc-sound-panel.ui:161
-msgid "Fade"
-msgstr "淡化"
-
-#: panels/sound/cc-sound-panel.ui:187
+#: panels/sound/cc-sound-panel.ui:196 panels/sound/cc-subwoofer-slider.ui:13
 msgid "Subwoofer"
 msgstr "重低音"
 
-#: panels/sound/cc-sound-panel.ui:205
+#: panels/sound/cc-sound-panel.ui:214
 msgid "Input"
 msgstr "輸入"
 
-#: panels/sound/cc-sound-panel.ui:226
+#: panels/sound/cc-sound-panel.ui:235
 msgid "Input Device"
 msgstr "輸入裝置"
 
-#: panels/sound/cc-sound-panel.ui:294
+#: panels/sound/cc-sound-panel.ui:309 panels/sound/cc-volume-slider.ui:13
 msgid "Volume"
 msgstr "音量"
 
-#: panels/sound/cc-sound-panel.ui:312
+#: panels/sound/cc-sound-panel.ui:327
 msgid "Alert Sound"
-msgstr "警示音效"
+msgstr "鈴響音效"
 
-#: panels/sound/cc-volume-slider.c:117
+#: panels/sound/cc-volume-slider.c:116
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
+#: panels/sound/cc-volume-slider.ui:22
+msgid "Mute"
+msgstr "靜音"
+
 #: panels/sound/gnome-sound-panel.desktop.in.in:3
 msgid "Sound"
-msgstr "音效"
+msgstr "音訊與音效"
 
 #: panels/sound/gnome-sound-panel.desktop.in.in:4
 msgid "Change sound levels, inputs, outputs, and alert sounds"
-msgstr "改變音效的音量、輸入、輸出與警示音效"
+msgstr "更改電腦的音量、輸入與輸出裝置、鈴響音效"
 
 #. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/sound/gnome-sound-panel.desktop.in.in:20
@@ -6045,57 +6827,57 @@ msgstr ""
 #: panels/thunderbolt/cc-bolt-device-entry.c:123
 msgctxt "Thunderbolt Device Status"
 msgid "Disconnected"
-msgstr "æ–·ç·š"
+msgstr "連接中斷"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:95
 #: panels/thunderbolt/cc-bolt-device-entry.c:126
 msgctxt "Thunderbolt Device Status"
 msgid "Connecting"
-msgstr "連線中"
+msgstr "正在連接"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:98
 #: panels/thunderbolt/cc-bolt-device-entry.c:130
 #: panels/thunderbolt/cc-bolt-device-entry.c:142
 msgctxt "Thunderbolt Device Status"
 msgid "Connected"
-msgstr "已連線"
+msgstr "已連接"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:101
 msgctxt "Thunderbolt Device Status"
 msgid "Authorization Error"
-msgstr "認證失敗"
+msgstr "授權發生錯誤"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:104
 #: panels/thunderbolt/cc-bolt-device-entry.c:136
 msgctxt "Thunderbolt Device Status"
 msgid "Authorizing"
-msgstr "正在認證"
+msgstr "正在授權"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:111
 msgctxt "Thunderbolt Device Status"
 msgid "Reduced Functionality"
-msgstr "功能較少"
+msgstr "功能受到限制"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:113
 msgctxt "Thunderbolt Device Status"
 msgid "Connected & Authorized"
-msgstr "已連線、認證"
+msgstr "已連接與授權"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:119
 #: panels/thunderbolt/cc-bolt-device-entry.c:150
 msgctxt "Thunderbolt Device Status"
 msgid "Unknown"
-msgstr "未知"
+msgstr "不明"
 
 #. Translators: The time point the device was authorized.
 #: panels/thunderbolt/cc-bolt-device-dialog.c:175
 msgid "Authorized at:"
-msgstr "認證於："
+msgstr "授權於："
 
 #. Translators: The time point the device was connected.
 #: panels/thunderbolt/cc-bolt-device-dialog.c:181
 msgid "Connected at:"
-msgstr "連線於："
+msgstr "連接於："
 
 #. Translators: The time point the device was enrolled,
 #. * i.e. authorized and stored in the device database.
@@ -6109,7 +6891,7 @@ msgstr "裝置授權失敗："
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:329
 msgid "Failed to forget device: "
-msgstr "遺忘裝置失敗："
+msgstr "無法將該裝置遺忘："
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:485
 #, c-format
@@ -6117,25 +6899,30 @@ msgid "Depends on %u other device"
 msgid_plural "Depends on %u other devices"
 msgstr[0] "基於其他 %u 個裝置"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:84
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:43
+#: panels/thunderbolt/cc-bolt-panel.ui:41
+msgid "Close notification"
+msgstr "關閉通知"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:87
 msgid "Name:"
 msgstr "名稱："
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:112
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:115
 msgid "Status:"
 msgstr "狀態："
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:141
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:144
 msgid "UUID:"
 msgstr "UUID："
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:247
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:250
 msgid "Authorize and Connect"
-msgstr "認證並連線"
+msgstr "授權並連接"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:263
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:266
 msgid "Forget Device"
-msgstr "遺忘裝置"
+msgstr "將該裝置遺忘"
 
 #: panels/thunderbolt/cc-bolt-device-entry.c:133
 msgctxt "Thunderbolt Device Status"
@@ -6145,7 +6932,7 @@ msgstr "錯誤"
 #: panels/thunderbolt/cc-bolt-device-entry.c:144
 msgctxt "Thunderbolt Device Status"
 msgid "Authorized"
-msgstr "已認證"
+msgstr "已授權"
 
 #: panels/thunderbolt/cc-bolt-panel.c:169
 msgid ""
@@ -6153,13 +6940,13 @@ msgid ""
 msgstr "Thunderbolt 子系統 (boltd) 尚未安裝或未正確設定。"
 
 #: panels/thunderbolt/cc-bolt-panel.c:425
-#: panels/thunderbolt/cc-bolt-panel.ui:157
+#: panels/thunderbolt/cc-bolt-panel.ui:156
 msgid "Allow direct access to devices such as docks and external GPUs."
-msgstr "允許直接存取裝置，例如 Dock 或外部 GPU。"
+msgstr "允許直接存取裝置，例如擴充塢或外接顯示卡。"
 
 #: panels/thunderbolt/cc-bolt-panel.c:426
 msgid "Only USB and Display Port devices can attach."
-msgstr "只有 USB 與顯示埠裝置可以連接。"
+msgstr "只有 USB 與 DisplayPort 裝置可以連接。"
 
 #: panels/thunderbolt/cc-bolt-panel.c:461
 msgid ""
@@ -6167,40 +6954,40 @@ msgid ""
 "Either the system lacks Thunderbolt support, it has been disabled in the "
 "BIOS or is set to an unsupported security level in the BIOS."
 msgstr ""
-"無法偵測到 Thunderbolt。\n"
-"可能是系統缺乏 Thunderbolt 支援，它可能在 BIOS 被停用或設定至不支援的安全級"
-"別。"
+"未偵測到 Thunderbolt。\n"
+"可能是系統不支援 Thunderbolt，也可能是在 BIOS 中被停用或設定至不支援的安全性"
+"層級。"
 
 #: panels/thunderbolt/cc-bolt-panel.c:505
 msgid "Thunderbolt support has been disabled in the BIOS."
-msgstr "Thunderbolt 支援在 BIOS 中被停用。"
+msgstr "Thunderbolt 的支援在 BIOS 中被停用。"
 
 #: panels/thunderbolt/cc-bolt-panel.c:509
 msgid "Thunderbolt security level could not be determined."
-msgstr "無法確定 Thunderbolt 安全性等級。"
+msgstr "無法確定 Thunderbolt 的安全性層級。"
 
 #: panels/thunderbolt/cc-bolt-panel.c:614
 #, c-format
 msgid "Error switching direct mode: %s"
 msgstr "切換直接模式時發生問題：%s"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:103
+#: panels/thunderbolt/cc-bolt-panel.ui:102
 msgid "No Thunderbolt Support"
-msgstr "無 Thunderbolt 支援"
+msgstr "不支援 Thunderbolt"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:104
+#: panels/thunderbolt/cc-bolt-panel.ui:103
 msgid "Could not connect to the thunderbolt subsystem."
-msgstr "無法連接 thunderbolt 子系統。"
+msgstr "無法連接 Thunderbolt 子系統。"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:153
+#: panels/thunderbolt/cc-bolt-panel.ui:152
 msgid "Direct Access"
 msgstr "直接存取"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:225
+#: panels/thunderbolt/cc-bolt-panel.ui:224
 msgid "Pending Devices"
-msgstr "待處理裝置"
+msgstr "待處理的裝置"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:319
+#: panels/thunderbolt/cc-bolt-panel.ui:318
 msgid "No devices attached"
 msgstr "沒有連接任何裝置"
 
@@ -6221,27 +7008,27 @@ msgstr "Thunderbolt;privacy;隱私;"
 msgid "Cursor Blinking"
 msgstr "游標閃爍"
 
-#: panels/universal-access/cc-cursor-blinking-dialog.ui:29
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:32
 msgid "Cursor blinks in text fields."
-msgstr "游標在文字欄位中閃爍。"
+msgstr "讓文字欄中的鍵盤游標閃爍。"
 
-#: panels/universal-access/cc-cursor-blinking-dialog.ui:62
-#: panels/universal-access/cc-repeat-keys-dialog.ui:117
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:65
+#: panels/universal-access/cc-repeat-keys-dialog.ui:120
 msgid "Speed"
 msgstr "速度"
 
-#: panels/universal-access/cc-cursor-blinking-dialog.ui:84
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:87
 msgid "Cursor blinking speed"
 msgstr "游標閃爍速度"
 
 #: panels/universal-access/cc-cursor-size-dialog.ui:5
 msgid "Cursor Size"
-msgstr "游標大小"
+msgstr "滑鼠指標大小"
 
 #: panels/universal-access/cc-cursor-size-dialog.ui:22
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
-msgstr "游標大小可以與縮放搭配以輕鬆看出游標位置。"
+msgstr "滑鼠指標大小可與縮放搭配以輕鬆看出其位置。"
 
 #: panels/universal-access/cc-pointing-dialog.ui:5
 msgid "Click Assist"
@@ -6249,17 +7036,17 @@ msgstr "點擊助理"
 
 #: panels/universal-access/cc-pointing-dialog.ui:38
 msgid "_Simulated Secondary Click"
-msgstr "模擬次要點擊(_S)"
+msgstr "模擬次要按鍵點擊(_S)"
 
 #: panels/universal-access/cc-pointing-dialog.ui:49
 msgid "Trigger a secondary click by holding down the primary button"
-msgstr "按住主要鍵時觸發次要點擊"
+msgstr "按住主要按鍵不放時觸發次要按鍵點擊"
 
 #: panels/universal-access/cc-pointing-dialog.ui:66
 #: panels/universal-access/cc-typing-dialog.ui:123
 #: panels/universal-access/cc-typing-dialog.ui:230
 msgid "A_cceptance delay:"
-msgstr "接受時間延遲(_C)："
+msgstr "觸發時間(_C)："
 
 #: panels/universal-access/cc-pointing-dialog.ui:78
 msgctxt "secondary click"
@@ -6268,7 +7055,7 @@ msgstr "短"
 
 #: panels/universal-access/cc-pointing-dialog.ui:90
 msgid "Secondary click delay"
-msgstr "第二次點擊延遲"
+msgstr "次要按鍵點擊延遲"
 
 #: panels/universal-access/cc-pointing-dialog.ui:97
 msgctxt "secondary click delay"
@@ -6277,15 +7064,15 @@ msgstr "é•·"
 
 #: panels/universal-access/cc-pointing-dialog.ui:126
 msgid "_Hover Click"
-msgstr "停駐即點擊(_H)"
+msgstr "懸停點擊(_H)"
 
 #: panels/universal-access/cc-pointing-dialog.ui:137
 msgid "Trigger a click when the pointer hovers"
-msgstr "當停止游標移動時觸發點擊"
+msgstr "滑鼠指標懸停在定點時觸發點擊"
 
 #: panels/universal-access/cc-pointing-dialog.ui:154
 msgid "D_elay:"
-msgstr "延遲(_E)："
+msgstr "懸停時間(_E)："
 
 #: panels/universal-access/cc-pointing-dialog.ui:166
 msgctxt "dwell click delay"
@@ -6299,7 +7086,7 @@ msgstr "é•·"
 
 #: panels/universal-access/cc-pointing-dialog.ui:201
 msgid "Motion _threshold:"
-msgstr "移動速度(_M)："
+msgstr "移動範圍閾值(_T)："
 
 #: panels/universal-access/cc-pointing-dialog.ui:213
 msgctxt "dwell click threshold"
@@ -6315,45 +7102,45 @@ msgstr "大"
 msgid "Repeat Keys"
 msgstr "重複按鍵"
 
-#: panels/universal-access/cc-repeat-keys-dialog.ui:29
+#: panels/universal-access/cc-repeat-keys-dialog.ui:32
 msgid "Key presses repeat when key is held down."
-msgstr "當按下某鍵不放時重複輸出該字元。"
+msgstr "按下某鍵不放時重複輸出字元。"
 
-#: panels/universal-access/cc-repeat-keys-dialog.ui:85
+#: panels/universal-access/cc-repeat-keys-dialog.ui:88
 msgid "Repeat keys delay"
 msgstr "按鍵重複延遲"
 
-#: panels/universal-access/cc-repeat-keys-dialog.ui:141
+#: panels/universal-access/cc-repeat-keys-dialog.ui:144
 msgid "Repeat keys speed"
 msgstr "按鍵重複速度"
 
 #: panels/universal-access/cc-typing-dialog.ui:4
 msgid "Typing Assist"
-msgstr "打字助理"
+msgstr "輸入助理"
 
 #: panels/universal-access/cc-typing-dialog.ui:41
 msgid "_Sticky Keys"
-msgstr "黏性特殊鍵(_S)"
+msgstr "相黏按鍵(_S)"
 
 #: panels/universal-access/cc-typing-dialog.ui:51
 msgid "Treats a sequence of modifier keys as a key combination"
-msgstr "將連續按的特殊鍵視為按鍵組合"
+msgstr "將連續按下的特殊按鍵視作按鍵組合"
 
 #: panels/universal-access/cc-typing-dialog.ui:63
 msgid "_Disable if two keys are pressed together"
-msgstr "如果同時按下任何兩鍵則停用(_D)"
+msgstr "若兩個按鍵同時按下則停用(_D)"
 
 #: panels/universal-access/cc-typing-dialog.ui:71
 msgid "Beep when a _modifier key is pressed"
-msgstr "當按下特殊按鍵時發出聲響(_M)"
+msgstr "特殊鍵按下時發出聲響(_M)"
 
 #: panels/universal-access/cc-typing-dialog.ui:96
 msgid "S_low Keys"
-msgstr "重複按鍵(_L)"
+msgstr "遲緩按鍵(_L)"
 
 #: panels/universal-access/cc-typing-dialog.ui:106
 msgid "Puts a delay between when a key is pressed and when it is accepted"
-msgstr "在按鍵被按下到它被接受之間置入延遲"
+msgstr "按鍵按下後需停留片刻再放開才會被傳送"
 
 #: panels/universal-access/cc-typing-dialog.ui:135
 msgctxt "slow keys delay"
@@ -6362,7 +7149,7 @@ msgstr "短"
 
 #: panels/universal-access/cc-typing-dialog.ui:147
 msgid "Slow keys typing delay"
-msgstr "降低按鍵輸入延遲"
+msgstr "遲緩按鍵觸發時間長度"
 
 #: panels/universal-access/cc-typing-dialog.ui:154
 msgctxt "slow keys delay"
@@ -6371,24 +7158,24 @@ msgstr "é•·"
 
 #: panels/universal-access/cc-typing-dialog.ui:166
 msgid "Beep when a key is pr_essed"
-msgstr "當按下按鍵時發出聲響(_E)"
+msgstr "按鍵按下時發出聲響(_E)"
 
 #: panels/universal-access/cc-typing-dialog.ui:173
 msgid "Beep when a key is _accepted"
-msgstr "當接受按鍵動作時發出聲響(_A)"
+msgstr "按鍵被接受時發出聲響(_A)"
 
 #: panels/universal-access/cc-typing-dialog.ui:180
 #: panels/universal-access/cc-typing-dialog.ui:273
 msgid "Beep when a key is _rejected"
-msgstr "當拒絕按鍵動作則發出聲響(_R)"
+msgstr "按鍵被拒絕時發出聲響(_R)"
 
 #: panels/universal-access/cc-typing-dialog.ui:203
 msgid "_Bounce Keys"
-msgstr "反彈鍵(_B)"
+msgstr "反彈按鍵(_B)"
 
 #: panels/universal-access/cc-typing-dialog.ui:213
 msgid "Ignores fast duplicate keypresses"
-msgstr "忽略快速重複按鍵"
+msgstr "忽略對按鍵快速重複按下的動作"
 
 #: panels/universal-access/cc-typing-dialog.ui:242
 msgctxt "bounce keys delay"
@@ -6397,20 +7184,20 @@ msgstr "短"
 
 #: panels/universal-access/cc-typing-dialog.ui:254
 msgid "Bounce keys typing delay"
-msgstr "反彈鍵輸入延遲"
+msgstr "反彈按鍵觸發時間長度"
 
 #: panels/universal-access/cc-typing-dialog.ui:261
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "é•·"
 
-#: panels/universal-access/cc-typing-dialog.ui:326
+#: panels/universal-access/cc-typing-dialog.ui:335
 msgid "_Enable by Keyboard"
-msgstr "由鍵盤啟用(_E)"
+msgstr "透過鍵盤啟用(_E)"
 
-#: panels/universal-access/cc-typing-dialog.ui:336
+#: panels/universal-access/cc-typing-dialog.ui:345
 msgid "Turn accessibility features on and off using the keyboard"
-msgstr "以鍵盤開啟與關閉無障礙功能"
+msgstr "使用鍵盤開啟與關閉無障礙功能"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
@@ -6443,11 +7230,11 @@ msgstr "最大"
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
-msgstr[0] "%d 像素"
+msgstr[0] "%d ç•«ç´ "
 
 #: panels/universal-access/cc-ua-panel.ui:17
 msgid "_Always Show Accessibility Menu"
-msgstr "永遠顯示無障礙存取選單(_A)"
+msgstr "永遠顯示無障礙輔助選單(_A)"
 
 #: panels/universal-access/cc-ua-panel.ui:31
 msgid "Seeing"
@@ -6471,19 +7258,19 @@ msgstr "螢幕閱讀器(_R)"
 
 #: panels/universal-access/cc-ua-panel.ui:71
 msgid "The screen reader reads displayed text as you move the focus."
-msgstr "螢幕閱讀器能在您移動焦點時讀出顯示的文字。"
+msgstr "螢幕閱讀器能朗讀您所指向的文字。"
 
 #: panels/universal-access/cc-ua-panel.ui:83
 msgid "_Sound Keys"
-msgstr "聲音按鍵(_S)"
+msgstr "按鍵聲音(_S)"
 
 #: panels/universal-access/cc-ua-panel.ui:84
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
-msgstr "當 Num Lock 或 Caps Lock 開啟時發出聲響。"
+msgstr "開啟或關閉 Num Lock 與 Caps Lock 時發出聲響提示。"
 
 #: panels/universal-access/cc-ua-panel.ui:96
 msgid "C_ursor Size"
-msgstr "游標大小(_U)"
+msgstr "滑鼠指標大小(_U)"
 
 #: panels/universal-access/cc-ua-panel.ui:116
 #: panels/universal-access/cc-zoom-options-dialog.ui:82
@@ -6497,7 +7284,7 @@ msgstr "聽覺"
 #: panels/universal-access/cc-ua-panel.ui:141
 #: panels/universal-access/cc-visual-alerts-dialog.ui:54
 msgid "_Visual Alerts"
-msgstr "視覺警示(_V)"
+msgstr "鈴響視覺化(_V)"
 
 #: panels/universal-access/cc-ua-panel.ui:166
 msgid "Screen _Keyboard"
@@ -6505,7 +7292,7 @@ msgstr "螢幕鍵盤(_K)"
 
 #: panels/universal-access/cc-ua-panel.ui:178
 msgid "R_epeat Keys"
-msgstr "重複鍵(_E)"
+msgstr "重複按鍵(_E)"
 
 #: panels/universal-access/cc-ua-panel.ui:198
 msgid "Cursor _Blinking"
@@ -6513,19 +7300,19 @@ msgstr "游標閃爍(_B)"
 
 #: panels/universal-access/cc-ua-panel.ui:218
 msgid "_Typing Assist (AccessX)"
-msgstr "打字助理 [AccessX](_T)"
+msgstr "輸入助理 (AccessX)(_T)"
 
 #: panels/universal-access/cc-ua-panel.ui:240
 msgid "Pointing &amp; Clicking"
-msgstr "指向與點選"
+msgstr "指向與點擊"
 
 #: panels/universal-access/cc-ua-panel.ui:243
 msgid "_Mouse Keys"
-msgstr "滑鼠按鍵(_M)"
+msgstr "滑鼠鍵(_M)"
 
 #: panels/universal-access/cc-ua-panel.ui:255
 msgid "_Locate Pointer"
-msgstr "定位印表機(_L)"
+msgstr "定位滑鼠指標(_L)"
 
 #: panels/universal-access/cc-ua-panel.ui:267
 msgid "_Click Assist"
@@ -6533,15 +7320,15 @@ msgstr "點擊助理(_C)"
 
 #: panels/universal-access/cc-ua-panel.ui:287
 msgid "_Double-Click Delay"
-msgstr "雙擊延遲(_D)"
+msgstr "點兩下的延遲時間(_D)"
 
 #: panels/universal-access/cc-ua-panel.ui:297
 msgid "Double-Click Delay"
-msgstr "雙擊延遲"
+msgstr "滑鼠按兩下的速度"
 
 #: panels/universal-access/cc-visual-alerts-dialog.ui:5
 msgid "Visual Alerts"
-msgstr "視覺警示"
+msgstr "鈴響視覺化"
 
 #: panels/universal-access/cc-visual-alerts-dialog.ui:14
 msgid "_Test flash"
@@ -6549,7 +7336,7 @@ msgstr "測試閃動(_T)"
 
 #: panels/universal-access/cc-visual-alerts-dialog.ui:38
 msgid "Use a visual indication when an alert sound occurs."
-msgstr "當警示音效發出時使用視覺化的指示。"
+msgstr "發出鈴響時使用視覺化指示。"
 
 #: panels/universal-access/cc-visual-alerts-dialog.ui:74
 msgid "Flash the entire _screen"
@@ -6557,7 +7344,7 @@ msgstr "閃動整個螢幕(_S)"
 
 #: panels/universal-access/cc-visual-alerts-dialog.ui:86
 msgid "Flash the entire _window"
-msgstr "閃動整個視窗(_W)"
+msgstr "閃動目前視窗(_W)"
 
 #: panels/universal-access/cc-zoom-options-dialog.c:306
 msgctxt "Distance"
@@ -6586,7 +7373,7 @@ msgstr "é•·"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:40
 msgid "Full Screen"
-msgstr "全螢幕"
+msgstr "整個螢幕"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:45
 msgid "Top Half"
@@ -6598,19 +7385,19 @@ msgstr "下半部"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:55
 msgid "Left Half"
-msgstr "左半"
+msgstr "左半部"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:60
 msgid "Right Half"
-msgstr "右半"
+msgstr "右半部"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:68
 msgid "Zoom Options"
-msgstr "放大鏡選項"
+msgstr "縮放選項"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:119
 msgid "_Magnification:"
-msgstr "放大率(_M)："
+msgstr "縮放倍率(_M)："
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:146
 msgid "Magnifier Position:"
@@ -6618,27 +7405,27 @@ msgstr "放大鏡位置："
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:163
 msgid "_Follow mouse cursor"
-msgstr "跟隨滑鼠遊標(_F)"
+msgstr "跟隨滑鼠指標(_F)"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:174
 msgid "_Screen part:"
-msgstr "螢幕部分(_S)："
+msgstr "螢幕範圍(_S)："
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:208
 msgid "Magnifier _extends outside of screen"
-msgstr "放大鏡延伸到螢幕外(_E)"
+msgstr "放大鏡延伸至螢幕外(_E)"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:215
 msgid "_Keep magnifier cursor centered"
-msgstr "保持放大鏡游標置中(_K)"
+msgstr "放大鏡指標保持置中(_K)"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:223
 msgid "Magnifier cursor _pushes contents around"
-msgstr "放大鏡游標將內容推到周圍(_P)"
+msgstr "放大鏡指標移動至四周時推動內容(_P)"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:231
 msgid "Magnifier cursor moves with _contents"
-msgstr "放大鏡游標隨內容移動(_C)"
+msgstr "放大鏡指標隨內容移動(_C)"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:247
 msgid "Magnifier"
@@ -6650,7 +7437,7 @@ msgstr "十字準星(_C)："
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:284
 msgid "_Overlaps mouse cursor"
-msgstr "重疊滑鼠遊標(_O)"
+msgstr "與滑鼠指標重疊(_O)"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:306
 msgid "_Thickness:"
@@ -6704,12 +7491,12 @@ msgstr "色彩(_L)"
 #: panels/universal-access/cc-zoom-options-dialog.ui:538
 msgctxt "universal access, color"
 msgid "None"
-msgstr "沒有"
+msgstr "黑白"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:556
 msgctxt "universal access, color"
 msgid "Full"
-msgstr "完全"
+msgstr "彩色"
 
 #: panels/universal-access/cc-zoom-options-dialog.ui:588
 msgctxt "universal access, brightness"
@@ -6737,7 +7524,7 @@ msgstr "色彩效果"
 
 #: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
 msgid "Make it easier to see, hear, type, point and click"
-msgstr "讓電腦更容易看、聽、輸入、指向與點按"
+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
@@ -6816,27 +7603,27 @@ msgstr "30 天"
 
 #: panels/usage/cc-usage-panel.c:180
 msgid "Empty all items from Trash?"
-msgstr "要清除垃圾桶中所有的項目？"
+msgstr "要清除垃圾桶中的所有項目嗎？"
 
 #: panels/usage/cc-usage-panel.c:181
 msgid "All items in the Trash will be permanently deleted."
-msgstr "所有在垃圾桶中的項目會永遠刪除。"
+msgstr "所有垃圾桶中的項目將永久刪除。"
 
 #: panels/usage/cc-usage-panel.c:182
 msgid "_Empty Trash"
-msgstr "清理垃圾桶(_E)"
+msgstr "清空垃圾桶(_E)"
 
 #: panels/usage/cc-usage-panel.c:218
 msgid "Delete all the temporary files?"
-msgstr "刪除所有暫存檔案？"
+msgstr "要刪除所有的暫存檔嗎？"
 
 #: panels/usage/cc-usage-panel.c:219
 msgid "All the temporary files will be permanently deleted."
-msgstr "所有的暫存檔案會永遠刪除。"
+msgstr "所有的暫存檔將永遠刪除。"
 
 #: panels/usage/cc-usage-panel.c:220
 msgid "_Purge Temporary Files"
-msgstr "清理暫存檔案(_P)"
+msgstr "清除暫存檔(_P)"
 
 #. Translators: Option for "File History Duration" in "File History" group
 #: panels/usage/cc-usage-panel.c:247
@@ -6872,8 +7659,8 @@ msgid ""
 "shared between applications, and makes it easier to find files that you "
 "might want to use."
 msgstr ""
-"檔案歷史記錄會保留您用過檔案的記錄。這個資訊會與應用程式共用，且會讓尋找可能"
-"想用的檔案變簡單。"
+"檔案歷史記錄會紀錄下您所使用過的檔案。該資訊會與其他應用程式分享，方便您找尋"
+"可能會需要的檔案。"
 
 #: panels/usage/cc-usage-panel.ui:13
 msgid "File H_istory"
@@ -6895,19 +7682,21 @@ msgstr "垃圾桶與暫存檔"
 msgid ""
 "Trash and temporary files can sometimes include personal or sensitive "
 "information. Automatically deleting them can help to protect privacy."
-msgstr "垃圾及暫存檔有時候可能會有個人或敏感資料。自動刪除會協助保障隱私權。"
+msgstr ""
+"垃圾桶與暫存檔中的資料可能涉及個人資料或敏感資料。自動定期清理能保障您的隱"
+"私。"
 
 #: panels/usage/cc-usage-panel.ui:67
 msgid "Automatically Delete _Trash Content"
-msgstr "自動刪除垃圾桶的內容(_T)"
+msgstr "自動清理垃圾桶(_T)"
 
 #: panels/usage/cc-usage-panel.ui:79
 msgid "Automatically Delete Temporary _Files"
-msgstr "自動刪除暫存檔案(_F)"
+msgstr "自動清理暫存檔(_F)"
 
 #: panels/usage/cc-usage-panel.ui:91
 msgid "Automatically Delete _Period"
-msgstr "自動刪除週期(_P)"
+msgstr "自動清理週期(_P)"
 
 #: panels/usage/cc-usage-panel.ui:115
 msgid "_Empty Trash…"
@@ -6915,26 +7704,34 @@ msgstr "清理垃圾桶(_E)…"
 
 #: panels/usage/cc-usage-panel.ui:126
 msgid "_Delete Temporary Files…"
-msgstr "刪除暫存檔案(_D)…"
+msgstr "清理暫存檔(_D)…"
 
 #: panels/usage/gnome-usage-panel.desktop.in.in:3
 msgid "File History & Trash"
-msgstr "檔案歷程記錄與垃圾桶"
+msgstr "檔案歷史記錄與垃圾桶"
 
 #: panels/usage/gnome-usage-panel.desktop.in.in:4
 msgid "Don't leave traces"
-msgstr "不留下追蹤"
+msgstr "不留下可被追蹤的訊息"
+
+#. Translators: Search terms to find the Usage panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/usage/gnome-usage-panel.desktop.in.in:20
+msgid ""
+"usage;recent;history;files;temporary;tmp;private;privacy;trash;purge;retain;"
+msgstr ""
+"usage;recent;history;files;temporary;tmp;private;privacy;trash;purge;retain;"
+"使用;最近;歷史;檔案;暫存檔;隱私權;垃圾桶;清除;保存;紀錄;追蹤;自動刪除;"
 
 #: panels/user-accounts/cc-add-user-dialog.c:35
 msgid "Should match the web address of your login provider."
-msgstr "應符合您的登入提供者的網路位址。"
+msgstr "應符合登入提供者的網路位址。"
 
 #: panels/user-accounts/cc-add-user-dialog.c:216
 msgid "Failed to add account"
-msgstr "無法加入到帳號"
+msgstr "無法加入帳號"
 
 #: panels/user-accounts/cc-add-user-dialog.c:679
-#: panels/user-accounts/cc-password-dialog.c:260
+#: panels/user-accounts/cc-password-dialog.ui:114
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
@@ -6946,7 +7743,7 @@ msgstr "無法註冊帳號"
 
 #: panels/user-accounts/cc-add-user-dialog.c:1055
 msgid "No supported way to authenticate with this domain"
-msgstr "沒有支援這個網域核對的方式"
+msgstr "不支援這個網域的認證方式"
 
 #: panels/user-accounts/cc-add-user-dialog.c:1119
 msgid "Failed to join domain"
@@ -6957,7 +7754,7 @@ msgid ""
 "That login name didn’t work.\n"
 "Please try again."
 msgstr ""
-"登入名稱沒有作用。\n"
+"登入名稱不起作用。\n"
 "請再試一次。"
 
 #: panels/user-accounts/cc-add-user-dialog.c:1181
@@ -6965,7 +7762,7 @@ msgid ""
 "That login password didn’t work.\n"
 "Please try again."
 msgstr ""
-"登入密碼沒有作用。\n"
+"登入密碼不起作用。\n"
 "請再試一次。"
 
 #: panels/user-accounts/cc-add-user-dialog.c:1189
@@ -6974,7 +7771,7 @@ msgstr "無法登入網域"
 
 #: panels/user-accounts/cc-add-user-dialog.c:1244
 msgid "Unable to find the domain. Maybe you misspelled it?"
-msgstr "找不到網域。也許您拼錯字？"
+msgstr "找不到網域，也許您拼錯字了？"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:15
 #: panels/user-accounts/data/join-dialog.ui:9
@@ -6990,41 +7787,41 @@ msgid ""
 "Administrators can add and remove other users, and can change settings for "
 "all users. Parental controls cannot be applied to administrators."
 msgstr ""
-"管理員可以加入與移除其他使用者，並且可以改變所有使用者的設定值。家長控制無法"
-"適用於管理員。"
+"管理員可以加入與移除其他使用者，並能更改所有使用者的設定。家長控制不適用於管"
+"理員。"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:149
 msgid "User sets password on first login"
-msgstr "使用者第一次登入時要設定密碼"
+msgstr "使用者首次登入時要求設定密碼"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:161
 msgid "Set password now"
-msgstr "立刻設定密碼"
+msgstr "立即設定密碼"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:224
 msgid "Confirm"
-msgstr "確認"
+msgstr "確認密碼"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:278
 msgid "Enterprise Login"
 msgstr "企業登入"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:279
-msgid "User accounts which are managed by a company or organisation."
-msgstr "受到由公司或組織管理的使用者帳號。"
+msgid "User accounts which are managed by a company or organization."
+msgstr "由公司或組織所管理的帳號。"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:385
+#: panels/user-accounts/cc-add-user-dialog.ui:388
 msgid "You are Offline"
 msgstr "您已離線"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:386
+#: panels/user-accounts/cc-add-user-dialog.ui:389
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
 "resources on the internet."
 msgstr ""
-"企業登入允許現有的集中管理式使用者帳號能用在這個裝置上。您也可以使用這個帳號"
-"來存取網際網路上的公司資源。"
+"企業登入功能可以讓集中管理的帳號在此裝置上使用；您也能透過該帳號存取公司的網"
+"路資源。"
 
 #: panels/user-accounts/cc-avatar-chooser.c:164
 msgid "Browse for more pictures"
@@ -7036,68 +7833,68 @@ msgstr "選擇檔案…"
 
 #: panels/user-accounts/cc-fingerprint-dialog.ui:8
 msgid "Fingerprint Manager"
-msgstr "指紋管理員"
+msgstr "指紋管理器"
 
 #: panels/user-accounts/cc-fingerprint-dialog.ui:20
 msgid "Fingerprint"
 msgstr "指紋"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:88
+#: panels/user-accounts/cc-fingerprint-dialog.ui:85
 msgid "_No"
 msgstr "否(_N)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:96
+#: panels/user-accounts/cc-fingerprint-dialog.ui:93
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:116
+#: panels/user-accounts/cc-fingerprint-dialog.ui:113
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
-msgstr "您是否要刪除您註冊的指紋？這將會停用指紋登入。"
+msgstr "確定要刪除先前所登錄的指紋嗎？刪除指紋會停用指紋登入。"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:172
+#: panels/user-accounts/cc-fingerprint-dialog.ui:169
 msgid "No fingerprint device"
 msgstr "沒有指紋裝置"
 
 #. Translators: This is the empty state page label which states that there are no devices ready.
-#: panels/user-accounts/cc-fingerprint-dialog.ui:187
+#: panels/user-accounts/cc-fingerprint-dialog.ui:184
 msgid "No Fingerprint device"
 msgstr "沒有指紋裝置"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:196
+#: panels/user-accounts/cc-fingerprint-dialog.ui:193
 msgid "Ensure the device is properly connected."
-msgstr "請確認裝置已適當連接。"
+msgstr "請確認裝置已確實連接。"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:204
+#: panels/user-accounts/cc-fingerprint-dialog.ui:201
 msgid "Fingerprint Device"
 msgstr "指紋裝置"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:213
+#: panels/user-accounts/cc-fingerprint-dialog.ui:210
 msgid "Choose the fingerprint device you want to configure"
-msgstr "請選擇您想要設定的指紋裝置"
+msgstr "請選擇欲設定的指紋裝置"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:243
+#: panels/user-accounts/cc-fingerprint-dialog.ui:240
 msgid "Fingerprint Login"
 msgstr "指紋登入"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:249
+#: panels/user-accounts/cc-fingerprint-dialog.ui:246
 msgid ""
 "Fingerprint login allows you to unlock and log into your computer with your "
 "finger"
-msgstr "指紋登入讓您可以用手指解鎖並登入電腦"
+msgstr "指紋登入能讓您透過手指來解鎖與登入電腦"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:276
+#: panels/user-accounts/cc-fingerprint-dialog.ui:273
 msgid "_Delete Fingerprints"
 msgstr "刪除指紋(_D)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:290
+#: panels/user-accounts/cc-fingerprint-dialog.ui:287
 msgid "Fingerprint Enroll"
-msgstr "指紋登錄"
+msgstr "登錄指紋"
 
 #: panels/user-accounts/cc-fingerprint-dialog.c:235
 msgid "the device needs to be claimed to perform this action"
-msgstr "需要索取裝置才能執行此動作"
+msgstr "須索取裝置才能執行此動作"
 
 #: panels/user-accounts/cc-fingerprint-dialog.c:237
 msgid "the device is already claimed by another process"
@@ -7105,141 +7902,141 @@ msgstr "該裝置已經被其他程序索取"
 
 #: panels/user-accounts/cc-fingerprint-dialog.c:239
 msgid "you do not have permission to perform the action"
-msgstr "您尚未取得執行該動作的授權"
+msgstr "您未取得執行該動作的許可"
 
 #: panels/user-accounts/cc-fingerprint-dialog.c:241
 msgid "no prints have been enrolled"
-msgstr "尚未有指紋登錄"
+msgstr "沒有已登錄的指紋"
 
 #: panels/user-accounts/cc-fingerprint-dialog.c:250
 msgid "Failed to communicate with the device during enrollment"
-msgstr "在登錄期間無法與裝置溝通"
+msgstr "無法與裝置通訊（登錄期間）"
 
 #: panels/user-accounts/cc-fingerprint-dialog.c:254
 msgid "Failed to communicate with the fingerprint reader"
-msgstr "無法與指紋讀取器溝通"
+msgstr "無法與指紋辨識器通訊"
 
 #: panels/user-accounts/cc-fingerprint-dialog.c:256
 msgid "Failed to communicate with the fingerprint daemon"
-msgstr "無法與指紋幕後程式溝通"
+msgstr "無法與指紋辨識器常駐程式通訊"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:539
+#: panels/user-accounts/cc-fingerprint-dialog.c:513
 #, c-format
 msgid "Failed to list fingerprints: %s"
 msgstr "無法列出指紋：%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:606
+#: panels/user-accounts/cc-fingerprint-dialog.c:580
 #, c-format
 msgid "Failed to delete saved fingerprints: %s"
-msgstr "無法刪除儲存的指紋：%s"
+msgstr "無法刪除已儲存的指紋：%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:637
+#: panels/user-accounts/cc-fingerprint-dialog.c:611
 msgid "Left thumb"
 msgstr "左手姆指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:639
+#: panels/user-accounts/cc-fingerprint-dialog.c:613
 msgid "Left middle finger"
 msgstr "左手中指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:641
+#: panels/user-accounts/cc-fingerprint-dialog.c:615
 msgid "_Left index finger"
 msgstr "左手食指(_L)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:643
+#: panels/user-accounts/cc-fingerprint-dialog.c:617
 msgid "Left ring finger"
 msgstr "左手無名指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:645
+#: panels/user-accounts/cc-fingerprint-dialog.c:619
 msgid "Left little finger"
 msgstr "左手小指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:647
+#: panels/user-accounts/cc-fingerprint-dialog.c:621
 msgid "Right thumb"
 msgstr "右手姆指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:649
+#: panels/user-accounts/cc-fingerprint-dialog.c:623
 msgid "Right middle finger"
 msgstr "右手中指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:651
+#: panels/user-accounts/cc-fingerprint-dialog.c:625
 msgid "_Right index finger"
 msgstr "右手食指(_R)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:653
+#: panels/user-accounts/cc-fingerprint-dialog.c:627
 msgid "Right ring finger"
 msgstr "右手無名指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:655
+#: panels/user-accounts/cc-fingerprint-dialog.c:629
 msgid "Right little finger"
 msgstr "右手小指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:657
+#: panels/user-accounts/cc-fingerprint-dialog.c:631
 msgid "Unknown Finger"
-msgstr "未知的手指"
+msgstr "不明手指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:791
+#: panels/user-accounts/cc-fingerprint-dialog.c:765
 msgctxt "Fingerprint enroll state"
 msgid "Complete"
-msgstr "完成"
+msgstr "登錄完畢"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:802
+#: panels/user-accounts/cc-fingerprint-dialog.c:776
 msgid "Fingerprint device disconnected"
 msgstr "指紋裝置已中斷連接"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:808
+#: panels/user-accounts/cc-fingerprint-dialog.c:782
 msgid "Fingerprint device storage is full"
-msgstr "指紋裝置儲存空間已滿"
+msgstr "指紋裝置的儲存空間已滿"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:812
+#: panels/user-accounts/cc-fingerprint-dialog.c:786
 msgid "Failed to enroll new fingerprint"
-msgstr "無法登錄新的指紋"
+msgstr "無法登錄新指紋"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:843
+#: panels/user-accounts/cc-fingerprint-dialog.c:817
 #, c-format
 msgid "Failed to start enrollment: %s"
-msgstr "無法啟動登錄：%s"
+msgstr "無法開始登錄程序：%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:851
+#: panels/user-accounts/cc-fingerprint-dialog.c:825
 msgctxt "Fingerprint enroll state"
 msgid "Failed to enroll new fingerprint"
-msgstr "無法登錄新的指紋"
+msgstr "無法登錄新指紋"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:882
+#: panels/user-accounts/cc-fingerprint-dialog.c:856
 #, c-format
 msgid "Failed to stop enrollment: %s"
-msgstr "無法停止登錄：%s"
+msgstr "無法停止登錄程序：%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:928
+#: panels/user-accounts/cc-fingerprint-dialog.c:902
 msgid ""
 "Repeatedly lift and place your finger on the reader to enroll your "
 "fingerprint"
-msgstr "請反複提起您的手指再重放到閱讀器上，以登錄您的指紋"
+msgstr "請將您的手指置於指紋辨識器上反覆抬起與放下來登錄指紋"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1047
+#: panels/user-accounts/cc-fingerprint-dialog.c:1021
 msgid "_Re-enroll this finger…"
 msgstr "重新登錄這隻手指(_R)…"
 
 #. TRANSLATORS: This is the label for the button to enroll a new finger
-#: panels/user-accounts/cc-fingerprint-dialog.c:1062
+#: panels/user-accounts/cc-fingerprint-dialog.c:1036
 msgid "Scan new fingerprint"
-msgstr "掃描新的指紋"
+msgstr "掃描新指紋"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1100
+#: panels/user-accounts/cc-fingerprint-dialog.c:1074
 #, c-format
 msgid "Failed to release fingerprint device %s: %s"
 msgstr "無法釋放指紋裝置 %s：%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1172
+#: panels/user-accounts/cc-fingerprint-dialog.c:1146
 msgctxt "Fingerprint enroll state"
 msgid "Problem Reading Device"
-msgstr "讀取裝置有問題"
+msgstr "讀取裝置存在問題"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1207
+#: panels/user-accounts/cc-fingerprint-dialog.c:1181
 #, c-format
 msgid "Failed to claim fingerprint device %s: %s"
 msgstr "無法索取指紋裝置 %s：%s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1358
+#: panels/user-accounts/cc-fingerprint-dialog.c:1332
 #, c-format
 msgid "Failed to get fingerprint devices: %s"
 msgstr "無法取得指紋裝置：%s"
@@ -7260,14 +8057,14 @@ msgstr "上週"
 #: panels/user-accounts/cc-login-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e"
-msgstr "%b%eæ—¥"
+msgstr "%-m月%e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
 #: panels/user-accounts/cc-login-history-dialog.c:93
 msgctxt "login history week label"
 msgid "%b %e, %Y"
-msgstr "%Yå¹´%b%eæ—¥"
+msgstr "%Y年-m月%e日"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
@@ -7280,7 +8077,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:179
-#: panels/user-accounts/cc-user-panel.c:712
+#: panels/user-accounts/cc-user-panel.c:727
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -7288,7 +8085,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:182
-#: panels/user-accounts/cc-user-panel.c:716
+#: panels/user-accounts/cc-user-panel.c:731
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -7309,45 +8106,53 @@ msgstr "作業階段開始"
 msgid "%s — Account Activity"
 msgstr "%s — 帳號活動"
 
-#: panels/user-accounts/cc-password-dialog.c:133
+#: panels/user-accounts/cc-login-history-dialog.ui:30
+msgid "Previous"
+msgstr "上週"
+
+#: panels/user-accounts/cc-login-history-dialog.ui:40
+msgid "Next"
+msgstr "下週"
+
+#: panels/user-accounts/cc-password-dialog.c:127
 msgid "Please choose another password."
 msgstr "請選擇其他密碼。"
 
-#: panels/user-accounts/cc-password-dialog.c:142
+#: panels/user-accounts/cc-password-dialog.c:136
 msgid "Please type your current password again."
-msgstr "請再次輸入您目前的密碼。"
+msgstr "請再次輸入目前的密碼。"
 
-#: panels/user-accounts/cc-password-dialog.c:148
+#: panels/user-accounts/cc-password-dialog.c:142
 msgid "Password could not be changed"
-msgstr "密碼無法變更"
+msgstr "無法更改密碼"
 
 #: panels/user-accounts/cc-password-dialog.ui:4
 msgid "Change Password"
 msgstr "更改密碼"
 
-#: panels/user-accounts/cc-password-dialog.ui:32
+#: panels/user-accounts/cc-password-dialog.ui:34
 msgid "Ch_ange"
-msgstr "改變(_A)"
+msgstr "更改(_A)"
 
-#: panels/user-accounts/cc-password-dialog.ui:51
+#: panels/user-accounts/cc-password-dialog.ui:53
 msgid "Current Password"
-msgstr "目前的密碼"
+msgstr "目前密碼"
 
-#: panels/user-accounts/cc-password-dialog.ui:76
+#: panels/user-accounts/cc-password-dialog.ui:68
 msgid "New Password"
 msgstr "新密碼"
 
-#: panels/user-accounts/cc-password-dialog.ui:121
+#: panels/user-accounts/cc-password-dialog.ui:99
 msgid "Confirm Password"
 msgstr "確認新密碼"
 
-#: panels/user-accounts/cc-password-dialog.ui:175
+#: panels/user-accounts/cc-password-dialog.ui:153
 msgid "Allow user to change their password on next login"
-msgstr "允許使用者在下次登入時改變他們的密碼"
+msgstr "允許使用者在下次登入時更改密碼"
 
-#: panels/user-accounts/cc-password-dialog.ui:186
+#: panels/user-accounts/cc-password-dialog.ui:165
 msgid "Set a password now"
-msgstr "立刻設定密碼"
+msgstr "立即設定密碼"
 
 #: panels/user-accounts/cc-realm-manager.c:303
 msgid "Cannot automatically join this type of domain"
@@ -7355,13 +8160,13 @@ msgstr "不能自動加入這個類型的網域"
 
 #: panels/user-accounts/cc-realm-manager.c:306
 msgid "No such domain or realm found"
-msgstr "找不到這個網域或領域名稱"
+msgstr "找不到網域或領域名稱"
 
 #: panels/user-accounts/cc-realm-manager.c:712
 #: panels/user-accounts/cc-realm-manager.c:726
-#, c-format
+#, fuzzy, c-format
 msgid "Cannot log in as %s at the %s domain"
-msgstr "不能以 %s 身分登入 %s 網域"
+msgstr "不能以 %s 的身份登入 %s 網域"
 
 #: panels/user-accounts/cc-realm-manager.c:718
 msgid "Invalid password, please try again"
@@ -7370,185 +8175,194 @@ msgstr "密碼錯誤，請再試一次"
 #: panels/user-accounts/cc-realm-manager.c:731
 #, c-format
 msgid "Couldn’t connect to the %s domain: %s"
-msgstr "無法連接到 %s 網域：%s"
+msgstr "無法連接 %s 網域：%s"
 
-#: panels/user-accounts/cc-user-panel.c:341
+#: panels/user-accounts/cc-user-panel.c:356
 msgid "Failed to delete user"
-msgstr "刪除使用者失敗"
+msgstr "無法刪除使用者"
 
-#: panels/user-accounts/cc-user-panel.c:398
-#: panels/user-accounts/cc-user-panel.c:453
-#: panels/user-accounts/cc-user-panel.c:499
+#: panels/user-accounts/cc-user-panel.c:413
+#: panels/user-accounts/cc-user-panel.c:468
+#: panels/user-accounts/cc-user-panel.c:514
 msgid "Failed to revoke remotely managed user"
-msgstr "註銷遠端管理的使用者失敗"
+msgstr "無法註銷遠端管理的使用者"
 
-#: panels/user-accounts/cc-user-panel.c:548
+#: panels/user-accounts/cc-user-panel.c:563
 msgid "You cannot delete your own account."
 msgstr "您不能刪除自己的帳號。"
 
-#: panels/user-accounts/cc-user-panel.c:557
+#: panels/user-accounts/cc-user-panel.c:572
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 仍在登入中"
 
-#: panels/user-accounts/cc-user-panel.c:561
+#: panels/user-accounts/cc-user-panel.c:576
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
-msgstr "在使用者登入期間刪除他會使系統處於不穩定的狀態。"
+msgstr "在使用者登入期間刪除其帳號會使系統處於不穩定的狀態。"
 
-#: panels/user-accounts/cc-user-panel.c:570
+#: panels/user-accounts/cc-user-panel.c:585
 #, c-format
 msgid "Do you want to keep %s’s files?"
-msgstr "您想要保留 %s 的檔案嗎？"
+msgstr "您要保留 %s 的檔案嗎？"
 
-#: panels/user-accounts/cc-user-panel.c:574
+#: panels/user-accounts/cc-user-panel.c:589
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
-msgstr ""
-"刪除使用者時，可以選擇保留家目錄、新進郵件 (mail spool) 與暫存檔案等資料。"
+msgstr "刪除使用者時，可以選擇是否要保留家目錄、電子郵件與暫存檔等資料。"
 
-#: panels/user-accounts/cc-user-panel.c:577
+#: panels/user-accounts/cc-user-panel.c:592
 msgid "_Delete Files"
 msgstr "刪除檔案(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:578
+#: panels/user-accounts/cc-user-panel.c:593
 msgid "_Keep Files"
 msgstr "保留檔案(_K)"
 
-#: panels/user-accounts/cc-user-panel.c:592
+#: panels/user-accounts/cc-user-panel.c:607
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
-msgstr "確定要註銷遠端管理的 %s 帳號？"
+msgstr "確定要註銷遠端管理的 %s 帳號嗎？"
 
-#: panels/user-accounts/cc-user-panel.c:596
+#: panels/user-accounts/cc-user-panel.c:611
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:646
+#: panels/user-accounts/cc-user-panel.c:661
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳號已停用"
 
-#: panels/user-accounts/cc-user-panel.c:654
+#: panels/user-accounts/cc-user-panel.c:669
 msgctxt "Password mode"
 msgid "To be set at next login"
-msgstr "在下次登入時設定"
+msgstr "下次登入時再設定"
 
-#: panels/user-accounts/cc-user-panel.c:657
+#: panels/user-accounts/cc-user-panel.c:672
 msgctxt "Password mode"
 msgid "None"
 msgstr "沒有"
 
-#: panels/user-accounts/cc-user-panel.c:700
+#: panels/user-accounts/cc-user-panel.c:715
 msgid "Logged in"
 msgstr "已登入"
 
-#. TRANSLATORS: Status of Parental Controls setup
-#: panels/user-accounts/cc-user-panel.c:787
-#: panels/user-accounts/cc-user-panel.c:876
-#: panels/wwan/cc-wwan-device-page.c:476
-msgid "Enabled"
-msgstr "已啟用"
-
-#: panels/user-accounts/cc-user-panel.c:1173
+#: panels/user-accounts/cc-user-panel.c:1202
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: panels/user-accounts/cc-user-panel.c:1175
+#: panels/user-accounts/cc-user-panel.c:1204
 msgid "Please make sure that the AccountService is installed and enabled."
-msgstr "請確定 AccountService 已經安裝並啟用。"
+msgstr "請確保已在系統上安裝並啟用《AccountService》。"
 
-#: panels/user-accounts/cc-user-panel.c:1197
+#: panels/user-accounts/cc-user-panel.c:1226
 msgid "This panel must be unlocked to change this setting"
-msgstr "必須解除鎖定此面板才能變更設定"
+msgstr "需先解鎖此面板才能更改設定"
 
-#: panels/user-accounts/cc-user-panel.c:1264
+#: panels/user-accounts/cc-user-panel.c:1293
 msgid "Delete the selected user account"
-msgstr "刪除選取的使用者帳號"
+msgstr "刪除所選的使用者帳號"
 
-#: panels/user-accounts/cc-user-panel.c:1268
-#: panels/user-accounts/cc-user-panel.c:1377
+#: panels/user-accounts/cc-user-panel.c:1297
+#: panels/user-accounts/cc-user-panel.c:1409
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
 msgstr ""
-"要刪除選取的使用者帳號，\n"
+"要刪除所選的使用者帳號，\n"
 "請先點選 * 圖示"
 
-#: panels/user-accounts/cc-user-panel.c:1423
+#: panels/user-accounts/cc-user-panel.c:1455
 msgid "Unlock to Add Users and Change Settings"
-msgstr "請解除鎖定以加入使用者與變更設定"
+msgstr "解鎖以加入使用者與更改設定"
 
 #: panels/user-accounts/cc-user-panel.ui:23
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "使用者"
 
-#: panels/user-accounts/cc-user-panel.ui:60
+#: panels/user-accounts/cc-user-panel.ui:63
 msgid "Your session needs to be restarted for changes to take effect"
-msgstr "您的作業階段需要重新啟動以讓變更生效"
+msgstr "您的作業階段需要重新啟動才能使更動生效"
 
-#: panels/user-accounts/cc-user-panel.ui:67
+#: panels/user-accounts/cc-user-panel.ui:70
 msgid "Restart Now"
-msgstr "立刻重新啟動"
+msgstr "立即重新啟動"
+
+#: panels/user-accounts/cc-user-panel.ui:79
+msgid "Close"
+msgstr "關閉"
+
+#: panels/user-accounts/cc-user-panel.ui:120
+msgid "Edit avatar"
+msgstr "編輯大頭貼"
+
+#: panels/user-accounts/cc-user-panel.ui:152
+msgid "Full name"
+msgstr "全名"
+
+#: panels/user-accounts/cc-user-panel.ui:171
+#: panels/wwan/cc-wwan-apn-dialog.c:295
+msgid "Edit"
+msgstr "編輯"
 
 #. FIXME
-#: panels/user-accounts/cc-user-panel.ui:195
+#: panels/user-accounts/cc-user-panel.ui:202
 msgid "_Fingerprint Login"
 msgstr "指紋登入(_F)"
 
-#: panels/user-accounts/cc-user-panel.ui:218
+#: panels/user-accounts/cc-user-panel.ui:225
 msgid "A_utomatic Login"
 msgstr "自動登入(_U)"
 
-#: panels/user-accounts/cc-user-panel.ui:231
+#: panels/user-accounts/cc-user-panel.ui:238
 msgid "Account Activity"
 msgstr "帳號活動"
 
-#: panels/user-accounts/cc-user-panel.ui:259
+#: panels/user-accounts/cc-user-panel.ui:266
 msgid "_Administrator"
 msgstr "管理員(_A)"
 
-#: panels/user-accounts/cc-user-panel.ui:260
+#: panels/user-accounts/cc-user-panel.ui:267
 msgid ""
 "Administrators can add and remove other users, and can change settings for "
 "all users."
-msgstr "管理員可以加入與移除其他使用者，並且可以改變所有使用者的設定值。"
+msgstr "管理員可以加入與移除其他使用者，並可以更改所有使用者的設定值。"
 
-#: panels/user-accounts/cc-user-panel.ui:276
+#: panels/user-accounts/cc-user-panel.ui:283
 msgid "_Parental Controls"
 msgstr "家長控制(_P)"
 
-#: panels/user-accounts/cc-user-panel.ui:277
+#: panels/user-accounts/cc-user-panel.ui:284
 msgid "Open the Parental Controls application."
 msgstr "開啟家長控制應用程式。"
 
-#: panels/user-accounts/cc-user-panel.ui:328
+#: panels/user-accounts/cc-user-panel.ui:335
 msgid "Remove User…"
 msgstr "移除使用者…"
 
-#: panels/user-accounts/cc-user-panel.ui:340
+#: panels/user-accounts/cc-user-panel.ui:347
 msgid "Other Users"
 msgstr "其他使用者"
 
-#: panels/user-accounts/cc-user-panel.ui:353
+#: panels/user-accounts/cc-user-panel.ui:360
 msgid "Add 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:381
+#: panels/user-accounts/cc-user-panel.ui:388
 msgid "No Users Found"
 msgstr "找不到使用者"
 
-#: panels/user-accounts/cc-user-panel.ui:390
+#: panels/user-accounts/cc-user-panel.ui:397
 msgid "Unlock to add a user account."
-msgstr "解除使用者帳號的新增鎖定。"
+msgstr "解鎖以新增使用者帳號。"
 
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
 msgid "Add or remove users and change your password"
-msgstr "加入或移除使用者並改變您的密碼"
+msgstr "加入或移除使用者及更改您的密碼"
 
 #. Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:20
@@ -7576,9 +8390,8 @@ msgid ""
 "enrolled in the domain. Please have your network administrator\n"
 "type their domain password here."
 msgstr ""
-"為了使用企業登入，這個電腦需要\n"
-"加入網域。請網路管理員在這裡\n"
-"輸入網域密碼。"
+"欲使用企業登入，需將該電腦登錄至網域中。\n"
+"請通知您的網路管理員於此輸入網域密碼。"
 
 #: panels/user-accounts/data/join-dialog.ui:112
 msgid "Administrator _Name"
@@ -7594,27 +8407,27 @@ msgstr "管理使用者帳號"
 
 #: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
 msgid "Authentication is required to change user data"
-msgstr "改變使用者資料需要核對"
+msgstr "更改使用者資料需要核對身分"
 
 #: panels/user-accounts/pw-utils.c:94
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
-msgstr "新的密碼需要與舊密碼有所差異。"
+msgstr "新密碼需與舊密碼有所差異。"
 
 #: panels/user-accounts/pw-utils.c:96
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
-msgstr "試著改變某些文字與數字。"
+msgstr "試著更動某些英文字母與數字。"
 
 #: panels/user-accounts/pw-utils.c:98 panels/user-accounts/pw-utils.c:106
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
-msgstr "試著更常改變密碼。"
+msgstr "試著更大幅地更動密碼。"
 
 #: panels/user-accounts/pw-utils.c:100
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
-msgstr "不含您的使用者名稱的密碼強度會比較高。"
+msgstr "不含使用者名稱的密碼強度會更高。"
 
 #: panels/user-accounts/pw-utils.c:102
 msgctxt "Password hint"
@@ -7624,17 +8437,17 @@ msgstr "試著避免在密碼中使用您的姓名。"
 #: panels/user-accounts/pw-utils.c:104
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
-msgstr "試著避免在密碼中包含某些文字。"
+msgstr "試著避免在密碼中包含某些單字。"
 
 #: panels/user-accounts/pw-utils.c:108
 msgctxt "Password hint"
 msgid "Try to avoid common words."
-msgstr "試著避免常見的文字。"
+msgstr "試著避免常用單字。"
 
 #: panels/user-accounts/pw-utils.c:110
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
-msgstr "試著避免重新排序現有的文字。"
+msgstr "試著避免重新排序已有的單字。"
 
 #: panels/user-accounts/pw-utils.c:112
 msgctxt "Password hint"
@@ -7644,137 +8457,139 @@ msgstr "試著使用更多數字。"
 #: panels/user-accounts/pw-utils.c:114
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
-msgstr "試著使用更多大寫字母。"
+msgstr "試著使用更多大寫英文字母。"
 
 #: panels/user-accounts/pw-utils.c:116
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
-msgstr "試著使用更多小寫字母。"
+msgstr "試著使用更多小寫英文字母。"
 
 #: panels/user-accounts/pw-utils.c:118
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
-msgstr "試著使用更多特殊字元，像是標點符號。"
+msgstr "試著使用更多特殊字元，例如半形標點符號。"
 
 #: panels/user-accounts/pw-utils.c:120
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
-msgstr "試著使用混合字母、數字與標點符號。"
+msgstr "試著混合使用英文字母、數字、半形標點符號等。"
 
 #: panels/user-accounts/pw-utils.c:122
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
-msgstr "試著避免同樣字元。"
+msgstr "試著避免重複使用相同字元。"
 
 #: panels/user-accounts/pw-utils.c:124
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
-msgstr "試著避免重複同樣類型的字元：您需要混合字母、數字與標點符號。"
+msgstr "試著避免重複使用相同類型的字元：需混合英文字母、數字、半形標點符號等。"
 
 #: panels/user-accounts/pw-utils.c:126
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
-msgstr "試著避免像 1234 或 abcd 等順序。"
+msgstr "試著避免使用如 1234 或 abcd 之類的連續字元。"
 
 #: panels/user-accounts/pw-utils.c:128
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
 "punctuation."
-msgstr "密碼需要更長。試著加入更多字母、數字與標點符號。"
+msgstr "密碼長度不足。試著加入更多英文字母、數字、半形標點符號等。"
 
 #: panels/user-accounts/pw-utils.c:130
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
-msgstr "混合大寫與小寫字元並嘗試使用一到兩個數字。"
+msgstr "混合英文大小寫字元並試著使用 1 至 2 個數字。"
 
 #: panels/user-accounts/pw-utils.c:132
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
-msgstr "加入更多字母、數字與標點符號會讓密碼更強。"
+msgstr "加入更多英文字母、數字、半形標點符號能使密碼強度更高。"
 
-#: panels/user-accounts/run-passwd.c:413
+#: panels/user-accounts/run-passwd.c:401
 msgid "Authentication failed"
-msgstr "核對失敗"
+msgstr "身分核對失敗"
 
-#: panels/user-accounts/run-passwd.c:492
+#: panels/user-accounts/run-passwd.c:480
 #, c-format
 msgid "The new password is too short"
-msgstr "新的密碼太短"
+msgstr "新密碼過短"
 
-#: panels/user-accounts/run-passwd.c:498
+#: panels/user-accounts/run-passwd.c:486
 #, c-format
 msgid "The new password is too simple"
-msgstr "新的密碼太簡單"
+msgstr "新密碼過於簡單"
 
-#: panels/user-accounts/run-passwd.c:504
+#: panels/user-accounts/run-passwd.c:492
 #, c-format
 msgid "The old and new passwords are too similar"
-msgstr "舊密碼與新密碼太相似"
+msgstr "舊密碼與新密碼過於相似"
 
-#: panels/user-accounts/run-passwd.c:507
+#: panels/user-accounts/run-passwd.c:495
 #, c-format
 msgid "The new password has already been used recently."
-msgstr "新的密碼已在最近使用過。"
+msgstr "新密碼已在最近使用過。"
 
-#: panels/user-accounts/run-passwd.c:510
+#: panels/user-accounts/run-passwd.c:498
 #, c-format
 msgid "The new password must contain numeric or special characters"
-msgstr "新的密碼必須包含數字或特殊字元"
+msgstr "新密碼須包含數字或特殊字元"
 
-#: panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:502
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "舊密碼與新密碼相同"
 
-#: panels/user-accounts/run-passwd.c:518
+#: panels/user-accounts/run-passwd.c:506
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
-msgstr "您的密碼在第一次通過身分核對後已經更改！"
+msgstr "您的密碼在先前身分核對之後已更動！"
 
-#: panels/user-accounts/run-passwd.c:522
-#, c-format
+# (Freddy)新密碼並未包含足夠的不同字元
+#: panels/user-accounts/run-passwd.c:510
+#, fuzzy, c-format
 msgid "The new password does not contain enough different characters"
-msgstr "新的密碼並未包含足夠的不同字元"
+msgstr "新密碼需與舊密碼有所差異"
 
-#: panels/user-accounts/run-passwd.c:526
+#: panels/user-accounts/run-passwd.c:514
 #: panels/wwan/cc-wwan-errors-private.h:72
 #, c-format
 msgid "Unknown error"
-msgstr "不明的錯誤"
+msgstr "不明錯誤"
 
 #: panels/user-accounts/user-utils.c:144
 msgid ""
 "The username should usually only consist of lower case letters from a-z, "
 "digits and the following characters: - _"
-msgstr "使用者名稱通常只能有小寫英文字母 a 到 z、數字與下述字元：- _"
+msgstr "使用者名稱通常僅能包含小寫英文字母 a 至 z、數字與下述字元：- _"
 
 #: panels/user-accounts/user-utils.c:148
 msgid "Sorry, that user name isn’t available. Please try another."
-msgstr "抱歉，使用者名稱無法使用。請嘗試另一個。"
+msgstr "抱歉，該使用者名稱無法使用。請嘗試其他名稱。"
 
 #: panels/user-accounts/user-utils.c:190
 msgid "The username is too long."
-msgstr "使用者名稱太長。"
+msgstr "使用者名稱過長。"
 
-#: panels/wacom/button-mapping.ui:7 panels/wacom/cc-wacom-page.ui:38
+#: panels/wacom/button-mapping.ui:7 panels/wacom/cc-wacom-ekr-page.ui:19
+#: panels/wacom/cc-wacom-page.ui:40
 msgid "Map Buttons"
-msgstr "對應按鈕"
+msgstr "按鍵功能"
 
 #: panels/wacom/button-mapping.ui:26
 msgid "Map buttons to functions"
-msgstr "功能對應按鈕"
+msgstr "指定按鍵的功能"
 
 #: panels/wacom/button-mapping.ui:51
 msgid ""
 "To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
 msgstr ""
-"若要編輯快捷鍵，請選擇「傳送按鍵」動作，按下鍵盤捷徑按鈕與新的按鍵組合，或以 "
-"Backspace 鍵來清除。"
+"要編輯快捷鍵，請選擇「傳送按鍵」，並按下欲傳送的鍵盤快捷鍵與新按鍵；或按 "
+"Backspace 來清除。"
 
 #: panels/wacom/button-mapping.ui:66
 msgid "_Close"
@@ -7784,21 +8599,21 @@ msgstr "關閉(_C)"
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
-msgstr "請點一下出現在螢幕上的目標標記來校準繪圖板。"
+msgstr "請點選螢幕上所出現的目標標記來校準繪圖板。"
 
 #: panels/wacom/calibrator/calibrator.ui:63
 msgid "Mis-click detected, restarting…"
-msgstr "偵測到誤點，重新開始…"
+msgstr "偵測到錯誤的點擊，正在重新開始…"
 
 #: panels/wacom/cc-wacom-button-row.c:244
 #, c-format
 msgid "Button %d"
-msgstr "按鈕 %d"
+msgstr "按鍵 %d"
 
 #: panels/wacom/cc-wacom-button-row.h:34
 msgctxt "Wacom action-type"
 msgid "Application defined"
-msgstr "定義的程式"
+msgstr "指定的應用程式"
 
 #: panels/wacom/cc-wacom-button-row.h:35
 msgctxt "Wacom action-type"
@@ -7808,12 +8623,12 @@ msgstr "傳送按鍵"
 #: panels/wacom/cc-wacom-button-row.h:36
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
-msgstr "切換監視器"
+msgstr "切換顯示器"
 
 #: panels/wacom/cc-wacom-button-row.h:37
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
-msgstr "顯示螢幕求助"
+msgstr "在螢幕上顯示按鍵功能"
 
 #: panels/wacom/cc-wacom-device.c:431
 msgid "Tablet mounted on laptop panel"
@@ -7827,8 +8642,13 @@ msgstr "繪圖板裝載至外接顯示器上"
 msgid "External tablet device"
 msgstr "外接繪圖板裝置"
 
+#. translators: this is a drawing tablet pad, i.e. a collection of buttons and knobs
+#: panels/wacom/cc-wacom-ekr-page.ui:9
+msgid "External pad device"
+msgstr "外接繪圖板裝置"
+
 #. All displays item
-#: panels/wacom/cc-wacom-page.c:608
+#: panels/wacom/cc-wacom-page.c:643
 msgid "All Displays"
 msgstr "所有顯示器"
 
@@ -7838,30 +8658,30 @@ msgstr "繪圖板模式"
 
 #: panels/wacom/cc-wacom-page.ui:17
 msgid "Use absolute positioning for the pen"
-msgstr "繪圖筆使用絕對定位"
+msgstr "數位筆使用絕對定位"
 
-#: panels/wacom/cc-wacom-page.ui:27
+#: panels/wacom/cc-wacom-page.ui:28
 msgid "Left Hand Orientation"
-msgstr "左手方向"
+msgstr "左手操作"
 
-#: panels/wacom/cc-wacom-page.ui:28
+#: panels/wacom/cc-wacom-page.ui:29
 msgid "Tablet and Express Keysâ„¢ are rotated for left hand use"
-msgstr "繪圖板與 Express Keys™ 可旋轉給左手使用"
+msgstr "將繪圖板與 Express Keys™ 旋轉至對側以適用於左手"
 
-#: panels/wacom/cc-wacom-page.ui:56
+#: panels/wacom/cc-wacom-page.ui:58
 msgctxt "display setting"
 msgid "Map to Monitor"
-msgstr "對應至顯示器"
+msgstr "顯示器鏡射"
 
-#: panels/wacom/cc-wacom-page.ui:62
+#: panels/wacom/cc-wacom-page.ui:64
 msgid "Keep Aspect Ratio"
 msgstr "維持寬長比"
 
-#: panels/wacom/cc-wacom-page.ui:63
+#: panels/wacom/cc-wacom-page.ui:65
 msgid "Only use a portion of the tablet surface to keep monitor aspect ratio"
-msgstr "僅使用繪圖板表面的一部分來維持螢幕寬長比"
+msgstr "僅使用部分的繪圖板面積並以相同寬長比鏡射至顯示器"
 
-#: panels/wacom/cc-wacom-page.ui:73
+#: panels/wacom/cc-wacom-page.ui:76
 msgid "Calibrate"
 msgstr "校準"
 
@@ -7871,11 +8691,11 @@ msgstr "未偵測到繪圖板"
 
 #: panels/wacom/cc-wacom-panel.ui:57
 msgid "Please plug in or turn on your Wacom tablet."
-msgstr "請插入或開啟您的 Wacom 繪圖板。"
+msgstr "請將 Wacom 繪圖板接上或開啟。"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:16
 msgid "Tip Pressure Feel"
-msgstr "點選壓力感應"
+msgstr "筆尖壓力感應"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:21
 #: panels/wacom/cc-wacom-stylus-page.ui:82
@@ -7884,7 +8704,7 @@ msgstr "輕"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:35
 msgid "Stylus tip pressure"
-msgstr "觸控筆尖壓力"
+msgstr "數位筆壓力感應的輕重"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:41
 #: panels/wacom/cc-wacom-stylus-page.ui:102
@@ -7894,17 +8714,17 @@ msgstr "重"
 #: panels/wacom/cc-wacom-stylus-page.ui:54
 msgctxt "display setting"
 msgid "Button 1"
-msgstr "按鈕 1"
+msgstr "按鍵 1"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:62
 msgctxt "display setting"
 msgid "Button 2"
-msgstr "按鈕 2"
+msgstr "按鍵 2"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:70
 msgctxt "display setting"
 msgid "Button 3"
-msgstr "按鈕 3"
+msgstr "按鍵 3"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:77
 msgid "Eraser Pressure Feel"
@@ -7914,17 +8734,13 @@ msgstr "橡皮擦壓力感應"
 msgid "Eraser pressure"
 msgstr "橡皮擦壓力"
 
-#: panels/wacom/cc-wacom-stylus-page.ui:133
-msgid "Default"
-msgstr "預設值"
-
 #: panels/wacom/cc-wacom-stylus-page.ui:134
 msgid "Middle Mouse Button Click"
-msgstr "滑鼠中鍵點擊"
+msgstr "滑鼠中鍵"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:135
 msgid "Right Mouse Button Click"
-msgstr "滑鼠右鍵點擊"
+msgstr "滑鼠右鍵"
 
 #: panels/wacom/cc-wacom-stylus-page.ui:137
 msgid "Forward"
@@ -7932,19 +8748,19 @@ msgstr "下一頁"
 
 #: panels/wacom/cc-wacom-tool.c:321
 msgid "Airbrush stylus with pressure, tilt, and integrated slider"
-msgstr "Airbrush 觸控筆搭配壓感、傾斜偵測與整合式滑鈕"
+msgstr "Airbrush 數位筆搭載壓力感應、傾斜偵測與整合式滑鈕"
 
 #: panels/wacom/cc-wacom-tool.c:323
 msgid "Airbrush stylus with pressure, tilt, and rotation"
-msgstr "Airbrush 觸控筆搭配壓感、傾斜偵測與旋轉"
+msgstr "Airbrush 數位筆搭載壓力感應、傾斜偵測與旋轉"
 
 #: panels/wacom/cc-wacom-tool.c:325
 msgid "Standard stylus with pressure and tilt"
-msgstr "標準觸控筆搭配壓感與傾斜偵測"
+msgstr "標準數位筆搭載壓力感應與傾斜偵測"
 
 #: panels/wacom/cc-wacom-tool.c:327
 msgid "Standard stylus with pressure"
-msgstr "標準觸控筆搭配壓感"
+msgstr "標準數位筆搭載壓力感應"
 
 #: panels/wacom/gnome-wacom-panel.desktop.in.in:3
 msgid "Wacom Tablet"
@@ -7952,7 +8768,7 @@ msgstr "Wacom 繪圖板"
 
 #: panels/wacom/gnome-wacom-panel.desktop.in.in:4
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
-msgstr "設定繪圖板的按鈕對映與調整觸控筆的靈敏度"
+msgstr "設定繪圖板的按鍵對映與調整數位筆的壓力感應力度"
 
 #. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/wacom/gnome-wacom-panel.desktop.in.in:19
@@ -7967,8 +8783,7 @@ msgstr "新增快捷鍵…"
 msgid "Access Points"
 msgstr "存取點"
 
-#: panels/wwan/cc-wwan-apn-dialog.ui:122
-#| msgid "VPN"
+#: panels/wwan/cc-wwan-apn-dialog.ui:123
 msgid "APN"
 msgstr "APN"
 
@@ -7978,7 +8793,7 @@ msgstr "操作已取消"
 
 #: panels/wwan/cc-wwan-data.c:545
 msgid "<b>Error:</b> Access denied changing settings"
-msgstr "<b>錯誤：</b>變更設定時拒絕存取"
+msgstr "<b>錯誤：</b>更改設定時存取遭拒"
 
 #: panels/wwan/cc-wwan-data.c:548
 msgid "<b>Error:</b> Mobile Equipment Error"
@@ -8026,7 +8841,7 @@ msgstr "網路狀態"
 
 #: panels/wwan/cc-wwan-details-dialog.ui:122
 msgid "Own Number"
-msgstr "擁有號碼"
+msgstr "擁有者號碼"
 
 #: panels/wwan/cc-wwan-details-dialog.ui:151
 msgid "Device Details"
@@ -8048,59 +8863,167 @@ msgstr "僅 3G"
 msgid "4G Only"
 msgstr "僅 4G"
 
-#: panels/wwan/cc-wwan-device.c:1003
+#: panels/wwan/cc-wwan-device.c:997
+msgid "5G Only"
+msgstr "僅 5G"
+
+#: panels/wwan/cc-wwan-device.c:1007
+msgid "2G, 3G, 4G, 5G (Preferred)"
+msgstr "2G、3G、4G、5G（偏好）"
+
+#: panels/wwan/cc-wwan-device.c:1009
+msgid "2G, 3G, 4G (Preferred), 5G"
+msgstr "2G、3G、4G（偏好）、5G"
+
+#: panels/wwan/cc-wwan-device.c:1011
+msgid "2G, 3G (Preferred), 4G, 5G"
+msgstr "2G、3G（偏好）、4G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1013
+msgid "2G (Preferred), 3G, 4G, 5G"
+msgstr "2G（偏好）、3G、4G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1015
+msgid "2G, 3G, 4G, 5G"
+msgstr "2G、3G、4G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1022
 msgid "2G, 3G, 4G (Preferred)"
-msgstr "2G、3G、4G (偏好)"
+msgstr "2G、3G、4G（偏好）"
 
-#: panels/wwan/cc-wwan-device.c:1005
+#: panels/wwan/cc-wwan-device.c:1024
 msgid "2G, 3G (Preferred), 4G"
 msgstr "2G、3G (偏好)、4G"
 
-#: panels/wwan/cc-wwan-device.c:1007
+#: panels/wwan/cc-wwan-device.c:1026
 msgid "2G (Preferred), 3G, 4G"
-msgstr "2G (偏好)、3G、4G"
+msgstr "2G（偏好）、3G、4G"
 
-#: panels/wwan/cc-wwan-device.c:1009
+#: panels/wwan/cc-wwan-device.c:1028
 msgid "2G, 3G, 4G"
 msgstr "2G、3G、4G"
 
-#: panels/wwan/cc-wwan-device.c:1015
+#: panels/wwan/cc-wwan-device.c:1035
+msgid "3G, 4G, 5G (Preferred)"
+msgstr "3G、4G、5G（偏好）"
+
+#: panels/wwan/cc-wwan-device.c:1037
+msgid "3G, 4G (Preferred), 5G"
+msgstr "3G、4G（偏好）、5G"
+
+#: panels/wwan/cc-wwan-device.c:1039
+msgid "3G (Preferred), 4G, 5G"
+msgstr "3G（偏好）、4G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1041
+msgid "3G, 4G, 5G"
+msgstr "3G、4G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1048
+msgid "2G, 4G, 5G (Preferred)"
+msgstr "2G、4G、5G（偏好）"
+
+#: panels/wwan/cc-wwan-device.c:1050
+msgid "2G, 4G (Preferred), 5G"
+msgstr "2G、4G（偏好）、5G"
+
+#: panels/wwan/cc-wwan-device.c:1052
+msgid "2G (Preferred), 4G, 5G"
+msgstr "2G（偏好）、4G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1054
+msgid "2G, 4G, 5G"
+msgstr "2G、3G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1061
+msgid "2G, 3G, 5G (Preferred)"
+msgstr "2G、3G、5G（偏好）"
+
+#: panels/wwan/cc-wwan-device.c:1063
+msgid "2G, 3G (Preferred), 5G"
+msgstr "2G、3G（偏好）、5G"
+
+#: panels/wwan/cc-wwan-device.c:1065
+msgid "2G (Preferred), 3G, 5G"
+msgstr "2G（偏好）、3G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1067
+msgid "2G, 3G, 5G"
+msgstr "2G、3G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1073
 msgid "3G, 4G (Preferred)"
-msgstr "3G、4G (偏好)"
+msgstr "3G、4G（偏好）"
 
-#: panels/wwan/cc-wwan-device.c:1017
+#: panels/wwan/cc-wwan-device.c:1075
 msgid "3G (Preferred), 4G"
-msgstr "3G (偏好)、4G"
+msgstr "3G（偏好）、4G"
 
-#: panels/wwan/cc-wwan-device.c:1019
+#: panels/wwan/cc-wwan-device.c:1077
 msgid "3G, 4G"
 msgstr "3G、4G"
 
-#: panels/wwan/cc-wwan-device.c:1025
+#: panels/wwan/cc-wwan-device.c:1083
 msgid "2G, 4G (Preferred)"
-msgstr "2G、4G (偏好)"
+msgstr "2G、4G（偏好）"
 
-#: panels/wwan/cc-wwan-device.c:1027
+#: panels/wwan/cc-wwan-device.c:1085
 msgid "2G (Preferred), 4G"
-msgstr "2G (偏好)、4G"
+msgstr "2G（偏好）、4G"
 
-#: panels/wwan/cc-wwan-device.c:1029
+#: panels/wwan/cc-wwan-device.c:1087
 msgid "2G, 4G"
 msgstr "2G、4G"
 
-#: panels/wwan/cc-wwan-device.c:1035
+#: panels/wwan/cc-wwan-device.c:1093
 msgid "2G, 3G (Preferred)"
-msgstr "2G、3G (偏好)"
+msgstr "2G、3G（偏好）"
 
-#: panels/wwan/cc-wwan-device.c:1037
+#: panels/wwan/cc-wwan-device.c:1095
 msgid "2G (Preferred), 3G"
-msgstr "2G (偏好)、3G"
+msgstr "2G（偏好）、3G"
 
-#: panels/wwan/cc-wwan-device.c:1039
+#: panels/wwan/cc-wwan-device.c:1097
 msgid "2G, 3G"
 msgstr "2G、3G"
 
-#: panels/wwan/cc-wwan-device.c:1043
+#: panels/wwan/cc-wwan-device.c:1103
+msgid "2G, 5G (Preferred)"
+msgstr "2G、5G（偏好）"
+
+#: panels/wwan/cc-wwan-device.c:1105
+msgid "2G (Preferred), 5G"
+msgstr "2G（偏好）、5G"
+
+#: panels/wwan/cc-wwan-device.c:1107
+msgid "2G, 5G"
+msgstr "2G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1113
+msgid "3G, 5G (Preferred)"
+msgstr "3G、5G（偏好）"
+
+#: panels/wwan/cc-wwan-device.c:1115
+msgid "3G (Preferred), 5G"
+msgstr "3G（偏好）、5G"
+
+#: panels/wwan/cc-wwan-device.c:1117
+msgid "3G, 5G"
+msgstr "3G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1123
+msgid "4G, 5G (Preferred)"
+msgstr "3G、5G（偏好）"
+
+#: panels/wwan/cc-wwan-device.c:1125
+msgid "4G (Preferred), 5G"
+msgstr "4G（偏好）、5G"
+
+#: panels/wwan/cc-wwan-device.c:1127
+msgid "4G, 5G"
+msgstr "4G、5G"
+
+#: panels/wwan/cc-wwan-device.c:1131
 msgctxt "Network mode"
 msgid "Unknown"
 msgstr "不明"
@@ -8111,37 +9034,37 @@ msgstr "解鎖 SIM 卡"
 
 #: panels/wwan/cc-wwan-device-page.c:188 panels/wwan/cc-wwan-device-page.c:236
 msgid "Unlock"
-msgstr "解鎖"
+msgstr "解除鎖定"
 
 #: panels/wwan/cc-wwan-device-page.c:193
 #, c-format
 msgid "Please provide PIN code for SIM %d"
-msgstr "請提供 SIM %d 的 PIN 碼"
+msgstr "請提供 SIM 卡 %d 的 PIN 碼"
 
 #: panels/wwan/cc-wwan-device-page.c:194
 msgid "Enter PIN to unlock your SIM card"
-msgstr "請輸入 PIN 碼解鎖您的 SIM 卡"
+msgstr "請輸入 PIN 碼以解鎖您的 SIM 卡"
 
 #: panels/wwan/cc-wwan-device-page.c:198
 #, c-format
 msgid "Please provide PUK code for SIM %d"
-msgstr "請為 SIM %d 提供 PUK 碼"
+msgstr "請提供 SIM 卡 %d 的 PUK 碼"
 
 #: panels/wwan/cc-wwan-device-page.c:199
 msgid "Enter PUK to unlock your SIM card"
-msgstr "請輸入 PUK 碼來解鎖您的 SIM 卡"
+msgstr "請輸入 PUK 碼以解鎖您的 SIM 卡"
 
 #: panels/wwan/cc-wwan-device-page.c:217
 #, c-format
 msgid "Wrong password entered. You have %1$u try left"
 msgid_plural "Wrong password entered. You have %1$u tries left"
-msgstr[0] "密碼輸入錯誤。您還有 %1$u 次嘗試"
+msgstr[0] "密碼輸入錯誤。您還有 %1$u 次嘗試機會"
 
 #: panels/wwan/cc-wwan-device-page.c:220
 #, c-format
 msgid "You have %u try left"
 msgid_plural "You have %u tries left"
-msgstr[0] "您還有 %u 次嘗試"
+msgstr[0] "您還有 %u 次嘗試機會"
 
 #: panels/wwan/cc-wwan-device-page.c:225
 msgid "Wrong password entered."
@@ -8149,7 +9072,7 @@ msgstr "密碼輸入錯誤。"
 
 #: panels/wwan/cc-wwan-device-page.c:270
 msgid "PUK code should be an 8 digit number"
-msgstr "PUK 碼應該有 8 個數字"
+msgstr "PUK 碼應有 8 位數字"
 
 #: panels/wwan/cc-wwan-device-page.c:294
 msgid "Enter New PIN"
@@ -8157,15 +9080,15 @@ msgstr "輸入新的 PIN 碼"
 
 #: panels/wwan/cc-wwan-device-page.c:298
 msgid "PIN code should be a 4-8 digit number"
-msgstr "PIN 碼應該是 4-8 個數字"
+msgstr "PIN 碼應為 4-8 位數字"
 
 #: panels/wwan/cc-wwan-device-page.c:316
 msgid "Unlocking…"
-msgstr "解鎖中…"
+msgstr "正在解除鎖定…"
 
 #: panels/wwan/cc-wwan-device-page.ui:18
 msgid "No SIM"
-msgstr "沒有 SIM"
+msgstr "沒有 SIM 卡"
 
 #: panels/wwan/cc-wwan-device-page.ui:19
 msgid "Insert a SIM card to use this modem"
@@ -8181,7 +9104,7 @@ msgstr "行動數據(_M)"
 
 #: panels/wwan/cc-wwan-device-page.ui:78
 msgid "Access data using mobile network"
-msgstr "使用行動網路存取數據連線"
+msgstr "使用行動網路存取網路數據"
 
 #: panels/wwan/cc-wwan-device-page.ui:88
 msgid "_Data Roaming"
@@ -8209,15 +9132,15 @@ msgstr "存取點名稱(_A)"
 
 #: panels/wwan/cc-wwan-device-page.ui:155
 msgid "_SIM Lock"
-msgstr "_SIM 鎖定"
+msgstr "_SIM 卡鎖定"
 
 #: panels/wwan/cc-wwan-device-page.ui:156
 msgid "Lock SIM with PIN"
-msgstr "以 PIN 碼鎖定 SIM"
+msgstr "以 PIN 碼鎖定 SIM 卡"
 
 #: panels/wwan/cc-wwan-device-page.ui:165
 msgid "M_odem Details"
-msgstr "數據機細節(_O)"
+msgstr "數據機詳細資訊(_O)"
 
 #: panels/wwan/cc-wwan-errors-private.h:40
 msgid "Phone failure"
@@ -8225,15 +9148,15 @@ msgstr "手機失敗"
 
 #: panels/wwan/cc-wwan-errors-private.h:41
 msgid "No connection to phone"
-msgstr "無法與手機連線"
+msgstr "沒有連線連接至手機"
 
 #: panels/wwan/cc-wwan-errors-private.h:43
 msgid "Operation not allowed"
-msgstr "不允許操作"
+msgstr "不允許的操作"
 
 #: panels/wwan/cc-wwan-errors-private.h:44
 msgid "Operation not supported"
-msgstr "不支援操作"
+msgstr "不支援的操作"
 
 #: panels/wwan/cc-wwan-errors-private.h:48
 msgid "SIM not inserted"
@@ -8241,19 +9164,19 @@ msgstr "SIM 卡尚未插入"
 
 #: panels/wwan/cc-wwan-errors-private.h:49
 msgid "SIM PIN required"
-msgstr "需要 SIM PIN 碼"
+msgstr "需要 SIM 卡的 PIN 碼"
 
 #: panels/wwan/cc-wwan-errors-private.h:50
 msgid "SIM PUK required"
-msgstr "需要 SIM PUK 碼"
+msgstr "需要 SIM 卡的 PUK 碼"
 
 #: panels/wwan/cc-wwan-errors-private.h:51
 msgid "SIM failure"
-msgstr "SIM 失敗"
+msgstr "SIM 卡失敗"
 
 #: panels/wwan/cc-wwan-errors-private.h:52
 msgid "SIM busy"
-msgstr "SIM 忙碌"
+msgstr "SIM 卡忙碌"
 
 #: panels/wwan/cc-wwan-errors-private.h:54
 msgid "Incorrect password"
@@ -8261,11 +9184,11 @@ msgstr "密碼不正確"
 
 #: panels/wwan/cc-wwan-errors-private.h:55
 msgid "SIM PIN2 required"
-msgstr "需要 SIM PIN2 碼"
+msgstr "需要 SIM 卡的 PIN2 碼"
 
 #: panels/wwan/cc-wwan-errors-private.h:56
 msgid "SIM PUK2 required"
-msgstr "需要 SIM PUK2 碼"
+msgstr "需要 SIM 卡的 PUK2 碼"
 
 #: panels/wwan/cc-wwan-errors-private.h:59
 msgid "Not found"
@@ -8285,52 +9208,45 @@ msgstr "未允許 GPRS 服務"
 
 #: panels/wwan/cc-wwan-errors-private.h:78
 msgid "Roaming not allowed in this location area"
-msgstr "此地理位置區域不允許漫遊"
+msgstr "此位置區域不允許漫遊"
 
 #: panels/wwan/cc-wwan-errors-private.h:82
 msgid "Unspecified GPRS error"
-msgstr "不明確的 GPRS 錯誤"
+msgstr "不明的 GPRS 錯誤"
 
 #: panels/wwan/cc-wwan-errors-private.h:91
-msgid "Action Cancelled"
-msgstr "動作已取消"
+msgid "No Error"
+msgstr "沒有錯誤"
 
 #: panels/wwan/cc-wwan-errors-private.h:94
+msgid "Action Cancelled"
+msgstr "動作取消"
+
+#: panels/wwan/cc-wwan-errors-private.h:97
 msgid "Access denied"
-msgstr "存取已拒絕"
+msgstr "存取遭拒"
 
-#: panels/wwan/cc-wwan-errors-private.h:103
+#: panels/wwan/cc-wwan-errors-private.h:106
 msgid "Unknown Error"
-msgstr "不明的錯誤"
+msgstr "不明錯誤"
 
 #: panels/wwan/cc-wwan-mode-dialog.ui:5
 msgid "Network Mode"
 msgstr "網路模式"
 
-#: panels/wwan/cc-wwan-mode-dialog.ui:39
-#: panels/wwan/cc-wwan-network-dialog.ui:146
-#: panels/wwan/cc-wwan-sim-lock-dialog.c:229
-msgid "_Set"
-msgstr "設定(_S)"
-
-#: panels/wwan/cc-wwan-network-dialog.ui:41 panels/wwan/cc-wwan-panel.ui:41
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:90
-msgid "Close"
-msgstr "關閉"
-
-#: panels/wwan/cc-wwan-network-dialog.ui:69
+#: panels/wwan/cc-wwan-network-dialog.ui:38
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: panels/wwan/cc-wwan-network-dialog.ui:84
+#: panels/wwan/cc-wwan-network-dialog.ui:53
 msgid "Choose Network"
 msgstr "選擇網路"
 
-#: panels/wwan/cc-wwan-network-dialog.ui:99
+#: panels/wwan/cc-wwan-network-dialog.ui:68
 msgid "Refresh Network Providers"
-msgstr "重新整理網路供應商"
+msgstr "重新整理網路提供者"
 
-#: panels/wwan/cc-wwan-panel.c:417 panels/wwan/cc-wwan-panel.c:448
+#: panels/wwan/cc-wwan-panel.c:365 panels/wwan/cc-wwan-panel.c:396
 #, c-format
 msgid "SIM %d"
 msgstr "SIM %d"
@@ -8339,49 +9255,49 @@ msgstr "SIM %d"
 msgid "Enable Mobile Network"
 msgstr "啟用行動網路"
 
-#: panels/wwan/cc-wwan-panel.ui:94
+#: panels/wwan/cc-wwan-panel.ui:61
 msgid "No WWAN Adapter Found"
 msgstr "找不到 WWAN 網卡"
 
-#: panels/wwan/cc-wwan-panel.ui:104
+#: panels/wwan/cc-wwan-panel.ui:71
 msgid "Make sure you have a Wireless Wan/Cellular device"
-msgstr "請確認您有無線 WAN 或巢格網路行動裝置"
+msgstr "請確認您有無線 WAN 網路或蜂巢式網路裝置"
 
-#: panels/wwan/cc-wwan-panel.ui:145
+#: panels/wwan/cc-wwan-panel.ui:112
 msgid "Wireless Wan is disabled when airplane mode is on"
-msgstr "開啟飛安模式時會停用無線 WAN 網路"
+msgstr "飛安模式開啟時會停無線 WAN 網路"
 
-#: panels/wwan/cc-wwan-panel.ui:153
+#: panels/wwan/cc-wwan-panel.ui:120
 msgid "_Turn off Airplane Mode"
 msgstr "關閉飛安模式(_T)"
 
-#: panels/wwan/cc-wwan-panel.ui:184
+#: panels/wwan/cc-wwan-panel.ui:151
 msgid "Data Connection"
-msgstr "數據資料連線"
+msgstr "數據連線"
 
-#: panels/wwan/cc-wwan-panel.ui:185
+#: panels/wwan/cc-wwan-panel.ui:152
 msgid "SIM card used for internet"
 msgstr "用於網際網路的 SIM 卡"
 
 #: panels/wwan/cc-wwan-sim-lock-dialog.ui:9
 msgid "SIM Lock"
-msgstr "SIM 鎖定"
+msgstr "SIM 卡鎖定"
 
 #: panels/wwan/cc-wwan-sim-lock-dialog.ui:24
 msgid "_Next"
 msgstr "下一步(_N)"
 
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:122
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:91
 msgid "_Lock SIM with PIN"
-msgstr "以 PIN 碼鎖定 SIM(_L)"
+msgstr "以 PIN 碼鎖定 SIM 卡(_L)"
 
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:138
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:107
 msgid "Change PIN"
-msgstr "變更 PIN 碼"
+msgstr "更改 PIN 碼"
 
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:231
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:202
 msgid "Enter current PIN to change SIM lock settings"
-msgstr "輸入目前的 PIN 碼並更改 SIM 鎖定設定"
+msgstr "輸入目前的 PIN 碼以更改 SIM 卡鎖定的設定值"
 
 #: panels/wwan/gnome-wwan-panel.desktop.in.in:3
 msgid "Mobile Network"
@@ -8394,7 +9310,9 @@ msgstr "設定電話撥打與行動數據連線"
 #. Translators: Search terms to find the WWAN panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/wwan/gnome-wwan-panel.desktop.in.in:16
 msgid "cellular;wwan;telephony;sim;mobile;"
-msgstr "cellular;wwan;telephony;sim;mobile;行動數據;巢格網路;撥打電話;攜帶;"
+msgstr ""
+"cellular;wwan;telephony;sim;mobile;行動數據;蜂巢式網路;撥打電話;攜帶;行動網"
+"è·¯;"
 
 #: shell/appdata/org.gnome.Settings.appdata.xml.in:8
 msgid "Utility to configure the GNOME desktop"
@@ -8430,13 +9348,17 @@ msgstr "要顯示的面板"
 
 #: shell/cc-application.c:63
 msgid "[PANEL] [ARGUMENT…]"
-msgstr "[面板] [引數…]"
+msgstr "[面板] [參數…]"
+
+#: shell/cc-panel-list.ui:18
+msgid "Settings categories"
+msgstr "設定值類別"
 
-#: shell/cc-panel-list.ui:39 shell/cc-window.c:242
+#: shell/cc-panel-list.ui:42 shell/cc-window.c:242
 msgid "Privacy"
 msgstr "隱私"
 
-#: shell/cc-panel-loader.c:301
+#: shell/cc-panel-loader.c:304
 msgid "Available panels:"
 msgstr "可用的面板："
 
@@ -8473,7 +9395,7 @@ msgstr "一般"
 #: shell/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Quit"
-msgstr "結束"
+msgstr "退出"
 
 #: shell/help-overlay.ui:27 shell/help-overlay.ui:57
 msgctxt "shortcut window"
@@ -8488,7 +9410,7 @@ msgstr "面板"
 #: shell/help-overlay.ui:41 shell/help-overlay.ui:49
 msgctxt "shortcut window"
 msgid "Go back to previous panel"
-msgstr "回到上一個面板"
+msgstr "返回到上一個面板"
 
 #: shell/help-overlay.ui:62
 msgctxt "shortcut window"
@@ -8502,15 +9424,14 @@ msgstr "Preferences;Settings;偏好設定;設定值;"
 
 #: shell/org.gnome.Settings.gschema.xml:5
 msgid "The identifier for the last Settings panel to be opened"
-msgstr "最後開啟的設定面板的識別碼"
+msgstr "最後開啟的設定面板識別碼"
 
 #: shell/org.gnome.Settings.gschema.xml:6
 msgid ""
 "The identifier for the last Settings panel to be opened. Unrecognised values "
 "will be ignored and the first panel in the list selected."
 msgstr ""
-"最後開啟的設定面板的識別碼。無法識別的值將會被忽略，且改選擇列表中的第一個面"
-"板。"
+"最後開啟的設定面板識別碼；無法識別的值會被忽略並改選擇列表中第一個面板。"
 
 #: shell/org.gnome.Settings.gschema.xml:13
 msgid "Show warning when running a development build of Settings"
@@ -8551,6 +9472,116 @@ msgstr[0] "%u 輸入"
 msgid "System Sounds"
 msgstr "系統音效"
 
+#~ msgid "Error: unable to determine HSI level."
+#~ msgstr "錯誤：無法確認 HSI 等級。"
+
+#~ msgid "Error: unable to determine Incorrect HSI level."
+#~ msgstr "錯誤：無法確認不正確的 HSI 等級。"
+
+#~ msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+#~ msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
+
+#~ msgid "Add a Printer…"
+#~ msgstr "加入印表機…"
+
+#~ msgid "Drip"
+#~ msgstr "水滴聲"
+
+#~ msgid "Glass"
+#~ msgstr "敲玻璃聲"
+
+#~ msgid "Sonar"
+#~ msgstr "聲納"
+
+#~ msgid "No Protection"
+#~ msgstr "缺乏防護"
+
+#~ msgid "Minimal Protection"
+#~ msgstr "最小防護"
+
+#~ msgid "Basic Protection"
+#~ msgstr "基本防護"
+
+#~ msgid "Extended Protection"
+#~ msgstr "延伸防護"
+
+#~ msgid "Minimal Security Protections"
+#~ msgstr "最小的安全性防護"
+
+#~ msgid "Basic Security Protections"
+#~ msgstr "基本的安全性防護"
+
+#~ msgid "Extended Security Protections"
+#~ msgstr "延伸的安全性防護"
+
+#~ msgid "Secure Boot is Inactive"
+#~ msgstr "安全開機非作用中"
+
+#~ msgid "SPI write"
+#~ msgstr "SPI 寫入"
+
+#~ msgid "SPI lock"
+#~ msgstr "SPI 鎖定"
+
+#~ msgid "Kernel tainted"
+#~ msgstr "核心污染"
+
+#, fuzzy
+#~ msgid "Suspend-to-ram"
+#~ msgstr "暫停（暫存至記憶體）"
+
+#~ msgid "MEI manufacturing mode"
+#~ msgstr "MEI 製造模式"
+
+#~ msgid "MEI version"
+#~ msgstr "MEI 版本"
+
+#~ msgid "fwupd plugins"
+#~ msgstr "fwupd 擴充套件"
+
+#~ msgid "IOMMU device protection enabled"
+#~ msgstr "IOMMU 裝置防護已啟用"
+
+#~ msgid "IOMMU device protection disabled"
+#~ msgstr "IOMMU 裝置防護已停用"
+
+#~ msgid "Kernel is tainted"
+#~ msgstr "核心遭受污染"
+
+#~ msgid "Kernel lockdown disabled"
+#~ msgstr "核心鎖定已停用"
+
+#~ msgid "Kernel lockdown enabled"
+#~ msgstr "核心鎖定已啟用"
+
+#~ msgid "Secure Boot disabled"
+#~ msgstr "安全開機已停用"
+
+#~ msgid "Secure Boot enabled"
+#~ msgstr "安全開機已啟用"
+
+#~ msgid "Lock your screen"
+#~ msgstr "鎖定您的螢幕"
+
+#~ msgid "Display Arrangement"
+#~ msgstr "排列顯示器的組合方式"
+
+#~ msgid "Light"
+#~ msgstr "明亮"
+
+#~ msgid ""
+#~ "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+#~ "network;identity;"
+#~ msgstr ""
+#~ "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+#~ "network;identity;螢幕;鎖定;診斷;隱私;最近使用;暫存;索引;名稱;網路;身分;"
+
+#~ msgid "Set"
+#~ msgstr "設定"
+
+#~ msgid "Bark"
+#~ msgstr "汪汪"
+
 #~ msgid "Web Links"
 #~ msgstr "網頁連結"
 
@@ -8679,18 +9710,12 @@ msgstr "系統音效"
 #~ msgid "Active Display"
 #~ msgstr "使用中顯示器"
 
-#~ msgid "Display Configuration"
-#~ msgstr "顯示器設定"
-
 #~ msgid "More Warm"
 #~ msgstr "變得更暖"
 
 #~ msgid "Less Warm"
 #~ msgstr "變得更冷"
 
-#~ msgid "Screenshots"
-#~ msgstr "螢幕擷圖"
-
 #~ msgid "Save a screenshot to $PICTURES"
 #~ msgstr "將螢幕擷圖儲存為 $PICTURES"
 
@@ -8840,18 +9865,12 @@ msgstr "系統音效"
 #~ "connecting to %s"
 #~ msgstr "螢幕分享允許遠端使用者連線到 %s 以檢視或控制您的螢幕"
 
-#~ msgid "Copy"
-#~ msgstr "複製"
-
 #~ msgid "_Screen Sharing"
 #~ msgstr "螢幕分享(_S)"
 
 #~ msgid "Some services are disabled because of no network access."
 #~ msgstr "由於沒有網路存取，某些服務已停用。"
 
-#~ msgid "Screen Sharing"
-#~ msgstr "螢幕分享"
-
 #~ msgid "_Password:"
 #~ msgstr "密碼(_P)："
 
@@ -8873,9 +9892,6 @@ msgstr "系統音效"
 #~ msgid "_Screen Reader"
 #~ msgstr "螢幕閱讀器(_S)"
 
-#~ msgid "_Full Name"
-#~ msgstr "全名(_F)"
-
 #~ msgid "Standard"
 #~ msgstr "標準"
 
@@ -9812,9 +10828,6 @@ msgstr "系統音效"
 #~ msgid "Co­lor"
 #~ msgstr "色彩"
 
-#~ msgid "Section"
-#~ msgstr "節"
-
 #~ msgid "Overview"
 #~ msgstr "概覽"
 
@@ -10018,9 +11031,6 @@ msgstr "系統音效"
 #~ msgid "4"
 #~ msgstr "4"
 
-#~ msgid "Loading options…"
-#~ msgstr "正在載入選項…"
-
 #~ msgctxt "Password hint"
 #~ msgid "Try to add more letters, numbers and symbols."
 #~ msgstr "試著加入更多字母、數字和標點符號。"
@@ -10048,9 +11058,6 @@ msgstr "系統音效"
 #~ msgid "<small>Your account</small>"
 #~ msgstr "<small>您的帳號</small>"
 
-#~ msgid "Edit"
-#~ msgstr "編輯"
-
 #~ msgctxt "button"
 #~ msgid "Set Shortcut"
 #~ msgstr "設定捷徑鍵"
@@ -10086,9 +11093,6 @@ msgstr "系統音效"
 #~ msgid "This will not remove the account on the server."
 #~ msgstr "這不會移除伺服器上的帳號。"
 
-#~ msgid "_Remove"
-#~ msgstr "移除(_R)"
-
 #~ msgid "No online accounts configured"
 #~ msgstr "尚未設定線上帳號"
 
@@ -10132,9 +11136,6 @@ msgstr "系統音效"
 #~ msgid "label"
 #~ msgstr "標籤"
 
-#~ msgid "Setting new driver…"
-#~ msgstr "正在設定新的驅動程式…"
-
 #~ msgid "Print _Test Page"
 #~ msgstr "列印測試頁(_T)"
 
@@ -10211,9 +11212,6 @@ msgstr "系統音效"
 #~ msgid "Bottom Button #%d"
 #~ msgstr "底部按鈕 #%d"
 
-#~ msgid "No Action"
-#~ msgstr "沒有動作"
-
 #~ msgid "Left Mouse Button Click"
 #~ msgstr "滑鼠左鍵點擊"
 
@@ -10355,9 +11353,6 @@ msgstr "系統音效"
 #~ msgid "Other"
 #~ msgstr "其他"
 
-#~ msgid "Personal File Sharing"
-#~ msgstr "個人檔案分享"
-
 #~ msgid "_Verify"
 #~ msgstr "é©—è­‰(_V)"
 
@@ -10389,9 +11384,6 @@ msgstr "系統音效"
 #~ msgid "Job State"
 #~ msgstr "工作狀態"
 
-#~ msgid "Options"
-#~ msgstr "選項"
-
 #~ msgid "Password:"
 #~ msgstr "密碼："
 
@@ -10472,9 +11464,6 @@ msgstr "系統音效"
 #~ msgid "Fast"
 #~ msgstr "快速"
 
-#~ msgid "No printers available"
-#~ msgstr "沒有可用的印表機"
-
 #~ msgid "Add New Printer"
 #~ msgstr "加入新的印表機"
 
@@ -10578,9 +11567,6 @@ msgstr "系統音效"
 #~ msgid "Immediately"
 #~ msgstr "立即"
 
-#~ msgid "Flickr"
-#~ msgstr "Flickr"
-
 #~ msgid "Set Up New Device"
 #~ msgstr "設置新裝置"
 
@@ -10952,9 +11938,6 @@ msgstr "系統音效"
 #~ msgid "C_ontinue"
 #~ msgstr "繼續(_O)"
 
-#~ msgid "Previous Week"
-#~ msgstr "前一週"
-
 #~ msgid "Next Week"
 #~ msgstr "下一週"
 
@@ -11098,9 +12081,6 @@ msgstr "系統音效"
 #~ msgid "Chinese (simplified)"
 #~ msgstr "簡體中文"
 
-#~ msgid "Select a region"
-#~ msgstr "選擇地區"
-
 #~ msgid "Date and Time preferences panel"
 #~ msgstr "日期和時刻偏好設定面板"
 
@@ -11125,9 +12105,6 @@ msgstr "系統音效"
 #~ msgid "Manufacturers"
 #~ msgstr "製造商"
 
-#~ msgid "Privacy settings"
-#~ msgstr "隱私設定值"
-
 #~ msgid "Don't retain history"
 #~ msgstr "不要保留歷史紀錄"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]