[gnome-control-center/gnome-3-8] Update Simplified Chinese translation

[Aron Xu <aronxu src gnome org>]

commit 48c6583d1e936ddb4dd06f044139c253833a4969
Author: Wylmer Wang <wantinghard gmail com>
Date:   Mon Apr 8 17:28:48 2013 +0800

    Update Simplified Chinese translation

 po/zh_CN.po |  638 ++++++++++++++++++++---------------------------------------
 1 files changed, 211 insertions(+), 427 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5e6ce6a..22e9c9d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -27,9 +27,9 @@ msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-05 13:53+0000\n"
+"POT-Creation-Date: 2013-04-08 04:04+0000\n"
 "PO-Revision-Date: 2013-03-12 14:38+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -176,7 +176,6 @@ msgid "Address"
 msgstr "地址"
 
 #: ../panels/bluetooth/bluetooth.ui.h:9
-#| msgid "Mouse and Touchpad Settings"
 msgid "Mouse & Touchpad Settings"
 msgstr "鼠标和触摸板设置"
 
@@ -190,7 +189,6 @@ msgid "Keyboard Settings"
 msgstr "键盘设置"
 
 #: ../panels/bluetooth/bluetooth.ui.h:12
-#| msgid "Send Files..."
 msgid "Send Files…"
 msgstr "发送文件…"
 
@@ -274,7 +272,6 @@ 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 "发生了一个内部错误并且无法恢复。"
 
@@ -298,15 +295,12 @@ 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 "校准失败！"
 
@@ -324,13 +318,11 @@ 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 "内置摄像头"
 
@@ -338,45 +330,35 @@ msgstr "内置摄像头"
 #. * 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 启用色彩管理"
 
@@ -387,7 +369,6 @@ msgstr "为 %s 显示颜色管理"
 
 #. not calibrated
 #: ../panels/color/cc-color-device.c:322
-#| msgid "Uncalibrated"
 msgid "Not calibrated"
 msgstr "未校准"
 
@@ -430,14 +411,11 @@ msgid "All files"
 msgstr "所有文件"
 
 #: ../panels/color/cc-color-panel.c:581
-#| msgctxt "Distance"
-#| msgid "¼ Screen"
 msgid "Screen"
 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 "保存配置"
 
@@ -466,15 +444,12 @@ 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 "测试配置"
 
@@ -483,8 +458,6 @@ msgstr "测试配置"
 #. * 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 "自动"
@@ -493,16 +466,12 @@ msgstr "自动"
 #. * 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 "中等质量"
@@ -511,8 +480,6 @@ msgstr "中等质量"
 #. * 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 "高质量"
@@ -547,12 +514,10 @@ msgid "Full-screen display correction not possible with this profile"
 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/color-calibrate.ui.h:1
-#| msgid "Calibration"
 msgid "Display Calibration"
 msgstr "显示校准"
 
@@ -576,7 +541,6 @@ msgstr "恢复"
 
 #. This button returns the user back to the color control panel
 #: ../panels/color/color-calibrate.ui.h:8
-#| msgid "Done!"
 msgid "Done"
 msgstr "完成"
 
@@ -599,8 +563,6 @@ 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 "质量"
 
@@ -610,7 +572,6 @@ msgid "Approximate Time"
 msgstr "估计时间"
 
 #: ../panels/color/color.ui.h:8
-#| msgid "Calibration"
 msgid "Calibration Quality"
 msgstr "校准质量"
 
@@ -619,7 +580,6 @@ msgid "Select the sensor device you want to use for calibration."
 msgstr "选择校准所使用的传感器设备。"
 
 #: ../panels/color/color.ui.h:10
-#| msgid "Calibration"
 msgid "Calibration Device"
 msgstr "校准设备"
 
@@ -628,8 +588,6 @@ msgid "Select the type of display that is connected."
 msgstr "选择连接的显示类型"
 
 #: ../panels/color/color.ui.h:12
-#| msgctxt "Device kind"
-#| msgid "Display"
 msgid "Display Type"
 msgstr "显示类型"
 
@@ -656,7 +614,6 @@ msgid ""
 msgstr "或者，也可以使用亮度配合此设备的其它配置使用。"
 
 #: ../panels/color/color.ui.h:17
-#| msgid "Brightness"
 msgid "Display Brightness"
 msgstr "显示亮度"
 
@@ -668,12 +625,10 @@ 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 "配置名"
 
@@ -682,7 +637,6 @@ msgid "Profile successfully created!"
 msgstr "配置成功创建！"
 
 #: ../panels/color/color.ui.h:22
-#| msgid "_Import"
 msgid "Export"
 msgstr "导出"
 
@@ -692,6 +646,9 @@ msgid ""
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
 "\">Microsoft Windows</a> systems useful."
 msgstr ""
+"有关如何在 <a href=\"linux\">GNU/Linux</a>、<a href=\"osx\">Apple OS X</a> "
+"和 <a href=\"windows\">Microsoft Windows</a> 系统中使用个人资料的这些说明可能"
+"对您有所帮助。"
 
 #: ../panels/color/color.ui.h:24
 #: ../panels/user-accounts/um-fingerprint-dialog.c:743
@@ -751,7 +708,6 @@ msgid "Set this profile for all users on this computer"
 msgstr "为此计算机上的所有用户设置此配置"
 
 #: ../panels/color/color.ui.h:37
-#| msgid "Enabled"
 msgid "Enable"
 msgstr "启用"
 
@@ -778,7 +734,7 @@ msgstr "查看详情"
 
 #: ../panels/color/color.ui.h:43
 msgid "Unable to detect any devices that can be color managed"
-msgstr ""
+msgstr "无法检测到可以管理颜色的设备"
 
 #: ../panels/color/color.ui.h:44
 msgid "LCD"
@@ -793,23 +749,19 @@ msgid "CRT"
 msgstr "CRT"
 
 #: ../panels/color/color.ui.h:47
-#| msgid "Co_nnector:"
 msgid "Projector"
 msgstr "投影仪"
 
 #: ../panels/color/color.ui.h:48
 msgid "Plasma"
-msgstr ""
+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 分钟"
 
@@ -824,25 +776,19 @@ 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 "显示面板"
+msgstr "原生显示"
 
 #: ../panels/color/color.ui.h:56
-#| msgid "Pointing and Clicking"
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (打印和出版)"
 
@@ -855,7 +801,6 @@ msgid "D65 (Photography and graphics)"
 msgstr "D65 (摄影及图像)"
 
 #: ../panels/color/color.ui.h:59
-#| msgid "75%"
 msgid "D75"
 msgstr "D75"
 
@@ -892,18 +837,16 @@ msgid "China"
 msgstr "中国"
 
 #: ../panels/common/cc-common-language.c:747
-#| msgid "Other profile…"
 msgid "Other…"
 msgstr "其他…"
 
-#: ../panels/common/cc-language-chooser.c:169
-#: ../panels/region/cc-format-chooser.c:259
-#: ../panels/region/cc-input-chooser.c:171
+#: ../panels/common/cc-language-chooser.c:176
+#: ../panels/region/cc-format-chooser.c:266
+#: ../panels/region/cc-input-chooser.c:172
 msgid "More…"
 msgstr "更多…"
 
-#: ../panels/common/cc-language-chooser.c:178
-#| msgid "No local printers found"
+#: ../panels/common/cc-language-chooser.c:193
 msgid "No languages found"
 msgstr "未找到语言"
 
@@ -912,7 +855,7 @@ msgstr "未找到语言"
 #: ../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/network/network-wifi.ui.h:29
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
 #: ../panels/user-accounts/um-fingerprint-dialog.c:215
 #: ../panels/user-accounts/um-fingerprint-dialog.c:216
@@ -920,7 +863,6 @@ msgid "Disabled"
 msgstr "禁用"
 
 #: ../panels/common/cc-util.c:29
-#| msgid "Left Half"
 msgid "Left Shift"
 msgstr "左 Shift"
 
@@ -1006,7 +948,6 @@ msgstr "语言"
 
 #: ../panels/common/language-chooser.ui.h:2
 #: ../panels/region/format-chooser.ui.h:2
-#| msgid "Done!"
 msgid "_Done"
 msgstr "完成(_D)"
 
@@ -1240,7 +1181,6 @@ msgid "Displays"
 msgstr "显示"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-#| msgid "Change resolution and position of monitors and projectors"
 msgid "Choose how to use connected monitors and projectors"
 msgstr "选择如何使用连接的显示器和投影仪"
 
@@ -1258,7 +1198,6 @@ msgstr "未知"
 
 #: ../panels/info/cc-info-panel.c:541
 #, c-format
-#| msgid "%d-bit"
 msgid "%s %d-bit"
 msgstr "%s %d 位"
 
@@ -1397,7 +1336,7 @@ 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
+#: ../panels/network/network-wifi.ui.h:44
 msgid "Details"
 msgstr "详细信息"
 
@@ -1407,9 +1346,6 @@ 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;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1453,7 +1389,6 @@ msgid "Disk"
 msgstr "磁盘"
 
 #: ../panels/info/info.ui.h:10
-#| msgid "Calculating..."
 msgid "Calculating…"
 msgstr "正在计算…"
 
@@ -1510,7 +1445,6 @@ msgid "_Software"
 msgstr "软件(_S)"
 
 #: ../panels/info/info.ui.h:26
-#| msgid "Other Media"
 msgid "_Other Media…"
 msgstr "其他媒体(_O)…"
 
@@ -1569,12 +1503,10 @@ msgid "Typing"
 msgstr "打字"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#| msgid "Switch to next source"
 msgid "Switch to next input source"
 msgstr "切换至下个输入源"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#| msgid "Switch to previous source"
 msgid "Switch to previous input source"
 msgstr "切换至上个输入源"
 
@@ -1603,7 +1535,6 @@ msgid "Home folder"
 msgstr "主文件夹"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:7
-#| msgid "Search"
 msgctxt "keybinding"
 msgid "Search"
 msgstr "搜索"
@@ -1699,9 +1630,8 @@ msgstr "组合键"
 
 #: ../panels/keyboard/cc-keyboard-option.c:371
 #, fuzzy
-#| msgid "Switch to next source"
 msgid "Modifiers-only switch to next source"
-msgstr "切换至下个源"
+msgstr "修饰键仅切换至下个源"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
@@ -1849,7 +1779,6 @@ msgid "_Reassign"
 msgstr "重新分配(_R)"
 
 #: ../panels/mouse/cc-mouse-panel.c:123
-#| msgid "_Test Your Settings"
 msgid "Test Your _Settings"
 msgstr "测试您的设置(_S)"
 
@@ -1936,7 +1865,7 @@ msgstr "双指滚动(_F)"
 #: ../panels/mouse/gnome-mouse-properties.ui.h:16
 #, fuzzy
 msgid "C_ontent sticks to fingers"
-msgstr "连结手指的内容(_O)"
+msgstr "内容吸附手指(_O)"
 
 #: ../panels/mouse/gnome-mouse-test.c:134
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
@@ -1992,7 +1921,6 @@ msgid "The system network services are not compatible with this version."
 msgstr "系统的网络服务与此版本的网络管理器不兼容。"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:1
-#| msgid "Security"
 msgid "802.1x _Security"
 msgstr "802.1x 安全性(_S)"
 
@@ -2006,7 +1934,6 @@ 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)"
 
@@ -2018,8 +1945,6 @@ msgid "Security"
 msgstr "安全性"
 
 #: ../panels/network/connection-editor/ce-page.c:502
-#| msgctxt "proxy method"
-#| msgid "Automatic"
 msgid "automatic"
 msgstr "自动"
 
@@ -2059,19 +1984,16 @@ msgstr "无"
 
 #: ../panels/network/connection-editor/ce-page-details.c:91
 #: ../panels/power/power.ui.h:19
-#| msgid "never"
 msgid "Never"
 msgstr "从不"
 
 #: ../panels/network/connection-editor/ce-page-details.c:102
 #: ../panels/user-accounts/um-utils.c:770
-#| msgid "today"
 msgid "Today"
 msgstr "今天"
 
 #: ../panels/network/connection-editor/ce-page-details.c:104
 #: ../panels/user-accounts/um-utils.c:773
-#| msgid "yesterday"
 msgid "Yesterday"
 msgstr "昨天"
 
@@ -2124,7 +2046,7 @@ msgstr "良好"
 #: ../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
+#: ../panels/network/network-wifi.ui.h:45
 msgid "Identity"
 msgstr "认证"
 
@@ -2143,13 +2065,11 @@ 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 "添加"
 
@@ -2160,36 +2080,29 @@ 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"
+#: ../panels/network/network-wifi.ui.h:25
 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"
+#: ../panels/network/network-wifi.ui.h:24
 msgid "Manual"
 msgstr "手动"
 
@@ -2199,7 +2112,7 @@ msgid "Link-Local Only"
 msgstr "仅本地连接"
 
 #: ../panels/network/connection-editor/ce-page-ip4.c:925
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2213,28 +2126,24 @@ msgstr "前缀"
 #: ../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
+#: ../panels/network/network-wifi.ui.h:47
 msgid "IPv6"
 msgstr "IPv6"
 
 #: ../panels/network/connection-editor/ce-page-reset.c:91
-#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/network/network-wifi.ui.h:49
 msgid "Reset"
 msgstr "重置"
 
 #: ../panels/network/connection-editor/ce-page-security.c:250
-#| msgid "None"
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "无"
@@ -2261,18 +2170,15 @@ 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 "信号强度"
 
@@ -2283,7 +2189,7 @@ 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-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
@@ -2292,14 +2198,14 @@ msgstr "IPv4 地址"
 #: ../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-simple.ui.h:4
 #: ../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-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:7
 msgid "Hardware Address"
 msgstr "硬件地址"
@@ -2307,7 +2213,7 @@ 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-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
 msgid "Default Route"
 msgstr "默认路由"
@@ -2317,23 +2223,22 @@ msgstr "默认路由"
 #: ../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-simple.ui.h:6
 #: ../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 ""
+msgstr "双绞(TP)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:3
 msgid "Attachment Unit Interface (AUI)"
-msgstr ""
+msgstr "连接单元接口(AUI)"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:4
 msgid "BNC"
@@ -2341,15 +2246,13 @@ msgstr "BNC"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:5
 msgid "Media Independent Interface (MII)"
-msgstr ""
+msgstr "媒体独立接口(MII)"
 
 #: ../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"
 
@@ -2368,7 +2271,7 @@ 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
+#: ../panels/network/network-wifi.ui.h:36
 msgid "_MAC Address"
 msgstr "_MAC 地址"
 
@@ -2395,13 +2298,13 @@ msgid "bytes"
 msgstr "字节"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:23
+#: ../panels/network/network-wifi.ui.h:22
 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
+#: ../panels/network/network-wifi.ui.h:23
 msgid "_Addresses"
 msgstr "地址(_A)"
 
@@ -2412,7 +2315,7 @@ 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
+#: ../panels/network/network-wifi.ui.h:30
 msgid "Routes"
 msgstr "路由"
 
@@ -2423,66 +2326,66 @@ 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
+#: ../panels/network/network-wifi.ui.h:32
 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
+#: ../panels/network/network-wifi.ui.h:34
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:267
+#: ../panels/network/connection-editor/net-connection-editor.c:268
 msgid "Unable to open connection editor"
 msgstr "蓝牙连接失败"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:282
+#: ../panels/network/connection-editor/net-connection-editor.c:283
 msgid "New Profile"
 msgstr "无配置"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/network/connection-editor/net-connection-editor.c:505
 #: ../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/connection-editor/net-connection-editor.c:587
 #: ../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
+#: ../panels/network/connection-editor/net-connection-editor.c:588
 msgid "Bond"
 msgstr "绑定"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:588
+#: ../panels/network/connection-editor/net-connection-editor.c:589
 msgid "Bridge"
 msgstr "桥接"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:589
+#: ../panels/network/connection-editor/net-connection-editor.c:590
 msgid "VLAN"
 msgstr "虚拟局域网"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:739
+#: ../panels/network/connection-editor/net-connection-editor.c:740
 msgid "Could not load VPN plugins"
 msgstr "无法装入 VPN 插件"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:803
+#: ../panels/network/connection-editor/net-connection-editor.c:804
 msgid "Import from file…"
 msgstr "从文件导入..."
 
-#: ../panels/network/connection-editor/net-connection-editor.c:870
+#: ../panels/network/connection-editor/net-connection-editor.c:871
 msgid "Add Network Connection"
 msgstr "添加网络连接"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:53
+#: ../panels/network/network-wifi.ui.h:39
 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
+#: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "忘记(_F)"
 
@@ -2524,6 +2427,7 @@ msgid "Select file to import"
 msgstr "选择要导入的文件"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:294
+#, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "名为“%s”的文件已存在。"
 
@@ -2596,11 +2500,11 @@ msgstr ""
 
 #: ../panels/network/net-device-bond.c:77
 msgid "Bond slaves"
-msgstr ""
+msgstr "绑定从机"
 
 #: ../panels/network/net-device-bridge.c:77
 msgid "Bridge slaves"
-msgstr ""
+msgstr "桥接从机"
 
 #: ../panels/network/net-device-ethernet.c:112
 #: ../panels/network/net-device-wifi.c:465
@@ -2631,12 +2535,13 @@ 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-ethernet.ui.h:3
 #: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
 msgid "Options…"
 msgstr "选项…"
 
 #: ../panels/network/net-device-ethernet.c:472
+#, c-format
 msgid "Profile %d"
 msgstr "配置 %d"
 
@@ -2678,21 +2583,18 @@ 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/network/net-device-wifi.c:1712
 #: ../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
+#: ../panels/network/net-device-wifi.c:1724
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -2716,6 +2618,11 @@ msgid "Proxy"
 msgstr "代理"
 
 #: ../panels/network/network-ethernet.ui.h:1
+#: ../panels/network/network-simple.ui.h:1
+msgid "Wired"
+msgstr "有线"
+
+#: ../panels/network/network-ethernet.ui.h:2
 msgid "_Add Profile…"
 msgstr "添加配置(_A)"
 
@@ -2728,7 +2635,7 @@ msgid "Provider"
 msgstr "提供商"
 
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-simple.ui.h:8
 msgid "_Options…"
 msgstr "选项(_O)…"
 
@@ -2791,7 +2698,7 @@ msgstr "FTP 代理端口"
 msgid "Socks proxy port"
 msgstr "SOCKS 代理端口"
 
-#: ../panels/network/network-simple.ui.h:6
+#: ../panels/network/network-simple.ui.h:7
 msgid "Turn device off"
 msgstr "设备关闭"
 
@@ -2856,158 +2763,114 @@ msgid "None"
 msgstr "无"
 
 #: ../panels/network/network-wifi.ui.h:19
-msgid "blablabla"
-msgstr "blablabla"
-
-#: ../panels/network/network-wifi.ui.h:20
 msgid "Show P_assword"
 msgstr "显示密码(_A)"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: ../panels/network/network-wifi.ui.h:20
 msgid "Make available to other users"
 msgstr "对其他用户有效"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: ../panels/network/network-wifi.ui.h:21
 msgid "identity"
 msgstr "认证"
 
-#: ../panels/network/network-wifi.ui.h:27
+#: ../panels/network/network-wifi.ui.h:26
 msgid "Automatic (DHCP) addresses only"
 msgstr "自动(DHCP) 仅地址"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: ../panels/network/network-wifi.ui.h:27
 msgid "Link-local only"
 msgstr "仅本地连接"
 
-#: ../panels/network/network-wifi.ui.h:29
+#: ../panels/network/network-wifi.ui.h:28
 msgid "Shared with other computers"
 msgstr "与其它计算机共享"
 
 #: ../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:35
-msgid ""
-"DNS\n"
-"section\n"
-"goes\n"
-"here"
-msgstr ""
-"DNS\n"
-"部分\n"
-"放在\n"
-"这里"
-
-#: ../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
+#: ../panels/network/network-wifi.ui.h:33
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:48
+#: ../panels/network/network-wifi.ui.h:35
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:50
+#: ../panels/network/network-wifi.ui.h:37
 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
+#: ../panels/network/network-wifi.ui.h:38
 msgid "hardware"
 msgstr "硬件"
 
-#: ../panels/network/network-wifi.ui.h:55
+#: ../panels/network/network-wifi.ui.h:41
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
 msgstr "将这个连接的设置重置为默认值，但记住它是首选连接。"
 
-#: ../panels/network/network-wifi.ui.h:56
+#: ../panels/network/network-wifi.ui.h:42
 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
+#: ../panels/network/network-wifi.ui.h:43
 msgid "reset"
 msgstr "重置"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:48
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../panels/network/network-wifi.ui.h:64
+#: ../panels/network/network-wifi.ui.h:50
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi 热点"
 
-#: ../panels/network/network-wifi.ui.h:65
+#: ../panels/network/network-wifi.ui.h:51
 msgid "_Turn On"
 msgstr "开启(_T)"
 
-#: ../panels/network/network-wifi.ui.h:66
+#: ../panels/network/network-wifi.ui.h:52
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../panels/network/network-wifi.ui.h:67
+#: ../panels/network/network-wifi.ui.h:53
 msgid "Turn Wi-Fi off"
 msgstr "关闭 Wi-Fi"
 
-#: ../panels/network/network-wifi.ui.h:68
+#: ../panels/network/network-wifi.ui.h:54
 msgid "_Use as Hotspot…"
 msgstr "用作热点(_U)…"
 
-#: ../panels/network/network-wifi.ui.h:69
+#: ../panels/network/network-wifi.ui.h:55
 msgid "_Connect to Hidden Network…"
 msgstr "连接到隐藏网络(_C)…"
 
-#: ../panels/network/network-wifi.ui.h:70
+#: ../panels/network/network-wifi.ui.h:56
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../panels/network/network-wifi.ui.h:71
+#: ../panels/network/network-wifi.ui.h:57
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "关闭以连接到 Wi-Fi 网络"
 
-#: ../panels/network/network-wifi.ui.h:72
+#: ../panels/network/network-wifi.ui.h:58
 msgid "Network Name"
 msgstr "网络名称"
 
-#: ../panels/network/network-wifi.ui.h:73
+#: ../panels/network/network-wifi.ui.h:59
 msgid "Connected Devices"
 msgstr "已连接的设备"
 
-#: ../panels/network/network-wifi.ui.h:74
+#: ../panels/network/network-wifi.ui.h:60
 msgid "Security type"
 msgstr "加密类型"
 
-#: ../panels/network/network-wifi.ui.h:75
+#: ../panels/network/network-wifi.ui.h:61
 msgid "Security key"
 msgstr "安全密钥"
 
@@ -3329,7 +3192,7 @@ 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 ""
+msgstr "GTC"
 
 #: ../panels/network/wireless-security/eap-method-fast.c:277
 #: ../panels/network/wireless-security/eap-method-peap.c:246
@@ -3346,20 +3209,18 @@ 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 ""
+msgstr "PAC 连接提供(_V)"
 
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1
@@ -3375,13 +3236,12 @@ 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 ""
+msgstr "两者"
 
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
@@ -3507,12 +3367,10 @@ 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 (默认)"
 
@@ -3529,7 +3387,6 @@ msgid "4"
 msgstr "4"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:5
-#| msgid "System"
 msgid "Open System"
 msgstr "开放系统"
 
@@ -3547,23 +3404,20 @@ msgstr "显示密钥(_W)"
 
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x"
-msgstr ""
+msgstr "WEP 索引(_X)"
 
 #: ../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 "声音警告"
@@ -3580,7 +3434,6 @@ msgid "Show Details in Banners"
 msgstr "在条幅中显示细节"
 
 #: ../panels/notifications/cc-edit-dialog.c:45
-#| msgid "Lock screen"
 msgctxt "notifications"
 msgid "View in Lock Screen"
 msgstr "在锁定屏幕中查看"
@@ -3605,7 +3458,6 @@ msgid "Off"
 msgstr "关"
 
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-#| msgid "Magnification:"
 msgid "Notifications"
 msgstr "通知"
 
@@ -3624,14 +3476,12 @@ 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/region/cc-input-chooser.c:1073
 #: ../panels/search/cc-search-locations-dialog.c:480
-#| msgid "Other..."
 msgid "Other"
 msgstr "其他"
 
@@ -3641,17 +3491,15 @@ msgstr "其他"
 msgid "Add Account"
 msgstr "添加账户"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:329
-#| msgid "_Mail"
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:330
 msgid "Mail"
 msgstr "邮件"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:335
-#| msgid "Contrast:"
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:336
 msgid "Contacts"
 msgstr "联系人"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:341
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:342
 msgid "Resources"
 msgstr "资源"
 
@@ -3664,7 +3512,6 @@ 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 "登入启用此账户。"
 
@@ -3672,23 +3519,23 @@ msgstr "登入启用此账户。"
 msgid "_Sign In"
 msgstr "登入(_S)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:680
+#: ../panels/online-accounts/cc-online-accounts-panel.c:684
 msgid "Error creating account"
 msgstr "创建账户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:722
+#: ../panels/online-accounts/cc-online-accounts-panel.c:726
 msgid "Error removing account"
 msgstr "移除账户出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:758
+#: ../panels/online-accounts/cc-online-accounts-panel.c:762
 msgid "Are you sure you want to remove the account?"
 msgstr "您确定要移除该账户吗？"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:760
+#: ../panels/online-accounts/cc-online-accounts-panel.c:764
 msgid "This will not remove the account on the server."
 msgstr "这不会将该账户从服务器上移除。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:761
+#: ../panels/online-accounts/cc-online-accounts-panel.c:765
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -3762,15 +3609,13 @@ msgstr[0] "分"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
 #: ../panels/power/cc-power-panel.c:231
-#, fuzzy, c-format
-#| msgid "Charging - %s until fully charged"
+#, c-format
 msgid "%s until fully charged"
-msgstr "正在充电 - 剩余 %s"
+msgstr "%s 后充满"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
 #: ../panels/power/cc-power-panel.c:238
 #, c-format
-#| msgid "Caution low UPS, %s remaining"
 msgid "Caution: %s remaining"
 msgstr "注意：剩余 %s"
 
@@ -3782,7 +3627,6 @@ msgstr "剩余 %s"
 
 #. TRANSLATORS: primary battery
 #: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
-#| msgid "Full Screen"
 msgid "Fully charged"
 msgstr "已充满"
 
@@ -3798,7 +3642,6 @@ msgstr "正在充电"
 
 #. TRANSLATORS: primary battery
 #: ../panels/power/cc-power-panel.c:272
-#| msgid "UPS discharging"
 msgid "Discharging"
 msgstr "正在放电"
 
@@ -3889,7 +3732,6 @@ msgstr "充足"
 
 #. TRANSLATORS: primary battery
 #: ../panels/power/cc-power-panel.c:557
-#| msgid "Full Screen"
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已充满"
@@ -3901,7 +3743,6 @@ msgid "Empty"
 msgstr "空"
 
 #: ../panels/power/cc-power-panel.c:732
-#| msgid "Battery"
 msgid "Batteries"
 msgstr "电池组"
 
@@ -3914,37 +3755,38 @@ 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:1521
+msgid "Turns off wireless devices"
+msgstr "关闭无线设备"
+
 #: ../panels/power/cc-power-panel.c:1544
-#| msgid "Mobile broadband"
 msgid "_Mobile Broadband"
 msgstr "移动宽带(_M)"
 
+#: ../panels/power/cc-power-panel.c:1549
+msgid "Turns off Mobile Broadband (3G, 4G, WiMax, etc.) devices"
+msgstr "关闭移动宽带(3G、4G、WiMax 等)设备"
+
 #: ../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 "电池供电时"
 
@@ -3957,18 +3799,14 @@ 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 "电源关闭"
 
@@ -3986,7 +3824,6 @@ 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;"
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 msgstr ""
@@ -4002,7 +3839,6 @@ msgid "Power off"
 msgstr "电源关闭"
 
 #: ../panels/power/power.ui.h:5
-#| msgid "5 minutes"
 msgid "45 minutes"
 msgstr "45 分钟"
 
@@ -4011,22 +3847,18 @@ msgid "1 hour"
 msgstr "1 小时"
 
 #: ../panels/power/power.ui.h:7
-#| msgid "10 minutes"
 msgid "80 minutes"
 msgstr "80 分钟"
 
 #: ../panels/power/power.ui.h:8
-#| msgid "10 minutes"
 msgid "90 minutes"
 msgstr "90 分钟"
 
 #: ../panels/power/power.ui.h:9
-#| msgid "10 minutes"
 msgid "100 minutes"
 msgstr "100 分钟"
 
 #: ../panels/power/power.ui.h:10
-#| msgid "1 hour"
 msgid "2 hours"
 msgstr "2 小时"
 
@@ -4043,7 +3875,6 @@ msgid "3 minutes"
 msgstr "3 分钟"
 
 #: ../panels/power/power.ui.h:14
-#| msgid "5 minutes"
 msgid "4 minutes"
 msgstr "4 分钟"
 
@@ -4052,7 +3883,6 @@ msgid "5 minutes"
 msgstr "5 分钟"
 
 #: ../panels/power/power.ui.h:16
-#| msgid "5 minutes"
 msgid "8 minutes"
 msgstr "8 分钟"
 
@@ -4061,49 +3891,39 @@ 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"
+#: ../panels/sharing/sharing.ui.h:22
 msgid "Password"
 msgstr "密码"
 
 #: ../panels/printers/authentication-dialog.ui.h:6
-#| msgid "Authentication required"
 msgid "Authentication Required"
 msgstr "需要认证"
 
@@ -4271,17 +4091,14 @@ msgid "No suitable driver found"
 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:2338
-#| msgid "Select from database..."
 msgid "Select from database…"
 msgstr "从数据库选择…"
 
 #: ../panels/printers/cc-printers-panel.c:2347
-#| msgid "Provide PPD File..."
 msgid "Provide PPD File…"
 msgstr "提供 PPD 文件…"
 
@@ -4309,7 +4126,8 @@ msgstr "添加打印机，查看打印任务并且管理打印"
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr ""
-"Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;硒鼓;墨盒;"
+"Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;硒鼓;墨"
+"盒;"
 
 #. Translators: This dialog contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:2
@@ -4348,7 +4166,6 @@ msgid "Search for network printers or filter result"
 msgstr "搜索网络打印机或过滤结果"
 
 #: ../panels/printers/options-dialog.ui.h:1
-#| msgid "Loading options..."
 msgid "Loading options…"
 msgstr "正在载入选项…"
 
@@ -4591,7 +4408,6 @@ msgstr "无预过滤"
 
 #. Translators: Name of column showing printer manufacturers
 #: ../panels/printers/pp-ppd-selection-dialog.c:233
-#| msgid "Manufacturer:"
 msgid "Manufacturer"
 msgstr "厂商"
 
@@ -4647,7 +4463,6 @@ msgid "label"
 msgstr "标签"
 
 #: ../panels/printers/printers.ui.h:17
-#| msgid "Setting new driver..."
 msgid "Setting new driver…"
 msgstr "正在设置新驱动…"
 
@@ -4682,17 +4497,14 @@ msgid "Hidden"
 msgstr "隐藏"
 
 #: ../panels/privacy/cc-privacy-panel.c:105
-#| msgid "Visibility"
 msgid "Visible"
 msgstr "可见"
 
 #: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
-#| msgid "Screenshots"
 msgid "Screen Lock"
 msgstr "锁屏"
 
 #: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
-#| msgid "Visibility"
 msgid "Name & Visibility"
 msgstr "名称及可见性"
 
@@ -4722,7 +4534,6 @@ msgstr ""
 "network;identity;屏幕;锁定;诊断;崩溃;私有;最近;临时;索引;名称;网络;认证;"
 
 #: ../panels/privacy/privacy.ui.h:1
-#| msgid "Screen turns off"
 msgid "Screen Turns Off"
 msgstr "关闭屏幕"
 
@@ -4743,10 +4554,8 @@ msgid "Display full name in _lock screen"
 msgstr "在锁屏时显示全名(_L)"
 
 #: ../panels/privacy/privacy.ui.h:14
-#, fuzzy
-#| msgid "Switch Modes"
 msgid "_Stealth Mode"
-msgstr "模式切换"
+msgstr "隐私模式(_S)"
 
 #: ../panels/privacy/privacy.ui.h:15
 msgid "Immediately"
@@ -4789,7 +4598,6 @@ msgid "30 days"
 msgstr "30 天"
 
 #: ../panels/privacy/privacy.ui.h:25
-#| msgid "never"
 msgid "Forever"
 msgstr "永远"
 
@@ -4816,18 +4624,14 @@ 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)："
+msgstr "空闲锁屏的等待时间(_A)："
 
 #: ../panels/privacy/privacy.ui.h:35
-#| msgid "Show _notifications when locked"
 msgid "Show _Notifications"
 msgstr "显示通知(_N)"
 
@@ -4836,7 +4640,6 @@ msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
 #: ../panels/privacy/privacy.ui.h:38
-#| msgid "_Keep Files"
 msgid "_Purge Temporary Files"
 msgstr "清理临时文件(_P)"
 
@@ -4856,60 +4659,52 @@ msgstr "自动清理临时文件(_F)"
 
 #: ../panels/privacy/privacy.ui.h:42
 msgid "Purge _After"
-msgstr ""
+msgstr "清理延时(_A)"
 
 #: ../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/cc-format-chooser.c:268
-#| msgid "No local printers found"
+#: ../panels/region/cc-format-chooser.c:283
 msgid "No regions found"
 msgstr "未找到区域"
 
-#: ../panels/region/cc-input-chooser.c:179
-#| msgid "Move Input Source Down"
+#: ../panels/region/cc-input-chooser.c:186
 msgid "No input sources found"
 msgstr "未找到输入源"
 
-#: ../panels/region/cc-region-panel.c:225
+#: ../panels/region/cc-region-panel.c:239
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "修改需要重启会话才能生效"
 
-#: ../panels/region/cc-region-panel.c:226
+#: ../panels/region/cc-region-panel.c:240
 msgid "Restart Now"
 msgstr "现在重启"
 
-#: ../panels/region/cc-region-panel.c:436
-#| msgid "None"
+#: ../panels/region/cc-region-panel.c:550
 msgctxt "Language"
 msgid "None"
 msgstr "无"
 
-#: ../panels/region/cc-region-panel.c:898
+#: ../panels/region/cc-region-panel.c:1040
 msgid "Sorry"
 msgstr "抱歉"
 
-#: ../panels/region/cc-region-panel.c:900
+#: ../panels/region/cc-region-panel.c:1042
 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:1491
+msgid "No input source selected"
+msgstr "未选择输入源"
 
-#: ../panels/region/cc-region-panel.c:1502
-#| msgid "Lock screen"
+#: ../panels/region/cc-region-panel.c:1652
 msgid "Login Screen"
 msgstr "登录屏幕"
 
@@ -4938,7 +4733,6 @@ msgid "Measurement"
 msgstr "度量衡"
 
 #: ../panels/region/format-chooser.ui.h:8
-#| msgid "Paper Type"
 msgid "Paper"
 msgstr "纸张"
 
@@ -4953,32 +4747,26 @@ 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;"
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Language;Layout;Keyboard;Input;语言;布局;键盘;输入;"
 
 #: ../panels/region/input-chooser.ui.h:1
-#| msgid "Add Input Source"
 msgid "Add an Input Source"
 msgstr "添加输入源"
 
 #: ../panels/region/input-options.ui.h:1
-#| msgid "Input Source Settings"
 msgid "Input Source Options"
 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/input-options.ui.h:3
-#| msgid "Allow different layouts for individual windows"
 msgid "Allow _different sources for each window"
 msgstr "每个窗口使用不同的输入源(_D)"
 
 #: ../panels/region/input-options.ui.h:4
-#| msgid "Keyboard Settings"
 msgid "Keyboard Shortcuts"
 msgstr "键盘快捷键"
 
@@ -4987,7 +4775,6 @@ msgid "Switch to previous source"
 msgstr "切换至上个源"
 
 #: ../panels/region/input-options.ui.h:6
-#| msgid "Ctrl+Alt+Shift+Space"
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
@@ -5004,10 +4791,8 @@ msgid "You can change these shortcuts in the keyboard settings"
 msgstr "可以在键盘设置中修改快捷键"
 
 #: ../panels/region/input-options.ui.h:10
-#, fuzzy
-#| msgid "Switch to next source"
 msgid "Alternative switch to next source"
-msgstr "切换至下个源"
+msgstr "选择性的切换至下个源"
 
 #: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
@@ -5038,12 +4823,10 @@ msgid "Bookmarks"
 msgstr "书签"
 
 #: ../panels/search/cc-search-locations-dialog.c:676
-#| msgid "Select a region"
 msgid "Select Location"
 msgstr "选择位置"
 
-#: ../panels/search/cc-search-panel.c:193
-#| msgid "No local printers found"
+#: ../panels/search/cc-search-panel.c:182
 msgid "No applications found"
 msgstr "未找到应用"
 
@@ -5063,7 +4846,6 @@ msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;搜索;查找;寻找;索引;隐藏;隐私;结果;"
 
 #: ../panels/search/search-locations-dialog.ui.h:1
-#| msgid "Location"
 msgid "Search Locations"
 msgstr "搜索位置"
 
@@ -5076,7 +4858,6 @@ msgid "Move Down"
 msgstr "下移"
 
 #: ../panels/search/search.ui.h:3
-#| msgid "Mouse Preferences"
 msgid "Preferences"
 msgstr "首选项"
 
@@ -5091,7 +4872,6 @@ msgid "Off"
 msgstr "关"
 
 #: ../panels/sharing/cc-sharing-panel.c:407
-#| msgid "Choose a Layout"
 msgid "Choose a Folder"
 msgstr "选择文件夹"
 
@@ -5100,7 +4880,6 @@ msgid "Copy"
 msgstr "复制"
 
 #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
-#| msgid "Hearing"
 msgid "Sharing"
 msgstr "共享"
 
@@ -5119,17 +4898,14 @@ msgstr ""
 "频;视频;图片;照片;电影;服务器;渲染;"
 
 #: ../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 "蓝牙共享"
 
@@ -5156,52 +4932,50 @@ 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 "Remote Login"
+msgstr "远程登录"
+
+#: ../panels/sharing/sharing.ui.h:9
 msgid "Some services are disabled because of no network access."
 msgstr "因为没有网络，一些服务已经禁用。"
 
-#: ../panels/sharing/sharing.ui.h:9
-#| msgid "Media player"
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Media Sharing"
 msgstr "媒体共享"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: ../panels/sharing/sharing.ui.h:11
 msgid "Share Music, Photos and Videos with others on the current network."
 msgstr "在当前网络上共享音乐、照片和视频。"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: ../panels/sharing/sharing.ui.h:12
 msgid "Share Media On This Network"
 msgstr "在网络上共享媒体"
 
-#: ../panels/sharing/sharing.ui.h:12
-#| msgid "Pictures Folder"
+#: ../panels/sharing/sharing.ui.h:13
 msgid "Shared Folders"
 msgstr "共享文件夹"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: ../panels/sharing/sharing.ui.h:14
 msgid "column"
 msgstr "列"
 
-#: ../panels/sharing/sharing.ui.h:14
-#| msgid "Add profile"
+#: ../panels/sharing/sharing.ui.h:15
 msgid "Add Folder"
 msgstr "添加文件夹"
 
-#: ../panels/sharing/sharing.ui.h:15
-#| msgid "Remove User"
+#: ../panels/sharing/sharing.ui.h:16
 msgid "Remove Folder"
 msgstr "移除文件夹"
 
-#: ../panels/sharing/sharing.ui.h:16
-#| msgid "Personal digital assistant"
+#: ../panels/sharing/sharing.ui.h:17
 msgid "Personal File Sharing"
 msgstr "个人文件共享"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: ../panels/sharing/sharing.ui.h:19
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5210,20 +4984,14 @@ msgstr ""
 "个人网络共享允许您与当前网络中的其他人共享自己的共享文件夹，使用地址：<a "
 "href=\"dav://%s\">dav://%s</a>"
 
-#: ../panels/sharing/sharing.ui.h:19
+#: ../panels/sharing/sharing.ui.h:20
 msgid "Share Public Folder On This Network"
 msgstr "在网络上共享公共文件夹"
 
-#: ../panels/sharing/sharing.ui.h:20
-#| msgid "Group Password"
+#: ../panels/sharing/sharing.ui.h:21
 msgid "Require Password"
 msgstr "需要密码"
 
-#: ../panels/sharing/sharing.ui.h:22
-#| msgid "Remove Region"
-msgid "Remote Login"
-msgstr "远程登录"
-
 #: ../panels/sharing/sharing.ui.h:24
 #, no-c-format
 msgid ""
@@ -5234,7 +5002,6 @@ msgstr ""
 "<a href=\"ssh %s\">ssh %s</a>"
 
 #: ../panels/sharing/sharing.ui.h:26
-#| msgid "Screen Settings"
 msgid "Screen Sharing"
 msgstr "屏幕共享"
 
@@ -5246,22 +5013,18 @@ msgid ""
 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 "显示密码"
 
@@ -5270,7 +5033,6 @@ msgid "Sound"
 msgstr "声音"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-#| msgid "Change sound volume and event sounds"
 msgid "Change sound levels, inputs, outputs, and alert sounds"
 msgstr "更改音量、输入、输出和事件声音"
 
@@ -5517,7 +5279,7 @@ msgstr ""
 "度;缩放;屏幕读取器;文本;字体;大小;粘滞键;慢速键;回弹键;鼠标键;"
 
 #: ../panels/universal-access/uap.ui.h:1
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: ../panels/universal-access/zoom-options.ui.h:35
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低"
@@ -5528,7 +5290,7 @@ msgid "Normal"
 msgstr "普通"
 
 #: ../panels/universal-access/uap.ui.h:3
-#: ../panels/universal-access/zoom-options.ui.h:35
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高"
@@ -5922,66 +5684,66 @@ msgstr "粗"
 msgid "Length:"
 msgstr "长度："
 
-#: ../panels/universal-access/zoom-options.ui.h:21
+#. The color of the accessibility crosshair
+#: ../panels/universal-access/zoom-options.ui.h:22
 msgid "Color:"
 msgstr "颜色："
 
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: ../panels/universal-access/zoom-options.ui.h:23
 msgid "Crosshairs:"
 msgstr "十字光标："
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: ../panels/universal-access/zoom-options.ui.h:24
 msgid "Overlaps mouse cursor"
 msgstr "光标与鼠标指针重叠"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Crosshairs"
 msgstr "十字光标"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: ../panels/universal-access/zoom-options.ui.h:26
 msgid "White on black:"
 msgstr "白底黑字："
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: ../panels/universal-access/zoom-options.ui.h:27
 msgid "Brightness:"
 msgstr "亮度："
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: ../panels/universal-access/zoom-options.ui.h:28
 msgid "Contrast:"
 msgstr "对比度："
 
 #. The contrast scale goes from Color to None (grayscale)
-#: ../panels/universal-access/zoom-options.ui.h:29
-#| msgid "Color"
+#: ../panels/universal-access/zoom-options.ui.h:30
 msgctxt "universal access, contrast"
 msgid "Color"
 msgstr "色彩"
 
-#: ../panels/universal-access/zoom-options.ui.h:30
+#: ../panels/universal-access/zoom-options.ui.h:31
 msgctxt "universal access, color"
 msgid "None"
 msgstr "无"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
+#: ../panels/universal-access/zoom-options.ui.h:32
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "完全"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
+#: ../panels/universal-access/zoom-options.ui.h:33
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/universal-access/zoom-options.ui.h:33
+#: ../panels/universal-access/zoom-options.ui.h:34
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "高"
 
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: ../panels/universal-access/zoom-options.ui.h:37
 msgid "Color Effects:"
 msgstr "色彩效果："
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: ../panels/universal-access/zoom-options.ui.h:38
 msgid "Color Effects"
 msgstr "色彩效果"
 
@@ -6114,12 +5876,10 @@ msgid ""
 msgstr "您的指纹已成功保存。您现在应该可以使用指纹读取器登录了。"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
-#| msgid "Username"
 msgid "Users"
 msgstr "用户"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-#| msgid "Add or remove users"
 msgid "Add or remove users and change your password"
 msgstr "添加或删除用户及更改密码"
 
@@ -6131,22 +5891,18 @@ msgstr ""
 "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 "下一周"
 
@@ -6269,7 +6025,6 @@ msgid "_Language"
 msgstr "语言(_L)"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
-#| msgid "A_utomatic Login"
 msgid "Last Login"
 msgstr "最近登录"
 
@@ -6472,7 +6227,6 @@ msgid "This Week"
 msgstr "本周"
 
 #: ../panels/user-accounts/um-history-dialog.c:91
-#| msgid "Last used"
 msgid "Last Week"
 msgstr "上周"
 
@@ -6497,7 +6251,6 @@ msgid "You need to enter a new password"
 msgstr "您需要输入一个新密码"
 
 #: ../panels/user-accounts/um-password-dialog.c:304
-#| msgid "The new password is too short"
 msgid "The new password is not strong enough"
 msgstr "新密码不够强"
 
@@ -6530,12 +6283,10 @@ msgid "Disable image"
 msgstr "禁用图像"
 
 #: ../panels/user-accounts/um-photo-dialog.c:461
-#| msgid "Take a photo..."
 msgid "Take a photo…"
 msgstr "拍张照…"
 
 #: ../panels/user-accounts/um-photo-dialog.c:479
-#| msgid "Browse for more pictures"
 msgid "Browse for more pictures…"
 msgstr "浏览更多图片…"
 
@@ -6758,13 +6509,11 @@ msgid "Show On-Screen Help"
 msgstr "显示屏幕帮助"
 
 #: ../panels/wacom/cc-wacom-page.c:621
-#| msgid "Up"
 msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "上"
 
 #: ../panels/wacom/cc-wacom-page.c:621
-#| msgid "Down"
 msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "下"
@@ -6793,7 +6542,7 @@ msgstr "Wacom 手写板"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
-msgstr ""
+msgstr "为绘图用平板设备设置按键映射和调整触摸笔灵敏度"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
@@ -6825,12 +6574,10 @@ msgid "Bluetooth Settings"
 msgstr "蓝牙设置"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
-#| msgid "Map to Monitor..."
 msgid "Map to Monitor…"
 msgstr "映射到显示器…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:9
-#| msgid "Map Buttons"
 msgid "Map Buttons…"
 msgstr "映射按键…"
 
@@ -7045,7 +6792,6 @@ msgstr ""
 "运行 “%s --help” 查看所有可用的命令行选项。\n"
 
 #: ../shell/cc-application.c:154
-#| msgid "Available Profiles"
 msgid "Available panels:"
 msgstr "可用面板"
 
@@ -7057,30 +6803,27 @@ msgstr "帮助"
 msgid "Quit"
 msgstr "退出"
 
-#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../shell/cc-window.c:62 ../shell/gnome-control-center.desktop.in.in.h:1
 msgid "Settings"
 msgstr "设置"
 
 #. Add categories
-#: ../shell/cc-window.c:857
-#| msgid "Proportional"
+#: ../shell/cc-window.c:858
 msgctxt "category"
 msgid "Personal"
 msgstr "个人"
 
-#: ../shell/cc-window.c:858
-#| msgid "Hardware"
+#: ../shell/cc-window.c:859
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../shell/cc-window.c:859
-#| msgid "System"
+#: ../shell/cc-window.c:860
 msgctxt "category"
 msgid "System"
 msgstr "系统"
 
-#: ../shell/cc-window.c:1413
+#: ../shell/cc-window.c:1411
 msgid "All Settings"
 msgstr "全部设置"
 
@@ -7088,6 +6831,50 @@ msgstr "全部设置"
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;首选项;设置;"
 
+#~ msgid "blablabla"
+#~ msgstr "blablabla"
+
+#~ msgid ""
+#~ "Address\n"
+#~ "section\n"
+#~ "goes\n"
+#~ "here"
+#~ msgstr ""
+#~ "网络\n"
+#~ "部分\n"
+#~ "放在\n"
+#~ "这里"
+
+#~ msgid ""
+#~ "DNS\n"
+#~ "section\n"
+#~ "goes\n"
+#~ "here"
+#~ msgstr ""
+#~ "DNS\n"
+#~ "部分\n"
+#~ "放在\n"
+#~ "这里"
+
+#~ msgid ""
+#~ "Routes\n"
+#~ "section\n"
+#~ "goes\n"
+#~ "here"
+#~ msgstr ""
+#~ "路由\n"
+#~ "部分\n"
+#~ "放在\n"
+#~ "这里"
+
+#~ msgid "00:24:16:31:8G:7A"
+#~ msgstr "00:24:16:31:8G:7A"
+
+#~| msgid "None"
+#~ msgctxt "Input source"
+#~ msgid "None"
+#~ msgstr "无"
+
 #~ msgid "Change the background"
 #~ msgstr "更改背景图像"
 
@@ -7539,9 +7326,6 @@ msgstr "Preferences;Settings;首选项;设置;"
 #~ msgid "Wireless"
 #~ msgstr "无线"
 
-#~ msgid "Wired"
-#~ msgstr "有线"
-
 #~ msgid "Mesh"
 #~ msgstr "网格"