[gnome-control-center/gnome-3-8] update Simplified Chinese (zh_CN) translation



commit b4427599c7367810ef933167bcbcbd0de50ee89f
Author: YunQiang Su <yqsu src gnome org>
Date:   Tue Mar 12 14:51:54 2013 +0800

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po | 5127 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 3656 insertions(+), 1471 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 88de602..3091ecd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,25 +17,26 @@
 # Lele Long <schemacs gmail com>, 2011.
 # Wylmer Wang <wantinghard gmail com>, 2011, 2012.
 # Wind He <lofwind gmail com>, 2011.
-# YunQiang Su <wzssyqa 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.
 #
 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: 2012-11-09 13:13+0000\n"
-"PO-Revision-Date: 2013-01-09 06:16+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"POT-Creation-Date: 2013-03-05 13:53+0000\n"
+"PO-Revision-Date: 2013-03-12 14:38+0800\n"
+"Last-Translator: YunQiang Su <wzssyqa 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"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #. This refers to a slideshow background
 #: ../panels/background/background.ui.h:2
@@ -100,22 +101,22 @@ msgstr "Flickr"
 msgid "Select"
 msgstr "选择"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:150
 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:154
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:281
+#: ../panels/background/cc-background-item.c:283
 msgid "No Desktop Background"
 msgstr "无桌面背景"
 
-#: ../panels/background/cc-background-panel.c:449
+#: ../panels/background/cc-background-panel.c:453
 msgid "Current background"
 msgstr "当前背景"
 
@@ -124,22 +125,14 @@ msgid "Background"
 msgstr "背景"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Change the background"
-msgstr "更改背景图像"
+msgid "Change your background image to a wallpaper or photo"
+msgstr "将您的背景图片改为一张壁纸或照片"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;壁纸;墙纸;屏幕;桌面;背景;"
 
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:1
-msgid "Bluetooth"
-msgstr "蓝牙"
-
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:2
-msgid "Configure Bluetooth settings"
-msgstr "配置蓝牙设置"
-
 #: ../panels/bluetooth/bluetooth.ui.h:1
 msgid "Set Up New Device"
 msgstr "设置新设备"
@@ -152,11 +145,17 @@ msgstr "移除设备"
 msgid "Connection"
 msgstr "连接"
 
-#: ../panels/bluetooth/bluetooth.ui.h:4 ../panels/printers/printers.ui.h:14
+#: ../panels/bluetooth/bluetooth.ui.h:4
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
 msgid "page 1"
 msgstr "第 1 页"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/printers/printers.ui.h:16
+#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
 msgid "page 2"
 msgstr "第 2 页"
 
@@ -164,16 +163,21 @@ msgstr "第 2 页"
 msgid "Paired"
 msgstr "已配对"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:756
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
 msgid "Type"
 msgstr "类型"
 
 #: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/network/connection-editor/ce-page-ip4.c:189
+#: ../panels/network/connection-editor/ce-page-ip4.c:441
+#: ../panels/network/connection-editor/ce-page-ip6.c:191
+#: ../panels/network/connection-editor/ce-page-ip6.c:445
 msgid "Address"
 msgstr "地址"
 
 #: ../panels/bluetooth/bluetooth.ui.h:9
-msgid "Mouse and Touchpad Settings"
+#| msgid "Mouse and Touchpad Settings"
+msgid "Mouse & Touchpad Settings"
 msgstr "鼠标和触摸板设置"
 
 #: ../panels/bluetooth/bluetooth.ui.h:10
@@ -186,447 +190,825 @@ msgid "Keyboard Settings"
 msgstr "键盘设置"
 
 #: ../panels/bluetooth/bluetooth.ui.h:12
-msgid "Send Files..."
-msgstr "发送文件..."
-
-#: ../panels/bluetooth/bluetooth.ui.h:13
-msgid "Browse Files..."
-msgstr "浏览文件..."
-
-#. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth 
radio's on the device.
-#: ../panels/bluetooth/bluetooth.ui.h:15
-msgctxt "Power"
-msgid "Bluetooth"
-msgstr "蓝牙"
+#| msgid "Send Files..."
+msgid "Send Files…"
+msgstr "发送文件…"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
 msgid "Yes"
 msgstr "是"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
 msgid "No"
 msgstr "否"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:451
+#: ../panels/bluetooth/cc-bluetooth-panel.c:469
 msgid "Bluetooth is disabled"
 msgstr "蓝牙已禁用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:456
+#: ../panels/bluetooth/cc-bluetooth-panel.c:474
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "蓝牙已通过硬件开关禁用"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:460
+#: ../panels/bluetooth/cc-bluetooth-panel.c:478
 msgid "No Bluetooth adapters found"
 msgstr "未找到蓝牙适配器"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:587
+#: ../panels/bluetooth/cc-bluetooth-panel.c:577
 msgid "Visibility"
 msgstr "可见性"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:591
+#: ../panels/bluetooth/cc-bluetooth-panel.c:581
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "“%s”的可见性"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:635
+#: ../panels/bluetooth/cc-bluetooth-panel.c:625
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "将“%s”从设备列表中移除吗?"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:637
+#: ../panels/bluetooth/cc-bluetooth-panel.c:627
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr "如果您移除该设备,下次使用前您需要重新设置它。"
 
-#. TRANSLATORS: this is where the user can click and import a profile
-#: ../panels/color/cc-color-panel.c:106
-msgid "Other profile…"
-msgstr "其他配置..."
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+msgid "Bluetooth"
+msgstr "蓝牙"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Turn Bluetooth on and off and connect your devices"
+msgstr "开启关闭蓝牙以及连接您的设备"
+
+#. TRANSLATORS: The user has to attach the sensor to the screen
+#: ../panels/color/cc-color-calibrate.c:360
+msgid "Place your calibration device over the square and press 'Start'"
+msgstr "将您的校准设备放在方块上并按“开始”"
+
+#. TRANSLATORS: Some calibration devices need the user to move a
+#. * dial or switch manually. We also show a picture showing them
+#. * what to do...
+#: ../panels/color/cc-color-calibrate.c:366
+msgid ""
+"Move your calibration device to the calibrate position and press 'Continue'"
+msgstr "将您的校准器移动到校准位置并按“继续”"
+
+#. TRANSLATORS: Some calibration devices need the user to move a
+#. * dial or switch manually. We also show a picture showing them
+#. * what to do...
+#: ../panels/color/cc-color-calibrate.c:372
+msgid ""
+"Move your calibration device to the surface position and press 'Continue'"
+msgstr "将您的校准器移动到表面位置并按“继续”"
+
+#. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
+#. * is built into the palmrest and we need to fullscreen the
+#. * sample widget and shut the lid.
+#: ../panels/color/cc-color-calibrate.c:378
+msgid "Shut the laptop lid"
+msgstr "关闭笔记本盖子"
+
+#. TRANSLATORS: We suck, the calibation failed and we have no
+#. * good idea why or any suggestions
+#: ../panels/color/cc-color-calibrate.c:409
+#| msgid "An internal error occurred."
+msgid "An internal error occurred that could not be recovered."
+msgstr "发生了一个内部错误并且无法恢复。"
+
+#. TRANSLATORS: Some required-at-runtime tools were not
+#. * installed, which should only affect insane distros
+#: ../panels/color/cc-color-calibrate.c:414
+msgid "Tools required for calibration are not installed."
+msgstr "校准所需的工具没有安装。"
+
+#. TRANSLATORS: The profile failed for some reason
+#: ../panels/color/cc-color-calibrate.c:420
+msgid "The profile could not be generated."
+msgstr "无法生成配置文件。"
+
+#. TRANSLATORS: The user specified a whitepoint that was
+#. * unobtainable with the hardware they've got -- see
+#. * https://en.wikipedia.org/wiki/White_point for details
+#: ../panels/color/cc-color-calibrate.c:426
+msgid "The target whitepoint was not obtainable."
+msgstr "目标白点不可获取。"
+
+#. TRANSLATORS: the display calibration process is finished
+#: ../panels/color/cc-color-calibrate.c:466
+#| msgctxt "print job"
+#| msgid "Completed"
+msgid "Complete!"
+msgstr "已完成!"
+
+#. TRANSLATORS: the display calibration failed, and we also show
+#. * the translated (or untranslated) error string after this
+#: ../panels/color/cc-color-calibrate.c:474
+#| msgid "Configuration failed"
+msgid "Calibration failed!"
+msgstr "校准失败!"
+
+#. TRANSLATORS: The user can now remove the sensor from the screen
+#: ../panels/color/cc-color-calibrate.c:481
+msgid "You can remove the calibration device."
+msgstr "您可以移除校准设备。"
+
+#. TRANSLATORS: The user has to be careful not to knock the
+#. * display off the screen (although we do cope if this is
+#. * detected early enough)
+#: ../panels/color/cc-color-calibrate.c:552
+msgid "Do not disturb the calibration device while in progress"
+msgstr "不要在进行时干扰校准设备"
+
+#. TRANSLATORS: This refers to the TFT display on a laptop
+#: ../panels/color/cc-color-common.c:41
+#| msgid "Lock screen"
+msgid "Laptop Screen"
+msgstr "笔记本屏幕"
+
+#. TRANSLATORS: This refers to the embedded webcam on a laptop
+#: ../panels/color/cc-color-common.c:50
+#| msgid "Built-in"
+msgid "Built-in Webcam"
+msgstr "内置摄像头"
+
+#. TRANSLATORS: an externally connected display, where %s is either the
+#. * model, vendor or ID, e.g. 'LP2480zx Monitor'
+#: ../panels/color/cc-color-common.c:65
+#, c-format
+#| msgid "Monitor"
+msgid "%s Monitor"
+msgstr "%s 显示器"
+
+#. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
+#: ../panels/color/cc-color-common.c:69
+#, c-format
+#| msgctxt "Device kind"
+#| msgid "Scanner"
+msgid "%s Scanner"
+msgstr "%s 扫描仪"
+
+#. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
+#: ../panels/color/cc-color-common.c:73
+#, c-format
+#| msgctxt "Device kind"
+#| msgid "Camera"
+msgid "%s Camera"
+msgstr "%s 相机"
+
+#. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
+#: ../panels/color/cc-color-common.c:77
+#, c-format
+#| msgctxt "Device kind"
+#| msgid "Printer"
+msgid "%s Printer"
+msgstr "%s 打印机"
+
+#. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
+#: ../panels/color/cc-color-common.c:81
+#, c-format
+#| msgctxt "Device kind"
+#| msgid "Webcam"
+msgid "%s Webcam"
+msgstr "%s 摄像头"
+
+#: ../panels/color/cc-color-device.c:89
+#, c-format
+#| msgid "Learn more about color management"
+msgid "Enable color management for %s"
+msgstr "为 %s 启用色彩管理"
+
+#: ../panels/color/cc-color-device.c:93
+#, c-format
+msgid "Show color profiles for %s"
+msgstr "为 %s 显示颜色管理"
+
+#. not calibrated
+#: ../panels/color/cc-color-device.c:322
+#| msgid "Uncalibrated"
+msgid "Not calibrated"
+msgstr "未校准"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:119
+#: ../panels/color/cc-color-panel.c:133
 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:126
+#: ../panels/color/cc-color-panel.c:141
 msgid "Colorspace: "
 msgstr "色彩空间:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:132
+#: ../panels/color/cc-color-panel.c:148
 msgid "Test profile: "
 msgstr "测试配置:"
 
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:185 ../panels/color/color.ui.h:11
-msgid "Set for all users"
-msgstr "为所有用户设置"
-
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:192
-msgid "Create virtual device"
-msgstr "创建虚拟设备"
-
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:227
+#: ../panels/color/cc-color-panel.c:216
 msgid "Select ICC Profile File"
 msgstr "选择 ICC 配置文件"
 
-#: ../panels/color/cc-color-panel.c:230
+#: ../panels/color/cc-color-panel.c:219
 msgid "_Import"
 msgstr "导入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:241
+#: ../panels/color/cc-color-panel.c:230
 msgid "Supported ICC profiles"
 msgstr "支持的 ICC 配置"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:248
+#: ../panels/color/cc-color-panel.c:237
+#: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "所有文件"
 
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:522
-msgid "Available Profiles for Displays"
-msgstr "可用的显示配置"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:526
-msgid "Available Profiles for Scanners"
-msgstr "可用的扫描仪配置"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:530
-msgid "Available Profiles for Printers"
-msgstr "可用的打印机配置"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:534
-msgid "Available Profiles for Cameras"
-msgstr "可用的相机配置"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:538
-msgid "Available Profiles for Webcams"
-msgstr "可用的摄像头配置"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#. * where the device type is not recognised
-#. Profiles that can be added to the device
-#: ../panels/color/cc-color-panel.c:543 ../panels/color/color.ui.h:2
-msgid "Available Profiles"
-msgstr "可用配置"
-
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:824
-#: ../panels/sound/gvc-mixer-dialog.c:1525
-msgid "Device"
-msgstr "设备"
+#: ../panels/color/cc-color-panel.c:581
+#| msgctxt "Distance"
+#| msgid "¼ Screen"
+msgid "Screen"
+msgstr "屏幕"
 
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:859
-msgid "Calibration"
-msgstr "校准"
+#. TRANSLATORS: this is the dialog to save the ICC profile
+#: ../panels/color/cc-color-panel.c:853
+#| msgid "Remove profile"
+msgid "Save Profile"
+msgstr "保存配置"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:891
+#: ../panels/color/cc-color-panel.c:1214
 msgid "Create a color profile for the selected device"
 msgstr "为所选设备创建一份色彩配置"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:905 ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
 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:938
+#: ../panels/color/cc-color-panel.c:1263
 msgid "The measuring instrument does not support printer profiling."
 msgstr "测量仪器不支持打印机校正。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:949
+#: ../panels/color/cc-color-panel.c:1274
 msgid "The device type is not currently supported."
 msgstr "目前不支持该设备类型。"
 
-#. TRANSLATORS: this is when an auto-added profile cannot be removed
-#: ../panels/color/cc-color-panel.c:1022
-msgid "Cannot remove automatically added profile"
-msgstr "不能移除自动添加的配置"
-
-#. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1359
-msgid "No profile"
-msgstr "无配置"
-
-#: ../panels/color/cc-color-panel.c:1390
-#, c-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i 年"
-
-#: ../panels/color/cc-color-panel.c:1401
-#, c-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i 个月"
-
-#: ../panels/color/cc-color-panel.c:1412
-#, c-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i 周"
-
-#. fallback
-#: ../panels/color/cc-color-panel.c:1419
-#, c-format
-msgid "Less than 1 week"
-msgstr "不到一周"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: ../panels/color/cc-color-profile.c:101
+#| msgctxt "Experience"
+#| msgid "Standard"
+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:107
+#| msgid "Test profile: "
+msgid "Test Profile"
+msgstr "测试配置"
+
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * 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:115
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "自动"
 
-#: ../panels/color/cc-color-panel.c:1481
+#. 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:125
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "低质量"
+
+#. TRANSLATORS: the profile quality
+#: ../panels/color/cc-color-profile.c:130
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "Medium Quality"
+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:137
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+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:154
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "默认 RGB"
 
-#: ../panels/color/cc-color-panel.c:1486
+#. 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:161
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "默认 CMYK"
 
-#: ../panels/color/cc-color-panel.c:1491
+#. 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:168
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "默认灰度"
 
-#: ../panels/color/cc-color-panel.c:1609 ../panels/color/cc-color-panel.c:1650
-#: ../panels/color/cc-color-panel.c:1661 ../panels/color/cc-color-panel.c:1672
-msgid "Uncalibrated"
-msgstr "未校准"
+#: ../panels/color/cc-color-profile.c:192
+msgid "Vendor supplied factory calibration data"
+msgstr "生产商提供的工厂校准数据"
 
-#: ../panels/color/cc-color-panel.c:1612
-msgid "This device is not color managed."
-msgstr "此设备没有进行色彩管理。"
+#: ../panels/color/cc-color-profile.c:201
+msgid "Full-screen display correction not possible with this profile"
+msgstr "使用此配置无法进行全屏显示校准"
 
-#: ../panels/color/cc-color-panel.c:1653
-msgid "This device is using manufacturing calibrated data."
-msgstr "此设备正在使用出厂校准数据。"
+#: ../panels/color/cc-color-profile.c:223
+#| msgid "This device has an old profile that may no longer be accurate."
+msgid "This profile may no longer be accurate"
+msgstr "此配置可能已经不准确了"
 
-#: ../panels/color/cc-color-panel.c:1664
-msgid ""
-"This device does not have a profile suitable for whole-screen color "
-"correction."
-msgstr "此设备没有一份适于全屏色彩修正的配置。"
-
-#: ../panels/color/cc-color-panel.c:1697
-msgid "This device has an old profile that may no longer be accurate."
-msgstr "此设备有一份可能已经不准确的旧配置。"
-
-#. TRANSLATORS: this is when the calibration profile age is not
-#. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1725
-msgid "Not specified"
-msgstr "未指定"
-
-#. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1910
-msgid "No devices supporting color management detected"
-msgstr "没有检测到支持色彩管理的设备"
-
-#: ../panels/color/cc-color-panel.c:2139
-msgctxt "Device kind"
-msgid "Display"
-msgstr "显示"
+#: ../panels/color/color-calibrate.ui.h:1
+#| msgid "Calibration"
+msgid "Display Calibration"
+msgstr "显示校准"
 
-#: ../panels/color/cc-color-panel.c:2141
-msgctxt "Device kind"
-msgid "Scanner"
-msgstr "扫描仪"
+#: ../panels/color/color-calibrate.ui.h:2
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+#: ../panels/user-accounts/um-account-dialog.c:1067
+msgid "Cancel"
+msgstr "取消"
 
-#: ../panels/color/cc-color-panel.c:2143
-msgctxt "Device kind"
-msgid "Printer"
-msgstr "打印机"
+#. This starts the calibration process
+#: ../panels/color/color-calibrate.ui.h:4
+msgid "Start"
+msgstr "开始"
 
-#: ../panels/color/cc-color-panel.c:2145
-msgctxt "Device kind"
-msgid "Camera"
-msgstr "相机"
+#. This resumes the calibration process
+#: ../panels/color/color-calibrate.ui.h:6
+msgid "Resume"
+msgstr "恢复"
 
-#: ../panels/color/cc-color-panel.c:2147
-msgctxt "Device kind"
-msgid "Webcam"
-msgstr "摄像头"
+#. This button returns the user back to the color control panel
+#: ../panels/color/color-calibrate.ui.h:8
+#| msgid "Done!"
+msgid "Done"
+msgstr "完成"
 
-#: ../panels/color/color.ui.h:3
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-#: ../panels/universal-access/zoom-options.ui.h:28
-msgid "Color"
-msgstr "色彩"
+#. Text printed on screen
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/gui_gtk.c:78
+msgid "Screen Calibration"
+msgstr "屏幕校准"
 
-#: ../panels/color/color.ui.h:4
-msgid "Each device needs an up to date color profile to be color managed."
-msgstr "每个设备需要一份最新的色彩配置以进行色彩管理。"
+#: ../panels/color/color.ui.h:2
+msgid ""
+"Calibration will produce a profile that you can use to color manage your "
+"screen. The longer you spend on calibration, the better the quality of the "
+"color profile."
+msgstr "校准可以产生用于屏幕色彩管理的配置。校准时花费的时间越多,效果也越好。"
 
-#: ../panels/color/color.ui.h:5
-msgid "Learn more"
-msgstr "了解更多"
+#: ../panels/color/color.ui.h:3
+msgid ""
+"You will not be able to use your computer while calibration takes place."
+msgstr "在校准进行时您将不能使用您的计算机。"
 
-#: ../panels/color/color.ui.h:6
-msgid "Learn more about color management"
-msgstr "了解更多有关色彩管理的信息"
+#. This is the approximate time it takes to calibrate the display.
+#: ../panels/color/color.ui.h:5
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgid "Quality"
+msgstr "质量"
 
+#. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:7
-msgid "Add device"
-msgstr "添加设备"
+msgid "Approximate Time"
+msgstr "估计时间"
 
 #: ../panels/color/color.ui.h:8
-msgid "Add a virtual device"
-msgstr "添加一个虚拟设备"
+#| msgid "Calibration"
+msgid "Calibration Quality"
+msgstr "校准质量"
 
 #: ../panels/color/color.ui.h:9
-msgid "Delete device"
-msgstr "删除设备"
+msgid "Select the sensor device you want to use for calibration."
+msgstr "选择校准所使用的传感器设备。"
 
 #: ../panels/color/color.ui.h:10
-msgid "Remove a device"
-msgstr "移除设备"
+#| msgid "Calibration"
+msgid "Calibration Device"
+msgstr "校准设备"
+
+#: ../panels/color/color.ui.h:11
+msgid "Select the type of display that is connected."
+msgstr "选择连接的显示类型"
 
 #: ../panels/color/color.ui.h:12
-msgid "Set this profile for all users on this computer"
-msgstr "为此计算机上的所有用户设置此配置"
+#| msgctxt "Device kind"
+#| msgid "Display"
+msgid "Display Type"
+msgstr "显示类型"
 
 #: ../panels/color/color.ui.h:13
-msgid "Add profile"
-msgstr "添加配置"
+msgid ""
+"Select a display target white point. Most displays should be calibrated to a "
+"D65 illuminant."
+msgstr "选择显示目标白点。多数显示器应该校准到 D65 光源。"
 
 #: ../panels/color/color.ui.h:14
-msgid "Calibrate…"
-msgstr "校准..."
+msgid "Profile Whitepoint"
+msgstr "配置参考白点"
 
 #: ../panels/color/color.ui.h:15
-msgid "Calibrate the device"
-msgstr "校准该设备"
+msgid ""
+"Please set the display to a brightness that is typical for you. Color "
+"management will be most accurate at this brightness level."
+msgstr "请选择通常使用的显示亮度。色彩管理在此亮度下将最准确。"
 
 #: ../panels/color/color.ui.h:16
-msgid "Remove profile"
-msgstr "移除配置"
+msgid ""
+"Alternatively, you can use the brightness level used with one of the other "
+"profiles for this device."
+msgstr "或者,也可以使用亮度配合此设备的其它配置使用。"
 
 #: ../panels/color/color.ui.h:17
-msgid "View details"
-msgstr "查看详情"
+#| msgid "Brightness"
+msgid "Display Brightness"
+msgstr "显示亮度"
 
 #: ../panels/color/color.ui.h:18
+msgid ""
+"You can use a color profile on different computers, or even create profiles "
+"for different lighting conditions."
+msgstr ""
+"您可以对不同的计算机使用同一个配置,或者甚至可以对不同的光照条件创建配置。"
+
+#: ../panels/color/color.ui.h:19
+#| msgid "_Profile:"
+msgid "Profile Name:"
+msgstr "配置名:"
+
+#: ../panels/color/color.ui.h:20
+#| msgid "_Profile:"
+msgid "Profile Name"
+msgstr "配置名"
+
+#: ../panels/color/color.ui.h:21
+msgid "Profile successfully created!"
+msgstr "配置成功创建!"
+
+#: ../panels/color/color.ui.h:22
+#| msgid "_Import"
+msgid "Export"
+msgstr "导出"
+
+#: ../panels/color/color.ui.h:23
+msgid ""
+"You may find these instructions on how to use the profile on <a href=\"linux"
+"\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
+"\">Microsoft Windows</a> systems useful."
+msgstr ""
+
+#: ../panels/color/color.ui.h:24
+#: ../panels/user-accounts/um-fingerprint-dialog.c:743
+msgid "Summary"
+msgstr "摘要"
+
+#: ../panels/color/color.ui.h:25
+msgid "Import File…"
+msgstr "导入文件…"
+
+#: ../panels/color/color.ui.h:26
+msgid ""
+"Problems detected. The profile may not work correctly. <a href=\"\">Show "
+"details.</a>"
+msgstr "探测到问题。此配置可能无法正常工作。<a href=\"\">显示详细信息。</a>"
+
+#: ../panels/color/color.ui.h:27
 msgid "Device type:"
 msgstr "设备类型:"
 
-#: ../panels/color/color.ui.h:19
+#: ../panels/color/color.ui.h:28
 msgid "Manufacturer:"
 msgstr "厂商:"
 
-#: ../panels/color/color.ui.h:20
+#: ../panels/color/color.ui.h:29
 msgid "Model:"
 msgstr "型号:"
 
-#: ../panels/color/color.ui.h:21
+#: ../panels/color/color.ui.h:30
 msgid ""
 "Image files can be dragged on this window to auto-complete the above fields."
 msgstr "可以将图像文件拖放到此窗口来自动填写以上字段。"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Color management settings"
-msgstr "色彩管理设置"
+#: ../panels/color/color.ui.h:31
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "色彩"
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+#: ../panels/color/color.ui.h:32
+msgid "Each device needs an up to date color profile to be color managed."
+msgstr "每个设备需要一份最新的色彩配置以进行色彩管理。"
+
+#: ../panels/color/color.ui.h:33
+msgid "Learn more"
+msgstr "了解更多"
+
+#: ../panels/color/color.ui.h:34
+msgid "Learn more about color management"
+msgstr "了解更多有关色彩管理的信息"
+
+#: ../panels/color/color.ui.h:35
+msgid "Set for all users"
+msgstr "为所有用户设置"
+
+#: ../panels/color/color.ui.h:36
+msgid "Set this profile for all users on this computer"
+msgstr "为此计算机上的所有用户设置此配置"
+
+#: ../panels/color/color.ui.h:37
+#| msgid "Enabled"
+msgid "Enable"
+msgstr "启用"
+
+#: ../panels/color/color.ui.h:38
+msgid "Add profile"
+msgstr "添加配置"
+
+#: ../panels/color/color.ui.h:39
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+msgid "Calibrate…"
+msgstr "校准..."
+
+#: ../panels/color/color.ui.h:40
+msgid "Calibrate the device"
+msgstr "校准该设备"
+
+#: ../panels/color/color.ui.h:41
+msgid "Remove profile"
+msgstr "移除配置"
+
+#: ../panels/color/color.ui.h:42
+msgid "View details"
+msgstr "查看详情"
+
+#: ../panels/color/color.ui.h:43
+msgid "Unable to detect any devices that can be color managed"
 msgstr ""
-"颜色;色彩;配置;校准;打印机;显示;Color;ICC;Profile;Calibrate;Printer;Display;"
 
-#. Add some common languages first
-#: ../panels/common/cc-common-language.c:533
-msgid "English"
-msgstr "英语"
+#: ../panels/color/color.ui.h:44
+msgid "LCD"
+msgstr "LCD"
+
+#: ../panels/color/color.ui.h:45
+msgid "LED"
+msgstr "LED"
+
+#: ../panels/color/color.ui.h:46
+msgid "CRT"
+msgstr "CRT"
 
-#: ../panels/common/cc-common-language.c:535
-msgid "British English"
-msgstr "英国英语"
+#: ../panels/color/color.ui.h:47
+#| msgid "Co_nnector:"
+msgid "Projector"
+msgstr "投影仪"
 
-#: ../panels/common/cc-common-language.c:538
-msgid "German"
-msgstr "德语"
+#: ../panels/color/color.ui.h:48
+msgid "Plasma"
+msgstr ""
+
+#: ../panels/color/color.ui.h:49
+#| msgctxt "universal access, contrast"
+#| msgid "High"
+msgctxt "Calibration quality"
+msgid "High"
+msgstr "高"
+
+#: ../panels/color/color.ui.h:50
+#| msgid "10 minutes"
+msgid "40 minutes"
+msgstr "40 分钟"
+
+#: ../panels/color/color.ui.h:51
+msgctxt "Calibration quality"
+msgid "Medium"
+msgstr "中"
+
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
+#: ../panels/privacy/privacy.ui.h:7
+msgid "30 minutes"
+msgstr "30 分钟"
+
+#: ../panels/color/color.ui.h:53
+#| msgctxt "Battery power"
+#| msgid "Low"
+msgctxt "Calibration quality"
+msgid "Low"
+msgstr "低"
+
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
+#| msgid "5 minutes"
+msgid "15 minutes"
+msgstr "15 分钟"
+
+#: ../panels/color/color.ui.h:55
+#, fuzzy
+#| msgid "Panel to display"
+msgid "Native to display"
+msgstr "显示面板"
 
-#: ../panels/common/cc-common-language.c:541
-msgid "French"
-msgstr "法语"
+#: ../panels/color/color.ui.h:56
+#| msgid "Pointing and Clicking"
+msgid "D50 (Printing and publishing)"
+msgstr "D50 (打印和出版)"
 
-#: ../panels/common/cc-common-language.c:544
-msgid "Spanish"
-msgstr "西班牙语"
+#: ../panels/color/color.ui.h:57
+msgid "D55"
+msgstr "D55"
 
-#: ../panels/common/cc-common-language.c:546
-msgid "Chinese (simplified)"
-msgstr "简体中文"
+#: ../panels/color/color.ui.h:58
+msgid "D65 (Photography and graphics)"
+msgstr "D65 (摄影及图像)"
 
-#: ../panels/common/cc-common-language.c:549
-msgid "Russian"
-msgstr "俄语"
+#: ../panels/color/color.ui.h:59
+#| msgid "75%"
+msgid "D75"
+msgstr "D75"
 
-#: ../panels/common/cc-common-language.c:552
-msgid "Arabic"
-msgstr "阿拉伯语"
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr "校准设备的色彩,例如显示器、相机或打印机"
+
+#. Translators: those are keywords for the color control-center panel
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr ""
+"颜色;色彩;配置;校准;打印机;显示;Color;ICC;Profile;Calibrate;Printer;Display;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:581
+#: ../panels/common/cc-common-language.c:677
 msgid "United States"
 msgstr "美国"
 
-#: ../panels/common/cc-common-language.c:582
+#: ../panels/common/cc-common-language.c:678
 msgid "Germany"
 msgstr "德国"
 
-#: ../panels/common/cc-common-language.c:583
+#: ../panels/common/cc-common-language.c:679
 msgid "France"
 msgstr "法国"
 
-#: ../panels/common/cc-common-language.c:584
+#: ../panels/common/cc-common-language.c:680
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../panels/common/cc-common-language.c:585
+#: ../panels/common/cc-common-language.c:681
 msgid "China"
 msgstr "中国"
 
-#: ../panels/common/cc-language-chooser.c:122
-msgid "Other..."
-msgstr "其他..."
+#: ../panels/common/cc-common-language.c:747
+#| msgid "Other profile…"
+msgid "Other…"
+msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:296
-msgid "Select a region"
-msgstr "选择一个地区"
+#: ../panels/common/cc-language-chooser.c:169
+#: ../panels/region/cc-format-chooser.c:259
+#: ../panels/region/cc-input-chooser.c:171
+msgid "More…"
+msgstr "更多…"
 
-#: ../panels/common/gdm-languages.c:781
-msgid "Unspecified"
-msgstr "未指定"
+#: ../panels/common/cc-language-chooser.c:178
+#| msgid "No local printers found"
+msgid "No languages found"
+msgstr "未找到语言"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Select a language"
-msgstr "选择一种语言"
+#. translators:
+#. * The device has been disabled
+#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:408
+#: ../panels/keyboard/keyboard-shortcuts.c:1160
+#: ../panels/network/network-wifi.ui.h:30
+#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "禁用"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:1
-#: ../panels/user-accounts/um-user-panel.c:454
-msgid "_Cancel"
-msgstr "取消(_C)"
+#: ../panels/common/cc-util.c:29
+#| msgid "Left Half"
+msgid "Left Shift"
+msgstr "左 Shift"
+
+#: ../panels/common/cc-util.c:30
+msgid "Left Alt"
+msgstr "左 Alt"
+
+#: ../panels/common/cc-util.c:31
+msgid "Left Ctrl"
+msgstr "左 Ctrl"
+
+#: ../panels/common/cc-util.c:32
+msgid "Right Shift"
+msgstr "右 Shift"
+
+#: ../panels/common/cc-util.c:33
+msgid "Right Alt"
+msgstr "右 Alt"
+
+#: ../panels/common/cc-util.c:34
+msgid "Right Ctrl"
+msgstr "右 Ctrl"
+
+#: ../panels/common/cc-util.c:35
+msgid "Left Alt+Shift"
+msgstr "左 Alt+Shift"
+
+#: ../panels/common/cc-util.c:36
+msgid "Right Alt+Shift"
+msgstr "右 Alt+Shift"
+
+#: ../panels/common/cc-util.c:37
+msgid "Left Ctrl+Shift"
+msgstr "左 Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:38
+msgid "Right Ctrl+Shift"
+msgstr "右 Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:39
+msgid "Left+Right Shift"
+msgstr "左+右 Shift"
+
+#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "左+右 Alt"
+
+#: ../panels/common/cc-util.c:41
+msgid "Left+Right Ctrl"
+msgstr "左+右 Ctrl"
+
+#: ../panels/common/cc-util.c:42
+msgid "Alt+Shift"
+msgstr "Ctrl+Alt+Shift+Space"
 
-#: ../panels/common/language-chooser.ui.h:3
-msgid "_Select"
-msgstr "选择(_S)"
+#: ../panels/common/cc-util.c:43
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Alt+Shift+Space"
+
+#: ../panels/common/cc-util.c:44
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../panels/common/cc-util.c:45
+msgid "Caps"
+msgstr "Caps"
+
+#: ../panels/common/cc-util.c:46
+msgid "Shift+Caps"
+msgstr "Shift+Caps"
+
+#: ../panels/common/cc-util.c:47
+msgid "Alt+Caps"
+msgstr "Alt+Caps"
+
+#: ../panels/common/cc-util.c:48
+msgid "Ctrl+Caps"
+msgstr "Ctrl+Caps"
+
+#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+msgid "Language"
+msgstr "语言"
+
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+#| msgid "Done!"
+msgid "_Done"
+msgstr "完成(_D)"
 
 #: ../panels/datetime/datetime.ui.h:1
 msgid "_Region:"
@@ -738,8 +1120,8 @@ msgid "Date & Time"
 msgstr "日期和时间"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-msgid "Date and Time preferences panel"
-msgstr "日期和时间首选项面板"
+msgid "Change the date and time, including time zone"
+msgstr "改变日期和时间,以及时区"
 
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
@@ -754,22 +1136,22 @@ msgstr "更改系统时间和日期设置"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "修改时间或日期设置,您需要获得管理员权限。"
 
-#: ../panels/display/cc-display-panel.c:481
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "正常"
 
-#: ../panels/display/cc-display-panel.c:482
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "逆时针"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:485
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "顺时针"
 
-#: ../panels/display/cc-display-panel.c:484
+#: ../panels/display/cc-display-panel.c:486
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 度"
@@ -780,58 +1162,55 @@ msgstr "180 度"
 #. * used as an adjective.  For example, the Spanish translation could be
 #. * "Pantallas en Espejo".
 #.
-#: ../panels/display/cc-display-panel.c:623
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your
+#. * laptop's screen is the same as your external projector.
+#. * Here, "Mirrored" is being used as an adjective.  For example,
+#. * the Spanish translation could be "Pantallas en Espejo".
+#.
+#: ../panels/display/cc-display-panel.c:625
+#: ../panels/display/cc-rr-labeler.c:418
 msgid "Mirrored Displays"
 msgstr "镜像显示"
 
-#: ../panels/display/cc-display-panel.c:647
+#: ../panels/display/cc-display-panel.c:649
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "显示器"
 
-#: ../panels/display/cc-display-panel.c:748
-#, c-format
-msgid "%d x %d (%s)"
-msgstr "%d x %d (%s)"
-
-#: ../panels/display/cc-display-panel.c:750
-#, c-format
-msgid "%d x %d"
-msgstr "%d x %d"
-
-#: ../panels/display/cc-display-panel.c:1659
+#: ../panels/display/cc-display-panel.c:1669
 msgid "Drag to change primary display."
 msgstr "拖拽以更改主显示设备。"
 
-#: ../panels/display/cc-display-panel.c:1717
+#: ../panels/display/cc-display-panel.c:1727
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "选择一台显示器来更改它的属性;拖动它来排列位置。"
 
-#: ../panels/display/cc-display-panel.c:2105
+#: ../panels/display/cc-display-panel.c:2115
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2107
+#: ../panels/display/cc-display-panel.c:2117
 msgid "%a %l:%M %p"
 msgstr "%A %H%M"
 
-#: ../panels/display/cc-display-panel.c:2269
-#: ../panels/display/cc-display-panel.c:2321
+#: ../panels/display/cc-display-panel.c:2279
+#: ../panels/display/cc-display-panel.c:2331
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "应用配置失败:%s"
 
-#: ../panels/display/cc-display-panel.c:2349
+#: ../panels/display/cc-display-panel.c:2359
 msgid "Could not save the monitor configuration"
 msgstr "无法保存显示器配置"
 
-#: ../panels/display/cc-display-panel.c:2409
+#: ../panels/display/cc-display-panel.c:2419
 msgid "Could not detect displays"
 msgstr "无法检测显示器"
 
-#: ../panels/display/cc-display-panel.c:2603
+#: ../panels/display/cc-display-panel.c:2614
 msgid "Could not get screen information"
 msgstr "无法获得屏幕信息"
 
@@ -861,8 +1240,9 @@ msgid "Displays"
 msgstr "显示"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Change resolution and position of monitors and projectors"
-msgstr "更改显示器和投影仪的分辨率和位置"
+#| msgid "Change resolution and position of monitors and projectors"
+msgid "Choose how to use connected monitors and projectors"
+msgstr "选择如何使用连接的显示器和投影仪"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
@@ -871,85 +1251,55 @@ msgstr ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;面板;投影仪;屏幕;分辨率;刷"
 "新;"
 
-#. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:417
-#, c-format
-msgid "VESA: %s"
-msgstr "VESA:%s"
-
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:441 ../panels/network/panel-common.c:120
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "未知"
 
-#. translators: This is the type of architecture, for example:
-#. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:616
+#: ../panels/info/cc-info-panel.c:541
+#, c-format
+#| msgid "%d-bit"
+msgid "%s %d-bit"
+msgstr "%s %d 位"
+
+#: ../panels/info/cc-info-panel.c:543
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位"
 
-#: ../panels/info/cc-info-panel.c:775
-msgid "Unknown model"
-msgstr "未知型号"
-
-#: ../panels/info/cc-info-panel.c:858
-msgid "The next login will attempt to use the standard experience."
-msgstr "下次登录将尝试提供标准用户体验。"
-
-#: ../panels/info/cc-info-panel.c:860
-msgid ""
-"The next login will use the fallback mode intended for unsupported graphics "
-"hardware."
-msgstr "下次登录将使用为不支持的显示硬件而设计的备用模式。"
-
-#. translators: The hardware is not able to run GNOME 3's
-#. * shell, so we use the GNOME "Fallback" session
-#: ../panels/info/cc-info-panel.c:902
-msgctxt "Experience"
-msgid "Fallback"
-msgstr "备用"
-
-#. translators: The hardware is able to run GNOME 3's
-#. * shell, also called "Standard" experience
-#: ../panels/info/cc-info-panel.c:908
-msgctxt "Experience"
-msgid "Standard"
-msgstr "标准"
-
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1218
 msgid "Ask what to do"
 msgstr "询问如何处理"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1222
 msgid "Do nothing"
 msgstr "不处理"
 
-#: ../panels/info/cc-info-panel.c:1378
+#: ../panels/info/cc-info-panel.c:1226
 msgid "Open folder"
 msgstr "打开文件夹"
 
-#: ../panels/info/cc-info-panel.c:1469
+#: ../panels/info/cc-info-panel.c:1317
 msgid "Other Media"
 msgstr "其他媒体"
 
-#: ../panels/info/cc-info-panel.c:1500
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application for audio CDs"
 msgstr "选择播放音频 CD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1501
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for video DVDs"
 msgstr "选择播放视频 DVD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1502
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application to run when a music player is connected"
 msgstr "选择要在连接音乐播放器后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1503
+#: ../panels/info/cc-info-panel.c:1351
 msgid "Select an application to run when a camera is connected"
 msgstr "选择要在连接相机后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1504
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for software CDs"
 msgstr "选择要在插入软件 CD 时运行的应用程序"
 
@@ -958,115 +1308,116 @@ msgstr "选择要在插入软件 CD 时运行的应用程序"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1516
+#: ../panels/info/cc-info-panel.c:1364
 msgid "audio DVD"
 msgstr "音频 DVD"
 
-#: ../panels/info/cc-info-panel.c:1517
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank Blu-ray disc"
 msgstr "空白蓝光光盘"
 
-#: ../panels/info/cc-info-panel.c:1518
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank CD disc"
 msgstr "空白 CD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1519
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank DVD disc"
 msgstr "空白 DVD 光盘"
 
 # 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1520
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1521
+#: ../panels/info/cc-info-panel.c:1369
 msgid "Blu-ray video disc"
 msgstr "蓝光视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1522
+#: ../panels/info/cc-info-panel.c:1370
 msgid "e-book reader"
 msgstr "电子书阅读器"
 
-#: ../panels/info/cc-info-panel.c:1523
+#: ../panels/info/cc-info-panel.c:1371
 msgid "HD DVD video disc"
 msgstr "HD DVD 视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1524
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Picture CD"
 msgstr "图片 CD"
 
-#: ../panels/info/cc-info-panel.c:1525
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Super Video CD"
 msgstr "超级 VCD"
 
-#: ../panels/info/cc-info-panel.c:1526
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Video CD"
 msgstr "视频 CD"
 
-#: ../panels/info/cc-info-panel.c:1527
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Windows software"
 msgstr "Windows 软件"
 
-#: ../panels/info/cc-info-panel.c:1528
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Software"
 msgstr "软件"
 
-#: ../panels/info/cc-info-panel.c:1651
-#: ../panels/keyboard/keyboard-shortcuts.c:1692
+#: ../panels/info/cc-info-panel.c:1499
+#: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "节"
 
-#: ../panels/info/cc-info-panel.c:1660 ../panels/info/info.ui.h:12
+#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
 msgid "Overview"
-msgstr "概况"
+msgstr "总览"
 
-#: ../panels/info/cc-info-panel.c:1666 ../panels/info/info.ui.h:19
+#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "默认应用程序"
 
-#: ../panels/info/cc-info-panel.c:1671 ../panels/info/info.ui.h:27
+#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "可移动介质"
 
-#: ../panels/info/cc-info-panel.c:1676 ../panels/info/info.ui.h:10
-msgid "Graphics"
-msgstr "图形"
-
-#: ../panels/info/cc-info-panel.c:1876
+#: ../panels/info/cc-info-panel.c:1544
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../panels/info/cc-info-panel.c:1926
+#: ../panels/info/cc-info-panel.c:1594
 msgid "Install Updates"
 msgstr "安装更新"
 
-#: ../panels/info/cc-info-panel.c:1930
+#: ../panels/info/cc-info-panel.c:1598
 msgid "System Up-To-Date"
 msgstr "系统已是最新"
 
-#: ../panels/info/cc-info-panel.c:1934
+#: ../panels/info/cc-info-panel.c:1602
 msgid "Checking for Updates"
 msgstr "正在检查更新"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
+#: ../panels/network/connection-editor/ce-page-details.c:240
+#: ../panels/network/network-wifi.ui.h:58
 msgid "Details"
 msgstr "详细信息"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "System Information"
-msgstr "系统信息"
+msgid "View information about your system"
+msgstr "查看您系统的信息"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
 "device;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;设备;"
-"系统;信息;内存;处理器;CPU;版本;默认;应用程序;备用;回滚;喜好;cd;dvd;音频;视频;"
-"光盘;光碟;盘片;可擦写;可移除;媒体;介质;自动运行;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;设备;系统;信息;"
+"内存;处理器;CPU;版本;默认;应用程序;首选;回滚;喜好;音频;视频;光盘;光碟;盘片;可"
+"擦写;可移除;媒体;介质;自动运行;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1092,87 +1443,81 @@ msgstr "内存"
 msgid "Processor"
 msgstr "处理器"
 
-#: ../panels/info/info.ui.h:7
-msgid "OS type"
-msgstr "操作系统类型"
-
+#. To translators: this field contains the distro name, version and type
 #: ../panels/info/info.ui.h:8
+msgid "Base system"
+msgstr "基本系统"
+
+#: ../panels/info/info.ui.h:9
 msgid "Disk"
 msgstr "磁盘"
 
-#: ../panels/info/info.ui.h:9
-msgid "Calculating..."
-msgstr "正在计算..."
+#: ../panels/info/info.ui.h:10
+#| msgid "Calculating..."
+msgid "Calculating…"
+msgstr "正在计算…"
 
 #: ../panels/info/info.ui.h:11
+msgid "Graphics"
+msgstr "图形"
+
+#: ../panels/info/info.ui.h:12
 msgid "Virtualization"
 msgstr "虚拟化"
 
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info.ui.h:14
 msgid "_Web"
 msgstr "网络(_W)"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:15
 msgid "_Mail"
 msgstr "邮件(_M)"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:16
 msgid "_Calendar"
 msgstr "日历(_C)"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:17
 msgid "M_usic"
 msgstr "音乐(_U)"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:18
 msgid "_Video"
 msgstr "视频(_V)"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info.ui.h:19
 msgid "_Photos"
 msgstr "照片(_P)"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info.ui.h:21
 msgid "Select how media should be handled"
 msgstr "选择如何处理介质"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:22
 msgid "CD _audio"
 msgstr "CD 音频(_A)"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:23
 msgid "_DVD video"
 msgstr "_DVD 视频"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:24
 msgid "_Music player"
 msgstr "音乐播放器(_M)"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info.ui.h:25
 msgid "_Software"
 msgstr "软件(_S)"
 
-#: ../panels/info/info.ui.h:25
-msgid "_Other Media..."
-msgstr "其他媒体(_O)..."
-
 #: ../panels/info/info.ui.h:26
+#| msgid "Other Media"
+msgid "_Other Media…"
+msgstr "其他媒体(_O)…"
+
+#: ../panels/info/info.ui.h:27
 msgid "_Never prompt or start programs on media insertion"
 msgstr "介质插入时从不提示或启动程序(_N)"
 
-#: ../panels/info/info.ui.h:28
-msgid "Driver"
-msgstr "驱动器"
-
-#: ../panels/info/info.ui.h:29
-msgid "Experience"
-msgstr "用户体验"
-
-#. Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.
-#: ../panels/info/info.ui.h:31
-msgid "Forced _Fallback Mode"
-msgstr "强制使用备用模式(_F)"
-
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "声音和媒体"
@@ -1224,14 +1569,14 @@ msgid "Typing"
 msgstr "打字"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#: ../panels/region/gnome-region-panel.ui.h:25
-msgid "Switch to next source"
-msgstr "切换至下个源"
+#| msgid "Switch to next source"
+msgid "Switch to next input source"
+msgstr "切换至下个输入源"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Switch to previous source"
-msgstr "切换至上个源"
+#| msgid "Switch to previous source"
+msgid "Switch to previous input source"
+msgstr "切换至上个输入源"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
 msgid "Launchers"
@@ -1258,12 +1603,14 @@ msgid "Home folder"
 msgstr "主文件夹"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:7
+#| msgid "Search"
+msgctxt "keybinding"
 msgid "Search"
 msgstr "搜索"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:1
 msgid "Screenshots"
-msgstr "截图"
+msgstr "搜索"
 
 # 与下面的剪贴板“位置”相对。
 #. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
@@ -1294,7 +1641,6 @@ msgid "Copy a screenshot of an area to clipboard"
 msgstr "复制选区截图到剪贴板"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:38
 msgid "System"
 msgstr "系统"
 
@@ -1343,33 +1689,28 @@ msgstr "减小文本字号"
 msgid "High contrast on or off"
 msgstr "高对比度开或关"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:241
-#: ../panels/keyboard/cc-keyboard-option.c:347
-#: ../panels/keyboard/keyboard-shortcuts.c:1157
-#: ../panels/sound/gvc-mixer-control.c:1834
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "禁用"
-
-#: ../panels/keyboard/cc-keyboard-option.c:315
+#: ../panels/keyboard/cc-keyboard-option.c:362
 msgid "Alternative Characters Key"
 msgstr "替代的字符键"
 
-#: ../panels/keyboard/cc-keyboard-option.c:320
+#: ../panels/keyboard/cc-keyboard-option.c:367
 msgid "Compose Key"
 msgstr "组合键"
 
+#: ../panels/keyboard/cc-keyboard-option.c:371
+#, fuzzy
+#| msgid "Switch to next source"
+msgid "Modifiers-only switch to next source"
+msgstr "切换至下个源"
+
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "键盘"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Change keyboard settings"
-msgstr "更改键盘设置"
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "查看和更改键盘快捷键,以及设置您的打字偏好"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
@@ -1445,8 +1786,9 @@ msgid "Cursor blink speed"
 msgstr "光标闪烁速度"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Layout Settings"
-msgstr "布局设置"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "输入源"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
@@ -1465,20 +1807,19 @@ msgstr ""
 "要编辑快捷键,请单击相应的行,然后输入新按键组合,或按 Backspace 清除。"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-#: ../panels/region/gnome-region-panel.ui.h:28
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:582
-#: ../panels/keyboard/keyboard-shortcuts.c:590
+#: ../panels/keyboard/keyboard-shortcuts.c:585
+#: ../panels/keyboard/keyboard-shortcuts.c:593
 msgid "Custom Shortcuts"
 msgstr "自定义快捷键"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:801
+#: ../panels/keyboard/keyboard-shortcuts.c:804
 msgid "<Unknown Action>"
 msgstr "<未知动作>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1298
+#: ../panels/keyboard/keyboard-shortcuts.c:1301
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1488,7 +1829,7 @@ msgstr ""
 "“%s”不能用作快捷键,因为使用此键将无法正常输入。\n"
 "请组合 Ctrl、Alt 或 Shift 键再试一次"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1330
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1497,27 +1838,29 @@ msgstr ""
 "快捷键“%s”已被用于\n"
 "“%s”"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1335
+#: ../panels/keyboard/keyboard-shortcuts.c:1338
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "如果你重新分配快捷键 %s,则快捷键 %s 将被禁用"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1341
+#: ../panels/keyboard/keyboard-shortcuts.c:1344
 msgid "_Reassign"
 msgstr "重新分配(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:147
-msgid "_Test Your Settings"
-msgstr "测试您的设置(_T)"
+#: ../panels/mouse/cc-mouse-panel.c:123
+#| msgid "_Test Your Settings"
+msgid "Test Your _Settings"
+msgstr "测试您的设置(_S)"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
 msgid "Mouse & Touchpad"
 msgstr "鼠标和触摸板"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse and touchpad preferences"
-msgstr "设置您的鼠标和触摸板首选项"
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr "改变您的鼠标和触摸板灵敏度,并选择惯用右手或左手"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
@@ -1630,174 +1973,730 @@ msgstr "单击,次键"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:332
+#: ../panels/network/cc-network-panel.c:347
 msgid "Air_plane Mode"
 msgstr "飞行模式(_P)"
 
-#: ../panels/network/cc-network-panel.c:834
+#: ../panels/network/cc-network-panel.c:912
 msgid "Network proxy"
 msgstr "网络代理"
 
-#: ../panels/network/cc-network-panel.c:1010 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:280
 #, 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:1074
+#: ../panels/network/cc-network-panel.c:1225
 msgid "The system network services are not compatible with this version."
 msgstr "系统的网络服务与此版本的网络管理器不兼容。"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "网络"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "网络设置"
-
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
-msgstr "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
-"网络;无线;蓝牙;宽带;上网;"
-
-#: ../panels/network/net-device-bond.c:131
-msgid "Bond slaves"
-msgstr ""
-
-#. Translators: network device speed
-#: ../panels/network/net-device-ethernet.c:49
-#: ../panels/network/net-device-mobile.c:261
-#: ../panels/network/net-device-wifi.c:725
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/秒"
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#| msgid "Security"
+msgid "802.1x _Security"
+msgstr "802.1x 安全性(_S)"
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity"
+msgstr "匿名认证(_M)"
+
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
+#: ../panels/network/connection-editor/security-page.ui.h:4
+#| msgid "Authentication failed"
+msgid "Inner _authentication"
+msgstr "内部认证(_A)"
+
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
+#: ../panels/network/connection-editor/ce-page-security.c:455
+#: ../panels/network/connection-editor/details-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:4
+msgid "Security"
+msgstr "安全性"
 
-#: ../panels/network/net-device-mobile.c:222
-msgid "Add new connection"
-msgstr "添加新连接"
+#: ../panels/network/connection-editor/ce-page.c:502
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "automatic"
+msgstr "自动"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/net-device-wifi.c:258
-#: ../panels/network/net-device-wifi.c:437
+#: ../panels/network/connection-editor/ce-page-details.c:52
+#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:385
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:262
-#: ../panels/network/net-device-wifi.c:441
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:228
+#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:266
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:232
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/net-device-wifi.c:271
+#: ../panels/network/connection-editor/ce-page-details.c:65
+#: ../panels/network/net-device-wifi.c:237
 msgid "Enterprise"
 msgstr "企业"
 
-#: ../panels/network/net-device-wifi.c:276
-#: ../panels/network/net-device-wifi.c:432
+#: ../panels/network/connection-editor/ce-page-details.c:70
+#: ../panels/network/net-device-wifi.c:242
+#: ../panels/network/net-device-wifi.c:375
 msgctxt "Wifi security"
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/net-device-wifi.c:652
-msgid "never"
+#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/power/power.ui.h:19
+#| msgid "never"
+msgid "Never"
 msgstr "从不"
 
-#: ../panels/network/net-device-wifi.c:662
-msgid "today"
+#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/user-accounts/um-utils.c:770
+#| msgid "today"
+msgid "Today"
 msgstr "今天"
 
-#: ../panels/network/net-device-wifi.c:664
-msgid "yesterday"
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/user-accounts/um-utils.c:773
+#| msgid "yesterday"
+msgid "Yesterday"
 msgstr "昨天"
 
-#: ../panels/network/net-device-wifi.c:666
+#: ../panels/network/connection-editor/ce-page-details.c:106
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:479
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天前"
 
-#. TRANSLATORS: VPN status
-#: ../panels/network/net-device-wifi.c:735
-#: ../panels/network/panel-common.c:235
-msgid "Not connected"
-msgstr "未连接"
-
-#: ../panels/network/net-device-wifi.c:737
-#: ../panels/network/net-device-wifi.c:2099
-msgid "Out of range"
-msgstr "超出范围"
+#. Translators: network device speed
+#: ../panels/network/connection-editor/ce-page-details.c:155
+#: ../panels/network/net-device-ethernet.c:54
+#: ../panels/network/net-device-wifi.c:537
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/秒"
 
-#: ../panels/network/net-device-wifi.c:768
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/net-device-wifi.c:770
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:568
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "微弱"
 
-#: ../panels/network/net-device-wifi.c:772
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:570
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "一般"
 
-#: ../panels/network/net-device-wifi.c:774
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:572
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "较好"
 
-#: ../panels/network/net-device-wifi.c:776
+#: ../panels/network/connection-editor/ce-page-details.c:189
+#: ../panels/network/net-device-wifi.c:574
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "良好"
 
-#: ../panels/network/net-device-wifi.c:960
+#: ../panels/network/connection-editor/ce-page-ethernet.c:200
+#: ../panels/network/connection-editor/ce-page-vpn.c:172
+#: ../panels/network/connection-editor/ce-page-wifi.c:243
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Identity"
+msgstr "认证"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:454
+msgid "Netmask"
+msgstr "网络掩码"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:216
+#: ../panels/network/connection-editor/ce-page-ip4.c:467
+#: ../panels/network/connection-editor/ce-page-ip6.c:217
+#: ../panels/network/connection-editor/ce-page-ip6.c:475
+#: ../panels/network/network-vpn.ui.h:3
+msgid "Gateway"
+msgstr "网关"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:233
+#: ../panels/network/connection-editor/ce-page-ip6.c:234
+#| msgid "IP Address"
+msgid "Delete Address"
+msgstr "删除地址"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:285
+#: ../panels/network/connection-editor/ce-page-ip6.c:286
+#| msgid "_Add"
+msgid "Add"
+msgstr "添加"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:350
+#: ../panels/network/connection-editor/ce-page-ip6.c:354
+msgid "Server"
+msgstr "服务器"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:367
+#: ../panels/network/connection-editor/ce-page-ip6.c:371
+#| msgid "Delete device"
+msgid "Delete DNS Server"
+msgstr "删除 DNS 服务器"
+
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ce-page-ip4.c:481
+#: ../panels/network/connection-editor/ce-page-ip6.c:489
+#| msgid "Metric"
+msgctxt "network parameters"
+msgid "Metric"
+msgstr "公制"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:502
+#: ../panels/network/connection-editor/ce-page-ip6.c:510
+#| msgid "Default Route"
+msgid "Delete Route"
+msgstr "删除路由"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:616
+#: ../panels/network/network-wifi.ui.h:26
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic (DHCP)"
+msgstr "自动(DHCP)"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:620
+#: ../panels/network/connection-editor/ce-page-ip6.c:622
+#: ../panels/network/network-wifi.ui.h:25
+#| msgctxt "proxy method"
+#| msgid "Manual"
+msgid "Manual"
+msgstr "手动"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:624
+#: ../panels/network/connection-editor/ce-page-ip6.c:626
+msgid "Link-Local Only"
+msgstr "仅本地连接"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:925
+#: ../panels/network/network-wifi.ui.h:60
+msgid "IPv4"
+msgstr "IPv4"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:458
+msgid "Prefix"
+msgstr "前缀"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:614
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic"
+msgstr "自动"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:618
+#| msgid "A_utomatic Login"
+msgid "Automatic, DHCP only"
+msgstr "自动,仅 DHCP"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:886
+#: ../panels/network/network-wifi.ui.h:61
+msgid "IPv6"
+msgstr "IPv6"
+
+#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/network-wifi.ui.h:63
+msgid "Reset"
+msgstr "重置"
+
+#: ../panels/network/connection-editor/ce-page-security.c:250
+#| msgid "None"
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "无"
+
+#: ../panels/network/connection-editor/ce-page-security.c:273
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-bit 密钥(Hex 或者 ASCII)"
+
+#: ../panels/network/connection-editor/ce-page-security.c:283
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit 密码"
+
+#: ../panels/network/connection-editor/ce-page-security.c:296
+#: ../panels/network/wireless-security/wireless-security.c:409
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../panels/network/connection-editor/ce-page-security.c:309
+msgid "Dynamic WEP (802.1x)"
+msgstr "动态 WEP (802.1x)"
+
+#: ../panels/network/connection-editor/ce-page-security.c:323
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 个人"
+
+#: ../panels/network/connection-editor/ce-page-security.c:337
+#| msgid "Enterprise"
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 企业"
+
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+#| msgid "Supply"
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#: ../panels/network/connection-editor/details-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:2
+#| msgid "Strength"
+msgid "Signal Strength"
+msgstr "信号强度"
+
+#: ../panels/network/connection-editor/details-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:3
+msgid "Link speed"
+msgstr "连接速度"
+
+#: ../panels/network/connection-editor/details-page.ui.h:4
+#: ../panels/network/net-device-ethernet.c:159
+#: ../panels/network/network-simple.ui.h:2
+#: ../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:160
+#: ../panels/network/net-device-ethernet.c:164
+#: ../panels/network/network-mobile.ui.h:4
+#: ../panels/network/network-simple.ui.h:3
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+msgid "IPv6 Address"
+msgstr "IPv6 地址"
+
+#: ../panels/network/connection-editor/details-page.ui.h:6
+#: ../panels/network/net-device-ethernet.c:167
+#: ../panels/network/network-simple.ui.h:1
+#: ../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:171
+#: ../panels/network/network-mobile.ui.h:5
+#: ../panels/network/network-simple.ui.h:4
+#: ../panels/network/network-wifi.ui.h:8
+msgid "Default Route"
+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:173
+#: ../panels/network/network-mobile.ui.h:6
+#: ../panels/network/network-simple.ui.h:5
+#: ../panels/network/network-wifi.ui.h:9
+msgid "DNS"
+msgstr "DNS"
+
+#: ../panels/network/connection-editor/details-page.ui.h:9
+#| msgid "Last used"
+msgid "Last Used"
+msgstr "上次使用"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#| msgid "%d Mb/s"
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#| msgid "%d Mb/s"
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:10
+#: ../panels/network/connection-editor/vpn-page.ui.h:1
+msgid "_Name"
+msgstr "名称(_N)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:11
+#: ../panels/network/connection-editor/wifi-page.ui.h:4
+#: ../panels/network/network-wifi.ui.h:49
+msgid "_MAC Address"
+msgstr "_MAC 地址"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+msgid "M_TU"
+msgstr "M_TU"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:13
+#: ../panels/network/connection-editor/wifi-page.ui.h:5
+msgid "_Cloned Address"
+msgstr "克隆的地址"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: ../panels/network/connection-editor/wifi-page.ui.h:6
+msgid "Connect _automatically"
+msgstr "自动连接(_A)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:15
+msgid "Make available to other _users"
+msgstr "对其它用户可用(_U)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:16
+msgid "bytes"
+msgstr "字节"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:23
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:24
+msgid "_Addresses"
+msgstr "地址(_A)"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+msgid "Automatic DNS"
+msgstr "自动 DNS"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/network-wifi.ui.h:39
+msgid "Routes"
+msgstr "路由"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Automatic Routes"
+msgstr "自动路由"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/network/network-wifi.ui.h:45
+msgid "Use this connection _only for resources on its network"
+msgstr "仅对此网络上的资源使用此连接(_O)"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:47
+msgid "IPv_6"
+msgstr "IPv_6"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:267
+msgid "Unable to open connection editor"
+msgstr "蓝牙连接失败"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:282
+msgid "New Profile"
+msgstr "无配置"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/user-accounts/um-account-dialog.c:1068
+msgid "_Add"
+msgstr "添加(_A)"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:586
+#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+msgid "VPN"
+msgstr "VPN"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:587
+msgid "Bond"
+msgstr "绑定"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:588
+msgid "Bridge"
+msgstr "桥接"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:589
+msgid "VLAN"
+msgstr "虚拟局域网"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:739
+msgid "Could not load VPN plugins"
+msgstr "无法装入 VPN 插件"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:803
+msgid "Import from file…"
+msgstr "从文件导入..."
+
+#: ../panels/network/connection-editor/net-connection-editor.c:870
+msgid "Add Network Connection"
+msgstr "添加网络连接"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:53
+msgid "_Reset"
+msgstr "重置(_R)"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:2
+#: ../panels/network/net-device-wifi.c:1411
+#: ../panels/network/network-wifi.ui.h:54
+msgid "_Forget"
+msgstr "忘记(_F)"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:3
+msgid ""
+"Reset the settings for this network, including passwords, but remember it as "
+"a preferred network"
+msgstr "重置这个网络包括密码在内的设置,但记住它是首选的网络"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:4
+msgid ""
+"Remove all details relating to this network and do not try to automatically "
+"connect"
+msgstr "删除与这个网络有关的所有细节,并不再尝试自动连接"
+
+#: ../panels/network/connection-editor/security-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:14
+msgid "S_ecurity"
+msgstr "安全性(_E)"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:205
+msgid "Cannot import VPN connection"
+msgstr "无法导入 VPN 连接"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:207
 #, c-format
 msgid ""
-"Network details for %s including password and any custom configuration will "
-"be lost."
-msgstr "网络 %s 包括密码和全部自定义设置的细节都将丢失。"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
+"\n"
+"Error: %s."
+msgstr ""
+"文件“%s”无法读取或者不包含可以识别的 VPN 连接信息\n"
+"\n"
+"错误:%s。"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:242
+msgid "Select file to import"
+msgstr "选择要导入的文件"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:294
+msgid "A file named \"%s\" already exists."
+msgstr "名为“%s”的文件已存在。"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:296
+msgid "_Replace"
+msgstr "替换(_R)"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:298
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr "您要用正在保存的 VPN 连接替换 %s 么?"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:334
+msgid "Cannot export VPN connection"
+msgstr "无法导入 VPN 连接"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:336
+#, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+"无法导出 VPN 连接“%s”到 %s。\n"
+"\n"
+"错误:%s。"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:371
+msgid "Export VPN connection..."
+msgstr "导出 VPN 连接..."
+
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
+msgid "(Error: unable to load VPN connection editor)"
+msgstr "(错误:无法载入 VPN 连接编辑器)"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:12
+msgid "_SSID"
+msgstr "_SSID"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:13
+msgid "_BSSID"
+msgstr "_BSSID"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:16
+msgid "My Home Network"
+msgstr "家庭网络"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:7
+msgid "Make available to _other users"
+msgstr "对于其它用户可用(_O)"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "网络"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Control how you connect to the Internet"
+msgstr "控制如何连接到互联网。"
+
+#. Translators: those are keywords for the network control-center panel
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+msgstr ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;网络;"
+"无线;蓝牙;宽带;上网;"
+
+#: ../panels/network/net-device-bond.c:77
+msgid "Bond slaves"
+msgstr ""
+
+#: ../panels/network/net-device-bridge.c:77
+msgid "Bridge slaves"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:971
-msgid "Forget"
-msgstr "忘记"
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:465
+msgid "never"
+msgstr "从不"
+
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:475
+msgid "today"
+msgstr "今天"
+
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:477
+msgid "yesterday"
+msgstr "昨天"
 
-#: ../panels/network/net-device-wifi.c:1554
+#: ../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:178
+#: ../panels/network/network-wifi.ui.h:10
+msgid "Last used"
+msgstr "上次使用的"
+
+#: ../panels/network/net-device-ethernet.c:337
+#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/network-ethernet.ui.h:2
+#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+msgid "Options…"
+msgstr "选项…"
+
+#: ../panels/network/net-device-ethernet.c:472
+msgid "Profile %d"
+msgstr "配置 %d"
+
+#: ../panels/network/net-device-mobile.c:241
+msgid "Add new connection"
+msgstr "添加新连接"
+
+#: ../panels/network/net-device-wifi.c:1120
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
-msgstr ""
-"如果您有除无线网络以外的方式连接到互联网,您可以将它与其他人分享。"
+msgstr "如果您有除无线网络以外的方式连接到互联网,您可以将它与其他人分享。"
 
-#: ../panels/network/net-device-wifi.c:1558
+#: ../panels/network/net-device-wifi.c:1124
 #, 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:1562
+#: ../panels/network/net-device-wifi.c:1128
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "启用热点模式时无法通过无线网络访问互联网。"
 
-#: ../panels/network/net-device-wifi.c:1628
+#: ../panels/network/net-device-wifi.c:1202
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户?"
 
-#: ../panels/network/net-device-wifi.c:1631
+#: ../panels/network/net-device-wifi.c:1205
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
+#: ../panels/network/net-device-wifi.c:1277
+msgid "System policy prohibits use as a Hotspot"
+msgstr "设备策略禁止用于热点"
+
+#: ../panels/network/net-device-wifi.c:1280
+msgid "Wireless device does not support Hotspot mode"
+msgstr "无线设备不支持热点模式"
+
+#: ../panels/network/net-device-wifi.c:1407
+#| msgid ""
+#| "Network details for %s including password and any custom configuration "
+#| "will be lost."
+msgid ""
+"Network details for the selected networks, including passwords and any "
+"custom configuration will be lost."
+msgstr "所选网络的细节,包括密码和全部自定义设置,都将丢失。"
+
+#: ../panels/network/net-device-wifi.c:1714
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+msgid "History"
+msgstr "历史"
+
+#. translators: This is the label for the "Forget wireless network" functionality
+#: ../panels/network/net-device-wifi.c:1726
+msgctxt "Wi-Fi Network"
+msgid "_Forget"
+msgstr "忘记(_F)"
+
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
 #: ../panels/network/net-proxy.c:67
 msgid ""
@@ -1812,10 +2711,14 @@ msgstr "若未提供配置 URL,将使用网络代理自动发现。"
 msgid "This is not recommended for untrusted public networks."
 msgstr "对于不可信的公共网络,不建议这样做。"
 
-#: ../panels/network/net-proxy.c:406
+#: ../panels/network/net-proxy.c:408
 msgid "Proxy"
 msgstr "代理"
 
+#: ../panels/network/network-ethernet.ui.h:1
+msgid "_Add Profile…"
+msgstr "添加配置(_A)"
+
 #: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
@@ -1824,34 +2727,10 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "提供商"
 
-#: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:644 ../panels/network/panel-common.c:646
-#: ../panels/printers/printers.ui.h:13
-msgid "IP Address"
-msgstr "IP 地址"
-
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:14 ../panels/network/panel-common.c:642
-msgid "IPv6 Address"
-msgstr "IPv6 地址"
-
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:15
-msgid "Default Route"
-msgstr "默认路由"
-
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:5
-#: ../panels/network/network-wifi.ui.h:16
-msgid "DNS"
-msgstr "DNS"
-
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:6
-msgid "_Options..."
-msgstr "选项(_O)..."
+#: ../panels/network/network-simple.ui.h:7
+msgid "_Options…"
+msgstr "选项(_O)…"
 
 #: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
 msgctxt "proxy method"
@@ -1896,32 +2775,38 @@ msgstr "_Socks 主机"
 msgid "_Ignore Hosts"
 msgstr "忽略主机(_I)"
 
-#: ../panels/network/network-simple.ui.h:1
-#: ../panels/network/network-wifi.ui.h:9
-msgid "Hardware Address"
-msgstr "硬件地址"
+#: ../panels/network/network-proxy.ui.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP 代理端口"
 
-#: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:13 ../panels/network/panel-common.c:641
-msgid "IPv4 Address"
-msgstr "IPv4 地址"
+#: ../panels/network/network-proxy.ui.h:12
+msgid "HTTPS proxy port"
+msgstr "HTTPS 代理端口"
+
+#: ../panels/network/network-proxy.ui.h:13
+msgid "FTP proxy port"
+msgstr "FTP 代理端口"
+
+#: ../panels/network/network-proxy.ui.h:14
+msgid "Socks proxy port"
+msgstr "SOCKS 代理端口"
+
+#: ../panels/network/network-simple.ui.h:6
+msgid "Turn device off"
+msgstr "设备关闭"
 
 #: ../panels/network/network.ui.h:1
 msgid "Select the interface to use for the new service"
 msgstr "选择用于新服务的接口"
 
 #: ../panels/network/network.ui.h:2
-msgid "C_reate..."
+msgid "C_reate…"
 msgstr "创建(_R)..."
 
 #: ../panels/network/network.ui.h:3
 msgid "_Interface"
 msgstr "接口(_I)"
 
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
-msgid "VPN"
-msgstr "VPN"
-
 #: ../panels/network/network.ui.h:8
 msgid "Add Device"
 msgstr "添加设备"
@@ -1930,10 +2815,6 @@ msgstr "添加设备"
 msgid "VPN Type"
 msgstr "VPN 类型"
 
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Gateway"
-msgstr "网关"
-
 #: ../panels/network/network-vpn.ui.h:4
 msgid "Group Name"
 msgstr "组名称"
@@ -1943,408 +2824,871 @@ msgid "Group Password"
 msgstr "组密码"
 
 #: ../panels/network/network-vpn.ui.h:6
+#: ../panels/printers/authentication-dialog.ui.h:4
 msgid "Username"
 msgstr "用户名"
 
 #: ../panels/network/network-vpn.ui.h:7
-msgid "_Configure..."
-msgstr "配置(_C)..."
+msgid "Turn VPN connection off"
+msgstr "关闭 VPN 连接"
 
 #: ../panels/network/network-wifi.ui.h:1
-msgid "Wi-Fi Hotspot"
-msgstr "Wi-Fi 热点"
+msgid "Automatic _Connect"
+msgstr "自动连接(_C)"
 
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Turn On"
-msgstr "开启(_T)"
+#: ../panels/network/network-wifi.ui.h:11
+msgid "details"
+msgstr "详细信息"
 
-#: ../panels/network/network-wifi.ui.h:3
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
+#: ../panels/network/network-wifi.ui.h:15
+#: ../panels/network/wireless-security/eap-method-leap.ui.h:2
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
+#: ../panels/network/wireless-security/ws-leap.ui.h:2
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+msgid "_Password"
+msgstr "密码(_P)"
 
-#: ../panels/network/network-wifi.ui.h:4
-msgid "_Use as Hotspot..."
-msgstr "用作热点(_U)..."
+#: ../panels/network/network-wifi.ui.h:18
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "无"
 
-#: ../panels/network/network-wifi.ui.h:5
-msgid "_Connect to Hidden Network..."
-msgstr "连接到隐藏网络(_C)..."
+#: ../panels/network/network-wifi.ui.h:19
+msgid "blablabla"
+msgstr "blablabla"
 
-#: ../panels/network/network-wifi.ui.h:6
-msgid "_Disconnect"
-msgstr "断开连接(_D)"
+#: ../panels/network/network-wifi.ui.h:20
+msgid "Show P_assword"
+msgstr "显示密码(_A)"
 
-#: ../panels/network/network-wifi.ui.h:7
-msgid "_Connect"
-msgstr "连接(_C)"
+#: ../panels/network/network-wifi.ui.h:21
+msgid "Make available to other users"
+msgstr "对其他用户有效"
 
-#: ../panels/network/network-wifi.ui.h:8
-msgid "Last used"
-msgstr "上次使用的"
+#: ../panels/network/network-wifi.ui.h:22
+msgid "identity"
+msgstr "认证"
 
-#: ../panels/network/network-wifi.ui.h:10
-msgid "Security"
-msgstr "安全性"
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP) addresses only"
+msgstr "自动(DHCP) 仅地址"
 
-#: ../panels/network/network-wifi.ui.h:11
-msgid "Strength"
-msgstr "强度"
+#: ../panels/network/network-wifi.ui.h:28
+msgid "Link-local only"
+msgstr "仅本地连接"
 
-#: ../panels/network/network-wifi.ui.h:12
-msgid "Link speed"
-msgstr "连接速度"
+#: ../panels/network/network-wifi.ui.h:29
+msgid "Shared with other computers"
+msgstr "与其它计算机共享"
 
-#: ../panels/network/network-wifi.ui.h:17
-msgid "_Forget Network"
-msgstr "忘记网络(_F)"
+#: ../panels/network/network-wifi.ui.h:31
+msgid ""
+"Address\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"网络\n"
+"部分\n"
+"放在\n"
+"这里"
 
-#: ../panels/network/network-wifi.ui.h:18
-msgid "_Settings..."
-msgstr "设置(_S)..."
+#: ../panels/network/network-wifi.ui.h:35
+msgid ""
+"DNS\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"DNS\n"
+"部分\n"
+"放在\n"
+"这里"
 
-#: ../panels/network/network-wifi.ui.h:19
+#: ../panels/network/network-wifi.ui.h:40
+msgid ""
+"Routes\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"路由\n"
+"部分\n"
+"放在\n"
+"这里"
+
+#: ../panels/network/network-wifi.ui.h:44
+msgid "_Ignore automatically obtained routes"
+msgstr "忽略自动获取的路由(_I)"
+
+#: ../panels/network/network-wifi.ui.h:46
+msgid "ipv4"
+msgstr "ipv4"
+
+#: ../panels/network/network-wifi.ui.h:48
+msgid "ipv6"
+msgstr "ipv6"
+
+#: ../panels/network/network-wifi.ui.h:50
+msgid "_Cloned MAC Address"
+msgstr "克隆的 MAC 地址(_C)"
+
+#: ../panels/network/network-wifi.ui.h:51
+msgid "00:24:16:31:8G:7A"
+msgstr "00:24:16:31:8G:7A"
+
+#: ../panels/network/network-wifi.ui.h:52
+msgid "hardware"
+msgstr "硬件"
+
+#: ../panels/network/network-wifi.ui.h:55
+msgid ""
+"Reset the settings for this connection to their defaults, but remember as a "
+"preferred connection."
+msgstr "将这个连接的设置重置为默认值,但记住它是首选连接。"
+
+#: ../panels/network/network-wifi.ui.h:56
+msgid ""
+"Remove all details relating to this network and do not try to automatically "
+"connect to it."
+msgstr "删除关于这个网络的所有细节,并不再试图自动连接。"
+
+#: ../panels/network/network-wifi.ui.h:57
+msgid "reset"
+msgstr "重置"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "Hardware"
+msgstr "硬件"
+
+#: ../panels/network/network-wifi.ui.h:64
+msgid "Wi-Fi Hotspot"
+msgstr "Wi-Fi 热点"
+
+#: ../panels/network/network-wifi.ui.h:65
+msgid "_Turn On"
+msgstr "开启(_T)"
+
+#: ../panels/network/network-wifi.ui.h:66
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:67
+msgid "Turn Wi-Fi off"
+msgstr "关闭 Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:68
+msgid "_Use as Hotspot…"
+msgstr "用作热点(_U)…"
+
+#: ../panels/network/network-wifi.ui.h:69
+msgid "_Connect to Hidden Network…"
+msgstr "连接到隐藏网络(_C)…"
+
+#: ../panels/network/network-wifi.ui.h:70
+msgid "_History"
+msgstr "历史(_H)"
+
+#: ../panels/network/network-wifi.ui.h:71
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "关闭以连接到 Wi-Fi 网络"
 
-#: ../panels/network/network-wifi.ui.h:20
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "网络名称"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "已连接的设备"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "加密类型"
 
-#: ../panels/network/network-wifi.ui.h:23
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "安全密钥"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:124
+#: ../panels/network/panel-common.c:131
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:128
+#: ../panels/network/panel-common.c:135
 msgid "Infrastructure"
 msgstr "架构"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:152 ../panels/network/panel-common.c:213
+#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
 msgid "Status unknown"
 msgstr "未知状态"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:156
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "未托管"
 
-#: ../panels/network/panel-common.c:161
-msgid "Firmware missing"
-msgstr "固件缺失"
-
-#: ../panels/network/panel-common.c:164
-msgid "Cable unplugged"
-msgstr "线缆被拔出"
-
-#: ../panels/network/panel-common.c:166
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "不可用"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:170
-msgid "Disconnected"
-msgstr "已断开"
-
-#. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Connecting"
 msgstr "正在连接"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Authentication required"
 msgstr "需要认证"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connected"
 msgstr "已连接"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:189
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "正在断开"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:193 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
 msgid "Connection failed"
 msgstr "连接失败"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:197 ../panels/network/panel-common.c:239
+#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
 msgid "Status unknown (missing)"
 msgstr "未知状态(丢失)"
 
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:227
+msgid "Not connected"
+msgstr "未连接"
+
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:259
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:263
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "IP 配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:267
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "IP 配置过期"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:271
+#: ../panels/network/panel-common.c:264
 msgid "Secrets were required, but not provided"
 msgstr "需要认证凭据,但没有提供"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:275
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x 客户端已断开"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:279
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x 客户端配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:283
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr "802.1x 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:287
+#: ../panels/network/panel-common.c:280
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x 客户端认证耗时过长"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:291
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "PPP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:295
+#: ../panels/network/panel-common.c:288
 msgid "PPP service disconnected"
 msgstr "PPP 服务已断开"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:299
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "PPP 失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:303
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client failed to start"
 msgstr "DHCP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:307
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "DHCP 客户端错误"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:311
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:315
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed to start"
 msgstr "共享连接服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:319
+#: ../panels/network/panel-common.c:312
 msgid "Shared connection service failed"
 msgstr "共享连接服务失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:323
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service failed to start"
 msgstr "自动 IP(AutoIP) 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:327
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "自动 IP(AutoIP) 服务出错"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:331
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "自动 IP(AutoIP) 服务失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:335
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "线路忙"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:339
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "无拨号音"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:343
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr "无法建立载波"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:347
+#: ../panels/network/panel-common.c:340
 msgid "Dialing request timed out"
 msgstr "拨号请求超时"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:351
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "拨号尝试失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:355
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "调制解调器初始化失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:359
+#: ../panels/network/panel-common.c:352
 msgid "Failed to select the specified APN"
 msgstr "无法选择指定的 APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:363
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "不搜索网络"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:367
+#: ../panels/network/panel-common.c:360
 msgid "Network registration denied"
 msgstr "网络注册遭拒绝"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:371
+#: ../panels/network/panel-common.c:364
 msgid "Network registration timed out"
 msgstr "网络注册超时"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:375
+#: ../panels/network/panel-common.c:368
 msgid "Failed to register with the requested network"
 msgstr "无法在请求的网络上注册"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:379
+#: ../panels/network/panel-common.c:372
 msgid "PIN check failed"
 msgstr "PIN 检查未通过"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:383
+#: ../panels/network/panel-common.c:376
 msgid "Firmware for the device may be missing"
 msgstr "可能缺少设备固件"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:387
+#: ../panels/network/panel-common.c:380
 msgid "Connection disappeared"
 msgstr "连接丢失"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:391
-msgid "Carrier/link changed"
-msgstr "载波/连接已更改"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:395
+#: ../panels/network/panel-common.c:384
 msgid "Existing connection was assumed"
 msgstr "已假定为现有连接"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:399
+#: ../panels/network/panel-common.c:388
 msgid "Modem not found"
 msgstr "未找到调制解调器"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:403
+#: ../panels/network/panel-common.c:392
 msgid "Bluetooth connection failed"
 msgstr "蓝牙连接失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:407
+#: ../panels/network/panel-common.c:396
 msgid "SIM Card not inserted"
 msgstr "未插入 SIM 卡"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:411
+#: ../panels/network/panel-common.c:400
 msgid "SIM Pin required"
 msgstr "要求 SIM PIN 码"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:415
+#: ../panels/network/panel-common.c:404
 msgid "SIM Puk required"
 msgstr "要求 SIM PUK 码"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:419
+#: ../panels/network/panel-common.c:408
 msgid "SIM wrong"
 msgstr "SIM 错误"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:423
+#: ../panels/network/panel-common.c:412
 msgid "InfiniBand device does not support connected mode"
 msgstr "高速互联设备不支持已连接模式"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:427
+#: ../panels/network/panel-common.c:416
 msgid "Connection dependency failed"
 msgstr "连接依赖失败"
 
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "固件缺失"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+msgid "Cable unplugged"
+msgstr "线缆被拔出"
+
+#: ../panels/network/wireless-security/eap-method.c:275
+msgid "No Certificate Authority certificate chosen"
+msgstr "没有选择证书颁发机构的证书"
+
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid ""
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
+msgstr ""
+"不使用认证机构(CA)认证可能会造成连接不安全,危害 Wi-Fi 网络。您要选择一个认证"
+"机构进行认证吗?"
+
+#: ../panels/network/wireless-security/eap-method.c:281
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../panels/network/wireless-security/eap-method.c:285
+msgid "Choose CA Certificate"
+msgstr "选择 CA 证书"
+
+#: ../panels/network/wireless-security/eap-method.c:645
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr "DER、PEM 或者 PKCS#12 私钥(*.der、*.pem、*.p12)"
+
+#: ../panels/network/wireless-security/eap-method.c:648
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER 或者 PEM 证书(*.der、*.pem、*.crt、*.cer)"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:261
+#: ../panels/network/wireless-security/eap-method-peap.c:280
+msgid "GTC"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:277
+#: ../panels/network/wireless-security/eap-method-peap.c:246
+#: ../panels/network/wireless-security/eap-method-ttls.c:263
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "选择一个 PAC 文件..."
+
+#: ../panels/network/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC 文件(*.pac)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+#| msgid "All files"
+msgid "PAC _file"
+msgstr "PAC 文件(_F)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#| msgid "Authentication failed"
+msgid "_Inner authentication"
+msgstr "内部认证(_I)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+msgid "PAC pro_visioning"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "Anonymous"
+msgstr "匿名"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#| msgid "Authentication failed"
+msgid "Authenticated"
+msgstr "已认证"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Both"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
+#: ../panels/network/wireless-security/ws-leap.ui.h:1
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+msgid "_Username"
+msgstr "用户名(_U)"
+
+#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/ws-leap.ui.h:3
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+msgid "Sho_w password"
+msgstr "显示密码(_W)"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:263
+#: ../panels/network/wireless-security/wireless-security.c:385
+msgid "MD5"
+msgstr "MD5"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:350
+#: ../panels/network/wireless-security/eap-method-tls.c:434
+#: ../panels/network/wireless-security/eap-method-ttls.c:350
+msgid "Choose a Certificate Authority certificate..."
+msgstr "选择一个证书颁发机构证书..."
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr "版本 0"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr "版本 1"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate"
+msgstr "C_A 证书"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+msgid "PEAP _version"
+msgstr "PEAP 版本(_V)"
+
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+msgid "As_k for this password every time"
+msgstr "每次询问密码(_K)"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:260
+msgid "Unencrypted private keys are insecure"
+msgstr "未加密的私钥是不安全的"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:263
+msgid ""
+"The selected private key does not appear to be protected by a password.  "
+"This could allow your security credentials to be compromised.  Please select "
+"a password-protected private key.\n"
+"\n"
+"(You can password-protect your private key with openssl)"
+msgstr ""
+"选择的私钥似乎没有密码进行保护。这可能会让您的私有证书被攻破。请选择一个有密"
+"码保护的私钥。\n"
+"\n"
+"(您可以使用 openssl 来对私钥进行密码保护)"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:428
+msgid "Choose your personal certificate..."
+msgstr "选择您的个人证书..."
+
+#: ../panels/network/wireless-security/eap-method-tls.c:440
+msgid "Choose your private key..."
+msgstr "选择您的私钥..."
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity"
+msgstr "认证(_D)"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate"
+msgstr "用户证书(_U)"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+msgid "Private _key"
+msgstr "私钥(_K)"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+msgid "_Private key password"
+msgstr "私钥密码(_P)"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:230
+msgid "PAP"
+msgstr "PAP"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:280
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr "不要再次警告我(_W)"
+
+#: ../panels/network/wireless-security/wireless-security.c:397
+msgid "TLS"
+msgstr "TLS"
+
+#: ../panels/network/wireless-security/wireless-security.c:421
+msgid "FAST"
+msgstr "FAST"
+
+#: ../panels/network/wireless-security/wireless-security.c:432
+msgid "Tunneled TLS"
+msgstr "隧道 TLS"
+
+#: ../panels/network/wireless-security/wireless-security.c:443
+msgid "Protected EAP (PEAP)"
+msgstr "受保护的 EAP(PEAP)"
+
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#| msgid "Authentication failed"
+msgid "Au_thentication"
+msgstr "认证(_T)"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+#| msgid "Default"
+msgid "1 (Default)"
+msgstr "1 (默认)"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#| msgid "System"
+msgid "Open System"
+msgstr "开放系统"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "共享密钥"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key"
+msgstr "密钥(_K)"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr "显示密钥(_W)"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+#| msgid "_Type:"
+msgid "_Type"
+msgstr "类型(_T)"
+
+#. TRANSLATORS: this is the per application switch for message tray usage.
+#: ../panels/notifications/cc-edit-dialog.c:39
+#| msgid "Magnification:"
+msgctxt "notifications"
+msgid "Notifications"
+msgstr "通知"
+
+#. TRANSLATORS: this is the setting to configure sounds associated with notifications
+#: ../panels/notifications/cc-edit-dialog.c:41
+#| msgid "Sound Effects"
+msgctxt "notifications"
+msgid "Sound Alerts"
+msgstr "声音警告"
+
+#: ../panels/notifications/cc-edit-dialog.c:42
+msgctxt "notifications"
+msgid "Show Popup Banners"
+msgstr "显示弹出条"
+
+#. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
+#: ../panels/notifications/cc-edit-dialog.c:44
+msgctxt "notifications"
+msgid "Show Details in Banners"
+msgstr "在条幅中显示细节"
+
+#: ../panels/notifications/cc-edit-dialog.c:45
+#| msgid "Lock screen"
+msgctxt "notifications"
+msgid "View in Lock Screen"
+msgstr "在锁定屏幕中查看"
+
+#: ../panels/notifications/cc-edit-dialog.c:46
+msgctxt "notifications"
+msgid "Show Details in Lock Screen"
+msgstr "在锁定屏幕中显示细节"
+
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
+msgid "On"
+msgstr "开"
+
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
+msgid "Off"
+msgstr "关"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
+#| msgid "Magnification:"
+msgid "Notifications"
+msgstr "通知"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "Control which notifications are displayed and what they show"
+msgstr "控制显示何种通知以及显示什么内容"
+
+#. Translators: those are keywords for the notifications control-center panel
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+msgid "Notifications;Banner;Message;Tray;Popup;"
+msgstr ""
+"Notifications;Banner;Message;Tray;Popup;通知;横幅;条幅;黑条;消息;托盘;弹出;"
+
+#: ../panels/notifications/notifications.ui.h:1
+msgid "Show Pop Up Banners"
+msgstr "显示弹出条幅"
+
+#: ../panels/notifications/notifications.ui.h:2
+#| msgid "Lock screen"
+msgid "Show in Lock Screen"
+msgstr "在锁屏显示"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:190
+#: ../panels/region/cc-input-chooser.c:997
+#: ../panels/search/cc-search-locations-dialog.c:480
+#| msgid "Other..."
+msgid "Other"
+msgstr "其他"
+
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:249
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "添加账户"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:371
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:329
+#| msgid "_Mail"
+msgid "Mail"
+msgstr "邮件"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:335
+#| msgid "Contrast:"
+msgid "Contacts"
+msgstr "联系人"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:341
+msgid "Resources"
+msgstr "资源"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:358
 msgid "Error logging into the account"
 msgstr "登录到该账户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:425
-msgid "Expired credentials. Please log in again."
-msgstr "证书过期。请重新登录。"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:430
+msgid "Credentials have expired."
+msgstr "证书已经过期"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:434
+#| msgid "Enable this account"
+msgid "Sign in to enable this account."
+msgstr "登入启用此账户。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:428
-msgid "_Log In"
-msgstr "登录(_L)"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:439
+msgid "_Sign In"
+msgstr "登入(_S)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:664
+#: ../panels/online-accounts/cc-online-accounts-panel.c:680
 msgid "Error creating account"
 msgstr "创建账户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:706
+#: ../panels/online-accounts/cc-online-accounts-panel.c:722
 msgid "Error removing account"
 msgstr "移除账户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:742
+#: ../panels/online-accounts/cc-online-accounts-panel.c:758
 msgid "Are you sure you want to remove the account?"
 msgstr "您确定要移除该账户吗?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:744
+#: ../panels/online-accounts/cc-online-accounts-panel.c:760
 msgid "This will not remove the account on the server."
 msgstr "这不会将该账户从服务器上移除。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:745
+#: ../panels/online-accounts/cc-online-accounts-panel.c:761
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -2353,15 +3697,15 @@ msgid "Online Accounts"
 msgstr "在线账户"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "Manage online accounts"
-msgstr "管理在线账户"
+msgid "Connect to your online accounts and decide what to use them for"
+msgstr "连接在线账户并决定如何使用"
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
 msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
 msgstr ""
-"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;网络;在"
-"线;聊天;日历;邮件;联系人;"
+"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;谷歌;脸"
+"谱;脸书;推特;雅虎;微博;网络;在线;聊天;日历;邮件;联系人;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -2383,17 +3727,17 @@ msgid ""
 msgstr ""
 "添加一个账户,让您的应用程序访问账户的文档、邮件、联系人、日历、聊天等等。"
 
-#: ../panels/power/cc-power-panel.c:157
+#: ../panels/power/cc-power-panel.c:184
 msgid "Unknown time"
 msgstr "未知时间"
 
-#: ../panels/power/cc-power-panel.c:163
+#: ../panels/power/cc-power-panel.c:190
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分钟"
 
-#: ../panels/power/cc-power-panel.c:175
+#: ../panels/power/cc-power-panel.c:202
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2401,189 +3745,253 @@ 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:183
+#: ../panels/power/cc-power-panel.c:210
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:184
+#: ../panels/power/cc-power-panel.c:211
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "时"
 
-#: ../panels/power/cc-power-panel.c:185
+#: ../panels/power/cc-power-panel.c:212
 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:228
-#, c-format
-msgid "Charging - %s until fully charged"
+#: ../panels/power/cc-power-panel.c:231
+#, fuzzy, c-format
+#| msgid "Charging - %s until fully charged"
+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:238
 #, c-format
-msgid "Caution low battery, %s remaining"
-msgstr "电池电量低,剩余 %s"
+#| msgid "Caution low UPS, %s remaining"
+msgid "Caution: %s remaining"
+msgstr "注意:剩余 %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:244
+#: ../panels/power/cc-power-panel.c:243
 #, c-format
-msgid "Using battery power - %s remaining"
-msgstr "使用电池 - 剩余 %s"
+msgid "%s remaining"
+msgstr "剩余 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:261
-msgid "Charging"
-msgstr "正在充电"
+#: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
+#| msgid "Full Screen"
+msgid "Fully charged"
+msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:266
-msgid "Using battery power"
-msgstr "使用电池"
+#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
+msgid "Empty"
+msgstr "电池已空"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
-msgid "Charging - fully charged"
-msgstr "充电完成"
+#: ../panels/power/cc-power-panel.c:267
+msgid "Charging"
+msgstr "正在充电"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:274
-msgid "Empty"
-msgstr "电池已空"
+#: ../panels/power/cc-power-panel.c:272
+#| msgid "UPS discharging"
+msgid "Discharging"
+msgstr "正在放电"
 
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:342
+#: ../panels/power/cc-power-panel.c:324
 #, c-format
-msgid "Caution low UPS, %s remaining"
-msgstr "UPS 电量低,剩余 %s"
+msgid "Estimated battery capacity: %s"
+msgstr "估计电池容量:%s"
 
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:348
-#, c-format
-msgid "Using UPS power - %s remaining"
-msgstr "使用 UPS - 剩余 %s"
+#: ../panels/power/cc-power-panel.c:404
+msgctxt "Battery name"
+msgid "Main"
+msgstr "主"
 
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:366
-msgid "Caution low UPS"
-msgstr "UPS 电量低"
-
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:371
-msgid "Using UPS power"
-msgstr "使用 UPS"
-
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:423
-msgid "Your secondary battery is fully charged"
-msgstr "您的辅电池已充满"
-
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:427
-msgid "Your secondary battery is empty"
-msgstr "您的辅电池已空"
+#: ../panels/power/cc-power-panel.c:406
+msgctxt "Battery name"
+msgid "Extra"
+msgstr "附加"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:510
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "无线鼠标"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:514
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "无线键盘"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:518
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "不间断电源(UPS)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:522
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "个人数字助理(PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "手机"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:530
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "媒体播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:534
+#: ../panels/power/cc-power-panel.c:518
 msgid "Tablet"
 msgstr "手写板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:538
+#: ../panels/power/cc-power-panel.c:522
 msgid "Computer"
 msgstr "计算机"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:542
+#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+#: ../panels/power/cc-power-panel.c:1938
 msgid "Battery"
 msgstr "电池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:553
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:560
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "警告"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:570
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充足"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:575
+#: ../panels/power/cc-power-panel.c:557
+#| msgid "Full Screen"
 msgctxt "Battery power"
-msgid "Charging - fully charged"
-msgstr "充电 -已充满"
+msgid "Fully charged"
+msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:579
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "空"
 
-#: ../panels/power/cc-power-panel.c:1075
-msgid ""
-"Tip: <a href=\"screen\">screen brightness</a> affects how much power is used"
-msgstr "提示:<a href=\"screen\">屏幕亮度</a>影响电量使用"
+#: ../panels/power/cc-power-panel.c:732
+#| msgid "Battery"
+msgid "Batteries"
+msgstr "电池组"
+
+#: ../panels/power/cc-power-panel.c:1074
+msgid "When _idle"
+msgstr "闲置时(_I)"
+
+#: ../panels/power/cc-power-panel.c:1401
+msgid "Power Saving"
+msgstr "省电"
+
+#: ../panels/power/cc-power-panel.c:1430
+#| msgid "Brightness"
+msgid "_Screen Brightness"
+msgstr "屏幕亮度(_S)"
+
+#: ../panels/power/cc-power-panel.c:1458
+#| msgid "_Turn screen off when inactive for:"
+msgid "_Dim Screen when Inactive"
+msgstr "无操作时屏幕变暗"
+
+#: ../panels/power/cc-power-panel.c:1481
+#| msgid "Full Screen"
+msgid "_Blank Screen"
+msgstr "空白屏幕(_B)"
+
+#: ../panels/power/cc-power-panel.c:1516
+#| msgid "Wi-Fi"
+msgid "_Wi-Fi"
+msgstr "_Wi-Fi"
+
+#: ../panels/power/cc-power-panel.c:1544
+#| msgid "Mobile broadband"
+msgid "_Mobile Broadband"
+msgstr "移动宽带(_M)"
+
+#: ../panels/power/cc-power-panel.c:1582
+#| msgid "Bluetooth"
+msgid "_Bluetooth"
+msgstr "蓝牙(_B)"
+
+#: ../panels/power/cc-power-panel.c:1633
+#| msgid "On battery power"
+msgid "When on battery power"
+msgstr "电池供电时"
+
+#: ../panels/power/cc-power-panel.c:1635
+msgid "When plugged in"
+msgstr "电源插入时"
+
+#: ../panels/power/cc-power-panel.c:1762
+msgid "Suspend & Power Off"
+msgstr "挂起和关机"
+
+#: ../panels/power/cc-power-panel.c:1793
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "_Automatic Suspend"
+msgstr "自动挂起(_A)"
+
+#: ../panels/power/cc-power-panel.c:1815
+#| msgid "When power is _critically low"
+msgid "When Battery Power is _Critical"
+msgstr "电量严重不足时(_C)"
+
+#: ../panels/power/cc-power-panel.c:1848
+#| msgid "Power off"
+msgid "Power Off"
+msgstr "电源关闭"
+
+#: ../panels/power/cc-power-panel.c:1990
+msgid "Devices"
+msgstr "设备"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "电源"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Power management settings"
-msgstr "电源管理设置"
+msgid "View your battery status and change power saving settings"
+msgstr "查看电池状态并更改省电设置"
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
-msgid "Power;Sleep;Suspend;Hibernate;Battery;"
-msgstr "Power;Sleep;Suspend;Hibernate;Battery;电源;睡眠;挂起;休眠;电池;"
+#| msgid "Power;Sleep;Suspend;Hibernate;Battery;"
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+msgstr ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"电源;睡眠;挂起;休眠;电池;亮度;暗;空白;显示器;空闲;"
 
 #: ../panels/power/power.ui.h:1
 msgid "Hibernate"
@@ -2593,223 +4001,298 @@ msgstr "休眠"
 msgid "Power off"
 msgstr "电源关闭"
 
-#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
-msgid "5 minutes"
-msgstr "5 分钟"
-
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
-msgid "10 minutes"
-msgstr "10 分钟"
-
-#: ../panels/power/power.ui.h:5 ../panels/screen/screen.ui.h:8
-msgid "30 minutes"
-msgstr "30 分钟"
+#: ../panels/power/power.ui.h:5
+#| msgid "5 minutes"
+msgid "45 minutes"
+msgstr "45 分钟"
 
-#: ../panels/power/power.ui.h:6 ../panels/screen/screen.ui.h:9
+#: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 小时"
 
 #: ../panels/power/power.ui.h:7
-msgid "Don't suspend"
-msgstr "不要挂起"
+#| msgid "10 minutes"
+msgid "80 minutes"
+msgstr "80 分钟"
 
 #: ../panels/power/power.ui.h:8
-msgid "On battery power"
-msgstr "使用电池"
+#| msgid "10 minutes"
+msgid "90 minutes"
+msgstr "90 分钟"
 
 #: ../panels/power/power.ui.h:9
-msgid "When plugged in"
-msgstr "电源插入时"
+#| msgid "10 minutes"
+msgid "100 minutes"
+msgstr "100 分钟"
 
 #: ../panels/power/power.ui.h:10
-msgid "Suspend when inactive for"
-msgstr "在此时间内无操作则挂起:"
+#| msgid "1 hour"
+msgid "2 hours"
+msgstr "2 小时"
+
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
+msgid "1 minute"
+msgstr "1 分钟"
+
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
+msgid "2 minutes"
+msgstr "2 分钟"
+
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 分钟"
+
+#: ../panels/power/power.ui.h:14
+#| msgid "5 minutes"
+msgid "4 minutes"
+msgstr "4 分钟"
 
-#: ../panels/power/power.ui.h:11
-msgid "When power is _critically low"
-msgstr "电量严重不足时(_C):"
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 分钟"
+
+#: ../panels/power/power.ui.h:16
+#| msgid "5 minutes"
+msgid "8 minutes"
+msgstr "8 分钟"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 分钟"
+
+#: ../panels/power/power.ui.h:18
+#| msgid "2 minutes"
+msgid "12 minutes"
+msgstr "12 分钟"
+
+#: ../panels/power/power.ui.h:20
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic Suspend"
+msgstr "自动挂起"
+
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
+#| msgid "Close"
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: ../panels/power/power.ui.h:22
+#| msgid "When plugged in"
+msgid "_Plugged In"
+msgstr "已插入(_P)"
+
+#: ../panels/power/power.ui.h:23
+#| msgid "On battery power"
+msgid "On _Battery Power"
+msgstr "使用电池时(_P)"
+
+#: ../panels/power/power.ui.h:24
+#| msgid "_Delay:"
+msgid "Delay"
+msgstr "延时"
+
+#: ../panels/printers/authentication-dialog.ui.h:3
+#| msgid "Authentication failed"
+msgid "Authenticate"
+msgstr "认证"
+
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/sharing/sharing.ui.h:21
+#| msgid "_Password"
+msgid "Password"
+msgstr "密码"
+
+#: ../panels/printers/authentication-dialog.ui.h:6
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "需要认证"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:589
+#: ../panels/printers/cc-printers-panel.c:591
 msgid "Low on toner"
 msgstr "墨粉不足"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:591
+#: ../panels/printers/cc-printers-panel.c:593
 msgid "Out of toner"
 msgstr "墨粉用尽"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:594
+#: ../panels/printers/cc-printers-panel.c:596
 msgid "Low on developer"
 msgstr "显影剂不足"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:597
+#: ../panels/printers/cc-printers-panel.c:599
 msgid "Out of developer"
 msgstr "显影剂用尽"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:599
+#: ../panels/printers/cc-printers-panel.c:601
 msgid "Low on a marker supply"
 msgstr "标记墨水不足"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:603
 msgid "Out of a marker supply"
 msgstr "标记墨水用尽"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:603
+#: ../panels/printers/cc-printers-panel.c:605
 msgid "Open cover"
 msgstr "打开上盖"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:607
 msgid "Open door"
 msgstr "打开后门"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:609
 msgid "Low on paper"
 msgstr "纸张不足"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:611
 msgid "Out of paper"
 msgstr "纸张用尽"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:613
 msgctxt "printer state"
 msgid "Offline"
 msgstr "离线"
 
-#. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:613
+#. Translators: Someone has stopped the Printer
+#. Translators: Printer's state (no jobs can be processed)
+#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:806
 msgctxt "printer state"
-msgid "Paused"
-msgstr "已暂停"
+msgid "Stopped"
+msgstr "已停止"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:617
 msgid "Waste receptacle almost full"
 msgstr "废粉仓将满"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:619
 msgid "Waste receptacle full"
 msgstr "废粉仓已满"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:619
+#: ../panels/printers/cc-printers-panel.c:621
 msgid "The optical photo conductor is near end of life"
 msgstr "感光鼓接近使用寿命"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:621
+#: ../panels/printers/cc-printers-panel.c:623
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光鼓无法工作"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:724
+#: ../panels/printers/cc-printers-panel.c:733
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "正在配置"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:781
+#: ../panels/printers/cc-printers-panel.c:792
 msgctxt "printer state"
 msgid "Ready"
 msgstr "就绪"
 
+#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
+#: ../panels/printers/cc-printers-panel.c:797
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "不接收任务"
+
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:785
+#: ../panels/printers/cc-printers-panel.c:802
 msgctxt "printer state"
 msgid "Processing"
 msgstr "正在处理"
 
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:789
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "已停止"
-
 # 以下几个level似乎译为“量”更好
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:906
+#: ../panels/printers/cc-printers-panel.c:923
 msgid "Toner Level"
 msgstr "碳粉量"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:909
+#: ../panels/printers/cc-printers-panel.c:926
 msgid "Ink Level"
 msgstr "墨水量"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:912
+#: ../panels/printers/cc-printers-panel.c:929
 msgid "Supply Level"
 msgstr "耗材量"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:930
+#: ../panels/printers/cc-printers-panel.c:947
 msgctxt "printer state"
 msgid "Installing"
 msgstr "正在安装"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1107
+#: ../panels/printers/cc-printers-panel.c:1124
 msgid "No printers available"
 msgstr "无可用打印机"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1411
+#: ../panels/printers/cc-printers-panel.c:1429
 #, 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:1731
+#: ../panels/printers/cc-printers-panel.c:1773
 msgid "Failed to add new printer."
 msgstr "添加新打印机失败。"
 
-#: ../panels/printers/cc-printers-panel.c:1896
+#: ../panels/printers/cc-printers-panel.c:1940
 msgid "Select PPD File"
 msgstr "选择 PPD 文件"
 
-#: ../panels/printers/cc-printers-panel.c:1905
+#: ../panels/printers/cc-printers-panel.c:1949
 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:2210
+#: ../panels/printers/cc-printers-panel.c:2254
 msgid "No suitable driver found"
 msgstr "未找到合适的驱动"
 
-#: ../panels/printers/cc-printers-panel.c:2279
-msgid "Searching for preferred drivers..."
-msgstr "正在搜索首选的驱动..."
+#: ../panels/printers/cc-printers-panel.c:2323
+#| msgid "Searching for preferred drivers..."
+msgid "Searching for preferred drivers…"
+msgstr "正在搜索首选的驱动…"
 
-#: ../panels/printers/cc-printers-panel.c:2294
-msgid "Select from database..."
-msgstr "从数据库选择..."
+#: ../panels/printers/cc-printers-panel.c:2338
+#| msgid "Select from database..."
+msgid "Select from database…"
+msgstr "从数据库选择…"
 
-#: ../panels/printers/cc-printers-panel.c:2303
-msgid "Provide PPD File..."
-msgstr "提供 PPD 文件..."
+#: ../panels/printers/cc-printers-panel.c:2347
+#| msgid "Provide PPD File..."
+msgid "Provide PPD File…"
+msgstr "提供 PPD 文件…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2454
-#: ../panels/printers/cc-printers-panel.c:2477
+#: ../panels/printers/cc-printers-panel.c:2498
+#: ../panels/printers/cc-printers-panel.c:2521
 msgid "Test page"
 msgstr "测试页"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2880
+#: ../panels/printers/cc-printers-panel.c:2929
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "无法装入界面:%s"
@@ -2819,8 +4302,8 @@ msgid "Printers"
 msgstr "打印机"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "更改打印机设置"
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr "添加打印机,查看打印任务并且管理打印"
 
 #. Translators: those are keywords for the printing control-center panel
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
@@ -2828,104 +4311,90 @@ msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr ""
 "Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;硒鼓;墨盒"
 
-#: ../panels/printers/jobs-dialog.ui.h:1
-#: ../panels/printers/options-dialog.ui.h:1
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
-msgid " "
-msgstr " "
-
+#. Translators: This dialog contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:2
-#: ../panels/printers/options-dialog.ui.h:4
+msgid "Active Jobs"
+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 "关闭"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Active Jobs"
-msgstr "活动的任务"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "恢复打印"
 
-#: ../panels/printers/jobs-dialog.ui.h:6
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Pause Printing"
 msgstr "暂停打印"
 
-#: ../panels/printers/jobs-dialog.ui.h:7
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Cancel Print Job"
 msgstr "取消打印机任务"
 
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1070
-msgid "_Add"
-msgstr "添加(_A)"
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
 msgstr "添加新打印机"
 
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-user-panel.c:467
+msgid "_Cancel"
+msgstr "取消(_C)"
+
 #: ../panels/printers/new-printer-dialog.ui.h:4
 msgid "Search for network printers or filter result"
 msgstr "搜索网络打印机或过滤结果"
 
-#: ../panels/printers/options-dialog.ui.h:2
-msgid "Options"
-msgstr "选项"
-
-#: ../panels/printers/options-dialog.ui.h:3
-msgid "Loading options..."
-msgstr "正在载入选项..."
+#: ../panels/printers/options-dialog.ui.h:1
+#| msgid "Loading options..."
+msgid "Loading options…"
+msgstr "正在载入选项…"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1069
-msgid "Cancel"
-msgstr "取消"
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid "Select Printer Driver"
+msgstr "选择打印机驱动"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "正在载入驱动数据库..."
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:5
-msgid "Select Printer Driver"
-msgstr "选择打印机驱动"
-
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:65
-#: ../panels/printers/pp-ppd-option-widget.c:69
+#: ../panels/printers/pp-ipp-option-widget.c:67
+#: ../panels/printers/pp-ppd-option-widget.c:71
 msgid "One Sided"
 msgstr "单面"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:67
-#: ../panels/printers/pp-ppd-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:69
+#: ../panels/printers/pp-ppd-option-widget.c:73
 msgid "Long Edge (Standard)"
 msgstr "长边(标准)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:69
-#: ../panels/printers/pp-ppd-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:71
+#: ../panels/printers/pp-ppd-option-widget.c:75
 msgid "Short Edge (Flip)"
 msgstr "短边(翻转)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:73
 msgid "Portrait"
 msgstr "纵向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:75
 msgid "Landscape"
 msgstr "横向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:77
 msgid "Reverse landscape"
 msgstr "横向倒转"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:77
+#: ../panels/printers/pp-ipp-option-widget.c:79
 msgid "Reverse portrait"
 msgstr "纵向倒转"
 
@@ -2986,13 +4455,13 @@ msgstr "任务状态"
 msgid "Time"
 msgstr "时间"
 
-#: ../panels/printers/pp-jobs-dialog.c:484
+#: ../panels/printers/pp-jobs-dialog.c:496
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s 个活动的任务"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1291
+#: ../panels/printers/pp-new-printer-dialog.c:1465
 msgid "No printers detected."
 msgstr "未检测到打印机。"
 
@@ -3084,57 +4553,58 @@ msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "高级"
 
-#. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:936
-#, c-format
-msgid "%s Options"
-msgstr "%s 选项"
-
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:75
 #: ../panels/printers/pp-ppd-option-widget.c:77
-#: ../panels/printers/pp-ppd-option-widget.c:85
+#: ../panels/printers/pp-ppd-option-widget.c:79
+#: ../panels/printers/pp-ppd-option-widget.c:87
 msgid "Auto Select"
 msgstr "自动选择"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../panels/printers/pp-ppd-option-widget.c:79
 #: ../panels/printers/pp-ppd-option-widget.c:81
 #: ../panels/printers/pp-ppd-option-widget.c:83
-#: ../panels/printers/pp-ppd-option-widget.c:87
+#: ../panels/printers/pp-ppd-option-widget.c:85
+#: ../panels/printers/pp-ppd-option-widget.c:89
 msgid "Printer Default"
 msgstr "打印机默认设置"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:89
+#: ../panels/printers/pp-ppd-option-widget.c:91
 msgid "Embed GhostScript fonts only"
 msgstr "只内嵌 GhostScript 字体"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:91
+#: ../panels/printers/pp-ppd-option-widget.c:93
 msgid "Convert to PS level 1"
 msgstr "转换为 PS 等级 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:93
+#: ../panels/printers/pp-ppd-option-widget.c:95
 msgid "Convert to PS level 2"
 msgstr "转换为 PS 等级 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:95
+#: ../panels/printers/pp-ppd-option-widget.c:97
 msgid "No pre-filtering"
 msgstr "无预过滤"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:230
-msgid "Manufacturers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#| msgid "Manufacturer:"
+msgid "Manufacturer"
 msgstr "厂商"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:242
-msgid "Drivers"
-msgstr "驱动"
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "驱动器"
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-samba.c:247
+#, c-format
+msgid "Enter your username and password to view printers available on %s."
+msgstr "输入用户名和密码以查看 %s 上可用的打印机。"
 
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
@@ -3163,10 +4633,10 @@ msgstr "默认(_D)"
 msgid "Jobs"
 msgstr "作业"
 
-#. Tanslators: Opens a dialog containing printer's jobs
+#. Translators: Opens a dialog containing printer's jobs
 #: ../panels/printers/printers.ui.h:11
-msgid "_Show"
-msgstr "显示(_S)"
+msgid "Show _Jobs"
+msgstr "显示作业(_J)"
 
 #: ../panels/printers/printers.ui.h:12
 msgid "Model"
@@ -3177,8 +4647,9 @@ msgid "label"
 msgstr "标签"
 
 #: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver..."
-msgstr "正在设置新驱动..."
+#| msgid "Setting new driver..."
+msgid "Setting new driver…"
+msgstr "正在设置新驱动…"
 
 #: ../panels/printers/printers.ui.h:18
 msgid "page 3"
@@ -3206,278 +4677,602 @@ msgid ""
 "doesn't seem to be available."
 msgstr "对不起,系统打印服务似乎不可用。"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "区域和语言"
+#: ../panels/privacy/cc-privacy-panel.c:105
+msgid "Hidden"
+msgstr "隐藏"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Change your region and language settings"
-msgstr "更改您的区域和语言设置"
+#: ../panels/privacy/cc-privacy-panel.c:105
+#| msgid "Visibility"
+msgid "Visible"
+msgstr "可见"
 
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
-msgid "Language;Layout;Keyboard;"
-msgstr "Language;Layout;Keyboard;语言;布局;键盘;"
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
+#| msgid "Screenshots"
+msgid "Screen Lock"
+msgstr "锁屏"
 
-#: ../panels/region/gnome-region-panel-formats.c:142
-msgid "Imperial"
-msgstr "英制"
+#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
+#| msgid "Visibility"
+msgid "Name & Visibility"
+msgstr "名称及可见性"
 
-#: ../panels/region/gnome-region-panel-formats.c:144
-msgid "Metric"
-msgstr "公制"
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
+msgid "Usage & History"
+msgstr "用量及历史"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
-msgid "Choose an input source"
-msgstr "选择一个输入源"
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
+msgid "Purge Trash & Temporary Files"
+msgstr "清理回收站及临时文件"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:2
-msgid "Select an input source to add"
-msgstr "选择一个要添加的输入源"
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
+msgid "Privacy"
+msgstr "隐私"
 
-#: ../panels/region/gnome-region-panel-system.c:471
-msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings."
-msgstr "登录屏幕、系统账户和新用户均使用系统的“区域和语言”设置。"
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Protect your personal information and control what others might see"
+msgstr "保护个人信息及控制其它用户可见的信息"
 
-#: ../panels/region/gnome-region-panel-system.c:476
-#: ../panels/region/gnome-region-panel.ui.h:30
+#. Translators: those are keywords for the privacy control-center panel
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
 msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings. You may change the system settings to match "
-"yours."
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
 msgstr ""
-"登录屏幕、系统账户和新用户均使用系统的“区域和语言”设置。您可以在那里按需修改"
-"相关系统设置。"
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;屏幕;锁定;诊断;崩溃;私有;最近;临时;索引;名称;网络;认证;"
 
-#: ../panels/region/gnome-region-panel-system.c:479
-msgid "Copy Settings"
-msgstr "复制设置"
+#: ../panels/privacy/privacy.ui.h:1
+#| msgid "Screen turns off"
+msgid "Screen Turns Off"
+msgstr "关闭屏幕"
 
-#: ../panels/region/gnome-region-panel-system.c:482
-#: ../panels/region/gnome-region-panel.ui.h:37
-msgid "Copy Settings..."
-msgstr "复制设置..."
+#: ../panels/privacy/privacy.ui.h:2
+msgid "30 seconds"
+msgstr "30 秒"
 
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
-msgstr "区域和语言"
+#: ../panels/privacy/privacy.ui.h:11
+msgid "Control how you appear on the screen and the network."
+msgstr "控制如何如何在屏幕和网络上显示您。"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Select a display language (change will be applied next time you log in)"
-msgstr "选择界面语言(将在下次登录时应用)"
+#: ../panels/privacy/privacy.ui.h:12
+msgid "Display _full name in top bar"
+msgstr "在顶栏显示全名(_F)"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
-msgid "Add Language"
-msgstr "添加语言"
+#: ../panels/privacy/privacy.ui.h:13
+msgid "Display full name in _lock screen"
+msgstr "在锁屏时显示全名(_L)"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Install languages..."
-msgstr "安装语言..."
+#: ../panels/privacy/privacy.ui.h:14
+#, fuzzy
+#| msgid "Switch Modes"
+msgid "_Stealth Mode"
+msgstr "模式切换"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
-msgid "Language"
-msgstr "语言"
+#: ../panels/privacy/privacy.ui.h:15
+msgid "Immediately"
+msgstr "立即"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Select a region (change will be applied the next time you log in)"
-msgstr "选择一个地区(将在下次登录时应用更改)"
+#: ../panels/privacy/privacy.ui.h:16
+msgid "1 day"
+msgstr "1 天"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Add Region"
-msgstr "添加地区"
+#: ../panels/privacy/privacy.ui.h:17
+msgid "2 days"
+msgstr "2 天"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
-msgid "Remove Region"
-msgstr "移除区域"
+#: ../panels/privacy/privacy.ui.h:18
+msgid "3 days"
+msgstr "3 天"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Dates"
-msgstr "日期"
+#: ../panels/privacy/privacy.ui.h:19
+msgid "4 days"
+msgstr "4 天"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
-msgid "Times"
-msgstr "时间"
+#: ../panels/privacy/privacy.ui.h:20
+msgid "5 days"
+msgstr "5 天"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
-msgid "Numbers"
-msgstr "数字"
+#: ../panels/privacy/privacy.ui.h:21
+msgid "6 days"
+msgstr "6 天"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
-msgid "Currency"
-msgstr "货币"
+#: ../panels/privacy/privacy.ui.h:22
+msgid "7 days"
+msgstr "7 天"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
-msgid "Measurement"
-msgstr "度量衡"
+#: ../panels/privacy/privacy.ui.h:23
+msgid "14 days"
+msgstr "14 天"
+
+#: ../panels/privacy/privacy.ui.h:24
+msgid "30 days"
+msgstr "30 天"
+
+#: ../panels/privacy/privacy.ui.h:25
+#| msgid "never"
+msgid "Forever"
+msgstr "永远"
+
+#: ../panels/privacy/privacy.ui.h:27
+msgid ""
+"Remembering your history makes things easier to find again. These items are "
+"never shared over the network."
+msgstr "记住历史让再次寻找变得容易。这些条目永远不会通过网络共享。"
+
+#: ../panels/privacy/privacy.ui.h:28
+msgid "Cl_ear Recent History"
+msgstr "清理最近历史(_E)"
+
+#: ../panels/privacy/privacy.ui.h:29
+msgid "_Recently Used"
+msgstr "最近使用(_R)"
+
+#: ../panels/privacy/privacy.ui.h:30
+msgid "Retain _History"
+msgstr "保留历史(_H)"
+
+#: ../panels/privacy/privacy.ui.h:32
+msgid "The Screen Lock protects your privacy when you are away."
+msgstr "在离开时,锁定屏幕可以保护隐私。"
+
+#: ../panels/privacy/privacy.ui.h:33
+#| msgid "A_utomatic Login"
+msgid "Automatic Screen _Lock"
+msgstr "自动锁屏(_L)"
+
+#: ../panels/privacy/privacy.ui.h:34
+#, fuzzy
+#| msgid "_Lock screen after:"
+msgid "Lock Screen _After Blank For"
+msgstr "定时锁定屏幕(_L):"
+
+#: ../panels/privacy/privacy.ui.h:35
+#| msgid "Show _notifications when locked"
+msgid "Show _Notifications"
+msgstr "显示通知(_N)"
+
+#: ../panels/privacy/privacy.ui.h:37
+msgid "_Empty Trash"
+msgstr "清空回收站(_E)"
+
+#: ../panels/privacy/privacy.ui.h:38
+#| msgid "_Keep Files"
+msgid "_Purge Temporary Files"
+msgstr "清理临时文件(_P)"
+
+#: ../panels/privacy/privacy.ui.h:39
+msgid ""
+"Automatically purge the Trash and temporary files to help keep your computer "
+"free of unnecessary sensitive information."
+msgstr "自动清理回收站和临时文件,帮助计算机保存避免不必要的敏感信息。"
+
+#: ../panels/privacy/privacy.ui.h:40
+msgid "Automatically Empty _Trash"
+msgstr "自动清理回收站(_T)"
+
+#: ../panels/privacy/privacy.ui.h:41
+msgid "Automatically Purge Temporary _Files"
+msgstr "自动清理临时文件(_F)"
+
+#: ../panels/privacy/privacy.ui.h:42
+msgid "Purge _After"
+msgstr ""
+
+#: ../panels/region/cc-format-chooser.c:122
+#| msgid "Imperial"
+msgctxt "measurement format"
+msgid "Imperial"
+msgstr "英制"
+
+#: ../panels/region/cc-format-chooser.c:124
+#| msgid "Metric"
+msgctxt "measurement format"
+msgid "Metric"
+msgstr "公制"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
-msgid "Examples"
-msgstr "示例"
+#: ../panels/region/cc-format-chooser.c:268
+#| msgid "No local printers found"
+msgid "No regions found"
+msgstr "未找到区域"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
+#: ../panels/region/cc-input-chooser.c:179
+#| msgid "Move Input Source Down"
+msgid "No input sources found"
+msgstr "未找到输入源"
+
+#: ../panels/region/cc-region-panel.c:225
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "修改需要重启会话才能生效"
+
+#: ../panels/region/cc-region-panel.c:226
+msgid "Restart Now"
+msgstr "现在重启"
+
+#: ../panels/region/cc-region-panel.c:436
+#| msgid "None"
+msgctxt "Language"
+msgid "None"
+msgstr "无"
+
+#: ../panels/region/cc-region-panel.c:898
+msgid "Sorry"
+msgstr "抱歉"
+
+#: ../panels/region/cc-region-panel.c:900
+msgid "Input methods can't be used on the login screen"
+msgstr "输入法不能在登录屏幕使用"
+
+#: ../panels/region/cc-region-panel.c:1345
+#| msgid "None"
+msgctxt "Input source"
+msgid "None"
+msgstr "无"
+
+#: ../panels/region/cc-region-panel.c:1502
+#| msgid "Lock screen"
+msgid "Login Screen"
+msgstr "登录屏幕"
+
+#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
 msgid "Formats"
 msgstr "格式"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
-msgid "Select keyboards or other input sources"
-msgstr "选择键盘或其他输入源"
+#: ../panels/region/format-chooser.ui.h:3
+msgid "Preview"
+msgstr "预览"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
-msgid "Add Input Source"
-msgstr "添加输入源"
+#: ../panels/region/format-chooser.ui.h:4
+msgid "Dates"
+msgstr "日期"
 
-#: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Remove Input Source"
-msgstr "移除输入源"
+#: ../panels/region/format-chooser.ui.h:5
+msgid "Times"
+msgstr "时间"
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Move Input Source Up"
-msgstr "上移输入源"
+#: ../panels/region/format-chooser.ui.h:6
+msgid "Numbers"
+msgstr "数字"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Move Input Source Down"
-msgstr "下移输入源"
+#: ../panels/region/format-chooser.ui.h:7
+msgid "Measurement"
+msgstr "度量衡"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Input Source Settings"
-msgstr "输入源设置"
+#: ../panels/region/format-chooser.ui.h:8
+#| msgid "Paper Type"
+msgid "Paper"
+msgstr "纸张"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Show Keyboard Layout"
-msgstr "显示键盘布局"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
+msgid "Region & Language"
+msgstr "区域和语言"
 
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "Ctrl+Alt+Space"
-msgstr "Ctrl+Alt+Space"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr "选择您的显示语言、格式、键盘布局和输入源"
 
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "Ctrl+Alt+Shift+Space"
-msgstr "Ctrl+Alt+Shift+Space"
+#. Translators: those are keywords for the region control-center panel
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#| msgid "Language;Layout;Keyboard;"
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Language;Layout;Keyboard;Input;语言;布局;键盘;输入;"
 
-#: ../panels/region/gnome-region-panel.ui.h:27
-msgid "Shortcut Settings"
-msgstr "快捷键设置"
+#: ../panels/region/input-chooser.ui.h:1
+#| msgid "Add Input Source"
+msgid "Add an Input Source"
+msgstr "添加输入源"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid "Input Sources"
-msgstr "输入源"
+#: ../panels/region/input-options.ui.h:1
+#| msgid "Input Source Settings"
+msgid "Input Source Options"
+msgstr "输入源选项"
 
-#. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:32
-msgid "Display language:"
-msgstr "显示语言:"
+#: ../panels/region/input-options.ui.h:2
+#| msgid "Use the same layout for all windows"
+msgid "Use the _same source for all windows"
+msgstr "所有窗口使用相同的输入源(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:33
-msgid "Input source:"
-msgstr "输入源:"
+#: ../panels/region/input-options.ui.h:3
+#| msgid "Allow different layouts for individual windows"
+msgid "Allow _different sources for each window"
+msgstr "每个窗口使用不同的输入源(_D)"
 
-#: ../panels/region/gnome-region-panel.ui.h:34
-msgid "Format:"
-msgstr "格式:"
+#: ../panels/region/input-options.ui.h:4
+#| msgid "Keyboard Settings"
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
 
-#: ../panels/region/gnome-region-panel.ui.h:35
-msgid "Your settings"
-msgstr "我的设置"
+#: ../panels/region/input-options.ui.h:5
+msgid "Switch to previous source"
+msgstr "切换至上个源"
 
-#: ../panels/region/gnome-region-panel.ui.h:36
-msgid "System settings"
-msgstr "系统设置"
+#: ../panels/region/input-options.ui.h:6
+#| msgid "Ctrl+Alt+Shift+Space"
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Space"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-msgid "Brightness & Lock"
-msgstr "亮度和锁屏"
+#: ../panels/region/input-options.ui.h:7
+msgid "Switch to next source"
+msgstr "切换至下个源"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-msgid "Screen brightness and lock settings"
-msgstr "配置屏幕亮度和锁定"
+#: ../panels/region/input-options.ui.h:8
+msgid "Super+Space"
+msgstr "Super+Space"
 
-#. Translators: those are keywords for the brightness and lock control-center panel
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
-msgid "Brightness;Lock;Dim;Blank;Monitor;"
-msgstr "亮度;锁定;渐暗;空白;显示器;Brightness;Lock;Dim;Blank;Monitor;"
+#: ../panels/region/input-options.ui.h:9
+msgid "You can change these shortcuts in the keyboard settings"
+msgstr "可以在键盘设置中修改快捷键"
 
-#: ../panels/screen/screen.ui.h:1
-msgid "Screen turns off"
-msgstr "关闭屏幕"
+#: ../panels/region/input-options.ui.h:10
+#, fuzzy
+#| msgid "Switch to next source"
+msgid "Alternative switch to next source"
+msgstr "切换至下个源"
 
-#: ../panels/screen/screen.ui.h:2
-msgid "30 seconds"
-msgstr "30 秒"
+#: ../panels/region/region.ui.h:2
+msgid "English (United Kingdom)"
+msgstr "英语 (英国)"
 
-#: ../panels/screen/screen.ui.h:3
-msgid "1 minute"
-msgstr "1 分钟"
+#: ../panels/region/region.ui.h:4
+msgid "United Kingdom"
+msgstr "英国"
 
-#: ../panels/screen/screen.ui.h:4
-msgid "2 minutes"
-msgstr "2 分钟"
+#: ../panels/region/region.ui.h:6
+msgid "Options"
+msgstr "选项"
 
-#: ../panels/screen/screen.ui.h:5
-msgid "3 minutes"
-msgstr "3 分钟"
+#: ../panels/region/region.ui.h:7
+msgid "Login settings are used by all users when logging into the system"
+msgstr "登录设置为所有用户登录系统时所使用"
+
+#: ../panels/search/cc-search-locations-dialog.c:276
+msgid "Home"
+msgstr "主目录"
 
-#: ../panels/screen/screen.ui.h:10
-msgid "_Dim screen to save power"
-msgstr "调暗屏幕以省电(_D)"
+#: ../panels/search/cc-search-locations-dialog.c:476
+msgid "Places"
+msgstr "位置"
 
-#: ../panels/screen/screen.ui.h:11
-msgid "Brightness"
-msgstr "亮度"
+#: ../panels/search/cc-search-locations-dialog.c:478
+msgid "Bookmarks"
+msgstr "书签"
 
-#: ../panels/screen/screen.ui.h:12
-msgid "_Turn screen off when inactive for:"
-msgstr "在此时间内无操作则关闭屏幕(_T):"
+#: ../panels/search/cc-search-locations-dialog.c:676
+#| msgid "Select a region"
+msgid "Select Location"
+msgstr "选择位置"
 
-#: ../panels/screen/screen.ui.h:13
-msgid "_Lock screen after:"
-msgstr "定时锁定屏幕(_L):"
+#: ../panels/search/cc-search-panel.c:193
+#| msgid "No local printers found"
+msgid "No applications found"
+msgstr "未找到应用"
 
-#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're 
detected to be physically in your home (your house, etc.)
-#: ../panels/screen/screen.ui.h:15
-msgid "Don't lock when at home"
-msgstr "在家时不锁定屏幕"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+msgid "Search"
+msgstr "搜索"
 
-#: ../panels/screen/screen.ui.h:16
-msgid "Locations..."
-msgstr "位置..."
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+msgid ""
+"Control which applications show search results in the Activities Overview"
+msgstr "控制在活动总览中哪个程序显示搜索结果"
 
-#: ../panels/screen/screen.ui.h:17
-msgid "Show _notifications when locked"
-msgstr "锁定时显示通知(_N)"
+#. Translators: those are keywords for the search control-center panel
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+msgid "Search;Find;Index;Hide;Privacy;Results;"
+msgstr ""
+"Search;Find;Index;Hide;Privacy;Results;搜索;查找;寻找;索引;隐藏;隐私;结果;"
+
+#: ../panels/search/search-locations-dialog.ui.h:1
+#| msgid "Location"
+msgid "Search Locations"
+msgstr "搜索位置"
+
+#: ../panels/search/search.ui.h:1
+msgid "Move Up"
+msgstr "上移"
+
+#: ../panels/search/search.ui.h:2
+msgid "Move Down"
+msgstr "下移"
+
+#: ../panels/search/search.ui.h:3
+#| msgid "Mouse Preferences"
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../panels/sharing/cc-sharing-panel.c:259
+msgctxt "service is enabled"
+msgid "On"
+msgstr "开"
+
+#: ../panels/sharing/cc-sharing-panel.c:261
+msgctxt "service is disabled"
+msgid "Off"
+msgstr "关"
+
+#: ../panels/sharing/cc-sharing-panel.c:407
+#| msgid "Choose a Layout"
+msgid "Choose a Folder"
+msgstr "选择文件夹"
+
+#: ../panels/sharing/cc-sharing-panel.c:585
+msgid "Copy"
+msgstr "复制"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+#| msgid "Hearing"
+msgid "Sharing"
+msgstr "共享"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Control what you want to share with others"
+msgstr "控制您想要和其他用户共享的内容"
+
+#. Translators: those are keywords for the sharing control-center panel
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
+"pictures;photos;movies;server;renderer;"
+msgstr ""
+"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
+"pictures;photos;movies;server;renderer;共享;主机;名称;远程;桌面;蓝牙;媒体;音"
+"频;视频;图片;照片;电影;服务器;渲染;"
+
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+#| msgid "Enable h_orizontal scrolling"
+msgid "Enable or disable remote login"
+msgstr "启用或禁用远程登录"
+
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
+#| msgid "Authentication is required to change user data"
+msgid "Authentication is required to enable or disable remote login"
+msgstr "启用或禁用远程登录需要认证"
+
+#: ../panels/sharing/sharing.ui.h:1
+#| msgid "Bluetooth Settings"
+msgid "Bluetooth Sharing"
+msgstr "蓝牙共享"
+
+#: ../panels/sharing/sharing.ui.h:2
+msgid ""
+"Bluetooth Sharing allows you to share files with other Bluetooth enabled "
+"devices"
+msgstr "蓝牙共享允许您使用带有蓝牙的设备共享文件"
+
+#: ../panels/sharing/sharing.ui.h:3
+msgid "Share Public Folder"
+msgstr "共享公共(Public)文件夹"
+
+#: ../panels/sharing/sharing.ui.h:4
+msgid "Only Receive From Trusted Devices"
+msgstr "只从信任的设备接收"
+
+#: ../panels/sharing/sharing.ui.h:5
+msgid "Save Received Files to Downloads Folder"
+msgstr "将接收的文件保存到下载(Downloads)文件夹"
+
+#: ../panels/sharing/sharing.ui.h:6
+msgid "Only share with Trusted Devices"
+msgstr "只共享信任的设备"
+
+#: ../panels/sharing/sharing.ui.h:7
+#| msgid "Computer"
+msgid "Computer Name"
+msgstr "计算机名"
+
+#: ../panels/sharing/sharing.ui.h:8
+msgid "Some services are disabled because of no network access."
+msgstr "因为没有网络,一些服务已经禁用。"
+
+#: ../panels/sharing/sharing.ui.h:9
+#| msgid "Media player"
+msgid "Media Sharing"
+msgstr "媒体共享"
+
+#: ../panels/sharing/sharing.ui.h:10
+msgid "Share Music, Photos and Videos with others on the current network."
+msgstr "在当前网络上共享音乐、照片和视频。"
+
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Share Media On This Network"
+msgstr "在网络上共享媒体"
+
+#: ../panels/sharing/sharing.ui.h:12
+#| msgid "Pictures Folder"
+msgid "Shared Folders"
+msgstr "共享文件夹"
+
+#: ../panels/sharing/sharing.ui.h:13
+msgid "column"
+msgstr "列"
+
+#: ../panels/sharing/sharing.ui.h:14
+#| msgid "Add profile"
+msgid "Add Folder"
+msgstr "添加文件夹"
+
+#: ../panels/sharing/sharing.ui.h:15
+#| msgid "Remove User"
+msgid "Remove Folder"
+msgstr "移除文件夹"
+
+#: ../panels/sharing/sharing.ui.h:16
+#| msgid "Personal digital assistant"
+msgid "Personal File Sharing"
+msgstr "个人文件共享"
+
+#: ../panels/sharing/sharing.ui.h:18
+#, no-c-format
+msgid ""
+"Personal File Sharing allows you to share your Public folder with others on "
+"your current network using: <a href=\"dav://%s\">dav://%s</a>"
+msgstr ""
+"个人网络共享允许您与当前网络中的其他人共享自己的共享文件夹,使用地址:<a "
+"href=\"dav://%s\">dav://%s</a>"
 
-#: ../panels/screen/screen.ui.h:18
-msgid "Lock"
-msgstr "锁定"
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share Public Folder On This Network"
+msgstr "在网络上共享公共文件夹"
 
-#: ../panels/sound/applet-main.c:49
-msgid "Enable debugging code"
-msgstr "启用调试代码"
+#: ../panels/sharing/sharing.ui.h:20
+#| msgid "Group Password"
+msgid "Require Password"
+msgstr "需要密码"
 
-#: ../panels/sound/applet-main.c:50
-msgid "Version of this application"
-msgstr "此应用程序的版本"
+#: ../panels/sharing/sharing.ui.h:22
+#| msgid "Remove Region"
+msgid "Remote Login"
+msgstr "远程登录"
 
-#: ../panels/sound/applet-main.c:62
-msgid " — GNOME Volume Control Applet"
-msgstr " — GNOME 音量控制小程序"
+#: ../panels/sharing/sharing.ui.h:24
+#, no-c-format
+msgid ""
+"Allow remote users to connect using the Secure Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+"允许远程用户使用安全 Shell 命令连接:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
-msgid "Volume Control"
-msgstr "音量控制"
+#: ../panels/sharing/sharing.ui.h:26
+#| msgid "Screen Settings"
+msgid "Screen Sharing"
+msgstr "屏幕共享"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:2
-msgid "Show desktop volume control"
-msgstr "显示桌面音量控制"
+#: ../panels/sharing/sharing.ui.h:28
+#, 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:29
+#| msgid "Remove Device"
+msgid "Remote View"
+msgstr "远程查看"
+
+#: ../panels/sharing/sharing.ui.h:30
+#| msgid "Volume Control"
+msgid "Remote Control"
+msgstr "远程控制"
+
+#: ../panels/sharing/sharing.ui.h:31
+#| msgid "Connection"
+msgid "Approve All Connections"
+msgstr "允许所有连接"
+
+#: ../panels/sharing/sharing.ui.h:32
+#| msgid "_Show password"
+msgid "Show Password"
+msgstr "显示密码"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "声音"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-msgid "Change sound volume and event sounds"
-msgstr "更改音量和事件声音"
+#| msgid "Change sound volume and event sounds"
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "更改音量、输入、输出和事件声音"
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
@@ -3510,61 +5305,45 @@ msgstr "敲窗"
 msgid "Sonar"
 msgstr "声纳"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
-msgid "Output"
-msgstr "输出"
-
-#: ../panels/sound/gvc-applet.c:272
-msgid "Sound Output Volume"
-msgstr "输出音量"
-
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input"
-msgstr "输入"
-
-#: ../panels/sound/gvc-applet.c:278
-msgid "Microphone Volume"
-msgstr "话筒音量"
-
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Left"
 msgstr "左"
 
-#: ../panels/sound/gvc-balance-bar.c:112
+#: ../panels/sound/gvc-balance-bar.c:107
 msgctxt "balance"
 msgid "Right"
 msgstr "右"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Rear"
 msgstr "后"
 
-#: ../panels/sound/gvc-balance-bar.c:116
+#: ../panels/sound/gvc-balance-bar.c:111
 msgctxt "balance"
 msgid "Front"
 msgstr "前"
 
-#: ../panels/sound/gvc-balance-bar.c:119
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Minimum"
 msgstr "最小"
 
-#: ../panels/sound/gvc-balance-bar.c:120
+#: ../panels/sound/gvc-balance-bar.c:115
 msgctxt "balance"
 msgid "Maximum"
 msgstr "最大"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: ../panels/sound/gvc-balance-bar.c:290
 msgid "_Balance:"
 msgstr "均衡(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:298
+#: ../panels/sound/gvc-balance-bar.c:293
 msgid "_Fade:"
 msgstr "淡入淡出(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:301
+#: ../panels/sound/gvc-balance-bar.c:296
 msgid "_Subwoofer:"
 msgstr "重低音(_S):"
 
@@ -3579,13 +5358,13 @@ msgid "Unamplified"
 msgstr "减弱"
 
 #: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
-#: ../panels/sound/gvc-mixer-dialog.c:521
+#: ../panels/sound/gvc-mixer-dialog.c:526
 msgid "_Profile:"
 msgstr "配置(_P):"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1841
+#: ../panels/sound/gvc/gvc-mixer-control.c:1837
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -3593,13 +5372,13 @@ msgstr[0] "%u 路输出"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1851
+#: ../panels/sound/gvc/gvc-mixer-control.c:1847
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 路输入"
 
-#: ../panels/sound/gvc-mixer-control.c:2375
+#: ../panels/sound/gvc/gvc-mixer-control.c:2373
 msgid "System Sounds"
 msgstr "系统声音"
 
@@ -3607,57 +5386,69 @@ msgstr "系统声音"
 msgid "_Test Speakers"
 msgstr "测试扬声器(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:426
+#: ../panels/sound/gvc-mixer-dialog.c:431
 msgid "Peak detect"
 msgstr "峰值检测"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1506
+#: ../panels/sound/gvc-mixer-dialog.c:1508
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "名称"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1588
+#: ../panels/sound/gvc-mixer-dialog.c:1527
+msgid "Device"
+msgstr "设备"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1590
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s 扬声器测试"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1642
+#: ../panels/sound/gvc-mixer-dialog.c:1644
 msgid "_Output volume:"
 msgstr "输出音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1661
+#: ../panels/sound/gvc-mixer-dialog.c:1658
+msgid "Output"
+msgstr "输出"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "C_hoose a device for sound output:"
 msgstr "选择音频输出设备(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1686
+#: ../panels/sound/gvc-mixer-dialog.c:1688
 msgid "Settings for the selected device:"
 msgstr "选中设备的设置:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1704
+#: ../panels/sound/gvc-mixer-dialog.c:1699
+msgid "Input"
+msgstr "输入"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1706
 msgid "_Input volume:"
 msgstr "输入音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1727
+#: ../panels/sound/gvc-mixer-dialog.c:1729
 msgid "Input level:"
 msgstr "输入等级:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1755
+#: ../panels/sound/gvc-mixer-dialog.c:1757
 msgid "C_hoose a device for sound input:"
 msgstr "选择音频输入设备(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1782
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "Sound Effects"
 msgstr "声音效果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "_Alert volume:"
 msgstr "警告音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1802
+#: ../panels/sound/gvc-mixer-dialog.c:1804
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1806
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "No application is currently playing or recording audio."
 msgstr "没有程序正在播放或录制音频。"
 
@@ -3702,35 +5493,18 @@ msgstr "测试"
 msgid "Subwoofer"
 msgstr "超低音"
 
-#: ../panels/sound/gvc-stream-status-icon.c:236
-#, c-format
-msgid "Failed to start Sound Preferences: %s"
-msgstr "声音首选项启动失败:%s"
-
-#: ../panels/sound/gvc-stream-status-icon.c:262
-msgid "_Mute"
-msgstr "静音(_M)"
-
-#: ../panels/sound/gvc-stream-status-icon.c:271
-msgid "_Sound Preferences"
-msgstr "声音首选项(_S)"
-
-#: ../panels/sound/gvc-stream-status-icon.c:416
-msgid "Muted"
-msgstr "已静音"
-
 #: ../panels/sound/sound-theme-file-utils.c:292
 msgid "Custom"
 msgstr "自定义"
 
-#: ../panels/universal-access/cc-ua-panel.c:286
-#: ../panels/universal-access/cc-ua-panel.c:292
+#: ../panels/universal-access/cc-ua-panel.c:281
+#: ../panels/universal-access/cc-ua-panel.c:287
 msgid "No shortcut set"
 msgstr "未设置快捷键"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Universal Access Preferences"
-msgstr "通用辅助功能首选项"
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "使看、听、打字、指、点更加容易"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
@@ -3743,7 +5517,7 @@ msgstr ""
 "度;缩放;屏幕读取器;文本;字体;大小;粘滞键;慢速键;回弹键;鼠标键"
 
 #: ../panels/universal-access/uap.ui.h:1
-#: ../panels/universal-access/zoom-options.ui.h:33
+#: ../panels/universal-access/zoom-options.ui.h:34
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低"
@@ -3754,7 +5528,7 @@ msgid "Normal"
 msgstr "普通"
 
 #: ../panels/universal-access/uap.ui.h:3
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: ../panels/universal-access/zoom-options.ui.h:35
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高"
@@ -3776,10 +5550,6 @@ msgstr "GNOME 屏幕键盘"
 msgid "OnBoard"
 msgstr "屏幕键盘"
 
-#: ../panels/universal-access/uap.ui.h:8
-msgid "None"
-msgstr "无"
-
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -3828,10 +5598,6 @@ msgstr "高对比度"
 msgid "Beep on Caps and Num Lock"
 msgstr "按 Caps 或 Num Lock 键时蜂鸣"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Options..."
-msgstr "选项..."
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "屏幕阅读器"
@@ -4184,31 +5950,38 @@ msgstr "亮度:"
 msgid "Contrast:"
 msgstr "对比度:"
 
+#. The contrast scale goes from Color to None (grayscale)
 #: ../panels/universal-access/zoom-options.ui.h:29
+#| msgid "Color"
+msgctxt "universal access, contrast"
+msgid "Color"
+msgstr "色彩"
+
+#: ../panels/universal-access/zoom-options.ui.h:30
 msgctxt "universal access, color"
 msgid "None"
 msgstr "无"
 
-#: ../panels/universal-access/zoom-options.ui.h:30
+#: ../panels/universal-access/zoom-options.ui.h:31
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "完全"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
+#: ../panels/universal-access/zoom-options.ui.h:32
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
+#: ../panels/universal-access/zoom-options.ui.h:33
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "高"
 
-#: ../panels/universal-access/zoom-options.ui.h:35
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgid "Color Effects:"
 msgstr "色彩效果:"
 
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: ../panels/universal-access/zoom-options.ui.h:37
 msgid "Color Effects"
 msgstr "色彩效果"
 
@@ -4238,10 +6011,6 @@ msgstr "本地账户(_L)"
 msgid "_Enterprise Login"
 msgstr "企业登录(_E)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Username"
-msgstr "用户名(_U)"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
 msgid "_Full name"
 msgstr "全名(_F)"
@@ -4259,11 +6028,6 @@ msgstr "域(_D)"
 msgid "_Login Name"
 msgstr "登录名(_L)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "_Password"
-msgstr "密码(_P)"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
 msgid "Tip: Enterprise domain or realm name"
 msgstr "提示:企业域或 realm 名"
@@ -4327,7 +6091,7 @@ msgid "Right little finger"
 msgstr "右手小指"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:706
+#: ../panels/user-accounts/um-fingerprint-dialog.c:700
 msgid "Enable Fingerprint Login"
 msgstr "启用指纹登录"
 
@@ -4350,12 +6114,14 @@ msgid ""
 msgstr "您的指纹已成功保存。您现在应该可以使用指纹读取器登录了。"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
-msgid "User Accounts"
-msgstr "用户账户"
+#| msgid "Username"
+msgid "Users"
+msgstr "用户"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users"
-msgstr "添加或删除用户"
+#| msgid "Add or remove users"
+msgid "Add or remove users and change your password"
+msgstr "添加或删除用户及更改密码"
 
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
@@ -4364,6 +6130,26 @@ msgstr ""
 "登录;名称;指纹;头像;标志;密码;Login;Name;Fingerprint;Avatar;Logo;Face;"
 "Password;"
 
+#: ../panels/user-accounts/data/history-dialog.ui.h:1
+#| msgid "Login Options"
+msgid "Login History"
+msgstr "登录历史"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+#| msgid "Previous track"
+msgid "Previous Week"
+msgstr "上一周"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+#| msgid "Next track"
+msgid "Next Week"
+msgstr "下一周"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:5
+#| msgid "Next track"
+msgid "Next week"
+msgstr "下一周"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
 msgstr "现在设置密码"
@@ -4385,54 +6171,38 @@ msgid "Enable this account"
 msgstr "启用此账户"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "_Hint"
-msgstr "提示(_H)"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid ""
-"This hint may be displayed at the login screen.  It will be visible to all "
-"users of this system.  Do <b>not</b> include the password here."
-msgstr ""
-"这个提示可能显示在登录屏幕。它将对此系统的所有用户可见。请 <b>不要</b> 把密码"
-"写在这里。"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
 msgstr "确认密码(_O)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "_New password"
 msgstr "新密码(_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Generate a password"
 msgstr "生成密码"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Fair"
-msgstr "一般"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Current _password"
 msgstr "当前密码(_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
 msgid "_Action"
 msgstr "动作(_A)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Changing password for"
 msgstr "更改此用户的密码"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:15
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "_Show password"
 msgstr "显示密码(_S)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:16
+#: ../panels/user-accounts/data/password-dialog.ui.h:13
 msgid "How to choose a strong password"
 msgstr "如何选择一个好密码"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
 msgid "Ch_ange"
 msgstr "更改(_A)"
 
@@ -4498,6 +6268,11 @@ msgstr "用户图标"
 msgid "_Language"
 msgstr "语言(_L)"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#| msgid "A_utomatic Login"
+msgid "Last Login"
+msgstr "最近登录"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "管理用户账户"
@@ -4507,7 +6282,7 @@ msgid "Authentication is required to change user data"
 msgstr "改变用户数据需要认证"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:569
+#: ../panels/user-accounts/um-password-dialog.c:597
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "太短"
@@ -4518,25 +6293,25 @@ msgid "Not good enough"
 msgstr "不够好"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:570
+#: ../panels/user-accounts/um-password-dialog.c:598
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "弱"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:571
+#: ../panels/user-accounts/um-password-dialog.c:599
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "一般"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:572
+#: ../panels/user-accounts/um-password-dialog.c:600
 msgctxt "Password strength"
 msgid "Good"
 msgstr "好"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:573
+#: ../panels/user-accounts/um-password-dialog.c:601
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "强"
@@ -4546,7 +6321,6 @@ msgid "Authentication failed"
 msgstr "认证失败"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:239
 #, c-format
 msgid "The new password is too short"
 msgstr "新密码太短"
@@ -4591,12 +6365,12 @@ msgstr "新密码必须包含足够的不同字符"
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../panels/user-accounts/um-account-dialog.c:180
+#: ../panels/user-accounts/um-account-dialog.c:182
 msgid "Failed to add account"
 msgstr "添加账户失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:404
-#: ../panels/user-accounts/um-account-dialog.c:445
+#: ../panels/user-accounts/um-account-dialog.c:403
+#: ../panels/user-accounts/um-account-dialog.c:444
 msgid "Failed to register account"
 msgstr "注册用户失败"
 
@@ -4660,16 +6434,16 @@ msgstr "无法访问“%s”设备"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:603
+#: ../panels/user-accounts/um-fingerprint-dialog.c:599
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "无法在“%s”设备上启动指纹采集"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:655
+#: ../panels/user-accounts/um-fingerprint-dialog.c:650
 msgid "Could not access any fingerprint readers"
 msgstr "无法访问指纹读取器"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:656
+#: ../panels/user-accounts/um-fingerprint-dialog.c:651
 msgid "Please contact your system administrator for help."
 msgstr "请联系系统管理员以寻求帮助。"
 
@@ -4678,66 +6452,76 @@ msgstr "请联系系统管理员以寻求帮助。"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:740
+#: ../panels/user-accounts/um-fingerprint-dialog.c:734
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
 msgstr "要启用指纹登录,你需要使用“%s”设备来保存您的一个指纹。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:747
+#: ../panels/user-accounts/um-fingerprint-dialog.c:741
 msgid "Selecting finger"
 msgstr "选择手指"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:748
+#: ../panels/user-accounts/um-fingerprint-dialog.c:742
 msgid "Enrolling fingerprints"
 msgstr "加入指纹识别"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:749
-msgid "Summary"
-msgstr "摘要"
+#: ../panels/user-accounts/um-history-dialog.c:88
+msgid "This Week"
+msgstr "本周"
+
+#: ../panels/user-accounts/um-history-dialog.c:91
+#| msgid "Last used"
+msgid "Last Week"
+msgstr "上周"
 
-#: ../panels/user-accounts/um-password-dialog.c:96
+#: ../panels/user-accounts/um-password-dialog.c:128
 msgid "_Generate a password"
 msgstr "生成密码(_G)"
 
-#: ../panels/user-accounts/um-password-dialog.c:150
+#: ../panels/user-accounts/um-password-dialog.c:181
 msgid "Please choose another password."
 msgstr "请选择其他的密码。"
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:190
 msgid "Please type your current password again."
 msgstr "请再次输入您的当前密码。"
 
-#: ../panels/user-accounts/um-password-dialog.c:165
+#: ../panels/user-accounts/um-password-dialog.c:196
 msgid "Password could not be changed"
 msgstr "无法更改密码"
 
-#: ../panels/user-accounts/um-password-dialog.c:236
+#: ../panels/user-accounts/um-password-dialog.c:301
 msgid "You need to enter a new password"
 msgstr "您需要输入一个新密码"
 
-#: ../panels/user-accounts/um-password-dialog.c:245
+#: ../panels/user-accounts/um-password-dialog.c:304
+#| msgid "The new password is too short"
+msgid "The new password is not strong enough"
+msgstr "新密码不够强"
+
+#: ../panels/user-accounts/um-password-dialog.c:310
 msgid "You need to confirm the password"
 msgstr "你需要重新输入密码以便确认"
 
-#: ../panels/user-accounts/um-password-dialog.c:248
+#: ../panels/user-accounts/um-password-dialog.c:313
 msgid "The passwords do not match"
 msgstr "密码不匹配"
 
-#: ../panels/user-accounts/um-password-dialog.c:254
+#: ../panels/user-accounts/um-password-dialog.c:319
 msgid "You need to enter your current password"
 msgstr "您需要输入当前密码"
 
-#: ../panels/user-accounts/um-password-dialog.c:257
+#: ../panels/user-accounts/um-password-dialog.c:322
 msgid "The current password is not correct"
 msgstr "当前密码错误"
 
-#: ../panels/user-accounts/um-password-dialog.c:347
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 
-#: ../panels/user-accounts/um-password-dialog.c:409
+#: ../panels/user-accounts/um-password-dialog.c:439
 msgid "Wrong password"
 msgstr "密码错误"
 
@@ -4746,14 +6530,16 @@ msgid "Disable image"
 msgstr "禁用图像"
 
 #: ../panels/user-accounts/um-photo-dialog.c:461
-msgid "Take a photo..."
-msgstr "照相..."
+#| msgid "Take a photo..."
+msgid "Take a photo…"
+msgstr "拍张照…"
 
 #: ../panels/user-accounts/um-photo-dialog.c:479
-msgid "Browse for more pictures..."
-msgstr "浏览更多图片..."
+#| msgid "Browse for more pictures"
+msgid "Browse for more pictures…"
+msgstr "浏览更多图片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:704
+#: ../panels/user-accounts/um-photo-dialog.c:703
 #, c-format
 msgid "Used by %s"
 msgstr "已被 %s 使用"
@@ -4781,82 +6567,72 @@ msgstr "无效密码,请重试"
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "无法连接到 %s 域:%s"
 
-#: ../panels/user-accounts/um-user-manager.c:466
-#, c-format
-msgid "A user with name '%s' already exists."
-msgstr "名为“%s”的用户已存在。"
-
-#: ../panels/user-accounts/um-user-manager.c:473
-#, c-format
-msgid "No user with the name '%s' exists."
-msgstr "名为“%s”的用户不存在。"
-
-#: ../panels/user-accounts/um-user-manager.c:631
-msgid "This user does not exist."
-msgstr "该用户不存在。"
-
-#: ../panels/user-accounts/um-user-panel.c:363
+#: ../panels/user-accounts/um-user-panel.c:376
 msgid "Failed to delete user"
 msgstr "删除用户失败"
 
-#: ../panels/user-accounts/um-user-panel.c:423
+#: ../panels/user-accounts/um-user-panel.c:436
 msgid "You cannot delete your own account."
 msgstr "您不能删除自己的账户。"
 
-#: ../panels/user-accounts/um-user-panel.c:432
+#: ../panels/user-accounts/um-user-panel.c:445
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 仍在登录状态"
 
-#: ../panels/user-accounts/um-user-panel.c:436
+#: ../panels/user-accounts/um-user-panel.c:449
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "在用户已登录时删除账户可能导致系统处于不一致状态。"
 
-#: ../panels/user-accounts/um-user-panel.c:445
+#: ../panels/user-accounts/um-user-panel.c:458
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "您想要保留 %s 的文件吗?"
 
-#: ../panels/user-accounts/um-user-panel.c:449
+#: ../panels/user-accounts/um-user-panel.c:462
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "删除用户时可以保留用户主目录、电子邮件目录和临时文件。"
 
-#: ../panels/user-accounts/um-user-panel.c:452
+#: ../panels/user-accounts/um-user-panel.c:465
 msgid "_Delete Files"
 msgstr "删除文件(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:453
+#: ../panels/user-accounts/um-user-panel.c:466
 msgid "_Keep Files"
 msgstr "保留文件(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:505
+#: ../panels/user-accounts/um-user-panel.c:518
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "账户已禁用"
 
-#: ../panels/user-accounts/um-user-panel.c:513
+#: ../panels/user-accounts/um-user-panel.c:526
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "下次登录时设置"
 
-#: ../panels/user-accounts/um-user-panel.c:516
+#: ../panels/user-accounts/um-user-panel.c:529
 msgctxt "Password mode"
 msgid "None"
 msgstr "无"
 
-#: ../panels/user-accounts/um-user-panel.c:864
+#: ../panels/user-accounts/um-user-panel.c:578
+msgid "Logged in"
+msgstr "已登录"
+
+#: ../panels/user-accounts/um-user-panel.c:942
 msgid "Failed to contact the accounts service"
 msgstr "联系账户服务失败"
 
-#: ../panels/user-accounts/um-user-panel.c:866
+#: ../panels/user-accounts/um-user-panel.c:944
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "请确定 AccountService 已经正确安装并启用。"
 
-#: ../panels/user-accounts/um-user-panel.c:906
+#: ../panels/user-accounts/um-user-panel.c:985
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4864,12 +6640,12 @@ msgstr ""
 "要进行更改,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:944
+#: ../panels/user-accounts/um-user-panel.c:1023
 msgid "Create a user account"
 msgstr "创建用户账户"
 
-#: ../panels/user-accounts/um-user-panel.c:955
-#: ../panels/user-accounts/um-user-panel.c:1237
+#: ../panels/user-accounts/um-user-panel.c:1034
+#: ../panels/user-accounts/um-user-panel.c:1320
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4877,12 +6653,12 @@ msgstr ""
 "要创建用户账户,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:964
+#: ../panels/user-accounts/um-user-panel.c:1043
 msgid "Delete the selected user account"
 msgstr "删除选中的用户账户"
 
-#: ../panels/user-accounts/um-user-panel.c:976
-#: ../panels/user-accounts/um-user-panel.c:1242
+#: ../panels/user-accounts/um-user-panel.c:1055
+#: ../panels/user-accounts/um-user-panel.c:1325
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4890,29 +6666,29 @@ msgstr ""
 "要删除选中的用户账户,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:1150
+#: ../panels/user-accounts/um-user-panel.c:1229
 msgid "My Account"
 msgstr "我的账户"
 
-#: ../panels/user-accounts/um-user-panel.c:1159
+#: ../panels/user-accounts/um-user-panel.c:1238
 msgid "Other Accounts"
 msgstr "其他账户"
 
-#: ../panels/user-accounts/um-utils.c:512
+#: ../panels/user-accounts/um-utils.c:516
 #, c-format
 msgid "A user with the username '%s' already exists"
 msgstr "以 %s 为用户名的用户已存在"
 
-#: ../panels/user-accounts/um-utils.c:516
+#: ../panels/user-accounts/um-utils.c:520
 #, c-format
 msgid "The username is too long"
 msgstr "用户名太长"
 
-#: ../panels/user-accounts/um-utils.c:519
+#: ../panels/user-accounts/um-utils.c:523
 msgid "The username cannot start with a '-'"
 msgstr "用户名不能以“-”开头"
 
-#: ../panels/user-accounts/um-utils.c:522
+#: ../panels/user-accounts/um-utils.c:526
 msgid ""
 "The username must only consist of:\n"
 " ➣ letters from the English alphabet\n"
@@ -4932,11 +6708,6 @@ msgstr "映射按键"
 msgid "Map buttons to functions"
 msgstr "将功能映射到按键"
 
-#. Text printed on screen
-#: ../panels/wacom/calibrator/gui_gtk.c:78
-msgid "Screen Calibration"
-msgstr "屏幕校准"
-
 #: ../panels/wacom/calibrator/gui_gtk.c:79
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
@@ -4966,7 +6737,7 @@ msgstr "映射到单个显示器..."
 msgid "%d of %d"
 msgstr "%d/%d"
 
-#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:384
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "无"
@@ -4981,28 +6752,37 @@ msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "切换显示器"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:121
+msgctxt "Wacom action-type"
+msgid "Show On-Screen Help"
+msgstr "显示屏幕帮助"
+
+#: ../panels/wacom/cc-wacom-page.c:621
+#| msgid "Up"
+msgctxt "Wacom tablet button"
 msgid "Up"
-msgstr "向上"
+msgstr "上"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:621
+#| msgid "Down"
+msgctxt "Wacom tablet button"
 msgid "Down"
-msgstr "向下"
+msgstr "下"
 
-#: ../panels/wacom/cc-wacom-page.c:638
+#: ../panels/wacom/cc-wacom-page.c:662
 msgid "Switch Modes"
 msgstr "模式切换"
 
-#: ../panels/wacom/cc-wacom-page.c:724
-#: ../panels/wacom/cc-wacom-stylus-page.c:376
+#: ../panels/wacom/cc-wacom-page.c:752
+#: ../panels/wacom/cc-wacom-stylus-page.c:373
 msgid "Button"
 msgstr "按键"
 
-#: ../panels/wacom/cc-wacom-page.c:777
+#: ../panels/wacom/cc-wacom-page.c:810
 msgid "Action"
 msgstr "动作"
 
-#: ../panels/wacom/cc-wacom-page.c:886
+#: ../panels/wacom/cc-wacom-page.c:920
 msgid "Display Mapping"
 msgstr "显示映射"
 
@@ -5012,8 +6792,8 @@ msgid "Wacom Tablet"
 msgstr "Wacom 手写板"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Set your Wacom tablet preferences"
-msgstr "设置您的 Wacom 手写板首选项"
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr ""
 
 #. Translators: those are keywords for the wacom tablet control-center panel
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
@@ -5045,16 +6825,14 @@ msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
-msgid "Map to Monitor..."
-msgstr "映射到显示器..."
+#| msgid "Map to Monitor..."
+msgid "Map to Monitor…"
+msgstr "映射到显示器…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Map Buttons..."
-msgstr "按键映射..."
-
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
-msgid "Calibrate..."
-msgstr "校准..."
+#| msgid "Map Buttons"
+msgid "Map Buttons…"
+msgstr "映射按键…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Adjust display resolution"
@@ -5070,89 +6848,88 @@ msgid "Left-Handed Orientation"
 msgstr "惯用左手"
 
 #. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1015
+#: ../panels/wacom/gsd-wacom-device.c:1076
 msgid "Left Ring"
 msgstr "左环模式"
 
-#: ../panels/wacom/gsd-wacom-device.c:1023
+#: ../panels/wacom/gsd-wacom-device.c:1086
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "左环模式 #%d"
 
 #. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1040
+#: ../panels/wacom/gsd-wacom-device.c:1105
 msgid "Right Ring"
 msgstr "右环模式"
 
-#: ../panels/wacom/gsd-wacom-device.c:1048
+#: ../panels/wacom/gsd-wacom-device.c:1115
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "右环模式 #%d"
 
 # Touchstrip和touchring都是商标。
 #. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1087
+#: ../panels/wacom/gsd-wacom-device.c:1156
 msgid "Left Touchstrip"
 msgstr "左 Touchstrip 模式"
 
 # Touchstrip和touchring都是商标。
-#: ../panels/wacom/gsd-wacom-device.c:1095
+#: ../panels/wacom/gsd-wacom-device.c:1166
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "左 Touchstrip 模式 #%d"
 
 #. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1112
-#| msgid "Right Touchstrip Mode #%d"
+#: ../panels/wacom/gsd-wacom-device.c:1185
 msgid "Right Touchstrip"
 msgstr "右 Touchstrip"
 
-#: ../panels/wacom/gsd-wacom-device.c:1120
+#: ../panels/wacom/gsd-wacom-device.c:1195
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "右 Touchstrip 模式 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1143
+#: ../panels/wacom/gsd-wacom-device.c:1220
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "左 Touchring 模式切换"
 
-#: ../panels/wacom/gsd-wacom-device.c:1145
+#: ../panels/wacom/gsd-wacom-device.c:1222
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "右 Touchring 模式切换"
 
-#: ../panels/wacom/gsd-wacom-device.c:1148
+#: ../panels/wacom/gsd-wacom-device.c:1225
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "左 Touchstrip 模式切换"
 
-#: ../panels/wacom/gsd-wacom-device.c:1150
+#: ../panels/wacom/gsd-wacom-device.c:1227
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "右 Touchstrip 模式切换"
 
-#: ../panels/wacom/gsd-wacom-device.c:1155
+#: ../panels/wacom/gsd-wacom-device.c:1232
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "模式切换 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1226
+#: ../panels/wacom/gsd-wacom-device.c:1336
 #, c-format
 msgid "Left Button #%d"
 msgstr "左键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1229
+#: ../panels/wacom/gsd-wacom-device.c:1339
 #, c-format
 msgid "Right Button #%d"
 msgstr "右键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1232
+#: ../panels/wacom/gsd-wacom-device.c:1342
 #, c-format
 msgid "Top Button #%d"
 msgstr "上键 #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1235
+#: ../panels/wacom/gsd-wacom-device.c:1345
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "底键 #%d"
@@ -5225,29 +7002,40 @@ msgstr "下键"
 msgid "Tip Pressure Feel"
 msgstr "指尖压力感应"
 
-#: ../shell/control-center.c:58
+#: ../shell/cc-application.c:67
 msgid "Enable verbose mode"
 msgstr "启用详细模式"
 
-#: ../shell/control-center.c:59
+#: ../shell/cc-application.c:68
 msgid "Show the overview"
 msgstr "显示摘要"
 
-#: ../shell/control-center.c:60 ../shell/control-center.c:61
-#: ../shell/control-center.c:62
+#: ../shell/cc-application.c:69
+msgid "Search for the string"
+msgstr "搜索字符串"
+
+#: ../shell/cc-application.c:70
+msgid "List possible panel names and exit"
+msgstr "列出可能的面板名并退出"
+
+#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
+#: ../shell/cc-application.c:73
 msgid "Show help options"
 msgstr "显示帮助选项"
 
-#: ../shell/control-center.c:63
+#: ../shell/cc-application.c:74
 msgid "Panel to display"
 msgstr "显示面板"
 
-#: ../shell/control-center.c:85
-#| msgid "All Settings"
+#: ../shell/cc-application.c:74
+msgid "[PANEL] [ARGUMENT…]"
+msgstr "[面板] [参数…]"
+
+#: ../shell/cc-application.c:116
 msgid "- Settings"
 msgstr "- 设置"
 
-#: ../shell/control-center.c:93
+#: ../shell/cc-application.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -5256,29 +7044,491 @@ msgstr ""
 "%s\n"
 "运行 “%s --help” 查看所有可用的命令行选项。\n"
 
-#: ../shell/control-center.c:211
+#: ../shell/cc-application.c:154
+#| msgid "Available Profiles"
+msgid "Available panels:"
+msgstr "可用面板"
+
+#: ../shell/cc-application.c:273
 msgid "Help"
 msgstr "帮助"
 
-#: ../shell/control-center.c:212
+#: ../shell/cc-application.c:274
 msgid "Quit"
 msgstr "退出"
 
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "控制中心"
-
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
+#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
 msgid "Settings"
 msgstr "设置"
 
+#. Add categories
+#: ../shell/cc-window.c:857
+#| msgid "Proportional"
+msgctxt "category"
+msgid "Personal"
+msgstr "个人"
+
+#: ../shell/cc-window.c:858
+#| msgid "Hardware"
+msgctxt "category"
+msgid "Hardware"
+msgstr "硬件"
+
+#: ../shell/cc-window.c:859
+#| msgid "System"
+msgctxt "category"
+msgid "System"
+msgstr "系统"
+
+#: ../shell/cc-window.c:1413
+msgid "All Settings"
+msgstr "全部设置"
+
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;首选项;设置;"
 
-#: ../shell/shell.ui.h:2
-msgid "All Settings"
-msgstr "全部设置"
+#~ msgid "Change the background"
+#~ msgstr "更改背景图像"
+
+#~ msgid "Configure Bluetooth settings"
+#~ msgstr "配置蓝牙设置"
+
+#~ msgid "Browse Files..."
+#~ msgstr "浏览文件..."
+
+#~ msgctxt "Power"
+#~ msgid "Bluetooth"
+#~ msgstr "蓝牙"
+
+#~ msgid "Create virtual device"
+#~ msgstr "创建虚拟设备"
+
+#~ msgid "Available Profiles for Displays"
+#~ msgstr "可用的显示配置"
+
+#~ msgid "Available Profiles for Scanners"
+#~ msgstr "可用的扫描仪配置"
+
+#~ msgid "Available Profiles for Printers"
+#~ msgstr "可用的打印机配置"
+
+#~ msgid "Available Profiles for Cameras"
+#~ msgstr "可用的相机配置"
+
+#~ msgid "Available Profiles for Webcams"
+#~ msgstr "可用的摄像头配置"
+
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i 年"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i 个月"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i 周"
+
+#~ msgid "Less than 1 week"
+#~ msgstr "不到一周"
+
+#~ msgid "This device is not color managed."
+#~ msgstr "此设备没有进行色彩管理。"
+
+#~ msgid "This device is using manufacturing calibrated data."
+#~ msgstr "此设备正在使用出厂校准数据。"
+
+#~ msgid ""
+#~ "This device does not have a profile suitable for whole-screen color "
+#~ "correction."
+#~ msgstr "此设备没有一份适于全屏色彩修正的配置。"
+
+#~ msgid "Not specified"
+#~ msgstr "未指定"
+
+#~ msgid "No devices supporting color management detected"
+#~ msgstr "没有检测到支持色彩管理的设备"
+
+#~ msgid "Add device"
+#~ msgstr "添加设备"
+
+#~ msgid "Add a virtual device"
+#~ msgstr "添加一个虚拟设备"
+
+#~ msgid "Remove a device"
+#~ msgstr "移除设备"
+
+#~ msgid "Color management settings"
+#~ msgstr "色彩管理设置"
+
+#~ msgid "English"
+#~ msgstr "英语"
+
+#~ msgid "British English"
+#~ msgstr "英国英语"
+
+#~ msgid "German"
+#~ msgstr "德语"
+
+#~ msgid "French"
+#~ msgstr "法语"
+
+#~ msgid "Spanish"
+#~ msgstr "西班牙语"
+
+#~ msgid "Chinese (simplified)"
+#~ msgstr "简体中文"
+
+#~ msgid "Russian"
+#~ msgstr "俄语"
+
+#~ msgid "Arabic"
+#~ msgstr "阿拉伯语"
+
+#~ msgid "Unspecified"
+#~ msgstr "未指定"
+
+#~ msgid "Select a language"
+#~ msgstr "选择一种语言"
+
+#~ msgid "_Select"
+#~ msgstr "选择(_S)"
+
+#~ 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"
+
+#~ msgid "VESA: %s"
+#~ msgstr "VESA:%s"
+
+#~ msgid "Unknown model"
+#~ msgstr "未知型号"
+
+#~ msgid "The next login will attempt to use the standard experience."
+#~ msgstr "下次登录将尝试提供标准用户体验。"
+
+#~ msgid ""
+#~ "The next login will use the fallback mode intended for unsupported "
+#~ "graphics hardware."
+#~ msgstr "下次登录将使用为不支持的显示硬件而设计的备用模式。"
+
+#~ msgctxt "Experience"
+#~ msgid "Fallback"
+#~ msgstr "备用"
+
+#~ msgid "System Information"
+#~ msgstr "系统信息"
+
+#~ msgid "OS type"
+#~ msgstr "操作系统类型"
+
+#~ msgid "_Other Media..."
+#~ msgstr "其他媒体(_O)..."
+
+#~ msgid "Experience"
+#~ msgstr "用户体验"
+
+#~ msgid "Forced _Fallback Mode"
+#~ msgstr "强制使用备用模式(_F)"
+
+#~ msgid "Change keyboard settings"
+#~ msgstr "更改键盘设置"
+
+#~ msgid "Layout Settings"
+#~ msgstr "布局设置"
+
+#~ msgid "Set your mouse and touchpad preferences"
+#~ msgstr "设置您的鼠标和触摸板首选项"
+
+#~ msgid "Network settings"
+#~ msgstr "网络设置"
+
+#~ msgid "Out of range"
+#~ msgstr "超出范围"
+
+#~ msgid "_Options..."
+#~ msgstr "选项(_O)..."
+
+#~ msgid "C_reate..."
+#~ msgstr "创建(_R)..."
+
+#~ msgid "_Configure..."
+#~ msgstr "配置(_C)..."
+
+#~ msgid "_Disconnect"
+#~ msgstr "断开连接(_D)"
+
+#~ msgid "_Connect"
+#~ msgstr "连接(_C)"
+
+#~ msgid "_Settings..."
+#~ msgstr "设置(_S)..."
+
+#~ msgid "Disconnected"
+#~ msgstr "已断开"
+
+#~ msgid "Carrier/link changed"
+#~ msgstr "载波/连接已更改"
+
+#~ msgid "Expired credentials. Please log in again."
+#~ msgstr "证书过期。请重新登录。"
+
+#~ msgid "_Log In"
+#~ msgstr "登录(_L)"
+
+#~ msgid "Manage online accounts"
+#~ msgstr "管理在线账户"
+
+#~ msgid "Caution low battery, %s remaining"
+#~ msgstr "电池电量低,剩余 %s"
+
+#~ msgid "Using battery power - %s remaining"
+#~ msgstr "使用电池 - 剩余 %s"
+
+#~ msgid "Using battery power"
+#~ msgstr "使用电池"
+
+#~ msgid "Charging - fully charged"
+#~ msgstr "充电完成"
+
+#~ msgid "Using UPS power - %s remaining"
+#~ msgstr "使用 UPS - 剩余 %s"
+
+#~ msgid "Caution low UPS"
+#~ msgstr "UPS 电量低"
+
+#~ msgid "Using UPS power"
+#~ msgstr "使用 UPS"
+
+#~ msgid "Your secondary battery is fully charged"
+#~ msgstr "您的辅电池已充满"
+
+#~ msgid "Your secondary battery is empty"
+#~ msgstr "您的辅电池已空"
+
+#~ msgctxt "Battery power"
+#~ msgid "Charging - fully charged"
+#~ msgstr "充电 -已充满"
+
+#~ msgid ""
+#~ "Tip: <a href=\"screen\">screen brightness</a> affects how much power is "
+#~ "used"
+#~ msgstr "提示:<a href=\"screen\">屏幕亮度</a>影响电量使用"
+
+#~ msgid "Power management settings"
+#~ msgstr "电源管理设置"
+
+#~ msgid "Don't suspend"
+#~ msgstr "不要挂起"
+
+#~ msgid "Suspend when inactive for"
+#~ msgstr "在此时间内无操作则挂起:"
+
+#~ msgctxt "printer state"
+#~ msgid "Paused"
+#~ msgstr "已暂停"
+
+#~ msgid "Change printer settings"
+#~ msgstr "更改打印机设置"
+
+#~ msgid "%s Options"
+#~ msgstr "%s 选项"
+
+#~ msgid "Manufacturers"
+#~ msgstr "厂商"
+
+#~ msgid "Drivers"
+#~ msgstr "驱动"
+
+#~ msgid "_Show"
+#~ msgstr "显示(_S)"
+
+#~ msgid "Change your region and language settings"
+#~ msgstr "更改您的区域和语言设置"
+
+#~ msgid "Choose an input source"
+#~ msgstr "选择一个输入源"
+
+#~ msgid "Select an input source to add"
+#~ msgstr "选择一个要添加的输入源"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings."
+#~ msgstr "登录屏幕、系统账户和新用户均使用系统的“区域和语言”设置。"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings. You may change the system settings to "
+#~ "match yours."
+#~ msgstr ""
+#~ "登录屏幕、系统账户和新用户均使用系统的“区域和语言”设置。您可以在那里按需修"
+#~ "改相关系统设置。"
+
+#~ msgid "Copy Settings"
+#~ msgstr "复制设置"
+
+#~ msgid "Copy Settings..."
+#~ msgstr "复制设置..."
+
+#~ msgid "Region and Language"
+#~ msgstr "区域和语言"
+
+#~ msgid ""
+#~ "Select a display language (change will be applied next time you log in)"
+#~ msgstr "选择界面语言(将在下次登录时应用)"
+
+#~ msgid "Add Language"
+#~ msgstr "添加语言"
+
+#~ msgid "Install languages..."
+#~ msgstr "安装语言..."
+
+#~ msgid "Select a region (change will be applied the next time you log in)"
+#~ msgstr "选择一个地区(将在下次登录时应用更改)"
+
+#~ msgid "Add Region"
+#~ msgstr "添加地区"
+
+#~ msgid "Currency"
+#~ msgstr "货币"
+
+#~ msgid "Examples"
+#~ msgstr "示例"
+
+#~ msgid "Select keyboards or other input sources"
+#~ msgstr "选择键盘或其他输入源"
+
+#~ msgid "Remove Input Source"
+#~ msgstr "移除输入源"
+
+#~ msgid "Move Input Source Up"
+#~ msgstr "上移输入源"
+
+#~ msgid "Show Keyboard Layout"
+#~ msgstr "显示键盘布局"
+
+#~ msgid "Ctrl+Alt+Space"
+#~ msgstr "Ctrl+Alt+Space"
+
+#~ msgid "Shortcut Settings"
+#~ msgstr "快捷键设置"
+
+#~ msgid "Display language:"
+#~ msgstr "显示语言:"
+
+#~ msgid "Input source:"
+#~ msgstr "输入源:"
+
+#~ msgid "Format:"
+#~ msgstr "格式:"
+
+#~ msgid "Your settings"
+#~ msgstr "我的设置"
+
+#~ msgid "System settings"
+#~ msgstr "系统设置"
+
+#~ msgid "Brightness & Lock"
+#~ msgstr "亮度和锁屏"
+
+#~ msgid "Screen brightness and lock settings"
+#~ msgstr "配置屏幕亮度和锁定"
+
+#~ msgid "Brightness;Lock;Dim;Blank;Monitor;"
+#~ msgstr "亮度;锁定;渐暗;空白;显示器;Brightness;Lock;Dim;Blank;Monitor;"
+
+#~ msgid "_Dim screen to save power"
+#~ msgstr "调暗屏幕以省电(_D)"
+
+#~ msgid "Don't lock when at home"
+#~ msgstr "在家时不锁定屏幕"
+
+#~ msgid "Locations..."
+#~ msgstr "位置..."
+
+#~ msgid "Lock"
+#~ msgstr "锁定"
+
+#~ msgid "Enable debugging code"
+#~ msgstr "启用调试代码"
+
+#~ msgid "Version of this application"
+#~ msgstr "此应用程序的版本"
+
+#~ msgid " — GNOME Volume Control Applet"
+#~ msgstr " — GNOME 音量控制小程序"
+
+#~ msgid "Show desktop volume control"
+#~ msgstr "显示桌面音量控制"
+
+#~ msgid "Sound Output Volume"
+#~ msgstr "输出音量"
+
+#~ msgid "Microphone Volume"
+#~ msgstr "话筒音量"
+
+#~ msgid "Failed to start Sound Preferences: %s"
+#~ msgstr "声音首选项启动失败:%s"
+
+#~ msgid "_Mute"
+#~ msgstr "静音(_M)"
+
+#~ msgid "_Sound Preferences"
+#~ msgstr "声音首选项(_S)"
+
+#~ msgid "Muted"
+#~ msgstr "已静音"
+
+#~ msgid "Universal Access Preferences"
+#~ msgstr "通用辅助功能首选项"
+
+#~ msgid "Options..."
+#~ msgstr "选项..."
+
+#~ msgid "User Accounts"
+#~ msgstr "用户账户"
+
+#~ msgid "_Hint"
+#~ msgstr "提示(_H)"
+
+#~ msgid ""
+#~ "This hint may be displayed at the login screen.  It will be visible to "
+#~ "all users of this system.  Do <b>not</b> include the password here."
+#~ msgstr ""
+#~ "这个提示可能显示在登录屏幕。它将对此系统的所有用户可见。请 <b>不要</b> 把"
+#~ "密码写在这里。"
+
+#~ msgid "Fair"
+#~ msgstr "一般"
+
+#~ msgid "Browse for more pictures..."
+#~ msgstr "浏览更多图片..."
+
+#~ msgid "No user with the name '%s' exists."
+#~ msgstr "名为“%s”的用户不存在。"
+
+#~ msgid "This user does not exist."
+#~ msgstr "该用户不存在。"
+
+#~ msgid "Set your Wacom tablet preferences"
+#~ msgstr "设置您的 Wacom 手写板首选项"
+
+#~ msgid "Map Buttons..."
+#~ msgstr "按键映射..."
+
+#~ msgid "Calibrate..."
+#~ msgstr "校准..."
+
+#~ msgid "Control Center"
+#~ msgstr "控制中心"
 
 #~ msgid "Network;Wireless;IP;LAN;Proxy;"
 #~ msgstr "Network;Wireless;IP;LAN;Proxy;网络;无线;上网;局域网;代理;"
@@ -5292,9 +7542,6 @@ msgstr "全部设置"
 #~ msgid "Wired"
 #~ msgstr "有线"
 
-#~ msgid "Mobile broadband"
-#~ msgstr "移动宽带"
-
 #~ msgid "Mesh"
 #~ msgstr "网格"
 
@@ -5330,9 +7577,6 @@ msgstr "全部设置"
 #~ msgid "Getting devices..."
 #~ msgstr "正在获取设备..."
 
-#~ msgid "No local printers found"
-#~ msgstr "未找到本地打印机"
-
 #~ msgid ""
 #~ "FirewallD is not running. Network printer detection needs services mdns, "
 #~ "ipp, ipp-client and samba-client enabled on firewall."
@@ -5340,9 +7584,6 @@ msgstr "全部设置"
 #~ "FirewallD 未运行。网络打印机功能需要防火墙允许 mdns、ipp、ipp-client 和 "
 #~ "samba-client 服务。"
 
-#~ msgid "Devices"
-#~ msgstr "设备"
-
 #~ msgctxt "printer type"
 #~ msgid "Local"
 #~ msgstr "本地"
@@ -5387,9 +7628,6 @@ msgstr "全部设置"
 #~ msgid "Solid Color"
 #~ msgstr "纯色"
 
-#~ msgid "Pictures Folder"
-#~ msgstr "图片文件夹"
-
 #~ msgid "Colors & Gradients"
 #~ msgstr "颜色和渐变"
 
@@ -5447,12 +7685,6 @@ msgstr "全部设置"
 #~ msgid "_Edge scrolling"
 #~ msgstr "边缘滚动(_E)"
 
-#~ msgid "Enable h_orizontal scrolling"
-#~ msgstr "启用水平滚动(_O)"
-
-#~ msgid "Not connected to the internet."
-#~ msgstr "未连接到互联网。"
-
 #~ msgid "Create the hotspot anyway?"
 #~ msgstr "仍然创建热点?"
 
@@ -5474,18 +7706,9 @@ msgstr "全部设置"
 #~ msgid "Add User"
 #~ msgstr "添加用户"
 
-#~ msgid "Remove User"
-#~ msgstr "移除用户"
-
 #~ msgid "Allowed users"
 #~ msgstr "允许的用户"
 
-#~ msgid "Co_nnector:"
-#~ msgstr "连接器(_N):"
-
-#~ msgid "Hardware"
-#~ msgstr "硬件"
-
 #~ msgid "C_hoose a device to configure:"
 #~ msgstr "选择要配置的设备(_H):"
 
@@ -5511,9 +7734,6 @@ msgstr "全部设置"
 #~ msgid "_Stop Hotspot..."
 #~ msgstr "停止热点(_S)..."
 
-#~ msgid "Device Off"
-#~ msgstr "设备关闭"
-
 #~ msgid "Disable VPN"
 #~ msgstr "禁用 VPN"
 
@@ -5526,9 +7746,6 @@ msgstr "全部设置"
 #~ msgid "FTP Port"
 #~ msgstr "FTP 端口"
 
-#~ msgid "Socks Port"
-#~ msgstr "SOCKS 端口"
-
 #~ msgid "Select an account"
 #~ msgstr "选择一个账户"
 
@@ -5547,33 +7764,15 @@ msgstr "全部设置"
 #~ msgid "affect how much power is used"
 #~ msgstr "影响使用多少电能"
 
-#~ msgid "Choose a Layout"
-#~ msgstr "选择布局"
-
-#~ msgid "Preview"
-#~ msgstr "预览"
-
 #~ msgid "Add Layout"
 #~ msgstr "添加布局"
 
 #~ msgid "Remove Layout"
 #~ msgstr "移除布局"
 
-#~ msgid "Move Up"
-#~ msgstr "上移"
-
-#~ msgid "Move Down"
-#~ msgstr "下移"
-
 #~ msgid "Preview Layout"
 #~ msgstr "预览布局"
 
-#~ msgid "Use the same layout for all windows"
-#~ msgstr "所有窗口使用相同的布局"
-
-#~ msgid "Allow different layouts for individual windows"
-#~ msgstr "允许各个窗口拥有不同的布局"
-
 #~ msgid "New windows use the default layout"
 #~ msgstr "新窗口使用默认布局"
 
@@ -5653,16 +7852,9 @@ msgstr "全部设置"
 #~ msgid "Wacom Graphics Tablet"
 #~ msgstr "Wacom 图形手写板"
 
-#~| msgid "Sound Settings"
-#~ msgid "Screen Settings"
-#~ msgstr "显示设置"
-
 #~ msgid "Battery discharging"
 #~ msgstr "电池放电中"
 
-#~ msgid "UPS discharging"
-#~ msgstr "UPS 放电中"
-
 #~ msgid "%s until charged (%.0lf%%)"
 #~ msgstr "还需 %s 充满(%.0lf%%)"
 
@@ -5708,9 +7900,6 @@ msgstr "全部设置"
 #~ msgid "Position of magnified view on screen"
 #~ msgstr "放大视图在屏幕上的位置"
 
-#~ msgid "Proportional"
-#~ msgstr "成比例"
-
 #~ msgid "Push"
 #~ msgstr "推动"
 
@@ -5894,10 +8083,6 @@ msgstr "全部设置"
 #~ msgid "Keyboard;Mouse;a11y;Accessibility;"
 #~ msgstr "键盘;鼠标;a11y;辅助功能;"
 
-#~ msgid "%u byte"
-#~ msgid_plural "%u bytes"
-#~ msgstr[0] "%u 字节"
-
 #~ msgid "%.1f KB"
 #~ msgstr "%.1f KB"
 


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