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



commit aa14031bc555dcce6ceab76a3c25bcb9146ff65f
Author: Yi-Jyun Pan <pan93412 gmail com>
Date:   Wed Nov 27 16:07:32 2019 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 5527 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 3062 insertions(+), 2465 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1e2463a96..893d3d296 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,161 +1,455 @@
 # Chinese (Taiwan) translation of gnome-control-center.
 # Copyright (C) 1999, 2001-07 Free Software Foundation, Inc.
 # GNOME 1.x:
+# GNOME 2.x:
+#
 # S.J. Luo <crystal mickey ee nctu edu tw>, 1999.
 # Abel Cheung <abel oaka org>, 2001-2002.
-# GNOME 2.x:
 # Abel Cheung <abel oaka org>, 2001-2003, 2005.
 # Woodman Tuen <wmtuen gmail com>, 2004-07.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2010.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
-#
+# pan93412 <pan93412 gmail com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.91\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
-"issues\n"
-"POT-Creation-Date: 2018-08-12 10:19+0000\n"
-"PO-Revision-Date: 2018-08-21 23:59+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
-"Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\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"
+"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: Poedit 2.1.1\n"
-
-#: panels/background/background.ui:49
-msgid "_Background"
-msgstr "背景(_B)"
-
-#. This refers to a slideshow background
-#: panels/background/background.ui:99 panels/background/background.ui:212
-msgid "Changes throughout the day"
-msgstr "整天的變更"
-
-#. To translators: This is a noun, not a verb
-#: panels/background/background.ui:162
-msgid "_Lock Screen"
-msgstr "鎖定畫面(_L)"
-
-#: panels/background/background.ui:268
-msgctxt "background, style"
-msgid "Tile"
-msgstr "鋪排"
-
-#: panels/background/background.ui:272
-msgctxt "background, style"
-msgid "Zoom"
-msgstr "縮放"
+"X-Generator: Lokalize 19.11.80\n"
+
+#: panels/applications/cc-applications-panel.c:561
+#| msgid "System Sounds"
+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"
+msgid "Full access"
+msgstr "完整存取權限"
+
+#: panels/applications/cc-applications-panel.c:563
+#| msgid "Session Ended"
+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
+msgid "Devices"
+msgstr "裝置"
 
-#: panels/background/background.ui:276
-msgctxt "background, style"
-msgid "Center"
-msgstr "置中"
+#: panels/applications/cc-applications-panel.c:568
+msgid "Full access to /dev"
+msgstr "完整 /dev 存取權限"
 
-#: panels/background/background.ui:280
-msgctxt "background, style"
-msgid "Scale"
-msgstr "縮放"
+#: panels/applications/cc-applications-panel.c:573
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
+msgstr "網路"
+
+#: panels/applications/cc-applications-panel.c:573
+#| msgid "Network Name"
+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
+msgid "Home"
+msgstr "家"
 
-#: panels/background/background.ui:284
-msgctxt "background, style"
-msgid "Fill"
-msgstr "填滿"
+#: panels/applications/cc-applications-panel.c:581
+#: panels/applications/cc-applications-panel.c:586
+#| msgctxt "printer state"
+#| msgid "Ready"
+msgid "Read-only"
+msgstr "唯讀"
+
+#: panels/applications/cc-applications-panel.c:584
+#: panels/applications/cc-applications-panel.c:586
+#| msgid "Open System"
+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
+#: shell/gnome-control-center.desktop.in.in:3
+msgid "Settings"
+msgstr "設定值"
 
-#: panels/background/background.ui:288
-msgctxt "background, style"
-msgid "Span"
-msgstr "合併"
+#: panels/applications/cc-applications-panel.c:591
+#| msgid "Search settings"
+msgid "Can change settings"
+msgstr "可以變更設定"
 
-#: panels/background/cc-background-chooser-dialog.c:424
-msgid "Wallpapers"
-msgstr "桌布"
+#: panels/applications/cc-applications-panel.c:596
+#, 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 內建了以下權限。這些無法變更。如果你很關心這些權限,請考慮移除此應用程式。"
 
-#: panels/background/cc-background-chooser-dialog.c:433
-msgid "Colors"
-msgstr "顏色"
+#: panels/applications/cc-applications-panel.c:738
+msgid "Web Links"
+msgstr "網頁連結"
 
-#. translators: This is the title of the wallpaper chooser dialog.
-#: panels/background/cc-background-chooser-dialog.c:468
-msgid "Select Background"
-msgstr "選擇背景"
-
-#: panels/background/cc-background-chooser-dialog.c:496
-msgid "Pictures"
-msgstr "影像"
-
-#. translators: No pictures were found
-#: panels/background/cc-background-chooser-dialog.c:528
-msgid "No Pictures Found"
-msgstr "找不到影像"
-
-#. translators: "Home" is used in place of the Pictures
-#. * directory in the string below when XDG_PICTURES_DIR is
-#. * undefined
-#: panels/background/cc-background-chooser-dialog.c:545
-#: panels/search/cc-search-locations-dialog.c:286
-msgid "Home"
-msgstr "家"
+#: panels/applications/cc-applications-panel.c:748
+msgid "Git Links"
+msgstr "Git 連結"
 
-#. translators: %s here is the name of the Pictures directory, the string should be translated in
-#. * the context "You can add images to your Pictures folder and they will show up here"
-#: panels/background/cc-background-chooser-dialog.c:555
+#: panels/applications/cc-applications-panel.c:754
 #, c-format
-msgid "You can add images to your %s folder and they will show up here"
-msgstr "您可以將影像加入您的%s資料夾,它們會顯示在這裡"
-
-#: panels/background/cc-background-chooser-dialog.c:560
-#: panels/color/cc-color-panel.c:240 panels/color/cc-color-panel.c:893
-#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
-#: panels/common/cc-language-chooser.ui:22
-#: panels/display/cc-display-panel.c:1901
-#: panels/network/connection-editor/connection-editor.ui:15
+msgid "%s Links"
+msgstr "%s 連結"
+
+#: panels/applications/cc-applications-panel.c:762
+#: panels/applications/cc-applications-panel.c:798
+msgid "Unset"
+msgstr "取消設定"
+
+#: panels/applications/cc-applications-panel.c:853
+#| msgid "Link speed"
+msgid "Links"
+msgstr "連結"
+
+#: panels/applications/cc-applications-panel.c:861
+#| msgid "_Delete Files"
+msgid "Hypertext Files"
+msgstr "超文字檔案"
+
+#: panels/applications/cc-applications-panel.c:875
+#| msgid "_Delete Files"
+msgid "Text Files"
+msgstr "文字檔案"
+
+#: panels/applications/cc-applications-panel.c:889
+#| msgid "_Keep Files"
+msgid "Image Files"
+msgstr "圖片檔案"
+
+#: panels/applications/cc-applications-panel.c:905
+#| msgid "_Delete Files"
+msgid "Font Files"
+msgstr "字型檔案"
+
+#: panels/applications/cc-applications-panel.c:966
+msgid "Archive Files"
+msgstr "封存檔案"
+
+#: panels/applications/cc-applications-panel.c:986
+msgid "Package Files"
+msgstr "軟體包檔案"
+
+#: panels/applications/cc-applications-panel.c:1009
+#| msgid "All files"
+msgid "Audio Files"
+msgstr "音訊檔案"
+
+#: panels/applications/cc-applications-panel.c:1026
+#| msgid "_Keep Files"
+msgid "Video Files"
+msgstr "視訊檔案"
+
+#: panels/applications/cc-applications-panel.c:1034
+#| msgid "_Delete Files"
+msgid "Other Files"
+msgstr "其他檔案"
+
+#. List of applications.
+#: panels/applications/cc-applications-panel.c:1376
+#: panels/applications/cc-applications-panel.ui:406
+#: 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 "安裝一些…"
+
+#: panels/applications/cc-applications-panel.ui:99
+msgid "Permissions & Access"
+msgstr "權限及存取"
+
+#: panels/applications/cc-applications-panel.ui:111
+msgid ""
+"Data and services that this app has asked for access to and permissions that "
+"it requires."
+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"
+msgid "Camera"
+msgstr "相機"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
+#. translators:
+#. * The device has been disabled
+#: panels/applications/cc-applications-panel.ui:133
+#: 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/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/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1876
+msgid "Disabled"
+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
+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
+msgid "Location Services"
+msgstr "位置服務"
+
+#: panels/applications/cc-applications-panel.ui:162
+#: panels/applications/cc-applications-panel.ui:489
+#| msgid "Built-in Webcam"
+msgid "Built-in Permissions"
+msgstr "內建權限"
+
+#: panels/applications/cc-applications-panel.ui:163
+#| msgid "Password could not be changed"
+msgid "Cannot be changed"
+msgstr "不能變更"
+
+#: panels/applications/cc-applications-panel.ui:180
+msgid ""
+"Individual permissions for applications can be reviewed in the <a href="
+"\"privacy\">Privacy</a> Settings."
+msgstr "應用程式的獨立權限可以在<a href=\"privacy\">隱私</a>設定中復閱。"
+
+#: panels/applications/cc-applications-panel.ui:204
+#| msgid "Orientation"
+msgid "Integration"
+msgstr "整合"
+
+#: panels/applications/cc-applications-panel.ui:216
+msgid "System features used by this application."
+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
+msgid "Search"
+msgstr "搜尋"
+
+#: panels/applications/cc-applications-panel.ui:242
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
+msgstr "通知"
+
+#: panels/applications/cc-applications-panel.ui:248
+#: panels/applications/cc-applications-panel.ui:254
+#| msgid "Sound"
+msgid "Sounds"
+msgstr "音效"
+
+#: panels/applications/cc-applications-panel.ui:287
+#| msgid "_Default printer"
+msgid "Default Handlers"
+msgstr "預設處理器"
+
+#: panels/applications/cc-applications-panel.ui:299
+msgid "Types of files and links that this application opens."
+msgstr "此應用程式開啟的檔案及連結類型。"
+
+#: panels/applications/cc-applications-panel.ui:315
+msgid "Reset"
+msgstr "重設"
+
+#: panels/applications/cc-applications-panel.ui:351
+msgid "Usage"
+msgstr "用量"
+
+#: panels/applications/cc-applications-panel.ui:363
+msgid "How much resources this application is using."
+msgstr "應用程式用了多少資源。"
+
+#: panels/applications/cc-applications-panel.ui:378
+#: panels/applications/cc-applications-panel.ui:525
+msgid "Storage"
+msgstr "儲存空間"
+
+#: panels/applications/cc-applications-panel.ui:413
+#| msgid "_Software"
+msgid "Open in Software"
+msgstr "在《軟體》中開啟"
+
+#: panels/applications/cc-applications-panel.ui:463 shell/cc-panel-list.ui:190
+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
+msgid "Try a different search"
+msgstr "嘗試不同的搜尋內容"
+
+#: panels/applications/cc-applications-panel.ui:542
+msgid ""
+"How much disk space this application is occupying with app data and caches."
+msgstr "此應用程式的應用程式資料及快取所佔用的磁碟空間。"
+
+#: panels/applications/cc-applications-panel.ui:551
+#| msgid "Applications"
+msgid "Application"
+msgstr "應用程式"
+
+#: panels/applications/cc-applications-panel.ui:557
+msgid "Data"
+msgstr "資料"
+
+#: panels/applications/cc-applications-panel.ui:563
+msgid "Cache"
+msgstr "快取"
+
+#: panels/applications/cc-applications-panel.ui:569
+msgid "<b>Total</b>"
+msgstr "<b>總計</b>"
+
+#: panels/applications/cc-applications-panel.ui:586
+msgid "Clear Cache…"
+msgstr "清除快取…"
+
+#: panels/applications/gnome-applications-panel.desktop.in.in:4
+msgid "Control various application permissions and settings"
+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/applications/gnome-applications-panel.desktop.in.in:16
+msgid "application;flatpak;permission;setting;"
+msgstr ""
+"application;flatpak;permission;setting;"
+"應用程式;權限;應用;設定;設置;"
+
+#: panels/background/cc-background-chooser.c:348
+#| msgid "Select an input source"
+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/common/cc-language-chooser.ui:24
+#: panels/display/cc-display-panel.c:950
+#: 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:1411 panels/network/net-device-wifi.c:1491
-#: panels/network/net-device-wifi.c:1736 panels/network/network-wifi.ui:24
+#: 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/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:330
-#: panels/privacy/cc-privacy-panel.c:1049 panels/region/cc-format-chooser.ui:24
-#: panels/region/input-chooser.ui:13
-#: panels/search/cc-search-locations-dialog.c:603
-#: panels/sharing/cc-sharing-panel.c:426
-#: panels/user-accounts/data/account-dialog.ui:28
+#: 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/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/data/join-dialog.ui:20
-#: panels/user-accounts/data/password-dialog.ui:21
 #: panels/user-accounts/um-fingerprint-dialog.c:261
-#: panels/user-accounts/um-photo-dialog.c:103
-#: panels/user-accounts/um-photo-dialog.c:230
-#: panels/user-accounts/um-user-panel.c:631
-#: panels/user-accounts/um-user-panel.c:649
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: panels/background/cc-background-chooser-dialog.c:561
-msgid "_Select"
-msgstr "選取(_S)"
+#: panels/background/cc-background-chooser.c:352
+#: panels/network/connection-editor/vpn-helpers.c:182
+#: panels/printers/pp-details-dialog.c:314
+#: 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-item.c:191
+#: 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 "移除背景"
+
+#: panels/background/cc-background-item.c:140
 msgid "multiple sizes"
 msgstr "多重尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: panels/background/cc-background-item.c:195
+#: panels/background/cc-background-item.c:144
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: panels/background/cc-background-item.c:320
+#: panels/background/cc-background-item.c:278
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: panels/background/cc-background-panel.c:291
+#: panels/background/cc-background-panel.c:145
 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 "活動"
+
 #: panels/background/gnome-background-panel.desktop.in.in:3
 msgid "Background"
 msgstr "背景"
@@ -164,56 +458,50 @@ msgstr "背景"
 msgid "Change your background image to a wallpaper or photo"
 msgstr "將您的背景影像變更為桌布或相片"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/background/gnome-background-panel.desktop.in.in:7
-msgid "preferences-desktop-wallpaper"
-msgstr "preferences-desktop-wallpaper"
-
 #. Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/background/gnome-background-panel.desktop.in.in:15
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:266
-msgid "Turn Off Airplane Mode"
-msgstr "關閉飛安模式"
-
-#: panels/bluetooth/cc-bluetooth-panel.c:329
+#: panels/bluetooth/cc-bluetooth-panel.c:309
 msgid "No Bluetooth Found"
 msgstr "找不到藍牙"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:329
+#: panels/bluetooth/cc-bluetooth-panel.c:310
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "插入藍牙棒以使用藍牙。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:313
 msgid "Bluetooth Turned Off"
 msgstr "藍牙已關閉"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:314
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "開啟以連接裝置與接收檔案傳輸。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:317
 msgid "Airplane Mode is on"
 msgstr "飛安模式已開啟"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:318
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "當開啟飛安模式時,將停用藍牙。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:321
 msgid "Hardware Airplane Mode is on"
 msgstr "硬體飛安模式已開啟"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:322
 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/network/cc-network-panel.ui:101
-#: panels/printers/pp-new-printer-dialog.c:1831
+#: panels/printers/pp-new-printer-dialog.c:1697
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -221,25 +509,20 @@ msgstr "藍牙"
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "開啟或關閉藍牙與連接您的裝置"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:6
-msgid "bluetooth"
-msgstr "bluetooth"
-
 #. Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:19
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;分享;藍牙;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: panels/color/cc-color-calibrate.c:350
+#: panels/color/cc-color-calibrate.c:348
 msgid "Place your calibration device over the square and press “Start”"
 msgstr "將您的校準裝置放在方塊上方,並按下「開始」"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: panels/color/cc-color-calibrate.c:356
+#: panels/color/cc-color-calibrate.c:354
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr "將您的校準裝置移到校準位置,並按下「繼續」"
@@ -247,7 +530,7 @@ msgstr "將您的校準裝置移到校準位置,並按下「繼續」"
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: panels/color/cc-color-calibrate.c:362
+#: panels/color/cc-color-calibrate.c:360
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr "將您的校準裝置移到表面位置,並按下「繼續」"
@@ -255,54 +538,54 @@ msgstr "將您的校準裝置移到表面位置,並按下「繼續」"
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: panels/color/cc-color-calibrate.c:368
+#: panels/color/cc-color-calibrate.c:366
 msgid "Shut the laptop lid"
 msgstr "關上筆記型電腦上蓋"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: panels/color/cc-color-calibrate.c:399
+#: panels/color/cc-color-calibrate.c:397
 msgid "An internal error occurred that could not be recovered."
 msgstr "發生內部的錯誤,無法復原。"
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: panels/color/cc-color-calibrate.c:404
+#: panels/color/cc-color-calibrate.c:402
 msgid "Tools required for calibration are not installed."
 msgstr "校準所需的工具尚未安裝。"
 
 #. TRANSLATORS: The profile failed for some reason
-#: panels/color/cc-color-calibrate.c:410
+#: panels/color/cc-color-calibrate.c:408
 msgid "The profile could not be generated."
 msgstr "無法產生描述檔。"
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: panels/color/cc-color-calibrate.c:416
+#: panels/color/cc-color-calibrate.c:414
 msgid "The target whitepoint was not obtainable."
 msgstr "尚無法獲取目標白點。"
 
 #. TRANSLATORS: the display calibration process is finished
-#: panels/color/cc-color-calibrate.c:455
+#: panels/color/cc-color-calibrate.c:453
 msgid "Complete!"
 msgstr "完成!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: panels/color/cc-color-calibrate.c:463
+#: panels/color/cc-color-calibrate.c:461
 msgid "Calibration failed!"
 msgstr "校準已失敗!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: panels/color/cc-color-calibrate.c:470
+#: panels/color/cc-color-calibrate.c:468
 msgid "You can remove the calibration device."
 msgstr "您可以移除校準裝置。"
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: panels/color/cc-color-calibrate.c:539
+#: panels/color/cc-color-calibrate.c:537
 msgid "Do not disturb the calibration device while in progress"
 msgstr "過程中請勿干擾校準裝置"
 
@@ -358,54 +641,54 @@ msgid "Show color profiles for %s"
 msgstr "顯示 %s 的顏色描述檔"
 
 #. not calibrated
-#: panels/color/cc-color-device.c:301
+#: panels/color/cc-color-device.c:303
 msgid "Not calibrated"
 msgstr "尚未校準"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: panels/color/cc-color-panel.c:169
+#: panels/color/cc-color-panel.c:170
 msgid "Default: "
 msgstr "預設值:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: panels/color/cc-color-panel.c:177
+#: panels/color/cc-color-panel.c:178
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: panels/color/cc-color-panel.c:184
+#: panels/color/cc-color-panel.c:185
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: panels/color/cc-color-panel.c:238
+#: panels/color/cc-color-panel.c:239
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: panels/color/cc-color-panel.c:241
+#: panels/color/cc-color-panel.c:242
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:252
+#: panels/color/cc-color-panel.c:253
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:259
+#: panels/color/cc-color-panel.c:260
 #: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "所有檔案"
 
-#: panels/color/cc-color-panel.c:554
+#: panels/color/cc-color-panel.c:555
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: panels/color/cc-color-panel.c:846
+#: panels/color/cc-color-panel.c:847
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上傳檔案失敗:%s"
@@ -413,159 +696,59 @@ msgstr "上傳檔案失敗:%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: panels/color/cc-color-panel.c:858
+#: panels/color/cc-color-panel.c:859
 msgid "The profile has been uploaded to:"
 msgstr "描述檔已經上傳到:"
 
-#: panels/color/cc-color-panel.c:860
+#: panels/color/cc-color-panel.c:861
 msgid "Write down this URL."
 msgstr "寫下這個 URL。"
 
-#: panels/color/cc-color-panel.c:861
+#: panels/color/cc-color-panel.c:862
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重新啟動這臺電腦並開機進入您一般的作業系統。"
 
-#: panels/color/cc-color-panel.c:862
+#: panels/color/cc-color-panel.c:863
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "在您的瀏覽器中輸入 URL 以下載並安裝描述檔。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: panels/color/cc-color-panel.c:890
+#: panels/color/cc-color-panel.c:891
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
-#: panels/color/cc-color-panel.c:894
+#: panels/color/cc-color-panel.c:895
 #: panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: panels/color/cc-color-panel.c:1208
+#: panels/color/cc-color-panel.c:1209
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1223 panels/color/cc-color-panel.c:1247
+#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr "尚未偵測到測量儀器。請檢查它是否已開啟並正確的連接。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1257
+#: panels/color/cc-color-panel.c:1258
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援印表機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1268
+#: panels/color/cc-color-panel.c:1269
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
-#. TRANSLATORS: standard spaces are well known colorspaces like
-#. * sRGB, AdobeRGB and ProPhotoRGB
-#: panels/color/cc-color-profile.c:100
-msgid "Standard Space"
-msgstr "標準空間"
-
-#. TRANSLATORS: test profiles do things like changing the screen
-#. * a different color, or swap the red and green channels
-#: panels/color/cc-color-profile.c:106
-msgid "Test Profile"
-msgstr "測試描述檔"
-
-#. TRANSLATORS: automatic profiles are generated automatically
-#. * by the color management system based on manufacturing data,
-#. * for instance the default monitor profile is created from the
-#. * primaries specified in the monitor EDID
-#: panels/color/cc-color-profile.c:114
-msgctxt "Automatically generated profile"
-msgid "Automatic"
-msgstr "自動"
-
-#. TRANSLATORS: the profile quality - low quality profiles take
-#. * much less time to generate but may be a poor reflection of the
-#. * device capability
-#: panels/color/cc-color-profile.c:124
-msgctxt "Profile quality"
-msgid "Low Quality"
-msgstr "低品質"
-
-#. TRANSLATORS: the profile quality
-#: panels/color/cc-color-profile.c:129
-msgctxt "Profile quality"
-msgid "Medium Quality"
-msgstr "中品質"
-
-#. TRANSLATORS: the profile quality - high quality profiles take
-#. * a *long* time, and have the best calibration and
-#. * characterisation data.
-#: panels/color/cc-color-profile.c:136
-msgctxt "Profile quality"
-msgid "High Quality"
-msgstr "高品質"
-
-#. TRANSLATORS: this default RGB space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:153
-msgctxt "Colorspace fallback"
-msgid "Default RGB"
-msgstr "預設 RGB"
-
-#. TRANSLATORS: this default CMYK space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:160
-msgctxt "Colorspace fallback"
-msgid "Default CMYK"
-msgstr "預設 CMYK"
-
-#. TRANSLATORS: this default gray space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:167
-msgctxt "Colorspace fallback"
-msgid "Default Gray"
-msgstr "預設灰階"
-
-#: panels/color/cc-color-profile.c:190
-msgid "Vendor supplied factory calibration data"
-msgstr "廠商提供的出廠校準資料"
-
-#: panels/color/cc-color-profile.c:199
-msgid "Full-screen display correction not possible with this profile"
-msgstr "這個描述檔無法使用全螢幕顯示校正"
-
-#: panels/color/cc-color-profile.c:221
-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/common/cc-language-chooser.ui:11
-#: panels/region/cc-format-chooser.ui:13
-msgid "_Done"
-msgstr "完成(_D)"
-
-#. Timeout parameters
-#. 15000 = 15 sec
-#. 750 = 0.75 sec
-#. Text printed on screen
-#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/cc-color-panel.ui:6 panels/wacom/calibrator/calibrator.ui:48
 msgid "Screen Calibration"
 msgstr "螢幕校準"
 
-#: panels/color/color.ui:23
+#: panels/color/cc-color-panel.ui:23
 msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
@@ -574,103 +757,102 @@ msgstr ""
 "校準動作會產生描述檔讓您可以用來管理螢幕的顏色。您花在校準的時間愈長,顏色描"
 "述檔的品質就愈好。"
 
-#: panels/color/color.ui:38
+#: panels/color/cc-color-panel.ui:38
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr "當校準在進行時將不能使用您的電腦。"
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:58
+#: panels/color/cc-color-panel.ui:58
 msgid "Quality"
 msgstr "品質"
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:75
+#: panels/color/cc-color-panel.ui:75
 msgid "Approximate Time"
 msgstr "大約時間"
 
-#: panels/color/color.ui:121
+#: panels/color/cc-color-panel.ui:121
 msgid "Calibration Quality"
 msgstr "校準品質"
 
-#: panels/color/color.ui:137
+#: panels/color/cc-color-panel.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "選擇您想要使用的校準偵測裝置。"
 
-#: panels/color/color.ui:174
+#: panels/color/cc-color-panel.ui:174
 msgid "Calibration Device"
 msgstr "校準裝置"
 
-#: panels/color/color.ui:189
+#: panels/color/cc-color-panel.ui:189
 msgid "Select the type of display that is connected."
 msgstr "選擇連接的顯示器類型。"
 
-#: panels/color/color.ui:226
+#: panels/color/cc-color-panel.ui:226
 msgid "Display Type"
 msgstr "顯示類型"
 
-#: panels/color/color.ui:241
+#: panels/color/cc-color-panel.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
 msgstr "選擇一個顯示目標白點。大多數顯示器應該校準到 D65 光源。"
 
-#: panels/color/color.ui:278
+#: panels/color/cc-color-panel.ui:278
 msgid "Profile Whitepoint"
 msgstr "描述檔白點"
 
-#: panels/color/color.ui:293
+#: panels/color/cc-color-panel.ui:293
 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/color.ui:307
+#: panels/color/cc-color-panel.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
 msgstr "或者,您可以使用這個裝置的其他描述檔所適用的亮度等級。"
 
-#: panels/color/color.ui:318
+#: panels/color/cc-color-panel.ui:318
 msgid "Display Brightness"
 msgstr "顯示亮度"
 
-#: panels/color/color.ui:333
+#: panels/color/cc-color-panel.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
 msgstr "您可以在不同電腦上使用顏色描述檔,或是為了不同的亮度條件建立描述檔。"
 
-#: panels/color/color.ui:348
+#: panels/color/cc-color-panel.ui:348
 msgid "Profile Name:"
 msgstr "描述檔名稱:"
 
-#: panels/color/color.ui:377
+#: panels/color/cc-color-panel.ui:377
 msgid "Profile Name"
 msgstr "描述檔名稱"
 
-#: panels/color/color.ui:392
+#: panels/color/cc-color-panel.ui:392
 msgid "Profile successfully created!"
 msgstr "描述檔製作成功!"
 
-#: panels/color/color.ui:443
+#: panels/color/cc-color-panel.ui:443
 msgid "Copy profile"
 msgstr "複製描述檔"
 
-#: panels/color/color.ui:456
+#: panels/color/cc-color-panel.ui:456
 msgid "Requires writable media"
 msgstr "需要可寫入媒體"
 
-#: panels/color/color.ui:519
+#: panels/color/cc-color-panel.ui:519
 msgid "Upload profile"
 msgstr "上傳描述檔"
 
-#: panels/color/color.ui:532
+#: panels/color/cc-color-panel.ui:532
 msgid "Requires Internet connection"
 msgstr "需要網際網路連線"
 
-#: panels/color/color.ui:591
+#: panels/color/cc-color-panel.ui:591
 msgid ""
 "You may find these instructions on how to use the profile on <a href=\"linux"
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
@@ -679,195 +861,286 @@ msgstr ""
 "您可以找到如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple OS "
 "X</a> 和 <a href=\"windows\">Microsoft Windows</a> 系統上使用描述檔的指引。"
 
-#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
+#: panels/color/cc-color-panel.ui:607
+#: panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "摘要"
 
-#: panels/color/color.ui:621
+#: panels/color/cc-color-panel.ui:621
 msgid "Add Profile"
 msgstr "加入描述檔"
 
-#: panels/color/color.ui:643
+#: panels/color/cc-color-panel.ui:643
 msgid "_Import File…"
 msgstr "載入檔案(_I)…"
 
-#: panels/color/color.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:519
-#: panels/printers/new-printer-dialog.ui:80 panels/region/input-chooser.ui:22
-#: panels/user-accounts/data/account-dialog.ui:47
+#: panels/color/cc-color-panel.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/printers/new-printer-dialog.ui:80
+#: panels/region/cc-input-chooser.ui:20
+#: panels/user-accounts/cc-add-user-dialog.ui:47
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: panels/color/color.ui:732
+#: panels/color/cc-color-panel.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 msgstr "偵測到問題。描述檔可能無法正常運作。<a href=\"\">顯示詳細資料。</a>"
 
-#: panels/color/color.ui:811
+#: panels/color/cc-color-panel.ui:790
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "每個裝置需要最新的色彩描述檔才能被管理顏色。"
 
-#: panels/color/color.ui:833
+#: panels/color/cc-color-panel.ui:812
 msgid "Learn more"
 msgstr "了解更多"
 
-#: panels/color/color.ui:838
+#: panels/color/cc-color-panel.ui:817
 msgid "Learn more about color management"
 msgstr "了解更多關於顏色管理的資訊"
 
-#: panels/color/color.ui:886
+#: panels/color/cc-color-panel.ui:865
 msgid "_Set for all users"
 msgstr "所有使用者皆可用(_S)"
 
-#: panels/color/color.ui:890 panels/color/color.ui:905
-#: panels/color/color.ui:906
+#: panels/color/cc-color-panel.ui:869 panels/color/cc-color-panel.ui:884
+#: panels/color/cc-color-panel.ui:885
 msgid "Set this profile for all users on this computer"
 msgstr "將這個描述檔給電腦上所有使用者"
 
-#: panels/color/color.ui:901
+#: panels/color/cc-color-panel.ui:880
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: panels/color/color.ui:932
+#: panels/color/cc-color-panel.ui:911
 msgid "_Add profile"
 msgstr "加入設定檔(_A)"
 
-#: panels/color/color.ui:945
+#: panels/color/cc-color-panel.ui:924
 msgid "_Calibrate…"
 msgstr "校準(_C)…"
 
-#: panels/color/color.ui:949
+#: panels/color/cc-color-panel.ui:928
 msgid "Calibrate the device"
 msgstr "校準裝置"
 
-#: panels/color/color.ui:960
+#: panels/color/cc-color-panel.ui:939
 msgid "_Remove profile"
 msgstr "移除描述檔(_R)"
 
-#: panels/color/color.ui:973
+#: panels/color/cc-color-panel.ui:952
 msgid "_View details"
 msgstr "檢視詳細資料(_V)"
 
-#: panels/color/color.ui:1009
+#: panels/color/cc-color-panel.ui:988
 msgid "Unable to detect any devices that can be color managed"
 msgstr "無法偵測到任何能被管理顏色的裝置"
 
-#: panels/color/color.ui:1053
+#: panels/color/cc-color-panel.ui:1032
 msgid "LCD"
 msgstr "LCD"
 
-#: panels/color/color.ui:1058
+#: panels/color/cc-color-panel.ui:1037
 msgid "LED"
 msgstr "LED"
 
-#: panels/color/color.ui:1063
+#: panels/color/cc-color-panel.ui:1042
 msgid "CRT"
 msgstr "CRT"
 
-#: panels/color/color.ui:1068
+#: panels/color/cc-color-panel.ui:1047
 msgid "Projector"
 msgstr "投影機"
 
-#: panels/color/color.ui:1073
+#: panels/color/cc-color-panel.ui:1052
 msgid "Plasma"
 msgstr "電漿"
 
-#: panels/color/color.ui:1078
+#: panels/color/cc-color-panel.ui:1057
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL 背光)"
 
-#: panels/color/color.ui:1083
+#: panels/color/cc-color-panel.ui:1062
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED 背光)"
 
-#: panels/color/color.ui:1088
+#: panels/color/cc-color-panel.ui:1067
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED 背光)"
 
-#: panels/color/color.ui:1093
+#: panels/color/cc-color-panel.ui:1072
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "廣色域 LCD (CCFL 背光)"
 
-#: panels/color/color.ui:1098
+#: panels/color/cc-color-panel.ui:1077
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "廣色域 LCD (RGB LED 背光)"
 
-#: panels/color/color.ui:1115
+#: panels/color/cc-color-panel.ui:1094
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: panels/color/color.ui:1116
+#: panels/color/cc-color-panel.ui:1095
 msgid "40 minutes"
 msgstr "40 分鐘"
 
-#: panels/color/color.ui:1120
+#: panels/color/cc-color-panel.ui:1099
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: panels/color/color.ui:1121 panels/power/power.ui:25
-#: panels/privacy/privacy.ui:38
+#: panels/color/cc-color-panel.ui:1100
 msgid "30 minutes"
 msgstr "30 分鐘"
 
-#: panels/color/color.ui:1125
+#: panels/color/cc-color-panel.ui:1104
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: panels/color/color.ui:1126 panels/power/power.ui:13 panels/power/power.ui:95
+#: panels/color/cc-color-panel.ui:1105
 msgid "15 minutes"
 msgstr "15 分鐘"
 
-#: panels/color/color.ui:1148
+#: panels/color/cc-color-panel.ui:1127
 msgid "Native to display"
 msgstr "原生顯示"
 
-#: panels/color/color.ui:1152
+#: panels/color/cc-color-panel.ui:1131
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (列印與出版)"
 
-#: panels/color/color.ui:1156
+#: panels/color/cc-color-panel.ui:1135
 msgid "D55"
 msgstr "D55"
 
-#: panels/color/color.ui:1160
+#: panels/color/cc-color-panel.ui:1139
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (攝影與繪圖)"
 
-#: panels/color/color.ui:1164
+#: panels/color/cc-color-panel.ui:1143
 msgid "D75"
 msgstr "D75"
 
-#: panels/color/gnome-color-panel.desktop.in.in:3
-msgid "Color"
-msgstr "顏色"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: panels/color/cc-color-profile.c:100
+msgid "Standard Space"
+msgstr "標準空間"
 
-#: panels/color/gnome-color-panel.desktop.in.in:4
-msgid ""
-"Calibrate the color of your devices, such as displays, cameras or printers"
-msgstr "校準您裝置的顏色,像是顯示器、攝影機或印表機"
+#. TRANSLATORS: test profiles do things like changing the screen
+#. * a different color, or swap the red and green channels
+#: panels/color/cc-color-profile.c:106
+msgid "Test Profile"
+msgstr "測試描述檔"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/color/gnome-color-panel.desktop.in.in:7
-msgid "preferences-color"
-msgstr "preferences-color"
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * by the color management system based on manufacturing data,
+#. * for instance the default monitor profile is created from the
+#. * primaries specified in the monitor EDID
+#: panels/color/cc-color-profile.c:114
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "自動"
 
-#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/color/gnome-color-panel.desktop.in.in:19
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr ""
-"Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;印表機;顯示"
-"器;"
+#. TRANSLATORS: the profile quality - low quality profiles take
+#. * much less time to generate but may be a poor reflection of the
+#. * device capability
+#: panels/color/cc-color-profile.c:124
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "低品質"
 
-#: panels/common/cc-common-language.c:300
-msgid "Other…"
+#. TRANSLATORS: the profile quality
+#: panels/color/cc-color-profile.c:129
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "中品質"
+
+#. TRANSLATORS: the profile quality - high quality profiles take
+#. * a *long* time, and have the best calibration and
+#. * characterisation data.
+#: panels/color/cc-color-profile.c:136
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "高品質"
+
+#. TRANSLATORS: this default RGB space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:153
+msgctxt "Colorspace fallback"
+msgid "Default RGB"
+msgstr "預設 RGB"
+
+#. TRANSLATORS: this default CMYK space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:160
+msgctxt "Colorspace fallback"
+msgid "Default CMYK"
+msgstr "預設 CMYK"
+
+#. TRANSLATORS: this default gray space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:167
+msgctxt "Colorspace fallback"
+msgid "Default Gray"
+msgstr "預設灰階"
+
+#: panels/color/cc-color-profile.c:190
+msgid "Vendor supplied factory calibration data"
+msgstr "廠商提供的出廠校準資料"
+
+#: panels/color/cc-color-profile.c:199
+msgid "Full-screen display correction not possible with this profile"
+msgstr "這個描述檔無法使用全螢幕顯示校正"
+
+#: panels/color/cc-color-profile.c:221
+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 "顏色"
+
+#: panels/color/gnome-color-panel.desktop.in.in:4
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr "校準您裝置的顏色,像是顯示器、攝影機或印表機"
+
+#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/color/gnome-color-panel.desktop.in.in:19
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr ""
+"Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;印表機;顯示"
+"器;"
+
+#: panels/common/cc-common-language.c:300
+msgid "Other…"
 msgstr "其他…"
 
-#: panels/common/cc-language-chooser.c:126
-#: panels/region/cc-format-chooser.c:261 panels/region/cc-input-chooser.c:169
+#: panels/common/cc-language-chooser.c:125
+#: panels/region/cc-format-chooser.c:296 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "更多…"
 
@@ -876,8 +1149,13 @@ msgid "No languages found"
 msgstr "找不到語言"
 
 #: panels/common/cc-language-chooser.ui:5
-msgid "Language"
-msgstr "語言"
+#| msgid "Select a language"
+msgid "Select Language"
+msgstr "選擇語言"
+
+#: panels/common/cc-language-chooser.ui:12
+msgid "_Select"
+msgstr "選取(_S)"
 
 #: panels/common/cc-util.c:127
 #: panels/network/connection-editor/ce-page-details.c:106
@@ -921,17 +1199,17 @@ msgid "Year"
 msgstr "年"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:326
+#: panels/datetime/cc-datetime-panel.c:334
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%b%e日,%p %l:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: panels/datetime/cc-datetime-panel.c:331
+#: panels/datetime/cc-datetime-panel.c:339
 msgid "%e %B %Y, %R"
 msgstr "%Y年%b%e日,%R"
 
 #. Translators: "city, country"
-#: panels/datetime/cc-datetime-panel.c:496
+#: panels/datetime/cc-datetime-panel.c:504
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -939,7 +1217,7 @@ msgstr "%s,%s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: panels/datetime/cc-datetime-panel.c:523
+#: panels/datetime/cc-datetime-panel.c:531
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -947,131 +1225,140 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: panels/datetime/cc-datetime-panel.c:530
+#: panels/datetime/cc-datetime-panel.c:538
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:535
+#: panels/datetime/cc-datetime-panel.c:543
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: panels/datetime/cc-datetime-panel.c:540
+#: panels/datetime/cc-datetime-panel.c:548
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: panels/datetime/cc-datetime-panel.c:545
+#: panels/datetime/cc-datetime-panel.c:553
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: panels/datetime/datetime.ui:22
+#: panels/datetime/cc-datetime-panel.ui:26
 msgid "January"
 msgstr "一月"
 
-#: panels/datetime/datetime.ui:25
+#: panels/datetime/cc-datetime-panel.ui:29
 msgid "February"
 msgstr "二月"
 
-#: panels/datetime/datetime.ui:28
+#: panels/datetime/cc-datetime-panel.ui:32
 msgid "March"
 msgstr "三月"
 
-#: panels/datetime/datetime.ui:31
+#: panels/datetime/cc-datetime-panel.ui:35
 msgid "April"
 msgstr "四月"
 
-#: panels/datetime/datetime.ui:34
+#: panels/datetime/cc-datetime-panel.ui:38
 msgid "May"
 msgstr "五月"
 
-#: panels/datetime/datetime.ui:37
+#: panels/datetime/cc-datetime-panel.ui:41
 msgid "June"
 msgstr "六月"
 
-#: panels/datetime/datetime.ui:40
+#: panels/datetime/cc-datetime-panel.ui:44
 msgid "July"
 msgstr "七月"
 
-#: panels/datetime/datetime.ui:43
+#: panels/datetime/cc-datetime-panel.ui:47
 msgid "August"
 msgstr "八月"
 
-#: panels/datetime/datetime.ui:46
+#: panels/datetime/cc-datetime-panel.ui:50
 msgid "September"
 msgstr "九月"
 
-#: panels/datetime/datetime.ui:49
+#: panels/datetime/cc-datetime-panel.ui:53
 msgid "October"
 msgstr "十月"
 
-#: panels/datetime/datetime.ui:52
+#: panels/datetime/cc-datetime-panel.ui:56
 msgid "November"
 msgstr "十一月"
 
-#: panels/datetime/datetime.ui:55
+#: panels/datetime/cc-datetime-panel.ui:59
 msgid "December"
 msgstr "十二月"
 
-#: panels/datetime/datetime.ui:61
+#: panels/datetime/cc-datetime-panel.ui:65
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "日期與時刻"
 
-#: panels/datetime/datetime.ui:109
+#: panels/datetime/cc-datetime-panel.ui:113
+#: panels/display/cc-night-light-page.ui:194
+#: panels/display/cc-night-light-page.ui:314
 msgid "Hour"
 msgstr "時"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: panels/datetime/datetime.ui:124
+#: panels/datetime/cc-datetime-panel.ui:128
 msgid "∶"
 msgstr "∶"
 
-#: panels/datetime/datetime.ui:148
+#: panels/datetime/cc-datetime-panel.ui:152
+#: panels/display/cc-night-light-page.ui:222
+#: panels/display/cc-night-light-page.ui:342
 msgid "Minute"
 msgstr "分"
 
-#: panels/datetime/datetime.ui:215
+#: panels/datetime/cc-datetime-panel.ui:219
 msgid "Time Zone"
 msgstr "時區"
 
-#: panels/datetime/datetime.ui:236
+#: panels/datetime/cc-datetime-panel.ui:240
 msgid "Search for a city"
 msgstr "搜尋城市"
 
-#: panels/datetime/datetime.ui:318
+#: panels/datetime/cc-datetime-panel.ui:313
 msgid "Automatic _Date & Time"
 msgstr "自動調整日期與時刻(_D)"
 
-#: panels/datetime/datetime.ui:333 panels/datetime/datetime.ui:411
+#: panels/datetime/cc-datetime-panel.ui:314
 msgid "Requires internet access"
 msgstr "需要網際網路連線"
 
-#: panels/datetime/datetime.ui:396
+#: panels/datetime/cc-datetime-panel.ui:334
 msgid "Automatic Time _Zone"
 msgstr "自動調整時區(_Z)"
 
-#: panels/datetime/datetime.ui:468
+#: panels/datetime/cc-datetime-panel.ui:335
+#| msgid "Requires internet access"
+msgid "Requires location services enabled and internet access"
+msgstr "需要啟用位置服務及網際網路連線"
+
+#: panels/datetime/cc-datetime-panel.ui:350
 msgid "Date & _Time"
 msgstr "日期與時刻(_T)"
 
-#: panels/datetime/datetime.ui:516
+#: panels/datetime/cc-datetime-panel.ui:366
 msgid "Time Z_one"
 msgstr "時區(_O)"
 
-#: panels/datetime/datetime.ui:586
+#: panels/datetime/cc-datetime-panel.ui:405
 msgid "Time _Format"
 msgstr "時刻格式(_F)"
 
-#: panels/datetime/datetime.ui:605
+#: panels/datetime/cc-datetime-panel.ui:414
 msgid "24-hour"
 msgstr "24小時"
 
-#: panels/datetime/datetime.ui:606
+#: panels/datetime/cc-datetime-panel.ui:415
 msgid "AM / PM"
 msgstr "AM / PM"
 
@@ -1079,11 +1366,6 @@ msgstr "AM / PM"
 msgid "Change the date and time, including time zone"
 msgstr "改變時刻與日期,包含時區"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/datetime/gnome-datetime-panel.desktop.in.in:7
-msgid "preferences-system-time"
-msgstr "preferences-system-time"
-
 #. Translators: Search terms to find the Date and Time panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:15
 msgid "Clock;Timezone;Location;"
@@ -1097,216 +1379,196 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,您需要通過核對。"
 
-#: panels/display/cc-display-panel.c:520
+#: 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)"
+
+#: panels/display/cc-display-panel.c:982
+msgid "Apply Changes?"
+msgstr "要套用變更嗎?"
+
+#: panels/display/cc-display-panel.c:987
+msgid "Changes Cannot be Applied"
+msgstr "變更無法套用"
+
+#: panels/display/cc-display-panel.c:988
+msgid "This could be due to hardware limitations."
+msgstr "這可能是因為硬體限制。"
+
+#: panels/display/cc-display-panel.ui:91
+msgid "Single Display"
+msgstr "單一顯示器"
+
+#: panels/display/cc-display-panel.ui:110
+#: panels/display/cc-display-panel.ui:315
+msgid "Join Displays"
+msgstr "接合多臺顯示器"
+
+#: panels/display/cc-display-panel.ui:128
+msgid "Mirror"
+msgstr "相同"
+
+#: panels/display/cc-display-panel.ui:153
+msgid "Display Mode"
+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."
+msgstr "請將顯示器拖曳到符合您實體顯示器的配置。請選取顯示器以變更其設定。"
+
+#: panels/display/cc-display-panel.ui:252
+msgid "Display Arrangement"
+msgstr "排列顯示器組合方式"
+
+#: panels/display/cc-display-panel.ui:434
+#| msgid "Display Calibration"
+msgid "Display Configuration"
+msgstr "顯示器設定"
+
+#: panels/display/cc-display-panel.ui:453
+#: panels/display/gnome-display-panel.desktop.in.in:3
+msgid "Displays"
+msgstr "顯示器"
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: panels/display/cc-display-panel.ui:464
+#: panels/display/cc-night-light-page.ui:111
+msgid "Night Light"
+msgstr "夜光"
+
+#: panels/display/cc-display-settings.c:104
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "橫向"
 
-#: panels/display/cc-display-panel.c:523
+#: panels/display/cc-display-settings.c:107
 msgctxt "Display rotation"
 msgid "Portrait Right"
 msgstr "直向右轉"
 
-#: panels/display/cc-display-panel.c:526
+#: panels/display/cc-display-settings.c:110
 msgctxt "Display rotation"
 msgid "Portrait Left"
 msgstr "直向左轉"
 
-#: panels/display/cc-display-panel.c:529
+#: panels/display/cc-display-settings.c:113
 msgctxt "Display rotation"
 msgid "Landscape (flipped)"
 msgstr "橫向(翻轉)"
 
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/display/cc-display-panel.c:596
-#: panels/printers/pp-options-dialog.c:558
+#: panels/display/cc-display-settings.c:187
+#, c-format
+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-panel.c:663 panels/display/cc-display-panel.c:1428
-#: panels/printers/pp-options-dialog.c:87
+#: panels/display/cc-display-settings.ui:24
+#| msgid "Resolution"
+msgctxt "display setting"
 msgid "Resolution"
 msgstr "解析度"
 
-#: panels/display/cc-display-panel.c:750
+#: panels/display/cc-display-settings.ui:33
 msgid "Refresh Rate"
 msgstr "更新率"
 
-#: panels/display/cc-display-panel.c:885
-msgid "Scale"
-msgstr "縮放"
-
-#: panels/display/cc-display-panel.c:937
+#: panels/display/cc-display-settings.ui:42
 msgid "Adjust for TV"
 msgstr "調整為電視"
 
-#: panels/display/cc-display-panel.c:1172
-msgid "Primary Display"
-msgstr "主要顯示器"
-
-#: panels/display/cc-display-panel.c:1200
-msgid "Display Arrangement"
-msgstr "排列顯示器組合方式"
-
-#: panels/display/cc-display-panel.c:1201
-msgid ""
-"Drag displays to match your setup. The top bar is placed on the primary "
-"display."
-msgstr "請拖曳顯示器位置以貼合您的配置。頂端列會放在主要顯示器中。"
-
-#: panels/display/cc-display-panel.c:1615
-msgid "Display Mode"
-msgstr "顯示器模式"
-
-#: panels/display/cc-display-panel.c:1631
-msgid "Join Displays"
-msgstr "接合多臺顯示器"
-
-#: panels/display/cc-display-panel.c:1634
-msgid "Mirror"
-msgstr "相同"
-
-#: panels/display/cc-display-panel.c:1637
-msgid "Single Display"
-msgstr "單一顯示器"
-
-#: panels/display/cc-display-panel.c:1911
-#: panels/network/connection-editor/connection-editor.ui:24
-#: panels/network/network-wifi.ui:38
-msgid "_Apply"
-msgstr "套用(_A)"
-
-#: panels/display/cc-display-panel.c:1933
-msgid "Apply Changes?"
-msgstr "要套用變更嗎?"
-
-#: panels/display/cc-display-panel.c:1938
-msgid "Changes Cannot be Applied"
-msgstr "變更無法套用"
-
-#: panels/display/cc-display-panel.c:1939
-msgid "This could be due to hardware limitations."
-msgstr "這可能是因為硬體限制。"
-
-#: panels/display/cc-display-panel.c:2070
-#, c-format
-msgid "%.2lf Hz"
-msgstr "%.2lf Hz"
-
-#. TRANSLATORS: the state of the night light setting
-#: panels/display/cc-display-panel.c:2242
-#: panels/notifications/cc-notifications-panel.c:288
-#: panels/power/cc-power-panel.c:2038 panels/power/cc-power-panel.c:2045
-#: panels/privacy/cc-privacy-panel.c:193 panels/privacy/cc-privacy-panel.c:260
-#: panels/universal-access/cc-ua-panel.c:478
-#: panels/universal-access/cc-ua-panel.c:841
-#: panels/universal-access/cc-ua-panel.c:854
-#: panels/universal-access/cc-ua-panel.c:866
-#: panels/universal-access/cc-ua-panel.c:1031
-msgid "On"
-msgstr "開啟"
-
-#: panels/display/cc-display-panel.c:2242 panels/network/net-proxy.c:54
-#: panels/notifications/cc-notifications-panel.c:288
-#: panels/power/cc-power-panel.c:2032 panels/power/cc-power-panel.c:2043
-#: panels/privacy/cc-privacy-panel.c:193 panels/privacy/cc-privacy-panel.c:260
-#: panels/universal-access/cc-ua-panel.c:478
-#: panels/universal-access/cc-ua-panel.c:841
-#: panels/universal-access/cc-ua-panel.c:854
-#: panels/universal-access/cc-ua-panel.c:866
-#: panels/universal-access/cc-ua-panel.c:1031
-#: panels/universal-access/uap.ui:338 panels/universal-access/uap.ui:384
-#: panels/universal-access/uap.ui:430 panels/universal-access/uap.ui:536
-#: panels/universal-access/uap.ui:689 panels/universal-access/uap.ui:735
-#: panels/universal-access/uap.ui:781 panels/universal-access/uap.ui:933
-msgid "Off"
-msgstr "關閉"
+#: panels/display/cc-display-settings.ui:59
+#| msgid "Scale"
+msgctxt "display setting"
+msgid "Scale"
+msgstr "縮放"
 
-#: panels/display/cc-display-panel.c:2262
-msgid "_Night Light"
-msgstr "夜光(_N)"
+#: panels/display/cc-night-light-page.c:622
+msgid "More Warm"
+msgstr "變得更暖"
 
-#: panels/display/cc-display-panel.c:2323
-msgid "Could not get screen information"
-msgstr "無法取得螢幕資訊"
+#: panels/display/cc-night-light-page.c:634
+msgid "Less Warm"
+msgstr "變得更冷"
 
 #. This cancels the redshift inhibit.
-#: panels/display/cc-night-light-dialog.ui:47
+#: panels/display/cc-night-light-page.ui:28
 msgid "Restart Filter"
 msgstr "重新啟動過濾器"
 
 #. Inhibit the redshift functionality until the next day starts
-#: panels/display/cc-night-light-dialog.ui:80
+#: panels/display/cc-night-light-page.ui:61
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "暫時停用直到明天"
 
-#: panels/display/cc-night-light-dialog.ui:107
+#: panels/display/cc-night-light-page.ui:88
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
 msgstr "夜光讓螢幕顏色變得溫暖。這可以幫助防止眼睛疲勞和失眠。"
 
-#. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: panels/display/cc-night-light-dialog.ui:129
-#: panels/display/cc-night-light-dialog.ui:466
-msgid "Night Light"
-msgstr "夜光"
-
-#: panels/display/cc-night-light-dialog.ui:145
+#: panels/display/cc-night-light-page.ui:127
 msgid "Schedule"
 msgstr "排程"
 
-#: panels/display/cc-night-light-dialog.ui:174
+#: panels/display/cc-night-light-page.ui:136
 msgid "Sunset to Sunrise"
 msgstr "日落到日出"
 
-#: panels/display/cc-night-light-dialog.ui:189
-#: 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:777 panels/network/network-wifi.ui:1054
-#: panels/privacy/cc-privacy-panel.c:220
-msgid "Manual"
-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
+msgid "Times"
+msgstr "時刻"
 
-#: panels/display/cc-night-light-dialog.ui:224
+#: panels/display/cc-night-light-page.ui:165
 msgid "From"
 msgstr "從"
 
-#: panels/display/cc-night-light-dialog.ui:256
-#: panels/display/cc-night-light-dialog.ui:353
+#: panels/display/cc-night-light-page.ui:203
+#: panels/display/cc-night-light-page.ui:323
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: panels/display/cc-night-light-dialog.ui:281
-#: panels/display/cc-night-light-dialog.ui:378
+#: panels/display/cc-night-light-page.ui:234
+#: panels/display/cc-night-light-page.ui:354
 msgid "AM"
 msgstr "上午"
 
 #. This is the short form for the time period in the afternoon
-#: panels/display/cc-night-light-dialog.ui:297
-#: panels/display/cc-night-light-dialog.ui:394
+#: panels/display/cc-night-light-page.ui:250
+#: panels/display/cc-night-light-page.ui:370
 msgid "PM"
 msgstr "下午"
 
-#: panels/display/cc-night-light-dialog.ui:436
+#: panels/display/cc-night-light-page.ui:284
 msgid "To"
 msgstr "到"
 
-#: panels/display/gnome-display-panel.desktop.in.in:3
-msgid "Displays"
-msgstr "顯示器"
+#: panels/display/cc-night-light-page.ui:408
+msgid "Color Temperature"
+msgstr "顏色溫度"
 
 #: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
 msgstr "選擇如何使用連接的顯示器和投影機"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/display/gnome-display-panel.desktop.in.in:7
-msgid "preferences-desktop-display"
-msgstr "preferences-desktop-display"
-
 #. Translators: Search terms to find the Displays panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/display/gnome-display-panel.desktop.in.in:19
 msgid ""
@@ -1317,9 +1579,37 @@ 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:373
-#: panels/info/cc-info-overview-panel.c:456 panels/network/panel-common.c:123
+#: 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
 msgid "Unknown"
 msgstr "不明"
 
@@ -1327,61 +1617,103 @@ msgstr "不明"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info/cc-info-overview-panel.c:464
+#: panels/info/cc-info-overview-panel.c:460
 #, 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:481
+#: panels/info/cc-info-overview-panel.c:477
 #, c-format
 msgid "64-bit"
 msgstr "64位元"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:484
+#: panels/info/cc-info-overview-panel.c:480
 #, c-format
 msgid "32-bit"
 msgstr "32位元"
 
-#: panels/info/cc-info-overview-panel.c:773
+#: panels/info/cc-info-overview-panel.c:710
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: panels/info/cc-info-removable-media-panel.c:298
+#: panels/info/cc-info-overview-panel.ui:70
+msgid "Device name"
+msgstr "裝置名稱"
+
+#: panels/info/cc-info-overview-panel.ui:86
+msgid "Memory"
+msgstr "記憶體"
+
+#: panels/info/cc-info-overview-panel.ui:102
+msgid "Processor"
+msgstr "處理器"
+
+#: panels/info/cc-info-overview-panel.ui:118
+msgid "Graphics"
+msgstr "繪圖"
+
+#. To translators: this field contains the distro name and version
+#: panels/info/cc-info-overview-panel.ui:133
+msgid "OS name"
+msgstr "作業系統名稱"
+
+#. To translators: this field contains the distro type
+#: panels/info/cc-info-overview-panel.ui:149
+msgid "OS type"
+msgstr "作業系統類型"
+
+#: panels/info/cc-info-overview-panel.ui:165
+msgid "Virtualization"
+msgstr "虛擬化"
+
+#: panels/info/cc-info-overview-panel.ui:181
+msgid "Disk"
+msgstr "磁碟"
+
+#: panels/info/cc-info-overview-panel.ui:293
+msgid "Calculating…"
+msgstr "正在計算…"
+
+#: panels/info/cc-info-overview-panel.ui:333
+msgid "Check for updates"
+msgstr "檢查更新"
+
+#: panels/info/cc-info-removable-media-panel.c:307
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: panels/info/cc-info-removable-media-panel.c:302
+#: panels/info/cc-info-removable-media-panel.c:311
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: panels/info/cc-info-removable-media-panel.c:306
+#: panels/info/cc-info-removable-media-panel.c:315
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: panels/info/cc-info-removable-media-panel.c:391
+#: panels/info/cc-info-removable-media-panel.c:401
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: panels/info/cc-info-removable-media-panel.c:424
+#: 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:425
+#: 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:426
+#: 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:427
+#: 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:428
+#: panels/info/cc-info-removable-media-panel.c:438
 msgid "Select an application for software CDs"
 msgstr "選擇軟體 CD 要用的應用程式"
 
@@ -1390,66 +1722,101 @@ msgstr "選擇軟體 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: panels/info/cc-info-removable-media-panel.c:440
+#: panels/info/cc-info-removable-media-panel.c:450
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: panels/info/cc-info-removable-media-panel.c:441
+#: 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:442
+#: panels/info/cc-info-removable-media-panel.c:452
 msgid "blank CD disc"
 msgstr "空白 CD 碟片"
 
-#: panels/info/cc-info-removable-media-panel.c:443
+#: panels/info/cc-info-removable-media-panel.c:453
 msgid "blank DVD disc"
 msgstr "空白 DVD 碟片"
 
-#: panels/info/cc-info-removable-media-panel.c:444
+#: 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:445
+#: 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:446
+#: panels/info/cc-info-removable-media-panel.c:456
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: panels/info/cc-info-removable-media-panel.c:447
+#: 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:448
+#: panels/info/cc-info-removable-media-panel.c:458
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: panels/info/cc-info-removable-media-panel.c:449
+#: panels/info/cc-info-removable-media-panel.c:459
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: panels/info/cc-info-removable-media-panel.c:450
+#: panels/info/cc-info-removable-media-panel.c:460
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: panels/info/cc-info-removable-media-panel.c:451
+#: panels/info/cc-info-removable-media-panel.c:461
 msgid "Windows software"
 msgstr "Windows 軟體"
 
-#: panels/info/gnome-default-apps-panel.desktop.in.in:3
-msgid "Default Applications"
-msgstr "預設應用程式"
+#: panels/info/cc-info-removable-media-panel.ui:44
+msgid "Select how media should be handled"
+msgstr "選擇要如何處理媒體"
 
-#: panels/info/gnome-default-apps-panel.desktop.in.in:4
-msgid "Configure Default Applications"
-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 "預設應用程式"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/info/gnome-default-apps-panel.desktop.in.in:7
-msgid "starred"
-msgstr "starred"
+#: 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
@@ -1464,11 +1831,6 @@ msgstr "關於"
 msgid "View information about your system"
 msgstr "檢視您系統的資訊"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/info/gnome-info-overview-panel.desktop.in.in:7
-msgid "help-about"
-msgstr "help-about"
-
 #. Translators: Search terms to find the About panel.
 #. Do NOT translate or localize the semicolons!
 #. The list MUST also end with a semicolon!
@@ -1491,11 +1853,6 @@ msgstr "可移除式媒體"
 msgid "Configure Removable Media settings"
 msgstr "設定可移除式媒體設定值"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/info/gnome-removable-media-panel.desktop.in.in:7
-msgid "media-removable"
-msgstr "media-removable"
-
 #. 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
 msgid ""
@@ -1506,119 +1863,14 @@ msgstr ""
 "removable;media;autorun;裝置;系統;預設;應用程式;偏好;首選;音訊;視訊;光碟;碟"
 "片;可移除;卸除式;媒體;自動執行;"
 
-#: panels/info/info-default-apps.ui:31
-msgid "_Web"
-msgstr "網頁(_W)"
-
-#: panels/info/info-default-apps.ui:43
-msgid "_Mail"
-msgstr "郵件(_M)"
-
-#: panels/info/info-default-apps.ui:59
-msgid "_Calendar"
-msgstr "日曆(_C)"
-
-#: panels/info/info-default-apps.ui:75
-msgid "M_usic"
-msgstr "音樂(_U)"
-
-#: panels/info/info-default-apps.ui:91
-msgid "_Video"
-msgstr "影片(_V)"
-
-#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
-msgid "_Photos"
-msgstr "相片(_P)"
-
-#: panels/info/info-overview.ui:58
-msgid "Device name"
-msgstr "裝置名稱"
-
-#: panels/info/info-overview.ui:74
-msgid "Memory"
-msgstr "記憶體"
-
-#: panels/info/info-overview.ui:90
-msgid "Processor"
-msgstr "處理器"
-
-#: panels/info/info-overview.ui:106
-msgid "Graphics"
-msgstr "繪圖"
-
-#. To translators: this field contains the distro name and version
-#: panels/info/info-overview.ui:121
-msgid "OS name"
-msgstr "作業系統名稱"
-
-#. To translators: this field contains the distro type
-#: panels/info/info-overview.ui:137
-msgid "OS type"
-msgstr "作業系統類型"
-
-#: panels/info/info-overview.ui:153
-msgid "Virtualization"
-msgstr "虛擬化"
-
-#: panels/info/info-overview.ui:169
-msgid "Disk"
-msgstr "磁碟"
-
-#: panels/info/info-overview.ui:274
-msgid "Calculating…"
-msgstr "正在計算…"
-
-#: panels/info/info-overview.ui:314
-msgid "Check for updates"
-msgstr "檢查更新"
-
-#: panels/info/info-removable-media.ui:43
-msgid "Select how media should be handled"
-msgstr "選擇要如何處理媒體"
-
-#: panels/info/info-removable-media.ui:74
-msgid "CD _audio"
-msgstr "CD 音樂(_A)"
-
-#: panels/info/info-removable-media.ui:91
-msgid "_DVD video"
-msgstr "_DVD 影片"
-
-#: panels/info/info-removable-media.ui:132
-msgid "_Music player"
-msgstr "音樂播放器(_M)"
-
-#: panels/info/info-removable-media.ui:190
-msgid "_Software"
-msgstr "軟體(_S)"
-
-#: panels/info/info-removable-media.ui:228
-msgid "_Other Media…"
-msgstr "其他(_O)…"
-
-#: panels/info/info-removable-media.ui:272
-msgid "_Never prompt or start programs on media insertion"
-msgstr "插入媒體時永遠不提示或啟動程式(_N)"
-
-#: panels/info/info-removable-media.ui:331
-msgid "Select how other media should be handled"
-msgstr "選擇要如何處理其他媒體"
-
-#: panels/info/info-removable-media.ui:370
-msgid "_Action:"
-msgstr "動作(_A):"
-
-#: panels/info/info-removable-media.ui:393
-msgid "_Type:"
-msgstr "類型(_T):"
-
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "聲音與媒體"
 
 #: panels/keyboard/00-multimedia.xml.in:4
-msgid "Volume mute"
-msgstr "靜音"
+#| msgid "Volume mute"
+msgid "Volume mute/unmute"
+msgstr "音量 靜音/取消靜音"
 
 #: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
@@ -1629,34 +1881,39 @@ msgid "Volume up"
 msgstr "調高音量"
 
 #: panels/keyboard/00-multimedia.xml.in:10
+msgid "Microphone mute/unmute"
+msgstr "麥克風 靜音/取消靜音"
+
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Launch media player"
 msgstr "執行媒體播放程式"
 
-#: panels/keyboard/00-multimedia.xml.in:12
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Play (or play/pause)"
 msgstr "播放 (或播放/暫停)"
 
-#: panels/keyboard/00-multimedia.xml.in:14
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Pause playback"
 msgstr "暫停播放"
 
-#: panels/keyboard/00-multimedia.xml.in:16
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Stop playback"
 msgstr "停止播放"
 
-#: panels/keyboard/00-multimedia.xml.in:18
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Previous track"
 msgstr "上一首歌曲"
 
-#: panels/keyboard/00-multimedia.xml.in:20
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Next track"
 msgstr "下一首歌曲"
 
-#: panels/keyboard/00-multimedia.xml.in:22
+#: panels/keyboard/00-multimedia.xml.in:24
 msgid "Eject"
 msgstr "退出"
 
-#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:580
+#: panels/keyboard/01-input-sources.xml.in:4
+#: panels/universal-access/cc-ua-panel.ui:565
 msgid "Typing"
 msgstr "輸入"
 
@@ -1676,12 +1933,6 @@ msgstr "執行器"
 msgid "Launch help browser"
 msgstr "執行說明文件瀏覽器"
 
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:251
-#: shell/cc-window.c:888 shell/cc-window.ui:124
-#: shell/gnome-control-center.desktop.in.in:3
-msgid "Settings"
-msgstr "設定值"
-
 #: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "執行計算機"
@@ -1699,7 +1950,7 @@ msgid "Home folder"
 msgstr "家目錄"
 
 #: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:156
+msgctxt "keybinding"
 msgid "Search"
 msgstr "搜尋"
 
@@ -1790,21 +2041,6 @@ msgstr "高對比開或關"
 msgid "Custom Shortcuts"
 msgstr "自訂快捷鍵"
 
-#. This label is displayed in a treeview cell displaying
-#. * a disabled accelerator key combination.
-#.
-#. translators:
-#. * The device has been disabled
-#: 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:782 panels/network/network-wifi.ui:1059
-#: panels/user-accounts/um-fingerprint-dialog.c:211
-#: subprojects/gvc/gvc-mixer-control.c:1866
-msgid "Disabled"
-msgstr "已停用"
-
 #. Translators: This key is also known as 'third level
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
@@ -1825,31 +2061,43 @@ msgstr "組合鍵"
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
-#: panels/keyboard/cc-keyboard-panel.c:179
+#: panels/keyboard/cc-keyboard-panel.c:180
 msgid "Reset All Shortcuts?"
 msgstr "重設所有的快捷鍵?"
 
-#: panels/keyboard/cc-keyboard-panel.c:182
+#: panels/keyboard/cc-keyboard-panel.c:183
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 msgstr "重設快捷鍵可能會影響您自訂的快捷鍵。這個動作不能撤銷。"
 
-#: panels/keyboard/cc-keyboard-panel.c:186
+#: panels/keyboard/cc-keyboard-panel.c:187
 #: panels/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:187
+#: panels/keyboard/cc-keyboard-panel.c:188
 msgid "Reset All"
 msgstr "全部重設"
 
-#: panels/keyboard/cc-keyboard-panel.c:279
+#: panels/keyboard/cc-keyboard-panel.c:284
 msgid "Reset the shortcut to its default value"
 msgstr "將快捷鍵重設回預設值"
 
+#: panels/keyboard/cc-keyboard-panel.ui:116
+msgid "Reset All…"
+msgstr "全部重設…"
+
+#: panels/keyboard/cc-keyboard-panel.ui:117
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "將快捷鍵重設回它們預設的按鍵組合"
+
+#: panels/keyboard/cc-keyboard-panel.ui:146
+msgid "No keyboard shortcut found"
+msgstr "找不到鍵盤快捷鍵"
+
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:411
 #, c-format
 msgid ""
@@ -1876,18 +2124,14 @@ msgid "Add Custom Shortcut"
 msgstr "加入自訂快捷鍵"
 
 #: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
-msgid "Keyboard"
-msgstr "鍵盤"
+#: 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: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:7
-msgid "input-keyboard"
-msgstr "input-keyboard"
-
 #. 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 ""
@@ -1897,34 +2141,12 @@ msgstr ""
 "鍵;快捷鍵;工作區;視窗;重新調整大小;縮放;拉遠;拉近;遠近;輸入;來源;輸入法;鎖定;"
 "上鎖;音量;"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
-#: shell/cc-application.c:252
-msgid "Keyboard Shortcuts"
-msgstr "鍵盤快捷鍵"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:77
-msgid "Reset All…"
-msgstr "全部重設…"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:78
-msgid "Reset all shortcuts to their default keybindings"
-msgstr "將快捷鍵重設回它們預設的按鍵組合"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:164
-msgid "No keyboard shortcut found"
-msgstr "找不到鍵盤快捷鍵"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
-msgid "Try a different search"
-msgstr "嘗試不同的搜尋內容"
-
 #: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
-msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
-msgstr "按下 Esc 取消或按 Backspace 重設鍵盤快捷鍵。"
+#| msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+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/sound/gvc-mixer-dialog.c:1480
-#: panels/sound/gvc-sound-theme-chooser.c:554
 msgid "Name"
 msgstr "名稱"
 
@@ -1940,7 +2162,7 @@ msgstr "快捷鍵"
 msgid "Set Shortcut…"
 msgstr "設定快捷鍵…"
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:594
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
 msgid "None"
 msgstr "沒有"
 
@@ -1964,7 +2186,7 @@ msgstr "取代"
 msgid "Set"
 msgstr "設定"
 
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:427
+#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463
 msgid "Test Your _Settings"
 msgstr "測試您的設定值(_S)"
 
@@ -1977,11 +2199,6 @@ msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr "改變您的滑鼠或控制板靈敏度並選擇慣用右手或左手"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:7
-msgid "input-mouse"
-msgstr "input-mouse"
-
 #. 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;"
@@ -2002,10 +2219,12 @@ msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr "設定滑鼠與觸控板上實體按鈕的順序。"
 
 #: panels/mouse/gnome-mouse-properties.ui:136
+#: panels/sound/cc-balance-slider.ui:13
 msgid "Left"
 msgstr "左"
 
 #: panels/mouse/gnome-mouse-properties.ui:146
+#: panels/sound/cc-balance-slider.ui:15
 msgid "Right"
 msgstr "右"
 
@@ -2018,19 +2237,19 @@ msgid "Mouse Speed"
 msgstr "鼠標速度"
 
 #: panels/mouse/gnome-mouse-properties.ui:243
-#: panels/mouse/gnome-mouse-properties.ui:548
+#: panels/mouse/gnome-mouse-properties.ui:535
 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/gnome-mouse-properties.ui:280
-#: panels/mouse/gnome-mouse-properties.ui:456
+#: panels/mouse/gnome-mouse-properties.ui:443
 msgid "Natural Scrolling"
 msgstr "自然捲動"
 
 #: panels/mouse/gnome-mouse-properties.ui:296
-#: panels/mouse/gnome-mouse-properties.ui:472
+#: panels/mouse/gnome-mouse-properties.ui:459
 msgid "Scrolling moves the content, not the view."
 msgstr "捲動會移動內容,而非檢視。"
 
@@ -2039,19 +2258,19 @@ msgstr "捲動會移動內容,而非檢視。"
 msgid "Touchpad"
 msgstr "觸控板"
 
-#: panels/mouse/gnome-mouse-properties.ui:527
+#: panels/mouse/gnome-mouse-properties.ui:514
 msgid "Touchpad Speed"
 msgstr "觸控板速度"
 
-#: panels/mouse/gnome-mouse-properties.ui:586
+#: panels/mouse/gnome-mouse-properties.ui:573
 msgid "Tap to Click"
 msgstr "輕觸表示點擊"
 
-#: panels/mouse/gnome-mouse-properties.ui:639
+#: panels/mouse/gnome-mouse-properties.ui:625
 msgid "Two-finger Scrolling"
 msgstr "兩指捲動"
 
-#: panels/mouse/gnome-mouse-properties.ui:693
+#: panels/mouse/gnome-mouse-properties.ui:678
 msgid "Edge Scrolling"
 msgstr "邊緣捲動"
 
@@ -2088,7 +2307,7 @@ msgid "Single click, secondary button"
 msgstr "單擊,次要按鈕"
 
 #. add proxy to device list
-#: panels/network/cc-network-panel.c:583
+#: panels/network/cc-network-panel.c:590
 msgid "Network proxy"
 msgstr "網路代理伺服器"
 
@@ -2096,64 +2315,85 @@ msgstr "網路代理伺服器"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:170
-#: panels/network/net-vpn.c:299
+#: 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/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:320
+#: panels/network/cc-network-panel.c:789 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:789
+#: panels/network/cc-network-panel.c:795
 msgid "NetworkManager needs to be running."
 msgstr "需要先執行 NetworkManager。"
 
-#: panels/network/cc-network-panel.ui:142
-#: panels/network/connection-editor/net-connection-editor.c:603
+#: panels/network/cc-network-panel.ui:102
+#| msgid "Devices"
+msgid "Other Devices"
+msgstr "其他裝置"
+
+#: panels/network/cc-network-panel.ui:143
+#: panels/network/connection-editor/net-connection-editor.c:581
 msgid "VPN"
 msgstr "VPN"
 
-#: panels/network/cc-network-panel.ui:194
+#: panels/network/cc-network-panel.ui:195
 msgid "Not set up"
 msgstr "尚未設置"
 
-#: panels/network/cc-wifi-panel.c:281
+#. 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.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
+msgid "Options…"
+msgstr "選項…"
+
+#: panels/network/cc-wifi-panel.c:284
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1769
+#: panels/network/network-wifi.ui:1738
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: panels/network/cc-wifi-panel.ui:73
+#: panels/network/cc-wifi-panel.ui:56
 msgid "Airplane Mode"
 msgstr "飛安模式"
 
-#: panels/network/cc-wifi-panel.ui:88
+#: panels/network/cc-wifi-panel.ui:72
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "停用 Wi-Fi、藍牙和行動寬頻"
 
-#: panels/network/cc-wifi-panel.ui:157
+#: panels/network/cc-wifi-panel.ui:141
 msgid "No Wi-Fi Adapter Found"
 msgstr "找不到 Wi-Fi 網卡"
 
-#: panels/network/cc-wifi-panel.ui:169
+#: panels/network/cc-wifi-panel.ui:153
 msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
 msgstr "請確認您的 Wi-Fi 網卡已插入並啟動"
 
-#: panels/network/cc-wifi-panel.ui:204
+#: panels/network/cc-wifi-panel.ui:188
 msgid "Airplane Mode On"
 msgstr "開啟飛安模式"
 
-#: panels/network/cc-wifi-panel.ui:216
+#: panels/network/cc-wifi-panel.ui:200
 msgid "Turn off to use Wi-Fi"
 msgstr "關閉以使用 Wi-Fi"
 
-#: panels/network/cc-wifi-panel.ui:242
+#: panels/network/cc-wifi-panel.ui:227
 msgid "Visible Networks"
 msgstr "可見網路"
 
-#: panels/network/cc-wifi-panel.ui:309
+#: panels/network/cc-wifi-panel.ui:295
 msgid "NetworkManager needs to be running"
 msgstr "需要先執行 NetworkManager"
 
@@ -2163,7 +2403,6 @@ msgstr "802.1x 防護(_S)"
 
 #: panels/network/connection-editor/8021x-security-page.ui:73
 #: panels/network/connection-editor/security-page.ui:72
-#: panels/wacom/wacom-stylus-page.ui:110
 msgid "page 1"
 msgstr "頁 1"
 
@@ -2182,7 +2421,6 @@ msgstr "內部核對(_A)"
 
 #: panels/network/connection-editor/8021x-security-page.ui:281
 #: panels/network/connection-editor/security-page.ui:280
-#: panels/wacom/wacom-stylus-page.ui:428
 msgid "page 2"
 msgstr "頁 2"
 
@@ -2193,118 +2431,143 @@ msgstr "頁 2"
 msgid "Security"
 msgstr "安全性"
 
-#: panels/network/connection-editor/ce-page.c:481
+#: panels/network/connection-editor/ce-page.c:396
+#| msgid "reset"
+msgid "Preserve"
+msgstr "保留"
+
+#: panels/network/connection-editor/ce-page.c:397
+#| msgid "Germany"
+msgid "Permanent"
+msgstr "永久"
+
+#: panels/network/connection-editor/ce-page.c:398
+msgid "Random"
+msgstr "隨機"
+
+#: panels/network/connection-editor/ce-page.c:399
+#| msgid "Tablet"
+msgid "Stable"
+msgstr "穩定"
+
+#: panels/network/connection-editor/ce-page.c:403
+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 ""
+
+#: panels/network/connection-editor/ce-page.c:538
 msgid "automatic"
 msgstr "自動"
 
-#: panels/network/connection-editor/ce-page.c:521
+#: panels/network/connection-editor/ce-page.c:578
 #, 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:235 panels/network/net-device-wifi.c:468
+#: panels/network/net-device-wifi.c:134 panels/network/net-device-wifi.c:314
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:239 panels/network/net-device-wifi.c:473
-#: panels/network/network-wifi.ui:593
+#: panels/network/net-device-wifi.c:138 panels/network/net-device-wifi.c:319
+#: panels/network/network-wifi.ui:592
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:243
+#: panels/network/net-device-wifi.c:142
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:248
+#: panels/network/net-device-wifi.c:147
 msgid "Enterprise"
 msgstr "企業版"
 
 #: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:253 panels/network/net-device-wifi.c:458
+#: panels/network/net-device-wifi.c:152 panels/network/net-device-wifi.c:304
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
 
 #: panels/network/connection-editor/ce-page-details.c:95
-#: panels/power/power.ui:99
 msgid "Never"
 msgstr "永不"
 
 #: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:121
-#: panels/network/net-device-wifi.c:567
+#: panels/network/net-device-ethernet.c:137
+#: panels/network/net-device-wifi.c:413
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天以前"
 
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:225
-#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:646
+#: panels/network/connection-editor/ce-page-details.c:228
+#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:536
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:675
+#: panels/network/connection-editor/ce-page-details.c:249
+#: panels/network/net-device-wifi.c:565
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:677
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:567
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:679
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:569
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:681
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:571
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: panels/network/connection-editor/ce-page-details.c:259
-#: panels/network/net-device-wifi.c:683
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:573
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:300
 msgid "Forget Connection"
 msgstr "忘記連線"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:302
 msgid "Remove Connection Profile"
 msgstr "移除連線個人檔案"
 
-#: panels/network/connection-editor/ce-page-details.c:306
+#: panels/network/connection-editor/ce-page-details.c:304
 msgid "Remove VPN"
 msgstr "移除 VPN"
 
-#: panels/network/connection-editor/ce-page-details.c:334
-#: panels/network/network-wifi.ui:1456 shell/cc-panel-list.ui:103
-#: shell/cc-window.c:243
+#: 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
 msgid "Details"
 msgstr "詳細資料"
 
-#: panels/network/connection-editor/ce-page-ethernet.c:174
+#: 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:194
-#: panels/network/network-wifi.ui:1460
+#: panels/network/connection-editor/ce-page-wifi.c:196
+#: panels/network/network-wifi.ui:1437
 msgid "Identity"
 msgstr "身分"
 
@@ -2319,12 +2582,12 @@ msgid "Delete Route"
 msgstr "刪除路由"
 
 #: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1464
+#: panels/network/network-wifi.ui:1441
 msgid "IPv4"
 msgstr "IPv4"
 
 #: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1468
+#: panels/network/network-wifi.ui:1445
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2369,26 +2632,26 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
+#: 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:155
-#: panels/network/net-device-ethernet.c:159
+#: 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:162 panels/network/network-wifi.ui:290
+#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "硬體位址"
 
 #: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:166
+#: panels/network/net-device-ethernet.c:182
 #: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "預設路由"
@@ -2396,9 +2659,9 @@ 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:168
+#: panels/network/net-device-ethernet.c:184
 #: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
-#: panels/network/network-wifi.ui:832 panels/network/network-wifi.ui:1109
+#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
 msgid "DNS"
 msgstr "DNS"
 
@@ -2415,10 +2678,11 @@ msgid "Make available to _other users"
 msgstr "允許其他使用者使用(_O)"
 
 #: panels/network/connection-editor/details-page.ui:376
-msgid "Restrict background data usage"
-msgstr "限制背景數據使用"
+#| msgid "Restrict background data usage"
+msgid "Restrict _background data usage"
+msgstr "限制背景資料用量(_B)"
 
-#: panels/network/connection-editor/details-page.ui:386
+#: panels/network/connection-editor/details-page.ui:387
 msgid "Appropriate for connections that have data charges or limits."
 msgstr "適合數據需收費或有流量限制的連線使用。"
 
@@ -2431,7 +2695,7 @@ msgstr "適合數據需收費或有流量限制的連線使用。"
 #: 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:220
+#: panels/privacy/cc-privacy-panel.c:239
 msgid "Automatic"
 msgstr "自動"
 
@@ -2473,21 +2737,21 @@ msgid "_Name"
 msgstr "名稱(_N)"
 
 #: panels/network/connection-editor/ethernet-page.ui:100
-#: panels/network/connection-editor/wifi-page.ui:68
-#: panels/network/network-wifi.ui:1261
+#: 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:146
+#: panels/network/connection-editor/ethernet-page.ui:151
 msgid "M_TU"
 msgstr "M_TU"
 
-#: panels/network/connection-editor/ethernet-page.ui:163
-#: panels/network/connection-editor/wifi-page.ui:98
+#: panels/network/connection-editor/ethernet-page.ui:168
+#: panels/network/connection-editor/wifi-page.ui:102
 msgid "_Cloned Address"
 msgstr "複製的 MA_C 位址"
 
-#: panels/network/connection-editor/ethernet-page.ui:178
+#: panels/network/connection-editor/ethernet-page.ui:183
 msgid "bytes"
 msgstr "位元組"
 
@@ -2496,7 +2760,7 @@ msgid "IPv_4 Method"
 msgstr "IPv_4 方法"
 
 #: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
+#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
@@ -2505,6 +2769,14 @@ msgstr "自動 (DHCP)"
 msgid "Link-Local Only"
 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
+msgid "Manual"
+msgstr "手動"
+
 #: panels/network/connection-editor/ip4-page.ui:83
 #: panels/network/connection-editor/ip6-page.ui:97
 msgid "Disable"
@@ -2519,7 +2791,7 @@ msgstr "位址"
 #: 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:87
+#: panels/printers/details-dialog.ui:89
 msgid "Address"
 msgstr "地址"
 
@@ -2547,7 +2819,7 @@ msgstr "請以分號 (;) 分隔 IP 地址"
 
 #: panels/network/connection-editor/ip4-page.ui:265
 #: panels/network/connection-editor/ip6-page.ui:279
-#: panels/network/network-wifi.ui:877 panels/network/network-wifi.ui:1154
+#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
 msgid "Routes"
 msgstr "路由"
 
@@ -2564,7 +2836,7 @@ msgstr "度量權值"
 
 #: panels/network/connection-editor/ip4-page.ui:384
 #: panels/network/connection-editor/ip6-page.ui:398
-#: panels/network/network-wifi.ui:933 panels/network/network-wifi.ui:1210
+#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
 msgid "Use this connection _only for resources on its network"
 msgstr "只在使用這個連線的網路資源時才使用此連線(_U)"
 
@@ -2581,19 +2853,19 @@ msgstr "自動,僅使用 DHCP"
 msgid "Prefix"
 msgstr "前綴"
 
-#: panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:261
 msgid "Unable to open connection editor"
 msgstr "無法開啟連線編輯器"
 
-#: panels/network/connection-editor/net-connection-editor.c:291
+#: panels/network/connection-editor/net-connection-editor.c:279
 msgid "New Profile"
 msgstr "新增設定檔"
 
-#: panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:727
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:759
 msgid "Add VPN"
 msgstr "加入 VPN"
 
@@ -2622,13 +2894,6 @@ msgstr ""
 msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
-#: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:331
-#: panels/sharing/cc-sharing-panel.c:427
-#: panels/user-accounts/um-photo-dialog.c:231
-msgid "_Open"
-msgstr "開啟(_O)"
-
 #: panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named “%s” already exists."
@@ -2676,71 +2941,54 @@ msgstr "_SSID"
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: panels/network/connection-editor/wifi-page.ui:53
-#: panels/network/network-wifi.ui:562
-msgid "My Home Network"
-msgstr "我的家用網路"
-
-#: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
-msgid "Network"
-msgstr "網路"
-
 #: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "控制您如何連線至網際網絡"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/network/gnome-network-panel.desktop.in.in:7
-msgid "network-workgroup"
-msgstr "network-workgroup"
-
 #. 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;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;Wireless;Wi-Fi;Wifi;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"
 msgstr "控制您如何連線至 Wi-Fi 網絡"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/network/gnome-wifi-panel.desktop.in.in:7
-msgid "network-wireless"
-msgstr "network-wireless"
-
 #. 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;"
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;"
 msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;網路;無線網路;區域網路;寬頻;"
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;"
+"網路;無線網路;區域網路;寬頻;熱點;區網;"
 
-#: panels/network/net-device-ethernet.c:107
-#: panels/network/net-device-wifi.c:553
+#: panels/network/net-device-ethernet.c:123
+#: panels/network/net-device-wifi.c:399
 msgid "never"
 msgstr "永不"
 
-#: panels/network/net-device-ethernet.c:117
-#: panels/network/net-device-wifi.c:563
+#: panels/network/net-device-ethernet.c:133
+#: panels/network/net-device-wifi.c:409
 msgid "today"
 msgstr "今日"
 
-#: panels/network/net-device-ethernet.c:119
-#: panels/network/net-device-wifi.c:565
+#: panels/network/net-device-ethernet.c:135
+#: panels/network/net-device-wifi.c:411
 msgid "yesterday"
 msgstr "昨日"
 
-#: panels/network/net-device-ethernet.c:157
+#: 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:173 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "最後使用的"
 
@@ -2749,83 +2997,96 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:276
+#: panels/network/net-device-ethernet.c:291
 #: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "有線"
 
-#: panels/network/net-device-ethernet.c:344
-#: panels/network/net-device-wifi.c:1895 panels/network/network-ethernet.ui:120
-#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
-#: panels/network/network-vpn.ui:79
-msgid "Options…"
-msgstr "選項…"
-
-#: panels/network/net-device-mobile.c:238
+#: panels/network/net-device-mobile.c:236
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: panels/network/net-device-wifi.c:1368
+#: 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:1372
+#: 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:1379
+#: panels/network/net-device-wifi.c:1228
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "開啟 Wi-Fi 熱點?"
 
-#: panels/network/net-device-wifi.c:1401
+#: 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:1412
+#: panels/network/net-device-wifi.c:1261
 msgid "_Turn On"
 msgstr "開啟(_T)"
 
-#: panels/network/net-device-wifi.c:1489
+#: panels/network/net-device-wifi.c:1338
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: panels/network/net-device-wifi.c:1492
+#: panels/network/net-device-wifi.c:1341
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: panels/network/net-device-wifi.c:1592
+#: panels/network/net-device-wifi.c:1397
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: panels/network/net-device-wifi.c:1595
+#: panels/network/net-device-wifi.c:1400
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: panels/network/net-device-wifi.c:1733
+#: panels/network/net-device-wifi.c:1558
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網路的詳細資料包含密碼及任何自訂的設定都會消失。"
 
-#: panels/network/net-device-wifi.c:1737 panels/network/network-wifi.ui:1362
+#: panels/network/net-device-wifi.c:1562 panels/network/network-wifi.ui:1350
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
-#: panels/network/net-device-wifi.c:2046 panels/network/net-device-wifi.c:2053
+#: panels/network/net-device-wifi.c:1725 panels/network/net-device-wifi.c:1732
 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:2086
+#: panels/network/net-device-wifi.c:1769
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
 
+#: panels/network/net-proxy.c:54
+#: 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/universal-access/cc-ua-panel.ui:323
+#: panels/universal-access/cc-ua-panel.ui:369
+#: panels/universal-access/cc-ua-panel.ui:415
+#: panels/universal-access/cc-ua-panel.ui:521
+#: 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
+msgid "Off"
+msgstr "關閉"
+
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
 #: panels/network/net-proxy.c:102
 msgid ""
@@ -2913,136 +3174,128 @@ msgstr "詳細資料"
 #: 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/sharing.ui:357
-#: panels/user-accounts/data/account-dialog.ui:300
-#: panels/user-accounts/data/account-dialog.ui:525
-#: panels/user-accounts/data/user-accounts-dialog.ui:205
+#: 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:622
+#: panels/network/network-wifi.ui:621
 msgid "Show P_assword"
 msgstr "顯示密碼(_A)"
 
-#: panels/network/network-wifi.ui:652
+#: panels/network/network-wifi.ui:651
 msgid "Make available to other users"
 msgstr "允許其他使用者使用"
 
-#: panels/network/network-wifi.ui:680
+#: panels/network/network-wifi.ui:679
 msgid "identity"
 msgstr "身分"
 
-#: panels/network/network-wifi.ui:714
+#: panels/network/network-wifi.ui:713
 msgid "IPv_4"
 msgstr "IPv_4"
 
-#: panels/network/network-wifi.ui:755 panels/network/network-wifi.ui:1032
+#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
 msgid "_Addresses"
 msgstr "位址(_A)"
 
-#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
+#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
 msgid "Automatic (DHCP) addresses only"
 msgstr "只用自動 (DHCP) 位址"
 
-#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Link-local only"
 msgstr "只有本機連線"
 
-#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
 msgid "Shared with other computers"
 msgstr "分享給其他電腦"
 
-#: panels/network/network-wifi.ui:917 panels/network/network-wifi.ui:1194
+#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193
 msgid "_Ignore automatically obtained routes"
 msgstr "忽略自動獲得的路由(_I)"
 
-#: panels/network/network-wifi.ui:960
+#: panels/network/network-wifi.ui:959
 msgid "ipv4"
 msgstr "ipv4"
 
-#: panels/network/network-wifi.ui:991
+#: panels/network/network-wifi.ui:990
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: panels/network/network-wifi.ui:1237
+#: panels/network/network-wifi.ui:1236
 msgid "ipv6"
 msgstr "ipv6"
 
-#: panels/network/network-wifi.ui:1277
+#: panels/network/network-wifi.ui:1276
 msgid "_Cloned MAC Address"
 msgstr "複製的 MA_C 位址"
 
-#: panels/network/network-wifi.ui:1327
-msgid "hardware"
-msgstr "硬體"
-
-#: panels/network/network-wifi.ui:1346
+#: panels/network/network-wifi.ui:1334
 msgid "_Reset"
 msgstr "重設(_R)"
 
-#: panels/network/network-wifi.ui:1382
+#: 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:1399
+#: 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:1419
-msgid "reset"
-msgstr "重設"
-
-#: panels/network/network-wifi.ui:1472
+#: panels/network/network-wifi.ui:1449
 msgid "Hardware"
 msgstr "硬體"
 
-#: panels/network/network-wifi.ui:1476
+#: panels/network/network-wifi.ui:1453
 msgctxt "tab"
 msgid "Reset"
 msgstr "重設"
 
-#: panels/network/network-wifi.ui:1537
+#: panels/network/network-wifi.ui:1505
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi 熱點"
 
-#: panels/network/network-wifi.ui:1554
+#: panels/network/network-wifi.ui:1523
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "關閉連線到 Wi-Fi 網路"
 
-#: panels/network/network-wifi.ui:1603
+#: panels/network/network-wifi.ui:1572
 msgid "Network Name"
 msgstr "網路名稱"
 
-#: panels/network/network-wifi.ui:1621
+#: panels/network/network-wifi.ui:1590
 msgid "Connected Devices"
 msgstr "已連線的裝置"
 
-#: panels/network/network-wifi.ui:1639
+#: panels/network/network-wifi.ui:1608
 msgid "Security type"
 msgstr "安全性類型"
 
-#: panels/network/network-wifi.ui:1702
+#: panels/network/network-wifi.ui:1671
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "密碼"
 
-#: panels/network/network-wifi.ui:1799
+#: panels/network/network-wifi.ui:1768
 msgid "Turn Wi-Fi off"
 msgstr "關閉 Wi-Fi"
 
-#: panels/network/network-wifi.ui:1831
+#: panels/network/network-wifi.ui:1800
 msgid "_Connect to Hidden Network…"
 msgstr "連接到隱藏的網路(_C)…"
 
-#: panels/network/network-wifi.ui:1841
+#: panels/network/network-wifi.ui:1810
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "開啟 Wi-Fi 熱點(_T)…"
 
-#: panels/network/network-wifi.ui:1851
+#: panels/network/network-wifi.ui:1820
 msgid "_Known Wi-Fi Networks"
 msgstr "已知 Wi-Fi 網路(_K)"
 
@@ -3353,13 +3606,13 @@ msgstr "缺少 EAP-FAST PAC 檔案"
 
 #: panels/network/wireless-security/eap-method-fast.c:268
 #: panels/network/wireless-security/eap-method-peap.c:302
-#: panels/network/wireless-security/eap-method-ttls.c:351
+#: 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:289
+#: panels/network/wireless-security/eap-method-ttls.c:299
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
@@ -3389,7 +3642,7 @@ 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:97
+#: panels/network/wireless-security/eap-method-ttls.ui:123
 msgid "_Inner authentication"
 msgstr "內部核對(_I)"
 
@@ -3408,8 +3661,8 @@ 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/user-accounts/data/account-dialog.ui:142
-#: panels/user-accounts/data/account-dialog.ui:505
+#: panels/user-accounts/cc-add-user-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "使用者名稱(_U)"
 
@@ -3431,14 +3684,14 @@ 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:336
+#: 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:430
+#: panels/network/wireless-security/eap-method-ttls.c:440
 msgid "Choose a Certificate Authority certificate"
 msgstr "選擇憑證授權單位 (CA) 憑證"
 
@@ -3452,13 +3705,13 @@ 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:57
+#: panels/network/wireless-security/eap-method-ttls.ui:82
 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:79
+#: panels/network/wireless-security/eap-method-ttls.ui:105
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 憑證(_R)"
 
@@ -3547,22 +3800,28 @@ msgstr "無效的 EAP-TTLS CA 憑證:%s"
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "無效的 EAP-TTLS CA 憑證:沒有指定憑證"
 
-#: panels/network/wireless-security/eap-method-ttls.c:259
+#: panels/network/wireless-security/eap-method-ttls.c:269
 msgid "PAP"
 msgstr "PAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:274
+#: panels/network/wireless-security/eap-method-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:305
+#: panels/network/wireless-security/eap-method-ttls.c:315
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (無 EAP)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:321
+#: panels/network/wireless-security/eap-method-ttls.c:331
 msgid "CHAP"
 msgstr "CHAP"
 
+#: panels/network/wireless-security/eap-method-ttls.ui:56
+#: 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
 msgid "Unknown error validating 802.1X security"
 msgstr "驗證 802.1X 安全加密的未知錯誤"
@@ -3673,96 +3932,92 @@ msgid "_Type"
 msgstr "類型(_T)"
 
 #. This is the per application switch for message tray usage.
-#: panels/notifications/cc-app-notifications-dialog.ui:61
+#: panels/notifications/cc-app-notifications-dialog.ui:60
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "通知(_N)"
 
 #. This is the setting to configure sounds associated with notifications.
-#: panels/notifications/cc-app-notifications-dialog.ui:113
+#: panels/notifications/cc-app-notifications-dialog.ui:112
 msgctxt "notifications"
 msgid "Sound _Alerts"
 msgstr "音效警示(_A)"
 
-#: panels/notifications/cc-app-notifications-dialog.ui:169
+#: panels/notifications/cc-app-notifications-dialog.ui:168
 msgctxt "notifications"
 msgid "Notification _Popups"
 msgstr "彈出式通知(_P)"
 
-#: panels/notifications/cc-app-notifications-dialog.ui:185
+#: panels/notifications/cc-app-notifications-dialog.ui:184
 msgid ""
 "Notifications will continue to appear in the notification list when popups "
 "are disabled."
 msgstr "當彈出視窗被停用時,通知將繼續出現在通知列表中。"
 
 #. Popups here refers to message tray notifications in the middle of the screen.
-#: panels/notifications/cc-app-notifications-dialog.ui:250
+#: panels/notifications/cc-app-notifications-dialog.ui:249
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
 msgstr "在彈出視窗中顯示訊息內容(_C)"
 
-#: panels/notifications/cc-app-notifications-dialog.ui:301
+#: panels/notifications/cc-app-notifications-dialog.ui:300
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "鎖定畫面通知(_L)"
 
-#: panels/notifications/cc-app-notifications-dialog.ui:352
+#: panels/notifications/cc-app-notifications-dialog.ui:351
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "在鎖定畫面中顯示訊息內容(_O)"
 
-#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
-msgid "Notifications"
-msgstr "通知"
+#: 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
+msgid "On"
+msgstr "開啟"
+
+#: panels/notifications/cc-notifications-panel.ui:70
+msgid "Notification _Popups"
+msgstr "彈出式通知(_P)"
+
+#: panels/notifications/cc-notifications-panel.ui:121
+msgid "_Lock Screen Notifications"
+msgstr "鎖定畫面通知(_L)"
 
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
 msgstr "控制要顯示哪種通知及要顯示什麼"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/notifications/gnome-notifications-panel.desktop.in.in:7
-msgid "preferences-system-notifications"
-msgstr "preferences-system-notifications"
-
 #. Translators: Search terms to find the Notifications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:20
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr "Notifications;Banner;Message;Tray;Popup;通知;橫幅;訊息;匣;彈出;"
 
-#: panels/notifications/notifications.ui:84
-msgid "Notification _Popups"
-msgstr "彈出式通知(_P)"
-
-#: panels/notifications/notifications.ui:134
-msgid "_Lock Screen Notifications"
-msgstr "鎖定畫面通知(_L)"
-
-#. List of applications.
-#: panels/notifications/notifications.ui:180 panels/privacy/privacy.ui:875
-#: panels/sound/gvc-mixer-dialog.c:1768
-msgid "Applications"
-msgstr "程式集"
-
-#: panels/online-accounts/cc-online-accounts-panel.c:148
+#: panels/online-accounts/cc-online-accounts-panel.c:150
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他"
 
 #. translators: This is the title of the "Show Account" dialog. The
 #. * %s is the name of the provider. e.g., 'Google'.
-#: panels/online-accounts/cc-online-accounts-panel.c:612
+#: panels/online-accounts/cc-online-accounts-panel.c:627
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:904
+#: panels/online-accounts/cc-online-accounts-panel.c:924
 msgid "Error removing account"
 msgstr "移除帳號時發生錯誤"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: panels/online-accounts/cc-online-accounts-panel.c:969
+#: panels/online-accounts/cc-online-accounts-panel.c:989
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> 已移除"
@@ -3775,11 +4030,6 @@ msgstr "線上帳號"
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "連接到您的線上帳號並決定要用它們來做什麼"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:7
-msgid "goa-panel"
-msgstr "goa-panel"
-
 #. Translators: Search terms to find the Online Accounts panel.
 #. Do NOT translate or localize the semicolons!
 #. The list MUST also end with a semicolon!
@@ -3798,33 +4048,33 @@ msgstr ""
 msgid "Undo"
 msgstr "復原"
 
-#: panels/online-accounts/online-accounts.ui:125
+#: panels/online-accounts/online-accounts.ui:96
 msgid "Connect to your data in the cloud"
 msgstr "連接您雲端上的資料"
 
-#: panels/online-accounts/online-accounts.ui:137
+#: panels/online-accounts/online-accounts.ui:111
 msgid "No internet connection — connect to set up new online accounts"
 msgstr "沒有網際網路連線 — 請連線以設定新的線上帳號"
 
-#: panels/online-accounts/online-accounts.ui:159
+#: panels/online-accounts/online-accounts.ui:136
 msgid "Add an account"
 msgstr "加入帳號"
 
-#: panels/online-accounts/online-accounts.ui:264
+#: panels/online-accounts/online-accounts.ui:243
 msgid "Remove Account"
 msgstr "移除帳號"
 
-#: panels/power/cc-power-panel.c:260
+#: panels/power/cc-power-panel.c:327
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: panels/power/cc-power-panel.c:266
+#: panels/power/cc-power-panel.c:333
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: panels/power/cc-power-panel.c:278
+#: panels/power/cc-power-panel.c:345
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3832,399 +4082,477 @@ 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:286
+#: panels/power/cc-power-panel.c:353
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: panels/power/cc-power-panel.c:287
+#: panels/power/cc-power-panel.c:354
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: panels/power/cc-power-panel.c:288
+#: panels/power/cc-power-panel.c:355
 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:307
+#: panels/power/cc-power-panel.c:373
 #, 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:314
+#: panels/power/cc-power-panel.c:380
 #, 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:319
+#: panels/power/cc-power-panel.c:385
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:324 panels/power/cc-power-panel.c:351
+#: panels/power/cc-power-panel.c:390 panels/power/cc-power-panel.c:420
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424
+#| msgid "Charging"
+msgid "Not charging"
+msgstr "未充電"
+
+#. TRANSLATORS: primary battery
+#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:342
+#: panels/power/cc-power-panel.c:411
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:347
+#: panels/power/cc-power-panel.c:416
 msgid "Discharging"
 msgstr "放電中"
 
-#: panels/power/cc-power-panel.c:465
+#: panels/power/cc-power-panel.c:549
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: panels/power/cc-power-panel.c:467
+#: panels/power/cc-power-panel.c:551
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:535
+#: panels/power/cc-power-panel.c:626
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:538
+#: panels/power/cc-power-panel.c:629
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:541
+#: panels/power/cc-power-panel.c:632
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:544
+#: panels/power/cc-power-panel.c:635
 msgid "Personal digital assistant"
 msgstr "個人數位助理"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:547
+#: panels/power/cc-power-panel.c:638
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:550
+#: panels/power/cc-power-panel.c:641
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:553 panels/wacom/cc-wacom-panel.c:807
+#: panels/power/cc-power-panel.c:644 panels/wacom/cc-wacom-panel.c:848
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:556
+#: panels/power/cc-power-panel.c:647
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:559
+#: panels/power/cc-power-panel.c:650
 msgid "Gaming input device"
 msgstr "遊戲輸入裝置"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:562 panels/power/cc-power-panel.c:814
-#: panels/power/cc-power-panel.c:2400
+#: panels/power/cc-power-panel.c:653 panels/power/cc-power-panel.c:911
+#: panels/power/cc-power-panel.c:2430
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:714
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:721
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:634
+#: panels/power/cc-power-panel.c:726
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:639
+#: panels/power/cc-power-panel.c:731
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:644
+#: panels/power/cc-power-panel.c:736
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:648
+#: panels/power/cc-power-panel.c:740
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: panels/power/cc-power-panel.c:812
+#: panels/power/cc-power-panel.c:909
 msgid "Batteries"
 msgstr "電池"
 
-#: panels/power/cc-power-panel.c:1172
+#: 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:1174
+#: 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:1177
+#: 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:1182
+#: 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:1185
+#: 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:1191
+#: panels/power/cc-power-panel.c:1293
 msgid "0 seconds"
 msgstr "0 秒"
 
-#: panels/power/cc-power-panel.c:1286
+#: panels/power/cc-power-panel.c:1390
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: panels/power/cc-power-panel.c:1736
+#: panels/power/cc-power-panel.c:1835
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: panels/power/cc-power-panel.c:1766
-msgid "_Screen brightness"
+#: panels/power/cc-power-panel.c:1869
+#| msgid "_Screen brightness"
+msgid "_Screen Brightness"
 msgstr "螢幕亮度(_S)"
 
-#: panels/power/cc-power-panel.c:1785
-msgid "Automatic brightness"
+#: panels/power/cc-power-panel.c:1890
+#| msgid "Automatic brightness"
+msgid "Automatic Brightness"
 msgstr "自動亮度"
 
-#: panels/power/cc-power-panel.c:1805
-msgid "_Keyboard brightness"
+#: panels/power/cc-power-panel.c:1903
+#| msgid "_Keyboard brightness"
+msgid "_Keyboard Brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: panels/power/cc-power-panel.c:1815
-msgid "_Dim screen when inactive"
+#: panels/power/cc-power-panel.c:1914
+#| msgid "_Dim screen when inactive"
+msgid "_Dim Screen When Inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: panels/power/cc-power-panel.c:1840
-msgid "_Blank screen"
+#: panels/power/cc-power-panel.c:1932
+#| msgid "_Blank screen"
+msgid "_Blank Screen"
 msgstr "螢幕轉黑(_B)"
 
-#: panels/power/cc-power-panel.c:1877
+#: panels/power/cc-power-panel.c:1955
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: panels/power/cc-power-panel.c:1882
+#: panels/power/cc-power-panel.c:1956
 msgid "Wi-Fi can be turned off to save power."
 msgstr "可以關閉 Wi-Fi 以省電。"
 
-#: panels/power/cc-power-panel.c:1907
-msgid "_Mobile broadband"
+#: panels/power/cc-power-panel.c:1972
+#| msgid "_Mobile broadband"
+msgid "_Mobile Broadband"
 msgstr "行動寬頻(_M)"
 
-#: panels/power/cc-power-panel.c:1912
+#: panels/power/cc-power-panel.c:1973
 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
 msgstr "可以關閉行動數據 (3G、4G、LTE 等等) 以省電。"
 
-#: panels/power/cc-power-panel.c:1971
+#: panels/power/cc-power-panel.c:2023
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: panels/power/cc-power-panel.c:1976
+#: panels/power/cc-power-panel.c:2024
 msgid "Bluetooth can be turned off to save power."
 msgstr "可以關閉藍牙以省電。"
 
-#: panels/power/cc-power-panel.c:2034
+#: panels/power/cc-power-panel.c:2076
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: panels/power/cc-power-panel.c:2036
+#: panels/power/cc-power-panel.c:2078
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: panels/power/cc-power-panel.c:2130
+#: panels/power/cc-power-panel.c:2172
 msgid "Suspend"
 msgstr "暫停"
 
-#: panels/power/cc-power-panel.c:2131
+#: panels/power/cc-power-panel.c:2173
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: panels/power/cc-power-panel.c:2132
+#: panels/power/cc-power-panel.c:2174
 msgid "Hibernate"
 msgstr "休眠"
 
-#: panels/power/cc-power-panel.c:2133
+#: panels/power/cc-power-panel.c:2175
 msgid "Nothing"
 msgstr "沒有"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2233
+#: panels/power/cc-power-panel.c:2275
 msgid "Suspend & Power Button"
 msgstr "暫停和電源按鈕"
 
-#: panels/power/cc-power-panel.c:2271
-msgid "_Automatic suspend"
+#: panels/power/cc-power-panel.c:2316
+#| msgid "Automatic Suspend"
+msgid "_Automatic Suspend"
 msgstr "自動暫停(_A)"
 
-#: panels/power/cc-power-panel.c:2272
+#: panels/power/cc-power-panel.c:2317
 msgid "Automatic suspend"
 msgstr "自動暫停"
 
-#: panels/power/cc-power-panel.c:2335
-msgid "_When the Power Button is pressed"
-msgstr "當按下電源按鈕(_W)"
-
-#: panels/power/cc-power-panel.c:2445 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:247
-msgid "Devices"
-msgstr "裝置"
-
-#: panels/power/gnome-power-panel.desktop.in.in:3
-msgid "Power"
-msgstr "電源"
-
-#: panels/power/gnome-power-panel.desktop.in.in:4
-msgid "View your battery status and change power saving settings"
-msgstr "檢視您的電池狀態並改變電源節省設定值"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/power/gnome-power-panel.desktop.in.in:7
-msgid "gnome-power-manager"
-msgstr "gnome-power-manager"
+#: panels/power/cc-power-panel.c:2374
+#| msgid "Lower Button"
+msgid "Po_wer Button Action"
+msgstr "電源鍵動作(_W)"
 
-#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/power/gnome-power-panel.desktop.in.in:19
-msgid ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"電源;睡眠;暫停;休眠;電池;亮度;轉黑;顯示器;閒置;"
+#. 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 分鐘"
 
-#: panels/power/power.ui:17
+#. 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 分鐘"
 
-#: panels/power/power.ui:21
+#. 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 分鐘"
 
-#: panels/power/power.ui:29
+#. 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 分鐘"
 
-#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
-#: panels/privacy/privacy.ui:56
+#. 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 小時"
 
-#: panels/power/power.ui:37
+#. 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 分鐘"
 
-#: panels/power/power.ui:41
+#. 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 分鐘"
 
-#: panels/power/power.ui:45
+#. 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 分鐘"
 
-#: panels/power/power.ui:49
+#. 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 小時"
 
-#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
+#. 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 分鐘"
 
-#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
+#. 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 分鐘"
 
-#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
+#. 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 分鐘"
 
-#: panels/power/power.ui:75
+#. 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 分鐘"
 
-#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
+#. 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 分鐘"
 
-#: panels/power/power.ui:83
+#. 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 分鐘"
 
-#: panels/power/power.ui:87
+#. 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 分鐘"
 
-#: panels/power/power.ui:91
+#. 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 分鐘"
 
-#: panels/power/power.ui:167
+#. 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 "自動暫停"
 
-#: panels/power/power.ui:192
+#: panels/power/cc-power-panel.ui:172
 msgid "_Plugged In"
 msgstr "插入插頭(_P)"
 
-#: panels/power/power.ui:208
+#: panels/power/cc-power-panel.ui:188
 msgid "On _Battery Power"
 msgstr "使用電池電源(_B)"
 
-#: panels/power/power.ui:253 panels/power/power.ui:313
-#: panels/universal-access/uap.ui:1507
+#: panels/power/cc-power-panel.ui:233 panels/power/cc-power-panel.ui:293
+#: panels/universal-access/cc-ua-panel.ui:1495
 msgid "Delay"
 msgstr "延遲"
 
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "電源"
+
+#: panels/power/gnome-power-panel.desktop.in.in:4
+msgid "View your battery status and change power saving settings"
+msgstr "檢視您的電池狀態並改變電源節省設定值"
+
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+msgstr ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"電源;睡眠;暫停;休眠;電池;亮度;轉黑;顯示器;閒置;"
+
 #: panels/printers/authentication-dialog.ui:11
 msgid " "
 msgstr " "
@@ -4242,7 +4570,7 @@ 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/data/account-dialog.ui:240
+#: panels/user-accounts/cc-add-user-dialog.ui:249
 msgid "Password"
 msgstr "密碼"
 
@@ -4252,45 +4580,45 @@ msgid "Authentication Required"
 msgstr "要求核對"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:809
+#: panels/printers/cc-printers-panel.c:715
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "「%s」印表機已刪除"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:1057
+#: panels/printers/cc-printers-panel.c:938
 msgid "Failed to add new printer."
 msgstr "無法加入新的印表機。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1394
+#: panels/printers/cc-printers-panel.c:1242
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
 
-#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
+#: 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:111
+#: panels/printers/details-dialog.ui:114
 #: panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "驅動程式"
 
-#: panels/printers/details-dialog.ui:147
+#: panels/printers/details-dialog.ui:152
 msgid "Searching for preferred drivers…"
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: panels/printers/details-dialog.ui:169
+#: panels/printers/details-dialog.ui:174
 msgid "Search for Drivers"
 msgstr "正在搜尋驅動程式"
 
-#: panels/printers/details-dialog.ui:177
+#: panels/printers/details-dialog.ui:182
 msgid "Select from Database…"
 msgstr "從資料庫選擇…"
 
-#: panels/printers/details-dialog.ui:185
+#: panels/printers/details-dialog.ui:190
 msgid "Install PPD File…"
 msgstr "安裝 PPD 檔案…"
 
@@ -4302,11 +4630,6 @@ msgstr "印表機"
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr "加入印表機、檢視印表機工作並決定您要如何列印"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/printers/gnome-printers-panel.desktop.in.in:7
-msgid "printer"
-msgstr "printer"
-
 #. Translators: Search terms to find the Printers panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/printers/gnome-printers-panel.desktop.in.in:16
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
@@ -4339,8 +4662,8 @@ msgstr "沒有使用中的印表機工作"
 
 #. Translators: This is the title presented at top of the dialog.
 #: panels/printers/new-printer-dialog.ui:29
-#: panels/printers/pp-new-printer-dialog.c:384
-#: panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/pp-new-printer-dialog.c:363
+#: panels/printers/pp-new-printer-dialog.c:427
 msgid "Add Printer"
 msgstr "加入印表機"
 
@@ -4367,26 +4690,26 @@ 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:893
+#: 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:134
-#: panels/printers/pp-details-dialog.c:434
+#: panels/printers/pp-details-dialog.c:133
+#: panels/printers/pp-details-dialog.c:417
 #, c-format
 msgid "%s Details"
 msgstr "%s 詳細資料"
 
-#: panels/printers/pp-details-dialog.c:183
+#: panels/printers/pp-details-dialog.c:180
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: panels/printers/pp-details-dialog.c:327
+#: panels/printers/pp-details-dialog.c:310
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: panels/printers/pp-details-dialog.c:336
+#: panels/printers/pp-details-dialog.c:319
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4397,7 +4720,7 @@ msgid "Select Printer Driver"
 msgstr "選擇印表機驅動程式"
 
 #: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/um-photo-dialog.c:105
+#: panels/user-accounts/cc-avatar-chooser.c:109
 msgid "Select"
 msgstr "選取"
 
@@ -4406,50 +4729,50 @@ msgid "Loading drivers database…"
 msgstr "正在載入驅動程式資料庫…"
 
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:539
+#: panels/printers/pp-host.c:472
 msgid "JetDirect Printer"
 msgstr "JetDirect 印表機"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:795
+#: panels/printers/pp-host.c:707
 msgid "LPD Printer"
 msgstr "LPD 印表機"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:66
-#: panels/printers/pp-ppd-option-widget.c:70
+#: panels/printers/pp-ipp-option-widget.c:65
+#: panels/printers/pp-ppd-option-widget.c:69
 msgid "One Sided"
 msgstr "單面"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:68
-#: panels/printers/pp-ppd-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:67
+#: panels/printers/pp-ppd-option-widget.c:71
 msgid "Long Edge (Standard)"
 msgstr "長邊 (標準)"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:70
-#: panels/printers/pp-ppd-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:69
+#: panels/printers/pp-ppd-option-widget.c:73
 msgid "Short Edge (Flip)"
 msgstr "短邊 (翻轉)"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:71
 msgid "Portrait"
 msgstr "直向"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:73
 msgid "Landscape"
 msgstr "橫向"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:76
+#: panels/printers/pp-ipp-option-widget.c:75
 msgid "Reverse landscape"
 msgstr "橫向倒轉"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:78
+#: panels/printers/pp-ipp-option-widget.c:77
 msgid "Reverse portrait"
 msgstr "直向倒轉"
 
@@ -4509,186 +4832,197 @@ msgid_plural "%u Jobs Require Authentication"
 msgstr[0] "有 %u 份工作需要核對身份"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: panels/printers/pp-jobs-dialog.c:617
+#: panels/printers/pp-jobs-dialog.c:613
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — 進行中的工作"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:622
+#: panels/printers/pp-jobs-dialog.c:617
 #, c-format
 msgid "Enter credentials to print from %s."
 msgstr "請輸入憑證以從 %s 列印。"
 
-#: panels/printers/pp-new-printer-dialog.c:402
+#: panels/printers/pp-new-printer-dialog.c:380
 msgid "Unlock Print Server"
 msgstr "解鎖印表機伺服器"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:406
+#: panels/printers/pp-new-printer-dialog.c:384
 #, c-format
 msgid "Unlock %s."
 msgstr "解除鎖定 %s。"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:411
+#: panels/printers/pp-new-printer-dialog.c:388
 #, c-format
 msgid "Enter username and password to view printers on %s."
 msgstr "輸入使用者名稱與密碼以檢視在 %s 的印表機。"
 
-#: panels/printers/pp-new-printer-dialog.c:894
+#: panels/printers/pp-new-printer-dialog.c:838
 msgid "Searching for Printers"
 msgstr "正在搜尋印表機"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1814
+#: panels/printers/pp-new-printer-dialog.c:1680
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1819
+#: panels/printers/pp-new-printer-dialog.c:1685
 msgid "Serial Port"
 msgstr "序列埠"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1826
+#: panels/printers/pp-new-printer-dialog.c:1692
 msgid "Parallel Port"
 msgstr "串列埠"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1868
+#: panels/printers/pp-new-printer-dialog.c:1734
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1873
+#: panels/printers/pp-new-printer-dialog.c:1739
 #, 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:1902
+#: panels/printers/pp-new-printer-dialog.c:1766
 msgid "Server requires authentication"
 msgstr "伺服器需要核對身份"
 
-#: panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:90
 msgid "Two Sided"
 msgstr "雙面"
 
-#: panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:91
 msgid "Paper Type"
 msgstr "紙張類型"
 
-#: panels/printers/pp-options-dialog.c:85
+#: panels/printers/pp-options-dialog.c:92
 msgid "Paper Source"
 msgstr "紙張來源"
 
-#: panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:93
 msgid "Output Tray"
 msgstr "出紙匣"
 
-#: panels/printers/pp-options-dialog.c:88
+#: panels/printers/pp-options-dialog.c:94
+#| msgid "Resolution"
+msgctxt "printing option"
+msgid "Resolution"
+msgstr "解析度"
+
+#: panels/printers/pp-options-dialog.c:95
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 前置過濾器"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: panels/printers/pp-options-dialog.c:534
+#: panels/printers/pp-options-dialog.c:548
 msgid "Pages per side"
 msgstr "每張紙的頁數"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: panels/printers/pp-options-dialog.c:546
+#: panels/printers/pp-options-dialog.c:560
 msgid "Two-sided"
 msgstr "雙面"
 
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: panels/printers/pp-options-dialog.c:572
+msgid "Orientation"
+msgstr "方向"
+
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:655
+#: panels/printers/pp-options-dialog.c:669
 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:658
+#: panels/printers/pp-options-dialog.c:672
 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:661
+#: panels/printers/pp-options-dialog.c:675
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "可安裝選項"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:664
+#: panels/printers/pp-options-dialog.c:678
 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:667
+#: panels/printers/pp-options-dialog.c:681
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "影像品質"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: panels/printers/pp-options-dialog.c:670
+#: panels/printers/pp-options-dialog.c:684
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "顏色"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:673
+#: panels/printers/pp-options-dialog.c:687
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "完成"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:676
+#: panels/printers/pp-options-dialog.c:690
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "進階"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:908
+#: panels/printers/pp-options-dialog.c:920
 msgid "Test page"
 msgstr "測試頁"
 
 #. Translators: this is an option of "Paper Source"
-#: panels/printers/pp-ppd-option-widget.c:76
-#: panels/printers/pp-ppd-option-widget.c:78
-#: panels/printers/pp-ppd-option-widget.c:86
+#: panels/printers/pp-ppd-option-widget.c:75
+#: panels/printers/pp-ppd-option-widget.c:77
+#: panels/printers/pp-ppd-option-widget.c:85
 msgid "Auto Select"
 msgstr "自動選擇"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: panels/printers/pp-ppd-option-widget.c:80
-#: panels/printers/pp-ppd-option-widget.c:82
-#: panels/printers/pp-ppd-option-widget.c:84
-#: panels/printers/pp-ppd-option-widget.c:88
+#: panels/printers/pp-ppd-option-widget.c:79
+#: panels/printers/pp-ppd-option-widget.c:81
+#: panels/printers/pp-ppd-option-widget.c:83
+#: panels/printers/pp-ppd-option-widget.c:87
 msgid "Printer Default"
 msgstr "印表機預設"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:90
+#: panels/printers/pp-ppd-option-widget.c:89
 msgid "Embed GhostScript fonts only"
 msgstr "只有內嵌的 GhostScript 字型"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:92
+#: panels/printers/pp-ppd-option-widget.c:91
 msgid "Convert to PS level 1"
 msgstr "轉換為 PS 等級 1"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:94
+#: panels/printers/pp-ppd-option-widget.c:93
 msgid "Convert to PS level 2"
 msgstr "轉換為 PS 等級 2"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:96
+#: panels/printers/pp-ppd-option-widget.c:95
 msgid "No pre-filtering"
 msgstr "無前置過濾器"
 
@@ -4698,123 +5032,123 @@ msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:615 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:606 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:620
+#: panels/printers/pp-printer-entry.c:611
 #, 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:780
+#: panels/printers/pp-printer-entry.c:766
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:768
 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:785
+#: panels/printers/pp-printer-entry.c:771
 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:788
+#: panels/printers/pp-printer-entry.c:774
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:776
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:778
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: panels/printers/pp-printer-entry.c:794
+#: panels/printers/pp-printer-entry.c:780
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:782
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:798
+#: panels/printers/pp-printer-entry.c:784
 msgid "Low on paper"
 msgstr "紙張不足"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:800
+#: panels/printers/pp-printer-entry.c:786
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:802
+#: panels/printers/pp-printer-entry.c:788
 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:804
-#: panels/printers/pp-printer-entry.c:932
+#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:918
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:806
+#: panels/printers/pp-printer-entry.c:792
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: panels/printers/pp-printer-entry.c:808
+#: panels/printers/pp-printer-entry.c:794
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:810
+#: panels/printers/pp-printer-entry.c:796
 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:812
+#: panels/printers/pp-printer-entry.c:798
 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:918
+#: panels/printers/pp-printer-entry.c:904
 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:923
+#: 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:928
+#: 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:952
+#: panels/printers/pp-printer-entry.c:938
 msgid "Clean print heads"
 msgstr "清理列印噴頭"
 
@@ -4881,70 +5215,94 @@ msgstr ""
 "抱歉!系統列印服務\n"
 "似乎無法使用。"
 
-#: panels/privacy/cc-privacy-panel.c:390 panels/privacy/privacy.ui:280
+#: panels/privacy/cc-privacy-panel.c:423 panels/privacy/cc-privacy-panel.ui:280
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
-#: panels/privacy/cc-privacy-panel.c:440
+#: panels/privacy/cc-privacy-panel.c:467
 msgid "In use"
 msgstr "使用中"
 
-#: panels/privacy/cc-privacy-panel.c:445
+#: panels/privacy/cc-privacy-panel.c:472
 msgctxt "Location services status"
 msgid "On"
 msgstr "開"
 
-#: panels/privacy/cc-privacy-panel.c:446
+#: panels/privacy/cc-privacy-panel.c:473
 msgctxt "Location services status"
 msgid "Off"
 msgstr "關"
 
-#: panels/privacy/cc-privacy-panel.c:821 panels/privacy/privacy.ui:745
-msgid "Location Services"
-msgstr "位置服務"
+#: panels/privacy/cc-privacy-panel.c:895
+#| msgid "Off"
+msgctxt "Camera status"
+msgid "Off"
+msgstr "關閉"
 
-#: panels/privacy/cc-privacy-panel.c:942 panels/privacy/privacy.ui:127
+#: 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:1071
+#: panels/privacy/cc-privacy-panel.c:1157
 msgid "Empty all items from Trash?"
 msgstr "要清除垃圾桶中所有的項目?"
 
-#: panels/privacy/cc-privacy-panel.c:1072
+#: panels/privacy/cc-privacy-panel.c:1158
 msgid "All items in the Trash will be permanently deleted."
 msgstr "所有在垃圾桶中的項目會永遠刪除。"
 
-#: panels/privacy/cc-privacy-panel.c:1073
+#: panels/privacy/cc-privacy-panel.c:1159
 msgid "_Empty Trash"
 msgstr "清理垃圾桶(_E)"
 
-#: panels/privacy/cc-privacy-panel.c:1096
+#: panels/privacy/cc-privacy-panel.c:1180
 msgid "Delete all the temporary files?"
 msgstr "刪除所有暫存檔案?"
 
-#: panels/privacy/cc-privacy-panel.c:1097
+#: panels/privacy/cc-privacy-panel.c:1181
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有的暫存檔案會永遠刪除。"
 
-#: panels/privacy/cc-privacy-panel.c:1098
+#: panels/privacy/cc-privacy-panel.c:1182
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: panels/privacy/cc-privacy-panel.c:1120 panels/privacy/privacy.ui:432
+#: 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:1160 panels/privacy/privacy.ui:637
+#: panels/privacy/cc-privacy-panel.c:1237
+#: panels/privacy/cc-privacy-panel.ui:637
 msgid "Software Usage"
 msgstr "軟體使用率"
 
-#: panels/privacy/cc-privacy-panel.c:1201 panels/privacy/privacy.ui:959
+#: 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:1215
+#: panels/privacy/cc-privacy-panel.c:1288
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4953,82 +5311,166 @@ msgstr ""
 "傳送技術問題的報告有助於我們改進 %s。報告是以匿名方式傳送,並且會消除個人資"
 "料。"
 
-#: panels/privacy/cc-privacy-panel.c:1227 panels/privacy/privacy.ui:719
+#: panels/privacy/cc-privacy-panel.c:1300
+#: panels/privacy/cc-privacy-panel.ui:719
 msgid "Privacy Policy"
 msgstr "隱私權原則"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "隱私"
-
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
-msgid "Protect your personal information and control what others might see"
-msgstr "保護您的個人資訊並控制其他人能看到什麼"
-
-#. FIXME
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
-msgid "preferences-system-privacy"
-msgstr "preferences-system-privacy"
-
-#. 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
-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;螢幕;鎖定;診斷;隱私;最近使用;暫存;索引;名稱;網路;身分;"
-
-#: panels/privacy/privacy.ui:14
+#. 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 "螢幕關閉"
 
-#: panels/privacy/privacy.ui:18
+#. 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 秒"
 
-#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
+#. 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 天"
 
-#: panels/privacy/privacy.ui:64
+#. 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 天"
 
-#: panels/privacy/privacy.ui:68
+#. 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 天"
 
-#: panels/privacy/privacy.ui:72
+#. 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 天"
 
-#: panels/privacy/privacy.ui:76
+#. 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 天"
 
-#: panels/privacy/privacy.ui:80
+#. 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 天"
 
-#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
+#. 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 天"
 
-#: panels/privacy/privacy.ui:88
+#. 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 天"
 
-#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
+#. 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 天"
 
-#: panels/privacy/privacy.ui:118
+#. 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/privacy.ui:148
+#: 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."
@@ -5036,61 +5478,62 @@ msgstr ""
 "記住您的歷史紀錄會讓需要再次找到某樣東西時更簡單。這些項目永遠不會透過網路分"
 "享出去。"
 
-#: panels/privacy/privacy.ui:176
+#: panels/privacy/cc-privacy-panel.ui:176
 msgid "_Recently Used"
 msgstr "最近使用(_R)"
 
-#: panels/privacy/privacy.ui:207
+#: panels/privacy/cc-privacy-panel.ui:207
 msgid "Retain _History"
 msgstr "保留歷史紀錄(_H)"
 
-#: panels/privacy/privacy.ui:247
+#: panels/privacy/cc-privacy-panel.ui:247
 msgid "Cl_ear Recent History"
 msgstr "清除最近歷史紀錄(_E)"
 
-#: panels/privacy/privacy.ui:301
+#: panels/privacy/cc-privacy-panel.ui:301
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "螢幕鎖可以在您離開時保護您的隱私。"
 
-#: panels/privacy/privacy.ui:328
+#: panels/privacy/cc-privacy-panel.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "自動鎖定螢幕(_L)"
 
-#: panels/privacy/privacy.ui:362
+#: panels/privacy/cc-privacy-panel.ui:362
 msgid "Lock screen _after blank for"
 msgstr "螢幕轉黑後多久鎖定螢幕(_A)"
 
-#: panels/privacy/privacy.ui:394
-msgid "Show _Notifications"
-msgstr "顯示通知(_N)"
+#: panels/privacy/cc-privacy-panel.ui:394
+#| msgid "_Lock Screen Notifications"
+msgid "Lock Screen _Notifications"
+msgstr "鎖定畫面通知(_N)"
 
-#: panels/privacy/privacy.ui:454
+#: 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/privacy.ui:483
+#: panels/privacy/cc-privacy-panel.ui:483
 msgid "Automatically empty _Trash"
 msgstr "自動清空垃圾桶(_T)"
 
-#: panels/privacy/privacy.ui:515
+#: panels/privacy/cc-privacy-panel.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "自動清除暫存檔案(_F)"
 
-#: panels/privacy/privacy.ui:546
+#: panels/privacy/cc-privacy-panel.ui:546
 msgid "Purge _After"
 msgstr "清除於(_A)"
 
-#: panels/privacy/privacy.ui:590
+#: panels/privacy/cc-privacy-panel.ui:590
 msgid "_Empty Trash…"
 msgstr "清理垃圾桶(_E)…"
 
-#: panels/privacy/privacy.ui:606
+#: panels/privacy/cc-privacy-panel.ui:606
 msgid "_Purge Temporary Files…"
 msgstr "清理暫存檔案(_P)…"
 
-#: panels/privacy/privacy.ui:654
+#: 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 "
@@ -5104,11 +5547,32 @@ msgstr ""
 "\n"
 "我們所收集的所有資訊都是匿名的,而且我們永遠不會將您的資料與任何第三方分享。"
 
-#: panels/privacy/privacy.ui:681
+#: panels/privacy/cc-privacy-panel.ui:681
 msgid "_Send software usage statistics"
 msgstr "傳送軟體使用率統計(_S)"
 
-#: panels/privacy/privacy.ui:764
+#: 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 "使用相機以讓應用程式能拍照或錄影。停用相機可能導致部份應用程式不能正常運作。"
+
+#: panels/privacy/cc-privacy-panel.ui:812
+#| msgid "%s Camera"
+msgid "_Camera"
+msgstr "相機(_C)"
+
+#: 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/privacy/cc-privacy-panel.ui:917
+msgid "_Microphone"
+msgstr "麥克風(_M)"
+
+#: panels/privacy/cc-privacy-panel.ui:974
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
@@ -5116,7 +5580,7 @@ msgstr ""
 "位置服務允許應用程式知道您的所在位置。使用 Wi-Fi 和行動寬頻可以提高定位精準"
 "度。"
 
-#: panels/privacy/privacy.ui:778
+#: panels/privacy/cc-privacy-panel.ui:988
 msgid ""
 "Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
 "com/privacy'>Privacy Policy</a>"
@@ -5124,25 +5588,43 @@ msgstr ""
 "使用 Mozilla 位置服務:<a href='https://location.services.mozilla.com/";
 "privacy'>隱私服務</a>"
 
-#: panels/privacy/privacy.ui:828
+#: panels/privacy/cc-privacy-panel.ui:1038
 msgid "_Location Services"
 msgstr "位置服務(_L)"
 
-#: panels/privacy/privacy.ui:1026
+#: panels/privacy/cc-privacy-panel.ui:1236
 msgid "_Automatic Problem Reporting"
 msgstr "自動回報問題(_A)"
 
-#: panels/region/cc-format-chooser.c:114
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
+msgstr "隱私"
+
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
+msgid "Protect your personal information and control what others might see"
+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
+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;螢幕;鎖定;診斷;隱私;最近使用;暫存;索引;名稱;網路;身分;"
+
+#: panels/region/cc-format-chooser.c:133
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: panels/region/cc-format-chooser.c:116
+#: panels/region/cc-format-chooser.c:135
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: panels/region/cc-format-chooser.c:277
+#: panels/region/cc-format-chooser.c:314
 msgid "No regions found"
 msgstr "找不到區域"
 
@@ -5150,264 +5632,229 @@ msgstr "找不到區域"
 msgid "Formats"
 msgstr "格式"
 
-#: panels/region/cc-format-chooser.ui:120
+#: panels/region/cc-format-chooser.ui:106
 msgid "Preview"
 msgstr "預覽"
 
-#: panels/region/cc-format-chooser.ui:137
+#: panels/region/cc-format-chooser.ui:123
 msgid "Dates"
 msgstr "日期"
 
-#: panels/region/cc-format-chooser.ui:168
-msgid "Times"
-msgstr "時刻"
-
-#: panels/region/cc-format-chooser.ui:199
+#: panels/region/cc-format-chooser.ui:185
 msgid "Dates & Times"
 msgstr "日期與時刻"
 
-#: panels/region/cc-format-chooser.ui:230
+#: panels/region/cc-format-chooser.ui:216
 msgid "Numbers"
 msgstr "數字"
 
-#: panels/region/cc-format-chooser.ui:247
+#: panels/region/cc-format-chooser.ui:233
 msgid "Measurement"
 msgstr "度量衡"
 
-#: panels/region/cc-format-chooser.ui:264
+#: panels/region/cc-format-chooser.ui:250
 msgid "Paper"
 msgstr "紙張"
 
-#: panels/region/cc-input-chooser.c:182
+#: panels/region/cc-input-chooser.c:193
 msgid "No input sources found"
 msgstr "找不到輸入來源"
 
-#: panels/region/cc-input-chooser.c:981
+#: panels/region/cc-input-chooser.c:948
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: panels/region/cc-region-panel.c:802
-msgid "No input source selected"
-msgstr "尚未選擇輸入來源"
+#: panels/region/cc-input-chooser.ui:5
+msgid "Add an Input Source"
+msgstr "加入輸入來源"
+
+#: panels/region/cc-input-chooser.ui:77
+msgid "Input methods can’t be used on the login screen"
+msgstr "輸入法無法在登入畫面中使用"
 
-#: panels/region/cc-region-panel.c:1597
+#: panels/region/cc-region-panel.c:1512
 msgid "Login _Screen"
 msgstr "登入畫面(_S)"
 
-#: panels/region/gnome-region-panel.desktop.in.in:3
-msgid "Region & Language"
-msgstr "地區和語言"
+#: panels/region/cc-region-panel.ui:64
+#: panels/user-accounts/cc-user-panel.ui:364
+msgid "_Language"
+msgstr "語言(_L)"
 
-#: panels/region/gnome-region-panel.desktop.in.in:4
-msgid ""
-"Select your display language, formats, keyboard layouts and input sources"
-msgstr "選擇您的顯示語言、格式、鍵盤配置和輸入來源"
+#: panels/region/cc-region-panel.ui:99
+msgid "Restart the session for changes to take effect"
+msgstr "須要重新啟動作業階段才能讓變更生效"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/region/gnome-region-panel.desktop.in.in:7
-msgid "preferences-desktop-locale"
-msgstr "preferences-desktop-locale"
+#: panels/region/cc-region-panel.ui:114
+msgid "Restart…"
+msgstr "重新啟動…"
 
-#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/region/gnome-region-panel.desktop.in.in:19
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
+#: panels/region/cc-region-panel.ui:147
+msgid "_Formats"
+msgstr "格式(_F)"
 
-#: panels/region/input-chooser.ui:5
-msgid "Add an Input Source"
-msgstr "加入輸入來源"
+#: panels/region/cc-region-panel.ui:195
+msgid "Input Sources"
+msgstr "輸入來源"
 
-#: panels/region/input-chooser.ui:77
-msgid "Input methods can’t be used on the login screen"
-msgstr "輸入法無法在登入畫面中使用"
+#: panels/region/cc-region-panel.ui:209
+#| msgid "Select keyboards or other input sources"
+msgid "Choose keyboard layouts or input methods."
+msgstr "請選取鍵盤配置或輸入法。"
+
+#: panels/region/cc-region-panel.ui:266
+msgid "No input source selected"
+msgstr "尚未選擇輸入來源"
 
-#: panels/region/input-options.ui:7
+#: panels/region/cc-region-panel.ui:300
+msgid "Login settings are used by all users when logging into the system"
+msgstr "登入設定值是所有的使用者在登入系統時會用到的"
+
+#: panels/region/cc-region-panel.ui:337
 msgid "Input Source Options"
 msgstr "輸入來源選項"
 
-#: panels/region/input-options.ui:27
+#: panels/region/cc-region-panel.ui:352
 msgid "Use the _same source for all windows"
 msgstr "在所有視窗中使用相同的來源(_S)"
 
-#: panels/region/input-options.ui:45
+#: panels/region/cc-region-panel.ui:370
 msgid "Allow _different sources for each window"
 msgstr "每個視窗使用不同的輸入來源(_D)"
 
-#: panels/region/input-options.ui:85
-msgid "Switch to previous source"
-msgstr "切換至上個來源"
+#: panels/region/cc-region-panel.ui:412
+#| msgid "Previous track"
+msgid "Previous source"
+msgstr "上一個來源"
 
-#: panels/region/input-options.ui:102
+#: panels/region/cc-region-panel.ui:430
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
-#: panels/region/input-options.ui:116
-msgid "Switch to next source"
-msgstr "切換至下個來源"
+#: panels/region/cc-region-panel.ui:445
+#| msgid "Resources"
+msgid "Next source"
+msgstr "下一個來源"
 
-#: panels/region/input-options.ui:133
+#: panels/region/cc-region-panel.ui:463
 msgid "Super+Space"
 msgstr "Super+Space"
 
-#: panels/region/input-options.ui:147
-msgid "You can change these shortcuts in the keyboard settings"
-msgstr "您可以在鍵盤設定值中改變這些快捷鍵"
-
-#: panels/region/input-options.ui:164
-msgid "Alternative switch to next source"
-msgstr "切換至下個來源的替代鍵"
-
-#: panels/region/input-options.ui:181
+#: panels/region/cc-region-panel.ui:478
 msgid "Left+Right Alt"
 msgstr "左+右 Alt"
 
-#: panels/region/region.ui:71
-#: panels/user-accounts/data/user-accounts-dialog.ui:348
-msgid "_Language"
-msgstr "語言(_L)"
-
-#: panels/region/region.ui:89
-msgid "English (United Kingdom)"
-msgstr "英文 (英國)"
+#: 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 "可以在鍵盤設定中變更這些鍵盤快捷鍵"
 
-#: panels/region/region.ui:116
-msgid "Restart the session for changes to take effect"
-msgstr "須要重新啟動作業階段才能讓變更生效"
-
-#: panels/region/region.ui:138
-msgid "Restart…"
-msgstr "重新啟動…"
-
-#: panels/region/region.ui:174
-msgid "_Formats"
-msgstr "格式(_F)"
-
-#: panels/region/region.ui:192
-msgid "United Kingdom"
-msgstr "英國"
-
-#: panels/region/region.ui:234
-msgid "Input Sources"
-msgstr "輸入來源"
-
-#: panels/region/region.ui:250
-msgid "_Options"
-msgstr "選項(_O)"
-
-#: panels/region/region.ui:318
-msgid "Add input source"
-msgstr "加入輸入來源"
-
-#: panels/region/region.ui:344
-msgid "Remove input source"
-msgstr "移除輸入來源"
-
-#: panels/region/region.ui:395
-msgid "Move input source up"
-msgstr "將輸入來源往上移"
-
-#: panels/region/region.ui:421
-msgid "Move input source down"
-msgstr "將輸入來源往下移"
-
-#: panels/region/region.ui:472
-msgid "Configure input source"
-msgstr "設定輸入來源"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "地區和語言"
 
-#: panels/region/region.ui:498
-msgid "Show input source keyboard layout"
-msgstr "顯示輸入來源鍵盤配置"
+#: panels/region/gnome-region-panel.desktop.in.in:4
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr "選擇您的顯示語言、格式、鍵盤配置和輸入來源"
 
-#: panels/region/region.ui:542
-msgid "Login settings are used by all users when logging into the system"
-msgstr "登入設定值是所有的使用者在登入系統時會用到的"
+#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/region/gnome-region-panel.desktop.in.in:19
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
 
-#: panels/search/cc-search-locations-dialog.c:600
+#: panels/search/cc-search-locations-dialog.c:611
 msgid "Select Location"
 msgstr "選擇位置"
 
-#: panels/search/cc-search-locations-dialog.c:604
+#: panels/search/cc-search-locations-dialog.c:615
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: panels/search/cc-search-panel.c:175
+#: panels/search/cc-search-panel.c:153
 msgid "No applications found"
 msgstr "找不到應用程式"
 
+#: panels/search/cc-search-panel-row.ui:92
+msgid "Move Up"
+msgstr "往上移"
+
+#: panels/search/cc-search-panel-row.ui:102
+msgid "Move Down"
+msgstr "往下移"
+
+#: panels/search/cc-search-panel.ui:32
+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 "搜尋位置"
+
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr "控制在活動概覽中哪些應用程式會顯示在搜尋結果中"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/search/gnome-search-panel.desktop.in.in:7
-msgid "preferences-system-search"
-msgstr "preferences-system-search"
-
 #. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/search/gnome-search-panel.desktop.in.in:19
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr "Search;Find;Index;Hide;Privacy;Results;搜尋;尋找;索引;隱藏;隱私;結果;"
 
-#: panels/search/search-locations-dialog.ui:9
-msgid "Search Locations"
-msgstr "搜尋位置"
+#: 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:43
+#: panels/search/search-locations-dialog.ui:52
 msgid "Places"
 msgstr "位置"
 
-#: panels/search/search-locations-dialog.ui:73
+#: panels/search/search-locations-dialog.ui:91
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: panels/search/search-locations-dialog.ui:130
+#: panels/search/search-locations-dialog.ui:156
 msgid "Other"
 msgstr "其他"
 
-#: panels/search/search.ui:71
-msgid "Move Up"
-msgstr "往上移"
-
-#: panels/search/search.ui:88
-msgid "Move Down"
-msgstr "往下移"
-
-#: panels/search/search.ui:124
-msgid "Preferences"
-msgstr "偏好設定"
-
 #. Label
-#: panels/sharing/cc-sharing-networks.c:302
+#: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "沒有選擇用來分享的網路"
 
-#: panels/sharing/cc-sharing-panel.c:318
+#: panels/sharing/cc-sharing-panel.c:320
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: panels/sharing/cc-sharing-panel.c:320 panels/sharing/cc-sharing-panel.c:347
+#: panels/sharing/cc-sharing-panel.c:322 panels/sharing/cc-sharing-panel.c:349
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: panels/sharing/cc-sharing-panel.c:350
+#: panels/sharing/cc-sharing-panel.c:352
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "已啟用"
 
-#: panels/sharing/cc-sharing-panel.c:353
+#: panels/sharing/cc-sharing-panel.c:355
 msgctxt "service is active"
 msgid "Active"
 msgstr "使用中"
 
-#: panels/sharing/cc-sharing-panel.c:423
+#: panels/sharing/cc-sharing-panel.c:425
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: panels/sharing/cc-sharing-panel.c:720
+#: panels/sharing/cc-sharing-panel.c:726
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
@@ -5416,7 +5863,7 @@ msgstr ""
 "檔案分享允許您使用 <a href=\"dav://%s\">dav://%s</a> 與目前網路上的其他人分享"
 "您的公開資料夾"
 
-#: panels/sharing/cc-sharing-panel.c:722
+#: panels/sharing/cc-sharing-panel.c:728
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5426,7 +5873,7 @@ msgstr ""
 "當啟用遠端登入時,遠端使用者可以使用 SSH 指令連線:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:724
+#: panels/sharing/cc-sharing-panel.c:730
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5435,399 +5882,322 @@ msgstr ""
 "螢幕分享允許遠端使用者連線到 <a href=\"vnc://%s\">vnc://%s</a> 檢視或控制您的"
 "螢幕"
 
-#: panels/sharing/cc-sharing-panel.c:828
+#: panels/sharing/cc-sharing-panel.c:834
 msgid "Copy"
 msgstr "複製"
 
-#: panels/sharing/cc-sharing-panel.c:1279
+#: panels/sharing/cc-sharing-panel.c:1287
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "分享"
 
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
-msgid "Control what you want to share with others"
-msgstr "控制您想要與其他人分享什麼"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
-msgid "preferences-system-sharing"
-msgstr "preferences-system-sharing"
-
-#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
-msgid ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;"
-msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"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 "啟用或停用遠端登入"
-
-#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
-msgid "Authentication is required to enable or disable remote login"
-msgstr "啟用或停用遠端登入需要核對"
-
-#: panels/sharing/sharing.ui:50
+#: panels/sharing/cc-sharing-panel.ui:34
 msgid "_Computer Name"
 msgstr "電腦名稱(_C)"
 
-#: panels/sharing/sharing.ui:108
+#: panels/sharing/cc-sharing-panel.ui:94
 msgid "_File Sharing"
 msgstr "檔案分享(_F)"
 
-#: panels/sharing/sharing.ui:151
+#: panels/sharing/cc-sharing-panel.ui:139
 msgid "_Screen Sharing"
 msgstr "螢幕分享(_S)"
 
-#: panels/sharing/sharing.ui:194
+#: panels/sharing/cc-sharing-panel.ui:184
 msgid "_Media Sharing"
 msgstr "媒體分享(_M)"
 
-#: panels/sharing/sharing.ui:237
+#: panels/sharing/cc-sharing-panel.ui:229
 msgid "_Remote Login"
 msgstr "遠端登入(_R)"
 
-#: panels/sharing/sharing.ui:276
+#: panels/sharing/cc-sharing-panel.ui:268
 msgid "Some services are disabled because of no network access."
 msgstr "由於沒有網路存取,某些服務已停用。"
 
-#: panels/sharing/sharing.ui:292 panels/sharing/sharing.ui:419
+#: panels/sharing/cc-sharing-panel.ui:286
+#: panels/sharing/cc-sharing-panel.ui:413
 msgid "File Sharing"
 msgstr "檔案分享"
 
-#: panels/sharing/sharing.ui:339
+#: panels/sharing/cc-sharing-panel.ui:333
 msgid "_Require Password"
 msgstr "需要密碼(_R)"
 
-#: panels/sharing/sharing.ui:430 panels/sharing/sharing.ui:502
+#: panels/sharing/cc-sharing-panel.ui:424
+#: panels/sharing/cc-sharing-panel.ui:494
 msgid "Remote Login"
 msgstr "遠端登入"
 
-#: panels/sharing/sharing.ui:525 panels/sharing/sharing.ui:771
+#: panels/sharing/cc-sharing-panel.ui:517
+#: panels/sharing/cc-sharing-panel.ui:763
 msgid "Screen Sharing"
 msgstr "螢幕分享"
 
-#: panels/sharing/sharing.ui:583
+#: panels/sharing/cc-sharing-panel.ui:575
 msgid "_Allow connections to control the screen"
 msgstr "允許連線控制螢幕(_A)"
 
-#: panels/sharing/sharing.ui:628
+#: panels/sharing/cc-sharing-panel.ui:620
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: panels/sharing/sharing.ui:658
+#: panels/sharing/cc-sharing-panel.ui:650
 msgid "_Show Password"
 msgstr "顯示密碼(_S)"
 
-#: panels/sharing/sharing.ui:689
+#: panels/sharing/cc-sharing-panel.ui:681
 msgid "Access Options"
 msgstr "存取選項"
 
-#: panels/sharing/sharing.ui:703
+#: panels/sharing/cc-sharing-panel.ui:695
 msgid "_New connections must ask for access"
 msgstr "存取新的連線必須詢問(_N)"
 
-#: panels/sharing/sharing.ui:721
+#: panels/sharing/cc-sharing-panel.ui:713
 msgid "_Require a password"
 msgstr "需要密碼(_R)"
 
-#: panels/sharing/sharing.ui:782 panels/sharing/sharing.ui:876
+#: panels/sharing/cc-sharing-panel.ui:774
+#: panels/sharing/cc-sharing-panel.ui:868
 msgid "Media Sharing"
 msgstr "媒體分享"
 
-#: panels/sharing/sharing.ui:815
+#: panels/sharing/cc-sharing-panel.ui:807
 msgid "Share music, photos and videos over the network."
 msgstr "透過網路分享音樂、相片和影片。"
 
-#: panels/sharing/sharing.ui:830
+#: panels/sharing/cc-sharing-panel.ui:822
 msgid "Folders"
 msgstr "資料夾"
 
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
-msgid "Sound"
-msgstr "音效"
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
+msgid "Control what you want to share with others"
+msgstr "控制您想要與其他人分享什麼"
 
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
-msgid "Change sound levels, inputs, outputs, and alert sounds"
-msgstr "改變音效的音量、輸入、輸出和警示音效"
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
+msgstr ""
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;分享;主機;名稱;遠端;桌面;媒體;音效;影片;圖片;相片;伺服"
+"器;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
-msgid "multimedia-volume-control"
-msgstr "multimedia-volume-control"
+#: panels/sharing/networks.ui:19
+msgid "Networks"
+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/data/gnome-sound-panel.desktop.in.in:20
-msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
-msgstr ""
-"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;音效卡;麥克風;音"
-"量;淡化;平衡;藍牙;耳機;音效;"
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
+msgid "Enable or disable remote login"
+msgstr "啟用或停用遠端登入"
+
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
+msgid "Authentication is required to enable or disable remote login"
+msgstr "啟用或停用遠端登入需要核對"
+
+#: panels/sound/cc-alert-chooser.c:151
+msgid "Custom"
+msgstr "自訂"
 
-#. Translators: This is the name of an audio file that sounds like the bark of a dog.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:6
+#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9
 msgid "Bark"
 msgstr "汪汪"
 
-#. Translators: This is the name of an audio file that sounds like a water drip.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:12
+#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15
 msgid "Drip"
 msgstr "水滴聲"
 
-#. Translators: This is the name of an audio file that sounds like tapping glass.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:18
+#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21
 msgid "Glass"
 msgstr "敲玻璃"
 
-#. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:24
+#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27
 msgid "Sonar"
 msgstr "聲納"
 
-#: panels/sound/gvc-balance-bar.c:104
-msgctxt "balance"
-msgid "Left"
-msgstr "左"
-
-#: panels/sound/gvc-balance-bar.c:105
-msgctxt "balance"
-msgid "Right"
-msgstr "右"
-
-#: panels/sound/gvc-balance-bar.c:108
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:13
+#| msgctxt "balance"
+#| msgid "Rear"
 msgid "Rear"
 msgstr "後"
 
-#: panels/sound/gvc-balance-bar.c:109
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:15
+#| msgctxt "balance"
+#| msgid "Front"
 msgid "Front"
 msgstr "前"
 
-#: panels/sound/gvc-balance-bar.c:112
-msgctxt "balance"
-msgid "Minimum"
-msgstr "最小值"
-
-#: panels/sound/gvc-balance-bar.c:113
-msgctxt "balance"
-msgid "Maximum"
-msgstr "最大值"
-
-#: panels/sound/gvc-balance-bar.c:288
-msgid "_Balance:"
-msgstr "平衡(_B):"
-
-#: panels/sound/gvc-balance-bar.c:291
-msgid "_Fade:"
-msgstr "淡化(_F):"
-
-#: panels/sound/gvc-balance-bar.c:294
-msgid "_Subwoofer:"
-msgstr "重低音(_S):"
-
-#: panels/sound/gvc-channel-bar.c:610 panels/sound/gvc-channel-bar.c:619
-msgctxt "volume"
-msgid "100%"
-msgstr "100%"
-
-#: panels/sound/gvc-channel-bar.c:614
-msgctxt "volume"
-msgid "Unamplified"
-msgstr "未經放大"
-
-#: panels/sound/gvc-combo-box.c:166 panels/sound/gvc-mixer-dialog.c:253
-#: panels/sound/gvc-mixer-dialog.c:520
-msgid "_Profile:"
-msgstr "設定檔(_P):"
-
-#: panels/sound/gvc-mixer-dialog.c:255
-msgid "_Test Speakers"
-msgstr "測試喇叭(_T)"
-
-#: panels/sound/gvc-mixer-dialog.c:424
-msgid "Peak detect"
-msgstr "峰值檢測"
+#: panels/sound/cc-output-test-dialog.c:134
+#, c-format
+#| msgid "Settings"
+msgid "Testing %s"
+msgstr "正在測試 %s"
 
-#: panels/sound/gvc-mixer-dialog.c:1499
-msgid "Device"
-msgstr "裝置"
+#: panels/sound/cc-output-test-dialog.ui:127
+msgid "Click a speaker to test"
+msgstr "按一下喇叭以測試"
 
-#: panels/sound/gvc-mixer-dialog.c:1562
-#, c-format
-msgid "Speaker Testing for %s"
-msgstr "%s 的喇叭測試"
+#: panels/sound/cc-sound-panel.ui:29
+#| msgid "System Sounds"
+msgid "System Volume"
+msgstr "系統音量"
 
-#: panels/sound/gvc-mixer-dialog.c:1617
-msgid "_Output volume:"
-msgstr "輸出音量(_O):"
+#: panels/sound/cc-sound-panel.ui:45
+#| msgid "Volume mute"
+msgid "Volume Levels"
+msgstr "音量等級"
 
-#: panels/sound/gvc-mixer-dialog.c:1631
+#: panels/sound/cc-sound-panel.ui:67
 msgid "Output"
 msgstr "輸出"
 
-#: panels/sound/gvc-mixer-dialog.c:1636
-msgid "C_hoose a device for sound output:"
-msgstr "選擇聲音輸出的裝置(_H):"
+#: panels/sound/cc-sound-panel.ui:94
+#| msgid "_Output volume:"
+msgid "Output Device"
+msgstr "輸出裝置"
 
-#: panels/sound/gvc-mixer-dialog.c:1658
-msgid "Settings for the selected device:"
-msgstr "已選取裝置的設定值:"
-
-#: panels/sound/gvc-mixer-dialog.c:1669
-msgid "Input"
-msgstr "輸入"
-
-#: panels/sound/gvc-mixer-dialog.c:1676
-msgid "_Input volume:"
-msgstr "輸入音量(_I):"
-
-#: panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input level:"
-msgstr "輸入等級:"
-
-#: panels/sound/gvc-mixer-dialog.c:1723
-msgid "C_hoose a device for sound input:"
-msgstr "選擇聲音輸入的裝置(_H):"
-
-#: panels/sound/gvc-mixer-dialog.c:1747
-msgid "Sound Effects"
-msgstr "聲音效果"
+#: panels/sound/cc-sound-panel.ui:117
+msgid "Test"
+msgstr "測試"
 
-#: panels/sound/gvc-mixer-dialog.c:1754
-msgid "_Alert volume:"
-msgstr "警示音量(_A):"
+#: panels/sound/cc-sound-panel.ui:148 panels/sound/cc-sound-panel.ui:325
+#| msgid "_Configuration URL"
+msgid "Configuration"
+msgstr "設定"
 
-#: panels/sound/gvc-mixer-dialog.c:1775
-msgid "No application is currently playing or recording audio."
-msgstr "沒有應用程式目前正在播放或錄製音效。"
+#: panels/sound/cc-sound-panel.ui:181
+#| msgid "_Balance:"
+msgid "Balance"
+msgstr "平衡"
 
-#: panels/sound/gvc-sound-theme-chooser.c:187
-msgid "Built-in"
-msgstr "內建"
+#: panels/sound/cc-sound-panel.ui:208
+#| msgid "_Fade:"
+msgid "Fade"
+msgstr "淡化"
 
-#: panels/sound/gvc-sound-theme-chooser.c:446
-#: panels/sound/gvc-sound-theme-chooser.c:458
-#: panels/sound/gvc-sound-theme-chooser.c:470
-msgid "Sound Preferences"
-msgstr "音效偏好設定"
+#: panels/sound/cc-sound-panel.ui:235
+msgid "Subwoofer"
+msgstr "重低音"
 
-#: panels/sound/gvc-sound-theme-chooser.c:449
-#: panels/sound/gvc-sound-theme-chooser.c:460
-#: panels/sound/gvc-sound-theme-chooser.c:472
-msgid "Testing event sound"
-msgstr "測試事件聲音"
+#: panels/sound/cc-sound-panel.ui:257
+msgid "Input"
+msgstr "輸入"
 
-#: panels/sound/gvc-sound-theme-chooser.c:544
-#: panels/wacom/wacom-stylus-page.ui:25
-msgid "Default"
-msgstr "預設值"
+#: panels/sound/cc-sound-panel.ui:284
+#| msgid "Input level:"
+msgid "Input Device"
+msgstr "輸入裝置"
 
-#: panels/sound/gvc-sound-theme-chooser.c:545
-msgid "From theme"
-msgstr "從主題"
+#: panels/sound/cc-sound-panel.ui:358
+#| msgid "Volume up"
+msgid "Volume"
+msgstr "音量"
 
-#: panels/sound/gvc-sound-theme-chooser.c:720
-msgid "C_hoose an alert sound:"
-msgstr "選擇警示音效(_H):"
+#: panels/sound/cc-sound-panel.ui:380
+#| msgid "_Alert volume:"
+msgid "Alert Sound"
+msgstr "警示音效"
 
-#: panels/sound/gvc-speaker-test.c:229
-msgid "Stop"
-msgstr "停止"
+#: panels/sound/cc-volume-slider.c:92
+msgctxt "volume"
+msgid "100%"
+msgstr "100%"
 
-#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
-msgid "Test"
-msgstr "測試"
+#: panels/sound/gnome-sound-panel.desktop.in.in:3
+msgid "Sound"
+msgstr "音效"
 
-#: panels/sound/gvc-speaker-test.c:237
-msgid "Subwoofer"
-msgstr "重低音"
+#: panels/sound/gnome-sound-panel.desktop.in.in:4
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "改變音效的音量、輸入、輸出和警示音效"
 
-#: panels/sound/sound-theme-file-utils.c:288
-msgid "Custom"
-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;"
+"音效卡;麥克風;音量;淡化;平衡;藍牙;耳機;音效;輸出;輸入;"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:86
-#: panels/thunderbolt/cc-bolt-device-entry.c:119
+#: panels/thunderbolt/cc-bolt-device-dialog.c:94
+#: panels/thunderbolt/cc-bolt-device-entry.c:125
 msgctxt "Thunderbolt Device Status"
 msgid "Disconnected"
 msgstr "斷線"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:89
-#: panels/thunderbolt/cc-bolt-device-entry.c:122
+#: panels/thunderbolt/cc-bolt-device-dialog.c:97
+#: panels/thunderbolt/cc-bolt-device-entry.c:128
 msgctxt "Thunderbolt Device Status"
 msgid "Connecting"
 msgstr "連線中"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:92
-#: panels/thunderbolt/cc-bolt-device-entry.c:126
-#: panels/thunderbolt/cc-bolt-device-entry.c:138
+#: panels/thunderbolt/cc-bolt-device-dialog.c:100
+#: panels/thunderbolt/cc-bolt-device-entry.c:132
+#: panels/thunderbolt/cc-bolt-device-entry.c:144
 msgctxt "Thunderbolt Device Status"
 msgid "Connected"
 msgstr "已連線"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:95
+#: panels/thunderbolt/cc-bolt-device-dialog.c:103
 msgctxt "Thunderbolt Device Status"
 msgid "Authorization Error"
 msgstr "認證失敗"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:98
-#: panels/thunderbolt/cc-bolt-device-entry.c:132
+#: panels/thunderbolt/cc-bolt-device-dialog.c:106
+#: panels/thunderbolt/cc-bolt-device-entry.c:138
 msgctxt "Thunderbolt Device Status"
 msgid "Authorizing"
 msgstr "正在認證"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:105
+#: panels/thunderbolt/cc-bolt-device-dialog.c:113
 msgctxt "Thunderbolt Device Status"
 msgid "Reduced Functionality"
 msgstr "功能較少"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:107
+#: panels/thunderbolt/cc-bolt-device-dialog.c:115
 msgctxt "Thunderbolt Device Status"
 msgid "Connected & Authorized"
 msgstr "已連線、認證"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:113
-#: panels/thunderbolt/cc-bolt-device-entry.c:146
+#: panels/thunderbolt/cc-bolt-device-dialog.c:121
+#: panels/thunderbolt/cc-bolt-device-entry.c:152
 msgctxt "Thunderbolt Device Status"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: The time point the device was authorized.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:169
+#: panels/thunderbolt/cc-bolt-device-dialog.c:177
 msgid "Authorized at:"
 msgstr "認證於:"
 
 #. Translators: The time point the device was connected.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:175
+#: panels/thunderbolt/cc-bolt-device-dialog.c:183
 msgid "Connected at:"
 msgstr "連線於:"
 
 #. Translators: The time point the device was enrolled,
 #. * i.e. authorized and stored in the device database.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:182
+#: panels/thunderbolt/cc-bolt-device-dialog.c:190
 msgid "Enrolled at:"
 msgstr "登錄於:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:250
+#: panels/thunderbolt/cc-bolt-device-dialog.c:264
 msgid "Failed to authorize device: "
 msgstr "認證裝置失敗:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:327
+#: panels/thunderbolt/cc-bolt-device-dialog.c:333
 msgid "Failed to forget device: "
 msgstr "遺忘裝置失敗:"
 
+#: panels/thunderbolt/cc-bolt-device-dialog.c:491
+#, c-format
+msgid "Depends on %u other device"
+msgid_plural "Depends on %u other devices"
+msgstr[0] "基於其他 %u 個裝置"
+
 #: panels/thunderbolt/cc-bolt-device-dialog.ui:109
 msgid "Name:"
 msgstr "名稱:"
@@ -5840,30 +6210,30 @@ msgstr "狀態:"
 msgid "UUID:"
 msgstr "UUID:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:280
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:324
 msgid "Authorize and Connect"
 msgstr "認證並連線"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:303
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:346
 msgid "Forget Device"
 msgstr "遺忘裝置"
 
-#: panels/thunderbolt/cc-bolt-device-entry.c:129
+#: panels/thunderbolt/cc-bolt-device-entry.c:135
 msgctxt "Thunderbolt Device Status"
 msgid "Error"
 msgstr "錯誤"
 
-#: panels/thunderbolt/cc-bolt-device-entry.c:140
+#: panels/thunderbolt/cc-bolt-device-entry.c:146
 msgctxt "Thunderbolt Device Status"
 msgid "Authorized"
 msgstr "已認證"
 
-#: panels/thunderbolt/cc-bolt-panel.c:175
+#: panels/thunderbolt/cc-bolt-panel.c:176
 msgid ""
 "The Thunderbolt subsystem (boltd) is not installed or not set up properly."
 msgstr "Thunderbolt 子系統 (boltd) 尚未安裝或未正確設定。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:460
+#: panels/thunderbolt/cc-bolt-panel.c:469
 msgid ""
 "Thunderbolt could not be detected.\n"
 "Either the system lacks Thunderbolt support, it has been disabled in the "
@@ -5873,11 +6243,16 @@ msgstr ""
 "可能是系統缺乏 Thunderbolt 支援,它可能在 BIOS 被停用或設定至不支援的安全級"
 "別。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:504
+#: panels/thunderbolt/cc-bolt-panel.c:513
 msgid "Thunderbolt support has been disabled in the BIOS."
 msgstr "Thunderbolt 支援在 BIOS 中被停用。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:613
+#: panels/thunderbolt/cc-bolt-panel.c:517
+#| msgid "The profile could not be generated."
+msgid "Thunderbolt security level could not be determined."
+msgstr "無法確定 Thunderbolt 安全性等級。"
+
+#: panels/thunderbolt/cc-bolt-panel.c:622
 #, c-format
 msgid "Error switching direct mode: %s"
 msgstr "切換直接模式時發生問題:%s"
@@ -5914,11 +6289,6 @@ msgstr "Thunderbolt"
 msgid "Manage Thunderbolt devices"
 msgstr "管理 Thunderbolt 裝置"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:7
-msgid "thunderbolt"
-msgstr "thunderbolt"
-
 #. Translators: those are keywords for the thunderbolt control-center panel. Do NOT translate or localize 
the semicolons! The list MUST also end with a semicolon!
 #: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:19
 msgid "Thunderbolt;"
@@ -5926,387 +6296,393 @@ msgstr "Thunderbolt;"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:498
+#: panels/universal-access/cc-ua-panel.c:497
 msgctxt "cursor size"
 msgid "Default"
 msgstr "預設值"
 
-#: panels/universal-access/cc-ua-panel.c:501
+#: panels/universal-access/cc-ua-panel.c:500
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "中"
 
-#: panels/universal-access/cc-ua-panel.c:504
+#: panels/universal-access/cc-ua-panel.c:503
 msgctxt "cursor size"
 msgid "Large"
 msgstr "大"
 
-#: panels/universal-access/cc-ua-panel.c:507
+#: panels/universal-access/cc-ua-panel.c:506
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "較大"
 
-#: panels/universal-access/cc-ua-panel.c:510
+#: panels/universal-access/cc-ua-panel.c:509
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "最大"
 
-#: panels/universal-access/cc-ua-panel.c:514
+#: panels/universal-access/cc-ua-panel.c:513
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
 msgstr[0] "%d 像素"
 
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
-msgid "Make it easier to see, hear, type, point and click"
-msgstr "讓電腦更容易看、聽、輸入、指向與點選"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
-msgid "preferences-desktop-accessibility"
-msgstr "preferences-desktop-accessibility"
-
-#. 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;"
-msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-"鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;反彈;滑鼠;雙擊;兩"
-"下;點按;延遲;助理;輔助;重複;閃動;"
-
-#: panels/universal-access/uap.ui:93
+#: panels/universal-access/cc-ua-panel.ui:78
 msgid "_Always Show Universal Access Menu"
 msgstr "永遠顯示無障礙存取選單(_A)"
 
-#: panels/universal-access/uap.ui:135
+#: panels/universal-access/cc-ua-panel.ui:120
 msgid "Seeing"
 msgstr "視覺"
 
-#: panels/universal-access/uap.ui:181
+#: panels/universal-access/cc-ua-panel.ui:166
 msgid "_High Contrast"
 msgstr "高反差(_H)"
 
-#: panels/universal-access/uap.ui:228
+#: panels/universal-access/cc-ua-panel.ui:213
 msgid "_Large Text"
 msgstr "大型文字(_L)"
 
-#: panels/universal-access/uap.ui:273
+#: panels/universal-access/cc-ua-panel.ui:258
 msgid "C_ursor Size"
 msgstr "游標大小(_U)"
 
-#: panels/universal-access/uap.ui:320
+#: panels/universal-access/cc-ua-panel.ui:305
 #: panels/universal-access/zoom-options.ui:99
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: panels/universal-access/uap.ui:366
+#: panels/universal-access/cc-ua-panel.ui:351
 msgid "Screen _Reader"
 msgstr "螢幕閱讀器(_R)"
 
-#: panels/universal-access/uap.ui:412 panels/universal-access/uap.ui:1243
+#: panels/universal-access/cc-ua-panel.ui:397
+#: panels/universal-access/cc-ua-panel.ui:1231
 msgid "_Sound Keys"
 msgstr "聲音按鍵(_S)"
 
-#: panels/universal-access/uap.ui:474
+#: panels/universal-access/cc-ua-panel.ui:459
 msgid "Hearing"
 msgstr "聽覺"
 
-#: panels/universal-access/uap.ui:518 panels/universal-access/uap.ui:1346
+#: panels/universal-access/cc-ua-panel.ui:503
+#: panels/universal-access/cc-ua-panel.ui:1334
 msgid "_Visual Alerts"
 msgstr "視覺警示(_V)"
 
-#: panels/universal-access/uap.ui:626
+#: panels/universal-access/cc-ua-panel.ui:611
 msgid "Screen _Keyboard"
 msgstr "螢幕鍵盤(_K)"
 
-#: panels/universal-access/uap.ui:671
+#: panels/universal-access/cc-ua-panel.ui:656
 msgid "R_epeat Keys"
 msgstr "重複鍵(_E)"
 
-#: panels/universal-access/uap.ui:717
+#: panels/universal-access/cc-ua-panel.ui:702
 msgid "Cursor _Blinking"
 msgstr "游標閃爍(_B)"
 
-#: panels/universal-access/uap.ui:763
+#: panels/universal-access/cc-ua-panel.ui:748
 msgid "_Typing Assist (AccessX)"
 msgstr "打字助理 [AccessX](_T)"
 
-#: panels/universal-access/uap.ui:824
+#: panels/universal-access/cc-ua-panel.ui:809
 msgid "Pointing & Clicking"
 msgstr "指向和點選"
 
-#: panels/universal-access/uap.ui:870
+#: panels/universal-access/cc-ua-panel.ui:855
 msgid "_Mouse Keys"
 msgstr "滑鼠按鍵(_M)"
 
-#: panels/universal-access/uap.ui:915
+#: panels/universal-access/cc-ua-panel.ui:900
 msgid "_Click Assist"
 msgstr "點擊助理(_C)"
 
-#: panels/universal-access/uap.ui:961
+#: panels/universal-access/cc-ua-panel.ui:946
 msgid "_Double-Click Delay"
 msgstr "雙擊延遲(_D)"
 
-#: panels/universal-access/uap.ui:981
+#: panels/universal-access/cc-ua-panel.ui:966
 msgid "Double-Click Delay"
 msgstr "雙擊延遲"
 
-#: panels/universal-access/uap.ui:1048
+#: panels/universal-access/cc-ua-panel.ui:1036
 msgid "Cursor Size"
 msgstr "游標大小"
 
-#: panels/universal-access/uap.ui:1075
+#: panels/universal-access/cc-ua-panel.ui:1063
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr "游標大小可以和縮放搭配以輕鬆看出游標位置。"
 
-#: panels/universal-access/uap.ui:1111
+#: panels/universal-access/cc-ua-panel.ui:1099
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
 
-#: panels/universal-access/uap.ui:1128
+#: panels/universal-access/cc-ua-panel.ui:1116
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "螢幕閱讀器能在您移動焦點時讀出顯示的文字。"
 
-#: panels/universal-access/uap.ui:1161
+#: panels/universal-access/cc-ua-panel.ui:1149
 msgid "_Screen Reader"
 msgstr "螢幕閱讀器(_S)"
 
-#: panels/universal-access/uap.ui:1200
+#: panels/universal-access/cc-ua-panel.ui:1188
 msgid "Sound Keys"
 msgstr "聲音按鍵"
 
-#: panels/universal-access/uap.ui:1218
+#: panels/universal-access/cc-ua-panel.ui:1206
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "當 Num Lock 或 Caps Lock 開啟時發出聲響。"
 
-#: panels/universal-access/uap.ui:1288
+#: panels/universal-access/cc-ua-panel.ui:1276
 msgid "Visual Alerts"
 msgstr "視覺警示"
 
-#: panels/universal-access/uap.ui:1292
+#: panels/universal-access/cc-ua-panel.ui:1280
 msgid "_Test flash"
 msgstr "測試閃動(_T)"
 
-#: panels/universal-access/uap.ui:1321
+#: panels/universal-access/cc-ua-panel.ui:1309
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "當警示音效發出時使用視覺化的指示。"
 
-#: panels/universal-access/uap.ui:1372
+#: panels/universal-access/cc-ua-panel.ui:1360
 msgid "Flash the _window title"
 msgstr "閃動視窗標題(_W)"
 
-#: panels/universal-access/uap.ui:1390
+#: panels/universal-access/cc-ua-panel.ui:1378
 msgid "Flash the entire _screen"
 msgstr "閃動整個螢幕(_S)"
 
-#: panels/universal-access/uap.ui:1435
+#: panels/universal-access/cc-ua-panel.ui:1423
 msgid "Repeat Keys"
 msgstr "重複按鍵"
 
-#: panels/universal-access/uap.ui:1465
+#: panels/universal-access/cc-ua-panel.ui:1453
 msgid "Key presses repeat when key is held down."
 msgstr "當按下某鍵不放時重複輸出該字元。"
 
-#: panels/universal-access/uap.ui:1544
+#: panels/universal-access/cc-ua-panel.ui:1533
 msgid "Repeat keys delay"
 msgstr "按鍵重複延遲"
 
-#: panels/universal-access/uap.ui:1592 panels/universal-access/uap.ui:1725
+#: panels/universal-access/cc-ua-panel.ui:1581
+#: panels/universal-access/cc-ua-panel.ui:1716
 msgid "Speed"
 msgstr "速度"
 
-#: panels/universal-access/uap.ui:1629
+#: panels/universal-access/cc-ua-panel.ui:1620
 msgid "Repeat keys speed"
 msgstr "按鍵重複速度"
 
-#: panels/universal-access/uap.ui:1653
+#: panels/universal-access/cc-ua-panel.ui:1644
 msgid "Cursor Blinking"
 msgstr "游標閃爍"
 
-#: panels/universal-access/uap.ui:1683
+#: panels/universal-access/cc-ua-panel.ui:1674
 msgid "Cursor blinks in text fields."
 msgstr "游標在文字欄位中閃爍。"
 
-#: panels/universal-access/uap.ui:1762
+#: panels/universal-access/cc-ua-panel.ui:1753
 msgid "Cursor blinking speed"
 msgstr "游標閃爍速度"
 
-#: panels/universal-access/uap.ui:1798
+#: panels/universal-access/cc-ua-panel.ui:1789
 msgid "Typing Assist"
 msgstr "打字助理"
 
-#: panels/universal-access/uap.ui:1837
+#: panels/universal-access/cc-ua-panel.ui:1828
 msgid "_Sticky Keys"
 msgstr "黏性特殊鍵(_S)"
 
-#: panels/universal-access/uap.ui:1854
+#: panels/universal-access/cc-ua-panel.ui:1845
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "將連續按的特殊鍵視為按鍵組合"
 
-#: panels/universal-access/uap.ui:1878
+#: panels/universal-access/cc-ua-panel.ui:1869
 msgid "_Disable if two keys are pressed together"
 msgstr "如果同時按下任何兩鍵則停用(_D)"
 
-#: panels/universal-access/uap.ui:1896
+#: panels/universal-access/cc-ua-panel.ui:1887
 msgid "Beep when a _modifier key is pressed"
 msgstr "當按下特殊按鍵時發出聲響(_M)"
 
-#: panels/universal-access/uap.ui:1944
+#: panels/universal-access/cc-ua-panel.ui:1935
 msgid "S_low Keys"
 msgstr "重複按鍵(_L)"
 
-#: panels/universal-access/uap.ui:1961
+#: panels/universal-access/cc-ua-panel.ui:1952
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按鍵被按下到它被接受之間置入延遲"
 
-#: panels/universal-access/uap.ui:1994 panels/universal-access/uap.ui:2207
-#: panels/universal-access/uap.ui:2544
+#: panels/universal-access/cc-ua-panel.ui:1985
+#: panels/universal-access/cc-ua-panel.ui:2198
+#: panels/universal-access/cc-ua-panel.ui:2535
 msgid "A_cceptance delay:"
 msgstr "接受時間延遲(_C):"
 
-#: panels/universal-access/uap.ui:2016
+#: panels/universal-access/cc-ua-panel.ui:2007
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/uap.ui:2035
+#: panels/universal-access/cc-ua-panel.ui:2026
 msgid "Slow keys typing delay"
 msgstr "降低按鍵輸入延遲"
 
-#: panels/universal-access/uap.ui:2050
+#: panels/universal-access/cc-ua-panel.ui:2041
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/uap.ui:2077
+#: panels/universal-access/cc-ua-panel.ui:2068
 msgid "Beep when a key is pr_essed"
 msgstr "當按下按鍵時發出聲響(_E)"
 
-#: panels/universal-access/uap.ui:2094
+#: panels/universal-access/cc-ua-panel.ui:2085
 msgid "Beep when a key is _accepted"
 msgstr "當接受按鍵動作時發出聲響(_A)"
 
-#: panels/universal-access/uap.ui:2111 panels/universal-access/uap.ui:2290
+#: panels/universal-access/cc-ua-panel.ui:2102
+#: panels/universal-access/cc-ua-panel.ui:2281
 msgid "Beep when a key is _rejected"
 msgstr "當拒絕按鍵動作則發出聲響(_R)"
 
-#: panels/universal-access/uap.ui:2157
+#: panels/universal-access/cc-ua-panel.ui:2148
 msgid "_Bounce Keys"
 msgstr "反彈鍵(_B)"
 
-#: panels/universal-access/uap.ui:2174
+#: panels/universal-access/cc-ua-panel.ui:2165
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重複按鍵"
 
-#: panels/universal-access/uap.ui:2229
+#: panels/universal-access/cc-ua-panel.ui:2220
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/uap.ui:2248
+#: panels/universal-access/cc-ua-panel.ui:2239
 msgid "Bounce keys typing delay"
 msgstr "反彈鍵輸入延遲"
 
-#: panels/universal-access/uap.ui:2263
+#: panels/universal-access/cc-ua-panel.ui:2254
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/uap.ui:2376
+#: panels/universal-access/cc-ua-panel.ui:2367
 msgid "_Enable by Keyboard"
 msgstr "由鍵盤啟用(_E)"
 
-#: panels/universal-access/uap.ui:2393
+#: panels/universal-access/cc-ua-panel.ui:2384
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "以鍵盤開啟和關閉無障礙功能"
 
-#: panels/universal-access/uap.ui:2457
+#: panels/universal-access/cc-ua-panel.ui:2448
 msgid "Click Assist"
 msgstr "點擊助理"
 
-#: panels/universal-access/uap.ui:2493
+#: panels/universal-access/cc-ua-panel.ui:2484
 msgid "_Simulated Secondary Click"
 msgstr "模擬次要點擊(_S)"
 
-#: panels/universal-access/uap.ui:2511
+#: panels/universal-access/cc-ua-panel.ui:2502
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "按住主要鍵時觸發次要點擊"
 
-#: panels/universal-access/uap.ui:2565
+#: panels/universal-access/cc-ua-panel.ui:2556
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/uap.ui:2584
+#: panels/universal-access/cc-ua-panel.ui:2575
 msgid "Secondary click delay"
 msgstr "第二次點擊延遲"
 
-#: panels/universal-access/uap.ui:2599
+#: panels/universal-access/cc-ua-panel.ui:2590
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/uap.ui:2656
+#: panels/universal-access/cc-ua-panel.ui:2647
 msgid "_Hover Click"
 msgstr "停駐即點擊(_H)"
 
-#: panels/universal-access/uap.ui:2674
+#: panels/universal-access/cc-ua-panel.ui:2665
 msgid "Trigger a click when the pointer hovers"
 msgstr "當停止游標移動時觸發點擊"
 
-#: panels/universal-access/uap.ui:2707
+#: panels/universal-access/cc-ua-panel.ui:2698
 msgid "D_elay:"
 msgstr "延遲(_E):"
 
-#: panels/universal-access/uap.ui:2729
+#: panels/universal-access/cc-ua-panel.ui:2720
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/uap.ui:2760
+#: panels/universal-access/cc-ua-panel.ui:2751
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "長"
 
-#: panels/universal-access/uap.ui:2796
+#: panels/universal-access/cc-ua-panel.ui:2787
 msgid "Motion _threshold:"
 msgstr "移動速度(_M):"
 
-#: panels/universal-access/uap.ui:2818
+#: panels/universal-access/cc-ua-panel.ui:2809
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: panels/universal-access/uap.ui:2849
+#: panels/universal-access/cc-ua-panel.ui:2840
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
 
-#: panels/universal-access/zoom-options.c:334
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "讓電腦更容易看、聽、輸入、指向與點選"
+
+#. Translators: Search terms to find the 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;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
+msgstr ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
+"鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;反彈;滑鼠;雙擊;兩"
+"下;點按;延遲;助理;輔助;重複;閃動;游標;音效;大;高;速度;視覺;聽覺;音訊;音樂;輸入;"
+
+#: panels/universal-access/zoom-options.c:305
 msgctxt "Distance"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/zoom-options.c:335
+#: panels/universal-access/zoom-options.c:306
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ 螢幕"
 
-#: panels/universal-access/zoom-options.c:336
+#: panels/universal-access/zoom-options.c:307
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ 螢幕"
 
-#: panels/universal-access/zoom-options.c:337
+#: panels/universal-access/zoom-options.c:308
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ 螢幕"
 
-#: panels/universal-access/zoom-options.c:338
+#: panels/universal-access/zoom-options.c:309
 msgctxt "Distance"
 msgid "Long"
 msgstr "長"
@@ -6335,31 +6711,31 @@ msgstr "右半"
 msgid "Zoom Options"
 msgstr "放大鏡選項"
 
-#: panels/universal-access/zoom-options.ui:188
+#: panels/universal-access/zoom-options.ui:185
 msgid "_Magnification:"
 msgstr "放大率(_M):"
 
-#: panels/universal-access/zoom-options.ui:252
+#: panels/universal-access/zoom-options.ui:249
 msgid "_Follow mouse cursor"
 msgstr "跟隨滑鼠遊標(_F)"
 
-#: panels/universal-access/zoom-options.ui:272
+#: panels/universal-access/zoom-options.ui:269
 msgid "_Screen part:"
 msgstr "螢幕部分(_S):"
 
-#: panels/universal-access/zoom-options.ui:334
+#: panels/universal-access/zoom-options.ui:331
 msgid "Magnifier _extends outside of screen"
 msgstr "放大鏡延伸到螢幕外(_E)"
 
-#: panels/universal-access/zoom-options.ui:353
+#: panels/universal-access/zoom-options.ui:350
 msgid "_Keep magnifier cursor centered"
 msgstr "保持放大鏡游標置中(_K)"
 
-#: panels/universal-access/zoom-options.ui:372
+#: panels/universal-access/zoom-options.ui:370
 msgid "Magnifier cursor _pushes contents around"
 msgstr "放大鏡游標將內容推到周圍(_P)"
 
-#: panels/universal-access/zoom-options.ui:391
+#: panels/universal-access/zoom-options.ui:390
 msgid "Magnifier cursor moves with _contents"
 msgstr "放大鏡游標隨內容移動(_C)"
 
@@ -6390,116 +6766,167 @@ msgid "_Length:"
 msgstr "長度(_L):"
 
 #. The color of the accessibility crosshair
-#: panels/universal-access/zoom-options.ui:629
+#: panels/universal-access/zoom-options.ui:626
 msgid "Co_lor:"
 msgstr "顏色(_L):"
 
-#: panels/universal-access/zoom-options.ui:693
+#: panels/universal-access/zoom-options.ui:690
 msgid "_Crosshairs:"
 msgstr "十字準星(_C):"
 
-#: panels/universal-access/zoom-options.ui:744
+#: panels/universal-access/zoom-options.ui:738
 msgid "_Overlaps mouse cursor"
 msgstr "重疊滑鼠遊標(_O)"
 
-#: panels/universal-access/zoom-options.ui:782
+#: panels/universal-access/zoom-options.ui:776
 msgid "Crosshairs"
 msgstr "十字準星"
 
-#: panels/universal-access/zoom-options.ui:831
+#: panels/universal-access/zoom-options.ui:825
 msgid "_White on black:"
 msgstr "黑底白字(_W):"
 
-#: panels/universal-access/zoom-options.ui:854
+#: panels/universal-access/zoom-options.ui:845
 msgid "_Brightness:"
 msgstr "亮度(_B):"
 
-#: panels/universal-access/zoom-options.ui:878
+#: panels/universal-access/zoom-options.ui:866
 msgid "_Contrast:"
 msgstr "對比(_C):"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: panels/universal-access/zoom-options.ui:901
+#: panels/universal-access/zoom-options.ui:886
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "顏色(_L)"
 
-#: panels/universal-access/zoom-options.ui:929
+#: panels/universal-access/zoom-options.ui:911
 msgctxt "universal access, color"
 msgid "None"
 msgstr "沒有"
 
-#: panels/universal-access/zoom-options.ui:961
+#: panels/universal-access/zoom-options.ui:943
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "完全"
 
-#: panels/universal-access/zoom-options.ui:1027
+#: panels/universal-access/zoom-options.ui:1006
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "低"
 
-#: panels/universal-access/zoom-options.ui:1060
+#: panels/universal-access/zoom-options.ui:1039
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "高"
 
-#: panels/universal-access/zoom-options.ui:1091
+#: panels/universal-access/zoom-options.ui:1070
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低"
 
-#: panels/universal-access/zoom-options.ui:1124
+#: panels/universal-access/zoom-options.ui:1103
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高"
 
-#: panels/universal-access/zoom-options.ui:1160
+#: panels/universal-access/zoom-options.ui:1139
 msgid "Color Effects:"
 msgstr "顏色效果:"
 
-#: panels/universal-access/zoom-options.ui:1185
+#: panels/universal-access/zoom-options.ui:1164
 msgid "Color Effects"
 msgstr "顏色效果"
 
-#: panels/user-accounts/data/account-dialog.ui:18
+#: panels/user-accounts/cc-add-user-dialog.c:34
+msgid "Should match the web address of your login provider."
+msgstr "應符合您的登入提供者的網路位址。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:205
+msgid "Failed to add account"
+msgstr "無法加入到帳號"
+
+#: panels/user-accounts/cc-add-user-dialog.c:676
+#: panels/user-accounts/cc-password-dialog.c:261
+msgid "The passwords do not match."
+msgstr "密碼不相符。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:898
+#: panels/user-accounts/cc-add-user-dialog.c:944
+#: panels/user-accounts/cc-add-user-dialog.c:965
+msgid "Failed to register account"
+msgstr "無法註冊帳號"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1088
+msgid "No supported way to authenticate with this domain"
+msgstr "沒有支援這個網域核對的方式"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1161
+msgid "Failed to join domain"
+msgstr "無法加入網域"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1222
+msgid ""
+"That login name didn’t work.\n"
+"Please try again."
+msgstr ""
+"登入名稱沒有作用。\n"
+"請再試一次。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1229
+msgid ""
+"That login password didn’t work.\n"
+"Please try again."
+msgstr ""
+"登入密碼沒有作用。\n"
+"請再試一次。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1237
+msgid "Failed to log into domain"
+msgstr "無法登入網域"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1295
+msgid "Unable to find the domain. Maybe you misspelled it?"
+msgstr "找不到網域。也許您拼錯字了?"
+
+#: panels/user-accounts/cc-add-user-dialog.ui:18
 #: panels/user-accounts/data/join-dialog.ui:11
 msgid "Add User"
 msgstr "加入使用者"
 
-#: panels/user-accounts/data/account-dialog.ui:171
+#: panels/user-accounts/cc-add-user-dialog.ui:180
 msgid "_Full Name"
 msgstr "全名(_F)"
 
-#: panels/user-accounts/data/account-dialog.ui:197
-#: panels/user-accounts/data/user-accounts-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:206
+#: panels/user-accounts/cc-user-panel.ui:153
 msgid "Standard"
 msgstr "標準"
 
-#: panels/user-accounts/data/account-dialog.ui:207
-#: panels/user-accounts/data/user-accounts-dialog.ui:155
+#: panels/user-accounts/cc-add-user-dialog.ui:216
+#: panels/user-accounts/cc-user-panel.ui:163
 msgid "Administrator"
 msgstr "管理員"
 
-#: panels/user-accounts/data/account-dialog.ui:223
-#: panels/user-accounts/data/user-accounts-dialog.ui:173
+#: panels/user-accounts/cc-add-user-dialog.ui:232
+#: panels/user-accounts/cc-user-panel.ui:181
 msgid "Account _Type"
 msgstr "帳號類型(_T)"
 
-#: panels/user-accounts/data/account-dialog.ui:260
+#: panels/user-accounts/cc-add-user-dialog.ui:269
 msgid "Allow user to set a password when they next _login"
 msgstr "允許使用者在下次登入時設定密碼(_L)"
 
-#: panels/user-accounts/data/account-dialog.ui:274
+#: panels/user-accounts/cc-add-user-dialog.ui:283
 msgid "Set a password _now"
 msgstr "立刻設定密碼(_N)"
 
-#: panels/user-accounts/data/account-dialog.ui:387
+#: panels/user-accounts/cc-add-user-dialog.ui:405
 msgid "_Confirm"
 msgstr "確認(_C)"
 
-#: panels/user-accounts/data/account-dialog.ui:463
-#: panels/user-accounts/data/account-dialog.ui:667
+#: panels/user-accounts/cc-add-user-dialog.ui:485
+#: panels/user-accounts/cc-add-user-dialog.ui:692
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
@@ -6508,52 +6935,351 @@ msgstr ""
 "企業登入允許現有的集中管理式使用者帳號能用在這個裝置上。您也可以使用這個帳號"
 "來存取網際網路上的公司資源。"
 
-#: panels/user-accounts/data/account-dialog.ui:485
-#: panels/user-accounts/data/join-dialog.ui:116
-msgid "_Domain"
-msgstr "網域(_O)"
-
-#: panels/user-accounts/data/account-dialog.ui:707
+#: panels/user-accounts/cc-add-user-dialog.ui:732
 msgid "You are Offline"
 msgstr "您已離線"
 
-#: panels/user-accounts/data/account-dialog.ui:726
+#: panels/user-accounts/cc-add-user-dialog.ui:751
 msgid "You must be online in order to add enterprise users."
 msgstr "請上線以加入企業登入使用者。"
 
-#: panels/user-accounts/data/account-dialog.ui:760
+#: panels/user-accounts/cc-add-user-dialog.ui:782
 msgid "_Enterprise Login"
 msgstr "企業登入(_E)"
 
-#: panels/user-accounts/data/account-fingerprint.ui:12
-msgid "Left thumb"
-msgstr "左手姆指"
+#: panels/user-accounts/cc-avatar-chooser.c:232
+msgid "Browse for more pictures"
+msgstr "瀏覽更多照片"
 
-#: panels/user-accounts/data/account-fingerprint.ui:15
-msgid "Left middle finger"
-msgstr "左手中指"
+#: panels/user-accounts/cc-avatar-chooser.ui:39
+msgid "Take a Picture…"
+msgstr "照張相…"
 
-#: panels/user-accounts/data/account-fingerprint.ui:18
-msgid "Left ring finger"
-msgstr "左手無名指"
+#: panels/user-accounts/cc-avatar-chooser.ui:46
+msgid "Select a File…"
+msgstr "選擇檔案…"
 
-#: panels/user-accounts/data/account-fingerprint.ui:21
-msgid "Left little finger"
-msgstr "左手小指"
+#: panels/user-accounts/cc-login-history-dialog.c:69
+msgid "This Week"
+msgstr "本週"
 
-#: panels/user-accounts/data/account-fingerprint.ui:24
-msgid "Right thumb"
-msgstr "右手姆指"
+#: panels/user-accounts/cc-login-history-dialog.c:72
+msgid "Last Week"
+msgstr "上週"
 
-#: panels/user-accounts/data/account-fingerprint.ui:27
-msgid "Right middle finger"
-msgstr "右手中指"
+#. Translators: This is a date format string in the style of "Feb 18",
+#. shown as the first day of a week on login history dialog.
+#. Translators: This is a date format string in the style of "Feb 24",
+#. shown as the last day of a week on login history dialog.
+#: panels/user-accounts/cc-login-history-dialog.c:82
+#: panels/user-accounts/cc-login-history-dialog.c:86
+msgctxt "login history week label"
+msgid "%b %e"
+msgstr "%b%e日"
 
-#: panels/user-accounts/data/account-fingerprint.ui:30
-msgid "Right ring finger"
-msgstr "右手無名指"
+#. Translators: This is a date format string in the style of "Feb 24, 2013",
+#. shown as the last day of a week on login history dialog.
+#: panels/user-accounts/cc-login-history-dialog.c:91
+msgctxt "login history week label"
+msgid "%b %e, %Y"
+msgstr "%Y年%b%e日"
 
-#: panels/user-accounts/data/account-fingerprint.ui:33
+#. Translators: This indicates a week label on a login history.
+#. The first %s is the first day of a week, and the second %s the last day.
+#: panels/user-accounts/cc-login-history-dialog.c:96
+#, c-format
+msgctxt "login history week label"
+msgid "%s — %s"
+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
+msgctxt "login date-time"
+msgid "%k:%M"
+msgstr "%k:%M"
+
+#. Translators: This indicates a login date-time.
+#. The first %s is a date, and the second %s a time.
+#: panels/user-accounts/cc-login-history-dialog.c:176
+#: panels/user-accounts/cc-user-panel.c:775
+#, c-format
+msgctxt "login date-time"
+msgid "%s, %s"
+msgstr "%s,%s"
+
+#: panels/user-accounts/cc-login-history-dialog.c:243
+msgid "Session Ended"
+msgstr "作業階段結束"
+
+#: panels/user-accounts/cc-login-history-dialog.c:249
+msgid "Session Started"
+msgstr "作業階段開始"
+
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: panels/user-accounts/cc-login-history-dialog.c:343
+#, c-format
+msgid "%s — Account Activity"
+msgstr "%s — 帳號活動"
+
+#: panels/user-accounts/cc-password-dialog.c:125
+msgid "Please choose another password."
+msgstr "請選擇其他密碼。"
+
+#: panels/user-accounts/cc-password-dialog.c:134
+msgid "Please type your current password again."
+msgstr "請再次輸入您目前的密碼。"
+
+#: panels/user-accounts/cc-password-dialog.c:140
+msgid "Password could not be changed"
+msgstr "密碼無法變更"
+
+#: panels/user-accounts/cc-password-dialog.ui:7
+msgid "Change Password"
+msgstr "更改密碼"
+
+#: panels/user-accounts/cc-password-dialog.ui:37
+msgid "Ch_ange"
+msgstr "改變(_A)"
+
+#: panels/user-accounts/cc-password-dialog.ui:145
+msgid "_Confirm New Password"
+msgstr "確認新密碼(_C)"
+
+#: panels/user-accounts/cc-password-dialog.ui:162
+msgid "_New Password"
+msgstr "新密碼(_N)"
+
+#: panels/user-accounts/cc-password-dialog.ui:216
+msgid "Current _Password"
+msgstr "目前的密碼(_P)"
+
+#: panels/user-accounts/cc-password-dialog.ui:254
+msgid "Allow user to change their password on next login"
+msgstr "允許使用者在下次登入時改變他們的密碼"
+
+#: panels/user-accounts/cc-password-dialog.ui:267
+msgid "Set a password now"
+msgstr "立刻設定密碼"
+
+#: panels/user-accounts/cc-realm-manager.c:307
+msgid "Cannot automatically join this type of domain"
+msgstr "不能自動加入這個類型的網域"
+
+#: panels/user-accounts/cc-realm-manager.c:310
+msgid "No such domain or realm found"
+msgstr "找不到這個網域或領域名稱"
+
+#: panels/user-accounts/cc-realm-manager.c:732
+#: panels/user-accounts/cc-realm-manager.c:746
+#, c-format
+msgid "Cannot log in as %s at the %s domain"
+msgstr "不能以 %s 身分登入 %s 網域"
+
+#: panels/user-accounts/cc-realm-manager.c:738
+msgid "Invalid password, please try again"
+msgstr "密碼錯誤,請再試一次"
+
+#: panels/user-accounts/cc-realm-manager.c:751
+#, c-format
+msgid "Couldn’t connect to the %s domain: %s"
+msgstr "無法連接到 %s 網域:%s"
+
+#: panels/user-accounts/cc-user-panel.c:214
+msgid "Your account"
+msgstr "您的帳號"
+
+#: panels/user-accounts/cc-user-panel.c:389
+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
+msgid "Failed to revoke remotely managed user"
+msgstr "註銷遠端管理的使用者失敗"
+
+#: panels/user-accounts/cc-user-panel.c:610
+msgid "You cannot delete your own account."
+msgstr "您不能刪除自己的帳號。"
+
+#: panels/user-accounts/cc-user-panel.c:619
+#, c-format
+msgid "%s is still logged in"
+msgstr "%s 仍在登入中"
+
+#: panels/user-accounts/cc-user-panel.c:623
+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
+#, c-format
+msgid "Do you want to keep %s’s files?"
+msgstr "您想要保留 %s 的檔案嗎?"
+
+#: panels/user-accounts/cc-user-panel.c:636
+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
+msgid "_Delete Files"
+msgstr "刪除檔案(_D)"
+
+#: panels/user-accounts/cc-user-panel.c:640
+msgid "_Keep Files"
+msgstr "保留檔案(_K)"
+
+#: panels/user-accounts/cc-user-panel.c:654
+#, 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
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: panels/user-accounts/cc-user-panel.c:708
+msgctxt "Password mode"
+msgid "Account disabled"
+msgstr "帳號已停用"
+
+#: panels/user-accounts/cc-user-panel.c:716
+msgctxt "Password mode"
+msgid "To be set at next login"
+msgstr "在下次登入時設定"
+
+#: panels/user-accounts/cc-user-panel.c:719
+msgctxt "Password mode"
+msgid "None"
+msgstr "沒有"
+
+#: panels/user-accounts/cc-user-panel.c:764
+msgid "Logged in"
+msgstr "已登入"
+
+#: panels/user-accounts/cc-user-panel.c:1098
+msgid "Failed to contact the accounts service"
+msgstr "無法連接帳號服務"
+
+#: panels/user-accounts/cc-user-panel.c:1100
+msgid "Please make sure that the AccountService is installed and enabled."
+msgstr "請確定 AccountService 已經安裝並啟用。"
+
+#. Translator comments:
+#. * 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
+msgid ""
+"To make changes,\n"
+"click the * icon first"
+msgstr ""
+"要進行變更,\n"
+"請先點選 * 圖示"
+
+#: panels/user-accounts/cc-user-panel.c:1205
+msgid "Create a user account"
+msgstr "建立新的使用者帳號"
+
+#: panels/user-accounts/cc-user-panel.c:1216
+#: panels/user-accounts/cc-user-panel.c:1344
+msgid ""
+"To create a user account,\n"
+"click the * icon first"
+msgstr ""
+"要建立使用者帳號,\n"
+"請先點選 * 圖示"
+
+#: panels/user-accounts/cc-user-panel.c:1225
+msgid "Delete the selected user account"
+msgstr "刪除選取的使用者帳號"
+
+#: panels/user-accounts/cc-user-panel.c:1237
+#: panels/user-accounts/cc-user-panel.c:1348
+msgid ""
+"To delete the selected user account,\n"
+"click the * icon first"
+msgstr ""
+"要刪除選取的使用者帳號,\n"
+"請先點選 * 圖示"
+
+#: panels/user-accounts/cc-user-panel.ui:18
+msgid "_Add User…"
+msgstr "加入使用者(_A)…"
+
+#: panels/user-accounts/cc-user-panel.ui:70
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "您的作業階段需要重新啟動以讓變更生效"
+
+#: panels/user-accounts/cc-user-panel.ui:78
+msgid "Restart Now"
+msgstr "立刻重新啟動"
+
+#: panels/user-accounts/cc-user-panel.ui:256
+msgid "A_utomatic Login"
+msgstr "自動登入(_U)"
+
+#: panels/user-accounts/cc-user-panel.ui:298
+msgid "_Fingerprint Login"
+msgstr "指紋登入(_F)"
+
+#: panels/user-accounts/cc-user-panel.ui:324
+#: panels/user-accounts/cc-user-panel.ui:340
+msgid "User Icon"
+msgstr "使用者圖示"
+
+#: panels/user-accounts/cc-user-panel.ui:404
+msgid "Last Login"
+msgstr "上次登入"
+
+#: panels/user-accounts/cc-user-panel.ui:453
+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
+msgid "No Users Found"
+msgstr "找不到使用者"
+
+#: panels/user-accounts/cc-user-panel.ui:496
+msgid "Unlock to add a user account."
+msgstr "解除使用者帳號的新增鎖定。"
+
+#: panels/user-accounts/data/account-fingerprint.ui:12
+msgid "Left thumb"
+msgstr "左手姆指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:15
+msgid "Left middle finger"
+msgstr "左手中指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:18
+msgid "Left ring finger"
+msgstr "左手無名指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:21
+msgid "Left little finger"
+msgstr "左手小指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:24
+msgid "Right thumb"
+msgstr "右手姆指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:27
+msgid "Right middle finger"
+msgstr "右手中指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:30
+msgid "Right ring finger"
+msgstr "右手無名指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:33
 msgid "Right little finger"
 msgstr "右手小指"
 
@@ -6574,20 +7300,12 @@ msgstr "左手食指(_L)"
 msgid "_Other finger:"
 msgstr "其他手指(_O):"
 
-#: panels/user-accounts/data/account-fingerprint.ui:262
+#: panels/user-accounts/data/account-fingerprint.ui:324
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
 msgstr "您的指紋已成功的儲存了。現在應該可以使用您的指紋辨識器來登入。"
 
-#: panels/user-accounts/data/avatar-chooser.ui:27
-msgid "Take a Picture…"
-msgstr "照張相…"
-
-#: panels/user-accounts/data/avatar-chooser.ui:34
-msgid "Select a File…"
-msgstr "選擇檔案…"
-
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "使用者"
@@ -6596,11 +7314,6 @@ msgstr "使用者"
 msgid "Add or remove users and change your password"
 msgstr "加入或移除使用者並改變您的密碼"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:7
-msgid "system-users"
-msgstr "system-users"
-
 #. Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:20
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
@@ -6635,179 +7348,109 @@ msgstr "管理員名稱(_N)"
 msgid "Administrator Password"
 msgstr "管理員密碼"
 
-#: panels/user-accounts/data/password-dialog.ui:7
-msgid "Change Password"
-msgstr "更改密碼"
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
+msgid "Manage user accounts"
+msgstr "管理使用者帳號"
 
-#: panels/user-accounts/data/password-dialog.ui:38
-msgid "Ch_ange"
-msgstr "改變(_A)"
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
+msgid "Authentication is required to change user data"
+msgstr "改變使用者資料需要核對"
 
-#: panels/user-accounts/data/password-dialog.ui:142
-msgid "_Confirm New Password"
-msgstr "確認新密碼(_C)"
+#: panels/user-accounts/pw-utils.c:94
+msgctxt "Password hint"
+msgid "The new password needs to be different from the old one."
+msgstr "新的密碼需要與舊密碼有所差異。"
 
-#: panels/user-accounts/data/password-dialog.ui:159
-msgid "_New Password"
-msgstr "新密碼(_N)"
-
-#: panels/user-accounts/data/password-dialog.ui:208
-msgid "Current _Password"
-msgstr "目前的密碼(_P)"
-
-#: panels/user-accounts/data/password-dialog.ui:243
-msgid "Allow user to change their password on next login"
-msgstr "允許使用者在下次登入時改變他們的密碼"
-
-#: panels/user-accounts/data/password-dialog.ui:256
-msgid "Set a password now"
-msgstr "立刻設定密碼"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:20
-msgid "_Add User…"
-msgstr "加入使用者(_A)…"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:69
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "您的作業階段需要重新啟動以讓變更生效"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:77
-msgid "Restart Now"
-msgstr "立刻重新啟動"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:244
-msgid "A_utomatic Login"
-msgstr "自動登入(_U)"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:285
-msgid "_Fingerprint Login"
-msgstr "指紋登入(_F)"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:311
-#: panels/user-accounts/data/user-accounts-dialog.ui:324
-msgid "User Icon"
-msgstr "使用者圖示"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:387
-msgid "Last Login"
-msgstr "上次登入"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:434
-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/data/user-accounts-dialog.ui:466
-msgid "No Users Found"
-msgstr "找不到使用者"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:476
-msgid "Unlock to add a user account."
-msgstr "解除使用者帳號的新增鎖定。"
-
-#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
-msgid "Manage user accounts"
-msgstr "管理使用者帳號"
-
-#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
-msgid "Authentication is required to change user data"
-msgstr "改變使用者資料需要核對"
-
-#: panels/user-accounts/pw-utils.c:81
-msgctxt "Password hint"
-msgid "The new password needs to be different from the old one."
-msgstr "新的密碼需要與舊密碼有所差異。"
-
-#: panels/user-accounts/pw-utils.c:83
+#: panels/user-accounts/pw-utils.c:96
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "試著改變某些文字和數字。"
 
-#: panels/user-accounts/pw-utils.c:85 panels/user-accounts/pw-utils.c:93
+#: panels/user-accounts/pw-utils.c:98 panels/user-accounts/pw-utils.c:106
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "試著更常改變密碼。"
 
-#: panels/user-accounts/pw-utils.c:87
+#: panels/user-accounts/pw-utils.c:100
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "不含您的使用者名稱的密碼強度會比較高。"
 
-#: panels/user-accounts/pw-utils.c:89
+#: panels/user-accounts/pw-utils.c:102
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "試著避免在密碼中使用您的姓名。"
 
-#: panels/user-accounts/pw-utils.c:91
+#: panels/user-accounts/pw-utils.c:104
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "試著避免在密碼中包含某些文字。"
 
-#: panels/user-accounts/pw-utils.c:95
+#: panels/user-accounts/pw-utils.c:108
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "試著避免常見的文字。"
 
-#: panels/user-accounts/pw-utils.c:97
+#: panels/user-accounts/pw-utils.c:110
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "試著避免重新排序現有的文字。"
 
-#: panels/user-accounts/pw-utils.c:99
+#: panels/user-accounts/pw-utils.c:112
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "試著使用更多數字。"
 
-#: panels/user-accounts/pw-utils.c:101
+#: panels/user-accounts/pw-utils.c:114
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "試著使用更多大寫字母。"
 
-#: panels/user-accounts/pw-utils.c:103
+#: panels/user-accounts/pw-utils.c:116
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "試著使用更多小寫字母。"
 
-#: panels/user-accounts/pw-utils.c:105
+#: panels/user-accounts/pw-utils.c:118
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "試著使用更多特殊字元,像是標點符號。"
 
-#: panels/user-accounts/pw-utils.c:107
+#: panels/user-accounts/pw-utils.c:120
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "試著使用混合字母、數字和標點符號。"
 
-#: panels/user-accounts/pw-utils.c:109
+#: panels/user-accounts/pw-utils.c:122
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "試著避免同樣字元。"
 
-#: panels/user-accounts/pw-utils.c:111
+#: panels/user-accounts/pw-utils.c:124
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
 msgstr "試著避免重複同樣類型的字元:您需要混合字母、數字和標點符號。"
 
-#: panels/user-accounts/pw-utils.c:113
+#: panels/user-accounts/pw-utils.c:126
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "試著避免像 1234 或 abcd 等順序。"
 
-#: panels/user-accounts/pw-utils.c:115
+#: panels/user-accounts/pw-utils.c:128
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
 "punctuation."
 msgstr "密碼需要更長。試著加入更多字母、數字和標點符號。"
 
-#: panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:130
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "混合大寫與小寫字元並嘗試使用一到兩個數字。"
 
-#: panels/user-accounts/pw-utils.c:119
+#: panels/user-accounts/pw-utils.c:132
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
@@ -6862,397 +7505,106 @@ msgstr "新的密碼並未包含足夠的不同字元"
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your login provider."
-msgstr "應符合您的登入提供者的網路位址。"
-
-#: panels/user-accounts/um-account-dialog.c:225
-msgid "Failed to add account"
-msgstr "無法加入到帳號"
-
-#: panels/user-accounts/um-account-dialog.c:465
-#: panels/user-accounts/um-password-dialog.c:291
-msgid "The passwords do not match."
-msgstr "密碼不相符。"
-
-#: panels/user-accounts/um-account-dialog.c:736
-#: panels/user-accounts/um-account-dialog.c:782
-#: panels/user-accounts/um-account-dialog.c:803
-msgid "Failed to register account"
-msgstr "無法註冊帳號"
-
-#: panels/user-accounts/um-account-dialog.c:926
-msgid "No supported way to authenticate with this domain"
-msgstr "沒有支援這個網域核對的方式"
-
-#: panels/user-accounts/um-account-dialog.c:999
-msgid "Failed to join domain"
-msgstr "無法加入網域"
-
-#: panels/user-accounts/um-account-dialog.c:1060
-msgid ""
-"That login name didn’t work.\n"
-"Please try again."
-msgstr ""
-"登入名稱沒有作用。\n"
-"請再試一次。"
-
-#: panels/user-accounts/um-account-dialog.c:1067
-msgid ""
-"That login password didn’t work.\n"
-"Please try again."
-msgstr ""
-"登入密碼沒有作用。\n"
-"請再試一次。"
-
-#: panels/user-accounts/um-account-dialog.c:1075
-msgid "Failed to log into domain"
-msgstr "無法登入網域"
-
-#: panels/user-accounts/um-account-dialog.c:1133
-msgid "Unable to find the domain. Maybe you misspelled it?"
-msgstr "找不到網域。也許您拼錯字了?"
-
-#: panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "標準"
-
-#: panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "管理員"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:139
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
-msgstr "您不被允許使用這個裝置。請連絡您的管理員。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:141
-msgid "The device is already in use."
-msgstr "該裝置已經在使用中。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:143
-msgid "An internal error occurred."
-msgstr "發生內部的錯誤。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:214
-msgid "Enabled"
-msgstr "已啟用"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:260
-msgid "Delete registered fingerprints?"
-msgstr "是否刪除已註冊的指紋?"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:264
-msgid "_Delete Fingerprints"
-msgstr "刪除指紋(_D)"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:270
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
-msgstr "您確定要刪除已註冊的指紋嗎?這麼一來將會停用指紋登入。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:440
-msgid "Done!"
-msgstr "完成!"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: panels/user-accounts/um-fingerprint-dialog.c:501
-#: panels/user-accounts/um-fingerprint-dialog.c:543
-#, c-format
-msgid "Could not access “%s” device"
-msgstr "無法存取「%s」裝置"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: panels/user-accounts/um-fingerprint-dialog.c:584
-#, c-format
-msgid "Could not start finger capture on “%s” device"
-msgstr "無法啟動「%s」裝置的指紋捕捉功能"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:628
-msgid "Could not access any fingerprint readers"
-msgstr "無法存取任何指紋辨識器"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:629
-msgid "Please contact your system administrator for help."
-msgstr "請連絡您的管理員來幫忙。"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
-#. * 'Digital Persona U.are.U 4000/4000B' device."
-#.
-#: panels/user-accounts/um-fingerprint-dialog.c:711
-#, c-format
-msgid ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the “%s” device."
-msgstr "若要啟用指紋登入,您需要使用「%s」裝置儲存您的指紋。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:718
-msgid "Selecting finger"
-msgstr "選擇手指"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:719
-msgid "Enrolling fingerprints"
-msgstr "登記指紋"
-
-#: panels/user-accounts/um-history-dialog.c:70
-msgid "This Week"
-msgstr "本週"
-
-#: panels/user-accounts/um-history-dialog.c:73
-msgid "Last Week"
-msgstr "上週"
-
-#. Translators: This is a date format string in the style of "Feb 18",
-#. shown as the first day of a week on login history dialog.
-#. Translators: This is a date format string in the style of "Feb 24",
-#. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/um-history-dialog.c:79
-#: panels/user-accounts/um-history-dialog.c:83
-msgctxt "login history week label"
-msgid "%b %e"
-msgstr "%b%e日"
-
-#. Translators: This is a date format string in the style of "Feb 24, 2013",
-#. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/um-history-dialog.c:88
-msgctxt "login history week label"
-msgid "%b %e, %Y"
-msgstr "%Y年%b%e日"
-
-#. Translators: This indicates a week label on a login history.
-#. The first %s is the first day of a week, and the second %s the last day.
-#: panels/user-accounts/um-history-dialog.c:93
-#, c-format
-msgctxt "login history week label"
-msgid "%s — %s"
-msgstr "%s — %s"
-
-#. Translators: This is a time format string in the style of "22:58".
-#. It indicates a login time which follows a date.
-#: panels/user-accounts/um-history-dialog.c:177
-#: panels/user-accounts/um-user-panel.c:763
-msgctxt "login date-time"
-msgid "%k:%M"
-msgstr "%k:%M"
-
-#. Translators: This indicates a login date-time.
-#. The first %s is a date, and the second %s a time.
-#: panels/user-accounts/um-history-dialog.c:180
-#: panels/user-accounts/um-user-panel.c:767
-#, c-format
-msgctxt "login date-time"
-msgid "%s, %s"
-msgstr "%s,%s"
-
-#: panels/user-accounts/um-history-dialog.c:250
-msgid "Session Ended"
-msgstr "作業階段結束"
-
-#: panels/user-accounts/um-history-dialog.c:256
-msgid "Session Started"
-msgstr "作業階段開始"
-
-#. Translators: This is the title of the "Account Activity" dialog.
-#. The %s is the user real name.
-#: panels/user-accounts/um-history-dialog.c:299
-#, c-format
-msgid "%s — Account Activity"
-msgstr "%s — 帳號活動"
-
-#: panels/user-accounts/um-password-dialog.c:150
-msgid "Please choose another password."
-msgstr "請選擇其他密碼。"
-
-#: panels/user-accounts/um-password-dialog.c:159
-msgid "Please type your current password again."
-msgstr "請再次輸入您目前的密碼。"
-
-#: panels/user-accounts/um-password-dialog.c:165
-msgid "Password could not be changed"
-msgstr "密碼無法變更"
-
-#: panels/user-accounts/um-photo-dialog.c:227
-msgid "Browse for more pictures"
-msgstr "瀏覽更多照片"
-
-#: panels/user-accounts/um-realm-manager.c:307
-msgid "Cannot automatically join this type of domain"
-msgstr "不能自動加入這個類型的網域"
-
-#: panels/user-accounts/um-realm-manager.c:310
-msgid "No such domain or realm found"
-msgstr "找不到這個網域或領域名稱"
-
-#: panels/user-accounts/um-realm-manager.c:732
-#: panels/user-accounts/um-realm-manager.c:746
-#, c-format
-msgid "Cannot log in as %s at the %s domain"
-msgstr "不能以 %s 身分登入 %s 網域"
-
-#: panels/user-accounts/um-realm-manager.c:738
-msgid "Invalid password, please try again"
-msgstr "密碼錯誤,請再試一次"
-
-#: panels/user-accounts/um-realm-manager.c:751
-#, c-format
-msgid "Couldn’t connect to the %s domain: %s"
-msgstr "無法連接到 %s 網域:%s"
-
-#: panels/user-accounts/um-user-panel.c:199
-msgid "Your account"
-msgstr "您的帳號"
-
-#: panels/user-accounts/um-user-panel.c:379
-msgid "Failed to delete user"
-msgstr "刪除使用者失敗"
-
-#: panels/user-accounts/um-user-panel.c:437
-#: panels/user-accounts/um-user-panel.c:496
-#: panels/user-accounts/um-user-panel.c:548
-msgid "Failed to revoke remotely managed user"
-msgstr "註銷遠端管理的使用者失敗"
-
-#: panels/user-accounts/um-user-panel.c:600
-msgid "You cannot delete your own account."
-msgstr "您不能刪除自己的帳號。"
-
-#: panels/user-accounts/um-user-panel.c:609
-#, c-format
-msgid "%s is still logged in"
-msgstr "%s 仍在登入中"
-
-#: panels/user-accounts/um-user-panel.c:613
-msgid ""
-"Deleting a user while they are logged in can leave the system in an "
-"inconsistent state."
-msgstr "在使用者登入期間刪除他會使系統處於不穩定的狀態。"
-
-#: panels/user-accounts/um-user-panel.c:622
-#, c-format
-msgid "Do you want to keep %s’s files?"
-msgstr "您想要保留 %s 的檔案嗎?"
-
-#: panels/user-accounts/um-user-panel.c:626
+#: 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 ""
-"It is possible to keep the home directory, mail spool and temporary files "
-"around when deleting a user account."
-msgstr "當刪除使用者時是可以保留家目錄、新進郵件(mail spool)和暫存檔案的。"
-
-#: panels/user-accounts/um-user-panel.c:629
-msgid "_Delete Files"
-msgstr "刪除檔案(_D)"
-
-#: panels/user-accounts/um-user-panel.c:630
-msgid "_Keep Files"
-msgstr "保留檔案(_K)"
-
-#: panels/user-accounts/um-user-panel.c:644
-#, c-format
-msgid "Are you sure you want to revoke remotely managed %s’s account?"
-msgstr "確定要註銷遠端管理的 %s 帳號?"
-
-#: panels/user-accounts/um-user-panel.c:648
-msgid "_Delete"
-msgstr "刪除(_D)"
-
-#: panels/user-accounts/um-user-panel.c:698
-msgctxt "Password mode"
-msgid "Account disabled"
-msgstr "帳號已停用"
-
-#: panels/user-accounts/um-user-panel.c:706
-msgctxt "Password mode"
-msgid "To be set at next login"
-msgstr "在下次登入時設定"
-
-#: panels/user-accounts/um-user-panel.c:709
-msgctxt "Password mode"
-msgid "None"
-msgstr "沒有"
-
-#: panels/user-accounts/um-user-panel.c:756
-msgid "Logged in"
-msgstr "已登入"
+"The username should usually only consist of lower case letters from a-z, "
+"digits and the following characters: - _"
+msgstr "使用者名稱通常只能有小寫英文字母 a 到 z、數字與下述字元:「-」、「_」。"
 
-#: panels/user-accounts/um-user-panel.c:1105
-msgid "Failed to contact the accounts service"
-msgstr "無法連接帳號服務"
+#: panels/user-accounts/user-utils.c:431
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr "抱歉,使用者名稱無法使用。請嘗試另一個。"
 
-#: panels/user-accounts/um-user-panel.c:1107
-msgid "Please make sure that the AccountService is installed and enabled."
-msgstr "請確定 AccountService 已經安裝並啟用。"
+#: panels/user-accounts/user-utils.c:476
+msgid "The username is too long."
+msgstr "使用者名稱太長。"
 
-#. Translator comments:
-#. * 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/um-user-panel.c:1139
+#: 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 ""
-"To make changes,\n"
-"click the * icon first"
-msgstr ""
-"要進行變更,\n"
-"請先點選 * 圖示"
+"You are not allowed to access the device. Contact your system administrator."
+msgstr "您不被允許使用這個裝置。請連絡您的管理員。"
 
-#: panels/user-accounts/um-user-panel.c:1179
-msgid "Create a user account"
-msgstr "建立新的使用者帳號"
+#: panels/user-accounts/um-fingerprint-dialog.c:141
+msgid "The device is already in use."
+msgstr "該裝置已經在使用中。"
 
-#: panels/user-accounts/um-user-panel.c:1190
-#: panels/user-accounts/um-user-panel.c:1368
-msgid ""
-"To create a user account,\n"
-"click the * icon first"
-msgstr ""
-"要建立使用者帳號,\n"
-"請先點選 * 圖示"
+#: panels/user-accounts/um-fingerprint-dialog.c:143
+msgid "An internal error occurred."
+msgstr "發生內部的錯誤。"
 
-#: panels/user-accounts/um-user-panel.c:1200
-msgid "Delete the selected user account"
-msgstr "刪除選取的使用者帳號"
+#: panels/user-accounts/um-fingerprint-dialog.c:214
+msgid "Enabled"
+msgstr "已啟用"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:260
+msgid "Delete registered fingerprints?"
+msgstr "是否刪除已註冊的指紋?"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:264
+msgid "_Delete Fingerprints"
+msgstr "刪除指紋(_D)"
 
-#: panels/user-accounts/um-user-panel.c:1212
-#: panels/user-accounts/um-user-panel.c:1373
+#: panels/user-accounts/um-fingerprint-dialog.c:270
 msgid ""
-"To delete the selected user account,\n"
-"click the * icon first"
-msgstr ""
-"要刪除選取的使用者帳號,\n"
-"請先點選 * 圖示"
+"Do you want to delete your registered fingerprints so fingerprint login is "
+"disabled?"
+msgstr "您確定要刪除已註冊的指紋嗎?這麼一來將會停用指紋登入。"
 
-#: panels/user-accounts/um-utils.c:496
-msgid "Sorry, that user name isn’t available. Please try another."
-msgstr "抱歉,使用者名稱無法使用。請嘗試另一個。"
+#: panels/user-accounts/um-fingerprint-dialog.c:440
+msgid "Done!"
+msgstr "完成!"
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+#: panels/user-accounts/um-fingerprint-dialog.c:501
+#: panels/user-accounts/um-fingerprint-dialog.c:543
+#, c-format
+msgid "Could not access “%s” device"
+msgstr "無法存取「%s」裝置"
 
-#: panels/user-accounts/um-utils.c:499
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+#: panels/user-accounts/um-fingerprint-dialog.c:584
 #, c-format
-msgid "The username is too long."
-msgstr "使用者名稱太長。"
+msgid "Could not start finger capture on “%s” device"
+msgstr "無法啟動「%s」裝置的指紋捕捉功能"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:628
+msgid "Could not access any fingerprint readers"
+msgstr "無法存取任何指紋辨識器"
 
-#: panels/user-accounts/um-utils.c:502
-msgid "The username cannot start with a “-”."
-msgstr "使用者名稱不能以「-」字元開頭。"
+#: panels/user-accounts/um-fingerprint-dialog.c:629
+msgid "Please contact your system administrator for help."
+msgstr "請連絡您的管理員來幫忙。"
 
-#: panels/user-accounts/um-utils.c:505
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
+#. * 'Digital Persona U.are.U 4000/4000B' device."
+#.
+#: panels/user-accounts/um-fingerprint-dialog.c:711
+#, c-format
 msgid ""
-"The username should only consist of upper and lower case letters from a-z, "
-"digits and the following characters: . - _"
-msgstr ""
-"使用者名稱只能由大小寫字母英文字母 a 到 z、數字,與其他字元:「.」、「-」、"
-"「_」。"
+"To enable fingerprint login, you need to save one of your fingerprints, "
+"using the “%s” device."
+msgstr "若要啟用指紋登入,您需要使用「%s」裝置儲存您的指紋。"
 
-#: panels/user-accounts/um-utils.c:509
-msgid "This will be used to name your home folder and can’t be changed."
-msgstr "這會成為您家目錄資料夾的名稱,並且不能被改變。"
+#: panels/user-accounts/um-fingerprint-dialog.c:718
+msgid "Selecting finger"
+msgstr "選擇手指"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:719
+msgid "Enrolling fingerprints"
+msgstr "登記指紋"
 
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
@@ -7275,13 +7627,13 @@ msgstr ""
 "若要編輯快捷鍵,請選擇「傳送按鍵」動作,按下鍵盤捷徑按鈕與新的按鍵組合,或以 "
 "Backspace 鍵來清除。"
 
-#: panels/wacom/calibrator/calibrator-gui.c:83
+#: panels/wacom/calibrator/calibrator.ui:61
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 msgstr "請點一下出現在螢幕上的目標標記來校準繪圖板。"
 
-#: panels/wacom/calibrator/calibrator-gui.c:87
+#: panels/wacom/calibrator/calibrator.ui:78
 msgid "Mis-click detected, restarting…"
 msgstr "偵測到誤點,重新開始…"
 
@@ -7333,7 +7685,7 @@ msgstr "%d / %d"
 msgid "Display Mapping"
 msgstr "顯示對應"
 
-#: panels/wacom/cc-wacom-panel.c:804 panels/wacom/wacom-stylus-page.ui:129
+#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "觸控筆"
 
@@ -7350,11 +7702,6 @@ msgstr "Wacom 繪圖板"
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr "設定繪圖板的按鈕對映與調整觸控筆的靈敏度"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/wacom/gnome-wacom-panel.desktop.in.in:7
-msgid "input-tablet"
-msgstr "input-tablet"
-
 #. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
 #: panels/wacom/gnome-wacom-panel.desktop.in.in:19
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
@@ -7388,38 +7735,42 @@ msgstr "請插入或開啟您的 Wacom 繪圖板"
 msgid "Bluetooth Settings"
 msgstr "藍牙設定值"
 
-#: panels/wacom/gnome-wacom-properties.ui:233
+#: panels/wacom/gnome-wacom-properties.ui:238
+msgid "Tracking Mode"
+msgstr "追蹤模式"
+
+#: panels/wacom/gnome-wacom-properties.ui:266
+msgid "Left-Handed Orientation"
+msgstr "左手方向"
+
+#: panels/wacom/gnome-wacom-properties.ui:296
 msgid "Map to Monitor…"
 msgstr "對應至顯示器..."
 
-#: panels/wacom/gnome-wacom-properties.ui:249
+#: panels/wacom/gnome-wacom-properties.ui:309
 msgid "Map Buttons…"
 msgstr "對應按鈕…"
 
-#: panels/wacom/gnome-wacom-properties.ui:265
+#: panels/wacom/gnome-wacom-properties.ui:322
 msgid "Calibrate…"
 msgstr "校準…"
 
-#: panels/wacom/gnome-wacom-properties.ui:286
-msgid "Adjust display resolution"
-msgstr "調整顯示解析度"
-
-#: panels/wacom/gnome-wacom-properties.ui:302
+#: panels/wacom/gnome-wacom-properties.ui:340
 msgid "Adjust mouse settings"
 msgstr "調整滑鼠設定值"
 
-#: panels/wacom/gnome-wacom-properties.ui:330
-msgid "Tracking Mode"
-msgstr "追蹤模式"
-
-#: panels/wacom/gnome-wacom-properties.ui:358
-msgid "Left-Handed Orientation"
-msgstr "左手方向"
+#: panels/wacom/gnome-wacom-properties.ui:356
+msgid "Adjust display resolution"
+msgstr "調整顯示解析度"
 
 #: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "新增快捷鍵…"
 
+#: panels/wacom/wacom-stylus-page.ui:25
+msgid "Default"
+msgstr "預設值"
+
 #: panels/wacom/wacom-stylus-page.ui:29
 msgid "Middle Mouse Button Click"
 msgstr "滑鼠中鍵點擊"
@@ -7428,7 +7779,7 @@ msgstr "滑鼠中鍵點擊"
 msgid "Right Mouse Button Click"
 msgstr "滑鼠右鍵點擊"
 
-#: panels/wacom/wacom-stylus-page.ui:37
+#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:242
 msgid "Back"
 msgstr "上一頁"
 
@@ -7444,101 +7795,94 @@ msgstr "找不到觸控筆"
 msgid "Please move your stylus to the proximity of the tablet to configure it"
 msgstr "請讓您的觸控筆靠近繪圖板來設定"
 
-#: panels/wacom/wacom-stylus-page.ui:169
+#: panels/wacom/wacom-stylus-page.ui:159
 msgid "Eraser Pressure Feel"
 msgstr "橡皮擦壓力感應"
 
-#: panels/wacom/wacom-stylus-page.ui:190 panels/wacom/wacom-stylus-page.ui:350
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
 msgid "Soft"
 msgstr "輕"
 
-#: panels/wacom/wacom-stylus-page.ui:220 panels/wacom/wacom-stylus-page.ui:380
+#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
 msgid "Firm"
 msgstr "重"
 
-#: panels/wacom/wacom-stylus-page.ui:243
+#: panels/wacom/wacom-stylus-page.ui:233
 msgid "Top Button"
 msgstr "頂端按鈕"
 
-#: panels/wacom/wacom-stylus-page.ui:272
+#: panels/wacom/wacom-stylus-page.ui:262
 msgid "Lower Button"
 msgstr "較低的按鈕"
 
-#: panels/wacom/wacom-stylus-page.ui:301
+#: panels/wacom/wacom-stylus-page.ui:291
 msgid "Lowest Button"
 msgstr "最低的按鈕"
 
-#: panels/wacom/wacom-stylus-page.ui:330
+#: panels/wacom/wacom-stylus-page.ui:320
 msgid "Tip Pressure Feel"
 msgstr "點選壓力感應"
 
-#: panels/wacom/wacom-stylus-page.ui:442
-msgid "page 3"
-msgstr "頁 3"
-
 #: shell/appdata/gnome-control-center.appdata.xml.in:7
-msgid "GNOME Control Center"
-msgstr "GNOME 控制中心"
+#| msgid "- Settings"
+msgid "GNOME Settings"
+msgstr "GNOME 設定"
 
 #: shell/appdata/gnome-control-center.appdata.xml.in:8
-msgid "Utilities to configure the GNOME desktop"
-msgstr "調整 GNOME 桌面設定的公用程式"
+#| msgid "Utilities to configure the GNOME desktop"
+msgid "Utility to configure the GNOME desktop"
+msgstr "設定 GNOME 桌面的工具程式"
 
 #: shell/appdata/gnome-control-center.appdata.xml.in:10
-msgid ""
-"The control center is GNOME’s main interface for configuration of various "
-"aspects of your desktop."
-msgstr "控制中心是 GNOME 用來管理桌面各層面設定的主要介面。"
+msgid "Settings is the primary interface for configuring your system."
+msgstr "《設定》是設定系統的主要介面。"
 
-#: shell/cc-application.c:62
+#: shell/appdata/gnome-control-center.appdata.xml.in:20
+msgid "The GNOME Project"
+msgstr "GNOME 專案"
+
+#: shell/cc-application.c:58
 msgid "Display version number"
 msgstr "顯示版本號碼"
 
-#: shell/cc-application.c:63
+#: shell/cc-application.c:59
 msgid "Enable verbose mode"
 msgstr "啟用詳細模式"
 
-#: shell/cc-application.c:64
+#: shell/cc-application.c:60
 msgid "Search for the string"
 msgstr "搜尋字串"
 
-#: shell/cc-application.c:65
+#: shell/cc-application.c:61
 msgid "List possible panel names and exit"
 msgstr "列出可能的面板名稱並結束"
 
-#: shell/cc-application.c:66
+#: shell/cc-application.c:62
 msgid "Panel to display"
 msgstr "要顯示的面板"
 
-#: shell/cc-application.c:66
+#: shell/cc-application.c:62
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[面板] [引數…]"
 
-#: shell/cc-application.c:137
+#: shell/cc-panel-loader.c:279
 msgid "Available panels:"
 msgstr "可用的面板:"
 
-#: shell/cc-application.c:253
-msgid "Help"
-msgstr "求助"
-
-#: shell/cc-application.c:254
-msgid "Quit"
-msgstr "結束"
-
-#: shell/cc-panel-list.ui:195
-msgid "No results found"
-msgstr "找不到結果"
-
-#: shell/cc-window.ui:140
+#: shell/cc-window.ui:147
 msgid "All Settings"
 msgstr "所有設定值"
 
-#: shell/cc-window.ui:234
+#: shell/cc-window.ui:185
+#| msgid "Primary"
+msgid "Primary Menu"
+msgstr "主選單"
+
+#: shell/cc-window.ui:332
 msgid "Warning: Development Version"
 msgstr "警告:開發版本"
 
-#: shell/cc-window.ui:235
+#: shell/cc-window.ui:333
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7547,10 +7891,9 @@ msgstr ""
 "這版本的設定應只作為開發目的。你可能會遇到不正常的系統行為、資料遺失與其他無"
 "法預測的問題。"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: shell/gnome-control-center.desktop.in.in:5
-msgid "gnome-control-center"
-msgstr "gnome-control-center"
+#: shell/cc-window.ui:344
+msgid "Help"
+msgstr "求助"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: shell/gnome-control-center.desktop.in.in:17
@@ -7610,7 +7953,7 @@ msgstr "當執行開發構建版本時,是否在設定中顯示警告。"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1873
+#: subprojects/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -7618,16 +7961,307 @@ msgstr[0] "%u 輸出"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1883
+#: subprojects/gvc/gvc-mixer-control.c:1893
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 輸入"
 
-#: subprojects/gvc/gvc-mixer-control.c:2738
+#: subprojects/gvc/gvc-mixer-control.c:2750
 msgid "System Sounds"
 msgstr "系統音效"
 
+#~ msgid "_Background"
+#~ msgstr "背景(_B)"
+
+#~ msgid "Changes throughout the day"
+#~ msgstr "整天的變更"
+
+#~ msgctxt "background, style"
+#~ msgid "Tile"
+#~ msgstr "鋪排"
+
+#~ msgctxt "background, style"
+#~ msgid "Zoom"
+#~ msgstr "縮放"
+
+#~ msgctxt "background, style"
+#~ msgid "Center"
+#~ msgstr "置中"
+
+#~ msgctxt "background, style"
+#~ msgid "Scale"
+#~ msgstr "縮放"
+
+#~ msgctxt "background, style"
+#~ msgid "Fill"
+#~ msgstr "填滿"
+
+#~ msgctxt "background, style"
+#~ msgid "Span"
+#~ msgstr "合併"
+
+#~ msgid "Wallpapers"
+#~ msgstr "桌布"
+
+#~ msgid "Colors"
+#~ msgstr "顏色"
+
+#~ msgid "Pictures"
+#~ msgstr "影像"
+
+#~ msgid "No Pictures Found"
+#~ msgstr "找不到影像"
+
+#~ msgid "You can add images to your %s folder and they will show up here"
+#~ msgstr "您可以將影像加入您的%s資料夾,它們會顯示在這裡"
+
+#~ msgid "preferences-desktop-wallpaper"
+#~ msgstr "preferences-desktop-wallpaper"
+
+#~ msgid "bluetooth"
+#~ msgstr "bluetooth"
+
+#~ msgid "preferences-color"
+#~ msgstr "preferences-color"
+
+#~ msgid "Language"
+#~ msgstr "語言"
+
+#~ msgid "preferences-system-time"
+#~ msgstr "preferences-system-time"
+
+#~ msgid "Primary Display"
+#~ msgstr "主要顯示器"
+
+#~ msgid "_Night Light"
+#~ msgstr "夜光(_N)"
+
+#~ msgid "Could not get screen information"
+#~ msgstr "無法取得螢幕資訊"
+
+#~ msgid "preferences-desktop-display"
+#~ msgstr "preferences-desktop-display"
+
+#~ msgid "starred"
+#~ msgstr "starred"
+
+#~ msgid "help-about"
+#~ msgstr "help-about"
+
+#~ msgid "media-removable"
+#~ msgstr "media-removable"
+
+#~ msgid "Keyboard"
+#~ msgstr "鍵盤"
+
+#~ msgid "input-keyboard"
+#~ msgstr "input-keyboard"
+
+#~ msgid "input-mouse"
+#~ msgstr "input-mouse"
+
+#~ msgid "My Home Network"
+#~ msgstr "我的家用網路"
+
+#~ msgid "network-workgroup"
+#~ msgstr "network-workgroup"
+
+#~ msgid "network-wireless"
+#~ msgstr "network-wireless"
+
+#~ msgid "hardware"
+#~ msgstr "硬體"
+
+#~ msgid "preferences-system-notifications"
+#~ msgstr "preferences-system-notifications"
+
+#~ msgid "goa-panel"
+#~ msgstr "goa-panel"
+
+#~ msgid "_Automatic suspend"
+#~ msgstr "自動暫停(_A)"
+
+#~ msgid "_When the Power Button is pressed"
+#~ msgstr "當按下電源按鈕(_W)"
+
+#~ msgid "gnome-power-manager"
+#~ msgstr "gnome-power-manager"
+
+#~ msgid "printer"
+#~ msgstr "printer"
+
+#~ msgid "preferences-system-privacy"
+#~ msgstr "preferences-system-privacy"
+
+#~ msgid "Show _Notifications"
+#~ msgstr "顯示通知(_N)"
+
+#~ msgid "preferences-desktop-locale"
+#~ msgstr "preferences-desktop-locale"
+
+#~ msgid "Switch to previous source"
+#~ msgstr "切換至上個來源"
+
+#~ msgid "Switch to next source"
+#~ msgstr "切換至下個來源"
+
+#~ msgid "Alternative switch to next source"
+#~ msgstr "切換至下個來源的替代鍵"
+
+#~ msgid "English (United Kingdom)"
+#~ msgstr "英文 (英國)"
+
+#~ msgid "United Kingdom"
+#~ msgstr "英國"
+
+#~ msgid "_Options"
+#~ msgstr "選項(_O)"
+
+#~ msgid "Add input source"
+#~ msgstr "加入輸入來源"
+
+#~ msgid "Remove input source"
+#~ msgstr "移除輸入來源"
+
+#~ msgid "Move input source up"
+#~ msgstr "將輸入來源往上移"
+
+#~ msgid "Move input source down"
+#~ msgstr "將輸入來源往下移"
+
+#~ msgid "Configure input source"
+#~ msgstr "設定輸入來源"
+
+#~ msgid "Show input source keyboard layout"
+#~ msgstr "顯示輸入來源鍵盤配置"
+
+#~ msgid "preferences-system-search"
+#~ msgstr "preferences-system-search"
+
+#~ msgid "Preferences"
+#~ msgstr "偏好設定"
+
+#~ msgid "preferences-system-sharing"
+#~ msgstr "preferences-system-sharing"
+
+#~ msgid "multimedia-volume-control"
+#~ msgstr "multimedia-volume-control"
+
+#~ msgctxt "balance"
+#~ msgid "Left"
+#~ msgstr "左"
+
+#~ msgctxt "balance"
+#~ msgid "Right"
+#~ msgstr "右"
+
+#~ msgctxt "balance"
+#~ msgid "Minimum"
+#~ msgstr "最小值"
+
+#~ msgctxt "balance"
+#~ msgid "Maximum"
+#~ msgstr "最大值"
+
+#~ msgid "_Subwoofer:"
+#~ msgstr "重低音(_S):"
+
+#~ msgctxt "volume"
+#~ msgid "Unamplified"
+#~ msgstr "未經放大"
+
+#~ msgid "_Profile:"
+#~ msgstr "設定檔(_P):"
+
+#~ msgid "_Test Speakers"
+#~ msgstr "測試喇叭(_T)"
+
+#~ msgid "Peak detect"
+#~ msgstr "峰值檢測"
+
+#~ msgid "Device"
+#~ msgstr "裝置"
+
+#~ msgid "Speaker Testing for %s"
+#~ msgstr "%s 的喇叭測試"
+
+#~ msgid "C_hoose a device for sound output:"
+#~ msgstr "選擇聲音輸出的裝置(_H):"
+
+#~ msgid "Settings for the selected device:"
+#~ msgstr "已選取裝置的設定值:"
+
+#~ msgid "_Input volume:"
+#~ msgstr "輸入音量(_I):"
+
+#~ msgid "C_hoose a device for sound input:"
+#~ msgstr "選擇聲音輸入的裝置(_H):"
+
+#~ msgid "Sound Effects"
+#~ msgstr "聲音效果"
+
+#~ msgid "No application is currently playing or recording audio."
+#~ msgstr "沒有應用程式目前正在播放或錄製音效。"
+
+#~ msgid "Built-in"
+#~ msgstr "內建"
+
+#~ msgid "Sound Preferences"
+#~ msgstr "音效偏好設定"
+
+#~ msgid "Testing event sound"
+#~ msgstr "測試事件聲音"
+
+#~ msgid "From theme"
+#~ msgstr "從主題"
+
+#~ msgid "C_hoose an alert sound:"
+#~ msgstr "選擇警示音效(_H):"
+
+#~ msgid "Stop"
+#~ msgstr "停止"
+
+#~ msgid "thunderbolt"
+#~ msgstr "thunderbolt"
+
+#~ msgid "preferences-desktop-accessibility"
+#~ msgstr "preferences-desktop-accessibility"
+
+#~ msgid "system-users"
+#~ msgstr "system-users"
+
+#~ msgctxt "Account type"
+#~ msgid "Standard"
+#~ msgstr "標準"
+
+#~ msgctxt "Account type"
+#~ msgid "Administrator"
+#~ msgstr "管理員"
+
+#~ msgid "The username cannot start with a “-”."
+#~ msgstr "使用者名稱不能以「-」字元開頭。"
+
+#~ msgid "input-tablet"
+#~ msgstr "input-tablet"
+
+#~ msgid "page 3"
+#~ msgstr "頁 3"
+
+#~ msgid "GNOME Control Center"
+#~ msgstr "GNOME 控制中心"
+
+#~ msgid ""
+#~ "The control center is GNOME’s main interface for configuration of various "
+#~ "aspects of your desktop."
+#~ msgstr "控制中心是 GNOME 用來管理桌面各層面設定的主要介面。"
+
+#~ msgid "Quit"
+#~ msgstr "結束"
+
+#~ msgid "gnome-control-center"
+#~ msgstr "gnome-control-center"
+
 #~ msgid "_Verify New Password"
 #~ msgstr "驗證新密碼(_V)"
 
@@ -7664,10 +8298,6 @@ msgstr "系統音效"
 #~ msgid "Remo­vable Media"
 #~ msgstr "可移除式媒體"
 
-#~ msgctxt "keybinding"
-#~ msgid "Search"
-#~ msgstr "搜尋"
-
 #~ msgid "Net­work"
 #~ msgstr "網路"
 
@@ -7719,9 +8349,6 @@ msgstr "系統音效"
 #~ msgid "Mirrored"
 #~ msgstr "相同顯示"
 
-#~ msgid "Primary"
-#~ msgstr "主要"
-
 #~ msgid "Secondary"
 #~ msgstr "次要"
 
@@ -7797,9 +8424,6 @@ msgstr "系統音效"
 #~ msgid "Delete DNS Server"
 #~ msgstr "刪除 DNS 伺服器"
 
-#~ msgid "Reset"
-#~ msgstr "重設"
-
 #~ msgid "Make available to other _users"
 #~ msgstr "允許其他使用者使用(_U)"
 
@@ -7934,9 +8558,6 @@ msgstr "系統音效"
 #~ msgid "Chat"
 #~ msgstr "聊天"
 
-#~ msgid "Resources"
-#~ msgstr "資源"
-
 #~ msgid "Error creating account"
 #~ msgstr "建立帳號時發生錯誤"
 
@@ -7983,9 +8604,6 @@ msgstr "系統音效"
 #~ msgid "Supply"
 #~ msgstr "耗材"
 
-#~ msgid "_Default printer"
-#~ msgstr "預設印表機(_D)"
-
 #~ msgid "Jobs"
 #~ msgstr "工作"
 
@@ -8411,9 +9029,6 @@ msgstr "系統音效"
 #~ msgid "Show help options"
 #~ msgstr "顯示說明的選項"
 
-#~ msgid "- Settings"
-#~ msgstr "- 設定值)"
-
 #~ msgid ""
 #~ "%s\n"
 #~ "Run '%s --help' to see a full list of available command line options.\n"
@@ -8427,9 +9042,6 @@ msgstr "系統音效"
 #~ msgid "United States"
 #~ msgstr "美國"
 
-#~ msgid "Germany"
-#~ msgstr "德國"
-
 #~ msgid "France"
 #~ msgstr "法國"
 
@@ -8456,9 +9068,6 @@ msgstr "系統音效"
 #~ msgid "Show Pop Up Banners"
 #~ msgstr "顯示彈出式橫幅"
 
-#~ msgid "Show in Lock Screen"
-#~ msgstr "在鎖定畫面中顯示"
-
 #~ msgid "Enter address of a printer or a text to filter results"
 #~ msgstr "輸入網路印表機的位址或過濾器結果文字"
 
@@ -9057,9 +9666,6 @@ msgstr "系統音效"
 #~ msgid "Select a region"
 #~ msgstr "選擇地區"
 
-#~ msgid "Select a language"
-#~ msgstr "選擇語言"
-
 #~ msgid "Date and Time preferences panel"
 #~ msgstr "日期和時刻偏好設定面板"
 
@@ -9105,9 +9711,6 @@ msgstr "系統音效"
 #~ msgid "Change your region and language settings"
 #~ msgstr "改變您的地區和語言設定值"
 
-#~ msgid "Select an input source"
-#~ msgstr "選擇一個輸入來源"
-
 #~ msgid ""
 #~ "The login screen, system accounts and new user accounts use the system-"
 #~ "wide Region and Language settings."
@@ -9151,9 +9754,6 @@ msgstr "系統音效"
 #~ msgid "Examples"
 #~ msgstr "範例"
 
-#~ msgid "Select keyboards or other input sources"
-#~ msgstr "選取鍵盤或其他輸入來源"
-
 #~ msgid "Ctrl+Alt+Space"
 #~ msgstr "Ctrl+Alt+Space"
 
@@ -9172,9 +9772,6 @@ msgstr "系統音效"
 #~ msgid "System settings"
 #~ msgstr "系統設定值"
 
-#~ msgid "Search settings"
-#~ msgstr "搜尋設定值"
-
 #~ msgid "Universal Access Preferences"
 #~ msgstr "無障礙偏好設定"
 


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