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



commit ff631c70dbfe486cce853a8ec5c8a066b9dca8cd
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Jul 16 02:48:47 2016 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po | 1729 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 969 insertions(+), 760 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 310c792..d65dd0c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,16 +14,16 @@ msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-04-04 07:58+0000\n"
-"PO-Revision-Date: 2016-03-27 17:59+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2016-06-24 15:26+0000\n"
+"PO-Revision-Date: 2016-07-15 09:43+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.6\n"
 
 #: ../panels/background/background.ui.h:1
 msgid "_Background"
@@ -95,7 +95,7 @@ msgstr "找不到影像"
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
 #: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:274
+#: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "家"
 
@@ -110,25 +110,25 @@ msgstr "您可以將影像加入您的%s資料夾,它們會顯示在這裡"
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1563
-#: ../panels/display/cc-display-panel.c:2196
+#: ../panels/display/cc-display-panel.c:1561
+#: ../panels/display/cc-display-panel.c:2206
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:245
-#: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1269
-#: ../panels/network/net-device-wifi.c:1462
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1295
+#: ../panels/network/net-device-wifi.c:1532
 #: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2052
+#: ../panels/printers/cc-printers-panel.c:2076
 #: ../panels/printers/new-printer-dialog.ui.h:2
 #: ../panels/privacy/cc-privacy-panel.c:982
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:681
+#: ../panels/search/cc-search-locations-dialog.c:637
 #: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1476
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: ../panels/user-accounts/um-fingerprint-dialog.c:266
 #: ../panels/user-accounts/um-photo-dialog.c:94
 #: ../panels/user-accounts/um-photo-dialog.c:217
 #: ../panels/user-accounts/um-user-panel.c:705
@@ -159,16 +159,17 @@ msgstr "無桌面背景"
 msgid "Current background"
 msgstr "目前的背景"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+msgid "Back­ground"
 msgstr "背景"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
 msgid "Change your background image to a wallpaper or photo"
 msgstr "將您的背景影像變更為桌布或相片"
 
 #. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:4
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;"
 
@@ -208,18 +209,17 @@ msgstr "硬體飛安模式已開啟"
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "關閉飛安模式開關以啟用藍牙。"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Blue­tooth"
 msgstr "藍牙"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "開啟或關閉藍牙與連接您的裝置"
 
 #. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;分享;藍牙;"
 
@@ -388,7 +388,7 @@ msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:420
+#: ../panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "所有檔案"
 
@@ -427,7 +427,7 @@ msgid "Save Profile"
 msgstr "儲存描述檔"
 
 #: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:375
+#: ../panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -673,7 +673,7 @@ msgstr ""
 "X</a> 和 <a href=\"windows\">Microsoft Windows</a> 系統上使用描述檔的指引。"
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:731
 msgid "Summary"
 msgstr "摘要"
 
@@ -686,10 +686,10 @@ msgid "_Import File…"
 msgstr "載入檔案(_I)…"
 
 #: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:518
+#: ../panels/network/connection-editor/net-connection-editor.c:546
 #: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1477
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -835,17 +835,18 @@ msgstr "D65 (攝影與繪圖)"
 msgid "D75"
 msgstr "D75"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Co­lor"
 msgstr "顏色"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr "校準您裝置的顏色,像是顯示器、攝影機或印表機"
 
 #. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr ""
 "Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;印表機;顯示"
@@ -865,23 +866,23 @@ msgstr "更多…"
 msgid "No languages found"
 msgstr "找不到語言"
 
-#: ../panels/common/cc-util.c:125
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:100
 msgid "Today"
 msgstr "今日"
 
-#: ../panels/common/cc-util.c:129
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:102
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:136
+#: ../panels/common/cc-util.c:138
 msgid "%b %e"
 msgstr "%b%e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:141
+#: ../panels/common/cc-util.c:143
 msgid "%b %e, %Y"
 msgstr "%Y年%b%e日"
 
@@ -1001,8 +1002,9 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Date & Time"
 msgstr "日期與時刻"
 
@@ -1059,12 +1061,12 @@ msgstr "24小時"
 msgid "AM / PM"
 msgstr "AM / PM"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
 msgid "Change the date and time, including time zone"
 msgstr "改變時刻與日期,包含時區"
 
 #. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
 msgid "Clock;Timezone;Location;"
 msgstr "Clock;Timezone;Location;時鐘;時區;位置;"
 
@@ -1076,209 +1078,214 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,您需要通過核對。"
 
-#: ../panels/display/cc-display-panel.c:575
+#: ../panels/display/cc-display-panel.c:573
 msgid "Lid Closed"
 msgstr "上蓋已經關閉"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:576
 msgid "Mirrored"
 msgstr "相同顯示"
 
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/display/cc-display-panel.c:2390
+#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:2429
 msgid "Primary"
 msgstr "主要"
 
-#: ../panels/display/cc-display-panel.c:582
+#: ../panels/display/cc-display-panel.c:580
 #: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938
+#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971
 #: ../panels/privacy/cc-privacy-panel.c:172
 #: ../panels/privacy/cc-privacy-panel.c:239
 #: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:585
+#: ../panels/display/cc-display-panel.c:583
 msgid "Secondary"
 msgstr "次要"
 
 #. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1560
+#: ../panels/display/cc-display-panel.c:1558
 msgid "Arrange Combined Displays"
 msgstr "排列顯示器的組合方式"
 
-#: ../panels/display/cc-display-panel.c:1564
-#: ../panels/display/cc-display-panel.c:2197
+#: ../panels/display/cc-display-panel.c:1562
+#: ../panels/display/cc-display-panel.c:2207
 #: ../panels/network/connection-editor/connection-editor.ui.h:2
 #: ../panels/network/network-wifi.ui.h:2
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1588
+#: ../panels/display/cc-display-panel.c:1586
 msgid "Drag displays to rearrange them"
 msgstr "拖拉顯示器以重新排列"
 
 #. translators: example string is "60 Hz (NTSC)"
 #. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1794
+#: ../panels/display/cc-display-panel.c:1793
 #, c-format
 msgid "%d Hz (NTSC)"
 msgstr "%d Hz (NTSC)"
 
 #. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1800
+#: ../panels/display/cc-display-panel.c:1799
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../panels/display/cc-display-panel.c:2246
+#: ../panels/display/cc-display-panel.c:2259
 msgid "Rotate counterclockwise by 90°"
 msgstr "逆時針"
 
-#: ../panels/display/cc-display-panel.c:2264
+#: ../panels/display/cc-display-panel.c:2277
 msgid "Rotate by 180°"
 msgstr "旋轉 180°"
 
-#: ../panels/display/cc-display-panel.c:2282
+#: ../panels/display/cc-display-panel.c:2295
 msgid "Rotate clockwise by 90°"
 msgstr "順時針旋轉 90°"
 
-#: ../panels/display/cc-display-panel.c:2303
+#: ../panels/display/cc-display-panel.c:2316
 msgid "Size"
 msgstr "尺寸"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2316
+#: ../panels/display/cc-display-panel.c:2331
 msgid "Aspect Ratio"
 msgstr "長寬比"
 
-#: ../panels/display/cc-display-panel.c:2338
+#: ../panels/display/cc-display-panel.c:2354
 #: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "解析度"
 
-#: ../panels/display/cc-display-panel.c:2360
+#: ../panels/display/cc-display-panel.c:2374
+msgid "Adjust for TV"
+msgstr "調整為電視"
+
+#: ../panels/display/cc-display-panel.c:2398
 msgid "Refresh Rate"
 msgstr "更新率"
 
-#: ../panels/display/cc-display-panel.c:2391
+#: ../panels/display/cc-display-panel.c:2430
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "在這個顯示器顯示頂端列與活動概覽"
 
-#: ../panels/display/cc-display-panel.c:2397
+#: ../panels/display/cc-display-panel.c:2436
 msgid "Secondary Display"
 msgstr "次要顯示器"
 
-#: ../panels/display/cc-display-panel.c:2398
+#: ../panels/display/cc-display-panel.c:2437
 msgid "Join this display with another to create an extra workspace"
 msgstr "將本顯示器與另一個顯示器組合以建立額外的工作空間"
 
-#: ../panels/display/cc-display-panel.c:2405
+#: ../panels/display/cc-display-panel.c:2444
 msgid "Presentation"
 msgstr "展示"
 
-#: ../panels/display/cc-display-panel.c:2406
+#: ../panels/display/cc-display-panel.c:2445
 msgid "Show slideshows and media only"
 msgstr "只顯示投影片與媒體"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2411
+#: ../panels/display/cc-display-panel.c:2450
 msgid "Mirror"
 msgstr "相同"
 
-#: ../panels/display/cc-display-panel.c:2412
+#: ../panels/display/cc-display-panel.c:2451
 msgid "Show your existing view on both displays"
 msgstr "兩個顯示器上皆顯示您現在的檢視畫面"
 
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:2457
 msgid "Turn Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:2419
+#: ../panels/display/cc-display-panel.c:2458
 msgid "Don't use this display"
 msgstr "不使用這個顯示器"
 
-#: ../panels/display/cc-display-panel.c:2722
+#: ../panels/display/cc-display-panel.c:2769
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
-#: ../panels/display/cc-display-panel.c:2753
+#: ../panels/display/cc-display-panel.c:2800
 msgid "_Arrange Combined Displays"
 msgstr "排列顯示器組合方式(_A)"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+msgid "Dis­plays"
 msgstr "顯示器"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
 msgid "Choose how to use connected monitors and projectors"
 msgstr "選擇如何使用連接的顯示器和投影機"
 
 #. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:4
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
 msgstr ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影機;螢幕;解"
 "析度;重新整理;螢幕;"
 
-#: ../panels/info/cc-info-panel.c:385
+#: ../panels/info/cc-info-panel.c:345
 msgid "Wayland"
 msgstr "Wayland"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "不明"
 
-#: ../panels/info/cc-info-panel.c:473
+#: ../panels/info/cc-info-panel.c:433
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位元"
 
-#: ../panels/info/cc-info-panel.c:475
+#: ../panels/info/cc-info-panel.c:435
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位元"
 
-#: ../panels/info/cc-info-panel.c:1155
+#: ../panels/info/cc-info-panel.c:1115
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1159
+#: ../panels/info/cc-info-panel.c:1119
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1163
+#: ../panels/info/cc-info-panel.c:1123
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1254
+#: ../panels/info/cc-info-panel.c:1214
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1285
+#: ../panels/info/cc-info-panel.c:1245
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1286
+#: ../panels/info/cc-info-panel.c:1246
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1287
+#: ../panels/info/cc-info-panel.c:1247
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1288
+#: ../panels/info/cc-info-panel.c:1248
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1289
+#: ../panels/info/cc-info-panel.c:1249
 msgid "Select an application for software CDs"
 msgstr "選擇軟體 CD 要用的應用程式"
 
@@ -1287,88 +1294,87 @@ msgstr "選擇軟體 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1301
+#: ../panels/info/cc-info-panel.c:1261
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1302
+#: ../panels/info/cc-info-panel.c:1262
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 碟片"
 
-#: ../panels/info/cc-info-panel.c:1303
+#: ../panels/info/cc-info-panel.c:1263
 msgid "blank CD disc"
 msgstr "空白 CD 碟片"
 
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-panel.c:1264
 msgid "blank DVD disc"
 msgstr "空白 DVD 碟片"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-panel.c:1265
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 碟片"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-panel.c:1266
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片碟片"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-panel.c:1267
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-panel.c:1268
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片碟片"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-panel.c:1269
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1310
+#: ../panels/info/cc-info-panel.c:1270
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1311
+#: ../panels/info/cc-info-panel.c:1271
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1312
+#: ../panels/info/cc-info-panel.c:1272
 msgid "Windows software"
 msgstr "Windows 軟體"
 
-#: ../panels/info/cc-info-panel.c:1435
+#: ../panels/info/cc-info-panel.c:1395
 #: ../panels/keyboard/keyboard-shortcuts.c:1949
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1404 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1410 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1415 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1480
+#: ../panels/info/cc-info-panel.c:1440
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#: ../panels/network/connection-editor/ce-page-details.c:240
-#: ../panels/network/network-wifi.ui.h:46
-msgid "Details"
-msgstr "詳細資料"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "De­tails"
+msgstr "詳細資訊"
+
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 msgid "View information about your system"
 msgstr "檢視您系統的資訊"
 
 #. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1543,8 +1549,9 @@ msgstr "執行器"
 msgid "Launch help browser"
 msgstr "執行說明文件瀏覽器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606
-#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
+#: ../shell/alt/cc-window.c:827 ../shell/cc-window.c:1584
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "設定值"
 
@@ -1617,7 +1624,6 @@ msgid "Lock screen"
 msgstr "鎖定畫面"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
 msgid "Universal Access"
 msgstr "無障礙功能"
 
@@ -1660,7 +1666,7 @@ msgstr "高對比開或關"
 #: ../panels/keyboard/keyboard-shortcuts.c:1220
 #: ../panels/network/network-wifi.ui.h:31
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
 msgid "Disabled"
 msgstr "已停用"
 
@@ -1684,16 +1690,17 @@ msgstr "組合鍵"
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+msgid "Key­board"
 msgstr "鍵盤"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr "檢視與變更鍵盤捷徑鍵並設定您的輸入偏好設定"
 
 #. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
 msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;捷徑鍵;重複;閃爍;"
 
@@ -1784,17 +1791,18 @@ msgstr "指派(_R)"
 msgid "Test Your _Settings"
 msgstr "測試您的設定值(_S)"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
-msgstr "滑鼠和觸控板"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+msgid "Mouse & Touch­pad"
+msgstr "滑鼠及觸控板"
+
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr "改變您的滑鼠或控制板靈敏度並選擇慣用右手或左手"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr ""
 "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;觸控板;指標;點擊;輕"
@@ -1892,11 +1900,11 @@ msgstr "單擊,次要按鈕"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:349
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:967
+#: ../panels/network/cc-network-panel.c:953
 msgid "Network proxy"
 msgstr "網路代理伺服器"
 
@@ -1904,17 +1912,17 @@ msgstr "網路代理伺服器"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
-#: ../panels/network/net-vpn.c:432
+#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/net-vpn.c:440
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1300
+#: ../panels/network/cc-network-panel.c:1194
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "噢,有問題發生。請聯繫您的軟體供應商。"
 
-#: ../panels/network/cc-network-panel.c:1306
+#: ../panels/network/cc-network-panel.c:1200
 msgid "NetworkManager needs to be running."
 msgstr "需要先執行 NetworkManager。"
 
@@ -1930,7 +1938,7 @@ msgstr "頁 1"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
 #: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 msgid "Anony_mous identity"
@@ -1947,189 +1955,199 @@ msgstr "內部核對(_A)"
 msgid "page 2"
 msgstr "頁 2"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:469
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:458
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
 msgstr "安全性"
 
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "自動"
 
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "設定檔 %d"
+
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:383
+#: ../panels/network/connection-editor/ce-page-details.c:50
+#: ../panels/network/net-device-wifi.c:214
+#: ../panels/network/net-device-wifi.c:390
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:223
-#: ../panels/network/net-device-wifi.c:388
+#: ../panels/network/connection-editor/ce-page-details.c:54
+#: ../panels/network/net-device-wifi.c:218
+#: ../panels/network/net-device-wifi.c:395
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:58
+#: ../panels/network/net-device-wifi.c:222
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/connection-editor/ce-page-details.c:63
+#: ../panels/network/net-device-wifi.c:227
 msgid "Enterprise"
 msgstr "企業版"
 
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:237
-#: ../panels/network/net-device-wifi.c:373
+#: ../panels/network/connection-editor/ce-page-details.c:68
+#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/net-device-wifi.c:380
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/network/connection-editor/ce-page-details.c:89
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "永不"
 
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:485
 #, 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:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:542
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/connection-editor/ce-page-details.c:179
+#: ../panels/network/net-device-wifi.c:571
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:573
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:575
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:577
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:579
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:226
-#: ../panels/network/connection-editor/ce-page-vpn.c:220
-#: ../panels/network/connection-editor/ce-page-wifi.c:262
+#: ../panels/network/connection-editor/ce-page-details.c:236
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+msgid "Details"
+msgstr "詳細資料"
+
+#: ../panels/network/connection-editor/ce-page-ethernet.c:215
+#: ../panels/network/connection-editor/ce-page-vpn.c:221
+#: ../panels/network/connection-editor/ce-page-wifi.c:227
 #: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "身分"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:177
-#: ../panels/network/connection-editor/ce-page-ip4.c:439
-#: ../panels/network/connection-editor/ce-page-ip6.c:179
-#: ../panels/network/connection-editor/ce-page-ip6.c:443
+#: ../panels/network/connection-editor/ce-page-ip4.c:178
+#: ../panels/network/connection-editor/ce-page-ip4.c:432
+#: ../panels/network/connection-editor/ce-page-ip6.c:180
+#: ../panels/network/connection-editor/ce-page-ip6.c:427
 msgid "Address"
 msgstr "地址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
+#: ../panels/network/connection-editor/ce-page-ip4.c:191
+#: ../panels/network/connection-editor/ce-page-ip4.c:445
 msgid "Netmask"
 msgstr "網路遮罩"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:204
-#: ../panels/network/connection-editor/ce-page-ip4.c:465
-#: ../panels/network/connection-editor/ce-page-ip6.c:205
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip4.c:205
+#: ../panels/network/connection-editor/ce-page-ip4.c:458
+#: ../panels/network/connection-editor/ce-page-ip6.c:206
+#: ../panels/network/connection-editor/ce-page-ip6.c:453
 #: ../panels/network/network-vpn.ui.h:2
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
+#: ../panels/network/connection-editor/ce-page-ip4.c:222
+#: ../panels/network/connection-editor/ce-page-ip6.c:223
 msgid "Delete Address"
 msgstr "刪除位址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
+#: ../panels/network/connection-editor/ce-page-ip4.c:276
+#: ../panels/network/connection-editor/ce-page-ip6.c:277
 msgid "Add"
 msgstr "加入"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
+#: ../panels/network/connection-editor/ce-page-ip4.c:339
+#: ../panels/network/connection-editor/ce-page-ip6.c:334
 msgid "Server"
 msgstr "伺服器"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:356
+#: ../panels/network/connection-editor/ce-page-ip6.c:351
 msgid "Delete DNS Server"
 msgstr "刪除 DNS 伺服器"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:479
-#: ../panels/network/connection-editor/ce-page-ip6.c:487
+#: ../panels/network/connection-editor/ce-page-ip4.c:472
+#: ../panels/network/connection-editor/ce-page-ip6.c:467
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:500
-#: ../panels/network/connection-editor/ce-page-ip6.c:508
+#: ../panels/network/connection-editor/ce-page-ip4.c:493
+#: ../panels/network/connection-editor/ce-page-ip6.c:484
 msgid "Delete Route"
 msgstr "刪除路由"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
+#: ../panels/network/connection-editor/ce-page-ip4.c:597
 #: ../panels/network/network-wifi.ui.h:27
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:619
-#: ../panels/network/connection-editor/ce-page-ip6.c:621
+#: ../panels/network/connection-editor/ce-page-ip4.c:601
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
 #: ../panels/network/network-wifi.ui.h:26
 #: ../panels/privacy/cc-privacy-panel.c:199
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
+#: ../panels/network/connection-editor/ce-page-ip4.c:605
+#: ../panels/network/connection-editor/ce-page-ip6.c:596
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:967
+#: ../panels/network/connection-editor/ce-page-ip4.c:935
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:192
-#: ../panels/network/connection-editor/ce-page-ip6.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:193
+#: ../panels/network/connection-editor/ce-page-ip6.c:440
 msgid "Prefix"
 msgstr "前綴"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:613
+#: ../panels/network/connection-editor/ce-page-ip6.c:584
 #: ../panels/network/connection-editor/ethernet-page.ui.h:1
 #: ../panels/network/connection-editor/ip4-page.ui.h:4
 #: ../panels/network/connection-editor/ip6-page.ui.h:4
@@ -2138,47 +2156,47 @@ msgstr "前綴"
 msgid "Automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
+#: ../panels/network/connection-editor/ce-page-ip6.c:588
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:937
+#: ../panels/network/connection-editor/ce-page-ip6.c:893
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/connection-editor/ce-page-reset.c:89
 #: ../panels/network/network-wifi.ui.h:51
 msgid "Reset"
 msgstr "重設"
 
-#: ../panels/network/connection-editor/ce-page-security.c:253
+#: ../panels/network/connection-editor/ce-page-security.c:248
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/network/connection-editor/ce-page-security.c:276
+#: ../panels/network/connection-editor/ce-page-security.c:271
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元金鑰 (Hex 或 ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:286
+#: ../panels/network/connection-editor/ce-page-security.c:281
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元密語"
 
-#: ../panels/network/connection-editor/ce-page-security.c:299
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:294
+#: ../panels/network/wireless-security/wireless-security.c:463
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:312
+#: ../panels/network/connection-editor/ce-page-security.c:307
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:326
+#: ../panels/network/connection-editor/ce-page-security.c:321
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 和 WPA2 個人版"
 
-#: ../panels/network/connection-editor/ce-page-security.c:340
+#: ../panels/network/connection-editor/ce-page-security.c:335
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 和 WPA2 企業版"
 
@@ -2193,30 +2211,30 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:157
+#: ../panels/network/net-device-ethernet.c:153
 #: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695
+#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:165
+#: ../panels/network/net-device-ethernet.c:161
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "硬體位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:169
+#: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
@@ -2226,7 +2244,7 @@ msgstr "預設路由"
 #: ../panels/network/connection-editor/details-page.ui.h:8
 #: ../panels/network/connection-editor/ip4-page.ui.h:3
 #: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:171
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
@@ -2309,13 +2327,13 @@ msgstr "自動連線(_A)"
 msgid "Firewall _Zone"
 msgstr "防火牆界域(_Z)"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:113
+#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:118
 msgctxt "Firewall zone"
 msgid "Default"
 msgstr "預設"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:50
 msgid "The zone defines the trust level of the connection"
 msgstr "界域定義了連線的信任等級"
 
@@ -2357,45 +2375,25 @@ msgstr "只在使用這個連線的網路資源時才使用此連線(_U)"
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:275
+#: ../panels/network/connection-editor/net-connection-editor.c:296
 msgid "Unable to open connection editor"
 msgstr "無法開啟連線編輯器"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:293
+#: ../panels/network/connection-editor/net-connection-editor.c:314
 msgid "New Profile"
 msgstr "新增設定檔"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:635
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:584
-msgid "Bond"
-msgstr "繫結"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:586
-msgid "Team"
-msgstr "團隊"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:588
-msgid "Bridge"
-msgstr "橋接"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:589
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:740
-msgid "Could not load VPN plugins"
-msgstr "無法載入 VPN 外掛程式"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:809
+#: ../panels/network/connection-editor/net-connection-editor.c:783
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:880
-msgid "Add Network Connection"
-msgstr "加入網路連線"
+#: ../panels/network/connection-editor/net-connection-editor.c:817
+msgid "Add VPN"
+msgstr "加入 VPN"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:41
@@ -2403,7 +2401,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1463
+#: ../panels/network/net-device-wifi.c:1533
 #: ../panels/network/network-wifi.ui.h:42
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2425,11 +2423,11 @@ msgstr "移除這個網路的相關詳細資料並且不再嘗試自動連線"
 msgid "S_ecurity"
 msgstr "安全性(_E)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:205
+#: ../panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "無法匯入 VPN 網路連線"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:207
+#: ../panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2441,36 +2439,36 @@ msgstr ""
 "\n"
 "錯誤:%s。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:242
+#: ../panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:2053
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/cc-printers-panel.c:2077
 #: ../panels/sharing/cc-sharing-panel.c:373
 #: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:294
+#: ../panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "名為「%s」的檔案已經存在。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:296
+#: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:298
+#: ../panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "您是否要以準備儲存的 VPN 連線取代 %s?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:334
+#: ../panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "不能匯出 VPN 連線"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:336
+#: ../panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2481,7 +2479,7 @@ msgstr ""
 "\n"
 "錯誤:%s。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:371
+#: ../panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "匯出 VPN 連線"
 
@@ -2508,61 +2506,46 @@ msgstr "我的家用網路"
 msgid "Make available to _other users"
 msgstr "允許其他使用者使用(_O)"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Net­work"
 msgstr "網路"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
 msgid "Control how you connect to the Internet"
 msgstr "控制您如何連線至網際網絡"
 
 #. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;"
+"DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;網路;無線網路;區域網路;代理伺服器;寬頻;數據機;藍牙;橋接;"
-"繫結;"
+"DNS;網路;無線網路;區域網路;代理伺服器;寬頻;數據機;藍牙;"
 
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "繫結的連線"
-
-#: ../panels/network/net-device-bond.c:102
-#: ../panels/network/net-device-bridge.c:102
-#: ../panels/network/net-device-team.c:102
-msgid "(none)"
-msgstr "(沒有)"
-
-#: ../panels/network/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "橋接的連線"
-
-#: ../panels/network/net-device-ethernet.c:110
-#: ../panels/network/net-device-wifi.c:463
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:471
 msgid "never"
 msgstr "永不"
 
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:481
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:475
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:483
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698
-#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../panels/network/net-device-ethernet.c:176
+#: ../panels/network/net-device-ethernet.c:172
 #: ../panels/network/network-wifi.ui.h:12
 msgid "Last used"
 msgstr "最後使用的"
@@ -2572,34 +2555,25 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:286
+#: ../panels/network/net-device-ethernet.c:280
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:354
-#: ../panels/network/net-device-wifi.c:1621
+#: ../panels/network/net-device-ethernet.c:348
+#: ../panels/network/net-device-wifi.c:1691
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
 msgid "Options…"
 msgstr "選項…"
 
-#: ../panels/network/net-device-ethernet.c:473
-#, c-format
-msgid "Profile %d"
-msgstr "設定檔 %d"
-
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:223
 msgid "Add new connection"
 msgstr "加入新連線"
 
-#: ../panels/network/net-device-team.c:77
-msgid "Team slaves"
-msgstr "團隊從屬"
-
-#: ../panels/network/net-device-wifi.c:1176
+#: ../panels/network/net-device-wifi.c:1202
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
@@ -2607,44 +2581,44 @@ msgstr ""
 "如果您有無線網路以外的方式連線到網際網路,您可以使用它來與其他人分享您的網際"
 "網路連線。"
 
-#: ../panels/network/net-device-wifi.c:1180
+#: ../panels/network/net-device-wifi.c:1206
 #, 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:1184
+#: ../panels/network/net-device-wifi.c:1210
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。"
 
-#: ../panels/network/net-device-wifi.c:1267
+#: ../panels/network/net-device-wifi.c:1293
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1296
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1327
+#: ../panels/network/net-device-wifi.c:1394
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: ../panels/network/net-device-wifi.c:1330
+#: ../panels/network/net-device-wifi.c:1397
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: ../panels/network/net-device-wifi.c:1459
+#: ../panels/network/net-device-wifi.c:1529
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網路的詳細資料包含密碼及任何自訂的設定都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1774
+#: ../panels/network/net-device-wifi.c:1839
 msgid "History"
 msgstr "歷史紀錄"
 
-#: ../panels/network/net-device-wifi.c:1778
+#: ../panels/network/net-device-wifi.c:1843
 #: ../panels/printers/options-dialog.ui.h:2
 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
 #: ../panels/wacom/gnome-wacom-properties.ui.h:5
@@ -2652,7 +2626,7 @@ msgid "_Close"
 msgstr "關閉(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1786
+#: ../panels/network/net-device-wifi.c:1851
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2687,6 +2661,10 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "供應商"
 
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "網路"
+
 #: ../panels/network/network-proxy.ui.h:1
 msgctxt "proxy method"
 msgid "None"
@@ -2793,8 +2771,8 @@ msgstr "詳細資料"
 #: ../panels/network/wireless-security/ws-leap.ui.h:2
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
 #: ../panels/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "_Password"
 msgstr "密碼(_P)"
 
@@ -2891,7 +2869,6 @@ msgid "_Connect to Hidden Network…"
 msgstr "連接到隱藏的網路(_C)…"
 
 #: ../panels/network/network-wifi.ui.h:58
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "_History"
 msgstr "歷史紀錄(_H)"
 
@@ -2913,359 +2890,336 @@ msgstr "安全性類型"
 
 #: ../panels/network/network-wifi.ui.h:63
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "Password"
 msgstr "密碼"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "基礎架構"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "狀態不明"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "未管理"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "無法使用"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "連線中"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Authentication required"
 msgstr "需要核對"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "已連線"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "斷線"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "連線失敗"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "狀態不詳(缺乏)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "未連線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "設定失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP 設定失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP 設定過期"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "需要機密,但沒有提供"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x 請求已斷線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x 請求設定失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1x 請求已失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x 請求花了太長時間核對"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "無法啟動 PPP 服務"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPP 服務已斷線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP 失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCP 客戶端啟動失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCP 客戶端錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP 客戶端失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "分享的連線服務啟動失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "分享的連線服務失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "無法啟動 AutoIP 服務"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP 服務錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP 服務失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "線路忙碌"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "沒有撥號音"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "無法建立載體"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "撥號要求逾時"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "嘗試撥號失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "數據機初始化失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "無法選擇指定的 APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "不要搜尋網路"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "網路登記被禁止"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "網路登記逾時"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "無法向要求的網路登記"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN 檢查失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "可能缺少裝置的韌體"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "連線已消失"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "優先使用現有的連線"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "找不到數據機"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "藍牙連線失敗"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "SIM 卡尚未插入"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "需要 SIM PIN 碼"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "需要 SIM PUK 碼"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM 錯誤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:412
-msgid "InfiniBand device does not support connected mode"
-msgstr "InfiniBand 裝置不支援已連接模式"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:416
+#: ../panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "連線相依性解析失敗"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "缺少韌體"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "纜線已拔除"
 
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "未選擇任何憑證授權單位(CA)憑證"
+#: ../panels/network/wireless-security/eap-method.c:69
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr "802.1x 加密的未定義錯誤 (wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路。是否要選擇一個憑"
-"證中心的憑證?"
-
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "忽略"
+#: ../panels/network/wireless-security/eap-method.c:245
+msgid "no file selected"
+msgstr "未選取檔案"
 
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "選擇 CA 憑證"
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid "unspecified error validating eap-method file"
+msgstr "驗證 eap-method 檔案時未指定的錯誤"
 
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER、PEM、或 PKCS#12 私密金鑰 (*.der, *.pem, *.p12)"
+#: ../panels/network/wireless-security/eap-method.c:480
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, 或 PKCS#12 私密金鑰 (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:648
+#: ../panels/network/wireless-security/eap-method.c:483
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:271
-#: ../panels/network/wireless-security/eap-method-peap.c:280
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+msgstr "缺少 EAP-FAST PAC 檔案"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:268
+#: ../panels/network/wireless-security/eap-method-peap.c:302
+#: ../panels/network/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:287
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../panels/network/wireless-security/eap-method-fast.c:283
+#: ../panels/network/wireless-security/eap-method-peap.c:272
+#: ../panels/network/wireless-security/eap-method-ttls.c:288
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:409
+#: ../panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
-msgid "PAC _file"
-msgstr "PAC 檔案(_F)"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
-msgid "_Inner authentication"
-msgstr "內部核對(_I)"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-msgid "PAC pro_visioning"
-msgstr "允許自動供應 PAC(_V)"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
@@ -3274,41 +3228,73 @@ msgstr "允許自動供應 PAC(_V)"
 msgid " "
 msgstr " "
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "已核對"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "兩者"
 
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file"
+msgstr "PAC 檔案(_F)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Inner authentication"
+msgstr "內部核對(_I)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "允許自動供應 PAC (_V)"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr "缺少 EAP-LEAP 使用者名稱"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr "缺少 EAP-LEAP 密碼"
+
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
 #: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "_Username"
 msgstr "使用者名稱(_U)"
 
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
 #: ../panels/network/wireless-security/ws-leap.ui.h:3
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr "無效的 EAP-PEAP CA 憑證:%s"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr "無效的 EAP-PEAP CA 憑證:沒有指定憑證"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:287
+#: ../panels/network/wireless-security/eap-method-ttls.c:318
+#: ../panels/network/wireless-security/wireless-security.c:439
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:456
-#: ../panels/network/wireless-security/eap-method-ttls.c:350
+#: ../panels/network/wireless-security/eap-method-peap.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-ttls.c:412
 msgid "Choose a Certificate Authority certificate"
 msgstr "選擇憑證授權單位 (CA) 憑證"
 
@@ -3326,19 +3312,57 @@ msgstr "版本 1"
 msgid "C_A certificate"
 msgstr "憑證(_A)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "所有的 CA 憑證檔案"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)"
 
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "每次都詢問密碼(_K)"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr "缺少 EAP 使用者名稱"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+msgid "missing EAP password"
+msgstr "缺少 EAP 密碼"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr "缺少 EAP-TLS 身分"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "無效的 EAP-TLS CA 憑證:%s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr "無效的 EAP-TLS CA 憑證:沒有指定憑證"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr "無效的 EAP-TLS 密碼:缺少"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr "無效的 EAP-TLS 私鑰:%s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr "無效的 EAP-TLS 使用者憑證:%s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私密金鑰是不安全的"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:285
+#: ../panels/network/wireless-security/eap-method-tls.c:319
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -3351,11 +3375,11 @@ msgstr ""
 "\n"
 "(您可以使用 openssl 來加密您的私密金鑰)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:495
 msgid "Choose your personal certificate"
 msgstr "選擇您的個人憑證"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:507
 msgid "Choose your private key"
 msgstr "選擇您的私密金鑰"
 
@@ -3367,51 +3391,56 @@ msgstr "識別(_D)"
 msgid "_User certificate"
 msgstr "使用者憑證(_U)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key"
 msgstr "私鑰(_K)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password"
 msgstr "私密金鑰密碼(_P)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr "無效的 EAP-TTLS CA 憑證:%s"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr "無效的 EAP-TTLS CA 憑證:沒有指定憑證"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "不要再警告我(_W)"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "否"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "是"
+#: ../panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1x security"
+msgstr "驗證 802.1x 加密的未知錯誤"
 
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:451
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:475
+msgid "PWD"
+msgstr "PWD"
+
+#: ../panels/network/wireless-security/wireless-security.c:486
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:497
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:508
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
@@ -3421,6 +3450,46 @@ msgstr "保護式 EAP (PEAP)"
 msgid "Au_thentication"
 msgstr "核對(_T)"
 
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr "缺少 leap 使用者名稱"
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+msgid "missing leap-password"
+msgstr "缺少 leap 密碼"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr "缺少 wep-key"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr "無效的 wep-key:長度為 %zu 的金鑰只能包含十六進位數字"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr "無效的 wep-key:長度為 %zu 的金鑰只能包含 ascii 字元"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+"無效的 wep-key:錯誤的金鑰長度 %zu。金鑰長度必須為 5/13 (ascii) 或 10/26 (十"
+"六進位)"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr "無效的 wep-key︰密語必須為非空"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr "無效的 wep-key︰密語必須少於 64 個字元"
+
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
 msgstr "1 (預設值)"
@@ -3457,19 +3526,30 @@ msgstr "顯示金鑰(_W)"
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr "無效的 wpa-psk:無效的長度 %zu。必須為 [8,63] 位元組或 64 十六進位數字"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr "無效的 wpa-psk:不能將 64 位元組金鑰轉譯為十六進位"
+
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type"
 msgstr "類型(_T)"
 
 #: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940
+#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973
 #: ../panels/privacy/cc-privacy-panel.c:172
 #: ../panels/privacy/cc-privacy-panel.c:239
 #: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 msgid "On"
 msgstr "開啟"
 
@@ -3506,16 +3586,17 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "在鎖定畫面中顯示訊息內容(_O)"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-msgid "Notifications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "No­ti­fi­ca­tions"
 msgstr "通知"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
 msgid "Control which notifications are displayed and what they show"
 msgstr "控制要顯示哪種通知及要顯示什麼"
 
 #. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr "Notifications;Banner;Message;Tray;Popup;通知;橫幅;訊息;匣;彈出;"
 
@@ -3533,30 +3614,34 @@ msgstr "鎖定畫面通知(_L)"
 msgid "Applications"
 msgstr "程式集"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "加入帳號"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Mail"
 msgstr "郵件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
+msgid "Calendar"
+msgstr "行事曆"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
 msgid "Chat"
 msgstr "聊天"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
 msgid "Resources"
 msgstr "資源"
 
@@ -3596,16 +3681,17 @@ msgstr "這不會移除伺服器上的帳號。"
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-msgid "Online Accounts"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+msgid "On­line Accounts"
 msgstr "線上帳號"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "連接到您的線上帳號並決定要用它們來做什麼"
 
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3757,7 +3843,7 @@ msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
 #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2252
+#: ../panels/power/cc-power-panel.c:2358
 msgid "Battery"
 msgstr "電池"
 
@@ -3805,101 +3891,102 @@ msgstr "電池"
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1640
+#: ../panels/power/cc-power-panel.c:1680
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1675
+#: ../panels/power/cc-power-panel.c:1715
 msgid "_Screen brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1694
+#: ../panels/power/cc-power-panel.c:1734
 msgid "Automatic brightness"
 msgstr "自動亮度"
 
-#: ../panels/power/cc-power-panel.c:1714
+#: ../panels/power/cc-power-panel.c:1754
 msgid "_Keyboard brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1724
+#: ../panels/power/cc-power-panel.c:1764
 msgid "_Dim screen when inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1749
+#: ../panels/power/cc-power-panel.c:1789
 msgid "_Blank screen"
 msgstr "螢幕轉黑(_B)"
 
-#: ../panels/power/cc-power-panel.c:1786
+#: ../panels/power/cc-power-panel.c:1826
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1791
+#: ../panels/power/cc-power-panel.c:1831
 msgid "Turn off Wi-Fi to save power."
 msgstr "關閉 Wi-Fi 以節省電源。"
 
-#: ../panels/power/cc-power-panel.c:1816
+#: ../panels/power/cc-power-panel.c:1856
 msgid "_Mobile broadband"
 msgstr "行動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1821
+#: ../panels/power/cc-power-panel.c:1861
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr "關閉行動寬頻 (3G、4G、LTE 等等) 以節省電源。"
 
-#: ../panels/power/cc-power-panel.c:1873
+#: ../panels/power/cc-power-panel.c:1906
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:1962
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1931
+#: ../panels/power/cc-power-panel.c:1964
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:2023
+#: ../panels/power/cc-power-panel.c:2059
 msgid "Suspend"
 msgstr "暫停"
 
-#: ../panels/power/cc-power-panel.c:2024
+#: ../panels/power/cc-power-panel.c:2060
 msgid "Hibernate"
 msgstr "休眠"
 
-#: ../panels/power/cc-power-panel.c:2025
+#: ../panels/power/cc-power-panel.c:2061
 msgid "Nothing"
 msgstr "沒有"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2074
+#: ../panels/power/cc-power-panel.c:2175
 msgid "Suspend & Power Button"
 msgstr "暫停和電源按鈕"
 
-#: ../panels/power/cc-power-panel.c:2115
+#: ../panels/power/cc-power-panel.c:2218
 msgid "_Automatic suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:2116
+#: ../panels/power/cc-power-panel.c:2219
 msgid "Automatic suspend"
 msgstr "自動暫停"
 
-#: ../panels/power/cc-power-panel.c:2180
+#: ../panels/power/cc-power-panel.c:2286
 msgid "_When the Power Button is pressed"
 msgstr "當按下電源按鈕(_W)"
 
-#: ../panels/power/cc-power-panel.c:2306
+#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270
 msgid "Devices"
 msgstr "裝置"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Po­wer"
 msgstr "電源"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
 msgid "View your battery status and change power saving settings"
 msgstr "檢視您的電池狀態並改變電源節省設定值"
 
 #. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:4
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 msgstr ""
@@ -3992,200 +4079,197 @@ msgid "Authentication Required"
 msgstr "要求核對"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:678
+#: ../panels/printers/cc-printers-panel.c:683
 msgid "Low on toner"
 msgstr "碳粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:680
+#: ../panels/printers/cc-printers-panel.c:685
 msgid "Out of toner"
 msgstr "碳粉用完"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:683
+#: ../panels/printers/cc-printers-panel.c:688
 msgid "Low on developer"
 msgstr "顯像劑不足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:686
+#: ../panels/printers/cc-printers-panel.c:691
 msgid "Out of developer"
 msgstr "顯像劑用完"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:688
+#: ../panels/printers/cc-printers-panel.c:693
 msgid "Low on a marker supply"
 msgstr "墨水匣不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:690
+#: ../panels/printers/cc-printers-panel.c:695
 msgid "Out of a marker supply"
 msgstr "墨水匣用完"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:692
+#: ../panels/printers/cc-printers-panel.c:697
 msgid "Open cover"
 msgstr "外殼開啟"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:694
+#: ../panels/printers/cc-printers-panel.c:699
 msgid "Open door"
 msgstr "紙匣門開啟"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:696
+#: ../panels/printers/cc-printers-panel.c:701
 msgid "Low on paper"
 msgstr "紙張不足。"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:698
+#: ../panels/printers/cc-printers-panel.c:703
 msgid "Out of paper"
 msgstr "紙張用完"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:700
+#: ../panels/printers/cc-printers-panel.c:705
 msgctxt "printer state"
 msgid "Offline"
 msgstr "離線"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:702
-#: ../panels/printers/cc-printers-panel.c:893
+#: ../panels/printers/cc-printers-panel.c:707
+#: ../panels/printers/cc-printers-panel.c:897
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:704
+#: ../panels/printers/cc-printers-panel.c:709
 msgid "Waste receptacle almost full"
 msgstr "廢墨收集器將滿"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:706
+#: ../panels/printers/cc-printers-panel.c:711
 msgid "Waste receptacle full"
 msgstr "廢墨收集器已滿"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:708
+#: ../panels/printers/cc-printers-panel.c:713
 msgid "The optical photo conductor is near end of life"
 msgstr "感光鼓接近使用壽命"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:710
+#: ../panels/printers/cc-printers-panel.c:715
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓已無法使用"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:820
+#: ../panels/printers/cc-printers-panel.c:824
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "正在設定"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:879
+#: ../panels/printers/cc-printers-panel.c:883
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備就緒"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:884
+#: ../panels/printers/cc-printers-panel.c:888
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "不接受工作"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:889
+#: ../panels/printers/cc-printers-panel.c:893
 msgctxt "printer state"
 msgid "Processing"
 msgstr "處理中"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1009
+#: ../panels/printers/cc-printers-panel.c:1013
 msgid "Toner Level"
 msgstr "碳粉匣等級"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1012
+#: ../panels/printers/cc-printers-panel.c:1016
 msgid "Ink Level"
 msgstr "墨水等級"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1015
+#: ../panels/printers/cc-printers-panel.c:1019
 msgid "Supply Level"
 msgstr "耗材等級"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1033
+#: ../panels/printers/cc-printers-panel.c:1037
 msgctxt "printer state"
 msgid "Installing"
 msgstr "正在安裝"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1541
+#: ../panels/printers/cc-printers-panel.c:1551
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 使用中"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1882
+#: ../panels/printers/cc-printers-panel.c:1892
 msgid "Failed to add new printer."
 msgstr "無法加入新的印表機。"
 
-#: ../panels/printers/cc-printers-panel.c:2049
+#: ../panels/printers/cc-printers-panel.c:2073
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/cc-printers-panel.c:2058
+#: ../panels/printers/cc-printers-panel.c:2082
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript 印表機描述檔 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2365
+#: ../panels/printers/cc-printers-panel.c:2389
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/cc-printers-panel.c:2436
+#: ../panels/printers/cc-printers-panel.c:2460
 msgid "Searching for preferred drivers…"
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: ../panels/printers/cc-printers-panel.c:2457
+#: ../panels/printers/cc-printers-panel.c:2481
 msgid "Select from database…"
 msgstr "從資料庫搜尋…"
 
-#: ../panels/printers/cc-printers-panel.c:2466
+#: ../panels/printers/cc-printers-panel.c:2490
 msgid "Provide PPD File…"
 msgstr "提供 PPD 檔案…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2617
-#: ../panels/printers/cc-printers-panel.c:2640
+#: ../panels/printers/cc-printers-panel.c:2637
+#: ../panels/printers/cc-printers-panel.c:2660
 msgid "Test page"
 msgstr "測試頁"
 
-#: ../panels/printers/cc-printers-panel.c:2753
-msgid "No printers"
-msgstr "沒有印表機"
-
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3099
+#: ../panels/printers/cc-printers-panel.c:3115
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-msgid "Printers"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Prin­ters"
 msgstr "印表機"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr "加入印表機、檢視印表機工作並決定您要如何列印"
 
 #. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Printer;Queue;Print;Paper;Ink;Toner;印表機;佇列;列印;紙張;墨水;碳粉;"
 
@@ -4347,6 +4431,11 @@ msgstr "序列埠"
 msgid "Parallel Port"
 msgstr "串列埠"
 
+#. Translators: The found device is a printer connected via Bluetooth
+#: ../panels/printers/pp-new-printer-dialog.c:1676
+msgid "Bluetooth"
+msgstr "藍牙"
+
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
 #: ../panels/printers/pp-new-printer-dialog.c:1713
 #, c-format
@@ -4557,13 +4646,17 @@ msgstr "列印測試頁(_T)"
 msgid "_Options"
 msgstr "選項(_O)"
 
+#: ../panels/printers/printers.ui.h:23
+msgid "No printers"
+msgstr "沒有印表機"
+
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
+#: ../panels/printers/printers.ui.h:25
 msgid "Add a Printer"
 msgstr "加入印表機"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:27
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
@@ -4647,16 +4740,17 @@ msgstr ""
 msgid "Privacy Policy"
 msgstr "隱私權原則"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
-msgid "Privacy"
-msgstr "隱私"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Pri­va­cy"
+msgstr "隱私權"
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
 msgid "Protect your personal information and control what others might see"
 msgstr "保護您的個人資訊並控制其他人能看到什麼"
 
 #. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
@@ -4823,21 +4917,21 @@ msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/region/cc-region-panel.c:248
-#: ../panels/user-accounts/um-user-panel.c:1069
+#: ../panels/region/cc-region-panel.c:247
+#: ../panels/user-accounts/um-user-panel.c:1080
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "您的作業階段需要重新啟動以讓變更生效"
 
-#: ../panels/region/cc-region-panel.c:252
-#: ../panels/user-accounts/um-user-panel.c:1073
+#: ../panels/region/cc-region-panel.c:251
+#: ../panels/user-accounts/um-user-panel.c:1084
 msgid "Restart Now"
 msgstr "立刻重新啟動"
 
-#: ../panels/region/cc-region-panel.c:889
+#: ../panels/region/cc-region-panel.c:888
 msgid "No input source selected"
 msgstr "尚未選擇輸入來源"
 
-#: ../panels/region/cc-region-panel.c:1807
+#: ../panels/region/cc-region-panel.c:1779
 msgid "Login _Screen"
 msgstr "登入畫面(_S)"
 
@@ -4869,17 +4963,18 @@ msgstr "度量衡"
 msgid "Paper"
 msgstr "紙張"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid "Re­gion & Lan­guage"
 msgstr "地區和語言"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
 msgstr "選擇您的顯示語言、格式、鍵盤配置和輸入來源"
 
 #. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;"
 
@@ -4936,7 +5031,7 @@ msgid "Left+Right Alt"
 msgstr "左+右 Alt"
 
 #: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "_Language"
 msgstr "語言(_L)"
 
@@ -4984,26 +5079,11 @@ msgstr "顯示輸入來源鍵盤配置"
 msgid "Login settings are used by all users when logging into the system"
 msgstr "登入設定值是所有的使用者在登入系統時會用到的"
 
-#: ../panels/search/cc-search-locations-dialog.c:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "位置"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "書籤"
-
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "其他"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:634
 msgid "Select Location"
 msgstr "選擇位置"
 
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:638
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -5011,17 +5091,18 @@ msgstr "確定(_O)"
 msgid "No applications found"
 msgstr "找不到應用程式"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
 msgid "Search"
 msgstr "搜尋"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr "控制在活動概覽中哪些應用程式會顯示在搜尋結果中"
 
 #. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr "Search;Find;Index;Hide;Privacy;Results;搜尋;尋找;索引;隱藏;隱私;結果;"
 
@@ -5029,6 +5110,18 @@ msgstr "Search;Find;Index;Hide;Privacy;Results;搜尋;尋找;索引;隱藏;隱
 msgid "Search Locations"
 msgstr "搜尋位置"
 
+#: ../panels/search/search-locations-dialog.ui.h:2
+msgid "Places"
+msgstr "位置"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+msgid "Bookmarks"
+msgstr "書籤"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+msgid "Other"
+msgstr "其他"
+
 #: ../panels/search/search.ui.h:1
 msgid "Move Up"
 msgstr "往上移"
@@ -5078,35 +5171,41 @@ msgstr ""
 #: ../panels/sharing/cc-sharing-panel.c:682
 #, c-format
 msgid ""
-"Allow remote users to connect using the Secure Shell command:\n"
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 msgstr ""
-"允許遠端使用者使用 SSH 指令連線:\n"
+"當啟用遠端登入時,遠端使用者可以使用 SSH 指令連線:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
 #: ../panels/sharing/cc-sharing-panel.c:684
 #, c-format
 msgid ""
-"Allow remote users to view or control your screen by connecting to: <a href="
-"\"vnc://%s\">vnc://%s</a>"
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
 msgstr ""
-"允許遠端使用者連線到:<a href=\"vnc://%s\">vnc://%s</a> 檢視或控制您的螢幕"
+"螢幕分享允許遠端使用者連線到 <a href=\"vnc://%s\">vnc://%s</a> 檢視或控制您的"
+"螢幕"
 
 #: ../panels/sharing/cc-sharing-panel.c:796
 msgid "Copy"
 msgstr "複製"
 
 #: ../panels/sharing/cc-sharing-panel.c:1122
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
 msgid "Sharing"
 msgstr "分享"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Sha­ring"
+msgstr "分享"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
 msgid "Control what you want to share with others"
 msgstr "控制您想要與其他人分享什麼"
 
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
@@ -5140,8 +5239,8 @@ msgid "_Computer Name"
 msgstr "電腦名稱(_C)"
 
 #: ../panels/sharing/sharing.ui.h:2
-msgid "_Personal File Sharing"
-msgstr "個人檔案分享(_P)"
+msgid "_File Sharing"
+msgstr "檔案分享(_F)"
 
 #: ../panels/sharing/sharing.ui.h:3
 msgid "_Screen Sharing"
@@ -5160,8 +5259,8 @@ msgid "Some services are disabled because of no network access."
 msgstr "由於沒有網路存取,某些服務已停用。"
 
 #: ../panels/sharing/sharing.ui.h:7
-msgid "Personal File Sharing"
-msgstr "個人檔案分享"
+msgid "File Sharing"
+msgstr "檔案分享"
 
 #: ../panels/sharing/sharing.ui.h:8
 msgid "_Require Password"
@@ -5176,8 +5275,8 @@ msgid "Screen Sharing"
 msgstr "螢幕分享"
 
 #: ../panels/sharing/sharing.ui.h:12
-msgid "_Allow Remote Control"
-msgstr "允許遙控(_A)"
+msgid "_Allow connections to control the screen"
+msgstr "允許連線控制螢幕(_A)"
 
 #: ../panels/sharing/sharing.ui.h:13
 msgid "_Password:"
@@ -5204,9 +5303,8 @@ msgid "Media Sharing"
 msgstr "媒體分享"
 
 #: ../panels/sharing/sharing.ui.h:19
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
-msgstr "媒體分享允許您透過網路分享音樂、相片和影片。"
+msgid "Share music, photos and videos over the network."
+msgstr "透過網路分享音樂、相片和影片。"
 
 #: ../panels/sharing/sharing.ui.h:20
 msgid "Folders"
@@ -5435,16 +5533,21 @@ msgstr "測試"
 msgid "Subwoofer"
 msgstr "重低音"
 
-#: ../panels/sound/sound-theme-file-utils.c:290
+#: ../panels/sound/sound-theme-file-utils.c:304
 msgid "Custom"
 msgstr "自訂"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+msgid "Uni­ver­sal Access"
+msgstr "無障礙功能"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Make it easier to see, hear, type, point and click"
 msgstr "讓電腦更容易看、聽、輸入、指向與點選"
 
 #. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
@@ -5543,7 +5646,7 @@ msgid "Sound Keys"
 msgstr "聲音按鍵"
 
 #: ../panels/universal-access/uap.ui.h:25
-msgid "Beep when Num Lock or Caps Lock are turned on."
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "當 Num Lock 或 Caps Lock 開啟時發出聲響。"
 
 #: ../panels/universal-access/uap.ui.h:26
@@ -5925,93 +6028,68 @@ msgid "Color Effects"
 msgstr "顏色效果"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "加入使用者"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+msgid "_Full Name"
+msgstr "全名(_F)"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#: ../panels/user-accounts/um-user-panel.c:900
 msgid "Standard"
 msgstr "標準"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: ../panels/user-accounts/um-user-panel.c:898
 msgid "Administrator"
 msgstr "管理員"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Full Name"
-msgstr "全名(_F)"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Account _Type"
 msgstr "帳號類型(_T)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
 msgid "Allow user to set a password when they next _login"
 msgstr "允許使用者在下次登入時設定密碼(_L)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
 msgid "Set a password _now"
 msgstr "立刻設定密碼(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "驗證(_V)"
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+msgid "_Confirm"
+msgstr "確認(_C)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
-msgstr "企業登入允許現有的集中管理式使用者帳號能用在這個裝置上。"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-msgid "_Domain"
-msgstr "網域(_O)"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
 msgstr ""
-"請上線以加入\n"
-"企業登入帳號。"
+"企業登入允許現有的集中管理式使用者帳號能用在這個裝置上。您也可以使用這個帳號"
+"來存取網際網路上的公司資源。"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:15
-msgid "_Enterprise Login"
-msgstr "企業登入(_E)"
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
+msgid "_Domain"
+msgstr "網域(_O)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-msgid "Add User"
-msgstr "加入使用者"
+msgid "You are Offline"
+msgstr "您已離線"
 
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
-msgid "_Enroll"
-msgstr "登錄(_E)"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
-msgid "Domain Administrator Login"
-msgstr "網域管理員登入"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr ""
-"為了使用企業登入,這個電腦需要\n"
-"加入網域。請網路管理員在這裡\n"
-"輸入網域密碼。"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "管理員名稱(_N)"
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+msgid "You must be online in order to add enterprise users."
+msgstr "請上線以加入企業登入使用者。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "管理員密碼"
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "_Enterprise Login"
+msgstr "企業登入(_E)"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -6046,7 +6124,7 @@ msgid "Right little finger"
 msgstr "右手小指"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:686
+#: ../panels/user-accounts/um-fingerprint-dialog.c:688
 msgid "Enable Fingerprint Login"
 msgstr "啟用指紋登入"
 
@@ -6087,6 +6165,33 @@ msgstr ""
 msgid "Login History"
 msgstr "登入歷史紀錄"
 
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "登錄(_E)"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "網域管理員登入"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"為了使用企業登入,這個電腦需要\n"
+"加入網域。請網路管理員在這裡\n"
+"輸入網域密碼。"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "管理員名稱(_N)"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "管理員密碼"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Change Password"
 msgstr "更改密碼"
@@ -6108,41 +6213,41 @@ msgid "Current _Password"
 msgstr "目前的密碼(_P)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "Allow user to set a password when they next login"
-msgstr "允許使用者在下次登入時選擇密碼"
+msgid "Allow user to change their password on next login"
+msgstr "允許使用者在下次登入時改變他們的密碼"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Set a password now"
 msgstr "立刻設定密碼"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
 msgid "Add User Account"
 msgstr "加入使用者帳號"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
 msgid "Remove User Account"
 msgstr "移除使用者帳號"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Login Options"
-msgstr "登入選項"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "A_utomatic Login"
 msgstr "自動登入(_U):"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "_Fingerprint Login"
 msgstr "指紋登入(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "User Icon"
 msgstr "使用者圖示"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Last Login"
 msgstr "上次登入"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+msgid "_Account Activity"
+msgstr "帳號活動(_A)"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "管理使用者帳號"
@@ -6240,8 +6345,8 @@ msgstr "試著加入更多字母、數字和標點符號。"
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
-msgstr "混合大寫與小寫字元並使用一到兩個數字。"
+msgid "Mix uppercase and lowercase and try to use a number or two."
+msgstr "混合大寫與小寫字元並嘗試使用一到兩個數字。"
 
 #: ../panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
@@ -6330,32 +6435,32 @@ msgid "Unknown error"
 msgstr "不明的錯誤"
 
 #: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your account provider."
-msgstr "應符合您帳號提供者的網路位址。"
+msgid "Should match the web address of your login provider."
+msgstr "應符合您的登入提供者的網路位址。"
 
 #: ../panels/user-accounts/um-account-dialog.c:228
 msgid "Failed to add account"
 msgstr "無法加入到帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:448
 msgid "Passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-account-dialog.c:733
-#: ../panels/user-accounts/um-account-dialog.c:779
-#: ../panels/user-accounts/um-account-dialog.c:800
+#: ../panels/user-accounts/um-account-dialog.c:702
+#: ../panels/user-accounts/um-account-dialog.c:748
+#: ../panels/user-accounts/um-account-dialog.c:769
 msgid "Failed to register account"
 msgstr "無法註冊帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:892
 msgid "No supported way to authenticate with this domain"
 msgstr "沒有支援這個網域核對的方式"
 
-#: ../panels/user-accounts/um-account-dialog.c:982
+#: ../panels/user-accounts/um-account-dialog.c:965
 msgid "Failed to join domain"
 msgstr "無法加入網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1026
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6363,7 +6468,7 @@ msgstr ""
 "登入名稱沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1050
+#: ../panels/user-accounts/um-account-dialog.c:1033
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6371,54 +6476,64 @@ msgstr ""
 "登入密碼沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1058
+#: ../panels/user-accounts/um-account-dialog.c:1041
 msgid "Failed to log into domain"
 msgstr "無法登入到網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1116
+#: ../panels/user-accounts/um-account-dialog.c:1099
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "找不到網域。也許您拼錯字了?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:138
+#: ../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:140
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "您不被允許使用這個裝置。請連絡您的管理員。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:140
+#: ../panels/user-accounts/um-fingerprint-dialog.c:142
 msgid "The device is already in use."
 msgstr "該裝置已經在使用中。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: ../panels/user-accounts/um-fingerprint-dialog.c:144
 msgid "An internal error occurred."
 msgstr "發生內部的錯誤。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:218
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: ../panels/user-accounts/um-fingerprint-dialog.c:265
 msgid "Delete registered fingerprints?"
 msgstr "是否刪除已註冊的指紋?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-fingerprint-dialog.c:269
 msgid "_Delete Fingerprints"
 msgstr "刪除指紋(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: ../panels/user-accounts/um-fingerprint-dialog.c:275
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "您確定要刪除已註冊的指紋嗎?這麼一來將會停用指紋登入。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: ../panels/user-accounts/um-fingerprint-dialog.c:445
 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:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: ../panels/user-accounts/um-fingerprint-dialog.c:506
+#: ../panels/user-accounts/um-fingerprint-dialog.c:548
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "無法存取「%s」裝置"
@@ -6426,16 +6541,16 @@ 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:587
+#: ../panels/user-accounts/um-fingerprint-dialog.c:589
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "無法使用「%s」裝置上的指紋捕捉"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:637
+#: ../panels/user-accounts/um-fingerprint-dialog.c:639
 msgid "Could not access any fingerprint readers"
 msgstr "無法存取任何指紋辨識器"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:640
 msgid "Please contact your system administrator for help."
 msgstr "請連絡您的管理員來幫忙。"
 
@@ -6444,18 +6559,18 @@ msgstr "請連絡您的管理員來幫忙。"
 #. * "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:720
+#: ../panels/user-accounts/um-fingerprint-dialog.c:722
 #, 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:727
+#: ../panels/user-accounts/um-fingerprint-dialog.c:729
 msgid "Selecting finger"
 msgstr "選擇手指"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:730
 msgid "Enrolling fingerprints"
 msgstr "登記指紋"
 
@@ -6654,15 +6769,15 @@ msgstr "沒有"
 msgid "Logged in"
 msgstr "已登入"
 
-#: ../panels/user-accounts/um-user-panel.c:1272
+#: ../panels/user-accounts/um-user-panel.c:1283
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: ../panels/user-accounts/um-user-panel.c:1274
+#: ../panels/user-accounts/um-user-panel.c:1285
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1315
+#: ../panels/user-accounts/um-user-panel.c:1326
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6670,12 +6785,12 @@ msgstr ""
 "要進行變更,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1353
+#: ../panels/user-accounts/um-user-panel.c:1364
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1364
-#: ../panels/user-accounts/um-user-panel.c:1676
+#: ../panels/user-accounts/um-user-panel.c:1375
+#: ../panels/user-accounts/um-user-panel.c:1687
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6683,12 +6798,12 @@ msgstr ""
 "要建立使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: ../panels/user-accounts/um-user-panel.c:1385
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1386
-#: ../panels/user-accounts/um-user-panel.c:1681
+#: ../panels/user-accounts/um-user-panel.c:1397
+#: ../panels/user-accounts/um-user-panel.c:1692
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6696,33 +6811,32 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1590
+#: ../panels/user-accounts/um-user-panel.c:1601
 msgid "My Account"
 msgstr "我的帳號"
 
 #: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "以「%s」為名的使用者已經存在。"
+msgid "Sorry, that user name isn't available. Please try another."
+msgstr "抱敟,使用者名稱無法使用。請嘗試另一個。"
 
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:566
 #, c-format
 msgid "The username is too long."
 msgstr "使用者名稱太長。"
 
-#: ../panels/user-accounts/um-utils.c:570
+#: ../panels/user-accounts/um-utils.c:569
 msgid "The username cannot start with a '-'."
 msgstr "使用者名稱不能以「-」字元開頭。"
 
-#: ../panels/user-accounts/um-utils.c:573
+#: ../panels/user-accounts/um-utils.c:572
 msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
 msgstr ""
-"使用者名稱只能由大小寫字母英文字母 a 到 z、數字,與其他字元如「.」、「-」和"
-"「_」構成。"
+"使用者名稱只能由大小寫字母英文字母 a 到 z、數字,與其他字元:「.」、「-」、"
+"「_」。"
 
-#: ../panels/user-accounts/um-utils.c:577
+#: ../panels/user-accounts/um-utils.c:576
 msgid "This will be used to name your home folder and can't be changed."
 msgstr "這會成為您家目錄資料夾的名稱,並且不能被改變。"
 
@@ -6809,17 +6923,17 @@ msgstr "顯示對應"
 msgid "Button"
 msgstr "按鈕"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
-msgstr "Wacom 繪圖板"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+msgid "Wa­com Tab­let"
+msgstr "Wa-com 繪圖板"
+
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr "設定繪圖板的按鈕對映與調整觸控筆的靈敏度"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;繪圖板;橡皮擦;滑鼠;"
 
@@ -6851,6 +6965,10 @@ msgstr "請插入或開啟您的 Wacom 繪圖板"
 msgid "Bluetooth Settings"
 msgstr "藍牙設定值"
 
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "Wacom 繪圖板"
+
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Map to Monitor…"
 msgstr "對應至顯示器..."
@@ -7036,6 +7154,11 @@ msgstr "較低的按鈕"
 msgid "Tip Pressure Feel"
 msgstr "點選壓力感應"
 
+#: ../shell/alt/cc-window.c:763 ../shell/cc-window.c:53
+#: ../shell/cc-window.c:1478
+msgid "All Settings"
+msgstr "所有設定值"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "GNOME 控制中心"
@@ -7090,22 +7213,18 @@ msgstr "求助"
 msgid "Quit"
 msgstr "結束"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495
-msgid "All Settings"
-msgstr "所有設定值"
-
 #. Add categories
-#: ../shell/cc-window.c:881
+#: ../shell/cc-window.c:871
 msgctxt "category"
 msgid "Personal"
 msgstr "個人"
 
-#: ../shell/cc-window.c:882
+#: ../shell/cc-window.c:872
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../shell/cc-window.c:883
+#: ../shell/cc-window.c:873
 msgctxt "category"
 msgid "System"
 msgstr "系統"
@@ -7144,6 +7263,102 @@ msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "取消搜尋"
 
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "熱點"
+
+#~ msgid "Color"
+#~ msgstr "顏色"
+
+#~ msgid "Bond"
+#~ msgstr "繫結"
+
+#~ msgid "Team"
+#~ msgstr "團隊"
+
+#~ msgid "Bridge"
+#~ msgstr "橋接"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "Could not load VPN plugins"
+#~ msgstr "無法載入 VPN 外掛程式"
+
+#~ msgid "Add Network Connection"
+#~ msgstr "加入網路連線"
+
+#~ msgid "Bond slaves"
+#~ msgstr "繫結的連線"
+
+#~ msgid "(none)"
+#~ msgstr "(沒有)"
+
+#~ msgid "Bridge slaves"
+#~ msgstr "橋接的連線"
+
+#~ msgid "Team slaves"
+#~ msgstr "團隊從屬"
+
+#~ msgid "InfiniBand device does not support connected mode"
+#~ msgstr "InfiniBand 裝置不支援已連接模式"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "未選擇任何憑證授權單位(CA)憑證"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路。是否要選擇一"
+#~ "個憑證中心的憑證?"
+
+#~ msgid "Ignore"
+#~ msgstr "忽略"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "選擇 CA 憑證"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "每次都詢問密碼(_K)"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "不要再警告我(_W)"
+
+#~ msgid "No"
+#~ msgstr "否"
+
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "Power"
+#~ msgstr "電源"
+
+#~ msgid "Privacy"
+#~ msgstr "隱私"
+
+#~ msgctxt "Search Location"
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid "Personal File Sharing"
+#~ msgstr "個人檔案分享"
+
+#~ msgid "_Allow Remote Control"
+#~ msgstr "允許遙控(_A)"
+
+#~ msgid "_Verify"
+#~ msgstr "驗證(_V)"
+
+#~ msgid "Login Options"
+#~ msgstr "登入選項"
+
+#~ msgid "A user with the username '%s' already exists."
+#~ msgstr "以「%s」為名的使用者已經存在。"
+
 #~ msgid "Used to determine your geographical location"
 #~ msgstr "用來判斷您所在的地理位置"
 
@@ -7635,9 +7850,6 @@ msgstr "取消搜尋"
 #~ msgid "Show Status When _Inactive"
 #~ msgstr "當不活動後顯示狀態(_I)"
 
-#~ msgid "_Confirm Password"
-#~ msgstr "確認密碼(_C)"
-
 #~ msgid "_Login Name"
 #~ msgstr "登入名稱(_L)"
 
@@ -7660,9 +7872,6 @@ msgstr "取消搜尋"
 #~ msgid "Domain not found."
 #~ msgstr "找不到網域。"
 
-#~ msgid "Wrong password"
-#~ msgstr "錯誤的密碼"
-
 #~ msgctxt "Password hint"
 #~ msgid "Try to add more characters."
 #~ msgstr "試著加入更多字元。"


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