[gnome-control-center] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit d4fb8ac471c821ad3038aa7ae6172c24f6e143cf
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Aug 19 19:16:35 2014 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1266 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po |  880 ++++++++++++++++++++++--------------------
 2 files changed, 1129 insertions(+), 1017 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 57daea5..20cc6cc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,8 +14,8 @@ 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: 2014-03-05 19:30+0000\n"
-"PO-Revision-Date: 2014-03-09 11:50+0800\n"
+"POT-Creation-Date: 2014-08-16 11:45+0000\n"
+"PO-Revision-Date: 2014-08-19 19:16+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -71,85 +71,90 @@ msgid "Span"
 msgstr "合併"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:277
+#: ../panels/background/cc-background-chooser-dialog.c:442
 msgid "Select Background"
 msgstr "選擇背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:297
+#: ../panels/background/cc-background-chooser-dialog.c:463
 msgid "Wallpapers"
 msgstr "桌布"
 
-#: ../panels/background/cc-background-chooser-dialog.c:306
+#: ../panels/background/cc-background-chooser-dialog.c:472
 msgid "Pictures"
 msgstr "圖片"
 
-#: ../panels/background/cc-background-chooser-dialog.c:314
+#: ../panels/background/cc-background-chooser-dialog.c:481
 msgid "Colors"
 msgstr "顏色"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:360
+#: ../panels/background/cc-background-chooser-dialog.c:540
 msgid "No Pictures Found"
 msgstr "找不到圖片"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:378
+#: ../panels/background/cc-background-chooser-dialog.c:558
 #: ../panels/search/cc-search-locations-dialog.c:274
 msgid "Home"
 msgstr "家"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:390
+#: ../panels/background/cc-background-chooser-dialog.c:570
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "你可以將影像加入你的%s資料夾,它們會顯示在這裏"
 
-#: ../panels/background/cc-background-chooser-dialog.c:419
-#: ../panels/color/cc-color-panel.c:222 ../panels/color/cc-color-panel.c:959
-#: ../panels/display/cc-display-panel.c:1510
-#: ../panels/display/cc-display-panel.c:1953
+#: ../panels/background/cc-background-chooser-dialog.c:592
+#: ../panels/color/cc-color-panel.c:224 ../panels/color/cc-color-panel.c:961
+#: ../panels/common/language-chooser.ui.h:3
+#: ../panels/display/cc-display-panel.c:1537
+#: ../panels/display/cc-display-panel.c:1976
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1197
-#: ../panels/network/net-device-wifi.c:1405
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:377
-#: ../panels/printers/cc-printers-panel.c:1945
+#: ../panels/network/net-device-wifi.c:1240
+#: ../panels/network/net-device-wifi.c:1448
+#: ../panels/printers/cc-printers-panel.c:1947
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:471
+#: ../panels/privacy/cc-privacy-panel.c:466
+#: ../panels/region/format-chooser.ui.h:3
+#: ../panels/region/input-chooser.ui.h:2
 #: ../panels/search/cc-search-locations-dialog.c:681
-#: ../panels/sharing/cc-sharing-panel.c:445
+#: ../panels/sharing/cc-sharing-panel.c:491
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:2
 #: ../panels/user-accounts/um-fingerprint-dialog.c:267
 #: ../panels/user-accounts/um-photo-dialog.c:95
-#: ../panels/user-accounts/um-photo-dialog.c:220
-#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-photo-dialog.c:222
+#: ../panels/user-accounts/um-user-panel.c:513
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:420
+#: ../panels/background/cc-background-chooser-dialog.c:593
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
 #: ../panels/user-accounts/um-photo-dialog.c:97
 msgid "Select"
 msgstr "選取"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:197
 msgid "multiple sizes"
 msgstr "多重尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:152
+#: ../panels/background/cc-background-item.c:201
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:280
+#: ../panels/background/cc-background-item.c:327
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: ../panels/background/cc-background-panel.c:492
+#: ../panels/background/cc-background-panel.c:493
 msgid "Current background"
 msgstr "目前的背景"
 
@@ -176,7 +181,7 @@ 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:1726
+#: ../panels/printers/pp-new-printer-dialog.c:1688
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -317,48 +322,48 @@ msgstr "尚未校準"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:138
+#: ../panels/color/cc-color-panel.c:140
 msgid "Default: "
 msgstr "預設值:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:146
+#: ../panels/color/cc-color-panel.c:148
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:153
+#: ../panels/color/cc-color-panel.c:155
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:220
+#: ../panels/color/cc-color-panel.c:222
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: ../panels/color/cc-color-panel.c:223
+#: ../panels/color/cc-color-panel.c:225
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:234
+#: ../panels/color/cc-color-panel.c:236
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:241
-#: ../panels/network/wireless-security/eap-method-fast.c:410
+#: ../panels/color/cc-color-panel.c:243
+#: ../panels/network/wireless-security/eap-method-fast.c:420
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../panels/color/cc-color-panel.c:580
+#: ../panels/color/cc-color-panel.c:582
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:904
+#: ../panels/color/cc-color-panel.c:906
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上傳檔案失敗:%s"
@@ -366,63 +371,63 @@ msgstr "上傳檔案失敗:%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:918
+#: ../panels/color/cc-color-panel.c:920
 msgid "The profile has been uploaded to:"
 msgstr "描述檔已經上傳到:"
 
-#: ../panels/color/cc-color-panel.c:920
+#: ../panels/color/cc-color-panel.c:922
 msgid "Write down this URL."
 msgstr "寫下這個 URL。"
 
-#: ../panels/color/cc-color-panel.c:921
+#: ../panels/color/cc-color-panel.c:923
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重新啟動這臺電腦並開機進入你一般的作業系統。"
 
-#: ../panels/color/cc-color-panel.c:922
+#: ../panels/color/cc-color-panel.c:924
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "在你的瀏覽器中輸入 URL 以下載並安裝描述檔。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:956
+#: ../panels/color/cc-color-panel.c:958
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
-#: ../panels/color/cc-color-panel.c:960
+#: ../panels/color/cc-color-panel.c:962
 #: ../panels/network/connection-editor/vpn-helpers.c:375
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1320
+#: ../panels/color/cc-color-panel.c:1322
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1335 ../panels/color/cc-color-panel.c:1359
+#: ../panels/color/cc-color-panel.c:1337 ../panels/color/cc-color-panel.c:1361
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr "尚未偵測到測量儀器。請檢查它是否已開啟並正確的連接。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1369
+#: ../panels/color/cc-color-panel.c:1371
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援打印機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1380
+#: ../panels/color/cc-color-panel.c:1382
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:102
+#: ../panels/color/cc-color-profile.c:103
 msgid "Standard Space"
 msgstr "標準空間"
 
 #. TRANSLATORS: test profiles do things like changing the screen
 #. * a different color, or swap the red and green channels
-#: ../panels/color/cc-color-profile.c:108
+#: ../panels/color/cc-color-profile.c:109
 msgid "Test Profile"
 msgstr "測試描述檔"
 
@@ -430,7 +435,7 @@ msgstr "測試描述檔"
 #. * by the color management system based on manufacturing data,
 #. * for instance the default monitor profile is created from the
 #. * primaries specified in the monitor EDID
-#: ../panels/color/cc-color-profile.c:116
+#: ../panels/color/cc-color-profile.c:117
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "自動"
@@ -438,13 +443,13 @@ msgstr "自動"
 #. TRANSLATORS: the profile quality - low quality profiles take
 #. * much less time to generate but may be a poor reflection of the
 #. * device capability
-#: ../panels/color/cc-color-profile.c:126
+#: ../panels/color/cc-color-profile.c:127
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "低品質"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:131
+#: ../panels/color/cc-color-profile.c:132
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "中品質"
@@ -452,41 +457,41 @@ msgstr "中品質"
 #. TRANSLATORS: the profile quality - high quality profiles take
 #. * a *long* time, and have the best calibration and
 #. * characterisation data.
-#: ../panels/color/cc-color-profile.c:138
+#: ../panels/color/cc-color-profile.c:139
 msgctxt "Profile quality"
 msgid "High Quality"
 msgstr "高品質"
 
 #. TRANSLATORS: this default RGB space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:155
+#: ../panels/color/cc-color-profile.c:156
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "預設 RGB"
 
 #. TRANSLATORS: this default CMYK space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:162
+#: ../panels/color/cc-color-profile.c:163
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "預設 CMYK"
 
 #. TRANSLATORS: this default gray space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:169
+#: ../panels/color/cc-color-profile.c:170
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "預設灰階"
 
-#: ../panels/color/cc-color-profile.c:193
+#: ../panels/color/cc-color-profile.c:194
 msgid "Vendor supplied factory calibration data"
 msgstr "廠商提供的出廠校準資料"
 
-#: ../panels/color/cc-color-profile.c:202
+#: ../panels/color/cc-color-profile.c:203
 msgid "Full-screen display correction not possible with this profile"
 msgstr "這個描述檔無法使用全螢幕顯示校正"
 
-#: ../panels/color/cc-color-profile.c:224
+#: ../panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
 msgstr "這個描述檔可能不再準確"
 
@@ -497,7 +502,7 @@ msgstr "顯示校準"
 #: ../panels/color/color-calibrate.ui.h:2
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1469
+#: ../panels/user-accounts/um-account-dialog.c:1468
 msgid "Cancel"
 msgstr "取消"
 
@@ -824,13 +829,13 @@ msgstr "中國"
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:122
-#: ../panels/region/cc-format-chooser.c:266
-#: ../panels/region/cc-input-chooser.c:170
+#: ../panels/common/cc-language-chooser.c:123
+#: ../panels/region/cc-format-chooser.c:267
+#: ../panels/region/cc-input-chooser.c:165
 msgid "More…"
 msgstr "更多…"
 
-#: ../panels/common/cc-language-chooser.c:139
+#: ../panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "找不到語言"
 
@@ -839,36 +844,59 @@ msgid "Language"
 msgstr "語言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:110 ../panels/region/format-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
 msgid "_Done"
 msgstr "完成(_D)"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:367
+#: ../panels/datetime/cc-datetime-panel.c:340
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%b%e日, %p %l:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:372
+#: ../panels/datetime/cc-datetime-panel.c:345
 msgid "%e %B %Y, %R"
 msgstr "%Y年%b%e日,%R"
 
+#. Translators: "city, country"
+#: ../panels/datetime/cc-datetime-panel.c:523
+#, c-format
+msgctxt "timezone loc"
+msgid "%s, %s"
+msgstr "%s,%s"
+
+#. Update the timezone on the listbow row
+#. Translators: "timezone (details)"
+#: ../panels/datetime/cc-datetime-panel.c:553
+#, c-format
+msgctxt "timezone desc"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:588
+#: ../panels/datetime/cc-datetime-panel.c:561
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:593
+#: ../panels/datetime/cc-datetime-panel.c:566
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:598
+#: ../panels/datetime/cc-datetime-panel.c:571
 msgid "%R"
 msgstr "%R"
 
+#. Update the text bubble in the timezone map
+#. Translators: "timezone (utc shift)"
+#: ../panels/datetime/cc-datetime-panel.c:576
+#, c-format
+msgctxt "timezone map"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: ../panels/datetime/datetime.ui.h:1
 msgid "January"
 msgstr "一月"
@@ -1004,106 +1032,106 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,你需要通過核對。"
 
-#: ../panels/display/cc-display-panel.c:486
+#: ../panels/display/cc-display-panel.c:487
 msgid "Lid Closed"
 msgstr "上蓋已經關閉"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:489
+#: ../panels/display/cc-display-panel.c:490
 msgid "Mirrored"
 msgstr "鏡射顯示器"
 
-#: ../panels/display/cc-display-panel.c:491
-#: ../panels/display/cc-display-panel.c:2122
+#: ../panels/display/cc-display-panel.c:492
+#: ../panels/display/cc-display-panel.c:2145
 msgid "Primary"
 msgstr "主要"
 
-#: ../panels/display/cc-display-panel.c:493
-#: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1702 ../panels/power/cc-power-panel.c:1713
-#: ../panels/privacy/cc-privacy-panel.c:81
-#: ../panels/privacy/cc-privacy-panel.c:121
-#: ../panels/universal-access/cc-ua-panel.c:256
-#: ../panels/universal-access/cc-ua-panel.c:596
-#: ../panels/universal-access/cc-ua-panel.c:721
+#: ../panels/display/cc-display-panel.c:494
+#: ../panels/notifications/cc-notifications-panel.c:185
+#: ../panels/power/cc-power-panel.c:1684 ../panels/power/cc-power-panel.c:1695
+#: ../panels/privacy/cc-privacy-panel.c:82
+#: ../panels/privacy/cc-privacy-panel.c:122
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:572
+#: ../panels/universal-access/cc-ua-panel.c:695
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:496
+#: ../panels/display/cc-display-panel.c:497
 msgid "Secondary"
 msgstr "次要"
 
-#: ../panels/display/cc-display-panel.c:1506
+#: ../panels/display/cc-display-panel.c:1533
 msgid "Arrange Combined Displays"
 msgstr "排列顯示器的組合方式"
 
-#: ../panels/display/cc-display-panel.c:1512
-#: ../panels/display/cc-display-panel.c:1956
+#: ../panels/display/cc-display-panel.c:1539
+#: ../panels/display/cc-display-panel.c:1979
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1533
+#: ../panels/display/cc-display-panel.c:1560
 msgid "Drag displays to rearrange them"
 msgstr "拖拉顯示器以重新排列他們"
 
-#: ../panels/display/cc-display-panel.c:2058
+#: ../panels/display/cc-display-panel.c:2081
 msgid "Size"
 msgstr "尺寸"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2071
+#: ../panels/display/cc-display-panel.c:2094
 msgid "Aspect Ratio"
 msgstr "長寬比"
 
-#: ../panels/display/cc-display-panel.c:2092
+#: ../panels/display/cc-display-panel.c:2115
 #: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../panels/display/cc-display-panel.c:2123
+#: ../panels/display/cc-display-panel.c:2146
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "在這個顯示器顯示頂端列與活動概覽"
 
-#: ../panels/display/cc-display-panel.c:2129
+#: ../panels/display/cc-display-panel.c:2152
 msgid "Secondary Display"
 msgstr "次要顯示器"
 
-#: ../panels/display/cc-display-panel.c:2130
+#: ../panels/display/cc-display-panel.c:2153
 msgid "Join this display with another to create an extra workspace"
 msgstr "將這個顯示器與另一個顯示器結合以建立額外的工作區"
 
-#: ../panels/display/cc-display-panel.c:2137
+#: ../panels/display/cc-display-panel.c:2160
 msgid "Presentation"
 msgstr "展示"
 
-#: ../panels/display/cc-display-panel.c:2138
+#: ../panels/display/cc-display-panel.c:2161
 msgid "Show slideshows and media only"
 msgstr "只顯示投影片與媒體"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2143
+#: ../panels/display/cc-display-panel.c:2166
 msgid "Mirror"
 msgstr "鏡射"
 
-#: ../panels/display/cc-display-panel.c:2144
+#: ../panels/display/cc-display-panel.c:2167
 msgid "Show your existing view on both displays"
 msgstr "在兩個顯示器顯示你現有的檢視"
 
-#: ../panels/display/cc-display-panel.c:2150
+#: ../panels/display/cc-display-panel.c:2173
 msgid "Turn Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:2151
+#: ../panels/display/cc-display-panel.c:2174
 msgid "Don't use this display"
 msgstr "不使用這個顯示器"
 
-#: ../panels/display/cc-display-panel.c:2367
+#: ../panels/display/cc-display-panel.c:2383
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
-#: ../panels/display/cc-display-panel.c:2398
+#: ../panels/display/cc-display-panel.c:2414
 msgid "_Arrange Combined Displays"
 msgstr "排列組合的顯示器(_A)"
 
@@ -1117,57 +1145,61 @@ msgstr "選擇如何使用連接的顯示器和投影機"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
-msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;面板;投影機;螢幕;解像度;重新整理;"
+msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影機;螢幕;解像度;重新整理;螢幕;"
+
+#: ../panels/info/cc-info-panel.c:384
+msgid "Wayland"
+msgstr "Wayland"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:387 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "不明"
 
-#: ../panels/info/cc-info-panel.c:525
+#: ../panels/info/cc-info-panel.c:472
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位元"
 
-#: ../panels/info/cc-info-panel.c:527
+#: ../panels/info/cc-info-panel.c:474
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位元"
 
-#: ../panels/info/cc-info-panel.c:1207
+#: ../panels/info/cc-info-panel.c:1154
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../panels/info/cc-info-panel.c:1211
+#: ../panels/info/cc-info-panel.c:1158
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../panels/info/cc-info-panel.c:1215
+#: ../panels/info/cc-info-panel.c:1162
 msgid "Open folder"
 msgstr "開啟資料夾"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-panel.c:1253
 msgid "Other Media"
 msgstr "其他媒體"
 
-#: ../panels/info/cc-info-panel.c:1337
+#: ../panels/info/cc-info-panel.c:1284
 msgid "Select an application for audio CDs"
 msgstr "選擇播放音樂 CD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1338
+#: ../panels/info/cc-info-panel.c:1285
 msgid "Select an application for video DVDs"
 msgstr "選擇播放影片 DVD 的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1339
+#: ../panels/info/cc-info-panel.c:1286
 msgid "Select an application to run when a music player is connected"
 msgstr "選擇當音樂播放器連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1340
+#: ../panels/info/cc-info-panel.c:1287
 msgid "Select an application to run when a camera is connected"
 msgstr "選擇當攝影機連接時要執行的應用程式"
 
-#: ../panels/info/cc-info-panel.c:1341
+#: ../panels/info/cc-info-panel.c:1288
 msgid "Select an application for software CDs"
 msgstr "選擇軟件 CD 要用的應用程式"
 
@@ -1176,72 +1208,72 @@ msgstr "選擇軟件 CD 要用的應用程式"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1353
+#: ../panels/info/cc-info-panel.c:1300
 msgid "audio DVD"
 msgstr "音樂 DVD"
 
-#: ../panels/info/cc-info-panel.c:1354
+#: ../panels/info/cc-info-panel.c:1301
 msgid "blank Blu-ray disc"
 msgstr "空白 Blu-ray 光碟"
 
-#: ../panels/info/cc-info-panel.c:1355
+#: ../panels/info/cc-info-panel.c:1302
 msgid "blank CD disc"
 msgstr "空白 CD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1356
+#: ../panels/info/cc-info-panel.c:1303
 msgid "blank DVD disc"
 msgstr "空白 DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1304
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光碟"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1305
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1306
 msgid "e-book reader"
 msgstr "電子書閱讀器"
 
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1307
 msgid "HD DVD video disc"
 msgstr "HD DVD 影片光碟"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1308
 msgid "Picture CD"
 msgstr "照片 CD"
 
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1309
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1310
 msgid "Video CD"
 msgstr "影片 CD"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1311
 msgid "Windows software"
 msgstr "Windows 軟件"
 
-#: ../panels/info/cc-info-panel.c:1487
-#: ../panels/keyboard/keyboard-shortcuts.c:1695
+#: ../panels/info/cc-info-panel.c:1434
+#: ../panels/keyboard/keyboard-shortcuts.c:1704
 msgid "Section"
 msgstr "節"
 
-#: ../panels/info/cc-info-panel.c:1496 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1443 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "概覽"
 
-#: ../panels/info/cc-info-panel.c:1502 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1449 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "預設應用程式"
 
-#: ../panels/info/cc-info-panel.c:1507 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1454 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "可移除式媒體"
 
-#: ../panels/info/cc-info-panel.c:1532
+#: ../panels/info/cc-info-panel.c:1479
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
@@ -1409,7 +1441,7 @@ msgid "Eject"
 msgstr "退出"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 #: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "輸入"
@@ -1430,23 +1462,28 @@ msgstr "執行器"
 msgid "Launch help browser"
 msgstr "執行說明文件瀏覽器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1601
+#: ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "設定值"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:4
 msgid "Launch calculator"
 msgstr "執行計數機"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: ../panels/keyboard/01-launchers.xml.in.h:5
 msgid "Launch email client"
 msgstr "執行電子郵件客戶端"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launch web browser"
 msgstr "執行網頁瀏覽器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: ../panels/keyboard/01-launchers.xml.in.h:7
 msgid "Home folder"
 msgstr "家目錄"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: ../panels/keyboard/01-launchers.xml.in.h:8
 msgctxt "keybinding"
 msgid "Search"
 msgstr "搜尋"
@@ -1537,9 +1574,9 @@ msgstr "高對比開或關"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:274
-#: ../panels/keyboard/cc-keyboard-option.c:393
-#: ../panels/keyboard/keyboard-shortcuts.c:1158
+#: ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:395
+#: ../panels/keyboard/keyboard-shortcuts.c:1168
 #: ../panels/network/network-wifi.ui.h:29
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
 #: ../panels/user-accounts/um-fingerprint-dialog.c:213
@@ -1551,7 +1588,7 @@ msgstr "已停用"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:352
+#: ../panels/keyboard/cc-keyboard-option.c:354
 msgid "Alternative Characters Key"
 msgstr "替代的字符鍵"
 
@@ -1559,11 +1596,11 @@ msgstr "替代的字符鍵"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:361
+#: ../panels/keyboard/cc-keyboard-option.c:363
 msgid "Compose Key"
 msgstr "組合鍵"
 
-#: ../panels/keyboard/cc-keyboard-option.c:366
+#: ../panels/keyboard/cc-keyboard-option.c:368
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
@@ -1584,103 +1621,111 @@ msgstr "Shortcut;Repeat;Blink;捷徑鍵;重複;閃爍;"
 msgid "Custom Shortcut"
 msgstr "自選捷徑鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: ../panels/network/connection-editor/net-connection-editor.c:512
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/region/input-chooser.ui.h:3
+#: ../panels/user-accounts/um-account-dialog.c:1469
+msgid "_Add"
+msgstr "加入(_A)"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
 msgid "C_ommand:"
 msgstr "指令(_O):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
 msgid "Repeat Keys"
 msgstr "重複按鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
 msgid "Key presses _repeat when key is held down"
 msgstr "當按下某鍵不放時重複輸出該字符(_R)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgid "_Delay:"
 msgstr "延遲(_D):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
 msgid "_Speed:"
 msgstr "速度(_S):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
 msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "慢速"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
 msgid "Repeat keys speed"
 msgstr "按鍵重複速度"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
 msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "長"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "快速"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
 msgid "Cursor Blinking"
 msgstr "游標閃爍"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
 msgid "Cursor _blinks in text fields"
 msgstr "文字輸入欄中的游標可以閃爍(_B)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 msgid "S_peed:"
 msgstr "速度(_P):"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 msgid "Cursor blink speed"
 msgstr "游標閃爍速度"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 #: ../panels/region/region.ui.h:5
 msgid "Input Sources"
 msgstr "輸入來源"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
 msgid "Add Shortcut"
 msgstr "加入捷徑鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
 msgid "Remove Shortcut"
 msgstr "移除捷徑鍵"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
 msgstr "要編輯捷徑鍵,點選相應的列並按下新的按鍵組合,或以 Backspace 鍵來清除。"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:24
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:584
-#: ../panels/keyboard/keyboard-shortcuts.c:592
+#: ../panels/keyboard/keyboard-shortcuts.c:588
+#: ../panels/keyboard/keyboard-shortcuts.c:596
 msgid "Custom Shortcuts"
 msgstr "自選捷徑鍵"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:803
+#: ../panels/keyboard/keyboard-shortcuts.c:813
 msgid "<Unknown Action>"
 msgstr "<行動設定不詳>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1299
+#: ../panels/keyboard/keyboard-shortcuts.c:1309
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1690,7 +1735,7 @@ msgstr ""
 "捷徑“%s”無法使用,原因是會無法按下此按鍵。\n"
 "請試用其它的按鍵:如同時使用 Control,Alt  或 Shift。"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1331
+#: ../panels/keyboard/keyboard-shortcuts.c:1341
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1699,13 +1744,13 @@ msgstr ""
 "捷徑鍵“%s”己經使用於:\n"
 "“%s”"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1336
+#: ../panels/keyboard/keyboard-shortcuts.c:1346
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "如果你重新指派捷徑鍵為「%s」,「%s」的捷徑鍵就會停用。"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1342
+#: ../panels/keyboard/keyboard-shortcuts.c:1352
 msgid "_Reassign"
 msgstr "重新指派(_R)"
 
@@ -1851,11 +1896,11 @@ msgstr "點選,次要按鈕"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:357
+#: ../panels/network/cc-network-panel.c:366
 msgid "Air_plane Mode"
 msgstr "飛安模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:956
+#: ../panels/network/cc-network-panel.c:965
 msgid "Network proxy"
 msgstr "網絡代理伺服器"
 
@@ -1863,14 +1908,14 @@ msgstr "網絡代理伺服器"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1135 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
 #: ../panels/network/net-vpn.c:431
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:1274
+#: ../panels/network/cc-network-panel.c:1289
 msgid "The system network services are not compatible with this version."
 msgstr "系統網絡服務與這個版本不兼容。"
 
@@ -1916,34 +1961,34 @@ msgstr "自動"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:216
-#: ../panels/network/net-device-wifi.c:377
+#: ../panels/network/net-device-wifi.c:217
+#: ../panels/network/net-device-wifi.c:378
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:220
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/net-device-wifi.c:221
+#: ../panels/network/net-device-wifi.c:383
 #: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:225
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:229
+#: ../panels/network/net-device-wifi.c:230
 msgid "Enterprise"
 msgstr "企業版"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:234
-#: ../panels/network/net-device-wifi.c:367
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:368
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
@@ -1964,8 +2009,8 @@ msgid "Yesterday"
 msgstr "昨日"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:125
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:472
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -1973,128 +2018,128 @@ msgstr[0] "%i 天以前"
 
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:528
+#: ../panels/network/net-device-ethernet.c:54
+#: ../panels/network/net-device-wifi.c:529
 #, 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:557
+#: ../panels/network/net-device-wifi.c:558
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:559
+#: ../panels/network/net-device-wifi.c:560
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:561
+#: ../panels/network/net-device-wifi.c:562
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/net-device-wifi.c:564
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:213
+#: ../panels/network/connection-editor/ce-page-ethernet.c:226
 #: ../panels/network/connection-editor/ce-page-vpn.c:204
-#: ../panels/network/connection-editor/ce-page-wifi.c:255
+#: ../panels/network/connection-editor/ce-page-wifi.c:270
 #: ../panels/network/network-wifi.ui.h:45
 msgid "Identity"
 msgstr "身分"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:194
-#: ../panels/network/connection-editor/ce-page-ip4.c:456
-#: ../panels/network/connection-editor/ce-page-ip6.c:196
-#: ../panels/network/connection-editor/ce-page-ip6.c:460
+#: ../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
 msgid "Address"
 msgstr "地址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:207
-#: ../panels/network/connection-editor/ce-page-ip4.c:469
+#: ../panels/network/connection-editor/ce-page-ip4.c:190
+#: ../panels/network/connection-editor/ce-page-ip4.c:452
 msgid "Netmask"
 msgstr "網絡遮罩"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip4.c:482
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
-#: ../panels/network/connection-editor/ce-page-ip6.c:490
+#: ../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/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:238
-#: ../panels/network/connection-editor/ce-page-ip6.c:239
+#: ../panels/network/connection-editor/ce-page-ip4.c:221
+#: ../panels/network/connection-editor/ce-page-ip6.c:222
 msgid "Delete Address"
 msgstr "刪除位址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:292
-#: ../panels/network/connection-editor/ce-page-ip6.c:293
+#: ../panels/network/connection-editor/ce-page-ip4.c:275
+#: ../panels/network/connection-editor/ce-page-ip6.c:276
 msgid "Add"
 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:343
+#: ../panels/network/connection-editor/ce-page-ip6.c:347
 msgid "Server"
 msgstr "伺服器"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:377
-#: ../panels/network/connection-editor/ce-page-ip6.c:381
+#: ../panels/network/connection-editor/ce-page-ip4.c:360
+#: ../panels/network/connection-editor/ce-page-ip6.c:364
 msgid "Delete DNS Server"
 msgstr "刪除 DNS 伺服器"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:496
-#: ../panels/network/connection-editor/ce-page-ip6.c:504
+#: ../panels/network/connection-editor/ce-page-ip4.c:479
+#: ../panels/network/connection-editor/ce-page-ip6.c:487
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:517
-#: ../panels/network/connection-editor/ce-page-ip6.c:525
+#: ../panels/network/connection-editor/ce-page-ip4.c:500
+#: ../panels/network/connection-editor/ce-page-ip6.c:508
 msgid "Delete Route"
 msgstr "刪除路由"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:632
+#: ../panels/network/connection-editor/ce-page-ip4.c:615
 #: ../panels/network/network-wifi.ui.h:25
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:636
-#: ../panels/network/connection-editor/ce-page-ip6.c:638
+#: ../panels/network/connection-editor/ce-page-ip4.c:619
+#: ../panels/network/connection-editor/ce-page-ip6.c:621
 #: ../panels/network/network-wifi.ui.h:24
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:640
-#: ../panels/network/connection-editor/ce-page-ip6.c:642
+#: ../panels/network/connection-editor/ce-page-ip4.c:623
+#: ../panels/network/connection-editor/ce-page-ip6.c:625
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:934
+#: ../panels/network/connection-editor/ce-page-ip4.c:953
 #: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:209
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip6.c:192
+#: ../panels/network/connection-editor/ce-page-ip6.c:456
 msgid "Prefix"
 msgstr "前綴"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:613
 #: ../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
@@ -2102,11 +2147,11 @@ msgstr "前綴"
 msgid "Automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:634
+#: ../panels/network/connection-editor/ce-page-ip6.c:617
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:894
+#: ../panels/network/connection-editor/ce-page-ip6.c:919
 #: ../panels/network/network-wifi.ui.h:47
 msgid "IPv6"
 msgstr "IPv6"
@@ -2157,15 +2202,15 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:159
 #: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:159
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:164
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
@@ -2173,14 +2218,14 @@ msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:166
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:7
 msgid "Hardware Address"
 msgstr "硬件位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:170
+#: ../panels/network/net-device-ethernet.c:171
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2190,7 +2235,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:172
+#: ../panels/network/net-device-ethernet.c:173
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2321,50 +2366,44 @@ msgstr "只在使用這個連線的網絡資源時才使用此連線(_U)"
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:268
+#: ../panels/network/connection-editor/net-connection-editor.c:269
 msgid "Unable to open connection editor"
 msgstr "無法開啟連線編輯器"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:286
+#: ../panels/network/connection-editor/net-connection-editor.c:287
 msgid "New Profile"
 msgstr "新增設定組合"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:511
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1470
-msgid "_Add"
-msgstr "加入(_A)"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:595
+#: ../panels/network/connection-editor/net-connection-editor.c:577
 #: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:596
+#: ../panels/network/connection-editor/net-connection-editor.c:578
 msgid "Bond"
 msgstr "繫結"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:598
+#: ../panels/network/connection-editor/net-connection-editor.c:580
 msgid "Team"
 msgstr "隊伍"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:600
+#: ../panels/network/connection-editor/net-connection-editor.c:582
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:601
+#: ../panels/network/connection-editor/net-connection-editor.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:752
+#: ../panels/network/connection-editor/net-connection-editor.c:734
 msgid "Could not load VPN plugins"
 msgstr "無法載入 VPN 外掛程式"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:821
+#: ../panels/network/connection-editor/net-connection-editor.c:803
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:892
+#: ../panels/network/connection-editor/net-connection-editor.c:874
 msgid "Add Network Connection"
 msgstr "加入網絡連線"
 
@@ -2374,7 +2413,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1406
+#: ../panels/network/net-device-wifi.c:1449
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2417,9 +2456,9 @@ msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1946
-#: ../panels/sharing/cc-sharing-panel.c:446
-#: ../panels/user-accounts/um-photo-dialog.c:221
+#: ../panels/printers/cc-printers-panel.c:1948
+#: ../panels/sharing/cc-sharing-panel.c:492
+#: ../panels/user-accounts/um-photo-dialog.c:223
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -2453,8 +2492,8 @@ msgstr ""
 "錯誤:%s。"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:371
-msgid "Export VPN connection..."
-msgstr "匯出 VPN 連線…"
+msgid "Export VPN connection"
+msgstr "匯出 VPN 連線"
 
 #: ../panels/network/connection-editor/vpn-page.ui.h:4
 msgid "(Error: unable to load VPN connection editor)"
@@ -2492,8 +2531,8 @@ msgstr "控制你如何連線至網際網絡"
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;"
-msgstr 
"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;bridge;bond;網絡;無線網絡;區域網絡;代理伺服器;寬頻;數據機;藍牙;橋接;繫結;"
+"vlan;bridge;bond;DNS;"
+msgstr 
"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;bridge;bond;DNS;網絡;無線網絡;區域網絡;代理伺服器;寬頻;數據機;藍牙;橋接;繫結;"
 
 #: ../panels/network/net-device-bond.c:77
 msgid "Bond slaves"
@@ -2509,29 +2548,29 @@ msgstr "(沒有)"
 msgid "Bridge slaves"
 msgstr "橋接的連線"
 
-#: ../panels/network/net-device-ethernet.c:111
-#: ../panels/network/net-device-wifi.c:457
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:458
 msgid "never"
 msgstr "永不"
 
-#: ../panels/network/net-device-ethernet.c:121
-#: ../panels/network/net-device-wifi.c:467
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:468
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:123
-#: ../panels/network/net-device-wifi.c:469
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:470
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:161
+#: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:3
 #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../panels/network/net-device-ethernet.c:177
+#: ../panels/network/net-device-ethernet.c:178
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "最後使用的"
@@ -2541,14 +2580,14 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:287
+#: ../panels/network/net-device-ethernet.c:288
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:355
-#: ../panels/network/net-device-wifi.c:1561
+#: ../panels/network/net-device-ethernet.c:356
+#: ../panels/network/net-device-wifi.c:1604
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2556,7 +2595,7 @@ msgstr "有線"
 msgid "Options…"
 msgstr "選項…"
 
-#: ../panels/network/net-device-ethernet.c:492
+#: ../panels/network/net-device-ethernet.c:474
 #, c-format
 msgid "Profile %d"
 msgstr "設定組合 %d"
@@ -2569,58 +2608,57 @@ msgstr "加入新連線"
 msgid "Team slaves"
 msgstr "隊伍從屬"
 
-#: ../panels/network/net-device-wifi.c:1110
+#: ../panels/network/net-device-wifi.c:1153
 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."
 msgstr "如果你有無線網絡以外的方式連線到互聯網,你可以使用它來與其他人分享你的互聯網連線。"
 
-#: ../panels/network/net-device-wifi.c:1114
+#: ../panels/network/net-device-wifi.c:1157
 #, 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:1118
+#: ../panels/network/net-device-wifi.c:1161
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過你的無線網絡存取互聯網的。"
 
-#: ../panels/network/net-device-wifi.c:1195
+#: ../panels/network/net-device-wifi.c:1238
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1198
+#: ../panels/network/net-device-wifi.c:1241
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1313
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: ../panels/network/net-device-wifi.c:1273
+#: ../panels/network/net-device-wifi.c:1316
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: ../panels/network/net-device-wifi.c:1402
+#: ../panels/network/net-device-wifi.c:1445
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網絡的詳細資料包含密碼及任何自選的組態都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1729
+#: ../panels/network/net-device-wifi.c:1753
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "歷史紀錄"
 
-#: ../panels/network/net-device-wifi.c:1733 ../panels/power/power.ui.h:21
-#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1595
+#: ../panels/network/net-device-wifi.c:1757
 #: ../panels/wacom/cc-wacom-page.c:533
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1741
+#: ../panels/network/net-device-wifi.c:1765
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -3194,22 +3232,22 @@ msgstr "DER, PEM, 或 PKCS#12 私密密碼匙(*.der, *.pem, *.p12)"
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 證書 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:261
+#: ../panels/network/wireless-security/eap-method-fast.c:271
 #: ../panels/network/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:277
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "選擇一個 PAC 檔案…"
+#: ../panels/network/wireless-security/eap-method-fast.c:409
+msgid "Choose a PAC file"
+msgstr "選擇一個 PAC 檔案"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: ../panels/network/wireless-security/eap-method-fast.c:416
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
@@ -3269,10 +3307,10 @@ msgid "MD5"
 msgstr "MD5"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:434
+#: ../panels/network/wireless-security/eap-method-tls.c:456
 #: ../panels/network/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "選擇證書授權單位(CA)證書…"
+msgid "Choose a Certificate Authority certificate"
+msgstr "選擇證書授權單位 (CA) 證書"
 
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3296,11 +3334,11 @@ msgstr "PEAP 版本(_V)"
 msgid "As_k for this password every time"
 msgstr "每次都詢問密碼(_K)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:260
+#: ../panels/network/wireless-security/eap-method-tls.c:282
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私密密碼匙是不安全的"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:263
+#: ../panels/network/wireless-security/eap-method-tls.c:285
 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 "
@@ -3312,13 +3350,13 @@ msgstr ""
 "\n"
 "(你可以使用 openssl 來加密你的私密密碼匙)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:428
-msgid "Choose your personal certificate..."
-msgstr "選擇你的個人證書…"
+#: ../panels/network/wireless-security/eap-method-tls.c:450
+msgid "Choose your personal certificate"
+msgstr "選擇你的個人證書"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:440
-msgid "Choose your private key..."
-msgstr "選擇你的私密密碼匙…"
+#: ../panels/network/wireless-security/eap-method-tls.c:462
+msgid "Choose your private key"
+msgstr "選擇你的私密密碼匙"
 
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity"
@@ -3455,13 +3493,13 @@ msgctxt "notifications"
 msgid "Show Details in Lock Screen"
 msgstr "在鎖定畫面中顯示詳細資料"
 
-#: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1708 ../panels/power/cc-power-panel.c:1715
-#: ../panels/privacy/cc-privacy-panel.c:81
-#: ../panels/privacy/cc-privacy-panel.c:121
-#: ../panels/universal-access/cc-ua-panel.c:256
-#: ../panels/universal-access/cc-ua-panel.c:596
-#: ../panels/universal-access/cc-ua-panel.c:721
+#: ../panels/notifications/cc-notifications-panel.c:185
+#: ../panels/power/cc-power-panel.c:1690 ../panels/power/cc-power-panel.c:1697
+#: ../panels/privacy/cc-privacy-panel.c:82
+#: ../panels/privacy/cc-privacy-panel.c:122
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:572
+#: ../panels/universal-access/cc-ua-panel.c:695
 msgid "On"
 msgstr "開啟"
 
@@ -3486,30 +3524,30 @@ msgstr "顯示彈出式橫幅"
 msgid "Show in Lock Screen"
 msgstr "在鎖定畫面中顯示"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:198
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:169
 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:316
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:283
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "加入帳號"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:355
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:322
 msgid "Mail"
 msgstr "郵件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:361
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:367
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
 msgid "Chat"
 msgstr "聊天"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:373
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Resources"
 msgstr "資源"
 
@@ -3582,17 +3620,17 @@ msgid ""
 "contacts, calendar, chat and more."
 msgstr "加入一個帳號以允許你的應用程式存取它用於文件、郵件、聯絡人、行事曆、聊天等等。"
 
-#: ../panels/power/cc-power-panel.c:182
+#: ../panels/power/cc-power-panel.c:183
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:189
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: ../panels/power/cc-power-panel.c:200
+#: ../panels/power/cc-power-panel.c:201
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3600,224 +3638,224 @@ msgstr[0] "%i 小時"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:208
+#: ../panels/power/cc-power-panel.c:209
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:209
+#: ../panels/power/cc-power-panel.c:210
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../panels/power/cc-power-panel.c:210
+#: ../panels/power/cc-power-panel.c:211
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:229
+#: ../panels/power/cc-power-panel.c:230
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s後完全充飽"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:236
+#: ../panels/power/cc-power-panel.c:237
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意:剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:242
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:246 ../panels/power/cc-power-panel.c:274
+#: ../panels/power/cc-power-panel.c:247 ../panels/power/cc-power-panel.c:275
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:250 ../panels/power/cc-power-panel.c:278
+#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:265
+#: ../panels/power/cc-power-panel.c:266
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
+#: ../panels/power/cc-power-panel.c:271
 msgid "Discharging"
 msgstr "放電中"
 
-#: ../panels/power/cc-power-panel.c:395
+#: ../panels/power/cc-power-panel.c:396
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: ../panels/power/cc-power-panel.c:397
+#: ../panels/power/cc-power-panel.c:398
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:469
+#: ../panels/power/cc-power-panel.c:470
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:472
+#: ../panels/power/cc-power-panel.c:473
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:475
+#: ../panels/power/cc-power-panel.c:476
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:478
+#: ../panels/power/cc-power-panel.c:479
 msgid "Personal digital assistant"
 msgstr "個人數碼助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:481
+#: ../panels/power/cc-power-panel.c:482
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:484
+#: ../panels/power/cc-power-panel.c:485
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:487
+#: ../panels/power/cc-power-panel.c:488
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:490
+#: ../panels/power/cc-power-panel.c:491
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:716
-#: ../panels/power/cc-power-panel.c:2039
+#: ../panels/power/cc-power-panel.c:494 ../panels/power/cc-power-panel.c:717
+#: ../panels/power/cc-power-panel.c:2019
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:539
+#: ../panels/power/cc-power-panel.c:540
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:551
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:556
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:561
+#: ../panels/power/cc-power-panel.c:562
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:566
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: ../panels/power/cc-power-panel.c:714
+#: ../panels/power/cc-power-panel.c:715
 msgid "Batteries"
 msgstr "電池"
 
-#: ../panels/power/cc-power-panel.c:1116
+#: ../panels/power/cc-power-panel.c:1117
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1463
+#: ../panels/power/cc-power-panel.c:1445
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1491
+#: ../panels/power/cc-power-panel.c:1473
 msgid "_Screen brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1497
+#: ../panels/power/cc-power-panel.c:1479
 msgid "_Keyboard brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1507
+#: ../panels/power/cc-power-panel.c:1489
 msgid "_Dim screen when inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1532
+#: ../panels/power/cc-power-panel.c:1514
 msgid "_Blank screen"
 msgstr "螢幕轉黑(_B)"
 
-#: ../panels/power/cc-power-panel.c:1569
+#: ../panels/power/cc-power-panel.c:1551
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1574
+#: ../panels/power/cc-power-panel.c:1556
 msgid "Turns off wireless devices"
 msgstr "關閉無線裝置"
 
-#: ../panels/power/cc-power-panel.c:1599
+#: ../panels/power/cc-power-panel.c:1581
 msgid "_Mobile broadband"
 msgstr "流動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1604
+#: ../panels/power/cc-power-panel.c:1586
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "關閉流動寬頻 (3G、4G、WiMax 等) 裝置"
 
-#: ../panels/power/cc-power-panel.c:1653
+#: ../panels/power/cc-power-panel.c:1635
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1704
+#: ../panels/power/cc-power-panel.c:1686
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1706
+#: ../panels/power/cc-power-panel.c:1688
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:1835
+#: ../panels/power/cc-power-panel.c:1818
 msgid "Suspend & Power Off"
 msgstr "暫停與關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1868
+#: ../panels/power/cc-power-panel.c:1851
 msgid "_Automatic suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:1892
+#: ../panels/power/cc-power-panel.c:1875
 msgid "When battery power is _critical"
 msgstr "當電池的電量極低時(_C)"
 
-#: ../panels/power/cc-power-panel.c:1949
+#: ../panels/power/cc-power-panel.c:1930
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: ../panels/power/cc-power-panel.c:2086
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Devices"
 msgstr "裝置"
 
@@ -3903,15 +3941,15 @@ msgstr "12 分鐘"
 msgid "Automatic Suspend"
 msgstr "自動暫停"
 
-#: ../panels/power/power.ui.h:22
+#: ../panels/power/power.ui.h:21
 msgid "_Plugged In"
 msgstr "插入插頭(_P)"
 
-#: ../panels/power/power.ui.h:23
+#: ../panels/power/power.ui.h:22
 msgid "On _Battery Power"
 msgstr "使用電池電源(_B)"
 
-#: ../panels/power/power.ui.h:24
+#: ../panels/power/power.ui.h:23
 msgid "Delay"
 msgstr "延遲"
 
@@ -3920,7 +3958,7 @@ msgid "Authenticate"
 msgstr "核對"
 
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "Password"
 msgstr "密碼"
@@ -4066,51 +4104,51 @@ msgid "No printers available"
 msgstr "沒有可用的打印機"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1431
+#: ../panels/printers/cc-printers-panel.c:1433
 #, 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:1775
+#: ../panels/printers/cc-printers-panel.c:1777
 msgid "Failed to add new printer."
 msgstr "無法加入新的打印機。"
 
-#: ../panels/printers/cc-printers-panel.c:1942
+#: ../panels/printers/cc-printers-panel.c:1944
 msgid "Select PPD File"
 msgstr "選擇 PPD 檔案"
 
-#: ../panels/printers/cc-printers-panel.c:1951
+#: ../panels/printers/cc-printers-panel.c:1953
 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:2256
+#: ../panels/printers/cc-printers-panel.c:2258
 msgid "No suitable driver found"
 msgstr "找不到合適的驅動程式"
 
-#: ../panels/printers/cc-printers-panel.c:2325
+#: ../panels/printers/cc-printers-panel.c:2327
 msgid "Searching for preferred drivers…"
 msgstr "正在搜尋偏好的驅動程式…"
 
-#: ../panels/printers/cc-printers-panel.c:2340
+#: ../panels/printers/cc-printers-panel.c:2342
 msgid "Select from database…"
 msgstr "從資料庫搜尋…"
 
-#: ../panels/printers/cc-printers-panel.c:2349
+#: ../panels/printers/cc-printers-panel.c:2351
 msgid "Provide PPD File…"
 msgstr "提供 PPD 檔案…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2500
-#: ../panels/printers/cc-printers-panel.c:2523
+#: ../panels/printers/cc-printers-panel.c:2502
+#: ../panels/printers/cc-printers-panel.c:2525
 msgid "Test page"
 msgstr "測試頁"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2931
+#: ../panels/printers/cc-printers-panel.c:2933
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "無法載入 ui:%s"
@@ -4135,7 +4173,6 @@ msgstr "使用中的工作"
 
 #: ../panels/printers/jobs-dialog.ui.h:3
 #: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/user-accounts/data/history-dialog.ui.h:2
 msgid "Close"
 msgstr "關閉"
 
@@ -4182,6 +4219,16 @@ msgstr "選擇打印機驅動程式"
 msgid "Loading drivers database..."
 msgstr "載入驅動程式資料庫…"
 
+#. Translators: The found device is a JetDirect printer
+#: ../panels/printers/pp-host.c:506
+msgid "JetDirect Printer"
+msgstr "JetDirect 打印機"
+
+#. Translators: The found device is a Line Printer Daemon printer
+#: ../panels/printers/pp-host.c:756
+msgid "LPD Printer"
+msgstr "LPD 打印機"
+
 #. Translators: this is an option of "Two Sided"
 #: ../panels/printers/pp-ipp-option-widget.c:66
 #: ../panels/printers/pp-ppd-option-widget.c:70
@@ -4283,36 +4330,34 @@ msgid "%s Active Jobs"
 msgstr "%s 使用中的工作"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1709
+#: ../panels/printers/pp-new-printer-dialog.c:1671
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1714
+#: ../panels/printers/pp-new-printer-dialog.c:1676
 msgid "Serial Port"
 msgstr "序列埠"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1721
+#: ../panels/printers/pp-new-printer-dialog.c:1683
 msgid "Parallel Port"
 msgstr "串列埠"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1774
+#: ../panels/printers/pp-new-printer-dialog.c:1739
 #, c-format
-#| msgid "Location"
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1779
+#: ../panels/printers/pp-new-printer-dialog.c:1744
 #, c-format
-#| msgid "Address"
 msgid "Address: %s"
 msgstr "位址:%s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1803
+#: ../panels/printers/pp-new-printer-dialog.c:1768
 msgid "Server requires authentication"
 msgstr "伺服器需要核對"
 
@@ -4436,17 +4481,17 @@ msgid "No pre-filtering"
 msgstr "無前置過濾器"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:232
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
 msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:249
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "驅動程式"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:253
+#: ../panels/printers/pp-samba.c:248
 #, c-format
 msgid "Enter your username and password to view printers available on %s."
 msgstr "輸入你的使用者名稱與密碼以檢視在 %s 可用的打印機。"
@@ -4523,43 +4568,43 @@ msgstr ""
 "抱歉!系統列印服務\n"
 "似乎無法使用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:249 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:250 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
-#: ../panels/privacy/cc-privacy-panel.c:362 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:360 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "使用與歷史紀錄"
 
-#: ../panels/privacy/cc-privacy-panel.c:490
+#: ../panels/privacy/cc-privacy-panel.c:485
 msgid "Empty all items from Trash?"
 msgstr "要清除回收筒中所有的項目?"
 
-#: ../panels/privacy/cc-privacy-panel.c:491
+#: ../panels/privacy/cc-privacy-panel.c:486
 msgid "All items in the Trash will be permanently deleted."
 msgstr "所有在回收筒中的項目會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:492 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:487 ../panels/privacy/privacy.ui.h:34
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:515
+#: ../panels/privacy/cc-privacy-panel.c:510
 msgid "Delete all the temporary files?"
 msgstr "刪除所有暫存檔案?"
 
-#: ../panels/privacy/cc-privacy-panel.c:516
+#: ../panels/privacy/cc-privacy-panel.c:511
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有的暫存檔案會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:517 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:512 ../panels/privacy/privacy.ui.h:35
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:539 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:534 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "清除回收筒與暫存檔案"
 
-#: ../panels/privacy/cc-privacy-panel.c:578 ../panels/privacy/privacy.ui.h:38
+#: ../panels/privacy/cc-privacy-panel.c:574 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "軟件使用率"
 
@@ -4587,102 +4632,98 @@ msgid "30 seconds"
 msgstr "30 秒"
 
 #: ../panels/privacy/privacy.ui.h:9
-msgid "Immediately"
-msgstr "立即"
-
-#: ../panels/privacy/privacy.ui.h:10
 msgid "1 day"
 msgstr "1 天"
 
-#: ../panels/privacy/privacy.ui.h:11
+#: ../panels/privacy/privacy.ui.h:10
 msgid "2 days"
 msgstr "2 天"
 
-#: ../panels/privacy/privacy.ui.h:12
+#: ../panels/privacy/privacy.ui.h:11
 msgid "3 days"
 msgstr "3 天"
 
-#: ../panels/privacy/privacy.ui.h:13
+#: ../panels/privacy/privacy.ui.h:12
 msgid "4 days"
 msgstr "4 天"
 
-#: ../panels/privacy/privacy.ui.h:14
+#: ../panels/privacy/privacy.ui.h:13
 msgid "5 days"
 msgstr "5 天"
 
-#: ../panels/privacy/privacy.ui.h:15
+#: ../panels/privacy/privacy.ui.h:14
 msgid "6 days"
 msgstr "6 天"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: ../panels/privacy/privacy.ui.h:15
 msgid "7 days"
 msgstr "7 天"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: ../panels/privacy/privacy.ui.h:16
 msgid "14 days"
 msgstr "14 天"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: ../panels/privacy/privacy.ui.h:17
 msgid "30 days"
 msgstr "30 天"
 
-#: ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/privacy.ui.h:18
 msgid "Forever"
 msgstr "永遠"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: ../panels/privacy/privacy.ui.h:20
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 msgstr "記住你的歷史紀錄會讓需要再次找到某樣東西時更簡單。這些項目永遠不會透過網絡分享出去。"
 
-#: ../panels/privacy/privacy.ui.h:22
-msgid "Cl_ear Recent History"
-msgstr "清除最近使用紀錄(_E)"
-
-#: ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/privacy.ui.h:21
 msgid "_Recently Used"
 msgstr "最近使用(_R)"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: ../panels/privacy/privacy.ui.h:22
 msgid "Retain _History"
 msgstr "保留歷史紀錄(_H)"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/privacy.ui.h:23
+msgid "Cl_ear Recent History"
+msgstr "清除最近使用紀錄(_E)"
+
+#: ../panels/privacy/privacy.ui.h:25
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "螢幕鎖可以在你離開時保護你的私隱。"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:26
 msgid "Automatic Screen _Lock"
 msgstr "自動鎖定螢幕(_L)"
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:27
 msgid "Lock screen _after blank for"
 msgstr "螢幕轉黑後多久鎖定螢幕(_A)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Show _Notifications"
 msgstr "顯示通知(_N)"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:30
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr "自動清除回收筒和暫存檔案可以保護你的電腦減少不必要的敏感資訊。"
 
-#: ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/privacy.ui.h:31
 msgid "Automatically empty _Trash"
 msgstr "自動清空回收筒(_T)"
 
-#: ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/privacy.ui.h:32
 msgid "Automatically purge Temporary _Files"
 msgstr "自動清除暫存檔案(_F)"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/privacy.ui.h:33
 msgid "Purge _After"
 msgstr "清除於(_A)"
 
-#: ../panels/privacy/privacy.ui.h:39
+#: ../panels/privacy/privacy.ui.h:37
 msgid ""
 "Sending us information about which software you use helps us provide you "
 "with more accurate recommendations. It also helps us to improve our "
@@ -4695,58 +4736,60 @@ msgstr ""
 "\n"
 "我們所收集的所有資訊都是匿名的,而且我們永遠不會將你的資料與任何第三方分享。"
 
-#: ../panels/privacy/privacy.ui.h:42
-msgid "Privacy Policy"
-msgstr "私隱權原則"
-
-#: ../panels/privacy/privacy.ui.h:43
+#: ../panels/privacy/privacy.ui.h:40
 msgid "_Send software usage statistics"
 msgstr "傳送軟件使用率統計(_S)"
 
-#: ../panels/region/cc-format-chooser.c:118
+#: ../panels/privacy/privacy.ui.h:41
+msgid "Privacy Policy"
+msgstr "私隱權原則"
+
+#: ../panels/region/cc-format-chooser.c:119
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:121
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/cc-format-chooser.c:283
+#: ../panels/region/cc-format-chooser.c:284
 msgid "No regions found"
 msgstr "找不到區域"
 
-#: ../panels/region/cc-input-chooser.c:184
+#: ../panels/region/cc-input-chooser.c:179
 msgid "No input sources found"
 msgstr "找不到輸入來源"
 
-#: ../panels/region/cc-input-chooser.c:1068
+#: ../panels/region/cc-input-chooser.c:1076
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/region/cc-region-panel.c:242
+#: ../panels/region/cc-region-panel.c:239
+#: ../panels/user-accounts/um-user-panel.c:896
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "你的作業階段需要重新啟動以讓更改生效"
 
-#: ../panels/region/cc-region-panel.c:243
+#: ../panels/region/cc-region-panel.c:240
+#: ../panels/user-accounts/um-user-panel.c:897
 msgid "Restart Now"
 msgstr "立刻重新啟動"
 
-#: ../panels/region/cc-region-panel.c:903
+#: ../panels/region/cc-region-panel.c:858
 msgid "No input source selected"
 msgstr "尚未選擇輸入來源"
 
-#: ../panels/region/cc-region-panel.c:1134
+#: ../panels/region/cc-region-panel.c:1088
 msgid "Sorry"
 msgstr "抱歉"
 
-#: ../panels/region/cc-region-panel.c:1136
+#: ../panels/region/cc-region-panel.c:1090
 msgid "Input methods can't be used on the login screen"
 msgstr "輸入法不能用在登入畫面"
 
-#: ../panels/region/cc-region-panel.c:1773
+#: ../panels/region/cc-region-panel.c:1727
 msgid "Login Screen"
 msgstr "登入畫面"
 
@@ -4754,27 +4797,27 @@ msgstr "登入畫面"
 msgid "Formats"
 msgstr "格式"
 
-#: ../panels/region/format-chooser.ui.h:3
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Preview"
 msgstr "預覽"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Dates"
 msgstr "日期"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Times"
 msgstr "時刻"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Numbers"
 msgstr "數字"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Measurement"
 msgstr "度量衡"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Paper"
 msgstr "紙張"
 
@@ -4913,21 +4956,32 @@ msgstr "往下移"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:272
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/sharing/cc-sharing-panel.c:278
+#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:301
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/sharing/cc-sharing-panel.c:442
+#: ../panels/sharing/cc-sharing-panel.c:304
+msgctxt "service is enabled"
+msgid "Enabled"
+msgstr "已啟用"
+
+#: ../panels/sharing/cc-sharing-panel.c:307
+msgctxt "service is active"
+msgid "Active"
+msgstr "使用中"
+
+#: ../panels/sharing/cc-sharing-panel.c:488
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: ../panels/sharing/cc-sharing-panel.c:756
+#: ../panels/sharing/cc-sharing-panel.c:916
 msgid "Copy"
 msgstr "複製"
 
@@ -4954,6 +5008,18 @@ msgstr "啟用或停用遠端登入"
 msgid "Authentication is required to enable or disable remote login"
 msgstr "啟用或停用遠端登入需要核對"
 
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:299
+msgid "No networks selected for sharing"
+msgstr "沒有選擇用來分享的網絡"
+
+#.
+#. * vim: sw=2 ts=8 cindent noai bs=2
+#.
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "網絡"
+
 #: ../panels/sharing/sharing.ui.h:1
 msgid "Bluetooth Sharing"
 msgstr "藍牙分享"
@@ -4996,46 +5062,18 @@ msgstr "遠端登入"
 msgid "Some services are disabled because of no network access."
 msgstr "由於沒有網絡存取,某些服務已停用。"
 
-#: ../panels/sharing/sharing.ui.h:11
-msgid "Share Music, Photos and Videos with others on the current network."
-msgstr "與目前網絡的其他人分享音樂、相片和影片。"
-
 #: ../panels/sharing/sharing.ui.h:12
-msgid "Share Media On This Network"
-msgstr "在這個網絡分享媒體"
-
-#: ../panels/sharing/sharing.ui.h:13
-msgid "Shared Folders"
-msgstr "分享資料夾"
-
-#: ../panels/sharing/sharing.ui.h:14
-msgid "column"
-msgstr "欄"
-
-#: ../panels/sharing/sharing.ui.h:15
-msgid "Add Folder"
-msgstr "加入資料夾"
-
-#: ../panels/sharing/sharing.ui.h:16
-msgid "Remove Folder"
-msgstr "移除資料夾"
-
-#: ../panels/sharing/sharing.ui.h:18
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
 "your current network using: <a href=\"dav://%s\">dav://%s</a>"
 msgstr "個人檔案分享允許你使用: <a href=\"dav://%s\">dav://%s</a> 與目前網絡上的其他人分享你的公開資料夾"
 
-#: ../panels/sharing/sharing.ui.h:19
-msgid "Share Public Folder On This Network"
-msgstr "在這個網絡分享公開資料夾"
-
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:13
 msgid "Require Password"
 msgstr "需要密碼"
 
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:16
 #, no-c-format
 msgid ""
 "Allow remote users to connect using the Secure Shell command:\n"
@@ -5044,37 +5082,45 @@ msgstr ""
 "允許遠端使用者使用 SSH 指令連線:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/sharing.ui.h:26
+#: ../panels/sharing/sharing.ui.h:19
 #, no-c-format
 msgid ""
 "Allow 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> 檢視或控制你的螢幕"
 
-#: ../panels/sharing/sharing.ui.h:27
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Allow Remote Control"
 msgstr "允許遙控"
 
-#: ../panels/sharing/sharing.ui.h:28
+#: ../panels/sharing/sharing.ui.h:21
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../panels/sharing/sharing.ui.h:29
+#: ../panels/sharing/sharing.ui.h:22
 msgid "Show Password"
 msgstr "顯示密碼"
 
-#: ../panels/sharing/sharing.ui.h:30
+#: ../panels/sharing/sharing.ui.h:23
 msgid "Access Options"
 msgstr "存取選項"
 
-#: ../panels/sharing/sharing.ui.h:31
+#: ../panels/sharing/sharing.ui.h:24
 msgid "New connections must ask for access"
 msgstr "存取新的連線必須詢問"
 
-#: ../panels/sharing/sharing.ui.h:32
+#: ../panels/sharing/sharing.ui.h:25
 msgid "Require a password"
 msgstr "需要密碼"
 
+#: ../panels/sharing/sharing.ui.h:26
+msgid "Share music, photos and videos over the network."
+msgstr "與網絡上其他人分享音樂、相片和影片。"
+
+#: ../panels/sharing/sharing.ui.h:27
+msgid "Folders"
+msgstr "資料夾"
+
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "音效"
@@ -5211,51 +5257,51 @@ msgstr "裝置"
 msgid "Speaker Testing for %s"
 msgstr "%s 的喇叭測試"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1648
+#: ../panels/sound/gvc-mixer-dialog.c:1649
 msgid "_Output volume:"
 msgstr "輸出音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1662
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "Output"
 msgstr "輸出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1667
+#: ../panels/sound/gvc-mixer-dialog.c:1668
 msgid "C_hoose a device for sound output:"
 msgstr "選擇聲音輸出的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1692
+#: ../panels/sound/gvc-mixer-dialog.c:1693
 msgid "Settings for the selected device:"
 msgstr "已選取裝置的設定值:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1703
+#: ../panels/sound/gvc-mixer-dialog.c:1704
 msgid "Input"
 msgstr "輸入"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1710
+#: ../panels/sound/gvc-mixer-dialog.c:1711
 msgid "_Input volume:"
 msgstr "輸入音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1733
+#: ../panels/sound/gvc-mixer-dialog.c:1734
 msgid "Input level:"
 msgstr "輸入等級:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: ../panels/sound/gvc-mixer-dialog.c:1762
 msgid "C_hoose a device for sound input:"
 msgstr "選擇聲音輸入的裝置(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1788
+#: ../panels/sound/gvc-mixer-dialog.c:1789
 msgid "Sound Effects"
 msgstr "聲音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1795
+#: ../panels/sound/gvc-mixer-dialog.c:1796
 msgid "_Alert volume:"
 msgstr "警示音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1808
+#: ../panels/sound/gvc-mixer-dialog.c:1809
 msgid "Applications"
 msgstr "程式集"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1812
+#: ../panels/sound/gvc-mixer-dialog.c:1813
 msgid "No application is currently playing or recording audio."
 msgstr "沒有應用程式目前正在播放或錄製音效。"
 
@@ -5313,7 +5359,7 @@ msgstr "讓電腦更容易看、聽、輸入、指向與點選"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
-msgstr "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen 
Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;彈跳;滑鼠;鍵;按鍵"
+msgstr "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen 
Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;字型;大小;相黏;遲緩;反彈;滑鼠;鍵;按鍵"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5396,13 +5442,13 @@ msgid "Visual Alerts"
 msgstr "視覺警示"
 
 #: ../panels/universal-access/uap.ui.h:23
-msgid "Use a visual indication when an alert sound occurs."
-msgstr "當警示音效發出時使用視覺化的指示。"
-
-#: ../panels/universal-access/uap.ui.h:24
 msgid "_Test flash"
 msgstr "測試閃動(_T)"
 
+#: ../panels/universal-access/uap.ui.h:24
+msgid "Use a visual indication when an alert sound occurs."
+msgstr "當警示音效發出時使用視覺化的指示。"
+
 #: ../panels/universal-access/uap.ui.h:25
 msgid "Flash the _window title"
 msgstr "閃動視窗標題(_W)"
@@ -5471,7 +5517,7 @@ msgstr "當拒絕按鍵動作則發出聲響(_R)"
 
 #: ../panels/universal-access/uap.ui.h:41
 msgid "_Bounce Keys"
-msgstr "回鍵(_B)"
+msgstr "反彈鍵(_B)"
 
 #: ../panels/universal-access/uap.ui.h:42
 msgid "Ignores fast duplicate keypresses"
@@ -5484,7 +5530,7 @@ msgstr "短"
 
 #: ../panels/universal-access/uap.ui.h:44
 msgid "Bounce keys typing delay"
-msgstr "回鍵輸入延遲"
+msgstr "反彈鍵輸入延遲"
 
 #: ../panels/universal-access/uap.ui.h:45
 msgctxt "bounce keys delay"
@@ -5765,12 +5811,12 @@ msgid "Account _Type"
 msgstr "帳號類型(_T)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "Allow user to set a password when they next login"
 msgstr "允許使用者在下次登入時選擇密碼"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Set a password now"
 msgstr "立刻設定密碼"
 
@@ -5796,16 +5842,25 @@ msgstr ""
 "請上線以加入\n"
 "企業登入帳號。"
 
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+msgid "_Enterprise Login"
+msgstr "企業登入(_E)"
+
 #: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: ../panels/user-accounts/um-account-dialog.c:1458
+msgid "Add User"
+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:17
+#: ../panels/user-accounts/data/account-dialog.ui.h:20
 msgid "Domain Administrator Login"
 msgstr "網域管理員登入"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: ../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"
@@ -5815,11 +5870,11 @@ msgstr ""
 "加入網域。請網絡系統管理員在這裏\n"
 "輸入網域密碼。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
+#: ../panels/user-accounts/data/account-dialog.ui.h:24
 msgid "Administrator _Name"
 msgstr "管理員名稱(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:22
+#: ../panels/user-accounts/data/account-dialog.ui.h:25
 msgid "Administrator Password"
 msgstr "管理員密碼"
 
@@ -5896,21 +5951,25 @@ msgid "Login History"
 msgstr "登入歷史紀錄"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
+msgid "Change Password"
+msgstr "更改密碼"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:3
+msgid "Ch_ange"
+msgstr "改變(_A)"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:4
 msgid "_Verify New Password"
 msgstr "驗證新密碼(_V)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
+#: ../panels/user-accounts/data/password-dialog.ui.h:5
 msgid "_New Password"
 msgstr "新密碼(_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
+#: ../panels/user-accounts/data/password-dialog.ui.h:6
 msgid "Current _Password"
 msgstr "目前的密碼(_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "Ch_ange"
-msgstr "改變(_A)"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgid "Add User Account"
 msgstr "加入使用者帳號"
@@ -6133,32 +6192,28 @@ msgstr "不明的錯誤"
 msgid "Should match the web address of your account provider."
 msgstr "應符合你帳號提供者的網絡位址。"
 
-#: ../panels/user-accounts/um-account-dialog.c:221
+#: ../panels/user-accounts/um-account-dialog.c:228
 msgid "Failed to add account"
 msgstr "無法加入到帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:315
-msgid "This will be used to name your home folder and can't be changed."
-msgstr "這會成為你家目錄資料夾的名稱,並且不能被改變。"
-
-#: ../panels/user-accounts/um-account-dialog.c:448
+#: ../panels/user-accounts/um-account-dialog.c:452
 msgid "Passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-account-dialog.c:718
-#: ../panels/user-accounts/um-account-dialog.c:764
+#: ../panels/user-accounts/um-account-dialog.c:731
+#: ../panels/user-accounts/um-account-dialog.c:777
 msgid "Failed to register account"
 msgstr "無法註冊帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:902
+#: ../panels/user-accounts/um-account-dialog.c:915
 msgid "No supported way to authenticate with this domain"
 msgstr "沒有支援這個網域核對的方式"
 
-#: ../panels/user-accounts/um-account-dialog.c:961
+#: ../panels/user-accounts/um-account-dialog.c:974
 msgid "Failed to join domain"
 msgstr "無法加入網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1022
+#: ../panels/user-accounts/um-account-dialog.c:1035
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6166,7 +6221,7 @@ msgstr ""
 "登入名稱沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1029
+#: ../panels/user-accounts/um-account-dialog.c:1042
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6174,23 +6229,14 @@ msgstr ""
 "登入密碼沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1037
+#: ../panels/user-accounts/um-account-dialog.c:1050
 msgid "Failed to log into domain"
 msgstr "無法登入到網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1095
+#: ../panels/user-accounts/um-account-dialog.c:1108
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "找不到網域。也許你拼錯字了?"
 
-#: ../panels/user-accounts/um-account-dialog.c:1445
-msgid "Add User"
-msgstr "加入使用者"
-
-#. Create enterprise toggle button.
-#: ../panels/user-accounts/um-account-dialog.c:1458
-msgid "_Enterprise Login"
-msgstr "企業登入(_E)"
-
 #: ../panels/user-accounts/um-fingerprint-dialog.c:137
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -6272,11 +6318,11 @@ msgstr "選擇手指"
 msgid "Enrolling fingerprints"
 msgstr "登記指紋"
 
-#: ../panels/user-accounts/um-history-dialog.c:87
+#: ../panels/user-accounts/um-history-dialog.c:68
 msgid "This Week"
 msgstr "本週"
 
-#: ../panels/user-accounts/um-history-dialog.c:90
+#: ../panels/user-accounts/um-history-dialog.c:71
 msgid "Last Week"
 msgstr "上週"
 
@@ -6284,22 +6330,22 @@ msgstr "上週"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:96
-#: ../panels/user-accounts/um-history-dialog.c:100
+#: ../panels/user-accounts/um-history-dialog.c:77
+#: ../panels/user-accounts/um-history-dialog.c:81
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%b%e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:105
+#: ../panels/user-accounts/um-history-dialog.c:86
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%Y年%b%e日"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:110
+#: ../panels/user-accounts/um-history-dialog.c:91
 #, c-format
 msgctxt "login history week label"
 msgid "%s - %s"
@@ -6307,26 +6353,26 @@ msgstr "%s - %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:194
-#: ../panels/user-accounts/um-user-panel.c:625
+#: ../panels/user-accounts/um-history-dialog.c:175
+#: ../panels/user-accounts/um-user-panel.c:631
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:197
-#: ../panels/user-accounts/um-user-panel.c:629
+#: ../panels/user-accounts/um-history-dialog.c:178
+#: ../panels/user-accounts/um-user-panel.c:635
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s,%s"
 
-#: ../panels/user-accounts/um-history-dialog.c:266
+#: ../panels/user-accounts/um-history-dialog.c:247
 msgid "Session Ended"
 msgstr "作業階段結束"
 
-#: ../panels/user-accounts/um-history-dialog.c:272
+#: ../panels/user-accounts/um-history-dialog.c:253
 msgid "Session Started"
 msgstr "作業階段開始"
 
@@ -6346,23 +6392,23 @@ msgstr "密碼無法更改"
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:217
+#: ../panels/user-accounts/um-photo-dialog.c:219
 msgid "Browse for more pictures"
 msgstr "瀏覽更多照片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:442
+#: ../panels/user-accounts/um-photo-dialog.c:453
 msgid "Disable image"
 msgstr "停用圖片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:460
+#: ../panels/user-accounts/um-photo-dialog.c:471
 msgid "Take a photo…"
 msgstr "照相…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:478
+#: ../panels/user-accounts/um-photo-dialog.c:489
 msgid "Browse for more pictures…"
 msgstr "瀏覽更多照片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:702
+#: ../panels/user-accounts/um-photo-dialog.c:713
 #, c-format
 msgid "Used by %s"
 msgstr "由 %s 使用"
@@ -6391,76 +6437,76 @@ msgstr "密碼錯誤,請再試一次"
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "無法連接到 %s 網域:%s"
 
-#: ../panels/user-accounts/um-user-panel.c:192
+#: ../panels/user-accounts/um-user-panel.c:198
 msgid "Other Accounts"
 msgstr "其他帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:411
+#: ../panels/user-accounts/um-user-panel.c:417
 msgid "Failed to delete user"
 msgstr "刪除使用者失敗"
 
-#: ../panels/user-accounts/um-user-panel.c:476
+#: ../panels/user-accounts/um-user-panel.c:482
 msgid "You cannot delete your own account."
 msgstr "你不能刪除自己的帳號。"
 
-#: ../panels/user-accounts/um-user-panel.c:485
+#: ../panels/user-accounts/um-user-panel.c:491
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 仍在登入中"
 
-#: ../panels/user-accounts/um-user-panel.c:489
+#: ../panels/user-accounts/um-user-panel.c:495
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "在使用者登入期間刪除他會使系統處於不穩定的狀態。"
 
-#: ../panels/user-accounts/um-user-panel.c:498
+#: ../panels/user-accounts/um-user-panel.c:504
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "你想要保留 %s 的檔案嗎?"
 
-#: ../panels/user-accounts/um-user-panel.c:502
+#: ../panels/user-accounts/um-user-panel.c:508
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "當刪除使用者時是可以保留家目錄、新進郵件(mail spool)和暫存檔案的。"
 
-#: ../panels/user-accounts/um-user-panel.c:505
+#: ../panels/user-accounts/um-user-panel.c:511
 msgid "_Delete Files"
 msgstr "刪除檔案(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:506
+#: ../panels/user-accounts/um-user-panel.c:512
 msgid "_Keep Files"
 msgstr "保留檔案(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:558
+#: ../panels/user-accounts/um-user-panel.c:564
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳號已停用"
 
-#: ../panels/user-accounts/um-user-panel.c:566
+#: ../panels/user-accounts/um-user-panel.c:572
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "在下次登入時設定"
 
-#: ../panels/user-accounts/um-user-panel.c:569
+#: ../panels/user-accounts/um-user-panel.c:575
 msgctxt "Password mode"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/user-accounts/um-user-panel.c:618
+#: ../panels/user-accounts/um-user-panel.c:624
 msgid "Logged in"
 msgstr "已登入"
 
-#: ../panels/user-accounts/um-user-panel.c:998
+#: ../panels/user-accounts/um-user-panel.c:1072
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: ../panels/user-accounts/um-user-panel.c:1000
+#: ../panels/user-accounts/um-user-panel.c:1074
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1041
+#: ../panels/user-accounts/um-user-panel.c:1115
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6468,12 +6514,12 @@ msgstr ""
 "要進行更改,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1079
+#: ../panels/user-accounts/um-user-panel.c:1153
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1090
-#: ../panels/user-accounts/um-user-panel.c:1379
+#: ../panels/user-accounts/um-user-panel.c:1164
+#: ../panels/user-accounts/um-user-panel.c:1453
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6481,12 +6527,12 @@ msgstr ""
 "要建立使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1100
+#: ../panels/user-accounts/um-user-panel.c:1174
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1112
-#: ../panels/user-accounts/um-user-panel.c:1384
+#: ../panels/user-accounts/um-user-panel.c:1186
+#: ../panels/user-accounts/um-user-panel.c:1458
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6494,29 +6540,33 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1294
+#: ../panels/user-accounts/um-user-panel.c:1368
 msgid "My Account"
 msgstr "我的帳號"
 
 #: ../panels/user-accounts/um-utils.c:567
 #, c-format
-msgid "A user with the username '%s' already exists"
-msgstr "以使用者名稱「%s」為名的使用者已經存在"
+msgid "A user with the username '%s' already exists."
+msgstr "以「%s」為名的使用者已經存在。"
 
 #: ../panels/user-accounts/um-utils.c:571
 #, c-format
-msgid "The username is too long"
-msgstr "使用者名稱太長了"
+msgid "The username is too long."
+msgstr "使用者名稱太長。"
 
 #: ../panels/user-accounts/um-utils.c:574
-msgid "The username cannot start with a '-'"
-msgstr "使用者名稱不能以 '-' 字母開頭"
+msgid "The username cannot start with a '-'."
+msgstr "使用者名稱不能以「-」字符開頭。"
 
 #: ../panels/user-accounts/um-utils.c:577
 msgid ""
 "The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'"
-msgstr "使用者名稱必須由從 a-z 的大小寫字母、數字、 '.'、 '-' 和 '_' 字符組成"
+"digits and any of characters '.', '-' and '_'."
+msgstr "使用者名稱只能由大小寫字母英文字母 a 到 z、數字,與其他字符如「.」、「-」和「_」構成。"
+
+#: ../panels/user-accounts/um-utils.c:581
+msgid "This will be used to name your home folder and can't be changed."
+msgstr "這會成為你家目錄資料夾的名稱,並且不能被改變。"
 
 #. Translators: This is a date format string in the style of "Feb 24".
 #: ../panels/user-accounts/um-utils.c:827
@@ -6887,29 +6937,43 @@ msgid "All Settings"
 msgstr "所有設定值"
 
 #. Add categories
-#: ../shell/cc-window.c:872
+#: ../shell/cc-window.c:876
 msgctxt "category"
 msgid "Personal"
 msgstr "個人"
 
-#: ../shell/cc-window.c:873
+#: ../shell/cc-window.c:877
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../shell/cc-window.c:874
+#: ../shell/cc-window.c:878
 msgctxt "category"
 msgid "System"
 msgstr "系統"
 
-#: ../shell/cc-window.c:1601 ../shell/gnome-control-center.desktop.in.in.h:1
-msgid "Settings"
-msgstr "設定值"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
 
+#~ msgid "Share Media On This Network"
+#~ msgstr "在這個網路分享媒體"
+
+#~ msgid "Shared Folders"
+#~ msgstr "分享資料夾"
+
+#~ msgid "column"
+#~ msgstr "欄"
+
+#~ msgid "Remove Folder"
+#~ msgstr "移除資料夾"
+
+#~ msgid "Share Public Folder On This Network"
+#~ msgstr "在這個網路分享公開資料夾"
+
+#~ msgid "Immediately"
+#~ msgstr "立即"
+
 #~ msgid "Flickr"
 #~ msgstr "Flickr"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1f7cc16..c8efe5e 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: 2014-06-22 06:29+0000\n"
-"PO-Revision-Date: 2014-06-22 16:36+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2014-08-16 11:45+0000\n"
+"PO-Revision-Date: 2014-08-16 20: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.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
 
 #: ../panels/background/background.ui.h:1
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
@@ -71,88 +71,90 @@ msgid "Span"
 msgstr "合併"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:286
+#: ../panels/background/cc-background-chooser-dialog.c:442
 msgid "Select Background"
 msgstr "選擇背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:307
+#: ../panels/background/cc-background-chooser-dialog.c:463
 msgid "Wallpapers"
 msgstr "桌布"
 
-#: ../panels/background/cc-background-chooser-dialog.c:316
+#: ../panels/background/cc-background-chooser-dialog.c:472
 msgid "Pictures"
 msgstr "圖片"
 
-#: ../panels/background/cc-background-chooser-dialog.c:324
+#: ../panels/background/cc-background-chooser-dialog.c:481
 msgid "Colors"
 msgstr "顏色"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:372
+#: ../panels/background/cc-background-chooser-dialog.c:540
 msgid "No Pictures Found"
 msgstr "找不到圖片"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:390
+#: ../panels/background/cc-background-chooser-dialog.c:558
 #: ../panels/search/cc-search-locations-dialog.c:274
 msgid "Home"
 msgstr "家"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:402
+#: ../panels/background/cc-background-chooser-dialog.c:570
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "您可以將影像加入您的%s資料夾,它們會顯示在這裡"
 
-#: ../panels/background/cc-background-chooser-dialog.c:430
-#: ../panels/color/cc-color-panel.c:223 ../panels/color/cc-color-panel.c:960
-#: ../panels/display/cc-display-panel.c:1536
-#: ../panels/display/cc-display-panel.c:1994
+#: ../panels/background/cc-background-chooser-dialog.c:592
+#: ../panels/color/cc-color-panel.c:224 ../panels/color/cc-color-panel.c:961
+#: ../panels/common/language-chooser.ui.h:3
+#: ../panels/display/cc-display-panel.c:1537
+#: ../panels/display/cc-display-panel.c:1976
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1197
-#: ../panels/network/net-device-wifi.c:1405
+#: ../panels/network/net-device-wifi.c:1240
+#: ../panels/network/net-device-wifi.c:1448
 #: ../panels/printers/cc-printers-panel.c:1947
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:465
+#: ../panels/privacy/cc-privacy-panel.c:466
+#: ../panels/region/format-chooser.ui.h:3
 #: ../panels/region/input-chooser.ui.h:2
 #: ../panels/search/cc-search-locations-dialog.c:681
-#: ../panels/sharing/cc-sharing-panel.c:445
-#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: ../panels/sharing/cc-sharing-panel.c:491
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
 #: ../panels/user-accounts/um-fingerprint-dialog.c:267
 #: ../panels/user-accounts/um-photo-dialog.c:95
-#: ../panels/user-accounts/um-photo-dialog.c:220
-#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-photo-dialog.c:222
+#: ../panels/user-accounts/um-user-panel.c:513
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:431
+#: ../panels/background/cc-background-chooser-dialog.c:593
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
 #: ../panels/user-accounts/um-photo-dialog.c:97
 msgid "Select"
 msgstr "選取"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:197
 msgid "multiple sizes"
 msgstr "多重尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:152
+#: ../panels/background/cc-background-item.c:201
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:280
+#: ../panels/background/cc-background-item.c:327
 msgid "No Desktop Background"
 msgstr "無桌面背景"
 
-#: ../panels/background/cc-background-panel.c:492
+#: ../panels/background/cc-background-panel.c:493
 msgid "Current background"
 msgstr "目前的背景"
 
@@ -179,7 +181,7 @@ 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:1726
+#: ../panels/printers/pp-new-printer-dialog.c:1688
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -320,48 +322,48 @@ msgstr "尚未校準"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:139
+#: ../panels/color/cc-color-panel.c:140
 msgid "Default: "
 msgstr "預設值:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:147
+#: ../panels/color/cc-color-panel.c:148
 msgid "Colorspace: "
 msgstr "色彩空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:154
+#: ../panels/color/cc-color-panel.c:155
 msgid "Test profile: "
 msgstr "測試描述檔:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:221
+#: ../panels/color/cc-color-panel.c:222
 msgid "Select ICC Profile File"
 msgstr "選擇 ICC 色彩描述檔"
 
-#: ../panels/color/cc-color-panel.c:224
+#: ../panels/color/cc-color-panel.c:225
 msgid "_Import"
 msgstr "匯入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:235
+#: ../panels/color/cc-color-panel.c:236
 msgid "Supported ICC profiles"
 msgstr "支援的 ICC 色彩描述檔"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:242
-#: ../panels/network/wireless-security/eap-method-fast.c:410
+#: ../panels/color/cc-color-panel.c:243
+#: ../panels/network/wireless-security/eap-method-fast.c:420
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../panels/color/cc-color-panel.c:581
+#: ../panels/color/cc-color-panel.c:582
 msgid "Screen"
 msgstr "螢幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:905
+#: ../panels/color/cc-color-panel.c:906
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上傳檔案失敗:%s"
@@ -369,51 +371,51 @@ msgstr "上傳檔案失敗:%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:919
+#: ../panels/color/cc-color-panel.c:920
 msgid "The profile has been uploaded to:"
 msgstr "描述檔已經上傳到:"
 
-#: ../panels/color/cc-color-panel.c:921
+#: ../panels/color/cc-color-panel.c:922
 msgid "Write down this URL."
 msgstr "寫下這個 URL。"
 
-#: ../panels/color/cc-color-panel.c:922
+#: ../panels/color/cc-color-panel.c:923
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重新啟動這臺電腦並開機進入您一般的作業系統。"
 
-#: ../panels/color/cc-color-panel.c:923
+#: ../panels/color/cc-color-panel.c:924
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "在您的瀏覽器中輸入 URL 以下載並安裝描述檔。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:957
+#: ../panels/color/cc-color-panel.c:958
 msgid "Save Profile"
 msgstr "儲存描述檔"
 
-#: ../panels/color/cc-color-panel.c:961
+#: ../panels/color/cc-color-panel.c:962
 #: ../panels/network/connection-editor/vpn-helpers.c:375
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1321
+#: ../panels/color/cc-color-panel.c:1322
 msgid "Create a color profile for the selected device"
 msgstr "為已選取裝置建立色彩描述檔"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1336 ../panels/color/cc-color-panel.c:1360
+#: ../panels/color/cc-color-panel.c:1337 ../panels/color/cc-color-panel.c:1361
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr "尚未偵測到測量儀器。請檢查它是否已開啟並正確的連接。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1370
+#: ../panels/color/cc-color-panel.c:1371
 msgid "The measuring instrument does not support printer profiling."
 msgstr "測量儀器不支援印表機的分析。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1381
+#: ../panels/color/cc-color-panel.c:1382
 msgid "The device type is not currently supported."
 msgstr "目刖不支援這個裝置類型。"
 
@@ -500,7 +502,7 @@ msgstr "顯示校準"
 #: ../panels/color/color-calibrate.ui.h:2
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1462
+#: ../panels/user-accounts/um-account-dialog.c:1468
 msgid "Cancel"
 msgstr "取消"
 
@@ -834,13 +836,13 @@ msgstr "中國"
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:122
-#: ../panels/region/cc-format-chooser.c:266
+#: ../panels/common/cc-language-chooser.c:123
+#: ../panels/region/cc-format-chooser.c:267
 #: ../panels/region/cc-input-chooser.c:165
 msgid "More…"
 msgstr "更多…"
 
-#: ../panels/common/cc-language-chooser.c:139
+#: ../panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "找不到語言"
 
@@ -848,32 +850,60 @@ msgstr "找不到語言"
 msgid "Language"
 msgstr "語言"
 
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "完成(_D)"
+
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:339
+#: ../panels/datetime/cc-datetime-panel.c:340
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%b%e日, %p %l:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:344
+#: ../panels/datetime/cc-datetime-panel.c:345
 msgid "%e %B %Y, %R"
 msgstr "%Y年%b%e日,%R"
 
+#. Translators: "city, country"
+#: ../panels/datetime/cc-datetime-panel.c:523
+#, c-format
+msgctxt "timezone loc"
+msgid "%s, %s"
+msgstr "%s,%s"
+
+#. Update the timezone on the listbow row
+#. Translators: "timezone (details)"
+#: ../panels/datetime/cc-datetime-panel.c:553
+#, c-format
+msgctxt "timezone desc"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:557
+#: ../panels/datetime/cc-datetime-panel.c:561
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:562
+#: ../panels/datetime/cc-datetime-panel.c:566
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:567
+#: ../panels/datetime/cc-datetime-panel.c:571
 msgid "%R"
 msgstr "%R"
 
+#. Update the text bubble in the timezone map
+#. Translators: "timezone (utc shift)"
+#: ../panels/datetime/cc-datetime-panel.c:576
+#, c-format
+msgctxt "timezone map"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: ../panels/datetime/datetime.ui.h:1
 msgid "January"
 msgstr "一月"
@@ -1009,106 +1039,106 @@ msgstr "改變系統時刻與日期設定值"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "要改變時刻或日期設定值,您需要通過核對。"
 
-#: ../panels/display/cc-display-panel.c:486
+#: ../panels/display/cc-display-panel.c:487
 msgid "Lid Closed"
 msgstr "上蓋已經關閉"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:489
+#: ../panels/display/cc-display-panel.c:490
 msgid "Mirrored"
 msgstr "鏡射顯示器"
 
-#: ../panels/display/cc-display-panel.c:491
-#: ../panels/display/cc-display-panel.c:2163
+#: ../panels/display/cc-display-panel.c:492
+#: ../panels/display/cc-display-panel.c:2145
 msgid "Primary"
 msgstr "主要"
 
-#: ../panels/display/cc-display-panel.c:493
-#: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1702 ../panels/power/cc-power-panel.c:1713
-#: ../panels/privacy/cc-privacy-panel.c:81
-#: ../panels/privacy/cc-privacy-panel.c:121
-#: ../panels/universal-access/cc-ua-panel.c:256
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:713
+#: ../panels/display/cc-display-panel.c:494
+#: ../panels/notifications/cc-notifications-panel.c:185
+#: ../panels/power/cc-power-panel.c:1684 ../panels/power/cc-power-panel.c:1695
+#: ../panels/privacy/cc-privacy-panel.c:82
+#: ../panels/privacy/cc-privacy-panel.c:122
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:572
+#: ../panels/universal-access/cc-ua-panel.c:695
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:496
+#: ../panels/display/cc-display-panel.c:497
 msgid "Secondary"
 msgstr "次要"
 
-#: ../panels/display/cc-display-panel.c:1532
+#: ../panels/display/cc-display-panel.c:1533
 msgid "Arrange Combined Displays"
 msgstr "排列顯示器的組合方式"
 
-#: ../panels/display/cc-display-panel.c:1538
-#: ../panels/display/cc-display-panel.c:1997
+#: ../panels/display/cc-display-panel.c:1539
+#: ../panels/display/cc-display-panel.c:1979
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "套用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1559
+#: ../panels/display/cc-display-panel.c:1560
 msgid "Drag displays to rearrange them"
 msgstr "拖拉顯示器以重新排列他們"
 
-#: ../panels/display/cc-display-panel.c:2099
+#: ../panels/display/cc-display-panel.c:2081
 msgid "Size"
 msgstr "尺寸"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2112
+#: ../panels/display/cc-display-panel.c:2094
 msgid "Aspect Ratio"
 msgstr "長寬比"
 
-#: ../panels/display/cc-display-panel.c:2133
+#: ../panels/display/cc-display-panel.c:2115
 #: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "解析度"
 
-#: ../panels/display/cc-display-panel.c:2164
+#: ../panels/display/cc-display-panel.c:2146
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "在這個顯示器顯示頂端列與活動概覽"
 
-#: ../panels/display/cc-display-panel.c:2170
+#: ../panels/display/cc-display-panel.c:2152
 msgid "Secondary Display"
 msgstr "次要顯示器"
 
-#: ../panels/display/cc-display-panel.c:2171
+#: ../panels/display/cc-display-panel.c:2153
 msgid "Join this display with another to create an extra workspace"
 msgstr "將這個顯示器與另一個顯示器結合以建立額外的工作區"
 
-#: ../panels/display/cc-display-panel.c:2178
+#: ../panels/display/cc-display-panel.c:2160
 msgid "Presentation"
 msgstr "展示"
 
-#: ../panels/display/cc-display-panel.c:2179
+#: ../panels/display/cc-display-panel.c:2161
 msgid "Show slideshows and media only"
 msgstr "只顯示投影片與媒體"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2184
+#: ../panels/display/cc-display-panel.c:2166
 msgid "Mirror"
 msgstr "鏡射"
 
-#: ../panels/display/cc-display-panel.c:2185
+#: ../panels/display/cc-display-panel.c:2167
 msgid "Show your existing view on both displays"
 msgstr "在兩個顯示器顯示您現有的檢視"
 
-#: ../panels/display/cc-display-panel.c:2191
+#: ../panels/display/cc-display-panel.c:2173
 msgid "Turn Off"
 msgstr "關閉"
 
-#: ../panels/display/cc-display-panel.c:2192
+#: ../panels/display/cc-display-panel.c:2174
 msgid "Don't use this display"
 msgstr "不使用這個顯示器"
 
-#: ../panels/display/cc-display-panel.c:2401
+#: ../panels/display/cc-display-panel.c:2383
 msgid "Could not get screen information"
 msgstr "無法取得螢幕資訊"
 
-#: ../panels/display/cc-display-panel.c:2432
+#: ../panels/display/cc-display-panel.c:2414
 msgid "_Arrange Combined Displays"
 msgstr "排列組合的顯示器(_A)"
 
@@ -1122,7 +1152,6 @@ msgstr "選擇如何使用連接的顯示器和投影機"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
-#| msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
 msgstr ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影機;螢幕;解"
@@ -1237,7 +1266,7 @@ msgid "Windows software"
 msgstr "Windows 軟體"
 
 #: ../panels/info/cc-info-panel.c:1434
-#: ../panels/keyboard/keyboard-shortcuts.c:1705
+#: ../panels/keyboard/keyboard-shortcuts.c:1704
 msgid "Section"
 msgstr "節"
 
@@ -1557,8 +1586,8 @@ msgstr "高對比開或關"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:274
-#: ../panels/keyboard/cc-keyboard-option.c:393
+#: ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:395
 #: ../panels/keyboard/keyboard-shortcuts.c:1168
 #: ../panels/network/network-wifi.ui.h:29
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
@@ -1571,7 +1600,7 @@ msgstr "已停用"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:352
+#: ../panels/keyboard/cc-keyboard-option.c:354
 msgid "Alternative Characters Key"
 msgstr "替代的字元鍵"
 
@@ -1579,11 +1608,11 @@ msgstr "替代的字元鍵"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:361
+#: ../panels/keyboard/cc-keyboard-option.c:363
 msgid "Compose Key"
 msgstr "組合鍵"
 
-#: ../panels/keyboard/cc-keyboard-option.c:366
+#: ../panels/keyboard/cc-keyboard-option.c:368
 msgid "Modifiers-only switch to next source"
 msgstr "只以修飾鍵切換至下個來源"
 
@@ -1605,10 +1634,10 @@ msgid "Custom Shortcut"
 msgstr "自訂捷徑鍵"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:511
+#: ../panels/network/connection-editor/net-connection-editor.c:512
 #: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1463
+#: ../panels/user-accounts/um-account-dialog.c:1469
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -1947,34 +1976,34 @@ msgstr "自動"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:216
-#: ../panels/network/net-device-wifi.c:377
+#: ../panels/network/net-device-wifi.c:217
+#: ../panels/network/net-device-wifi.c:378
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:220
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/net-device-wifi.c:221
+#: ../panels/network/net-device-wifi.c:383
 #: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:225
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:229
+#: ../panels/network/net-device-wifi.c:230
 msgid "Enterprise"
 msgstr "企業版"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:234
-#: ../panels/network/net-device-wifi.c:367
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:368
 msgctxt "Wifi security"
 msgid "None"
 msgstr "沒有"
@@ -1995,8 +2024,8 @@ msgid "Yesterday"
 msgstr "昨日"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:125
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:472
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2004,128 +2033,128 @@ msgstr[0] "%i 天以前"
 
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:528
+#: ../panels/network/net-device-ethernet.c:54
+#: ../panels/network/net-device-wifi.c:529
 #, 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:557
+#: ../panels/network/net-device-wifi.c:558
 msgctxt "Signal strength"
 msgid "None"
 msgstr "沒有"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:559
+#: ../panels/network/net-device-wifi.c:560
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "太弱"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:561
+#: ../panels/network/net-device-wifi.c:562
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "確定"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/net-device-wifi.c:564
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "很好"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:213
+#: ../panels/network/connection-editor/ce-page-ethernet.c:226
 #: ../panels/network/connection-editor/ce-page-vpn.c:204
-#: ../panels/network/connection-editor/ce-page-wifi.c:255
+#: ../panels/network/connection-editor/ce-page-wifi.c:270
 #: ../panels/network/network-wifi.ui.h:45
 msgid "Identity"
 msgstr "身分"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:194
-#: ../panels/network/connection-editor/ce-page-ip4.c:456
-#: ../panels/network/connection-editor/ce-page-ip6.c:196
-#: ../panels/network/connection-editor/ce-page-ip6.c:460
+#: ../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
 msgid "Address"
 msgstr "地址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:207
-#: ../panels/network/connection-editor/ce-page-ip4.c:469
+#: ../panels/network/connection-editor/ce-page-ip4.c:190
+#: ../panels/network/connection-editor/ce-page-ip4.c:452
 msgid "Netmask"
 msgstr "網路遮罩"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip4.c:482
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
-#: ../panels/network/connection-editor/ce-page-ip6.c:490
+#: ../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/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:238
-#: ../panels/network/connection-editor/ce-page-ip6.c:239
+#: ../panels/network/connection-editor/ce-page-ip4.c:221
+#: ../panels/network/connection-editor/ce-page-ip6.c:222
 msgid "Delete Address"
 msgstr "刪除位址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:292
-#: ../panels/network/connection-editor/ce-page-ip6.c:293
+#: ../panels/network/connection-editor/ce-page-ip4.c:275
+#: ../panels/network/connection-editor/ce-page-ip6.c:276
 msgid "Add"
 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:343
+#: ../panels/network/connection-editor/ce-page-ip6.c:347
 msgid "Server"
 msgstr "伺服器"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:377
-#: ../panels/network/connection-editor/ce-page-ip6.c:381
+#: ../panels/network/connection-editor/ce-page-ip4.c:360
+#: ../panels/network/connection-editor/ce-page-ip6.c:364
 msgid "Delete DNS Server"
 msgstr "刪除 DNS 伺服器"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:496
-#: ../panels/network/connection-editor/ce-page-ip6.c:504
+#: ../panels/network/connection-editor/ce-page-ip4.c:479
+#: ../panels/network/connection-editor/ce-page-ip6.c:487
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:517
-#: ../panels/network/connection-editor/ce-page-ip6.c:525
+#: ../panels/network/connection-editor/ce-page-ip4.c:500
+#: ../panels/network/connection-editor/ce-page-ip6.c:508
 msgid "Delete Route"
 msgstr "刪除路由"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:632
+#: ../panels/network/connection-editor/ce-page-ip4.c:615
 #: ../panels/network/network-wifi.ui.h:25
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:636
-#: ../panels/network/connection-editor/ce-page-ip6.c:638
+#: ../panels/network/connection-editor/ce-page-ip4.c:619
+#: ../panels/network/connection-editor/ce-page-ip6.c:621
 #: ../panels/network/network-wifi.ui.h:24
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:640
-#: ../panels/network/connection-editor/ce-page-ip6.c:642
+#: ../panels/network/connection-editor/ce-page-ip4.c:623
+#: ../panels/network/connection-editor/ce-page-ip6.c:625
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:934
+#: ../panels/network/connection-editor/ce-page-ip4.c:953
 #: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:209
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip6.c:192
+#: ../panels/network/connection-editor/ce-page-ip6.c:456
 msgid "Prefix"
 msgstr "前綴"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:613
 #: ../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
@@ -2133,11 +2162,11 @@ msgstr "前綴"
 msgid "Automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:634
+#: ../panels/network/connection-editor/ce-page-ip6.c:617
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:894
+#: ../panels/network/connection-editor/ce-page-ip6.c:919
 #: ../panels/network/network-wifi.ui.h:47
 msgid "IPv6"
 msgstr "IPv6"
@@ -2188,15 +2217,15 @@ msgid "Link speed"
 msgstr "連線速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:159
 #: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:159
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:164
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
@@ -2204,14 +2233,14 @@ msgid "IPv6 Address"
 msgstr "IPv6 位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:166
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:7
 msgid "Hardware Address"
 msgstr "硬體位址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:170
+#: ../panels/network/net-device-ethernet.c:171
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2221,7 +2250,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:172
+#: ../panels/network/net-device-ethernet.c:173
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2352,44 +2381,44 @@ msgstr "只在使用這個連線的網路資源時才使用此連線(_U)"
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:268
+#: ../panels/network/connection-editor/net-connection-editor.c:269
 msgid "Unable to open connection editor"
 msgstr "無法開啟連線編輯器"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:286
+#: ../panels/network/connection-editor/net-connection-editor.c:287
 msgid "New Profile"
 msgstr "新增設定組合"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:595
+#: ../panels/network/connection-editor/net-connection-editor.c:577
 #: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:596
+#: ../panels/network/connection-editor/net-connection-editor.c:578
 msgid "Bond"
 msgstr "繫結"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:598
+#: ../panels/network/connection-editor/net-connection-editor.c:580
 msgid "Team"
 msgstr "團隊"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:600
+#: ../panels/network/connection-editor/net-connection-editor.c:582
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:601
+#: ../panels/network/connection-editor/net-connection-editor.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:752
+#: ../panels/network/connection-editor/net-connection-editor.c:734
 msgid "Could not load VPN plugins"
 msgstr "無法載入 VPN 外掛程式"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:821
+#: ../panels/network/connection-editor/net-connection-editor.c:803
 msgid "Import from file…"
 msgstr "從檔案匯入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:892
+#: ../panels/network/connection-editor/net-connection-editor.c:874
 msgid "Add Network Connection"
 msgstr "加入網路連線"
 
@@ -2399,7 +2428,7 @@ msgid "_Reset"
 msgstr "重設(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1406
+#: ../panels/network/net-device-wifi.c:1449
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -2443,8 +2472,8 @@ msgstr "選擇要匯入的檔案"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
 #: ../panels/printers/cc-printers-panel.c:1948
-#: ../panels/sharing/cc-sharing-panel.c:446
-#: ../panels/user-accounts/um-photo-dialog.c:221
+#: ../panels/sharing/cc-sharing-panel.c:492
+#: ../panels/user-accounts/um-photo-dialog.c:223
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -2478,8 +2507,8 @@ msgstr ""
 "錯誤:%s。"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:371
-msgid "Export VPN connection..."
-msgstr "匯出 VPN 連線…"
+msgid "Export VPN connection"
+msgstr "匯出 VPN 連線"
 
 #: ../panels/network/connection-editor/vpn-page.ui.h:4
 msgid "(Error: unable to load VPN connection editor)"
@@ -2517,11 +2546,11 @@ msgstr "控制您如何連線至網際網絡"
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;"
+"vlan;bridge;bond;DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;網路;無線網路;區域網路;代理伺服器;寬頻;數據機;藍牙;橋接;繫"
-"結;"
+"vlan;bridge;bond;DNS;網路;無線網路;區域網路;代理伺服器;寬頻;數據機;藍牙;橋接;"
+"繫結;"
 
 #: ../panels/network/net-device-bond.c:77
 msgid "Bond slaves"
@@ -2537,29 +2566,29 @@ msgstr "(沒有)"
 msgid "Bridge slaves"
 msgstr "橋接的連線"
 
-#: ../panels/network/net-device-ethernet.c:111
-#: ../panels/network/net-device-wifi.c:457
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:458
 msgid "never"
 msgstr "永不"
 
-#: ../panels/network/net-device-ethernet.c:121
-#: ../panels/network/net-device-wifi.c:467
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:468
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:123
-#: ../panels/network/net-device-wifi.c:469
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:470
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:161
+#: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:3
 #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../panels/network/net-device-ethernet.c:177
+#: ../panels/network/net-device-ethernet.c:178
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "最後使用的"
@@ -2569,14 +2598,14 @@ msgstr "最後使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:287
+#: ../panels/network/net-device-ethernet.c:288
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:355
-#: ../panels/network/net-device-wifi.c:1561
+#: ../panels/network/net-device-ethernet.c:356
+#: ../panels/network/net-device-wifi.c:1604
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2584,7 +2613,7 @@ msgstr "有線"
 msgid "Options…"
 msgstr "選項…"
 
-#: ../panels/network/net-device-ethernet.c:492
+#: ../panels/network/net-device-ethernet.c:474
 #, c-format
 msgid "Profile %d"
 msgstr "設定組合 %d"
@@ -2597,7 +2626,7 @@ msgstr "加入新連線"
 msgid "Team slaves"
 msgstr "團隊從屬"
 
-#: ../panels/network/net-device-wifi.c:1110
+#: ../panels/network/net-device-wifi.c:1153
 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."
@@ -2605,51 +2634,51 @@ msgstr ""
 "如果您有無線網路以外的方式連線到網際網路,您可以使用它來與其他人分享您的網際"
 "網路連線。"
 
-#: ../panels/network/net-device-wifi.c:1114
+#: ../panels/network/net-device-wifi.c:1157
 #, 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:1118
+#: ../panels/network/net-device-wifi.c:1161
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。"
 
-#: ../panels/network/net-device-wifi.c:1195
+#: ../panels/network/net-device-wifi.c:1238
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止熱點並中斷任何使用者的連線?"
 
-#: ../panels/network/net-device-wifi.c:1198
+#: ../panels/network/net-device-wifi.c:1241
 msgid "_Stop Hotspot"
 msgstr "停止熱點(_S)"
 
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1313
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系統原則禁止做為熱點"
 
-#: ../panels/network/net-device-wifi.c:1273
+#: ../panels/network/net-device-wifi.c:1316
 msgid "Wireless device does not support Hotspot mode"
 msgstr "無線裝置不支援熱點模式"
 
-#: ../panels/network/net-device-wifi.c:1402
+#: ../panels/network/net-device-wifi.c:1445
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "選取網路的詳細資料包含密碼及任何自訂的組態都會消失。"
 
-#: ../panels/network/net-device-wifi.c:1729
+#: ../panels/network/net-device-wifi.c:1753
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "歷史紀錄"
 
-#: ../panels/network/net-device-wifi.c:1733
+#: ../panels/network/net-device-wifi.c:1757
 #: ../panels/wacom/cc-wacom-page.c:533
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1741
+#: ../panels/network/net-device-wifi.c:1765
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "遺忘(_F)"
@@ -3225,22 +3254,22 @@ msgstr "DER, PEM, 或 PKCS#12 私密金鑰(*.der, *.pem, *.p12)"
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:261
+#: ../panels/network/wireless-security/eap-method-fast.c:271
 #: ../panels/network/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:277
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "選擇一個 PAC 檔案…"
+#: ../panels/network/wireless-security/eap-method-fast.c:409
+msgid "Choose a PAC file"
+msgstr "選擇一個 PAC 檔案"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: ../panels/network/wireless-security/eap-method-fast.c:416
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
@@ -3300,10 +3329,10 @@ msgid "MD5"
 msgstr "MD5"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:434
+#: ../panels/network/wireless-security/eap-method-tls.c:456
 #: ../panels/network/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "選擇憑證授權單位(CA)憑證…"
+msgid "Choose a Certificate Authority certificate"
+msgstr "選擇憑證授權單位 (CA) 憑證"
 
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3327,11 +3356,11 @@ msgstr "PEAP 版本(_V)"
 msgid "As_k for this password every time"
 msgstr "每次都詢問密碼(_K)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:260
+#: ../panels/network/wireless-security/eap-method-tls.c:282
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私密金鑰是不安全的"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:263
+#: ../panels/network/wireless-security/eap-method-tls.c:285
 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 "
@@ -3344,13 +3373,13 @@ msgstr ""
 "\n"
 "(您可以使用 openssl 來加密您的私密金鑰)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:428
-msgid "Choose your personal certificate..."
-msgstr "選擇您的個人憑證…"
+#: ../panels/network/wireless-security/eap-method-tls.c:450
+msgid "Choose your personal certificate"
+msgstr "選擇您的個人憑證"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:440
-msgid "Choose your private key..."
-msgstr "選擇您的私密金鑰…"
+#: ../panels/network/wireless-security/eap-method-tls.c:462
+msgid "Choose your private key"
+msgstr "選擇您的私密金鑰"
 
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity"
@@ -3487,13 +3516,13 @@ msgctxt "notifications"
 msgid "Show Details in Lock Screen"
 msgstr "在鎖定畫面中顯示詳細資料"
 
-#: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1708 ../panels/power/cc-power-panel.c:1715
-#: ../panels/privacy/cc-privacy-panel.c:81
-#: ../panels/privacy/cc-privacy-panel.c:121
-#: ../panels/universal-access/cc-ua-panel.c:256
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:713
+#: ../panels/notifications/cc-notifications-panel.c:185
+#: ../panels/power/cc-power-panel.c:1690 ../panels/power/cc-power-panel.c:1697
+#: ../panels/privacy/cc-privacy-panel.c:82
+#: ../panels/privacy/cc-privacy-panel.c:122
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:572
+#: ../panels/universal-access/cc-ua-panel.c:695
 msgid "On"
 msgstr "開啟"
 
@@ -3518,30 +3547,30 @@ msgstr "顯示彈出式橫幅"
 msgid "Show in Lock Screen"
 msgstr "在鎖定畫面中顯示"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:187
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:169
 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:301
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:283
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "加入帳號"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:322
 msgid "Mail"
 msgstr "郵件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
 msgid "Chat"
 msgstr "聊天"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:358
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Resources"
 msgstr "資源"
 
@@ -3619,17 +3648,17 @@ msgstr ""
 "加入一個帳號以允許您的應用程式存取它用於文件、郵件、連絡人、行事曆、聊天等"
 "等。"
 
-#: ../panels/power/cc-power-panel.c:182
+#: ../panels/power/cc-power-panel.c:183
 msgid "Unknown time"
 msgstr "不明的時間"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:189
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分鐘"
 
-#: ../panels/power/cc-power-panel.c:200
+#: ../panels/power/cc-power-panel.c:201
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3637,224 +3666,224 @@ msgstr[0] "%i 小時"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:208
+#: ../panels/power/cc-power-panel.c:209
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:209
+#: ../panels/power/cc-power-panel.c:210
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../panels/power/cc-power-panel.c:210
+#: ../panels/power/cc-power-panel.c:211
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:229
+#: ../panels/power/cc-power-panel.c:230
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s後完全充飽"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:236
+#: ../panels/power/cc-power-panel.c:237
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意:剩下 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:242
 #, c-format
 msgid "%s remaining"
 msgstr "剩下 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:246 ../panels/power/cc-power-panel.c:274
+#: ../panels/power/cc-power-panel.c:247 ../panels/power/cc-power-panel.c:275
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:250 ../panels/power/cc-power-panel.c:278
+#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
 msgid "Empty"
 msgstr "沒電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:265
+#: ../panels/power/cc-power-panel.c:266
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
+#: ../panels/power/cc-power-panel.c:271
 msgid "Discharging"
 msgstr "放電中"
 
-#: ../panels/power/cc-power-panel.c:395
+#: ../panels/power/cc-power-panel.c:396
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主要"
 
-#: ../panels/power/cc-power-panel.c:397
+#: ../panels/power/cc-power-panel.c:398
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "額外"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:469
+#: ../panels/power/cc-power-panel.c:470
 msgid "Wireless mouse"
 msgstr "無線滑鼠"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:472
+#: ../panels/power/cc-power-panel.c:473
 msgid "Wireless keyboard"
 msgstr "無線鍵盤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:475
+#: ../panels/power/cc-power-panel.c:476
 msgid "Uninterruptible power supply"
 msgstr "不斷電系統"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:478
+#: ../panels/power/cc-power-panel.c:479
 msgid "Personal digital assistant"
 msgstr "個人數位助理"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:481
+#: ../panels/power/cc-power-panel.c:482
 msgid "Cellphone"
 msgstr "手機"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:484
+#: ../panels/power/cc-power-panel.c:485
 msgid "Media player"
 msgstr "媒體播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:487
+#: ../panels/power/cc-power-panel.c:488
 msgid "Tablet"
 msgstr "繪圖板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:490
+#: ../panels/power/cc-power-panel.c:491
 msgid "Computer"
 msgstr "電腦"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:716
-#: ../panels/power/cc-power-panel.c:2037
+#: ../panels/power/cc-power-panel.c:494 ../panels/power/cc-power-panel.c:717
+#: ../panels/power/cc-power-panel.c:2019
 msgid "Battery"
 msgstr "電池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:539
+#: ../panels/power/cc-power-panel.c:540
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:551
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:556
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Good"
 msgstr "良好"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:561
+#: ../panels/power/cc-power-panel.c:562
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已完全充飽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:566
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "沒電"
 
-#: ../panels/power/cc-power-panel.c:714
+#: ../panels/power/cc-power-panel.c:715
 msgid "Batteries"
 msgstr "電池"
 
-#: ../panels/power/cc-power-panel.c:1116
+#: ../panels/power/cc-power-panel.c:1117
 msgid "When _idle"
 msgstr "閒置時(_I)"
 
-#: ../panels/power/cc-power-panel.c:1463
+#: ../panels/power/cc-power-panel.c:1445
 msgid "Power Saving"
 msgstr "節省電源"
 
-#: ../panels/power/cc-power-panel.c:1491
+#: ../panels/power/cc-power-panel.c:1473
 msgid "_Screen brightness"
 msgstr "螢幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1497
+#: ../panels/power/cc-power-panel.c:1479
 msgid "_Keyboard brightness"
 msgstr "鍵盤亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1507
+#: ../panels/power/cc-power-panel.c:1489
 msgid "_Dim screen when inactive"
 msgstr "當不活動後降低螢幕亮度(_D)"
 
-#: ../panels/power/cc-power-panel.c:1532
+#: ../panels/power/cc-power-panel.c:1514
 msgid "_Blank screen"
 msgstr "螢幕轉黑(_B)"
 
-#: ../panels/power/cc-power-panel.c:1569
+#: ../panels/power/cc-power-panel.c:1551
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1574
+#: ../panels/power/cc-power-panel.c:1556
 msgid "Turns off wireless devices"
 msgstr "關閉無線裝置"
 
-#: ../panels/power/cc-power-panel.c:1599
+#: ../panels/power/cc-power-panel.c:1581
 msgid "_Mobile broadband"
 msgstr "行動寬頻(_M)"
 
-#: ../panels/power/cc-power-panel.c:1604
+#: ../panels/power/cc-power-panel.c:1586
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "關閉行動寬頻 (3G、4G、WiMax 等) 裝置"
 
-#: ../panels/power/cc-power-panel.c:1653
+#: ../panels/power/cc-power-panel.c:1635
 msgid "_Bluetooth"
 msgstr "藍牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1704
+#: ../panels/power/cc-power-panel.c:1686
 msgid "When on battery power"
 msgstr "使用電池電源時"
 
-#: ../panels/power/cc-power-panel.c:1706
+#: ../panels/power/cc-power-panel.c:1688
 msgid "When plugged in"
 msgstr "當插入電源線時"
 
-#: ../panels/power/cc-power-panel.c:1835
+#: ../panels/power/cc-power-panel.c:1818
 msgid "Suspend & Power Off"
 msgstr "暫停與關閉電源"
 
-#: ../panels/power/cc-power-panel.c:1868
+#: ../panels/power/cc-power-panel.c:1851
 msgid "_Automatic suspend"
 msgstr "自動暫停(_A)"
 
-#: ../panels/power/cc-power-panel.c:1892
+#: ../panels/power/cc-power-panel.c:1875
 msgid "When battery power is _critical"
 msgstr "當電池的電量極低時(_C)"
 
-#: ../panels/power/cc-power-panel.c:1949
+#: ../panels/power/cc-power-panel.c:1930
 msgid "Power Off"
 msgstr "關閉電源"
 
-#: ../panels/power/cc-power-panel.c:2084
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Devices"
 msgstr "裝置"
 
@@ -3959,7 +3988,7 @@ msgid "Authenticate"
 msgstr "核對"
 
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "Password"
 msgstr "密碼"
@@ -4220,6 +4249,16 @@ msgstr "選擇印表機驅動程式"
 msgid "Loading drivers database..."
 msgstr "載入驅動程式資料庫…"
 
+#. Translators: The found device is a JetDirect printer
+#: ../panels/printers/pp-host.c:506
+msgid "JetDirect Printer"
+msgstr "JetDirect 印表機"
+
+#. Translators: The found device is a Line Printer Daemon printer
+#: ../panels/printers/pp-host.c:756
+msgid "LPD Printer"
+msgstr "LPD 印表機"
+
 #. Translators: this is an option of "Two Sided"
 #: ../panels/printers/pp-ipp-option-widget.c:66
 #: ../panels/printers/pp-ppd-option-widget.c:70
@@ -4321,34 +4360,34 @@ msgid "%s Active Jobs"
 msgstr "%s 使用中的工作"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1709
+#: ../panels/printers/pp-new-printer-dialog.c:1671
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1714
+#: ../panels/printers/pp-new-printer-dialog.c:1676
 msgid "Serial Port"
 msgstr "序列埠"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1721
+#: ../panels/printers/pp-new-printer-dialog.c:1683
 msgid "Parallel Port"
 msgstr "串列埠"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1774
+#: ../panels/printers/pp-new-printer-dialog.c:1739
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1779
+#: ../panels/printers/pp-new-printer-dialog.c:1744
 #, c-format
 msgid "Address: %s"
 msgstr "位址:%s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1803
+#: ../panels/printers/pp-new-printer-dialog.c:1768
 msgid "Server requires authentication"
 msgstr "伺服器需要核對"
 
@@ -4472,17 +4511,17 @@ msgid "No pre-filtering"
 msgstr "無前置過濾器"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:232
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
 msgid "Manufacturer"
 msgstr "製造商"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:249
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "驅動程式"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:253
+#: ../panels/printers/pp-samba.c:248
 #, c-format
 msgid "Enter your username and password to view printers available on %s."
 msgstr "輸入您的使用者名稱與密碼以檢視在 %s 可用的印表機。"
@@ -4559,43 +4598,43 @@ msgstr ""
 "抱歉!系統列印服務\n"
 "似乎無法使用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:249 ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/cc-privacy-panel.c:250 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
-#: ../panels/privacy/cc-privacy-panel.c:359 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:360 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "使用與歷史紀錄"
 
-#: ../panels/privacy/cc-privacy-panel.c:484
+#: ../panels/privacy/cc-privacy-panel.c:485
 msgid "Empty all items from Trash?"
 msgstr "要清除回收筒中所有的項目?"
 
-#: ../panels/privacy/cc-privacy-panel.c:485
+#: ../panels/privacy/cc-privacy-panel.c:486
 msgid "All items in the Trash will be permanently deleted."
 msgstr "所有在回收筒中的項目會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:486 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:487 ../panels/privacy/privacy.ui.h:34
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:509
+#: ../panels/privacy/cc-privacy-panel.c:510
 msgid "Delete all the temporary files?"
 msgstr "刪除所有暫存檔案?"
 
-#: ../panels/privacy/cc-privacy-panel.c:510
+#: ../panels/privacy/cc-privacy-panel.c:511
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有的暫存檔案會永遠刪除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:511 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:512 ../panels/privacy/privacy.ui.h:35
 msgid "_Purge Temporary Files"
 msgstr "清理暫存檔案(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:533 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:534 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "清除回收筒與暫存檔案"
 
-#: ../panels/privacy/cc-privacy-panel.c:573 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:574 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "軟體使用率"
 
@@ -4740,17 +4779,17 @@ msgstr "傳送軟體使用率統計(_S)"
 msgid "Privacy Policy"
 msgstr "隱私權原則"
 
-#: ../panels/region/cc-format-chooser.c:118
+#: ../panels/region/cc-format-chooser.c:119
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:121
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/cc-format-chooser.c:283
+#: ../panels/region/cc-format-chooser.c:284
 msgid "No regions found"
 msgstr "找不到區域"
 
@@ -4758,32 +4797,34 @@ msgstr "找不到區域"
 msgid "No input sources found"
 msgstr "找不到輸入來源"
 
-#: ../panels/region/cc-input-chooser.c:1063
+#: ../panels/region/cc-input-chooser.c:1076
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/region/cc-region-panel.c:242
+#: ../panels/region/cc-region-panel.c:239
+#: ../panels/user-accounts/um-user-panel.c:896
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "您的作業階段需要重新啟動以讓變更生效"
 
-#: ../panels/region/cc-region-panel.c:243
+#: ../panels/region/cc-region-panel.c:240
+#: ../panels/user-accounts/um-user-panel.c:897
 msgid "Restart Now"
 msgstr "立刻重新啟動"
 
-#: ../panels/region/cc-region-panel.c:903
+#: ../panels/region/cc-region-panel.c:858
 msgid "No input source selected"
 msgstr "尚未選擇輸入來源"
 
-#: ../panels/region/cc-region-panel.c:1134
+#: ../panels/region/cc-region-panel.c:1088
 msgid "Sorry"
 msgstr "抱歉"
 
-#: ../panels/region/cc-region-panel.c:1136
+#: ../panels/region/cc-region-panel.c:1090
 msgid "Input methods can't be used on the login screen"
 msgstr "輸入法不能用在登入畫面"
 
-#: ../panels/region/cc-region-panel.c:1773
+#: ../panels/region/cc-region-panel.c:1727
 msgid "Login Screen"
 msgstr "登入畫面"
 
@@ -4791,27 +4832,27 @@ msgstr "登入畫面"
 msgid "Formats"
 msgstr "格式"
 
-#: ../panels/region/format-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Preview"
 msgstr "預覽"
 
-#: ../panels/region/format-chooser.ui.h:3
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Dates"
 msgstr "日期"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Times"
 msgstr "時刻"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Numbers"
 msgstr "數字"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Measurement"
 msgstr "度量衡"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Paper"
 msgstr "紙張"
 
@@ -4950,21 +4991,32 @@ msgstr "往下移"
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:272
 msgctxt "service is enabled"
 msgid "On"
 msgstr "開啟"
 
-#: ../panels/sharing/cc-sharing-panel.c:278
+#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:301
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "關閉"
 
-#: ../panels/sharing/cc-sharing-panel.c:442
+#: ../panels/sharing/cc-sharing-panel.c:304
+msgctxt "service is enabled"
+msgid "Enabled"
+msgstr "已啟用"
+
+#: ../panels/sharing/cc-sharing-panel.c:307
+msgctxt "service is active"
+msgid "Active"
+msgstr "使用中"
+
+#: ../panels/sharing/cc-sharing-panel.c:488
 msgid "Choose a Folder"
 msgstr "選擇一個資料夾"
 
-#: ../panels/sharing/cc-sharing-panel.c:756
+#: ../panels/sharing/cc-sharing-panel.c:916
 msgid "Copy"
 msgstr "複製"
 
@@ -4994,6 +5046,18 @@ msgstr "啟用或停用遠端登入"
 msgid "Authentication is required to enable or disable remote login"
 msgstr "啟用或停用遠端登入需要核對"
 
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:299
+msgid "No networks selected for sharing"
+msgstr "沒有選擇用來分享的網路"
+
+#.
+#. * vim: sw=2 ts=8 cindent noai bs=2
+#.
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "網路"
+
 #: ../panels/sharing/sharing.ui.h:1
 msgid "Bluetooth Sharing"
 msgstr "藍牙分享"
@@ -5036,31 +5100,7 @@ msgstr "遠端登入"
 msgid "Some services are disabled because of no network access."
 msgstr "由於沒有網路存取,某些服務已停用。"
 
-#: ../panels/sharing/sharing.ui.h:11
-msgid "Share Music, Photos and Videos with others on the current network."
-msgstr "與目前網路的其他人分享音樂、相片和影片。"
-
 #: ../panels/sharing/sharing.ui.h:12
-msgid "Share Media On This Network"
-msgstr "在這個網路分享媒體"
-
-#: ../panels/sharing/sharing.ui.h:13
-msgid "Shared Folders"
-msgstr "分享資料夾"
-
-#: ../panels/sharing/sharing.ui.h:14
-msgid "column"
-msgstr "欄"
-
-#: ../panels/sharing/sharing.ui.h:15
-msgid "Add Folder"
-msgstr "加入資料夾"
-
-#: ../panels/sharing/sharing.ui.h:16
-msgid "Remove Folder"
-msgstr "移除資料夾"
-
-#: ../panels/sharing/sharing.ui.h:18
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5069,15 +5109,11 @@ msgstr ""
 "個人檔案分享允許您使用: <a href=\"dav://%s\">dav://%s</a> 與目前網路上的其他"
 "人分享您的公開資料夾"
 
-#: ../panels/sharing/sharing.ui.h:19
-msgid "Share Public Folder On This Network"
-msgstr "在這個網路分享公開資料夾"
-
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:13
 msgid "Require Password"
 msgstr "需要密碼"
 
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:16
 #, no-c-format
 msgid ""
 "Allow remote users to connect using the Secure Shell command:\n"
@@ -5086,7 +5122,7 @@ msgstr ""
 "允許遠端使用者使用 SSH 指令連線:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/sharing.ui.h:26
+#: ../panels/sharing/sharing.ui.h:19
 #, no-c-format
 msgid ""
 "Allow remote users to view or control your screen by connecting to: <a href="
@@ -5094,30 +5130,38 @@ msgid ""
 msgstr ""
 "允許遠端使用者連線到:<a href=\"vnc://%s\">vnc://%s</a> 檢視或控制您的螢幕"
 
-#: ../panels/sharing/sharing.ui.h:27
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Allow Remote Control"
 msgstr "允許遙控"
 
-#: ../panels/sharing/sharing.ui.h:28
+#: ../panels/sharing/sharing.ui.h:21
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../panels/sharing/sharing.ui.h:29
+#: ../panels/sharing/sharing.ui.h:22
 msgid "Show Password"
 msgstr "顯示密碼"
 
-#: ../panels/sharing/sharing.ui.h:30
+#: ../panels/sharing/sharing.ui.h:23
 msgid "Access Options"
 msgstr "存取選項"
 
-#: ../panels/sharing/sharing.ui.h:31
+#: ../panels/sharing/sharing.ui.h:24
 msgid "New connections must ask for access"
 msgstr "存取新的連線必須詢問"
 
-#: ../panels/sharing/sharing.ui.h:32
+#: ../panels/sharing/sharing.ui.h:25
 msgid "Require a password"
 msgstr "需要密碼"
 
+#: ../panels/sharing/sharing.ui.h:26
+msgid "Share music, photos and videos over the network."
+msgstr "與網路上其他人分享音樂、相片和影片。"
+
+#: ../panels/sharing/sharing.ui.h:27
+msgid "Folders"
+msgstr "資料夾"
+
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "音效"
@@ -5361,7 +5405,7 @@ msgid ""
 msgstr ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;鍵盤;滑鼠;無障礙;對比;螢幕;閱讀器;文字;"
-"字型;大小;相黏;遲緩;彈跳;滑鼠;鍵;按鍵"
+"字型;大小;相黏;遲緩;反彈;滑鼠;鍵;按鍵"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -5519,7 +5563,7 @@ msgstr "當拒絕按鍵動作則發出聲響(_R)"
 
 #: ../panels/universal-access/uap.ui.h:41
 msgid "_Bounce Keys"
-msgstr "回鍵(_B)"
+msgstr "反彈鍵(_B)"
 
 #: ../panels/universal-access/uap.ui.h:42
 msgid "Ignores fast duplicate keypresses"
@@ -5532,7 +5576,7 @@ msgstr "短"
 
 #: ../panels/universal-access/uap.ui.h:44
 msgid "Bounce keys typing delay"
-msgstr "回鍵輸入延遲"
+msgstr "反彈鍵輸入延遲"
 
 #: ../panels/universal-access/uap.ui.h:45
 msgctxt "bounce keys delay"
@@ -5845,20 +5889,24 @@ msgstr ""
 "企業登入帳號。"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:15
-#: ../panels/user-accounts/um-account-dialog.c:1438
+msgid "_Enterprise Login"
+msgstr "企業登入(_E)"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: ../panels/user-accounts/um-account-dialog.c:1458
 msgid "Add User"
 msgstr "加入使用者"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: ../panels/user-accounts/data/account-dialog.ui.h:19
 msgid "_Enroll"
 msgstr "登錄(_E)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
+#: ../panels/user-accounts/data/account-dialog.ui.h:20
 msgid "Domain Administrator Login"
 msgstr "網域管理員登入"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
+#: ../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"
@@ -5868,11 +5916,11 @@ msgstr ""
 "加入網域。請網路系統管理員在這裡\n"
 "輸入網域密碼。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:23
+#: ../panels/user-accounts/data/account-dialog.ui.h:24
 msgid "Administrator _Name"
 msgstr "管理員名稱(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
+#: ../panels/user-accounts/data/account-dialog.ui.h:25
 msgid "Administrator Password"
 msgstr "管理員密碼"
 
@@ -5951,7 +5999,6 @@ msgid "Login History"
 msgstr "登入歷史紀錄"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
-#| msgid "Show Password"
 msgid "Change Password"
 msgstr "更改密碼"
 
@@ -6193,28 +6240,28 @@ msgstr "不明的錯誤"
 msgid "Should match the web address of your account provider."
 msgstr "應符合您帳號提供者的網路位址。"
 
-#: ../panels/user-accounts/um-account-dialog.c:221
+#: ../panels/user-accounts/um-account-dialog.c:228
 msgid "Failed to add account"
 msgstr "無法加入到帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:441
+#: ../panels/user-accounts/um-account-dialog.c:452
 msgid "Passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-account-dialog.c:711
-#: ../panels/user-accounts/um-account-dialog.c:757
+#: ../panels/user-accounts/um-account-dialog.c:731
+#: ../panels/user-accounts/um-account-dialog.c:777
 msgid "Failed to register account"
 msgstr "無法註冊帳號"
 
-#: ../panels/user-accounts/um-account-dialog.c:895
+#: ../panels/user-accounts/um-account-dialog.c:915
 msgid "No supported way to authenticate with this domain"
 msgstr "沒有支援這個網域核對的方式"
 
-#: ../panels/user-accounts/um-account-dialog.c:954
+#: ../panels/user-accounts/um-account-dialog.c:974
 msgid "Failed to join domain"
 msgstr "無法加入網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1015
+#: ../panels/user-accounts/um-account-dialog.c:1035
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6222,7 +6269,7 @@ msgstr ""
 "登入名稱沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1022
+#: ../panels/user-accounts/um-account-dialog.c:1042
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6230,19 +6277,14 @@ msgstr ""
 "登入密碼沒有用。\n"
 "請再試一次。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1030
+#: ../panels/user-accounts/um-account-dialog.c:1050
 msgid "Failed to log into domain"
 msgstr "無法登入到網域"
 
-#: ../panels/user-accounts/um-account-dialog.c:1088
+#: ../panels/user-accounts/um-account-dialog.c:1108
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "找不到網域。也許您拼錯字了?"
 
-#. Create enterprise toggle button.
-#: ../panels/user-accounts/um-account-dialog.c:1451
-msgid "_Enterprise Login"
-msgstr "企業登入(_E)"
-
 #: ../panels/user-accounts/um-fingerprint-dialog.c:137
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -6360,7 +6402,7 @@ msgstr "%s - %s"
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
 #: ../panels/user-accounts/um-history-dialog.c:175
-#: ../panels/user-accounts/um-user-panel.c:625
+#: ../panels/user-accounts/um-user-panel.c:631
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -6368,7 +6410,7 @@ msgstr "%k:%M"
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
 #: ../panels/user-accounts/um-history-dialog.c:178
-#: ../panels/user-accounts/um-user-panel.c:629
+#: ../panels/user-accounts/um-user-panel.c:635
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -6398,23 +6440,23 @@ msgstr "密碼無法變更"
 msgid "The passwords do not match."
 msgstr "密碼不相符。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:217
+#: ../panels/user-accounts/um-photo-dialog.c:219
 msgid "Browse for more pictures"
 msgstr "瀏覽更多照片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:442
+#: ../panels/user-accounts/um-photo-dialog.c:453
 msgid "Disable image"
 msgstr "停用圖片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:460
+#: ../panels/user-accounts/um-photo-dialog.c:471
 msgid "Take a photo…"
 msgstr "照相…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:478
+#: ../panels/user-accounts/um-photo-dialog.c:489
 msgid "Browse for more pictures…"
 msgstr "瀏覽更多照片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:702
+#: ../panels/user-accounts/um-photo-dialog.c:713
 #, c-format
 msgid "Used by %s"
 msgstr "由 %s 使用"
@@ -6443,76 +6485,76 @@ msgstr "密碼錯誤,請再試一次"
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "無法連接到 %s 網域:%s"
 
-#: ../panels/user-accounts/um-user-panel.c:192
+#: ../panels/user-accounts/um-user-panel.c:198
 msgid "Other Accounts"
 msgstr "其他帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:411
+#: ../panels/user-accounts/um-user-panel.c:417
 msgid "Failed to delete user"
 msgstr "刪除使用者失敗"
 
-#: ../panels/user-accounts/um-user-panel.c:476
+#: ../panels/user-accounts/um-user-panel.c:482
 msgid "You cannot delete your own account."
 msgstr "您不能刪除自己的帳號。"
 
-#: ../panels/user-accounts/um-user-panel.c:485
+#: ../panels/user-accounts/um-user-panel.c:491
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 仍在登入中"
 
-#: ../panels/user-accounts/um-user-panel.c:489
+#: ../panels/user-accounts/um-user-panel.c:495
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "在使用者登入期間刪除他會使系統處於不穩定的狀態。"
 
-#: ../panels/user-accounts/um-user-panel.c:498
+#: ../panels/user-accounts/um-user-panel.c:504
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "您想要保留 %s 的檔案嗎?"
 
-#: ../panels/user-accounts/um-user-panel.c:502
+#: ../panels/user-accounts/um-user-panel.c:508
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "當刪除使用者時是可以保留家目錄、新進郵件(mail spool)和暫存檔案的。"
 
-#: ../panels/user-accounts/um-user-panel.c:505
+#: ../panels/user-accounts/um-user-panel.c:511
 msgid "_Delete Files"
 msgstr "刪除檔案(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:506
+#: ../panels/user-accounts/um-user-panel.c:512
 msgid "_Keep Files"
 msgstr "保留檔案(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:558
+#: ../panels/user-accounts/um-user-panel.c:564
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帳號已停用"
 
-#: ../panels/user-accounts/um-user-panel.c:566
+#: ../panels/user-accounts/um-user-panel.c:572
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "在下次登入時設定"
 
-#: ../panels/user-accounts/um-user-panel.c:569
+#: ../panels/user-accounts/um-user-panel.c:575
 msgctxt "Password mode"
 msgid "None"
 msgstr "沒有"
 
-#: ../panels/user-accounts/um-user-panel.c:618
+#: ../panels/user-accounts/um-user-panel.c:624
 msgid "Logged in"
 msgstr "已登入"
 
-#: ../panels/user-accounts/um-user-panel.c:1002
+#: ../panels/user-accounts/um-user-panel.c:1072
 msgid "Failed to contact the accounts service"
 msgstr "無法連接帳號服務"
 
-#: ../panels/user-accounts/um-user-panel.c:1004
+#: ../panels/user-accounts/um-user-panel.c:1074
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "請確定 AccountService 已經安裝並啟用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1045
+#: ../panels/user-accounts/um-user-panel.c:1115
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6520,12 +6562,12 @@ msgstr ""
 "要進行變更,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1083
+#: ../panels/user-accounts/um-user-panel.c:1153
 msgid "Create a user account"
 msgstr "建立新的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1094
-#: ../panels/user-accounts/um-user-panel.c:1383
+#: ../panels/user-accounts/um-user-panel.c:1164
+#: ../panels/user-accounts/um-user-panel.c:1453
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6533,12 +6575,12 @@ msgstr ""
 "要建立使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1104
+#: ../panels/user-accounts/um-user-panel.c:1174
 msgid "Delete the selected user account"
 msgstr "刪除選取的使用者帳號"
 
-#: ../panels/user-accounts/um-user-panel.c:1116
-#: ../panels/user-accounts/um-user-panel.c:1388
+#: ../panels/user-accounts/um-user-panel.c:1186
+#: ../panels/user-accounts/um-user-panel.c:1458
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6546,31 +6588,25 @@ msgstr ""
 "要刪除選取的使用者帳號,\n"
 "請先點選 * 圖示"
 
-#: ../panels/user-accounts/um-user-panel.c:1298
+#: ../panels/user-accounts/um-user-panel.c:1368
 msgid "My Account"
 msgstr "我的帳號"
 
 #: ../panels/user-accounts/um-utils.c:567
 #, c-format
-#| msgid "A user with the username '%s' already exists"
 msgid "A user with the username '%s' already exists."
 msgstr "以「%s」為名的使用者已經存在。"
 
 #: ../panels/user-accounts/um-utils.c:571
 #, c-format
-#| msgid "The username is too long"
 msgid "The username is too long."
 msgstr "使用者名稱太長。"
 
 #: ../panels/user-accounts/um-utils.c:574
-#| msgid "The username cannot start with a '-'"
 msgid "The username cannot start with a '-'."
 msgstr "使用者名稱不能以「-」字元開頭。"
 
 #: ../panels/user-accounts/um-utils.c:577
-#| msgid ""
-#| "The username should only consist of lower and upper case letters from a-"
-#| "z, digits and any of characters '.', '-' and '_'"
 msgid ""
 "The username should only consist of lower and upper case letters from a-z, "
 "digits and any of characters '.', '-' and '_'."
@@ -6972,8 +7008,20 @@ msgstr "系統"
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;偏好設定;設定值;"
 
-#~ msgid "_Done"
-#~ msgstr "完成(_D)"
+#~ msgid "Share Media On This Network"
+#~ msgstr "在這個網路分享媒體"
+
+#~ msgid "Shared Folders"
+#~ msgstr "分享資料夾"
+
+#~ msgid "column"
+#~ msgstr "欄"
+
+#~ msgid "Remove Folder"
+#~ msgstr "移除資料夾"
+
+#~ msgid "Share Public Folder On This Network"
+#~ msgstr "在這個網路分享公開資料夾"
 
 #~ msgid "Immediately"
 #~ msgstr "立即"



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