[gnome-control-center] Update zh_CN translation

[Aron Xu <aronxu src gnome org>]

commit 0967a45bf5c71eadb00c54286ec75ca96fa50818
Author: Aron Xu <aron debian org>
Date:   Mon Jul 28 00:14:26 2014 +0800

    Update zh_CN translation

 po/zh_CN.po | 1196 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 617 insertions(+), 579 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d97dc30..456a2a2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,26 +18,25 @@
 # Wind He <lofwind gmail com>, 2011.
 # bsfmig <bigslowfat gmail com>, 2012.
 # Cheng Lu <chenglu1990 gmail com>, 2012.
-# Aron Xu <happyaron xu gmail com>, 2010, 2011, 2012, 2013.
 # YunQiang Su <wzssyqa gmail com>, 2011, 2013.
 # Wylmer Wang <wantinghard gmail com>, 2011, 2012, 2014.
 # Tong Hui <tonghuix gmail com>, 2014.
+# Aron Xu <happyaron xu gmail com>, 2010, 2011, 2012, 2013, 2014.
 #
 msgid ""
 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: 2014-03-08 07:30+0000\n"
-"PO-Revision-Date: 2014-01-13 00:09+0800\n"
-"Last-Translator: Tong Hui <tonghuix gmail com>\n"
+"POT-Creation-Date: 2014-07-27 06:33+0000\n"
+"PO-Revision-Date: 2014-07-28 00:14+0800\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
 
 #: ../panels/background/background.ui.h:1
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
@@ -85,85 +84,90 @@ msgid "Span"
 msgstr "适合宽度"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:277
+#: ../panels/background/cc-background-chooser-dialog.c:441
 msgid "Select Background"
 msgstr "选择背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:297
+#: ../panels/background/cc-background-chooser-dialog.c:462
 msgid "Wallpapers"
 msgstr "壁纸"
 
-#: ../panels/background/cc-background-chooser-dialog.c:306
+#: ../panels/background/cc-background-chooser-dialog.c:471
 msgid "Pictures"
 msgstr "图片"
 
-#: ../panels/background/cc-background-chooser-dialog.c:314
+#: ../panels/background/cc-background-chooser-dialog.c:480
 msgid "Colors"
 msgstr "色彩"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:360
+#: ../panels/background/cc-background-chooser-dialog.c:539
 msgid "No Pictures Found"
 msgstr "未找到图片"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:378
+#: ../panels/background/cc-background-chooser-dialog.c:557
 #: ../panels/search/cc-search-locations-dialog.c:274
 msgid "Home"
 msgstr "主目录"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:390
+#: ../panels/background/cc-background-chooser-dialog.c:569
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "æ‚¨æ·»åŠ åˆ° %s 文件夹的图片将在此显示"
 
-#: ../panels/background/cc-background-chooser-dialog.c:419
-#: ../panels/color/cc-color-panel.c:222 ../panels/color/cc-color-panel.c:959
-#: ../panels/display/cc-display-panel.c:1510
-#: ../panels/display/cc-display-panel.c:1953
+#: ../panels/background/cc-background-chooser-dialog.c:591
+#: ../panels/color/cc-color-panel.c:224 ../panels/color/cc-color-panel.c:961
+#: ../panels/common/language-chooser.ui.h:3
+#: ../panels/display/cc-display-panel.c:1537
+#: ../panels/display/cc-display-panel.c:1976
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1197
-#: ../panels/network/net-device-wifi.c:1405
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:377
-#: ../panels/printers/cc-printers-panel.c:1945
+#: ../panels/network/net-device-wifi.c:1198
+#: ../panels/network/net-device-wifi.c:1406
+#: ../panels/printers/cc-printers-panel.c:1947
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:471
+#: ../panels/privacy/cc-privacy-panel.c:466
+#: ../panels/region/format-chooser.ui.h:3
+#: ../panels/region/input-chooser.ui.h:2
 #: ../panels/search/cc-search-locations-dialog.c:681
-#: ../panels/sharing/cc-sharing-panel.c:445
+#: ../panels/sharing/cc-sharing-panel.c:491
+#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: ../panels/user-accounts/data/password-dialog.ui.h:2
 #: ../panels/user-accounts/um-fingerprint-dialog.c:267
 #: ../panels/user-accounts/um-photo-dialog.c:95
-#: ../panels/user-accounts/um-photo-dialog.c:220
+#: ../panels/user-accounts/um-photo-dialog.c:222
 #: ../panels/user-accounts/um-user-panel.c:507
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:420
+#: ../panels/background/cc-background-chooser-dialog.c:592
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
 #: ../panels/user-accounts/um-photo-dialog.c:97
 msgid "Select"
 msgstr "选择"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:198
 msgid "multiple sizes"
 msgstr "多个尺寸"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:152
+#: ../panels/background/cc-background-item.c:202
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:280
+#: ../panels/background/cc-background-item.c:328
 msgid "No Desktop Background"
 msgstr "æ— æ¡Œé¢èƒŒæ™¯"
 
-#: ../panels/background/cc-background-panel.c:492
+#: ../panels/background/cc-background-panel.c:495
 msgid "Current background"
 msgstr "当前背景"
 
@@ -331,48 +335,48 @@ msgstr "æœªæ ¡å‡†"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:138
+#: ../panels/color/cc-color-panel.c:140
 msgid "Default: "
 msgstr "默认："
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:146
+#: ../panels/color/cc-color-panel.c:148
 msgid "Colorspace: "
 msgstr "色彩空间："
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:153
+#: ../panels/color/cc-color-panel.c:155
 msgid "Test profile: "
 msgstr "测试配置："
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:220
+#: ../panels/color/cc-color-panel.c:222
 msgid "Select ICC Profile File"
 msgstr "选择 ICC 配置文件"
 
-#: ../panels/color/cc-color-panel.c:223
+#: ../panels/color/cc-color-panel.c:225
 msgid "_Import"
 msgstr "导入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:234
+#: ../panels/color/cc-color-panel.c:236
 msgid "Supported ICC profiles"
 msgstr "支持的 ICC 配置"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:241
+#: ../panels/color/cc-color-panel.c:243
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有文件"
 
-#: ../panels/color/cc-color-panel.c:580
+#: ../panels/color/cc-color-panel.c:582
 msgid "Screen"
 msgstr "屏幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:904
+#: ../panels/color/cc-color-panel.c:906
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "ä¸Šä¼ æ–‡ä»¶å¤±è´¥ï¼š%s"
@@ -380,63 +384,63 @@ msgstr "ä¸Šä¼ æ–‡ä»¶å¤±è´¥ï¼š%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:918
+#: ../panels/color/cc-color-panel.c:920
 msgid "The profile has been uploaded to:"
 msgstr "é…ç½®å·²ä¸Šä¼ åˆ°ï¼š"
 
-#: ../panels/color/cc-color-panel.c:920
+#: ../panels/color/cc-color-panel.c:922
 msgid "Write down this URL."
 msgstr "请记下此 URL。"
 
-#: ../panels/color/cc-color-panel.c:921
+#: ../panels/color/cc-color-panel.c:923
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重启此计算机并启动您平时用的操作系统。"
 
-#: ../panels/color/cc-color-panel.c:922
+#: ../panels/color/cc-color-panel.c:924
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "在浏览器中输入该 URL 来下载和安装该配置。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:956
+#: ../panels/color/cc-color-panel.c:958
 msgid "Save Profile"
 msgstr "保存配置"
 
-#: ../panels/color/cc-color-panel.c:960
+#: ../panels/color/cc-color-panel.c:962
 #: ../panels/network/connection-editor/vpn-helpers.c:375
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1320
+#: ../panels/color/cc-color-panel.c:1322
 msgid "Create a color profile for the selected device"
 msgstr "为所选设备创建一份色彩配置"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1335 ../panels/color/cc-color-panel.c:1359
+#: ../panels/color/cc-color-panel.c:1337 ../panels/color/cc-color-panel.c:1361
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr "没有检测到测量仪器。请检查它是否打开和正确连接。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1369
+#: ../panels/color/cc-color-panel.c:1371
 msgid "The measuring instrument does not support printer profiling."
 msgstr "æµ‹é‡ä»ªå™¨ä¸æ”¯æŒæ‰“å°æœºæ ¡æ­£ã€‚"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1380
+#: ../panels/color/cc-color-panel.c:1382
 msgid "The device type is not currently supported."
 msgstr "目前不支持该设备类型。"
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:102
+#: ../panels/color/cc-color-profile.c:103
 msgid "Standard Space"
 msgstr "æ ‡å‡†ç©ºé—´"
 
 #. TRANSLATORS: test profiles do things like changing the screen
 #. * a different color, or swap the red and green channels
-#: ../panels/color/cc-color-profile.c:108
+#: ../panels/color/cc-color-profile.c:109
 msgid "Test Profile"
 msgstr "测试配置"
 
@@ -444,7 +448,7 @@ msgstr "测试配置"
 #. * by the color management system based on manufacturing data,
 #. * for instance the default monitor profile is created from the
 #. * primaries specified in the monitor EDID
-#: ../panels/color/cc-color-profile.c:116
+#: ../panels/color/cc-color-profile.c:117
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "自动"
@@ -452,13 +456,13 @@ msgstr "自动"
 #. TRANSLATORS: the profile quality - low quality profiles take
 #. * much less time to generate but may be a poor reflection of the
 #. * device capability
-#: ../panels/color/cc-color-profile.c:126
+#: ../panels/color/cc-color-profile.c:127
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "低质量"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:131
+#: ../panels/color/cc-color-profile.c:132
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "中等质量"
@@ -466,41 +470,41 @@ msgstr "中等质量"
 #. TRANSLATORS: the profile quality - high quality profiles take
 #. * a *long* time, and have the best calibration and
 #. * characterisation data.
-#: ../panels/color/cc-color-profile.c:138
+#: ../panels/color/cc-color-profile.c:139
 msgctxt "Profile quality"
 msgid "High Quality"
 msgstr "高质量"
 
 #. TRANSLATORS: this default RGB space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:155
+#: ../panels/color/cc-color-profile.c:156
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "默认 RGB"
 
 #. TRANSLATORS: this default CMYK space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:162
+#: ../panels/color/cc-color-profile.c:163
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "默认 CMYK"
 
 #. TRANSLATORS: this default gray space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:169
+#: ../panels/color/cc-color-profile.c:170
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "默认灰度"
 
-#: ../panels/color/cc-color-profile.c:193
+#: ../panels/color/cc-color-profile.c:194
 msgid "Vendor supplied factory calibration data"
 msgstr "ç”Ÿäº§å•†æä¾›çš„å·¥åŽ‚æ ¡å‡†æ•°æ®"
 
-#: ../panels/color/cc-color-profile.c:202
+#: ../panels/color/cc-color-profile.c:203
 msgid "Full-screen display correction not possible with this profile"
 msgstr "ä½¿ç”¨æ­¤é…ç½®æ— æ³•è¿›è¡Œå…¨å±æ˜¾ç¤ºæ ¡å‡†"
 
-#: ../panels/color/cc-color-profile.c:224
+#: ../panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
 msgstr "此配置可能已经不准确了"
 
@@ -511,7 +515,7 @@ msgstr "æ˜¾ç¤ºæ ¡å‡†"
 #: ../panels/color/color-calibrate.ui.h:2
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1469
+#: ../panels/user-accounts/um-account-dialog.c:1462
 msgid "Cancel"
 msgstr "取消"
 
@@ -843,13 +847,13 @@ msgstr "中国"
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:122
-#: ../panels/region/cc-format-chooser.c:266
-#: ../panels/region/cc-input-chooser.c:170
+#: ../panels/common/cc-language-chooser.c:123
+#: ../panels/region/cc-format-chooser.c:267
+#: ../panels/region/cc-input-chooser.c:165
 msgid "More…"
 msgstr "更多…"
 
-#: ../panels/common/cc-language-chooser.c:139
+#: ../panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "未找到语言"
 
@@ -858,36 +862,59 @@ msgid "Language"
 msgstr "语言"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:110 ../panels/region/format-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
 msgid "_Done"
 msgstr "完成(_D)"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:367
+#: ../panels/datetime/cc-datetime-panel.c:340
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y%B，%p%l%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:372
+#: ../panels/datetime/cc-datetime-panel.c:345
 msgid "%e %B %Y, %R"
 msgstr "%Y%B，%R"
 
+#. Translators: "city, country"
+#: ../panels/datetime/cc-datetime-panel.c:523
+#, c-format
+msgctxt "timezone loc"
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#. Update the timezone on the listbow row
+#. Translators: "timezone (details)"
+#: ../panels/datetime/cc-datetime-panel.c:553
+#, c-format
+msgctxt "timezone desc"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:588
+#: ../panels/datetime/cc-datetime-panel.c:561
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:593
+#: ../panels/datetime/cc-datetime-panel.c:566
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:598
+#: ../panels/datetime/cc-datetime-panel.c:571
 msgid "%R"
 msgstr "%R"
 
+#. Update the text bubble in the timezone map
+#. Translators: "timezone (utc shift)"
+#: ../panels/datetime/cc-datetime-panel.c:576
+#, c-format
+msgctxt "timezone map"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: ../panels/datetime/datetime.ui.h:1
 msgid "January"
 msgstr "一月"
@@ -1023,107 +1050,107 @@ msgstr "更改系统时间和日期设置"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "修改时间或日期设置，您需要获得管理员权限。"
 
-#: ../panels/display/cc-display-panel.c:486
+#: ../panels/display/cc-display-panel.c:487
 msgid "Lid Closed"
 msgstr "关闭盖子"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:489
+#: ../panels/display/cc-display-panel.c:490
 msgid "Mirrored"
 msgstr "镜像显示"
 
-#: ../panels/display/cc-display-panel.c:491
-#: ../panels/display/cc-display-panel.c:2122
+#: ../panels/display/cc-display-panel.c:492
+#: ../panels/display/cc-display-panel.c:2145
 msgid "Primary"
 msgstr "主"
 
-#: ../panels/display/cc-display-panel.c:493
-#: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1702 ../panels/power/cc-power-panel.c:1713
-#: ../panels/privacy/cc-privacy-panel.c:81
-#: ../panels/privacy/cc-privacy-panel.c:121
-#: ../panels/universal-access/cc-ua-panel.c:256
-#: ../panels/universal-access/cc-ua-panel.c:596
-#: ../panels/universal-access/cc-ua-panel.c:721
+#: ../panels/display/cc-display-panel.c:494
+#: ../panels/notifications/cc-notifications-panel.c:185
+#: ../panels/power/cc-power-panel.c:1684 ../panels/power/cc-power-panel.c:1695
+#: ../panels/privacy/cc-privacy-panel.c:82
+#: ../panels/privacy/cc-privacy-panel.c:122
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:572
+#: ../panels/universal-access/cc-ua-panel.c:695
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "å…³"
 
-#: ../panels/display/cc-display-panel.c:496
+#: ../panels/display/cc-display-panel.c:497
 msgid "Secondary"
 msgstr "次"
 
-#: ../panels/display/cc-display-panel.c:1506
+#: ../panels/display/cc-display-panel.c:1533
 msgid "Arrange Combined Displays"
 msgstr "排列组合的显示屏"
 
-#: ../panels/display/cc-display-panel.c:1512
-#: ../panels/display/cc-display-panel.c:1956
+#: ../panels/display/cc-display-panel.c:1539
+#: ../panels/display/cc-display-panel.c:1979
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1533
+#: ../panels/display/cc-display-panel.c:1560
 msgid "Drag displays to rearrange them"
 msgstr "拖动显示屏来重新排列它们"
 
-#: ../panels/display/cc-display-panel.c:2058
+#: ../panels/display/cc-display-panel.c:2081
 msgid "Size"
 msgstr "大小"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2071
+#: ../panels/display/cc-display-panel.c:2094
 msgid "Aspect Ratio"
 msgstr "宽高比"
 
-#: ../panels/display/cc-display-panel.c:2092
+#: ../panels/display/cc-display-panel.c:2115
 #: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "分辨率"
 
-#: ../panels/display/cc-display-panel.c:2123
+#: ../panels/display/cc-display-panel.c:2146
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "åœ¨æ­¤æ˜¾ç¤ºå™¨ä¸Šæ˜¾ç¤ºé¡¶æ å’Œæ´»åŠ¨æ¦‚è§ˆ"
 
-#: ../panels/display/cc-display-panel.c:2129
+#: ../panels/display/cc-display-panel.c:2152
 msgid "Secondary Display"
 msgstr "第二显示器"
 
-#: ../panels/display/cc-display-panel.c:2130
+#: ../panels/display/cc-display-panel.c:2153
 msgid "Join this display with another to create an extra workspace"
 msgstr "将该显示器与另一显示器合并以扩展工作空间"
 
 # 左撇子有歧视色彩。
-#: ../panels/display/cc-display-panel.c:2137
+#: ../panels/display/cc-display-panel.c:2160
 msgid "Presentation"
 msgstr "演示"
 
-#: ../panels/display/cc-display-panel.c:2138
+#: ../panels/display/cc-display-panel.c:2161
 msgid "Show slideshows and media only"
 msgstr "只显示幻灯片和多媒体"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2143
+#: ../panels/display/cc-display-panel.c:2166
 msgid "Mirror"
 msgstr "镜像"
 
-#: ../panels/display/cc-display-panel.c:2144
+#: ../panels/display/cc-display-panel.c:2167
 msgid "Show your existing view on both displays"
 msgstr "在两块显示器上同时显示当前视图"
 
-#: ../panels/display/cc-display-panel.c:2150
+#: ../panels/display/cc-display-panel.c:2173
 msgid "Turn Off"
 msgstr "关闭"
 
-#: ../panels/display/cc-display-panel.c:2151
+#: ../panels/display/cc-display-panel.c:2174
 msgid "Don't use this display"
 msgstr "不使用该显示器"
 
-#: ../panels/display/cc-display-panel.c:2367
+#: ../panels/display/cc-display-panel.c:2383
 msgid "Could not get screen information"
 msgstr "æ— æ³•èŽ·å¾—å±å¹•ä¿¡æ¯"
 
-#: ../panels/display/cc-display-panel.c:2398
+#: ../panels/display/cc-display-panel.c:2414
 msgid "_Arrange Combined Displays"
 msgstr "排列组合显示屏(_A)"
 
@@ -1137,59 +1164,63 @@ msgstr "选择如何使用连接的显示器和投影仪"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
 msgstr ""
-"Panel;Projector;xrandr;Screen;Resolution;Refresh;面板;投影仪;屏幕;分辨率;刷"
-"æ–°;"
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影仪;屏幕;"
+"分辨率;刷新;"
+
+#: ../panels/info/cc-info-panel.c:384
+msgid "Wayland"
+msgstr "Wayland"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:387 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "未知"
 
-#: ../panels/info/cc-info-panel.c:525
+#: ../panels/info/cc-info-panel.c:472
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位"
 
-#: ../panels/info/cc-info-panel.c:527
+#: ../panels/info/cc-info-panel.c:474
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位"
 
-#: ../panels/info/cc-info-panel.c:1207
+#: ../panels/info/cc-info-panel.c:1154
 msgid "Ask what to do"
 msgstr "询问如何处理"
 
-#: ../panels/info/cc-info-panel.c:1211
+#: ../panels/info/cc-info-panel.c:1158
 msgid "Do nothing"
 msgstr "不处理"
 
-#: ../panels/info/cc-info-panel.c:1215
+#: ../panels/info/cc-info-panel.c:1162
 msgid "Open folder"
 msgstr "打开文件夹"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-panel.c:1253
 msgid "Other Media"
 msgstr "其他媒体"
 
-#: ../panels/info/cc-info-panel.c:1337
+#: ../panels/info/cc-info-panel.c:1284
 msgid "Select an application for audio CDs"
 msgstr "选择播放音频 CD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1338
+#: ../panels/info/cc-info-panel.c:1285
 msgid "Select an application for video DVDs"
 msgstr "选择播放视频 DVD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1339
+#: ../panels/info/cc-info-panel.c:1286
 msgid "Select an application to run when a music player is connected"
 msgstr "选择要在连接音乐播放器后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1340
+#: ../panels/info/cc-info-panel.c:1287
 msgid "Select an application to run when a camera is connected"
 msgstr "选择要在连接相机后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1341
+#: ../panels/info/cc-info-panel.c:1288
 msgid "Select an application for software CDs"
 msgstr "选择要在插入软件 CD 时运行的应用程序"
 
@@ -1198,73 +1229,73 @@ msgstr "选择要在插入软件 CD 时运行的应用程序"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1353
+#: ../panels/info/cc-info-panel.c:1300
 msgid "audio DVD"
 msgstr "音频 DVD"
 
-#: ../panels/info/cc-info-panel.c:1354
+#: ../panels/info/cc-info-panel.c:1301
 msgid "blank Blu-ray disc"
 msgstr "空白蓝光光盘"
 
-#: ../panels/info/cc-info-panel.c:1355
+#: ../panels/info/cc-info-panel.c:1302
 msgid "blank CD disc"
 msgstr "空白 CD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1356
+#: ../panels/info/cc-info-panel.c:1303
 msgid "blank DVD disc"
 msgstr "空白 DVD 光盘"
 
 # 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1304
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1305
 msgid "Blu-ray video disc"
 msgstr "蓝光视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1306
 msgid "e-book reader"
 msgstr "电子书阅读器"
 
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1307
 msgid "HD DVD video disc"
 msgstr "HD DVD 视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1308
 msgid "Picture CD"
 msgstr "图片 CD"
 
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1309
 msgid "Super Video CD"
 msgstr "超级 VCD"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1310
 msgid "Video CD"
 msgstr "视频 CD"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1311
 msgid "Windows software"
 msgstr "Windows 软件"
 
-#: ../panels/info/cc-info-panel.c:1487
-#: ../panels/keyboard/keyboard-shortcuts.c:1695
+#: ../panels/info/cc-info-panel.c:1434
+#: ../panels/keyboard/keyboard-shortcuts.c:1705
 msgid "Section"
 msgstr "节"
 
-#: ../panels/info/cc-info-panel.c:1496 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1443 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "总览"
 
-#: ../panels/info/cc-info-panel.c:1502 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1449 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "默认应用程序"
 
-#: ../panels/info/cc-info-panel.c:1507 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1454 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "可移动介质"
 
-#: ../panels/info/cc-info-panel.c:1532
+#: ../panels/info/cc-info-panel.c:1479
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
@@ -1336,7 +1367,6 @@ msgid "Virtualization"
 msgstr "虚拟化"
 
 #: ../panels/info/info.ui.h:13
-#| msgid "Checking for Updates"
 msgid "Check for updates"
 msgstr "检查更新"
 
@@ -1437,7 +1467,7 @@ msgid "Eject"
 msgstr "弹出"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 #: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "打字"
@@ -1458,23 +1488,28 @@ msgstr "启动器"
 msgid "Launch help browser"
 msgstr "启动帮助浏览器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1601
+#: ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "设置"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:4
 msgid "Launch calculator"
 msgstr "启动计算器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: ../panels/keyboard/01-launchers.xml.in.h:5
 msgid "Launch email client"
 msgstr "启动邮件客户端"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launch web browser"
 msgstr "启动网页浏览器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: ../panels/keyboard/01-launchers.xml.in.h:7
 msgid "Home folder"
 msgstr "主文件夹"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: ../panels/keyboard/01-launchers.xml.in.h:8
 msgctxt "keybinding"
 msgid "Search"
 msgstr "搜索"
@@ -1566,9 +1601,9 @@ msgstr "高对比度开或关"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:274
-#: ../panels/keyboard/cc-keyboard-option.c:393
-#: ../panels/keyboard/keyboard-shortcuts.c:1158
+#: ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:395
+#: ../panels/keyboard/keyboard-shortcuts.c:1168
 #: ../panels/network/network-wifi.ui.h:29
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
 #: ../panels/user-accounts/um-fingerprint-dialog.c:213
@@ -1580,7 +1615,7 @@ msgstr "禁用"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:352
+#: ../panels/keyboard/cc-keyboard-option.c:354
 msgid "Alternative Characters Key"
 msgstr "替代的字符键"
 
@@ -1588,11 +1623,11 @@ msgstr "替代的字符键"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:361
+#: ../panels/keyboard/cc-keyboard-option.c:363
 msgid "Compose Key"
 msgstr "组合键"
 
-#: ../panels/keyboard/cc-keyboard-option.c:366
+#: ../panels/keyboard/cc-keyboard-option.c:368
 msgid "Modifiers-only switch to next source"
 msgstr "切换至下个源的仅使用修饰键的开关"
 
@@ -1613,104 +1648,112 @@ msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
 msgid "Custom Shortcut"
 msgstr "自定义快捷键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: ../panels/network/connection-editor/net-connection-editor.c:512
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/region/input-chooser.ui.h:3
+#: ../panels/user-accounts/um-account-dialog.c:1463
+msgid "_Add"
+msgstr "æ·»åŠ (_A)"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
 msgid "C_ommand:"
 msgstr "命令(_O)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
 msgid "Repeat Keys"
 msgstr "重复键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
 msgid "Key presses _repeat when key is held down"
 msgstr "按住某一键时重复该键(_R)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgid "_Delay:"
 msgstr "延时(_D)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
 msgid "_Speed:"
 msgstr "速度(_S)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
 msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "æ…¢"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
 msgid "Repeat keys speed"
 msgstr "重复键速度"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
 msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "é•¿"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "å¿«"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
 msgid "Cursor Blinking"
 msgstr "å…‰æ ‡é—ªçƒ"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
 msgid "Cursor _blinks in text fields"
 msgstr "æ–‡æœ¬åŸŸä¸­å…‰æ ‡é—ªçƒ(_B)"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 msgid "S_peed:"
 msgstr "速度(_P)："
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 msgid "Cursor blink speed"
 msgstr "å…‰æ ‡é—ªçƒé€Ÿåº¦"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 #: ../panels/region/region.ui.h:5
 msgid "Input Sources"
 msgstr "输入源"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
 msgid "Add Shortcut"
 msgstr "æ·»åŠ å¿«æ·é”®"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
 msgid "Remove Shortcut"
 msgstr "移除快捷键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
 msgstr ""
 "要编辑快捷键，请单击相应的行，然后输入新按键组合，或按 Backspace 清除。"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:24
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:584
-#: ../panels/keyboard/keyboard-shortcuts.c:592
+#: ../panels/keyboard/keyboard-shortcuts.c:588
+#: ../panels/keyboard/keyboard-shortcuts.c:596
 msgid "Custom Shortcuts"
 msgstr "自定义快捷键"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:803
+#: ../panels/keyboard/keyboard-shortcuts.c:813
 msgid "<Unknown Action>"
 msgstr "<未知动作>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1299
+#: ../panels/keyboard/keyboard-shortcuts.c:1309
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1720,7 +1763,7 @@ msgstr ""
 "“%sâ€ä¸èƒ½ç”¨ä½œå¿«æ·é”®ï¼Œå› ä¸ºä½¿ç”¨æ­¤é”®å°†æ— æ³•æ­£å¸¸è¾“å…¥ã€‚\n"
 "请组合 Ctrl、Alt 或 Shift 键再试一次"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1331
+#: ../panels/keyboard/keyboard-shortcuts.c:1341
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1729,13 +1772,13 @@ msgstr ""
 "快捷键“%s”已被用于\n"
 "“%s”"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1336
+#: ../panels/keyboard/keyboard-shortcuts.c:1346
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "å¦‚æžœä½ é‡æ–°åˆ†é…å¿«æ·é”® %s，则快捷键 %s 将被禁用"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1342
+#: ../panels/keyboard/keyboard-shortcuts.c:1352
 msgid "_Reassign"
 msgstr "重新分配(_R)"
 
@@ -1883,11 +1926,11 @@ msgstr "单击，次键"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:357
+#: ../panels/network/cc-network-panel.c:366
 msgid "Air_plane Mode"
 msgstr "飞行模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:956
+#: ../panels/network/cc-network-panel.c:965
 msgid "Network proxy"
 msgstr "网络代理"
 
@@ -1895,14 +1938,14 @@ msgstr "网络代理"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1135 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
 #: ../panels/network/net-vpn.c:431
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:1274
+#: ../panels/network/cc-network-panel.c:1289
 msgid "The system network services are not compatible with this version."
 msgstr "系统的网络服务与此版本的网络管理器不兼容。"
 
@@ -1948,34 +1991,34 @@ msgstr "自动"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:216
-#: ../panels/network/net-device-wifi.c:377
+#: ../panels/network/net-device-wifi.c:217
+#: ../panels/network/net-device-wifi.c:378
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:220
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/net-device-wifi.c:221
+#: ../panels/network/net-device-wifi.c:383
 #: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:225
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:229
+#: ../panels/network/net-device-wifi.c:230
 msgid "Enterprise"
 msgstr "企业"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:234
-#: ../panels/network/net-device-wifi.c:367
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:368
 msgctxt "Wifi security"
 msgid "None"
 msgstr "æ— "
@@ -1996,8 +2039,8 @@ msgid "Yesterday"
 msgstr "昨天"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:125
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:472
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2005,38 +2048,38 @@ msgstr[0] "%i 天前"
 
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:528
+#: ../panels/network/net-device-ethernet.c:54
+#: ../panels/network/net-device-wifi.c:529
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/秒"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:557
+#: ../panels/network/net-device-wifi.c:558
 msgctxt "Signal strength"
 msgid "None"
 msgstr "æ— "
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:559
+#: ../panels/network/net-device-wifi.c:560
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "微弱"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:561
+#: ../panels/network/net-device-wifi.c:562
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "一般"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/net-device-wifi.c:564
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "较好"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "良好"
@@ -2048,85 +2091,85 @@ msgstr "良好"
 msgid "Identity"
 msgstr "认证"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:194
-#: ../panels/network/connection-editor/ce-page-ip4.c:456
-#: ../panels/network/connection-editor/ce-page-ip6.c:196
-#: ../panels/network/connection-editor/ce-page-ip6.c:460
+#: ../panels/network/connection-editor/ce-page-ip4.c:176
+#: ../panels/network/connection-editor/ce-page-ip4.c:438
+#: ../panels/network/connection-editor/ce-page-ip6.c:178
+#: ../panels/network/connection-editor/ce-page-ip6.c:442
 msgid "Address"
 msgstr "地址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:207
-#: ../panels/network/connection-editor/ce-page-ip4.c:469
+#: ../panels/network/connection-editor/ce-page-ip4.c:189
+#: ../panels/network/connection-editor/ce-page-ip4.c:451
 msgid "Netmask"
 msgstr "ç½‘ç»œæŽ©ç "
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip4.c:482
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
-#: ../panels/network/connection-editor/ce-page-ip6.c:490
+#: ../panels/network/connection-editor/ce-page-ip4.c:203
+#: ../panels/network/connection-editor/ce-page-ip4.c:464
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:472
 #: ../panels/network/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "网关"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:238
-#: ../panels/network/connection-editor/ce-page-ip6.c:239
+#: ../panels/network/connection-editor/ce-page-ip4.c:220
+#: ../panels/network/connection-editor/ce-page-ip6.c:221
 msgid "Delete Address"
 msgstr "åˆ é™¤åœ°å€"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:292
-#: ../panels/network/connection-editor/ce-page-ip6.c:293
+#: ../panels/network/connection-editor/ce-page-ip4.c:274
+#: ../panels/network/connection-editor/ce-page-ip6.c:275
 msgid "Add"
 msgstr "æ·»åŠ "
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:342
+#: ../panels/network/connection-editor/ce-page-ip6.c:346
 msgid "Server"
 msgstr "服务器"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:377
-#: ../panels/network/connection-editor/ce-page-ip6.c:381
+#: ../panels/network/connection-editor/ce-page-ip4.c:359
+#: ../panels/network/connection-editor/ce-page-ip6.c:363
 msgid "Delete DNS Server"
 msgstr "åˆ é™¤ DNS 服务器"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:496
-#: ../panels/network/connection-editor/ce-page-ip6.c:504
+#: ../panels/network/connection-editor/ce-page-ip4.c:478
+#: ../panels/network/connection-editor/ce-page-ip6.c:486
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:517
-#: ../panels/network/connection-editor/ce-page-ip6.c:525
+#: ../panels/network/connection-editor/ce-page-ip4.c:499
+#: ../panels/network/connection-editor/ce-page-ip6.c:507
 msgid "Delete Route"
 msgstr "åˆ é™¤è·¯ç”±"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:632
+#: ../panels/network/connection-editor/ce-page-ip4.c:614
 #: ../panels/network/network-wifi.ui.h:25
 msgid "Automatic (DHCP)"
 msgstr "自动(DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:636
-#: ../panels/network/connection-editor/ce-page-ip6.c:638
+#: ../panels/network/connection-editor/ce-page-ip4.c:618
+#: ../panels/network/connection-editor/ce-page-ip6.c:620
 #: ../panels/network/network-wifi.ui.h:24
 msgid "Manual"
 msgstr "手动"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:640
-#: ../panels/network/connection-editor/ce-page-ip6.c:642
+#: ../panels/network/connection-editor/ce-page-ip4.c:622
+#: ../panels/network/connection-editor/ce-page-ip6.c:624
 msgid "Link-Local Only"
 msgstr "仅本地连接"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:934
+#: ../panels/network/connection-editor/ce-page-ip4.c:916
 #: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:209
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip6.c:191
+#: ../panels/network/connection-editor/ce-page-ip6.c:455
 msgid "Prefix"
 msgstr "前缀"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:612
 #: ../panels/network/connection-editor/ethernet-page.ui.h:1
 #: ../panels/network/connection-editor/ip4-page.ui.h:4
 #: ../panels/network/connection-editor/ip6-page.ui.h:4
@@ -2134,11 +2177,11 @@ msgstr "前缀"
 msgid "Automatic"
 msgstr "自动"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:634
+#: ../panels/network/connection-editor/ce-page-ip6.c:616
 msgid "Automatic, DHCP only"
 msgstr "自动，仅 DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:894
+#: ../panels/network/connection-editor/ce-page-ip6.c:876
 #: ../panels/network/network-wifi.ui.h:47
 msgid "IPv6"
 msgstr "IPv6"
@@ -2189,15 +2232,15 @@ msgid "Link speed"
 msgstr "连接速度"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:159
 #: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:159
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:164
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
@@ -2205,14 +2248,14 @@ msgid "IPv6 Address"
 msgstr "IPv6 地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:166
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:7
 msgid "Hardware Address"
 msgstr "硬件地址"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:170
+#: ../panels/network/net-device-ethernet.c:171
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2222,7 +2265,7 @@ msgstr "默认路由"
 #: ../panels/network/connection-editor/details-page.ui.h:8
 #: ../panels/network/connection-editor/ip4-page.ui.h:3
 #: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:172
+#: ../panels/network/net-device-ethernet.c:173
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2353,50 +2396,44 @@ msgstr "仅对此网络上的资源使用此连接(_O)"
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:268
+#: ../panels/network/connection-editor/net-connection-editor.c:269
 msgid "Unable to open connection editor"
 msgstr "蓝牙连接失败"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:286
+#: ../panels/network/connection-editor/net-connection-editor.c:287
 msgid "New Profile"
 msgstr "æ— é…ç½®"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:511
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1470
-msgid "_Add"
-msgstr "æ·»åŠ (_A)"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:595
+#: ../panels/network/connection-editor/net-connection-editor.c:577
 #: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:596
+#: ../panels/network/connection-editor/net-connection-editor.c:578
 msgid "Bond"
 msgstr "绑定"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:598
+#: ../panels/network/connection-editor/net-connection-editor.c:580
 msgid "Team"
 msgstr "组队"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:600
+#: ../panels/network/connection-editor/net-connection-editor.c:582
 msgid "Bridge"
 msgstr "桥接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:601
+#: ../panels/network/connection-editor/net-connection-editor.c:583
 msgid "VLAN"
 msgstr "虚拟局域网"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:752
+#: ../panels/network/connection-editor/net-connection-editor.c:734
 msgid "Could not load VPN plugins"
 msgstr "æ— æ³•è£…å…¥ VPN 插件"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:821
+#: ../panels/network/connection-editor/net-connection-editor.c:803
 msgid "Import from file…"
 msgstr "从文件导入..."
 
-#: ../panels/network/connection-editor/net-connection-editor.c:892
+#: ../panels/network/connection-editor/net-connection-editor.c:874
 msgid "Add Network Connection"
 msgstr "æ·»åŠ ç½‘ç»œè¿žæŽ¥"
 
@@ -2406,7 +2443,7 @@ msgid "_Reset"
 msgstr "重置(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1406
+#: ../panels/network/net-device-wifi.c:1407
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -2449,9 +2486,9 @@ msgid "Select file to import"
 msgstr "选择要导入的文件"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1946
-#: ../panels/sharing/cc-sharing-panel.c:446
-#: ../panels/user-accounts/um-photo-dialog.c:221
+#: ../panels/printers/cc-printers-panel.c:1948
+#: ../panels/sharing/cc-sharing-panel.c:492
+#: ../panels/user-accounts/um-photo-dialog.c:223
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -2485,8 +2522,8 @@ msgstr ""
 "错误：%s。"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:371
-msgid "Export VPN connection..."
-msgstr "导出 VPN 连接..."
+msgid "Export VPN connection"
+msgstr "导出 VPN 连接"
 
 #: ../panels/network/connection-editor/vpn-page.ui.h:4
 msgid "(Error: unable to load VPN connection editor)"
@@ -2522,9 +2559,10 @@ msgstr "控制如何连接到互联网。"
 
 #. Translators: those are keywords for the network control-center panel
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+#, fuzzy
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;"
+"vlan;bridge;bond;DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "vlan;bridge;bond;网络;æ— çº¿;;;互联网协议;局域网;代理;广域网;宽带;调制解调器;蓝"
@@ -2544,29 +2582,29 @@ msgstr "(æ— )"
 msgid "Bridge slaves"
 msgstr "桥接从机"
 
-#: ../panels/network/net-device-ethernet.c:111
-#: ../panels/network/net-device-wifi.c:457
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:458
 msgid "never"
 msgstr "从不"
 
-#: ../panels/network/net-device-ethernet.c:121
-#: ../panels/network/net-device-wifi.c:467
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:468
 msgid "today"
 msgstr "今天"
 
-#: ../panels/network/net-device-ethernet.c:123
-#: ../panels/network/net-device-wifi.c:469
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:470
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../panels/network/net-device-ethernet.c:161
+#: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:3
 #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: ../panels/network/net-device-ethernet.c:177
+#: ../panels/network/net-device-ethernet.c:178
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "上次使用的"
@@ -2576,14 +2614,14 @@ msgstr "上次使用的"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:287
+#: ../panels/network/net-device-ethernet.c:288
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "有线"
 
-#: ../panels/network/net-device-ethernet.c:355
-#: ../panels/network/net-device-wifi.c:1561
+#: ../panels/network/net-device-ethernet.c:356
+#: ../panels/network/net-device-wifi.c:1562
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2591,7 +2629,7 @@ msgstr "有线"
 msgid "Options…"
 msgstr "选项…"
 
-#: ../panels/network/net-device-ethernet.c:492
+#: ../panels/network/net-device-ethernet.c:474
 #, c-format
 msgid "Profile %d"
 msgstr "配置 %d"
@@ -2604,58 +2642,57 @@ msgstr "æ·»åŠ æ–°è¿žæŽ¥"
 msgid "Team slaves"
 msgstr "组队从机"
 
-#: ../panels/network/net-device-wifi.c:1110
+#: ../panels/network/net-device-wifi.c:1111
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
 msgstr "å¦‚æžœæ‚¨æœ‰é™¤æ— çº¿ç½‘ç»œä»¥å¤–çš„æ–¹å¼è¿žæŽ¥åˆ°äº’è”ç½‘ï¼Œæ‚¨å¯ä»¥å°†å®ƒä¸Žå…¶ä»–äººåˆ†äº«ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1114
+#: ../panels/network/net-device-wifi.c:1115
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "åˆ‡æ¢æ— çº¿ç½‘çƒ­ç‚¹ä¼šä½¿å¾—æ‚¨ä»Ž <b>%s</b> 断开。"
 
-#: ../panels/network/net-device-wifi.c:1118
+#: ../panels/network/net-device-wifi.c:1119
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "å¯ç”¨çƒ­ç‚¹æ¨¡å¼æ—¶æ— æ³•é€šè¿‡æ— çº¿ç½‘ç»œè®¿é—®äº’è”ç½‘ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1195
+#: ../panels/network/net-device-wifi.c:1196
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户？"
 
-#: ../panels/network/net-device-wifi.c:1198
+#: ../panels/network/net-device-wifi.c:1199
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1271
 msgid "System policy prohibits use as a Hotspot"
 msgstr "设备策略禁止用于热点"
 
-#: ../panels/network/net-device-wifi.c:1273
+#: ../panels/network/net-device-wifi.c:1274
 msgid "Wireless device does not support Hotspot mode"
 msgstr "æ— çº¿è®¾å¤‡ä¸æ”¯æŒçƒ­ç‚¹æ¨¡å¼"
 
-#: ../panels/network/net-device-wifi.c:1402
+#: ../panels/network/net-device-wifi.c:1403
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "æ‰€é€‰ç½‘ç»œçš„ç»†èŠ‚ï¼ŒåŒ…æ‹¬å¯†ç å’Œå…¨éƒ¨è‡ªå®šä¹‰è®¾ç½®ï¼Œéƒ½å°†ä¸¢å¤±ã€‚"
 
-#: ../panels/network/net-device-wifi.c:1729
+#: ../panels/network/net-device-wifi.c:1711
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "历史"
 
-#: ../panels/network/net-device-wifi.c:1733 ../panels/power/power.ui.h:21
-#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1595
+#: ../panels/network/net-device-wifi.c:1715
 #: ../panels/wacom/cc-wacom-page.c:533
 msgid "_Close"
 msgstr "关闭(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1741
+#: ../panels/network/net-device-wifi.c:1723
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -3243,8 +3280,8 @@ msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "选择一个 PAC 文件..."
+msgid "Choose a PAC file"
+msgstr "选择 PAC 文件"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:406
 msgid "PAC files (*.pac)"
@@ -3308,8 +3345,8 @@ msgstr "MD5"
 #: ../panels/network/wireless-security/eap-method-peap.c:350
 #: ../panels/network/wireless-security/eap-method-tls.c:434
 #: ../panels/network/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "选择一个证书颁发机构证书..."
+msgid "Choose a Certificate Authority certificate"
+msgstr "选择 CA 证书"
 
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3351,12 +3388,12 @@ msgstr ""
 "(您可以使用 openssl æ¥å¯¹ç§é’¥è¿›è¡Œå¯†ç ä¿æŠ¤)"
 
 #: ../panels/network/wireless-security/eap-method-tls.c:428
-msgid "Choose your personal certificate..."
-msgstr "选择您的个人证书..."
+msgid "Choose your personal certificate"
+msgstr "选择您的个人证书"
 
 #: ../panels/network/wireless-security/eap-method-tls.c:440
-msgid "Choose your private key..."
-msgstr "选择您的私钥..."
+msgid "Choose your private key"
+msgstr "选择您的私钥"
 
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity"
@@ -3493,13 +3530,13 @@ msgctxt "notifications"
 msgid "Show Details in Lock Screen"
 msgstr "在锁定屏幕中显示细节"
 
-#: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1708 ../panels/power/cc-power-panel.c:1715
-#: ../panels/privacy/cc-privacy-panel.c:81
-#: ../panels/privacy/cc-privacy-panel.c:121
-#: ../panels/universal-access/cc-ua-panel.c:256
-#: ../panels/universal-access/cc-ua-panel.c:596
-#: ../panels/universal-access/cc-ua-panel.c:721
+#: ../panels/notifications/cc-notifications-panel.c:185
+#: ../panels/power/cc-power-panel.c:1690 ../panels/power/cc-power-panel.c:1697
+#: ../panels/privacy/cc-privacy-panel.c:82
+#: ../panels/privacy/cc-privacy-panel.c:122
+#: ../panels/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:572
+#: ../panels/universal-access/cc-ua-panel.c:695
 msgid "On"
 msgstr "å¼€"
 
@@ -3525,30 +3562,30 @@ msgstr "显示弹出条幅"
 msgid "Show in Lock Screen"
 msgstr "在锁屏显示"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:198
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:169
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他账户"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:316
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:283
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "æ·»åŠ è´¦æˆ·"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:355
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:322
 msgid "Mail"
 msgstr "邮件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:361
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Contacts"
 msgstr "联系人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:367
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
 msgid "Chat"
 msgstr "聊天"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:373
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Resources"
 msgstr "资源"
 
@@ -3598,16 +3635,13 @@ msgstr "连接在线账户并决定如何使用"
 
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
-#| msgid ""
-#| "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
-#| "ownCloud;Kerberos;IMAP;SMTP;"
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;脸谱;脸书;推特;雅虎;微博;网络;在线;聊天;日历;邮件;联"
-"系人;云存储;稍后阅读;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;脸谱;脸书;推特;雅虎;微博;网络;在"
+"线;聊天;日历;邮件;联系人;云存储;稍后阅读;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -3629,17 +3663,17 @@ msgid ""
 msgstr ""
 "æ·»åŠ ä¸€ä¸ªè´¦æˆ·ï¼Œè®©æ‚¨çš„åº”ç”¨ç¨‹åºè®¿é—®è´¦æˆ·çš„æ–‡æ¡£ã€é‚®ä»¶ã€è”ç³»äººã€æ—¥åŽ†ã€èŠå¤©ç­‰ç­‰ã€‚"
 
-#: ../panels/power/cc-power-panel.c:182
+#: ../panels/power/cc-power-panel.c:183
 msgid "Unknown time"
 msgstr "未知时间"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:189
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分钟"
 
-#: ../panels/power/cc-power-panel.c:200
+#: ../panels/power/cc-power-panel.c:201
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3647,224 +3681,224 @@ msgstr[0] "%i 小时"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:208
+#: ../panels/power/cc-power-panel.c:209
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:209
+#: ../panels/power/cc-power-panel.c:210
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "æ—¶"
 
-#: ../panels/power/cc-power-panel.c:210
+#: ../panels/power/cc-power-panel.c:211
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:229
+#: ../panels/power/cc-power-panel.c:230
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s 后充满"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:236
+#: ../panels/power/cc-power-panel.c:237
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意：剩余 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:242
 #, c-format
 msgid "%s remaining"
 msgstr "剩余 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:246 ../panels/power/cc-power-panel.c:274
+#: ../panels/power/cc-power-panel.c:247 ../panels/power/cc-power-panel.c:275
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:250 ../panels/power/cc-power-panel.c:278
+#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
 msgid "Empty"
 msgstr "ç”µæ± å·²ç©º"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:265
+#: ../panels/power/cc-power-panel.c:266
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
+#: ../panels/power/cc-power-panel.c:271
 msgid "Discharging"
 msgstr "正在放电"
 
-#: ../panels/power/cc-power-panel.c:395
+#: ../panels/power/cc-power-panel.c:396
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主"
 
-#: ../panels/power/cc-power-panel.c:397
+#: ../panels/power/cc-power-panel.c:398
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "é™„åŠ "
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:469
+#: ../panels/power/cc-power-panel.c:470
 msgid "Wireless mouse"
 msgstr "æ— çº¿é¼ æ ‡"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:472
+#: ../panels/power/cc-power-panel.c:473
 msgid "Wireless keyboard"
 msgstr "æ— çº¿é”®ç›˜"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:475
+#: ../panels/power/cc-power-panel.c:476
 msgid "Uninterruptible power supply"
 msgstr "不间断电源(UPS)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:478
+#: ../panels/power/cc-power-panel.c:479
 msgid "Personal digital assistant"
 msgstr "个人数字助理(PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:481
+#: ../panels/power/cc-power-panel.c:482
 msgid "Cellphone"
 msgstr "手机"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:484
+#: ../panels/power/cc-power-panel.c:485
 msgid "Media player"
 msgstr "媒体播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:487
+#: ../panels/power/cc-power-panel.c:488
 msgid "Tablet"
 msgstr "手写板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:490
+#: ../panels/power/cc-power-panel.c:491
 msgid "Computer"
 msgstr "计算机"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:493 ../panels/power/cc-power-panel.c:716
-#: ../panels/power/cc-power-panel.c:2039
+#: ../panels/power/cc-power-panel.c:494 ../panels/power/cc-power-panel.c:717
+#: ../panels/power/cc-power-panel.c:2019
 msgid "Battery"
 msgstr "ç”µæ± "
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:539
+#: ../panels/power/cc-power-panel.c:540
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "警告"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:551
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:556
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充足"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:561
+#: ../panels/power/cc-power-panel.c:562
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:566
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "空"
 
-#: ../panels/power/cc-power-panel.c:714
+#: ../panels/power/cc-power-panel.c:715
 msgid "Batteries"
 msgstr "ç”µæ± ç»„"
 
-#: ../panels/power/cc-power-panel.c:1116
+#: ../panels/power/cc-power-panel.c:1117
 msgid "When _idle"
 msgstr "闲置时(_I)"
 
-#: ../panels/power/cc-power-panel.c:1463
+#: ../panels/power/cc-power-panel.c:1445
 msgid "Power Saving"
 msgstr "省电"
 
-#: ../panels/power/cc-power-panel.c:1491
+#: ../panels/power/cc-power-panel.c:1473
 msgid "_Screen brightness"
 msgstr "屏幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1497
+#: ../panels/power/cc-power-panel.c:1479
 msgid "_Keyboard brightness"
 msgstr "键盘亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1507
+#: ../panels/power/cc-power-panel.c:1489
 msgid "_Dim screen when inactive"
 msgstr "æ— æ“ä½œæ—¶å±å¹•å˜æš—(_D)"
 
-#: ../panels/power/cc-power-panel.c:1532
+#: ../panels/power/cc-power-panel.c:1514
 msgid "_Blank screen"
 msgstr "空白屏幕(_B)"
 
-#: ../panels/power/cc-power-panel.c:1569
+#: ../panels/power/cc-power-panel.c:1551
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1574
+#: ../panels/power/cc-power-panel.c:1556
 msgid "Turns off wireless devices"
 msgstr "å…³é—­æ— çº¿è®¾å¤‡"
 
-#: ../panels/power/cc-power-panel.c:1599
+#: ../panels/power/cc-power-panel.c:1581
 msgid "_Mobile broadband"
 msgstr "移动宽带(_M)"
 
-#: ../panels/power/cc-power-panel.c:1604
+#: ../panels/power/cc-power-panel.c:1586
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "关闭移动宽带(3G、4G、WiMax 等)设备"
 
-#: ../panels/power/cc-power-panel.c:1653
+#: ../panels/power/cc-power-panel.c:1635
 msgid "_Bluetooth"
 msgstr "蓝牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1704
+#: ../panels/power/cc-power-panel.c:1686
 msgid "When on battery power"
 msgstr "ç”µæ± ä¾›ç”µæ—¶"
 
-#: ../panels/power/cc-power-panel.c:1706
+#: ../panels/power/cc-power-panel.c:1688
 msgid "When plugged in"
 msgstr "电源插入时"
 
-#: ../panels/power/cc-power-panel.c:1835
+#: ../panels/power/cc-power-panel.c:1818
 msgid "Suspend & Power Off"
 msgstr "挂起和关机"
 
-#: ../panels/power/cc-power-panel.c:1868
+#: ../panels/power/cc-power-panel.c:1851
 msgid "_Automatic suspend"
 msgstr "自动挂起(_A)"
 
-#: ../panels/power/cc-power-panel.c:1892
+#: ../panels/power/cc-power-panel.c:1875
 msgid "When battery power is _critical"
 msgstr "电量严重不足时(_C)"
 
-#: ../panels/power/cc-power-panel.c:1949
+#: ../panels/power/cc-power-panel.c:1930
 msgid "Power Off"
 msgstr "电源关闭"
 
-#: ../panels/power/cc-power-panel.c:2086
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Devices"
 msgstr "设备"
 
@@ -3952,15 +3986,15 @@ msgstr "12 分钟"
 msgid "Automatic Suspend"
 msgstr "自动挂起"
 
-#: ../panels/power/power.ui.h:22
+#: ../panels/power/power.ui.h:21
 msgid "_Plugged In"
 msgstr "已插入(_P)"
 
-#: ../panels/power/power.ui.h:23
+#: ../panels/power/power.ui.h:22
 msgid "On _Battery Power"
 msgstr "ä½¿ç”¨ç”µæ± æ—¶(_P)"
 
-#: ../panels/power/power.ui.h:24
+#: ../panels/power/power.ui.h:23
 msgid "Delay"
 msgstr "延时"
 
@@ -3969,7 +4003,7 @@ msgid "Authenticate"
 msgstr "认证"
 
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "Password"
 msgstr "å¯†ç "
@@ -4116,51 +4150,51 @@ msgid "No printers available"
 msgstr "æ— å¯ç”¨æ‰“å°æœº"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1431
+#: ../panels/printers/cc-printers-panel.c:1433
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 项活动任务"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1775
+#: ../panels/printers/cc-printers-panel.c:1777
 msgid "Failed to add new printer."
 msgstr "æ·»åŠ æ–°æ‰“å°æœºå¤±è´¥ã€‚"
 
-#: ../panels/printers/cc-printers-panel.c:1942
+#: ../panels/printers/cc-printers-panel.c:1944
 msgid "Select PPD File"
 msgstr "选择 PPD 文件"
 
-#: ../panels/printers/cc-printers-panel.c:1951
+#: ../panels/printers/cc-printers-panel.c:1953
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript 打印机描述文件(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2256
+#: ../panels/printers/cc-printers-panel.c:2258
 msgid "No suitable driver found"
 msgstr "未找到合适的驱动"
 
-#: ../panels/printers/cc-printers-panel.c:2325
+#: ../panels/printers/cc-printers-panel.c:2327
 msgid "Searching for preferred drivers…"
 msgstr "正在搜索首选的驱动…"
 
-#: ../panels/printers/cc-printers-panel.c:2340
+#: ../panels/printers/cc-printers-panel.c:2342
 msgid "Select from database…"
 msgstr "从数据库选择…"
 
-#: ../panels/printers/cc-printers-panel.c:2349
+#: ../panels/printers/cc-printers-panel.c:2351
 msgid "Provide PPD File…"
 msgstr "提供 PPD 文件…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2500
-#: ../panels/printers/cc-printers-panel.c:2523
+#: ../panels/printers/cc-printers-panel.c:2502
+#: ../panels/printers/cc-printers-panel.c:2525
 msgid "Test page"
 msgstr "测试页"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2931
+#: ../panels/printers/cc-printers-panel.c:2933
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "æ— æ³•è£…å…¥ç•Œé¢ï¼š%s"
@@ -4187,7 +4221,6 @@ msgstr "活动的任务"
 
 #: ../panels/printers/jobs-dialog.ui.h:3
 #: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/user-accounts/data/history-dialog.ui.h:2
 msgid "Close"
 msgstr "关闭"
 
@@ -4352,14 +4385,12 @@ msgstr "并口"
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
 #: ../panels/printers/pp-new-printer-dialog.c:1774
 #, c-format
-#| msgid "Location"
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. Translators: Network address of found printer
 #: ../panels/printers/pp-new-printer-dialog.c:1779
 #, c-format
-#| msgid "A_ddress:"
 msgid "Address: %s"
 msgstr "地址：%s"
 
@@ -4524,7 +4555,6 @@ msgstr "位置"
 
 #. Translators: This checkbox is checked when the default printer is selected.
 #: ../panels/printers/printers.ui.h:8
-#| msgid "Default Route"
 msgid "_Default printer"
 msgstr "默认打印机(_D)"
 
@@ -4575,44 +4605,43 @@ msgid ""
 "doesn't seem to be available."
 msgstr "对不起，系统打印服务似乎不可用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:249 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:250 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "锁屏"
 
-#: ../panels/privacy/cc-privacy-panel.c:362 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:360 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "用量及历史"
 
-#: ../panels/privacy/cc-privacy-panel.c:490
+#: ../panels/privacy/cc-privacy-panel.c:485
 msgid "Empty all items from Trash?"
 msgstr "清空回收站中的所有项目吗？"
 
-#: ../panels/privacy/cc-privacy-panel.c:491
+#: ../panels/privacy/cc-privacy-panel.c:486
 msgid "All items in the Trash will be permanently deleted."
 msgstr "å›žæ”¶ç«™å†…çš„æ‰€æœ‰é¡¹ç›®å°†ä¼šæ°¸ä¹…åˆ é™¤ã€‚"
 
-#: ../panels/privacy/cc-privacy-panel.c:492 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:487 ../panels/privacy/privacy.ui.h:34
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:515
+#: ../panels/privacy/cc-privacy-panel.c:510
 msgid "Delete all the temporary files?"
 msgstr "åˆ é™¤æ‰€æœ‰ä¸´æ—¶æ–‡ä»¶å—ï¼Ÿ"
 
-#: ../panels/privacy/cc-privacy-panel.c:516
+#: ../panels/privacy/cc-privacy-panel.c:511
 msgid "All the temporary files will be permanently deleted."
 msgstr "æ‰€æœ‰ä¸´æ—¶æ–‡ä»¶å°†ä¼šæ°¸ä¹…åˆ é™¤ã€‚"
 
-#: ../panels/privacy/cc-privacy-panel.c:517 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:512 ../panels/privacy/privacy.ui.h:35
 msgid "_Purge Temporary Files"
 msgstr "清理临时文件(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:539 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:534 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "清理回收站及临时文件"
 
-#: ../panels/privacy/cc-privacy-panel.c:578 ../panels/privacy/privacy.ui.h:38
-#| msgid "Software"
+#: ../panels/privacy/cc-privacy-panel.c:574 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "软件使用"
 
@@ -4642,102 +4671,98 @@ msgid "30 seconds"
 msgstr "30 秒"
 
 #: ../panels/privacy/privacy.ui.h:9
-msgid "Immediately"
-msgstr "立即"
-
-#: ../panels/privacy/privacy.ui.h:10
 msgid "1 day"
 msgstr "1 天"
 
-#: ../panels/privacy/privacy.ui.h:11
+#: ../panels/privacy/privacy.ui.h:10
 msgid "2 days"
 msgstr "2 天"
 
-#: ../panels/privacy/privacy.ui.h:12
+#: ../panels/privacy/privacy.ui.h:11
 msgid "3 days"
 msgstr "3 天"
 
-#: ../panels/privacy/privacy.ui.h:13
+#: ../panels/privacy/privacy.ui.h:12
 msgid "4 days"
 msgstr "4 天"
 
-#: ../panels/privacy/privacy.ui.h:14
+#: ../panels/privacy/privacy.ui.h:13
 msgid "5 days"
 msgstr "5 天"
 
-#: ../panels/privacy/privacy.ui.h:15
+#: ../panels/privacy/privacy.ui.h:14
 msgid "6 days"
 msgstr "6 天"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: ../panels/privacy/privacy.ui.h:15
 msgid "7 days"
 msgstr "7 天"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: ../panels/privacy/privacy.ui.h:16
 msgid "14 days"
 msgstr "14 天"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: ../panels/privacy/privacy.ui.h:17
 msgid "30 days"
 msgstr "30 天"
 
-#: ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/privacy.ui.h:18
 msgid "Forever"
 msgstr "永远"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: ../panels/privacy/privacy.ui.h:20
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 msgstr "记住历史让再次寻找变得容易。这些条目永远不会通过网络共享。"
 
-#: ../panels/privacy/privacy.ui.h:22
-msgid "Cl_ear Recent History"
-msgstr "清理最近历史(_E)"
-
-#: ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/privacy.ui.h:21
 msgid "_Recently Used"
 msgstr "最近使用(_R)"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: ../panels/privacy/privacy.ui.h:22
 msgid "Retain _History"
 msgstr "保留历史(_H)"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/privacy.ui.h:23
+msgid "Cl_ear Recent History"
+msgstr "清理最近历史(_E)"
+
+#: ../panels/privacy/privacy.ui.h:25
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "在离开时，锁定屏幕可以保护隐私。"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:26
 msgid "Automatic Screen _Lock"
 msgstr "自动锁屏(_L)"
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:27
 msgid "Lock screen _after blank for"
 msgstr "黑屏至锁屏的等待时间(_A)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Show _Notifications"
 msgstr "显示通知(_N)"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:30
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr "自动清理回收站和临时文件，帮助计算机保存避免不必要的敏感信息。"
 
-#: ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/privacy.ui.h:31
 msgid "Automatically empty _Trash"
 msgstr "自动清空回收站(_T)"
 
-#: ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/privacy.ui.h:32
 msgid "Automatically purge Temporary _Files"
 msgstr "自动清理临时文件(_F)"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/privacy.ui.h:33
 msgid "Purge _After"
 msgstr "清理延时(_A)"
 
-#: ../panels/privacy/privacy.ui.h:39
+#: ../panels/privacy/privacy.ui.h:37
 msgid ""
 "Sending us information about which software you use helps us provide you "
 "with more accurate recommendations. It also helps us to improve our "
@@ -4745,64 +4770,64 @@ msgid ""
 "\n"
 "All the information we collect is made anonymous, and we will never share "
 "your data with third parties."
-msgstr "向我们发送使用软件的情况有助于我们向您提供更准确的推荐，也有助于改进"
-"我们的软件。\n"
+msgstr ""
+"向我们发送使用软件的情况有助于我们向您提供更准确的推荐，也有助于改进我们的软"
+"件。\n"
 "\n"
 "我们收集的信息都是匿名的，并且不会将您的数据透露给他人。"
 
-#: ../panels/privacy/privacy.ui.h:42
-#| msgid "Privacy"
-msgid "Privacy Policy"
-msgstr "隐私政策"
-
-#: ../panels/privacy/privacy.ui.h:43
+#: ../panels/privacy/privacy.ui.h:40
 msgid "_Send software usage statistics"
 msgstr "发送软件使用统计信息(_S)"
 
-#: ../panels/region/cc-format-chooser.c:118
+#: ../panels/privacy/privacy.ui.h:41
+msgid "Privacy Policy"
+msgstr "隐私政策"
+
+#: ../panels/region/cc-format-chooser.c:119
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:121
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/cc-format-chooser.c:283
+#: ../panels/region/cc-format-chooser.c:284
 msgid "No regions found"
 msgstr "未找到区域"
 
-#: ../panels/region/cc-input-chooser.c:184
+#: ../panels/region/cc-input-chooser.c:179
 msgid "No input sources found"
 msgstr "未找到输入源"
 
-#: ../panels/region/cc-input-chooser.c:1068
+#: ../panels/region/cc-input-chooser.c:1076
 msgctxt "Input Source"
 msgid "Other"
 msgstr "其他输入源"
 
-#: ../panels/region/cc-region-panel.c:242
+#: ../panels/region/cc-region-panel.c:239
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "修改需要重启会话才能生效"
 
-#: ../panels/region/cc-region-panel.c:243
+#: ../panels/region/cc-region-panel.c:240
 msgid "Restart Now"
 msgstr "现在重启"
 
-#: ../panels/region/cc-region-panel.c:903
+#: ../panels/region/cc-region-panel.c:858
 msgid "No input source selected"
 msgstr "未选择输入源"
 
-#: ../panels/region/cc-region-panel.c:1134
+#: ../panels/region/cc-region-panel.c:1088
 msgid "Sorry"
 msgstr "抱歉"
 
-#: ../panels/region/cc-region-panel.c:1136
+#: ../panels/region/cc-region-panel.c:1090
 msgid "Input methods can't be used on the login screen"
 msgstr "输入法不能在登录屏幕使用"
 
-#: ../panels/region/cc-region-panel.c:1773
+#: ../panels/region/cc-region-panel.c:1727
 msgid "Login Screen"
 msgstr "登录屏幕"
 
@@ -4810,27 +4835,27 @@ msgstr "登录屏幕"
 msgid "Formats"
 msgstr "æ ¼å¼"
 
-#: ../panels/region/format-chooser.ui.h:3
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Preview"
 msgstr "预览"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Dates"
 msgstr "日期"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Times"
 msgstr "时间"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Numbers"
 msgstr "æ•°å­—"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Measurement"
 msgstr "度量衡"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Paper"
 msgstr "çº¸å¼ "
 
@@ -4970,21 +4995,32 @@ msgstr "下移"
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:272
 msgctxt "service is enabled"
 msgid "On"
 msgstr "å¼€"
 
-#: ../panels/sharing/cc-sharing-panel.c:278
+#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:301
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "å…³"
 
-#: ../panels/sharing/cc-sharing-panel.c:442
+#: ../panels/sharing/cc-sharing-panel.c:304
+msgctxt "service is enabled"
+msgid "Enabled"
+msgstr "已启用"
+
+#: ../panels/sharing/cc-sharing-panel.c:307
+msgctxt "service is active"
+msgid "Active"
+msgstr "活动"
+
+#: ../panels/sharing/cc-sharing-panel.c:488
 msgid "Choose a Folder"
 msgstr "选择文件夹"
 
-#: ../panels/sharing/cc-sharing-panel.c:756
+#: ../panels/sharing/cc-sharing-panel.c:915
 msgid "Copy"
 msgstr "复制"
 
@@ -5014,6 +5050,18 @@ msgstr "启用或禁用远程登录"
 msgid "Authentication is required to enable or disable remote login"
 msgstr "启用或禁用远程登录需要认证"
 
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:299
+msgid "No networks selected for sharing"
+msgstr "未选择要共享的网络"
+
+#.
+#. * vim: sw=2 ts=8 cindent noai bs=2
+#.
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "网络"
+
 #: ../panels/sharing/sharing.ui.h:1
 msgid "Bluetooth Sharing"
 msgstr "蓝牙共享"
@@ -5056,31 +5104,7 @@ msgstr "远程登录"
 msgid "Some services are disabled because of no network access."
 msgstr "å› ä¸ºæ²¡æœ‰ç½‘ç»œï¼Œä¸€äº›æœåŠ¡å·²ç»ç¦ç”¨ã€‚"
 
-#: ../panels/sharing/sharing.ui.h:11
-msgid "Share Music, Photos and Videos with others on the current network."
-msgstr "在当前网络上共享音乐、照片和视频。"
-
 #: ../panels/sharing/sharing.ui.h:12
-msgid "Share Media On This Network"
-msgstr "在网络上共享媒体"
-
-#: ../panels/sharing/sharing.ui.h:13
-msgid "Shared Folders"
-msgstr "共享文件夹"
-
-#: ../panels/sharing/sharing.ui.h:14
-msgid "column"
-msgstr "列"
-
-#: ../panels/sharing/sharing.ui.h:15
-msgid "Add Folder"
-msgstr "æ·»åŠ æ–‡ä»¶å¤¹"
-
-#: ../panels/sharing/sharing.ui.h:16
-msgid "Remove Folder"
-msgstr "移除文件夹"
-
-#: ../panels/sharing/sharing.ui.h:18
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5089,15 +5113,11 @@ msgstr ""
 "个人网络共享允许您与当前网络中的其他人共享自己的共享文件夹，使用地址：<a "
 "href=\"dav://%s\">dav://%s</a>"
 
-#: ../panels/sharing/sharing.ui.h:19
-msgid "Share Public Folder On This Network"
-msgstr "在网络上共享公共文件夹"
-
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:13
 msgid "Require Password"
 msgstr "éœ€è¦å¯†ç "
 
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:16
 #, no-c-format
 msgid ""
 "Allow remote users to connect using the Secure Shell command:\n"
@@ -5106,41 +5126,46 @@ msgstr ""
 "允许远程用户使用安全 Shell 命令连接：\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/sharing.ui.h:26
+#: ../panels/sharing/sharing.ui.h:19
 #, no-c-format
 msgid ""
 "Allow remote users to view or control your screen by connecting to: <a href="
 "\"vnc://%s\">vnc://%s</a>"
 msgstr "允许远程用户通过 VNC 控制屏幕：<a href=\"vnc://%s\">vnc://%s</a> "
 
-#: ../panels/sharing/sharing.ui.h:27
-#| msgid "Remote Control"
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Allow Remote Control"
 msgstr "允许远程控制"
 
-#: ../panels/sharing/sharing.ui.h:28
-#| msgid "Password"
+#: ../panels/sharing/sharing.ui.h:21
 msgid "Password:"
 msgstr "å¯†ç ï¼š"
 
-#: ../panels/sharing/sharing.ui.h:29
+#: ../panels/sharing/sharing.ui.h:22
 msgid "Show Password"
 msgstr "æ˜¾ç¤ºå¯†ç "
 
-#: ../panels/sharing/sharing.ui.h:30
-#| msgid "%s Options"
+#: ../panels/sharing/sharing.ui.h:23
 msgid "Access Options"
 msgstr "访问选项"
 
-#: ../panels/sharing/sharing.ui.h:31
+#: ../panels/sharing/sharing.ui.h:24
 msgid "New connections must ask for access"
 msgstr "建立新连接必须询问"
 
-#: ../panels/sharing/sharing.ui.h:32
-#| msgid "Require Password"
+#: ../panels/sharing/sharing.ui.h:25
 msgid "Require a password"
 msgstr "éœ€è¦å¯†ç "
 
+#: ../panels/sharing/sharing.ui.h:26
+#, fuzzy
+msgid "Share music, photos and videos over the network."
+msgstr "在当前网络上共享音乐、照片和视频。"
+
+#: ../panels/sharing/sharing.ui.h:27
+msgid "Folders"
+msgstr "文件夹"
+
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "声音"
@@ -5279,51 +5304,51 @@ msgstr "设备"
 msgid "Speaker Testing for %s"
 msgstr "%s 扬声器测试"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1648
+#: ../panels/sound/gvc-mixer-dialog.c:1649
 msgid "_Output volume:"
 msgstr "输出音量(_O)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1662
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "Output"
 msgstr "输出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1667
+#: ../panels/sound/gvc-mixer-dialog.c:1668
 msgid "C_hoose a device for sound output:"
 msgstr "选择音频输出设备(_H)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1692
+#: ../panels/sound/gvc-mixer-dialog.c:1693
 msgid "Settings for the selected device:"
 msgstr "选中设备的设置："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1703
+#: ../panels/sound/gvc-mixer-dialog.c:1704
 msgid "Input"
 msgstr "输入"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1710
+#: ../panels/sound/gvc-mixer-dialog.c:1711
 msgid "_Input volume:"
 msgstr "输入音量(_I)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1733
+#: ../panels/sound/gvc-mixer-dialog.c:1734
 msgid "Input level:"
 msgstr "输入等级："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: ../panels/sound/gvc-mixer-dialog.c:1762
 msgid "C_hoose a device for sound input:"
 msgstr "选择音频输入设备(_H)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1788
+#: ../panels/sound/gvc-mixer-dialog.c:1789
 msgid "Sound Effects"
 msgstr "声音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1795
+#: ../panels/sound/gvc-mixer-dialog.c:1796
 msgid "_Alert volume:"
 msgstr "警告音量(_A)："
 
-#: ../panels/sound/gvc-mixer-dialog.c:1808
+#: ../panels/sound/gvc-mixer-dialog.c:1809
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1812
+#: ../panels/sound/gvc-mixer-dialog.c:1813
 msgid "No application is currently playing or recording audio."
 msgstr "没有程序正在播放或录制音频。"
 
@@ -5431,7 +5456,6 @@ msgid "_Typing Assist (AccessX)"
 msgstr "AccessX 打字助手(_T)"
 
 #: ../panels/universal-access/uap.ui.h:14
-#| msgid "Pointing and Clicking"
 msgid "Pointing & Clicking"
 msgstr "指向和单击"
 
@@ -5468,13 +5492,13 @@ msgid "Visual Alerts"
 msgstr "视觉警告"
 
 #: ../panels/universal-access/uap.ui.h:23
-msgid "Use a visual indication when an alert sound occurs."
-msgstr "发出警告声时使用视觉提示。"
-
-#: ../panels/universal-access/uap.ui.h:24
 msgid "_Test flash"
 msgstr "测试闪烁(_T)"
 
+#: ../panels/universal-access/uap.ui.h:24
+msgid "Use a visual indication when an alert sound occurs."
+msgstr "发出警告声时使用视觉提示。"
+
 #: ../panels/universal-access/uap.ui.h:25
 msgid "Flash the _window title"
 msgstr "é—ªçƒçª—å£æ ‡é¢˜æ (_W)"
@@ -5837,12 +5861,12 @@ msgid "Account _Type"
 msgstr "账户类型(_T)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "Allow user to set a password when they next login"
 msgstr "å…è®¸ç”¨æˆ·ä¸‹æ¬¡ç™»å½•æ—¶æ›´æ”¹å¯†ç "
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Set a password now"
 msgstr "çŽ°åœ¨è®¾ç½®å¯†ç "
 
@@ -5868,16 +5892,21 @@ msgstr ""
 "è¯·è”ç½‘ä»¥æ·»åŠ \n"
 "企业登录帐号。"
 
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/um-account-dialog.c:1438
+msgid "Add User"
+msgstr "æ·»åŠ ç”¨æˆ·"
+
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
 msgid "_Enroll"
 msgstr "登记(_E)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/user-accounts/data/account-dialog.ui.h:19
 msgid "Domain Administrator Login"
 msgstr "域管理员登录"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: ../panels/user-accounts/data/account-dialog.ui.h:20
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
@@ -5887,11 +5916,11 @@ msgstr ""
 "注册该计算机。请网络管理员在此\n"
 "è¾“å…¥åŸŸå¯†ç ã€‚"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
+#: ../panels/user-accounts/data/account-dialog.ui.h:23
 msgid "Administrator _Name"
 msgstr "管理员名称(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:22
+#: ../panels/user-accounts/data/account-dialog.ui.h:24
 msgid "Administrator Password"
 msgstr "ç®¡ç†å‘˜å¯†ç "
 
@@ -5970,21 +5999,25 @@ msgid "Login History"
 msgstr "登录历史"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
+msgid "Change Password"
+msgstr "æ›´æ”¹å¯†ç "
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:3
+msgid "Ch_ange"
+msgstr "更改(_A)"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:4
 msgid "_Verify New Password"
 msgstr "ç¡®è®¤æ–°å¯†ç (_V)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
+#: ../panels/user-accounts/data/password-dialog.ui.h:5
 msgid "_New Password"
 msgstr "æ–°å¯†ç (_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
+#: ../panels/user-accounts/data/password-dialog.ui.h:6
 msgid "Current _Password"
 msgstr "å½“å‰å¯†ç (_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "Ch_ange"
-msgstr "更改(_A)"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgid "Add User Account"
 msgstr "æ·»åŠ ç”¨æˆ·è´¦æˆ·"
@@ -6211,28 +6244,24 @@ msgstr "应与您帐号提供商的网络地址相同。"
 msgid "Failed to add account"
 msgstr "æ·»åŠ è´¦æˆ·å¤±è´¥"
 
-#: ../panels/user-accounts/um-account-dialog.c:315
-msgid "This will be used to name your home folder and can't be changed."
-msgstr "通常是您主文件夹的名字，该名字不可改变。"
-
-#: ../panels/user-accounts/um-account-dialog.c:448
+#: ../panels/user-accounts/um-account-dialog.c:441
 msgid "Passwords do not match."
 msgstr "å¯†ç ä¸åŒ¹é…ã€‚"
 
-#: ../panels/user-accounts/um-account-dialog.c:718
-#: ../panels/user-accounts/um-account-dialog.c:764
+#: ../panels/user-accounts/um-account-dialog.c:711
+#: ../panels/user-accounts/um-account-dialog.c:757
 msgid "Failed to register account"
 msgstr "注册用户失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:902
+#: ../panels/user-accounts/um-account-dialog.c:895
 msgid "No supported way to authenticate with this domain"
 msgstr "没有支持这个域验证的方法"
 
-#: ../panels/user-accounts/um-account-dialog.c:961
+#: ../panels/user-accounts/um-account-dialog.c:954
 msgid "Failed to join domain"
 msgstr "åŠ å…¥åŸŸå¤±è´¥"
 
-#: ../panels/user-accounts/um-account-dialog.c:1022
+#: ../panels/user-accounts/um-account-dialog.c:1015
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6240,7 +6269,7 @@ msgstr ""
 "该登录名不能用。\n"
 "请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1029
+#: ../panels/user-accounts/um-account-dialog.c:1022
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6248,20 +6277,16 @@ msgstr ""
 "ç™»å½•å¯†ç ä¸èƒ½ç”¨ã€‚\n"
 "请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1037
+#: ../panels/user-accounts/um-account-dialog.c:1030
 msgid "Failed to log into domain"
 msgstr "登入域失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:1095
+#: ../panels/user-accounts/um-account-dialog.c:1088
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "找不到该域名，也许您拼错了？"
 
-#: ../panels/user-accounts/um-account-dialog.c:1445
-msgid "Add User"
-msgstr "æ·»åŠ ç”¨æˆ·"
-
 #. Create enterprise toggle button.
-#: ../panels/user-accounts/um-account-dialog.c:1458
+#: ../panels/user-accounts/um-account-dialog.c:1451
 msgid "_Enterprise Login"
 msgstr "企业登录(_E)"
 
@@ -6346,11 +6371,11 @@ msgstr "选择手指"
 msgid "Enrolling fingerprints"
 msgstr "åŠ å…¥æŒ‡çº¹è¯†åˆ«"
 
-#: ../panels/user-accounts/um-history-dialog.c:87
+#: ../panels/user-accounts/um-history-dialog.c:68
 msgid "This Week"
 msgstr "本周"
 
-#: ../panels/user-accounts/um-history-dialog.c:90
+#: ../panels/user-accounts/um-history-dialog.c:71
 msgid "Last Week"
 msgstr "上周"
 
@@ -6358,22 +6383,22 @@ msgstr "上周"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:96
-#: ../panels/user-accounts/um-history-dialog.c:100
+#: ../panels/user-accounts/um-history-dialog.c:77
+#: ../panels/user-accounts/um-history-dialog.c:81
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%b %e"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:105
+#: ../panels/user-accounts/um-history-dialog.c:86
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%Y %b %e"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:110
+#: ../panels/user-accounts/um-history-dialog.c:91
 #, c-format
 msgctxt "login history week label"
 msgid "%s - %s"
@@ -6381,7 +6406,7 @@ msgstr "%s - %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:194
+#: ../panels/user-accounts/um-history-dialog.c:175
 #: ../panels/user-accounts/um-user-panel.c:625
 msgctxt "login date-time"
 msgid "%k:%M"
@@ -6389,18 +6414,18 @@ msgstr "%k:%M"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:197
+#: ../panels/user-accounts/um-history-dialog.c:178
 #: ../panels/user-accounts/um-user-panel.c:629
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:266
+#: ../panels/user-accounts/um-history-dialog.c:247
 msgid "Session Ended"
 msgstr "会话结束时间"
 
-#: ../panels/user-accounts/um-history-dialog.c:272
+#: ../panels/user-accounts/um-history-dialog.c:253
 msgid "Session Started"
 msgstr "会话开始时间"
 
@@ -6420,23 +6445,23 @@ msgstr "æ— æ³•æ›´æ”¹å¯†ç "
 msgid "The passwords do not match."
 msgstr "å¯†ç ä¸åŒ¹é…ã€‚"
 
-#: ../panels/user-accounts/um-photo-dialog.c:217
+#: ../panels/user-accounts/um-photo-dialog.c:219
 msgid "Browse for more pictures"
 msgstr "浏览更多图片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:442
+#: ../panels/user-accounts/um-photo-dialog.c:453
 msgid "Disable image"
 msgstr "禁用图像"
 
-#: ../panels/user-accounts/um-photo-dialog.c:460
+#: ../panels/user-accounts/um-photo-dialog.c:471
 msgid "Take a photo…"
 msgstr "æ‹å¼ ç…§â€¦"
 
-#: ../panels/user-accounts/um-photo-dialog.c:478
+#: ../panels/user-accounts/um-photo-dialog.c:489
 msgid "Browse for more pictures…"
 msgstr "浏览更多图片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:702
+#: ../panels/user-accounts/um-photo-dialog.c:713
 #, c-format
 msgid "Used by %s"
 msgstr "已被 %s 使用"
@@ -6526,15 +6551,15 @@ msgstr "æ— "
 msgid "Logged in"
 msgstr "已登录"
 
-#: ../panels/user-accounts/um-user-panel.c:998
+#: ../panels/user-accounts/um-user-panel.c:1002
 msgid "Failed to contact the accounts service"
 msgstr "联系账户服务失败"
 
-#: ../panels/user-accounts/um-user-panel.c:1000
+#: ../panels/user-accounts/um-user-panel.c:1004
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "请确定 AccountService 已经正确安装并启用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1041
+#: ../panels/user-accounts/um-user-panel.c:1045
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6542,12 +6567,12 @@ msgstr ""
 "要进行更改，\n"
 "请先点击 * å›¾æ ‡"
 
-#: ../panels/user-accounts/um-user-panel.c:1079
+#: ../panels/user-accounts/um-user-panel.c:1083
 msgid "Create a user account"
 msgstr "创建用户账户"
 
-#: ../panels/user-accounts/um-user-panel.c:1090
-#: ../panels/user-accounts/um-user-panel.c:1379
+#: ../panels/user-accounts/um-user-panel.c:1094
+#: ../panels/user-accounts/um-user-panel.c:1383
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6555,12 +6580,12 @@ msgstr ""
 "要创建用户账户，\n"
 "请先点击 * å›¾æ ‡"
 
-#: ../panels/user-accounts/um-user-panel.c:1100
+#: ../panels/user-accounts/um-user-panel.c:1104
 msgid "Delete the selected user account"
 msgstr "åˆ é™¤é€‰ä¸­çš„ç”¨æˆ·è´¦æˆ·"
 
-#: ../panels/user-accounts/um-user-panel.c:1112
-#: ../panels/user-accounts/um-user-panel.c:1384
+#: ../panels/user-accounts/um-user-panel.c:1116
+#: ../panels/user-accounts/um-user-panel.c:1388
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6568,30 +6593,35 @@ msgstr ""
 "è¦åˆ é™¤é€‰ä¸­çš„ç”¨æˆ·è´¦æˆ·ï¼Œ\n"
 "请先点击 * å›¾æ ‡"
 
-#: ../panels/user-accounts/um-user-panel.c:1294
+#: ../panels/user-accounts/um-user-panel.c:1298
 msgid "My Account"
 msgstr "我的账户"
 
 #: ../panels/user-accounts/um-utils.c:567
-#, c-format
-msgid "A user with the username '%s' already exists"
+#, fuzzy, c-format
+msgid "A user with the username '%s' already exists."
 msgstr "以 %s 为用户名的用户已存在"
 
 #: ../panels/user-accounts/um-utils.c:571
 #, c-format
-msgid "The username is too long"
-msgstr "用户名太长"
+msgid "The username is too long."
+msgstr "用户名太长。"
 
 #: ../panels/user-accounts/um-utils.c:574
-msgid "The username cannot start with a '-'"
-msgstr "用户名不能以“-”开头"
+msgid "The username cannot start with a '-'."
+msgstr "用户名不能以“-”开头。"
 
 #: ../panels/user-accounts/um-utils.c:577
+#, fuzzy
 msgid ""
 "The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'"
+"digits and any of characters '.', '-' and '_'."
 msgstr "用户名只能包含大小写英文字母(a-z)，数字，'.', '-' 及 '_'等符号"
 
+#: ../panels/user-accounts/um-utils.c:581
+msgid "This will be used to name your home folder and can't be changed."
+msgstr "通常是您主文件夹的名字，该名字不可改变。"
+
 #. Translators: This is a date format string in the style of "Feb 24".
 #: ../panels/user-accounts/um-utils.c:827
 msgid "%b %e"
@@ -6966,29 +6996,43 @@ msgid "All Settings"
 msgstr "全部设置"
 
 #. Add categories
-#: ../shell/cc-window.c:872
+#: ../shell/cc-window.c:876
 msgctxt "category"
 msgid "Personal"
 msgstr "个人"
 
-#: ../shell/cc-window.c:873
+#: ../shell/cc-window.c:877
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../shell/cc-window.c:874
+#: ../shell/cc-window.c:878
 msgctxt "category"
 msgid "System"
 msgstr "系统"
 
-#: ../shell/cc-window.c:1601 ../shell/gnome-control-center.desktop.in.in.h:1
-msgid "Settings"
-msgstr "设置"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;首选项;设置;"
 
+#~ msgid "Immediately"
+#~ msgstr "立即"
+
+#~ msgid "Share Media On This Network"
+#~ msgstr "在网络上共享媒体"
+
+#~ msgid "Shared Folders"
+#~ msgstr "共享文件夹"
+
+#~ msgid "column"
+#~ msgstr "列"
+
+#~ msgid "Remove Folder"
+#~ msgstr "移除文件夹"
+
+#~ msgid "Share Public Folder On This Network"
+#~ msgstr "在网络上共享公共文件夹"
+
 #~ msgid "Flickr"
 #~ msgstr "Flickr"
 
@@ -7473,9 +7517,6 @@ msgstr "Preferences;Settings;首选项;设置;"
 #~ msgid "_Action"
 #~ msgstr "动作(_A)"
 
-#~ msgid "Changing password for"
-#~ msgstr "æ›´æ”¹æ­¤ç”¨æˆ·çš„å¯†ç "
-
 #~ msgid "_Show password"
 #~ msgstr "æ˜¾ç¤ºå¯†ç (_S)"
 
@@ -7691,9 +7732,6 @@ msgstr "Preferences;Settings;首选项;设置;"
 #~ msgid "Date and Time preferences panel"
 #~ msgstr "日期和时间首选项面板"
 
-#~ msgid "%d x %d (%s)"
-#~ msgstr "%d x %d (%s)"
-
 #~ msgid "%d x %d"
 #~ msgstr "%d x %d"