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



commit fc13178ff0a59d1a4940d6081ed4d84785153ecf
Author: Yi-Jyun Pan <pan93412 gmail com>
Date:   Thu Jan 23 07:38:25 2020 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 4870 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 2599 insertions(+), 2271 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 893d3d296..b4e2e167c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,179 +13,162 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.91\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/issu";
-"es\n"
-"POT-Creation-Date: 2019-09-28 19:30+0000\n"
-"PO-Revision-Date: 2019-11-27 23:59+0800\n"
-"Last-Translator: pan93412 <pan93412 gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
+"issues\n"
+"POT-Creation-Date: 2020-01-08 15:54+0000\n"
+"PO-Revision-Date: 2020-01-22 14:36+0800\n"
+"Last-Translator: Yi-Jyun Pan <pan93412 gmail com>\n"
 "Language-Team: Chinese <zh-l10n linux org tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 19.11.80\n"
+"X-Generator: Poedit 2.2.4\n"
 
-#: panels/applications/cc-applications-panel.c:561
-#| msgid "System Sounds"
+#: panels/applications/cc-applications-panel.c:708
 msgid "System Bus"
 msgstr "系統匯流排"
 
-#: panels/applications/cc-applications-panel.c:561
-#: panels/applications/cc-applications-panel.c:563
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:584
-#| msgid "_Full Name"
+#: panels/applications/cc-applications-panel.c:708
+#: panels/applications/cc-applications-panel.c:710
+#: panels/applications/cc-applications-panel.c:723
+#: panels/applications/cc-applications-panel.c:728
 msgid "Full access"
 msgstr "完整存取權限"
 
-#: panels/applications/cc-applications-panel.c:563
-#| msgid "Session Ended"
+#: panels/applications/cc-applications-panel.c:710
 msgid "Session Bus"
 msgstr "工作階段匯流排"
 
-#: panels/applications/cc-applications-panel.c:568
-#: panels/power/cc-power-panel.c:2477 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:273
+#: panels/applications/cc-applications-panel.c:714
+#: panels/power/cc-power-panel.c:2469 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525
 msgid "Devices"
 msgstr "裝置"
 
-#: panels/applications/cc-applications-panel.c:568
+#: panels/applications/cc-applications-panel.c:714
 msgid "Full access to /dev"
 msgstr "完整 /dev 存取權限"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:718
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
+#: panels/network/network-mobile.ui:252
 msgid "Network"
 msgstr "網路"
 
-#: panels/applications/cc-applications-panel.c:573
-#| msgid "Network Name"
+#: panels/applications/cc-applications-panel.c:718
+#: panels/applications/cc-snap-row.c:109
 msgid "Has network access"
 msgstr "有網路存取權限"
 
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:581
-#: panels/search/cc-search-locations-dialog.c:293
+#: panels/applications/cc-applications-panel.c:723
+#: panels/applications/cc-applications-panel.c:725
+#: panels/search/cc-search-locations-dialog.c:361
 msgid "Home"
 msgstr "家"
 
-#: panels/applications/cc-applications-panel.c:581
-#: panels/applications/cc-applications-panel.c:586
-#| msgctxt "printer state"
-#| msgid "Ready"
+#: panels/applications/cc-applications-panel.c:725
+#: panels/applications/cc-applications-panel.c:730
 msgid "Read-only"
 msgstr "唯讀"
 
-#: panels/applications/cc-applications-panel.c:584
-#: panels/applications/cc-applications-panel.c:586
-#| msgid "Open System"
+#: panels/applications/cc-applications-panel.c:728
+#: panels/applications/cc-applications-panel.c:730
 msgid "File System"
 msgstr "檔案系統"
 
-#: panels/applications/cc-applications-panel.c:591
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:277
-#: shell/cc-window.c:975 shell/cc-window.ui:132
+#: panels/applications/cc-applications-panel.c:734
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281
+#: shell/cc-window.c:964 shell/cc-window.ui:125
 #: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "設定值"
 
-#: panels/applications/cc-applications-panel.c:591
-#| msgid "Search settings"
+#: panels/applications/cc-applications-panel.c:734
+#: panels/applications/cc-snap-row.c:73
 msgid "Can change settings"
 msgstr "可以變更設定"
 
-#: panels/applications/cc-applications-panel.c:596
+#: panels/applications/cc-applications-panel.c:736
 #, 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 內建了以下權限。這些無法變更。如果你很關心這些權限,請考慮移除此應用程式。"
+msgstr ""
+"%s 內建了以下權限。這些無法變更。如果你很關心這些權限,請考慮移除此應用程式。"
 
-#: panels/applications/cc-applications-panel.c:738
+#: panels/applications/cc-applications-panel.c:891
 msgid "Web Links"
 msgstr "網頁連結"
 
-#: panels/applications/cc-applications-panel.c:748
+#: panels/applications/cc-applications-panel.c:901
 msgid "Git Links"
 msgstr "Git 連結"
 
-#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:907
 #, c-format
 msgid "%s Links"
 msgstr "%s 連結"
 
-#: panels/applications/cc-applications-panel.c:762
-#: panels/applications/cc-applications-panel.c:798
+#: panels/applications/cc-applications-panel.c:915
+#: panels/applications/cc-applications-panel.c:951
 msgid "Unset"
 msgstr "取消設定"
 
-#: panels/applications/cc-applications-panel.c:853
-#| msgid "Link speed"
+#: panels/applications/cc-applications-panel.c:1006
 msgid "Links"
 msgstr "連結"
 
-#: panels/applications/cc-applications-panel.c:861
-#| msgid "_Delete Files"
+#: panels/applications/cc-applications-panel.c:1014
 msgid "Hypertext Files"
 msgstr "超文字檔案"
 
-#: panels/applications/cc-applications-panel.c:875
-#| msgid "_Delete Files"
+#: panels/applications/cc-applications-panel.c:1028
 msgid "Text Files"
 msgstr "文字檔案"
 
-#: panels/applications/cc-applications-panel.c:889
-#| msgid "_Keep Files"
+#: panels/applications/cc-applications-panel.c:1042
 msgid "Image Files"
 msgstr "圖片檔案"
 
-#: panels/applications/cc-applications-panel.c:905
-#| msgid "_Delete Files"
+#: panels/applications/cc-applications-panel.c:1058
 msgid "Font Files"
 msgstr "字型檔案"
 
-#: panels/applications/cc-applications-panel.c:966
+#: panels/applications/cc-applications-panel.c:1119
 msgid "Archive Files"
 msgstr "封存檔案"
 
-#: panels/applications/cc-applications-panel.c:986
+#: panels/applications/cc-applications-panel.c:1139
 msgid "Package Files"
 msgstr "軟體包檔案"
 
-#: panels/applications/cc-applications-panel.c:1009
-#| msgid "All files"
+#: panels/applications/cc-applications-panel.c:1162
 msgid "Audio Files"
 msgstr "音訊檔案"
 
-#: panels/applications/cc-applications-panel.c:1026
-#| msgid "_Keep Files"
+#: panels/applications/cc-applications-panel.c:1179
 msgid "Video Files"
 msgstr "視訊檔案"
 
-#: panels/applications/cc-applications-panel.c:1034
-#| msgid "_Delete Files"
+#: panels/applications/cc-applications-panel.c:1187
 msgid "Other Files"
 msgstr "其他檔案"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1376
-#: panels/applications/cc-applications-panel.ui:406
+#: panels/applications/cc-applications-panel.c:1529
+#: panels/applications/cc-applications-panel.ui:412
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
 #: panels/notifications/cc-notifications-panel.ui:167
-#: panels/privacy/cc-privacy-panel.ui:1085
 msgid "Applications"
 msgstr "程式集"
 
 #: panels/applications/cc-applications-panel.ui:45
-#| msgid "No applications found"
 msgid "No applications"
 msgstr "無應用程式"
 
 #: panels/applications/cc-applications-panel.ui:59
-#| msgid "Install PPD File…"
 msgid "Install some…"
 msgstr "安裝一些…"
 
@@ -197,12 +180,11 @@ msgstr "權限及存取"
 msgid ""
 "Data and services that this app has asked for access to and permissions that "
 "it requires."
-msgstr ""
+msgstr "此應用程式要求存取的資料及服務,及應用程式請求的權限。"
 
 #: panels/applications/cc-applications-panel.ui:126
 #: panels/applications/cc-applications-panel.ui:132
-#: panels/privacy/cc-privacy-panel.c:908 panels/privacy/cc-privacy-panel.ui:745
-#| msgid "%s Camera"
+#: panels/camera/gnome-camera-panel.desktop.in.in:3
 msgid "Camera"
 msgstr "相機"
 
@@ -215,12 +197,11 @@ msgstr "相機"
 #: panels/applications/cc-applications-panel.ui:145
 #: panels/applications/cc-applications-panel.ui:157
 #: panels/applications/cc-applications-panel.ui:237
-#: panels/applications/cc-applications-panel.ui:255
+#: panels/applications/cc-applications-panel.ui:261
 #: panels/keyboard/cc-keyboard-option.c:259
 #: panels/keyboard/cc-keyboard-option.c:378
-#: panels/keyboard/keyboard-shortcuts.c:425
-#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
-#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:96
+#: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126
 #: panels/user-accounts/um-fingerprint-dialog.c:211
 #: subprojects/gvc/gvc-mixer-control.c:1876
 msgid "Disabled"
@@ -228,24 +209,22 @@ msgstr "已停用"
 
 #: panels/applications/cc-applications-panel.ui:138
 #: panels/applications/cc-applications-panel.ui:144
-#: panels/privacy/cc-privacy-panel.c:941 panels/privacy/cc-privacy-panel.ui:850
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:3
 msgid "Microphone"
 msgstr "麥克風"
 
 #: panels/applications/cc-applications-panel.ui:150
 #: panels/applications/cc-applications-panel.ui:156
-#: panels/privacy/cc-privacy-panel.c:850 panels/privacy/cc-privacy-panel.ui:955
+#: panels/location/gnome-location-panel.desktop.in.in:3
 msgid "Location Services"
 msgstr "位置服務"
 
 #: panels/applications/cc-applications-panel.ui:162
-#: panels/applications/cc-applications-panel.ui:489
-#| msgid "Built-in Webcam"
+#: panels/applications/cc-applications-panel.ui:495
 msgid "Built-in Permissions"
 msgstr "內建權限"
 
 #: panels/applications/cc-applications-panel.ui:163
-#| msgid "Password could not be changed"
 msgid "Cannot be changed"
 msgstr "不能變更"
 
@@ -256,7 +235,6 @@ msgid ""
 msgstr "應用程式的獨立權限可以在<a href=\"privacy\">隱私</a>設定中復閱。"
 
 #: panels/applications/cc-applications-panel.ui:204
-#| msgid "Orientation"
 msgid "Integration"
 msgstr "整合"
 
@@ -267,7 +245,7 @@ msgstr "此應用程式使用的系統功能。"
 #: panels/applications/cc-applications-panel.ui:230
 #: panels/applications/cc-applications-panel.ui:236
 #: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:162
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:155
 msgid "Search"
 msgstr "搜尋"
 
@@ -277,77 +255,297 @@ msgid "Notifications"
 msgstr "通知"
 
 #: panels/applications/cc-applications-panel.ui:248
+msgid "Run in background"
+msgstr "背景執行"
+
 #: panels/applications/cc-applications-panel.ui:254
-#| msgid "Sound"
+#: panels/applications/cc-applications-panel.ui:260
 msgid "Sounds"
 msgstr "音效"
 
-#: panels/applications/cc-applications-panel.ui:287
-#| msgid "_Default printer"
+#: panels/applications/cc-applications-panel.ui:293
 msgid "Default Handlers"
 msgstr "預設處理器"
 
-#: panels/applications/cc-applications-panel.ui:299
+#: panels/applications/cc-applications-panel.ui:305
 msgid "Types of files and links that this application opens."
 msgstr "此應用程式開啟的檔案及連結類型。"
 
-#: panels/applications/cc-applications-panel.ui:315
+#: panels/applications/cc-applications-panel.ui:321
 msgid "Reset"
 msgstr "重設"
 
-#: panels/applications/cc-applications-panel.ui:351
+#: panels/applications/cc-applications-panel.ui:357
 msgid "Usage"
 msgstr "用量"
 
-#: panels/applications/cc-applications-panel.ui:363
+#: panels/applications/cc-applications-panel.ui:369
 msgid "How much resources this application is using."
 msgstr "應用程式用了多少資源。"
 
-#: panels/applications/cc-applications-panel.ui:378
-#: panels/applications/cc-applications-panel.ui:525
+#: panels/applications/cc-applications-panel.ui:384
+#: panels/applications/cc-applications-panel.ui:531
 msgid "Storage"
 msgstr "儲存空間"
 
-#: panels/applications/cc-applications-panel.ui:413
-#| msgid "_Software"
+#: panels/applications/cc-applications-panel.ui:419
 msgid "Open in Software"
 msgstr "在《軟體》中開啟"
 
-#: panels/applications/cc-applications-panel.ui:463 shell/cc-panel-list.ui:190
+#: panels/applications/cc-applications-panel.ui:469 shell/cc-panel-list.ui:121
 msgid "No results found"
 msgstr "找不到結果"
 
-#: panels/applications/cc-applications-panel.ui:474
-#: panels/keyboard/cc-keyboard-panel.ui:157 shell/cc-panel-list.ui:201
+#: panels/applications/cc-applications-panel.ui:480
+#: panels/keyboard/cc-keyboard-panel.ui:188 shell/cc-panel-list.ui:132
 msgid "Try a different search"
 msgstr "嘗試不同的搜尋內容"
 
-#: panels/applications/cc-applications-panel.ui:542
+#: panels/applications/cc-applications-panel.ui:548
 msgid ""
 "How much disk space this application is occupying with app data and caches."
 msgstr "此應用程式的應用程式資料及快取所佔用的磁碟空間。"
 
-#: panels/applications/cc-applications-panel.ui:551
-#| msgid "Applications"
+#: panels/applications/cc-applications-panel.ui:557
 msgid "Application"
 msgstr "應用程式"
 
-#: panels/applications/cc-applications-panel.ui:557
+#: panels/applications/cc-applications-panel.ui:563
 msgid "Data"
 msgstr "資料"
 
-#: panels/applications/cc-applications-panel.ui:563
+#: panels/applications/cc-applications-panel.ui:569
 msgid "Cache"
 msgstr "快取"
 
-#: panels/applications/cc-applications-panel.ui:569
+#: panels/applications/cc-applications-panel.ui:575
 msgid "<b>Total</b>"
 msgstr "<b>總計</b>"
 
-#: panels/applications/cc-applications-panel.ui:586
+#: panels/applications/cc-applications-panel.ui:592
 msgid "Clear Cache…"
 msgstr "清除快取…"
 
+#: panels/applications/cc-snap-row.c:55
+msgid "Add user accounts and change passwords"
+msgstr "加入使用者帳戶並變更密碼"
+
+#: panels/applications/cc-snap-row.c:57 panels/applications/cc-snap-row.c:133
+msgid "Play and record sound"
+msgstr "播放及錄音"
+
+#: panels/applications/cc-snap-row.c:59
+msgid "Detect network devices using mDNS/DNS-SD (Bonjour/zeroconf)"
+msgstr "使用 mDNS/DNS-SD (Bonjour/zeroconf) 偵測網路裝置"
+
+#: panels/applications/cc-snap-row.c:61
+msgid "Access bluetooth hardware directly"
+msgstr "直接存取藍牙硬體"
+
+#: panels/applications/cc-snap-row.c:63
+msgid "Use bluetooth devices"
+msgstr "使用藍牙裝置"
+
+#: panels/applications/cc-snap-row.c:65
+msgid "Use your camera"
+msgstr "使用相機"
+
+#: panels/applications/cc-snap-row.c:67
+msgid "Print documents"
+msgstr "列印文件"
+
+#: panels/applications/cc-snap-row.c:69
+msgid "Use any connected joystick"
+msgstr "使用連結的搖桿"
+
+#: panels/applications/cc-snap-row.c:71
+msgid "Allow connecting to the Docker service"
+msgstr "允許連線至 Docker 服務"
+
+#: panels/applications/cc-snap-row.c:75
+msgid "Configure network firewall"
+msgstr "設定網路防火牆"
+
+#: panels/applications/cc-snap-row.c:77
+msgid "Setup and use privileged FUSE filesystems"
+msgstr "設定並使用特權 FUSE 檔案系統"
+
+#: panels/applications/cc-snap-row.c:79
+msgid "Update firmware on this device"
+msgstr "更新此裝置的韌體"
+
+#: panels/applications/cc-snap-row.c:81
+msgid "Access hardware information"
+msgstr "存取硬體資訊"
+
+#: panels/applications/cc-snap-row.c:83
+msgid "Provide entropy to hardware random number generator"
+msgstr "提供熵給硬體隨機數字產生器"
+
+#: panels/applications/cc-snap-row.c:85
+msgid "Use hardware-generated random numbers"
+msgstr "使用硬體產生的隨機數"
+
+#: panels/applications/cc-snap-row.c:87
+msgid "Access files in your home folder"
+msgstr "存取您家目錄的檔案"
+
+#: panels/applications/cc-snap-row.c:89
+msgid "Access libvirt service"
+msgstr "存取 libvirt 服務"
+
+#: panels/applications/cc-snap-row.c:91
+msgid "Change system language and region settings"
+msgstr "變更系統語言及地區設定"
+
+#: panels/applications/cc-snap-row.c:93
+msgid "Change location settings and providers"
+msgstr "變更位置設定及提供者"
+
+#: panels/applications/cc-snap-row.c:95
+msgid "Access your location"
+msgstr "存取您的位置"
+
+#: panels/applications/cc-snap-row.c:97
+msgid "Read system and application logs"
+msgstr "讀取系統及應用程式日誌"
+
+#: panels/applications/cc-snap-row.c:99
+msgid "Access LXD service"
+msgstr "存取 LXD 服務"
+
+#: panels/applications/cc-snap-row.c:101
+msgid "access the media-hub service"
+msgstr "存取媒體中心服務"
+
+#: panels/applications/cc-snap-row.c:103
+msgid "Use and configure modems"
+msgstr "使用並設定數據機"
+
+#: panels/applications/cc-snap-row.c:105
+msgid "Read system mount information and disk quotas"
+msgstr "讀取系統掛載資訊及磁碟配額"
+
+#: panels/applications/cc-snap-row.c:107
+msgid "Control music and video players"
+msgstr "控制音樂及影片播放器"
+
+#: panels/applications/cc-snap-row.c:111
+msgid "Change low-level network settings"
+msgstr "變更低階網路設定"
+
+#: panels/applications/cc-snap-row.c:113
+msgid "Access the NetworkManager service to read and change network settings"
+msgstr "存取 NetworkManager 服務以讀取及變更網路設定"
+
+#: panels/applications/cc-snap-row.c:115
+msgid "Read access to network settings"
+msgstr "有權讀取網路設定"
+
+#: panels/applications/cc-snap-row.c:117
+msgid "Change network settings"
+msgstr "變更網路設定"
+
+#: panels/applications/cc-snap-row.c:119
+msgid "Read network settings"
+msgstr "讀取網路設定"
+
+#: panels/applications/cc-snap-row.c:121
+msgid ""
+"Access the ofono service to read and change network settings for mobile "
+"telephony"
+msgstr "存取 ofono 服務以讀取及變更行動電話語音的網路設定"
+
+#: panels/applications/cc-snap-row.c:123
+msgid "Control Open vSwitch hardware"
+msgstr "控制開放 vSwitch 硬體"
+
+#: panels/applications/cc-snap-row.c:125
+msgid "Read from CD/DVD"
+msgstr "從 CD/DVD 讀取"
+
+#: panels/applications/cc-snap-row.c:127
+msgid "Read, add, change, or remove saved passwords"
+msgstr "讀取、加入、變更或移除儲存的密碼"
+
+#: panels/applications/cc-snap-row.c:129
+msgid ""
+"Access pppd and ppp devices for configuring Point-to-Point Protocol "
+"connections"
+msgstr "存取 pppd 及 ppp 裝置以設定端對端通訊協定的連線"
+
+#: panels/applications/cc-snap-row.c:131
+msgid "Pause or end any process on the system"
+msgstr "暫停或結束系統處理程序"
+
+#: panels/applications/cc-snap-row.c:135
+msgid "Access USB hardware directly"
+msgstr "直接存取 USB 硬體"
+
+#: panels/applications/cc-snap-row.c:137
+msgid "Read/write files on removable storage devices"
+msgstr "讀取╱寫入可移除式儲存裝置"
+
+#: panels/applications/cc-snap-row.c:139
+msgid "Prevent screen sleep/lock"
+msgstr "防止螢幕睡眠/鎖定"
+
+#: panels/applications/cc-snap-row.c:141
+msgid "Access serial port hardware"
+msgstr "存取序列埠硬體"
+
+#: panels/applications/cc-snap-row.c:143
+msgid "Restart or power off the device"
+msgstr "重新啟動或關機裝置"
+
+#: panels/applications/cc-snap-row.c:145
+msgid "Install, remove and configure software"
+msgstr "安裝、移除及設定軟體"
+
+#: panels/applications/cc-snap-row.c:147
+msgid "Access Storage Framework service"
+msgstr "存取儲存空間框架 (Storage Framework) 服務"
+
+#: panels/applications/cc-snap-row.c:149
+msgid "Read process and system information"
+msgstr "讀取處理程序及系統資訊"
+
+#: panels/applications/cc-snap-row.c:151
+msgid "Monitor and control any running program"
+msgstr "監控及控制執行程式"
+
+#: panels/applications/cc-snap-row.c:153
+msgid "Change the date and time"
+msgstr "變更日期及時間"
+
+#: panels/applications/cc-snap-row.c:155
+msgid "Change time server settings"
+msgstr "變更時間伺服器設定"
+
+#: panels/applications/cc-snap-row.c:157
+msgid "Change the time zone"
+msgstr "變更時區"
+
+#: panels/applications/cc-snap-row.c:159
+msgid "Access the UDisks2 service for configuring disks and removable media"
+msgstr "存取 UDisks2 服務以設定磁碟及可移除式媒體"
+
+#: panels/applications/cc-snap-row.c:161
+msgid "Read/change shared calendar events in Ubuntu Unity 8"
+msgstr "讀取或變更 Ubuntu Unity 8 的共享行事曆事件"
+
+#: panels/applications/cc-snap-row.c:163
+msgid "Read/change shared contacts in Ubuntu Unity 8"
+msgstr "讀取或變更 Ubuntu Unity 8 的共享聯絡人"
+
+#: panels/applications/cc-snap-row.c:165
+msgid "Access energy usage data"
+msgstr "存取能量使用情況資料"
+
+#: panels/applications/cc-snap-row.c:167
+msgid "Read/write access to U2F devices exposed"
+msgstr "有權讀取/寫入至公開的 U2F 裝置"
+
 #: panels/applications/gnome-applications-panel.desktop.in.in:4
 msgid "Control various application permissions and settings"
 msgstr "控制各應用程式的權限及設定"
@@ -356,67 +554,60 @@ 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/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:348
-#| msgid "Select an input source"
+#: panels/background/cc-background-chooser.c:349
 msgid "Select a picture"
 msgstr "請選擇圖片"
 
-#: panels/background/cc-background-chooser.c:351
-#: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894
-#: panels/color/cc-color-panel.ui:657 panels/color/color-calibrate.ui:25
+#: panels/background/cc-background-chooser.c:352
+#: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:241
+#: panels/color/cc-color-panel.c:894 panels/color/cc-color-panel.ui:657
 #: panels/common/cc-language-chooser.ui:24
 #: panels/display/cc-display-panel.c:950
+#: panels/info-overview/cc-info-overview-panel.ui:235
+#: panels/network/cc-wifi-hotspot-dialog.ui:122
 #: panels/network/connection-editor/connection-editor.ui:17
-#: panels/network/connection-editor/vpn-helpers.c:181
-#: panels/network/connection-editor/vpn-helpers.c:310
-#: panels/network/net-device-wifi.c:1260 panels/network/net-device-wifi.c:1340
-#: panels/network/net-device-wifi.c:1561 panels/network/network-wifi.ui:24
+#: panels/network/connection-editor/vpn-helpers.c:176
+#: panels/network/connection-editor/vpn-helpers.c:299
+#: panels/network/net-device-wifi.c:800 panels/network/net-device-wifi.c:908
 #: panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:313
-#: panels/privacy/cc-privacy-panel.c:1137 panels/region/cc-format-chooser.ui:24
-#: panels/region/cc-input-chooser.ui:11
-#: panels/search/cc-search-locations-dialog.c:614
-#: panels/sharing/cc-sharing-panel.c:428
+#: panels/printers/pp-details-dialog.c:252
+#: panels/region/cc-format-chooser.ui:28 panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:638
+#: panels/sharing/cc-sharing-panel.c:428 panels/usage/cc-usage-panel.c:134
 #: panels/user-accounts/cc-add-user-dialog.ui:28
 #: panels/user-accounts/cc-avatar-chooser.c:107
 #: panels/user-accounts/cc-avatar-chooser.c:235
 #: panels/user-accounts/cc-password-dialog.ui:20
-#: panels/user-accounts/cc-user-panel.c:641
-#: panels/user-accounts/cc-user-panel.c:659
+#: panels/user-accounts/cc-user-panel.c:635
+#: panels/user-accounts/cc-user-panel.c:653
 #: panels/user-accounts/data/join-dialog.ui:20
 #: panels/user-accounts/um-fingerprint-dialog.c:261
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: panels/background/cc-background-chooser.c:352
-#: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:314
+#: panels/background/cc-background-chooser.c:353
+#: panels/network/connection-editor/vpn-helpers.c:177
+#: panels/printers/pp-details-dialog.c:253
 #: panels/sharing/cc-sharing-panel.c:429
 #: panels/user-accounts/cc-avatar-chooser.c:236
 msgid "_Open"
 msgstr "開啟(_O)"
 
 #: panels/background/cc-background-chooser.ui:104
-#| msgid "Show in Lock Screen"
 msgid "Set Background and Lock Screen"
 msgstr "設定背景及鎖定螢幕"
 
 #: panels/background/cc-background-chooser.ui:114
-#| msgid "Select Background"
 msgid "Set Background"
 msgstr "設定背景"
 
 #: panels/background/cc-background-chooser.ui:121
-#| msgid "_Lock Screen"
 msgid "Set Lock Screen"
 msgstr "設定鎖定螢幕"
 
 #: panels/background/cc-background-chooser.ui:143
-#| msgid "Select Background"
 msgid "Remove Background"
 msgstr "移除背景"
 
@@ -440,13 +631,10 @@ msgid "Current background"
 msgstr "目前的背景"
 
 #: panels/background/cc-background-panel.ui:63
-#| msgid "Add a Printer…"
 msgid "Add Picture…"
 msgstr "加入圖片…"
 
 #: panels/background/cc-background-preview.ui:55
-#| msgctxt "service is active"
-#| msgid "Active"
 msgid "Activities"
 msgstr "活動"
 
@@ -463,45 +651,45 @@ msgstr "將您的背景影像變更為桌布或相片"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:309
+#: panels/bluetooth/cc-bluetooth-panel.ui:31
 msgid "No Bluetooth Found"
 msgstr "找不到藍牙"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:310
+#: panels/bluetooth/cc-bluetooth-panel.ui:42
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "插入藍牙棒以使用藍牙。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:313
+#: panels/bluetooth/cc-bluetooth-panel.ui:69
 msgid "Bluetooth Turned Off"
 msgstr "藍牙已關閉"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:314
+#: panels/bluetooth/cc-bluetooth-panel.ui:80
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "開啟以連接裝置與接收檔案傳輸。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:317
+#: panels/bluetooth/cc-bluetooth-panel.ui:107
 msgid "Airplane Mode is on"
 msgstr "飛安模式已開啟"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:318
+#: panels/bluetooth/cc-bluetooth-panel.ui:118
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "當開啟飛安模式時,將停用藍牙。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:321
+#: panels/bluetooth/cc-bluetooth-panel.ui:124
+msgid "Turn Off Airplane Mode"
+msgstr "關閉飛安模式"
+
+#: panels/bluetooth/cc-bluetooth-panel.ui:154
 msgid "Hardware Airplane Mode is on"
 msgstr "硬體飛安模式已開啟"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:322
+#: panels/bluetooth/cc-bluetooth-panel.ui:165
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "關閉飛安模式開關以啟用藍牙。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:324
-msgid "Turn Off Airplane Mode"
-msgstr "關閉飛安模式"
-
 #. Translators: The found device is a printer connected via Bluetooth
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
-#: panels/printers/pp-new-printer-dialog.c:1697
+#: panels/printers/pp-new-printer-dialog.c:1714
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -514,6 +702,48 @@ msgstr "開啟或關閉藍牙與連接您的裝置"
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;分享;藍牙;"
 
+#: panels/camera/cc-camera-panel.ui:34
+msgid "Camera is turned off"
+msgstr "相機已關閉"
+
+#: panels/camera/cc-camera-panel.ui:43
+msgid "No applications can capture photos or video."
+msgstr "沒有應用程式能擷取圖片或影片。"
+
+#: panels/camera/cc-camera-panel.ui:77
+msgid ""
+"Use of the camera allows applications to capture photos and video. Disabling "
+"the camera may cause some applications to not function properly."
+msgstr ""
+"使用相機以讓應用程式能拍照或錄影。停用相機可能導致部份應用程式不能正常運作。"
+
+#: panels/camera/cc-camera-panel.ui:87
+msgid "Allow the applications below to use your camera."
+msgstr "允許下列應用程式使用相機。"
+
+#: panels/camera/cc-camera-panel.ui:107
+msgid "No Applications Have Asked for Camera Access"
+msgstr "沒有應用程式請求相機存取權"
+
+#: panels/camera/gnome-camera-panel.desktop.in.in:4
+msgid "Protect your pictures"
+msgstr "保護您的照片"
+
+#. FIXME
+#. Translators: Search terms to find the Privacy 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/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/microphone/gnome-microphone-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;"
+msgstr ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;螢幕;鎖定;診斷;隱私;最近使用;暫存;索引;名稱;網路;身分;"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: panels/color/cc-color-calibrate.c:348
 msgid "Place your calibration device over the square and press “Start”"
@@ -589,6 +819,25 @@ msgstr "您可以移除校準裝置。"
 msgid "Do not disturb the calibration device while in progress"
 msgstr "過程中請勿干擾校準裝置"
 
+#: panels/color/cc-color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "顯示校準"
+
+#. This starts the calibration process
+#: panels/color/cc-color-calibrate.ui:40
+msgid "_Start"
+msgstr "開始(_S)"
+
+#. This resumes the calibration process
+#: panels/color/cc-color-calibrate.ui:54
+msgid "_Resume"
+msgstr "繼續(_R)"
+
+#. This button returns the user back to the color control panel
+#: panels/color/cc-color-calibrate.ui:67 panels/region/cc-format-chooser.ui:64
+msgid "_Done"
+msgstr "完成(_D)"
+
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
@@ -679,7 +928,7 @@ msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: panels/color/cc-color-panel.c:260
-#: panels/network/wireless-security/eap-method-fast.c:417
+#: panels/network/wireless-security/eap-method-fast.c:309
 msgid "All files"
 msgstr "所有檔案"
 
@@ -718,7 +967,7 @@ msgid "Save Profile"
 msgstr "儲存描述檔"
 
 #: panels/color/cc-color-panel.c:895
-#: panels/network/connection-editor/vpn-helpers.c:311
+#: panels/network/connection-editor/vpn-helpers.c:300
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -806,7 +1055,8 @@ msgstr "描述檔白點"
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
-msgstr "請將顯示器的亮度設定為您常用的狀態。顏色管理會以這個亮度等級調整到最正確。"
+msgstr ""
+"請將顯示器的亮度設定為您常用的狀態。顏色管理會以這個亮度等級調整到最正確。"
 
 #: panels/color/cc-color-panel.ui:307
 msgid ""
@@ -875,7 +1125,7 @@ msgid "_Import File…"
 msgstr "載入檔案(_I)…"
 
 #: panels/color/cc-color-panel.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/network/connection-editor/net-connection-editor.c:513
 #: panels/printers/new-printer-dialog.ui:80
 #: panels/region/cc-input-chooser.ui:20
 #: panels/user-accounts/cc-add-user-dialog.ui:47
@@ -1100,25 +1350,6 @@ msgstr "這個描述檔無法使用全螢幕顯示校正"
 msgid "This profile may no longer be accurate"
 msgstr "這個描述檔可能不再準確"
 
-#: panels/color/color-calibrate.ui:7
-msgid "Display Calibration"
-msgstr "顯示校準"
-
-#. This starts the calibration process
-#: panels/color/color-calibrate.ui:40
-msgid "_Start"
-msgstr "開始(_S)"
-
-#. This resumes the calibration process
-#: panels/color/color-calibrate.ui:54
-msgid "_Resume"
-msgstr "繼續(_R)"
-
-#. This button returns the user back to the color control panel
-#: panels/color/color-calibrate.ui:67 panels/region/cc-format-chooser.ui:13
-msgid "_Done"
-msgstr "完成(_D)"
-
 #: panels/color/gnome-color-panel.desktop.in.in:3
 msgid "Color"
 msgstr "顏色"
@@ -1139,17 +1370,15 @@ msgstr ""
 msgid "Other…"
 msgstr "其他…"
 
-#: panels/common/cc-language-chooser.c:125
-#: panels/region/cc-format-chooser.c:296 panels/region/cc-input-chooser.c:178
+#: panels/common/cc-language-chooser.c:127 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "更多…"
 
-#: panels/common/cc-language-chooser.c:142
+#: panels/common/cc-language-chooser.c:144
 msgid "No languages found"
 msgstr "找不到語言"
 
 #: panels/common/cc-language-chooser.ui:5
-#| msgid "Select a language"
 msgid "Select Language"
 msgstr "選擇語言"
 
@@ -1157,13 +1386,25 @@ msgstr "選擇語言"
 msgid "_Select"
 msgstr "選取(_S)"
 
+#: panels/common/cc-permission-infobar.ui:20
+msgid "Unlock…"
+msgstr "解除鎖定…"
+
+#: panels/common/cc-permission-infobar.ui:45
+msgid "Unlock to Change Settings"
+msgstr "解除鎖定以變更設定"
+
+#: panels/common/cc-permission-infobar.ui:55
+msgid "Some settings must be unlocked before they can be changed."
+msgstr "部份設定需要先解鎖才能變更。"
+
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:106
+#: panels/network/connection-editor/ce-page-details.c:143
 msgid "Today"
 msgstr "今日"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:108
+#: panels/network/connection-editor/ce-page-details.c:145
 msgid "Yesterday"
 msgstr "昨日"
 
@@ -1177,6 +1418,43 @@ msgstr "%b%e日"
 msgid "%b %e, %Y"
 msgstr "%Y年%b%e日"
 
+#: panels/common/cc-util.c:165
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小時"
+
+#: panels/common/cc-util.c:166
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分鐘"
+
+#: panels/common/cc-util.c:167
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#. 5 hours 2 minutes 12 seconds
+#: panels/common/cc-util.c:172
+#, c-format
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: panels/common/cc-util.c:177
+#, c-format
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: panels/common/cc-util.c:187
+msgid "0 seconds"
+msgstr "0 秒"
+
 #. translators: This is the default hotspot name, need to be less than 32-bytes
 #: panels/common/hostname-helper.c:177
 msgctxt "hotspot"
@@ -1338,7 +1616,6 @@ msgid "Automatic Time _Zone"
 msgstr "自動調整時區(_Z)"
 
 #: panels/datetime/cc-datetime-panel.ui:335
-#| msgid "Requires internet access"
 msgid "Requires location services enabled and internet access"
 msgstr "需要啟用位置服務及網際網路連線"
 
@@ -1379,9 +1656,83 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,您需要通過核對。"
 
+#: panels/default-apps/cc-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "網頁(_W)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "郵件(_M)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "日曆(_C)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "音樂(_U)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "影片(_V)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:162
+#: panels/removable-media/cc-removable-media-panel.ui:162
+msgid "_Photos"
+msgstr "相片(_P)"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "預設應用程式"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+msgstr "設定預設應用程式"
+
+#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:19
+msgid "default;application;preferred;media;"
+msgstr "default;application;preferred;media;預設;應用程式;偏好;首選;媒體;"
+
+#. translators: '%s' is the distributor's name, such as 'Fedora'
+#: panels/diagnostics/cc-diagnostics-panel.c:141
+#, c-format
+msgid ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data."
+msgstr ""
+"傳送技術問題的報告有助於我們改進 %s。報告是以匿名方式傳送,並且會消除個人資"
+"料。"
+
+#: panels/diagnostics/cc-diagnostics-panel.c:151
+#: panels/diagnostics/cc-diagnostics-panel.ui:53
+msgid "Reports are sent anonymously and are scrubbed of personal data."
+msgstr "報告是以匿名方式傳送,並且會消除個人資料。"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:30
+msgid "Problem Reporting"
+msgstr "問題回報"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:43
+msgid ""
+"Sending reports of technical problems help us improve this operating system."
+msgstr "傳送技術問題的報告有助於我們改進這個作業系統。"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:78
+msgid "_Automatic Problem Reporting"
+msgstr "自動回報問題(_A)"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:3
+msgid "Diagnostics"
+msgstr "診斷"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:4
+msgid "Report your problems"
+msgstr "回報您遇到的問題"
+
+#. FIXME
 #: panels/display/cc-display-panel.c:961
 #: panels/network/connection-editor/connection-editor.ui:27
-#: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "套用(_A)"
 
@@ -1414,10 +1765,15 @@ msgstr "相同"
 msgid "Display Mode"
 msgstr "顯示器模式"
 
+#: panels/display/cc-display-panel.ui:222
+msgid "Contains top bar and Activities"
+msgstr "包含頂端列及概覽"
+
+#: panels/display/cc-display-panel.ui:223
+msgid "Primary Display"
+msgstr "主要顯示器"
+
 #: panels/display/cc-display-panel.ui:245
-#| msgid ""
-#| "Drag displays to match your setup. The top bar is placed on the primary "
-#| "display."
 msgid ""
 "Drag displays to match your physical display setup. Select a display to "
 "change its settings."
@@ -1427,8 +1783,11 @@ msgstr "請將顯示器拖曳到符合您實體顯示器的配置。請選取顯
 msgid "Display Arrangement"
 msgstr "排列顯示器組合方式"
 
+#: panels/display/cc-display-panel.ui:387
+msgid "Active Display"
+msgstr "使用中顯示器"
+
 #: panels/display/cc-display-panel.ui:434
-#| msgid "Display Calibration"
 msgid "Display Configuration"
 msgstr "顯示器設定"
 
@@ -1469,13 +1828,11 @@ msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
 #: panels/display/cc-display-settings.ui:15
-#| msgid "Orientation"
 msgctxt "display setting"
 msgid "Orientation"
 msgstr "方向"
 
 #: panels/display/cc-display-settings.ui:24
-#| msgid "Resolution"
 msgctxt "display setting"
 msgid "Resolution"
 msgstr "解析度"
@@ -1489,7 +1846,6 @@ msgid "Adjust for TV"
 msgstr "調整為電視"
 
 #: panels/display/cc-display-settings.ui:59
-#| msgid "Scale"
 msgctxt "display setting"
 msgid "Scale"
 msgstr "縮放"
@@ -1527,12 +1883,11 @@ msgid "Sunset to Sunrise"
 msgstr "日落到日出"
 
 #: panels/display/cc-night-light-page.ui:137
-#| msgid "Schedule"
 msgid "Manual Schedule"
 msgstr "手動排程"
 
 #: panels/display/cc-night-light-page.ui:148
-#: panels/region/cc-format-chooser.ui:154
+#: panels/region/cc-format-chooser.ui:346
 msgid "Times"
 msgstr "時刻"
 
@@ -1579,37 +1934,11 @@ msgstr ""
 "redshift;color;sunset;sunrise;面板;投影機;螢幕;解析度;重新整理;螢幕;夜晚;夜"
 "光;藍光;日出;日落;"
 
-#: panels/info/cc-info-default-apps-panel.ui:31
-msgid "_Web"
-msgstr "網頁(_W)"
-
-#: panels/info/cc-info-default-apps-panel.ui:43
-msgid "_Mail"
-msgstr "郵件(_M)"
-
-#: panels/info/cc-info-default-apps-panel.ui:59
-msgid "_Calendar"
-msgstr "日曆(_C)"
-
-#: panels/info/cc-info-default-apps-panel.ui:75
-msgid "M_usic"
-msgstr "音樂(_U)"
-
-#: panels/info/cc-info-default-apps-panel.ui:91
-msgid "_Video"
-msgstr "影片(_V)"
-
-#: panels/info/cc-info-default-apps-panel.ui:162
-#: panels/info/cc-info-removable-media-panel.ui:162
-msgid "_Photos"
-msgstr "相片(_P)"
-
-#. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:369
-#: panels/info/cc-info-overview-panel.c:440
-#: panels/info/cc-info-overview-panel.c:452
-#: panels/info/cc-info-overview-panel.c:497
-#: panels/info/cc-info-overview-panel.c:527 panels/network/panel-common.c:123
+#: panels/info-overview/cc-info-overview-panel.c:406
+#: panels/info-overview/cc-info-overview-panel.c:421
+#: panels/info-overview/cc-info-overview-panel.c:433
+#: panels/info-overview/cc-info-overview-panel.c:479
+#: panels/info-overview/cc-info-overview-panel.c:509
 msgid "Unknown"
 msgstr "不明"
 
@@ -1617,258 +1946,127 @@ msgstr "不明"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info/cc-info-overview-panel.c:460
+#: panels/info-overview/cc-info-overview-panel.c:441
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s;組建 ID:%s"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:477
+#: panels/info-overview/cc-info-overview-panel.c:456
 #, c-format
 msgid "64-bit"
 msgstr "64位元"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:480
+#: panels/info-overview/cc-info-overview-panel.c:459
 #, c-format
 msgid "32-bit"
 msgstr "32位元"
 
-#: panels/info/cc-info-overview-panel.c:710
-#, c-format
-msgid "Version %s"
-msgstr "版本 %s"
+#: panels/info-overview/cc-info-overview-panel.c:665
+msgid "X11"
+msgstr "X11"
+
+#: panels/info-overview/cc-info-overview-panel.c:669
+msgid "Wayland"
+msgstr "Wayland"
 
-#: panels/info/cc-info-overview-panel.ui:70
-msgid "Device name"
+#: panels/info-overview/cc-info-overview-panel.c:671
+msgctxt "Windowing system (Wayland, X11, or Unknown)"
+msgid "Unknown"
+msgstr "不明"
+
+#: panels/info-overview/cc-info-overview-panel.ui:54
+msgid "Device Name"
 msgstr "裝置名稱"
 
-#: panels/info/cc-info-overview-panel.ui:86
+#: panels/info-overview/cc-info-overview-panel.ui:76
 msgid "Memory"
 msgstr "記憶體"
 
-#: panels/info/cc-info-overview-panel.ui:102
+#: panels/info-overview/cc-info-overview-panel.ui:85
 msgid "Processor"
 msgstr "處理器"
 
-#: panels/info/cc-info-overview-panel.ui:118
+#: panels/info-overview/cc-info-overview-panel.ui:94
 msgid "Graphics"
 msgstr "繪圖"
 
-#. To translators: this field contains the distro name and version
-#: panels/info/cc-info-overview-panel.ui:133
-msgid "OS name"
+#: panels/info-overview/cc-info-overview-panel.ui:103
+msgid "Disk Capacity"
+msgstr "磁碟空間"
+
+#: panels/info-overview/cc-info-overview-panel.ui:104
+msgid "Calculating…"
+msgstr "正在計算…"
+
+#. translators: this field contains the distro name and version
+#: panels/info-overview/cc-info-overview-panel.ui:126
+msgid "OS Name"
 msgstr "作業系統名稱"
 
-#. To translators: this field contains the distro type
-#: panels/info/cc-info-overview-panel.ui:149
-msgid "OS type"
+#: panels/info-overview/cc-info-overview-panel.ui:135
+msgid "OS Type"
 msgstr "作業系統類型"
 
-#: panels/info/cc-info-overview-panel.ui:165
+#: panels/info-overview/cc-info-overview-panel.ui:144
+msgid "GNOME Version"
+msgstr "GNOME 版本"
+
+#: panels/info-overview/cc-info-overview-panel.ui:154
+msgid "Windowing System"
+msgstr "視窗系統"
+
+#: panels/info-overview/cc-info-overview-panel.ui:162
 msgid "Virtualization"
 msgstr "虛擬化"
 
-#: panels/info/cc-info-overview-panel.ui:181
-msgid "Disk"
-msgstr "磁碟"
+#: panels/info-overview/cc-info-overview-panel.ui:171
+msgid "Software Updates"
+msgstr "軟體更新"
 
-#: panels/info/cc-info-overview-panel.ui:293
-msgid "Calculating…"
-msgstr "正在計算…"
+#: panels/info-overview/cc-info-overview-panel.ui:192
+msgid "Rename Device"
+msgstr "重新命名裝置"
 
-#: panels/info/cc-info-overview-panel.ui:333
-msgid "Check for updates"
-msgstr "檢查更新"
+#: panels/info-overview/cc-info-overview-panel.ui:209
+msgid ""
+"The device name is used to identify this device when it is viewed over the "
+"network, or when pairing Bluetooth devices."
+msgstr "裝置名稱用來在網路上檢視裝置,或是配對藍牙裝置時識別裝置。"
 
-#: panels/info/cc-info-removable-media-panel.c:307
-msgid "Ask what to do"
-msgstr "詢問要做什麼"
+#: panels/info-overview/cc-info-overview-panel.ui:226
+msgid "_Rename"
+msgstr "重新命名(_R)"
 
-#: panels/info/cc-info-removable-media-panel.c:311
-msgid "Do nothing"
-msgstr "不做任何事"
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3
+msgid "About"
+msgstr "關於"
 
-#: panels/info/cc-info-removable-media-panel.c:315
-msgid "Open folder"
-msgstr "開啟資料夾"
-
-#: panels/info/cc-info-removable-media-panel.c:401
-msgid "Other Media"
-msgstr "其他媒體"
-
-#: panels/info/cc-info-removable-media-panel.c:434
-msgid "Select an application for audio CDs"
-msgstr "選擇播放音樂 CD 的應用程式"
-
-#: panels/info/cc-info-removable-media-panel.c:435
-msgid "Select an application for video DVDs"
-msgstr "選擇播放影片 DVD 的應用程式"
-
-#: panels/info/cc-info-removable-media-panel.c:436
-msgid "Select an application to run when a music player is connected"
-msgstr "選擇當音樂播放器連接時要執行的應用程式"
-
-#: panels/info/cc-info-removable-media-panel.c:437
-msgid "Select an application to run when a camera is connected"
-msgstr "選擇當攝影機連接時要執行的應用程式"
-
-#: panels/info/cc-info-removable-media-panel.c:438
-msgid "Select an application for software CDs"
-msgstr "選擇軟體 CD 要用的應用程式"
-
-#. translators: these strings are duplicates of shared-mime-info
-#. * strings, just here to fix capitalization of the English originals.
-#. * If the shared-mime-info translation works for your language,
-#. * simply leave these untranslated.
-#.
-#: panels/info/cc-info-removable-media-panel.c:450
-msgid "audio DVD"
-msgstr "音樂 DVD"
-
-#: panels/info/cc-info-removable-media-panel.c:451
-msgid "blank Blu-ray disc"
-msgstr "空白 Blu-ray 碟片"
-
-#: panels/info/cc-info-removable-media-panel.c:452
-msgid "blank CD disc"
-msgstr "空白 CD 碟片"
-
-#: panels/info/cc-info-removable-media-panel.c:453
-msgid "blank DVD disc"
-msgstr "空白 DVD 碟片"
-
-#: panels/info/cc-info-removable-media-panel.c:454
-msgid "blank HD DVD disc"
-msgstr "空白 HD DVD 碟片"
-
-#: panels/info/cc-info-removable-media-panel.c:455
-msgid "Blu-ray video disc"
-msgstr "Blu-ray 影片碟片"
-
-#: panels/info/cc-info-removable-media-panel.c:456
-msgid "e-book reader"
-msgstr "電子書閱讀器"
-
-#: panels/info/cc-info-removable-media-panel.c:457
-msgid "HD DVD video disc"
-msgstr "HD DVD 影片碟片"
-
-#: panels/info/cc-info-removable-media-panel.c:458
-msgid "Picture CD"
-msgstr "照片 CD"
-
-#: panels/info/cc-info-removable-media-panel.c:459
-msgid "Super Video CD"
-msgstr "SVCD"
-
-#: panels/info/cc-info-removable-media-panel.c:460
-msgid "Video CD"
-msgstr "影片 CD"
-
-#: panels/info/cc-info-removable-media-panel.c:461
-msgid "Windows software"
-msgstr "Windows 軟體"
-
-#: panels/info/cc-info-removable-media-panel.ui:44
-msgid "Select how media should be handled"
-msgstr "選擇要如何處理媒體"
-
-#: panels/info/cc-info-removable-media-panel.ui:75
-msgid "CD _audio"
-msgstr "CD 音樂(_A)"
-
-#: panels/info/cc-info-removable-media-panel.ui:92
-msgid "_DVD video"
-msgstr "_DVD 影片"
-
-#: panels/info/cc-info-removable-media-panel.ui:133
-msgid "_Music player"
-msgstr "音樂播放器(_M)"
-
-#: panels/info/cc-info-removable-media-panel.ui:191
-msgid "_Software"
-msgstr "軟體(_S)"
-
-#: panels/info/cc-info-removable-media-panel.ui:229
-msgid "_Other Media…"
-msgstr "其他(_O)…"
-
-#: panels/info/cc-info-removable-media-panel.ui:287
-msgid "_Never prompt or start programs on media insertion"
-msgstr "插入媒體時永遠不提示或啟動程式(_N)"
-
-#: panels/info/cc-info-removable-media-panel.ui:339
-msgid "Select how other media should be handled"
-msgstr "選擇要如何處理其他媒體"
-
-#: panels/info/cc-info-removable-media-panel.ui:378
-msgid "_Action:"
-msgstr "動作(_A):"
-
-#: panels/info/cc-info-removable-media-panel.ui:401
-msgid "_Type:"
-msgstr "類型(_T):"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:3
-msgid "Default Applications"
-msgstr "預設應用程式"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:4
-msgid "Configure Default Applications"
-msgstr "設定預設應用程式"
-
-#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/info/gnome-default-apps-panel.desktop.in.in:19
-msgid "default;application;preferred;media;"
-msgstr "default;application;preferred;media;預設;應用程式;偏好;首選;媒體;"
-
-#: panels/info/gnome-info-overview-panel.desktop.in.in:3
-msgid "About"
-msgstr "關於"
-
-#: panels/info/gnome-info-overview-panel.desktop.in.in:4
-msgid "View information about your system"
-msgstr "檢視您系統的資訊"
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:4
+msgid "View information about your system"
+msgstr "檢視您系統的資訊"
 
 #. Translators: Search terms to find the About panel.
 #. Do NOT translate or localize the semicolons!
 #. The list MUST also end with a semicolon!
 #. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: panels/info/gnome-info-overview-panel.desktop.in.in:23
-msgid ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-msgstr ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;裝置;系統;資訊;"
-"記憶體;處理器;版本;預設;應用程式;首選;音訊;視訊;碟片;可移除;媒體;自動執行;"
-
-#: panels/info/gnome-removable-media-panel.desktop.in.in:3
-msgid "Removable Media"
-msgstr "可移除式媒體"
-
-#: panels/info/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/info/gnome-removable-media-panel.desktop.in.in:19
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:23
 msgid ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;"
+"device;system;information;hostname;memory;processor;version;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;裝置;系統;預設;應用程式;偏好;首選;音訊;視訊;光碟;碟"
-"片;可移除;卸除式;媒體;自動執行;"
+"device;system;information;hostname;memory;processor;version;default;"
+"application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;裝"
+"置;系統;資訊;記憶體;處理器;版本;預設;應用程式;首選;音訊;視訊;碟片;可移除;媒"
+"體;自動執行;主機名;主機名稱"
 
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "聲音與媒體"
 
 #: panels/keyboard/00-multimedia.xml.in:4
-#| msgid "Volume mute"
 msgid "Volume mute/unmute"
 msgstr "音量 靜音/取消靜音"
 
@@ -2035,6 +2233,41 @@ msgstr "將文字縮小"
 msgid "High contrast on or off"
 msgstr "高對比開或關"
 
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:8
+#: panels/keyboard/cc-keyboard-panel.ui:72
+msgid "Alternate Characters Key"
+msgstr "替代字元鍵"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:28
+msgid ""
+"The alternate characters key can be used to enter additional characters. "
+"These are sometimes printed as a third-option on your keyboard."
+msgstr ""
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:45
+msgid "Left Alt"
+msgstr "左 Alt"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:61
+msgid "Right Alt"
+msgstr "右 Alt"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:77
+msgid "Left Super"
+msgstr "左 Super"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:93
+msgid "Right Super"
+msgstr "右 Super"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:109
+msgid "Menu key"
+msgstr "選單鍵"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:125
+msgid "Right Ctrl"
+msgstr "右 Ctrl"
+
 #: panels/keyboard/cc-keyboard-manager.c:501
 #: panels/keyboard/cc-keyboard-manager.c:509
 #: panels/keyboard/cc-keyboard-manager.c:809
@@ -2061,49 +2294,81 @@ msgstr "組合鍵"
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
-#: panels/keyboard/cc-keyboard-panel.c:180
+#: panels/keyboard/cc-keyboard-panel.c:94
+msgctxt "keyboard key"
+msgid "Right Ctrl"
+msgstr "右 Ctrl"
+
+#: panels/keyboard/cc-keyboard-panel.c:95
+msgctxt "keyboard key"
+msgid "Menu Key"
+msgstr "選單鍵"
+
+#: panels/keyboard/cc-keyboard-panel.c:96
+msgctxt "keyboard key"
+msgid "Left Super"
+msgstr "左 Super"
+
+#: panels/keyboard/cc-keyboard-panel.c:97
+msgctxt "keyboard key"
+msgid "Right Super"
+msgstr "右 Super"
+
+#: panels/keyboard/cc-keyboard-panel.c:98
+msgctxt "keyboard key"
+msgid "Left Alt"
+msgstr "左 Alt"
+
+#: panels/keyboard/cc-keyboard-panel.c:99
+msgctxt "keyboard key"
+msgid "Right Alt"
+msgstr "右 Alt"
+
+#: panels/keyboard/cc-keyboard-panel.c:201
 msgid "Reset All Shortcuts?"
 msgstr "重設所有的快捷鍵?"
 
-#: panels/keyboard/cc-keyboard-panel.c:183
+#: panels/keyboard/cc-keyboard-panel.c:204
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 msgstr "重設快捷鍵可能會影響您自訂的快捷鍵。這個動作不能撤銷。"
 
-#: panels/keyboard/cc-keyboard-panel.c:187
-#: panels/keyboard/shortcut-editor.ui:346
+#: panels/keyboard/cc-keyboard-panel.c:208
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:346
 #: panels/printers/authentication-dialog.ui:29
 #: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "取消"
 
-#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/keyboard/cc-keyboard-panel.c:209
 msgid "Reset All"
 msgstr "全部重設"
 
-#: panels/keyboard/cc-keyboard-panel.c:284
+#: panels/keyboard/cc-keyboard-panel.c:305
 msgid "Reset the shortcut to its default value"
 msgstr "將快捷鍵重設回預設值"
 
-#: panels/keyboard/cc-keyboard-panel.ui:116
+#: panels/keyboard/cc-keyboard-panel.ui:73
+msgid "Hold down and type to enter different characters"
+msgstr "按下並輸入以輸入不同字元"
+
+#: panels/keyboard/cc-keyboard-panel.ui:147
 msgid "Reset All…"
 msgstr "全部重設…"
 
-#: panels/keyboard/cc-keyboard-panel.ui:117
+#: panels/keyboard/cc-keyboard-panel.ui:148
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "將快捷鍵重設回它們預設的按鍵組合"
 
-#: panels/keyboard/cc-keyboard-panel.ui:146
+#: panels/keyboard/cc-keyboard-panel.ui:177
 msgid "No keyboard shortcut found"
 msgstr "找不到鍵盤快捷鍵"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:411
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:413
 #, c-format
-msgid ""
-"%s is already being used for <b>%s</b>. If you replace it, %s will be "
-"disabled"
-msgstr "%s 已經被 <b>%s</b> 使用。若您希望替換,則 %s 會被停用"
+msgid "%s is already being used for %s. If you replace it, %s will be disabled"
+msgstr "%s 已經被 %s 使用。如您替換,則 %s 會被停用"
 
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:581
 msgid "Set Custom Shortcut"
@@ -2113,255 +2378,513 @@ msgstr "設定自訂快捷鍵"
 msgid "Set Shortcut"
 msgstr "設定快捷鍵"
 
-#. Setup the top label
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:590
+#. TRANSLATORS: %s is replaced with a description of the keyboard shortcut
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:592
 #, c-format
-msgid "Enter new shortcut to change <b>%s</b>."
-msgstr "請輸入新的快捷鍵來更改 <b>%s</b>。"
+msgid "Enter new shortcut to change %s."
+msgstr "請輸入新的快捷鍵來更改 %s。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1016
 msgid "Add Custom Shortcut"
 msgstr "加入自訂快捷鍵"
 
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
-#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:340
-msgid "Keyboard Shortcuts"
-msgstr "鍵盤快捷鍵"
-
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
-msgid "View and change keyboard shortcuts and set your typing preferences"
-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;捷徑"
-"鍵;快捷鍵;工作區;視窗;重新調整大小;縮放;拉遠;拉近;遠近;輸入;來源;輸入法;鎖定;"
-"上鎖;音量;"
-
-#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
-#| msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:68
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
 msgstr "按下 Esc 取消或按 Backspace 停用鍵盤快捷鍵。"
 
-#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:156
+#: panels/printers/pp-details-dialog.ui:40
 msgid "Name"
 msgstr "名稱"
 
-#: panels/keyboard/shortcut-editor.ui:168
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:168
 msgid "Command"
 msgstr "指令"
 
-#: panels/keyboard/shortcut-editor.ui:180
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "快捷鍵"
 
-#: panels/keyboard/shortcut-editor.ui:259
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:259
 msgid "Set Shortcut…"
 msgstr "設定快捷鍵…"
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:272
 msgid "None"
 msgstr "沒有"
 
-#: panels/keyboard/shortcut-editor.ui:303
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "輸入新的快捷鍵"
 
-#: panels/keyboard/shortcut-editor.ui:357
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:357
 msgid "Remove"
 msgstr "移除"
 
-#: panels/keyboard/shortcut-editor.ui:367
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:367
 msgid "Add"
 msgstr "加入"
 
-#: panels/keyboard/shortcut-editor.ui:382
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:382
 msgid "Replace"
 msgstr "取代"
 
-#: panels/keyboard/shortcut-editor.ui:395
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:395
 msgid "Set"
 msgstr "設定"
 
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463
-msgid "Test Your _Settings"
-msgstr "測試您的設定值(_S)"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:327
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤快捷鍵"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
-msgid "Mouse & Touchpad"
-msgstr "滑鼠和觸控板"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "檢視與變更鍵盤快捷鍵並設定您的輸入偏好設定"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+#. 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 ""
-"Change your mouse or touchpad sensitivity and select right or left-handed"
-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;"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
-"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;觸控板;指標;點擊;輕"
-"觸;雙擊;按鈕;軌跡球;捲動;"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;捷徑"
+"鍵;快捷鍵;工作區;視窗;重新調整大小;縮放;拉遠;拉近;遠近;輸入;來源;輸入法;鎖定;"
+"上鎖;音量;"
 
-#: panels/mouse/gnome-mouse-properties.ui:50
-msgid "General"
-msgstr "一般"
+#: panels/location/cc-location-panel.ui:31
+msgid "Location services turned off"
+msgstr "位置服務已關閉"
 
-#: panels/mouse/gnome-mouse-properties.ui:88
-msgid "Primary Button"
-msgstr "主要按鈕"
+#: panels/location/cc-location-panel.ui:40
+msgid "No applications can obtain location information."
+msgstr "沒有應用程式能取得位置資訊。"
 
-#: panels/mouse/gnome-mouse-properties.ui:107
-msgid "Sets the order of physical buttons on mice and touchpads."
-msgstr "設定滑鼠與觸控板上實體按鈕的順序。"
+#: panels/location/cc-location-panel.ui:74
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
+msgstr ""
+"位置服務允許應用程式知道您的所在位置。使用 Wi-Fi 和行動寬頻可以提高定位精準"
+"度。"
 
-#: panels/mouse/gnome-mouse-properties.ui:136
-#: panels/sound/cc-balance-slider.ui:13
-msgid "Left"
-msgstr "左"
+#: panels/location/cc-location-panel.ui:83
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr ""
+"使用 Mozilla 位置服務:<a href='https://location.services.mozilla.com/";
+"privacy'>隱私服務</a>"
 
-#: panels/mouse/gnome-mouse-properties.ui:146
-#: panels/sound/cc-balance-slider.ui:15
-msgid "Right"
-msgstr "右"
+#: panels/location/cc-location-panel.ui:95
+msgid "Allow the applications below to determine your location."
+msgstr "允許下列應用程式判斷位置。"
 
-#: panels/mouse/gnome-mouse-properties.ui:182
-msgid "Mouse"
-msgstr "滑鼠"
+#: panels/location/cc-location-panel.ui:115
+msgid "No Applications Have Asked for Location Access"
+msgstr "沒有應用程式請求位置存取權限"
 
-#: panels/mouse/gnome-mouse-properties.ui:221
-msgid "Mouse Speed"
-msgstr "鼠標速度"
+#: panels/location/gnome-location-panel.desktop.in.in:4
+msgid "Protect your location information"
+msgstr "保護您的位置資訊"
 
-#: panels/mouse/gnome-mouse-properties.ui:243
-#: panels/mouse/gnome-mouse-properties.ui:535
-msgid "Double-click timeout"
-msgstr "雙擊分辨時間"
+#. FIXME
+#: panels/lock/cc-lock-panel.ui:29
+msgid ""
+"Automatically locking the screen prevents others from access the computer "
+"while you're away."
+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/gnome-mouse-properties.ui:280
-#: panels/mouse/gnome-mouse-properties.ui:443
-msgid "Natural Scrolling"
-msgstr "自然捲動"
+#: panels/lock/cc-lock-panel.ui:46
+msgid "Blank Screen Delay"
+msgstr "螢幕轉黑延遲"
 
-#: panels/mouse/gnome-mouse-properties.ui:296
-#: panels/mouse/gnome-mouse-properties.ui:459
-msgid "Scrolling moves the content, not the view."
-msgstr "捲動會移動內容,而非檢視。"
+#: panels/lock/cc-lock-panel.ui:47
+msgid "Period of inactivity after which the screen will go blank."
+msgstr "不活躍多久後螢幕轉黑。"
 
-#: panels/mouse/gnome-mouse-properties.ui:346
-#: panels/mouse/gnome-mouse-properties.ui:391
-msgid "Touchpad"
-msgstr "觸控板"
+#: panels/lock/cc-lock-panel.ui:67
+msgid "Automatic Screen _Lock"
+msgstr "自動鎖定螢幕(_L)"
 
-#: panels/mouse/gnome-mouse-properties.ui:514
-msgid "Touchpad Speed"
-msgstr "觸控板速度"
+#: panels/lock/cc-lock-panel.ui:84
+msgid "Automatic _Screen Lock Delay"
+msgstr "自動螢幕鎖定延遲(_S)"
 
-#: panels/mouse/gnome-mouse-properties.ui:573
-msgid "Tap to Click"
-msgstr "輕觸表示點擊"
+#: panels/lock/cc-lock-panel.ui:85
+msgid "Period after the screen blanks when the screen is automatically locked."
+msgstr "螢幕轉黑後,要多久才會自動鎖定螢幕。"
 
-#: panels/mouse/gnome-mouse-properties.ui:625
-msgid "Two-finger Scrolling"
-msgstr "兩指捲動"
+#: panels/lock/cc-lock-panel.ui:105
+msgid "Show _Notifications on Lock Screen"
+msgstr "在鎖定螢幕顯示通知(_N)"
 
-#: panels/mouse/gnome-mouse-properties.ui:678
-msgid "Edge Scrolling"
-msgstr "邊緣捲動"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:149
+msgctxt "lock_screen"
+msgid "Screen Turns Off"
+msgstr "螢幕關閉"
 
-#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25
-msgid "Try clicking, double clicking, scrolling"
-msgstr "試著單擊、雙擊、捲動"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:153
+msgctxt "lock_screen"
+msgid "30 seconds"
+msgstr "30 秒"
 
-#: panels/mouse/gnome-mouse-test.c:137
-msgid "Five clicks, GEGL time!"
-msgstr "五次點擊,GEGL 時間!"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:157
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 分鐘"
 
-#: panels/mouse/gnome-mouse-test.c:142
-msgid "Double click, primary button"
-msgstr "雙擊,主要按鈕"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:161
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 分鐘"
 
-#: panels/mouse/gnome-mouse-test.c:142
-msgid "Single click, primary button"
-msgstr "單擊,主要按鈕"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:165
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 分鐘"
 
-#: panels/mouse/gnome-mouse-test.c:145
-msgid "Double click, middle button"
-msgstr "雙擊,中央按鈕"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:169
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 分鐘"
 
-#: panels/mouse/gnome-mouse-test.c:145
-msgid "Single click, middle button"
-msgstr "單擊,中央按鈕"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:173
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 分鐘"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:177
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 小時"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:192 panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
+msgid "1 minute"
+msgstr "1 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:196 panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
+msgid "2 minutes"
+msgstr "2 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:200 panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
+msgid "3 minutes"
+msgstr "3 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:204 panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
+msgid "4 minutes"
+msgstr "4 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:208 panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
+msgid "5 minutes"
+msgstr "5 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:212 panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
+msgid "8 minutes"
+msgstr "8 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:216 panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
+msgid "10 minutes"
+msgstr "10 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:220 panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
+msgid "12 minutes"
+msgstr "12 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:224 panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 分鐘"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:228 panels/power/cc-power-panel.ui:99
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "永不"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:3
+msgid "Screen Lock"
+msgstr "螢幕鎖定"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:4
+msgid "Lock your screen"
+msgstr "鎖定您的螢幕"
+
+#. FIXME
+#: panels/microphone/cc-microphone-panel.ui:34
+msgid "Microphone is turned off"
+msgstr "麥克風已關閉"
+
+#: panels/microphone/cc-microphone-panel.ui:43
+msgid "No applications can record sound."
+msgstr "沒有能錄音的應用程式。"
+
+#: panels/microphone/cc-microphone-panel.ui:77
+msgid ""
+"Use of the microphone allows applications to record and listen to audio. "
+"Disabling the microphone may cause some applications to not function "
+"properly."
+msgstr ""
+"使用麥克風以允許應用程式錄音或聆聽聲音。停用麥克風可能導致部份應用程式無法正"
+"常運作。"
+
+#: panels/microphone/cc-microphone-panel.ui:87
+msgid "Allow the applications below to use your microphone."
+msgstr "允許下列應用程式使用麥克風。"
+
+#: panels/microphone/cc-microphone-panel.ui:107
+msgid "No Applications Have Asked for Microphone Access"
+msgstr "沒有應用程式請求麥克風存取權限。"
+
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:4
+msgid "Protect your conversations"
+msgstr "保護您的對話"
+
+#. FIXME
+#: panels/mouse/cc-mouse-panel.ui:37
+msgid "General"
+msgstr "一般"
+
+#: panels/mouse/cc-mouse-panel.ui:75
+msgid "Primary Button"
+msgstr "主要按鈕"
+
+#: panels/mouse/cc-mouse-panel.ui:94
+msgid "Sets the order of physical buttons on mice and touchpads."
+msgstr "設定滑鼠與觸控板上實體按鈕的順序。"
+
+#: panels/mouse/cc-mouse-panel.ui:123 panels/sound/cc-balance-slider.ui:13
+msgid "Left"
+msgstr "左"
+
+#: panels/mouse/cc-mouse-panel.ui:133 panels/sound/cc-balance-slider.ui:15
+msgid "Right"
+msgstr "右"
+
+#: panels/mouse/cc-mouse-panel.ui:169
+msgid "Mouse"
+msgstr "滑鼠"
+
+#: panels/mouse/cc-mouse-panel.ui:208
+msgid "Mouse Speed"
+msgstr "鼠標速度"
+
+#: panels/mouse/cc-mouse-panel.ui:230 panels/mouse/cc-mouse-panel.ui:522
+msgid "Double-click timeout"
+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:267 panels/mouse/cc-mouse-panel.ui:430
+msgid "Natural Scrolling"
+msgstr "自然捲動"
+
+#: panels/mouse/cc-mouse-panel.ui:283 panels/mouse/cc-mouse-panel.ui:446
+msgid "Scrolling moves the content, not the view."
+msgstr "捲動會移動內容,而非檢視。"
+
+#: panels/mouse/cc-mouse-panel.ui:333 panels/mouse/cc-mouse-panel.ui:378
+msgid "Touchpad"
+msgstr "觸控板"
+
+#: panels/mouse/cc-mouse-panel.ui:501
+msgid "Touchpad Speed"
+msgstr "觸控板速度"
+
+#: panels/mouse/cc-mouse-panel.ui:560
+msgid "Tap to Click"
+msgstr "輕觸表示點擊"
+
+#: panels/mouse/cc-mouse-panel.ui:612
+msgid "Two-finger Scrolling"
+msgstr "兩指捲動"
+
+#: panels/mouse/cc-mouse-panel.ui:665
+msgid "Edge Scrolling"
+msgstr "邊緣捲動"
+
+#: panels/mouse/cc-mouse-panel.ui:719 panels/wacom/cc-wacom-panel.c:438
+msgid "Test Your _Settings"
+msgstr "測試您的設定值(_S)"
+
+#: panels/mouse/cc-mouse-test.c:132 panels/mouse/cc-mouse-test.ui:25
+msgid "Try clicking, double clicking, scrolling"
+msgstr "試著單擊、雙擊、捲動"
+
+#: panels/mouse/cc-mouse-test.c:137
+msgid "Five clicks, GEGL time!"
+msgstr "五次點擊,GEGL 時間!"
+
+#: panels/mouse/cc-mouse-test.c:142
+msgid "Double click, primary button"
+msgstr "雙擊,主要按鈕"
+
+#: panels/mouse/cc-mouse-test.c:142
+msgid "Single click, primary button"
+msgstr "單擊,主要按鈕"
+
+#: panels/mouse/cc-mouse-test.c:145
+msgid "Double click, middle button"
+msgstr "雙擊,中央按鈕"
+
+#: panels/mouse/cc-mouse-test.c:145
+msgid "Single click, middle button"
+msgstr "單擊,中央按鈕"
 
-#: panels/mouse/gnome-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:148
 msgid "Double click, secondary button"
 msgstr "雙擊,次要按鈕"
 
-#: panels/mouse/gnome-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:148
 msgid "Single click, secondary button"
 msgstr "單擊,次要按鈕"
 
-#. add proxy to device list
-#: panels/network/cc-network-panel.c:590
-msgid "Network proxy"
-msgstr "網路代理伺服器"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
+msgstr "滑鼠和觸控板"
 
-#. Translators: this is the title of the connection details
-#. * window for vpn connections, it is also used to display
-#. * vpn connections in the device list.
-#.
-#: panels/network/cc-network-panel.c:725 panels/network/net-vpn.c:167
-#: panels/network/net-vpn.c:295
-#, c-format
-msgid "%s VPN"
-msgstr "%s VPN"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+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/network/cc-network-panel.c:789 panels/network/cc-wifi-panel.ui:306
+#: panels/network/cc-network-panel.c:648 panels/network/cc-wifi-panel.ui:306
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "噢,有問題發生。請聯繫您的軟體供應商。"
 
-#: panels/network/cc-network-panel.c:795
+#: panels/network/cc-network-panel.c:654
 msgid "NetworkManager needs to be running."
 msgstr "需要先執行 NetworkManager。"
 
-#: panels/network/cc-network-panel.ui:102
-#| msgid "Devices"
+#: panels/network/cc-network-panel.ui:68
 msgid "Other Devices"
 msgstr "其他裝置"
 
-#: panels/network/cc-network-panel.ui:143
-#: panels/network/connection-editor/net-connection-editor.c:581
+#: panels/network/cc-network-panel.ui:109
+#: panels/network/connection-editor/net-connection-editor.c:596
 msgid "VPN"
 msgstr "VPN"
 
-#: panels/network/cc-network-panel.ui:195
+#: panels/network/cc-network-panel.ui:153
 msgid "Not set up"
 msgstr "尚未設置"
 
 #. TRANSLATORS: This happens when the connection name does not contain the SSID.
 #: panels/network/cc-wifi-connection-row.c:189
 #, c-format
-#| msgctxt "timezone desc"
-#| msgid "%s (%s)"
 msgctxt "Wi-Fi Connection"
 msgid "%s (SSID: %s)"
 msgstr "%s (SSID: %s)"
 
+#: panels/network/cc-wifi-connection-row.c:249
+msgid "Insecure network (WEP)"
+msgstr "不安全網路 (WEP)"
+
+#: panels/network/cc-wifi-connection-row.c:254
+msgid "Secure network (WPA)"
+msgstr "安全網路 (WPA)"
+
+#: panels/network/cc-wifi-connection-row.c:259
+msgid "Secure network (WPA2)"
+msgstr "安全網路 (WPA2)"
+
+#: panels/network/cc-wifi-connection-row.c:264
+msgid "Secure network"
+msgstr "安全網路"
+
 #: panels/network/cc-wifi-connection-row.ui:102
-#: panels/network/net-device-ethernet.c:359
-#: panels/network/network-ethernet.ui:120 panels/network/network-mobile.ui:394
-#: panels/network/network-simple.ui:75 panels/network/network-vpn.ui:79
+#: panels/network/net-device-ethernet.c:318
+#: panels/network/network-bluetooth.ui:76
+#: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414
+#: panels/network/network-vpn.ui:78
 msgid "Options…"
 msgstr "選項…"
 
-#: panels/network/cc-wifi-panel.c:284
+#. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name
+#: panels/network/cc-wifi-hotspot-dialog.c:132
+#, c-format
+msgid ""
+"Turning on the hotspot will disconnect from %s, and it will not be possible "
+"to access the internet through Wi-Fi."
+msgstr "開啟熱點會斷開 %s 的連線,且會不能透過 Wi-Fi 連線網路。"
+
+#: panels/network/cc-wifi-hotspot-dialog.c:248
+msgid "Must have a minimum of 8 characters"
+msgstr "必須至少有 8 個字元"
+
+#: panels/network/cc-wifi-hotspot-dialog.c:458
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "開啟 Wi-Fi 熱點?"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:19
+msgid ""
+"Wi-Fi hotspot allows others to share your internet connection, by creating a "
+"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 之外的網路連線來源。"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:44
+#: panels/network/network-wifi.ui:105
+msgid "Network Name"
+msgstr "網路名稱"
+
+#. Translators: This is a password needed for printing.
+#: panels/network/cc-wifi-hotspot-dialog.ui:69
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
+#: panels/user-accounts/cc-add-user-dialog.ui:249
+msgid "Password"
+msgstr "密碼"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:83
+msgid "Generate Random Password"
+msgstr "產生隨機密碼"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:84
+msgid "Autogenerate Password"
+msgstr "自動產生密碼"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:130
+msgid "_Turn On"
+msgstr "開啟(_T)"
+
+#: panels/network/cc-wifi-panel.c:277
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1738
+#: panels/network/network-wifi.ui:233
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
@@ -2397,361 +2920,304 @@ msgstr "可見網路"
 msgid "NetworkManager needs to be running"
 msgstr "需要先執行 NetworkManager"
 
-#: panels/network/connection-editor/8021x-security-page.ui:26
+#: panels/network/connection-editor/8021x-security-page.ui:20
 msgid "802.1x _Security"
 msgstr "802.1x 防護(_S)"
 
-#: panels/network/connection-editor/8021x-security-page.ui:73
-#: panels/network/connection-editor/security-page.ui:72
-msgid "page 1"
-msgstr "頁 1"
-
-#: panels/network/connection-editor/8021x-security-page.ui:224
-#: panels/network/connection-editor/security-page.ui:223
-#: panels/network/wireless-security/eap-method-fast.ui:50
-#: panels/network/wireless-security/eap-method-peap.ui:48
-#: panels/network/wireless-security/eap-method-ttls.ui:31
-msgid "Anony_mous identity"
-msgstr "匿名識別(_M)"
-
-#: panels/network/connection-editor/8021x-security-page.ui:238
-#: panels/network/connection-editor/security-page.ui:237
-msgid "Inner _authentication"
-msgstr "內部核對(_A)"
-
-#: panels/network/connection-editor/8021x-security-page.ui:281
-#: panels/network/connection-editor/security-page.ui:280
-msgid "page 2"
-msgstr "頁 2"
-
-#: panels/network/connection-editor/ce-page-8021x-security.c:101
-#: panels/network/connection-editor/ce-page-security.c:445
-#: panels/network/connection-editor/details-page.ui:86
-#: panels/network/network-wifi.ui:239
+#: panels/network/connection-editor/ce-page-8021x-security.c:114
+#: panels/network/connection-editor/ce-page-security.c:386
+#: panels/network/connection-editor/details-page.ui:90
 msgid "Security"
 msgstr "安全性"
 
-#: panels/network/connection-editor/ce-page.c:396
-#| msgid "reset"
+#: panels/network/connection-editor/ce-page.c:234
 msgid "Preserve"
 msgstr "保留"
 
-#: panels/network/connection-editor/ce-page.c:397
-#| msgid "Germany"
+#: panels/network/connection-editor/ce-page.c:235
 msgid "Permanent"
 msgstr "永久"
 
-#: panels/network/connection-editor/ce-page.c:398
+#: panels/network/connection-editor/ce-page.c:236
 msgid "Random"
 msgstr "隨機"
 
-#: panels/network/connection-editor/ce-page.c:399
-#| msgid "Tablet"
+#: panels/network/connection-editor/ce-page.c:237
 msgid "Stable"
 msgstr "穩定"
 
-#: panels/network/connection-editor/ce-page.c:403
+#: panels/network/connection-editor/ce-page.c:241
 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 "
 "cloning or spoofing. Example: 00:11:22:33:44:55"
 msgstr ""
+"這裡輸入的 MAC 位址會當作這個連線開在的網路裝置的硬體位址。這個功能又稱為 "
+"MAC 複製或欺騙。範例:00:11:22:33:44:55"
 
-#: panels/network/connection-editor/ce-page.c:538
-msgid "automatic"
-msgstr "自動"
-
-#: panels/network/connection-editor/ce-page.c:578
+#: panels/network/connection-editor/ce-page.c:399
 #, c-format
 msgid "Profile %d"
 msgstr "設定檔 %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:134 panels/network/net-device-wifi.c:314
+#: panels/network/connection-editor/ce-page-details.c:93
+#: panels/network/net-device-wifi.c:235
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:138 panels/network/net-device-wifi.c:319
-#: panels/network/network-wifi.ui:592
+#: panels/network/connection-editor/ce-page-details.c:97
+#: panels/network/net-device-wifi.c:240
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:142
+#: panels/network/connection-editor/ce-page-details.c:101
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:147
+#: panels/network/connection-editor/ce-page-details.c:106
 msgid "Enterprise"
 msgstr "企業版"
 
-#: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:152 panels/network/net-device-wifi.c:304
+#: panels/network/connection-editor/ce-page-details.c:111
+#: panels/network/net-device-wifi.c:225
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
 
-#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/network/connection-editor/ce-page-details.c:132
 msgid "Never"
 msgstr "永不"
 
-#: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:137
-#: panels/network/net-device-wifi.c:413
+#: panels/network/connection-editor/ce-page-details.c:147
+#: panels/network/net-device-ethernet.c:108
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天以前"
 
+#: panels/network/connection-editor/ce-page-details.c:272
+#, 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:228
-#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:536
+#: panels/network/connection-editor/ce-page-details.c:274
+#: panels/network/net-device-ethernet.c:202
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:249
-#: panels/network/net-device-wifi.c:565
+#: panels/network/connection-editor/ce-page-details.c:291
+msgid "2.4 GHz / 5 GHz"
+msgstr "2.4 GHz / 5 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:293
+msgid "2.4 GHz"
+msgstr "2.4 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:295
+msgid "5 GHz"
+msgstr "5 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:315
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:567
+#: panels/network/connection-editor/ce-page-details.c:317
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:569
+#: panels/network/connection-editor/ce-page-details.c:319
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:571
+#: panels/network/connection-editor/ce-page-details.c:321
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:573
+#: panels/network/connection-editor/ce-page-details.c:323
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: panels/network/connection-editor/ce-page-details.c:300
+#: panels/network/connection-editor/ce-page-details.c:381
+#: panels/network/connection-editor/details-page.ui:108
+#: panels/network/net-device-ethernet.c:143
+#: panels/network/net-device-mobile.c:431
+msgid "IPv4 Address"
+msgstr "IPv4 位址"
+
+#: panels/network/connection-editor/ce-page-details.c:382
+#: panels/network/connection-editor/details-page.ui:126
+#: panels/network/net-device-ethernet.c:144
+#: panels/network/net-device-ethernet.c:148
+#: panels/network/net-device-mobile.c:432 panels/network/network-mobile.ui:200
+msgid "IPv6 Address"
+msgstr "IPv6 位址"
+
+#: panels/network/connection-editor/ce-page-details.c:385
+#: panels/network/connection-editor/ce-page-details.c:386
+#: panels/network/net-device-ethernet.c:146
+#: panels/network/net-device-mobile.c:435
+#: panels/network/net-device-mobile.c:436 panels/network/network-mobile.ui:183
+msgid "IP Address"
+msgstr "IP 位址"
+
+#: panels/network/connection-editor/ce-page-details.c:420
 msgid "Forget Connection"
 msgstr "忘記連線"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:422
 msgid "Remove Connection Profile"
 msgstr "移除連線個人檔案"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:424
 msgid "Remove VPN"
 msgstr "移除 VPN"
 
-#: panels/network/connection-editor/ce-page-details.c:332
-#: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103
-#: shell/cc-window.c:269
+#: panels/network/connection-editor/ce-page-details.c:442
 msgid "Details"
 msgstr "詳細資料"
 
-#: panels/network/connection-editor/ce-page-ethernet.c:177
-#: panels/network/connection-editor/ce-page-vpn.c:188
-#: panels/network/connection-editor/ce-page-wifi.c:196
-#: panels/network/network-wifi.ui:1437
+#: panels/network/connection-editor/ce-page-ethernet.c:71
+msgid "automatic"
+msgstr "自動"
+
+#: panels/network/connection-editor/ce-page-ethernet.c:144
+#: panels/network/connection-editor/ce-page-vpn.c:150
+#: panels/network/connection-editor/ce-page-wifi.c:129
 msgid "Identity"
 msgstr "身分"
 
-#: panels/network/connection-editor/ce-page-ip4.c:251
-#: panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:268
+#: panels/network/connection-editor/ce-page-ip6.c:249
 msgid "Delete Address"
 msgstr "刪除位址"
 
-#: panels/network/connection-editor/ce-page-ip4.c:422
-#: panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:428
+#: panels/network/connection-editor/ce-page-ip6.c:398
 msgid "Delete Route"
 msgstr "刪除路由"
 
-#: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1441
+#: panels/network/connection-editor/ce-page-ip4.c:852
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1445
+#: panels/network/connection-editor/ce-page-ip6.c:783
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:257
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:280
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元金鑰 (Hex 或 ASCII)"
 
-#: panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:290
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元密語"
 
-#: panels/network/connection-editor/ce-page-security.c:291
-#: panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:303
+#: panels/network/wireless-security/ws-dynamic-wep.ui:20
+#: panels/network/wireless-security/ws-wpa-eap.ui:25
 msgid "LEAP"
 msgstr "LEAP"
 
-#: panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:316
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP (802.1x)"
 
-#: panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:330
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 和 WPA2 個人版"
 
-#: panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:344
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 和 WPA2 企業版"
 
 #: panels/network/connection-editor/details-page.ui:18
-#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "信號強度"
 
-#: panels/network/connection-editor/details-page.ui:52
-#: panels/network/network-wifi.ui:207
+#: panels/network/connection-editor/details-page.ui:54
 msgid "Link speed"
 msgstr "連線速度"
 
-#: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:170 panels/network/network-wifi.ui:256
-#: panels/network/panel-common.c:644
-msgid "IPv4 Address"
-msgstr "IPv4 位址"
-
-#: panels/network/connection-editor/details-page.ui:122
-#: panels/network/net-device-ethernet.c:171
-#: panels/network/net-device-ethernet.c:175
-#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
-#: panels/network/panel-common.c:645
-msgid "IPv6 Address"
-msgstr "IPv6 位址"
-
-#: panels/network/connection-editor/details-page.ui:140
-#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
+#: panels/network/connection-editor/details-page.ui:144
+#: panels/network/net-device-ethernet.c:151
 msgid "Hardware Address"
 msgstr "硬體位址"
 
-#: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:182
-#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
+#: panels/network/connection-editor/details-page.ui:162
+msgid "Supported Frequencies"
+msgstr "支援的頻率"
+
+#: panels/network/connection-editor/details-page.ui:180
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/network-mobile.ui:217
 msgid "Default Route"
 msgstr "預設路由"
 
-#: panels/network/connection-editor/details-page.ui:177
-#: panels/network/connection-editor/ip4-page.ui:197
-#: panels/network/connection-editor/ip6-page.ui:211
-#: panels/network/net-device-ethernet.c:184
-#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
-#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
+#: panels/network/connection-editor/details-page.ui:199
+#: panels/network/connection-editor/ip4-page.ui:211
+#: panels/network/connection-editor/ip6-page.ui:225
+#: panels/network/net-device-ethernet.c:157
+#: panels/network/network-mobile.ui:235
 msgid "DNS"
 msgstr "DNS"
 
-#: panels/network/connection-editor/details-page.ui:195
+#: panels/network/connection-editor/details-page.ui:217
 msgid "Last Used"
 msgstr "最後使用的"
 
-#: panels/network/connection-editor/details-page.ui:324
+#: panels/network/connection-editor/details-page.ui:376
 msgid "Connect _automatically"
 msgstr "自動連線(_A)"
 
-#: panels/network/connection-editor/details-page.ui:343
+#: panels/network/connection-editor/details-page.ui:395
 msgid "Make available to _other users"
 msgstr "允許其他使用者使用(_O)"
 
-#: panels/network/connection-editor/details-page.ui:376
-#| msgid "Restrict background data usage"
-msgid "Restrict _background data usage"
-msgstr "限制背景資料用量(_B)"
-
-#: panels/network/connection-editor/details-page.ui:387
-msgid "Appropriate for connections that have data charges or limits."
-msgstr "適合數據需收費或有流量限制的連線使用。"
-
-#: panels/network/connection-editor/ethernet-page.ui:16
-#: panels/network/connection-editor/ethernet-page.ui:39
-#: panels/network/connection-editor/ip4-page.ui:209
-#: panels/network/connection-editor/ip4-page.ui:277
-#: panels/network/connection-editor/ip6-page.ui:42
-#: panels/network/connection-editor/ip6-page.ui:223
-#: panels/network/connection-editor/ip6-page.ui:291
-#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
-#: panels/network/wireless-security/eap-method-peap.ui:22
-#: panels/privacy/cc-privacy-panel.c:239
-msgid "Automatic"
-msgstr "自動"
-
-#: panels/network/connection-editor/ethernet-page.ui:19
-msgid "Twisted Pair (TP)"
-msgstr "雙絞線 (TP)"
+#: panels/network/connection-editor/details-page.ui:428
+msgid "_Metered connection: has data limits or can incur charges"
+msgstr "計量連線(_M):有資料限制或可能會收取費用"
 
-#: panels/network/connection-editor/ethernet-page.ui:22
-msgid "Attachment Unit Interface (AUI)"
-msgstr "附加單位介面 (AUI)"
+#: panels/network/connection-editor/details-page.ui:439
+msgid ""
+"Software updates and other large downloads will not be started automatically."
+msgstr "軟體更新及其他大型下載不會自動開始。"
 
 #: panels/network/connection-editor/ethernet-page.ui:25
-msgid "BNC"
-msgstr "BNC"
-
-#: panels/network/connection-editor/ethernet-page.ui:28
-msgid "Media Independent Interface (MII)"
-msgstr "媒體獨立介面 (MII)"
-
-#: panels/network/connection-editor/ethernet-page.ui:42
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:45
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:48
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:51
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:71
 #: panels/network/connection-editor/vpn-page.ui:23
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/ethernet-page.ui:54
 #: panels/network/connection-editor/wifi-page.ui:67
-#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "_MAC 位址"
 
-#: panels/network/connection-editor/ethernet-page.ui:151
+#: panels/network/connection-editor/ethernet-page.ui:105
 msgid "M_TU"
 msgstr "M_TU"
 
-#: panels/network/connection-editor/ethernet-page.ui:168
+#: panels/network/connection-editor/ethernet-page.ui:122
 #: panels/network/connection-editor/wifi-page.ui:102
 msgid "_Cloned Address"
 msgstr "複製的 MA_C 位址"
 
-#: panels/network/connection-editor/ethernet-page.ui:183
+#: panels/network/connection-editor/ethernet-page.ui:137
 msgid "bytes"
 msgstr "位元組"
 
@@ -2760,7 +3226,6 @@ msgid "IPv_4 Method"
 msgstr "IPv_4 方法"
 
 #: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
@@ -2771,9 +3236,7 @@ msgstr "只有本機連線"
 
 #: panels/network/connection-editor/ip4-page.ui:69
 #: panels/network/connection-editor/ip6-page.ui:83
-#: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113
-#: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053
-#: panels/privacy/cc-privacy-panel.c:239
+#: panels/network/net-proxy.c:72 panels/network/network-proxy.ui:116
 msgid "Manual"
 msgstr "手動"
 
@@ -2782,61 +3245,74 @@ msgstr "手動"
 msgid "Disable"
 msgstr "停用"
 
-#: panels/network/connection-editor/ip4-page.ui:111
-#: panels/network/connection-editor/ip6-page.ui:125
+#: panels/network/connection-editor/ip4-page.ui:97
+#: panels/network/connection-editor/ip6-page.ui:111
+msgid "Shared to other computers"
+msgstr "分享給其他電腦"
+
+#: panels/network/connection-editor/ip4-page.ui:125
+#: panels/network/connection-editor/ip6-page.ui:139
 msgid "Addresses"
 msgstr "位址"
 
-#: panels/network/connection-editor/ip4-page.ui:129
-#: panels/network/connection-editor/ip4-page.ui:313
-#: panels/network/connection-editor/ip6-page.ui:143
-#: panels/network/connection-editor/ip6-page.ui:327
-#: panels/printers/details-dialog.ui:89
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/printers/pp-details-dialog.ui:95
 msgid "Address"
 msgstr "地址"
 
-#: panels/network/connection-editor/ip4-page.ui:143
-#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
 msgid "Netmask"
 msgstr "網路遮罩"
 
-#: panels/network/connection-editor/ip4-page.ui:157
-#: panels/network/connection-editor/ip4-page.ui:341
-#: panels/network/connection-editor/ip6-page.ui:171
-#: panels/network/connection-editor/ip6-page.ui:355
+#: panels/network/connection-editor/ip4-page.ui:171
+#: panels/network/connection-editor/ip4-page.ui:355
+#: panels/network/connection-editor/ip6-page.ui:185
+#: panels/network/connection-editor/ip6-page.ui:369
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: panels/network/connection-editor/ip4-page.ui:220
-#: panels/network/connection-editor/ip6-page.ui:234
-msgid "Automatic DNS"
+#: panels/network/connection-editor/ip4-page.ui:223
+#: panels/network/connection-editor/ip4-page.ui:291
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:237
+#: panels/network/connection-editor/ip6-page.ui:305
+#: panels/network/net-proxy.c:74 panels/network/network-proxy.ui:106
+#: panels/network/wireless-security/eap-method-peap.ui:33
+msgid "Automatic"
+msgstr "自動"
+
+#: panels/network/connection-editor/ip4-page.ui:234
+#: panels/network/connection-editor/ip6-page.ui:248
+msgid "Automatic DNS"
 msgstr "自動 DNS"
 
-#: panels/network/connection-editor/ip4-page.ui:244
-#: panels/network/connection-editor/ip6-page.ui:258
+#: panels/network/connection-editor/ip4-page.ui:258
+#: panels/network/connection-editor/ip6-page.ui:272
 msgid "Separate IP addresses with commas"
 msgstr "請以分號 (;) 分隔 IP 地址"
 
-#: panels/network/connection-editor/ip4-page.ui:265
-#: panels/network/connection-editor/ip6-page.ui:279
-#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
+#: panels/network/connection-editor/ip4-page.ui:279
+#: panels/network/connection-editor/ip6-page.ui:293
 msgid "Routes"
 msgstr "路由"
 
-#: panels/network/connection-editor/ip4-page.ui:288
-#: panels/network/connection-editor/ip6-page.ui:302
+#: panels/network/connection-editor/ip4-page.ui:302
+#: panels/network/connection-editor/ip6-page.ui:316
 msgid "Automatic Routes"
 msgstr "自動路由"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: panels/network/connection-editor/ip4-page.ui:354
-#: panels/network/connection-editor/ip6-page.ui:368
+#: panels/network/connection-editor/ip4-page.ui:368
+#: panels/network/connection-editor/ip6-page.ui:382
 msgid "Metric"
 msgstr "度量權值"
 
-#: panels/network/connection-editor/ip4-page.ui:384
-#: panels/network/connection-editor/ip6-page.ui:398
-#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
+#: panels/network/connection-editor/ip4-page.ui:398
+#: panels/network/connection-editor/ip6-page.ui:412
 msgid "Use this connection _only for resources on its network"
 msgstr "只在使用這個連線的網路資源時才使用此連線(_U)"
 
@@ -2848,37 +3324,36 @@ msgstr "IPv_6 方法"
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: panels/network/connection-editor/ip6-page.ui:157
-#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Prefix"
 msgstr "前綴"
 
-#: panels/network/connection-editor/net-connection-editor.c:261
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "Unable to open connection editor"
 msgstr "無法開啟連線編輯器"
 
-#: panels/network/connection-editor/net-connection-editor.c:279
+#: panels/network/connection-editor/net-connection-editor.c:307
 msgid "New Profile"
 msgstr "新增設定檔"
 
-#: panels/network/connection-editor/net-connection-editor.c:727
+#: panels/network/connection-editor/net-connection-editor.c:740
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: panels/network/connection-editor/net-connection-editor.c:759
+#: panels/network/connection-editor/net-connection-editor.c:772
 msgid "Add VPN"
 msgstr "加入 VPN"
 
-#: panels/network/connection-editor/security-page.ui:26
-#: panels/network/network-wifi.ui:529
+#: panels/network/connection-editor/security-page.ui:20
 msgid "S_ecurity"
 msgstr "安全性(_E)"
 
-#: panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:139
 msgid "Cannot import VPN connection"
 msgstr "無法匯入 VPN 網路連線"
 
-#: panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:141
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2890,29 +3365,29 @@ msgstr ""
 "\n"
 "錯誤:%s。"
 
-#: panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:173
 msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
-#: panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:225
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "名為「%s」的檔案已經存在。"
 
-#: panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:227
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "您是否要以準備儲存的 VPN 連線取代 %s?"
 
-#: panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:264
 msgid "Cannot export VPN connection"
 msgstr "無法匯出 VPN 連線"
 
-#: panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:266
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -2923,7 +3398,7 @@ msgstr ""
 "\n"
 "錯誤:%s。"
 
-#: panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:296
 msgid "Export VPN connection"
 msgstr "匯出 VPN 連線"
 
@@ -2932,12 +3407,10 @@ msgid "(Error: unable to load VPN connection editor)"
 msgstr "(錯誤:無法載入 VPN 連線編輯器)"
 
 #: panels/network/connection-editor/wifi-page.ui:20
-#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "_SSID"
 
 #: panels/network/connection-editor/wifi-page.ui:36
-#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
@@ -2947,13 +3420,10 @@ msgstr "控制您如何連線至網際網絡"
 
 #. Translators: Search terms to find the Network panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/network/gnome-network-panel.desktop.in.in:19
-#| msgid ""
-#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
-#| "vpn;DNS;"
 msgid "Network;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;"
 msgstr ""
-"Network;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"DNS;網路;區域網路;代理伺服器;寬頻;數據機;藍牙;區網;代理;藍芽;"
+"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"
@@ -2961,34 +3431,24 @@ msgstr "控制您如何連線至 Wi-Fi 網絡"
 
 #. Translators: Search terms to find the Wi-Fi panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/network/gnome-wifi-panel.desktop.in.in:19
-#| msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;"
 msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;"
-"網路;無線網路;區域網路;寬頻;熱點;區網;"
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;網路;無線網路;區域網"
+"路;寬頻;熱點;區網;"
 
-#: panels/network/net-device-ethernet.c:123
-#: panels/network/net-device-wifi.c:399
+#: panels/network/net-device-ethernet.c:96
 msgid "never"
 msgstr "永不"
 
-#: panels/network/net-device-ethernet.c:133
-#: panels/network/net-device-wifi.c:409
+#: panels/network/net-device-ethernet.c:104
 msgid "today"
 msgstr "今日"
 
-#: panels/network/net-device-ethernet.c:135
-#: panels/network/net-device-wifi.c:411
+#: panels/network/net-device-ethernet.c:106
 msgid "yesterday"
 msgstr "昨日"
 
-#: panels/network/net-device-ethernet.c:173
-#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
-#: panels/network/panel-common.c:649
-msgid "IP Address"
-msgstr "IP 位址"
-
-#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:162
 msgid "Last used"
 msgstr "最後使用的"
 
@@ -2997,85 +3457,59 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:291
-#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
+#: panels/network/net-device-ethernet.c:252
+#: panels/network/network-bluetooth.ui:38 panels/network/network-ethernet.ui:18
 msgid "Wired"
 msgstr "有線"
 
-#: panels/network/net-device-mobile.c:236
+#: panels/network/net-device-mobile.c:208
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: panels/network/net-device-wifi.c:1217
-#, c-format
-msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr "切換無線網路熱點會讓您從 <b>%s</b> 斷線。"
-
-#: panels/network/net-device-wifi.c:1221
-msgid ""
-"It is not possible to access the Internet through your wireless while the "
-"hotspot is active."
-msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。"
-
-#: panels/network/net-device-wifi.c:1228
-msgid "Turn On Wi-Fi Hotspot?"
-msgstr "開啟 Wi-Fi 熱點?"
-
-#: panels/network/net-device-wifi.c:1250
-msgid ""
-"Wi-Fi hotspots are usually used to share an additional Internet connection "
-"over Wi-Fi."
-msgstr "Wi-Fi 熱點常用於透過 Wi-Fi 分享額外網際網路連線。"
-
-#: panels/network/net-device-wifi.c:1261
-msgid "_Turn On"
-msgstr "開啟(_T)"
-
-#: panels/network/net-device-wifi.c:1338
+#: panels/network/net-device-wifi.c:798
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: panels/network/net-device-wifi.c:1341
+#: panels/network/net-device-wifi.c:801
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: panels/network/net-device-wifi.c:1397
-msgid "System policy prohibits use as a Hotspot"
-msgstr "系統原則禁止做為熱點"
-
-#: panels/network/net-device-wifi.c:1400
-msgid "Wireless device does not support Hotspot mode"
-msgstr "無線裝置不支援熱點模式"
-
-#: panels/network/net-device-wifi.c:1558
+#: panels/network/net-device-wifi.c:905
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網路的詳細資料包含密碼及任何自訂的設定都會消失。"
 
-#: panels/network/net-device-wifi.c:1562 panels/network/network-wifi.ui:1350
+#: panels/network/net-device-wifi.c:909
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
-#: panels/network/net-device-wifi.c:1725 panels/network/net-device-wifi.c:1732
+#: panels/network/net-device-wifi.c:1065 panels/network/net-device-wifi.c:1072
 msgid "Known Wi-Fi Networks"
 msgstr "已知 Wi-Fi 網路"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: panels/network/net-device-wifi.c:1769
+#: panels/network/net-device-wifi.c:1107
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
-#: panels/network/net-proxy.c:54
+#: panels/network/net-device-wifi.c:1268
+msgid "System policy prohibits use as a Hotspot"
+msgstr "系統原則禁止做為熱點"
+
+#: panels/network/net-device-wifi.c:1271
+msgid "Wireless device does not support Hotspot mode"
+msgstr "無線裝置不支援熱點模式"
+
+#: panels/network/net-proxy.c:70
 #: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2085
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/power/cc-power-panel.c:2066 panels/power/cc-power-panel.c:2077
+#: panels/universal-access/cc-ua-panel.c:480
+#: panels/universal-access/cc-ua-panel.c:843
+#: panels/universal-access/cc-ua-panel.c:856
+#: panels/universal-access/cc-ua-panel.c:868
+#: panels/universal-access/cc-ua-panel.c:1033
 #: panels/universal-access/cc-ua-panel.ui:323
 #: panels/universal-access/cc-ua-panel.ui:369
 #: panels/universal-access/cc-ua-panel.ui:415
@@ -3083,12 +3517,12 @@ msgstr "遺忘(_F)"
 #: panels/universal-access/cc-ua-panel.ui:674
 #: panels/universal-access/cc-ua-panel.ui:720
 #: panels/universal-access/cc-ua-panel.ui:766
-#: panels/universal-access/cc-ua-panel.ui:918
+#: panels/universal-access/cc-ua-panel.ui:950
 msgid "Off"
 msgstr "關閉"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:113
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "當沒有提供設定 URL 時會使用網頁代理伺服器自動發現。"
@@ -3097,664 +3531,565 @@ msgstr "當沒有提供設定 URL 時會使用網頁代理伺服器自動發現
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: panels/network/net-proxy.c:110
+#: panels/network/net-proxy.c:121
 msgid "This is not recommended for untrusted public networks."
 msgstr "這不建議用於不信任的公用網路。"
 
-#: panels/network/network-mobile.ui:30
+#. update title
+#. Translators: this is the title of the connection details
+#. * window for vpn connections, it is also used to display
+#. * vpn connections in the device list.
+#.
+#: panels/network/net-vpn.c:66 panels/network/net-vpn.c:163
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
+
+#: panels/network/network-bluetooth.ui:50
+msgid "Turn device off"
+msgstr "關閉裝置"
+
+#: panels/network/network-mobile.ui:29
 msgid "IMEI"
 msgstr "IMEI"
 
-#: panels/network/network-mobile.ui:48
+#: panels/network/network-mobile.ui:47
 msgid "Provider"
 msgstr "供應商"
 
-#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:95
 msgid "Network Proxy"
 msgstr "網路代理伺服器"
 
-#: panels/network/network-proxy.ui:173
+#: panels/network/network-proxy.ui:176
 msgid "_HTTP Proxy"
 msgstr "_HTTP 代理伺服器"
 
-#: panels/network/network-proxy.ui:192
+#: panels/network/network-proxy.ui:195
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS 代理伺服器"
 
-#: panels/network/network-proxy.ui:211
+#: panels/network/network-proxy.ui:214
 msgid "_FTP Proxy"
 msgstr "_FTP 代理伺服器"
 
-#: panels/network/network-proxy.ui:230
+#: panels/network/network-proxy.ui:233
 msgid "_Socks Host"
 msgstr "Socks 主機(_S)"
 
-#: panels/network/network-proxy.ui:249
+#: panels/network/network-proxy.ui:252
 msgid "_Ignore Hosts"
 msgstr "忽略主機(_I)"
 
-#: panels/network/network-proxy.ui:287
+#: panels/network/network-proxy.ui:290
 msgid "HTTP proxy port"
 msgstr "HTTP 代理伺服器連接埠"
 
-#: panels/network/network-proxy.ui:364
+#: panels/network/network-proxy.ui:367
 msgid "HTTPS proxy port"
 msgstr "HTTPS 代理伺服器連接埠"
 
-#: panels/network/network-proxy.ui:385
+#: panels/network/network-proxy.ui:388
 msgid "FTP proxy port"
 msgstr "FTP 代理伺服器連接埠"
 
-#: panels/network/network-proxy.ui:406
+#: panels/network/network-proxy.ui:409
 msgid "Socks proxy port"
 msgstr "Socks 代理伺服器通訊埠"
 
-#: panels/network/network-proxy.ui:435
+#: panels/network/network-proxy.ui:438
 msgid "_Configuration URL"
 msgstr "設定網址(_C)"
 
-#: panels/network/network-simple.ui:50
-msgid "Turn device off"
-msgstr "關閉裝置"
-
-#: panels/network/network-vpn.ui:56
+#: panels/network/network-vpn.ui:55
 msgid "Turn VPN connection off"
 msgstr "關閉 VPN 連線"
 
-#: panels/network/network-wifi.ui:127
-msgid "Automatic _Connect"
-msgstr "自動連線(_C)"
-
-#: panels/network/network-wifi.ui:474
-msgid "details"
-msgstr "詳細資料"
-
-#: panels/network/network-wifi.ui:545
-#: panels/network/wireless-security/eap-method-leap.ui:40
-#: panels/network/wireless-security/eap-method-simple.ui:40
-#: panels/network/wireless-security/ws-leap.ui:40
-#: panels/network/wireless-security/ws-wpa-psk.ui:22
-#: panels/sharing/cc-sharing-panel.ui:351
-#: panels/user-accounts/cc-add-user-dialog.ui:310
-#: panels/user-accounts/cc-add-user-dialog.ui:547
-#: panels/user-accounts/cc-user-panel.ui:216
-msgid "_Password"
-msgstr "密碼(_P)"
-
-#: panels/network/network-wifi.ui:621
-msgid "Show P_assword"
-msgstr "顯示密碼(_A)"
-
-#: panels/network/network-wifi.ui:651
-msgid "Make available to other users"
-msgstr "允許其他使用者使用"
-
-#: panels/network/network-wifi.ui:679
-msgid "identity"
-msgstr "身分"
-
-#: panels/network/network-wifi.ui:713
-msgid "IPv_4"
-msgstr "IPv_4"
-
-#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
-msgid "_Addresses"
-msgstr "位址(_A)"
-
-#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
-msgid "Automatic (DHCP) addresses only"
-msgstr "只用自動 (DHCP) 位址"
-
-#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
-msgid "Link-local only"
-msgstr "只有本機連線"
-
-#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
-msgid "Shared with other computers"
-msgstr "分享給其他電腦"
-
-#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193
-msgid "_Ignore automatically obtained routes"
-msgstr "忽略自動獲得的路由(_I)"
-
-#: panels/network/network-wifi.ui:959
-msgid "ipv4"
-msgstr "ipv4"
-
-#: panels/network/network-wifi.ui:990
-msgid "IPv_6"
-msgstr "IPv_6"
-
-#: panels/network/network-wifi.ui:1236
-msgid "ipv6"
-msgstr "ipv6"
-
-#: panels/network/network-wifi.ui:1276
-msgid "_Cloned MAC Address"
-msgstr "複製的 MA_C 位址"
-
-#: panels/network/network-wifi.ui:1334
-msgid "_Reset"
-msgstr "重設(_R)"
-
-#: panels/network/network-wifi.ui:1370
-msgid ""
-"Reset the settings for this connection to their defaults, but remember as a "
-"preferred connection."
-msgstr "重設這個網路的設定值為預設值,但將它記住為偏好的網路。"
-
-#: panels/network/network-wifi.ui:1387
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect to it."
-msgstr "移除這個網路的所有相關詳細資料並且不再嘗試自動連線。"
-
-#: panels/network/network-wifi.ui:1449
-msgid "Hardware"
-msgstr "硬體"
-
-#: panels/network/network-wifi.ui:1453
-msgctxt "tab"
-msgid "Reset"
-msgstr "重設"
-
-#: panels/network/network-wifi.ui:1505
+#: panels/network/network-wifi.ui:37
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi 熱點"
 
-#: panels/network/network-wifi.ui:1523
+#: panels/network/network-wifi.ui:55
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "關閉連線到 Wi-Fi 網路"
 
-#: panels/network/network-wifi.ui:1572
-msgid "Network Name"
-msgstr "網路名稱"
-
-#: panels/network/network-wifi.ui:1590
-msgid "Connected Devices"
-msgstr "已連線的裝置"
-
-#: panels/network/network-wifi.ui:1608
+#: panels/network/network-wifi.ui:123
 msgid "Security type"
 msgstr "安全性類型"
 
-#: panels/network/network-wifi.ui:1671
+#: panels/network/network-wifi.ui:175
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "密碼"
 
-#: panels/network/network-wifi.ui:1768
+#: panels/network/network-wifi.ui:264
 msgid "Turn Wi-Fi off"
 msgstr "關閉 Wi-Fi"
 
-#: panels/network/network-wifi.ui:1800
+#: panels/network/network-wifi.ui:296
 msgid "_Connect to Hidden Network…"
 msgstr "連接到隱藏的網路(_C)…"
 
-#: panels/network/network-wifi.ui:1810
+#: panels/network/network-wifi.ui:307
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "開啟 Wi-Fi 熱點(_T)…"
 
-#: panels/network/network-wifi.ui:1820
+#: panels/network/network-wifi.ui:318
 msgid "_Known Wi-Fi Networks"
 msgstr "已知 Wi-Fi 網路(_K)"
 
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:127
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:131
-msgid "Infrastructure"
-msgstr "基礎架構"
-
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:147 panels/network/panel-common.c:201
+#: panels/network/panel-common.c:37
 msgid "Status unknown"
 msgstr "狀態不明"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:151
+#: panels/network/panel-common.c:41
 msgid "Unmanaged"
 msgstr "未管理"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:155
+#: panels/network/panel-common.c:45
 msgid "Unavailable"
 msgstr "無法使用"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:165 panels/network/panel-common.c:207
+#: panels/network/panel-common.c:55
 msgid "Connecting"
 msgstr "連線中"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:169 panels/network/panel-common.c:211
+#: panels/network/panel-common.c:59
 msgid "Authentication required"
 msgstr "需要核對"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
+#: panels/network/panel-common.c:63
 msgid "Connected"
 msgstr "已連線"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:177
+#: panels/network/panel-common.c:67
 msgid "Disconnecting"
 msgstr "斷線"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:181 panels/network/panel-common.c:219
+#: panels/network/panel-common.c:71
 msgid "Connection failed"
 msgstr "連線失敗"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:185 panels/network/panel-common.c:227
+#: panels/network/panel-common.c:75
 msgid "Status unknown (missing)"
 msgstr "狀態不詳(缺乏)"
 
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:223
-msgid "Not connected"
-msgstr "未連線"
-
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:248
+#: panels/network/panel-common.c:96
 msgid "Configuration failed"
 msgstr "設定失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:252
+#: panels/network/panel-common.c:100
 msgid "IP configuration failed"
 msgstr "IP 設定失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:256
+#: panels/network/panel-common.c:104
 msgid "IP configuration expired"
 msgstr "IP 設定過期"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:260
+#: panels/network/panel-common.c:108
 msgid "Secrets were required, but not provided"
 msgstr "需要機密,但沒有提供"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:264
+#: panels/network/panel-common.c:112
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x 請求已斷線"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:268
+#: panels/network/panel-common.c:116
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x 請求設定失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:272
+#: panels/network/panel-common.c:120
 msgid "802.1x supplicant failed"
 msgstr "802.1x 請求已失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:276
+#: panels/network/panel-common.c:124
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x 請求花了太長時間核對"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:280
+#: panels/network/panel-common.c:128
 msgid "PPP service failed to start"
 msgstr "無法啟動 PPP 服務"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:284
+#: panels/network/panel-common.c:132
 msgid "PPP service disconnected"
 msgstr "PPP 服務已斷線"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:288
+#: panels/network/panel-common.c:136
 msgid "PPP failed"
 msgstr "PPP 失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:292
+#: panels/network/panel-common.c:140
 msgid "DHCP client failed to start"
 msgstr "DHCP 客戶端啟動失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:296
+#: panels/network/panel-common.c:144
 msgid "DHCP client error"
 msgstr "DHCP 客戶端錯誤"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:300
+#: panels/network/panel-common.c:148
 msgid "DHCP client failed"
 msgstr "DHCP 客戶端失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:304
+#: panels/network/panel-common.c:152
 msgid "Shared connection service failed to start"
 msgstr "分享的連線服務啟動失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:308
+#: panels/network/panel-common.c:156
 msgid "Shared connection service failed"
 msgstr "分享的連線服務失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:312
+#: panels/network/panel-common.c:160
 msgid "AutoIP service failed to start"
 msgstr "無法啟動 AutoIP 服務"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:316
+#: panels/network/panel-common.c:164
 msgid "AutoIP service error"
 msgstr "AutoIP 服務錯誤"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:320
+#: panels/network/panel-common.c:168
 msgid "AutoIP service failed"
 msgstr "AutoIP 服務失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:324
+#: panels/network/panel-common.c:172
 msgid "Line busy"
 msgstr "線路忙碌"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:328
+#: panels/network/panel-common.c:176
 msgid "No dial tone"
 msgstr "沒有撥號音"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:332
+#: panels/network/panel-common.c:180
 msgid "No carrier could be established"
 msgstr "無法建立載體"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:336
+#: panels/network/panel-common.c:184
 msgid "Dialing request timed out"
 msgstr "撥號要求逾時"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:340
+#: panels/network/panel-common.c:188
 msgid "Dialing attempt failed"
 msgstr "嘗試撥號失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:344
+#: panels/network/panel-common.c:192
 msgid "Modem initialization failed"
 msgstr "數據機初始化失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:348
+#: panels/network/panel-common.c:196
 msgid "Failed to select the specified APN"
 msgstr "無法選擇指定的 APN"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:352
+#: panels/network/panel-common.c:200
 msgid "Not searching for networks"
 msgstr "不要搜尋網路"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:356
+#: panels/network/panel-common.c:204
 msgid "Network registration denied"
 msgstr "網路登記被禁止"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:360
+#: panels/network/panel-common.c:208
 msgid "Network registration timed out"
 msgstr "網路登記逾時"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:364
+#: panels/network/panel-common.c:212
 msgid "Failed to register with the requested network"
 msgstr "無法向要求的網路登記"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:368
+#: panels/network/panel-common.c:216
 msgid "PIN check failed"
 msgstr "PIN 檢查失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:372
+#: panels/network/panel-common.c:220
 msgid "Firmware for the device may be missing"
 msgstr "可能缺少裝置的韌體"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:376
+#: panels/network/panel-common.c:224
 msgid "Connection disappeared"
 msgstr "連線已消失"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:380
+#: panels/network/panel-common.c:228
 msgid "Existing connection was assumed"
 msgstr "優先使用現有的連線"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:384
+#: panels/network/panel-common.c:232
 msgid "Modem not found"
 msgstr "找不到數據機"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:388
+#: panels/network/panel-common.c:236
 msgid "Bluetooth connection failed"
 msgstr "藍牙連線失敗"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:392
+#: panels/network/panel-common.c:240
 msgid "SIM Card not inserted"
 msgstr "SIM 卡尚未插入"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:396
+#: panels/network/panel-common.c:244
 msgid "SIM Pin required"
 msgstr "需要 SIM PIN 碼"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:400
+#: panels/network/panel-common.c:248
 msgid "SIM Puk required"
 msgstr "需要 SIM PUK 碼"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:404
+#: panels/network/panel-common.c:252
 msgid "SIM wrong"
 msgstr "SIM 錯誤"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:408
+#: panels/network/panel-common.c:256
 msgid "Connection dependency failed"
 msgstr "連線相依性解析失敗"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:433
+#: panels/network/panel-common.c:351
 msgid "Firmware missing"
 msgstr "缺少韌體"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:437
+#: panels/network/panel-common.c:355
 msgid "Cable unplugged"
 msgstr "纜線已拔除"
 
-#: panels/network/wireless-security/eap-method.c:69
+#: panels/network/wireless-security/eap-method.c:92
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X 安全加密的未定義錯誤 (wpa-eap)"
 
-#: panels/network/wireless-security/eap-method.c:245
+#: panels/network/wireless-security/eap-method.c:153
 msgid "no file selected"
 msgstr "未選取檔案"
 
-#: panels/network/wireless-security/eap-method.c:276
+#: panels/network/wireless-security/eap-method.c:180
 msgid "unspecified error validating eap-method file"
 msgstr "驗證 eap-method 檔案時未指定的錯誤"
 
-#: panels/network/wireless-security/eap-method.c:451
+#: panels/network/wireless-security/eap-method.c:355
 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:454
+#: panels/network/wireless-security/eap-method.c:358
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
 
-#: panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:90
 msgid "missing EAP-FAST PAC file"
 msgstr "缺少 EAP-FAST PAC 檔案"
 
-#: panels/network/wireless-security/eap-method-fast.c:268
-#: panels/network/wireless-security/eap-method-peap.c:302
-#: panels/network/wireless-security/eap-method-ttls.c:361
-msgid "GTC"
-msgstr "GTC"
-
-#: panels/network/wireless-security/eap-method-fast.c:283
-#: panels/network/wireless-security/eap-method-peap.c:272
-#: panels/network/wireless-security/eap-method-ttls.c:299
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:300
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案"
 
-#: panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:305
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:22
+#: panels/network/wireless-security/eap-method-fast.ui:13
+#: panels/network/wireless-security/eap-method-peap.ui:21
+#: panels/network/wireless-security/eap-method-ttls.ui:37
+msgid "GTC"
+msgstr "GTC"
+
+#: panels/network/wireless-security/eap-method-fast.ui:17
+#: panels/network/wireless-security/eap-method-peap.ui:13
+#: panels/network/wireless-security/eap-method-ttls.ui:21
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: panels/network/wireless-security/eap-method-fast.ui:29
 msgid "Anonymous"
 msgstr "匿名"
 
-#: panels/network/wireless-security/eap-method-fast.ui:25
+#: panels/network/wireless-security/eap-method-fast.ui:32
 msgid "Authenticated"
 msgstr "已核對"
 
-#: panels/network/wireless-security/eap-method-fast.ui:28
+#: panels/network/wireless-security/eap-method-fast.ui:35
 msgid "Both"
 msgstr "兩者"
 
-#: panels/network/wireless-security/eap-method-fast.ui:76
+#: panels/network/wireless-security/eap-method-fast.ui:49
+#: panels/network/wireless-security/eap-method-peap.ui:52
+#: panels/network/wireless-security/eap-method-ttls.ui:51
+msgid "Anony_mous identity"
+msgstr "匿名識別(_M)"
+
+#: panels/network/wireless-security/eap-method-fast.ui:75
 msgid "PAC _file"
 msgstr "PAC 檔案(_F)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:122
-#: panels/network/wireless-security/eap-method-peap.ui:146
-#: panels/network/wireless-security/eap-method-ttls.ui:123
+#: panels/network/wireless-security/eap-method-fast.ui:115
+#: panels/network/wireless-security/eap-method-peap.ui:150
+#: panels/network/wireless-security/eap-method-ttls.ui:143
 msgid "_Inner authentication"
 msgstr "內部核對(_I)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:156
+#: panels/network/wireless-security/eap-method-fast.ui:144
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: panels/network/wireless-security/eap-method-leap.c:65
+#: panels/network/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP username"
 msgstr "缺少 EAP-LEAP 使用者名稱"
 
-#: panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:78
 msgid "missing EAP-LEAP password"
 msgstr "缺少 EAP-LEAP 密碼"
 
-#: panels/network/wireless-security/eap-method-leap.ui:26
-#: panels/network/wireless-security/eap-method-simple.ui:26
-#: panels/network/wireless-security/ws-leap.ui:26
+#: panels/network/wireless-security/eap-method-leap.ui:17
+#: panels/network/wireless-security/eap-method-simple.ui:17
+#: panels/network/wireless-security/ws-leap.ui:18
 #: panels/user-accounts/cc-add-user-dialog.ui:146
 #: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "使用者名稱(_U)"
 
-#: panels/network/wireless-security/eap-method-leap.ui:68
-#: panels/network/wireless-security/eap-method-simple.ui:85
-#: panels/network/wireless-security/eap-method-tls.ui:164
-#: panels/network/wireless-security/ws-leap.ui:68
-#: panels/network/wireless-security/ws-wpa-psk.ui:76
+#: panels/network/wireless-security/eap-method-leap.ui:31
+#: panels/network/wireless-security/eap-method-simple.ui:31
+#: panels/network/wireless-security/ws-leap.ui:32
+#: panels/network/wireless-security/ws-wpa-psk.ui:14
+#: panels/sharing/cc-sharing-panel.ui:351
+#: panels/user-accounts/cc-add-user-dialog.ui:310
+#: panels/user-accounts/cc-add-user-dialog.ui:547
+#: panels/user-accounts/cc-user-panel.ui:204
+msgid "_Password"
+msgstr "密碼(_P)"
+
+#: panels/network/wireless-security/eap-method-leap.ui:55
+#: panels/network/wireless-security/eap-method-simple.ui:73
+#: panels/network/wireless-security/eap-method-tls.ui:157
+#: panels/network/wireless-security/ws-leap.ui:56
+#: panels/network/wireless-security/ws-wpa-psk.ui:64
 msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
-#: panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:90
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "無效的 EAP-PEAP CA 憑證:%s"
 
-#: panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:99
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "無效的 EAP-PEAP CA 憑證:沒有指定憑證"
 
-#: panels/network/wireless-security/eap-method-peap.c:287
-#: panels/network/wireless-security/eap-method-ttls.c:346
-#: panels/network/wireless-security/wireless-security.c:441
-msgid "MD5"
-msgstr "MD5"
-
-#: panels/network/wireless-security/eap-method-peap.c:381
-#: panels/network/wireless-security/eap-method-tls.c:492
-#: panels/network/wireless-security/eap-method-ttls.c:440
+#: panels/network/wireless-security/eap-method-peap.c:281
+#: panels/network/wireless-security/eap-method-tls.c:496
+#: panels/network/wireless-security/eap-method-ttls.c:289
 msgid "Choose a Certificate Authority certificate"
 msgstr "選擇憑證授權單位 (CA) 憑證"
 
-#: panels/network/wireless-security/eap-method-peap.ui:25
+#: panels/network/wireless-security/eap-method-peap.ui:17
+#: panels/network/wireless-security/eap-method-ttls.ui:33
+#: panels/network/wireless-security/ws-wpa-eap.ui:15
+msgid "MD5"
+msgstr "MD5"
+
+#: panels/network/wireless-security/eap-method-peap.ui:36
 msgid "Version 0"
 msgstr "版本 0"
 
-#: panels/network/wireless-security/eap-method-peap.ui:28
+#: panels/network/wireless-security/eap-method-peap.ui:39
 msgid "Version 1"
 msgstr "版本 1"
 
-#: panels/network/wireless-security/eap-method-peap.ui:74
-#: panels/network/wireless-security/eap-method-tls.ui:75
-#: panels/network/wireless-security/eap-method-ttls.ui:82
+#: panels/network/wireless-security/eap-method-peap.ui:78
+#: panels/network/wireless-security/eap-method-tls.ui:68
+#: panels/network/wireless-security/eap-method-ttls.ui:102
 msgid "C_A certificate"
 msgstr "憑證(_A)"
 
-#: panels/network/wireless-security/eap-method-peap.ui:96
-#: panels/network/wireless-security/eap-method-tls.ui:97
-#: panels/network/wireless-security/eap-method-ttls.ui:105
+#: panels/network/wireless-security/eap-method-peap.ui:100
+#: panels/network/wireless-security/eap-method-tls.ui:90
+#: panels/network/wireless-security/eap-method-ttls.ui:125
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 憑證(_R)"
 
-#: panels/network/wireless-security/eap-method-peap.ui:114
+#: panels/network/wireless-security/eap-method-peap.ui:118
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)"
 
-#: panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:80
 msgid "missing EAP username"
 msgstr "缺少 EAP 使用者名稱"
 
-#: panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "缺少 EAP 密碼"
 
-#: panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:81
 msgid "missing EAP-TLS identity"
 msgstr "缺少 EAP-TLS 身分"
 
-#: panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:91
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "無效的 EAP-TLS CA 憑證:%s"
 
-#: panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:100
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "無效的 EAP-TLS CA 憑證:沒有指定憑證"
 
-#: panels/network/wireless-security/eap-method-tls.c:100
+#: panels/network/wireless-security/eap-method-tls.c:113
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "無效的 EAP-TLS 私鑰:%s"
 
-#: panels/network/wireless-security/eap-method-tls.c:110
+#: panels/network/wireless-security/eap-method-tls.c:123
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "無效的 EAP-TLS 使用者憑證:%s"
 
-#: panels/network/wireless-security/eap-method-tls.c:307
+#: panels/network/wireless-security/eap-method-tls.c:279
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私密金鑰不安全"
 
-#: panels/network/wireless-security/eap-method-tls.c:310
+#: panels/network/wireless-security/eap-method-tls.c:282
 msgid ""
 "The selected private key does not appear to be protected by a password. This "
 "could allow your security credentials to be compromised. Please select a "
@@ -3767,115 +4102,120 @@ msgstr ""
 "\n"
 "(您可以使用 openssl 來加密您的私密金鑰)"
 
-#: panels/network/wireless-security/eap-method-tls.c:486
+#: panels/network/wireless-security/eap-method-tls.c:489
 msgid "Choose your personal certificate"
 msgstr "選擇您的個人憑證"
 
-#: panels/network/wireless-security/eap-method-tls.c:498
+#: panels/network/wireless-security/eap-method-tls.c:503
 msgid "Choose your private key"
 msgstr "選擇您的私密金鑰"
 
-#: panels/network/wireless-security/eap-method-tls.ui:24
+#: panels/network/wireless-security/eap-method-tls.ui:17
 msgid "I_dentity"
 msgstr "識別(_D)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:50
+#: panels/network/wireless-security/eap-method-tls.ui:43
 msgid "_User certificate"
 msgstr "使用者憑證(_U)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:115
+#: panels/network/wireless-security/eap-method-tls.ui:108
 msgid "Private _key"
 msgstr "私鑰(_K)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:140
+#: panels/network/wireless-security/eap-method-tls.ui:133
 msgid "_Private key password"
 msgstr "私密金鑰密碼(_P)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:101
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "無效的 EAP-TTLS CA 憑證:%s"
 
-#: panels/network/wireless-security/eap-method-ttls.c:68
+#: panels/network/wireless-security/eap-method-ttls.c:109
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "無效的 EAP-TTLS CA 憑證:沒有指定憑證"
 
-#: panels/network/wireless-security/eap-method-ttls.c:269
+#: panels/network/wireless-security/eap-method-ttls.ui:13
 msgid "PAP"
 msgstr "PAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:284
+#: panels/network/wireless-security/eap-method-ttls.ui:17
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:315
+#: panels/network/wireless-security/eap-method-ttls.ui:25
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (無 EAP)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:331
+#: panels/network/wireless-security/eap-method-ttls.ui:29
 msgid "CHAP"
 msgstr "CHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.ui:56
+#: panels/network/wireless-security/eap-method-ttls.ui:76
 #: panels/user-accounts/cc-add-user-dialog.ui:507
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "網域(_O)"
 
-#: panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:107
 msgid "Unknown error validating 802.1X security"
 msgstr "驗證 802.1X 安全加密的未知錯誤"
 
-#: panels/network/wireless-security/wireless-security.c:453
+#: panels/network/wireless-security/ws-dynamic-wep.ui:15
+#: panels/network/wireless-security/ws-wpa-eap.ui:20
 msgid "TLS"
 msgstr "TLS"
 
-#: panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/ws-dynamic-wep.ui:25
+#: panels/network/wireless-security/ws-wpa-eap.ui:30
 msgid "PWD"
 msgstr "PWD"
 
-#: panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/ws-dynamic-wep.ui:30
+#: panels/network/wireless-security/ws-wpa-eap.ui:35
 msgid "FAST"
 msgstr "FAST"
 
-#: panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/ws-dynamic-wep.ui:35
+#: panels/network/wireless-security/ws-wpa-eap.ui:40
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/ws-dynamic-wep.ui:40
+#: panels/network/wireless-security/ws-wpa-eap.ui:45
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
-#: panels/network/wireless-security/ws-dynamic-wep.ui:39
-#: panels/network/wireless-security/ws-wep-key.ui:115
-#: panels/network/wireless-security/ws-wpa-eap.ui:33
+#: panels/network/wireless-security/ws-dynamic-wep.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:102
+#: panels/network/wireless-security/ws-wpa-eap.ui:61
 msgid "Au_thentication"
 msgstr "核對(_T)"
 
-#: panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:84
 msgid "missing leap-username"
 msgstr "缺少 leap 使用者名稱"
 
-#: panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:93
 msgid "missing leap-password"
 msgstr "缺少 leap 密碼"
 
-#: panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-wep-key.c:117
 msgid "missing wep-key"
 msgstr "缺少 wep-key"
 
-#: panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:126
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "無效的 wep-key:長度為 %zu 的金鑰只能包含十六進位數字"
 
-#: panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "無效的 wep-key:長度為 %zu 的金鑰只能包含 ascii 字元"
 
-#: panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:140
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3884,11 +4224,11 @@ msgstr ""
 "無效的 wep-key:錯誤的金鑰長度 %zu。金鑰長度必須為 5/13 (ascii) 或 10/26 (十"
 "六進位)"
 
-#: panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:147
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無效的 wep-key︰密語必須為非空"
 
-#: panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:149
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無效的 wep-key︰密語必須少於 64 個字元"
 
@@ -3904,30 +4244,30 @@ msgstr "開放系統"
 msgid "Shared Key"
 msgstr "共享金鑰"
 
-#: panels/network/wireless-security/ws-wep-key.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:48
 msgid "_Key"
 msgstr "金鑰(_K)"
 
-#: panels/network/wireless-security/ws-wep-key.ui:94
+#: panels/network/wireless-security/ws-wep-key.ui:84
 msgid "Sho_w key"
 msgstr "顯示金鑰(_W)"
 
-#: panels/network/wireless-security/ws-wep-key.ui:152
+#: panels/network/wireless-security/ws-wep-key.ui:134
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:89
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr "無效的 wpa-psk:無效的長度 %zu。必須為 [8,63] 位元組或 64 十六進位數字"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:98
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無效的 wpa-psk:不能將 64 位元組金鑰轉譯為十六進位"
 
-#: panels/network/wireless-security/ws-wpa-psk.ui:50
+#: panels/network/wireless-security/ws-wpa-psk.ui:42
 msgid "_Type"
 msgstr "類型(_T)"
 
@@ -3971,13 +4311,12 @@ msgid "Show Message C_ontent on Lock Screen"
 msgstr "在鎖定畫面中顯示訊息內容(_O)"
 
 #: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2080 panels/power/cc-power-panel.c:2087
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/power/cc-power-panel.c:2072 panels/power/cc-power-panel.c:2079
+#: panels/universal-access/cc-ua-panel.c:480
+#: panels/universal-access/cc-ua-panel.c:843
+#: panels/universal-access/cc-ua-panel.c:856
+#: panels/universal-access/cc-ua-panel.c:868
+#: panels/universal-access/cc-ua-panel.c:1033
 msgid "On"
 msgstr "開啟"
 
@@ -4017,10 +4356,10 @@ msgstr "移除帳號時發生錯誤"
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: panels/online-accounts/cc-online-accounts-panel.c:989
+#: panels/online-accounts/cc-online-accounts-panel.c:991
 #, c-format
-msgid "<b>%s</b> removed"
-msgstr "<b>%s</b> 已移除"
+msgid "%s removed"
+msgstr "已移除 %s"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
 msgid "Online Accounts"
@@ -4064,17 +4403,17 @@ msgstr "加入帳號"
 msgid "Remove Account"
 msgstr "移除帳號"
 
-#: panels/power/cc-power-panel.c:327
+#: panels/power/cc-power-panel.c:334
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: panels/power/cc-power-panel.c:333
+#: panels/power/cc-power-panel.c:340
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:352
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -4082,444 +4421,318 @@ msgstr[0] "%i 小時"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: panels/power/cc-power-panel.c:353
+#: panels/power/cc-power-panel.c:360
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: panels/power/cc-power-panel.c:354
+#: panels/power/cc-power-panel.c:361
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:362
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:373
+#: panels/power/cc-power-panel.c:380
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s後完全充飽"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:380
+#: panels/power/cc-power-panel.c:387
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意:剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:385
+#: panels/power/cc-power-panel.c:392
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:390 panels/power/cc-power-panel.c:420
+#: panels/power/cc-power-panel.c:397 panels/power/cc-power-panel.c:427
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424
-#| msgid "Charging"
+#: panels/power/cc-power-panel.c:401 panels/power/cc-power-panel.c:431
 msgid "Not charging"
 msgstr "未充電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428
+#: panels/power/cc-power-panel.c:405 panels/power/cc-power-panel.c:435
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:411
+#: panels/power/cc-power-panel.c:418
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:416
+#: panels/power/cc-power-panel.c:423
 msgid "Discharging"
 msgstr "放電中"
 
-#: panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:556
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: panels/power/cc-power-panel.c:551
+#: panels/power/cc-power-panel.c:558
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:626
+#: panels/power/cc-power-panel.c:633
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:636
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:639
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:635
+#: panels/power/cc-power-panel.c:642
 msgid "Personal digital assistant"
 msgstr "個人數位助理"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:638
+#: panels/power/cc-power-panel.c:645
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:648
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:644 panels/wacom/cc-wacom-panel.c:848
+#: panels/power/cc-power-panel.c:651 panels/wacom/cc-wacom-panel.c:815
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:647
+#: panels/power/cc-power-panel.c:654
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:650
+#: panels/power/cc-power-panel.c:657
 msgid "Gaming input device"
 msgstr "遊戲輸入裝置"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:653 panels/power/cc-power-panel.c:911
-#: panels/power/cc-power-panel.c:2430
+#: panels/power/cc-power-panel.c:660 panels/power/cc-power-panel.c:942
+#: panels/power/cc-power-panel.c:2422
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:714
+#: panels/power/cc-power-panel.c:721
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:721
+#: panels/power/cc-power-panel.c:728
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:726
+#: panels/power/cc-power-panel.c:733
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:731
+#: panels/power/cc-power-panel.c:738
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:736
+#: panels/power/cc-power-panel.c:743
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:740
+#: panels/power/cc-power-panel.c:747
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: panels/power/cc-power-panel.c:909
+#: panels/power/cc-power-panel.c:940
 msgid "Batteries"
 msgstr "電池"
 
-#: panels/power/cc-power-panel.c:1274
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d 小時"
-
-#: panels/power/cc-power-panel.c:1276
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d 分鐘"
-
-#: panels/power/cc-power-panel.c:1279
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
-
-#. 5 hours 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1284
-#, c-format
-msgctxt "time"
-msgid "%s %s %s"
-msgstr "%s %s %s"
-
-#. 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1287
-#, c-format
-msgctxt "time"
-msgid "%s %s"
-msgstr "%s %s"
-
-#. 0 seconds
-#: panels/power/cc-power-panel.c:1293
-msgid "0 seconds"
-msgstr "0 秒"
-
-#: panels/power/cc-power-panel.c:1390
+#: panels/power/cc-power-panel.c:1381
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: panels/power/cc-power-panel.c:1835
+#: panels/power/cc-power-panel.c:1827
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: panels/power/cc-power-panel.c:1869
-#| msgid "_Screen brightness"
+#: panels/power/cc-power-panel.c:1861
 msgid "_Screen Brightness"
 msgstr "螢幕亮度(_S)"
 
-#: panels/power/cc-power-panel.c:1890
-#| msgid "Automatic brightness"
+#: panels/power/cc-power-panel.c:1882
 msgid "Automatic Brightness"
 msgstr "自動亮度"
 
-#: panels/power/cc-power-panel.c:1903
-#| msgid "_Keyboard brightness"
+#: panels/power/cc-power-panel.c:1895
 msgid "_Keyboard Brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: panels/power/cc-power-panel.c:1914
-#| msgid "_Dim screen when inactive"
+#: panels/power/cc-power-panel.c:1906
 msgid "_Dim Screen When Inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: panels/power/cc-power-panel.c:1932
-#| msgid "_Blank screen"
+#: panels/power/cc-power-panel.c:1924
 msgid "_Blank Screen"
 msgstr "螢幕轉黑(_B)"
 
-#: panels/power/cc-power-panel.c:1955
+#: panels/power/cc-power-panel.c:1947
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: panels/power/cc-power-panel.c:1956
+#: panels/power/cc-power-panel.c:1948
 msgid "Wi-Fi can be turned off to save power."
 msgstr "可以關閉 Wi-Fi 以省電。"
 
-#: panels/power/cc-power-panel.c:1972
-#| msgid "_Mobile broadband"
+#: panels/power/cc-power-panel.c:1964
 msgid "_Mobile Broadband"
 msgstr "行動寬頻(_M)"
 
-#: panels/power/cc-power-panel.c:1973
+#: panels/power/cc-power-panel.c:1965
 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
 msgstr "可以關閉行動數據 (3G、4G、LTE 等等) 以省電。"
 
-#: panels/power/cc-power-panel.c:2023
+#: panels/power/cc-power-panel.c:2015
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: panels/power/cc-power-panel.c:2024
+#: panels/power/cc-power-panel.c:2016
 msgid "Bluetooth can be turned off to save power."
 msgstr "可以關閉藍牙以省電。"
 
-#: panels/power/cc-power-panel.c:2076
+#: panels/power/cc-power-panel.c:2068
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: panels/power/cc-power-panel.c:2078
+#: panels/power/cc-power-panel.c:2070
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: panels/power/cc-power-panel.c:2172
+#: panels/power/cc-power-panel.c:2164
 msgid "Suspend"
 msgstr "暫停"
 
-#: panels/power/cc-power-panel.c:2173
+#: panels/power/cc-power-panel.c:2165
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: panels/power/cc-power-panel.c:2174
+#: panels/power/cc-power-panel.c:2166
 msgid "Hibernate"
 msgstr "休眠"
 
-#: panels/power/cc-power-panel.c:2175
+#: panels/power/cc-power-panel.c:2167
 msgid "Nothing"
 msgstr "沒有"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2275
+#: panels/power/cc-power-panel.c:2267
 msgid "Suspend & Power Button"
 msgstr "暫停和電源按鈕"
 
-#: panels/power/cc-power-panel.c:2316
-#| msgid "Automatic Suspend"
+#: panels/power/cc-power-panel.c:2308
 msgid "_Automatic Suspend"
 msgstr "自動暫停(_A)"
 
-#: panels/power/cc-power-panel.c:2317
+#: panels/power/cc-power-panel.c:2309
 msgid "Automatic suspend"
 msgstr "自動暫停"
 
-#: panels/power/cc-power-panel.c:2374
-#| msgid "Lower Button"
+#: panels/power/cc-power-panel.c:2366
 msgid "Po_wer Button Action"
 msgstr "電源鍵動作(_W)"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:13
-#| msgid "15 minutes"
 msgctxt "automatic_suspend"
 msgid "15 minutes"
 msgstr "15 分鐘"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:17
-#| msgid "20 minutes"
 msgctxt "automatic_suspend"
 msgid "20 minutes"
 msgstr "20 分鐘"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:21
-#| msgid "25 minutes"
 msgctxt "automatic_suspend"
 msgid "25 minutes"
 msgstr "25 分鐘"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:25
-#| msgid "30 minutes"
 msgctxt "automatic_suspend"
 msgid "30 minutes"
 msgstr "30 分鐘"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:29
-#| msgid "45 minutes"
 msgctxt "automatic_suspend"
 msgid "45 minutes"
 msgstr "45 分鐘"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:33
-#| msgid "1 hour"
 msgctxt "automatic_suspend"
 msgid "1 hour"
 msgstr "1 小時"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:37
-#| msgid "80 minutes"
 msgctxt "automatic_suspend"
 msgid "80 minutes"
 msgstr "80 分鐘"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:41
-#| msgid "90 minutes"
 msgctxt "automatic_suspend"
 msgid "90 minutes"
 msgstr "90 分鐘"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:45
-#| msgid "100 minutes"
 msgctxt "automatic_suspend"
 msgid "100 minutes"
 msgstr "100 分鐘"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
 #: panels/power/cc-power-panel.ui:49
-#| msgid "2 hours"
 msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 小時"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:63
-#| msgid "1 minute"
-msgctxt "blank_screen"
-msgid "1 minute"
-msgstr "1 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:67
-#| msgid "2 minutes"
-msgctxt "blank_screen"
-msgid "2 minutes"
-msgstr "2 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:71
-#| msgid "3 minutes"
-msgctxt "blank_screen"
-msgid "3 minutes"
-msgstr "3 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:75
-#| msgid "4 minutes"
-msgctxt "blank_screen"
-msgid "4 minutes"
-msgstr "4 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:79
-#| msgid "5 minutes"
-msgctxt "blank_screen"
-msgid "5 minutes"
-msgstr "5 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:83
-#| msgid "8 minutes"
-msgctxt "blank_screen"
-msgid "8 minutes"
-msgstr "8 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:87
-#| msgid "10 minutes"
-msgctxt "blank_screen"
-msgid "10 minutes"
-msgstr "10 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:91
-#| msgid "12 minutes"
-msgctxt "blank_screen"
-msgid "12 minutes"
-msgstr "12 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:95
-#| msgid "15 minutes"
-msgctxt "blank_screen"
-msgid "15 minutes"
-msgstr "15 分鐘"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:99
-#| msgid "Never"
-msgctxt "blank_screen"
-msgid "Never"
-msgstr "永不"
-
 #: panels/power/cc-power-panel.ui:147
 msgid "Automatic Suspend"
 msgstr "自動暫停"
@@ -4533,7 +4746,7 @@ msgid "On _Battery Power"
 msgstr "使用電池電源(_B)"
 
 #: panels/power/cc-power-panel.ui:233 panels/power/cc-power-panel.ui:293
-#: panels/universal-access/cc-ua-panel.ui:1495
+#: panels/universal-access/cc-ua-panel.ui:1527
 msgid "Delay"
 msgstr "延遲"
 
@@ -4567,13 +4780,6 @@ msgstr "核對"
 msgid "Username"
 msgstr "使用者名稱"
 
-#. Translators: This is a password needed for printing.
-#: panels/printers/authentication-dialog.ui:96
-#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
-#: panels/user-accounts/cc-add-user-dialog.ui:249
-msgid "Password"
-msgstr "密碼"
-
 #: panels/printers/authentication-dialog.ui:139
 #: panels/printers/new-printer-dialog.ui:337
 msgid "Authentication Required"
@@ -4596,32 +4802,6 @@ msgstr "無法加入新的印表機。"
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
 
-#: panels/printers/details-dialog.ui:64 panels/printers/printer-entry.ui:223
-msgid "Location"
-msgstr "位置"
-
-#. Translators: Name of column showing printer drivers
-#: panels/printers/details-dialog.ui:114
-#: panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "驅動程式"
-
-#: panels/printers/details-dialog.ui:152
-msgid "Searching for preferred drivers…"
-msgstr "正在搜尋偏好的驅動程式…"
-
-#: panels/printers/details-dialog.ui:174
-msgid "Search for Drivers"
-msgstr "正在搜尋驅動程式"
-
-#: panels/printers/details-dialog.ui:182
-msgid "Select from Database…"
-msgstr "從資料庫選擇…"
-
-#: panels/printers/details-dialog.ui:190
-msgid "Install PPD File…"
-msgstr "安裝 PPD 檔案…"
-
 #: panels/printers/gnome-printers-panel.desktop.in.in:3
 msgid "Printers"
 msgstr "印表機"
@@ -4688,53 +4868,73 @@ msgstr "輸入網路位址或搜尋印表機"
 msgid "Enter username and password to view printers on Print Server."
 msgstr "輸入使用者名稱與密碼以檢視在印表機伺服器上的印表機。"
 
-#. Translators: This button triggers the printing of a test page.
-#. Translators: Name of job which makes printer to print test page
-#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:907
-msgid "Test Page"
-msgstr "測試頁"
-
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: panels/printers/pp-details-dialog.c:133
-#: panels/printers/pp-details-dialog.c:417
+#: panels/printers/pp-details-dialog.c:75
+#: panels/printers/pp-details-dialog.c:370
 #, c-format
 msgid "%s Details"
 msgstr "%s 詳細資料"
 
-#: panels/printers/pp-details-dialog.c:180
+#: panels/printers/pp-details-dialog.c:122
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: panels/printers/pp-details-dialog.c:310
+#: panels/printers/pp-details-dialog.c:249
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: panels/printers/pp-details-dialog.c:319
+#: panels/printers/pp-details-dialog.c:258
 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/ppd-selection-dialog.ui:10
-msgid "Select Printer Driver"
-msgstr "選擇印表機驅動程式"
-
-#: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/cc-avatar-chooser.c:109
-msgid "Select"
-msgstr "選取"
+#: panels/printers/pp-details-dialog.ui:68 panels/printers/printer-entry.ui:223
+msgid "Location"
+msgstr "位置"
+
+#. Translators: Name of column showing printer drivers
+#: panels/printers/pp-details-dialog.ui:122
+#: panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "驅動程式"
+
+#: panels/printers/pp-details-dialog.ui:162
+msgid "Searching for preferred drivers…"
+msgstr "正在搜尋偏好的驅動程式…"
+
+#: panels/printers/pp-details-dialog.ui:183
+msgid "Search for Drivers"
+msgstr "正在搜尋驅動程式"
+
+#: panels/printers/pp-details-dialog.ui:192
+msgid "Select from Database…"
+msgstr "從資料庫選擇…"
+
+#: panels/printers/pp-details-dialog.ui:201
+msgid "Install PPD File…"
+msgstr "安裝 PPD 檔案…"
+
+#: panels/printers/ppd-selection-dialog.ui:10
+msgid "Select Printer Driver"
+msgstr "選擇印表機驅動程式"
+
+#: panels/printers/ppd-selection-dialog.ui:40
+#: panels/user-accounts/cc-avatar-chooser.c:109
+msgid "Select"
+msgstr "選取"
 
 #: panels/printers/ppd-selection-dialog.ui:73
 msgid "Loading drivers database…"
 msgstr "正在載入驅動程式資料庫…"
 
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:472
+#: panels/printers/pp-host.c:479
 msgid "JetDirect Printer"
 msgstr "JetDirect 印表機"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:707
+#: panels/printers/pp-host.c:714
 msgid "LPD Printer"
 msgstr "LPD 印表機"
 
@@ -4865,128 +5065,134 @@ msgid "Searching for Printers"
 msgstr "正在搜尋印表機"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1680
+#: panels/printers/pp-new-printer-dialog.c:1697
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1685
+#: panels/printers/pp-new-printer-dialog.c:1702
 msgid "Serial Port"
 msgstr "序列埠"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1692
+#: panels/printers/pp-new-printer-dialog.c:1709
 msgid "Parallel Port"
 msgstr "串列埠"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1734
+#: panels/printers/pp-new-printer-dialog.c:1751
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1739
+#: panels/printers/pp-new-printer-dialog.c:1756
 #, c-format
 msgid "Address: %s"
 msgstr "位址:%s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: panels/printers/pp-new-printer-dialog.c:1766
+#: panels/printers/pp-new-printer-dialog.c:1783
 msgid "Server requires authentication"
 msgstr "伺服器需要核對身份"
 
-#: panels/printers/pp-options-dialog.c:90
+#: panels/printers/pp-options-dialog.c:91
 msgid "Two Sided"
 msgstr "雙面"
 
-#: panels/printers/pp-options-dialog.c:91
+#: panels/printers/pp-options-dialog.c:92
 msgid "Paper Type"
 msgstr "紙張類型"
 
-#: panels/printers/pp-options-dialog.c:92
+#: panels/printers/pp-options-dialog.c:93
 msgid "Paper Source"
 msgstr "紙張來源"
 
-#: panels/printers/pp-options-dialog.c:93
+#: panels/printers/pp-options-dialog.c:94
 msgid "Output Tray"
 msgstr "出紙匣"
 
-#: panels/printers/pp-options-dialog.c:94
-#| msgid "Resolution"
+#: panels/printers/pp-options-dialog.c:95
 msgctxt "printing option"
 msgid "Resolution"
 msgstr "解析度"
 
-#: panels/printers/pp-options-dialog.c:95
+#: panels/printers/pp-options-dialog.c:96
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 前置過濾器"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: panels/printers/pp-options-dialog.c:548
+#: panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "每張紙的頁數"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: panels/printers/pp-options-dialog.c:560
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "雙面"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/printers/pp-options-dialog.c:572
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "方向"
 
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:669
+#: panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "一般"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: panels/printers/pp-options-dialog.c:672
+#: panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "頁面設定"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: panels/printers/pp-options-dialog.c:675
+#: panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "可安裝選項"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:678
+#: panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "工作"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: panels/printers/pp-options-dialog.c:681
+#: panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "影像品質"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: panels/printers/pp-options-dialog.c:684
+#: panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "顏色"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:687
+#: panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "完成"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:690
+#: panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "進階"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:920
+#. Translators: This button triggers the printing of a test page.
+#: panels/printers/pp-options-dialog.c:869
+#: panels/printers/pp-options-dialog.ui:18
+msgid "Test Page"
+msgstr "測試頁"
+
+#. Translators: Name of job which makes printer to print test page
+#: panels/printers/pp-options-dialog.c:882
 msgid "Test page"
 msgstr "測試頁"
 
@@ -5032,627 +5238,256 @@ msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:606 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:597 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "沒有進行中的工作"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:611
+#: panels/printers/pp-printer-entry.c:602
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u 個工作"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:766
+#: panels/printers/pp-printer-entry.c:757
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:768
+#: panels/printers/pp-printer-entry.c:759
 msgid "Out of toner"
 msgstr "碳粉用完"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: panels/printers/pp-printer-entry.c:771
+#: panels/printers/pp-printer-entry.c:762
 msgid "Low on developer"
 msgstr "顯像劑不足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: panels/printers/pp-printer-entry.c:774
+#: panels/printers/pp-printer-entry.c:765
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:776
+#: panels/printers/pp-printer-entry.c:767
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:778
+#: panels/printers/pp-printer-entry.c:769
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: panels/printers/pp-printer-entry.c:780
+#: panels/printers/pp-printer-entry.c:771
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:773
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:784
+#: panels/printers/pp-printer-entry.c:775
 msgid "Low on paper"
 msgstr "紙張不足"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:786
+#: panels/printers/pp-printer-entry.c:777
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:788
+#: panels/printers/pp-printer-entry.c:779
 msgctxt "printer state"
 msgid "Offline"
 msgstr "離線"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: panels/printers/pp-printer-entry.c:790
-#: panels/printers/pp-printer-entry.c:918
+#: panels/printers/pp-printer-entry.c:781
+#: panels/printers/pp-printer-entry.c:909
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:783
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: panels/printers/pp-printer-entry.c:794
+#: panels/printers/pp-printer-entry.c:785
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:787
 msgid "The optical photo conductor is near end of life"
 msgstr "感光鼓接近使用壽命"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:798
+#: panels/printers/pp-printer-entry.c:789
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓已無法使用"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: panels/printers/pp-printer-entry.c:904
+#: panels/printers/pp-printer-entry.c:895
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備就緒"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: panels/printers/pp-printer-entry.c:909
-msgctxt "printer state"
-msgid "Does not accept jobs"
-msgstr "不接受工作"
-
-#. Translators: Printer's state (jobs are processing)
-#: panels/printers/pp-printer-entry.c:914
-msgctxt "printer state"
-msgid "Processing"
-msgstr "處理中"
-
-#. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:938
-msgid "Clean print heads"
-msgstr "清理列印噴頭"
-
-#: panels/printers/printer-entry.ui:14
-msgid "Printing Options"
-msgstr "印表機選項"
-
-#: panels/printers/printer-entry.ui:26
-msgid "Printer Details"
-msgstr "印表機詳細資料"
-
-#. Set this printer as default
-#: panels/printers/printer-entry.ui:38
-msgid "Use Printer by Default"
-msgstr "使用預設印表機"
-
-#. Translators: This button executes command which cleans print heads of the printer.
-#: panels/printers/printer-entry.ui:50
-msgid "Clean Print Heads"
-msgstr "清理列印噴頭"
-
-#: panels/printers/printer-entry.ui:61
-msgid "Remove Printer"
-msgstr "移除印表機"
-
-#: panels/printers/printer-entry.ui:193
-msgid "Model"
-msgstr "型號"
-
-#: panels/printers/printer-entry.ui:251
-msgid "Ink Level"
-msgstr "墨水等級"
-
-#. Translators: This is the message which follows the printer error.
-#: panels/printers/printer-entry.ui:312
-msgid "Please restart when the problem is resolved."
-msgstr "若問題解決後請重新啟動機器。"
-
-#. Translators: This is the button which restarts the printer.
-#: panels/printers/printer-entry.ui:319
-msgid "Restart"
-msgstr "重新啟動"
-
-#. Translators: This button adds new printer.
-#: panels/printers/printers.ui:20
-msgid "Add…"
-msgstr "加入…"
-
-#: panels/printers/printers.ui:186
-msgid "No printers"
-msgstr "沒有印表機"
-
-#. Translators: This button adds new printer.
-#: panels/printers/printers.ui:200
-msgid "Add a Printer…"
-msgstr "加入印表機…"
-
-#. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:232
-msgid ""
-"Sorry! The system printing service\n"
-"doesn’t seem to be available."
-msgstr ""
-"抱歉!系統列印服務\n"
-"似乎無法使用。"
-
-#: panels/privacy/cc-privacy-panel.c:423 panels/privacy/cc-privacy-panel.ui:280
-msgid "Screen Lock"
-msgstr "螢幕鎖定"
-
-#: panels/privacy/cc-privacy-panel.c:467
-msgid "In use"
-msgstr "使用中"
-
-#: panels/privacy/cc-privacy-panel.c:472
-msgctxt "Location services status"
-msgid "On"
-msgstr "開"
-
-#: panels/privacy/cc-privacy-panel.c:473
-msgctxt "Location services status"
-msgid "Off"
-msgstr "關"
-
-#: panels/privacy/cc-privacy-panel.c:895
-#| msgid "Off"
-msgctxt "Camera status"
-msgid "Off"
-msgstr "關閉"
-
-#: panels/privacy/cc-privacy-panel.c:897
-#| msgid "On"
-msgctxt "Camera status"
-msgid "On"
-msgstr "開啟"
-
-#: panels/privacy/cc-privacy-panel.c:928
-#| msgid "Off"
-msgctxt "Microphone status"
-msgid "Off"
-msgstr "關閉"
-
-#: panels/privacy/cc-privacy-panel.c:930
-#| msgid "On"
-msgctxt "Microphone status"
-msgid "On"
-msgstr "開啟"
-
-#: panels/privacy/cc-privacy-panel.c:1036
-#: panels/privacy/cc-privacy-panel.ui:127
-msgid "Usage & History"
-msgstr "使用與歷史紀錄"
-
-#: panels/privacy/cc-privacy-panel.c:1157
-msgid "Empty all items from Trash?"
-msgstr "要清除垃圾桶中所有的項目?"
-
-#: panels/privacy/cc-privacy-panel.c:1158
-msgid "All items in the Trash will be permanently deleted."
-msgstr "所有在垃圾桶中的項目會永遠刪除。"
-
-#: panels/privacy/cc-privacy-panel.c:1159
-msgid "_Empty Trash"
-msgstr "清理垃圾桶(_E)"
-
-#: panels/privacy/cc-privacy-panel.c:1180
-msgid "Delete all the temporary files?"
-msgstr "刪除所有暫存檔案?"
-
-#: panels/privacy/cc-privacy-panel.c:1181
-msgid "All the temporary files will be permanently deleted."
-msgstr "所有的暫存檔案會永遠刪除。"
-
-#: panels/privacy/cc-privacy-panel.c:1182
-msgid "_Purge Temporary Files"
-msgstr "清理暫存檔案(_P)"
-
-#: panels/privacy/cc-privacy-panel.c:1204
-#: panels/privacy/cc-privacy-panel.ui:432
-msgid "Purge Trash & Temporary Files"
-msgstr "清除垃圾桶與暫存檔案"
-
-#: panels/privacy/cc-privacy-panel.c:1237
-#: panels/privacy/cc-privacy-panel.ui:637
-msgid "Software Usage"
-msgstr "軟體使用率"
-
-#: panels/privacy/cc-privacy-panel.c:1276
-#: panels/privacy/cc-privacy-panel.ui:1169
-msgid "Problem Reporting"
-msgstr "問題回報"
-
-#. translators: '%s' is the distributor's name, such as 'Fedora'
-#: panels/privacy/cc-privacy-panel.c:1288
-#, c-format
-msgid ""
-"Sending reports of technical problems helps us improve %s. Reports are sent "
-"anonymously and are scrubbed of personal data."
-msgstr ""
-"傳送技術問題的報告有助於我們改進 %s。報告是以匿名方式傳送,並且會消除個人資"
-"料。"
-
-#: panels/privacy/cc-privacy-panel.c:1300
-#: panels/privacy/cc-privacy-panel.ui:719
-msgid "Privacy Policy"
-msgstr "隱私權原則"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:14
-#| msgid "Screen Turns Off"
-msgctxt "lock_screen"
-msgid "Screen Turns Off"
-msgstr "螢幕關閉"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:18
-#| msgid "30 seconds"
-msgctxt "lock_screen"
-msgid "30 seconds"
-msgstr "30 秒"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:22
-#| msgid "1 minute"
-msgctxt "lock_screen"
-msgid "1 minute"
-msgstr "1 分鐘"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:26
-#| msgid "2 minutes"
-msgctxt "lock_screen"
-msgid "2 minutes"
-msgstr "2 分鐘"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:30
-#| msgid "3 minutes"
-msgctxt "lock_screen"
-msgid "3 minutes"
-msgstr "3 分鐘"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:34
-#| msgid "5 minutes"
-msgctxt "lock_screen"
-msgid "5 minutes"
-msgstr "5 分鐘"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:38
-#| msgid "30 minutes"
-msgctxt "lock_screen"
-msgid "30 minutes"
-msgstr "30 分鐘"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:42
-#| msgid "1 hour"
-msgctxt "lock_screen"
-msgid "1 hour"
-msgstr "1 小時"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:56
-#| msgid "1 hour"
-msgctxt "purge_files"
-msgid "1 hour"
-msgstr "1 小時"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:60
-#| msgid "1 day"
-msgctxt "purge_files"
-msgid "1 day"
-msgstr "1 天"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:64
-#| msgid "2 days"
-msgctxt "purge_files"
-msgid "2 days"
-msgstr "2 天"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:68
-#| msgid "3 days"
-msgctxt "purge_files"
-msgid "3 days"
-msgstr "3 天"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:72
-#| msgid "4 days"
-msgctxt "purge_files"
-msgid "4 days"
-msgstr "4 天"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:76
-#| msgid "5 days"
-msgctxt "purge_files"
-msgid "5 days"
-msgstr "5 天"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:80
-#| msgid "6 days"
-msgctxt "purge_files"
-msgid "6 days"
-msgstr "6 天"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:84
-#| msgid "7 days"
-msgctxt "purge_files"
-msgid "7 days"
-msgstr "7 天"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:88
-#| msgid "14 days"
-msgctxt "purge_files"
-msgid "14 days"
-msgstr "14 天"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:92
-#| msgid "30 days"
-msgctxt "purge_files"
-msgid "30 days"
-msgstr "30 天"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:106
-#| msgid "1 day"
-msgctxt "retain_history"
-msgid "1 day"
-msgstr "1 天"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:110
-#| msgid "7 days"
-msgctxt "retain_history"
-msgid "7 days"
-msgstr "7 天"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:114
-#| msgid "30 days"
-msgctxt "retain_history"
-msgid "30 days"
-msgstr "30 天"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:118
-#| msgid "Forever"
-msgctxt "retain_history"
-msgid "Forever"
-msgstr "永遠"
-
-#: panels/privacy/cc-privacy-panel.ui:148
-msgid ""
-"Remembering your history makes things easier to find again. These items are "
-"never shared over the network."
-msgstr ""
-"記住您的歷史紀錄會讓需要再次找到某樣東西時更簡單。這些項目永遠不會透過網路分"
-"享出去。"
-
-#: panels/privacy/cc-privacy-panel.ui:176
-msgid "_Recently Used"
-msgstr "最近使用(_R)"
-
-#: panels/privacy/cc-privacy-panel.ui:207
-msgid "Retain _History"
-msgstr "保留歷史紀錄(_H)"
-
-#: panels/privacy/cc-privacy-panel.ui:247
-msgid "Cl_ear Recent History"
-msgstr "清除最近歷史紀錄(_E)"
-
-#: panels/privacy/cc-privacy-panel.ui:301
-msgid "The Screen Lock protects your privacy when you are away."
-msgstr "螢幕鎖可以在您離開時保護您的隱私。"
-
-#: panels/privacy/cc-privacy-panel.ui:328
-msgid "Automatic Screen _Lock"
-msgstr "自動鎖定螢幕(_L)"
-
-#: panels/privacy/cc-privacy-panel.ui:362
-msgid "Lock screen _after blank for"
-msgstr "螢幕轉黑後多久鎖定螢幕(_A)"
-
-#: panels/privacy/cc-privacy-panel.ui:394
-#| msgid "_Lock Screen Notifications"
-msgid "Lock Screen _Notifications"
-msgstr "鎖定畫面通知(_N)"
-
-#: panels/privacy/cc-privacy-panel.ui:454
-msgid ""
-"Automatically purge the Trash and temporary files to help keep your computer "
-"free of unnecessary sensitive information."
-msgstr "自動清除垃圾桶和暫存檔案可以保護您的電腦減少不必要的敏感資訊。"
-
-#: panels/privacy/cc-privacy-panel.ui:483
-msgid "Automatically empty _Trash"
-msgstr "自動清空垃圾桶(_T)"
-
-#: panels/privacy/cc-privacy-panel.ui:515
-msgid "Automatically purge Temporary _Files"
-msgstr "自動清除暫存檔案(_F)"
-
-#: panels/privacy/cc-privacy-panel.ui:546
-msgid "Purge _After"
-msgstr "清除於(_A)"
+#: panels/printers/pp-printer-entry.c:900
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "不接受工作"
 
-#: panels/privacy/cc-privacy-panel.ui:590
-msgid "_Empty Trash…"
-msgstr "清理垃圾桶(_E)…"
+#. Translators: Printer's state (jobs are processing)
+#: panels/printers/pp-printer-entry.c:905
+msgctxt "printer state"
+msgid "Processing"
+msgstr "處理中"
 
-#: panels/privacy/cc-privacy-panel.ui:606
-msgid "_Purge Temporary Files…"
-msgstr "清理暫存檔案(_P)…"
+#. Translators: Name of job which makes printer to clean its heads
+#: panels/printers/pp-printer-entry.c:929
+msgid "Clean print heads"
+msgstr "清理列印噴頭"
 
-#: panels/privacy/cc-privacy-panel.ui:654
-msgid ""
-"Sending us information about which software you use helps us provide you "
-"with more accurate recommendations. It also helps us to improve our "
-"software.\n"
-"\n"
-"All the information we collect is made anonymous, and we will never share "
-"your data with third parties."
-msgstr ""
-"傳送您所使用軟體的資訊給我們能幫助我們提供您更準確的建議。它也能協助我們改進"
-"我們的軟體。\n"
-"\n"
-"我們所收集的所有資訊都是匿名的,而且我們永遠不會將您的資料與任何第三方分享。"
+#: panels/printers/printer-entry.ui:14
+msgid "Printing Options"
+msgstr "印表機選項"
 
-#: panels/privacy/cc-privacy-panel.ui:681
-msgid "_Send software usage statistics"
-msgstr "傳送軟體使用率統計(_S)"
+#: panels/printers/printer-entry.ui:26
+msgid "Printer Details"
+msgstr "印表機詳細資料"
 
-#: panels/privacy/cc-privacy-panel.ui:764
-msgid ""
-"Use of the camera allows applications to capture photos and video. Disabling "
-"the camera may cause some applications to not function properly."
-msgstr "使用相機以讓應用程式能拍照或錄影。停用相機可能導致部份應用程式不能正常運作。"
+#. Set this printer as default
+#: panels/printers/printer-entry.ui:38
+msgid "Use Printer by Default"
+msgstr "使用預設印表機"
 
-#: panels/privacy/cc-privacy-panel.ui:812
-#| msgid "%s Camera"
-msgid "_Camera"
-msgstr "相機(_C)"
+#. Translators: This button executes command which cleans print heads of the printer.
+#: panels/printers/printer-entry.ui:50
+msgid "Clean Print Heads"
+msgstr "清理列印噴頭"
 
-#: panels/privacy/cc-privacy-panel.ui:869
-msgid ""
-"Use of the microphone allows applications to capture sounds. Disabling the "
-"microphone may cause some applications to not function properly."
-msgstr "使用麥克風以讓應用程式能錄音。停用麥克風可能導致部份應用程式不能正常運作。"
+#: panels/printers/printer-entry.ui:61
+msgid "Remove Printer"
+msgstr "移除印表機"
 
-#: panels/privacy/cc-privacy-panel.ui:917
-msgid "_Microphone"
-msgstr "麥克風(_M)"
+#: panels/printers/printer-entry.ui:193
+msgid "Model"
+msgstr "型號"
 
-#: panels/privacy/cc-privacy-panel.ui:974
-msgid ""
-"Location services allow applications to know your location. Using Wi-Fi and "
-"mobile broadband increases accuracy."
-msgstr ""
-"位置服務允許應用程式知道您的所在位置。使用 Wi-Fi 和行動寬頻可以提高定位精準"
-"度。"
+#: panels/printers/printer-entry.ui:251
+msgid "Ink Level"
+msgstr "墨水等級"
 
-#: panels/privacy/cc-privacy-panel.ui:988
-msgid ""
-"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
-"com/privacy'>Privacy Policy</a>"
-msgstr ""
-"使用 Mozilla 位置服務:<a href='https://location.services.mozilla.com/";
-"privacy'>隱私服務</a>"
+#. Translators: This is the message which follows the printer error.
+#: panels/printers/printer-entry.ui:312
+msgid "Please restart when the problem is resolved."
+msgstr "若問題解決後請重新啟動機器。"
 
-#: panels/privacy/cc-privacy-panel.ui:1038
-msgid "_Location Services"
-msgstr "位置服務(_L)"
+#. Translators: This is the button which restarts the printer.
+#: panels/printers/printer-entry.ui:319
+msgid "Restart"
+msgstr "重新啟動"
 
-#: panels/privacy/cc-privacy-panel.ui:1236
-msgid "_Automatic Problem Reporting"
-msgstr "自動回報問題(_A)"
+#. Translators: This button adds new printer.
+#: panels/printers/printers.ui:20
+msgid "Add…"
+msgstr "加入…"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "隱私"
+#: panels/printers/printers.ui:186
+msgid "No printers"
+msgstr "沒有印表機"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
-msgid "Protect your personal information and control what others might see"
-msgstr "保護您的個人資訊並控制其他人能看到什麼"
+#. Translators: This button adds new printer.
+#: panels/printers/printers.ui:200
+msgid "Add a Printer…"
+msgstr "加入印表機…"
 
-#. FIXME
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
+#. Translators: The CUPS server is not running (we can not connect to it).
+#: panels/printers/printers.ui:232
 msgid ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;"
+"Sorry! The system printing service\n"
+"doesn’t seem to be available."
 msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;螢幕;鎖定;診斷;隱私;最近使用;暫存;索引;名稱;網路;身分;"
+"抱歉!系統列印服務\n"
+"似乎無法使用。"
 
-#: panels/region/cc-format-chooser.c:133
+#: panels/region/cc-format-chooser.c:148
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: panels/region/cc-format-chooser.c:135
+#: panels/region/cc-format-chooser.c:150
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: panels/region/cc-format-chooser.c:314
-msgid "No regions found"
-msgstr "找不到區域"
-
-#: panels/region/cc-format-chooser.ui:7
+#: panels/region/cc-format-chooser.c:255 panels/region/cc-format-chooser.c:296
+#: panels/region/cc-format-chooser.ui:6
 msgid "Formats"
 msgstr "格式"
 
-#: panels/region/cc-format-chooser.ui:106
+#: panels/region/cc-format-chooser.ui:48 panels/wacom/wacom-stylus-page.ui:37
+#: shell/cc-window.ui:232
+msgid "Back"
+msgstr "上一頁"
+
+#: panels/region/cc-format-chooser.ui:103
+msgid ""
+"Choose the format for numbers, dates and currencies. Changes take effect on "
+"next login."
+msgstr "選擇數字、日期及貨幣的格式。變更會在下次登入時生效。"
+
+#: panels/region/cc-format-chooser.ui:119
+msgid "Search locales..."
+msgstr "搜尋地區…"
+
+#: panels/region/cc-format-chooser.ui:160
+msgid "Common Formats"
+msgstr "通常格式"
+
+#: panels/region/cc-format-chooser.ui:191
+msgid "All Formats"
+msgstr "所有格式"
+
+#: panels/region/cc-format-chooser.ui:244
+msgid "No Search Results"
+msgstr "沒有搜尋結果"
+
+#: panels/region/cc-format-chooser.ui:257
+msgid "Searches can be for countries or languages."
+msgstr "可以搜尋國家或語言。"
+
+#: panels/region/cc-format-chooser.ui:309
 msgid "Preview"
 msgstr "預覽"
 
-#: panels/region/cc-format-chooser.ui:123
+#: panels/region/cc-format-chooser.ui:324
 msgid "Dates"
 msgstr "日期"
 
-#: panels/region/cc-format-chooser.ui:185
+#: panels/region/cc-format-chooser.ui:368
 msgid "Dates & Times"
 msgstr "日期與時刻"
 
-#: panels/region/cc-format-chooser.ui:216
+#: panels/region/cc-format-chooser.ui:390
 msgid "Numbers"
 msgstr "數字"
 
-#: panels/region/cc-format-chooser.ui:233
+#: panels/region/cc-format-chooser.ui:412
 msgid "Measurement"
 msgstr "度量衡"
 
-#: panels/region/cc-format-chooser.ui:250
+#: panels/region/cc-format-chooser.ui:434
 msgid "Paper"
 msgstr "紙張"
 
@@ -5673,12 +5508,12 @@ msgstr "加入輸入來源"
 msgid "Input methods can’t be used on the login screen"
 msgstr "輸入法無法在登入畫面中使用"
 
-#: panels/region/cc-region-panel.c:1512
+#: panels/region/cc-region-panel.c:1511
 msgid "Login _Screen"
 msgstr "登入畫面(_S)"
 
 #: panels/region/cc-region-panel.ui:64
-#: panels/user-accounts/cc-user-panel.ui:364
+#: panels/user-accounts/cc-user-panel.ui:352
 msgid "_Language"
 msgstr "語言(_L)"
 
@@ -5699,7 +5534,6 @@ msgid "Input Sources"
 msgstr "輸入來源"
 
 #: panels/region/cc-region-panel.ui:209
-#| msgid "Select keyboards or other input sources"
 msgid "Choose keyboard layouts or input methods."
 msgstr "請選取鍵盤配置或輸入法。"
 
@@ -5724,7 +5558,6 @@ msgid "Allow _different sources for each window"
 msgstr "每個視窗使用不同的輸入來源(_D)"
 
 #: panels/region/cc-region-panel.ui:412
-#| msgid "Previous track"
 msgid "Previous source"
 msgstr "上一個來源"
 
@@ -5733,7 +5566,6 @@ msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
 #: panels/region/cc-region-panel.ui:445
-#| msgid "Resources"
 msgid "Next source"
 msgstr "下一個來源"
 
@@ -5746,7 +5578,6 @@ msgid "Left+Right Alt"
 msgstr "左+右 Alt"
 
 #: panels/region/cc-region-panel.ui:494
-#| msgid "You can change these shortcuts in the keyboard settings"
 msgid "These keyboard shortcuts can be changed in the keyboard settings"
 msgstr "可以在鍵盤設定中變更這些鍵盤快捷鍵"
 
@@ -5764,14 +5595,186 @@ msgstr "選擇您的顯示語言、格式、鍵盤配置和輸入來源"
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
 
-#: panels/search/cc-search-locations-dialog.c:611
+#: panels/removable-media/cc-removable-media-panel.c:267
+msgid "Ask what to do"
+msgstr "詢問要做什麼"
+
+#: panels/removable-media/cc-removable-media-panel.c:271
+msgid "Do nothing"
+msgstr "不做任何事"
+
+#: panels/removable-media/cc-removable-media-panel.c:275
+msgid "Open folder"
+msgstr "開啟資料夾"
+
+#: panels/removable-media/cc-removable-media-panel.c:341
+msgid "Other Media"
+msgstr "其他媒體"
+
+#: panels/removable-media/cc-removable-media-panel.c:362
+msgid "Select an application for audio CDs"
+msgstr "選擇播放音樂 CD 的應用程式"
+
+#: panels/removable-media/cc-removable-media-panel.c:363
+msgid "Select an application for video DVDs"
+msgstr "選擇播放影片 DVD 的應用程式"
+
+#: panels/removable-media/cc-removable-media-panel.c:364
+msgid "Select an application to run when a music player is connected"
+msgstr "選擇當音樂播放器連接時要執行的應用程式"
+
+#: panels/removable-media/cc-removable-media-panel.c:365
+msgid "Select an application to run when a camera is connected"
+msgstr "選擇當攝影機連接時要執行的應用程式"
+
+#: panels/removable-media/cc-removable-media-panel.c:366
+msgid "Select an application for software CDs"
+msgstr "選擇軟體 CD 要用的應用程式"
+
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: panels/removable-media/cc-removable-media-panel.c:378
+msgid "audio DVD"
+msgstr "音樂 DVD"
+
+#: panels/removable-media/cc-removable-media-panel.c:379
+msgid "blank Blu-ray disc"
+msgstr "空白 Blu-ray 碟片"
+
+#: panels/removable-media/cc-removable-media-panel.c:380
+msgid "blank CD disc"
+msgstr "空白 CD 碟片"
+
+#: panels/removable-media/cc-removable-media-panel.c:381
+msgid "blank DVD disc"
+msgstr "空白 DVD 碟片"
+
+#: panels/removable-media/cc-removable-media-panel.c:382
+msgid "blank HD DVD disc"
+msgstr "空白 HD DVD 碟片"
+
+#: panels/removable-media/cc-removable-media-panel.c:383
+msgid "Blu-ray video disc"
+msgstr "Blu-ray 影片碟片"
+
+#: panels/removable-media/cc-removable-media-panel.c:384
+msgid "e-book reader"
+msgstr "電子書閱讀器"
+
+#: panels/removable-media/cc-removable-media-panel.c:385
+msgid "HD DVD video disc"
+msgstr "HD DVD 影片碟片"
+
+#: panels/removable-media/cc-removable-media-panel.c:386
+msgid "Picture CD"
+msgstr "照片 CD"
+
+#: panels/removable-media/cc-removable-media-panel.c:387
+msgid "Super Video CD"
+msgstr "SVCD"
+
+#: panels/removable-media/cc-removable-media-panel.c:388
+msgid "Video CD"
+msgstr "影片 CD"
+
+#: panels/removable-media/cc-removable-media-panel.c:389
+msgid "Windows software"
+msgstr "Windows 軟體"
+
+#: panels/removable-media/cc-removable-media-panel.ui:44
+msgid "Select how media should be handled"
+msgstr "選擇要如何處理媒體"
+
+#: panels/removable-media/cc-removable-media-panel.ui:75
+msgid "CD _audio"
+msgstr "CD 音樂(_A)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:92
+msgid "_DVD video"
+msgstr "_DVD 影片"
+
+#: panels/removable-media/cc-removable-media-panel.ui:133
+msgid "_Music player"
+msgstr "音樂播放器(_M)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:191
+msgid "_Software"
+msgstr "軟體(_S)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:229
+msgid "_Other Media…"
+msgstr "其他(_O)…"
+
+#: panels/removable-media/cc-removable-media-panel.ui:288
+msgid "_Never prompt or start programs on media insertion"
+msgstr "插入媒體時永遠不提示或啟動程式(_N)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:342
+msgid "Select how other media should be handled"
+msgstr "選擇要如何處理其他媒體"
+
+#: panels/removable-media/cc-removable-media-panel.ui:389
+msgid "_Action:"
+msgstr "動作(_A):"
+
+#: panels/removable-media/cc-removable-media-panel.ui:412
+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;裝置;系統;預設;應用程式;偏好;首選;音訊;視訊;光碟;碟"
+"片;可移除;可移除式;媒體;自動執行;"
+
+#: panels/search/cc-search-locations-dialog.c:635
 msgid "Select Location"
 msgstr "選擇位置"
 
-#: panels/search/cc-search-locations-dialog.c:615
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "_OK"
 msgstr "確定(_O)"
 
+#: panels/search/cc-search-locations-dialog.ui:9
+#: panels/search/cc-search-panel.ui:61
+msgid "Search Locations"
+msgstr "搜尋位置"
+
+#: panels/search/cc-search-locations-dialog.ui:32
+#: panels/search/cc-search-locations-dialog.ui:69
+#: panels/search/cc-search-locations-dialog.ui:107
+msgid ""
+"Folders which are searched by system applications, such as Files, Photos and "
+"Videos."
+msgstr "系統應用程式會搜尋的資料夾,例如「檔案」、「照片」或「影片」。"
+
+#: panels/search/cc-search-locations-dialog.ui:52
+msgid "Places"
+msgstr "位置"
+
+#: panels/search/cc-search-locations-dialog.ui:91
+msgid "Bookmarks"
+msgstr "書籤"
+
+#: panels/search/cc-search-locations-dialog.ui:156
+msgid "Other"
+msgstr "其他"
+
 #: panels/search/cc-search-panel.c:153
 msgid "No applications found"
 msgstr "找不到應用程式"
@@ -5784,16 +5787,13 @@ msgstr "往上移"
 msgid "Move Down"
 msgstr "往下移"
 
-#: panels/search/cc-search-panel.ui:32
+#: panels/search/cc-search-panel.ui:33
 msgid ""
 "Control which search results are shown in the Activities Overview. The order "
 "of search results can also be changed by moving rows in the list."
-msgstr "控制是否在「活動概覽」顯示搜尋結果。亦可藉由移動清單中的行來變更搜尋結果順序。"
-
-#: panels/search/cc-search-panel.ui:60
-#: panels/search/search-locations-dialog.ui:9
-msgid "Search Locations"
-msgstr "搜尋位置"
+msgstr ""
+"控制是否在「活動概覽」顯示搜尋結果。亦可藉由移動清單中的行來變更搜尋結果順"
+"序。"
 
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
@@ -5805,31 +5805,15 @@ msgstr "控制在活動概覽中哪些應用程式會顯示在搜尋結果中"
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr "Search;Find;Index;Hide;Privacy;Results;搜尋;尋找;索引;隱藏;隱私;結果;"
 
-#: panels/search/search-locations-dialog.ui:32
-#: panels/search/search-locations-dialog.ui:69
-#: panels/search/search-locations-dialog.ui:107
-msgid ""
-"Folders which are searched by system applications, such as Files, Photos and "
-"Videos."
-msgstr "系統應用程式會搜尋的資料夾,例如「檔案」、「照片」或「影片」。"
-
-#: panels/search/search-locations-dialog.ui:52
-msgid "Places"
-msgstr "位置"
-
-#: panels/search/search-locations-dialog.ui:91
-msgid "Bookmarks"
-msgstr "書籤"
-
-#: panels/search/search-locations-dialog.ui:156
-msgid "Other"
-msgstr "其他"
-
 #. Label
 #: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "沒有選擇用來分享的網路"
 
+#: panels/sharing/cc-sharing-networks.ui:19
+msgid "Networks"
+msgstr "網路"
+
 #: panels/sharing/cc-sharing-panel.c:320
 msgctxt "service is enabled"
 msgid "On"
@@ -5854,39 +5838,38 @@ msgstr "使用中"
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: panels/sharing/cc-sharing-panel.c:726
+#. TRANSLATORS: %s is replaced with a link to a dav://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:729
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
-"current network using: <a href=\"dav://%s\">dav://%s</a>"
-msgstr ""
-"檔案分享允許您使用 <a href=\"dav://%s\">dav://%s</a> 與目前網路上的其他人分享"
-"您的公開資料夾"
+"current network using: %s"
+msgstr "檔案分享允許您使用下述方式與目前網路上的其他人分享您的公開資料夾:%s"
 
-#: panels/sharing/cc-sharing-panel.c:728
+#. TRANSLATORS: %s is replaced with a link to a "ssh <hostname>" command to run
+#: panels/sharing/cc-sharing-panel.c:735
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"%s"
 msgstr ""
-"當啟用遠端登入時,遠端使用者可以使用 SSH 指令連線:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"啟用遠端登入後,遠端使用者可使用此 SSH 指令連線:\n"
+"%s"
 
-#: panels/sharing/cc-sharing-panel.c:730
+#. TRANSLATORS: %s is replaced with a link to a vnc://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:741
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
-"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
-msgstr ""
-"螢幕分享允許遠端使用者連線到 <a href=\"vnc://%s\">vnc://%s</a> 檢視或控制您的"
-"螢幕"
+"connecting to %s"
+msgstr "螢幕分享允許遠端使用者連線到 %s 以檢視或控制您的螢幕"
 
-#: panels/sharing/cc-sharing-panel.c:834
+#: panels/sharing/cc-sharing-panel.c:846
 msgid "Copy"
 msgstr "複製"
 
-#: panels/sharing/cc-sharing-panel.c:1287
+#: panels/sharing/cc-sharing-panel.c:1299
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "分享"
@@ -5985,10 +5968,6 @@ msgstr ""
 "movies;server;renderer;分享;主機;名稱;遠端;桌面;媒體;音效;影片;圖片;相片;伺服"
 "器;"
 
-#: panels/sharing/networks.ui:19
-msgid "Networks"
-msgstr "網路"
-
 #: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
 msgid "Enable or disable remote login"
 msgstr "啟用或停用遠端登入"
@@ -6018,20 +5997,15 @@ msgid "Sonar"
 msgstr "聲納"
 
 #: panels/sound/cc-fade-slider.ui:13
-#| msgctxt "balance"
-#| msgid "Rear"
 msgid "Rear"
 msgstr "後"
 
 #: panels/sound/cc-fade-slider.ui:15
-#| msgctxt "balance"
-#| msgid "Front"
 msgid "Front"
 msgstr "前"
 
 #: panels/sound/cc-output-test-dialog.c:134
 #, c-format
-#| msgid "Settings"
 msgid "Testing %s"
 msgstr "正在測試 %s"
 
@@ -6040,12 +6014,10 @@ msgid "Click a speaker to test"
 msgstr "按一下喇叭以測試"
 
 #: panels/sound/cc-sound-panel.ui:29
-#| msgid "System Sounds"
 msgid "System Volume"
 msgstr "系統音量"
 
 #: panels/sound/cc-sound-panel.ui:45
-#| msgid "Volume mute"
 msgid "Volume Levels"
 msgstr "音量等級"
 
@@ -6054,7 +6026,6 @@ msgid "Output"
 msgstr "輸出"
 
 #: panels/sound/cc-sound-panel.ui:94
-#| msgid "_Output volume:"
 msgid "Output Device"
 msgstr "輸出裝置"
 
@@ -6063,17 +6034,14 @@ msgid "Test"
 msgstr "測試"
 
 #: panels/sound/cc-sound-panel.ui:148 panels/sound/cc-sound-panel.ui:325
-#| msgid "_Configuration URL"
 msgid "Configuration"
 msgstr "設定"
 
 #: panels/sound/cc-sound-panel.ui:181
-#| msgid "_Balance:"
 msgid "Balance"
 msgstr "平衡"
 
 #: panels/sound/cc-sound-panel.ui:208
-#| msgid "_Fade:"
 msgid "Fade"
 msgstr "淡化"
 
@@ -6086,21 +6054,18 @@ msgid "Input"
 msgstr "輸入"
 
 #: panels/sound/cc-sound-panel.ui:284
-#| msgid "Input level:"
 msgid "Input Device"
 msgstr "輸入裝置"
 
 #: panels/sound/cc-sound-panel.ui:358
-#| msgid "Volume up"
 msgid "Volume"
 msgstr "音量"
 
 #: panels/sound/cc-sound-panel.ui:380
-#| msgid "_Alert volume:"
 msgid "Alert Sound"
 msgstr "警示音效"
 
-#: panels/sound/cc-volume-slider.c:92
+#: panels/sound/cc-volume-slider.c:115
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
@@ -6115,12 +6080,11 @@ 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
-#| msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 msgid ""
 "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;Output;Input;"
 msgstr ""
-"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;;Output;Input;"
-"音效卡;麥克風;音量;淡化;平衡;藍牙;耳機;音效;輸出;輸入;"
+"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;;Output;Input;音"
+"效卡;麥克風;音量;淡化;平衡;藍牙;耳機;音效;輸出;輸入;"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:94
 #: panels/thunderbolt/cc-bolt-device-entry.c:125
@@ -6248,7 +6212,6 @@ msgid "Thunderbolt support has been disabled in the BIOS."
 msgstr "Thunderbolt 支援在 BIOS 中被停用。"
 
 #: panels/thunderbolt/cc-bolt-panel.c:517
-#| msgid "The profile could not be generated."
 msgid "Thunderbolt security level could not be determined."
 msgstr "無法確定 Thunderbolt 安全性等級。"
 
@@ -6296,32 +6259,32 @@ msgstr "Thunderbolt;"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:497
+#: panels/universal-access/cc-ua-panel.c:500
 msgctxt "cursor size"
 msgid "Default"
 msgstr "預設值"
 
-#: panels/universal-access/cc-ua-panel.c:500
+#: panels/universal-access/cc-ua-panel.c:503
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "中"
 
-#: panels/universal-access/cc-ua-panel.c:503
+#: panels/universal-access/cc-ua-panel.c:506
 msgctxt "cursor size"
 msgid "Large"
 msgstr "大"
 
-#: panels/universal-access/cc-ua-panel.c:506
+#: panels/universal-access/cc-ua-panel.c:509
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "較大"
 
-#: panels/universal-access/cc-ua-panel.c:509
+#: panels/universal-access/cc-ua-panel.c:512
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "最大"
 
-#: panels/universal-access/cc-ua-panel.c:513
+#: panels/universal-access/cc-ua-panel.c:516
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
@@ -6357,7 +6320,7 @@ msgid "Screen _Reader"
 msgstr "螢幕閱讀器(_R)"
 
 #: panels/universal-access/cc-ua-panel.ui:397
-#: panels/universal-access/cc-ua-panel.ui:1231
+#: panels/universal-access/cc-ua-panel.ui:1263
 msgid "_Sound Keys"
 msgstr "聲音按鍵(_S)"
 
@@ -6366,7 +6329,7 @@ msgid "Hearing"
 msgstr "聽覺"
 
 #: panels/universal-access/cc-ua-panel.ui:503
-#: panels/universal-access/cc-ua-panel.ui:1334
+#: panels/universal-access/cc-ua-panel.ui:1366
 msgid "_Visual Alerts"
 msgstr "視覺警示(_V)"
 
@@ -6395,248 +6358,252 @@ msgid "_Mouse Keys"
 msgstr "滑鼠按鍵(_M)"
 
 #: panels/universal-access/cc-ua-panel.ui:900
+msgid "_Locate Pointer"
+msgstr "定位印表機(_L)"
+
+#: panels/universal-access/cc-ua-panel.ui:932
 msgid "_Click Assist"
 msgstr "點擊助理(_C)"
 
-#: panels/universal-access/cc-ua-panel.ui:946
+#: panels/universal-access/cc-ua-panel.ui:978
 msgid "_Double-Click Delay"
 msgstr "雙擊延遲(_D)"
 
-#: panels/universal-access/cc-ua-panel.ui:966
+#: panels/universal-access/cc-ua-panel.ui:998
 msgid "Double-Click Delay"
 msgstr "雙擊延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:1036
+#: panels/universal-access/cc-ua-panel.ui:1068
 msgid "Cursor Size"
 msgstr "游標大小"
 
-#: panels/universal-access/cc-ua-panel.ui:1063
+#: panels/universal-access/cc-ua-panel.ui:1095
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr "游標大小可以和縮放搭配以輕鬆看出游標位置。"
 
-#: panels/universal-access/cc-ua-panel.ui:1099
+#: panels/universal-access/cc-ua-panel.ui:1131
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
 
-#: panels/universal-access/cc-ua-panel.ui:1116
+#: panels/universal-access/cc-ua-panel.ui:1148
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "螢幕閱讀器能在您移動焦點時讀出顯示的文字。"
 
-#: panels/universal-access/cc-ua-panel.ui:1149
+#: panels/universal-access/cc-ua-panel.ui:1181
 msgid "_Screen Reader"
 msgstr "螢幕閱讀器(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1188
+#: panels/universal-access/cc-ua-panel.ui:1220
 msgid "Sound Keys"
 msgstr "聲音按鍵"
 
-#: panels/universal-access/cc-ua-panel.ui:1206
+#: panels/universal-access/cc-ua-panel.ui:1238
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "當 Num Lock 或 Caps Lock 開啟時發出聲響。"
 
-#: panels/universal-access/cc-ua-panel.ui:1276
+#: panels/universal-access/cc-ua-panel.ui:1308
 msgid "Visual Alerts"
 msgstr "視覺警示"
 
-#: panels/universal-access/cc-ua-panel.ui:1280
+#: panels/universal-access/cc-ua-panel.ui:1312
 msgid "_Test flash"
 msgstr "測試閃動(_T)"
 
-#: panels/universal-access/cc-ua-panel.ui:1309
+#: panels/universal-access/cc-ua-panel.ui:1341
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "當警示音效發出時使用視覺化的指示。"
 
-#: panels/universal-access/cc-ua-panel.ui:1360
-msgid "Flash the _window title"
-msgstr "閃動視窗標題(_W)"
+#: panels/universal-access/cc-ua-panel.ui:1392
+msgid "Flash the entire _window"
+msgstr "閃動整個視窗(_W)"
 
-#: panels/universal-access/cc-ua-panel.ui:1378
+#: panels/universal-access/cc-ua-panel.ui:1410
 msgid "Flash the entire _screen"
 msgstr "閃動整個螢幕(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1423
+#: panels/universal-access/cc-ua-panel.ui:1455
 msgid "Repeat Keys"
 msgstr "重複按鍵"
 
-#: panels/universal-access/cc-ua-panel.ui:1453
+#: panels/universal-access/cc-ua-panel.ui:1485
 msgid "Key presses repeat when key is held down."
 msgstr "當按下某鍵不放時重複輸出該字元。"
 
-#: panels/universal-access/cc-ua-panel.ui:1533
+#: panels/universal-access/cc-ua-panel.ui:1565
 msgid "Repeat keys delay"
 msgstr "按鍵重複延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:1581
-#: panels/universal-access/cc-ua-panel.ui:1716
+#: panels/universal-access/cc-ua-panel.ui:1613
+#: panels/universal-access/cc-ua-panel.ui:1748
 msgid "Speed"
 msgstr "速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1620
+#: panels/universal-access/cc-ua-panel.ui:1652
 msgid "Repeat keys speed"
 msgstr "按鍵重複速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1644
+#: panels/universal-access/cc-ua-panel.ui:1676
 msgid "Cursor Blinking"
 msgstr "游標閃爍"
 
-#: panels/universal-access/cc-ua-panel.ui:1674
+#: panels/universal-access/cc-ua-panel.ui:1706
 msgid "Cursor blinks in text fields."
 msgstr "游標在文字欄位中閃爍。"
 
-#: panels/universal-access/cc-ua-panel.ui:1753
+#: panels/universal-access/cc-ua-panel.ui:1785
 msgid "Cursor blinking speed"
 msgstr "游標閃爍速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1789
+#: panels/universal-access/cc-ua-panel.ui:1821
 msgid "Typing Assist"
 msgstr "打字助理"
 
-#: panels/universal-access/cc-ua-panel.ui:1828
+#: panels/universal-access/cc-ua-panel.ui:1860
 msgid "_Sticky Keys"
 msgstr "黏性特殊鍵(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1845
+#: panels/universal-access/cc-ua-panel.ui:1877
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "將連續按的特殊鍵視為按鍵組合"
 
-#: panels/universal-access/cc-ua-panel.ui:1869
+#: panels/universal-access/cc-ua-panel.ui:1901
 msgid "_Disable if two keys are pressed together"
 msgstr "如果同時按下任何兩鍵則停用(_D)"
 
-#: panels/universal-access/cc-ua-panel.ui:1887
+#: panels/universal-access/cc-ua-panel.ui:1919
 msgid "Beep when a _modifier key is pressed"
 msgstr "當按下特殊按鍵時發出聲響(_M)"
 
-#: panels/universal-access/cc-ua-panel.ui:1935
+#: panels/universal-access/cc-ua-panel.ui:1967
 msgid "S_low Keys"
 msgstr "重複按鍵(_L)"
 
-#: panels/universal-access/cc-ua-panel.ui:1952
+#: panels/universal-access/cc-ua-panel.ui:1984
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按鍵被按下到它被接受之間置入延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:1985
-#: panels/universal-access/cc-ua-panel.ui:2198
-#: panels/universal-access/cc-ua-panel.ui:2535
+#: panels/universal-access/cc-ua-panel.ui:2017
+#: panels/universal-access/cc-ua-panel.ui:2230
+#: panels/universal-access/cc-ua-panel.ui:2567
 msgid "A_cceptance delay:"
 msgstr "接受時間延遲(_C):"
 
-#: panels/universal-access/cc-ua-panel.ui:2007
+#: panels/universal-access/cc-ua-panel.ui:2039
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2026
+#: panels/universal-access/cc-ua-panel.ui:2058
 msgid "Slow keys typing delay"
 msgstr "降低按鍵輸入延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:2041
+#: panels/universal-access/cc-ua-panel.ui:2073
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/cc-ua-panel.ui:2068
+#: panels/universal-access/cc-ua-panel.ui:2100
 msgid "Beep when a key is pr_essed"
 msgstr "當按下按鍵時發出聲響(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:2085
+#: panels/universal-access/cc-ua-panel.ui:2117
 msgid "Beep when a key is _accepted"
 msgstr "當接受按鍵動作時發出聲響(_A)"
 
-#: panels/universal-access/cc-ua-panel.ui:2102
-#: panels/universal-access/cc-ua-panel.ui:2281
+#: panels/universal-access/cc-ua-panel.ui:2134
+#: panels/universal-access/cc-ua-panel.ui:2313
 msgid "Beep when a key is _rejected"
 msgstr "當拒絕按鍵動作則發出聲響(_R)"
 
-#: panels/universal-access/cc-ua-panel.ui:2148
+#: panels/universal-access/cc-ua-panel.ui:2180
 msgid "_Bounce Keys"
 msgstr "反彈鍵(_B)"
 
-#: panels/universal-access/cc-ua-panel.ui:2165
+#: panels/universal-access/cc-ua-panel.ui:2197
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重複按鍵"
 
-#: panels/universal-access/cc-ua-panel.ui:2220
+#: panels/universal-access/cc-ua-panel.ui:2252
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2239
+#: panels/universal-access/cc-ua-panel.ui:2271
 msgid "Bounce keys typing delay"
 msgstr "反彈鍵輸入延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:2254
+#: panels/universal-access/cc-ua-panel.ui:2286
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/cc-ua-panel.ui:2367
+#: panels/universal-access/cc-ua-panel.ui:2399
 msgid "_Enable by Keyboard"
 msgstr "由鍵盤啟用(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:2384
+#: panels/universal-access/cc-ua-panel.ui:2416
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "以鍵盤開啟和關閉無障礙功能"
 
-#: panels/universal-access/cc-ua-panel.ui:2448
+#: panels/universal-access/cc-ua-panel.ui:2480
 msgid "Click Assist"
 msgstr "點擊助理"
 
-#: panels/universal-access/cc-ua-panel.ui:2484
+#: panels/universal-access/cc-ua-panel.ui:2516
 msgid "_Simulated Secondary Click"
 msgstr "模擬次要點擊(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:2502
+#: panels/universal-access/cc-ua-panel.ui:2534
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "按住主要鍵時觸發次要點擊"
 
-#: panels/universal-access/cc-ua-panel.ui:2556
+#: panels/universal-access/cc-ua-panel.ui:2588
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2575
+#: panels/universal-access/cc-ua-panel.ui:2607
 msgid "Secondary click delay"
 msgstr "第二次點擊延遲"
 
-#: panels/universal-access/cc-ua-panel.ui:2590
+#: panels/universal-access/cc-ua-panel.ui:2622
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/cc-ua-panel.ui:2647
+#: panels/universal-access/cc-ua-panel.ui:2679
 msgid "_Hover Click"
 msgstr "停駐即點擊(_H)"
 
-#: panels/universal-access/cc-ua-panel.ui:2665
+#: panels/universal-access/cc-ua-panel.ui:2697
 msgid "Trigger a click when the pointer hovers"
 msgstr "當停止游標移動時觸發點擊"
 
-#: panels/universal-access/cc-ua-panel.ui:2698
+#: panels/universal-access/cc-ua-panel.ui:2730
 msgid "D_elay:"
 msgstr "延遲(_E):"
 
-#: panels/universal-access/cc-ua-panel.ui:2720
+#: panels/universal-access/cc-ua-panel.ui:2752
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2751
+#: panels/universal-access/cc-ua-panel.ui:2783
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/cc-ua-panel.ui:2787
+#: panels/universal-access/cc-ua-panel.ui:2819
 msgid "Motion _threshold:"
 msgstr "移動速度(_M):"
 
-#: panels/universal-access/cc-ua-panel.ui:2809
+#: panels/universal-access/cc-ua-panel.ui:2841
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: panels/universal-access/cc-ua-panel.ui:2840
+#: panels/universal-access/cc-ua-panel.ui:2872
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
@@ -6647,10 +6614,6 @@ msgstr "讓電腦更容易看、聽、輸入、指向與點選"
 
 #. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
 #: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
-#| msgid ""
-#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
-#| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
-#| "Repeat;Blink;"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
 "big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
@@ -6658,9 +6621,9 @@ msgid ""
 msgstr ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
 "big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
-"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
-"鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;反彈;滑鼠;雙擊;兩"
-"下;點按;延遲;助理;輔助;重複;閃動;游標;音效;大;高;速度;視覺;聽覺;音訊;音樂;輸入;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;鍵盤;滑鼠;"
+"無障礙;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;反彈;滑鼠;雙擊;兩下;點按;延"
+"遲;助理;輔助;重複;閃動;游標;音效;大;高;速度;視覺;聽覺;音訊;音樂;輸入;"
 
 #: panels/universal-access/zoom-options.c:305
 msgctxt "Distance"
@@ -6838,6 +6801,178 @@ msgstr "顏色效果:"
 msgid "Color Effects"
 msgstr "顏色效果"
 
+#: panels/usage/cc-usage-panel.c:155
+msgid "Empty all items from Trash?"
+msgstr "要清除垃圾桶中所有的項目?"
+
+#: panels/usage/cc-usage-panel.c:156
+msgid "All items in the Trash will be permanently deleted."
+msgstr "所有在垃圾桶中的項目會永遠刪除。"
+
+#: panels/usage/cc-usage-panel.c:157
+msgid "_Empty Trash"
+msgstr "清理垃圾桶(_E)"
+
+#: panels/usage/cc-usage-panel.c:178
+msgid "Delete all the temporary files?"
+msgstr "刪除所有暫存檔案?"
+
+#: panels/usage/cc-usage-panel.c:179
+msgid "All the temporary files will be permanently deleted."
+msgstr "所有的暫存檔案會永遠刪除。"
+
+#: panels/usage/cc-usage-panel.c:180
+msgid "_Purge Temporary Files"
+msgstr "清理暫存檔案(_P)"
+
+#: panels/usage/cc-usage-panel.ui:31
+msgid "File History"
+msgstr "檔案歷史記錄"
+
+#: panels/usage/cc-usage-panel.ui:43
+msgid ""
+"File history keeps a record of files that you have used. This information is "
+"shared between applications, and makes it easier to find files that you "
+"might want to use."
+msgstr ""
+"檔案歷史記錄會保留你用過檔案的記錄。這個資訊會與應用程式共用,且會讓尋找可能"
+"想用的檔案變簡單。"
+
+#: panels/usage/cc-usage-panel.ui:58
+msgid "File H_istory"
+msgstr "檔案歷史記錄(_I)"
+
+#: panels/usage/cc-usage-panel.ui:80
+msgid "File _History Duration"
+msgstr "檔案歷史記錄期間(_H)"
+
+#: panels/usage/cc-usage-panel.ui:121
+msgid "_Clear History…"
+msgstr "清除歷史記錄(_C)…"
+
+#: panels/usage/cc-usage-panel.ui:137
+msgid "Trash & Temporary Files"
+msgstr "垃圾及暫存檔"
+
+#: panels/usage/cc-usage-panel.ui:147
+msgid ""
+"Trash and temporary files can sometimes include personal or sensitive "
+"information. Automatically deleting them can help to protect privacy."
+msgstr "垃圾及暫存檔有時候可能會有個人或敏感資料。自動刪除會協助保障隱私權。"
+
+#: panels/usage/cc-usage-panel.ui:161
+msgid "Automatically Delete _Trash Content"
+msgstr "自動刪除垃圾桶的內容(_T)"
+
+#: panels/usage/cc-usage-panel.ui:176
+msgid "Automatically Delete Temporary _Files"
+msgstr "自動刪除暫存檔案(_F)"
+
+#: panels/usage/cc-usage-panel.ui:198
+msgid "Automatically Delete _Period"
+msgstr "自動刪除週期(_P)"
+
+#: panels/usage/cc-usage-panel.ui:240
+msgid "_Empty Trash…"
+msgstr "清理垃圾桶(_E)…"
+
+#: panels/usage/cc-usage-panel.ui:252
+msgid "_Delete Temporary Files…"
+msgstr "刪除暫存檔案(_D)…"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:280
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 小時"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:284
+msgctxt "purge_files"
+msgid "1 day"
+msgstr "1 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:288
+msgctxt "purge_files"
+msgid "2 days"
+msgstr "2 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:292
+msgctxt "purge_files"
+msgid "3 days"
+msgstr "3 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:296
+msgctxt "purge_files"
+msgid "4 days"
+msgstr "4 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:300
+msgctxt "purge_files"
+msgid "5 days"
+msgstr "5 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:304
+msgctxt "purge_files"
+msgid "6 days"
+msgstr "6 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:308
+msgctxt "purge_files"
+msgid "7 days"
+msgstr "7 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:312
+msgctxt "purge_files"
+msgid "14 days"
+msgstr "14 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:316
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:331
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:335
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:339
+msgctxt "retain_history"
+msgid "30 days"
+msgstr "30 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:343
+msgctxt "retain_history"
+msgid "Forever"
+msgstr "永遠"
+
+#: panels/usage/gnome-usage-panel.desktop.in.in:3
+msgid "File History & Trash"
+msgstr "檔案歷程記錄 & 垃圾"
+
+#: panels/usage/gnome-usage-panel.desktop.in.in:4
+msgid "Don't leave traces"
+msgstr "不留下追蹤"
+
+#. FIXME
 #: panels/user-accounts/cc-add-user-dialog.c:34
 msgid "Should match the web address of your login provider."
 msgstr "應符合您的登入提供者的網路位址。"
@@ -6899,17 +7034,17 @@ msgid "_Full Name"
 msgstr "全名(_F)"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:206
-#: panels/user-accounts/cc-user-panel.ui:153
+#: panels/user-accounts/cc-user-panel.ui:141
 msgid "Standard"
 msgstr "標準"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:216
-#: panels/user-accounts/cc-user-panel.ui:163
+#: panels/user-accounts/cc-user-panel.ui:151
 msgid "Administrator"
 msgstr "管理員"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:232
-#: panels/user-accounts/cc-user-panel.ui:181
+#: panels/user-accounts/cc-user-panel.ui:169
 msgid "Account _Type"
 msgstr "帳號類型(_T)"
 
@@ -6995,7 +7130,7 @@ msgstr "%s — %s"
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
 #: panels/user-accounts/cc-login-history-dialog.c:173
-#: panels/user-accounts/cc-user-panel.c:771
+#: panels/user-accounts/cc-user-panel.c:765
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -7003,7 +7138,7 @@ msgstr "%k:%M"
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
 #: panels/user-accounts/cc-login-history-dialog.c:176
-#: panels/user-accounts/cc-user-panel.c:775
+#: panels/user-accounts/cc-user-panel.c:769
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -7087,87 +7222,87 @@ msgstr "密碼錯誤,請再試一次"
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "無法連接到 %s 網域:%s"
 
-#: panels/user-accounts/cc-user-panel.c:214
+#: panels/user-accounts/cc-user-panel.c:208
 msgid "Your account"
 msgstr "您的帳號"
 
-#: panels/user-accounts/cc-user-panel.c:389
+#: panels/user-accounts/cc-user-panel.c:383
 msgid "Failed to delete user"
 msgstr "刪除使用者失敗"
 
-#: panels/user-accounts/cc-user-panel.c:447
-#: panels/user-accounts/cc-user-panel.c:506
-#: panels/user-accounts/cc-user-panel.c:558
+#: panels/user-accounts/cc-user-panel.c:441
+#: panels/user-accounts/cc-user-panel.c:500
+#: panels/user-accounts/cc-user-panel.c:552
 msgid "Failed to revoke remotely managed user"
 msgstr "註銷遠端管理的使用者失敗"
 
-#: panels/user-accounts/cc-user-panel.c:610
+#: panels/user-accounts/cc-user-panel.c:604
 msgid "You cannot delete your own account."
 msgstr "您不能刪除自己的帳號。"
 
-#: panels/user-accounts/cc-user-panel.c:619
+#: panels/user-accounts/cc-user-panel.c:613
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 仍在登入中"
 
-#: panels/user-accounts/cc-user-panel.c:623
+#: panels/user-accounts/cc-user-panel.c:617
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "在使用者登入期間刪除他會使系統處於不穩定的狀態。"
 
-#: panels/user-accounts/cc-user-panel.c:632
+#: panels/user-accounts/cc-user-panel.c:626
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "您想要保留 %s 的檔案嗎?"
 
-#: panels/user-accounts/cc-user-panel.c:636
+#: panels/user-accounts/cc-user-panel.c:630
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "當刪除使用者時是可以保留家目錄、新進郵件(mail spool)和暫存檔案的。"
 
-#: panels/user-accounts/cc-user-panel.c:639
+#: panels/user-accounts/cc-user-panel.c:633
 msgid "_Delete Files"
 msgstr "刪除檔案(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:640
+#: panels/user-accounts/cc-user-panel.c:634
 msgid "_Keep Files"
 msgstr "保留檔案(_K)"
 
-#: panels/user-accounts/cc-user-panel.c:654
+#: panels/user-accounts/cc-user-panel.c:648
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "確定要註銷遠端管理的 %s 帳號?"
 
-#: panels/user-accounts/cc-user-panel.c:658
+#: panels/user-accounts/cc-user-panel.c:652
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:708
+#: panels/user-accounts/cc-user-panel.c:702
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳號已停用"
 
-#: panels/user-accounts/cc-user-panel.c:716
+#: panels/user-accounts/cc-user-panel.c:710
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "在下次登入時設定"
 
-#: panels/user-accounts/cc-user-panel.c:719
+#: panels/user-accounts/cc-user-panel.c:713
 msgctxt "Password mode"
 msgid "None"
 msgstr "沒有"
 
-#: panels/user-accounts/cc-user-panel.c:764
+#: panels/user-accounts/cc-user-panel.c:758
 msgid "Logged in"
 msgstr "已登入"
 
-#: panels/user-accounts/cc-user-panel.c:1098
+#: panels/user-accounts/cc-user-panel.c:1092
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: panels/user-accounts/cc-user-panel.c:1100
+#: panels/user-accounts/cc-user-panel.c:1094
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
@@ -7175,7 +7310,7 @@ msgstr "請確定 AccountService 已經安裝並啟用。"
 #. * We split the line in 2 here to "make it look good", as there's
 #. * no good way to do this in GTK+ for tooltips. See:
 #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
-#: panels/user-accounts/cc-user-panel.c:1132
+#: panels/user-accounts/cc-user-panel.c:1126
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -7183,12 +7318,12 @@ msgstr ""
 "要進行變更,\n"
 "請先點選 * 圖示"
 
-#: panels/user-accounts/cc-user-panel.c:1205
+#: panels/user-accounts/cc-user-panel.c:1199
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: panels/user-accounts/cc-user-panel.c:1216
-#: panels/user-accounts/cc-user-panel.c:1344
+#: panels/user-accounts/cc-user-panel.c:1210
+#: panels/user-accounts/cc-user-panel.c:1338
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -7196,12 +7331,12 @@ msgstr ""
 "要建立使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: panels/user-accounts/cc-user-panel.c:1225
+#: panels/user-accounts/cc-user-panel.c:1219
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: panels/user-accounts/cc-user-panel.c:1237
-#: panels/user-accounts/cc-user-panel.c:1348
+#: panels/user-accounts/cc-user-panel.c:1231
+#: panels/user-accounts/cc-user-panel.c:1342
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7209,45 +7344,45 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: panels/user-accounts/cc-user-panel.ui:18
+#: panels/user-accounts/cc-user-panel.ui:5
 msgid "_Add User…"
 msgstr "加入使用者(_A)…"
 
-#: panels/user-accounts/cc-user-panel.ui:70
+#: panels/user-accounts/cc-user-panel.ui:52
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "您的作業階段需要重新啟動以讓變更生效"
 
-#: panels/user-accounts/cc-user-panel.ui:78
+#: panels/user-accounts/cc-user-panel.ui:60
 msgid "Restart Now"
 msgstr "立刻重新啟動"
 
-#: panels/user-accounts/cc-user-panel.ui:256
+#: panels/user-accounts/cc-user-panel.ui:244
 msgid "A_utomatic Login"
 msgstr "自動登入(_U)"
 
-#: panels/user-accounts/cc-user-panel.ui:298
+#: panels/user-accounts/cc-user-panel.ui:286
 msgid "_Fingerprint Login"
 msgstr "指紋登入(_F)"
 
-#: panels/user-accounts/cc-user-panel.ui:324
-#: panels/user-accounts/cc-user-panel.ui:340
+#: panels/user-accounts/cc-user-panel.ui:312
+#: panels/user-accounts/cc-user-panel.ui:328
 msgid "User Icon"
 msgstr "使用者圖示"
 
-#: panels/user-accounts/cc-user-panel.ui:404
+#: panels/user-accounts/cc-user-panel.ui:392
 msgid "Last Login"
 msgstr "上次登入"
 
-#: panels/user-accounts/cc-user-panel.ui:453
+#: panels/user-accounts/cc-user-panel.ui:441
 msgid "Remove User…"
 msgstr "移除使用者…"
 
 #. Translators: This is the empty state page label which states that there are no users to show in the panel.
-#: panels/user-accounts/cc-user-panel.ui:486
+#: panels/user-accounts/cc-user-panel.ui:471
 msgid "No Users Found"
 msgstr "找不到使用者"
 
-#: panels/user-accounts/cc-user-panel.ui:496
+#: panels/user-accounts/cc-user-panel.ui:481
 msgid "Unlock to add a user account."
 msgstr "解除使用者帳號的新增鎖定。"
 
@@ -7456,76 +7591,55 @@ msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
 msgstr "加入更多字母、數字和標點符號會讓密碼更強。"
 
-#: panels/user-accounts/run-passwd.c:422
+#: panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "核對失敗"
 
-#: panels/user-accounts/run-passwd.c:502
+#: panels/user-accounts/run-passwd.c:504
 #, c-format
 msgid "The new password is too short"
 msgstr "新的密碼太短"
 
-#: panels/user-accounts/run-passwd.c:508
+#: panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "新的密碼太簡單"
 
-#: panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:516
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "舊密碼與新密碼太相似了"
 
-#: panels/user-accounts/run-passwd.c:517
+#: panels/user-accounts/run-passwd.c:519
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "新的密碼已經在最近使用過了。"
 
-#: panels/user-accounts/run-passwd.c:520
+#: panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "新的密碼必須包含數字或特殊字元"
 
-#: panels/user-accounts/run-passwd.c:524
+#: panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "舊密碼與新密碼是相同的"
 
-#: panels/user-accounts/run-passwd.c:528
+#: panels/user-accounts/run-passwd.c:530
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "您的密碼在第一次核對後已經改變過了!"
 
-#: panels/user-accounts/run-passwd.c:532
+#: panels/user-accounts/run-passwd.c:534
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "新的密碼並未包含足夠的不同字元"
 
-#: panels/user-accounts/run-passwd.c:536
+#: panels/user-accounts/run-passwd.c:538
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: panels/user-accounts/user-utils.c:427
-#| msgid ""
-#| "The username should only consist of upper and lower case letters from a-"
-#| "z, digits and the following characters: . - _"
-msgid ""
-"The username should usually only consist of lower case letters from a-z, "
-"digits and the following characters: - _"
-msgstr "使用者名稱通常只能有小寫英文字母 a 到 z、數字與下述字元:「-」、「_」。"
-
-#: panels/user-accounts/user-utils.c:431
-msgid "Sorry, that user name isn’t available. Please try another."
-msgstr "抱歉,使用者名稱無法使用。請嘗試另一個。"
-
-#: panels/user-accounts/user-utils.c:476
-msgid "The username is too long."
-msgstr "使用者名稱太長。"
-
-#: panels/user-accounts/user-utils.c:526
-msgid "This will be used to name your home folder and can’t be changed."
-msgstr "這會成為您家目錄資料夾的名稱,並且不能被改變。"
-
 #: panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -7606,11 +7720,30 @@ msgstr "選擇手指"
 msgid "Enrolling fingerprints"
 msgstr "登記指紋"
 
+#: panels/user-accounts/user-utils.c:439
+msgid ""
+"The username should usually only consist of lower case letters from a-z, "
+"digits and the following characters: - _"
+msgstr ""
+"使用者名稱通常只能有小寫英文字母 a 到 z、數字與下述字元:「-」、「_」。"
+
+#: panels/user-accounts/user-utils.c:443
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr "抱歉,使用者名稱無法使用。請嘗試另一個。"
+
+#: panels/user-accounts/user-utils.c:488
+msgid "The username is too long."
+msgstr "使用者名稱太長。"
+
+#: panels/user-accounts/user-utils.c:550
+msgid "This will be used to name your home folder and can’t be changed."
+msgstr "這會成為您家目錄資料夾的名稱,並且不能被改變。"
+
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "對應按鈕"
 
-#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:519
 #: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "關閉(_C)"
@@ -7637,7 +7770,7 @@ msgstr "請點一下出現在螢幕上的目標標記來校準繪圖板。"
 msgid "Mis-click detected, restarting…"
 msgstr "偵測到誤點,重新開始…"
 
-#: panels/wacom/cc-wacom-button-row.c:253
+#: panels/wacom/cc-wacom-button-row.c:249
 #, c-format
 msgid "Button %d"
 msgstr "按鈕 %d"
@@ -7662,17 +7795,17 @@ msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "顯示螢幕求助"
 
-#: panels/wacom/cc-wacom-mapping-panel.c:256
+#: panels/wacom/cc-wacom-mapping-panel.c:249
 msgid "Output:"
 msgstr "輸出:"
 
 #. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:268
+#: panels/wacom/cc-wacom-mapping-panel.c:261
 msgid "Keep aspect ratio (letterbox):"
 msgstr "保持長寬比:"
 
 #. Whole-desktop checkbox
-#: panels/wacom/cc-wacom-mapping-panel.c:279
+#: panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Map to single monitor"
 msgstr "映射到單一螢幕"
 
@@ -7681,15 +7814,15 @@ msgstr "映射到單一螢幕"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: panels/wacom/cc-wacom-page.c:530
+#: panels/wacom/cc-wacom-page.c:516
 msgid "Display Mapping"
 msgstr "顯示對應"
 
-#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119
+#: panels/wacom/cc-wacom-panel.c:812 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "觸控筆"
 
-#: panels/wacom/cc-wacom-stylus-page.c:355
+#: panels/wacom/cc-wacom-stylus-page.c:360
 msgid "Button"
 msgstr "按鈕"
 
@@ -7744,6 +7877,7 @@ msgid "Left-Handed Orientation"
 msgstr "左手方向"
 
 #: panels/wacom/gnome-wacom-properties.ui:296
+#: panels/wacom/gnome-wacom-properties.ui:401
 msgid "Map to Monitor…"
 msgstr "對應至顯示器..."
 
@@ -7763,6 +7897,10 @@ msgstr "調整滑鼠設定值"
 msgid "Adjust display resolution"
 msgstr "調整顯示解析度"
 
+#: panels/wacom/gnome-wacom-properties.ui:376
+msgid "Decouple Display"
+msgstr "去耦顯示器"
+
 #: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "新增快捷鍵…"
@@ -7779,10 +7917,6 @@ msgstr "滑鼠中鍵點擊"
 msgid "Right Mouse Button Click"
 msgstr "滑鼠右鍵點擊"
 
-#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:242
-msgid "Back"
-msgstr "上一頁"
-
 #: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "下一頁"
@@ -7799,37 +7933,35 @@ msgstr "請讓您的觸控筆靠近繪圖板來設定"
 msgid "Eraser Pressure Feel"
 msgstr "橡皮擦壓力感應"
 
-#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:341
 msgid "Soft"
 msgstr "輕"
 
-#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
+#: panels/wacom/wacom-stylus-page.ui:211 panels/wacom/wacom-stylus-page.ui:372
 msgid "Firm"
 msgstr "重"
 
-#: panels/wacom/wacom-stylus-page.ui:233
+#: panels/wacom/wacom-stylus-page.ui:234
 msgid "Top Button"
 msgstr "頂端按鈕"
 
-#: panels/wacom/wacom-stylus-page.ui:262
+#: panels/wacom/wacom-stylus-page.ui:263
 msgid "Lower Button"
 msgstr "較低的按鈕"
 
-#: panels/wacom/wacom-stylus-page.ui:291
+#: panels/wacom/wacom-stylus-page.ui:292
 msgid "Lowest Button"
 msgstr "最低的按鈕"
 
-#: panels/wacom/wacom-stylus-page.ui:320
+#: panels/wacom/wacom-stylus-page.ui:321
 msgid "Tip Pressure Feel"
 msgstr "點選壓力感應"
 
 #: shell/appdata/gnome-control-center.appdata.xml.in:7
-#| msgid "- Settings"
 msgid "GNOME Settings"
 msgstr "GNOME 設定"
 
 #: shell/appdata/gnome-control-center.appdata.xml.in:8
-#| msgid "Utilities to configure the GNOME desktop"
 msgid "Utility to configure the GNOME desktop"
 msgstr "設定 GNOME 桌面的工具程式"
 
@@ -7865,24 +7997,27 @@ msgstr "要顯示的面板"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[面板] [引數…]"
 
-#: shell/cc-panel-loader.c:279
+#: shell/cc-panel-list.ui:45 shell/cc-window.c:277
+msgid "Privacy"
+msgstr "隱私"
+
+#: shell/cc-panel-loader.c:292
 msgid "Available panels:"
 msgstr "可用的面板:"
 
-#: shell/cc-window.ui:147
+#: shell/cc-window.ui:140
 msgid "All Settings"
 msgstr "所有設定值"
 
-#: shell/cc-window.ui:185
-#| msgid "Primary"
+#: shell/cc-window.ui:178
 msgid "Primary Menu"
 msgstr "主選單"
 
-#: shell/cc-window.ui:332
+#: shell/cc-window.ui:319
 msgid "Warning: Development Version"
 msgstr "警告:開發版本"
 
-#: shell/cc-window.ui:333
+#: shell/cc-window.ui:320
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7891,7 +8026,7 @@ msgstr ""
 "這版本的設定應只作為開發目的。你可能會遇到不正常的系統行為、資料遺失與其他無"
 "法預測的問題。"
 
-#: shell/cc-window.ui:344
+#: shell/cc-window.ui:331
 msgid "Help"
 msgstr "求助"
 
@@ -7971,6 +8106,256 @@ msgstr[0] "%u 輸入"
 msgid "System Sounds"
 msgstr "系統音效"
 
+#~ msgid "Version %s"
+#~ msgstr "版本 %s"
+
+#~ msgid "OS name"
+#~ msgstr "作業系統名稱"
+
+#~ msgid "OS type"
+#~ msgstr "作業系統類型"
+
+#~ msgid "Disk"
+#~ msgstr "磁碟"
+
+#~ msgid "Check for updates"
+#~ msgstr "檢查更新"
+
+#~ msgid "Network proxy"
+#~ msgstr "網路代理伺服器"
+
+#~ msgid "page 1"
+#~ msgstr "頁 1"
+
+#~ msgid "Inner _authentication"
+#~ msgstr "內部核對(_A)"
+
+#~ msgid "page 2"
+#~ msgstr "頁 2"
+
+#~| msgid "Restrict background data usage"
+#~ msgid "Restrict _background data usage"
+#~ msgstr "限制背景資料用量(_B)"
+
+#~ msgid "Appropriate for connections that have data charges or limits."
+#~ msgstr "適合數據需收費或有流量限制的連線使用。"
+
+#~ msgid "Twisted Pair (TP)"
+#~ msgstr "雙絞線 (TP)"
+
+#~ msgid "Attachment Unit Interface (AUI)"
+#~ msgstr "附加單位介面 (AUI)"
+
+#~ msgid "BNC"
+#~ msgstr "BNC"
+
+#~ msgid "Media Independent Interface (MII)"
+#~ msgstr "媒體獨立介面 (MII)"
+
+#~ msgid "10 Mb/s"
+#~ msgstr "10 Mb/s"
+
+#~ msgid "100 Mb/s"
+#~ msgstr "100 Mb/s"
+
+#~ msgid "1 Gb/s"
+#~ msgstr "1 Gb/s"
+
+#~ msgid "10 Gb/s"
+#~ msgstr "10 Gb/s"
+
+#~ msgid ""
+#~ "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+#~ msgstr "切換無線網路熱點會讓您從 <b>%s</b> 斷線。"
+
+#~ msgid ""
+#~ "It is not possible to access the Internet through your wireless while the "
+#~ "hotspot is active."
+#~ msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。"
+
+#~ msgid ""
+#~ "Wi-Fi hotspots are usually used to share an additional Internet "
+#~ "connection over Wi-Fi."
+#~ msgstr "Wi-Fi 熱點常用於透過 Wi-Fi 分享額外網際網路連線。"
+
+#~ msgid "Automatic _Connect"
+#~ msgstr "自動連線(_C)"
+
+#~ msgid "details"
+#~ msgstr "詳細資料"
+
+#~ msgid "Show P_assword"
+#~ msgstr "顯示密碼(_A)"
+
+#~ msgid "Make available to other users"
+#~ msgstr "允許其他使用者使用"
+
+#~ msgid "identity"
+#~ msgstr "身分"
+
+#~ msgid "IPv_4"
+#~ msgstr "IPv_4"
+
+#~ msgid "_Addresses"
+#~ msgstr "位址(_A)"
+
+#~ msgid "Automatic (DHCP) addresses only"
+#~ msgstr "只用自動 (DHCP) 位址"
+
+#~ msgid "Link-local only"
+#~ msgstr "只有本機連線"
+
+#~ msgid "_Ignore automatically obtained routes"
+#~ msgstr "忽略自動獲得的路由(_I)"
+
+#~ msgid "ipv4"
+#~ msgstr "ipv4"
+
+#~ msgid "IPv_6"
+#~ msgstr "IPv_6"
+
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
+
+#~ msgid "_Cloned MAC Address"
+#~ msgstr "複製的 MA_C 位址"
+
+#~ msgid "_Reset"
+#~ msgstr "重設(_R)"
+
+#~ msgid ""
+#~ "Reset the settings for this connection to their defaults, but remember as "
+#~ "a preferred connection."
+#~ msgstr "重設這個網路的設定值為預設值,但將它記住為偏好的網路。"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect to it."
+#~ msgstr "移除這個網路的所有相關詳細資料並且不再嘗試自動連線。"
+
+#~ msgid "Hardware"
+#~ msgstr "硬體"
+
+#~ msgctxt "tab"
+#~ msgid "Reset"
+#~ msgstr "重設"
+
+#~ msgid "Connected Devices"
+#~ msgstr "已連線的裝置"
+
+#~ msgid "Ad-hoc"
+#~ msgstr "Ad-hoc"
+
+#~ msgid "Infrastructure"
+#~ msgstr "基礎架構"
+
+#~ msgid "Not connected"
+#~ msgstr "未連線"
+
+#~ msgid "In use"
+#~ msgstr "使用中"
+
+#~ msgctxt "Location services status"
+#~ msgid "On"
+#~ msgstr "開"
+
+#~ msgctxt "Location services status"
+#~ msgid "Off"
+#~ msgstr "關"
+
+#~| msgid "Off"
+#~ msgctxt "Camera status"
+#~ msgid "Off"
+#~ msgstr "關閉"
+
+#~| msgid "On"
+#~ msgctxt "Camera status"
+#~ msgid "On"
+#~ msgstr "開啟"
+
+#~| msgid "Off"
+#~ msgctxt "Microphone status"
+#~ msgid "Off"
+#~ msgstr "關閉"
+
+#~| msgid "On"
+#~ msgctxt "Microphone status"
+#~ msgid "On"
+#~ msgstr "開啟"
+
+#~ msgid "Usage & History"
+#~ msgstr "使用與歷史紀錄"
+
+#~ msgid "Privacy Policy"
+#~ msgstr "隱私權原則"
+
+#~ msgid ""
+#~ "Remembering your history makes things easier to find again. These items "
+#~ "are never shared over the network."
+#~ msgstr ""
+#~ "記住您的歷史紀錄會讓需要再次找到某樣東西時更簡單。這些項目永遠不會透過網路"
+#~ "分享出去。"
+
+#~ msgid "_Recently Used"
+#~ msgstr "最近使用(_R)"
+
+#~ msgid "Retain _History"
+#~ msgstr "保留歷史紀錄(_H)"
+
+#~ msgid "The Screen Lock protects your privacy when you are away."
+#~ msgstr "螢幕鎖可以在您離開時保護您的隱私。"
+
+#~ msgid "Lock screen _after blank for"
+#~ msgstr "螢幕轉黑後多久鎖定螢幕(_A)"
+
+#~| msgid "_Lock Screen Notifications"
+#~ msgid "Lock Screen _Notifications"
+#~ msgstr "鎖定畫面通知(_N)"
+
+#~ msgid ""
+#~ "Automatically purge the Trash and temporary files to help keep your "
+#~ "computer free of unnecessary sensitive information."
+#~ msgstr "自動清除垃圾桶和暫存檔案可以保護您的電腦減少不必要的敏感資訊。"
+
+#~ msgid "Purge _After"
+#~ msgstr "清除於(_A)"
+
+#~ msgid ""
+#~ "Sending us information about which software you use helps us provide you "
+#~ "with more accurate recommendations. It also helps us to improve our "
+#~ "software.\n"
+#~ "\n"
+#~ "All the information we collect is made anonymous, and we will never share "
+#~ "your data with third parties."
+#~ msgstr ""
+#~ "傳送您所使用軟體的資訊給我們能幫助我們提供您更準確的建議。它也能協助我們改"
+#~ "進我們的軟體。\n"
+#~ "\n"
+#~ "我們所收集的所有資訊都是匿名的,而且我們永遠不會將您的資料與任何第三方分"
+#~ "享。"
+
+#~ msgid "_Send software usage statistics"
+#~ msgstr "傳送軟體使用率統計(_S)"
+
+#~| msgid "%s Camera"
+#~ msgid "_Camera"
+#~ msgstr "相機(_C)"
+
+#~ msgid "_Microphone"
+#~ msgstr "麥克風(_M)"
+
+#~ msgid "_Location Services"
+#~ msgstr "位置服務(_L)"
+
+#~ msgid "Protect your personal information and control what others might see"
+#~ msgstr "保護您的個人資訊並控制其他人能看到什麼"
+
+#~ msgid "No regions found"
+#~ msgstr "找不到區域"
+
+#~ msgid "Flash the _window title"
+#~ msgstr "閃動視窗標題(_W)"
+
 #~ msgid "_Background"
 #~ msgstr "背景(_B)"
 
@@ -8031,9 +8416,6 @@ msgstr "系統音效"
 #~ msgid "preferences-system-time"
 #~ msgstr "preferences-system-time"
 
-#~ msgid "Primary Display"
-#~ msgstr "主要顯示器"
-
 #~ msgid "_Night Light"
 #~ msgstr "夜光(_N)"
 
@@ -8094,9 +8476,6 @@ msgstr "系統音效"
 #~ msgid "preferences-system-privacy"
 #~ msgstr "preferences-system-privacy"
 
-#~ msgid "Show _Notifications"
-#~ msgstr "顯示通知(_N)"
-
 #~ msgid "preferences-desktop-locale"
 #~ msgstr "preferences-desktop-locale"
 
@@ -8130,9 +8509,6 @@ msgstr "系統音效"
 #~ msgid "Move input source down"
 #~ msgstr "將輸入來源往下移"
 
-#~ msgid "Configure input source"
-#~ msgstr "設定輸入來源"
-
 #~ msgid "Show input source keyboard layout"
 #~ msgstr "顯示輸入來源鍵盤配置"
 
@@ -8201,9 +8577,6 @@ msgstr "系統音效"
 #~ msgid "Sound Effects"
 #~ msgstr "聲音效果"
 
-#~ msgid "No application is currently playing or recording audio."
-#~ msgstr "沒有應用程式目前正在播放或錄製音效。"
-
 #~ msgid "Built-in"
 #~ msgstr "內建"
 
@@ -8454,9 +8827,6 @@ msgstr "系統音效"
 #~ "如果您有無線網路以外的方式連線到網際網路,您可以使用它來與其他人分享您的網"
 #~ "際網路連線。"
 
-#~ msgid "History"
-#~ msgstr "歷史紀錄"
-
 #~ msgid "Proxy"
 #~ msgstr "代理伺服器"
 
@@ -8622,9 +8992,6 @@ msgstr "系統音效"
 #~ msgid "Other Accounts"
 #~ msgstr "其他帳號"
 
-#~ msgid "Wayland"
-#~ msgstr "Wayland"
-
 #~ msgid "Add a New Printer"
 #~ msgstr "加入新的印表機"
 
@@ -8989,9 +9356,6 @@ msgstr "系統音效"
 #~ msgid "Bluetooth is disabled by hardware switch"
 #~ msgstr "藍牙已被硬體開關停用"
 
-#~ msgid "Security key"
-#~ msgstr "安全金鑰"
-
 #~ msgid "Wireless devices require extra power"
 #~ msgstr "無線裝置需要額外電源"
 
@@ -9101,9 +9465,6 @@ msgstr "系統音效"
 #~ msgid "Paired"
 #~ msgstr "已配對"
 
-#~ msgid "Type"
-#~ msgstr "類型"
-
 #~ msgid "Mouse & Touchpad Settings"
 #~ msgstr "滑鼠與觸控板設定值"
 
@@ -9215,9 +9576,6 @@ msgstr "系統音效"
 #~ msgid "Photograph"
 #~ msgstr "相片"
 
-#~ msgid "Account Information"
-#~ msgstr "帳號資訊"
-
 #~ msgid "Switch between AM and PM."
 #~ msgstr "在上午與下午之間切換。"
 
@@ -9292,9 +9650,6 @@ msgstr "系統音效"
 #~ msgid "Note: may limit resolution options"
 #~ msgstr "注意:可能會限制解析度選項"
 
-#~ msgid "_Detect Displays"
-#~ msgstr "偵測顯示器(_D)"
-
 #~ msgid "Hidden"
 #~ msgstr "隱藏"
 
@@ -9354,21 +9709,9 @@ msgstr "系統音效"
 #~ msgid "Left Shift"
 #~ msgstr "左 Shift"
 
-#~ msgid "Left Alt"
-#~ msgstr "左 Alt"
-
-#~ msgid "Left Ctrl"
-#~ msgstr "左 Ctrl"
-
 #~ msgid "Right Shift"
 #~ msgstr "右 Shift"
 
-#~ msgid "Right Alt"
-#~ msgstr "右 Alt"
-
-#~ msgid "Right Ctrl"
-#~ msgstr "右 Ctrl"
-
 #~ msgid "Left Alt+Shift"
 #~ msgstr "左 Alt+Shift"
 
@@ -9529,9 +9872,6 @@ msgstr "系統音效"
 #~ msgid "Enable this account"
 #~ msgstr "啟用這個帳號"
 
-#~ msgid "Generate a password"
-#~ msgstr "產生密碼"
-
 #~ msgid "_Action"
 #~ msgstr "動作(_A)"
 
@@ -9644,9 +9984,6 @@ msgstr "系統音效"
 #~ msgid "_Log In"
 #~ msgstr "登入(_L)"
 
-#~ msgid "Change the background"
-#~ msgstr "更改背景"
-
 #~ msgctxt "Power"
 #~ msgid "Bluetooth"
 #~ msgstr "藍牙"
@@ -9669,21 +10006,12 @@ msgstr "系統音效"
 #~ msgid "Date and Time preferences panel"
 #~ msgstr "日期和時刻偏好設定面板"
 
-#~ msgid "System Information"
-#~ msgstr "系統資訊"
-
-#~ msgid "Change keyboard settings"
-#~ msgstr "改變鍵盤設定值"
-
 #~ msgid "Layout Settings"
 #~ msgstr "配置設定值"
 
 #~ msgid "Set your mouse and touchpad preferences"
 #~ msgstr "設定您的滑鼠與觸控板偏好設定"
 
-#~ msgid "Network settings"
-#~ msgstr "網路設定值"
-
 #~ msgid "Carrier/link changed"
 #~ msgstr "載體/連結已變更"
 



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