[gnome-control-center] Update zh_CN translation

[YunQiang Su <yqsu src gnome org>]

commit a16045eab871662e78344d818acb098b2557d677
Author: Dz Chen <wsxy162 gmail com>
Date:   Sun Oct 30 20:34:42 2016 +0800

    Update zh_CN translation

 po/zh_CN.po | 4006 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 2255 insertions(+), 1751 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 85bbc7a..3c7050c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -23,27 +23,29 @@
 # Tong Hui <tonghuix gmail com>, 2014.
 # Eleanor Chen <chenyueg gmail com>, 2014.
 # Aron Xu <happyaron xu gmail com>, 2010, 2011, 2012, 2013, 2014, 2015.
+# Mingye Wang <arthur2e5 aosc xyz>, 2015.
+# Jeff Bai <jeffbai aosc xyz>, 2015, 2016.
+# Dingzhong Chen <wsxy162 gmail com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center master\n"
+"Project-Id-Version: gnome-control-center 3.22\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: 2015-04-30 12:28+0000\n"
-"PO-Revision-Date: 2015-04-10 16:57+0800\n"
-"Last-Translator: osfans <waxaca 163 com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"POT-Creation-Date: 2016-10-27 16:38+0000\n"
+"PO-Revision-Date: 2016-10-30 20:32+0800\n"
+"Last-Translator: Dingzhong Chen <wsxy162 gmail com>\n"
+"Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\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.7.5\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: ../panels/background/background.ui.h:1
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
-msgstr "背景"
+msgid "_Background"
+msgstr "背景(_B)"
 
 #. This refers to a slideshow background
 #: ../panels/background/background.ui.h:3
@@ -52,8 +54,8 @@ msgstr "在一天内按时切换"
 
 #. To translators: This is a noun, not a verb
 #: ../panels/background/background.ui.h:5
-msgid "Lock Screen"
-msgstr "锁定屏幕"
+msgid "_Lock Screen"
+msgstr "锁定屏幕(_L)"
 
 #: ../panels/background/background.ui.h:6
 msgctxt "background, style"
@@ -111,7 +113,7 @@ msgstr "æ— å›¾ç‰‡"
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
 #: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:274
+#: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "主目录"
 
@@ -124,38 +126,36 @@ msgstr "æ‚¨æ·»åŠ åˆ° %s 文件夹的图片将在此显示"
 
 #: ../panels/background/cc-background-chooser-dialog.c:580
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color.ui.h:29 ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1582
-#: ../panels/display/cc-display-panel.c:2020
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
+#: ../panels/common/language-chooser.ui.h:3
+#: ../panels/display/cc-display-panel.c:1561
+#: ../panels/display/cc-display-panel.c:2207
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:245
-#: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1247
-#: ../panels/network/net-device-wifi.c:1440
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1298
+#: ../panels/network/net-device-wifi.c:1535
 #: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:1940
+#: ../panels/printers/cc-printers-panel.c:2077
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:568
-#: ../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:491
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/privacy/cc-privacy-panel.c:1048
+#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
+#: ../panels/search/cc-search-locations-dialog.c:637
+#: ../panels/sharing/cc-sharing-panel.c:372
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: ../panels/user-accounts/um-fingerprint-dialog.c:265
 #: ../panels/user-accounts/um-photo-dialog.c:94
 #: ../panels/user-accounts/um-photo-dialog.c:217
-#: ../panels/user-accounts/um-user-panel.c:708
-#: ../panels/user-accounts/um-user-panel.c:726
+#: ../panels/user-accounts/um-user-panel.c:705
+#: ../panels/user-accounts/um-user-panel.c:723
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: ../panels/background/cc-background-chooser-dialog.c:581
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:96
-msgid "Select"
-msgstr "选择"
+msgid "_Select"
+msgstr "选择(_S)"
 
 #: ../panels/background/cc-background-item.c:203
 msgid "multiple sizes"
@@ -176,37 +176,70 @@ msgstr "æ— æ¡Œé¢èƒŒæ™¯"
 msgid "Current background"
 msgstr "当前背景"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+msgid "Back­ground"
+msgstr "背景"
+
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
 msgid "Change your background image to a wallpaper or photo"
 msgstr "å°†èƒŒæ™¯å›¾ç‰‡æ”¹ä¸ºä¸€å¼ å£çº¸æˆ–ç…§ç‰‡"
 
 #. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:4
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;壁纸;墙纸;屏幕;桌面;背景;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:262
-msgid "Bluetooth is disabled"
-msgstr "蓝牙已禁用"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+msgid "Turn Off Airplane Mode"
+msgstr "关闭飞行模式"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:263
-msgid "No Bluetooth adapters found"
-msgstr "未找到蓝牙适配器"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+msgid "No Bluetooth Found"
+msgstr "未找到蓝牙"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
-msgid "Bluetooth is disabled by hardware switch"
-msgstr "蓝牙已通过硬件开关禁用"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+msgid "Plug in a dongle to use Bluetooth."
+msgstr "插入蓝牙适配器以使用蓝牙。"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1637
-msgid "Bluetooth"
-msgstr "蓝牙"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+msgid "Bluetooth Turned Off"
+msgstr "蓝牙已经关闭"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+msgid "Turn on to connect devices and receive file transfers."
+msgstr "æ‰“å¼€ä»¥è¿žæŽ¥è®¾å¤‡å’ŒæŽ¥æ”¶æ–‡ä»¶ä¼ é€ã€‚"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+msgid "Airplane Mode is on"
+msgstr "飞行模式已打开"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+msgid "Bluetooth is disabled when airplane mode is on."
+msgstr "蓝牙已禁用当开启飞行模式时。"
 
+#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+msgid "Hardware Airplane Mode is on"
+msgstr "硬件飞行模式已打开"
+
+#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+msgid "Turn off the Airplane mode switch to enable Bluetooth."
+msgstr "关闭飞行模式开关以开启蓝牙。"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Blue­tooth"
+msgstr "蓝牙"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "开关蓝牙及连接您的设备"
 
+#. Translators: those are keywords for the bluetooth control-center panel
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+msgid "share;sharing;bluetooth;obex;"
+msgstr "share;sharing;bluetooth;obex;分享;共享;蓝牙;"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: ../panels/color/cc-color-calibrate.c:361
 msgid "Place your calibration device over the square and press 'Start'"
@@ -233,7 +266,7 @@ msgstr "å°†æ‚¨çš„æ ¡å‡†å™¨ç§»åŠ¨åˆ°è¡¨é¢ä½ç½®å¹¶æŒ‰â€œç»§ç»­â€"
 #. * sample widget and shut the lid.
 #: ../panels/color/cc-color-calibrate.c:379
 msgid "Shut the laptop lid"
-msgstr "合上笔记本盖"
+msgstr "合上笔记本盖子"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
@@ -245,12 +278,12 @@ msgstr "å‘ç”Ÿäº†ä¸€ä¸ªæ— æ³•æ¢å¤çš„å†…éƒ¨é”™è¯¯ã€‚"
 #. * installed, which should only affect insane distros
 #: ../panels/color/cc-color-calibrate.c:415
 msgid "Tools required for calibration are not installed."
-msgstr "æ ¡å‡†æ‰€éœ€çš„å·¥å…·æ²¡æœ‰å®‰è£…ã€‚"
+msgstr "æœªå®‰è£…æ ¡å‡†æ‰€éœ€çš„å·¥å…·ã€‚"
 
 #. TRANSLATORS: The profile failed for some reason
 #: ../panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
-msgstr "æ— æ³•ç”Ÿæˆé…ç½®æ–‡ä»¶ã€‚"
+msgstr "æ— æ³•ç”Ÿæˆé…ç½®ã€‚"
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
@@ -273,14 +306,14 @@ msgstr "æ ¡å‡†å¤±è´¥ï¼"
 #. TRANSLATORS: The user can now remove the sensor from the screen
 #: ../panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
-msgstr "æ‚¨å¯ä»¥ç§»é™¤æ ¡å‡†è®¾å¤‡ã€‚"
+msgstr "æ‚¨çŽ°åœ¨å¯ä»¥ç§»é™¤æ ¡å‡†è®¾å¤‡ã€‚"
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
 #: ../panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
-msgstr "ä¸è¦åœ¨è¿‡ç¨‹ä¸­å¹²æ‰°æ ¡å‡†è®¾å¤‡"
+msgstr "æ ¡å‡†è¿‡ç¨‹ä¸­ä¸è¦å¹²æ‰°æ ¡å‡†è®¾å¤‡"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: ../panels/color/cc-color-common.c:41
@@ -372,7 +405,7 @@ msgstr "支持的 ICC 配置"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:420
+#: ../panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "所有文件"
 
@@ -403,7 +436,7 @@ msgstr "重启计算机并引导您日常使用的操作系统。"
 
 #: ../panels/color/cc-color-panel.c:926
 msgid "Type the URL into your browser to download and install the profile."
-msgstr "在浏览器中输入该 URL 来下载和安装该配置。"
+msgstr "在浏览器中输入该 URL 以下载和安装该配置。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
 #: ../panels/color/cc-color-panel.c:960
@@ -411,21 +444,21 @@ msgid "Save Profile"
 msgstr "保存配置"
 
 #: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:375
+#: ../panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
 #: ../panels/color/cc-color-panel.c:1324
 msgid "Create a color profile for the selected device"
-msgstr "为所选设备创建一份色彩配置"
+msgstr "为选中的设备创建一份色彩配置"
 
 #. TRANSLATORS: this is when the button is insensitive
 #: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
-msgstr "没有检测到测量仪器，请检查它是否打开并正确连接。"
+msgstr "未检测到测量仪器，请检查仪器是否已打开并已正确连接。"
 
 #. TRANSLATORS: this is when the button is insensitive
 #: ../panels/color/cc-color-panel.c:1373
@@ -435,7 +468,7 @@ msgstr "æµ‹é‡ä»ªå™¨ä¸æ”¯æŒæ‰“å°æœºæ ¡æ­£ã€‚"
 #. TRANSLATORS: this is when the button is insensitive
 #: ../panels/color/cc-color-panel.c:1384
 msgid "The device type is not currently supported."
-msgstr "目前不支持该设备类型。"
+msgstr "目前不支持此设备类型。"
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
@@ -507,7 +540,7 @@ msgstr "ç”Ÿäº§å•†æä¾›çš„å·¥åŽ‚æ ¡å‡†æ•°æ®"
 
 #: ../panels/color/cc-color-profile.c:203
 msgid "Full-screen display correction not possible with this profile"
-msgstr "ä½¿ç”¨æ­¤é…ç½®æ— æ³•è¿›è¡Œå…¨å±æ˜¾ç¤ºæ ¡å‡†"
+msgstr "æ— æ³•ä½¿ç”¨æ­¤é…ç½®è¿›è¡Œå…¨å±æ˜¾ç¤ºæ ¡å‡†"
 
 #: ../panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
@@ -517,27 +550,22 @@ msgstr "此配置可能已不准确"
 msgid "Display Calibration"
 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:1476
-msgid "Cancel"
-msgstr "取消"
-
 #. This starts the calibration process
 #: ../panels/color/color-calibrate.ui.h:4
-msgid "Start"
-msgstr "开始"
+msgid "_Start"
+msgstr "开始(_S)"
 
 #. This resumes the calibration process
 #: ../panels/color/color-calibrate.ui.h:6
-msgid "Resume"
-msgstr "恢复"
+msgid "_Resume"
+msgstr "恢复(_R)"
 
 #. This button returns the user back to the color control panel
 #: ../panels/color/color-calibrate.ui.h:8
-msgid "Done"
-msgstr "完成"
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "完成(_D)"
 
 #. Timeout parameters
 #. 15000 = 15 sec
@@ -552,12 +580,12 @@ msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
 "color profile."
-msgstr "æ ¡å‡†å¯ä»¥äº§ç”Ÿç”¨äºŽå±å¹•è‰²å½©ç®¡ç†çš„é…ç½®ã€‚æ ¡å‡†æ—¶èŠ±è´¹çš„æ—¶é—´è¶Šå¤šæ•ˆæžœè¶Šå¥½ã€‚"
+msgstr "æ ¡å‡†å°†ç”Ÿæˆç”¨äºŽå±å¹•è‰²å½©ç®¡ç†çš„é…ç½®ã€‚æ ¡å‡†æ—¶èŠ±è´¹çš„æ—¶é—´è¶Šå¤šæ•ˆæžœè¶Šå¥½ã€‚"
 
 #: ../panels/color/color.ui.h:3
 msgid ""
 "You will not be able to use your computer while calibration takes place."
-msgstr "åœ¨æ ¡å‡†è¿›è¡Œæ—¶æ‚¨å°†ä¸èƒ½ä½¿ç”¨æ‚¨çš„è®¡ç®—æœºã€‚"
+msgstr "æ ¡å‡†è¿›è¡Œæ—¶æ‚¨å°†ä¸èƒ½ä½¿ç”¨æ‚¨çš„è®¡ç®—æœºã€‚"
 
 #. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:5
@@ -567,7 +595,7 @@ msgstr "质量"
 #. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:7
 msgid "Approximate Time"
-msgstr "ä¼°æ—¶"
+msgstr "预计耗时"
 
 #: ../panels/color/color.ui.h:8
 msgid "Calibration Quality"
@@ -624,11 +652,11 @@ msgstr ""
 
 #: ../panels/color/color.ui.h:19
 msgid "Profile Name:"
-msgstr "配置名："
+msgstr "配置名称："
 
 #: ../panels/color/color.ui.h:20
 msgid "Profile Name"
-msgstr "配置名"
+msgstr "配置名称"
 
 #: ../panels/color/color.ui.h:21
 msgid "Profile successfully created!"
@@ -640,7 +668,7 @@ msgstr "复制配置"
 
 #: ../panels/color/color.ui.h:23
 msgid "Requires writable media"
-msgstr "需要可写的媒体"
+msgstr "需要可写媒体"
 
 #: ../panels/color/color.ui.h:24
 msgid "Upload profile"
@@ -657,207 +685,240 @@ msgid ""
 "\">Microsoft Windows</a> systems useful."
 msgstr ""
 "有关如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple OS X</a> "
-"和 <a href=\"windows\">Microsoft Windows</a> 系统中使用个人资料的这些说明可能"
-"对您有所帮助。"
+"和 <a href=\"windows\">Microsoft Windows</a> 系统中使用配置的这些说明可能对您"
+"有所帮助。"
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:730
 msgid "Summary"
 msgstr "摘要"
 
 #: ../panels/color/color.ui.h:28
-msgid "Import File…"
-msgstr "导入文件..."
+msgid "Add profile"
+msgstr "æ·»åŠ é…ç½®"
+
+#: ../panels/color/color.ui.h:29
+msgid "_Import File…"
+msgstr "导入文件(_I)…"
 
-#: ../panels/color/color.ui.h:30
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:512
+#: ../panels/color/color.ui.h:31
+#: ../panels/network/connection-editor/net-connection-editor.c:546
 #: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1477
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "_Add"
 msgstr "æ·»åŠ (_A)"
 
-#: ../panels/color/color.ui.h:31
+#: ../panels/color/color.ui.h:32
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 msgstr "æ£€æµ‹åˆ°é—®é¢˜ï¼Œæ­¤é…ç½®å¯èƒ½æ— æ³•æ­£å¸¸å·¥ä½œã€‚<a href=\"\">显示详细信息。</a>"
 
-#: ../panels/color/color.ui.h:32
+#: ../panels/color/color.ui.h:33
 msgid "Each device needs an up to date color profile to be color managed."
-msgstr "每个设备需要一份最新的色彩配置以进行色彩管理。"
+msgstr "每个设备都需要一份最新色彩配置以进行色彩管理。"
 
-#: ../panels/color/color.ui.h:33
+#: ../panels/color/color.ui.h:34
 msgid "Learn more"
 msgstr "了解更多"
 
-#: ../panels/color/color.ui.h:34
+#: ../panels/color/color.ui.h:35
 msgid "Learn more about color management"
 msgstr "了解更多有关色彩管理的信息"
 
-#: ../panels/color/color.ui.h:35
-msgid "Set for all users"
-msgstr "为所有用户设置"
-
 #: ../panels/color/color.ui.h:36
-msgid "Set this profile for all users on this computer"
-msgstr "为此计算机上的所有用户设置此配置"
+msgid "_Set for all users"
+msgstr "为所有用户设置(_S)"
 
 #: ../panels/color/color.ui.h:37
-msgid "Enable"
-msgstr "启用"
+msgid "Set this profile for all users on this computer"
+msgstr "为此计算机上的所有用户设置此配置"
 
 #: ../panels/color/color.ui.h:38
-msgid "Add profile"
-msgstr "æ·»åŠ é…ç½®"
+msgid "_Enable"
+msgstr "启用(_E)"
 
 #: ../panels/color/color.ui.h:39
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
-msgid "Calibrate…"
-msgstr "æ ¡å‡†..."
+msgid "_Add profile"
+msgstr "æ·»åŠ é…ç½®(_A)"
 
 #: ../panels/color/color.ui.h:40
-msgid "Calibrate the device"
-msgstr "æ ¡å‡†è¯¥è®¾å¤‡"
+msgid "_Calibrate…"
+msgstr "æ ¡å‡†(_C)…"
 
 #: ../panels/color/color.ui.h:41
-msgid "Remove profile"
-msgstr "移除配置"
+msgid "Calibrate the device"
+msgstr "æ ¡å‡†è¯¥è®¾å¤‡"
 
 #: ../panels/color/color.ui.h:42
-msgid "View details"
-msgstr "查看详情"
+msgid "_Remove profile"
+msgstr "移除配置(_R)"
 
 #: ../panels/color/color.ui.h:43
-msgid "Unable to detect any devices that can be color managed"
-msgstr "æ— æ³•æ£€æµ‹åˆ°å¯ä»¥ç®¡ç†é¢œè‰²çš„è®¾å¤‡"
+msgid "_View details"
+msgstr "查看详情(_V)"
 
 #: ../panels/color/color.ui.h:44
+msgid "Unable to detect any devices that can be color managed"
+msgstr "未检测到可以管理颜色的设备"
+
+#: ../panels/color/color.ui.h:45
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:46
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:47
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:48
 msgid "Projector"
 msgstr "投影仪"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:49
 msgid "Plasma"
 msgstr "等离子"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:50
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:51
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:52
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED 背光)"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:53
 msgid "Wide gamut LCD (CCFL backlight)"
-msgstr "广色域 LCD (CCFL 背光)"
+msgstr "广色域 LCD（CCFL 背光）"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:54
 msgid "Wide gamut LCD (RGB LED backlight)"
-msgstr "广色域 LCD (RGB LED 背光)"
+msgstr "广色域 LCD（RGB LED 背光）"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:55
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:56
 msgid "40 minutes"
 msgstr "40 分钟"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:57
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 分钟"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:59
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:59 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
 msgid "15 minutes"
 msgstr "15 分钟"
 
-#: ../panels/color/color.ui.h:60
+#: ../panels/color/color.ui.h:61
 msgid "Native to display"
 msgstr "显示设备原生"
 
-#: ../panels/color/color.ui.h:61
+#: ../panels/color/color.ui.h:62
 msgid "D50 (Printing and publishing)"
-msgstr "D50 (打印和出版)"
+msgstr "D50（打印和出版）"
 
-#: ../panels/color/color.ui.h:62
+#: ../panels/color/color.ui.h:63
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:63
+#: ../panels/color/color.ui.h:64
 msgid "D65 (Photography and graphics)"
-msgstr "D65 (摄影及图形)"
+msgstr "D65（摄影及图形）"
 
-#: ../panels/color/color.ui.h:64
+#: ../panels/color/color.ui.h:65
 msgid "D75"
 msgstr "D75"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Co­lor"
 msgstr "色彩"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
-msgstr "æ ¡å‡†è®¾å¤‡çš„è‰²å½©ï¼Œä¾‹å¦‚æ˜¾ç¤ºå™¨ã€ç›¸æœºæˆ–æ‰“å°æœº"
+msgstr "æ ¡å‡†æ˜¾ç¤ºå™¨ã€ç›¸æœºã€æ‰“å°æœºç­‰è®¾å¤‡çš„è‰²å½©"
 
 #. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr ""
-"颜色;色彩;配置;æ ¡å‡†;打印机;显示;Color;ICC;Profile;Calibrate;Printer;Display;"
+"Color;ICC;Profile;Calibrate;Printer;Display;颜色;色彩;配置;æ ¡å‡†;打印机;显示;"
 
 #: ../panels/common/cc-common-language.c:323
 msgid "Other…"
-msgstr "其他..."
+msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:123
-#: ../panels/region/cc-format-chooser.c:270
-#: ../panels/region/cc-input-chooser.c:167
+#: ../panels/common/cc-language-chooser.c:124
+#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
-msgstr "更多..."
+msgstr "更多…"
 
-#: ../panels/common/cc-language-chooser.c:139
+#: ../panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "未找到语言"
 
-#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:100
+msgid "Today"
+msgstr "今天"
+
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:102
+msgid "Yesterday"
+msgstr "昨天"
+
+#. Translators: This is a date format string in the style of "Feb 24".
+#: ../panels/common/cc-util.c:138
+msgid "%b %e"
+msgstr "%b %e"
+
+#. Translators: This is a date format string in the style of "Feb 24, 2013".
+#: ../panels/common/cc-util.c:143
+msgid "%b %e, %Y"
+msgstr " %Y %b %e"
+
+#: ../panels/common/language-chooser.ui.h:1
 msgid "Language"
 msgstr "语言"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
-msgid "_Done"
-msgstr "完成(_D)"
+#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
+#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+msgid "Day"
+msgstr "æ—¥"
+
+#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
+#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+msgid "Month"
+msgstr "月"
+
+#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
+#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+msgid "Year"
+msgstr "å¹´"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
 #: ../panels/datetime/cc-datetime-panel.c:340
@@ -956,8 +1017,9 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Date & Time"
 msgstr "日期和时间"
 
@@ -975,63 +1037,51 @@ msgid "Minute"
 msgstr "分"
 
 #: ../panels/datetime/datetime.ui.h:18
-msgid "Day"
-msgstr "æ—¥"
-
-#: ../panels/datetime/datetime.ui.h:19
-msgid "Month"
-msgstr "月"
-
-#: ../panels/datetime/datetime.ui.h:20
-msgid "Year"
-msgstr "å¹´"
-
-#: ../panels/datetime/datetime.ui.h:21
 msgid "Time Zone"
 msgstr "时区"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: ../panels/datetime/datetime.ui.h:19
 msgid "Search for a city"
 msgstr "搜索城市"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: ../panels/datetime/datetime.ui.h:20
 msgid "Automatic _Date & Time"
 msgstr "自动设置日期和时间(_D)"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: ../panels/datetime/datetime.ui.h:21
 msgid "Requires internet access"
 msgstr "需要互联网连接"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: ../panels/datetime/datetime.ui.h:22
 msgid "Automatic Time _Zone"
 msgstr "自动设置时区(_Z)"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: ../panels/datetime/datetime.ui.h:23
 msgid "Date & _Time"
 msgstr "日期和时间(_T)"
 
-#: ../panels/datetime/datetime.ui.h:27
-msgid "Time _Zone"
-msgstr "时区(_Z)"
+#: ../panels/datetime/datetime.ui.h:24
+msgid "Time Z_one"
+msgstr "时区(_O)"
 
-#: ../panels/datetime/datetime.ui.h:28
+#: ../panels/datetime/datetime.ui.h:25
 msgid "Time _Format"
 msgstr "æ—¶é—´æ ¼å¼(_F)"
 
-#: ../panels/datetime/datetime.ui.h:29
+#: ../panels/datetime/datetime.ui.h:26
 msgid "24-hour"
 msgstr "24 小时"
 
-#: ../panels/datetime/datetime.ui.h:30
+#: ../panels/datetime/datetime.ui.h:27
 msgid "AM / PM"
 msgstr "上午/下午"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
 msgid "Change the date and time, including time zone"
-msgstr "改变日期和时间，包括时区"
+msgstr "改变日期、时间和时区"
 
 #. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
 msgid "Clock;Timezone;Location;"
 msgstr "Clock;Timezone;Location;时钟;时区;位置;"
 
@@ -1041,284 +1091,312 @@ msgstr "更改系统时间和日期设置"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
 msgid "To change time or date settings, you need to authenticate."
-msgstr "修改时间或日期设置，您需要管理员权限。"
+msgstr "修改时间或日期设置需要认证。"
 
-#: ../panels/display/cc-display-panel.c:567
+#: ../panels/display/cc-display-panel.c:573
 msgid "Lid Closed"
-msgstr "盖已合上"
+msgstr "上盖已合上"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:570
+#: ../panels/display/cc-display-panel.c:576
 msgid "Mirrored"
 msgstr "镜像显示"
 
-#: ../panels/display/cc-display-panel.c:572
-#: ../panels/display/cc-display-panel.c:2195
+#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:2430
 msgid "Primary"
-msgstr "主"
-
-#: ../panels/display/cc-display-panel.c:574
-#: ../panels/notifications/cc-notifications-panel.c:247
-#: ../panels/power/cc-power-panel.c:1713 ../panels/power/cc-power-panel.c:1724
-#: ../panels/privacy/cc-privacy-panel.c:155
-#: ../panels/privacy/cc-privacy-panel.c:222
-#: ../panels/universal-access/cc-ua-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:572
-#: ../panels/universal-access/cc-ua-panel.c:695
+msgstr "主显示器"
+
+#: ../panels/display/cc-display-panel.c:580
+#: ../panels/notifications/cc-notifications-panel.c:257
+#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:269
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "å…³"
 
-#: ../panels/display/cc-display-panel.c:577
+#: ../panels/display/cc-display-panel.c:583
 msgid "Secondary"
-msgstr "次"
+msgstr "副显示器"
 
 #. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1579
+#: ../panels/display/cc-display-panel.c:1558
 msgid "Arrange Combined Displays"
 msgstr "安排多个显示"
 
-#: ../panels/display/cc-display-panel.c:1583
-#: ../panels/display/cc-display-panel.c:2021
+#: ../panels/display/cc-display-panel.c:1562
+#: ../panels/display/cc-display-panel.c:2208
 #: ../panels/network/connection-editor/connection-editor.ui.h:2
 #: ../panels/network/network-wifi.ui.h:2
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1607
+#: ../panels/display/cc-display-panel.c:1586
 msgid "Drag displays to rearrange them"
-msgstr "拖动显示屏来重新排列它们"
+msgstr "拖动以重新排列显示屏拖动以重新排列显示屏"
+
+#. translators: example string is "60 Hz (NTSC)"
+#. * NTSC is https://en.wikipedia.org/wiki/NTSC
+#: ../panels/display/cc-display-panel.c:1793
+#, c-format
+msgid "%d Hz (NTSC)"
+msgstr "%d Hz (NTSC)"
+
+#. translators: example string is "60 Hz"
+#: ../panels/display/cc-display-panel.c:1799
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
 
-#: ../panels/display/cc-display-panel.c:2073
+#: ../panels/display/cc-display-panel.c:2260
 msgid "Rotate counterclockwise by 90°"
 msgstr "逆时针旋转 90°"
 
-#: ../panels/display/cc-display-panel.c:2091
+#: ../panels/display/cc-display-panel.c:2278
 msgid "Rotate by 180°"
 msgstr "旋转 180°"
 
-#: ../panels/display/cc-display-panel.c:2109
+#: ../panels/display/cc-display-panel.c:2296
 msgid "Rotate clockwise by 90°"
 msgstr "顺时针旋转 90°"
 
-#: ../panels/display/cc-display-panel.c:2130
+#: ../panels/display/cc-display-panel.c:2317
 msgid "Size"
 msgstr "大小"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2143
+#: ../panels/display/cc-display-panel.c:2332
 msgid "Aspect Ratio"
 msgstr "宽高比"
 
-#: ../panels/display/cc-display-panel.c:2165
+#: ../panels/display/cc-display-panel.c:2355
 #: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "分辨率"
 
-#: ../panels/display/cc-display-panel.c:2196
+#: ../panels/display/cc-display-panel.c:2375
+msgid "Adjust for TV"
+msgstr "为 TV 调整"
+
+#: ../panels/display/cc-display-panel.c:2399
+msgid "Refresh Rate"
+msgstr "刷新频率"
+
+#: ../panels/display/cc-display-panel.c:2431
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "åœ¨æ­¤æ˜¾ç¤ºå™¨ä¸Šæ˜¾ç¤ºé¡¶æ å’Œæ´»åŠ¨æ¦‚è§ˆ"
 
-#: ../panels/display/cc-display-panel.c:2202
+#: ../panels/display/cc-display-panel.c:2437
 msgid "Secondary Display"
-msgstr "第二显示器"
+msgstr "副显示器"
 
-#: ../panels/display/cc-display-panel.c:2203
+#: ../panels/display/cc-display-panel.c:2438
 msgid "Join this display with another to create an extra workspace"
 msgstr "将该显示器与另一显示器合并以扩展工作空间"
 
 # 左撇子有歧视色彩。
-#: ../panels/display/cc-display-panel.c:2210
+#: ../panels/display/cc-display-panel.c:2445
 msgid "Presentation"
 msgstr "演示"
 
-#: ../panels/display/cc-display-panel.c:2211
+#: ../panels/display/cc-display-panel.c:2446
 msgid "Show slideshows and media only"
 msgstr "只显示幻灯片和多媒体"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2216
+#: ../panels/display/cc-display-panel.c:2451
 msgid "Mirror"
 msgstr "镜像"
 
-#: ../panels/display/cc-display-panel.c:2217
+#: ../panels/display/cc-display-panel.c:2452
 msgid "Show your existing view on both displays"
 msgstr "在两块显示器上同时显示当前视图"
 
-#: ../panels/display/cc-display-panel.c:2223
+#: ../panels/display/cc-display-panel.c:2458
 msgid "Turn Off"
 msgstr "关闭"
 
-#: ../panels/display/cc-display-panel.c:2224
+#: ../panels/display/cc-display-panel.c:2459
 msgid "Don't use this display"
 msgstr "不使用该显示器"
 
-#: ../panels/display/cc-display-panel.c:2449
+#: ../panels/display/cc-display-panel.c:2770
 msgid "Could not get screen information"
-msgstr "æ— æ³•èŽ·å¾—å±å¹•ä¿¡æ¯"
+msgstr "æ— æ³•èŽ·å–å±å¹•ä¿¡æ¯"
 
-#: ../panels/display/cc-display-panel.c:2480
+#: ../panels/display/cc-display-panel.c:2801
 msgid "_Arrange Combined Displays"
 msgstr "安排多个显示(_A)"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+msgid "Dis­plays"
 msgstr "显示"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
 msgid "Choose how to use connected monitors and projectors"
-msgstr "选择如何使用连接的显示器和投影仪"
+msgstr "选择如何使用接入的显示器和投影仪"
 
 #. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:4
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
 msgstr ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影仪;屏幕;分"
 "辨率;刷新;"
 
-#: ../panels/info/cc-info-panel.c:385
-msgid "Wayland"
-msgstr "Wayland"
-
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:434 ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "未知"
 
-#: ../panels/info/cc-info-panel.c:473
+#: ../panels/info/cc-info-panel.c:567
+#, c-format
+msgid "%s %d-bit (Build ID: %s)"
+msgstr "%s %d 位（构建 ID：%s）"
+
+#: ../panels/info/cc-info-panel.c:569
+#, c-format
+msgid "%d-bit (Build ID: %s)"
+msgstr "%d 位（构建 ID：%s）"
+
+#: ../panels/info/cc-info-panel.c:577
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位"
 
-#: ../panels/info/cc-info-panel.c:475
+#: ../panels/info/cc-info-panel.c:579
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位"
 
-#: ../panels/info/cc-info-panel.c:1155
+#: ../panels/info/cc-info-panel.c:1260
 msgid "Ask what to do"
 msgstr "询问如何处理"
 
-#: ../panels/info/cc-info-panel.c:1159
+#: ../panels/info/cc-info-panel.c:1264
 msgid "Do nothing"
-msgstr "不处理"
+msgstr "æ— åŠ¨ä½œ"
 
-#: ../panels/info/cc-info-panel.c:1163
+#: ../panels/info/cc-info-panel.c:1268
 msgid "Open folder"
 msgstr "打开文件夹"
 
-#: ../panels/info/cc-info-panel.c:1254
+#: ../panels/info/cc-info-panel.c:1359
 msgid "Other Media"
 msgstr "其他媒体"
 
-#: ../panels/info/cc-info-panel.c:1285
+#: ../panels/info/cc-info-panel.c:1390
 msgid "Select an application for audio CDs"
 msgstr "选择播放音频 CD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1286
+#: ../panels/info/cc-info-panel.c:1391
 msgid "Select an application for video DVDs"
 msgstr "选择播放视频 DVD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1287
+#: ../panels/info/cc-info-panel.c:1392
 msgid "Select an application to run when a music player is connected"
-msgstr "选择要在连接音乐播放器后运行的应用程序"
+msgstr "选择连接音乐播放器后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1288
+#: ../panels/info/cc-info-panel.c:1393
 msgid "Select an application to run when a camera is connected"
-msgstr "选择要在连接相机后运行的应用程序"
+msgstr "选择连接相机后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1289
+#: ../panels/info/cc-info-panel.c:1394
 msgid "Select an application for software CDs"
-msgstr "选择要在插入软件 CD 时运行的应用程序"
+msgstr "选择插入软件 CD 时运行的应用程序"
 
 #. translators: these strings are duplicates of shared-mime-info
 #. * strings, just here to fix capitalization of the English originals.
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1301
+#: ../panels/info/cc-info-panel.c:1406
 msgid "audio DVD"
 msgstr "音频 DVD"
 
-#: ../panels/info/cc-info-panel.c:1302
+#: ../panels/info/cc-info-panel.c:1407
 msgid "blank Blu-ray disc"
 msgstr "空白蓝光光盘"
 
-#: ../panels/info/cc-info-panel.c:1303
+#: ../panels/info/cc-info-panel.c:1408
 msgid "blank CD disc"
 msgstr "空白 CD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-panel.c:1409
 msgid "blank DVD disc"
 msgstr "空白 DVD 光盘"
 
 # 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-panel.c:1410
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-panel.c:1411
 msgid "Blu-ray video disc"
 msgstr "蓝光视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-panel.c:1412
 msgid "e-book reader"
 msgstr "电子书阅读器"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-panel.c:1413
 msgid "HD DVD video disc"
 msgstr "HD DVD 视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-panel.c:1414
 msgid "Picture CD"
 msgstr "图片 CD"
 
-#: ../panels/info/cc-info-panel.c:1310
+#: ../panels/info/cc-info-panel.c:1415
 msgid "Super Video CD"
-msgstr "SVCD"
+msgstr "超级 VCD "
 
-#: ../panels/info/cc-info-panel.c:1311
+#: ../panels/info/cc-info-panel.c:1416
 msgid "Video CD"
 msgstr "视频 CD"
 
-#: ../panels/info/cc-info-panel.c:1312
+#: ../panels/info/cc-info-panel.c:1417
 msgid "Windows software"
 msgstr "Windows 软件"
 
-#: ../panels/info/cc-info-panel.c:1435
-#: ../panels/keyboard/keyboard-shortcuts.c:1947
+#: ../panels/info/cc-info-panel.c:1540
 msgid "Section"
 msgstr "节"
 
-#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1549 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "总览"
 
-#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1555 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "默认应用程序"
 
-#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1560 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "可移动介质"
 
-#: ../panels/info/cc-info-panel.c:1480
+#: ../panels/info/cc-info-panel.c:1585
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#: ../panels/network/connection-editor/ce-page-details.c:240
-#: ../panels/network/network-wifi.ui.h:46
-msgid "Details"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "De­tails"
 msgstr "详细信息"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 msgid "View information about your system"
-msgstr "查看您系统的信息"
+msgstr "查看系统信息"
 
 #. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1363,7 +1441,7 @@ msgstr "磁盘"
 
 #: ../panels/info/info.ui.h:10
 msgid "Calculating…"
-msgstr "正在计算..."
+msgstr "正在计算…"
 
 #: ../panels/info/info.ui.h:11
 msgid "Graphics"
@@ -1379,7 +1457,7 @@ msgstr "检查更新"
 
 #: ../panels/info/info.ui.h:15
 msgid "_Web"
-msgstr "网络(_W)"
+msgstr "_Web"
 
 #: ../panels/info/info.ui.h:16
 msgid "_Mail"
@@ -1423,7 +1501,7 @@ msgstr "软件(_S)"
 
 #: ../panels/info/info.ui.h:27
 msgid "_Other Media…"
-msgstr "其他媒体(_O)..."
+msgstr "其他媒体(_O)…"
 
 #: ../panels/info/info.ui.h:28
 msgid "_Never prompt or start programs on media insertion"
@@ -1451,7 +1529,7 @@ msgstr "启动媒体播放器"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:6
 msgid "Play (or play/pause)"
-msgstr "播放(或者 播放/暂停）"
+msgstr "播放（或播放/暂停）"
 
 #: ../panels/keyboard/00-multimedia.xml.in.h:7
 msgid "Pause playback"
@@ -1474,7 +1552,6 @@ msgid "Eject"
 msgstr "弹出"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 #: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "打字"
@@ -1495,8 +1572,9 @@ msgstr "启动器"
 msgid "Launch help browser"
 msgstr "启动帮助浏览器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1605
-#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
+#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "设置"
 
@@ -1514,7 +1592,7 @@ msgstr "启动网页浏览器"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:7
 msgid "Home folder"
-msgstr "主文件夹"
+msgstr "主目录"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:8
 msgctxt "keybinding"
@@ -1555,7 +1633,7 @@ msgstr "复制选区截图到剪贴板"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:11
 msgid "Record a short screencast"
-msgstr "记录一小段屏幕录像。"
+msgstr "记录一小段屏幕录像"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
 msgid "System"
@@ -1570,7 +1648,6 @@ msgid "Lock screen"
 msgstr "锁定屏幕"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
 msgid "Universal Access"
 msgstr "通用辅助功能"
 
@@ -1604,13 +1681,23 @@ msgstr "减小文本字号"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:9
 msgid "High contrast on or off"
-msgstr "高对比度开或关"
+msgstr "高对比度开关"
+
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:522
+#: ../panels/keyboard/cc-keyboard-manager.c:830
+msgid "Custom Shortcuts"
+msgstr "自定义快捷键"
 
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:1219
+#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/shortcut-editor.ui.h:2
 #: ../panels/network/network-wifi.ui.h:31
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
 #: ../panels/user-accounts/um-fingerprint-dialog.c:213
@@ -1637,186 +1724,129 @@ msgstr "Compose é”®"
 msgid "Modifiers-only switch to next source"
 msgstr "切换至下一输入源的修饰键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
-msgstr "键盘"
+#: ../panels/keyboard/cc-keyboard-panel.c:217
+msgid "Reset the shortcut to its default value"
+msgstr "重置快捷键为它的默认值"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "View and change keyboard shortcuts and set your typing preferences"
-msgstr "查看和更改快捷键，以及设置您的打字偏好"
-
-#. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "自定义快捷键"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "_Name:"
-msgstr "名称(_N)："
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "C_ommand:"
-msgstr "命令(_O)："
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Repeat Keys"
-msgstr "重复键"
-
-#: ../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:8
-msgid "_Delay:"
-msgstr "延时(_D)："
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-msgid "_Speed:"
-msgstr "速度(_S)："
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#, c-format
+msgid ""
+"%s is already being used for <b>%s</b>. If you replace it, %s will be "
+"disabled"
+msgstr "%s 已被用于 <b>%s</b>。如果您替换了它，%s 将被禁用"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-msgctxt "keyboard, delay"
-msgid "Short"
-msgstr "短"
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+msgid "Set Custom Shortcut"
+msgstr "设置自定义快捷键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
-msgctxt "keyboard, speed"
-msgid "Slow"
-msgstr "æ…¢"
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+msgid "Set Shortcut"
+msgstr "设置快捷键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-msgid "Repeat keys speed"
-msgstr "重复键速度"
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr "输入新的快捷键以更改<b>%s</b>。"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-msgctxt "keyboard, delay"
-msgid "Long"
-msgstr "é•¿"
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:945
+msgid "Add Custom Shortcut"
+msgstr "æ·»åŠ è‡ªå®šä¹‰å¿«æ·é”®"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
-msgctxt "keyboard, speed"
-msgid "Fast"
-msgstr "å¿«"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+msgid "Key­board"
+msgstr "键盘"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
-msgid "Cursor Blinking"
-msgstr "å…‰æ ‡é—ªçƒ"
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "查看和更改快捷并设置打字偏好"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
-msgid "Cursor _blinks in text fields"
-msgstr "æ–‡æœ¬åŸŸä¸­å…‰æ ‡é—ªçƒ(_B)"
+#. Translators: those are keywords for the keyboard control-center panel
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
+msgid "Shortcut;Repeat;Blink;"
+msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-msgid "S_peed:"
-msgstr "速度(_P)："
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
+msgid "No keyboard shortcut found"
+msgstr "未找到键盘快捷键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Cursor blink speed"
-msgstr "å…‰æ ‡é—ªçƒé€Ÿåº¦"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 ../shell/panel-list.ui.h:4
+msgid "Try a different search"
+msgstr "尝试不同的搜索"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/region/region.ui.h:5
-msgid "Input Sources"
-msgstr "输入源"
+#: ../panels/keyboard/shortcut-editor.ui.h:1
+msgid "Press Esc to cancel."
+msgstr "按 Esc 键取消。"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
-msgid "Add Shortcut"
-msgstr "æ·»åŠ å¿«æ·é”®"
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "名称"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
-msgid "Remove Shortcut"
-msgstr "移除快捷键"
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+msgid "Command"
+msgstr "命令"
 
-#: ../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:24
-msgid "Shortcuts"
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+msgid "Shortcut"
 msgstr "快捷键"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:636
-#: ../panels/keyboard/keyboard-shortcuts.c:644
-msgid "Custom Shortcuts"
-msgstr "自定义快捷键"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:861
-msgid "<Unknown Action>"
-msgstr "<未知动作>"
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+msgid "Edit"
+msgstr "编辑"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1358
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"%s ä¸èƒ½ç”¨ä½œå¿«æ·é”®ï¼Œå¦åˆ™å°†æ— æ³•ä½¿ç”¨å…¶è¿›è¡Œæ­£å¸¸è¾“å…¥ã€‚\n"
-"请组合 Ctrl、Alt 或 Shift 键再试一次"
+#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "æ— "
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1388
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"快捷键 %s 已被用于\n"
-"%s"
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+msgid "Remove"
+msgstr "移除"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1393
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr "如果您重新分配快捷键 %s，则快捷键 %s 将被禁用"
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Enter the new shortcut"
+msgstr "输入新的快捷键"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1399
-msgid "_Reassign"
-msgstr "重新分配(_R)"
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "取消"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1440
-#, c-format
-msgid ""
-"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
-"automatically set it to \"%s\"?"
-msgstr "%s å·²å ç”¨å¿«æ·é”® %s ，您是否想将它自动设置为 %s ？"
+#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: ../panels/network/connection-editor/ce-page-ip4.c:305
+#: ../panels/network/connection-editor/ce-page-ip6.c:277
+msgid "Add"
+msgstr "æ·»åŠ "
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1450
-#, c-format
-msgid ""
-"\"%s\" is currently associated with \"%s\", this shortcut will be disabled "
-"if you move forward."
-msgstr "快捷键 %s 已被分配给 %s ，如果继续，该快捷键将被禁用。"
+#: ../panels/keyboard/shortcut-editor.ui.h:13
+msgid "Replace"
+msgstr "替换"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1457
-msgid "_Assign"
-msgstr "分配(_A)"
+#: ../panels/keyboard/shortcut-editor.ui.h:14
+msgid "Set"
+msgstr "设置"
 
-#: ../panels/mouse/cc-mouse-panel.c:94
+#: ../panels/mouse/cc-mouse-panel.c:82
 msgid "Test Your _Settings"
 msgstr "测试您的设置(_S)"
 
-#: ../panels/mouse/cc-mouse-panel.c:107
-msgid "Test Your Settings"
-msgstr "测试您的设置"
-
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+msgid "Mouse & Touch­pad"
 msgstr "é¼ æ ‡å’Œè§¦æ‘¸æ¿"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
-msgstr "æ”¹å˜é¼ æ ‡å’Œè§¦æ‘¸æ¿çµæ•åº¦ï¼Œå¹¶é€‰æ‹©æƒ¯ç”¨å³æ‰‹æˆ–å·¦æ‰‹"
+msgstr "æ”¹å˜é¼ æ ‡å’Œè§¦æ‘¸æ¿çµæ•åº¦ï¼Œå¹¶é€‰æ‹©å³æ‰‹æˆ–å·¦æ‰‹ä¹ æƒ¯"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr ""
 "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;触摸板;指针;触摸;单击;双"
@@ -1827,81 +1857,61 @@ msgid "General"
 msgstr "常规"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
-msgctxt "double click, speed"
-msgid "Slow"
-msgstr "æ…¢"
+msgid "Primary Button"
+msgstr "主按钮"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgid "Double-click timeout"
-msgstr "双击超时"
+msgid "Sets the order of physical buttons on mice and touchpads."
+msgstr "è®¾ç½®é¼ æ ‡å’Œè§¦æŽ§æ¿ä¸Šçš„ç‰©ç†æŒ‰é’®çš„æŽ’åˆ—ã€‚"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:4
-msgctxt "double click, speed"
-msgid "Fast"
-msgstr "å¿«"
+msgid "Left"
+msgstr "å·¦"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:5
-msgid "_Double-click"
-msgstr "双击(_D)"
+msgid "Right"
+msgstr "右"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "Primary _button"
-msgstr "主按钮(_B)"
+msgid "Mouse"
+msgstr "é¼ æ ‡"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:7
-msgctxt "mouse, left button as primary"
-msgid "_Left"
-msgstr "å·¦(_L)"
+msgid "Mouse Speed"
+msgstr "é¼ æ ‡é€Ÿåº¦"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:8
-msgctxt "mouse, right button as primary"
-msgid "_Right"
-msgstr "右(_R)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
-msgid "Mouse"
-msgstr "é¼ æ ‡"
+msgid "Double-click timeout"
+msgstr "双击超时"
 
+#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
 #: ../panels/mouse/gnome-mouse-properties.ui.h:10
-msgid "_Pointer speed"
-msgstr "指针速度(_P)"
+msgid "Natural Scrolling"
+msgstr "自然滚动"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:11
-msgctxt "mouse pointer, speed"
-msgid "Slow"
-msgstr "æ…¢"
+msgid "Scrolling moves the content, not the view."
+msgstr "滚动移动内容而非视图。"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:12
-msgctxt "mouse pointer, speed"
-msgid "Fast"
-msgstr "å¿«"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Touchpad"
 msgstr "触摸板"
 
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+msgid "Touchpad Speed"
+msgstr "触摸板速度"
+
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
-msgctxt "touchpad pointer, speed"
-msgid "Slow"
-msgstr "æ…¢"
+msgid "Tap to Click"
+msgstr "轻拍以点击"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
-msgctxt "touchpad pointer, speed"
-msgid "Fast"
-msgstr "å¿«"
+msgid "Two-finger Scrolling"
+msgstr "双指滚动"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:16
-msgid "Tap to _click"
-msgstr "轻触表示点击(_C)"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
-msgid "Two _finger scroll"
-msgstr "双指滚动(_F)"
-
-#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
-msgid "_Natural scrolling"
-msgstr "自然滚动(_N)"
+msgid "Edge Scrolling"
+msgstr "边缘滚动"
 
 #: ../panels/mouse/gnome-mouse-test.c:130
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
@@ -1938,11 +1948,11 @@ msgstr "辅键单击"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:349
 msgid "Air_plane Mode"
 msgstr "飞行模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:967
+#: ../panels/network/cc-network-panel.c:953
 msgid "Network proxy"
 msgstr "网络代理"
 
@@ -1950,291 +1960,287 @@ msgstr "网络代理"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
-#: ../panels/network/net-vpn.c:431
+#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/net-vpn.c:440
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1300
+#: ../panels/network/cc-network-panel.c:1194
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "抱歉，发生错误。请联系软件提供商。"
 
-#: ../panels/network/cc-network-panel.c:1306
+#: ../panels/network/cc-network-panel.c:1200
 msgid "NetworkManager needs to be running."
-msgstr "需要运行 NetworkManager"
+msgstr "需要运行 NetworkManager。"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:1
 msgid "802.1x _Security"
 msgstr "802.1X 安全性(_S)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:3
 #: ../panels/printers/printers.ui.h:14
 msgid "page 1"
 msgstr "第 1 页"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/connection-editor/security-page.ui.h:4
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 msgid "Anony_mous identity"
 msgstr "匿名身份(_M)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:4
+#: ../panels/network/connection-editor/security-page.ui.h:5
 msgid "Inner _authentication"
 msgstr "内部认证(_A)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:6
 #: ../panels/printers/printers.ui.h:16
 msgid "page 2"
 msgstr "第 2 页"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:455
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:459
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
 msgstr "安全"
 
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "自动"
 
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "配置 %d"
+
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/connection-editor/ce-page-details.c:50
+#: ../panels/network/net-device-wifi.c:214
+#: ../panels/network/net-device-wifi.c:390
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:222
-#: ../panels/network/net-device-wifi.c:387
+#: ../panels/network/connection-editor/ce-page-details.c:54
+#: ../panels/network/net-device-wifi.c:218
+#: ../panels/network/net-device-wifi.c:395
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:226
+#: ../panels/network/connection-editor/ce-page-details.c:58
+#: ../panels/network/net-device-wifi.c:222
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/connection-editor/ce-page-details.c:63
+#: ../panels/network/net-device-wifi.c:227
 msgid "Enterprise"
 msgstr "企业"
 
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:236
-#: ../panels/network/net-device-wifi.c:372
+#: ../panels/network/connection-editor/ce-page-details.c:68
+#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/net-device-wifi.c:380
 msgctxt "Wifi security"
 msgid "None"
 msgstr "æ— "
 
-#: ../panels/network/connection-editor/ce-page-details.c:91
-#: ../panels/power/power.ui.h:19
+#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "从不"
 
-#: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:815
-msgid "Today"
-msgstr "今天"
-
 #: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:818
-msgid "Yesterday"
-msgstr "昨天"
-
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:476
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:485
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天前"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:533
+#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:542
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/秒"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:562
+#: ../panels/network/connection-editor/ce-page-details.c:179
+#: ../panels/network/net-device-wifi.c:571
 msgctxt "Signal strength"
 msgid "None"
 msgstr "æ— "
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:564
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:573
 msgctxt "Signal strength"
 msgid "Weak"
-msgstr "å¼±"
+msgstr "较弱"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:566
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:575
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "一般"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:568
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:577
 msgctxt "Signal strength"
 msgid "Good"
-msgstr "好"
+msgstr "良好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:570
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:579
 msgctxt "Signal strength"
 msgid "Excellent"
-msgstr "极好"
+msgstr "非常好"
 
-#: ../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:270
+#: ../panels/network/connection-editor/ce-page-details.c:225
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+#: ../shell/panel-list.ui.h:2
+msgid "Details"
+msgstr "详细信息"
+
+#: ../panels/network/connection-editor/ce-page-ethernet.c:215
+#: ../panels/network/connection-editor/ce-page-vpn.c:221
+#: ../panels/network/connection-editor/ce-page-wifi.c:227
 #: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "身份"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:177
-#: ../panels/network/connection-editor/ce-page-ip4.c:439
-#: ../panels/network/connection-editor/ce-page-ip6.c:179
-#: ../panels/network/connection-editor/ce-page-ip6.c:443
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:461
+#: ../panels/network/connection-editor/ce-page-ip6.c:180
+#: ../panels/network/connection-editor/ce-page-ip6.c:427
 msgid "Address"
 msgstr "地址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
+#: ../panels/network/connection-editor/ce-page-ip4.c:215
+#: ../panels/network/connection-editor/ce-page-ip4.c:474
 msgid "Netmask"
-msgstr "æŽ©ç "
+msgstr "å­ç½‘æŽ©ç "
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:204
-#: ../panels/network/connection-editor/ce-page-ip4.c:465
-#: ../panels/network/connection-editor/ce-page-ip6.c:205
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip4.c:229
+#: ../panels/network/connection-editor/ce-page-ip4.c:487
+#: ../panels/network/connection-editor/ce-page-ip6.c:206
+#: ../panels/network/connection-editor/ce-page-ip6.c:453
 #: ../panels/network/network-vpn.ui.h:2
 msgid "Gateway"
 msgstr "网关"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
+#: ../panels/network/connection-editor/ce-page-ip4.c:250
+#: ../panels/network/connection-editor/ce-page-ip6.c:223
 msgid "Delete Address"
 msgstr "åˆ é™¤åœ°å€"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
-msgid "Add"
-msgstr "æ·»åŠ "
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
+#: ../panels/network/connection-editor/ce-page-ip4.c:368
+#: ../panels/network/connection-editor/ce-page-ip6.c:334
 msgid "Server"
 msgstr "服务器"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:385
+#: ../panels/network/connection-editor/ce-page-ip6.c:351
 msgid "Delete DNS Server"
 msgstr "åˆ é™¤ DNS 服务器"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:479
-#: ../panels/network/connection-editor/ce-page-ip6.c:487
+#: ../panels/network/connection-editor/ce-page-ip4.c:501
+#: ../panels/network/connection-editor/ce-page-ip6.c:467
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "权重"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:500
-#: ../panels/network/connection-editor/ce-page-ip6.c:508
+#: ../panels/network/connection-editor/ce-page-ip4.c:522
+#: ../panels/network/connection-editor/ce-page-ip6.c:484
 msgid "Delete Route"
 msgstr "åˆ é™¤è·¯ç”±"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
+#: ../panels/network/connection-editor/ce-page-ip4.c:626
 #: ../panels/network/network-wifi.ui.h:27
 msgid "Automatic (DHCP)"
-msgstr "自动(DHCP)"
+msgstr "自动 (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:619
-#: ../panels/network/connection-editor/ce-page-ip6.c:621
+#: ../panels/network/connection-editor/ce-page-ip4.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
 #: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:182
+#: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
 msgstr "手动"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
+#: ../panels/network/connection-editor/ce-page-ip4.c:634
+#: ../panels/network/connection-editor/ce-page-ip6.c:596
 msgid "Link-Local Only"
-msgstr "仅本地连接"
+msgstr "仅本地链路"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:967
+#: ../panels/network/connection-editor/ce-page-ip4.c:979
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:192
-#: ../panels/network/connection-editor/ce-page-ip6.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:193
+#: ../panels/network/connection-editor/ce-page-ip6.c:440
 msgid "Prefix"
 msgstr "前缀"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:613
+#: ../panels/network/connection-editor/ce-page-ip6.c:584
 #: ../panels/network/connection-editor/ethernet-page.ui.h:1
 #: ../panels/network/connection-editor/ip4-page.ui.h:4
 #: ../panels/network/connection-editor/ip6-page.ui.h:4
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:182
+#: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Automatic"
 msgstr "自动"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
+#: ../panels/network/connection-editor/ce-page-ip6.c:588
 msgid "Automatic, DHCP only"
 msgstr "自动，仅 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:937
+#: ../panels/network/connection-editor/ce-page-ip6.c:898
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/connection-editor/ce-page-reset.c:78
 #: ../panels/network/network-wifi.ui.h:51
 msgid "Reset"
 msgstr "重置"
 
-#: ../panels/network/connection-editor/ce-page-security.c:250
+#: ../panels/network/connection-editor/ce-page-security.c:248
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "æ— "
 
-#: ../panels/network/connection-editor/ce-page-security.c:273
+#: ../panels/network/connection-editor/ce-page-security.c:271
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128 位密钥(Hex 或者 ASCII)"
+msgstr "WEP 40/128 位密钥（Hex 或 ASCII）"
 
-#: ../panels/network/connection-editor/ce-page-security.c:283
+#: ../panels/network/connection-editor/ce-page-security.c:281
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 ä½å¯†ç "
 
-#: ../panels/network/connection-editor/ce-page-security.c:296
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:294
+#: ../panels/network/wireless-security/wireless-security.c:463
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:309
+#: ../panels/network/connection-editor/ce-page-security.c:307
 msgid "Dynamic WEP (802.1x)"
 msgstr "动态 WEP (802.1X)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:323
+#: ../panels/network/connection-editor/ce-page-security.c:321
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 和 WPA2 个人"
 
-#: ../panels/network/connection-editor/ce-page-security.c:337
+#: ../panels/network/connection-editor/ce-page-security.c:335
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 和 WPA2 企业"
 
@@ -2246,33 +2252,33 @@ msgstr "信号强度"
 #: ../panels/network/connection-editor/details-page.ui.h:2
 #: ../panels/network/network-wifi.ui.h:5
 msgid "Link speed"
-msgstr "连接速度"
+msgstr "链路速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:157
+#: ../panels/network/net-device-ethernet.c:153
 #: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:693
+#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:694
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6 地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:165
+#: ../panels/network/net-device-ethernet.c:161
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "硬件地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:169
+#: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
@@ -2282,7 +2288,7 @@ msgstr "默认路由"
 #: ../panels/network/connection-editor/details-page.ui.h:8
 #: ../panels/network/connection-editor/ip4-page.ui.h:3
 #: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:171
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
@@ -2295,11 +2301,11 @@ msgstr "上次使用"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
-msgstr "双绞线(TP)"
+msgstr "双绞线 (TP)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:3
 msgid "Attachment Unit Interface (AUI)"
-msgstr "连接单元接口(AUI)"
+msgstr "连接单元接口 (AUI)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:4
 msgid "BNC"
@@ -2307,7 +2313,7 @@ msgstr "BNC"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:5
 msgid "Media Independent Interface (MII)"
-msgstr "媒体独立接口(MII)"
+msgstr "媒体独立接口 (MII)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:6
 msgid "10 Mb/s"
@@ -2343,7 +2349,7 @@ msgstr "M_TU"
 #: ../panels/network/connection-editor/ethernet-page.ui.h:13
 #: ../panels/network/connection-editor/wifi-page.ui.h:5
 msgid "_Cloned Address"
-msgstr "克隆的地址"
+msgstr "克隆的地址(_C)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:14
 msgid "bytes"
@@ -2360,18 +2366,18 @@ msgid "Connect _automatically"
 msgstr "自动连接(_A)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:17
+#: ../panels/network/connection-editor/security-page.ui.h:2
 #: ../panels/network/connection-editor/vpn-page.ui.h:2
-#: ../panels/network/connection-editor/wifi-page.ui.h:8
 msgid "Firewall _Zone"
 msgstr "防火墙区域(_Z)"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:113
+#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:118
 msgctxt "Firewall zone"
 msgid "Default"
 msgstr "默认"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:50
 msgid "The zone defines the trust level of the connection"
 msgstr "此区域定义了对连接的信任级别"
 
@@ -2413,45 +2419,25 @@ msgstr "仅对该网络上的资源使用此连接(_O)"
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:269
+#: ../panels/network/connection-editor/net-connection-editor.c:296
 msgid "Unable to open connection editor"
 msgstr "æ— æ³•æ‰“å¼€è¿žæŽ¥ç¼–è¾‘å™¨"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:287
+#: ../panels/network/connection-editor/net-connection-editor.c:314
 msgid "New Profile"
 msgstr "新配置"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:577
+#: ../panels/network/connection-editor/net-connection-editor.c:635
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:578
-msgid "Bond"
-msgstr "绑定(Bond 方式)"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:580
-msgid "Team"
-msgstr "绑定(Team 方式)"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:582
-msgid "Bridge"
-msgstr "桥接"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:583
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../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:803
+#: ../panels/network/connection-editor/net-connection-editor.c:783
 msgid "Import from file…"
-msgstr "从文件导入..."
+msgstr "从文件导入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:874
-msgid "Add Network Connection"
-msgstr "æ·»åŠ ç½‘ç»œè¿žæŽ¥"
+#: ../panels/network/connection-editor/net-connection-editor.c:817
+msgid "Add VPN"
+msgstr "æ·»åŠ  VPN"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:41
@@ -2459,7 +2445,7 @@ msgid "_Reset"
 msgstr "重置(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1441
+#: ../panels/network/net-device-wifi.c:1536
 #: ../panels/network/network-wifi.ui.h:42
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -2468,24 +2454,24 @@ msgstr "忘记(_F)"
 msgid ""
 "Reset the settings for this network, including passwords, but remember it as "
 "a preferred network"
-msgstr "é‡ç½®è¿™ä¸ªç½‘ç»œåŒ…æ‹¬å¯†ç åœ¨å†…çš„è®¾ç½®ï¼Œä½†ä»å°è¯•è‡ªåŠ¨è¿žæŽ¥"
+msgstr "é‡ç½®è¿™ä¸ªç½‘ç»œåŒ…æ‹¬å¯†ç åœ¨å†…çš„è®¾ç½®ï¼Œä½†ä»ä½œä¸ºé¦–é€‰è¿žæŽ¥"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:4
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect"
-msgstr "åˆ é™¤ä¸Žè¿™ä¸ªç½‘ç»œæœ‰å…³çš„æ‰€æœ‰ç»†èŠ‚ï¼Œä¸å†å°è¯•è‡ªåŠ¨è¿žæŽ¥"
+msgstr "åˆ é™¤å…³äºŽè¿™ä¸ªç½‘ç»œçš„æ‰€æœ‰ç»†èŠ‚ï¼Œä¸å†å°è¯•è‡ªåŠ¨è¿žæŽ¥"
 
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
 msgstr "安全(_E)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:205
+#: ../panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "æ— æ³•å¯¼å…¥ VPN 连接"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:207
+#: ../panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2493,57 +2479,57 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"文件 %s æ— æ³•è¯»å–æˆ–è€…ä¸åŒ…å«å¯ä»¥è¯†åˆ«çš„ VPN 连接信息\n"
+"文件“%sâ€æ— æ³•è¯»å–æˆ–æœªåŒ…å«å¯è¯†åˆ«çš„ VPN 连接信息\n"
 "\n"
 "错误：%s。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:242
+#: ../panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "选择要导入的文件"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1941
-#: ../panels/sharing/cc-sharing-panel.c:492
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/cc-printers-panel.c:2078
+#: ../panels/sharing/cc-sharing-panel.c:373
 #: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:294
+#: ../panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named \"%s\" already exists."
-msgstr "名为 %s 的文件已存在。"
+msgstr "名为“%s”的文件已存在。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:296
+#: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:298
+#: ../panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
-msgstr "您要用正在保存的 VPN 连接替换 %s 么？"
+msgstr "您希望用将要保存的 VPN 连接替换 %s 么？"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:334
+#: ../panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "æ— æ³•å¯¼å…¥ VPN 连接"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:336
+#: ../panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
 "\n"
 "Error: %s."
 msgstr ""
-"æ— æ³•å¯¼å‡º VPN 连接 %s 到 %s。\n"
+"æ— æ³•å°† VPN 连接“%s”导出到 %s。\n"
 "\n"
 "错误：%s。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:371
+#: ../panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "导出 VPN 连接"
 
 #: ../panels/network/connection-editor/vpn-page.ui.h:4
 msgid "(Error: unable to load VPN connection editor)"
-msgstr "(é”™è¯¯ï¼šæ— æ³•è½½å…¥ VPN 连接编辑器)"
+msgstr "ï¼ˆé”™è¯¯ï¼šæ— æ³•è½½å…¥ VPN 连接编辑器）"
 
 #: ../panels/network/connection-editor/wifi-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:14
@@ -2564,62 +2550,47 @@ msgstr "家庭网络"
 msgid "Make available to _other users"
 msgstr "对其他用户可用(_O)"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Net­work"
 msgstr "网络"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
 msgid "Control how you connect to the Internet"
-msgstr "控制如何连接到互联网。"
+msgstr "控制连接到互联网的方式"
 
 #. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;"
+"DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;网络;æ— çº¿;æ— çº¿ä¿çœŸ;æ— çº¿;互联网协议;局域网;代理;广域网;宽"
-"带;调制解调器;蓝牙;虚拟专用网;虚拟局域网;桥接;绑定;域名系统;"
-
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "绑定从属设备(Bond 方式)"
-
-#: ../panels/network/net-device-bond.c:102
-#: ../panels/network/net-device-bridge.c:102
-#: ../panels/network/net-device-team.c:102
-msgid "(none)"
-msgstr "(æ— )"
-
-#: ../panels/network/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "桥接从属设备"
+"DNS;网络;æ— çº¿;æ— çº¿ä¿çœŸ;æ— çº¿;互联网协议;局域网;代理;广域网;宽带;调制解调器;蓝"
+"牙;虚拟专用网;域名系统;"
 
-#: ../panels/network/net-device-ethernet.c:110
-#: ../panels/network/net-device-wifi.c:462
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:471
 msgid "never"
 msgstr "从不"
 
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:472
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:481
 msgid "today"
 msgstr "今天"
 
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:474
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:483
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
-#: ../panels/printers/printers.ui.h:13
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: ../panels/network/net-device-ethernet.c:176
+#: ../panels/network/net-device-ethernet.c:172
 #: ../panels/network/network-wifi.ui.h:12
 msgid "Last used"
 msgstr "上次使用"
@@ -2629,87 +2600,77 @@ msgstr "上次使用"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:286
+#: ../panels/network/net-device-ethernet.c:280
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有线"
 
-#: ../panels/network/net-device-ethernet.c:354
-#: ../panels/network/net-device-wifi.c:1597
+#: ../panels/network/net-device-ethernet.c:348
+#: ../panels/network/net-device-wifi.c:1694
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8
-#: ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
 msgid "Options…"
-msgstr "选项..."
-
-#: ../panels/network/net-device-ethernet.c:472
-#, c-format
-msgid "Profile %d"
-msgstr "配置 %d"
+msgstr "选项…"
 
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:223
 msgid "Add new connection"
 msgstr "æ·»åŠ æ–°è¿žæŽ¥"
 
-#: ../panels/network/net-device-team.c:77
-msgid "Team slaves"
-msgstr "绑定从属设备(Team 方式)"
-
-#: ../panels/network/net-device-wifi.c:1154
+#: ../panels/network/net-device-wifi.c:1205
 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 "å¦‚æžœæ‚¨æœ‰é™¤æ— çº¿ç½‘ç»œä»¥å¤–çš„æ–¹å¼è¿žæŽ¥åˆ°äº’è”ç½‘ï¼Œæ‚¨å¯ä»¥å°†å®ƒä¸Žå…¶ä»–äººåˆ†äº«ã€‚"
+msgstr ""
+"å¦‚æžœæœ‰æ— çº¿ç½‘ç»œä»¥å¤–çš„æ–¹å¼è¿žæŽ¥äº’è”ç½‘ï¼Œæ‚¨å¯ä»¥é…ç½®æ— çº¿çƒ­ç‚¹å¹¶ä¸Žä»–äººå…±äº«ç½‘ç»œè¿žæŽ¥ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1158
+#: ../panels/network/net-device-wifi.c:1209
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr "åˆ‡æ¢æ— çº¿ç½‘çƒ­ç‚¹ä¼šä½¿å¾—æ‚¨ä»Ž <b>%s</b> 断开。"
+msgstr "æ‰“å¼€æ— çº¿ç½‘çƒ­ç‚¹å°†ä½¿æ‚¨ä»Ž <b>%s</b> 断开。"
 
-#: ../panels/network/net-device-wifi.c:1162
+#: ../panels/network/net-device-wifi.c:1213
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "å¯ç”¨çƒ­ç‚¹æ¨¡å¼æ—¶æ— æ³•é€šè¿‡æ— çº¿ç½‘ç»œè®¿é—®äº’è”ç½‘ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1245
+#: ../panels/network/net-device-wifi.c:1296
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户？"
 
-#: ../panels/network/net-device-wifi.c:1248
+#: ../panels/network/net-device-wifi.c:1299
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
-#: ../panels/network/net-device-wifi.c:1305
+#: ../panels/network/net-device-wifi.c:1397
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系统策略禁止作为热点使用"
 
-#: ../panels/network/net-device-wifi.c:1308
+#: ../panels/network/net-device-wifi.c:1400
 msgid "Wireless device does not support Hotspot mode"
 msgstr "æ— çº¿è®¾å¤‡ä¸æ”¯æŒçƒ­ç‚¹æ¨¡å¼"
 
-#: ../panels/network/net-device-wifi.c:1437
+#: ../panels/network/net-device-wifi.c:1532
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
-msgstr "æ‰€é€‰ç½‘ç»œçš„ç»†èŠ‚ï¼ŒåŒ…æ‹¬å¯†ç å’Œå…¨éƒ¨è‡ªå®šä¹‰è®¾ç½®ï¼Œéƒ½å°†ä¸¢å¤±ã€‚"
+msgstr "æ‰€é€‰ç½‘ç»œçš„ç»†èŠ‚ï¼ŒåŒ…æ‹¬å¯†ç å’Œå…¨éƒ¨è‡ªå®šä¹‰è®¾ç½®éƒ½å°†ä¸¢å¤±ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1750
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: ../panels/network/net-device-wifi.c:1842
 msgid "History"
 msgstr "历史"
 
-#: ../panels/network/net-device-wifi.c:1754
-#: ../panels/region/input-options.ui.h:2 ../panels/wacom/button-mapping.ui.h:2
-#: ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/network/net-device-wifi.c:1846
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
 #: ../panels/wacom/gnome-wacom-properties.ui.h:5
 msgid "_Close"
 msgstr "关闭(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1762
+#: ../panels/network/net-device-wifi.c:1854
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -2734,7 +2695,7 @@ msgstr "代理"
 
 #: ../panels/network/network-ethernet.ui.h:2
 msgid "_Add Profile…"
-msgstr "æ·»åŠ é…ç½®(_A)"
+msgstr "æ·»åŠ é…ç½®(_A)…"
 
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
@@ -2742,7 +2703,11 @@ msgstr "IMEI"
 
 #: ../panels/network/network-mobile.ui.h:2
 msgid "Provider"
-msgstr "提供商"
+msgstr "提供者"
+
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "网络"
 
 #: ../panels/network/network-proxy.ui.h:1
 msgctxt "proxy method"
@@ -2761,11 +2726,11 @@ msgstr "自动"
 
 #: ../panels/network/network-proxy.ui.h:4
 msgid "_Method"
-msgstr "方法(_M)"
+msgstr "方式(_M)"
 
 #: ../panels/network/network-proxy.ui.h:5
 msgid "_Configuration URL"
-msgstr "配置 URL(_C)"
+msgstr "配置 URL (_C)"
 
 #: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
@@ -2805,7 +2770,7 @@ msgstr "SOCKS 代理端口"
 
 #: ../panels/network/network-simple.ui.h:7
 msgid "Turn device off"
-msgstr "设备关闭"
+msgstr "关闭设备"
 
 #: ../panels/network/network.ui.h:1
 msgid "Add Device"
@@ -2821,7 +2786,7 @@ msgstr "VPN 类型"
 
 #: ../panels/network/network-vpn.ui.h:3
 msgid "Group Name"
-msgstr "组名称"
+msgstr "组名"
 
 #: ../panels/network/network-vpn.ui.h:4
 msgid "Group Password"
@@ -2849,22 +2814,19 @@ msgstr "详细信息"
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:2
 #: ../panels/network/wireless-security/ws-leap.ui.h:2
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "_Password"
 msgstr "å¯†ç (_P)"
 
-#: ../panels/network/network-wifi.ui.h:20
-msgid "None"
-msgstr "æ— "
-
 #: ../panels/network/network-wifi.ui.h:21
 msgid "Show P_assword"
 msgstr "æ˜¾ç¤ºå¯†ç (_A)"
 
 #: ../panels/network/network-wifi.ui.h:22
 msgid "Make available to other users"
-msgstr "对其他用户有效"
+msgstr "对其他用户可用"
 
 #: ../panels/network/network-wifi.ui.h:23
 msgid "identity"
@@ -2872,11 +2834,11 @@ msgstr "身份"
 
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
-msgstr "自动(DHCP) 仅地址"
+msgstr "仅自动分配地址 (DHCP)"
 
 #: ../panels/network/network-wifi.ui.h:29
 msgid "Link-local only"
-msgstr "仅本地连接"
+msgstr "仅本地链路"
 
 #: ../panels/network/network-wifi.ui.h:30
 msgid "Shared with other computers"
@@ -2906,7 +2868,7 @@ msgstr "硬件"
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
-msgstr "将这个连接的设置重置为默认值，但仍尝试自动连接。"
+msgstr "将这个连接的设置重置为默认值，但仍作为首选连接。"
 
 #: ../panels/network/network-wifi.ui.h:44
 msgid ""
@@ -2928,7 +2890,7 @@ msgstr "Wi-Fi 热点"
 
 #: ../panels/network/network-wifi.ui.h:53
 msgid "_Turn On"
-msgstr "开启(_T)"
+msgstr "打开(_T)"
 
 #: ../panels/network/network-wifi.ui.h:54
 msgid "Wi-Fi"
@@ -2940,11 +2902,11 @@ msgstr "关闭 Wi-Fi"
 
 #: ../panels/network/network-wifi.ui.h:56
 msgid "_Use as Hotspot…"
-msgstr "用作热点(_U)..."
+msgstr "用作热点(_U)…"
 
 #: ../panels/network/network-wifi.ui.h:57
 msgid "_Connect to Hidden Network…"
-msgstr "连接到隐藏网络(_C)..."
+msgstr "连接到隐藏网络(_C)…"
 
 #: ../panels/network/network-wifi.ui.h:58
 msgid "_History"
@@ -2952,7 +2914,7 @@ msgstr "历史(_H)"
 
 #: ../panels/network/network-wifi.ui.h:59
 msgid "Switch off to connect to a Wi-Fi network"
-msgstr "关闭以连接到 Wi-Fi 网络"
+msgstr "å…³é—­ä»¥è¿žæŽ¥åˆ°æ— çº¿ç½‘ç»œ"
 
 #: ../panels/network/network-wifi.ui.h:60
 msgid "Network Name"
@@ -2967,356 +2929,337 @@ msgid "Security type"
 msgstr "安全类型"
 
 #: ../panels/network/network-wifi.ui.h:63
-msgid "Security key"
-msgstr "安全密钥"
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
+msgid "Password"
+msgstr "å¯†ç "
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "架构"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "未知状态"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "未托管"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "不可用"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "正在连接"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Authentication required"
 msgstr "需要认证"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "已连接"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "正在断开"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "连接失败"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
-msgstr "未知状态(丢失)"
+msgstr "未知状态（丢失）"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "未连接"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP 配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration expired"
-msgstr "IP 配置过期"
+msgstr "IP 配置已过期"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "需要认证凭据，但没有提供"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1X 客户端已断开"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1X 客户端配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1X 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1X 客户端认证耗时过长"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "PPP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPP 服务已断开"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP 失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCP 客户端启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCP 客户端错误"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "共享连接服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "共享连接服务失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "AutoIP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP 服务出错"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP 服务失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "线路忙"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "æ— æ‹¨å·éŸ³"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "æ— æ³•å»ºç«‹è½½æ³¢"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "拨号请求超时"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "拨号尝试失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "调制解调器初始化失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "æ— æ³•é€‰æ‹©æŒ‡å®šçš„ APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "未在搜索网络"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "网络注册被拒绝"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "网络注册超时"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "æ— æ³•åœ¨è¯·æ±‚çš„ç½‘ç»œä¸Šæ³¨å†Œ"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN 检查失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
-msgstr "可能缺少设备固件"
+msgstr "设备可能缺少固件"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "连接丢失"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "已假定为现有连接"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "未找到调制解调器"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "蓝牙连接失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "未插入 SIM 卡"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "需要 SIM PIN ç "
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "需要 SIM PUK ç "
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM 错误"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:412
-msgid "InfiniBand device does not support connected mode"
-msgstr "InfiniBand 不支持已连接模式"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:416
+#: ../panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "连接依赖失败"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "固件缺失"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "线缆已拔出"
 
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "未选择 CA 证书"
+#: ../panels/network/wireless-security/eap-method.c:69
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr "802.1x 安全性里未定义的错误 (wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr "不使用 CA 证书可能降低连接 Wi-Fi 网络安全性。您要选择一个 CA 证书吗？"
+#: ../panels/network/wireless-security/eap-method.c:245
+msgid "no file selected"
+msgstr "未选择文件"
 
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "忽略"
-
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "选择 CA 证书"
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid "unspecified error validating eap-method file"
+msgstr "验证 eap-method 文件时发生未知错误"
 
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER、PEM 或 PKCS#12 私钥(*.der、*.pem、*.p12)"
+#: ../panels/network/wireless-security/eap-method.c:480
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER、PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:648
+#: ../panels/network/wireless-security/eap-method.c:483
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "DER 或 PEM 证书(*.der、*.pem、*.crt、*.cer)"
+msgstr "DER 或 PEM 证书 (*.der, *.pem, *.crt, *.cer)"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+msgstr "缺失 EAP-FAST PAC 文件"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:271
-#: ../panels/network/wireless-security/eap-method-peap.c:280
+#: ../panels/network/wireless-security/eap-method-fast.c:268
+#: ../panels/network/wireless-security/eap-method-peap.c:302
+#: ../panels/network/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:287
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../panels/network/wireless-security/eap-method-fast.c:283
+#: ../panels/network/wireless-security/eap-method-peap.c:272
+#: ../panels/network/wireless-security/eap-method-ttls.c:288
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:409
+#: ../panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "选择 PAC 文件"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
-msgid "PAC _file"
-msgstr "PAC 文件(_F)"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
-msgid "_Inner authentication"
-msgstr "内部认证(_I)"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-msgid "PAC pro_visioning"
-msgstr "PAC 置备(_V)"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
@@ -3325,41 +3268,73 @@ msgstr "PAC 置备(_V)"
 msgid " "
 msgstr " "
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "已认证"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "两者"
 
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file"
+msgstr "PAC 文件(_F)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Inner authentication"
+msgstr "内部认证(_I)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "允许自动 PAC 配置(_V)"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr "缺失 EAP-LEAP 用户名"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr "缺失 EAP-LEAP å¯†ç "
+
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
 #: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "_Username"
 msgstr "用户名(_U)"
 
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
 #: ../panels/network/wireless-security/ws-leap.ui.h:3
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
 msgstr "æ˜¾ç¤ºå¯†ç (_W)"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr "æ— æ•ˆçš„ EAP-PEAP CA 证书：%s"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr "æ— æ•ˆçš„ EAP-PEAP CA 证书：未指定证书"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:287
+#: ../panels/network/wireless-security/eap-method-ttls.c:318
+#: ../panels/network/wireless-security/wireless-security.c:439
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:456
-#: ../panels/network/wireless-security/eap-method-ttls.c:350
+#: ../panels/network/wireless-security/eap-method-peap.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-ttls.c:412
 msgid "Choose a Certificate Authority certificate"
 msgstr "选择 CA 证书"
 
@@ -3377,19 +3352,56 @@ msgstr "版本 1"
 msgid "C_A certificate"
 msgstr "C_A 证书"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+msgid "No CA certificate is _required"
+msgstr "不需要 CA 证书(_R)"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)"
 
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "æ¯æ¬¡è¯¢é—®å¯†ç (_K)"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr "缺失 EAP 用户名"
+
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+msgid "missing EAP password"
+msgstr "缺失 EAP å¯†ç "
+
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr "缺失 EAP-TLS 身份"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "æ— æ•ˆçš„ EAP-TLS CA 证书：%s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr "æ— æ•ˆçš„ EAP-TLS CA 证书：未指定证书"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr "æ— æ•ˆçš„ EAP-TLS å¯†ç ï¼šç¼ºå¤±"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr "æ— æ•ˆçš„ EAP-TLS CA 私钥：%s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr "æ— æ•ˆçš„ EAP-TLS 用户证书：%s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "æœªåŠ å¯†çš„ç§é’¥ä¸å®‰å…¨"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:285
+#: ../panels/network/wireless-security/eap-method-tls.c:319
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -3397,16 +3409,16 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"é€‰æ‹©çš„ç§é’¥æ²¡æœ‰è®¾ç½®å¯†ç ï¼Œå¯èƒ½ä½¿æ‚¨çš„å®‰å…¨å‡­æ®é­å—æ”»å‡»ã€‚è¯·é€‰æ‹©ä¸€ä¸ªæœ‰å¯†ç çš„ç§"
-"钥。\n"
+"é€‰æ‹©çš„ç§é’¥æœªè®¾ç½®å¯†ç ï¼Œå¯èƒ½ä½¿æ‚¨çš„å®‰å…¨å‡­æ®é­å—æ”»å‡»å¹¶å¤±æ•ˆã€‚è¯·é€‰æ‹©ä¸€ä¸ªå¸¦æœ‰å¯†ç çš„"
+"私钥。\n"
 "\n"
-"(您可以使用 openssl æ¥å‘ç§é’¥æ·»åŠ å¯†ç )"
+"（您可以使用 openssl æ¥å‘ç§é’¥æ·»åŠ å¯†ç ï¼‰"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:495
 msgid "Choose your personal certificate"
 msgstr "选择您的个人证书"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:507
 msgid "Choose your private key"
 msgstr "选择您的私钥"
 
@@ -3418,51 +3430,56 @@ msgstr "身份(_D)"
 msgid "_User certificate"
 msgstr "用户证书(_U)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key"
 msgstr "私钥(_K)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password"
 msgstr "ç§é’¥å¯†ç (_P)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr "æ— æ•ˆçš„ EAP-TTLS CA 证书：%s"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr "æ— æ•ˆçš„ EAP-TTLS CA 证书：未指定证书"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "不要再次警告我(_W)"
+#: ../panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1x security"
+msgstr "验证 802.1x 安全性时发生未知错误"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "否"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "是"
-
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:451
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:475
+msgid "PWD"
+msgstr "PWD"
+
+#: ../panels/network/wireless-security/wireless-security.c:486
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:497
 msgid "Tunneled TLS"
 msgstr "隧道 TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:508
 msgid "Protected EAP (PEAP)"
 msgstr "受保护的 EAP (PEAP)"
 
@@ -3472,9 +3489,49 @@ msgstr "受保护的 EAP (PEAP)"
 msgid "Au_thentication"
 msgstr "认证(_T)"
 
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr "缺失 leap-username"
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+msgid "missing leap-password"
+msgstr "缺失 leap-password"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr "缺失 wep-key"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr "æ— æ•ˆçš„ wep-key：%zu 长度的密钥只能包含十六进制数字"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr "æ— æ•ˆçš„ wep-key：%zu 长度的密钥只能包含 ASCII 字符"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+"æ— æ•ˆçš„ wep-key：错误的密钥长度 %zu。密钥必须为长度 5/13 (ASCII) 或者 10/26 "
+"(十六进制)"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr "æ— æ•ˆçš„ wep-keyï¼šå¯†ç å­—æ®µä¸èƒ½ä¸ºç©º"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr "æ— æ•ˆçš„ wep-keyï¼šå¯†ç å­—æ®µå¿…é¡»çŸ­äºŽ 64 个字符"
+
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
-msgstr "1 (默认)"
+msgstr "1（默认）"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:2
 msgid "2"
@@ -3508,160 +3565,164 @@ msgstr "显示密钥(_W)"
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
+"æ— æ•ˆçš„ wep-pskï¼šæ— æ•ˆçš„å¯†é’¥é•¿åº¦ %zu。必须为 [8,63] 字节或者 64 位十六进制数字"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr "æ— æ•ˆçš„ wep-pskï¼šæ— æ³•å°† 64 字节作为十六进制来解析密钥"
+
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type"
 msgstr "类型(_T)"
 
-#: ../panels/notifications/cc-notifications-panel.c:247
-#: ../panels/power/cc-power-panel.c:1719 ../panels/power/cc-power-panel.c:1726
-#: ../panels/privacy/cc-privacy-panel.c:155
-#: ../panels/privacy/cc-privacy-panel.c:222
-#: ../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/notifications/cc-notifications-panel.c:257
+#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:269
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 msgid "On"
 msgstr "å¼€"
 
 #. This is the per application switch for message tray usage.
 #: ../panels/notifications/edit-dialog.ui.h:2
 msgctxt "notifications"
-msgid "Notifications"
-msgstr "通知"
+msgid "_Notifications"
+msgstr "通知(_N)"
 
 #. This is the setting to configure sounds associated with notifications.
 #: ../panels/notifications/edit-dialog.ui.h:4
 msgctxt "notifications"
-msgid "Sound Alerts"
-msgstr "声音警告"
+msgid "Sound _Alerts"
+msgstr "声音警告(_A)"
 
 #: ../panels/notifications/edit-dialog.ui.h:5
 msgctxt "notifications"
-msgid "Notification Banners"
-msgstr "通知条"
+msgid "Notification _Banners"
+msgstr "通知条幅(_B)"
 
 #. Banners here refers to message tray notifications in the middle of the screen.
 #: ../panels/notifications/edit-dialog.ui.h:7
 msgctxt "notifications"
-msgid "Show Message Content in Banners"
-msgstr "在通知条中显示消息内容"
+msgid "Show Message _Content in Banners"
+msgstr "在通知条幅中显示消息内容(_C)"
 
 #: ../panels/notifications/edit-dialog.ui.h:8
 msgctxt "notifications"
-msgid "Lock Screen Notifications"
-msgstr "锁屏通知"
+msgid "_Lock Screen Notifications"
+msgstr "锁屏通知(_L)"
 
 #: ../panels/notifications/edit-dialog.ui.h:9
 msgctxt "notifications"
-msgid "Show Message Content on Lock Screen"
-msgstr "锁屏时显示显示消息内容"
+msgid "Show Message C_ontent on Lock Screen"
+msgstr "锁屏时显示显示消息内容(_O)"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-msgid "Notifications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "No­ti­fi­ca­tions"
 msgstr "通知"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
 msgid "Control which notifications are displayed and what they show"
-msgstr "控制显示何种通知以及显示什么内容"
+msgstr "控制显示的通知种类及内容"
 
 #. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr ""
 "Notifications;Banner;Message;Tray;Popup;通知;横幅;条幅;黑条;消息;托盘;弹出;"
 
 #: ../panels/notifications/notifications.ui.h:1
-msgid "Notification Banners"
-msgstr "通知条"
+msgid "Notification _Banners"
+msgstr "通知条幅"
 
 #: ../panels/notifications/notifications.ui.h:2
-msgid "Lock Screen Notifications"
-msgstr "锁屏通知"
+msgid "_Lock Screen Notifications"
+msgstr "锁屏通知(_L)"
 
 #. List of applications.
 #: ../panels/notifications/notifications.ui.h:4
-#: ../panels/sound/gvc-mixer-dialog.c:1781
+#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:169
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:290
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "æ·»åŠ å¸å·"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:329
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Mail"
 msgstr "邮件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:335
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
+msgid "Calendar"
+msgstr "日历"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Contacts"
 msgstr "联系人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:341
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
 msgid "Chat"
 msgstr "聊天"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:347
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
 msgid "Resources"
 msgstr "资源"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:422
-msgid "Error logging into the account"
-msgstr "登录到该帐号出错"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:492
-msgid "Credentials have expired."
-msgstr "凭据已经过期"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:496
-msgid "Sign in to enable this account."
-msgstr "登录以启用此帐号。"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "_Sign In"
-msgstr "登录(_S)"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:748
+#: ../panels/online-accounts/cc-online-accounts-panel.c:640
 msgid "Error creating account"
 msgstr "创建帐号出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:808
+#: ../panels/online-accounts/cc-online-accounts-panel.c:700
 msgid "Error removing account"
 msgstr "移除帐号出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
+#: ../panels/online-accounts/cc-online-accounts-panel.c:736
 msgid "Are you sure you want to remove the account?"
 msgstr "确定要移除这个帐号吗？"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:846
+#: ../panels/online-accounts/cc-online-accounts-panel.c:738
 msgid "This will not remove the account on the server."
 msgstr "这不会将该帐号从服务器上移除。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:847
+#: ../panels/online-accounts/cc-online-accounts-panel.c:739
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-msgid "Online Accounts"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+msgid "On­line Accounts"
 msgstr "在线帐号"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "连接在线帐号并决定如何使用"
 
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;脸谱;脸书;推特;雅虎;微博;网络;在"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;脸谱;脸书;推特;雅虎;互联网;网络;在"
 "线;聊天;日历;邮件;联系人;云存储;稍后阅读;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
@@ -3669,6 +3730,7 @@ msgid "No online accounts configured"
 msgstr "未设置在线帐号"
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Remove Account"
 msgstr "移除帐号"
 
@@ -3681,19 +3743,19 @@ msgstr "æ·»åŠ åœ¨çº¿å¸å·"
 msgid ""
 "Adding an account allows your applications to access it for documents, mail, "
 "contacts, calendar, chat and more."
-msgstr "æ·»åŠ ä¸€ä¸ªå¸å·ï¼Œè®©æ‚¨çš„åº”ç”¨è®¿é—®å¸å·çš„æ–‡æ¡£ã€é‚®ä»¶ã€è”ç³»äººã€æ—¥åŽ†ã€èŠå¤©ç­‰ã€‚"
+msgstr "æ·»åŠ ä¸€ä¸ªå¸å·ä»¥è®©æ‚¨çš„åº”ç”¨è®¿é—®å¸å·çš„æ–‡æ¡£ã€é‚®ä»¶ã€è”ç³»äººã€æ—¥åŽ†ã€èŠå¤©ç­‰ã€‚"
 
-#: ../panels/power/cc-power-panel.c:192
+#: ../panels/power/cc-power-panel.c:253
 msgid "Unknown time"
 msgstr "未知时间"
 
-#: ../panels/power/cc-power-panel.c:198
+#: ../panels/power/cc-power-panel.c:259
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分钟"
 
-#: ../panels/power/cc-power-panel.c:210
+#: ../panels/power/cc-power-panel.c:271
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3701,560 +3763,549 @@ 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:218
+#: ../panels/power/cc-power-panel.c:279
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:219
+#: ../panels/power/cc-power-panel.c:280
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "æ—¶"
 
-#: ../panels/power/cc-power-panel.c:220
+#: ../panels/power/cc-power-panel.c:281
 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:239
+#: ../panels/power/cc-power-panel.c:300
 #, 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:246
+#: ../panels/power/cc-power-panel.c:307
 #, c-format
 msgid "Caution: %s remaining"
-msgstr "注意：剩余 %s"
+msgstr "注意：剩余 %s 的电量"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:251
+#: ../panels/power/cc-power-panel.c:312
 #, c-format
 msgid "%s remaining"
 msgstr "剩余 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:256 ../panels/power/cc-power-panel.c:284
+#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:260 ../panels/power/cc-power-panel.c:288
+#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
 msgid "Empty"
-msgstr "ç”µæ± å·²ç©º"
+msgstr "ç”µæ± å·²è€—å°½"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:275
+#: ../panels/power/cc-power-panel.c:336
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:280
+#: ../panels/power/cc-power-panel.c:341
 msgid "Discharging"
 msgstr "正在放电"
 
-#: ../panels/power/cc-power-panel.c:405
+#: ../panels/power/cc-power-panel.c:464
 msgctxt "Battery name"
 msgid "Main"
-msgstr "主"
+msgstr "ä¸»ç”µæ± "
 
-#: ../panels/power/cc-power-panel.c:407
+#: ../panels/power/cc-power-panel.c:466
 msgctxt "Battery name"
 msgid "Extra"
-msgstr "é™„åŠ "
+msgstr "é™„åŠ ç”µæ± "
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:479
+#: ../panels/power/cc-power-panel.c:537
 msgid "Wireless mouse"
 msgstr "æ— çº¿é¼ æ ‡"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:482
+#: ../panels/power/cc-power-panel.c:540
 msgid "Wireless keyboard"
 msgstr "æ— çº¿é”®ç›˜"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:485
+#: ../panels/power/cc-power-panel.c:543
 msgid "Uninterruptible power supply"
-msgstr "不间断电源(UPS)"
+msgstr "不间断电源 (UPS)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:488
+#: ../panels/power/cc-power-panel.c:546
 msgid "Personal digital assistant"
 msgstr "个人数字助理(PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:491
+#: ../panels/power/cc-power-panel.c:549
 msgid "Cellphone"
 msgstr "手机"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:494
+#: ../panels/power/cc-power-panel.c:552
 msgid "Media player"
 msgstr "媒体播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:497
+#: ../panels/power/cc-power-panel.c:555
 msgid "Tablet"
 msgstr "手写板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:500
+#: ../panels/power/cc-power-panel.c:558
 msgid "Computer"
 msgstr "计算机"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:503 ../panels/power/cc-power-panel.c:734
-#: ../panels/power/cc-power-panel.c:2057
+#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
+#: ../panels/power/cc-power-panel.c:2366
 msgid "Battery"
 msgstr "ç”µæ± "
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:557
+#: ../panels/power/cc-power-panel.c:615
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:564
+#: ../panels/power/cc-power-panel.c:622
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "警告"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:569
+#: ../panels/power/cc-power-panel.c:627
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:574
+#: ../panels/power/cc-power-panel.c:632
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充足"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:579
+#: ../panels/power/cc-power-panel.c:637
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:583
+#: ../panels/power/cc-power-panel.c:641
 msgctxt "Battery power"
 msgid "Empty"
-msgstr "空"
+msgstr "ç”µæ± å·²è€—å°½"
 
-#: ../panels/power/cc-power-panel.c:732
+#: ../panels/power/cc-power-panel.c:799
 msgid "Batteries"
 msgstr "ç”µæ± "
 
-#: ../panels/power/cc-power-panel.c:1134
+#: ../panels/power/cc-power-panel.c:1227
 msgid "When _idle"
-msgstr "闲置时(_I)"
+msgstr "空闲时(_I)"
 
-#: ../panels/power/cc-power-panel.c:1463
+#: ../panels/power/cc-power-panel.c:1681
 msgid "Power Saving"
-msgstr "省电"
+msgstr "节电"
 
-#: ../panels/power/cc-power-panel.c:1498
+#: ../panels/power/cc-power-panel.c:1716
 msgid "_Screen brightness"
 msgstr "屏幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1504
+#: ../panels/power/cc-power-panel.c:1735
+msgid "Automatic brightness"
+msgstr "自动亮度"
+
+#: ../panels/power/cc-power-panel.c:1755
 msgid "_Keyboard brightness"
 msgstr "键盘亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1514
+#: ../panels/power/cc-power-panel.c:1765
 msgid "_Dim screen when inactive"
-msgstr "æ— æ“ä½œæ—¶å±å¹•å˜æš—(_D)"
+msgstr "æ— æ“ä½œæ—¶ä½¿å±å¹•å˜æš—(_D)"
 
-#: ../panels/power/cc-power-panel.c:1539
+#: ../panels/power/cc-power-panel.c:1790
 msgid "_Blank screen"
 msgstr "空白屏幕(_B)"
 
-#: ../panels/power/cc-power-panel.c:1576
+#: ../panels/power/cc-power-panel.c:1827
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1581
-msgid "Wireless devices require extra power"
-msgstr "æ— çº¿è®¾å¤‡éœ€è¦æ¶ˆè€—æ›´å¤šç”µ"
+#: ../panels/power/cc-power-panel.c:1832
+msgid "Turn off Wi-Fi to save power."
+msgstr "关闭 Wi-Fi 以节省电源。"
 
-#: ../panels/power/cc-power-panel.c:1606
+#: ../panels/power/cc-power-panel.c:1857
 msgid "_Mobile broadband"
 msgstr "移动宽带(_M)"
 
-#: ../panels/power/cc-power-panel.c:1611
-msgid "Mobile broadband (3G, 4G, WiMax, etc.) devices require extra power"
-msgstr "移动宽带(3G、4G、WiMax 等)设备需要消耗更多电量"
+#: ../panels/power/cc-power-panel.c:1862
+msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
+msgstr "关闭移动宽带（3G、4G、WiMax 等）以节省电源。"
 
-#: ../panels/power/cc-power-panel.c:1661
+#: ../panels/power/cc-power-panel.c:1907
 msgid "_Bluetooth"
 msgstr "蓝牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1715
+#: ../panels/power/cc-power-panel.c:1970
 msgid "When on battery power"
 msgstr "ç”µæ± ä¾›ç”µæ—¶"
 
-#: ../panels/power/cc-power-panel.c:1717
+#: ../panels/power/cc-power-panel.c:1972
 msgid "When plugged in"
-msgstr "电源插入时"
+msgstr "插入电源时"
 
-#: ../panels/power/cc-power-panel.c:1847
-msgid "Suspend & Power Off"
-msgstr "挂起和关机"
+#: ../panels/power/cc-power-panel.c:2067
+msgid "Suspend"
+msgstr "挂起"
 
-#: ../panels/power/cc-power-panel.c:1887
+#: ../panels/power/cc-power-panel.c:2068
+msgid "Hibernate"
+msgstr "ä¼‘çœ "
+
+#: ../panels/power/cc-power-panel.c:2069
+msgid "Nothing"
+msgstr "不处理"
+
+#. Frame header
+#: ../panels/power/cc-power-panel.c:2183
+msgid "Suspend & Power Button"
+msgstr "挂起和关机按钮"
+
+#: ../panels/power/cc-power-panel.c:2226
 msgid "_Automatic suspend"
 msgstr "自动挂起(_A)"
 
-#: ../panels/power/cc-power-panel.c:1911
-msgid "When battery power is _critical"
-msgstr "电量严重不足时(_C)"
+#: ../panels/power/cc-power-panel.c:2227
+msgid "Automatic suspend"
+msgstr "自动挂起"
 
-#: ../panels/power/cc-power-panel.c:1968
-msgid "Power Off"
-msgstr "电源关闭"
+#: ../panels/power/cc-power-panel.c:2294
+msgid "_When the Power Button is pressed"
+msgstr "按下电源按钮时(_W)"
 
-#: ../panels/power/cc-power-panel.c:2111
+#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270
+#: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "设备"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Po­wer"
 msgstr "电源"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
 msgid "View your battery status and change power saving settings"
 msgstr "æŸ¥çœ‹ç”µæ± çŠ¶æ€å¹¶æ›´æ”¹çœç”µè®¾ç½®"
 
 #. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:4
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 msgstr ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 "电源;ç¡çœ ;挂起;ä¼‘çœ ;ç”µæ± ;亮度;æš—;空白;显示器;空闲;"
 
-#: ../panels/power/power.ui.h:1
-msgid "Hibernate"
-msgstr "ä¼‘çœ "
-
-#: ../panels/power/power.ui.h:2
-msgid "Power off"
-msgstr "电源关闭"
-
-#: ../panels/power/power.ui.h:5
+#: ../panels/power/power.ui.h:3
 msgid "45 minutes"
 msgstr "45 分钟"
 
-#: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
+#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 小时"
 
-#: ../panels/power/power.ui.h:7
+#: ../panels/power/power.ui.h:5
 msgid "80 minutes"
 msgstr "80 分钟"
 
-#: ../panels/power/power.ui.h:8
+#: ../panels/power/power.ui.h:6
 msgid "90 minutes"
 msgstr "90 分钟"
 
-#: ../panels/power/power.ui.h:9
+#: ../panels/power/power.ui.h:7
 msgid "100 minutes"
 msgstr "100 分钟"
 
-#: ../panels/power/power.ui.h:10
+#: ../panels/power/power.ui.h:8
 msgid "2 hours"
 msgstr "2 小时"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
+#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
 msgid "1 minute"
 msgstr "1 分钟"
 
-#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
+#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
 msgid "2 minutes"
 msgstr "2 分钟"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
 msgid "3 minutes"
 msgstr "3 分钟"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:12
 msgid "4 minutes"
 msgstr "4 分钟"
 
-#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
 msgid "5 minutes"
 msgstr "5 分钟"
 
-#: ../panels/power/power.ui.h:16
+#: ../panels/power/power.ui.h:14
 msgid "8 minutes"
 msgstr "8 分钟"
 
-#: ../panels/power/power.ui.h:17
+#: ../panels/power/power.ui.h:15
 msgid "10 minutes"
 msgstr "10 分钟"
 
-#: ../panels/power/power.ui.h:18
+#: ../panels/power/power.ui.h:16
 msgid "12 minutes"
 msgstr "12 分钟"
 
-#: ../panels/power/power.ui.h:20
+#: ../panels/power/power.ui.h:18
 msgid "Automatic Suspend"
 msgstr "自动挂起"
 
-#: ../panels/power/power.ui.h:21
+#: ../panels/power/power.ui.h:19
 msgid "_Plugged In"
 msgstr "已插入电源(_P)"
 
-#: ../panels/power/power.ui.h:22
+#: ../panels/power/power.ui.h:20
 msgid "On _Battery Power"
 msgstr "ä½¿ç”¨ç”µæ± æ—¶(_B)"
 
-#: ../panels/power/power.ui.h:23
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
 msgid "Delay"
-msgstr "延时"
+msgstr "延迟"
 
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
 msgstr "认证"
 
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:14
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "Password"
-msgstr "å¯†ç "
-
 #: ../panels/printers/authentication-dialog.ui.h:6
 msgid "Authentication Required"
 msgstr "需要认证"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:588
+#: ../panels/printers/cc-printers-panel.c:684
 msgid "Low on toner"
 msgstr "墨粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:590
+#: ../panels/printers/cc-printers-panel.c:686
 msgid "Out of toner"
 msgstr "墨粉用尽"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:593
+#: ../panels/printers/cc-printers-panel.c:689
 msgid "Low on developer"
 msgstr "显影剂不足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:596
+#: ../panels/printers/cc-printers-panel.c:692
 msgid "Out of developer"
 msgstr "显影剂用尽"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:598
+#: ../panels/printers/cc-printers-panel.c:694
 msgid "Low on a marker supply"
 msgstr "æ ‡è®°å¢¨æ°´ä¸è¶³"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:600
+#: ../panels/printers/cc-printers-panel.c:696
 msgid "Out of a marker supply"
 msgstr "æ ‡è®°å¢¨æ°´ç”¨å°½"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:602
+#: ../panels/printers/cc-printers-panel.c:698
 msgid "Open cover"
 msgstr "打开上盖"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:604
+#: ../panels/printers/cc-printers-panel.c:700
 msgid "Open door"
 msgstr "打开后盖"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:606
+#: ../panels/printers/cc-printers-panel.c:702
 msgid "Low on paper"
 msgstr "çº¸å¼ ä¸è¶³"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:608
+#: ../panels/printers/cc-printers-panel.c:704
 msgid "Out of paper"
 msgstr "çº¸å¼ ç”¨å°½"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:610
+#: ../panels/printers/cc-printers-panel.c:706
 msgctxt "printer state"
 msgid "Offline"
 msgstr "离线"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:612
-#: ../panels/printers/cc-printers-panel.c:803
+#: ../panels/printers/cc-printers-panel.c:708
+#: ../panels/printers/cc-printers-panel.c:898
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:614
+#: ../panels/printers/cc-printers-panel.c:710
 msgid "Waste receptacle almost full"
 msgstr "废粉仓将满"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:616
+#: ../panels/printers/cc-printers-panel.c:712
 msgid "Waste receptacle full"
 msgstr "废粉仓已满"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:618
+#: ../panels/printers/cc-printers-panel.c:714
 msgid "The optical photo conductor is near end of life"
-msgstr "感光鼓接近使用寿命"
+msgstr "感光鼓使用寿命已快耗尽"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:620
+#: ../panels/printers/cc-printers-panel.c:716
 msgid "The optical photo conductor is no longer functioning"
-msgstr "æ„Ÿå…‰é¼“æ— æ³•å·¥ä½œ"
+msgstr "感光鼓故障"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:730
+#: ../panels/printers/cc-printers-panel.c:825
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "正在配置"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:789
+#: ../panels/printers/cc-printers-panel.c:884
 msgctxt "printer state"
 msgid "Ready"
 msgstr "就绪"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:794
+#: ../panels/printers/cc-printers-panel.c:889
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "不接收任务"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:799
+#: ../panels/printers/cc-printers-panel.c:894
 msgctxt "printer state"
 msgid "Processing"
 msgstr "正在处理"
 
 # ä»¥ä¸‹å‡ ä¸ªlevel似乎译为“量”更好
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:919
+#: ../panels/printers/cc-printers-panel.c:1014
 msgid "Toner Level"
 msgstr "碳粉量"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:922
+#: ../panels/printers/cc-printers-panel.c:1017
 msgid "Ink Level"
 msgstr "墨水量"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:925
+#: ../panels/printers/cc-printers-panel.c:1020
 msgid "Supply Level"
 msgstr "耗材量"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:943
+#: ../panels/printers/cc-printers-panel.c:1038
 msgctxt "printer state"
 msgid "Installing"
 msgstr "正在安装"
 
-#. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1119
-msgid "No printers available"
-msgstr "æ— å¯ç”¨æ‰“å°æœº"
-
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1429
+#: ../panels/printers/cc-printers-panel.c:1552
 #, 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:1770
+#: ../panels/printers/cc-printers-panel.c:1893
 msgid "Failed to add new printer."
 msgstr "æ·»åŠ æ–°æ‰“å°æœºå¤±è´¥ã€‚"
 
-#: ../panels/printers/cc-printers-panel.c:1937
+#: ../panels/printers/cc-printers-panel.c:2074
 msgid "Select PPD File"
 msgstr "选择 PPD 文件"
 
-#: ../panels/printers/cc-printers-panel.c:1946
+#: ../panels/printers/cc-printers-panel.c:2083
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
-msgstr "PostScript 打印机描述文件(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
+msgstr "PostScript 打印机描述文件 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2253
+#: ../panels/printers/cc-printers-panel.c:2390
 msgid "No suitable driver found"
 msgstr "未找到合适的驱动"
 
-#: ../panels/printers/cc-printers-panel.c:2324
+#: ../panels/printers/cc-printers-panel.c:2461
 msgid "Searching for preferred drivers…"
-msgstr "正在搜索首选的驱动..."
+msgstr "正在搜索首选驱动…"
 
-#: ../panels/printers/cc-printers-panel.c:2345
+#: ../panels/printers/cc-printers-panel.c:2482
 msgid "Select from database…"
-msgstr "从数据库选择..."
+msgstr "从数据库选择…"
 
-#: ../panels/printers/cc-printers-panel.c:2354
+#: ../panels/printers/cc-printers-panel.c:2491
 msgid "Provide PPD File…"
-msgstr "提供 PPD 文件..."
+msgstr "提供 PPD 文件…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2505
-#: ../panels/printers/cc-printers-panel.c:2528
+#: ../panels/printers/cc-printers-panel.c:2638
+#: ../panels/printers/cc-printers-panel.c:2661
 msgid "Test page"
 msgstr "测试页"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2942
+#: ../panels/printers/cc-printers-panel.c:3116
 #, c-format
 msgid "Could not load ui: %s"
-msgstr "æ— æ³•è£…å…¥ç•Œé¢ï¼š%s"
+msgstr "æ— æ³•è½½å…¥ç•Œé¢ï¼š%s"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-msgid "Printers"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Prin­ters"
 msgstr "打印机"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
 msgid "Add printers, view printer jobs and decide how you want to print"
-msgstr "æ·»åŠ æ‰“å°æœºï¼ŒæŸ¥çœ‹æ‰“å°ä»»åŠ¡å¹¶ä¸”ç®¡ç†æ‰“å°"
+msgstr "æ·»åŠ æ‰“å°æœºï¼ŒæŸ¥çœ‹æ‰“å°ä»»åŠ¡å’Œç®¡ç†æ‰“å°"
 
 #. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr ""
 "Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;çº¸å¼ ;墨水;墨粉;硒鼓;墨"
 "ç›’;"
 
-#. Translators: This dialog contains list of active print jobs of the selected printer
+#. Translators: this action removes (purges) all the listed jobs from the list.
 #: ../panels/printers/jobs-dialog.ui.h:2
-msgid "Active Jobs"
-msgstr "活动的任务"
-
-#: ../panels/printers/jobs-dialog.ui.h:3
-#: ../panels/printers/options-dialog.ui.h:2
-msgid "Close"
-msgstr "关闭"
+msgid "Clear All"
+msgstr "全部清除"
 
+#. Translators: this label describes the dialog empty state, with no jobs listed.
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Resume Printing"
-msgstr "恢复打印"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
-msgid "Pause Printing"
-msgstr "暂停打印"
-
-#: ../panels/printers/jobs-dialog.ui.h:6
-msgid "Cancel Print Job"
-msgstr "取消打印任务"
+msgid "No Active Printer Jobs"
+msgstr "没有活动的打印机任务"
 
 #: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
@@ -4277,23 +4328,28 @@ msgstr "输入网络地址或搜索打印机"
 
 #: ../panels/printers/options-dialog.ui.h:1
 msgid "Loading options…"
-msgstr "正在载入选项..."
+msgstr "正在载入选项…"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:1
 msgid "Select Printer Driver"
 msgstr "选择打印机驱动"
 
+#: ../panels/printers/ppd-selection-dialog.ui.h:3
+#: ../panels/user-accounts/um-photo-dialog.c:96
+msgid "Select"
+msgstr "选择"
+
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
-msgstr "正在载入驱动数据库..."
+msgstr "正在载入驱动数据库…"
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:506
+#: ../panels/printers/pp-host.c:526
 msgid "JetDirect Printer"
 msgstr "JetDirect 打印机"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:756
+#: ../panels/printers/pp-host.c:782
 msgid "LPD Printer"
 msgstr "LPD 打印机"
 
@@ -4307,13 +4363,13 @@ msgstr "单面"
 #: ../panels/printers/pp-ipp-option-widget.c:68
 #: ../panels/printers/pp-ppd-option-widget.c:72
 msgid "Long Edge (Standard)"
-msgstr "é•¿è¾¹(æ ‡å‡†)"
+msgstr "é•¿è¾¹ï¼ˆæ ‡å‡†ï¼‰"
 
 #. Translators: this is an option of "Two Sided"
 #: ../panels/printers/pp-ipp-option-widget.c:70
 #: ../panels/printers/pp-ppd-option-widget.c:74
 msgid "Short Edge (Flip)"
-msgstr "短边(翻转)"
+msgstr "短边（翻转）"
 
 #. Translators: this is an option of "Orientation"
 #: ../panels/printers/pp-ipp-option-widget.c:72
@@ -4336,98 +4392,90 @@ msgid "Reverse portrait"
 msgstr "纵向倒转"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:142
+#: ../panels/printers/pp-jobs-dialog.c:103
 msgctxt "print job"
 msgid "Pending"
 msgstr "等待中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:146
+#: ../panels/printers/pp-jobs-dialog.c:107
 msgctxt "print job"
-msgid "Held"
-msgstr "挂起"
+msgid "Paused"
+msgstr "暂停"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:150
+#: ../panels/printers/pp-jobs-dialog.c:111
 msgctxt "print job"
 msgid "Processing"
-msgstr "处理中"
+msgstr "正在处理"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:154
+#: ../panels/printers/pp-jobs-dialog.c:115
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:158
+#: ../panels/printers/pp-jobs-dialog.c:119
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:162
+#: ../panels/printers/pp-jobs-dialog.c:123
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:166
+#: ../panels/printers/pp-jobs-dialog.c:127
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
-#. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:288
-msgid "Job Title"
-msgstr "ä»»åŠ¡æ ‡é¢˜"
-
-#. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:297
-msgid "Job State"
-msgstr "任务状态"
-
-#. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:303
-msgid "Time"
-msgstr "时间"
-
-#: ../panels/printers/pp-jobs-dialog.c:451
+#. Translators: This is the printer name for which we are showing the active jobs
+#: ../panels/printers/pp-jobs-dialog.c:289
 #, c-format
-msgid "%s Active Jobs"
-msgstr "%s 个活动的任务"
+msgctxt "Printer jobs dialog title"
+msgid "%s - Active Jobs"
+msgstr "%s 项活动任务"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1620
+#: ../panels/printers/pp-new-printer-dialog.c:1659
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1625
+#: ../panels/printers/pp-new-printer-dialog.c:1664
 msgid "Serial Port"
 msgstr "串口"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1632
+#: ../panels/printers/pp-new-printer-dialog.c:1671
 msgid "Parallel Port"
 msgstr "并口"
 
+#. Translators: The found device is a printer connected via Bluetooth
+#: ../panels/printers/pp-new-printer-dialog.c:1676
+msgid "Bluetooth"
+msgstr "蓝牙"
+
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1688
+#: ../panels/printers/pp-new-printer-dialog.c:1713
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1693
+#: ../panels/printers/pp-new-printer-dialog.c:1718
 #, 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:1717
+#: ../panels/printers/pp-new-printer-dialog.c:1747
 msgid "Server requires authentication"
-msgstr "服务器需要认证"
+msgstr "服务器要求认证"
 
 #: ../panels/printers/pp-options-dialog.c:81
 msgid "Two Sided"
@@ -4487,7 +4535,7 @@ msgstr "可安装选项"
 #: ../panels/printers/pp-options-dialog.c:663
 msgctxt "Printer Option Group"
 msgid "Job"
-msgstr "作业"
+msgstr "任务"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
 #: ../panels/printers/pp-options-dialog.c:666
@@ -4505,7 +4553,7 @@ msgstr "色彩"
 #: ../panels/printers/pp-options-dialog.c:672
 msgctxt "Printer Option Group"
 msgid "Finishing"
-msgstr "完成"
+msgstr "正在完成"
 
 #. Translators: "Advanced" tab contains all others settings
 #: ../panels/printers/pp-options-dialog.c:675
@@ -4532,7 +4580,7 @@ msgstr "打印机默认设置"
 #. Translators: this is an option of "GhostScript"
 #: ../panels/printers/pp-ppd-option-widget.c:90
 msgid "Embed GhostScript fonts only"
-msgstr "只内嵌 GhostScript 字体"
+msgstr "仅内嵌 GhostScript 字体"
 
 #. Translators: this is an option of "GhostScript"
 #: ../panels/printers/pp-ppd-option-widget.c:92
@@ -4590,12 +4638,12 @@ msgstr "默认打印机(_D)"
 
 #: ../panels/printers/printers.ui.h:9
 msgid "Jobs"
-msgstr "作业"
+msgstr "任务"
 
-#. Translators: Opens a dialog containing printer's jobs
+#. Translators: Opens a dialog containing printer
 #: ../panels/printers/printers.ui.h:11
 msgid "Show _Jobs"
-msgstr "显示作业(_J)"
+msgstr "显示任务(_J)"
 
 #: ../panels/printers/printers.ui.h:12
 msgid "Model"
@@ -4607,7 +4655,7 @@ msgstr "æ ‡ç­¾"
 
 #: ../panels/printers/printers.ui.h:17
 msgid "Setting new driver…"
-msgstr "正在设置新驱动..."
+msgstr "正在设置新驱动…"
 
 #: ../panels/printers/printers.ui.h:18
 msgid "page 3"
@@ -4618,89 +4666,112 @@ msgstr "第 3 页"
 msgid "Print _Test Page"
 msgstr "打印测试页(_T)"
 
-#. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:22
+#. Translators: This button opens printer
+#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6
 msgid "_Options"
 msgstr "选项(_O)"
 
+#: ../panels/printers/printers.ui.h:23
+msgid "No printers"
+msgstr "æ— æ‰“å°æœº"
+
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
-msgid "Add New Printer"
-msgstr "æ·»åŠ æ–°æ‰“å°æœº"
+#: ../panels/printers/printers.ui.h:25
+msgid "Add a Printer"
+msgstr "æ·»åŠ æ‰“å°æœº"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:27
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
-msgstr "对不起，系统打印服务似乎不可用。"
+msgstr "抱歉，系统打印服务似乎不可用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:352 ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "锁屏"
 
-#: ../panels/privacy/cc-privacy-panel.c:462 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:438
+msgid "In use"
+msgstr "å·²å ç”¨"
+
+#: ../panels/privacy/cc-privacy-panel.c:443
+msgctxt "Location services status"
+msgid "On"
+msgstr "开启"
+
+#: ../panels/privacy/cc-privacy-panel.c:444
+msgctxt "Location services status"
+msgid "Off"
+msgstr "关闭"
+
+#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
+msgid "Location Services"
+msgstr "定位服务"
+
+#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "用量及历史"
 
-#: ../panels/privacy/cc-privacy-panel.c:587
+#: ../panels/privacy/cc-privacy-panel.c:1067
 msgid "Empty all items from Trash?"
 msgstr "清空回收站中的所有项目吗？"
 
-#: ../panels/privacy/cc-privacy-panel.c:588
+#: ../panels/privacy/cc-privacy-panel.c:1068
 msgid "All items in the Trash will be permanently deleted."
 msgstr "å›žæ”¶ç«™å†…çš„æ‰€æœ‰é¡¹ç›®å°†ä¼šæ°¸ä¹…åˆ é™¤ã€‚"
 
-#: ../panels/privacy/cc-privacy-panel.c:589 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:612
+#: ../panels/privacy/cc-privacy-panel.c:1092
 msgid "Delete all the temporary files?"
 msgstr "åˆ é™¤æ‰€æœ‰ä¸´æ—¶æ–‡ä»¶å—ï¼Ÿ"
 
-#: ../panels/privacy/cc-privacy-panel.c:613
+#: ../panels/privacy/cc-privacy-panel.c:1093
 msgid "All the temporary files will be permanently deleted."
 msgstr "æ‰€æœ‰ä¸´æ—¶æ–‡ä»¶å°†ä¼šæ°¸ä¹…åˆ é™¤ã€‚"
 
-#: ../panels/privacy/cc-privacy-panel.c:614 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
 msgid "_Purge Temporary Files"
 msgstr "清理临时文件(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:636 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "清理回收站及临时文件"
 
-#: ../panels/privacy/cc-privacy-panel.c:676 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
-msgstr "软件使用"
+msgstr "软件使用统计"
 
-#: ../panels/privacy/cc-privacy-panel.c:717 ../panels/privacy/privacy.ui.h:44
+#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
 msgid "Problem Reporting"
 msgstr "报告问题"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:731
+#: ../panels/privacy/cc-privacy-panel.c:1211
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
 "anonymously and are scrubbed of personal data."
 msgstr "发送匿名的技术问题报告能帮助我们改进 %s，这些报告中不含个人数据。"
 
-#: ../panels/privacy/cc-privacy-panel.c:743 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
 msgid "Privacy Policy"
 msgstr "隐私政策"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
-msgid "Privacy"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Pri­va­cy"
 msgstr "隐私"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
 msgid "Protect your personal information and control what others might see"
 msgstr "保护个人信息并控制他人可见的信息"
 
 #. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
@@ -4754,7 +4825,7 @@ msgstr "30 天"
 
 #: ../panels/privacy/privacy.ui.h:18
 msgid "Forever"
-msgstr "永远"
+msgstr "永久"
 
 #: ../panels/privacy/privacy.ui.h:20
 msgid ""
@@ -4794,7 +4865,7 @@ msgstr "显示通知(_N)"
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
-msgstr "自动清理回收站和临时文件，帮助计算机保存避免不必要的敏感信息。"
+msgstr "自动清理回收站和临时文件，避免计算机保存不必要的敏感信息。"
 
 #: ../panels/privacy/privacy.ui.h:31
 msgid "Automatically empty _Trash"
@@ -4819,66 +4890,69 @@ msgid ""
 msgstr ""
 "发送软件的使用情况有助于我们向提供更准确的推荐，帮助改进软件。\n"
 "\n"
-"信息均为匿名收集，且不会与他人分享。"
+"信息均为匿名收集，不会与他人分享。"
 
 #: ../panels/privacy/privacy.ui.h:40
 msgid "_Send software usage statistics"
 msgstr "发送软件使用统计信息(_S)"
 
-#: ../panels/privacy/privacy.ui.h:42
-msgid "_Location Services"
-msgstr "位置服务(_L)"
-
 #: ../panels/privacy/privacy.ui.h:43
-msgid "Used to determine your geographical location"
-msgstr "用于获得您的位置信息"
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
+msgstr ""
+"定位服务允许应用得知您的地理位置。使用 Wi-Fi 和移动宽带可以提高精确度。"
+
+#: ../panels/privacy/privacy.ui.h:44
+msgid "_Location Services"
+msgstr "定位服务(_L)"
 
-#: ../panels/privacy/privacy.ui.h:45
+#: ../panels/privacy/privacy.ui.h:47
 msgid "_Automatic Problem Reporting"
 msgstr "自动报告问题(_A)"
 
-#: ../panels/region/cc-format-chooser.c:119
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/cc-format-chooser.c:121
+#: ../panels/region/cc-format-chooser.c:122
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/cc-format-chooser.c:286
+#: ../panels/region/cc-format-chooser.c:287
 msgid "No regions found"
 msgstr "æ— å¯ç”¨åŒºåŸŸ"
 
-#: ../panels/region/cc-input-chooser.c:180
+#: ../panels/region/cc-input-chooser.c:182
 msgid "No input sources found"
 msgstr "æ— è¾“å…¥æº"
 
-#: ../panels/region/cc-input-chooser.c:1085
+#: ../panels/region/cc-input-chooser.c:992
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
 #: ../panels/region/cc-region-panel.c:247
-#: ../panels/user-accounts/um-user-panel.c:1071
+#: ../panels/user-accounts/um-user-panel.c:1087
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "修改需要重启会话才能生效"
 
 #: ../panels/region/cc-region-panel.c:251
-#: ../panels/user-accounts/um-user-panel.c:1075
+#: ../panels/user-accounts/um-user-panel.c:1091
 msgid "Restart Now"
 msgstr "现在重启"
 
-#: ../panels/region/cc-region-panel.c:876
+#: ../panels/region/cc-region-panel.c:888
 msgid "No input source selected"
 msgstr "未选择输入源"
 
-#: ../panels/region/cc-region-panel.c:1796
-msgid "Login Screen"
-msgstr "登录屏幕"
+#: ../panels/region/cc-region-panel.c:1779
+msgid "Login _Screen"
+msgstr "登录屏幕(_S)"
 
-#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+#: ../panels/region/format-chooser.ui.h:1
 msgid "Formats"
 msgstr "æ ¼å¼"
 
@@ -4900,23 +4974,24 @@ msgstr "æ•°å­—"
 
 #: ../panels/region/format-chooser.ui.h:8
 msgid "Measurement"
-msgstr "度量衡"
+msgstr "度量"
 
 #: ../panels/region/format-chooser.ui.h:9
 msgid "Paper"
 msgstr "çº¸å¼ "
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid "Re­gion & Lan­guage"
 msgstr "区域和语言"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 msgid ""
 "Select your display language, formats, keyboard layouts and input sources"
 msgstr "é€‰æ‹©æ‚¨çš„æ˜¾ç¤ºè¯­è¨€ã€æ ¼å¼ã€é”®ç›˜å¸ƒå±€å’Œè¾“å…¥æº"
 
 #. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Language;Layout;Keyboard;Input;语言;布局;键盘;输入;"
 
@@ -4926,63 +5001,72 @@ msgstr "æ·»åŠ è¾“å…¥æº"
 
 #: ../panels/region/input-chooser.ui.h:4
 msgid "Input methods can't be used on the login screen"
-msgstr "输入法不能在登录屏幕使用"
+msgstr "不能在登录屏幕使用输入法"
 
 #: ../panels/region/input-options.ui.h:1
 msgid "Input Source Options"
 msgstr "输入源选项"
 
-#: ../panels/region/input-options.ui.h:3
+#: ../panels/region/input-options.ui.h:2
 msgid "Use the _same source for all windows"
 msgstr "所有窗口使用相同的输入源(_S)"
 
-#: ../panels/region/input-options.ui.h:4
+#: ../panels/region/input-options.ui.h:3
 msgid "Allow _different sources for each window"
 msgstr "每个窗口使用不同的输入源(_D)"
 
-#: ../panels/region/input-options.ui.h:5
+#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
 msgid "Keyboard Shortcuts"
 msgstr "键盘快捷键"
 
-#: ../panels/region/input-options.ui.h:6
+#: ../panels/region/input-options.ui.h:5
 msgid "Switch to previous source"
-msgstr "切换至上个源"
+msgstr "切换至上个输入源"
 
-#: ../panels/region/input-options.ui.h:7
+#: ../panels/region/input-options.ui.h:6
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
-#: ../panels/region/input-options.ui.h:8
+#: ../panels/region/input-options.ui.h:7
 msgid "Switch to next source"
-msgstr "切换至下个源"
+msgstr "切换至下个输入源"
 
-#: ../panels/region/input-options.ui.h:9
+#: ../panels/region/input-options.ui.h:8
 msgid "Super+Space"
 msgstr "Super+Space"
 
-#: ../panels/region/input-options.ui.h:10
+#: ../panels/region/input-options.ui.h:9
 msgid "You can change these shortcuts in the keyboard settings"
 msgstr "可以在键盘设置中修改快捷键"
 
-#: ../panels/region/input-options.ui.h:11
+#: ../panels/region/input-options.ui.h:10
 msgid "Alternative switch to next source"
 msgstr "切换至下个源第二组快捷键"
 
-#: ../panels/region/input-options.ui.h:12
+#: ../panels/region/input-options.ui.h:11
 msgid "Left+Right Alt"
 msgstr "左+右 Alt"
 
+#: ../panels/region/region.ui.h:1
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+msgid "_Language"
+msgstr "语言(_L)"
+
 #: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
-msgstr "英语(英国)"
+msgstr "英语（英国）"
+
+#: ../panels/region/region.ui.h:3
+msgid "_Formats"
+msgstr "æ ¼å¼(_F)"
 
 #: ../panels/region/region.ui.h:4
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../panels/region/region.ui.h:6
-msgid "Options"
-msgstr "选项"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "输入源"
 
 #: ../panels/region/region.ui.h:7
 msgid "Add input source"
@@ -5006,32 +5090,17 @@ msgstr "配置输入源"
 
 #: ../panels/region/region.ui.h:12
 msgid "Show input source keyboard layout"
-msgstr " 显示输入源键盘布局"
+msgstr "显示输入源键盘布局"
 
 #: ../panels/region/region.ui.h:13
 msgid "Login settings are used by all users when logging into the system"
-msgstr "登录设置为所有用户共享"
-
-#: ../panels/search/cc-search-locations-dialog.c:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "位置"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "书签"
+msgstr "登录设置将对所有于本机登录的用户共享"
 
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "其他"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:634
 msgid "Select Location"
 msgstr "选择位置"
 
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:638
 msgid "_OK"
 msgstr "确定(_O)"
 
@@ -5039,17 +5108,18 @@ msgstr "确定(_O)"
 msgid "No applications found"
 msgstr "未找到应用"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
 msgid "Search"
 msgstr "搜索"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
 msgid ""
 "Control which applications show search results in the Activities Overview"
-msgstr "控制在活动总览中哪个程序显示搜索结果"
+msgstr "控制在活动总览中显示哪些程序的搜索结果"
 
 #. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;搜索;查找;寻找;索引;隐藏;隐私;结果;"
@@ -5058,6 +5128,18 @@ msgstr ""
 msgid "Search Locations"
 msgstr "搜索位置"
 
+#: ../panels/search/search-locations-dialog.ui.h:2
+msgid "Places"
+msgstr "位置"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+msgid "Bookmarks"
+msgstr "书签"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+msgid "Other"
+msgstr "其他"
+
 #: ../panels/search/search.ui.h:1
 msgid "Move Up"
 msgstr "上移"
@@ -5070,52 +5152,94 @@ msgstr "下移"
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../panels/sharing/cc-sharing-panel.c:272
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+msgid "No networks selected for sharing"
+msgstr "未选择要共享的网络"
+
+#: ../panels/sharing/cc-sharing-panel.c:263
 msgctxt "service is enabled"
 msgid "On"
-msgstr "å¼€"
+msgstr "已开启"
 
-#: ../panels/sharing/cc-sharing-panel.c:274
-#: ../panels/sharing/cc-sharing-panel.c:301
+#: ../panels/sharing/cc-sharing-panel.c:265
+#: ../panels/sharing/cc-sharing-panel.c:292
 msgctxt "service is disabled"
 msgid "Off"
-msgstr "å…³"
+msgstr "已关闭"
 
-#: ../panels/sharing/cc-sharing-panel.c:304
+#: ../panels/sharing/cc-sharing-panel.c:295
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../panels/sharing/cc-sharing-panel.c:307
+#: ../panels/sharing/cc-sharing-panel.c:298
 msgctxt "service is active"
 msgid "Active"
 msgstr "活动"
 
-#: ../panels/sharing/cc-sharing-panel.c:488
+#: ../panels/sharing/cc-sharing-panel.c:369
 msgid "Choose a Folder"
 msgstr "选择文件夹"
 
-#: ../panels/sharing/cc-sharing-panel.c:917
+#: ../panels/sharing/cc-sharing-panel.c:680
+#, 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/cc-sharing-panel.c:682
+#, c-format
+msgid ""
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+"当启用远程登录是，远程用户可以使用 SSH 命令来连接：\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:684
+#, c-format
+msgid ""
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+msgstr ""
+"屏幕共享允许远程用户查看或控制您的屏幕通过连接到：<a href=\"vnc://%s\">vnc://"
+"%s</a> "
+
+#: ../panels/sharing/cc-sharing-panel.c:796
 msgid "Copy"
 msgstr "复制"
 
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+#: ../panels/sharing/cc-sharing-panel.c:1122
 msgid "Sharing"
 msgstr "共享"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Sha­ring"
+msgstr "共享"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
 msgid "Control what you want to share with others"
-msgstr "控制您想要与其他用户共享的内容"
+msgstr "控制想要与其他用户共享的内容"
 
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
 msgid ""
-"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
-"pictures;photos;movies;server;renderer;"
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
 msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
-"pictures;photos;movies;server;renderer;共享;主机;名称;远程;桌面;蓝牙;媒体;音"
-"频;视频;图片;照片;电影;服务器;渲染;"
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;共享;主机;名称;远程;桌面;媒体;音频;视频;图片;照片;电"
+"影;服务器;渲染;"
+
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "网络"
 
 #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
 msgid "Enable or disable remote login"
@@ -5125,120 +5249,79 @@ msgstr "启用或禁用远程登录"
 msgid "Authentication is required to enable or disable remote login"
 msgstr "启用或禁用远程登录需要认证"
 
-#. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
-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 "蓝牙共享"
+msgid "_Computer Name"
+msgstr "计算机名(_C)"
 
 #: ../panels/sharing/sharing.ui.h:2
-msgid ""
-"Bluetooth Sharing allows you to share files with other Bluetooth enabled "
-"devices"
-msgstr "蓝牙共享允许您使用带有蓝牙的设备共享文件"
+msgid "_File Sharing"
+msgstr "文件共享(_F)"
 
 #: ../panels/sharing/sharing.ui.h:3
-msgid "Only Receive From Trusted Devices"
-msgstr "只从信任的设备接收"
+msgid "_Screen Sharing"
+msgstr "屏幕共享(_S)"
 
 #: ../panels/sharing/sharing.ui.h:4
-msgid "Save Received Files to Downloads Folder"
-msgstr "将接收的文件保存到下载文件夹"
+msgid "_Media Sharing"
+msgstr "媒体共享(_M)"
 
 #: ../panels/sharing/sharing.ui.h:5
-msgid "Computer Name"
-msgstr "计算机名"
+msgid "_Remote Login"
+msgstr "远程登录(_R)"
 
 #: ../panels/sharing/sharing.ui.h:6
-msgid "Personal File Sharing"
-msgstr "个人文件共享"
+msgid "Some services are disabled because of no network access."
+msgstr "å› ä¸ºæ²¡æœ‰ç½‘ç»œï¼Œä¸€äº›æœåŠ¡å·²ç»ç¦ç”¨ã€‚"
 
 #: ../panels/sharing/sharing.ui.h:7
-msgid "Screen Sharing"
-msgstr "屏幕共享"
+msgid "File Sharing"
+msgstr "文件共享"
 
 #: ../panels/sharing/sharing.ui.h:8
-msgid "Media Sharing"
-msgstr "媒体共享"
+msgid "_Require Password"
+msgstr "éœ€è¦å¯†ç (_R)"
 
-#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Remote Login"
 msgstr "远程登录"
 
-#: ../panels/sharing/sharing.ui.h:10
-msgid "Some services are disabled because of no network access."
-msgstr "å› ä¸ºæ²¡æœ‰ç½‘ç»œï¼Œä¸€äº›æœåŠ¡å·²ç»ç¦ç”¨ã€‚"
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Screen Sharing"
+msgstr "屏幕共享"
 
 #: ../panels/sharing/sharing.ui.h:12
-#, 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>"
+msgid "_Allow connections to control the screen"
+msgstr "允许连接控制屏幕(_A)"
 
 #: ../panels/sharing/sharing.ui.h:13
-msgid "Require Password"
-msgstr "éœ€è¦å¯†ç "
+msgid "_Password:"
+msgstr "å¯†ç (_P)："
 
-#: ../panels/sharing/sharing.ui.h:16
-#, no-c-format
-msgid ""
-"Allow remote users to connect using the Secure Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
-msgstr ""
-"允许远程用户使用 SSH 命令连接：\n"
-"<a href=\"ssh %s\">ssh %s</a>"
-
-#: ../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 ""
-"允许远程用户通过 VNC 查看或控制屏幕：<a href=\"vnc://%s\">vnc://%s</a> "
-
-#: ../panels/sharing/sharing.ui.h:20
-msgid "Allow Remote Control"
-msgstr "允许远程控制"
-
-#: ../panels/sharing/sharing.ui.h:21
-msgid "Password:"
-msgstr "å¯†ç ï¼š"
-
-#: ../panels/sharing/sharing.ui.h:22
-msgid "Show Password"
-msgstr "æ˜¾ç¤ºå¯†ç "
+#: ../panels/sharing/sharing.ui.h:14
+msgid "_Show Password"
+msgstr "æ˜¾ç¤ºå¯†ç (_S)"
 
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:15
 msgid "Access Options"
 msgstr "访问选项"
 
-#: ../panels/sharing/sharing.ui.h:24
-msgid "New connections must ask for access"
-msgstr "建立新连接前必须询问"
+#: ../panels/sharing/sharing.ui.h:16
+msgid "_New connections must ask for access"
+msgstr "建立新连接前必须询问访问权限(_N)"
 
-#: ../panels/sharing/sharing.ui.h:25
-msgid "Require a password"
-msgstr "éœ€è¦å¯†ç "
+#: ../panels/sharing/sharing.ui.h:17
+msgid "_Require a password"
+msgstr "éœ€è¦å¯†ç (_R)"
 
-#: ../panels/sharing/sharing.ui.h:26
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
-msgstr "媒体共享允许您在网络上共享音乐、照片和视频。"
+#: ../panels/sharing/sharing.ui.h:18
+msgid "Media Sharing"
+msgstr "媒体共享"
 
-#: ../panels/sharing/sharing.ui.h:27
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share music, photos and videos over the network."
+msgstr "通过网络共享音乐、照片和视频。"
+
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Folders"
 msgstr "文件夹"
 
@@ -5248,14 +5331,14 @@ msgstr "声音"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
 msgid "Change sound levels, inputs, outputs, and alert sounds"
-msgstr "更改音量、输入、输出和事件声音"
+msgstr "更改音频音量、音频输入输出和事件声音"
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 msgstr ""
-"声卡;麦克风;话筒;音量;淡入淡出;均衡;蓝牙;耳机;耳麦;Card;Microphone;Volume;"
-"Fade;Balance;Bluetooth;Headset;"
+"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;声卡;麦克风;话筒;音量;"
+"淡入淡出;均衡;蓝牙;耳机;耳麦;音频;"
 
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
@@ -5267,13 +5350,13 @@ msgstr "çŠ¬å "
 #. You might want to translate it into the equivalent words of your language.
 #: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:6
 msgid "Drip"
-msgstr "滴雨"
+msgstr "雨滴"
 
 #. Translators: This is the name of an audio file that sounds like tapping glass.
 #. You might want to translate it into the equivalent words of your language.
 #: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:9
 msgid "Glass"
-msgstr "敲窗"
+msgstr "玻璃"
 
 #. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
 #. You might want to translate it into the equivalent words of your language.
@@ -5317,7 +5400,7 @@ msgstr "均衡(_B)："
 
 #: ../panels/sound/gvc-balance-bar.c:292
 msgid "_Fade:"
-msgstr "淡入淡出(_F)："
+msgstr "淡出淡入(_F)："
 
 #: ../panels/sound/gvc-balance-bar.c:295
 msgid "_Subwoofer:"
@@ -5366,11 +5449,6 @@ msgstr "测试扬声器(_T)"
 msgid "Peak detect"
 msgstr "峰值检测"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
-msgid "Name"
-msgstr "名称"
-
 #: ../panels/sound/gvc-mixer-dialog.c:1512
 msgid "Device"
 msgstr "设备"
@@ -5422,7 +5500,7 @@ msgstr "警告音量(_A)："
 
 #: ../panels/sound/gvc-mixer-dialog.c:1785
 msgid "No application is currently playing or recording audio."
-msgstr "没有程序正在播放或录制音频。"
+msgstr "没有正在播放或录制音频的程序。"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:188
 msgid "Built-in"
@@ -5452,29 +5530,34 @@ msgstr "来自主题"
 msgid "C_hoose an alert sound:"
 msgstr "选择警告声音(_H)："
 
-#: ../panels/sound/gvc-speaker-test.c:219
+#: ../panels/sound/gvc-speaker-test.c:231
 msgid "Stop"
 msgstr "停止"
 
-#: ../panels/sound/gvc-speaker-test.c:219
-#: ../panels/sound/gvc-speaker-test.c:331
+#: ../panels/sound/gvc-speaker-test.c:231
+#: ../panels/sound/gvc-speaker-test.c:343
 msgid "Test"
 msgstr "测试"
 
-#: ../panels/sound/gvc-speaker-test.c:227
+#: ../panels/sound/gvc-speaker-test.c:239
 msgid "Subwoofer"
-msgstr "超低音"
+msgstr "重低音"
 
-#: ../panels/sound/sound-theme-file-utils.c:290
+#: ../panels/sound/sound-theme-file-utils.c:304
 msgid "Custom"
 msgstr "自定义"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+msgid "Uni­ver­sal Access"
+msgstr "通用辅助功能"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Make it easier to see, hear, type, point and click"
-msgstr "ä½¿çœ‹ã€å¬ã€æ‰“å­—ã€æŒ‡ã€ç‚¹æ›´åŠ å®¹æ˜“"
+msgstr "辅助视觉、听觉、打字和指点操作"
 
 #. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
@@ -5500,6 +5583,7 @@ msgid "_Large Text"
 msgstr "大号文本(_L)"
 
 #: ../panels/universal-access/uap.ui.h:5
+#: ../panels/universal-access/zoom-options.ui.h:7
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
@@ -5524,207 +5608,255 @@ msgid "Screen _Keyboard"
 msgstr "屏幕键盘(_K)"
 
 #: ../panels/universal-access/uap.ui.h:13
+msgid "R_epeat Keys"
+msgstr "重复键(_E)"
+
+#: ../panels/universal-access/uap.ui.h:14
+msgid "Cursor _Blinking"
+msgstr "å…‰æ ‡é—ªçƒ(_B)"
+
+#: ../panels/universal-access/uap.ui.h:15
 msgid "_Typing Assist (AccessX)"
 msgstr "AccessX 打字助手(_T)"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:16
 msgid "Pointing & Clicking"
 msgstr "指向和点击"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:17
 msgid "_Mouse Keys"
 msgstr "é¼ æ ‡é”®(_M)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:18
 msgid "_Click Assist"
 msgstr "点击助手(_C)"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:19
+msgid "_Double-Click Delay"
+msgstr "双击延时(_D)"
+
+#: ../panels/universal-access/uap.ui.h:20
+msgid "Double-Click Delay"
+msgstr "双击延时"
+
+#: ../panels/universal-access/uap.ui.h:21
 msgid "Screen Reader"
 msgstr "屏幕朗读"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:22
 msgid "The screen reader reads displayed text as you move the focus."
-msgstr "当您移动焦点时朗读显示的文本。"
+msgstr "移动焦点时朗读显示的文本。"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:23
 msgid "_Screen Reader"
 msgstr "屏幕朗读(_S)"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Sound Keys"
 msgstr "发声键"
 
-#: ../panels/universal-access/uap.ui.h:21
-msgid "Beep when Num Lock or Caps Lock are turned on."
-msgstr "数字键盘锁定或大小写锁定开启时发出蜂鸣声。"
+#: ../panels/universal-access/uap.ui.h:25
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
+msgstr "数字键盘锁定或大小写锁定开启或关闭时发出蜂鸣声。"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:26
 msgid "Visual Alerts"
 msgstr "视觉警告"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:27
 msgid "_Test flash"
 msgstr "测试闪烁(_T)"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "发出警告声时使用视觉提示。"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Flash the _window title"
 msgstr "é—ªçƒçª—å£æ ‡é¢˜æ (_W)"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Flash the entire _screen"
 msgstr "闪烁整个屏幕(_S)"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:31
+msgid "Repeat Keys"
+msgstr "重复"
+
+#: ../panels/universal-access/uap.ui.h:32
+msgid "Key presses repeat when key is held down."
+msgstr "按住某一键时重复该键。"
+
+#: ../panels/universal-access/uap.ui.h:34
+msgid "Repeat keys delay"
+msgstr "重复键延时"
+
+#: ../panels/universal-access/uap.ui.h:35
+msgid "Speed"
+msgstr "速度"
+
+#: ../panels/universal-access/uap.ui.h:36
+msgid "Repeat keys speed"
+msgstr "重复键速度"
+
+#: ../panels/universal-access/uap.ui.h:37
+msgid "Cursor Blinking"
+msgstr "å…‰æ ‡é—ªçƒ"
+
+#: ../panels/universal-access/uap.ui.h:38
+msgid "Cursor blinks in text fields."
+msgstr "æ–‡æœ¬å­—æ®µä¸­å…‰æ ‡é—ªçƒã€‚"
+
+#: ../panels/universal-access/uap.ui.h:39
+msgid "Cursor blinking speed"
+msgstr "å…‰æ ‡é—ªçƒé€Ÿåº¦"
+
+#: ../panels/universal-access/uap.ui.h:40
 msgid "Typing Assist"
 msgstr "打字助手"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:41
 msgid "_Sticky Keys"
 msgstr "粘滞键(_S)"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Treats a sequence of modifier keys as a key combination"
-msgstr "将一串键当作一个组合键"
+msgstr "将一系列按键当作组合键"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:43
 msgid "_Disable if two keys are pressed together"
-msgstr "若同时按下两个键则禁用(_D)"
+msgstr "同时按下两个键时禁用输入(_D)"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Beep when a _modifier key is pressed"
-msgstr "当按下修饰键时蜂鸣(_M)"
+msgstr "按修饰键时蜂鸣(_M)"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:45
 msgid "S_low Keys"
 msgstr "慢速键(_L)"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "åœ¨æŒ‰ä¸‹æŒ‰é”®å’ŒæŽ¥å—æŒ‰é”®ä¹‹é—´æ·»åŠ å»¶è¿Ÿ"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:47
 msgid "A_cceptance delay:"
 msgstr "按键接受延迟(_C)："
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:48
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Slow keys typing delay"
 msgstr "慢速键输入延迟"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:50
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "é•¿"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:51
 msgid "Beep when a key is pr_essed"
 msgstr "按键时蜂鸣(_E)"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Beep when a key is _accepted"
 msgstr "按键被接受时蜂鸣(_A)"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:53
 msgid "Beep when a key is _rejected"
 msgstr "按键被拒绝时蜂鸣(_R)"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:54
 msgid "_Bounce Keys"
 msgstr "重复键(_B)"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重复按键"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:56
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:57
 msgid "Bounce keys typing delay"
 msgstr "重复键输入延迟"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:58
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "é•¿"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:59
 msgid "_Enable by Keyboard"
 msgstr "通过键盘启用(_E)"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "通过键盘开关辅助功能特性"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Click Assist"
 msgstr "点击助手"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:62
 msgid "_Simulated Secondary Click"
 msgstr "模拟右键点击(_S)"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æŒ‰ä½é¼ æ ‡ä¸»é”®ä¸æ”¾æ—¶è§¦å‘å³é”®ç‚¹å‡»"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:64
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Secondary click delay"
 msgstr "右键点击延迟"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:66
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "é•¿"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:67
 msgid "_Hover Click"
 msgstr "悬停点击(_H)"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Trigger a click when the pointer hovers"
-msgstr "指针悬停时执行点击。"
+msgstr "指针悬停时触发点击。"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:69
 msgid "D_elay:"
 msgstr "延迟(_E)："
 
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:70
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:71
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "é•¿"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Motion _threshold:"
 msgstr "运动阈值(_T)："
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:73
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:74
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
@@ -5778,37 +5910,33 @@ msgstr "右半部分"
 msgid "Zoom Options"
 msgstr "缩放选项"
 
-#: ../panels/universal-access/zoom-options.ui.h:7
-msgid "Zoom"
-msgstr "缩放"
-
 #: ../panels/universal-access/zoom-options.ui.h:8
-msgid "Magnification:"
-msgstr "放大比率："
+msgid "_Magnification:"
+msgstr "放大比率(_M)："
 
 #: ../panels/universal-access/zoom-options.ui.h:9
-msgid "Follow mouse cursor"
-msgstr "è·Ÿéšé¼ æ ‡å…‰æ ‡"
+msgid "_Follow mouse cursor"
+msgstr "è·Ÿéšé¼ æ ‡å…‰æ ‡(_F)"
 
 #: ../panels/universal-access/zoom-options.ui.h:10
-msgid "Screen part:"
-msgstr "屏幕区域："
+msgid "_Screen part:"
+msgstr "屏幕区域(_S)："
 
 #: ../panels/universal-access/zoom-options.ui.h:11
-msgid "Magnifier extends outside of screen"
-msgstr "放大镜延伸至屏幕外"
+msgid "Magnifier _extends outside of screen"
+msgstr "放大镜可延伸至屏幕外(_E)"
 
 #: ../panels/universal-access/zoom-options.ui.h:12
-msgid "Keep magnifier cursor centered"
-msgstr "ä¿æŒæ”¾å¤§é•œå…‰æ ‡å±…ä¸­"
+msgid "_Keep magnifier cursor centered"
+msgstr "ä¿æŒæ”¾å¤§é•œå…‰æ ‡å±…ä¸­(_K)"
 
 #: ../panels/universal-access/zoom-options.ui.h:13
-msgid "Magnifier cursor pushes contents around"
-msgstr "æ”¾å¤§é•œå…‰æ ‡æŽ¨åŠ¨å†…å®¹"
+msgid "Magnifier cursor _pushes contents around"
+msgstr "æ”¾å¤§é•œå…‰æ ‡æŽ¨åŠ¨å†…å®¹(_P)"
 
 #: ../panels/universal-access/zoom-options.ui.h:14
-msgid "Magnifier cursor moves with contents"
-msgstr "æ”¾å¤§é•œå…‰æ ‡ä¸Žå†…å®¹åŒæ­¥ç§»åŠ¨"
+msgid "Magnifier cursor moves with _contents"
+msgstr "æ”¾å¤§é•œå…‰æ ‡ä¸Žå†…å®¹åŒæ­¥ç§»åŠ¨(_C)"
 
 #: ../panels/universal-access/zoom-options.ui.h:15
 msgid "Magnifier Position:"
@@ -5819,8 +5947,8 @@ msgid "Magnifier"
 msgstr "放大镜"
 
 #: ../panels/universal-access/zoom-options.ui.h:17
-msgid "Thickness:"
-msgstr "粗细："
+msgid "_Thickness:"
+msgstr "粗细(_T)："
 
 #: ../panels/universal-access/zoom-options.ui.h:18
 msgctxt "universal access, thickness"
@@ -5833,43 +5961,43 @@ msgid "Thick"
 msgstr "ç²—"
 
 #: ../panels/universal-access/zoom-options.ui.h:20
-msgid "Length:"
-msgstr "长度："
+msgid "_Length:"
+msgstr "长度(_L)："
 
 #. The color of the accessibility crosshair
 #: ../panels/universal-access/zoom-options.ui.h:22
-msgid "Color:"
-msgstr "颜色："
+msgid "Co_lor:"
+msgstr "颜色(_L)："
 
 #: ../panels/universal-access/zoom-options.ui.h:23
-msgid "Crosshairs:"
-msgstr "åå­—å…‰æ ‡ï¼š"
+msgid "_Crosshairs:"
+msgstr "åå­—å…‰æ ‡(_C)："
 
 #: ../panels/universal-access/zoom-options.ui.h:24
-msgid "Overlaps mouse cursor"
-msgstr "å…‰æ ‡ä¸Žé¼ æ ‡æŒ‡é’ˆé‡å "
+msgid "_Overlaps mouse cursor"
+msgstr "å…‰æ ‡ä¸Žé¼ æ ‡æŒ‡é’ˆé‡å ï¼ˆâ€”â€”O）"
 
 #: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Crosshairs"
 msgstr "åå­—å…‰æ ‡"
 
 #: ../panels/universal-access/zoom-options.ui.h:26
-msgid "White on black:"
-msgstr "白底黑字："
+msgid "_White on black:"
+msgstr "白底黑字(_W)："
 
 #: ../panels/universal-access/zoom-options.ui.h:27
-msgid "Brightness:"
-msgstr "亮度："
+msgid "_Brightness:"
+msgstr "亮度(_B)："
 
 #: ../panels/universal-access/zoom-options.ui.h:28
-msgid "Contrast:"
-msgstr "对比度："
+msgid "_Contrast:"
+msgstr "对比度(_C)："
 
 #. The contrast scale goes from Color to None (grayscale)
 #: ../panels/universal-access/zoom-options.ui.h:30
 msgctxt "universal access, contrast"
-msgid "Color"
-msgstr "色彩"
+msgid "Co_lor"
+msgstr "色彩(_L)"
 
 #: ../panels/universal-access/zoom-options.ui.h:31
 msgctxt "universal access, color"
@@ -5910,92 +6038,66 @@ msgid "Color Effects"
 msgstr "色彩效果"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "æ ‡å‡†"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "管理员"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "æ·»åŠ ç”¨æˆ·"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
 msgid "_Full Name"
 msgstr "全名(_F)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-msgid "Account _Type"
-msgstr "帐号类型(_T)"
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Standard"
+msgstr "æ ‡å‡†"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../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/user-accounts-dialog.ui.h:3
+msgid "Administrator"
+msgstr "管理员"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
-msgid "Set a password now"
-msgstr "çŽ°åœ¨è®¾ç½®å¯†ç "
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+msgid "Account _Type"
+msgstr "帐号类型(_T)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "验证(_V)"
+msgid "Allow user to set a password when they next _login"
+msgstr "å…è®¸ç”¨æˆ·ä¸‹æ¬¡ç™»å½•æ—¶æ›´æ”¹å¯†ç (_L)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:11
-msgid ""
-"Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
-msgstr "企业登录允许在本设备上使用已有的、集中管理的用户帐号。"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-msgid "_Domain"
-msgstr "域(_D)"
+msgid "Set a password _now"
+msgstr "çŽ°åœ¨è®¾ç½®å¯†ç (_N)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:13
+msgid "_Confirm"
+msgstr "确认(_C)"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
 msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr "è¯·è”ç½‘ä»¥æ·»åŠ ä¼ä¸šç™»å½•å¸å·ã€‚"
+"Enterprise login allows an existing centrally managed user account to be "
+"used on this device. You can also use this account to access company "
+"resources on the internet."
+msgstr ""
+"企业登录允许在本设备上使用已有的、集中管理的用户帐号。您也可以使用此账号访问"
+"公司在互联网上的资源。"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:15
-msgid "_Enterprise Login"
-msgstr "企业登录(_E)"
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
+msgid "_Domain"
+msgstr "域(_D)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-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:20
-msgid "Domain Administrator Login"
-msgstr "域管理员登录"
+msgid "You are Offline"
+msgstr "您已离线"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr ""
-"要想使用企业登录，需要在域中注册该计算机。请网络管理员在此\n"
-"è¾“å…¥åŸŸå¯†ç ã€‚"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "管理员名称(_N)"
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+msgid "You must be online in order to add enterprise users."
+msgstr "æ‚¨å¿…é¡»åœ¨çº¿ä»¥æ·»åŠ ä¼ä¸šç™»å½•å¸å·ã€‚"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "ç®¡ç†å‘˜å¯†ç "
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "_Enterprise Login"
+msgstr "企业登录(_E)"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -6030,7 +6132,7 @@ msgid "Right little finger"
 msgstr "右手小指"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:686
+#: ../panels/user-accounts/um-fingerprint-dialog.c:687
 msgid "Enable Fingerprint Login"
 msgstr "启用指纹登录"
 
@@ -6050,7 +6152,7 @@ msgstr "其他手指(_O)："
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
-msgstr "您的指纹已成功保存，现在起可以使用指纹登录。"
+msgstr "您的指纹已成功保存，从现在起可以使用指纹登录。"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
 msgid "Users"
@@ -6064,12 +6166,34 @@ msgstr "æ·»åŠ æˆ–åˆ é™¤ç”¨æˆ·åŠæ›´æ”¹å¯†ç "
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr ""
-"登录;名称;指纹;头像;æ ‡å¿—;å¯†ç ;Login;Name;Fingerprint;Avatar;Logo;Face;"
-"Password;"
+"Login;Name;Fingerprint;Avatar;Logo;Face;Password;登录;名称;指纹;头像;æ ‡å¿—;密"
+"ç ;"
+
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "登记(_E)"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "域管理员登录"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"要使用企业登录，需要在域中注册该计算机。\n"
+"è¯·è¦æ±‚ç½‘ç»œç®¡ç†å‘˜åœ¨æ­¤è¾“å…¥åŸŸå¯†ç ã€‚"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "管理员名称(_N)"
 
-#: ../panels/user-accounts/data/history-dialog.ui.h:1
-msgid "Login History"
-msgstr "登录历史"
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "ç®¡ç†å‘˜å¯†ç "
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Change Password"
@@ -6091,35 +6215,31 @@ msgstr "æ–°å¯†ç (_N)"
 msgid "Current _Password"
 msgstr "å½“å‰å¯†ç (_P)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Add User Account"
-msgstr "æ·»åŠ ç”¨æˆ·å¸å·"
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
+msgid "Allow user to change their password on next login"
+msgstr "å…è®¸ç”¨æˆ·ä¸‹æ¬¡ç™»å½•æ—¶æ›´æ”¹å¯†ç "
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-msgid "Remove User Account"
-msgstr "移除用户帐号"
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
+msgid "Set a password now"
+msgstr "çŽ°åœ¨è®¾ç½®å¯†ç "
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Login Options"
-msgstr "登录选项"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+msgid "_Add User…"
+msgstr "æ·»åŠ ç”¨æˆ·(_A)…"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "A_utomatic Login"
 msgstr "自动登录(_U)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Fingerprint Login"
 msgstr "指纹登录(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "User Icon"
 msgstr "ç”¨æˆ·å›¾æ ‡"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "_Language"
-msgstr "语言(_L)"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "Last Login"
 msgstr "最近登录"
 
@@ -6139,7 +6259,7 @@ msgstr "æ–°å¯†ç ä¸èƒ½å’Œæ—§å¯†ç ç›¸åŒã€‚"
 #: ../panels/user-accounts/pw-utils.c:83
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
-msgstr "请改动些字母和数字。"
+msgstr "请改动一些字母和数字。"
 
 #: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
 msgctxt "Password hint"
@@ -6159,12 +6279,12 @@ msgstr "è¯·å‹¿åœ¨å¯†ç ä¸­ä½¿ç”¨æ‚¨çš„åå­—ã€‚"
 #: ../panels/user-accounts/pw-utils.c:91
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
-msgstr "请勿使用单词。"
+msgstr "è¯·å‹¿åœ¨å¯†ç ä¸­ä½¿ç”¨å•è¯ã€‚"
 
 #: ../panels/user-accounts/pw-utils.c:95
 msgctxt "Password hint"
 msgid "Try to avoid common words."
-msgstr "尽勿使用常用单词。"
+msgstr "请勿使用常用单词。"
 
 #: ../panels/user-accounts/pw-utils.c:97
 msgctxt "Password hint"
@@ -6194,7 +6314,7 @@ msgstr "è¯·ä½¿ç”¨æ›´å¤šç‰¹æ®Šå­—ç¬¦ï¼Œå¦‚æ ‡ç‚¹ç¬¦å·ã€‚"
 #: ../panels/user-accounts/pw-utils.c:107
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
-msgstr "è¯·æ··åˆä½¿ç”¨å­—æ¯ã€æ•°å­—å’Œæ ‡ç‚¹ç¬¦å·ã€‚"
+msgstr "è¯·æ··ç”¨å­—æ¯ã€æ•°å­—å’Œæ ‡ç‚¹ç¬¦å·ã€‚"
 
 #: ../panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
@@ -6206,7 +6326,7 @@ msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
-msgstr "è¯·é¿å…é‡å¤ç›¸åŒç±»åž‹çš„å­—ç¬¦ï¼šæ··åˆå­—æ¯ã€æ•°å­—å’Œæ ‡ç‚¹ç¬¦å·ã€‚"
+msgstr "è¯·é¿å…é‡å¤ç›¸åŒç±»åž‹çš„å­—ç¬¦ï¼šä½ éœ€è¦æ··åˆå­—æ¯ã€æ•°å­—å’Œæ ‡ç‚¹ç¬¦å·ã€‚"
 
 #: ../panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
@@ -6220,45 +6340,45 @@ msgstr "请使用更多字母、数字和符号。"
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
-msgstr "混合使用大小写字母和 1-2 个数字。"
+msgid "Mix uppercase and lowercase and try to use a number or two."
+msgstr "å¯†ç éœ€è¦å¤§å°å†™å­—æ¯æ··ç”¨å¹¶è¯•ç€ä½¿ç”¨ä¸€åˆ°ä¸¤ä¸ªæ•°å­—ã€‚"
 
 #: ../panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
 "Good password! Adding more letters, numbers and punctuation will make it "
 "stronger."
-msgstr "å¯†ç ä¸é”™ï¼è¿˜å¯ä»¥å¢žåŠ æ›´å¤šå­—æ¯ã€æ•°å­—å’Œæ ‡ç‚¹è¿›ä¸€æ­¥æé«˜å¥å£®æ€§ã€‚"
+msgstr "å¯†ç ä¸é”™ï¼å¢žåŠ æ›´å¤šå­—æ¯ã€æ•°å­—å’Œæ ‡ç‚¹å¯è¿›ä¸€æ­¥æé«˜å¯†ç å¼ºåº¦ã€‚"
 
 #: ../panels/user-accounts/pw-utils.c:141
 #: ../panels/user-accounts/pw-utils.c:171
 msgctxt "Password strength"
 msgid "Strength: Weak"
-msgstr "强度：弱"
+msgstr "强度：较弱"
 
 #: ../panels/user-accounts/pw-utils.c:145
 #: ../panels/user-accounts/pw-utils.c:172
 msgctxt "Password strength"
 msgid "Strength: Low"
-msgstr "强度：低"
+msgstr "强度：较低"
 
 #: ../panels/user-accounts/pw-utils.c:148
 #: ../panels/user-accounts/pw-utils.c:173
 msgctxt "Password strength"
 msgid "Strength: Medium"
-msgstr "强度：中"
+msgstr "强度：中等"
 
 #: ../panels/user-accounts/pw-utils.c:151
 #: ../panels/user-accounts/pw-utils.c:174
 msgctxt "Password strength"
 msgid "Strength: Good"
-msgstr "强度：好"
+msgstr "强度：良好"
 
 #: ../panels/user-accounts/pw-utils.c:154
 #: ../panels/user-accounts/pw-utils.c:175
 msgctxt "Password strength"
 msgid "Strength: High"
-msgstr "强度：高"
+msgstr "强度：较高"
 
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
@@ -6282,7 +6402,7 @@ msgstr "æ–°å¯†ç å’Œæ—§å¯†ç å¤ªç›¸ä¼¼"
 #: ../panels/user-accounts/run-passwd.c:517
 #, c-format
 msgid "The new password has already been used recently."
-msgstr "æ–°å¯†ç æœ€è¿‘ä½¿ç”¨è¿‡ã€‚"
+msgstr "æ–°çš„å¯†ç æœ€è¿‘å·²ä½¿ç”¨è¿‡ã€‚"
 
 #: ../panels/user-accounts/run-passwd.c:520
 #, c-format
@@ -6297,12 +6417,12 @@ msgstr "æ–°æ—§å¯†ç ç›¸åŒ"
 #: ../panels/user-accounts/run-passwd.c:528
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
-msgstr "å¯†ç åœ¨æ‚¨é¦–æ¬¡ç™»å½•åŽå·²ç»æ›´æ”¹ï¼"
+msgstr "å¯†ç åœ¨æ‚¨é¦–æ¬¡è®¤è¯åŽå·²ç»æ›´æ”¹ï¼"
 
 #: ../panels/user-accounts/run-passwd.c:532
 #, c-format
 msgid "The new password does not contain enough different characters"
-msgstr "æ–°å¯†ç å¿…é¡»åŒ…å«è¶³å¤Ÿçš„ä¸åŒå­—ç¬¦"
+msgstr "æ–°å¯†ç å¿…é¡»ä¸€å®šé‡ä¸åŒçš„å­—ç¬¦"
 
 #: ../panels/user-accounts/run-passwd.c:536
 #, c-format
@@ -6310,50 +6430,60 @@ msgid "Unknown error"
 msgstr "未知错误"
 
 #: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your account provider."
-msgstr "应与您帐号提供商的网络地址相同。"
+msgid "Should match the web address of your login provider."
+msgstr "应与您登录提供商的网络地址相同。"
 
 #: ../panels/user-accounts/um-account-dialog.c:228
 msgid "Failed to add account"
 msgstr "æ·»åŠ å¸å·å¤±è´¥"
 
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:448
 msgid "Passwords do not match."
 msgstr "å¯†ç ä¸åŒ¹é…ã€‚"
 
-#: ../panels/user-accounts/um-account-dialog.c:733
-#: ../panels/user-accounts/um-account-dialog.c:779
-#: ../panels/user-accounts/um-account-dialog.c:800
+#: ../panels/user-accounts/um-account-dialog.c:702
+#: ../panels/user-accounts/um-account-dialog.c:748
+#: ../panels/user-accounts/um-account-dialog.c:769
 msgid "Failed to register account"
 msgstr "注册用户失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:892
 msgid "No supported way to authenticate with this domain"
-msgstr "没有支持这个域的验证方法"
+msgstr "没有支持该域的验证方法"
 
-#: ../panels/user-accounts/um-account-dialog.c:982
+#: ../panels/user-accounts/um-account-dialog.c:965
 msgid "Failed to join domain"
 msgstr "åŠ å…¥åŸŸå¤±è´¥"
 
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1026
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
 msgstr "登录名不正确，请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1050
+#: ../panels/user-accounts/um-account-dialog.c:1033
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
 msgstr "ç™»å½•å¯†ç ä¸æ­£ç¡®ï¼Œè¯·é‡è¯•ã€‚"
 
-#: ../panels/user-accounts/um-account-dialog.c:1058
+#: ../panels/user-accounts/um-account-dialog.c:1041
 msgid "Failed to log into domain"
 msgstr "登录到域失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:1116
+#: ../panels/user-accounts/um-account-dialog.c:1099
 msgid "Unable find the domain. Maybe you misspelled it?"
-msgstr "找不到该域名，也许您拼错了？"
+msgstr "找不到该域名，也许拼写有误？"
+
+#: ../panels/user-accounts/um-account-type.c:34
+msgctxt "Account type"
+msgid "Standard"
+msgstr "æ ‡å‡†"
+
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "管理员"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:138
 msgid ""
@@ -6362,7 +6492,7 @@ msgstr "您未被允许访问该设备。请联系系统管理员。"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:140
 msgid "The device is already in use."
-msgstr "设备使用中。"
+msgstr "è®¾å¤‡æ­£è¢«å ç”¨ã€‚"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:142
 msgid "An internal error occurred."
@@ -6372,46 +6502,46 @@ msgstr "发生了一个内部错误。"
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
 msgid "Delete registered fingerprints?"
 msgstr "è¦åˆ é™¤å·²è®°å½•çš„æŒ‡çº¹å—ï¼Ÿ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "_Delete Fingerprints"
 msgstr "åˆ é™¤æŒ‡çº¹(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: ../panels/user-accounts/um-fingerprint-dialog.c:274
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "ç¡®å®šè¦åˆ é™¤å·²ç™»è®°çš„æŒ‡çº¹å—ï¼Ÿè¿™å°†ç¦ç”¨æŒ‡çº¹ç™»å½•ã€‚"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: ../panels/user-accounts/um-fingerprint-dialog.c:444
 msgid "Done!"
 msgstr "完成！"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: ../panels/user-accounts/um-fingerprint-dialog.c:505
+#: ../panels/user-accounts/um-fingerprint-dialog.c:547
 #, c-format
 msgid "Could not access '%s' device"
-msgstr "æ— æ³•è®¿é—®è®¾å¤‡ %s"
+msgstr "æ— æ³•è®¿é—®è®¾å¤‡â€œ%s”"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:587
+#: ../panels/user-accounts/um-fingerprint-dialog.c:588
 #, c-format
 msgid "Could not start finger capture on '%s' device"
-msgstr "æ— æ³•åœ¨è®¾å¤‡ %s 上启动指纹采集"
+msgstr "æ— æ³•åœ¨è®¾å¤‡â€œ%s”上启动指纹采集"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:637
+#: ../panels/user-accounts/um-fingerprint-dialog.c:638
 msgid "Could not access any fingerprint readers"
 msgstr "æ— æ³•è®¿é—®æŒ‡çº¹è¯»å–å™¨"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:639
 msgid "Please contact your system administrator for help."
 msgstr "请联系系统管理员以寻求帮助。"
 
@@ -6420,26 +6550,26 @@ msgstr "请联系系统管理员以寻求帮助。"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:720
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
-msgstr "要启用指纹登录，您需要使用设备 %s 保存一个指纹。"
+msgstr "要启用指纹登录，您需要使用设备“%s”保存一个指纹。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:727
+#: ../panels/user-accounts/um-fingerprint-dialog.c:728
 msgid "Selecting finger"
 msgstr "选择手指"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:729
 msgid "Enrolling fingerprints"
-msgstr "åŠ å…¥æŒ‡çº¹è¯†åˆ«"
+msgstr "正在登记指纹"
 
-#: ../panels/user-accounts/um-history-dialog.c:68
+#: ../panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
 msgstr "本周"
 
-#: ../panels/user-accounts/um-history-dialog.c:71
+#: ../panels/user-accounts/um-history-dialog.c:73
 msgid "Last Week"
 msgstr "上周"
 
@@ -6447,22 +6577,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:77
-#: ../panels/user-accounts/um-history-dialog.c:81
+#: ../panels/user-accounts/um-history-dialog.c:79
+#: ../panels/user-accounts/um-history-dialog.c:83
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%b %e"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:86
+#: ../panels/user-accounts/um-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%Y %b %e"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:91
+#: ../panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
 msgid "%s - %s"
@@ -6470,32 +6600,39 @@ 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:844
+#: ../panels/user-accounts/um-history-dialog.c:177
+#: ../panels/user-accounts/um-user-panel.c:841
 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:178
-#: ../panels/user-accounts/um-user-panel.c:848
+#: ../panels/user-accounts/um-history-dialog.c:180
+#: ../panels/user-accounts/um-user-panel.c:845
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:247
+#: ../panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "会话结束"
 
-#: ../panels/user-accounts/um-history-dialog.c:253
+#: ../panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "会话开始"
 
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: ../panels/user-accounts/um-history-dialog.c:299
+#, c-format
+msgid "%s - Account Activity"
+msgstr "%s - 账号活动"
+
 #: ../panels/user-accounts/um-password-dialog.c:145
 msgid "Please choose another password."
-msgstr "è¯·é€‰æ‹©å…¶ä»–çš„å¯†ç ã€‚"
+msgstr "è¯·é€‰æ‹©å¦ä¸€ä¸ªå¯†ç ã€‚"
 
 #: ../panels/user-accounts/um-password-dialog.c:154
 msgid "Please type your current password again."
@@ -6519,11 +6656,11 @@ msgstr "禁用图像"
 
 #: ../panels/user-accounts/um-photo-dialog.c:466
 msgid "Take a photo…"
-msgstr "æ‹å¼ ç…§..."
+msgstr "æ‹å¼ ç…§ç‰‡â€¦"
 
 #: ../panels/user-accounts/um-photo-dialog.c:484
 msgid "Browse for more pictures…"
-msgstr "浏览更多图片..."
+msgstr "浏览更多图片…"
 
 #: ../panels/user-accounts/um-photo-dialog.c:708
 #, c-format
@@ -6532,18 +6669,18 @@ msgstr "已被 %s 使用"
 
 #: ../panels/user-accounts/um-realm-manager.c:350
 msgid "Cannot automatically join this type of domain"
-msgstr "ä¸èƒ½è‡ªåŠ¨åŠ å…¥æ­¤ç±»åŸŸ"
+msgstr "æ— æ³•è‡ªåŠ¨åŠ å…¥æ­¤ç±»åŸŸ"
 
 #: ../panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
-msgstr "未发现此域或 realm"
+msgstr "æ— æ­¤åŸŸæˆ– Realm"
 
 #: ../panels/user-accounts/um-realm-manager.c:815
 #: ../panels/user-accounts/um-realm-manager.c:829
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
-msgstr "不能以 %s 身份登录域 %s"
+msgstr "æ— æ³•ä»¥ %s 的身份登录域 %s"
 
 #: ../panels/user-accounts/um-realm-manager.c:821
 msgid "Invalid password, please try again"
@@ -6554,91 +6691,91 @@ msgstr "æ— æ•ˆå¯†ç ï¼Œè¯·é‡è¯•"
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "æ— æ³•è¿žæŽ¥åˆ° %s 域：%s"
 
-#: ../panels/user-accounts/um-user-panel.c:240
+#: ../panels/user-accounts/um-user-panel.c:239
 msgid "Other Accounts"
 msgstr "其他帐号"
 
-#: ../panels/user-accounts/um-user-panel.c:450
+#: ../panels/user-accounts/um-user-panel.c:447
 msgid "Failed to delete user"
 msgstr "åˆ é™¤ç”¨æˆ·å¤±è´¥"
 
-#: ../panels/user-accounts/um-user-panel.c:510
-#: ../panels/user-accounts/um-user-panel.c:569
-#: ../panels/user-accounts/um-user-panel.c:621
+#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-user-panel.c:566
+#: ../panels/user-accounts/um-user-panel.c:618
 msgid "Failed to revoke remotely managed user"
 msgstr "吊销远程管理的用户失败"
 
-#: ../panels/user-accounts/um-user-panel.c:677
+#: ../panels/user-accounts/um-user-panel.c:674
 msgid "You cannot delete your own account."
 msgstr "ä¸èƒ½åˆ é™¤è‡ªå·±çš„å¸å·ã€‚"
 
-#: ../panels/user-accounts/um-user-panel.c:686
+#: ../panels/user-accounts/um-user-panel.c:683
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 已经登录"
 
-#: ../panels/user-accounts/um-user-panel.c:690
+#: ../panels/user-accounts/um-user-panel.c:687
 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:699
+#: ../panels/user-accounts/um-user-panel.c:696
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "要保留 %s 的文件吗？"
 
-#: ../panels/user-accounts/um-user-panel.c:703
+#: ../panels/user-accounts/um-user-panel.c:700
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "åˆ é™¤ç”¨æˆ·æ—¶å¯ä»¥ä¿ç•™å…¶ä¸»ç›®å½•ã€ç”µå­é‚®ä»¶ç›®å½•å’Œä¸´æ—¶æ–‡ä»¶ã€‚"
 
-#: ../panels/user-accounts/um-user-panel.c:706
+#: ../panels/user-accounts/um-user-panel.c:703
 msgid "_Delete Files"
 msgstr "åˆ é™¤æ–‡ä»¶(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:707
+#: ../panels/user-accounts/um-user-panel.c:704
 msgid "_Keep Files"
 msgstr "保留文件(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:721
+#: ../panels/user-accounts/um-user-panel.c:718
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s's account?"
-msgstr "您确定要吊销元亨管理的帐号 %s 吗？"
+msgstr "您确定要吊销远程管理的帐号 %s 吗？"
 
-#: ../panels/user-accounts/um-user-panel.c:725
+#: ../panels/user-accounts/um-user-panel.c:722
 msgid "_Delete"
 msgstr "åˆ é™¤(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:777
+#: ../panels/user-accounts/um-user-panel.c:774
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帐号已禁用"
 
-#: ../panels/user-accounts/um-user-panel.c:785
+#: ../panels/user-accounts/um-user-panel.c:782
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "下次登录时设置"
 
-#: ../panels/user-accounts/um-user-panel.c:788
+#: ../panels/user-accounts/um-user-panel.c:785
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ— "
 
-#: ../panels/user-accounts/um-user-panel.c:837
+#: ../panels/user-accounts/um-user-panel.c:834
 msgid "Logged in"
 msgstr "已登录"
 
-#: ../panels/user-accounts/um-user-panel.c:1274
+#: ../panels/user-accounts/um-user-panel.c:1290
 msgid "Failed to contact the accounts service"
 msgstr "联系帐号服务失败"
 
-#: ../panels/user-accounts/um-user-panel.c:1276
+#: ../panels/user-accounts/um-user-panel.c:1292
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "请确定帐号服务已正确安装并启用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1317
+#: ../panels/user-accounts/um-user-panel.c:1334
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6646,12 +6783,12 @@ msgstr ""
 "要进行更改，\n"
 "请先点击 * å›¾æ ‡"
 
-#: ../panels/user-accounts/um-user-panel.c:1355
+#: ../panels/user-accounts/um-user-panel.c:1374
 msgid "Create a user account"
 msgstr "创建用户帐号"
 
-#: ../panels/user-accounts/um-user-panel.c:1366
-#: ../panels/user-accounts/um-user-panel.c:1678
+#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1677
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6659,12 +6796,12 @@ msgstr ""
 "要创建用户帐号，\n"
 "请先点击 * å›¾æ ‡"
 
-#: ../panels/user-accounts/um-user-panel.c:1376
+#: ../panels/user-accounts/um-user-panel.c:1395
 msgid "Delete the selected user account"
 msgstr "åˆ é™¤é€‰ä¸­çš„ç”¨æˆ·å¸å·"
 
-#: ../panels/user-accounts/um-user-panel.c:1388
-#: ../panels/user-accounts/um-user-panel.c:1683
+#: ../panels/user-accounts/um-user-panel.c:1407
+#: ../panels/user-accounts/um-user-panel.c:1682
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6672,43 +6809,32 @@ msgstr ""
 "è¦åˆ é™¤é€‰ä¸­çš„ç”¨æˆ·å¸å·ï¼Œ\n"
 "请先点击 * å›¾æ ‡"
 
-#: ../panels/user-accounts/um-user-panel.c:1592
+#: ../panels/user-accounts/um-user-panel.c:1591
 msgid "My Account"
 msgstr "我的帐号"
 
 #: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "用户 %s 已存在。"
+msgid "Sorry, that user name isn't available. Please try another."
+msgstr "抱歉，该用户名不可用。请试下别的。"
 
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:566
 #, c-format
 msgid "The username is too long."
 msgstr "用户名太长。"
 
-#: ../panels/user-accounts/um-utils.c:570
+#: ../panels/user-accounts/um-utils.c:569
 msgid "The username cannot start with a '-'."
 msgstr "用户名不能以“-”开头。"
 
-#: ../panels/user-accounts/um-utils.c:573
+#: ../panels/user-accounts/um-utils.c:572
 msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'."
-msgstr "用户名只能包含大小写英文字母(a-z)、数字、“.”“-”“_”等符号"
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
+msgstr "用户名只能包含大小写英文字母（a 至 z）、数字和“.”“-”“_”符号"
 
-#: ../panels/user-accounts/um-utils.c:577
+#: ../panels/user-accounts/um-utils.c:576
 msgid "This will be used to name your home folder and can't be changed."
-msgstr "将作为您主文件夹的名称，不可更改。"
-
-#. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/user-accounts/um-utils.c:823
-msgid "%b %e"
-msgstr "%b %e"
-
-#. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/user-accounts/um-utils.c:827
-msgid "%b %e, %Y"
-msgstr " %Y %b %e"
+msgstr "将作为您主文件夹的名称且不可再次更改。"
 
 #: ../panels/wacom/button-mapping.ui.h:1
 msgid "Map Buttons"
@@ -6734,17 +6860,17 @@ msgstr "è¯·è§¦æ‘¸å±å¹•ä¸Šå‡ºçŽ°çš„æ ‡è®°ä»¥æ ¡å‡†å¹³æ¿ç”µè„‘ã€‚"
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:87
 msgid "Mis-click detected, restarting..."
-msgstr "检测到误点击，重新开始..."
+msgstr "æ£€æµ‹åˆ°è¯¯ç‚¹å‡»ï¼Œé‡æ–°å¼€å§‹æ ¡å‡†â€¦"
 
 #: ../panels/wacom/cc-wacom-button-row.c:442
 msgctxt "Wacom tablet button"
 msgid "Up"
-msgstr "上"
+msgstr "上键"
 
 #: ../panels/wacom/cc-wacom-button-row.c:443
 msgctxt "Wacom tablet button"
 msgid "Down"
-msgstr "下"
+msgstr "下键"
 
 #: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
@@ -6773,12 +6899,12 @@ msgstr "输出："
 #. Keep ratio switch
 #: ../panels/wacom/cc-wacom-mapping-panel.c:275
 msgid "Keep aspect ratio (letterbox):"
-msgstr "保持长宽比(邮筒)："
+msgstr "保持长宽比（黑边）："
 
 #. Whole-desktop checkbox
 #: ../panels/wacom/cc-wacom-mapping-panel.c:286
 msgid "Map to single monitor"
-msgstr "æ˜ å°„åˆ°å•ä¸ªæ˜¾ç¤ºå™¨..."
+msgstr "æ˜ å°„åˆ°å•ä¸ªæ˜¾ç¤ºå™¨â€¦"
 
 #: ../panels/wacom/cc-wacom-nav-button.c:88
 #, c-format
@@ -6793,27 +6919,27 @@ msgstr "æ˜¾ç¤ºæ˜ å°„"
 msgid "Button"
 msgstr "按键"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+msgid "Wa­com Tab­let"
 msgstr "Wacom 手写板"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr "ä¸ºç»˜å›¾ç”¨å¹³æ¿è®¾å¤‡è®¾ç½®æŒ‰é”®æ˜ å°„å¹¶è°ƒæ•´è§¦æ‘¸ç¬”çµæ•åº¦"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;手写板;手写板;写字笔;擦除器;é¼ æ ‡;"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:1
 msgid "Tablet (absolute)"
-msgstr "手写板(绝对)"
+msgstr "手写板（绝对）"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:2
 msgid "Touchpad (relative)"
-msgstr "触摸板(相对)"
+msgstr "触摸板（相对）"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:3
 msgid "Tablet Preferences"
@@ -6835,13 +6961,21 @@ msgstr "请插入并打开您的 Wacom 手写板"
 msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "Wacom 手写板"
+
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Map to Monitor…"
-msgstr "æ˜ å°„åˆ°æ˜¾ç¤ºå™¨..."
+msgstr "æ˜ å°„åˆ°æ˜¾ç¤ºå™¨â€¦"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Map Buttons…"
-msgstr "æ˜ å°„æŒ‰é”®..."
+msgstr "æ˜ å°„æŒ‰é”®â€¦"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+msgid "Calibrate…"
+msgstr "æ ¡å‡†â€¦"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:13
 msgid "Adjust display resolution"
@@ -6927,29 +7061,29 @@ msgstr "右 Touchstrip 模式切换"
 msgid "Mode Switch #%d"
 msgstr "模式切换 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1300
+#: ../panels/wacom/gsd-wacom-device.c:1238
 #, c-format
 msgid "Left Button #%d"
 msgstr "左键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1303
+#: ../panels/wacom/gsd-wacom-device.c:1241
 #, c-format
 msgid "Right Button #%d"
 msgstr "右键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1306
+#: ../panels/wacom/gsd-wacom-device.c:1244
 #, c-format
 msgid "Top Button #%d"
 msgstr "上键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1309
+#: ../panels/wacom/gsd-wacom-device.c:1247
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "底键 #%d"
 
 #: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
-msgstr "新建快捷键..."
+msgstr "新建快捷键…"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:1
 msgid "No Action"
@@ -6993,7 +7127,7 @@ msgstr "前进"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:11
 msgid "Stylus"
-msgstr "写字笔"
+msgstr "手写笔"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:12
 msgid "Eraser Pressure Feel"
@@ -7019,6 +7153,11 @@ msgstr "下键"
 msgid "Tip Pressure Feel"
 msgstr "指尖压力感应"
 
+#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
+#: ../shell/cc-window.c:1478
+msgid "All Settings"
+msgstr "全部设置"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "GNOME 控制中心"
@@ -7031,78 +7170,60 @@ msgstr "用来配置 GNOME 桌面的工具"
 msgid ""
 "The control center is GNOME's main interface for configuration of various "
 "aspects of your desktop."
-msgstr "控制中心是GNOME桌面中各方面配置的主界面。"
+msgstr "控制中心是 GNOME 用于配置桌面各方面设置的主要界面。"
 
-#: ../shell/cc-application.c:69
+#: ../shell/cc-application.c:45
+msgid "Display version number"
+msgstr "显示版本号"
+
+#: ../shell/cc-application.c:46
 msgid "Enable verbose mode"
 msgstr "启用详细模式"
 
-#: ../shell/cc-application.c:70
+#: ../shell/cc-application.c:47
 msgid "Show the overview"
 msgstr "显示摘要"
 
-#: ../shell/cc-application.c:71
+#: ../shell/cc-application.c:48
 msgid "Search for the string"
 msgstr "搜索字符串"
 
-#: ../shell/cc-application.c:72
+#: ../shell/cc-application.c:49
 msgid "List possible panel names and exit"
-msgstr "列出可能的面板名并退出"
-
-#: ../shell/cc-application.c:73 ../shell/cc-application.c:74
-#: ../shell/cc-application.c:75
-msgid "Show help options"
-msgstr "显示帮助选项"
+msgstr "列出所有面板名称并退出"
 
-#: ../shell/cc-application.c:76
+#: ../shell/cc-application.c:50
 msgid "Panel to display"
-msgstr "显示面板"
+msgstr "要显示的面板"
 
-#: ../shell/cc-application.c:76
+#: ../shell/cc-application.c:50
 msgid "[PANEL] [ARGUMENT…]"
-msgstr "[面板] [参数...]"
+msgstr "[面板] [参数…]"
 
-#: ../shell/cc-application.c:145
-msgid "- Settings"
-msgstr "- 设置"
-
-#: ../shell/cc-application.c:163
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"运行 %s --help 查看所有可用的命令行选项。\n"
-
-#: ../shell/cc-application.c:193
+#: ../shell/cc-application.c:113
 msgid "Available panels:"
 msgstr "可用面板"
 
-#: ../shell/cc-application.c:326
+#: ../shell/cc-application.c:252
 msgid "Help"
 msgstr "帮助"
 
-#: ../shell/cc-application.c:327
+#: ../shell/cc-application.c:253
 msgid "Quit"
 msgstr "退出"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1494
-msgid "All Settings"
-msgstr "全部设置"
-
 #. Add categories
-#: ../shell/cc-window.c:880
+#: ../shell/cc-window.c:871
 msgctxt "category"
 msgid "Personal"
 msgstr "个人"
 
-#: ../shell/cc-window.c:881
+#: ../shell/cc-window.c:872
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../shell/cc-window.c:882
+#: ../shell/cc-window.c:873
 msgctxt "category"
 msgid "System"
 msgstr "系统"
@@ -7110,3 +7231,386 @@ msgstr "系统"
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;首选项;设置;"
+
+#: ../shell/help-overlay.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "常规"
+
+#: ../shell/help-overlay.ui.h:2
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "退出"
+
+#: ../shell/help-overlay.ui.h:3
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "搜索"
+
+#: ../shell/help-overlay.ui.h:4
+msgctxt "shortcut window"
+msgid "Panels"
+msgstr "面板"
+
+#: ../shell/help-overlay.ui.h:5
+msgctxt "shortcut window"
+msgid "Go back to the overview"
+msgstr "后退到总览视图"
+
+#: ../shell/help-overlay.ui.h:6
+msgctxt "shortcut window"
+msgid "Cancel search"
+msgstr "取消搜索"
+
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "热点"
+
+#: ../shell/panel-list.ui.h:3
+#, fuzzy
+#| msgid "No regions found"
+msgid "No results found"
+msgstr "æ— å¯ç”¨åŒºåŸŸ"
+
+#~ msgid "Wayland"
+#~ msgstr "Wayland"
+
+#~ msgctxt "button"
+#~ msgid "Set Shortcut"
+#~ msgstr "设置快捷键"
+
+#~ msgid "_Unlock"
+#~ msgstr "解锁(_U)"
+
+#~ msgid "Color"
+#~ msgstr "色彩"
+
+#~ msgid "_Name:"
+#~ msgstr "名称(_N)："
+
+#~ msgid "Add Shortcut"
+#~ msgstr "æ·»åŠ å¿«æ·é”®"
+
+#~ msgid "Remove Shortcut"
+#~ msgstr "移除快捷键"
+
+#~ msgid ""
+#~ "To edit a shortcut, click the row and hold down the new keys or press "
+#~ "Backspace to clear."
+#~ msgstr ""
+#~ "要编辑快捷键，请单击相应的行，然后输入新按键组合，或按 Backspace 清除。"
+
+#~ msgid "<Unknown Action>"
+#~ msgstr "<未知动作>"
+
+#~ msgid ""
+#~ "The shortcut \"%s\" cannot be used because it will become impossible to "
+#~ "type using this key.\n"
+#~ "Please try with a key such as Control, Alt or Shift at the same time."
+#~ msgstr ""
+#~ "%s ä¸èƒ½ç”¨ä½œå¿«æ·é”®ï¼Œå¦åˆ™å°†æ— æ³•ä½¿ç”¨å…¶è¿›è¡Œæ­£å¸¸è¾“å…¥ã€‚\n"
+#~ "请组合 Ctrl、Alt 或 Shift 键再试一次"
+
+#~ msgid ""
+#~ "The shortcut \"%s\" is already used for\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "快捷键“%s”已被用于\n"
+#~ "“%s”"
+
+#~ msgid ""
+#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be "
+#~ "disabled."
+#~ msgstr "如果您重新分配快捷键为“%s”，快捷键“%s”将被禁用"
+
+#~ msgid "_Reassign"
+#~ msgstr "重新分配(_R)"
+
+#~ msgid ""
+#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
+#~ "automatically set it to \"%s\"?"
+#~ msgstr "“%sâ€å·²å ç”¨å¿«æ·é”®â€œ%s”，您是否想将它自动设置为“%s”？"
+
+#~ msgid ""
+#~ "\"%s\" is currently associated with \"%s\", this shortcut will be "
+#~ "disabled if you move forward."
+#~ msgstr "快捷键 %s 已被分配给 %s ，如果继续，该快捷键将被禁用。"
+
+#~ msgid "_Assign"
+#~ msgstr "分配(_A)"
+
+#~ msgid "Bond"
+#~ msgstr "绑定（Bond 方式）"
+
+#~ msgid "Team"
+#~ msgstr "绑定（Team 方式）"
+
+#~ msgid "Bridge"
+#~ msgstr "桥接"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "Could not load VPN plugins"
+#~ msgstr "æ— æ³•è½½å…¥ VPN 插件"
+
+#~ msgid "Add Network Connection"
+#~ msgstr "æ·»åŠ ç½‘ç»œè¿žæŽ¥"
+
+#~ msgid "Bond slaves"
+#~ msgstr "绑定从属设备（Bond 方式）"
+
+#~ msgid "(none)"
+#~ msgstr "ï¼ˆæ— ï¼‰"
+
+#~ msgid "Bridge slaves"
+#~ msgstr "桥接从属设备"
+
+#~ msgid "Team slaves"
+#~ msgstr "绑定从属设备（Team 方式）"
+
+#~ msgid "InfiniBand device does not support connected mode"
+#~ msgstr "InfiniBand 不支持已连接模式"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "未选择 CA 证书"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "不使用 CA è¯ä¹¦å¯èƒ½å¯¼è‡´è¿žæŽ¥åˆ°ä¸å®‰å…¨æˆ–æ¶æ„çš„æ— çº¿ç½‘ç»œã€‚æ‚¨è¦é€‰æ‹©ä¸€ä¸ª CA 证书"
+#~ "吗？"
+
+#~ msgid "Ignore"
+#~ msgstr "忽略"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "选择 CA 证书"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "æ¯æ¬¡è¯¢é—®å¯†ç (_K)"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "不再警告(_W)"
+
+#~ msgid "No"
+#~ msgstr "否"
+
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "Error logging into the account"
+#~ msgstr "登录到帐号出错"
+
+#~ msgid "Credentials have expired."
+#~ msgstr "凭据已过期。"
+
+#~ msgid "Sign in to enable this account."
+#~ msgstr "登录以启用此帐号。"
+
+#~ msgid "_Sign In"
+#~ msgstr "登录(_S)"
+
+#~ msgid "Power"
+#~ msgstr "电源"
+
+#~ msgid "Privacy"
+#~ msgstr "隐私"
+
+#~ msgctxt "Search Location"
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid "Personal File Sharing"
+#~ msgstr "个人文件共享"
+
+#~ msgid "_Allow Remote Control"
+#~ msgstr "允许远程控制(_A)"
+
+#~ msgid "_Verify"
+#~ msgstr "验证(_V)"
+
+#~ msgid "Login History"
+#~ msgstr "登录历史"
+
+#~ msgid "Add User Account"
+#~ msgstr "æ·»åŠ ç”¨æˆ·å¸å·"
+
+#~ msgid "Remove User Account"
+#~ msgstr "移除用户帐号"
+
+#~ msgid "Login Options"
+#~ msgstr "登录选项"
+
+#~ msgid "A user with the username '%s' already exists."
+#~ msgstr "用户“%s”已存在。"
+
+#~ msgid "Done"
+#~ msgstr "完成"
+
+#~ msgid "Time _Zone"
+#~ msgstr "时区(_Z)"
+
+#~ msgid "Active Jobs"
+#~ msgstr "活动的任务"
+
+#~ msgid "Close"
+#~ msgstr "关闭"
+
+#~ msgid "Resume Printing"
+#~ msgstr "恢复打印"
+
+#~ msgid "Pause Printing"
+#~ msgstr "暂停打印"
+
+#~ msgid "Cancel Print Job"
+#~ msgstr "取消打印任务"
+
+#~ msgctxt "print job"
+#~ msgid "Held"
+#~ msgstr "挂起"
+
+#~ msgid "Job Title"
+#~ msgstr "ä»»åŠ¡æ ‡é¢˜"
+
+#~ msgid "Job State"
+#~ msgstr "任务状态"
+
+#~ msgid "Time"
+#~ msgstr "时间"
+
+#~ msgid "Used to determine your geographical location"
+#~ msgstr "用于获得您的位置信息"
+
+#~ msgid "Options"
+#~ msgstr "选项"
+
+#~ msgid "Password:"
+#~ msgstr "å¯†ç ï¼š"
+
+#~| msgid "Repeat Keys"
+#~ msgid "_Repeat Keys"
+#~ msgstr "重复键(_R)"
+
+#~| msgid "Cursor Blinking"
+#~ msgid "_Cursor Blinking"
+#~ msgstr "å…‰æ ‡é—ªçƒ(_C)"
+
+#~ msgid "Zoom"
+#~ msgstr "缩放"
+
+#~ msgctxt "universal access, contrast"
+#~ msgid "Color"
+#~ msgstr "色彩"
+
+#~ msgid "_Delay:"
+#~ msgstr "延时(_D)："
+
+#~ msgctxt "keyboard, delay"
+#~ msgid "Short"
+#~ msgstr "短"
+
+#~ msgctxt "keyboard, speed"
+#~ msgid "Slow"
+#~ msgstr "æ…¢"
+
+#~ msgctxt "keyboard, delay"
+#~ msgid "Long"
+#~ msgstr "é•¿"
+
+#~ msgctxt "keyboard, speed"
+#~ msgid "Fast"
+#~ msgstr "å¿«"
+
+#~ msgid "S_peed:"
+#~ msgstr "速度(_P)："
+
+#~ msgid "Test Your Settings"
+#~ msgstr "测试您的设置"
+
+#~ msgctxt "double click, speed"
+#~ msgid "Slow"
+#~ msgstr "æ…¢"
+
+#~ msgctxt "double click, speed"
+#~ msgid "Fast"
+#~ msgstr "å¿«"
+
+#~ msgctxt "mouse, left button as primary"
+#~ msgid "_Left"
+#~ msgstr "å·¦(_L)"
+
+#~ msgctxt "mouse, right button as primary"
+#~ msgid "_Right"
+#~ msgstr "右(_R)"
+
+#~ msgid "_Pointer speed"
+#~ msgstr "指针速度(_P)"
+
+#~ msgctxt "mouse pointer, speed"
+#~ msgid "Slow"
+#~ msgstr "æ…¢"
+
+#~ msgctxt "mouse pointer, speed"
+#~ msgid "Fast"
+#~ msgstr "å¿«"
+
+#~ msgctxt "touchpad pointer, speed"
+#~ msgid "Slow"
+#~ msgstr "æ…¢"
+
+#~ msgctxt "touchpad pointer, speed"
+#~ msgid "Fast"
+#~ msgstr "å¿«"
+
+#~ msgid "No printers available"
+#~ msgstr "æ— å¯ç”¨æ‰“å°æœº"
+
+#~ msgid "Add New Printer"
+#~ msgstr "æ·»åŠ æ–°æ‰“å°æœº"
+
+#~ msgid "Bluetooth is disabled"
+#~ msgstr "蓝牙已禁用"
+
+#~ msgid "Security key"
+#~ msgstr "安全密钥"
+
+#~ msgid "Wireless devices require extra power"
+#~ msgstr "æ— çº¿è®¾å¤‡éœ€è¦æ¶ˆè€—æ›´å¤šç”µ"
+
+#~ msgid "When battery power is _critical"
+#~ msgstr "电量严重不足时(_C)"
+
+#~ msgid "Power Off"
+#~ msgstr "电源关闭"
+
+#~ msgid "Power off"
+#~ msgstr "电源关闭"
+
+#~ msgid ""
+#~ "Bluetooth Sharing allows you to share files with other Bluetooth enabled "
+#~ "devices"
+#~ msgstr "蓝牙共享允许您使用带有蓝牙的设备共享文件"
+
+#~ msgid "Only Receive From Trusted Devices"
+#~ msgstr "只从信任的设备接收"
+
+#~ msgid "Save Received Files to Downloads Folder"
+#~ msgstr "将接收的文件保存到下载文件夹"
+
+#~ msgid "Show help options"
+#~ msgstr "显示帮助选项"
+
+#~ msgid "- Settings"
+#~ msgstr "- 设置"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "运行 %s --help 查看所有可用的命令行选项。\n"