[gnome-control-center/gnome-3-10] Update Chinese simplified translation

[Wylmer Wang <wylmerwang src gnome org>]

commit b38e32daa4860f8389b733490e421748eff8873a
Author: Wylmer Wang <wantinghard gmail com>
Date:   Sun Nov 10 10:47:51 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 1583 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 867 insertions(+), 716 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7addf42..e163011 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: gnome-control-center master\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: 2013-08-15 16:10+0000\n"
+"POT-Creation-Date: 2013-11-09 10:32+0000\n"
 "PO-Revision-Date: 2013-08-16 12:12+0800\n"
 "Last-Translator: Luo Lei <luolei ubuntukylin com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -38,86 +38,98 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.4\n"
 
+#: ../panels/background/background.ui.h:1
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
+msgid "Background"
+msgstr "背景"
+
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:2
+#: ../panels/background/background.ui.h:3
 msgid "Changes throughout the day"
 msgstr "该日内所有改变"
 
-#: ../panels/background/background.ui.h:3
+#: ../panels/background/background.ui.h:4
+msgid "Lock Screen"
+msgstr "锁定屏幕"
+
+#: ../panels/background/background.ui.h:5
 msgctxt "background, style"
 msgid "Tile"
 msgstr "平铺"
 
-#: ../panels/background/background.ui.h:4
+#: ../panels/background/background.ui.h:6
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "缩放"
 
-#: ../panels/background/background.ui.h:5
+#: ../panels/background/background.ui.h:7
 msgctxt "background, style"
 msgid "Center"
 msgstr "居中"
 
-#: ../panels/background/background.ui.h:6
+#: ../panels/background/background.ui.h:8
 msgctxt "background, style"
 msgid "Scale"
 msgstr "比例放大"
 
-#: ../panels/background/background.ui.h:7
+#: ../panels/background/background.ui.h:9
 msgctxt "background, style"
 msgid "Fill"
 msgstr "å¡«å……"
 
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:10
 msgctxt "background, style"
 msgid "Span"
 msgstr "适合宽度"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:300
+#: ../panels/background/cc-background-chooser-dialog.c:292
 msgid "Select Background"
 msgstr "选择背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:319
+#: ../panels/background/cc-background-chooser-dialog.c:312
 msgid "Wallpapers"
 msgstr "壁纸"
 
-#: ../panels/background/cc-background-chooser-dialog.c:328
+#: ../panels/background/cc-background-chooser-dialog.c:321
 msgid "Pictures"
 msgstr "图片"
 
-#: ../panels/background/cc-background-chooser-dialog.c:336
+#: ../panels/background/cc-background-chooser-dialog.c:329
 msgid "Colors"
 msgstr "色彩"
 
-#: ../panels/background/cc-background-chooser-dialog.c:345
+#: ../panels/background/cc-background-chooser-dialog.c:338
 msgid "Flickr"
 msgstr "Flickr"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:400
+#: ../panels/background/cc-background-chooser-dialog.c:385
 msgid "No Pictures Found"
 msgstr "未找到图片"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:415
+#: ../panels/background/cc-background-chooser-dialog.c:400
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "æ‚¨æ·»åŠ åˆ° %s 文件夹的图片将在此显示"
 
-#: ../panels/background/cc-background-chooser-dialog.c:443
-#: ../panels/bluetooth/cc-bluetooth-panel.c:631
-#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967
+#: ../panels/background/cc-background-chooser-dialog.c:428
+#: ../panels/bluetooth/cc-bluetooth-panel.c:640
+#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
+#: ../panels/display/cc-display-panel.c:1509
+#: ../panels/display/cc-display-panel.c:1924
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1202
-#: ../panels/network/net-device-wifi.c:1408
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:355
+#: ../panels/network/net-device-wifi.c:1194
+#: ../panels/network/net-device-wifi.c:1402
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
 #: ../panels/printers/cc-printers-panel.c:1946
 #: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/privacy/cc-privacy-panel.c:470
 #: ../panels/search/cc-search-locations-dialog.c:682
-#: ../panels/sharing/cc-sharing-panel.c:421
+#: ../panels/sharing/cc-sharing-panel.c:435
 #: ../panels/user-accounts/um-fingerprint-dialog.c:269
 #: ../panels/user-accounts/um-photo-dialog.c:96
 #: ../panels/user-accounts/um-photo-dialog.c:221
@@ -125,36 +137,31 @@ msgstr "æ‚¨æ·»åŠ åˆ° %s 文件夹的图片将在此显示"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:444
+#: ../panels/background/cc-background-chooser-dialog.c:429
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
 #: ../panels/user-accounts/um-photo-dialog.c:98
 msgid "Select"
 msgstr "选择"
 
-#: ../panels/background/cc-background-item.c:150
+#: ../panels/background/cc-background-item.c:149
 msgid "multiple sizes"
 msgstr "多个尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:154
+#: ../panels/background/cc-background-item.c:153
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:283
+#: ../panels/background/cc-background-item.c:281
 msgid "No Desktop Background"
 msgstr "æ— æ¡Œé¢èƒŒæ™¯"
 
-#: ../panels/background/cc-background-panel.c:460
+#: ../panels/background/cc-background-panel.c:493
 msgid "Current background"
 msgstr "当前背景"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
-msgstr "背景"
-
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
 msgid "Change your background image to a wallpaper or photo"
 msgstr "å°†æ‚¨çš„èƒŒæ™¯å›¾ç‰‡æ”¹ä¸ºä¸€å¼ å£çº¸æˆ–ç…§ç‰‡"
@@ -168,7 +175,7 @@ msgstr "Wallpaper;Screen;Desktop;壁纸;墙纸;屏幕;桌面;背景;"
 msgid "Set Up New Device"
 msgstr "设置新设备"
 
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
 msgid "Remove Device"
 msgstr "移除设备"
 
@@ -222,49 +229,49 @@ msgstr "键盘设置"
 msgid "Send Files…"
 msgstr "发送文件…"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
+#: ../panels/bluetooth/cc-bluetooth-panel.c:366
 #: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
 msgid "Yes"
 msgstr "是"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:357
+#: ../panels/bluetooth/cc-bluetooth-panel.c:366
 #: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
 msgid "No"
 msgstr "否"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:470
+#: ../panels/bluetooth/cc-bluetooth-panel.c:479
 msgid "Bluetooth is disabled"
 msgstr "蓝牙已禁用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:475
+#: ../panels/bluetooth/cc-bluetooth-panel.c:484
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "蓝牙已通过硬件开关禁用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+#: ../panels/bluetooth/cc-bluetooth-panel.c:488
 msgid "No Bluetooth adapters found"
 msgstr "未找到蓝牙适配器"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:578
+#: ../panels/bluetooth/cc-bluetooth-panel.c:587
 msgid "Visibility"
 msgstr "可见性"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:582
+#: ../panels/bluetooth/cc-bluetooth-panel.c:591
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "“%s”的可见性"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:626
+#: ../panels/bluetooth/cc-bluetooth-panel.c:635
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "将“%s”从设备列表中移除吗？"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:628
+#: ../panels/bluetooth/cc-bluetooth-panel.c:637
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr "如果您移除该设备，下次使用前您需要重新设置它。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:632
-#: ../panels/online-accounts/cc-online-accounts-panel.c:826
+#: ../panels/bluetooth/cc-bluetooth-panel.c:641
+#: ../panels/online-accounts/cc-online-accounts-panel.c:844
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -277,14 +284,14 @@ msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "开启关闭蓝牙以及连接您的设备"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: ../panels/color/cc-color-calibrate.c:360
+#: ../panels/color/cc-color-calibrate.c:361
 msgid "Place your calibration device over the square and press 'Start'"
 msgstr "å°†æ‚¨çš„æ ¡å‡†è®¾å¤‡æ”¾åœ¨æ–¹å—ä¸Šå¹¶æŒ‰â€œå¼€å§‹â€"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:366
+#: ../panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press 'Continue'"
 msgstr "å°†æ‚¨çš„æ ¡å‡†å™¨ç§»åŠ¨åˆ°æ ¡å‡†ä½ç½®å¹¶æŒ‰â€œç»§ç»­â€"
@@ -292,7 +299,7 @@ msgstr "å°†æ‚¨çš„æ ¡å‡†å™¨ç§»åŠ¨åˆ°æ ¡å‡†ä½ç½®å¹¶æŒ‰â€œç»§ç»­â€"
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:372
+#: ../panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press 'Continue'"
 msgstr "å°†æ‚¨çš„æ ¡å‡†å™¨ç§»åŠ¨åˆ°è¡¨é¢ä½ç½®å¹¶æŒ‰â€œç»§ç»­â€"
@@ -300,54 +307,54 @@ msgstr "å°†æ‚¨çš„æ ¡å‡†å™¨ç§»åŠ¨åˆ°è¡¨é¢ä½ç½®å¹¶æŒ‰â€œç»§ç»­â€"
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:378
+#: ../panels/color/cc-color-calibrate.c:379
 msgid "Shut the laptop lid"
 msgstr "关闭笔记本盖子"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:409
+#: ../panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
 msgstr "å‘ç”Ÿäº†ä¸€ä¸ªå†…éƒ¨é”™è¯¯å¹¶ä¸”æ— æ³•æ¢å¤ã€‚"
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:414
+#: ../panels/color/cc-color-calibrate.c:415
 msgid "Tools required for calibration are not installed."
 msgstr "æ ¡å‡†æ‰€éœ€çš„å·¥å…·æ²¡æœ‰å®‰è£…ã€‚"
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:420
+#: ../panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
 msgstr "æ— æ³•ç”Ÿæˆé…ç½®æ–‡ä»¶ã€‚"
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:426
+#: ../panels/color/cc-color-calibrate.c:427
 msgid "The target whitepoint was not obtainable."
 msgstr "ç›®æ ‡ç™½ç‚¹ä¸å¯èŽ·å–ã€‚"
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:466
+#: ../panels/color/cc-color-calibrate.c:467
 msgid "Complete!"
 msgstr "已完成！"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:474
+#: ../panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "æ ¡å‡†å¤±è´¥ï¼"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:481
+#: ../panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
 msgstr "æ‚¨å¯ä»¥ç§»é™¤æ ¡å‡†è®¾å¤‡ã€‚"
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:552
+#: ../panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "ä¸è¦åœ¨è¿›è¡Œæ—¶å¹²æ‰°æ ¡å‡†è®¾å¤‡"
 
@@ -409,48 +416,48 @@ msgstr "æœªæ ¡å‡†"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:135
+#: ../panels/color/cc-color-panel.c:137
 msgid "Default: "
 msgstr "默认："
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:143
+#: ../panels/color/cc-color-panel.c:145
 msgid "Colorspace: "
 msgstr "色彩空间："
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:150
+#: ../panels/color/cc-color-panel.c:152
 msgid "Test profile: "
 msgstr "测试配置："
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:218
+#: ../panels/color/cc-color-panel.c:219
 msgid "Select ICC Profile File"
 msgstr "选择 ICC 配置文件"
 
-#: ../panels/color/cc-color-panel.c:221
+#: ../panels/color/cc-color-panel.c:222
 msgid "_Import"
 msgstr "导入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:232
+#: ../panels/color/cc-color-panel.c:233
 msgid "Supported ICC profiles"
 msgstr "支持的 ICC 配置"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:239
+#: ../panels/color/cc-color-panel.c:240
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有文件"
 
-#: ../panels/color/cc-color-panel.c:586
+#: ../panels/color/cc-color-panel.c:579
 msgid "Screen"
 msgstr "屏幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:912
+#: ../panels/color/cc-color-panel.c:903
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "ä¸Šä¼ æ–‡ä»¶å¤±è´¥ï¼š%s"
@@ -458,51 +465,51 @@ msgstr "ä¸Šä¼ æ–‡ä»¶å¤±è´¥ï¼š%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:926
+#: ../panels/color/cc-color-panel.c:917
 msgid "The profile has been uploaded to:"
 msgstr "é…ç½®å·²ä¸Šä¼ åˆ°ï¼š"
 
-#: ../panels/color/cc-color-panel.c:928
+#: ../panels/color/cc-color-panel.c:919
 msgid "Write down this URL."
 msgstr "请记下此 URL。"
 
-#: ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:920
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重启此计算机并启动您平时用的操作系统。"
 
-#: ../panels/color/cc-color-panel.c:930
+#: ../panels/color/cc-color-panel.c:921
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "在浏览器中输入该 URL 来下载和安装该配置。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:964
+#: ../panels/color/cc-color-panel.c:955
 msgid "Save Profile"
 msgstr "保存配置"
 
-#: ../panels/color/cc-color-panel.c:968
+#: ../panels/color/cc-color-panel.c:959
 #: ../panels/network/connection-editor/vpn-helpers.c:375
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1328
+#: ../panels/color/cc-color-panel.c:1315
 msgid "Create a color profile for the selected device"
 msgstr "为所选设备创建一份色彩配置"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367
+#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr "没有检测到测量仪器。请检查它是否打开和正确连接。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1377
+#: ../panels/color/cc-color-panel.c:1364
 msgid "The measuring instrument does not support printer profiling."
 msgstr "æµ‹é‡ä»ªå™¨ä¸æ”¯æŒæ‰“å°æœºæ ¡æ­£ã€‚"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1388
+#: ../panels/color/cc-color-panel.c:1375
 msgid "The device type is not currently supported."
 msgstr "目前不支持该设备类型。"
 
@@ -589,8 +596,7 @@ msgstr "æ˜¾ç¤ºæ ¡å‡†"
 #: ../panels/color/color-calibrate.ui.h:2
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1439
+#: ../panels/user-accounts/um-account-dialog.c:1470
 msgid "Cancel"
 msgstr "取消"
 
@@ -610,7 +616,7 @@ msgid "Done"
 msgstr "完成"
 
 #. Timeout parameters
-#. 5000 = 5 sec
+#. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
 #: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
@@ -746,164 +752,146 @@ msgid ""
 msgstr "æŽ¢æµ‹åˆ°é—®é¢˜ã€‚æ­¤é…ç½®å¯èƒ½æ— æ³•æ­£å¸¸å·¥ä½œã€‚<a href=\"\">显示详细信息。</a>"
 
 #: ../panels/color/color.ui.h:30
-msgid "Device type:"
-msgstr "设备类型："
-
-#: ../panels/color/color.ui.h:31
-msgid "Manufacturer:"
-msgstr "厂商："
-
-#: ../panels/color/color.ui.h:32
-msgid "Model:"
-msgstr "型号："
-
-#: ../panels/color/color.ui.h:33
-msgid ""
-"Image files can be dragged on this window to auto-complete the above fields."
-msgstr "可以将图像文件拖放到此窗口来自动填写以上字段。"
-
-#: ../panels/color/color.ui.h:34
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "色彩"
-
-#: ../panels/color/color.ui.h:35
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "每个设备需要一份最新的色彩配置以进行色彩管理。"
 
-#: ../panels/color/color.ui.h:36
+#: ../panels/color/color.ui.h:31
 msgid "Learn more"
 msgstr "了解更多"
 
-#: ../panels/color/color.ui.h:37
+#: ../panels/color/color.ui.h:32
 msgid "Learn more about color management"
 msgstr "了解更多有关色彩管理的信息"
 
-#: ../panels/color/color.ui.h:38
+#: ../panels/color/color.ui.h:33
 msgid "Set for all users"
 msgstr "为所有用户设置"
 
-#: ../panels/color/color.ui.h:39
+#: ../panels/color/color.ui.h:34
 msgid "Set this profile for all users on this computer"
 msgstr "为此计算机上的所有用户设置此配置"
 
-#: ../panels/color/color.ui.h:40
+#: ../panels/color/color.ui.h:35
 msgid "Enable"
 msgstr "启用"
 
-#: ../panels/color/color.ui.h:41
+#: ../panels/color/color.ui.h:36
 msgid "Add profile"
 msgstr "æ·»åŠ é…ç½®"
 
-#: ../panels/color/color.ui.h:42
+#: ../panels/color/color.ui.h:37
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Calibrate…"
 msgstr "æ ¡å‡†..."
 
-#: ../panels/color/color.ui.h:43
+#: ../panels/color/color.ui.h:38
 msgid "Calibrate the device"
 msgstr "æ ¡å‡†è¯¥è®¾å¤‡"
 
-#: ../panels/color/color.ui.h:44
+#: ../panels/color/color.ui.h:39
 msgid "Remove profile"
 msgstr "移除配置"
 
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:40
 msgid "View details"
 msgstr "查看详情"
 
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:41
 msgid "Unable to detect any devices that can be color managed"
 msgstr "æ— æ³•æ£€æµ‹åˆ°å¯ä»¥ç®¡ç†é¢œè‰²çš„è®¾å¤‡"
 
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:42
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:43
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:44
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:45
 msgid "Projector"
 msgstr "投影仪"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:46
 msgid "Plasma"
 msgstr "等离子"
 
-#: ../panels/color/color.ui.h:52
+#: ../panels/color/color.ui.h:47
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:48
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:49
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED 背光)"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:50
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "宽色域 LCD (CCFL 背光)"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:51
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "宽色域 LCD (RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:52
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:53
 msgid "40 minutes"
 msgstr "40 分钟"
 
-#: ../panels/color/color.ui.h:59
+#: ../panels/color/color.ui.h:54
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 分钟"
 
-#: ../panels/color/color.ui.h:61
+#: ../panels/color/color.ui.h:56
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "15 分钟"
 
-#: ../panels/color/color.ui.h:63
+#: ../panels/color/color.ui.h:58
 msgid "Native to display"
 msgstr "原生显示"
 
-#: ../panels/color/color.ui.h:64
+#: ../panels/color/color.ui.h:59
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (打印和出版)"
 
-#: ../panels/color/color.ui.h:65
+#: ../panels/color/color.ui.h:60
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:66
+#: ../panels/color/color.ui.h:61
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (摄影及图像)"
 
-#: ../panels/color/color.ui.h:67
+#: ../panels/color/color.ui.h:62
 msgid "D75"
 msgstr "D75"
 
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "色彩"
+
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
@@ -955,10 +943,40 @@ msgid "Language"
 msgstr "语言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:119 ../panels/region/format-chooser.ui.h:2
+#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
 msgid "_Done"
 msgstr "完成(_D)"
 
+#. Translators: This is the full date and time format used in 12-hour mode.
+#: ../panels/datetime/cc-datetime-panel.c:363
+#, fuzzy
+#| msgid "%a %l:%M %p"
+msgid "%e %B %Y, %l:%M %p"
+msgstr "%A %H%M"
+
+#. Translators: This is the full date and time format used in 24-hour mode.
+#: ../panels/datetime/cc-datetime-panel.c:368
+msgid "%e %B %Y, %R"
+msgstr ""
+
+#. Translators: UTC here means the Coordinated Universal Time.
+#. * %:::z will be replaced by the offset from UTC e.g. UTC+02
+#: ../panels/datetime/cc-datetime-panel.c:584
+msgid "UTC%:::z"
+msgstr ""
+
+#. Translators: This is the time format used in 12-hour mode.
+#: ../panels/datetime/cc-datetime-panel.c:589
+#, fuzzy
+#| msgid "%a %l:%M %p"
+msgid "%l:%M %p"
+msgstr "%A %H%M"
+
+#. Translators: This is the time format used in 24-hour mode.
+#: ../panels/datetime/cc-datetime-panel.c:594
+msgid "%R"
+msgstr ""
+
 #: ../panels/datetime/datetime.ui.h:1
 msgid "January"
 msgstr "一月"
@@ -1008,66 +1026,77 @@ msgid "December"
 msgstr "十二月"
 
 #: ../panels/datetime/datetime.ui.h:13
-msgid "_Region:"
-msgstr "地区(_R)："
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+msgid "Date & Time"
+msgstr "日期和时间"
 
 #: ../panels/datetime/datetime.ui.h:14
-msgid "_City:"
-msgstr "城市(_C)："
+msgid "Hour"
+msgstr "æ—¶"
 
-#: ../panels/datetime/datetime.ui.h:15
-msgid "_Network Time"
-msgstr "网络时间(_N)"
+#. Translator: this is the separator between hours and minutes, like in HH∶MM
+#: ../panels/datetime/datetime.ui.h:16
+msgid "∶"
+msgstr ":"
 
-#. Translator: this is the separator between hours and minutes, like in HH:MM
 #: ../panels/datetime/datetime.ui.h:17
-msgid ":"
-msgstr ":"
+msgid "Minute"
+msgstr "分"
 
 #: ../panels/datetime/datetime.ui.h:18
-msgid "Set the time one hour ahead."
-msgstr "将时间向前调一小时。"
+msgid "Day"
+msgstr "æ—¥"
 
 #: ../panels/datetime/datetime.ui.h:19
-msgid "Set the time one hour back."
-msgstr "将时间向后调一小时。"
+msgid "Month"
+msgstr "月"
 
 #: ../panels/datetime/datetime.ui.h:20
-msgid "Set the time one minute ahead."
-msgstr "将时间向前调一分钟。"
+msgid "Year"
+msgstr "å¹´"
 
 #: ../panels/datetime/datetime.ui.h:21
-msgid "Set the time one minute back."
-msgstr "将时间向后调一分钟。"
+msgid "Time Zone"
+msgstr "时间"
 
 #: ../panels/datetime/datetime.ui.h:22
-msgid "Switch between AM and PM."
-msgstr "在上午(AM)和下午(PM)间切换。"
+msgid "Search for a city"
+msgstr "搜索城市"
 
 #: ../panels/datetime/datetime.ui.h:23
-msgid "Month"
-msgstr "月"
+msgid "Automatic _Date & Time"
+msgstr "自动日期和时间(_D)"
 
 #: ../panels/datetime/datetime.ui.h:24
-msgid "Day"
-msgstr "æ—¥"
+msgid "Requires internet access"
+msgstr "需要互联网连接"
 
 #: ../panels/datetime/datetime.ui.h:25
-msgid "Year"
-msgstr "å¹´"
+#, fuzzy
+#| msgid "Automatic _Connect"
+msgid "Automatic Time _Zone"
+msgstr "自动连接(_C)"
 
 #: ../panels/datetime/datetime.ui.h:26
+msgid "Date & _Time"
+msgstr "日期和时间(_T)"
+
+#: ../panels/datetime/datetime.ui.h:27
+msgid "Time _Zone"
+msgstr "时区(_Z)"
+
+#: ../panels/datetime/datetime.ui.h:28
+msgid "Time _Format"
+msgstr "æ—¶é—´æ ¼å¼(_F)"
+
+#: ../panels/datetime/datetime.ui.h:29
 msgid "24-hour"
 msgstr "24 小时"
 
-#: ../panels/datetime/datetime.ui.h:27
-msgid "AM/PM"
+#: ../panels/datetime/datetime.ui.h:30
+msgid "AM / PM"
 msgstr "上午/下午"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
-msgid "Date & Time"
-msgstr "日期和时间"
-
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Change the date and time, including time zone"
 msgstr "改变日期和时间，以及时区"
@@ -1085,104 +1114,110 @@ msgstr "更改系统时间和日期设置"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "修改时间或日期设置，您需要获得管理员权限。"
 
-#: ../panels/display/cc-display-panel.c:491
-msgctxt "display panel, rotation"
-msgid "Normal"
-msgstr "正常"
+#: ../panels/display/cc-display-panel.c:485
+msgid "Lid Closed"
+msgstr "关闭盖子"
 
-#: ../panels/display/cc-display-panel.c:492
-msgctxt "display panel, rotation"
-msgid "Counterclockwise"
-msgstr "逆时针"
-
-#: ../panels/display/cc-display-panel.c:493
-msgctxt "display panel, rotation"
-msgid "Clockwise"
-msgstr "顺时针"
-
-#: ../panels/display/cc-display-panel.c:494
-msgctxt "display panel, rotation"
-msgid "180 Degrees"
-msgstr "180 度"
-
-#. Keep this string in sync with gnome-desktop/libgnome-desktop/gnome-rr-labeler.c
-#. Translators:  this is the feature where what you see on your laptop's
-#. * screen is the same as your external projector.  Here, "Mirrored" is being
-#. * used as an adjective.  For example, the Spanish translation could be
-#. * "Pantallas en Espejo".
-#.
-#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
-#. Translators:  this is the feature where what you see on your
-#. * laptop's screen is the same as your external projector.
-#. * Here, "Mirrored" is being used as an adjective.  For example,
-#. * the Spanish translation could be "Pantallas en Espejo".
-#.
-#: ../panels/display/cc-display-panel.c:633
-#: ../panels/display/cc-rr-labeler.c:418
-msgid "Mirrored Displays"
+#. translators: "Mirrored" describes when both displays show the same view
+#: ../panels/display/cc-display-panel.c:488
+msgid "Mirrored"
 msgstr "镜像显示"
 
-#: ../panels/display/cc-display-panel.c:657
-#: ../panels/display/display-capplet.ui.h:1
-msgid "Monitor"
-msgstr "显示器"
+#: ../panels/display/cc-display-panel.c:490
+#: ../panels/display/cc-display-panel.c:2057
+msgid "Primary"
+msgstr "主按钮"
 
-#: ../panels/display/cc-display-panel.c:1702
-msgid "Drag to change primary display."
-msgstr "拖拽以更改主显示设备。"
+#: ../panels/display/cc-display-panel.c:492
+#: ../panels/notifications/cc-notifications-panel.c:205
+#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1749
+#: ../panels/privacy/cc-privacy-panel.c:80
+#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
+#: ../panels/universal-access/uap.ui.h:6
+msgid "Off"
+msgstr "å…³"
 
-#: ../panels/display/cc-display-panel.c:1760
-msgid ""
-"Select a monitor to change its properties; drag it to rearrange its "
-"placement."
-msgstr "选择一台显示器来更改它的属性；拖动它来排列位置。"
+#: ../panels/display/cc-display-panel.c:495
+msgid "Secondary"
+msgstr "次要"
 
-#: ../panels/display/cc-display-panel.c:2157
-msgid "%a %R"
-msgstr "%a %R"
+#: ../panels/display/cc-display-panel.c:1505
+msgid "Arrange Combined Displays"
+msgstr ""
 
-#: ../panels/display/cc-display-panel.c:2159
-msgid "%a %l:%M %p"
-msgstr "%A %H%M"
+#: ../panels/display/cc-display-panel.c:1511
+#: ../panels/display/cc-display-panel.c:1927
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+msgid "_Apply"
+msgstr "应用(_A)"
 
-#: ../panels/display/cc-display-panel.c:2321
-#: ../panels/display/cc-display-panel.c:2373
-#, c-format
-msgid "Failed to apply configuration: %s"
-msgstr "应用配置失败：%s"
+#: ../panels/display/cc-display-panel.c:1532
+msgid "Drag displays to rearrange them"
+msgstr "拖动显示屏来重新排列它们"
 
-#: ../panels/display/cc-display-panel.c:2401
-msgid "Could not save the monitor configuration"
-msgstr "æ— æ³•ä¿å­˜æ˜¾ç¤ºå™¨é…ç½®"
+#. size
+#: ../panels/display/cc-display-panel.c:1991
+msgid "Size"
+msgstr "尺寸"
 
-#: ../panels/display/cc-display-panel.c:2461
-msgid "Could not detect displays"
-msgstr "æ— æ³•æ£€æµ‹æ˜¾ç¤ºå™¨"
+#. aspect ratio
+#: ../panels/display/cc-display-panel.c:2006
+msgid "Aspect Ratio"
+msgstr "宽高比"
 
-#: ../panels/display/cc-display-panel.c:2673
-msgid "Could not get screen information"
-msgstr "æ— æ³•èŽ·å¾—å±å¹•ä¿¡æ¯"
+#: ../panels/display/cc-display-panel.c:2027
+#: ../panels/printers/pp-options-dialog.c:86
+msgid "Resolution"
+msgstr "分辨率"
 
-#: ../panels/display/display-capplet.ui.h:2
-msgid "_Resolution"
-msgstr "分辨率(_R)"
+#: ../panels/display/cc-display-panel.c:2058
+msgid "Show the top bar and Activities Overview on this display"
+msgstr "åœ¨æ­¤æ˜¾ç¤ºå™¨ä¸Šæ˜¾ç¤ºé¡¶æ å’Œæ´»åŠ¨æ¦‚è§ˆ"
 
-#: ../panels/display/display-capplet.ui.h:3
-msgid "R_otation"
-msgstr "旋转(_O)"
+#: ../panels/display/cc-display-panel.c:2064
+msgid "Secondary Display"
+msgstr "第二显示器"
 
-#. Note that mirror is a verb in this string
-#: ../panels/display/display-capplet.ui.h:5
-msgid "_Mirror displays"
-msgstr "镜像显示(_M)"
+#: ../panels/display/cc-display-panel.c:2065
+msgid "Join this display with another to create an extra workspace"
+msgstr "将该显示器与另一个合并来生成另外的工作空间"
 
-#: ../panels/display/display-capplet.ui.h:6
-msgid "Note: may limit resolution options"
-msgstr "提醒：可能会限制分辨率选项"
+# 左撇子有歧视色彩。
+#: ../panels/display/cc-display-panel.c:2072
+msgid "Presentation"
+msgstr "演示"
 
-#: ../panels/display/display-capplet.ui.h:7
-msgid "_Detect Displays"
-msgstr "检测显示(_D)"
+#: ../panels/display/cc-display-panel.c:2073
+msgid "Show slideshows and media only"
+msgstr "只显示幻灯片和多媒体"
+
+#. translators: "Mirror" describes when both displays show the same view
+#: ../panels/display/cc-display-panel.c:2078
+msgid "Mirror"
+msgstr "镜像"
+
+#: ../panels/display/cc-display-panel.c:2079
+msgid "Show your existing view on both displays"
+msgstr "在两块显示器上同时显示当前视图"
+
+#: ../panels/display/cc-display-panel.c:2085
+msgid "Turn Off"
+msgstr "关闭"
+
+#: ../panels/display/cc-display-panel.c:2086
+msgid "Don't use this display"
+msgstr "不使用该显示器"
+
+#: ../panels/display/cc-display-panel.c:2301
+msgid "Could not get screen information"
+msgstr "æ— æ³•èŽ·å¾—å±å¹•ä¿¡æ¯"
+
+#: ../panels/display/cc-display-panel.c:2332
+msgid "_Arrange Combined Displays"
+msgstr ""
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
 msgid "Displays"
@@ -1200,53 +1235,53 @@ msgstr ""
 "æ–°;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "未知"
 
-#: ../panels/info/cc-info-panel.c:532
+#: ../panels/info/cc-info-panel.c:534
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:536
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位"
 
-#: ../panels/info/cc-info-panel.c:1214
+#: ../panels/info/cc-info-panel.c:1216
 msgid "Ask what to do"
 msgstr "询问如何处理"
 
-#: ../panels/info/cc-info-panel.c:1218
+#: ../panels/info/cc-info-panel.c:1220
 msgid "Do nothing"
 msgstr "不处理"
 
-#: ../panels/info/cc-info-panel.c:1222
+#: ../panels/info/cc-info-panel.c:1224
 msgid "Open folder"
 msgstr "打开文件夹"
 
-#: ../panels/info/cc-info-panel.c:1313
+#: ../panels/info/cc-info-panel.c:1315
 msgid "Other Media"
 msgstr "其他媒体"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1346
 msgid "Select an application for audio CDs"
 msgstr "选择播放音频 CD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1347
 msgid "Select an application for video DVDs"
 msgstr "选择播放视频 DVD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application to run when a music player is connected"
 msgstr "选择要在连接音乐播放器后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application to run when a camera is connected"
 msgstr "选择要在连接相机后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application for software CDs"
 msgstr "选择要在插入软件 CD 时运行的应用程序"
 
@@ -1255,90 +1290,90 @@ msgstr "选择要在插入软件 CD 时运行的应用程序"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1362
 msgid "audio DVD"
 msgstr "音频 DVD"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1363
 msgid "blank Blu-ray disc"
 msgstr "空白蓝光光盘"
 
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1364
 msgid "blank CD disc"
 msgstr "空白 CD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank DVD disc"
 msgstr "空白 DVD 光盘"
 
 # 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1367
 msgid "Blu-ray video disc"
 msgstr "蓝光视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1368
 msgid "e-book reader"
 msgstr "电子书阅读器"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1369
 msgid "HD DVD video disc"
 msgstr "HD DVD 视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1370
 msgid "Picture CD"
 msgstr "图片 CD"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1371
 msgid "Super Video CD"
 msgstr "超级 VCD"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Video CD"
 msgstr "视频 CD"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Windows software"
 msgstr "Windows 软件"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Software"
 msgstr "软件"
 
-#: ../panels/info/cc-info-panel.c:1495
+#: ../panels/info/cc-info-panel.c:1497
 #: ../panels/keyboard/keyboard-shortcuts.c:1696
 msgid "Section"
 msgstr "节"
 
-#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "总览"
 
-#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "默认应用程序"
 
-#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "可移动介质"
 
-#: ../panels/info/cc-info-panel.c:1540
+#: ../panels/info/cc-info-panel.c:1542
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1590
+#: ../panels/info/cc-info-panel.c:1592
 msgid "Install Updates"
 msgstr "安装更新"
 
-#: ../panels/info/cc-info-panel.c:1594
+#: ../panels/info/cc-info-panel.c:1596
 msgid "System Up-To-Date"
 msgstr "系统已是最新"
 
-#: ../panels/info/cc-info-panel.c:1598
+#: ../panels/info/cc-info-panel.c:1600
 msgid "Checking for Updates"
 msgstr "正在检查更新"
 
@@ -1505,7 +1540,7 @@ msgid "Eject"
 msgstr "弹出"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 #: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "打字"
@@ -1665,7 +1700,6 @@ msgid "Modifiers-only switch to next source"
 msgstr "切换至下个源的仅使用修饰键的开关"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "键盘"
 
@@ -1690,83 +1724,83 @@ msgstr "名称(_N)："
 msgid "C_ommand:"
 msgstr "命令(_O)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Repeat Keys"
 msgstr "重复键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
 msgid "Key presses _repeat when key is held down"
 msgstr "按住某一键时重复该键(_R)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
 msgid "_Delay:"
 msgstr "延时(_D)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
 msgid "_Speed:"
 msgstr "速度(_S)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
 msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "æ…¢"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 msgid "Repeat keys speed"
 msgstr "重复键速度"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
 msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "é•¿"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
 msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "å¿«"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
 msgid "Cursor Blinking"
 msgstr "å…‰æ ‡é—ªçƒ"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 msgid "Cursor _blinks in text fields"
 msgstr "æ–‡æœ¬åŸŸä¸­å…‰æ ‡é—ªçƒ(_B)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
 msgid "S_peed:"
 msgstr "速度(_P)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
 msgid "Cursor blink speed"
 msgstr "å…‰æ ‡é—ªçƒé€Ÿåº¦"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 #: ../panels/region/region.ui.h:5
 msgid "Input Sources"
 msgstr "输入源"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 msgid "Add Shortcut"
 msgstr "æ·»åŠ å¿«æ·é”®"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Remove Shortcut"
 msgstr "移除快捷键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
 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:23
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
 msgid "Shortcuts"
 msgstr "快捷键"
 
@@ -1808,11 +1842,11 @@ msgstr "å¦‚æžœä½ é‡æ–°åˆ†é…å¿«æ·é”® %s，则快捷键 %s 将被禁用"
 msgid "_Reassign"
 msgstr "重新分配(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:100
+#: ../panels/mouse/cc-mouse-panel.c:95
 msgid "Test Your _Settings"
 msgstr "测试您的设置(_S)"
 
-#: ../panels/mouse/cc-mouse-panel.c:116
+#: ../panels/mouse/cc-mouse-panel.c:108
 msgid "Test Your Settings"
 msgstr "测试您的设置"
 
@@ -1833,91 +1867,87 @@ msgstr ""
 "击;按钮;轨迹球;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Mouse Preferences"
-msgstr "é¼ æ ‡é¦–é€‰é¡¹"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "General"
 msgstr "常规"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgctxt "double click, speed"
 msgid "Slow"
 msgstr "æ…¢"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
 msgid "Double-click timeout"
 msgstr "双击超时"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgctxt "double click, speed"
 msgid "Fast"
 msgstr "å¿«"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "_Double-click"
 msgstr "双击(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "Primary _button"
 msgstr "主按钮(_B)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "å·¦(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../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:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Mouse"
 msgstr "é¼ æ ‡"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "_Pointer speed"
 msgstr "指针速度(_P)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgctxt "mouse pointer, speed"
 msgid "Slow"
 msgstr "æ…¢"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgctxt "mouse pointer, speed"
 msgid "Fast"
 msgstr "å¿«"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Touchpad"
 msgstr "触摸板"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgctxt "touchpad pointer, speed"
 msgid "Slow"
 msgstr "æ…¢"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgctxt "touchpad pointer, speed"
 msgid "Fast"
 msgstr "å¿«"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Disable while _typing"
 msgstr "打字时禁用(_T)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 msgid "Tap to _click"
 msgstr "轻触表示点击(_C)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
 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:21
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
 msgid "_Natural scrolling"
 msgstr "自然滚动(_N)"
 
@@ -1956,11 +1986,11 @@ msgstr "单击，次键"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:347
+#: ../panels/network/cc-network-panel.c:358
 msgid "Air_plane Mode"
 msgstr "飞行模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:914
+#: ../panels/network/cc-network-panel.c:930
 msgid "Network proxy"
 msgstr "网络代理"
 
@@ -1968,14 +1998,14 @@ msgstr "网络代理"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1093 ../panels/network/net-vpn.c:285
-#: ../panels/network/net-vpn.c:438
+#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
+#: ../panels/network/net-vpn.c:431
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:1228
+#: ../panels/network/cc-network-panel.c:1244
 msgid "The system network services are not compatible with this version."
 msgstr "系统的网络服务与此版本的网络管理器不兼容。"
 
@@ -2009,34 +2039,34 @@ msgstr "自动"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:222
-#: ../panels/network/net-device-wifi.c:383
+#: ../panels/network/net-device-wifi.c:216
+#: ../panels/network/net-device-wifi.c:377
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:226
-#: ../panels/network/net-device-wifi.c:388
+#: ../panels/network/net-device-wifi.c:220
+#: ../panels/network/net-device-wifi.c:382
 #: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:230
+#: ../panels/network/net-device-wifi.c:224
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:229
 msgid "Enterprise"
 msgstr "企业"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:240
-#: ../panels/network/net-device-wifi.c:373
+#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/net-device-wifi.c:367
 msgctxt "Wifi security"
 msgid "None"
 msgstr "æ— "
@@ -2047,18 +2077,18 @@ msgid "Never"
 msgstr "从不"
 
 #: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:787
+#: ../panels/user-accounts/um-utils.c:803
 msgid "Today"
 msgstr "今天"
 
 #: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:790
+#: ../panels/user-accounts/um-utils.c:806
 msgid "Yesterday"
 msgstr "昨天"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:125
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:471
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2067,37 +2097,37 @@ msgstr[0] "%i 天前"
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
 #: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:535
+#: ../panels/network/net-device-wifi.c:528
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/秒"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:564
+#: ../panels/network/net-device-wifi.c:557
 msgctxt "Signal strength"
 msgid "None"
 msgstr "æ— "
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:566
+#: ../panels/network/net-device-wifi.c:559
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "微弱"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:568
+#: ../panels/network/net-device-wifi.c:561
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "一般"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:570
+#: ../panels/network/net-device-wifi.c:563
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "较好"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:572
+#: ../panels/network/net-device-wifi.c:565
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "良好"
@@ -2170,7 +2200,7 @@ msgstr "手动"
 msgid "Link-Local Only"
 msgstr "仅本地连接"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:941
+#: ../panels/network/connection-editor/ce-page-ip4.c:942
 #: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
@@ -2232,10 +2262,6 @@ msgstr "WPA & WPA2 个人"
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企业"
 
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-msgid "_Apply"
-msgstr "应用(_A)"
-
 #: ../panels/network/connection-editor/details-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:2
 msgid "Signal Strength"
@@ -2247,15 +2273,15 @@ msgid "Link speed"
 msgstr "连接速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:155
 #: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:159
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/net-device-ethernet.c:160
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
@@ -2263,14 +2289,14 @@ msgid "IPv6 Address"
 msgstr "IPv6 地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:166
+#: ../panels/network/net-device-ethernet.c:163
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:7
 msgid "Hardware Address"
 msgstr "硬件地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:170
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2280,7 +2306,7 @@ msgstr "默认路由"
 #: ../panels/network/connection-editor/details-page.ui.h:8
 #: ../panels/network/connection-editor/ip4-page.ui.h:3
 #: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:172
+#: ../panels/network/net-device-ethernet.c:169
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2411,46 +2437,46 @@ msgstr "仅对此网络上的资源使用此连接(_O)"
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:266
+#: ../panels/network/connection-editor/net-connection-editor.c:268
 msgid "Unable to open connection editor"
 msgstr "蓝牙连接失败"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:284
+#: ../panels/network/connection-editor/net-connection-editor.c:286
 msgid "New Profile"
 msgstr "æ— é…ç½®"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:509
+#: ../panels/network/connection-editor/net-connection-editor.c:511
 #: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1440
+#: ../panels/user-accounts/um-account-dialog.c:1471
 msgid "_Add"
 msgstr "æ·»åŠ (_A)"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:593
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+#: ../panels/network/connection-editor/net-connection-editor.c:595
+#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:594
+#: ../panels/network/connection-editor/net-connection-editor.c:596
 msgid "Bond"
 msgstr "绑定"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:595
+#: ../panels/network/connection-editor/net-connection-editor.c:597
 msgid "Bridge"
 msgstr "桥接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:596
+#: ../panels/network/connection-editor/net-connection-editor.c:598
 msgid "VLAN"
 msgstr "虚拟局域网"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:747
+#: ../panels/network/connection-editor/net-connection-editor.c:749
 msgid "Could not load VPN plugins"
 msgstr "æ— æ³•è£…å…¥ VPN 插件"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:816
+#: ../panels/network/connection-editor/net-connection-editor.c:818
 msgid "Import from file…"
 msgstr "从文件导入..."
 
-#: ../panels/network/connection-editor/net-connection-editor.c:887
+#: ../panels/network/connection-editor/net-connection-editor.c:889
 msgid "Add Network Connection"
 msgstr "æ·»åŠ ç½‘ç»œè¿žæŽ¥"
 
@@ -2460,7 +2486,7 @@ msgid "_Reset"
 msgstr "重置(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1409
+#: ../panels/network/net-device-wifi.c:1403
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -2504,7 +2530,7 @@ msgstr "选择要导入的文件"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
 #: ../panels/printers/cc-printers-panel.c:1947
-#: ../panels/sharing/cc-sharing-panel.c:422
+#: ../panels/sharing/cc-sharing-panel.c:436
 #: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "打开(_O)"
@@ -2592,29 +2618,29 @@ msgstr "绑定从机"
 msgid "Bridge slaves"
 msgstr "桥接从机"
 
-#: ../panels/network/net-device-ethernet.c:111
-#: ../panels/network/net-device-wifi.c:463
+#: ../panels/network/net-device-ethernet.c:108
+#: ../panels/network/net-device-wifi.c:457
 msgid "never"
 msgstr "从不"
 
-#: ../panels/network/net-device-ethernet.c:121
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:467
 msgid "today"
 msgstr "今天"
 
-#: ../panels/network/net-device-ethernet.c:123
-#: ../panels/network/net-device-wifi.c:475
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:469
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../panels/network/net-device-ethernet.c:161
+#: ../panels/network/net-device-ethernet.c:158
 #: ../panels/network/network-mobile.ui.h:3
 #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: ../panels/network/net-device-ethernet.c:177
+#: ../panels/network/net-device-ethernet.c:174
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "上次使用的"
@@ -2624,14 +2650,14 @@ msgstr "上次使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:287
+#: ../panels/network/net-device-ethernet.c:284
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有线"
 
-#: ../panels/network/net-device-ethernet.c:355
-#: ../panels/network/net-device-wifi.c:1550
+#: ../panels/network/net-device-ethernet.c:352
+#: ../panels/network/net-device-wifi.c:1558
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2639,67 +2665,67 @@ msgstr "有线"
 msgid "Options…"
 msgstr "选项…"
 
-#: ../panels/network/net-device-ethernet.c:492
+#: ../panels/network/net-device-ethernet.c:489
 #, c-format
 msgid "Profile %d"
 msgstr "配置 %d"
 
-#: ../panels/network/net-device-mobile.c:239
+#: ../panels/network/net-device-mobile.c:232
 msgid "Add new connection"
 msgstr "æ·»åŠ æ–°è¿žæŽ¥"
 
-#: ../panels/network/net-device-wifi.c:1118
+#: ../panels/network/net-device-wifi.c:1110
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
 msgstr "å¦‚æžœæ‚¨æœ‰é™¤æ— çº¿ç½‘ç»œä»¥å¤–çš„æ–¹å¼è¿žæŽ¥åˆ°äº’è”ç½‘ï¼Œæ‚¨å¯ä»¥å°†å®ƒä¸Žå…¶ä»–äººåˆ†äº«ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1122
+#: ../panels/network/net-device-wifi.c:1114
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "åˆ‡æ¢æ— çº¿ç½‘çƒ­ç‚¹ä¼šä½¿å¾—æ‚¨ä»Ž <b>%s</b> 断开。"
 
-#: ../panels/network/net-device-wifi.c:1126
+#: ../panels/network/net-device-wifi.c:1118
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "å¯ç”¨çƒ­ç‚¹æ¨¡å¼æ—¶æ— æ³•é€šè¿‡æ— çº¿ç½‘ç»œè®¿é—®äº’è”ç½‘ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1200
+#: ../panels/network/net-device-wifi.c:1192
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户？"
 
-#: ../panels/network/net-device-wifi.c:1203
+#: ../panels/network/net-device-wifi.c:1195
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
-#: ../panels/network/net-device-wifi.c:1275
+#: ../panels/network/net-device-wifi.c:1267
 msgid "System policy prohibits use as a Hotspot"
 msgstr "设备策略禁止用于热点"
 
-#: ../panels/network/net-device-wifi.c:1278
+#: ../panels/network/net-device-wifi.c:1270
 msgid "Wireless device does not support Hotspot mode"
 msgstr "æ— çº¿è®¾å¤‡ä¸æ”¯æŒçƒ­ç‚¹æ¨¡å¼"
 
-#: ../panels/network/net-device-wifi.c:1405
+#: ../panels/network/net-device-wifi.c:1399
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "æ‰€é€‰ç½‘ç»œçš„ç»†èŠ‚ï¼ŒåŒ…æ‹¬å¯†ç å’Œå…¨éƒ¨è‡ªå®šä¹‰è®¾ç½®ï¼Œéƒ½å°†ä¸¢å¤±ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1715
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+#: ../panels/network/net-device-wifi.c:1726
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "历史"
 
-#: ../panels/network/net-device-wifi.c:1719 ../panels/power/power.ui.h:21
-#: ../panels/privacy/privacy.ui.h:10 ../panels/sound/gvc-mixer-dialog.c:1596
-#: ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/network/net-device-wifi.c:1730 ../panels/power/power.ui.h:21
+#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
+#: ../panels/wacom/cc-wacom-page.c:534
 msgid "_Close"
 msgstr "关闭(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1727
+#: ../panels/network/net-device-wifi.c:1738
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -2718,7 +2744,7 @@ msgstr "若未提供配置 URL，将使用网络代理自动发现。"
 msgid "This is not recommended for untrusted public networks."
 msgstr "å¯¹äºŽä¸å¯ä¿¡çš„å…¬å…±ç½‘ç»œï¼Œä¸å»ºè®®è¿™æ ·åšã€‚"
 
-#: ../panels/network/net-proxy.c:408
+#: ../panels/network/net-proxy.c:410
 msgid "Proxy"
 msgstr "代理"
 
@@ -2734,17 +2760,17 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "提供商"
 
-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
 msgctxt "proxy method"
 msgid "None"
 msgstr "æ— "
 
-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "手动"
 
-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "自动"
@@ -2797,19 +2823,7 @@ msgstr "SOCKS 代理端口"
 msgid "Turn device off"
 msgstr "设备关闭"
 
-#: ../panels/network/network.ui.h:1
-msgid "Select the interface to use for the new service"
-msgstr "选择用于新服务的接口"
-
-#: ../panels/network/network.ui.h:2
-msgid "C_reate…"
-msgstr "创建(_R)..."
-
-#: ../panels/network/network.ui.h:3
-msgid "_Interface"
-msgstr "接口(_I)"
-
-#: ../panels/network/network.ui.h:8
+#: ../panels/network/network.ui.h:5
 msgid "Add Device"
 msgstr "æ·»åŠ è®¾å¤‡"
 
@@ -2848,7 +2862,7 @@ msgstr "详细信息"
 #: ../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:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Password"
 msgstr "å¯†ç (_P)"
 
@@ -3538,26 +3552,15 @@ msgid "Show Details in Lock Screen"
 msgstr "在锁定屏幕中显示细节"
 
 #: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1738 ../panels/power/cc-power-panel.c:1745
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:144
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:573
-#: ../panels/universal-access/cc-ua-panel.c:699
+#: ../panels/power/cc-power-panel.c:1744 ../panels/power/cc-power-panel.c:1751
+#: ../panels/privacy/cc-privacy-panel.c:80
+#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
 msgid "On"
 msgstr "å¼€"
 
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1732 ../panels/power/cc-power-panel.c:1743
-#: ../panels/privacy/cc-privacy-panel.c:77
-#: ../panels/privacy/cc-privacy-panel.c:144
-#: ../panels/universal-access/cc-ua-panel.c:253
-#: ../panels/universal-access/cc-ua-panel.c:573
-#: ../panels/universal-access/cc-ua-panel.c:699
-#: ../panels/universal-access/uap.ui.h:6
-msgid "Off"
-msgstr "å…³"
-
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
 msgid "Notifications"
 msgstr "通知"
@@ -3580,26 +3583,30 @@ msgstr "显示弹出条幅"
 msgid "Show in Lock Screen"
 msgstr "在锁屏显示"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:197
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200
 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:300
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:318
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "æ·»åŠ è´¦æˆ·"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:339
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:357
 msgid "Mail"
 msgstr "邮件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:345
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
 msgid "Contacts"
 msgstr "联系人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:351
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369
+msgid "Chat"
+msgstr "聊天"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
 msgid "Resources"
 msgstr "资源"
 
@@ -3607,31 +3614,31 @@ msgstr "资源"
 msgid "Error logging into the account"
 msgstr "登录到该账户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:497
+#: ../panels/online-accounts/cc-online-accounts-panel.c:495
 msgid "Credentials have expired."
 msgstr "证书已经过期"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
+#: ../panels/online-accounts/cc-online-accounts-panel.c:499
 msgid "Sign in to enable this account."
 msgstr "登入启用此账户。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:506
+#: ../panels/online-accounts/cc-online-accounts-panel.c:504
 msgid "_Sign In"
 msgstr "登入(_S)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:747
+#: ../panels/online-accounts/cc-online-accounts-panel.c:745
 msgid "Error creating account"
 msgstr "创建账户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:787
+#: ../panels/online-accounts/cc-online-accounts-panel.c:805
 msgid "Error removing account"
 msgstr "移除账户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:823
+#: ../panels/online-accounts/cc-online-accounts-panel.c:841
 msgid "Are you sure you want to remove the account?"
 msgstr "您确定要移除该账户吗？"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:825
+#: ../panels/online-accounts/cc-online-accounts-panel.c:843
 msgid "This will not remove the account on the server."
 msgstr "这不会将该账户从服务器上移除。"
 
@@ -3647,9 +3654,11 @@ msgstr "连接在线账户并决定如何使用"
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
+"Kerberos;IMAP;SMTP;"
 msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"谷歌;脸谱;脸书;推特;雅虎;微博;网络;在线;聊天;日历;邮件;联系人;云存储"
+"Kerberos;IMAP;SMTP;谷歌;脸谱;脸书;推特;雅虎;微博;网络;在线;聊天;日历;邮件;联"
+"系人;云存储"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -3671,17 +3680,17 @@ msgid ""
 msgstr ""
 "æ·»åŠ ä¸€ä¸ªè´¦æˆ·ï¼Œè®©æ‚¨çš„åº”ç”¨ç¨‹åºè®¿é—®è´¦æˆ·çš„æ–‡æ¡£ã€é‚®ä»¶ã€è”ç³»äººã€æ—¥åŽ†ã€èŠå¤©ç­‰ç­‰ã€‚"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:189
 msgid "Unknown time"
 msgstr "未知时间"
 
-#: ../panels/power/cc-power-panel.c:194
+#: ../panels/power/cc-power-panel.c:195
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分钟"
 
-#: ../panels/power/cc-power-panel.c:206
+#: ../panels/power/cc-power-panel.c:207
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3689,229 +3698,224 @@ msgstr[0] "%i 小时"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:214
+#: ../panels/power/cc-power-panel.c:215
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:215
+#: ../panels/power/cc-power-panel.c:216
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "æ—¶"
 
-#: ../panels/power/cc-power-panel.c:216
+#: ../panels/power/cc-power-panel.c:217
 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:235
+#: ../panels/power/cc-power-panel.c:236
 #, 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:242
+#: ../panels/power/cc-power-panel.c:243
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意：剩余 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:247
+#: ../panels/power/cc-power-panel.c:248
 #, c-format
 msgid "%s remaining"
 msgstr "剩余 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
+#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:256 ../panels/power/cc-power-panel.c:284
+#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
 msgid "Empty"
 msgstr "ç”µæ± å·²ç©º"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:271
+#: ../panels/power/cc-power-panel.c:272
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:276
+#: ../panels/power/cc-power-panel.c:277
 msgid "Discharging"
 msgstr "正在放电"
 
-#: ../panels/power/cc-power-panel.c:328
-#, c-format
-msgid "Estimated battery capacity: %s"
-msgstr "ä¼°è®¡ç”µæ± å®¹é‡ï¼š%s"
-
-#: ../panels/power/cc-power-panel.c:411
+#: ../panels/power/cc-power-panel.c:395
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主"
 
-#: ../panels/power/cc-power-panel.c:413
+#: ../panels/power/cc-power-panel.c:397
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "é™„åŠ "
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:504
+#: ../panels/power/cc-power-panel.c:469
 msgid "Wireless mouse"
 msgstr "æ— çº¿é¼ æ ‡"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:508
+#: ../panels/power/cc-power-panel.c:472
 msgid "Wireless keyboard"
 msgstr "æ— çº¿é”®ç›˜"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:512
+#: ../panels/power/cc-power-panel.c:475
 msgid "Uninterruptible power supply"
 msgstr "不间断电源(UPS)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:517
+#: ../panels/power/cc-power-panel.c:478
 msgid "Personal digital assistant"
 msgstr "个人数字助理(PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:521
+#: ../panels/power/cc-power-panel.c:481
 msgid "Cellphone"
 msgstr "手机"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:525
+#: ../panels/power/cc-power-panel.c:484
 msgid "Media player"
 msgstr "媒体播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:529
+#: ../panels/power/cc-power-panel.c:487
 msgid "Tablet"
 msgstr "手写板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:533
+#: ../panels/power/cc-power-panel.c:490
 msgid "Computer"
 msgstr "计算机"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:537 ../panels/power/cc-power-panel.c:747
-#: ../panels/power/cc-power-panel.c:2069
+#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:740
+#: ../panels/power/cc-power-panel.c:2075
 msgid "Battery"
 msgstr "ç”µæ± "
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: ../panels/power/cc-power-panel.c:539
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:553
+#: ../panels/power/cc-power-panel.c:546
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "警告"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:558
+#: ../panels/power/cc-power-panel.c:551
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:563
+#: ../panels/power/cc-power-panel.c:556
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充足"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:568
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:572
+#: ../panels/power/cc-power-panel.c:565
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "空"
 
-#: ../panels/power/cc-power-panel.c:745
+#: ../panels/power/cc-power-panel.c:738
 msgid "Batteries"
 msgstr "ç”µæ± ç»„"
 
-#: ../panels/power/cc-power-panel.c:1138
+#: ../panels/power/cc-power-panel.c:1144
 msgid "When _idle"
 msgstr "闲置时(_I)"
 
-#: ../panels/power/cc-power-panel.c:1507
+#: ../panels/power/cc-power-panel.c:1513
 msgid "Power Saving"
 msgstr "省电"
 
-#: ../panels/power/cc-power-panel.c:1535
+#: ../panels/power/cc-power-panel.c:1541
 msgid "_Screen brightness"
 msgstr "屏幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1541
+#: ../panels/power/cc-power-panel.c:1547
 msgid "_Keyboard brightness"
 msgstr "键盘亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1551
+#: ../panels/power/cc-power-panel.c:1557
 msgid "_Dim screen when inactive"
 msgstr "æ— æ“ä½œæ—¶å±å¹•å˜æš—(_D)"
 
-#: ../panels/power/cc-power-panel.c:1576
+#: ../panels/power/cc-power-panel.c:1582
 msgid "_Blank screen"
 msgstr "空白屏幕(_B)"
 
-#: ../panels/power/cc-power-panel.c:1613
+#: ../panels/power/cc-power-panel.c:1619
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1618
+#: ../panels/power/cc-power-panel.c:1624
 msgid "Turns off wireless devices"
 msgstr "å…³é—­æ— çº¿è®¾å¤‡"
 
-#: ../panels/power/cc-power-panel.c:1643
+#: ../panels/power/cc-power-panel.c:1649
 msgid "_Mobile broadband"
 msgstr "移动宽带(_M)"
 
-#: ../panels/power/cc-power-panel.c:1648
+#: ../panels/power/cc-power-panel.c:1654
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "关闭移动宽带(3G、4G、WiMax 等)设备"
 
-#: ../panels/power/cc-power-panel.c:1683
+#: ../panels/power/cc-power-panel.c:1689
 msgid "_Bluetooth"
 msgstr "蓝牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1734
+#: ../panels/power/cc-power-panel.c:1740
 msgid "When on battery power"
 msgstr "ç”µæ± ä¾›ç”µæ—¶"
 
-#: ../panels/power/cc-power-panel.c:1736
+#: ../panels/power/cc-power-panel.c:1742
 msgid "When plugged in"
 msgstr "电源插入时"
 
-#: ../panels/power/cc-power-panel.c:1865
+#: ../panels/power/cc-power-panel.c:1871
 msgid "Suspend & Power Off"
 msgstr "挂起和关机"
 
-#: ../panels/power/cc-power-panel.c:1898
+#: ../panels/power/cc-power-panel.c:1904
 msgid "_Automatic suspend"
 msgstr "自动挂起(_A)"
 
-#: ../panels/power/cc-power-panel.c:1922
+#: ../panels/power/cc-power-panel.c:1928
 msgid "When battery power is _critical"
 msgstr "电量严重不足时(_C)"
 
-#: ../panels/power/cc-power-panel.c:1979
+#: ../panels/power/cc-power-panel.c:1985
 msgid "Power Off"
 msgstr "电源关闭"
 
-#: ../panels/power/cc-power-panel.c:2121
+#: ../panels/power/cc-power-panel.c:2122
 msgid "Devices"
 msgstr "设备"
 
@@ -4254,10 +4258,20 @@ msgstr "取消打印机任务"
 msgid "Add a New Printer"
 msgstr "æ·»åŠ æ–°æ‰“å°æœº"
 
-#: ../panels/printers/new-printer-dialog.ui.h:4
+#. Translators: This button opens authentication dialog for selected server.
+#: ../panels/printers/new-printer-dialog.ui.h:5
+msgid "A_uthenticate"
+msgstr "认证(_U)"
+
+#: ../panels/printers/new-printer-dialog.ui.h:6
 msgid "Search for network printers or filter result"
 msgstr "搜索网络打印机或过滤结果"
 
+#. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
+#: ../panels/printers/new-printer-dialog.ui.h:8
+msgid "Enter address of a printer or a text to filter results"
+msgstr "输入打印机地址或文本来过滤结果"
+
 #: ../panels/printers/options-dialog.ui.h:1
 msgid "Loading options…"
 msgstr "正在载入选项…"
@@ -4370,8 +4384,13 @@ msgstr "时间"
 msgid "%s Active Jobs"
 msgstr "%s 个活动的任务"
 
+#. Translators: This item is a server which needs authentication to show its printers
+#: ../panels/printers/pp-new-printer-dialog.c:1669
+msgid "Server requires authentication"
+msgstr "服务器需要认证"
+
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1468
+#: ../panels/printers/pp-new-printer-dialog.c:1706
 msgid "No printers detected."
 msgstr "未检测到打印机。"
 
@@ -4391,10 +4410,6 @@ msgstr "çº¸å¼ æ¥æº"
 msgid "Output Tray"
 msgstr "出纸托盘"
 
-#: ../panels/printers/pp-options-dialog.c:86
-msgid "Resolution"
-msgstr "分辨率"
-
 #: ../panels/printers/pp-options-dialog.c:87
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 预过滤"
@@ -4510,7 +4525,7 @@ msgid "Driver"
 msgstr "驱动器"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:247
+#: ../panels/printers/pp-samba.c:254
 #, c-format
 msgid "Enter your username and password to view printers available on %s."
 msgstr "è¾“å…¥ç”¨æˆ·åå’Œå¯†ç ä»¥æŸ¥çœ‹ %s 上可用的打印机。"
@@ -4585,27 +4600,39 @@ msgid ""
 "doesn't seem to be available."
 msgstr "对不起，系统打印服务似乎不可用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:104
-msgid "Hidden"
-msgstr "隐藏"
-
-#: ../panels/privacy/cc-privacy-panel.c:104
-msgid "Visible"
-msgstr "可见"
-
-#: ../panels/privacy/cc-privacy-panel.c:272 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
 msgid "Screen Lock"
 msgstr "锁屏"
 
-#: ../panels/privacy/cc-privacy-panel.c:339 ../panels/privacy/privacy.ui.h:9
-msgid "Name & Visibility"
-msgstr "名称及可见性"
-
-#: ../panels/privacy/cc-privacy-panel.c:447 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
 msgid "Usage & History"
 msgstr "用量及历史"
 
-#: ../panels/privacy/cc-privacy-panel.c:577 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:489
+msgid "Empty all items from Trash?"
+msgstr "清空回收站中的所有项目吗？"
+
+#: ../panels/privacy/cc-privacy-panel.c:490
+msgid "All items in the Trash will be permanently deleted."
+msgstr "å›žæ”¶ç«™å†…çš„æ‰€æœ‰é¡¹ç›®å°†ä¼šæ°¸ä¹…åˆ é™¤ã€‚"
+
+#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+msgid "_Empty Trash"
+msgstr "清空回收站(_E)"
+
+#: ../panels/privacy/cc-privacy-panel.c:514
+msgid "Delete all the temporary files?"
+msgstr "åˆ é™¤æ‰€æœ‰ä¸´æ—¶æ–‡ä»¶å—ï¼Ÿ"
+
+#: ../panels/privacy/cc-privacy-panel.c:515
+msgid "All the temporary files will be permanently deleted."
+msgstr "æ‰€æœ‰ä¸´æ—¶æ–‡ä»¶å°†ä¼šæ°¸ä¹…åˆ é™¤ã€‚"
+
+#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+msgid "_Purge Temporary Files"
+msgstr "清理临时文件(_P)"
+
+#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
 msgid "Purge Trash & Temporary Files"
 msgstr "清理回收站及临时文件"
 
@@ -4634,123 +4661,99 @@ msgstr "关闭屏幕"
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: ../panels/privacy/privacy.ui.h:11
-msgid "Control how you appear on the screen and the network."
-msgstr "控制如何如何在屏幕和网络上显示您。"
-
-#: ../panels/privacy/privacy.ui.h:12
-msgid "Display _full name in top bar"
-msgstr "åœ¨é¡¶æ æ˜¾ç¤ºå…¨å(_F)"
-
-#: ../panels/privacy/privacy.ui.h:13
-msgid "Display full name in _lock screen"
-msgstr "在锁屏时显示全名(_L)"
-
-#: ../panels/privacy/privacy.ui.h:14
-msgid "_Stealth Mode"
-msgstr "隐私模式(_S)"
-
-#: ../panels/privacy/privacy.ui.h:15
+#: ../panels/privacy/privacy.ui.h:9
 msgid "Immediately"
 msgstr "立即"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: ../panels/privacy/privacy.ui.h:10
 msgid "1 day"
 msgstr "1 天"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: ../panels/privacy/privacy.ui.h:11
 msgid "2 days"
 msgstr "2 天"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: ../panels/privacy/privacy.ui.h:12
 msgid "3 days"
 msgstr "3 天"
 
-#: ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/privacy.ui.h:13
 msgid "4 days"
 msgstr "4 天"
 
-#: ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/privacy.ui.h:14
 msgid "5 days"
 msgstr "5 天"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: ../panels/privacy/privacy.ui.h:15
 msgid "6 days"
 msgstr "6 天"
 
-#: ../panels/privacy/privacy.ui.h:22
+#: ../panels/privacy/privacy.ui.h:16
 msgid "7 days"
 msgstr "7 天"
 
-#: ../panels/privacy/privacy.ui.h:23
+#: ../panels/privacy/privacy.ui.h:17
 msgid "14 days"
 msgstr "14 天"
 
-#: ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/privacy.ui.h:18
 msgid "30 days"
 msgstr "30 天"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: ../panels/privacy/privacy.ui.h:19
 msgid "Forever"
 msgstr "永远"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/privacy.ui.h:21
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 msgstr "记住历史让再次寻找变得容易。这些条目永远不会通过网络共享。"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:22
 msgid "Cl_ear Recent History"
 msgstr "清理最近历史(_E)"
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:24
 msgid "_Recently Used"
 msgstr "最近使用(_R)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:25
 msgid "Retain _History"
 msgstr "保留历史(_H)"
 
-#: ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/privacy.ui.h:27
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "在离开时，锁定屏幕可以保护隐私。"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Automatic Screen _Lock"
 msgstr "自动锁屏(_L)"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:29
 msgid "Lock screen _after blank for"
 msgstr "黑屏至锁屏的等待时间(_A)"
 
-#: ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/privacy.ui.h:30
 msgid "Show _Notifications"
 msgstr "显示通知(_N)"
 
-#: ../panels/privacy/privacy.ui.h:37
-msgid "_Empty Trash"
-msgstr "清空回收站(_E)"
-
-#: ../panels/privacy/privacy.ui.h:38
-msgid "_Purge Temporary Files"
-msgstr "清理临时文件(_P)"
-
-#: ../panels/privacy/privacy.ui.h:39
+#: ../panels/privacy/privacy.ui.h:34
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr "自动清理回收站和临时文件，帮助计算机保存避免不必要的敏感信息。"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: ../panels/privacy/privacy.ui.h:35
 msgid "Automatically empty _Trash"
 msgstr "自动清空回收站(_T)"
 
-#: ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/privacy.ui.h:36
 msgid "Automatically purge Temporary _Files"
 msgstr "自动清理临时文件(_F)"
 
-#: ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/privacy.ui.h:37
 msgid "Purge _After"
 msgstr "清理延时(_A)"
 
@@ -4974,21 +4977,21 @@ msgstr "下移"
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:285
 msgctxt "service is enabled"
 msgid "On"
 msgstr "å¼€"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:287
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "å…³"
 
-#: ../panels/sharing/cc-sharing-panel.c:418
+#: ../panels/sharing/cc-sharing-panel.c:432
 msgid "Choose a Folder"
 msgstr "选择文件夹"
 
-#: ../panels/sharing/cc-sharing-panel.c:702
+#: ../panels/sharing/cc-sharing-panel.c:739
 msgid "Copy"
 msgstr "复制"
 
@@ -5387,8 +5390,8 @@ msgstr ""
 "度;缩放;屏幕读取器;文本;字体;大小;粘滞键;慢速键;回弹键;é¼ æ ‡é”®;"
 
 #: ../panels/universal-access/uap.ui.h:1
-msgid "Show Status When _Inactive"
-msgstr "不活动时显示状态(_I)"
+msgid "_Always Show Universal Access Menu"
+msgstr "总是显示通用辅助功能菜单(_A)"
 
 #: ../panels/universal-access/uap.ui.h:2
 msgid "Seeing"
@@ -5831,7 +5834,7 @@ msgid "_Full Name"
 msgstr "全名(_F)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Account _Type"
 msgstr "账户类型(_T)"
 
@@ -5846,8 +5849,8 @@ msgid "Set a password now"
 msgstr "çŽ°åœ¨è®¾ç½®å¯†ç "
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Confirm Password"
-msgstr "ç¡®è®¤å¯†ç (_C)"
+msgid "_Verify"
+msgstr "验证(_V)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:11
 msgid ""
@@ -5860,14 +5863,6 @@ msgid "_Domain"
 msgstr "域(_D)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid "_Login Name"
-msgstr "登录名(_L)"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
-msgid "Login _Password"
-msgstr "ç™»å½•å¯†ç (_P)"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
 msgid ""
 "Go online to add\n"
 "enterprise login accounts."
@@ -5876,15 +5871,15 @@ msgstr ""
 "企业登录帐号。"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: ../panels/user-accounts/data/account-dialog.ui.h:16
 msgid "_Enroll"
 msgstr "登记(_E)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
 msgid "Domain Administrator Login"
 msgstr "域管理员登录"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
@@ -5894,11 +5889,11 @@ msgstr ""
 "注册该计算机。请网络管理员在此\n"
 "è¾“å…¥åŸŸå¯†ç ã€‚"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:23
+#: ../panels/user-accounts/data/account-dialog.ui.h:21
 msgid "Administrator _Name"
 msgstr "管理员名称(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
+#: ../panels/user-accounts/data/account-dialog.ui.h:22
 msgid "Administrator Password"
 msgstr "ç®¡ç†å‘˜å¯†ç "
 
@@ -5977,8 +5972,8 @@ msgid "Login History"
 msgstr "登录历史"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
-msgid "C_onfirm New Password"
-msgstr "ç¡®è®¤æ–°å¯†ç (_O)"
+msgid "_Verify New Password"
+msgstr "ç¡®è®¤æ–°å¯†ç (_V)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
 msgid "_New Password"
@@ -5992,69 +5987,35 @@ msgstr "å½“å‰å¯†ç (_P)"
 msgid "Ch_ange"
 msgstr "更改(_A)"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
-msgid "Changing photo for:"
-msgstr "更换照片："
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
-msgid ""
-"Choose a picture that will be shown at the login screen for this account."
-msgstr "选择一个在登录屏幕上和此账户一同显示的图片。"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Gallery"
-msgstr "相册"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "浏览更多图片"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid "Take a photograph"
-msgstr "照相"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
-msgid "Browse"
-msgstr "浏览"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
-msgid "Photograph"
-msgstr "照片"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Account Information"
-msgstr "账户信息"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Add User Account"
 msgstr "æ·»åŠ ç”¨æˆ·è´¦æˆ·"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Remove User Account"
 msgstr "移除用户账户"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Login Options"
 msgstr "登录选项"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "自动登录(_U)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Fingerprint Login"
 msgstr "指纹登录(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "User Icon"
 msgstr "ç”¨æˆ·å›¾æ ‡"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "语言(_L)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "最近登录"
 
@@ -6153,37 +6114,44 @@ msgctxt "Password hint"
 msgid "Try to add more letters, numbers and symbols."
 msgstr "请尝试使用更多字母、数字和符号。"
 
-#: ../panels/user-accounts/pw-utils.c:119
+#: ../panels/user-accounts/pw-utils.c:118
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and use a number or two."
 msgstr "混合使用大写和小些字母及 1 到 2 个数字。"
 
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
+#: ../panels/user-accounts/pw-utils.c:120
+msgctxt "Password hint"
+msgid ""
+"Good password! Adding more letters, numbers and punctuation will make it "
+"stronger."
+msgstr "å¯†ç ä¸é”™ï¼è¦æ˜¯å¢žåŠ æ›´å¤šçš„å­—ç¬¦ä¸²ï¼Œæ•°å­—å’Œæ ‡ç‚¹å°±æ›´å®‰å…¨äº†ã€‚"
+
+#: ../panels/user-accounts/pw-utils.c:142
+#: ../panels/user-accounts/pw-utils.c:172
 msgctxt "Password strength"
 msgid "Strength: Weak"
 msgstr "强度：弱"
 
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
+#: ../panels/user-accounts/pw-utils.c:146
+#: ../panels/user-accounts/pw-utils.c:173
 msgctxt "Password strength"
 msgid "Strength: Low"
 msgstr "强度：低"
 
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
+#: ../panels/user-accounts/pw-utils.c:149
+#: ../panels/user-accounts/pw-utils.c:174
 msgctxt "Password strength"
 msgid "Strength: Medium"
 msgstr "强度：一般"
 
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
+#: ../panels/user-accounts/pw-utils.c:152
+#: ../panels/user-accounts/pw-utils.c:175
 msgctxt "Password strength"
 msgid "Strength: Good"
 msgstr "强度：良好"
 
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
+#: ../panels/user-accounts/pw-utils.c:155
+#: ../panels/user-accounts/pw-utils.c:176
 msgctxt "Password strength"
 msgid "Strength: High"
 msgstr "强度：高"
@@ -6237,66 +6205,65 @@ msgstr "æ–°å¯†ç å¿…é¡»åŒ…å«è¶³å¤Ÿçš„ä¸åŒå­—ç¬¦"
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../panels/user-accounts/um-account-dialog.c:228
+#: ../panels/user-accounts/um-account-dialog.c:35
+msgid "Should match the web address of your account provider."
+msgstr "应与您帐号提供商的网络地址相同。"
+
+#: ../panels/user-accounts/um-account-dialog.c:222
 msgid "Failed to add account"
 msgstr "æ·»åŠ è´¦æˆ·å¤±è´¥"
 
-#: ../panels/user-accounts/um-account-dialog.c:330
+#: ../panels/user-accounts/um-account-dialog.c:316
 msgid "This will be used to name your home folder and can't be changed."
 msgstr "通常是您主文件夹的名字，该名字不可改变。"
 
-#: ../panels/user-accounts/um-account-dialog.c:426
+#: ../panels/user-accounts/um-account-dialog.c:449
 msgid "Passwords do not match."
 msgstr "å¯†ç ä¸åŒ¹é…ã€‚"
 
-#: ../panels/user-accounts/um-account-dialog.c:427
-#: ../panels/user-accounts/um-password-dialog.c:297
-msgid "Passwords do not match"
-msgstr "å¯†ç ä¸åŒ¹é…"
-
-#: ../panels/user-accounts/um-account-dialog.c:680
-#: ../panels/user-accounts/um-account-dialog.c:726
+#: ../panels/user-accounts/um-account-dialog.c:719
+#: ../panels/user-accounts/um-account-dialog.c:765
 msgid "Failed to register account"
 msgstr "注册用户失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:864
+#: ../panels/user-accounts/um-account-dialog.c:903
 msgid "No supported way to authenticate with this domain"
 msgstr "没有支持这个域验证的方法"
 
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:962
 msgid "Failed to join domain"
 msgstr "åŠ å…¥åŸŸå¤±è´¥"
 
-#: ../panels/user-accounts/um-account-dialog.c:984
+#: ../panels/user-accounts/um-account-dialog.c:1023
 msgid ""
-"Login not recognized.\n"
+"That login name didn't work.\n"
 "Please try again."
 msgstr ""
-"登录未被识别。\n"
+"该登录名不能用。\n"
 "请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:991
+#: ../panels/user-accounts/um-account-dialog.c:1030
 msgid ""
-"Invalid password.\n"
+"That login password didn't work.\n"
 "Please try again."
 msgstr ""
-"æ— æ•ˆå¯†ç ã€‚\n"
+"ç™»å½•å¯†ç ä¸èƒ½ç”¨ã€‚\n"
 "请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:999
+#: ../panels/user-accounts/um-account-dialog.c:1038
 msgid "Failed to log into domain"
 msgstr "登入域失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:1057
-msgid "Domain not found."
-msgstr "未找到该域"
+#: ../panels/user-accounts/um-account-dialog.c:1096
+msgid "Unable find the domain. Maybe you misspelled it?"
+msgstr "找不到该域名，也许您拼错了？"
 
-#: ../panels/user-accounts/um-account-dialog.c:1415
+#: ../panels/user-accounts/um-account-dialog.c:1446
 msgid "Add User"
 msgstr "æ·»åŠ ç”¨æˆ·"
 
 #. Create enterprise toggle button.
-#: ../panels/user-accounts/um-account-dialog.c:1428
+#: ../panels/user-accounts/um-account-dialog.c:1459
 msgid "_Enterprise Login"
 msgstr "企业登录(_E)"
 
@@ -6431,33 +6398,33 @@ msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:260
+#: ../panels/user-accounts/um-history-dialog.c:267
 msgid "Session Ended"
 msgstr "会话结束时间"
 
-#: ../panels/user-accounts/um-history-dialog.c:266
+#: ../panels/user-accounts/um-history-dialog.c:273
 msgid "Session Started"
 msgstr "会话开始时间"
 
-#: ../panels/user-accounts/um-password-dialog.c:153
+#: ../panels/user-accounts/um-password-dialog.c:146
 msgid "Please choose another password."
 msgstr "è¯·é€‰æ‹©å…¶ä»–çš„å¯†ç ã€‚"
 
-#: ../panels/user-accounts/um-password-dialog.c:162
+#: ../panels/user-accounts/um-password-dialog.c:155
 msgid "Please type your current password again."
 msgstr "è¯·å†æ¬¡è¾“å…¥æ‚¨çš„å½“å‰å¯†ç ã€‚"
 
-#: ../panels/user-accounts/um-password-dialog.c:168
+#: ../panels/user-accounts/um-password-dialog.c:161
 msgid "Password could not be changed"
 msgstr "æ— æ³•æ›´æ”¹å¯†ç "
 
-#: ../panels/user-accounts/um-password-dialog.c:295
+#: ../panels/user-accounts/um-password-dialog.c:287
 msgid "The passwords do not match."
 msgstr "å¯†ç ä¸åŒ¹é…ã€‚"
 
-#: ../panels/user-accounts/um-password-dialog.c:357
-msgid "Wrong password"
-msgstr "å¯†ç é”™è¯¯"
+#: ../panels/user-accounts/um-photo-dialog.c:218
+msgid "Browse for more pictures"
+msgstr "浏览更多图片"
 
 #: ../panels/user-accounts/um-photo-dialog.c:443
 msgid "Disable image"
@@ -6607,33 +6574,33 @@ msgstr ""
 msgid "My Account"
 msgstr "我的账户"
 
-#: ../panels/user-accounts/um-utils.c:535
+#: ../panels/user-accounts/um-utils.c:551
 #, c-format
 msgid "A user with the username '%s' already exists"
 msgstr "以 %s 为用户名的用户已存在"
 
-#: ../panels/user-accounts/um-utils.c:539
+#: ../panels/user-accounts/um-utils.c:555
 #, c-format
 msgid "The username is too long"
 msgstr "用户名太长"
 
-#: ../panels/user-accounts/um-utils.c:542
+#: ../panels/user-accounts/um-utils.c:558
 msgid "The username cannot start with a '-'"
 msgstr "用户名不能以“-”开头"
 
-#: ../panels/user-accounts/um-utils.c:545
+#: ../panels/user-accounts/um-utils.c:561
 msgid ""
 "The username should only consist of lower and upper case letters from a-z, "
 "digits and any of characters '.', '-' and '_'"
 msgstr "用户名只能包含大小写英文字母(a-z)，数字，'.', '-' 及 '_'等符号"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/user-accounts/um-utils.c:795
+#: ../panels/user-accounts/um-utils.c:811
 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:799
+#: ../panels/user-accounts/um-utils.c:815
 msgid "%b %e, %Y"
 msgstr " %Y %b %e"
 
@@ -6712,7 +6679,7 @@ msgstr "æ˜ å°„åˆ°å•ä¸ªæ˜¾ç¤ºå™¨..."
 msgid "%d of %d"
 msgstr "%d/%d"
 
-#: ../panels/wacom/cc-wacom-page.c:522
+#: ../panels/wacom/cc-wacom-page.c:531
 msgid "Display Mapping"
 msgstr "æ˜¾ç¤ºæ˜ å°„"
 
@@ -6784,88 +6751,88 @@ msgid "Left-Handed Orientation"
 msgstr "惯用左手"
 
 #. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1078
+#: ../panels/wacom/gsd-wacom-device.c:1063
 msgid "Left Ring"
 msgstr "左环模式"
 
-#: ../panels/wacom/gsd-wacom-device.c:1089
+#: ../panels/wacom/gsd-wacom-device.c:1074
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "左环模式 #%d"
 
 #. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1109
+#: ../panels/wacom/gsd-wacom-device.c:1094
 msgid "Right Ring"
 msgstr "右环模式"
 
-#: ../panels/wacom/gsd-wacom-device.c:1120
+#: ../panels/wacom/gsd-wacom-device.c:1105
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "右环模式 #%d"
 
 # Touchstripå’Œtouchringéƒ½æ˜¯å•†æ ‡ã€‚
 #. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1162
+#: ../panels/wacom/gsd-wacom-device.c:1147
 msgid "Left Touchstrip"
 msgstr "左 Touchstrip 模式"
 
 # Touchstripå’Œtouchringéƒ½æ˜¯å•†æ ‡ã€‚
-#: ../panels/wacom/gsd-wacom-device.c:1173
+#: ../panels/wacom/gsd-wacom-device.c:1158
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "左 Touchstrip 模式 #%d"
 
 #. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1193
+#: ../panels/wacom/gsd-wacom-device.c:1178
 msgid "Right Touchstrip"
 msgstr "右 Touchstrip"
 
-#: ../panels/wacom/gsd-wacom-device.c:1204
+#: ../panels/wacom/gsd-wacom-device.c:1189
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "右 Touchstrip 模式 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1230
+#: ../panels/wacom/gsd-wacom-device.c:1215
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "左 Touchring 模式切换"
 
-#: ../panels/wacom/gsd-wacom-device.c:1232
+#: ../panels/wacom/gsd-wacom-device.c:1217
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "右 Touchring 模式切换"
 
-#: ../panels/wacom/gsd-wacom-device.c:1235
+#: ../panels/wacom/gsd-wacom-device.c:1220
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "左 Touchstrip 模式切换"
 
-#: ../panels/wacom/gsd-wacom-device.c:1237
+#: ../panels/wacom/gsd-wacom-device.c:1222
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "右 Touchstrip 模式切换"
 
-#: ../panels/wacom/gsd-wacom-device.c:1242
+#: ../panels/wacom/gsd-wacom-device.c:1227
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "模式切换 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1351
+#: ../panels/wacom/gsd-wacom-device.c:1335
 #, c-format
 msgid "Left Button #%d"
 msgstr "左键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1354
+#: ../panels/wacom/gsd-wacom-device.c:1338
 #, c-format
 msgid "Right Button #%d"
 msgstr "右键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1357
+#: ../panels/wacom/gsd-wacom-device.c:1341
 #, c-format
 msgid "Top Button #%d"
 msgstr "上键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1360
+#: ../panels/wacom/gsd-wacom-device.c:1344
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "底键 #%d"
@@ -6996,34 +6963,221 @@ msgstr "帮助"
 msgid "Quit"
 msgstr "退出"
 
-#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
-msgid "Settings"
-msgstr "设置"
+#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+msgid "All Settings"
+msgstr "全部设置"
 
 #. Add categories
-#: ../shell/cc-window.c:860
+#: ../shell/cc-window.c:868
 msgctxt "category"
 msgid "Personal"
 msgstr "个人"
 
-#: ../shell/cc-window.c:861
+#: ../shell/cc-window.c:869
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../shell/cc-window.c:862
+#: ../shell/cc-window.c:870
 msgctxt "category"
 msgid "System"
 msgstr "系统"
 
-#: ../shell/cc-window.c:1451
-msgid "All Settings"
-msgstr "全部设置"
+#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "设置"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;首选项;设置;"
 
+#~ msgid "Device type:"
+#~ msgstr "设备类型："
+
+#~ msgid "Manufacturer:"
+#~ msgstr "厂商："
+
+#~ msgid "Model:"
+#~ msgstr "型号："
+
+#~ msgid ""
+#~ "Image files can be dragged on this window to auto-complete the above "
+#~ "fields."
+#~ msgstr "可以将图像文件拖放到此窗口来自动填写以上字段。"
+
+#~ msgid "_Region:"
+#~ msgstr "地区(_R)："
+
+#~ msgid "_City:"
+#~ msgstr "城市(_C)："
+
+#~ msgid "_Network Time"
+#~ msgstr "网络时间(_N)"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Set the time one hour ahead."
+#~ msgstr "将时间向前调一小时。"
+
+#~ msgid "Set the time one hour back."
+#~ msgstr "将时间向后调一小时。"
+
+#~ msgid "Set the time one minute ahead."
+#~ msgstr "将时间向前调一分钟。"
+
+#~ msgid "Set the time one minute back."
+#~ msgstr "将时间向后调一分钟。"
+
+#~ msgid "Switch between AM and PM."
+#~ msgstr "在上午(AM)和下午(PM)间切换。"
+
+#~ msgid "AM/PM"
+#~ msgstr "上午/下午"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "Normal"
+#~ msgstr "正常"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "Counterclockwise"
+#~ msgstr "逆时针"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "Clockwise"
+#~ msgstr "顺时针"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "180 Degrees"
+#~ msgstr "180 度"
+
+#~ msgid "Monitor"
+#~ msgstr "显示器"
+
+#~ msgid "Drag to change primary display."
+#~ msgstr "拖拽以更改主显示设备。"
+
+#~ msgid ""
+#~ "Select a monitor to change its properties; drag it to rearrange its "
+#~ "placement."
+#~ msgstr "选择一台显示器来更改它的属性；拖动它来排列位置。"
+
+#~ msgid "%a %R"
+#~ msgstr "%a %R"
+
+#~ msgid "Failed to apply configuration: %s"
+#~ msgstr "应用配置失败：%s"
+
+#~ msgid "Could not save the monitor configuration"
+#~ msgstr "æ— æ³•ä¿å­˜æ˜¾ç¤ºå™¨é…ç½®"
+
+#~ msgid "Could not detect displays"
+#~ msgstr "æ— æ³•æ£€æµ‹æ˜¾ç¤ºå™¨"
+
+#~ msgid "_Resolution"
+#~ msgstr "分辨率(_R)"
+
+#~ msgid "R_otation"
+#~ msgstr "旋转(_O)"
+
+#~ msgid "_Mirror displays"
+#~ msgstr "镜像显示(_M)"
+
+#~ msgid "Note: may limit resolution options"
+#~ msgstr "提醒：可能会限制分辨率选项"
+
+#~ msgid "_Detect Displays"
+#~ msgstr "检测显示(_D)"
+
+#~ msgid "Mouse Preferences"
+#~ msgstr "é¼ æ ‡é¦–é€‰é¡¹"
+
+#~ msgid "Select the interface to use for the new service"
+#~ msgstr "选择用于新服务的接口"
+
+#~ msgid "C_reate…"
+#~ msgstr "创建(_R)..."
+
+#~ msgid "_Interface"
+#~ msgstr "接口(_I)"
+
+#~ msgid "Estimated battery capacity: %s"
+#~ msgstr "ä¼°è®¡ç”µæ± å®¹é‡ï¼š%s"
+
+#~ msgid "Hidden"
+#~ msgstr "隐藏"
+
+#~ msgid "Visible"
+#~ msgstr "可见"
+
+#~ msgid "Name & Visibility"
+#~ msgstr "名称及可见性"
+
+#~ msgid "Control how you appear on the screen and the network."
+#~ msgstr "控制如何如何在屏幕和网络上显示您。"
+
+#~ msgid "Display _full name in top bar"
+#~ msgstr "åœ¨é¡¶æ æ˜¾ç¤ºå…¨å(_F)"
+
+#~ msgid "Display full name in _lock screen"
+#~ msgstr "在锁屏时显示全名(_L)"
+
+#~ msgid "_Stealth Mode"
+#~ msgstr "隐私模式(_S)"
+
+#~ msgid "Show Status When _Inactive"
+#~ msgstr "不活动时显示状态(_I)"
+
+#~ msgid "_Confirm Password"
+#~ msgstr "ç¡®è®¤å¯†ç (_C)"
+
+#~ msgid "_Login Name"
+#~ msgstr "登录名(_L)"
+
+#~ msgid "Login _Password"
+#~ msgstr "ç™»å½•å¯†ç (_P)"
+
+#~ msgid "C_onfirm New Password"
+#~ msgstr "ç¡®è®¤æ–°å¯†ç (_O)"
+
+#~ msgid "Changing photo for:"
+#~ msgstr "更换照片："
+
+#~ msgid ""
+#~ "Choose a picture that will be shown at the login screen for this account."
+#~ msgstr "选择一个在登录屏幕上和此账户一同显示的图片。"
+
+#~ msgid "Gallery"
+#~ msgstr "相册"
+
+#~ msgid "Take a photograph"
+#~ msgstr "照相"
+
+#~ msgid "Browse"
+#~ msgstr "浏览"
+
+#~ msgid "Photograph"
+#~ msgstr "照片"
+
+#~ msgid "Account Information"
+#~ msgstr "账户信息"
+
+#~ msgid "Passwords do not match"
+#~ msgstr "å¯†ç ä¸åŒ¹é…"
+
+#~ msgid ""
+#~ "Login not recognized.\n"
+#~ "Please try again."
+#~ msgstr ""
+#~ "登录未被识别。\n"
+#~ "请重试。"
+
+#~ msgid "Domain not found."
+#~ msgstr "未找到该域"
+
+#~ msgid "Wrong password"
+#~ msgstr "å¯†ç é”™è¯¯"
+
 #~ msgid "No shortcut set"
 #~ msgstr "未设置快捷键"
 
@@ -7875,9 +8029,6 @@ msgstr "Preferences;Settings;首选项;设置;"
 #~ msgid "Swap colors"
 #~ msgstr "交换颜色"
 
-#~ msgid "Secondary color"
-#~ msgstr "副色"
-
 #~ msgid "Horizontal Gradient"
 #~ msgstr "水平渐变"