[gnome-control-center] Update Chinese (China) translation



commit cfff970fd8ac91c3f9095bc6a4f7c1feabbb7d32
Author: Dz Chen <wsxy162 gmail com>
Date:   Wed May 8 09:23:50 2019 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 8222 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 4723 insertions(+), 3499 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c7050cc1..226b27bcd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,5 @@
 # Simplified Chinese translation for gnome-control-center.
-# Copyright (C) 2002, 2003, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2019 gnome-control-center's COPYRIGHT HOLDER
 # This file is distributed under the same license as gnome-control-center package.
 # Some translations are taken from tranditional Chinese translation.
 # by Abel Cheung <maddog linuxhall org>, 2001.
@@ -24,16 +24,16 @@
 # Eleanor Chen <chenyueg gmail com>, 2014.
 # Aron Xu <happyaron xu gmail com>, 2010, 2011, 2012, 2013, 2014, 2015.
 # Mingye Wang <arthur2e5 aosc xyz>, 2015.
-# Jeff Bai <jeffbai aosc xyz>, 2015, 2016.
-# Dingzhong Chen <wsxy162 gmail com>, 2016.
+# Mingcong Bai <jeffbai aosc xyz>, 2015, 2016, 2018.
+# Dingzhong Chen <wsxy162 gmail com>, 2016, 2018, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 3.22\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-27 16:38+0000\n"
-"PO-Revision-Date: 2016-10-30 20:32+0800\n"
+"Project-Id-Version: gnome-control-center master\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
+"issues\n"
+"POT-Creation-Date: 2019-04-01 22:33+0000\n"
+"PO-Revision-Date: 2019-04-07 17:35+0800\n"
 "Last-Translator: Dingzhong Chen <wsxy162 gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
@@ -41,380 +41,685 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+#: panels/applications/cc-applications-panel.c:561
+msgid "System Bus"
+msgstr "系统总线"
+
+#: panels/applications/cc-applications-panel.c:561
+#: panels/applications/cc-applications-panel.c:563
+#: panels/applications/cc-applications-panel.c:579
+#: panels/applications/cc-applications-panel.c:584
+msgid "Full access"
+msgstr "完全访问"
+
+#: panels/applications/cc-applications-panel.c:563
+msgid "Session Bus"
+msgstr "会话总线"
+
+#: panels/applications/cc-applications-panel.c:568
+#: panels/power/cc-power-panel.c:2453 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
+#: shell/cc-window.c:268
+msgid "Devices"
+msgstr "设备"
+
+#: panels/applications/cc-applications-panel.c:568
+msgid "Full access to /dev"
+msgstr "对 /dev 的完全访问"
+
+#: panels/applications/cc-applications-panel.c:573
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
+msgstr "网络"
+
+#: panels/applications/cc-applications-panel.c:573
+msgid "Has network access"
+msgstr "拥有网络访问"
+
+#. translators: "Home" is used in place of the Pictures
+#. * directory in the string below when XDG_PICTURES_DIR is
+#. * undefined
+#: panels/applications/cc-applications-panel.c:579
+#: panels/applications/cc-applications-panel.c:581
+#: panels/background/cc-background-chooser-dialog.c:536
+#: panels/search/cc-search-locations-dialog.c:286
+msgid "Home"
+msgstr "主目录"
+
+#: panels/applications/cc-applications-panel.c:581
+#: panels/applications/cc-applications-panel.c:586
+msgid "Read-only"
+msgstr "只读"
+
+#: panels/applications/cc-applications-panel.c:584
+#: panels/applications/cc-applications-panel.c:586
+msgid "File System"
+msgstr "文件系统"
+
+#: panels/applications/cc-applications-panel.c:591
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:272
+#: shell/cc-window.c:935 shell/cc-window.ui:131
+#: shell/gnome-control-center.desktop.in.in:3
+msgid "Settings"
+msgstr "设置"
+
+#: panels/applications/cc-applications-panel.c:591
+msgid "Can change settings"
+msgstr "可以修改设置"
+
+#: panels/applications/cc-applications-panel.c:596
+#, c-format
+msgid ""
+"%s has the following permissions built-in. These cannot be altered. If you "
+"are concerned about these permissions, consider removing this application."
+msgstr ""
+"%s 拥有以下内置权限。这些无法被更改。如果您在意这些权限,请考虑移除该应用程"
+"序。"
+
+#: panels/applications/cc-applications-panel.c:738
+msgid "Web Links"
+msgstr "Web 链接"
+
+#: panels/applications/cc-applications-panel.c:748
+msgid "Git Links"
+msgstr "Git 链接"
+
+#: panels/applications/cc-applications-panel.c:754
+#, c-format
+msgid "%s Links"
+msgstr "%s 链接"
+
+#: panels/applications/cc-applications-panel.c:762
+#: panels/applications/cc-applications-panel.c:798
+msgid "Unset"
+msgstr "未设置"
+
+#: panels/applications/cc-applications-panel.c:853
+msgid "Links"
+msgstr "链接"
+
+#: panels/applications/cc-applications-panel.c:861
+msgid "Hypertext Files"
+msgstr "超文本文件"
+
+#: panels/applications/cc-applications-panel.c:875
+msgid "Text Files"
+msgstr "文本文件"
+
+#: panels/applications/cc-applications-panel.c:889
+msgid "Image Files"
+msgstr "图像文件"
+
+#: panels/applications/cc-applications-panel.c:905
+msgid "Font Files"
+msgstr "字体文件"
+
+#: panels/applications/cc-applications-panel.c:966
+msgid "Archive Files"
+msgstr "归档文件"
+
+#: panels/applications/cc-applications-panel.c:986
+msgid "Package Files"
+msgstr "软件包文件"
+
+#: panels/applications/cc-applications-panel.c:1009
+msgid "Audio Files"
+msgstr "音频文件"
+
+#: panels/applications/cc-applications-panel.c:1026
+msgid "Video Files"
+msgstr "视频文件"
+
+#: panels/applications/cc-applications-panel.c:1034
+msgid "Other Files"
+msgstr "其它文件"
+
+#. List of applications.
+#: panels/applications/cc-applications-panel.c:1376
+#: panels/applications/cc-applications-panel.ui:406
+#: panels/applications/gnome-applications-panel.desktop.in.in:3
+#: panels/notifications/cc-notifications-panel.ui:167
+#: panels/privacy/cc-privacy-panel.ui:1085
+msgid "Applications"
+msgstr "应用程序"
+
+#: panels/applications/cc-applications-panel.ui:45
+msgid "No applications"
+msgstr "没有应用程序"
+
+#: panels/applications/cc-applications-panel.ui:59
+msgid "Install some…"
+msgstr "安装一些…"
+
+#: panels/applications/cc-applications-panel.ui:99
+msgid "Permissions & Access"
+msgstr "权限和访问"
+
+#: panels/applications/cc-applications-panel.ui:111
+msgid ""
+"Data and services that this app has asked for access to and permissions that "
+"it requires."
+msgstr "应用要求访问的数据和服务以及它需要的权限。"
+
+#: panels/applications/cc-applications-panel.ui:126
+#: panels/applications/cc-applications-panel.ui:132
+#: panels/privacy/cc-privacy-panel.c:908 panels/privacy/cc-privacy-panel.ui:745
+msgid "Camera"
+msgstr "相机"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
+#. translators:
+#. * The device has been disabled
+#: panels/applications/cc-applications-panel.ui:133
+#: panels/applications/cc-applications-panel.ui:145
+#: panels/applications/cc-applications-panel.ui:157
+#: panels/applications/cc-applications-panel.ui:237
+#: panels/applications/cc-applications-panel.ui:255
+#: panels/keyboard/cc-keyboard-option.c:259
+#: panels/keyboard/cc-keyboard-option.c:378
+#: panels/keyboard/keyboard-shortcuts.c:425
+#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
+#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1864
+msgid "Disabled"
+msgstr "已禁用"
+
+#: panels/applications/cc-applications-panel.ui:138
+#: panels/applications/cc-applications-panel.ui:144
+#: panels/privacy/cc-privacy-panel.c:941 panels/privacy/cc-privacy-panel.ui:850
+msgid "Microphone"
+msgstr "麦克风"
+
+#: panels/applications/cc-applications-panel.ui:150
+#: panels/applications/cc-applications-panel.ui:156
+#: panels/privacy/cc-privacy-panel.c:850 panels/privacy/cc-privacy-panel.ui:955
+msgid "Location Services"
+msgstr "定位服务"
+
+#: panels/applications/cc-applications-panel.ui:162
+#: panels/applications/cc-applications-panel.ui:489
+msgid "Built-in Permissions"
+msgstr "内置权限"
+
+#: panels/applications/cc-applications-panel.ui:163
+msgid "Cannot be changed"
+msgstr "无法被修改"
+
+#: panels/applications/cc-applications-panel.ui:180
+msgid ""
+"Individual permissions for applications can be reviewed in the <a href="
+"\"privacy\">Privacy</a> Settings."
+msgstr "应用程序的各个权限可以在 <a href=\"privacy\">隐私</a> 设置中查看。"
+
+# 左撇子有歧视色彩。
+#: panels/applications/cc-applications-panel.ui:204
+msgid "Integration"
+msgstr "集成"
+
+#: panels/applications/cc-applications-panel.ui:216
+msgid "System features used by this application."
+msgstr "此应用程序使用的系统功能。"
+
+#: panels/applications/cc-applications-panel.ui:230
+#: panels/applications/cc-applications-panel.ui:236
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:161
+msgid "Search"
+msgstr "搜索"
+
+#: panels/applications/cc-applications-panel.ui:242
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
+msgstr "通知"
+
+#: panels/applications/cc-applications-panel.ui:248
+#: panels/applications/cc-applications-panel.ui:254
+msgid "Sounds"
+msgstr "声音"
+
+#: panels/applications/cc-applications-panel.ui:287
+msgid "Default Handlers"
+msgstr "默认处理程序"
+
+#: panels/applications/cc-applications-panel.ui:299
+msgid "Types of files and links that this application opens."
+msgstr "应用程序打开的文件和链接类型。"
+
+#: panels/applications/cc-applications-panel.ui:315
+msgid "Reset"
+msgstr "重置"
+
+#: panels/applications/cc-applications-panel.ui:351
+msgid "Usage"
+msgstr "占用"
+
+#: panels/applications/cc-applications-panel.ui:363
+msgid "How much resources this application is using."
+msgstr "应用程序使用了多少资源。"
+
+#: panels/applications/cc-applications-panel.ui:378
+#: panels/applications/cc-applications-panel.ui:525
+msgid "Storage"
+msgstr "存储"
+
+#: panels/applications/cc-applications-panel.ui:413
+msgid "Open in Software"
+msgstr "在“软件”中打开"
 
-#: ../panels/background/background.ui.h:1
+#: panels/applications/cc-applications-panel.ui:463 shell/cc-panel-list.ui:190
+msgid "No results found"
+msgstr "未找到结果"
+
+#: panels/applications/cc-applications-panel.ui:474
+#: panels/keyboard/cc-keyboard-panel.ui:175 shell/cc-panel-list.ui:201
+msgid "Try a different search"
+msgstr "尝试不同的搜索"
+
+#: panels/applications/cc-applications-panel.ui:542
+msgid ""
+"How much disk space this application is occupying with app data and caches."
+msgstr "此应用程序包括应用数据和缓存占用了多少硬盘空间。"
+
+#: panels/applications/cc-applications-panel.ui:551
+msgid "Application"
+msgstr "应用程序"
+
+#: panels/applications/cc-applications-panel.ui:557
+msgid "Data"
+msgstr "数据"
+
+#: panels/applications/cc-applications-panel.ui:563
+msgid "Cache"
+msgstr "缓存"
+
+#: panels/applications/cc-applications-panel.ui:569
+msgid "<b>Total</b>"
+msgstr "<b>全部</b>"
+
+#: panels/applications/cc-applications-panel.ui:586
+msgid "Clear Cache…"
+msgstr "清空缓存…"
+
+#: panels/applications/gnome-applications-panel.desktop.in.in:4
+msgid "Control various application permissions and settings"
+msgstr "控制不同应用程序权限和设置"
+
+#. FIXME
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/applications/gnome-applications-panel.desktop.in.in:16
+msgid "application;flatpak;permission;setting;"
+msgstr "application;flatpak;permission;setting;应用程序;权限;设置;"
+
+#: panels/background/background.ui:49
 msgid "_Background"
 msgstr "背景(_B)"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:3
+#: panels/background/background.ui:99 panels/background/background.ui:212
 msgid "Changes throughout the day"
-msgstr "在一天内按时切换"
+msgstr "在一天内按时变化"
 
 #. To translators: This is a noun, not a verb
-#: ../panels/background/background.ui.h:5
+#: panels/background/background.ui:162
 msgid "_Lock Screen"
 msgstr "锁定屏幕(_L)"
 
-#: ../panels/background/background.ui.h:6
+#: panels/background/background.ui:268
 msgctxt "background, style"
 msgid "Tile"
 msgstr "平铺"
 
-#: ../panels/background/background.ui.h:7
+#: panels/background/background.ui:272
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "缩放"
 
-#: ../panels/background/background.ui.h:8
+#: panels/background/background.ui:276
 msgctxt "background, style"
 msgid "Center"
 msgstr "居中"
 
-#: ../panels/background/background.ui.h:9
+#: panels/background/background.ui:280
 msgctxt "background, style"
 msgid "Scale"
 msgstr "比例放大"
 
-#: ../panels/background/background.ui.h:10
+#: panels/background/background.ui:284
 msgctxt "background, style"
 msgid "Fill"
 msgstr "填充"
 
-#: ../panels/background/background.ui.h:11
+#: panels/background/background.ui:288
 msgctxt "background, style"
 msgid "Span"
 msgstr "适合宽度"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: panels/background/cc-background-chooser-dialog.c:412
 msgid "Wallpapers"
 msgstr "壁纸"
 
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: panels/background/cc-background-chooser-dialog.c:423
 msgid "Colors"
 msgstr "色彩"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: panels/background/cc-background-chooser-dialog.c:455
 msgid "Select Background"
 msgstr "选择背景"
 
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: panels/background/cc-background-chooser-dialog.c:484
 msgid "Pictures"
 msgstr "图片"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: panels/background/cc-background-chooser-dialog.c:519
 msgid "No Pictures Found"
 msgstr "无图片"
 
-#. translators: "Home" is used in place of the Pictures
-#. * directory in the string below when XDG_PICTURES_DIR is
-#. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:302
-msgid "Home"
-msgstr "主目录"
-
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: panels/background/cc-background-chooser-dialog.c:546
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "您添加到 %s 文件夹的图片将在此显示"
 
-#: ../panels/background/cc-background-chooser-dialog.c:580
-#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
-#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1561
-#: ../panels/display/cc-display-panel.c:2207
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:181
-#: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1298
-#: ../panels/network/net-device-wifi.c:1535
-#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2077
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:1048
-#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:637
-#: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/join-dialog.ui.h:2
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:265
-#: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:217
-#: ../panels/user-accounts/um-user-panel.c:705
-#: ../panels/user-accounts/um-user-panel.c:723
+#: panels/background/cc-background-chooser-dialog.c:550
+#: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894
+#: panels/color/cc-color-panel.ui:657 panels/color/color-calibrate.ui:25
+#: panels/common/cc-language-chooser.ui:24
+#: panels/display/cc-display-panel.c:916
+#: panels/network/connection-editor/connection-editor.ui:17
+#: panels/network/connection-editor/vpn-helpers.c:181
+#: panels/network/connection-editor/vpn-helpers.c:310
+#: panels/network/net-device-wifi.c:1200 panels/network/net-device-wifi.c:1280
+#: panels/network/net-device-wifi.c:1474 panels/network/network-wifi.ui:24
+#: panels/printers/new-printer-dialog.ui:45
+#: panels/printers/pp-details-dialog.c:313
+#: panels/privacy/cc-privacy-panel.c:1137 panels/region/cc-format-chooser.ui:24
+#: panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:607
+#: panels/sharing/cc-sharing-panel.c:427
+#: panels/user-accounts/cc-add-user-dialog.ui:28
+#: panels/user-accounts/cc-avatar-chooser.c:106
+#: panels/user-accounts/cc-avatar-chooser.c:234
+#: panels/user-accounts/cc-password-dialog.ui:20
+#: panels/user-accounts/cc-user-panel.c:640
+#: panels/user-accounts/cc-user-panel.c:658
+#: panels/user-accounts/data/join-dialog.ui:20
+#: panels/user-accounts/um-fingerprint-dialog.c:261
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: panels/background/cc-background-chooser-dialog.c:551
+#: panels/common/cc-language-chooser.ui:12
 msgid "_Select"
 msgstr "选择(_S)"
 
-#: ../panels/background/cc-background-item.c:203
+#: panels/background/cc-background-item.c:191
 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:207
+#: panels/background/cc-background-item.c:195
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:333
+#: panels/background/cc-background-item.c:320
 msgid "No Desktop Background"
 msgstr "无桌面背景"
 
-#: ../panels/background/cc-background-panel.c:493
+#: panels/background/cc-background-panel.c:291
 msgid "Current background"
 msgstr "当前背景"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Back­ground"
+#: panels/background/gnome-background-panel.desktop.in.in:3
+msgid "Background"
 msgstr "背景"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
+#: panels/background/gnome-background-panel.desktop.in.in:4
 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:5
+#. Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/background/gnome-background-panel.desktop.in.in:15
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;壁纸;墙纸;屏幕;桌面;背景;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
-msgid "Turn Off Airplane Mode"
-msgstr "关闭飞行模式"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:309
 msgid "No Bluetooth Found"
 msgstr "未找到蓝牙"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:310
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "插入蓝牙适配器以使用蓝牙。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:313
 msgid "Bluetooth Turned Off"
-msgstr "蓝牙已经关闭"
+msgstr "蓝牙已关闭"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:314
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "打开以连接设备和接收文件传送。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:317
 msgid "Airplane Mode is on"
 msgstr "飞行模式已打开"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:318
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "蓝牙已禁用当开启飞行模式时。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: panels/bluetooth/cc-bluetooth-panel.c:321
 msgid "Hardware Airplane Mode is on"
 msgstr "硬件飞行模式已打开"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:333
+#: panels/bluetooth/cc-bluetooth-panel.c:322
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "关闭飞行模式开关以开启蓝牙。"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "Blue­tooth"
+#: panels/bluetooth/cc-bluetooth-panel.c:324
+msgid "Turn Off Airplane Mode"
+msgstr "关闭飞行模式"
+
+#. Translators: The found device is a printer connected via Bluetooth
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
+#: panels/network/cc-network-panel.ui:101
+#: panels/printers/pp-new-printer-dialog.c:1697
+msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "开关蓝牙及连接您的设备"
 
-#. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+#. Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:19
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;分享;共享;蓝牙;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: ../panels/color/cc-color-calibrate.c:361
-msgid "Place your calibration device over the square and press 'Start'"
+#: panels/color/cc-color-calibrate.c:348
+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:367
+#: panels/color/cc-color-calibrate.c:354
 msgid ""
-"Move your calibration device to the calibrate position and press 'Continue'"
+"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:373
+#: panels/color/cc-color-calibrate.c:360
 msgid ""
-"Move your calibration device to the surface position and press 'Continue'"
+"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:379
+#: panels/color/cc-color-calibrate.c:366
 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:410
+#: panels/color/cc-color-calibrate.c:397
 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:415
+#: panels/color/cc-color-calibrate.c:402
 msgid "Tools required for calibration are not installed."
 msgstr "未安装校准所需的工具。"
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:421
+#: panels/color/cc-color-calibrate.c:408
 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:427
+#: panels/color/cc-color-calibrate.c:414
 msgid "The target whitepoint was not obtainable."
 msgstr "无法获取目标白点。"
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:467
+#: panels/color/cc-color-calibrate.c:453
 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:475
+#: panels/color/cc-color-calibrate.c:461
 msgid "Calibration failed!"
 msgstr "校准失败!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:482
+#: panels/color/cc-color-calibrate.c:468
 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:553
+#: panels/color/cc-color-calibrate.c:537
 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
+#: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
 msgstr "笔记本屏幕"
 
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
-#: ../panels/color/cc-color-common.c:50
+#: panels/color/cc-color-common.c:50
 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
+#: panels/color/cc-color-common.c:65
 #, c-format
 msgid "%s Monitor"
 msgstr "%s 显示器"
 
 #. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
-#: ../panels/color/cc-color-common.c:69
+#: panels/color/cc-color-common.c:69
 #, c-format
 msgid "%s Scanner"
 msgstr "%s 扫描仪"
 
 #. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
-#: ../panels/color/cc-color-common.c:73
+#: panels/color/cc-color-common.c:73
 #, c-format
 msgid "%s Camera"
 msgstr "%s 相机"
 
 #. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
-#: ../panels/color/cc-color-common.c:77
+#: panels/color/cc-color-common.c:77
 #, c-format
 msgid "%s Printer"
 msgstr "%s 打印机"
 
 #. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
-#: ../panels/color/cc-color-common.c:81
+#: panels/color/cc-color-common.c:81
 #, c-format
 msgid "%s Webcam"
 msgstr "%s 摄像头"
 
-#: ../panels/color/cc-color-device.c:89
+#: panels/color/cc-color-device.c:91
 #, c-format
 msgid "Enable color management for %s"
 msgstr "为 %s 启用色彩管理"
 
-#: ../panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:94
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "为 %s 显示颜色管理"
 
 #. not calibrated
-#: ../panels/color/cc-color-device.c:323
+#: panels/color/cc-color-device.c:303
 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:141
+#: panels/color/cc-color-panel.c:170
 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:149
+#: panels/color/cc-color-panel.c:178
 msgid "Colorspace: "
 msgstr "色彩空间:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:156
+#: panels/color/cc-color-panel.c:185
 msgid "Test profile: "
 msgstr "测试配置:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:223
+#: panels/color/cc-color-panel.c:239
 msgid "Select ICC Profile File"
 msgstr "选择 ICC 配置文件"
 
-#: ../panels/color/cc-color-panel.c:226
+#: panels/color/cc-color-panel.c:242
 msgid "_Import"
 msgstr "导入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:237
+#: panels/color/cc-color-panel.c:253
 msgid "Supported ICC profiles"
 msgstr "支持的 ICC 配置"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:260
+#: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "所有文件"
 
-#: ../panels/color/cc-color-panel.c:583
+#: panels/color/cc-color-panel.c:555
 msgid "Screen"
 msgstr "屏幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:908
+#: panels/color/cc-color-panel.c:847
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上传文件失败:%s"
@@ -422,263 +727,162 @@ msgstr "上传文件失败:%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:922
+#: panels/color/cc-color-panel.c:859
 msgid "The profile has been uploaded to:"
 msgstr "配置已上传到:"
 
-#: ../panels/color/cc-color-panel.c:924
+#: panels/color/cc-color-panel.c:861
 msgid "Write down this URL."
 msgstr "请记下此 URL。"
 
-#: ../panels/color/cc-color-panel.c:925
+#: panels/color/cc-color-panel.c:862
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重启计算机并引导您日常使用的操作系统。"
 
-#: ../panels/color/cc-color-panel.c:926
+#: panels/color/cc-color-panel.c:863
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "在浏览器中输入该 URL 以下载和安装该配置。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:960
+#: panels/color/cc-color-panel.c:891
 msgid "Save Profile"
 msgstr "保存配置"
 
-#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:895
+#: panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1324
+#: panels/color/cc-color-panel.c:1209
 msgid "Create a color profile for the selected device"
 msgstr "为选中的设备创建一份色彩配置"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363
+#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248
 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:1373
+#: panels/color/cc-color-panel.c:1258
 msgid "The measuring instrument does not support printer profiling."
 msgstr "测量仪器不支持打印机校正。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1384
+#: panels/color/cc-color-panel.c:1269
 msgid "The device type is not currently supported."
 msgstr "目前不支持此设备类型。"
 
-#. TRANSLATORS: standard spaces are well known colorspaces like
-#. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:103
-msgid "Standard Space"
-msgstr "标准空间"
-
-#. TRANSLATORS: test profiles do things like changing the screen
-#. * a different color, or swap the red and green channels
-#: ../panels/color/cc-color-profile.c:109
-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:117
-msgctxt "Automatically generated profile"
-msgid "Automatic"
-msgstr "自动"
-
-#. TRANSLATORS: the profile quality - low quality profiles take
-#. * much less time to generate but may be a poor reflection of the
-#. * device capability
-#: ../panels/color/cc-color-profile.c:127
-msgctxt "Profile quality"
-msgid "Low Quality"
-msgstr "低质量"
-
-#. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:132
-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:139
-msgctxt "Profile quality"
-msgid "High Quality"
-msgstr "高质量"
-
-#. TRANSLATORS: this default RGB space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:156
-msgctxt "Colorspace fallback"
-msgid "Default RGB"
-msgstr "默认 RGB"
-
-#. TRANSLATORS: this default CMYK space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:163
-msgctxt "Colorspace fallback"
-msgid "Default CMYK"
-msgstr "默认 CMYK"
-
-#. TRANSLATORS: this default gray space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:170
-msgctxt "Colorspace fallback"
-msgid "Default Gray"
-msgstr "默认灰度"
-
-#: ../panels/color/cc-color-profile.c:194
-msgid "Vendor supplied factory calibration data"
-msgstr "生产商提供的工厂校准数据"
-
-#: ../panels/color/cc-color-profile.c:203
-msgid "Full-screen display correction not possible with this profile"
-msgstr "无法使用此配置进行全屏显示校准"
-
-#: ../panels/color/cc-color-profile.c:225
-msgid "This profile may no longer be accurate"
-msgstr "此配置可能已不准确"
-
-#: ../panels/color/color-calibrate.ui.h:1
-msgid "Display Calibration"
-msgstr "显示校准"
-
-#. This starts the calibration process
-#: ../panels/color/color-calibrate.ui.h:4
-msgid "_Start"
-msgstr "开始(_S)"
-
-#. This resumes the calibration process
-#: ../panels/color/color-calibrate.ui.h:6
-msgid "_Resume"
-msgstr "恢复(_R)"
-
-#. This button returns the user back to the color control panel
-#: ../panels/color/color-calibrate.ui.h:8
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
-msgid "_Done"
-msgstr "完成(_D)"
-
-#. Timeout parameters
-#. 15000 = 15 sec
-#. 750 = 0.75 sec
-#. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/cc-color-panel.ui:6 panels/wacom/calibrator/calibrator.ui:47
 msgid "Screen Calibration"
 msgstr "屏幕校准"
 
-#: ../panels/color/color.ui.h:2
+#: panels/color/cc-color-panel.ui:23
 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:3
+#: panels/color/cc-color-panel.ui:38
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr "校准进行时您将不能使用您的计算机。"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:5
+#: panels/color/cc-color-panel.ui:58
 msgid "Quality"
 msgstr "质量"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:7
+#: panels/color/cc-color-panel.ui:75
 msgid "Approximate Time"
 msgstr "预计耗时"
 
-#: ../panels/color/color.ui.h:8
+#: panels/color/cc-color-panel.ui:121
 msgid "Calibration Quality"
 msgstr "校准质量"
 
-#: ../panels/color/color.ui.h:9
+#: panels/color/cc-color-panel.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "选择校准所使用的传感器设备。"
 
-#: ../panels/color/color.ui.h:10
+#: panels/color/cc-color-panel.ui:174
 msgid "Calibration Device"
 msgstr "校准设备"
 
-#: ../panels/color/color.ui.h:11
+#: panels/color/cc-color-panel.ui:189
 msgid "Select the type of display that is connected."
-msgstr "选择连接的显示类型"
+msgstr "选择连接的显示类型。"
 
-#: ../panels/color/color.ui.h:12
+#: panels/color/cc-color-panel.ui:226
 msgid "Display Type"
 msgstr "显示类型"
 
-#: ../panels/color/color.ui.h:13
+#: panels/color/cc-color-panel.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
 msgstr "选择显示目标白点。多数显示器应该校准到 D65 光源。"
 
-#: ../panels/color/color.ui.h:14
+#: panels/color/cc-color-panel.ui:278
 msgid "Profile Whitepoint"
 msgstr "配置参考白点"
 
-#: ../panels/color/color.ui.h:15
+#: panels/color/cc-color-panel.ui:293
 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
+#: panels/color/cc-color-panel.ui:307
 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
+#: panels/color/cc-color-panel.ui:318
 msgid "Display Brightness"
 msgstr "显示亮度"
 
-#: ../panels/color/color.ui.h:18
+#: panels/color/cc-color-panel.ui:333
 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
+#: panels/color/cc-color-panel.ui:348
 msgid "Profile Name:"
 msgstr "配置名称:"
 
-#: ../panels/color/color.ui.h:20
+#: panels/color/cc-color-panel.ui:377
 msgid "Profile Name"
 msgstr "配置名称"
 
-#: ../panels/color/color.ui.h:21
+#: panels/color/cc-color-panel.ui:392
 msgid "Profile successfully created!"
 msgstr "创建配置成功!"
 
-#: ../panels/color/color.ui.h:22
+#: panels/color/cc-color-panel.ui:443
 msgid "Copy profile"
 msgstr "复制配置"
 
-#: ../panels/color/color.ui.h:23
+#: panels/color/cc-color-panel.ui:456
 msgid "Requires writable media"
-msgstr "需要可写媒体"
+msgstr "需要可写介质"
 
-#: ../panels/color/color.ui.h:24
+#: panels/color/cc-color-panel.ui:519
 msgid "Upload profile"
 msgstr "上传配置"
 
-#: ../panels/color/color.ui.h:25
+#: panels/color/cc-color-panel.ui:532
 msgid "Requires Internet connection"
 msgstr "需要互联网连接"
 
-#: ../panels/color/color.ui.h:26
+#: panels/color/cc-color-panel.ui:591
 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"
@@ -688,626 +892,872 @@ msgstr ""
 "和 <a href=\"windows\">Microsoft Windows</a> 系统中使用配置的这些说明可能对您"
 "有所帮助。"
 
-#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:730
+#: panels/color/cc-color-panel.ui:607
+#: panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "摘要"
 
-#: ../panels/color/color.ui.h:28
-msgid "Add profile"
+#: panels/color/cc-color-panel.ui:621
+msgid "Add Profile"
 msgstr "添加配置"
 
-#: ../panels/color/color.ui.h:29
+#: panels/color/cc-color-panel.ui:643
 msgid "_Import File…"
 msgstr "导入文件(_I)…"
 
-#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: panels/color/cc-color-panel.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/printers/new-printer-dialog.ui:80
+#: panels/region/cc-input-chooser.ui:20
+#: panels/user-accounts/cc-add-user-dialog.ui:47
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../panels/color/color.ui.h:32
+#: panels/color/cc-color-panel.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 msgstr "检测到问题,此配置可能无法正常工作。<a href=\"\">显示详细信息。</a>"
 
-#: ../panels/color/color.ui.h:33
+#: panels/color/cc-color-panel.ui:790
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "每个设备都需要一份最新色彩配置以进行色彩管理。"
 
-#: ../panels/color/color.ui.h:34
+#: panels/color/cc-color-panel.ui:812
 msgid "Learn more"
 msgstr "了解更多"
 
-#: ../panels/color/color.ui.h:35
+#: panels/color/cc-color-panel.ui:817
 msgid "Learn more about color management"
 msgstr "了解更多有关色彩管理的信息"
 
-#: ../panels/color/color.ui.h:36
+#: panels/color/cc-color-panel.ui:865
 msgid "_Set for all users"
 msgstr "为所有用户设置(_S)"
 
-#: ../panels/color/color.ui.h:37
+#: panels/color/cc-color-panel.ui:869 panels/color/cc-color-panel.ui:884
+#: panels/color/cc-color-panel.ui:885
 msgid "Set this profile for all users on this computer"
 msgstr "为此计算机上的所有用户设置此配置"
 
-#: ../panels/color/color.ui.h:38
+#: panels/color/cc-color-panel.ui:880
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: ../panels/color/color.ui.h:39
+#: panels/color/cc-color-panel.ui:911
 msgid "_Add profile"
 msgstr "添加配置(_A)"
 
-#: ../panels/color/color.ui.h:40
+#: panels/color/cc-color-panel.ui:924
 msgid "_Calibrate…"
 msgstr "校准(_C)…"
 
-#: ../panels/color/color.ui.h:41
+#: panels/color/cc-color-panel.ui:928
 msgid "Calibrate the device"
 msgstr "校准该设备"
 
-#: ../panels/color/color.ui.h:42
+#: panels/color/cc-color-panel.ui:939
 msgid "_Remove profile"
 msgstr "移除配置(_R)"
 
-#: ../panels/color/color.ui.h:43
+#: panels/color/cc-color-panel.ui:952
 msgid "_View details"
 msgstr "查看详情(_V)"
 
-#: ../panels/color/color.ui.h:44
+#: panels/color/cc-color-panel.ui:988
 msgid "Unable to detect any devices that can be color managed"
 msgstr "未检测到可以管理颜色的设备"
 
-#: ../panels/color/color.ui.h:45
+#: panels/color/cc-color-panel.ui:1032
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:46
+#: panels/color/cc-color-panel.ui:1037
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:47
+#: panels/color/cc-color-panel.ui:1042
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:48
+#: panels/color/cc-color-panel.ui:1047
 msgid "Projector"
 msgstr "投影仪"
 
-#: ../panels/color/color.ui.h:49
+#: panels/color/cc-color-panel.ui:1052
 msgid "Plasma"
 msgstr "等离子"
 
-#: ../panels/color/color.ui.h:50
+#: panels/color/cc-color-panel.ui:1057
 msgid "LCD (CCFL backlight)"
-msgstr "LCD (CCFL 背光)"
+msgstr "LCD(CCFL 背光)"
 
-#: ../panels/color/color.ui.h:51
+#: panels/color/cc-color-panel.ui:1062
 msgid "LCD (RGB LED backlight)"
-msgstr "LCD (RGB LED 背光)"
+msgstr "LCD(RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:52
+#: panels/color/cc-color-panel.ui:1067
 msgid "LCD (white LED backlight)"
-msgstr "LCD (白色 LED 背光)"
+msgstr "LCD(白色 LED 背光)"
 
-#: ../panels/color/color.ui.h:53
+#: panels/color/cc-color-panel.ui:1072
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "广色域 LCD(CCFL 背光)"
 
-#: ../panels/color/color.ui.h:54
+#: panels/color/cc-color-panel.ui:1077
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "广色域 LCD(RGB LED 背光)"
 
-#: ../panels/color/color.ui.h:55
+#: panels/color/cc-color-panel.ui:1094
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:56
+#: panels/color/cc-color-panel.ui:1095
 msgid "40 minutes"
 msgstr "40 分钟"
 
-#: ../panels/color/color.ui.h:57
+#: panels/color/cc-color-panel.ui:1099
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
-#: ../panels/privacy/privacy.ui.h:7
+#: panels/color/cc-color-panel.ui:1100
 msgid "30 minutes"
 msgstr "30 分钟"
 
-#: ../panels/color/color.ui.h:59
+#: panels/color/cc-color-panel.ui:1104
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
+#: panels/color/cc-color-panel.ui:1105
 msgid "15 minutes"
 msgstr "15 分钟"
 
-#: ../panels/color/color.ui.h:61
+#: panels/color/cc-color-panel.ui:1127
 msgid "Native to display"
 msgstr "显示设备原生"
 
-#: ../panels/color/color.ui.h:62
+#: panels/color/cc-color-panel.ui:1131
 msgid "D50 (Printing and publishing)"
 msgstr "D50(打印和出版)"
 
-#: ../panels/color/color.ui.h:63
+#: panels/color/cc-color-panel.ui:1135
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:64
+#: panels/color/cc-color-panel.ui:1139
 msgid "D65 (Photography and graphics)"
 msgstr "D65(摄影及图形)"
 
-#: ../panels/color/color.ui.h:65
+#: panels/color/cc-color-panel.ui:1143
 msgid "D75"
 msgstr "D75"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Co­lor"
-msgstr "色彩"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: panels/color/cc-color-profile.c:100
+msgid "Standard Space"
+msgstr "标准空间"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
-msgid ""
-"Calibrate the color of your devices, such as displays, cameras or printers"
-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:106
+msgid "Test Profile"
+msgstr "测试配置"
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr ""
-"Color;ICC;Profile;Calibrate;Printer;Display;颜色;色彩;配置;校准;打印机;显示;"
+#. 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:114
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "自动"
 
-#: ../panels/common/cc-common-language.c:323
-msgid "Other…"
-msgstr "其他…"
+#. TRANSLATORS: the profile quality - low quality profiles take
+#. * much less time to generate but may be a poor reflection of the
+#. * device capability
+#: panels/color/cc-color-profile.c:124
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "低质量"
 
-#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
-#: ../panels/region/cc-input-chooser.c:169
-msgid "More…"
-msgstr "更多…"
+#. TRANSLATORS: the profile quality
+#: panels/color/cc-color-profile.c:129
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "中等质量"
 
-#: ../panels/common/cc-language-chooser.c:140
-msgid "No languages found"
-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:136
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "高质量"
 
-#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
-msgid "Today"
-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:153
+msgctxt "Colorspace fallback"
+msgid "Default RGB"
+msgstr "默认 RGB"
 
-#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
-msgid "Yesterday"
-msgstr "昨天"
+#. 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:160
+msgctxt "Colorspace fallback"
+msgid "Default CMYK"
+msgstr "默认 CMYK"
 
-#. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:138
-msgid "%b %e"
-msgstr "%b %e"
+#. TRANSLATORS: this default gray space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:167
+msgctxt "Colorspace fallback"
+msgid "Default Gray"
+msgstr "默认灰度"
 
-#. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:143
-msgid "%b %e, %Y"
-msgstr " %Y %b %e"
+#: panels/color/cc-color-profile.c:190
+msgid "Vendor supplied factory calibration data"
+msgstr "生产商提供的工厂校准数据"
+
+#: panels/color/cc-color-profile.c:199
+msgid "Full-screen display correction not possible with this profile"
+msgstr "无法使用此配置进行全屏显示校准"
+
+#: panels/color/cc-color-profile.c:221
+msgid "This profile may no longer be accurate"
+msgstr "此配置可能已不准确"
+
+#: panels/color/color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "显示校准"
+
+#. This starts the calibration process
+#: panels/color/color-calibrate.ui:40
+msgid "_Start"
+msgstr "开始(_S)"
+
+#. This resumes the calibration process
+#: panels/color/color-calibrate.ui:54
+msgid "_Resume"
+msgstr "恢复(_R)"
+
+#. This button returns the user back to the color control panel
+#: panels/color/color-calibrate.ui:67 panels/region/cc-format-chooser.ui:13
+msgid "_Done"
+msgstr "完成(_D)"
+
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
+msgstr "色彩"
+
+#: panels/color/gnome-color-panel.desktop.in.in:4
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr "校准显示器、相机、打印机等设备的色彩"
+
+#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/color/gnome-color-panel.desktop.in.in:19
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr ""
+"Color;ICC;Profile;Calibrate;Printer;Display;颜色;色彩;配置;校准;打印机;显示;"
+
+#: panels/common/cc-common-language.c:300
+msgid "Other…"
+msgstr "其他…"
+
+#: panels/common/cc-language-chooser.c:125
+#: panels/region/cc-format-chooser.c:268 panels/region/cc-input-chooser.c:178
+msgid "More…"
+msgstr "更多…"
+
+#: panels/common/cc-language-chooser.c:142
+msgid "No languages found"
+msgstr "未找到语言"
+
+#: panels/common/cc-language-chooser.ui:5
+msgid "Select Language"
+msgstr "选择语言"
+
+#: panels/common/cc-util.c:127
+#: panels/network/connection-editor/ce-page-details.c:106
+msgid "Today"
+msgstr "今天"
+
+#: panels/common/cc-util.c:131
+#: panels/network/connection-editor/ce-page-details.c:108
+msgid "Yesterday"
+msgstr "昨天"
+
+#. Translators: This is a date format string in the style of "Feb 24".
+#: panels/common/cc-util.c:138
+msgid "%b %e"
+msgstr "%-m月%-d日"
+
+#. Translators: This is a date format string in the style of "Feb 24, 2013".
+#: panels/common/cc-util.c:143
+msgid "%b %e, %Y"
+msgstr "%Y年%-m月%-d日"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Language"
-msgstr "语言"
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: panels/common/hostname-helper.c:177
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "热点"
 
-#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
-#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
+#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
 msgid "Day"
 msgstr "日"
 
-#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
-#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
+#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
 msgid "Month"
 msgstr "月"
 
-#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
-#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
+#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
 msgid "Year"
 msgstr "年"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: panels/datetime/cc-datetime-panel.c:332
 msgid "%e %B %Y, %l:%M %p"
-msgstr "%Y年%m月%d日, %p %-l:%M"
+msgstr "%Y年%m月%d日,%p %-l:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:345
+#: panels/datetime/cc-datetime-panel.c:337
 msgid "%e %B %Y, %R"
-msgstr "%Y年%m月%d日, %R"
+msgstr "%Y年%m月%d日,%R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: panels/datetime/cc-datetime-panel.c:502
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
-msgstr "%s, %s"
+msgstr "%s,%s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: panels/datetime/cc-datetime-panel.c:529
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
-msgstr "%s (%s)"
+msgstr "%s(%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:561
+#: panels/datetime/cc-datetime-panel.c:536
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: panels/datetime/cc-datetime-panel.c:541
 msgid "%l:%M %p"
 msgstr "%p %-l:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:571
+#: panels/datetime/cc-datetime-panel.c:546
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: panels/datetime/cc-datetime-panel.c:551
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../panels/datetime/datetime.ui.h:1
+#: panels/datetime/cc-datetime-panel.ui:26
 msgid "January"
 msgstr "一月"
 
-#: ../panels/datetime/datetime.ui.h:2
+#: panels/datetime/cc-datetime-panel.ui:29
 msgid "February"
 msgstr "二月"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: panels/datetime/cc-datetime-panel.ui:32
 msgid "March"
 msgstr "三月"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: panels/datetime/cc-datetime-panel.ui:35
 msgid "April"
 msgstr "四月"
 
-#: ../panels/datetime/datetime.ui.h:5
+#: panels/datetime/cc-datetime-panel.ui:38
 msgid "May"
 msgstr "五月"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: panels/datetime/cc-datetime-panel.ui:41
 msgid "June"
 msgstr "六月"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: panels/datetime/cc-datetime-panel.ui:44
 msgid "July"
 msgstr "七月"
 
-#: ../panels/datetime/datetime.ui.h:8
+#: panels/datetime/cc-datetime-panel.ui:47
 msgid "August"
 msgstr "八月"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: panels/datetime/cc-datetime-panel.ui:50
 msgid "September"
 msgstr "九月"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: panels/datetime/cc-datetime-panel.ui:53
 msgid "October"
 msgstr "十月"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: panels/datetime/cc-datetime-panel.ui:56
 msgid "November"
 msgstr "十一月"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: panels/datetime/cc-datetime-panel.ui:59
 msgid "December"
 msgstr "十二月"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: panels/datetime/cc-datetime-panel.ui:65
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "日期和时间"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: panels/datetime/cc-datetime-panel.ui:113
+#: panels/display/cc-night-light-dialog.ui:245
+#: panels/display/cc-night-light-dialog.ui:352
 msgid "Hour"
 msgstr "时"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: ../panels/datetime/datetime.ui.h:16
+#: panels/datetime/cc-datetime-panel.ui:128
 msgid "∶"
-msgstr ":"
+msgstr "∶"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: panels/datetime/cc-datetime-panel.ui:152
+#: panels/display/cc-night-light-dialog.ui:273
+#: panels/display/cc-night-light-dialog.ui:380
 msgid "Minute"
 msgstr "分"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: panels/datetime/cc-datetime-panel.ui:219
 msgid "Time Zone"
 msgstr "时区"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: panels/datetime/cc-datetime-panel.ui:240
 msgid "Search for a city"
 msgstr "搜索城市"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: panels/datetime/cc-datetime-panel.ui:313
 msgid "Automatic _Date & Time"
 msgstr "自动设置日期和时间(_D)"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: panels/datetime/cc-datetime-panel.ui:314
 msgid "Requires internet access"
 msgstr "需要互联网连接"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: panels/datetime/cc-datetime-panel.ui:334
 msgid "Automatic Time _Zone"
 msgstr "自动设置时区(_Z)"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: panels/datetime/cc-datetime-panel.ui:335
+msgid "Requires location services enabled and internet access"
+msgstr "需要启用定位服务和互联网连接"
+
+#: panels/datetime/cc-datetime-panel.ui:350
 msgid "Date & _Time"
 msgstr "日期和时间(_T)"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: panels/datetime/cc-datetime-panel.ui:366
 msgid "Time Z_one"
 msgstr "时区(_O)"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: panels/datetime/cc-datetime-panel.ui:405
 msgid "Time _Format"
 msgstr "时间格式(_F)"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: panels/datetime/cc-datetime-panel.ui:414
 msgid "24-hour"
 msgstr "24 小时"
 
-#: ../panels/datetime/datetime.ui.h:27
+#: panels/datetime/cc-datetime-panel.ui:415
 msgid "AM / PM"
 msgstr "上午/下午"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 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:5
+#. Translators: Search terms to find the Date and Time panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:15
 msgid "Clock;Timezone;Location;"
 msgstr "Clock;Timezone;Location;时钟;时区;位置;"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:11
 msgid "Change system time and date settings"
 msgstr "更改系统时间和日期设置"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 msgid "To change time or date settings, you need to authenticate."
 msgstr "修改时间或日期设置需要认证。"
 
-#: ../panels/display/cc-display-panel.c:573
-msgid "Lid Closed"
-msgstr "上盖已合上"
-
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:576
-msgid "Mirrored"
-msgstr "镜像显示"
-
-#: ../panels/display/cc-display-panel.c:578
-#: ../panels/display/cc-display-panel.c:2430
-msgid "Primary"
-msgstr "主显示器"
-
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-#: ../panels/universal-access/uap.ui.h:6
+#: panels/display/cc-display-panel.c:927
+#: panels/network/connection-editor/connection-editor.ui:27
+#: panels/network/network-wifi.ui:38
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#: panels/display/cc-display-panel.c:948
+msgid "Apply Changes?"
+msgstr "应用更改?"
+
+#: panels/display/cc-display-panel.c:953
+msgid "Changes Cannot be Applied"
+msgstr "无法应用更改"
+
+#: panels/display/cc-display-panel.c:954
+msgid "This could be due to hardware limitations."
+msgstr "这可能是硬件限制造成的。"
+
+#. TRANSLATORS: the state of the night light setting
+#: panels/display/cc-display-panel.c:1127
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2056 panels/power/cc-power-panel.c:2063
+#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
+#: panels/universal-access/cc-ua-panel.c:478
+#: panels/universal-access/cc-ua-panel.c:841
+#: panels/universal-access/cc-ua-panel.c:854
+#: panels/universal-access/cc-ua-panel.c:866
+#: panels/universal-access/cc-ua-panel.c:1031
+msgid "On"
+msgstr "开"
+
+#: panels/display/cc-display-panel.c:1127 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2050 panels/power/cc-power-panel.c:2061
+#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
+#: panels/universal-access/cc-ua-panel.c:478
+#: panels/universal-access/cc-ua-panel.c:841
+#: panels/universal-access/cc-ua-panel.c:854
+#: panels/universal-access/cc-ua-panel.c:866
+#: panels/universal-access/cc-ua-panel.c:1031
+#: panels/universal-access/cc-ua-panel.ui:338
+#: panels/universal-access/cc-ua-panel.ui:384
+#: panels/universal-access/cc-ua-panel.ui:430
+#: panels/universal-access/cc-ua-panel.ui:536
+#: panels/universal-access/cc-ua-panel.ui:689
+#: panels/universal-access/cc-ua-panel.ui:735
+#: panels/universal-access/cc-ua-panel.ui:781
+#: panels/universal-access/cc-ua-panel.ui:933
 msgid "Off"
 msgstr "关"
 
-#: ../panels/display/cc-display-panel.c:583
-msgid "Secondary"
-msgstr "副显示器"
-
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1558
-msgid "Arrange Combined Displays"
-msgstr "安排多个显示"
+#: panels/display/cc-display-panel.ui:81
+msgid "Single Display"
+msgstr "单显示器"
 
-#: ../panels/display/cc-display-panel.c:1562
-#: ../panels/display/cc-display-panel.c:2208
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "应用(_A)"
+#: panels/display/cc-display-panel.ui:100
+#: panels/display/cc-display-panel.ui:305
+msgid "Join Displays"
+msgstr "加入显示器"
 
-#: ../panels/display/cc-display-panel.c:1586
-msgid "Drag displays to rearrange them"
-msgstr "拖动以重新排列显示屏拖动以重新排列显示屏"
+#: panels/display/cc-display-panel.ui:118
+msgid "Mirror"
+msgstr "镜像"
 
-#. translators: example string is "60 Hz (NTSC)"
-#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1793
-#, c-format
-msgid "%d Hz (NTSC)"
-msgstr "%d Hz (NTSC)"
+#: panels/display/cc-display-panel.ui:143
+msgid "Display Mode"
+msgstr "显示模式"
 
-#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1799
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: panels/display/cc-display-panel.ui:235
+msgid ""
+"Drag displays to match your physical display setup. Select a display to "
+"change its settings."
+msgstr "拖动显示器来匹配您的物理显示器布局。选择显示器可以改变其设置。"
+
+#: panels/display/cc-display-panel.ui:242
+msgid "Display Arrangement"
+msgstr "显示器布局"
+
+#: panels/display/cc-display-panel.ui:424
+msgid "Display Configuration"
+msgstr "显示配置"
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: panels/display/cc-display-panel.ui:451
+#: panels/display/cc-display-panel.ui:469
+#: panels/display/cc-night-light-dialog.ui:505
+msgid "Night Light"
+msgstr "夜灯"
+
+#: panels/display/cc-display-settings.c:108
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "横向"
 
-#: ../panels/display/cc-display-panel.c:2260
-msgid "Rotate counterclockwise by 90°"
-msgstr "逆时针旋转 90°"
+#: panels/display/cc-display-settings.c:111
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "纵向,朝右"
 
-#: ../panels/display/cc-display-panel.c:2278
-msgid "Rotate by 180°"
-msgstr "旋转 180°"
+#: panels/display/cc-display-settings.c:114
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "纵向,朝左"
 
-#: ../panels/display/cc-display-panel.c:2296
-msgid "Rotate clockwise by 90°"
-msgstr "顺时针旋转 90°"
+#: panels/display/cc-display-settings.c:117
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "横向翻转"
 
-#: ../panels/display/cc-display-panel.c:2317
-msgid "Size"
-msgstr "大小"
+#: panels/display/cc-display-settings.c:191
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf 赫兹"
 
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2332
-msgid "Aspect Ratio"
-msgstr "宽高比"
+#: panels/display/cc-display-settings.ui:15
+msgctxt "display setting"
+msgid "Orientation"
+msgstr "方向"
 
-#: ../panels/display/cc-display-panel.c:2355
-#: ../panels/printers/pp-options-dialog.c:85
+#: panels/display/cc-display-settings.ui:24
+msgctxt "display setting"
 msgid "Resolution"
 msgstr "分辨率"
 
-#: ../panels/display/cc-display-panel.c:2375
-msgid "Adjust for TV"
-msgstr "为 TV 调整"
-
-#: ../panels/display/cc-display-panel.c:2399
+#: panels/display/cc-display-settings.ui:33
 msgid "Refresh Rate"
 msgstr "刷新频率"
 
-#: ../panels/display/cc-display-panel.c:2431
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "在此显示器上显示顶栏和活动概览"
+#: panels/display/cc-display-settings.ui:42
+msgid "Adjust for TV"
+msgstr "为电视调整"
 
-#: ../panels/display/cc-display-panel.c:2437
-msgid "Secondary Display"
-msgstr "副显示器"
+#: panels/display/cc-display-settings.ui:59
+msgctxt "display setting"
+msgid "Scale"
+msgstr "缩放"
 
-#: ../panels/display/cc-display-panel.c:2438
-msgid "Join this display with another to create an extra workspace"
-msgstr "将该显示器与另一显示器合并以扩展工作空间"
+#. This cancels the redshift inhibit.
+#: panels/display/cc-night-light-dialog.ui:46
+msgid "Restart Filter"
+msgstr "重启滤镜"
 
-# 左撇子有歧视色彩。
-#: ../panels/display/cc-display-panel.c:2445
-msgid "Presentation"
-msgstr "演示"
+#. Inhibit the redshift functionality until the next day starts
+#: panels/display/cc-night-light-dialog.ui:79
+msgid "Temporarily Disabled Until Tomorrow"
+msgstr "暂时禁用直到明天"
 
-#: ../panels/display/cc-display-panel.c:2446
-msgid "Show slideshows and media only"
-msgstr "只显示幻灯片和多媒体"
+#: panels/display/cc-night-light-dialog.ui:106
+msgid ""
+"Night light makes the screen color warmer. This can help to prevent eye "
+"strain and sleeplessness."
+msgstr "夜灯使屏幕颜色更暖。这可以帮助预防眼疲劳和失眠。"
+
+#: panels/display/cc-night-light-dialog.ui:127
+msgid "Schedule"
+msgstr "计划"
+
+#: panels/display/cc-night-light-dialog.ui:148
+msgid "Sunset to Sunrise"
+msgstr "日落到日出"
+
+#: panels/display/cc-night-light-dialog.ui:164
+#: panels/network/connection-editor/ip4-page.ui:69
+#: panels/network/connection-editor/ip6-page.ui:83
+#: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113
+#: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053
+#: panels/privacy/cc-privacy-panel.c:239
+msgid "Manual"
+msgstr "手动"
 
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2451
-msgid "Mirror"
-msgstr "镜像"
+#: panels/display/cc-night-light-dialog.ui:180
+msgid "_Off"
+msgstr "关闭(_O)"
 
-#: ../panels/display/cc-display-panel.c:2452
-msgid "Show your existing view on both displays"
-msgstr "在两块显示器上同时显示当前视图"
+#: panels/display/cc-night-light-dialog.ui:216
+msgid "From"
+msgstr "从"
 
-#: ../panels/display/cc-display-panel.c:2458
-msgid "Turn Off"
-msgstr "关闭"
+#: panels/display/cc-night-light-dialog.ui:254
+#: panels/display/cc-night-light-dialog.ui:361
+msgid ":"
+msgstr ":"
+
+#. This is the short form for the time period in the morning
+#: panels/display/cc-night-light-dialog.ui:284
+#: panels/display/cc-night-light-dialog.ui:391
+msgid "AM"
+msgstr "上午"
 
-#: ../panels/display/cc-display-panel.c:2459
-msgid "Don't use this display"
-msgstr "不使用该显示器"
+#. This is the short form for the time period in the afternoon
+#: panels/display/cc-night-light-dialog.ui:300
+#: panels/display/cc-night-light-dialog.ui:407
+msgid "PM"
+msgstr "下午"
 
-#: ../panels/display/cc-display-panel.c:2770
-msgid "Could not get screen information"
-msgstr "无法获取屏幕信息"
+#: panels/display/cc-night-light-dialog.ui:449
+msgid "To"
+msgstr "到"
 
-#: ../panels/display/cc-display-panel.c:2801
-msgid "_Arrange Combined Displays"
-msgstr "安排多个显示(_A)"
+#: panels/display/cc-night-light-dialog.ui:470
+msgid "Color Temperature"
+msgstr "色温"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Dis­plays"
-msgstr "显示"
+#: panels/display/gnome-display-panel.desktop.in.in:3
+msgid "Displays"
+msgstr "显示器"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
+#: panels/display/gnome-display-panel.desktop.in.in:4
 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:5
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+#. Translators: Search terms to find the Displays panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/display/gnome-display-panel.desktop.in.in:19
+msgid ""
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;color;sunset;sunrise;"
 msgstr ""
-"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影仪;屏幕;分"
-"辨率;刷新;"
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;color;sunset;sunrise;面板;投影仪;屏幕;分辨率;刷新;夜晚;晚上;光;蓝;红"
+"移;颜色;日落;日出;"
+
+#: panels/info/cc-info-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "_Web"
+
+#: panels/info/cc-info-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "邮件(_M)"
+
+#: panels/info/cc-info-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "日历(_C)"
+
+#: panels/info/cc-info-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "音乐(_U)"
+
+#: panels/info/cc-info-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "视频(_V)"
+
+#: panels/info/cc-info-default-apps-panel.ui:162
+#: panels/info/cc-info-removable-media-panel.ui:161
+msgid "_Photos"
+msgstr "照片(_P)"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:434 ../panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:369
+#: panels/info/cc-info-overview-panel.c:452
+#: panels/info/cc-info-overview-panel.c:497
+#: panels/info/cc-info-overview-panel.c:527 panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "未知"
 
-#: ../panels/info/cc-info-panel.c:567
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: panels/info/cc-info-overview-panel.c:460
 #, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d 位(构建 ID:%s)"
+msgid "%s; Build ID: %s"
+msgstr "%s;构建 ID:%s"
 
-#: ../panels/info/cc-info-panel.c:569
+#. translators: This is the type of architecture for the OS
+#: panels/info/cc-info-overview-panel.c:477
 #, c-format
-msgid "%d-bit (Build ID: %s)"
-msgstr "%d 位(构建 ID:%s)"
+msgid "64-bit"
+msgstr "64 位"
 
-#: ../panels/info/cc-info-panel.c:577
+#. translators: This is the type of architecture for the OS
+#: panels/info/cc-info-overview-panel.c:480
 #, c-format
-msgid "%s %d-bit"
-msgstr "%s %d 位"
+msgid "32-bit"
+msgstr "32 位"
 
-#: ../panels/info/cc-info-panel.c:579
+#: panels/info/cc-info-overview-panel.c:710
 #, c-format
-msgid "%d-bit"
-msgstr "%d 位"
+msgid "Version %s"
+msgstr "版本 %s"
+
+#: panels/info/cc-info-overview-panel.ui:70
+msgid "Device name"
+msgstr "设备名称"
+
+#: panels/info/cc-info-overview-panel.ui:86
+msgid "Memory"
+msgstr "内存"
+
+#: panels/info/cc-info-overview-panel.ui:102
+msgid "Processor"
+msgstr "处理器"
+
+#: panels/info/cc-info-overview-panel.ui:118
+msgid "Graphics"
+msgstr "图形"
+
+#. To translators: this field contains the distro name and version
+#: panels/info/cc-info-overview-panel.ui:133
+msgid "OS name"
+msgstr "系统名称"
+
+#. To translators: this field contains the distro type
+#: panels/info/cc-info-overview-panel.ui:149
+msgid "OS type"
+msgstr "系统类型"
+
+#: panels/info/cc-info-overview-panel.ui:165
+msgid "Virtualization"
+msgstr "虚拟化"
+
+#: panels/info/cc-info-overview-panel.ui:181
+msgid "Disk"
+msgstr "磁盘"
+
+#: panels/info/cc-info-overview-panel.ui:293
+msgid "Calculating…"
+msgstr "正在计算…"
 
-#: ../panels/info/cc-info-panel.c:1260
+#: panels/info/cc-info-overview-panel.ui:333
+msgid "Check for updates"
+msgstr "检查更新"
+
+#: panels/info/cc-info-removable-media-panel.c:296
 msgid "Ask what to do"
 msgstr "询问如何处理"
 
-#: ../panels/info/cc-info-panel.c:1264
+#: panels/info/cc-info-removable-media-panel.c:300
 msgid "Do nothing"
 msgstr "无动作"
 
-#: ../panels/info/cc-info-panel.c:1268
+#: panels/info/cc-info-removable-media-panel.c:304
 msgid "Open folder"
 msgstr "打开文件夹"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: panels/info/cc-info-removable-media-panel.c:389
 msgid "Other Media"
-msgstr "其他媒体"
+msgstr "其他介质"
 
-#: ../panels/info/cc-info-panel.c:1390
+#: panels/info/cc-info-removable-media-panel.c:422
 msgid "Select an application for audio CDs"
 msgstr "选择播放音频 CD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1391
+#: panels/info/cc-info-removable-media-panel.c:423
 msgid "Select an application for video DVDs"
 msgstr "选择播放视频 DVD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1392
+#: panels/info/cc-info-removable-media-panel.c:424
 msgid "Select an application to run when a music player is connected"
 msgstr "选择连接音乐播放器后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1393
+#: panels/info/cc-info-removable-media-panel.c:425
 msgid "Select an application to run when a camera is connected"
 msgstr "选择连接相机后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1394
+#: panels/info/cc-info-removable-media-panel.c:426
 msgid "Select an application for software CDs"
 msgstr "选择插入软件 CD 时运行的应用程序"
 
@@ -1316,399 +1766,323 @@ msgstr "选择插入软件 CD 时运行的应用程序"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1406
+#: panels/info/cc-info-removable-media-panel.c:438
 msgid "audio DVD"
 msgstr "音频 DVD"
 
-#: ../panels/info/cc-info-panel.c:1407
+#: panels/info/cc-info-removable-media-panel.c:439
 msgid "blank Blu-ray disc"
 msgstr "空白蓝光光盘"
 
-#: ../panels/info/cc-info-panel.c:1408
+#: panels/info/cc-info-removable-media-panel.c:440
 msgid "blank CD disc"
 msgstr "空白 CD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1409
+#: panels/info/cc-info-removable-media-panel.c:441
 msgid "blank DVD disc"
 msgstr "空白 DVD 光盘"
 
 # 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1410
+#: panels/info/cc-info-removable-media-panel.c:442
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1411
+#: panels/info/cc-info-removable-media-panel.c:443
 msgid "Blu-ray video disc"
 msgstr "蓝光视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1412
+#: panels/info/cc-info-removable-media-panel.c:444
 msgid "e-book reader"
 msgstr "电子书阅读器"
 
-#: ../panels/info/cc-info-panel.c:1413
+#: panels/info/cc-info-removable-media-panel.c:445
 msgid "HD DVD video disc"
 msgstr "HD DVD 视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1414
+#: panels/info/cc-info-removable-media-panel.c:446
 msgid "Picture CD"
 msgstr "图片 CD"
 
-#: ../panels/info/cc-info-panel.c:1415
+#: panels/info/cc-info-removable-media-panel.c:447
 msgid "Super Video CD"
-msgstr "超级 VCD "
+msgstr "超级 VCD"
 
-#: ../panels/info/cc-info-panel.c:1416
+#: panels/info/cc-info-removable-media-panel.c:448
 msgid "Video CD"
 msgstr "视频 CD"
 
-#: ../panels/info/cc-info-panel.c:1417
+#: panels/info/cc-info-removable-media-panel.c:449
 msgid "Windows software"
 msgstr "Windows 软件"
 
-#: ../panels/info/cc-info-panel.c:1540
-msgid "Section"
-msgstr "节"
-
-#: ../panels/info/cc-info-panel.c:1549 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "总览"
+#: panels/info/cc-info-removable-media-panel.ui:43
+msgid "Select how media should be handled"
+msgstr "选择如何处理介质"
 
-#: ../panels/info/cc-info-panel.c:1555 ../panels/info/info.ui.h:21
-msgid "Default Applications"
-msgstr "默认应用程序"
+#: panels/info/cc-info-removable-media-panel.ui:74
+msgid "CD _audio"
+msgstr "CD 音频(_A)"
 
-#: ../panels/info/cc-info-panel.c:1560 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "可移动介质"
+#: panels/info/cc-info-removable-media-panel.ui:91
+msgid "_DVD video"
+msgstr "_DVD 视频"
 
-#: ../panels/info/cc-info-panel.c:1585
-#, c-format
-msgid "Version %s"
-msgstr "版本 %s"
+#: panels/info/cc-info-removable-media-panel.ui:132
+msgid "_Music player"
+msgstr "音乐播放器(_M)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "详细信息"
+#: panels/info/cc-info-removable-media-panel.ui:190
+msgid "_Software"
+msgstr "软件(_S)"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
-msgid "View information about your system"
-msgstr "查看系统信息"
+#: panels/info/cc-info-removable-media-panel.ui:228
+msgid "_Other Media…"
+msgstr "其他介质(_O)…"
 
-#. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
-msgid ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-msgstr ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;设备;系统;信息;"
-"内存;处理器;CPU;版本;默认;应用程序;首选;回滚;喜好;音频;视频;光盘;光碟;盘片;可"
-"擦写;可移除;媒体;介质;自动运行;"
+#: panels/info/cc-info-removable-media-panel.ui:272
+msgid "_Never prompt or start programs on media insertion"
+msgstr "介质插入时从不提示或启动程序(_N)"
 
-#: ../panels/info/info.ui.h:1
+#: panels/info/cc-info-removable-media-panel.ui:331
 msgid "Select how other media should be handled"
 msgstr "选择如何处理其他介质"
 
-#: ../panels/info/info.ui.h:2
+#: panels/info/cc-info-removable-media-panel.ui:370
 msgid "_Action:"
 msgstr "动作(_A):"
 
-#: ../panels/info/info.ui.h:3
+#: panels/info/cc-info-removable-media-panel.ui:393
 msgid "_Type:"
 msgstr "类型(_T):"
 
-#: ../panels/info/info.ui.h:4
-msgid "Device name"
-msgstr "设备名称"
-
-#: ../panels/info/info.ui.h:5
-msgid "Memory"
-msgstr "内存"
-
-#: ../panels/info/info.ui.h:6
-msgid "Processor"
-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:10
-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
-msgid "Check for updates"
-msgstr "检查更新"
-
-#: ../panels/info/info.ui.h:15
-msgid "_Web"
-msgstr "_Web"
-
-#: ../panels/info/info.ui.h:16
-msgid "_Mail"
-msgstr "邮件(_M)"
-
-#: ../panels/info/info.ui.h:17
-msgid "_Calendar"
-msgstr "日历(_C)"
-
-#: ../panels/info/info.ui.h:18
-msgid "M_usic"
-msgstr "音乐(_U)"
-
-#: ../panels/info/info.ui.h:19
-msgid "_Video"
-msgstr "视频(_V)"
+#: panels/info/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "默认应用程序"
 
-#: ../panels/info/info.ui.h:20
-msgid "_Photos"
-msgstr "照片(_P)"
+#: panels/info/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+msgstr "配置默认应用程序"
 
-#: ../panels/info/info.ui.h:22
-msgid "Select how media should be handled"
-msgstr "选择如何处理介质"
+#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/info/gnome-default-apps-panel.desktop.in.in:19
+msgid "default;application;preferred;media;"
+msgstr "default;application;preferred;media;默认;应用程序;首选;偏好;媒体;介质;"
 
-#: ../panels/info/info.ui.h:23
-msgid "CD _audio"
-msgstr "CD 音频(_A)"
+#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+msgid "About"
+msgstr "关于"
 
-#: ../panels/info/info.ui.h:24
-msgid "_DVD video"
-msgstr "_DVD 视频"
+#: panels/info/gnome-info-overview-panel.desktop.in.in:4
+msgid "View information about your system"
+msgstr "查看系统信息"
 
-#: ../panels/info/info.ui.h:25
-msgid "_Music player"
-msgstr "音乐播放器(_M)"
+#. Translators: Search terms to find the About panel.
+#. Do NOT translate or localize the semicolons!
+#. The list MUST also end with a semicolon!
+#. "Preferred Applications" is the old name for the preference, so make
+#. sure that you use the same "translation" for those keywords
+#: panels/info/gnome-info-overview-panel.desktop.in.in:23
+msgid ""
+"device;system;information;memory;processor;version;default;application;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+msgstr ""
+"device;system;information;memory;processor;version;default;application;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;设备;系统;信息;"
+"内存;处理器;CPU;版本;默认;应用程序;首选;音频;视频;光盘;光碟;盘片;可擦写;可移"
+"除;可移动;媒体;介质;自动运行;"
 
-#: ../panels/info/info.ui.h:26
-msgid "_Software"
-msgstr "软件(_S)"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "可移动介质"
 
-#: ../panels/info/info.ui.h:27
-msgid "_Other Media…"
-msgstr "其他媒体(_O)…"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:4
+msgid "Configure Removable Media settings"
+msgstr "配置可移动介质设置"
 
-#: ../panels/info/info.ui.h:28
-msgid "_Never prompt or start programs on media insertion"
-msgstr "介质插入时从不提示或启动程序(_N)"
+#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/info/gnome-removable-media-panel.desktop.in.in:19
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;设备;系统;默认;应用程序;首选;音频;视频;光盘;光碟;盘"
+"片;可擦写;可移除;可移动;媒体;介质;自动运行;"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:1
+#: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "声音和媒体"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:2
+#: panels/keyboard/00-multimedia.xml.in:4
 msgid "Volume mute"
 msgstr "静音"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:3
+#: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
 msgstr "减小音量"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:4
+#: panels/keyboard/00-multimedia.xml.in:8
 msgid "Volume up"
 msgstr "增大音量"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:5
+#: panels/keyboard/00-multimedia.xml.in:10
 msgid "Launch media player"
 msgstr "启动媒体播放器"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:6
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Play (or play/pause)"
 msgstr "播放(或播放/暂停)"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:7
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Pause playback"
 msgstr "暂停播放"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:8
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Stop playback"
 msgstr "停止播放"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:9
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Previous track"
 msgstr "上一音轨"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:10
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Next track"
 msgstr "下一音轨"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:11
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Eject"
 msgstr "弹出"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:11
+#: panels/keyboard/01-input-sources.xml.in:4
+#: panels/universal-access/cc-ua-panel.ui:580
 msgid "Typing"
 msgstr "打字"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:2
+#: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
 msgstr "切换至下个输入源"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: panels/keyboard/01-input-sources.xml.in:13
 msgid "Switch to previous input source"
 msgstr "切换至上个输入源"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:1
+#: panels/keyboard/01-launchers.xml.in:2
 msgid "Launchers"
 msgstr "启动器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:2
+#: panels/keyboard/01-launchers.xml.in:4
 msgid "Launch help browser"
 msgstr "启动帮助浏览器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
-#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
-msgid "Settings"
-msgstr "设置"
-
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "启动计算器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: panels/keyboard/01-launchers.xml.in:10
 msgid "Launch email client"
 msgstr "启动邮件客户端"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: panels/keyboard/01-launchers.xml.in:12
 msgid "Launch web browser"
 msgstr "启动网页浏览器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: panels/keyboard/01-launchers.xml.in:14
 msgid "Home folder"
 msgstr "主目录"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:8
-msgctxt "keybinding"
-msgid "Search"
-msgstr "搜索"
-
-#: ../panels/keyboard/01-screenshot.xml.in.h:1
+#: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "截图"
 
 # 与下面的剪贴板“位置”相对。
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:3
+#: panels/keyboard/01-screenshot.xml.in:6
 msgid "Save a screenshot to $PICTURES"
 msgstr "将屏幕截图保存到 $PICTURES 目录"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:5
+#: panels/keyboard/01-screenshot.xml.in:10
 msgid "Save a screenshot of a window to $PICTURES"
 msgstr "将窗口截图保存到 $PICTURES 目录"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: panels/keyboard/01-screenshot.xml.in:14
 msgid "Save a screenshot of an area to $PICTURES"
 msgstr "将选区截图保存到 $PICTURES 目录"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:8
+#: panels/keyboard/01-screenshot.xml.in:17
 msgid "Copy a screenshot to clipboard"
 msgstr "复制截图到剪贴板"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:9
+#: panels/keyboard/01-screenshot.xml.in:20
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "复制窗口截图到剪贴板"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:10
+#: panels/keyboard/01-screenshot.xml.in:23
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "复制选区截图到剪贴板"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:11
+#: panels/keyboard/01-screenshot.xml.in:26
 msgid "Record a short screencast"
 msgstr "记录一小段屏幕录像"
 
-#: ../panels/keyboard/01-system.xml.in.h:1
+#: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "系统"
 
-#: ../panels/keyboard/01-system.xml.in.h:2
+#: panels/keyboard/01-system.xml.in:4
 msgid "Log out"
 msgstr "注销"
 
-#: ../panels/keyboard/01-system.xml.in.h:3
+#: panels/keyboard/01-system.xml.in:6
 msgid "Lock screen"
 msgstr "锁定屏幕"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:1
+#: panels/keyboard/50-accessibility.xml.in:2
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
 msgid "Universal Access"
-msgstr "通用辅助功能"
+msgstr "通用辅助"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:2
+#: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
 msgstr "开关屏幕缩放"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:3
+#: panels/keyboard/50-accessibility.xml.in:6
 msgid "Zoom in"
 msgstr "放大"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:4
+#: panels/keyboard/50-accessibility.xml.in:8
 msgid "Zoom out"
 msgstr "缩小"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: panels/keyboard/50-accessibility.xml.in:10
 msgid "Turn screen reader on or off"
 msgstr "开关屏幕阅读器"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: panels/keyboard/50-accessibility.xml.in:12
 msgid "Turn on-screen keyboard on or off"
 msgstr "开关屏幕键盘"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: panels/keyboard/50-accessibility.xml.in:14
 msgid "Increase text size"
 msgstr "增大文本字号"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:8
+#: panels/keyboard/50-accessibility.xml.in:16
 msgid "Decrease text size"
 msgstr "减小文本字号"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:9
+#: panels/keyboard/50-accessibility.xml.in:18
 msgid "High contrast on or off"
 msgstr "高对比度开关"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:522
-#: ../panels/keyboard/cc-keyboard-manager.c:830
+#: panels/keyboard/cc-keyboard-manager.c:501
+#: panels/keyboard/cc-keyboard-manager.c:509
+#: panels/keyboard/cc-keyboard-manager.c:809
 msgid "Custom Shortcuts"
 msgstr "自定义快捷键"
 
-#. This label is displayed in a treeview cell displaying
-#. * a disabled accelerator key combination.
+#. Translators: This key is also known as 'third level
+#. * chooser'. AltGr is often used for this purpose. See
+#. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
-#: ../panels/keyboard/shortcut-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:213
-msgid "Disabled"
-msgstr "禁用"
-
-#. Translators: This key is also known as 'third level
-#. * chooser'. AltGr is often used for this purpose. See
-#. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
-#.
-#: ../panels/keyboard/cc-keyboard-option.c:354
+#: panels/keyboard/cc-keyboard-option.c:337
 msgid "Alternative Characters Key"
 msgstr "替代的字符键"
 
@@ -1716,243 +2090,263 @@ msgstr "替代的字符键"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: panels/keyboard/cc-keyboard-option.c:346
 msgid "Compose Key"
 msgstr "Compose 键"
 
-#: ../panels/keyboard/cc-keyboard-option.c:368
+#: panels/keyboard/cc-keyboard-option.c:351
 msgid "Modifiers-only switch to next source"
 msgstr "切换至下一输入源的修饰键"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:217
+#: panels/keyboard/cc-keyboard-panel.c:179
+msgid "Reset All Shortcuts?"
+msgstr "重置所有快捷键?"
+
+#: panels/keyboard/cc-keyboard-panel.c:182
+msgid ""
+"Resetting the shortcuts may affect your custom shortcuts. This cannot be "
+"undone."
+msgstr "重新设置快捷键可能影响您的自定义快捷键。此操作无法撤销。"
+
+#: panels/keyboard/cc-keyboard-panel.c:186
+#: panels/keyboard/shortcut-editor.ui:346
+#: panels/printers/authentication-dialog.ui:29
+#: panels/printers/ppd-selection-dialog.ui:27
+msgid "Cancel"
+msgstr "取消"
+
+#: panels/keyboard/cc-keyboard-panel.c:187
+msgid "Reset All"
+msgstr "全部重置"
+
+#: panels/keyboard/cc-keyboard-panel.c:283
 msgid "Reset the shortcut to its default value"
 msgstr "重置快捷键为它的默认值"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#: panels/keyboard/cc-keyboard-panel.ui:67 panels/region/cc-region-panel.ui:395
+#: shell/cc-window.ui:334
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
+
+#: panels/keyboard/cc-keyboard-panel.ui:77
+msgid "Reset All…"
+msgstr "全部重置…"
+
+#: panels/keyboard/cc-keyboard-panel.ui:78
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "重置所有快捷键为它们的默认键绑定"
+
+#: panels/keyboard/cc-keyboard-panel.ui:164
+msgid "No keyboard shortcut found"
+msgstr "未找到键盘快捷键"
+
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:411
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
 msgstr "%s 已被用于 <b>%s</b>。如果您替换了它,%s 将被禁用"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:581
 msgid "Set Custom Shortcut"
 msgstr "设置自定义快捷键"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
-#: ../panels/keyboard/shortcut-editor.ui.h:7
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:581
 msgid "Set Shortcut"
 msgstr "设置快捷键"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:590
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "输入新的快捷键以更改<b>%s</b>。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:945
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017
 msgid "Add Custom Shortcut"
 msgstr "添加自定义快捷键"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Key­board"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+msgid "Keyboard"
 msgstr "键盘"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 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:5
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "No keyboard shortcut found"
-msgstr "未找到键盘快捷键"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 ../shell/panel-list.ui.h:4
-msgid "Try a different search"
-msgstr "尝试不同的搜索"
+#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;快捷"
+"键;工作空间;窗口;更改大小;缩放;对比度;输入;源;锁定;音量;"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "按 Esc 键取消。"
+#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
+msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
+msgstr "按 Esc 以取消或 Backspace 以停用此键盘快捷键。"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:3
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
+#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
 msgid "Name"
 msgstr "名称"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:4
+#: panels/keyboard/shortcut-editor.ui:168
 msgid "Command"
 msgstr "命令"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:5
+#: panels/keyboard/shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:6
-msgid "Edit"
-msgstr "编辑"
+#: panels/keyboard/shortcut-editor.ui:259
+msgid "Set Shortcut…"
+msgstr "设置快捷键…"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
-#: ../panels/network/network-wifi.ui.h:20
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
 msgid "None"
 msgstr "无"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:9
-msgid "Remove"
-msgstr "移除"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: panels/keyboard/shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "输入新的快捷键"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "取消"
+#: panels/keyboard/shortcut-editor.ui:357
+msgid "Remove"
+msgstr "移除"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:12
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
+#: panels/keyboard/shortcut-editor.ui:367
 msgid "Add"
 msgstr "添加"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: panels/keyboard/shortcut-editor.ui:382
 msgid "Replace"
 msgstr "替换"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:14
+#: panels/keyboard/shortcut-editor.ui:395
 msgid "Set"
 msgstr "设置"
 
-#: ../panels/mouse/cc-mouse-panel.c:82
+#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463
 msgid "Test Your _Settings"
 msgstr "测试您的设置(_S)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Mouse & Touch­pad"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
 msgstr "鼠标和触摸板"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 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:5
+#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr ""
-"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;触摸板;指针;触摸;单击;双"
-"击;按钮;轨迹球;"
+"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;触摸板;指针;触摸;单"
+"击;双击;按钮;轨迹球;滚动;"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
+#: panels/mouse/gnome-mouse-properties.ui:50
 msgid "General"
 msgstr "常规"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#: panels/mouse/gnome-mouse-properties.ui:88
 msgid "Primary Button"
 msgstr "主按钮"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: panels/mouse/gnome-mouse-properties.ui:107
 msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr "设置鼠标和触控板上的物理按钮的排列。"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: panels/mouse/gnome-mouse-properties.ui:136
+#: panels/sound/cc-balance-slider.ui:13
 msgid "Left"
 msgstr "左"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: panels/mouse/gnome-mouse-properties.ui:146
+#: panels/sound/cc-balance-slider.ui:15
 msgid "Right"
 msgstr "右"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: panels/mouse/gnome-mouse-properties.ui:182
 msgid "Mouse"
 msgstr "鼠标"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: panels/mouse/gnome-mouse-properties.ui:221
 msgid "Mouse Speed"
 msgstr "鼠标速度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: panels/mouse/gnome-mouse-properties.ui:243
+#: panels/mouse/gnome-mouse-properties.ui:535
 msgid "Double-click timeout"
 msgstr "双击超时"
 
+#. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use 
the same translation if possible.
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: panels/mouse/gnome-mouse-properties.ui:280
+#: panels/mouse/gnome-mouse-properties.ui:443
 msgid "Natural Scrolling"
 msgstr "自然滚动"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: panels/mouse/gnome-mouse-properties.ui:296
+#: panels/mouse/gnome-mouse-properties.ui:459
 msgid "Scrolling moves the content, not the view."
 msgstr "滚动移动内容而非视图。"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: panels/mouse/gnome-mouse-properties.ui:346
+#: panels/mouse/gnome-mouse-properties.ui:391
 msgid "Touchpad"
 msgstr "触摸板"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: panels/mouse/gnome-mouse-properties.ui:514
 msgid "Touchpad Speed"
 msgstr "触摸板速度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: panels/mouse/gnome-mouse-properties.ui:573
 msgid "Tap to Click"
 msgstr "轻拍以点击"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: panels/mouse/gnome-mouse-properties.ui:625
 msgid "Two-finger Scrolling"
 msgstr "双指滚动"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: panels/mouse/gnome-mouse-properties.ui:678
 msgid "Edge Scrolling"
 msgstr "边缘滚动"
 
-#: ../panels/mouse/gnome-mouse-test.c:130
-#: ../panels/mouse/gnome-mouse-test.ui.h:1
+#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25
 msgid "Try clicking, double clicking, scrolling"
 msgstr "尝试单击、双击、滚动"
 
-#: ../panels/mouse/gnome-mouse-test.c:135
+#: panels/mouse/gnome-mouse-test.c:137
 msgid "Five clicks, GEGL time!"
 msgstr "点击五次,开始 GEGL!"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:142
 msgid "Double click, primary button"
 msgstr "主键双击"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:142
 msgid "Single click, primary button"
 msgstr "主键单击"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:145
 msgid "Double click, middle button"
 msgstr "中键双击"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:145
 msgid "Single click, middle button"
 msgstr "中键单击"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:148
 msgid "Double click, secondary button"
-msgstr "辅键双击"
+msgstr "副键双击"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:148
 msgid "Single click, secondary button"
-msgstr "辅键单击"
+msgstr "副键单击"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:349
-msgid "Air_plane Mode"
-msgstr "飞行模式(_P)"
-
-#: ../panels/network/cc-network-panel.c:953
+#. add proxy to device list
+#: panels/network/cc-network-panel.c:589
 msgid "Network proxy"
 msgstr "网络代理"
 
@@ -1960,521 +2354,531 @@ msgstr "网络代理"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: panels/network/cc-network-panel.c:725 panels/network/net-vpn.c:167
+#: panels/network/net-vpn.c:295
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1194
+#: panels/network/cc-network-panel.c:789 panels/network/cc-wifi-panel.ui:304
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "抱歉,发生错误。请联系软件提供商。"
 
-#: ../panels/network/cc-network-panel.c:1200
+#: panels/network/cc-network-panel.c:795
 msgid "NetworkManager needs to be running."
 msgstr "需要运行 NetworkManager。"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#: panels/network/cc-network-panel.ui:142
+#: panels/network/connection-editor/net-connection-editor.c:581
+msgid "VPN"
+msgstr "VPN"
+
+#: panels/network/cc-network-panel.ui:194
+msgid "Not set up"
+msgstr "未设置"
+
+#. TRANSLATORS: This happens when the connection name does not contain the SSID.
+#: panels/network/cc-wifi-connection-row.c:189
+#, c-format
+msgctxt "Wi-Fi Connection"
+msgid "%s (SSID: %s)"
+msgstr "%s (SSID: %s)"
+
+#: panels/network/cc-wifi-connection-row.ui:73
+#: panels/network/net-device-ethernet.c:359
+#: panels/network/network-ethernet.ui:120 panels/network/network-mobile.ui:394
+#: panels/network/network-simple.ui:75 panels/network/network-vpn.ui:79
+msgid "Options…"
+msgstr "选项…"
+
+#: panels/network/cc-wifi-panel.c:281
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:1738
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: panels/network/cc-wifi-panel.ui:56
+msgid "Airplane Mode"
+msgstr "飞行模式"
+
+#: panels/network/cc-wifi-panel.ui:72
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "禁用 Wi-Fi、蓝牙及移动宽带"
+
+#: panels/network/cc-wifi-panel.ui:141
+msgid "No Wi-Fi Adapter Found"
+msgstr "未找到 Wi-Fi 适配器"
+
+#: panels/network/cc-wifi-panel.ui:153
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "请确保您已插入并打开了 Wi-Fi 适配器"
+
+#: panels/network/cc-wifi-panel.ui:188
+msgid "Airplane Mode On"
+msgstr "飞行模式已开启"
+
+#: panels/network/cc-wifi-panel.ui:200
+msgid "Turn off to use Wi-Fi"
+msgstr "关闭以使用 Wi-Fi"
+
+#: panels/network/cc-wifi-panel.ui:226
+msgid "Visible Networks"
+msgstr "可见网络"
+
+#: panels/network/cc-wifi-panel.ui:293
+msgid "NetworkManager needs to be running"
+msgstr "需要运行 NetworkManager"
+
+#: panels/network/connection-editor/8021x-security-page.ui:26
 msgid "802.1x _Security"
 msgstr "802.1X 安全性(_S)"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/printers/printers.ui.h:14
+#: panels/network/connection-editor/8021x-security-page.ui:73
+#: panels/network/connection-editor/security-page.ui:72
 msgid "page 1"
 msgstr "第 1 页"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: panels/network/connection-editor/8021x-security-page.ui:224
+#: panels/network/connection-editor/security-page.ui:223
+#: panels/network/wireless-security/eap-method-fast.ui:50
+#: panels/network/wireless-security/eap-method-peap.ui:48
+#: panels/network/wireless-security/eap-method-ttls.ui:31
 msgid "Anony_mous identity"
 msgstr "匿名身份(_M)"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: panels/network/connection-editor/8021x-security-page.ui:238
+#: panels/network/connection-editor/security-page.ui:237
 msgid "Inner _authentication"
 msgstr "内部认证(_A)"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
-#: ../panels/printers/printers.ui.h:16
+#: panels/network/connection-editor/8021x-security-page.ui:281
+#: panels/network/connection-editor/security-page.ui:280
 msgid "page 2"
 msgstr "第 2 页"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
-#: ../panels/network/connection-editor/details-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6
+#: panels/network/connection-editor/ce-page-8021x-security.c:101
+#: panels/network/connection-editor/ce-page-security.c:445
+#: panels/network/connection-editor/details-page.ui:86
+#: panels/network/network-wifi.ui:239
 msgid "Security"
 msgstr "安全"
 
-#: ../panels/network/connection-editor/ce-page.c:481
+#: panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "自动"
 
-#: ../panels/network/connection-editor/ce-page.c:521
+#: panels/network/connection-editor/ce-page.c:521
 #, c-format
 msgid "Profile %d"
 msgstr "配置 %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:214
-#: ../panels/network/net-device-wifi.c:390
+#: panels/network/connection-editor/ce-page-details.c:56
+#: panels/network/net-device-wifi.c:123 panels/network/net-device-wifi.c:299
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:395
-#: ../panels/network/network-wifi.ui.h:19
+#: panels/network/connection-editor/ce-page-details.c:60
+#: panels/network/net-device-wifi.c:127 panels/network/net-device-wifi.c:304
+#: panels/network/network-wifi.ui:592
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:222
+#: panels/network/connection-editor/ce-page-details.c:64
+#: panels/network/net-device-wifi.c:131
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:227
+#: panels/network/connection-editor/ce-page-details.c:69
+#: panels/network/net-device-wifi.c:136
 msgid "Enterprise"
 msgstr "企业"
 
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:232
-#: ../panels/network/net-device-wifi.c:380
+#: panels/network/connection-editor/ce-page-details.c:74
+#: panels/network/net-device-wifi.c:141 panels/network/net-device-wifi.c:289
 msgctxt "Wifi security"
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/connection-editor/ce-page-details.c:89
-#: ../panels/power/power.ui.h:17
+#: panels/network/connection-editor/ce-page-details.c:95
 msgid "Never"
 msgstr "从不"
 
-#: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: panels/network/connection-editor/ce-page-details.c:110
+#: panels/network/net-device-ethernet.c:137
+#: panels/network/net-device-wifi.c:398
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天前"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
-#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:542
+#: panels/network/connection-editor/ce-page-details.c:228
+#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:476
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/秒"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:571
+#: panels/network/connection-editor/ce-page-details.c:249
+#: panels/network/net-device-wifi.c:505
 msgctxt "Signal strength"
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:573
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:507
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "较弱"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:575
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:509
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "一般"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:577
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:511
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:579
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:513
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常好"
 
-#: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
-#: ../shell/panel-list.ui.h:2
+#: panels/network/connection-editor/ce-page-details.c:300
+msgid "Forget Connection"
+msgstr "忘记连接"
+
+#: panels/network/connection-editor/ce-page-details.c:302
+msgid "Remove Connection Profile"
+msgstr "移除连接配置"
+
+#: panels/network/connection-editor/ce-page-details.c:304
+msgid "Remove VPN"
+msgstr "移除 VPN"
+
+#: panels/network/connection-editor/ce-page-details.c:332
+#: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103
+#: shell/cc-window.c:264
 msgid "Details"
 msgstr "详细信息"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:215
-#: ../panels/network/connection-editor/ce-page-vpn.c:221
-#: ../panels/network/connection-editor/ce-page-wifi.c:227
-#: ../panels/network/network-wifi.ui.h:47
+#: panels/network/connection-editor/ce-page-ethernet.c:174
+#: panels/network/connection-editor/ce-page-vpn.c:188
+#: panels/network/connection-editor/ce-page-wifi.c:194
+#: panels/network/network-wifi.ui:1437
 msgid "Identity"
 msgstr "身份"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-msgid "Address"
-msgstr "地址"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
-msgid "Netmask"
-msgstr "子网掩码"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "网关"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: panels/network/connection-editor/ce-page-ip4.c:251
+#: panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "删除地址"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "服务器"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
-msgid "Delete DNS Server"
-msgstr "删除 DNS 服务器"
-
-#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "权重"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: panels/network/connection-editor/ce-page-ip4.c:422
+#: panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "删除路由"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "自动 (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Manual"
-msgstr "手动"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "仅本地链路"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:979
-#: ../panels/network/network-wifi.ui.h:48
+#: panels/network/connection-editor/ce-page-ip4.c:896
+#: panels/network/network-wifi.ui:1441
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
-msgid "Prefix"
-msgstr "前缀"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "自动"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "自动,仅 DHCP"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
-#: ../panels/network/network-wifi.ui.h:49
+#: panels/network/connection-editor/ce-page-ip6.c:828
+#: panels/network/network-wifi.ui:1445
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-#: ../panels/network/network-wifi.ui.h:51
-msgid "Reset"
-msgstr "重置"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "无"
 
-#: ../panels/network/connection-editor/ce-page-security.c:271
+#: panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 位密钥(Hex 或 ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:281
+#: panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码"
 
-#: ../panels/network/connection-editor/ce-page-security.c:294
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: panels/network/connection-editor/ce-page-security.c:291
+#: panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "动态 WEP (802.1X)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:321
+#: panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 和 WPA2 个人"
 
-#: ../panels/network/connection-editor/ce-page-security.c:335
+#: panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 和 WPA2 企业"
 
-#: ../panels/network/connection-editor/details-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:4
+#: panels/network/connection-editor/details-page.ui:18
+#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "信号强度"
 
-#: ../panels/network/connection-editor/details-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:5
+#: panels/network/connection-editor/details-page.ui:52
+#: panels/network/network-wifi.ui:207
 msgid "Link speed"
 msgstr "链路速度"
 
-#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
+#: panels/network/connection-editor/details-page.ui:104
+#: panels/network/net-device-ethernet.c:170 panels/network/network-wifi.ui:256
+#: panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 地址"
 
-#: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:154
-#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
+#: panels/network/connection-editor/details-page.ui:122
+#: panels/network/net-device-ethernet.c:171
+#: panels/network/net-device-ethernet.c:175
+#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
+#: panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6 地址"
 
-#: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:9
+#: panels/network/connection-editor/details-page.ui:140
+#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "硬件地址"
 
-#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:165
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
-#: ../panels/network/network-wifi.ui.h:10
+#: panels/network/connection-editor/details-page.ui:158
+#: panels/network/net-device-ethernet.c:182
+#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 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:167
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
-#: ../panels/network/network-wifi.ui.h:11
+#: panels/network/connection-editor/details-page.ui:177
+#: panels/network/connection-editor/ip4-page.ui:197
+#: panels/network/connection-editor/ip6-page.ui:211
+#: panels/network/net-device-ethernet.c:184
+#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
+#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/connection-editor/details-page.ui.h:9
+#: panels/network/connection-editor/details-page.ui:195
 msgid "Last Used"
 msgstr "上次使用"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+#: panels/network/connection-editor/details-page.ui:324
+msgid "Connect _automatically"
+msgstr "自动连接(_A)"
+
+#: panels/network/connection-editor/details-page.ui:343
+msgid "Make available to _other users"
+msgstr "对其他用户可用(_O)"
+
+#: panels/network/connection-editor/details-page.ui:376
+msgid "Restrict background data usage"
+msgstr "限制后台数据的使用"
+
+#: panels/network/connection-editor/details-page.ui:386
+msgid "Appropriate for connections that have data charges or limits."
+msgstr "适用于有数据费用或限制的连接。"
+
+#: panels/network/connection-editor/ethernet-page.ui:16
+#: panels/network/connection-editor/ethernet-page.ui:39
+#: panels/network/connection-editor/ip4-page.ui:209
+#: panels/network/connection-editor/ip4-page.ui:277
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:223
+#: panels/network/connection-editor/ip6-page.ui:291
+#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
+#: panels/network/wireless-security/eap-method-peap.ui:22
+#: panels/privacy/cc-privacy-panel.c:239
+msgid "Automatic"
+msgstr "自动"
+
+#: panels/network/connection-editor/ethernet-page.ui:19
 msgid "Twisted Pair (TP)"
 msgstr "双绞线 (TP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+#: panels/network/connection-editor/ethernet-page.ui:22
 msgid "Attachment Unit Interface (AUI)"
 msgstr "连接单元接口 (AUI)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+#: panels/network/connection-editor/ethernet-page.ui:25
 msgid "BNC"
 msgstr "BNC"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:28
 msgid "Media Independent Interface (MII)"
 msgstr "媒体独立接口 (MII)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#: panels/network/connection-editor/ethernet-page.ui:42
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#: panels/network/connection-editor/ethernet-page.ui:45
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+#: panels/network/connection-editor/ethernet-page.ui:48
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+#: panels/network/connection-editor/ethernet-page.ui:51
 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
+#: panels/network/connection-editor/ethernet-page.ui:71
+#: panels/network/connection-editor/vpn-page.ui:23
 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:38
+#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/wifi-page.ui:67
+#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "_MAC 地址"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+#: panels/network/connection-editor/ethernet-page.ui:146
 msgid "M_TU"
 msgstr "M_TU"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:13
-#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:163
+#: panels/network/connection-editor/wifi-page.ui:97
 msgid "_Cloned Address"
 msgstr "克隆的地址(_C)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: panels/network/connection-editor/ethernet-page.ui:178
 msgid "bytes"
 msgstr "字节"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "对其他用户可用(_U)"
+#: panels/network/connection-editor/ip4-page.ui:27
+msgid "IPv_4 Method"
+msgstr "IPv_4 方式"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "自动连接(_A)"
+#: panels/network/connection-editor/ip4-page.ui:42
+#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
+msgid "Automatic (DHCP)"
+msgstr "自动 (DHCP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "防火墙区域(_Z)"
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:69
+msgid "Link-Local Only"
+msgstr "仅本地链路"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-#: ../panels/network/connection-editor/firewall-helpers.c:118
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "默认"
+#: panels/network/connection-editor/ip4-page.ui:83
+#: panels/network/connection-editor/ip6-page.ui:97
+msgid "Disable"
+msgstr "禁用"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "此区域定义了对连接的信任级别"
+#: panels/network/connection-editor/ip4-page.ui:111
+#: panels/network/connection-editor/ip6-page.ui:125
+msgid "Addresses"
+msgstr "地址"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: panels/network/connection-editor/ip4-page.ui:129
+#: panels/network/connection-editor/ip4-page.ui:313
+#: panels/network/connection-editor/ip6-page.ui:143
+#: panels/network/connection-editor/ip6-page.ui:327
+#: panels/printers/details-dialog.ui:89
+msgid "Address"
+msgstr "地址"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "地址(_A)"
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
+msgid "Netmask"
+msgstr "子网掩码"
+
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
+msgid "Gateway"
+msgstr "网关"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: panels/network/connection-editor/ip4-page.ui:220
+#: panels/network/connection-editor/ip6-page.ui:234
 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:32
+#: panels/network/connection-editor/ip4-page.ui:244
+#: panels/network/connection-editor/ip6-page.ui:258
+msgid "Separate IP addresses with commas"
+msgstr "使用逗号分隔 IP 地址"
+
+#: panels/network/connection-editor/ip4-page.ui:265
+#: panels/network/connection-editor/ip6-page.ui:279
+#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
 msgid "Routes"
 msgstr "路由"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: panels/network/connection-editor/ip4-page.ui:288
+#: panels/network/connection-editor/ip6-page.ui:302
 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:34
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: panels/network/connection-editor/ip4-page.ui:354
+#: panels/network/connection-editor/ip6-page.ui:368
+msgid "Metric"
+msgstr "跃点"
+
+#: panels/network/connection-editor/ip4-page.ui:384
+#: panels/network/connection-editor/ip6-page.ui:398
+#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
 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:36
-msgid "IPv_6"
-msgstr "IPv_6"
+#: panels/network/connection-editor/ip6-page.ui:27
+msgid "IPv_6 Method"
+msgstr "IPv_6 方式"
+
+#: panels/network/connection-editor/ip6-page.ui:55
+msgid "Automatic, DHCP only"
+msgstr "自动,仅 DHCP"
+
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
+msgid "Prefix"
+msgstr "前缀"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: panels/network/connection-editor/net-connection-editor.c:261
 msgid "Unable to open connection editor"
 msgstr "无法打开连接编辑器"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: panels/network/connection-editor/net-connection-editor.c:279
 msgid "New Profile"
 msgstr "新配置"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:635
-msgid "VPN"
-msgstr "VPN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: panels/network/connection-editor/net-connection-editor.c:727
 msgid "Import from file…"
 msgstr "从文件导入…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: panels/network/connection-editor/net-connection-editor.c:759
 msgid "Add VPN"
 msgstr "添加 VPN"
 
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "重置(_R)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1536
-#: ../panels/network/network-wifi.ui.h:42
-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:16
+#: panels/network/connection-editor/security-page.ui:26
+#: panels/network/network-wifi.ui:529
 msgid "S_ecurity"
 msgstr "安全(_E)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
+"The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
 "\n"
 "Error: %s."
@@ -2483,39 +2887,39 @@ msgstr ""
 "\n"
 "错误:%s。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "选择要导入的文件"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/cc-printers-panel.c:2078
-#: ../panels/sharing/cc-sharing-panel.c:373
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: panels/network/connection-editor/vpn-helpers.c:182
+#: panels/printers/pp-details-dialog.c:314
+#: panels/sharing/cc-sharing-panel.c:428
+#: panels/user-accounts/cc-avatar-chooser.c:235
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
-msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
 msgstr "名为“%s”的文件已存在。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "您希望用将要保存的 VPN 连接替换 %s 么?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
 msgstr ""
@@ -2523,75 +2927,71 @@ msgstr ""
 "\n"
 "错误:%s。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "导出 VPN 连接"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: panels/network/connection-editor/vpn-page.ui:58
 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:14
+#: panels/network/connection-editor/wifi-page.ui:20
+#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "_SSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:15
+#: panels/network/connection-editor/wifi-page.ui:36
+#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:18
-msgid "My Home Network"
-msgstr "家庭网络"
-
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "对其他用户可用(_O)"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Net­work"
-msgstr "网络"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
+#: panels/network/gnome-network-panel.desktop.in.in:4
 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:5
+#. Translators: Search terms to find the Network panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/network/gnome-network-panel.desktop.in.in:19
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"DNS;网络;无线;无线保真;无线;互联网协议;局域网;代理;广域网;宽带;调制解调器;蓝"
-"牙;虚拟专用网;域名系统;"
+"DNS;网络;无线;无线保真;互联网协议;局域网;代理;广域网;宽带;调制解调器;蓝牙;虚"
+"拟专用网;域名系统;"
 
-#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:471
+#: panels/network/gnome-wifi-panel.desktop.in.in:4
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "控制连接到 Wi-Fi 网络的方式"
+
+#. Translators: Search terms to find the Wi-Fi panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/network/gnome-wifi-panel.desktop.in.in:19
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;网络;无线;无线保真;互联网协"
+"议;局域网;宽带;域名系统;"
+
+#: panels/network/net-device-ethernet.c:123
+#: panels/network/net-device-wifi.c:384
 msgid "never"
 msgstr "从不"
 
-#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:481
+#: panels/network/net-device-ethernet.c:133
+#: panels/network/net-device-wifi.c:394
 msgid "today"
 msgstr "今天"
 
-#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:483
+#: panels/network/net-device-ethernet.c:135
+#: panels/network/net-device-wifi.c:396
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../panels/network/net-device-ethernet.c:156
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
-#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
+#: panels/network/net-device-ethernet.c:173
+#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
+#: panels/network/panel-common.c:649
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: ../panels/network/net-device-ethernet.c:172
-#: ../panels/network/network-wifi.ui.h:12
+#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "上次使用"
 
@@ -2600,83 +3000,78 @@ msgstr "上次使用"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:280
-#: ../panels/network/network-ethernet.ui.h:1
-#: ../panels/network/network-simple.ui.h:1
+#: panels/network/net-device-ethernet.c:291
+#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "有线"
 
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1694
-#: ../panels/network/network-ethernet.ui.h:3
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
-msgid "Options…"
-msgstr "选项…"
-
-#: ../panels/network/net-device-mobile.c:223
+#: panels/network/net-device-mobile.c:236
 msgid "Add new connection"
 msgstr "添加新连接"
 
-#: ../panels/network/net-device-wifi.c:1205
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"如果有无线网络以外的方式连接互联网,您可以配置无线热点并与他人共享网络连接。"
-
-#: ../panels/network/net-device-wifi.c:1209
+#: panels/network/net-device-wifi.c:1157
 #, 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:1213
+#: panels/network/net-device-wifi.c:1161
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "启用热点模式时无法通过无线网络访问互联网。"
 
-#: ../panels/network/net-device-wifi.c:1296
+#: panels/network/net-device-wifi.c:1168
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "要打开 Wi-Fi 热点吗?"
+
+#: panels/network/net-device-wifi.c:1190
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr "Wi-Fi 热点常用于在 Wi-Fi 上共享其互联网连接。"
+
+#: panels/network/net-device-wifi.c:1201
+msgid "_Turn On"
+msgstr "打开(_T)"
+
+#: panels/network/net-device-wifi.c:1278
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户?"
 
-#: ../panels/network/net-device-wifi.c:1299
+#: panels/network/net-device-wifi.c:1281
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
-#: ../panels/network/net-device-wifi.c:1397
+#: panels/network/net-device-wifi.c:1337
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系统策略禁止作为热点使用"
 
-#: ../panels/network/net-device-wifi.c:1400
+#: panels/network/net-device-wifi.c:1340
 msgid "Wireless device does not support Hotspot mode"
 msgstr "无线设备不支持热点模式"
 
-#: ../panels/network/net-device-wifi.c:1532
+#: panels/network/net-device-wifi.c:1471
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "所选网络的细节,包括密码和全部自定义设置都将丢失。"
 
-#: ../panels/network/net-device-wifi.c:1842
-msgid "History"
-msgstr "历史"
+#: panels/network/net-device-wifi.c:1475 panels/network/network-wifi.ui:1350
+msgid "_Forget"
+msgstr "忘记(_F)"
 
-#: ../panels/network/net-device-wifi.c:1846
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "关闭(_C)"
+#: panels/network/net-device-wifi.c:1638 panels/network/net-device-wifi.c:1645
+msgid "Known Wi-Fi Networks"
+msgstr "已知的 Wi-Fi 网络"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1854
+#: panels/network/net-device-wifi.c:1682
 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
+#: panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "若未提供配置 URL,将使用网络代理自动发现。"
@@ -2685,834 +3080,779 @@ msgstr "若未提供配置 URL,将使用网络代理自动发现。"
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:75
+#: panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "对于不可信的公共网络,不建议这样做。"
 
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "代理"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "添加配置(_A)…"
-
-#: ../panels/network/network-mobile.ui.h:1
+#: panels/network/network-mobile.ui:30
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network-mobile.ui.h:2
+#: panels/network/network-mobile.ui:48
 msgid "Provider"
 msgstr "提供者"
 
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "网络"
-
-#: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "无"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "手动"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "自动"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "方式(_M)"
-
-#: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "配置 URL (_C)"
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
+msgid "Network Proxy"
+msgstr "网络代理"
 
-#: ../panels/network/network-proxy.ui.h:6
+#: panels/network/network-proxy.ui:173
 msgid "_HTTP Proxy"
 msgstr "_HTTP 代理"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: panels/network/network-proxy.ui:192
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS 代理"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: panels/network/network-proxy.ui:211
 msgid "_FTP Proxy"
 msgstr "_FTP 代理"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: panels/network/network-proxy.ui:230
 msgid "_Socks Host"
 msgstr "_Socks 主机"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: panels/network/network-proxy.ui:249
 msgid "_Ignore Hosts"
 msgstr "忽略主机(_I)"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: panels/network/network-proxy.ui:287
 msgid "HTTP proxy port"
 msgstr "HTTP 代理端口"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: panels/network/network-proxy.ui:364
 msgid "HTTPS proxy port"
 msgstr "HTTPS 代理端口"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: panels/network/network-proxy.ui:385
 msgid "FTP proxy port"
 msgstr "FTP 代理端口"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: panels/network/network-proxy.ui:406
 msgid "Socks proxy port"
 msgstr "SOCKS 代理端口"
 
-#: ../panels/network/network-simple.ui.h:7
+#: panels/network/network-proxy.ui:435
+msgid "_Configuration URL"
+msgstr "配置 URL(_C)"
+
+#: panels/network/network-simple.ui:50
 msgid "Turn device off"
 msgstr "关闭设备"
 
-#: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "添加设备"
-
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "移除设备"
-
-#: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "VPN 类型"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "组名"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "组密码"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-msgid "Username"
-msgstr "用户名"
-
-#: ../panels/network/network-vpn.ui.h:6
+#: panels/network/network-vpn.ui:56
 msgid "Turn VPN connection off"
 msgstr "关闭 VPN 连接"
 
-#: ../panels/network/network-wifi.ui.h:3
+#: panels/network/network-wifi.ui:127
 msgid "Automatic _Connect"
 msgstr "自动连接(_C)"
 
-#: ../panels/network/network-wifi.ui.h:13
+#: panels/network/network-wifi.ui:474
 msgid "details"
 msgstr "详细信息"
 
-#: ../panels/network/network-wifi.ui.h:17
-#: ../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/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: panels/network/network-wifi.ui:545
+#: panels/network/wireless-security/eap-method-leap.ui:40
+#: panels/network/wireless-security/eap-method-simple.ui:40
+#: panels/network/wireless-security/ws-leap.ui:40
+#: panels/network/wireless-security/ws-wpa-psk.ui:22
+#: panels/sharing/cc-sharing-panel.ui:351
+#: panels/user-accounts/cc-add-user-dialog.ui:310
+#: panels/user-accounts/cc-add-user-dialog.ui:547
+#: panels/user-accounts/cc-user-panel.ui:214
 msgid "_Password"
 msgstr "密码(_P)"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: panels/network/network-wifi.ui:621
 msgid "Show P_assword"
 msgstr "显示密码(_A)"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: panels/network/network-wifi.ui:651
 msgid "Make available to other users"
 msgstr "对其他用户可用"
 
-#: ../panels/network/network-wifi.ui.h:23
+#: panels/network/network-wifi.ui:679
 msgid "identity"
 msgstr "身份"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: panels/network/network-wifi.ui:713
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
+msgid "_Addresses"
+msgstr "地址(_A)"
+
+#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
 msgid "Automatic (DHCP) addresses only"
 msgstr "仅自动分配地址 (DHCP)"
 
-#: ../panels/network/network-wifi.ui.h:29
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Link-local only"
 msgstr "仅本地链路"
 
-#: ../panels/network/network-wifi.ui.h:30
+#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
 msgid "Shared with other computers"
 msgstr "与其他计算机共享"
 
-#: ../panels/network/network-wifi.ui.h:33
+#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193
 msgid "_Ignore automatically obtained routes"
 msgstr "忽略自动获取的路由(_I)"
 
-#: ../panels/network/network-wifi.ui.h:35
+#: panels/network/network-wifi.ui:959
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:37
+#: panels/network/network-wifi.ui:990
+msgid "IPv_6"
+msgstr "IPv_6"
+
+#: panels/network/network-wifi.ui:1236
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:39
+#: panels/network/network-wifi.ui:1276
 msgid "_Cloned MAC Address"
 msgstr "克隆的 MAC 地址(_C)"
 
-#: ../panels/network/network-wifi.ui.h:40
-msgid "hardware"
-msgstr "硬件"
+#: panels/network/network-wifi.ui:1334
+msgid "_Reset"
+msgstr "重置(_R)"
 
-#: ../panels/network/network-wifi.ui.h:43
+#: panels/network/network-wifi.ui:1370
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
 msgstr "将这个连接的设置重置为默认值,但仍作为首选连接。"
 
-#: ../panels/network/network-wifi.ui.h:44
+#: panels/network/network-wifi.ui:1387
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
 msgstr "删除关于这个网络的所有细节,不再尝试自动连接。"
 
-#: ../panels/network/network-wifi.ui.h:45
-msgid "reset"
-msgstr "重置"
-
-#: ../panels/network/network-wifi.ui.h:50
+#: panels/network/network-wifi.ui:1449
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../panels/network/network-wifi.ui.h:52
+#: panels/network/network-wifi.ui:1453
+msgctxt "tab"
+msgid "Reset"
+msgstr "重置"
+
+#: panels/network/network-wifi.ui:1505
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi 热点"
 
-#: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "打开(_T)"
-
-#: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "关闭 Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "用作热点(_U)…"
-
-#: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "连接到隐藏网络(_C)…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "历史(_H)"
-
-#: ../panels/network/network-wifi.ui.h:59
+#: panels/network/network-wifi.ui:1523
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "关闭以连接到无线网络"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: panels/network/network-wifi.ui:1572
 msgid "Network Name"
 msgstr "网络名称"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: panels/network/network-wifi.ui:1590
 msgid "Connected Devices"
 msgstr "已连接的设备"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: panels/network/network-wifi.ui:1608
 msgid "Security type"
 msgstr "安全类型"
 
-#: ../panels/network/network-wifi.ui.h:63
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: panels/network/network-wifi.ui:1671
+msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "密码"
 
+#: panels/network/network-wifi.ui:1768
+msgid "Turn Wi-Fi off"
+msgstr "关闭 Wi-Fi"
+
+#: panels/network/network-wifi.ui:1800
+msgid "_Connect to Hidden Network…"
+msgstr "连接到隐藏网络(_C)…"
+
+#: panels/network/network-wifi.ui:1810
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "打开 Wi-Fi 热点(_T)…"
+
+#: panels/network/network-wifi.ui:1820
+msgid "_Known Wi-Fi Networks"
+msgstr "已知的 Wi-Fi 网络(_K)"
+
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:127
+#: panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "架构"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
+#: panels/network/panel-common.c:147 panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "未知状态"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:151
+#: panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "未托管"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "不可用"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
+#: panels/network/panel-common.c:165 panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "正在连接"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: panels/network/panel-common.c:169 panels/network/panel-common.c:211
 msgid "Authentication required"
 msgstr "需要认证"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "已连接"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:177
+#: panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "正在断开"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
+#: panels/network/panel-common.c:181 panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "连接失败"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
+#: panels/network/panel-common.c:185 panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "未知状态(丢失)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223
+#: panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "未连接"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:248
+#: panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP 配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP 配置已过期"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "需要认证凭据,但没有提供"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1X 客户端已断开"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1X 客户端配置失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1X 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1X 客户端认证耗时过长"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "PPP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPP 服务已断开"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP 失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCP 客户端启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCP 客户端错误"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "共享连接服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "共享连接服务失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "AutoIP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP 服务出错"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP 服务失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "线路忙"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "无拨号音"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "无法建立载波"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "拨号请求超时"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "拨号尝试失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "调制解调器初始化失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "无法选择指定的 APN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "未在搜索网络"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "网络注册被拒绝"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "网络注册超时"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "无法在请求的网络上注册"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN 检查失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "设备可能缺少固件"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "连接丢失"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "已假定为现有连接"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "未找到调制解调器"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "蓝牙连接失败"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "未插入 SIM 卡"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "需要 SIM PIN 码"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "需要 SIM PUK 码"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM 错误"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "连接依赖失败"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:433
+#: panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "固件缺失"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:437
+#: panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "线缆已拔出"
 
-#: ../panels/network/wireless-security/eap-method.c:69
-msgid "undefined error in 802.1x security (wpa-eap)"
-msgstr "802.1x 安全性里未定义的错误 (wpa-eap)"
+#: panels/network/wireless-security/eap-method.c:69
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "802.1X 安全性里未定义的错误 (wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:245
+#: panels/network/wireless-security/eap-method.c:245
 msgid "no file selected"
 msgstr "未选择文件"
 
-#: ../panels/network/wireless-security/eap-method.c:276
+#: panels/network/wireless-security/eap-method.c:276
 msgid "unspecified error validating eap-method file"
 msgstr "验证 eap-method 文件时发生未知错误"
 
-#: ../panels/network/wireless-security/eap-method.c:480
+#: panels/network/wireless-security/eap-method.c:451
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER、PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:483
+#: panels/network/wireless-security/eap-method.c:454
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 证书 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:72
 msgid "missing EAP-FAST PAC file"
 msgstr "缺失 EAP-FAST PAC 文件"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:268
-#: ../panels/network/wireless-security/eap-method-peap.c:302
-#: ../panels/network/wireless-security/eap-method-ttls.c:333
+#: panels/network/wireless-security/eap-method-fast.c:268
+#: panels/network/wireless-security/eap-method-peap.c:302
+#: panels/network/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:283
-#: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:288
+#: panels/network/wireless-security/eap-method-fast.c:283
+#: panels/network/wireless-security/eap-method-peap.c:272
+#: panels/network/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "选择 PAC 文件"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../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:2
+#: panels/network/wireless-security/eap-method-fast.ui:22
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: panels/network/wireless-security/eap-method-fast.ui:25
 msgid "Authenticated"
 msgstr "已认证"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: panels/network/wireless-security/eap-method-fast.ui:28
 msgid "Both"
 msgstr "两者"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: panels/network/wireless-security/eap-method-fast.ui:76
 msgid "PAC _file"
 msgstr "PAC 文件(_F)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+#: panels/network/wireless-security/eap-method-fast.ui:122
+#: panels/network/wireless-security/eap-method-peap.ui:146
+#: panels/network/wireless-security/eap-method-ttls.ui:97
 msgid "_Inner authentication"
 msgstr "内部认证(_I)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: panels/network/wireless-security/eap-method-fast.ui:156
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允许自动 PAC 配置(_V)"
 
-#: ../panels/network/wireless-security/eap-method-leap.c:65
+#: panels/network/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
 msgstr "缺失 EAP-LEAP 用户名"
 
-#: ../panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:74
 msgid "missing EAP-LEAP password"
 msgstr "缺失 EAP-LEAP 密码"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
-#: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: panels/network/wireless-security/eap-method-leap.ui:26
+#: panels/network/wireless-security/eap-method-simple.ui:26
+#: panels/network/wireless-security/ws-leap.ui:26
+#: panels/user-accounts/cc-add-user-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "用户名(_U)"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
-#: ../panels/network/wireless-security/ws-leap.ui.h:3
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+#: panels/network/wireless-security/eap-method-leap.ui:68
+#: panels/network/wireless-security/eap-method-simple.ui:85
+#: panels/network/wireless-security/eap-method-tls.ui:164
+#: panels/network/wireless-security/ws-leap.ui:68
+#: panels/network/wireless-security/ws-wpa-psk.ui:76
 msgid "Sho_w password"
 msgstr "显示密码(_W)"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "无效的 EAP-PEAP CA 证书:%s"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "无效的 EAP-PEAP CA 证书:未指定证书"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:318
-#: ../panels/network/wireless-security/wireless-security.c:439
+#: panels/network/wireless-security/eap-method-peap.c:287
+#: panels/network/wireless-security/eap-method-ttls.c:336
+#: panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:381
-#: ../panels/network/wireless-security/eap-method-tls.c:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:412
+#: panels/network/wireless-security/eap-method-peap.c:381
+#: panels/network/wireless-security/eap-method-tls.c:492
+#: panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "选择 CA 证书"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:25
 msgid "Version 0"
 msgstr "版本 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: panels/network/wireless-security/eap-method-peap.ui:28
 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
+#: panels/network/wireless-security/eap-method-peap.ui:74
+#: panels/network/wireless-security/eap-method-tls.ui:75
+#: panels/network/wireless-security/eap-method-ttls.ui:57
 msgid "C_A certificate"
 msgstr "C_A 证书"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: panels/network/wireless-security/eap-method-peap.ui:96
+#: panels/network/wireless-security/eap-method-tls.ui:97
+#: panels/network/wireless-security/eap-method-ttls.ui:79
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 证书(_R)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
+#: panels/network/wireless-security/eap-method-peap.ui:114
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "缺失 EAP 用户名"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "缺失 EAP 密码"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:68
 msgid "missing EAP-TLS identity"
 msgstr "缺失 EAP-TLS 身份"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:77
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "无效的 EAP-TLS CA 证书:%s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "无效的 EAP-TLS CA 证书:未指定证书"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:95
-msgid "invalid EAP-TLS password: missing"
-msgstr "无效的 EAP-TLS 密码:缺失"
-
-#: ../panels/network/wireless-security/eap-method-tls.c:109
+#: panels/network/wireless-security/eap-method-tls.c:100
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "无效的 EAP-TLS CA 私钥:%s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:119
+#: panels/network/wireless-security/eap-method-tls.c:110
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "无效的 EAP-TLS 用户证书:%s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:316
+#: panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私钥不安全"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:319
+#: panels/network/wireless-security/eap-method-tls.c:310
 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"
+"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"
 "\n"
-"(您可以使用 openssl 来向私钥添加密码)"
+"(您可以使用 openssl 来对私钥进行密码保护)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:495
+#: panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "选择您的个人证书"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "选择您的私钥"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+#: panels/network/wireless-security/eap-method-tls.ui:24
 msgid "I_dentity"
 msgstr "身份(_D)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+#: panels/network/wireless-security/eap-method-tls.ui:50
 msgid "_User certificate"
 msgstr "用户证书(_U)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: panels/network/wireless-security/eap-method-tls.ui:115
 msgid "Private _key"
 msgstr "私钥(_K)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: panels/network/wireless-security/eap-method-tls.ui:140
 msgid "_Private key password"
 msgstr "私钥密码(_P)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "无效的 EAP-TTLS CA 证书:%s"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:68
+#: panels/network/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "无效的 EAP-TTLS CA 证书:未指定证书"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:258
+#: panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:273
+#: panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:303
+#: panels/network/wireless-security/eap-method-ttls.c:305
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2(无 EAP)"
+
+#: panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/wireless-security.c:87
-msgid "Unknown error validating 802.1x security"
-msgstr "验证 802.1x 安全性时发生未知错误"
+#: panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1X security"
+msgstr "验证 802.1X 安全性时发生未知错误"
 
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "隧道 TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: panels/network/wireless-security/wireless-security.c:510
 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
+#: panels/network/wireless-security/ws-dynamic-wep.ui:39
+#: panels/network/wireless-security/ws-wep-key.ui:115
+#: panels/network/wireless-security/ws-wpa-eap.ui:33
 msgid "Au_thentication"
 msgstr "认证(_T)"
 
-#: ../panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "缺失 leap-username"
 
-#: ../panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "缺失 leap-password"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "缺失 wep-key"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "无效的 wep-key:%zu 长度的密钥只能包含十六进制数字"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "无效的 wep-key:%zu 长度的密钥只能包含 ASCII 字符"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3521,51 +3861,39 @@ msgstr ""
 "无效的 wep-key:错误的密钥长度 %zu。密钥必须为长度 5/13 (ASCII) 或者 10/26 "
 "(十六进制)"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "无效的 wep-key:密码字段不能为空"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "无效的 wep-key:密码字段必须短于 64 个字符"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+#: panels/network/wireless-security/ws-wep-key.ui:11
 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
+#: panels/network/wireless-security/ws-wep-key.ui:31
 msgid "Open System"
 msgstr "开放系统"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: panels/network/wireless-security/ws-wep-key.ui:34
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: panels/network/wireless-security/ws-wep-key.ui:56
 msgid "_Key"
 msgstr "密钥(_K)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: panels/network/wireless-security/ws-wep-key.ui:94
 msgid "Sho_w key"
 msgstr "显示密钥(_W)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: panels/network/wireless-security/ws-wep-key.ui:152
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3573,150 +3901,108 @@ msgid ""
 msgstr ""
 "无效的 wep-psk:无效的密钥长度 %zu。必须为 [8,63] 字节或者 64 位十六进制数字"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "无效的 wep-psk:无法将 64 字节作为十六进制来解析密钥"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+#: panels/network/wireless-security/ws-wpa-psk.ui:50
 msgid "_Type"
 msgstr "类型(_T)"
 
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-msgid "On"
-msgstr "开"
-
 #. This is the per application switch for message tray usage.
-#: ../panels/notifications/edit-dialog.ui.h:2
+#: panels/notifications/cc-app-notifications-dialog.ui:61
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "通知(_N)"
 
 #. This is the setting to configure sounds associated with notifications.
-#: ../panels/notifications/edit-dialog.ui.h:4
+#: panels/notifications/cc-app-notifications-dialog.ui:113
 msgctxt "notifications"
 msgid "Sound _Alerts"
-msgstr "声音警告(_A)"
+msgstr "声音警报(_A)"
 
-#: ../panels/notifications/edit-dialog.ui.h:5
+#: panels/notifications/cc-app-notifications-dialog.ui:169
 msgctxt "notifications"
-msgid "Notification _Banners"
-msgstr "通知条幅(_B)"
+msgid "Notification _Popups"
+msgstr "通知弹窗(_P)"
 
-#. Banners here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:7
+#: panels/notifications/cc-app-notifications-dialog.ui:185
+msgid ""
+"Notifications will continue to appear in the notification list when popups "
+"are disabled."
+msgstr "禁用弹窗时通知将继续在通知列表里显示。"
+
+#. Popups here refers to message tray notifications in the middle of the screen.
+#: panels/notifications/cc-app-notifications-dialog.ui:250
 msgctxt "notifications"
-msgid "Show Message _Content in Banners"
-msgstr "在通知条幅中显示消息内容(_C)"
+msgid "Show Message _Content in Popups"
+msgstr "在弹窗中显示消息内容(_C)"
 
-#: ../panels/notifications/edit-dialog.ui.h:8
+#: panels/notifications/cc-app-notifications-dialog.ui:301
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "锁屏通知(_L)"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: panels/notifications/cc-app-notifications-dialog.ui:352
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "锁屏时显示显示消息内容(_O)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
-msgid "No­ti­fi­ca­tions"
-msgstr "通知"
+#: panels/notifications/cc-notifications-panel.ui:70
+msgid "Notification _Popups"
+msgstr "通知弹窗(_P)"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
-msgid "Control which notifications are displayed and what they show"
+#: panels/notifications/cc-notifications-panel.ui:121
+msgid "_Lock Screen Notifications"
+msgstr "锁屏通知(_L)"
+
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:4
+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:5
+#. Translators: Search terms to find the Notifications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:20
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr ""
-"Notifications;Banner;Message;Tray;Popup;通知;横幅;条幅;黑条;消息;托盘;弹出;"
-
-#: ../panels/notifications/notifications.ui.h:1
-msgid "Notification _Banners"
-msgstr "通知条幅"
-
-#: ../panels/notifications/notifications.ui.h:2
-msgid "_Lock Screen Notifications"
-msgstr "锁屏通知(_L)"
+"Notifications;Banner;Message;Tray;Popup;通知;横幅;条幅;消息;托盘;弹出;弹窗;"
 
-#. List of applications.
-#: ../panels/notifications/notifications.ui.h:4
-#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781
-msgid "Applications"
-msgstr "应用程序"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
+#: panels/online-accounts/cc-online-accounts-panel.c:150
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他"
 
-#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
-#: ../panels/online-accounts/online-accounts.ui.h:2
-msgid "Add Account"
-msgstr "添加帐号"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
-msgid "Mail"
-msgstr "邮件"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
-msgid "Calendar"
-msgstr "日历"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
-msgid "Chat"
-msgstr "聊天"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
-msgid "Resources"
-msgstr "资源"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:640
-msgid "Error creating account"
-msgstr "创建帐号出错"
+#. translators: This is the title of the "Show Account" dialog. The
+#. * %s is the name of the provider. e.g., 'Google'.
+#: panels/online-accounts/cc-online-accounts-panel.c:626
+#, c-format
+msgid "%s Account"
+msgstr "%s 帐号"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:700
+#: panels/online-accounts/cc-online-accounts-panel.c:923
 msgid "Error removing account"
 msgstr "移除帐号出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:736
-msgid "Are you sure you want to remove the account?"
-msgstr "确定要移除这个帐号吗?"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:738
-msgid "This will not remove the account on the server."
-msgstr "这不会将该帐号从服务器上移除。"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:739
-msgid "_Remove"
-msgstr "移除(_R)"
+#. Translators: The %s is the username (eg., debarshi ray gmail com
+#. * or rishi).
+#.
+#: panels/online-accounts/cc-online-accounts-panel.c:988
+#, c-format
+msgid "<b>%s</b> removed"
+msgstr "<b>%s</b> 已移除"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "On­line Accounts"
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
+msgid "Online Accounts"
 msgstr "在线帐号"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:4
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "连接在线帐号并决定如何使用"
 
+#. Translators: Search terms to find the Online Accounts panel.
+#. Do NOT translate or localize the semicolons!
+#. The list MUST also end with a semicolon!
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:22
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3725,37 +4011,38 @@ msgstr ""
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;脸谱;脸书;推特;雅虎;互联网;网络;在"
 "线;聊天;日历;邮件;联系人;云存储;稍后阅读;"
 
-#: ../panels/online-accounts/online-accounts.ui.h:1
-msgid "No online accounts configured"
-msgstr "未设置在线帐号"
+#. Translators: This is the button which allows undoing the removal of the printer.
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:71
+msgid "Undo"
+msgstr "撤消"
 
-#: ../panels/online-accounts/online-accounts.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "Remove Account"
-msgstr "移除帐号"
+#: panels/online-accounts/online-accounts.ui:96
+msgid "Connect to your data in the cloud"
+msgstr "连接您的云端数据"
 
-#: ../panels/online-accounts/online-accounts.ui.h:4
-msgid "Add an online account"
-msgstr "添加在线帐号"
+#: panels/online-accounts/online-accounts.ui:111
+msgid "No internet connection — connect to set up new online accounts"
+msgstr "无互联网连接——连接以设置新的在线帐号"
 
-# 统一下翻译
-#: ../panels/online-accounts/online-accounts.ui.h:5
-msgid ""
-"Adding an account allows your applications to access it for documents, mail, "
-"contacts, calendar, chat and more."
-msgstr "添加一个帐号以让您的应用访问帐号的文档、邮件、联系人、日历、聊天等。"
+#: panels/online-accounts/online-accounts.ui:136
+msgid "Add an account"
+msgstr "添加帐号"
+
+#: panels/online-accounts/online-accounts.ui:243
+msgid "Remove Account"
+msgstr "移除帐号"
 
-#: ../panels/power/cc-power-panel.c:253
+#: panels/power/cc-power-panel.c:318
 msgid "Unknown time"
 msgstr "未知时间"
 
-#: ../panels/power/cc-power-panel.c:259
+#: panels/power/cc-power-panel.c:324
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分钟"
 
-#: ../panels/power/cc-power-panel.c:271
+#: panels/power/cc-power-panel.c:336
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3763,1123 +4050,1397 @@ 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:279
+#: panels/power/cc-power-panel.c:344
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:280
+#: panels/power/cc-power-panel.c:345
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "时"
 
-#: ../panels/power/cc-power-panel.c:281
+#: panels/power/cc-power-panel.c:346
 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:300
+#: panels/power/cc-power-panel.c:364
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s 后充满"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:307
+#: panels/power/cc-power-panel.c:371
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意:剩余 %s 的电量"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:312
+#: panels/power/cc-power-panel.c:376
 #, c-format
 msgid "%s remaining"
 msgstr "剩余 %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:381 panels/power/cc-power-panel.c:411
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
+#: panels/power/cc-power-panel.c:385 panels/power/cc-power-panel.c:415
+msgid "Not charging"
+msgstr "未充电"
+
+#. TRANSLATORS: primary battery
+#: panels/power/cc-power-panel.c:389 panels/power/cc-power-panel.c:419
 msgid "Empty"
-msgstr "电池已耗尽"
+msgstr "已耗尽"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:336
+#: panels/power/cc-power-panel.c:402
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:341
+#: panels/power/cc-power-panel.c:407
 msgid "Discharging"
 msgstr "正在放电"
 
-#: ../panels/power/cc-power-panel.c:464
+#: panels/power/cc-power-panel.c:540
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主电池"
 
-#: ../panels/power/cc-power-panel.c:466
+#: panels/power/cc-power-panel.c:542
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "附加电池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:537
+#: panels/power/cc-power-panel.c:611
 msgid "Wireless mouse"
 msgstr "无线鼠标"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: panels/power/cc-power-panel.c:614
 msgid "Wireless keyboard"
 msgstr "无线键盘"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: panels/power/cc-power-panel.c:617
 msgid "Uninterruptible power supply"
-msgstr "不间断电源 (UPS)"
+msgstr "不间断电源(UPS)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: panels/power/cc-power-panel.c:620
 msgid "Personal digital assistant"
-msgstr "个人数字助理(PDA)"
+msgstr "个人数字助理(PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:623
 msgid "Cellphone"
 msgstr "手机"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:552
+#: panels/power/cc-power-panel.c:626
 msgid "Media player"
 msgstr "媒体播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555
+#: panels/power/cc-power-panel.c:629 panels/wacom/cc-wacom-panel.c:848
 msgid "Tablet"
 msgstr "手写板"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:558
+#: panels/power/cc-power-panel.c:632
 msgid "Computer"
 msgstr "计算机"
 
+#. TRANSLATORS: secondary battery
+#: panels/power/cc-power-panel.c:635
+msgid "Gaming input device"
+msgstr "游戏输入设备"
+
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2366
+#: panels/power/cc-power-panel.c:638 panels/power/cc-power-panel.c:891
+#: panels/power/cc-power-panel.c:2406
 msgid "Battery"
 msgstr "电池"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:615
+#: panels/power/cc-power-panel.c:699
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:706
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "警告"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:627
+#: panels/power/cc-power-panel.c:711
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:716
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充足"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:637
+#: panels/power/cc-power-panel.c:721
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:725
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "电池已耗尽"
 
-#: ../panels/power/cc-power-panel.c:799
+#: panels/power/cc-power-panel.c:889
 msgid "Batteries"
 msgstr "电池"
 
-#: ../panels/power/cc-power-panel.c:1227
+#: panels/power/cc-power-panel.c:1250
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小时"
+
+#: panels/power/cc-power-panel.c:1252
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分钟"
+
+#: panels/power/cc-power-panel.c:1255
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#. 5 hours 2 minutes 12 seconds
+#: panels/power/cc-power-panel.c:1260
+#, c-format
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: panels/power/cc-power-panel.c:1263
+#, c-format
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: panels/power/cc-power-panel.c:1269
+msgid "0 seconds"
+msgstr "0 秒"
+
+#: panels/power/cc-power-panel.c:1366
 msgid "When _idle"
 msgstr "空闲时(_I)"
 
-#: ../panels/power/cc-power-panel.c:1681
+#: panels/power/cc-power-panel.c:1811
 msgid "Power Saving"
 msgstr "节电"
 
-#: ../panels/power/cc-power-panel.c:1716
+#: panels/power/cc-power-panel.c:1845
 msgid "_Screen brightness"
 msgstr "屏幕亮度(_S)"
 
-#: ../panels/power/cc-power-panel.c:1735
+#: panels/power/cc-power-panel.c:1866
 msgid "Automatic brightness"
 msgstr "自动亮度"
 
-#: ../panels/power/cc-power-panel.c:1755
+#: panels/power/cc-power-panel.c:1879
 msgid "_Keyboard brightness"
 msgstr "键盘亮度(_K)"
 
-#: ../panels/power/cc-power-panel.c:1765
+#: panels/power/cc-power-panel.c:1890
 msgid "_Dim screen when inactive"
 msgstr "无操作时使屏幕变暗(_D)"
 
-#: ../panels/power/cc-power-panel.c:1790
+#: panels/power/cc-power-panel.c:1908
 msgid "_Blank screen"
-msgstr "空白屏幕(_B)"
+msgstr "息屏(_B)"
 
-#: ../panels/power/cc-power-panel.c:1827
+#: panels/power/cc-power-panel.c:1931
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1832
-msgid "Turn off Wi-Fi to save power."
-msgstr "关闭 Wi-Fi 以节省电源。"
+#: panels/power/cc-power-panel.c:1932
+msgid "Wi-Fi can be turned off to save power."
+msgstr "可以关闭 Wi-Fi 以节省电源。"
 
-#: ../panels/power/cc-power-panel.c:1857
+#: panels/power/cc-power-panel.c:1948
 msgid "_Mobile broadband"
 msgstr "移动宽带(_M)"
 
-#: ../panels/power/cc-power-panel.c:1862
-msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
-msgstr "关闭移动宽带(3G、4G、WiMax 等)以节省电源。"
+#: panels/power/cc-power-panel.c:1949
+msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
+msgstr "可以关闭移动宽带(LTE、4G、3G 等)以节省电源。"
 
-#: ../panels/power/cc-power-panel.c:1907
+#: panels/power/cc-power-panel.c:1999
 msgid "_Bluetooth"
 msgstr "蓝牙(_B)"
 
-#: ../panels/power/cc-power-panel.c:1970
+#: panels/power/cc-power-panel.c:2000
+msgid "Bluetooth can be turned off to save power."
+msgstr "可以关闭蓝牙以节省电源。"
+
+#: panels/power/cc-power-panel.c:2052
 msgid "When on battery power"
 msgstr "电池供电时"
 
-#: ../panels/power/cc-power-panel.c:1972
+#: panels/power/cc-power-panel.c:2054
 msgid "When plugged in"
 msgstr "插入电源时"
 
-#: ../panels/power/cc-power-panel.c:2067
+#: panels/power/cc-power-panel.c:2148
 msgid "Suspend"
 msgstr "挂起"
 
-#: ../panels/power/cc-power-panel.c:2068
+#: panels/power/cc-power-panel.c:2149
+msgid "Power Off"
+msgstr "电源关闭"
+
+#: panels/power/cc-power-panel.c:2150
 msgid "Hibernate"
 msgstr "休眠"
 
-#: ../panels/power/cc-power-panel.c:2069
+#: panels/power/cc-power-panel.c:2151
 msgid "Nothing"
 msgstr "不处理"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2183
+#: panels/power/cc-power-panel.c:2251
 msgid "Suspend & Power Button"
 msgstr "挂起和关机按钮"
 
-#: ../panels/power/cc-power-panel.c:2226
+#: panels/power/cc-power-panel.c:2292
 msgid "_Automatic suspend"
 msgstr "自动挂起(_A)"
 
-#: ../panels/power/cc-power-panel.c:2227
+#: panels/power/cc-power-panel.c:2293
 msgid "Automatic suspend"
 msgstr "自动挂起"
 
-#: ../panels/power/cc-power-panel.c:2294
+#: panels/power/cc-power-panel.c:2350
 msgid "_When the Power Button is pressed"
 msgstr "按下电源按钮时(_W)"
 
-#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270
-#: ../shell/panel-list.ui.h:1
-msgid "Devices"
-msgstr "设备"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Po­wer"
-msgstr "电源"
-
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
-msgid "View your battery status and change power saving settings"
-msgstr "查看电池状态并更改省电设置"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:13
+msgctxt "automatic_suspend"
+msgid "15 minutes"
+msgstr "15 分钟"
 
-#. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
-msgid ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"电源;睡眠;挂起;休眠;电池;亮度;暗;空白;显示器;空闲;"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:17
+msgctxt "automatic_suspend"
+msgid "20 minutes"
+msgstr "20 分钟"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:21
+msgctxt "automatic_suspend"
+msgid "25 minutes"
+msgstr "25 分钟"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:25
+msgctxt "automatic_suspend"
+msgid "30 minutes"
+msgstr "30 分钟"
 
-#: ../panels/power/power.ui.h:3
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:29
+msgctxt "automatic_suspend"
 msgid "45 minutes"
 msgstr "45 分钟"
 
-#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:33
+msgctxt "automatic_suspend"
 msgid "1 hour"
 msgstr "1 小时"
 
-#: ../panels/power/power.ui.h:5
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:37
+msgctxt "automatic_suspend"
 msgid "80 minutes"
 msgstr "80 分钟"
 
-#: ../panels/power/power.ui.h:6
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:41
+msgctxt "automatic_suspend"
 msgid "90 minutes"
 msgstr "90 分钟"
 
-#: ../panels/power/power.ui.h:7
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:45
+msgctxt "automatic_suspend"
 msgid "100 minutes"
 msgstr "100 分钟"
 
-#: ../panels/power/power.ui.h:8
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:49
+msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 小时"
 
-#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
 msgid "1 minute"
 msgstr "1 分钟"
 
-#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
 msgid "2 minutes"
 msgstr "2 分钟"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
 msgid "3 minutes"
 msgstr "3 分钟"
 
-#: ../panels/power/power.ui.h:12
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
 msgid "4 minutes"
 msgstr "4 分钟"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
 msgid "5 minutes"
 msgstr "5 分钟"
 
-#: ../panels/power/power.ui.h:14
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
 msgid "8 minutes"
 msgstr "8 分钟"
 
-#: ../panels/power/power.ui.h:15
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
 msgid "10 minutes"
 msgstr "10 分钟"
 
-#: ../panels/power/power.ui.h:16
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
 msgid "12 minutes"
 msgstr "12 分钟"
 
-#: ../panels/power/power.ui.h:18
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:99
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "从不"
+
+#: panels/power/cc-power-panel.ui:147
 msgid "Automatic Suspend"
 msgstr "自动挂起"
 
-#: ../panels/power/power.ui.h:19
+#: panels/power/cc-power-panel.ui:172
 msgid "_Plugged In"
 msgstr "已插入电源(_P)"
 
-#: ../panels/power/power.ui.h:20
+#: panels/power/cc-power-panel.ui:188
 msgid "On _Battery Power"
 msgstr "使用电池时(_B)"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
+#: panels/power/cc-power-panel.ui:233 panels/power/cc-power-panel.ui:293
+#: panels/universal-access/cc-ua-panel.ui:1507
 msgid "Delay"
 msgstr "延迟"
 
-#: ../panels/printers/authentication-dialog.ui.h:3
-msgid "Authenticate"
-msgstr "认证"
-
-#: ../panels/printers/authentication-dialog.ui.h:6
-msgid "Authentication Required"
-msgstr "需要认证"
-
-#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:684
-msgid "Low on toner"
-msgstr "墨粉不足"
-
-#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:686
-msgid "Out of toner"
-msgstr "墨粉用尽"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:689
-msgid "Low on developer"
-msgstr "显影剂不足"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:692
-msgid "Out of developer"
-msgstr "显影剂用尽"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:694
-msgid "Low on a marker supply"
-msgstr "标记墨水不足"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:696
-msgid "Out of a marker supply"
-msgstr "标记墨水用尽"
-
-#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:698
-msgid "Open cover"
-msgstr "打开上盖"
-
-#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:700
-msgid "Open door"
-msgstr "打开后盖"
-
-#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:702
-msgid "Low on paper"
-msgstr "纸张不足"
-
-#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:704
-msgid "Out of paper"
-msgstr "纸张用尽"
-
-#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:706
-msgctxt "printer state"
-msgid "Offline"
-msgstr "离线"
-
-#. Translators: Someone has stopped the Printer
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:708
-#: ../panels/printers/cc-printers-panel.c:898
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "已停止"
-
-#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:710
-msgid "Waste receptacle almost full"
-msgstr "废粉仓将满"
-
-#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:712
-msgid "Waste receptacle full"
-msgstr "废粉仓已满"
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:714
-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:716
-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:825
-msgctxt "printer state"
-msgid "Configuring"
-msgstr "正在配置"
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "电源"
 
-#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:884
-msgctxt "printer state"
-msgid "Ready"
-msgstr "就绪"
+#: panels/power/gnome-power-panel.desktop.in.in:4
+msgid "View your battery status and change power saving settings"
+msgstr "查看电池状态并更改省电设置"
 
-#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:889
-msgctxt "printer state"
-msgid "Does not accept jobs"
-msgstr "不接收任务"
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+msgstr ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"电源;睡眠;挂起;休眠;电池;亮度;暗;空白;监视器;显示器;空闲;"
 
-#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:894
-msgctxt "printer state"
-msgid "Processing"
-msgstr "正在处理"
+#: panels/printers/authentication-dialog.ui:11
+msgid " "
+msgstr " "
 
-# 以下几个level似乎译为“量”更好
-#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1014
-msgid "Toner Level"
-msgstr "碳粉量"
+#: panels/printers/authentication-dialog.ui:42
+msgid "Authenticate"
+msgstr "认证"
 
-#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1017
-msgid "Ink Level"
-msgstr "墨水量"
+#. Translators: This is a username on a print server.
+#: panels/printers/authentication-dialog.ui:80
+#: panels/printers/jobs-dialog.ui:57 panels/printers/new-printer-dialog.ui:362
+msgid "Username"
+msgstr "用户名"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1020
-msgid "Supply Level"
-msgstr "耗材量"
+#. Translators: This is a password needed for printing.
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
+#: panels/user-accounts/cc-add-user-dialog.ui:249
+msgid "Password"
+msgstr "密码"
 
-#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1038
-msgctxt "printer state"
-msgid "Installing"
-msgstr "正在安装"
+#: panels/printers/authentication-dialog.ui:139
+#: panels/printers/new-printer-dialog.ui:337
+msgid "Authentication Required"
+msgstr "需要认证"
 
-#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1552
+#. Translators: %s is the printer name
+#: panels/printers/cc-printers-panel.c:715
 #, c-format
-msgid "%u active"
-msgid_plural "%u active"
-msgstr[0] "%u 项活动任务"
+msgid "Printer “%s” has been deleted"
+msgstr "已删除打印机“%s”"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1893
+#: panels/printers/cc-printers-panel.c:938
 msgid "Failed to add new printer."
 msgstr "添加新打印机失败。"
 
-#: ../panels/printers/cc-printers-panel.c:2074
-msgid "Select PPD File"
-msgstr "选择 PPD 文件"
+#. Translators: The XML file containing user interface can not be loaded
+#: panels/printers/cc-printers-panel.c:1242
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "无法载入界面:%s"
 
-#: ../panels/printers/cc-printers-panel.c:2083
-msgid ""
-"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
-"PPD.GZ)"
-msgstr "PostScript 打印机描述文件 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
+#: panels/printers/details-dialog.ui:64 panels/printers/printer-entry.ui:223
+msgid "Location"
+msgstr "位置"
 
-#: ../panels/printers/cc-printers-panel.c:2390
-msgid "No suitable driver found"
-msgstr "未找到合适的驱动"
+#. Translators: Name of column showing printer drivers
+#: panels/printers/details-dialog.ui:114
+#: panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "驱动"
 
-#: ../panels/printers/cc-printers-panel.c:2461
+#: panels/printers/details-dialog.ui:152
 msgid "Searching for preferred drivers…"
 msgstr "正在搜索首选驱动…"
 
-#: ../panels/printers/cc-printers-panel.c:2482
-msgid "Select from database…"
-msgstr "从数据库选择…"
-
-#: ../panels/printers/cc-printers-panel.c:2491
-msgid "Provide PPD File…"
-msgstr "提供 PPD 文件…"
+#: panels/printers/details-dialog.ui:174
+msgid "Search for Drivers"
+msgstr "搜索驱动"
 
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2638
-#: ../panels/printers/cc-printers-panel.c:2661
-msgid "Test page"
-msgstr "测试页"
+#: panels/printers/details-dialog.ui:182
+msgid "Select from Database…"
+msgstr "从数据库选择…"
 
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3116
-#, c-format
-msgid "Could not load ui: %s"
-msgstr "无法载入界面:%s"
+#: panels/printers/details-dialog.ui:190
+msgid "Install PPD File…"
+msgstr "安装 PPD 文件…"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Prin­ters"
+#: panels/printers/gnome-printers-panel.desktop.in.in:3
+msgid "Printers"
 msgstr "打印机"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+#: panels/printers/gnome-printers-panel.desktop.in.in:4
 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:5
+#. Translators: Search terms to find the Printers panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/printers/gnome-printers-panel.desktop.in.in:16
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr ""
 "Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;硒鼓;墨"
 "盒;"
 
+#. Translators: This is a windows domain used with SMB protocol.
+#: panels/printers/jobs-dialog.ui:44
+msgid "Domain"
+msgstr "域"
+
+#. Translators: This button authenticates all print jobs and send them for printing.
+#: panels/printers/jobs-dialog.ui:123
+msgid "A_uthenticate"
+msgstr "认证(_U)"
+
 #. Translators: this action removes (purges) all the listed jobs from the list.
-#: ../panels/printers/jobs-dialog.ui.h:2
+#: panels/printers/jobs-dialog.ui:163
 msgid "Clear All"
 msgstr "全部清除"
 
+#. Translators: This button pop up authentication dialog for print jobs which need credentials.
+#: panels/printers/jobs-dialog.ui:225
+msgid "_Authenticate"
+msgstr "认证(_A)"
+
 #. Translators: this label describes the dialog empty state, with no jobs listed.
-#: ../panels/printers/jobs-dialog.ui.h:4
+#: panels/printers/jobs-dialog.ui:354
 msgid "No Active Printer Jobs"
 msgstr "没有活动的打印机任务"
 
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
+#. Translators: This is the title presented at top of the dialog.
+#: panels/printers/new-printer-dialog.ui:29
+#: panels/printers/pp-new-printer-dialog.c:363
+#: panels/printers/pp-new-printer-dialog.c:427
+msgid "Add Printer"
 msgstr "添加打印机"
 
 #. Translators: This button opens authentication dialog for selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "A_uthenticate"
-msgstr "认证(_U)"
+#. Translators: This buttons submits the credentials for the selected server.
+#: panels/printers/new-printer-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:111
+msgid "_Unlock"
+msgstr "解锁(_U)"
 
-#. Translators: No printers were found
-#: ../panels/printers/new-printer-dialog.ui.h:7
-msgid "No printers detected."
-msgstr "未检测到打印机。"
+#. Translators: No printers were detected
+#: panels/printers/new-printer-dialog.ui:211
+msgid "No Printers Found"
+msgstr "未找到打印机"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:9
+#: panels/printers/new-printer-dialog.ui:284
 msgid "Enter a network address or search for a printer"
 msgstr "输入网络地址或搜索打印机"
 
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "正在载入选项…"
+#: panels/printers/new-printer-dialog.ui:353
+msgid "Enter username and password to view printers on Print Server."
+msgstr "输入用户名和密码以查看打印服务器上的打印机。"
+
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:907
+msgid "Test Page"
+msgstr "测试页"
+
+#. Translators: This is the title of the dialog. %s is the printer name.
+#: panels/printers/pp-details-dialog.c:133
+#: panels/printers/pp-details-dialog.c:417
+#, c-format
+msgid "%s Details"
+msgstr "%s 详细信息"
+
+#: panels/printers/pp-details-dialog.c:180
+msgid "No suitable driver found"
+msgstr "未找到合适的驱动"
+
+#: panels/printers/pp-details-dialog.c:310
+msgid "Select PPD File"
+msgstr "选择 PPD 文件"
+
+#: panels/printers/pp-details-dialog.c:319
+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/ppd-selection-dialog.ui.h:1
+#: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "选择打印机驱动"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:96
+#: panels/printers/ppd-selection-dialog.ui:40
+#: panels/user-accounts/cc-avatar-chooser.c:108
 msgid "Select"
 msgstr "选择"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:4
-msgid "Loading drivers database..."
+#: panels/printers/ppd-selection-dialog.ui:73
+msgid "Loading drivers database…"
 msgstr "正在载入驱动数据库…"
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:526
+#: panels/printers/pp-host.c:472
 msgid "JetDirect Printer"
 msgstr "JetDirect 打印机"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:782
+#: panels/printers/pp-host.c:707
 msgid "LPD Printer"
 msgstr "LPD 打印机"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:66
-#: ../panels/printers/pp-ppd-option-widget.c:70
+#: panels/printers/pp-ipp-option-widget.c:65
+#: panels/printers/pp-ppd-option-widget.c:69
 msgid "One Sided"
 msgstr "单面"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:68
-#: ../panels/printers/pp-ppd-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:67
+#: panels/printers/pp-ppd-option-widget.c:71
 msgid "Long Edge (Standard)"
 msgstr "长边(标准)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:70
-#: ../panels/printers/pp-ppd-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:69
+#: panels/printers/pp-ppd-option-widget.c:73
 msgid "Short Edge (Flip)"
 msgstr "短边(翻转)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:71
 msgid "Portrait"
 msgstr "纵向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:73
 msgid "Landscape"
 msgstr "横向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:76
+#: panels/printers/pp-ipp-option-widget.c:75
 msgid "Reverse landscape"
 msgstr "横向倒转"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:78
+#: panels/printers/pp-ipp-option-widget.c:77
 msgid "Reverse portrait"
 msgstr "纵向倒转"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:103
+#: panels/printers/pp-jobs-dialog.c:234
 msgctxt "print job"
 msgid "Pending"
 msgstr "等待中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:107
+#: panels/printers/pp-jobs-dialog.c:240
 msgctxt "print job"
 msgid "Paused"
 msgstr "暂停"
 
+#. Translators: Job's state (job needs authentication to proceed further)
+#: panels/printers/pp-jobs-dialog.c:245
+msgctxt "print job"
+msgid "Authentication required"
+msgstr "需要认证"
+
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:111
+#: panels/printers/pp-jobs-dialog.c:250
 msgctxt "print job"
 msgid "Processing"
 msgstr "正在处理"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:115
+#: panels/printers/pp-jobs-dialog.c:254
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:119
+#: panels/printers/pp-jobs-dialog.c:258
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:123
+#: panels/printers/pp-jobs-dialog.c:262
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:127
+#: panels/printers/pp-jobs-dialog.c:266
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
+#. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
+#: panels/printers/pp-jobs-dialog.c:390
+#, c-format
+msgid "%u Job Requires Authentication"
+msgid_plural "%u Jobs Require Authentication"
+msgstr[0] "%u 项任务需要认证"
+
 #. Translators: This is the printer name for which we are showing the active jobs
-#: ../panels/printers/pp-jobs-dialog.c:289
+#: panels/printers/pp-jobs-dialog.c:613
 #, c-format
 msgctxt "Printer jobs dialog title"
-msgid "%s - Active Jobs"
-msgstr "%s 项活动任务"
+msgid "%s — Active Jobs"
+msgstr "%s — 活动任务"
+
+#. Translators: The printer needs authentication info to print.
+#: panels/printers/pp-jobs-dialog.c:617
+#, c-format
+msgid "Enter credentials to print from %s."
+msgstr "从 %s 输入凭据以打印。"
+
+#: panels/printers/pp-new-printer-dialog.c:380
+msgid "Unlock Print Server"
+msgstr "解锁打印服务器"
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: panels/printers/pp-new-printer-dialog.c:384
+#, c-format
+msgid "Unlock %s."
+msgstr "解锁 %s。"
+
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: panels/printers/pp-new-printer-dialog.c:388
+#, c-format
+msgid "Enter username and password to view printers on %s."
+msgstr "输入用户名和密码以查看 %s 上的打印机。"
+
+#: panels/printers/pp-new-printer-dialog.c:838
+msgid "Searching for Printers"
+msgstr "正在搜索打印机"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1659
+#: panels/printers/pp-new-printer-dialog.c:1680
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1664
+#: panels/printers/pp-new-printer-dialog.c:1685
 msgid "Serial Port"
 msgstr "串口"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1671
+#: panels/printers/pp-new-printer-dialog.c:1692
 msgid "Parallel Port"
 msgstr "并口"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
-msgstr "蓝牙"
-
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1713
+#: panels/printers/pp-new-printer-dialog.c:1734
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1718
+#: panels/printers/pp-new-printer-dialog.c:1739
 #, c-format
 msgid "Address: %s"
 msgstr "地址:%s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1747
+#: panels/printers/pp-new-printer-dialog.c:1766
 msgid "Server requires authentication"
 msgstr "服务器要求认证"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: panels/printers/pp-options-dialog.c:90
 msgid "Two Sided"
 msgstr "双面"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: panels/printers/pp-options-dialog.c:91
 msgid "Paper Type"
 msgstr "纸张类型"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:92
 msgid "Paper Source"
 msgstr "纸张来源"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:93
 msgid "Output Tray"
 msgstr "出纸托盘"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:94
+msgctxt "printing option"
+msgid "Resolution"
+msgstr "分辨率"
+
+#: panels/printers/pp-options-dialog.c:95
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 预过滤"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: panels/printers/pp-options-dialog.c:548
 msgid "Pages per side"
 msgstr "每面页数"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:545
+#: panels/printers/pp-options-dialog.c:560
 msgid "Two-sided"
 msgstr "双面"
 
-# 左撇子有歧视色彩。
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
+#: panels/printers/pp-options-dialog.c:572
 msgid "Orientation"
 msgstr "方向"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: panels/printers/pp-options-dialog.c:669
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "常规"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:657
+#: panels/printers/pp-options-dialog.c:672
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "页面设置"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:660
+#: panels/printers/pp-options-dialog.c:675
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "可安装选项"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:663
+#: panels/printers/pp-options-dialog.c:678
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "任务"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:666
+#: panels/printers/pp-options-dialog.c:681
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "图像质量"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:669
+#: panels/printers/pp-options-dialog.c:684
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "色彩"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:672
+#: panels/printers/pp-options-dialog.c:687
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "正在完成"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:675
+#: panels/printers/pp-options-dialog.c:690
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "高级"
 
-#. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:76
-#: ../panels/printers/pp-ppd-option-widget.c:78
-#: ../panels/printers/pp-ppd-option-widget.c:86
+#. Translators: Name of job which makes printer to print test page
+#: panels/printers/pp-options-dialog.c:920
+msgid "Test page"
+msgstr "测试页"
+
+#. 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
 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:80
-#: ../panels/printers/pp-ppd-option-widget.c:82
-#: ../panels/printers/pp-ppd-option-widget.c:84
-#: ../panels/printers/pp-ppd-option-widget.c:88
+#: 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
 msgid "Printer Default"
 msgstr "打印机默认设置"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:90
+#: panels/printers/pp-ppd-option-widget.c:89
 msgid "Embed GhostScript fonts only"
 msgstr "仅内嵌 GhostScript 字体"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:92
+#: panels/printers/pp-ppd-option-widget.c:91
 msgid "Convert to PS level 1"
 msgstr "转换为 PS 等级 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:94
+#: panels/printers/pp-ppd-option-widget.c:93
 msgid "Convert to PS level 2"
 msgstr "转换为 PS 等级 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:96
+#: panels/printers/pp-ppd-option-widget.c:95
 msgid "No pre-filtering"
 msgstr "无预过滤"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#: panels/printers/pp-ppd-selection-dialog.c:233
 msgid "Manufacturer"
 msgstr "厂商"
 
-#. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "驱动"
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: panels/printers/pp-printer-entry.c:606 panels/printers/printer-entry.ui:166
+msgid "No Active Jobs"
+msgstr "无活动任务"
 
-#. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:248
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: panels/printers/pp-printer-entry.c:611
 #, c-format
-msgid "Enter your username and password to view printers available on %s."
-msgstr "输入用户名和密码以查看 %s 上可用的打印机。"
+msgid "%u Job"
+msgid_plural "%u Jobs"
+msgstr[0] "%u 项任务"
 
-#: ../panels/printers/printers.ui.h:1
-msgid "Add Printer"
-msgstr "添加打印机"
+#. Translators: The printer is low on toner
+#: panels/printers/pp-printer-entry.c:766
+msgid "Low on toner"
+msgstr "墨粉不足"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "Remove Printer"
-msgstr "移除打印机"
+#. Translators: The printer has no toner left
+#: panels/printers/pp-printer-entry.c:768
+msgid "Out of toner"
+msgstr "墨粉用尽"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:4
-msgid "Supply"
-msgstr "耗材"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: panels/printers/pp-printer-entry.c:771
+msgid "Low on developer"
+msgstr "显影剂不足"
 
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:6
-msgid "Location"
-msgstr "位置"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: panels/printers/pp-printer-entry.c:774
+msgid "Out of developer"
+msgstr "显影剂用尽"
+
+#. Translators: "marker" is one color bin of the printer
+#: panels/printers/pp-printer-entry.c:776
+msgid "Low on a marker supply"
+msgstr "标记墨水不足"
 
-#. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:8
-msgid "_Default printer"
-msgstr "默认打印机(_D)"
+#. Translators: "marker" is one color bin of the printer
+#: panels/printers/pp-printer-entry.c:778
+msgid "Out of a marker supply"
+msgstr "标记墨水用尽"
 
-#: ../panels/printers/printers.ui.h:9
-msgid "Jobs"
-msgstr "任务"
+#. Translators: One or more covers on the printer are open
+#: panels/printers/pp-printer-entry.c:780
+msgid "Open cover"
+msgstr "打开上盖"
+
+#. Translators: One or more doors on the printer are open
+#: panels/printers/pp-printer-entry.c:782
+msgid "Open door"
+msgstr "打开后盖"
+
+#. Translators: At least one input tray is low on media
+#: panels/printers/pp-printer-entry.c:784
+msgid "Low on paper"
+msgstr "纸张不足"
+
+#. Translators: At least one input tray is empty
+#: panels/printers/pp-printer-entry.c:786
+msgid "Out of paper"
+msgstr "纸张用尽"
+
+#. Translators: The printer is offline
+#: panels/printers/pp-printer-entry.c:788
+msgctxt "printer state"
+msgid "Offline"
+msgstr "离线"
+
+#. Translators: Someone has stopped the Printer
+#. Translators: Printer's state (no jobs can be processed)
+#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:918
+msgctxt "printer state"
+msgid "Stopped"
+msgstr "已停止"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: panels/printers/pp-printer-entry.c:792
+msgid "Waste receptacle almost full"
+msgstr "废粉仓将满"
+
+#. Translators: The printer marker supply waste receptacle is full
+#: panels/printers/pp-printer-entry.c:794
+msgid "Waste receptacle full"
+msgstr "废粉仓已满"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: panels/printers/pp-printer-entry.c:796
+msgid "The optical photo conductor is near end of life"
+msgstr "感光鼓使用寿命已快耗尽"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: panels/printers/pp-printer-entry.c:798
+msgid "The optical photo conductor is no longer functioning"
+msgstr "感光鼓故障"
+
+#. Translators: Printer's state (can start new job without waiting)
+#: panels/printers/pp-printer-entry.c:904
+msgctxt "printer state"
+msgid "Ready"
+msgstr "就绪"
+
+#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
+#: panels/printers/pp-printer-entry.c:909
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "不接收任务"
+
+#. Translators: Printer's state (jobs are processing)
+#: panels/printers/pp-printer-entry.c:914
+msgctxt "printer state"
+msgid "Processing"
+msgstr "正在处理"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: panels/printers/pp-printer-entry.c:938
+msgid "Clean print heads"
+msgstr "清理喷墨头"
+
+#: panels/printers/printer-entry.ui:14
+msgid "Printing Options"
+msgstr "打印选项"
 
-#. Translators: Opens a dialog containing printer
-#: ../panels/printers/printers.ui.h:11
-msgid "Show _Jobs"
-msgstr "显示任务(_J)"
+#: panels/printers/printer-entry.ui:26
+msgid "Printer Details"
+msgstr "打印机详细信息"
 
-#: ../panels/printers/printers.ui.h:12
+#. Set this printer as default
+#: panels/printers/printer-entry.ui:38
+msgid "Use Printer by Default"
+msgstr "默认使用的打印机"
+
+#. Translators: This button executes command which cleans print heads of the printer.
+#: panels/printers/printer-entry.ui:50
+msgid "Clean Print Heads"
+msgstr "清理喷墨头"
+
+#: panels/printers/printer-entry.ui:61
+msgid "Remove Printer"
+msgstr "移除打印机"
+
+#: panels/printers/printer-entry.ui:193
 msgid "Model"
 msgstr "型号"
 
-#: ../panels/printers/printers.ui.h:15
-msgid "label"
-msgstr "标签"
-
-#: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver…"
-msgstr "正在设置新驱动…"
+#: panels/printers/printer-entry.ui:251
+msgid "Ink Level"
+msgstr "墨水量"
 
-#: ../panels/printers/printers.ui.h:18
-msgid "page 3"
-msgstr "第 3 页"
+#. Translators: This is the message which follows the printer error.
+#: panels/printers/printer-entry.ui:312
+msgid "Please restart when the problem is resolved."
+msgstr "问题解决后请重启。"
 
-#. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:20
-msgid "Print _Test Page"
-msgstr "打印测试页(_T)"
+#. Translators: This is the button which restarts the printer.
+#: panels/printers/printer-entry.ui:319
+msgid "Restart"
+msgstr "重启"
 
-#. Translators: This button opens printer
-#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6
-msgid "_Options"
-msgstr "选项(_O)"
+#. Translators: This button adds new printer.
+#: panels/printers/printers.ui:20
+msgid "Add…"
+msgstr "添加…"
 
-#: ../panels/printers/printers.ui.h:23
+#: panels/printers/printers.ui:186
 msgid "No printers"
 msgstr "无打印机"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:25
-msgid "Add a Printer"
-msgstr "添加打印机"
+#: panels/printers/printers.ui:200
+msgid "Add a Printer…"
+msgstr "添加打印机…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:27
+#: panels/printers/printers.ui:232
 msgid ""
 "Sorry! The system printing service\n"
-"doesn't seem to be available."
+"doesn’t seem to be available."
 msgstr "抱歉,系统打印服务似乎不可用。"
 
-#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
+#: panels/privacy/cc-privacy-panel.c:423 panels/privacy/cc-privacy-panel.ui:280
 msgid "Screen Lock"
 msgstr "锁屏"
 
-#: ../panels/privacy/cc-privacy-panel.c:438
+#: panels/privacy/cc-privacy-panel.c:467
 msgid "In use"
 msgstr "已占用"
 
-#: ../panels/privacy/cc-privacy-panel.c:443
+#: panels/privacy/cc-privacy-panel.c:472
 msgctxt "Location services status"
 msgid "On"
 msgstr "开启"
 
-#: ../panels/privacy/cc-privacy-panel.c:444
+#: panels/privacy/cc-privacy-panel.c:473
 msgctxt "Location services status"
 msgid "Off"
 msgstr "关闭"
 
-#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
-msgid "Location Services"
-msgstr "定位服务"
+#: panels/privacy/cc-privacy-panel.c:895
+msgctxt "Camera status"
+msgid "Off"
+msgstr "关闭"
+
+#: panels/privacy/cc-privacy-panel.c:897
+msgctxt "Camera status"
+msgid "On"
+msgstr "开启"
+
+#: panels/privacy/cc-privacy-panel.c:928
+msgctxt "Microphone status"
+msgid "Off"
+msgstr "关闭"
 
-#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
+#: panels/privacy/cc-privacy-panel.c:930
+msgctxt "Microphone status"
+msgid "On"
+msgstr "开启"
+
+#: panels/privacy/cc-privacy-panel.c:1036
+#: panels/privacy/cc-privacy-panel.ui:127
 msgid "Usage & History"
 msgstr "用量及历史"
 
-#: ../panels/privacy/cc-privacy-panel.c:1067
+#: panels/privacy/cc-privacy-panel.c:1157
 msgid "Empty all items from Trash?"
 msgstr "清空回收站中的所有项目吗?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1068
+#: panels/privacy/cc-privacy-panel.c:1158
 msgid "All items in the Trash will be permanently deleted."
 msgstr "回收站内的所有项目将会永久删除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
+#: panels/privacy/cc-privacy-panel.c:1159
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1092
+#: panels/privacy/cc-privacy-panel.c:1180
 msgid "Delete all the temporary files?"
 msgstr "删除所有临时文件吗?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1093
+#: panels/privacy/cc-privacy-panel.c:1181
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有临时文件将会永久删除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
+#: panels/privacy/cc-privacy-panel.c:1182
 msgid "_Purge Temporary Files"
 msgstr "清理临时文件(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
+#: panels/privacy/cc-privacy-panel.c:1204
+#: panels/privacy/cc-privacy-panel.ui:432
 msgid "Purge Trash & Temporary Files"
 msgstr "清理回收站及临时文件"
 
-#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
+#: panels/privacy/cc-privacy-panel.c:1237
+#: panels/privacy/cc-privacy-panel.ui:637
 msgid "Software Usage"
 msgstr "软件使用统计"
 
-#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
+#: panels/privacy/cc-privacy-panel.c:1276
+#: panels/privacy/cc-privacy-panel.ui:1169
 msgid "Problem Reporting"
 msgstr "报告问题"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1211
+#: panels/privacy/cc-privacy-panel.c:1288
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
 "anonymously and are scrubbed of personal data."
 msgstr "发送匿名的技术问题报告能帮助我们改进 %s,这些报告中不含个人数据。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
+#: panels/privacy/cc-privacy-panel.c:1300
+#: panels/privacy/cc-privacy-panel.ui:719
 msgid "Privacy Policy"
 msgstr "隐私政策"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
-msgid "Pri­va­cy"
-msgstr "隐私"
-
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
-msgid "Protect your personal information and control what others might see"
-msgstr "保护个人信息并控制他人可见的信息"
-
-#. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
-msgid ""
-"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/privacy/privacy.ui.h:1
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:14
+msgctxt "lock_screen"
 msgid "Screen Turns Off"
-msgstr "关闭屏幕"
+msgstr "屏幕关闭"
 
-#: ../panels/privacy/privacy.ui.h:2
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:18
+msgctxt "lock_screen"
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: ../panels/privacy/privacy.ui.h:9
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:22
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 分钟"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:26
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 分钟"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:30
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 分钟"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:34
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 分钟"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:38
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 分钟"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:42
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 小时"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:56
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 小时"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:60
+msgctxt "purge_files"
 msgid "1 day"
 msgstr "1 天"
 
-#: ../panels/privacy/privacy.ui.h:10
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:64
+msgctxt "purge_files"
 msgid "2 days"
 msgstr "2 天"
 
-#: ../panels/privacy/privacy.ui.h:11
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:68
+msgctxt "purge_files"
 msgid "3 days"
 msgstr "3 天"
 
-#: ../panels/privacy/privacy.ui.h:12
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:72
+msgctxt "purge_files"
 msgid "4 days"
 msgstr "4 天"
 
-#: ../panels/privacy/privacy.ui.h:13
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:76
+msgctxt "purge_files"
 msgid "5 days"
 msgstr "5 天"
 
-#: ../panels/privacy/privacy.ui.h:14
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:80
+msgctxt "purge_files"
 msgid "6 days"
 msgstr "6 天"
 
-#: ../panels/privacy/privacy.ui.h:15
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:84
+msgctxt "purge_files"
 msgid "7 days"
 msgstr "7 天"
 
-#: ../panels/privacy/privacy.ui.h:16
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:88
+msgctxt "purge_files"
 msgid "14 days"
 msgstr "14 天"
 
-#: ../panels/privacy/privacy.ui.h:17
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:92
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:106
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:110
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:114
+msgctxt "retain_history"
 msgid "30 days"
 msgstr "30 天"
 
-#: ../panels/privacy/privacy.ui.h:18
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:118
+msgctxt "retain_history"
 msgid "Forever"
 msgstr "永久"
 
-#: ../panels/privacy/privacy.ui.h:20
+#: panels/privacy/cc-privacy-panel.ui:148
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
 msgstr "记住历史能够在下次使用时方便查找。这些条目永远不会通过网络共享。"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: panels/privacy/cc-privacy-panel.ui:176
 msgid "_Recently Used"
 msgstr "最近使用(_R)"
 
-#: ../panels/privacy/privacy.ui.h:22
+#: panels/privacy/cc-privacy-panel.ui:207
 msgid "Retain _History"
 msgstr "保留历史(_H)"
 
-#: ../panels/privacy/privacy.ui.h:23
+#: panels/privacy/cc-privacy-panel.ui:247
 msgid "Cl_ear Recent History"
 msgstr "清理最近历史(_E)"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: panels/privacy/cc-privacy-panel.ui:301
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "离开时锁定屏幕可以保护隐私。"
 
-#: ../panels/privacy/privacy.ui.h:26
+#: panels/privacy/cc-privacy-panel.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "自动锁屏(_L)"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: panels/privacy/cc-privacy-panel.ui:362
 msgid "Lock screen _after blank for"
 msgstr "黑屏至锁屏的等待时间(_A)"
 
-#: ../panels/privacy/privacy.ui.h:28
-msgid "Show _Notifications"
-msgstr "显示通知(_N)"
+#: panels/privacy/cc-privacy-panel.ui:394
+msgid "Lock Screen _Notifications"
+msgstr "锁屏通知(_N)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: panels/privacy/cc-privacy-panel.ui:454
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr "自动清理回收站和临时文件,避免计算机保存不必要的敏感信息。"
 
-#: ../panels/privacy/privacy.ui.h:31
+#: panels/privacy/cc-privacy-panel.ui:483
 msgid "Automatically empty _Trash"
 msgstr "自动清空回收站(_T)"
 
-#: ../panels/privacy/privacy.ui.h:32
+#: panels/privacy/cc-privacy-panel.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "自动清理临时文件(_F)"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: panels/privacy/cc-privacy-panel.ui:546
 msgid "Purge _After"
 msgstr "清理延时(_A)"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: panels/privacy/cc-privacy-panel.ui:590
+msgid "_Empty Trash…"
+msgstr "清空回收站(_E)…"
+
+#: panels/privacy/cc-privacy-panel.ui:606
+msgid "_Purge Temporary Files…"
+msgstr "清除临时文件(_P)…"
+
+#: panels/privacy/cc-privacy-panel.ui:654
 msgid ""
 "Sending us information about which software you use helps us provide you "
 "with more accurate recommendations. It also helps us to improve our "
@@ -4892,306 +5453,316 @@ msgstr ""
 "\n"
 "信息均为匿名收集,不会与他人分享。"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: panels/privacy/cc-privacy-panel.ui:681
 msgid "_Send software usage statistics"
 msgstr "发送软件使用统计信息(_S)"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: panels/privacy/cc-privacy-panel.ui:764
+msgid ""
+"Use of the camera allows applications to capture photos and video. Disabling "
+"the camera may cause some applications to not function properly."
+msgstr ""
+"使用相机允许应用程序拍摄照片和视频。禁用相机可能会导致一些应用程序功能无法正"
+"常使用。"
+
+#: panels/privacy/cc-privacy-panel.ui:812
+msgid "_Camera"
+msgstr "相机(_C)"
+
+#: panels/privacy/cc-privacy-panel.ui:869
+msgid ""
+"Use of the microphone allows applications to capture sounds. Disabling the "
+"microphone may cause some applications to not function properly."
+msgstr ""
+"使用麦克风允许应用程序录制声音。禁用麦克风可能会导致一些应用程序功能无法正常"
+"使用。"
+
+#: panels/privacy/cc-privacy-panel.ui:917
+msgid "_Microphone"
+msgstr "麦克风(_M)"
+
+#: panels/privacy/cc-privacy-panel.ui:974
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
 msgstr ""
-"定位服务允许应用得知您的地理位置。使用 Wi-Fi 和移动宽带可以提高精确度。"
+"定位服务允许应用得知您的地理定位。使用 Wi-Fi 和移动宽带可以提高精确度。"
+
+#: panels/privacy/cc-privacy-panel.ui:988
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr ""
+"使用 Mozilla 定位服务:<a href='https://location.services.mozilla.com/";
+"privacy'>隐私策略</a>"
 
-#: ../panels/privacy/privacy.ui.h:44
+#: panels/privacy/cc-privacy-panel.ui:1038
 msgid "_Location Services"
 msgstr "定位服务(_L)"
 
-#: ../panels/privacy/privacy.ui.h:47
+#: panels/privacy/cc-privacy-panel.ui:1236
 msgid "_Automatic Problem Reporting"
 msgstr "自动报告问题(_A)"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
+msgstr "隐私"
+
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
+msgid "Protect your personal information and control what others might see"
+msgstr "保护个人信息并控制他人可见的信息"
+
+#. FIXME
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
+msgid ""
+"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/cc-format-chooser.c:114
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: panels/region/cc-format-chooser.c:116
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: ../panels/region/cc-format-chooser.c:287
+#: panels/region/cc-format-chooser.c:286
 msgid "No regions found"
 msgstr "无可用区域"
 
-#: ../panels/region/cc-input-chooser.c:182
-msgid "No input sources found"
-msgstr "无输入源"
-
-#: ../panels/region/cc-input-chooser.c:992
-msgctxt "Input Source"
-msgid "Other"
-msgstr "其他"
-
-#: ../panels/region/cc-region-panel.c:247
-#: ../panels/user-accounts/um-user-panel.c:1087
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "修改需要重启会话才能生效"
-
-#: ../panels/region/cc-region-panel.c:251
-#: ../panels/user-accounts/um-user-panel.c:1091
-msgid "Restart Now"
-msgstr "现在重启"
-
-#: ../panels/region/cc-region-panel.c:888
-msgid "No input source selected"
-msgstr "未选择输入源"
-
-#: ../panels/region/cc-region-panel.c:1779
-msgid "Login _Screen"
-msgstr "登录屏幕(_S)"
-
-#: ../panels/region/format-chooser.ui.h:1
+#: panels/region/cc-format-chooser.ui:7
 msgid "Formats"
 msgstr "格式"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: panels/region/cc-format-chooser.ui:106
 msgid "Preview"
 msgstr "预览"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: panels/region/cc-format-chooser.ui:123
 msgid "Dates"
 msgstr "日期"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: panels/region/cc-format-chooser.ui:154
 msgid "Times"
 msgstr "时间"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: panels/region/cc-format-chooser.ui:185
+msgid "Dates & Times"
+msgstr "日期与时间"
+
+#: panels/region/cc-format-chooser.ui:216
 msgid "Numbers"
 msgstr "数字"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: panels/region/cc-format-chooser.ui:233
 msgid "Measurement"
 msgstr "度量"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: panels/region/cc-format-chooser.ui:250
 msgid "Paper"
 msgstr "纸张"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Re­gion & Lan­guage"
-msgstr "区域和语言"
-
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
-msgid ""
-"Select your display language, formats, keyboard layouts and input sources"
-msgstr "选择您的显示语言、格式、键盘布局和输入源"
+#: panels/region/cc-input-chooser.c:193
+msgid "No input sources found"
+msgstr "无输入源"
 
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "Language;Layout;Keyboard;Input;语言;布局;键盘;输入;"
+#: panels/region/cc-input-chooser.c:948
+msgctxt "Input Source"
+msgid "Other"
+msgstr "其他"
 
-#: ../panels/region/input-chooser.ui.h:1
+#: panels/region/cc-input-chooser.ui:5
 msgid "Add an Input Source"
 msgstr "添加输入源"
 
-#: ../panels/region/input-chooser.ui.h:4
-msgid "Input methods can't be used on the login screen"
-msgstr "不能在登录屏幕使用输入法"
+#: panels/region/cc-input-chooser.ui:77
+msgid "Input methods can’t be used on the login screen"
+msgstr "无法在登录屏幕上使用输入法"
+
+#: panels/region/cc-region-panel.c:1505
+msgid "Login _Screen"
+msgstr "登录屏幕(_S)"
+
+#: panels/region/cc-region-panel.ui:64
+#: panels/user-accounts/cc-user-panel.ui:362
+msgid "_Language"
+msgstr "语言(_L)"
+
+#: panels/region/cc-region-panel.ui:99
+msgid "Restart the session for changes to take effect"
+msgstr "重启会话以让更改生效"
+
+#: panels/region/cc-region-panel.ui:114
+msgid "Restart…"
+msgstr "重启…"
+
+#: panels/region/cc-region-panel.ui:147
+msgid "_Formats"
+msgstr "格式(_F)"
+
+#: panels/region/cc-region-panel.ui:195
+msgid "Input Sources"
+msgstr "输入源"
+
+#: panels/region/cc-region-panel.ui:209
+msgid "Choose keyboard layouts or input methods."
+msgstr "选择键盘布局或输入法。"
+
+#: panels/region/cc-region-panel.ui:266
+msgid "No input source selected"
+msgstr "未选择输入源"
+
+#: panels/region/cc-region-panel.ui:300
+msgid "Login settings are used by all users when logging into the system"
+msgstr "登录设置将对所有于本机登录的用户共享"
 
-#: ../panels/region/input-options.ui.h:1
+#: panels/region/cc-region-panel.ui:338
 msgid "Input Source Options"
 msgstr "输入源选项"
 
-#: ../panels/region/input-options.ui.h:2
+#: panels/region/cc-region-panel.ui:353
 msgid "Use the _same source for all windows"
 msgstr "所有窗口使用相同的输入源(_S)"
 
-#: ../panels/region/input-options.ui.h:3
+#: panels/region/cc-region-panel.ui:371
 msgid "Allow _different sources for each window"
 msgstr "每个窗口使用不同的输入源(_D)"
 
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
-msgid "Keyboard Shortcuts"
-msgstr "键盘快捷键"
-
-#: ../panels/region/input-options.ui.h:5
-msgid "Switch to previous source"
-msgstr "切换至上个输入源"
+#: panels/region/cc-region-panel.ui:413
+msgid "Previous source"
+msgstr "上个源"
 
-#: ../panels/region/input-options.ui.h:6
+#: panels/region/cc-region-panel.ui:431
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Space"
 
-#: ../panels/region/input-options.ui.h:7
-msgid "Switch to next source"
-msgstr "切换至下个输入源"
+#: panels/region/cc-region-panel.ui:446
+msgid "Next source"
+msgstr "下个源"
 
-#: ../panels/region/input-options.ui.h:8
+#: panels/region/cc-region-panel.ui:464
 msgid "Super+Space"
 msgstr "Super+Space"
 
-#: ../panels/region/input-options.ui.h:9
-msgid "You can change these shortcuts in the keyboard settings"
-msgstr "可以在键盘设置中修改快捷键"
-
-#: ../panels/region/input-options.ui.h:10
-msgid "Alternative switch to next source"
-msgstr "切换至下个源第二组快捷键"
-
-#: ../panels/region/input-options.ui.h:11
+#: panels/region/cc-region-panel.ui:479
 msgid "Left+Right Alt"
 msgstr "左+右 Alt"
 
-#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
-msgid "_Language"
-msgstr "语言(_L)"
+#: panels/region/cc-region-panel.ui:495
+msgid "These keyboard shortcuts can be changed in the keyboard settings"
+msgstr "可以在键盘设置中修改这些键盘快捷键"
 
-#: ../panels/region/region.ui.h:2
-msgid "English (United Kingdom)"
-msgstr "英语(英国)"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "区域与语言"
 
-#: ../panels/region/region.ui.h:3
-msgid "_Formats"
-msgstr "格式(_F)"
+#: panels/region/gnome-region-panel.desktop.in.in:4
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr "选择您的显示语言、格式、键盘布局和输入源"
 
-#: ../panels/region/region.ui.h:4
-msgid "United Kingdom"
-msgstr "英国"
+#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/region/gnome-region-panel.desktop.in.in:19
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Language;Layout;Keyboard;Input;语言;布局;键盘;输入;"
 
-#: ../panels/region/region.ui.h:5
-msgid "Input Sources"
-msgstr "输入源"
+#: panels/search/cc-search-locations-dialog.c:604
+msgid "Select Location"
+msgstr "选择位置"
 
-#: ../panels/region/region.ui.h:7
-msgid "Add input source"
-msgstr "添加输入源"
-
-#: ../panels/region/region.ui.h:8
-msgid "Remove input source"
-msgstr "移除输入源"
-
-#: ../panels/region/region.ui.h:9
-msgid "Move input source up"
-msgstr "上移输入源"
-
-#: ../panels/region/region.ui.h:10
-msgid "Move input source down"
-msgstr "下移输入源"
-
-#: ../panels/region/region.ui.h:11
-msgid "Configure input source"
-msgstr "配置输入源"
-
-#: ../panels/region/region.ui.h:12
-msgid "Show input source keyboard layout"
-msgstr "显示输入源键盘布局"
-
-#: ../panels/region/region.ui.h:13
-msgid "Login settings are used by all users when logging into the system"
-msgstr "登录设置将对所有于本机登录的用户共享"
-
-#: ../panels/search/cc-search-locations-dialog.c:634
-msgid "Select Location"
-msgstr "选择位置"
-
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: panels/search/cc-search-locations-dialog.c:608
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../panels/search/cc-search-panel.c:177
+#: panels/search/cc-search-panel.c:175
 msgid "No applications found"
 msgstr "未找到应用"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
-msgid "Search"
-msgstr "搜索"
+#: panels/search/cc-search-panel.ui:52
+msgid "Move Up"
+msgstr "上移"
+
+#: panels/search/cc-search-panel.ui:69
+msgid "Move Down"
+msgstr "下移"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
+#: panels/search/cc-search-panel.ui:105
+msgid "Preferences"
+msgstr "首选项"
+
+#: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
-msgstr "控制在活动总览中显示哪些程序的搜索结果"
+msgstr "控制在活动概览中显示哪些程序的搜索结果"
 
-#. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
+#. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/search/gnome-search-panel.desktop.in.in:19
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;搜索;查找;寻找;索引;隐藏;隐私;结果;"
 
-#: ../panels/search/search-locations-dialog.ui.h:1
+#: panels/search/search-locations-dialog.ui:9
 msgid "Search Locations"
 msgstr "搜索位置"
 
-#: ../panels/search/search-locations-dialog.ui.h:2
+#: panels/search/search-locations-dialog.ui:43
 msgid "Places"
 msgstr "位置"
 
-#: ../panels/search/search-locations-dialog.ui.h:3
+#: panels/search/search-locations-dialog.ui:73
 msgid "Bookmarks"
 msgstr "书签"
 
-#: ../panels/search/search-locations-dialog.ui.h:4
+#: panels/search/search-locations-dialog.ui:130
 msgid "Other"
 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 "Preferences"
-msgstr "首选项"
-
 #. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
+#: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "未选择要共享的网络"
 
-#: ../panels/sharing/cc-sharing-panel.c:263
+#: panels/sharing/cc-sharing-panel.c:319
 msgctxt "service is enabled"
 msgid "On"
 msgstr "已开启"
 
-#: ../panels/sharing/cc-sharing-panel.c:265
-#: ../panels/sharing/cc-sharing-panel.c:292
+#: panels/sharing/cc-sharing-panel.c:321 panels/sharing/cc-sharing-panel.c:348
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "已关闭"
 
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: panels/sharing/cc-sharing-panel.c:351
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: panels/sharing/cc-sharing-panel.c:354
 msgctxt "service is active"
 msgid "Active"
 msgstr "活动"
 
-#: ../panels/sharing/cc-sharing-panel.c:369
+#: panels/sharing/cc-sharing-panel.c:424
 msgid "Choose a Folder"
 msgstr "选择文件夹"
 
-#: ../panels/sharing/cc-sharing-panel.c:680
+#: panels/sharing/cc-sharing-panel.c:724
 #, 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>"
+"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>"
+"文件共享允许您与当前网络中的其他人共享自己的公共文件夹,使用地址:<a href="
+"\"dav://%s\">dav://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:682
+#: panels/sharing/cc-sharing-panel.c:726
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5201,984 +5772,1450 @@ msgstr ""
 "当启用远程登录是,远程用户可以使用 SSH 命令来连接:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:684
+#: panels/sharing/cc-sharing-panel.c:728
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
 "connecting to <a href=\"vnc://%s\">vnc://%s</a>"
 msgstr ""
 "屏幕共享允许远程用户查看或控制您的屏幕通过连接到:<a href=\"vnc://%s\">vnc://"
-"%s</a> "
+"%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:796
+#: panels/sharing/cc-sharing-panel.c:832
 msgid "Copy"
 msgstr "复制"
 
-#: ../panels/sharing/cc-sharing-panel.c:1122
+#: panels/sharing/cc-sharing-panel.c:1285
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "共享"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
-msgid "Sha­ring"
-msgstr "共享"
-
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
-msgid "Control what you want to share with others"
-msgstr "控制想要与其他用户共享的内容"
-
-#. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
-msgid ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;"
-msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;共享;主机;名称;远程;桌面;媒体;音频;视频;图片;照片;电"
-"影;服务器;渲染;"
-
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "网络"
-
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
-msgid "Enable or disable remote login"
-msgstr "启用或禁用远程登录"
-
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
-msgid "Authentication is required to enable or disable remote login"
-msgstr "启用或禁用远程登录需要认证"
-
-#: ../panels/sharing/sharing.ui.h:1
+#: panels/sharing/cc-sharing-panel.ui:34
 msgid "_Computer Name"
 msgstr "计算机名(_C)"
 
-#: ../panels/sharing/sharing.ui.h:2
+#: panels/sharing/cc-sharing-panel.ui:94
 msgid "_File Sharing"
 msgstr "文件共享(_F)"
 
-#: ../panels/sharing/sharing.ui.h:3
+#: panels/sharing/cc-sharing-panel.ui:139
 msgid "_Screen Sharing"
 msgstr "屏幕共享(_S)"
 
-#: ../panels/sharing/sharing.ui.h:4
+#: panels/sharing/cc-sharing-panel.ui:184
 msgid "_Media Sharing"
 msgstr "媒体共享(_M)"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: panels/sharing/cc-sharing-panel.ui:229
 msgid "_Remote Login"
 msgstr "远程登录(_R)"
 
-#: ../panels/sharing/sharing.ui.h:6
+#: panels/sharing/cc-sharing-panel.ui:268
 msgid "Some services are disabled because of no network access."
 msgstr "因为没有网络,一些服务已经禁用。"
 
-#: ../panels/sharing/sharing.ui.h:7
+#: panels/sharing/cc-sharing-panel.ui:286
+#: panels/sharing/cc-sharing-panel.ui:413
 msgid "File Sharing"
 msgstr "文件共享"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: panels/sharing/cc-sharing-panel.ui:333
 msgid "_Require Password"
 msgstr "需要密码(_R)"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: panels/sharing/cc-sharing-panel.ui:424
+#: panels/sharing/cc-sharing-panel.ui:496
 msgid "Remote Login"
 msgstr "远程登录"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: panels/sharing/cc-sharing-panel.ui:519
+#: panels/sharing/cc-sharing-panel.ui:765
 msgid "Screen Sharing"
 msgstr "屏幕共享"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: panels/sharing/cc-sharing-panel.ui:577
 msgid "_Allow connections to control the screen"
 msgstr "允许连接控制屏幕(_A)"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: panels/sharing/cc-sharing-panel.ui:622
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: panels/sharing/cc-sharing-panel.ui:652
 msgid "_Show Password"
 msgstr "显示密码(_S)"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: panels/sharing/cc-sharing-panel.ui:683
 msgid "Access Options"
 msgstr "访问选项"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: panels/sharing/cc-sharing-panel.ui:697
 msgid "_New connections must ask for access"
 msgstr "建立新连接前必须询问访问权限(_N)"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: panels/sharing/cc-sharing-panel.ui:715
 msgid "_Require a password"
 msgstr "需要密码(_R)"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: panels/sharing/cc-sharing-panel.ui:776
+#: panels/sharing/cc-sharing-panel.ui:870
 msgid "Media Sharing"
 msgstr "媒体共享"
 
-#: ../panels/sharing/sharing.ui.h:19
+#: panels/sharing/cc-sharing-panel.ui:809
 msgid "Share music, photos and videos over the network."
 msgstr "通过网络共享音乐、照片和视频。"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: panels/sharing/cc-sharing-panel.ui:824
 msgid "Folders"
 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 levels, inputs, outputs, and alert sounds"
-msgstr "更改音频音量、音频输入输出和事件声音"
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
+msgid "Control what you want to share with others"
+msgstr "控制想要与其他用户共享的内容"
 
-#. Translators: those are keywords for the sound control-center panel
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
-msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
 msgstr ""
-"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;声卡;麦克风;话筒;音量;"
-"淡入淡出;均衡;蓝牙;耳机;耳麦;音频;"
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;共享;主机;名称;远程;桌面;介质;媒体;音频;视频;图片;照"
+"片;电影;服务器;渲染;"
 
-#. Translators: This is the name of an audio file that sounds like the bark of a dog.
-#. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
+#: panels/sharing/networks.ui:19
+msgid "Networks"
+msgstr "网络"
+
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
+msgid "Enable or disable remote login"
+msgstr "启用或禁用远程登录"
+
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
+msgid "Authentication is required to enable or disable remote login"
+msgstr "启用或禁用远程登录需要认证"
+
+#: panels/sound/cc-alert-chooser.c:151
+msgid "Custom"
+msgstr "自定义"
+
+#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9
 msgid "Bark"
 msgstr "犬吠"
 
-#. Translators: This is the name of an audio file that sounds like a water drip.
-#. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:6
+#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15
 msgid "Drip"
 msgstr "雨滴"
 
-#. Translators: This is the name of an audio file that sounds like tapping glass.
-#. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:9
+#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21
 msgid "Glass"
 msgstr "玻璃"
 
-#. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
-#. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:12
+#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27
 msgid "Sonar"
 msgstr "声纳"
 
-#: ../panels/sound/gvc-balance-bar.c:105
-msgctxt "balance"
-msgid "Left"
-msgstr "左"
-
-#: ../panels/sound/gvc-balance-bar.c:106
-msgctxt "balance"
-msgid "Right"
-msgstr "右"
-
-#: ../panels/sound/gvc-balance-bar.c:109
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:13
 msgid "Rear"
 msgstr "后"
 
-#: ../panels/sound/gvc-balance-bar.c:110
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:15
 msgid "Front"
 msgstr "前"
 
-#: ../panels/sound/gvc-balance-bar.c:113
-msgctxt "balance"
-msgid "Minimum"
-msgstr "最小"
-
-#: ../panels/sound/gvc-balance-bar.c:114
-msgctxt "balance"
-msgid "Maximum"
-msgstr "最大"
-
-#: ../panels/sound/gvc-balance-bar.c:289
-msgid "_Balance:"
-msgstr "均衡(_B):"
+# 对话框标题
+#: panels/sound/cc-output-test-dialog.c:134
+#, c-format
+msgid "Testing %s"
+msgstr "测试 %s"
 
-#: ../panels/sound/gvc-balance-bar.c:292
-msgid "_Fade:"
-msgstr "淡出淡入(_F):"
+#: panels/sound/cc-output-test-dialog.ui:127
+msgid "Click a speaker to test"
+msgstr "单击扬声器进行测试"
 
-#: ../panels/sound/gvc-balance-bar.c:295
-msgid "_Subwoofer:"
-msgstr "重低音(_S):"
+#: panels/sound/cc-sound-panel.ui:29
+msgid "System Volume"
+msgstr "系统音量"
 
-#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620
-msgctxt "volume"
-msgid "100%"
-msgstr "100%"
+#: panels/sound/cc-sound-panel.ui:45
+msgid "Volume Levels"
+msgstr "音量级别"
 
-#: ../panels/sound/gvc-channel-bar.c:615
-msgctxt "volume"
-msgid "Unamplified"
-msgstr "减弱"
+#: panels/sound/cc-sound-panel.ui:67
+msgid "Output"
+msgstr "输出"
 
-#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249
-#: ../panels/sound/gvc-mixer-dialog.c:515
-msgid "_Profile:"
-msgstr "配置(_P):"
+#: panels/sound/cc-sound-panel.ui:94
+msgid "Output Device"
+msgstr "输出设备"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u 路输出"
+#: panels/sound/cc-sound-panel.ui:117
+msgid "Test"
+msgstr "测试"
 
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u 路输入"
+#: panels/sound/cc-sound-panel.ui:148 panels/sound/cc-sound-panel.ui:325
+msgid "Configuration"
+msgstr "配置"
 
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
-msgid "System Sounds"
-msgstr "系统声音"
+#: panels/sound/cc-sound-panel.ui:181
+msgid "Balance"
+msgstr "均衡"
 
-#: ../panels/sound/gvc-mixer-dialog.c:251
-msgid "_Test Speakers"
-msgstr "测试扬声器(_T)"
+#: panels/sound/cc-sound-panel.ui:208
+msgid "Fade"
+msgstr "淡出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:420
-msgid "Peak detect"
-msgstr "峰值检测"
+#: panels/sound/cc-sound-panel.ui:235
+msgid "Subwoofer"
+msgstr "重低音"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1512
-msgid "Device"
-msgstr "设备"
+#: panels/sound/cc-sound-panel.ui:257
+msgid "Input"
+msgstr "输入"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1575
-#, c-format
-msgid "Speaker Testing for %s"
-msgstr "%s 扬声器测试"
+#: panels/sound/cc-sound-panel.ui:284
+msgid "Input Device"
+msgstr "输入设备"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1631
-msgid "_Output volume:"
-msgstr "输出音量(_O):"
+#: panels/sound/cc-sound-panel.ui:358
+msgid "Volume"
+msgstr "音量"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1645
-msgid "Output"
-msgstr "输出"
+#: panels/sound/cc-sound-panel.ui:380
+msgid "Alert Sound"
+msgstr "警报声"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1650
-msgid "C_hoose a device for sound output:"
-msgstr "选择音频输出设备(_H):"
+#: panels/sound/cc-volume-slider.c:178
+msgctxt "volume"
+msgid "100%"
+msgstr "100%"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1672
-msgid "Settings for the selected device:"
-msgstr "选中设备的设置:"
+#: panels/sound/gnome-sound-panel.desktop.in.in:3
+msgid "Sound"
+msgstr "声音"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1683
-msgid "Input"
-msgstr "输入"
+#: panels/sound/gnome-sound-panel.desktop.in.in:4
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "更改音频音量、音频输入输出和事件声音"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1690
-msgid "_Input volume:"
-msgstr "输入音量(_I):"
+#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/sound/gnome-sound-panel.desktop.in.in:20
+msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+msgstr ""
+"Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;声卡;麦克风;话筒;"
+"音量;淡入淡出;均衡;蓝牙;耳机;耳麦;音频;"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:94
+#: panels/thunderbolt/cc-bolt-device-entry.c:125
+msgctxt "Thunderbolt Device Status"
+msgid "Disconnected"
+msgstr "已断开"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:97
+#: panels/thunderbolt/cc-bolt-device-entry.c:128
+msgctxt "Thunderbolt Device Status"
+msgid "Connecting"
+msgstr "正在连接"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
-msgid "Input level:"
-msgstr "输入等级:"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:100
+#: panels/thunderbolt/cc-bolt-device-entry.c:132
+#: panels/thunderbolt/cc-bolt-device-entry.c:144
+msgctxt "Thunderbolt Device Status"
+msgid "Connected"
+msgstr "已连接"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1737
-msgid "C_hoose a device for sound input:"
-msgstr "选择音频输入设备(_H):"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:103
+msgctxt "Thunderbolt Device Status"
+msgid "Authorization Error"
+msgstr "认证错误"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:106
+#: panels/thunderbolt/cc-bolt-device-entry.c:138
+msgctxt "Thunderbolt Device Status"
+msgid "Authorizing"
+msgstr "正在认证"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:113
+msgctxt "Thunderbolt Device Status"
+msgid "Reduced Functionality"
+msgstr "功能受限"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:115
+msgctxt "Thunderbolt Device Status"
+msgid "Connected & Authorized"
+msgstr "已连接并认证"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:121
+#: panels/thunderbolt/cc-bolt-device-entry.c:152
+msgctxt "Thunderbolt Device Status"
+msgid "Unknown"
+msgstr "未知状态"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
-msgid "Sound Effects"
-msgstr "声音效果"
+#. Translators: The time point the device was authorized.
+#: panels/thunderbolt/cc-bolt-device-dialog.c:177
+msgid "Authorized at:"
+msgstr "认证于:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1768
-msgid "_Alert volume:"
-msgstr "警告音量(_A):"
+#. Translators: The time point the device was connected.
+#: panels/thunderbolt/cc-bolt-device-dialog.c:183
+msgid "Connected at:"
+msgstr "连接于:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1785
-msgid "No application is currently playing or recording audio."
-msgstr "没有正在播放或录制音频的程序。"
+#. Translators: The time point the device was enrolled,
+#. * i.e. authorized and stored in the device database.
+#: panels/thunderbolt/cc-bolt-device-dialog.c:190
+msgid "Enrolled at:"
+msgstr "登记于:"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:188
-msgid "Built-in"
-msgstr "内置"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:264
+msgid "Failed to authorize device: "
+msgstr "无法认证设备:"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:454
-#: ../panels/sound/gvc-sound-theme-chooser.c:466
-#: ../panels/sound/gvc-sound-theme-chooser.c:478
-msgid "Sound Preferences"
-msgstr "声音首选项"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:333
+msgid "Failed to forget device: "
+msgstr "无法忘记设备:"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:457
-#: ../panels/sound/gvc-sound-theme-chooser.c:468
-#: ../panels/sound/gvc-sound-theme-chooser.c:480
-msgid "Testing event sound"
-msgstr "测试事件声音"
+#: panels/thunderbolt/cc-bolt-device-dialog.c:491
+#, c-format
+msgid "Depends on %u other device"
+msgid_plural "Depends on %u other devices"
+msgstr[0] "依赖于 %u 个其它设备"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:109
+msgid "Name:"
+msgstr "名称:"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:141
+msgid "Status:"
+msgstr "状态:"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:174
+msgid "UUID:"
+msgstr "UUID:"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:324
+msgid "Authorize and Connect"
+msgstr "认证并连接"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:346
+msgid "Forget Device"
+msgstr "忘记设备"
+
+#: panels/thunderbolt/cc-bolt-device-entry.c:135
+msgctxt "Thunderbolt Device Status"
+msgid "Error"
+msgstr "错误"
+
+#: panels/thunderbolt/cc-bolt-device-entry.c:146
+msgctxt "Thunderbolt Device Status"
+msgid "Authorized"
+msgstr "已认证"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:554
-msgid "Default"
-msgstr "默认"
+#: panels/thunderbolt/cc-bolt-panel.c:176
+msgid ""
+"The Thunderbolt subsystem (boltd) is not installed or not set up properly."
+msgstr "Thunderbolt 子系统 (boltd) 未安装或配置不正确。"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:555
-msgid "From theme"
-msgstr "来自主题"
+#: panels/thunderbolt/cc-bolt-panel.c:469
+msgid ""
+"Thunderbolt could not be detected.\n"
+"Either the system lacks Thunderbolt support, it has been disabled in the "
+"BIOS or is set to an unsupported security level in the BIOS."
+msgstr ""
+"无法探测到 Thunderbolt。\n"
+"可能是该系统无 Thunderbolt 支持,或在 BIOS 中被禁用,抑或是设置成了不被支持的"
+"安全级别。"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:740
-msgid "C_hoose an alert sound:"
-msgstr "选择警告声音(_H):"
+#: panels/thunderbolt/cc-bolt-panel.c:513
+msgid "Thunderbolt support has been disabled in the BIOS."
+msgstr "Thunderbolt 支持在 BIOS 中被禁用。"
 
-#: ../panels/sound/gvc-speaker-test.c:231
-msgid "Stop"
-msgstr "停止"
+#: panels/thunderbolt/cc-bolt-panel.c:517
+msgid "Thunderbolt security level could not be determined."
+msgstr "无法确定 Thunderbolt 安全级别。"
 
-#: ../panels/sound/gvc-speaker-test.c:231
-#: ../panels/sound/gvc-speaker-test.c:343
-msgid "Test"
-msgstr "测试"
+#: panels/thunderbolt/cc-bolt-panel.c:622
+#, c-format
+msgid "Error switching direct mode: %s"
+msgstr "无法切换为直接模式:%s"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:143
+msgid "No Thunderbolt support"
+msgstr "无 Thunderbolt 支持"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:246
+msgid "Direct Access"
+msgstr "直接访问"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:269
+msgid "Allow direct access to devices such as docks and external GPUs."
+msgstr "允许直接访问底座和外置图形处理器一类的设备。"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:289
+msgid "Only USB and Display Port devices can attach."
+msgstr "只能挂接 USB 和 Display Port 设备。"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:397
+msgid "Pending Devices"
+msgstr "等待中的设备"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:535
+msgid "No devices attached"
+msgstr "未连接设备"
+
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:3
+msgid "Thunderbolt"
+msgstr "Thunderbolt"
+
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:4
+msgid "Manage Thunderbolt devices"
+msgstr "管理 Thunderbolt 设备"
+
+#. Translators: those are keywords for the thunderbolt control-center panel. Do NOT translate or localize 
the semicolons! The list MUST also end with a semicolon!
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:19
+msgid "Thunderbolt;"
+msgstr "Thunderbolt;"
+
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: panels/universal-access/cc-ua-panel.c:498
+msgctxt "cursor size"
+msgid "Default"
+msgstr "默认"
 
-#: ../panels/sound/gvc-speaker-test.c:239
-msgid "Subwoofer"
-msgstr "重低音"
+#: panels/universal-access/cc-ua-panel.c:501
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "中"
 
-#: ../panels/sound/sound-theme-file-utils.c:304
-msgid "Custom"
-msgstr "自定义"
+#: panels/universal-access/cc-ua-panel.c:504
+msgctxt "cursor size"
+msgid "Large"
+msgstr "大"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Uni­ver­sal Access"
-msgstr "通用辅助功能"
+#: panels/universal-access/cc-ua-panel.c:507
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "更大"
 
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
-msgid "Make it easier to see, hear, type, point and click"
-msgstr "辅助视觉、听觉、打字和指点操作"
+#: panels/universal-access/cc-ua-panel.c:510
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "最大"
 
-#. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
-msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
-msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;键盘;辅助功能;对比度;缩"
-"放;屏幕读取器;文本;字体;大小;粘滞键;慢速键;回弹键;鼠标;"
+#: panels/universal-access/cc-ua-panel.c:514
+#, c-format
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d 个像素"
 
-#: ../panels/universal-access/uap.ui.h:1
+#: panels/universal-access/cc-ua-panel.ui:93
 msgid "_Always Show Universal Access Menu"
-msgstr "始终显示通用辅助功能菜单(_A)"
+msgstr "始终显示通用辅助菜单(_A)"
 
-#: ../panels/universal-access/uap.ui.h:2
+#: panels/universal-access/cc-ua-panel.ui:135
 msgid "Seeing"
 msgstr "视觉"
 
-#: ../panels/universal-access/uap.ui.h:3
+#: panels/universal-access/cc-ua-panel.ui:181
 msgid "_High Contrast"
 msgstr "高对比度(_H)"
 
-#: ../panels/universal-access/uap.ui.h:4
+#: panels/universal-access/cc-ua-panel.ui:228
 msgid "_Large Text"
 msgstr "大号文本(_L)"
 
-#: ../panels/universal-access/uap.ui.h:5
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: panels/universal-access/cc-ua-panel.ui:273
+msgid "C_ursor Size"
+msgstr "光标大小(_U)"
+
+#: panels/universal-access/cc-ua-panel.ui:320
+#: panels/universal-access/zoom-options.ui:99
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../panels/universal-access/uap.ui.h:7
+#: panels/universal-access/cc-ua-panel.ui:366
 msgid "Screen _Reader"
 msgstr "屏幕朗读(_R)"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: panels/universal-access/cc-ua-panel.ui:412
+#: panels/universal-access/cc-ua-panel.ui:1243
 msgid "_Sound Keys"
 msgstr "发声键(_S)"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: panels/universal-access/cc-ua-panel.ui:474
 msgid "Hearing"
 msgstr "听觉"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: panels/universal-access/cc-ua-panel.ui:518
+#: panels/universal-access/cc-ua-panel.ui:1346
 msgid "_Visual Alerts"
-msgstr "视觉警告(_V)"
+msgstr "视觉警报(_V)"
 
-#: ../panels/universal-access/uap.ui.h:12
+#: panels/universal-access/cc-ua-panel.ui:626
 msgid "Screen _Keyboard"
 msgstr "屏幕键盘(_K)"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: panels/universal-access/cc-ua-panel.ui:671
 msgid "R_epeat Keys"
 msgstr "重复键(_E)"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: panels/universal-access/cc-ua-panel.ui:717
 msgid "Cursor _Blinking"
 msgstr "光标闪烁(_B)"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: panels/universal-access/cc-ua-panel.ui:763
 msgid "_Typing Assist (AccessX)"
 msgstr "AccessX 打字助手(_T)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: panels/universal-access/cc-ua-panel.ui:824
 msgid "Pointing & Clicking"
 msgstr "指向和点击"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: panels/universal-access/cc-ua-panel.ui:870
 msgid "_Mouse Keys"
 msgstr "鼠标键(_M)"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: panels/universal-access/cc-ua-panel.ui:915
 msgid "_Click Assist"
 msgstr "点击助手(_C)"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: panels/universal-access/cc-ua-panel.ui:961
 msgid "_Double-Click Delay"
 msgstr "双击延时(_D)"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: panels/universal-access/cc-ua-panel.ui:981
 msgid "Double-Click Delay"
 msgstr "双击延时"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: panels/universal-access/cc-ua-panel.ui:1048
+msgid "Cursor Size"
+msgstr "光标大小"
+
+#: panels/universal-access/cc-ua-panel.ui:1075
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr "可通过缩放光标大小来更清晰地看见光标。"
+
+#: panels/universal-access/cc-ua-panel.ui:1111
 msgid "Screen Reader"
 msgstr "屏幕朗读"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: panels/universal-access/cc-ua-panel.ui:1128
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "移动焦点时朗读显示的文本。"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: panels/universal-access/cc-ua-panel.ui:1161
 msgid "_Screen Reader"
 msgstr "屏幕朗读(_S)"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: panels/universal-access/cc-ua-panel.ui:1200
 msgid "Sound Keys"
 msgstr "发声键"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: panels/universal-access/cc-ua-panel.ui:1218
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "数字键盘锁定或大小写锁定开启或关闭时发出蜂鸣声。"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: panels/universal-access/cc-ua-panel.ui:1288
 msgid "Visual Alerts"
-msgstr "视觉警告"
+msgstr "视觉警报"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: panels/universal-access/cc-ua-panel.ui:1292
 msgid "_Test flash"
 msgstr "测试闪烁(_T)"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: panels/universal-access/cc-ua-panel.ui:1321
 msgid "Use a visual indication when an alert sound occurs."
-msgstr "发出警告声时使用视觉提示。"
+msgstr "发出警报声时使用视觉提示。"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: panels/universal-access/cc-ua-panel.ui:1372
 msgid "Flash the _window title"
 msgstr "闪烁窗口标题栏(_W)"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: panels/universal-access/cc-ua-panel.ui:1390
 msgid "Flash the entire _screen"
 msgstr "闪烁整个屏幕(_S)"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: panels/universal-access/cc-ua-panel.ui:1435
 msgid "Repeat Keys"
 msgstr "重复"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: panels/universal-access/cc-ua-panel.ui:1465
 msgid "Key presses repeat when key is held down."
 msgstr "按住某一键时重复该键。"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: panels/universal-access/cc-ua-panel.ui:1545
 msgid "Repeat keys delay"
 msgstr "重复键延时"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: panels/universal-access/cc-ua-panel.ui:1593
+#: panels/universal-access/cc-ua-panel.ui:1728
 msgid "Speed"
 msgstr "速度"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: panels/universal-access/cc-ua-panel.ui:1632
 msgid "Repeat keys speed"
 msgstr "重复键速度"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: panels/universal-access/cc-ua-panel.ui:1656
 msgid "Cursor Blinking"
 msgstr "光标闪烁"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: panels/universal-access/cc-ua-panel.ui:1686
 msgid "Cursor blinks in text fields."
 msgstr "文本字段中光标闪烁。"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: panels/universal-access/cc-ua-panel.ui:1765
 msgid "Cursor blinking speed"
 msgstr "光标闪烁速度"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: panels/universal-access/cc-ua-panel.ui:1801
 msgid "Typing Assist"
 msgstr "打字助手"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: panels/universal-access/cc-ua-panel.ui:1840
 msgid "_Sticky Keys"
 msgstr "粘滞键(_S)"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: panels/universal-access/cc-ua-panel.ui:1857
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "将一系列按键当作组合键"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: panels/universal-access/cc-ua-panel.ui:1881
 msgid "_Disable if two keys are pressed together"
 msgstr "同时按下两个键时禁用输入(_D)"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: panels/universal-access/cc-ua-panel.ui:1899
 msgid "Beep when a _modifier key is pressed"
 msgstr "按修饰键时蜂鸣(_M)"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: panels/universal-access/cc-ua-panel.ui:1947
 msgid "S_low Keys"
 msgstr "慢速键(_L)"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: panels/universal-access/cc-ua-panel.ui:1964
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按下按键和接受按键之间添加延迟"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: panels/universal-access/cc-ua-panel.ui:1997
+#: panels/universal-access/cc-ua-panel.ui:2210
+#: panels/universal-access/cc-ua-panel.ui:2547
 msgid "A_cceptance delay:"
 msgstr "按键接受延迟(_C):"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: panels/universal-access/cc-ua-panel.ui:2019
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: panels/universal-access/cc-ua-panel.ui:2038
 msgid "Slow keys typing delay"
 msgstr "慢速键输入延迟"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: panels/universal-access/cc-ua-panel.ui:2053
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: panels/universal-access/cc-ua-panel.ui:2080
 msgid "Beep when a key is pr_essed"
 msgstr "按键时蜂鸣(_E)"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: panels/universal-access/cc-ua-panel.ui:2097
 msgid "Beep when a key is _accepted"
 msgstr "按键被接受时蜂鸣(_A)"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: panels/universal-access/cc-ua-panel.ui:2114
+#: panels/universal-access/cc-ua-panel.ui:2293
 msgid "Beep when a key is _rejected"
 msgstr "按键被拒绝时蜂鸣(_R)"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: panels/universal-access/cc-ua-panel.ui:2160
 msgid "_Bounce Keys"
 msgstr "重复键(_B)"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: panels/universal-access/cc-ua-panel.ui:2177
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重复按键"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: panels/universal-access/cc-ua-panel.ui:2232
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: panels/universal-access/cc-ua-panel.ui:2251
 msgid "Bounce keys typing delay"
 msgstr "重复键输入延迟"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: panels/universal-access/cc-ua-panel.ui:2266
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: panels/universal-access/cc-ua-panel.ui:2379
 msgid "_Enable by Keyboard"
 msgstr "通过键盘启用(_E)"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: panels/universal-access/cc-ua-panel.ui:2396
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "通过键盘开关辅助功能特性"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: panels/universal-access/cc-ua-panel.ui:2460
 msgid "Click Assist"
 msgstr "点击助手"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: panels/universal-access/cc-ua-panel.ui:2496
 msgid "_Simulated Secondary Click"
-msgstr "模拟右键点击(_S)"
+msgstr "模拟副键点击(_S)"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: panels/universal-access/cc-ua-panel.ui:2514
 msgid "Trigger a secondary click by holding down the primary button"
-msgstr "按住鼠标主键不放时触发右键点击"
+msgstr "按住鼠标主键不放时触发副键点击"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: panels/universal-access/cc-ua-panel.ui:2568
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: panels/universal-access/cc-ua-panel.ui:2587
 msgid "Secondary click delay"
-msgstr "右键点击延迟"
+msgstr "副键点击延迟"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: panels/universal-access/cc-ua-panel.ui:2602
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: panels/universal-access/cc-ua-panel.ui:2659
 msgid "_Hover Click"
 msgstr "悬停点击(_H)"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: panels/universal-access/cc-ua-panel.ui:2677
 msgid "Trigger a click when the pointer hovers"
-msgstr "指针悬停时触发点击。"
+msgstr "指针悬停时触发点击"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: panels/universal-access/cc-ua-panel.ui:2710
 msgid "D_elay:"
 msgstr "延迟(_E):"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: panels/universal-access/cc-ua-panel.ui:2732
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: panels/universal-access/cc-ua-panel.ui:2763
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: panels/universal-access/cc-ua-panel.ui:2799
 msgid "Motion _threshold:"
 msgstr "运动阈值(_T):"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: panels/universal-access/cc-ua-panel.ui:2821
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: panels/universal-access/cc-ua-panel.ui:2852
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/zoom-options.c:333
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "辅助视觉、听觉、打字和指点操作"
+
+#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
+msgid ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
+msgstr ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;键盘;鼠标;"
+"无障碍;辅助功能;可访问;对比度;光标;声音;缩放;屏幕;读取器;阅读器;大;高;巨大;文"
+"本;文字;字体;大小;粘滞;按键;慢;回弹;鼠标;双击;点击;单击;延迟;速度;助手;重复;"
+"闪烁;可视化;视觉;听觉;音频;输入;打字;"
+
+#: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "Short"
 msgstr "短"
 
-#: ../panels/universal-access/zoom-options.c:334
+#: panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ 屏幕"
 
-#: ../panels/universal-access/zoom-options.c:335
+#: panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ 屏幕"
 
-#: ../panels/universal-access/zoom-options.c:336
+#: panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ 屏幕"
 
-#: ../panels/universal-access/zoom-options.c:337
+#: panels/universal-access/zoom-options.c:338
 msgctxt "Distance"
 msgid "Long"
 msgstr "长"
 
-#: ../panels/universal-access/zoom-options.ui.h:1
+#: panels/universal-access/zoom-options.ui:48
 msgid "Full Screen"
 msgstr "全屏"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: panels/universal-access/zoom-options.ui:53
 msgid "Top Half"
 msgstr "上半部分"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: panels/universal-access/zoom-options.ui:58
 msgid "Bottom Half"
 msgstr "下半部分"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: panels/universal-access/zoom-options.ui:63
 msgid "Left Half"
 msgstr "左半部分"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: panels/universal-access/zoom-options.ui:68
 msgid "Right Half"
 msgstr "右半部分"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: panels/universal-access/zoom-options.ui:78
 msgid "Zoom Options"
 msgstr "缩放选项"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: panels/universal-access/zoom-options.ui:185
 msgid "_Magnification:"
 msgstr "放大比率(_M):"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: panels/universal-access/zoom-options.ui:249
 msgid "_Follow mouse cursor"
 msgstr "跟随鼠标光标(_F)"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: panels/universal-access/zoom-options.ui:269
 msgid "_Screen part:"
 msgstr "屏幕区域(_S):"
 
-#: ../panels/universal-access/zoom-options.ui.h:11
+#: panels/universal-access/zoom-options.ui:331
 msgid "Magnifier _extends outside of screen"
 msgstr "放大镜可延伸至屏幕外(_E)"
 
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: panels/universal-access/zoom-options.ui:350
 msgid "_Keep magnifier cursor centered"
 msgstr "保持放大镜光标居中(_K)"
 
-#: ../panels/universal-access/zoom-options.ui.h:13
+#: panels/universal-access/zoom-options.ui:369
 msgid "Magnifier cursor _pushes contents around"
 msgstr "放大镜光标推动内容(_P)"
 
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: panels/universal-access/zoom-options.ui:388
 msgid "Magnifier cursor moves with _contents"
 msgstr "放大镜光标与内容同步移动(_C)"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: panels/universal-access/zoom-options.ui:422
 msgid "Magnifier Position:"
 msgstr "放大镜位置:"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: panels/universal-access/zoom-options.ui:443
 msgid "Magnifier"
 msgstr "放大镜"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: panels/universal-access/zoom-options.ui:490
 msgid "_Thickness:"
 msgstr "粗细(_T):"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: panels/universal-access/zoom-options.ui:516
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "细"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: panels/universal-access/zoom-options.ui:548
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "粗"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
+#: panels/universal-access/zoom-options.ui:574
 msgid "_Length:"
 msgstr "长度(_L):"
 
 #. The color of the accessibility crosshair
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: panels/universal-access/zoom-options.ui:623
 msgid "Co_lor:"
 msgstr "颜色(_L):"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: panels/universal-access/zoom-options.ui:687
 msgid "_Crosshairs:"
 msgstr "十字光标(_C):"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: panels/universal-access/zoom-options.ui:735
 msgid "_Overlaps mouse cursor"
 msgstr "光标与鼠标指针重叠(——O)"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: panels/universal-access/zoom-options.ui:773
 msgid "Crosshairs"
 msgstr "十字光标"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: panels/universal-access/zoom-options.ui:822
 msgid "_White on black:"
 msgstr "白底黑字(_W):"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: panels/universal-access/zoom-options.ui:842
 msgid "_Brightness:"
 msgstr "亮度(_B):"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: panels/universal-access/zoom-options.ui:863
 msgid "_Contrast:"
 msgstr "对比度(_C):"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: ../panels/universal-access/zoom-options.ui.h:30
+#: panels/universal-access/zoom-options.ui:883
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "色彩(_L)"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
+#: panels/universal-access/zoom-options.ui:908
 msgctxt "universal access, color"
 msgid "None"
 msgstr "无"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
+#: panels/universal-access/zoom-options.ui:940
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "完全"
 
-#: ../panels/universal-access/zoom-options.ui.h:33
+#: panels/universal-access/zoom-options.ui:1003
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: panels/universal-access/zoom-options.ui:1036
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "高"
 
-#: ../panels/universal-access/zoom-options.ui.h:35
+#: panels/universal-access/zoom-options.ui:1067
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: panels/universal-access/zoom-options.ui:1100
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高"
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: panels/universal-access/zoom-options.ui:1136
 msgid "Color Effects:"
 msgstr "色彩效果:"
 
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: panels/universal-access/zoom-options.ui:1161
 msgid "Color Effects"
 msgstr "色彩效果"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/join-dialog.ui.h:1
+#: panels/user-accounts/cc-add-user-dialog.c:34
+msgid "Should match the web address of your login provider."
+msgstr "应与您登录提供商的网络地址相同。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:204
+msgid "Failed to add account"
+msgstr "添加帐号失败"
+
+#: panels/user-accounts/cc-add-user-dialog.c:652
+#: panels/user-accounts/cc-password-dialog.c:261
+msgid "The passwords do not match."
+msgstr "密码不匹配。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:874
+#: panels/user-accounts/cc-add-user-dialog.c:920
+#: panels/user-accounts/cc-add-user-dialog.c:941
+msgid "Failed to register account"
+msgstr "注册用户失败"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1064
+msgid "No supported way to authenticate with this domain"
+msgstr "没有支持该域的验证方法"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1137
+msgid "Failed to join domain"
+msgstr "加入域失败"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1198
+msgid ""
+"That login name didn’t work.\n"
+"Please try again."
+msgstr ""
+"登录名不正确。\n"
+"请重试。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1205
+msgid ""
+"That login password didn’t work.\n"
+"Please try again."
+msgstr ""
+"登录密码不正确。\n"
+"请重试。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1213
+msgid "Failed to log into domain"
+msgstr "登录到域失败"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1271
+msgid "Unable to find the domain. Maybe you misspelled it?"
+msgstr "找不到该域名,也许拼写有误?"
+
+#: panels/user-accounts/cc-add-user-dialog.ui:18
+#: panels/user-accounts/data/join-dialog.ui:11
 msgid "Add User"
 msgstr "添加用户"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: panels/user-accounts/cc-add-user-dialog.ui:180
 msgid "_Full Name"
 msgstr "全名(_F)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#: panels/user-accounts/cc-add-user-dialog.ui:206
+#: panels/user-accounts/cc-user-panel.ui:151
 msgid "Standard"
 msgstr "标准"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#: panels/user-accounts/cc-add-user-dialog.ui:216
+#: panels/user-accounts/cc-user-panel.ui:161
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: panels/user-accounts/cc-add-user-dialog.ui:232
+#: panels/user-accounts/cc-user-panel.ui:179
 msgid "Account _Type"
 msgstr "帐号类型(_T)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
+#: panels/user-accounts/cc-add-user-dialog.ui:269
 msgid "Allow user to set a password when they next _login"
 msgstr "允许用户下次登录时更改密码(_L)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: panels/user-accounts/cc-add-user-dialog.ui:283
 msgid "Set a password _now"
 msgstr "现在设置密码(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#: panels/user-accounts/cc-add-user-dialog.ui:405
 msgid "_Confirm"
 msgstr "确认(_C)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#: panels/user-accounts/cc-add-user-dialog.ui:485
+#: panels/user-accounts/cc-add-user-dialog.ui:692
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
 "resources on the internet."
 msgstr ""
-"企业登录允许在本设备上使用已有的、集中管理的用户帐号。您也可以使用此账号访问"
+"企业登录允许在本设备上使用已有的、集中管理的用户帐号。您也可以使用此帐号访问"
 "公司在互联网上的资源。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-#: ../panels/user-accounts/data/join-dialog.ui.h:9
+#: panels/user-accounts/cc-add-user-dialog.ui:507
+#: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "域(_D)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: panels/user-accounts/cc-add-user-dialog.ui:732
 msgid "You are Offline"
 msgstr "您已离线"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: panels/user-accounts/cc-add-user-dialog.ui:751
 msgid "You must be online in order to add enterprise users."
-msgstr "您必须在线以添加企业登录帐号。"
+msgstr "您必须在线以添加企业用户。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: panels/user-accounts/cc-add-user-dialog.ui:782
 msgid "_Enterprise Login"
 msgstr "企业登录(_E)"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
-msgid "Left thumb"
-msgstr "左手拇指"
+#: panels/user-accounts/cc-avatar-chooser.c:231
+msgid "Browse for more pictures"
+msgstr "浏览更多图片"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:2
-msgid "Left middle finger"
-msgstr "左手中指"
+#: panels/user-accounts/cc-avatar-chooser.ui:27
+msgid "Take a Picture…"
+msgstr "拍张照片…"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:3
-msgid "Left ring finger"
-msgstr "左手无名指"
+#: panels/user-accounts/cc-avatar-chooser.ui:34
+msgid "Select a File…"
+msgstr "选择文件…"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:4
-msgid "Left little finger"
-msgstr "左手小指"
+#: panels/user-accounts/cc-login-history-dialog.c:69
+msgid "This Week"
+msgstr "本周"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:5
-msgid "Right thumb"
-msgstr "右手拇指"
+#: panels/user-accounts/cc-login-history-dialog.c:72
+msgid "Last Week"
+msgstr "上周"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:6
-msgid "Right middle finger"
-msgstr "右手中指"
+#. Translators: This is a date format string in the style of "Feb 18",
+#. shown as the first day of a week on login history dialog.
+#. Translators: This is a date format string in the style of "Feb 24",
+#. shown as the last day of a week on login history dialog.
+#: panels/user-accounts/cc-login-history-dialog.c:82
+#: panels/user-accounts/cc-login-history-dialog.c:86
+msgctxt "login history week label"
+msgid "%b %e"
+msgstr "%b %e"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:7
-msgid "Right ring finger"
-msgstr "右手无名指"
+#. Translators: This is a date format string in the style of "Feb 24, 2013",
+#. shown as the last day of a week on login history dialog.
+#: panels/user-accounts/cc-login-history-dialog.c:91
+msgctxt "login history week label"
+msgid "%b %e, %Y"
+msgstr "%Y %b %e"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:8
-msgid "Right little finger"
-msgstr "右手小指"
+#. Translators: This indicates a week label on a login history.
+#. The first %s is the first day of a week, and the second %s the last day.
+#: panels/user-accounts/cc-login-history-dialog.c:96
+#, c-format
+msgctxt "login history week label"
+msgid "%s — %s"
+msgstr "%s — %s"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:687
-msgid "Enable Fingerprint Login"
-msgstr "启用指纹登录"
+#. Translators: This is a time format string in the style of "22:58".
+#. It indicates a login time which follows a date.
+#: panels/user-accounts/cc-login-history-dialog.c:173
+#: panels/user-accounts/cc-user-panel.c:770
+msgctxt "login date-time"
+msgid "%k:%M"
+msgstr "%k:%M"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:10
-msgid "_Right index finger"
-msgstr "右手食指(_R)"
+#. Translators: This indicates a login date-time.
+#. The first %s is a date, and the second %s a time.
+#: panels/user-accounts/cc-login-history-dialog.c:176
+#: panels/user-accounts/cc-user-panel.c:774
+#, c-format
+msgctxt "login date-time"
+msgid "%s, %s"
+msgstr "%s,%s"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:11
-msgid "_Left index finger"
-msgstr "左手食指(_L)"
+#: panels/user-accounts/cc-login-history-dialog.c:243
+msgid "Session Ended"
+msgstr "会话结束"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:12
+#: panels/user-accounts/cc-login-history-dialog.c:249
+msgid "Session Started"
+msgstr "会话开始"
+
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: panels/user-accounts/cc-login-history-dialog.c:343
+#, c-format
+msgid "%s — Account Activity"
+msgstr "%s — 帐号活动"
+
+#: panels/user-accounts/cc-password-dialog.c:125
+msgid "Please choose another password."
+msgstr "请选择另一个密码。"
+
+#: panels/user-accounts/cc-password-dialog.c:134
+msgid "Please type your current password again."
+msgstr "请再次输入当前密码。"
+
+#: panels/user-accounts/cc-password-dialog.c:140
+msgid "Password could not be changed"
+msgstr "无法更改密码"
+
+#: panels/user-accounts/cc-password-dialog.ui:7
+msgid "Change Password"
+msgstr "更改密码"
+
+#: panels/user-accounts/cc-password-dialog.ui:37
+msgid "Ch_ange"
+msgstr "更改(_A)"
+
+#: panels/user-accounts/cc-password-dialog.ui:145
+msgid "_Confirm New Password"
+msgstr "确认新密码(_C)"
+
+#: panels/user-accounts/cc-password-dialog.ui:162
+msgid "_New Password"
+msgstr "新密码(_N)"
+
+#: panels/user-accounts/cc-password-dialog.ui:216
+msgid "Current _Password"
+msgstr "当前密码(_P)"
+
+#: panels/user-accounts/cc-password-dialog.ui:254
+msgid "Allow user to change their password on next login"
+msgstr "允许用户下次登录时更改密码"
+
+#: panels/user-accounts/cc-password-dialog.ui:267
+msgid "Set a password now"
+msgstr "现在设置密码"
+
+#: panels/user-accounts/cc-realm-manager.c:307
+msgid "Cannot automatically join this type of domain"
+msgstr "无法自动加入此类域"
+
+#: panels/user-accounts/cc-realm-manager.c:310
+msgid "No such domain or realm found"
+msgstr "无此域或 Realm"
+
+#: panels/user-accounts/cc-realm-manager.c:732
+#: panels/user-accounts/cc-realm-manager.c:746
+#, c-format
+msgid "Cannot log in as %s at the %s domain"
+msgstr "无法以 %s 的身份登录域 %s"
+
+#: panels/user-accounts/cc-realm-manager.c:738
+msgid "Invalid password, please try again"
+msgstr "无效密码,请重试"
+
+#: panels/user-accounts/cc-realm-manager.c:751
+#, c-format
+msgid "Couldn’t connect to the %s domain: %s"
+msgstr "无法连接到 %s 域:%s"
+
+#: panels/user-accounts/cc-user-panel.c:213
+msgid "Your account"
+msgstr "您的帐号"
+
+#: panels/user-accounts/cc-user-panel.c:388
+msgid "Failed to delete user"
+msgstr "删除用户失败"
+
+#: panels/user-accounts/cc-user-panel.c:446
+#: panels/user-accounts/cc-user-panel.c:505
+#: panels/user-accounts/cc-user-panel.c:557
+msgid "Failed to revoke remotely managed user"
+msgstr "吊销远程管理的用户失败"
+
+#: panels/user-accounts/cc-user-panel.c:609
+msgid "You cannot delete your own account."
+msgstr "不能删除自己的帐号。"
+
+#: panels/user-accounts/cc-user-panel.c:618
+#, c-format
+msgid "%s is still logged in"
+msgstr "%s 已经登录"
+
+#: panels/user-accounts/cc-user-panel.c:622
+msgid ""
+"Deleting a user while they are logged in can leave the system in an "
+"inconsistent state."
+msgstr "删除已登录帐号可能导致系统不一致。"
+
+#: panels/user-accounts/cc-user-panel.c:631
+#, c-format
+msgid "Do you want to keep %s’s files?"
+msgstr "要保留 %s 的文件吗?"
+
+#: panels/user-accounts/cc-user-panel.c:635
+msgid ""
+"It is possible to keep the home directory, mail spool and temporary files "
+"around when deleting a user account."
+msgstr "删除用户时可以保留其主目录、电子邮件目录和临时文件。"
+
+#: panels/user-accounts/cc-user-panel.c:638
+msgid "_Delete Files"
+msgstr "删除文件(_D)"
+
+#: panels/user-accounts/cc-user-panel.c:639
+msgid "_Keep Files"
+msgstr "保留文件(_K)"
+
+#: panels/user-accounts/cc-user-panel.c:653
+#, c-format
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
+msgstr "您确定要吊销远程管理的帐号 %s 吗?"
+
+#: panels/user-accounts/cc-user-panel.c:657
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: panels/user-accounts/cc-user-panel.c:707
+msgctxt "Password mode"
+msgid "Account disabled"
+msgstr "帐号已禁用"
+
+#: panels/user-accounts/cc-user-panel.c:715
+msgctxt "Password mode"
+msgid "To be set at next login"
+msgstr "下次登录时设置"
+
+#: panels/user-accounts/cc-user-panel.c:718
+msgctxt "Password mode"
+msgid "None"
+msgstr "无"
+
+#: panels/user-accounts/cc-user-panel.c:763
+msgid "Logged in"
+msgstr "已登录"
+
+#: panels/user-accounts/cc-user-panel.c:1093
+msgid "Failed to contact the accounts service"
+msgstr "联系帐号服务失败"
+
+#: panels/user-accounts/cc-user-panel.c:1095
+msgid "Please make sure that the AccountService is installed and enabled."
+msgstr "请确定帐号服务已正确安装并启用。"
+
+#. Translator comments:
+#. * We split the line in 2 here to "make it look good", as there's
+#. * no good way to do this in GTK+ for tooltips. See:
+#. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
+#: panels/user-accounts/cc-user-panel.c:1127
+msgid ""
+"To make changes,\n"
+"click the * icon first"
+msgstr ""
+"要进行更改,\n"
+"请先点击 * 图标"
+
+#: panels/user-accounts/cc-user-panel.c:1200
+msgid "Create a user account"
+msgstr "创建用户帐号"
+
+#: panels/user-accounts/cc-user-panel.c:1211
+#: panels/user-accounts/cc-user-panel.c:1339
+msgid ""
+"To create a user account,\n"
+"click the * icon first"
+msgstr ""
+"要创建用户帐号,\n"
+"请先点击 * 图标"
+
+#: panels/user-accounts/cc-user-panel.c:1220
+msgid "Delete the selected user account"
+msgstr "删除选中的用户帐号"
+
+#: panels/user-accounts/cc-user-panel.c:1232
+#: panels/user-accounts/cc-user-panel.c:1343
+msgid ""
+"To delete the selected user account,\n"
+"click the * icon first"
+msgstr ""
+"要删除选中的用户帐号,\n"
+"请先点击 * 图标"
+
+#: panels/user-accounts/cc-user-panel.ui:18
+msgid "_Add User…"
+msgstr "添加用户(_A)…"
+
+#: panels/user-accounts/cc-user-panel.ui:70
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "修改需要重启会话才能生效"
+
+#: panels/user-accounts/cc-user-panel.ui:78
+msgid "Restart Now"
+msgstr "现在重启"
+
+#: panels/user-accounts/cc-user-panel.ui:254
+msgid "A_utomatic Login"
+msgstr "自动登录(_U)"
+
+#: panels/user-accounts/cc-user-panel.ui:296
+msgid "_Fingerprint Login"
+msgstr "指纹登录(_F)"
+
+#: panels/user-accounts/cc-user-panel.ui:322
+#: panels/user-accounts/cc-user-panel.ui:338
+msgid "User Icon"
+msgstr "用户图标"
+
+#: panels/user-accounts/cc-user-panel.ui:402
+msgid "Last Login"
+msgstr "最近登录"
+
+#: panels/user-accounts/cc-user-panel.ui:451
+msgid "Remove User…"
+msgstr "移除用户…"
+
+#. Translators: This is the empty state page label which states that there are no users to show in the panel.
+#: panels/user-accounts/cc-user-panel.ui:484
+msgid "No Users Found"
+msgstr "未找到用户"
+
+#: panels/user-accounts/cc-user-panel.ui:494
+msgid "Unlock to add a user account."
+msgstr "解锁以添加用户帐号。"
+
+#: panels/user-accounts/data/account-fingerprint.ui:12
+msgid "Left thumb"
+msgstr "左手拇指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:15
+msgid "Left middle finger"
+msgstr "左手中指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:18
+msgid "Left ring finger"
+msgstr "左手无名指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:21
+msgid "Left little finger"
+msgstr "左手小指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:24
+msgid "Right thumb"
+msgstr "右手拇指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:27
+msgid "Right middle finger"
+msgstr "右手中指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:30
+msgid "Right ring finger"
+msgstr "右手无名指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:33
+msgid "Right little finger"
+msgstr "右手小指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:39
+#: panels/user-accounts/um-fingerprint-dialog.c:677
+msgid "Enable Fingerprint Login"
+msgstr "启用指纹登录"
+
+#: panels/user-accounts/data/account-fingerprint.ui:89
+msgid "_Right index finger"
+msgstr "右手食指(_R)"
+
+#: panels/user-accounts/data/account-fingerprint.ui:105
+msgid "_Left index finger"
+msgstr "左手食指(_L)"
+
+#: panels/user-accounts/data/account-fingerprint.ui:126
 msgid "_Other finger:"
 msgstr "其他手指(_O):"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:13
+#: panels/user-accounts/data/account-fingerprint.ui:262
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
 msgstr "您的指纹已成功保存,从现在起可以使用指纹登录。"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "用户"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
 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
+#. Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:20
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr ""
 "Login;Name;Fingerprint;Avatar;Logo;Face;Password;登录;名称;指纹;头像;标志;密"
 "码;"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/join-dialog.ui.h:4
+#: panels/user-accounts/data/join-dialog.ui:39
 msgid "_Enroll"
 msgstr "登记(_E)"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:5
+#: panels/user-accounts/data/join-dialog.ui:75
 msgid "Domain Administrator Login"
 msgstr "域管理员登录"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:6
+#: panels/user-accounts/data/join-dialog.ui:93
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
@@ -6187,361 +7224,251 @@ msgstr ""
 "要使用企业登录,需要在域中注册该计算机。\n"
 "请要求网络管理员在此输入域密码。"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:10
+#: panels/user-accounts/data/join-dialog.ui:150
 msgid "Administrator _Name"
 msgstr "管理员名称(_N)"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:11
+#: panels/user-accounts/data/join-dialog.ui:185
 msgid "Administrator Password"
 msgstr "管理员密码"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:1
-msgid "Change Password"
-msgstr "更改密码"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
-msgid "Ch_ange"
-msgstr "更改(_A)"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
-msgid "_Verify New Password"
-msgstr "确认新密码(_V)"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
-msgid "_New Password"
-msgstr "新密码(_N)"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "Current _Password"
-msgstr "当前密码(_P)"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "Allow user to change their password on next login"
-msgstr "允许用户下次登录时更改密码"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
-msgid "Set a password now"
-msgstr "现在设置密码"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-msgid "_Add User…"
-msgstr "添加用户(_A)…"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "A_utomatic Login"
-msgstr "自动登录(_U)"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
-msgid "_Fingerprint Login"
-msgstr "指纹登录(_F)"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "User Icon"
-msgstr "用户图标"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-msgid "Last Login"
-msgstr "最近登录"
-
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
 msgid "Manage user accounts"
 msgstr "管理用户帐号"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
 msgid "Authentication is required to change user data"
 msgstr "改变用户数据需要认证"
 
-#: ../panels/user-accounts/pw-utils.c:81
+#: panels/user-accounts/pw-utils.c:94
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr "新密码不能和旧密码相同。"
 
-#: ../panels/user-accounts/pw-utils.c:83
+#: panels/user-accounts/pw-utils.c:96
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "请改动一些字母和数字。"
 
-#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
+#: panels/user-accounts/pw-utils.c:98 panels/user-accounts/pw-utils.c:106
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "请进一步修改密码。"
 
-#: ../panels/user-accounts/pw-utils.c:87
+#: panels/user-accounts/pw-utils.c:100
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "不包含用户名的密码更安全。"
 
-#: ../panels/user-accounts/pw-utils.c:89
+#: panels/user-accounts/pw-utils.c:102
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "请勿在密码中使用您的名字。"
 
-#: ../panels/user-accounts/pw-utils.c:91
+#: panels/user-accounts/pw-utils.c:104
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "请勿在密码中使用单词。"
 
-#: ../panels/user-accounts/pw-utils.c:95
+#: panels/user-accounts/pw-utils.c:108
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "请勿使用常用单词。"
 
-#: ../panels/user-accounts/pw-utils.c:97
+#: panels/user-accounts/pw-utils.c:110
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "请勿仅变更现有单词顺序。"
 
-#: ../panels/user-accounts/pw-utils.c:99
+#: panels/user-accounts/pw-utils.c:112
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "请使用更多数字。"
 
-#: ../panels/user-accounts/pw-utils.c:101
+#: panels/user-accounts/pw-utils.c:114
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "请使用更多大写字母。"
 
-#: ../panels/user-accounts/pw-utils.c:103
+#: panels/user-accounts/pw-utils.c:116
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "请使用更多小写字母。"
 
-#: ../panels/user-accounts/pw-utils.c:105
+#: panels/user-accounts/pw-utils.c:118
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "请使用更多特殊字符,如标点符号。"
 
-#: ../panels/user-accounts/pw-utils.c:107
+#: panels/user-accounts/pw-utils.c:120
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "请混用字母、数字和标点符号。"
 
-#: ../panels/user-accounts/pw-utils.c:109
+#: panels/user-accounts/pw-utils.c:122
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "请避免重复相同的字符。"
 
-#: ../panels/user-accounts/pw-utils.c:111
+#: panels/user-accounts/pw-utils.c:124
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
 msgstr "请避免重复相同类型的字符:你需要混合字母、数字和标点符号。"
 
-#: ../panels/user-accounts/pw-utils.c:113
+#: panels/user-accounts/pw-utils.c:126
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "请避免使用如 1234 或 abcd 的有规律序列。"
 
-#: ../panels/user-accounts/pw-utils.c:115
+#: panels/user-accounts/pw-utils.c:128
 msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "请使用更多字母、数字和符号。"
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr "需要更长的密码。请试着加入更多的字母、数字和标点符号。"
 
-#: ../panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:130
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "密码需要大小写字母混用并试着使用一到两个数字。"
 
-#: ../panels/user-accounts/pw-utils.c:119
+#: panels/user-accounts/pw-utils.c:132
 msgctxt "Password hint"
 msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
-msgstr "密码不错!增加更多字母、数字和标点可进一步提高密码强度。"
-
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "强度:较弱"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "强度:较低"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "强度:中等"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "强度:良好"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "强度:较高"
-
-#: ../panels/user-accounts/run-passwd.c:422
+"Adding more letters, numbers and punctuation will make the password stronger."
+msgstr "增加更多字母、数字和标点可进一步提高密码强度。"
+
+#: panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: ../panels/user-accounts/run-passwd.c:502
+#: panels/user-accounts/run-passwd.c:502
 #, c-format
 msgid "The new password is too short"
 msgstr "新密码太短"
 
-#: ../panels/user-accounts/run-passwd.c:508
+#: panels/user-accounts/run-passwd.c:508
 #, c-format
 msgid "The new password is too simple"
 msgstr "新密码太简单"
 
-#: ../panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:514
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "新密码和旧密码太相似"
 
-#: ../panels/user-accounts/run-passwd.c:517
+#: panels/user-accounts/run-passwd.c:517
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "新的密码最近已使用过。"
 
-#: ../panels/user-accounts/run-passwd.c:520
+#: panels/user-accounts/run-passwd.c:520
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "新密码必须包含数字或特殊字符"
 
-#: ../panels/user-accounts/run-passwd.c:524
+#: panels/user-accounts/run-passwd.c:524
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "新旧密码相同"
 
-#: ../panels/user-accounts/run-passwd.c:528
+#: panels/user-accounts/run-passwd.c:528
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "密码在您首次认证后已经更改!"
 
-#: ../panels/user-accounts/run-passwd.c:532
+#: panels/user-accounts/run-passwd.c:532
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "新密码必须一定量不同的字符"
 
-#: ../panels/user-accounts/run-passwd.c:536
+#: panels/user-accounts/run-passwd.c:536
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your login provider."
-msgstr "应与您登录提供商的网络地址相同。"
-
-#: ../panels/user-accounts/um-account-dialog.c:228
-msgid "Failed to add account"
-msgstr "添加帐号失败"
+#: panels/user-accounts/user-utils.c:430
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr "抱歉,该用户名不可用。请试下别的。"
 
-#: ../panels/user-accounts/um-account-dialog.c:448
-msgid "Passwords do not match."
-msgstr "密码不匹配。"
+#: panels/user-accounts/user-utils.c:433
+#, c-format
+msgid "The username is too long."
+msgstr "用户名太长。"
 
-#: ../panels/user-accounts/um-account-dialog.c:702
-#: ../panels/user-accounts/um-account-dialog.c:748
-#: ../panels/user-accounts/um-account-dialog.c:769
-msgid "Failed to register account"
-msgstr "注册用户失败"
+#: panels/user-accounts/user-utils.c:436
+msgid "The username cannot start with a “-”."
+msgstr "用户名不能以“-”开头。"
 
-#: ../panels/user-accounts/um-account-dialog.c:892
-msgid "No supported way to authenticate with this domain"
-msgstr "没有支持该域的验证方法"
+#: panels/user-accounts/user-utils.c:439
+msgid ""
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
+msgstr "用户名只能包含大小写英文字母(a 至 z)、数字和“.”“-”“_”符号"
 
-#: ../panels/user-accounts/um-account-dialog.c:965
-msgid "Failed to join domain"
-msgstr "加入域失败"
+#: panels/user-accounts/user-utils.c:443
+msgid "This will be used to name your home folder and can’t be changed."
+msgstr "将作为您主文件夹的名称且不可再次更改。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1026
+#: panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
-"That login name didn't work.\n"
-"Please try again."
-msgstr "登录名不正确,请重试。"
+"You are not allowed to access the device. Contact your system administrator."
+msgstr "您未被允许访问该设备。请联系系统管理员。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1033
-msgid ""
-"That login password didn't work.\n"
-"Please try again."
-msgstr "登录密码不正确,请重试。"
-
-#: ../panels/user-accounts/um-account-dialog.c:1041
-msgid "Failed to log into domain"
-msgstr "登录到域失败"
-
-#: ../panels/user-accounts/um-account-dialog.c:1099
-msgid "Unable find the domain. Maybe you misspelled it?"
-msgstr "找不到该域名,也许拼写有误?"
-
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "标准"
-
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "管理员"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:138
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
-msgstr "您未被允许访问该设备。请联系系统管理员。"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:140
+#: panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "The device is already in use."
 msgstr "设备正被占用。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: panels/user-accounts/um-fingerprint-dialog.c:143
 msgid "An internal error occurred."
 msgstr "发生了一个内部错误。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: panels/user-accounts/um-fingerprint-dialog.c:260
 msgid "Delete registered fingerprints?"
-msgstr "要删除已记录的指纹吗?"
+msgstr "要删除已登记的指纹吗?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:268
+#: panels/user-accounts/um-fingerprint-dialog.c:264
 msgid "_Delete Fingerprints"
 msgstr "删除指纹(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:274
+#: panels/user-accounts/um-fingerprint-dialog.c:270
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "确定要删除已登记的指纹吗?这将禁用指纹登录。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:444
+#: panels/user-accounts/um-fingerprint-dialog.c:440
 msgid "Done!"
 msgstr "完成!"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:505
-#: ../panels/user-accounts/um-fingerprint-dialog.c:547
+#: panels/user-accounts/um-fingerprint-dialog.c:501
+#: panels/user-accounts/um-fingerprint-dialog.c:543
 #, c-format
-msgid "Could not access '%s' device"
+msgid "Could not access “%s” device"
 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:588
+#: panels/user-accounts/um-fingerprint-dialog.c:584
 #, c-format
-msgid "Could not start finger capture on '%s' device"
+msgid "Could not start finger capture on “%s” device"
 msgstr "无法在设备“%s”上启动指纹采集"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: panels/user-accounts/um-fingerprint-dialog.c:628
 msgid "Could not access any fingerprint readers"
 msgstr "无法访问指纹读取器"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:639
+#: panels/user-accounts/um-fingerprint-dialog.c:629
 msgid "Please contact your system administrator for help."
 msgstr "请联系系统管理员以寻求帮助。"
 
@@ -6550,729 +7477,1059 @@ 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:721
+#: panels/user-accounts/um-fingerprint-dialog.c:711
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
+"using the “%s” device."
 msgstr "要启用指纹登录,您需要使用设备“%s”保存一个指纹。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: panels/user-accounts/um-fingerprint-dialog.c:718
 msgid "Selecting finger"
 msgstr "选择手指"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: panels/user-accounts/um-fingerprint-dialog.c:719
 msgid "Enrolling fingerprints"
 msgstr "正在登记指纹"
 
-#: ../panels/user-accounts/um-history-dialog.c:70
-msgid "This Week"
-msgstr "本周"
+#: panels/wacom/button-mapping.ui:9
+msgid "Map Buttons"
+msgstr "映射按键"
 
-#: ../panels/user-accounts/um-history-dialog.c:73
-msgid "Last Week"
-msgstr "上周"
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
+#: panels/wacom/gnome-wacom-properties.ui:60
+msgid "_Close"
+msgstr "关闭(_C)"
 
-#. Translators: This is a date format string in the style of "Feb 18",
-#. shown as the first day of a week on login history dialog.
-#. Translators: This is a date format string in the style of "Feb 24",
-#. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:79
-#: ../panels/user-accounts/um-history-dialog.c:83
-msgctxt "login history week label"
-msgid "%b %e"
-msgstr "%b %e"
+#: panels/wacom/button-mapping.ui:71
+msgid "Map buttons to functions"
+msgstr "将功能映射到按键"
 
-#. Translators: This is a date format string in the style of "Feb 24, 2013",
-#. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:88
-msgctxt "login history week label"
-msgid "%b %e, %Y"
-msgstr "%Y %b %e"
+#: panels/wacom/button-mapping.ui:119
+msgid ""
+"To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
+"shortcut button and hold down the new keys or press Backspace to clear."
+msgstr ""
+"要编辑快捷键,请选择“发送按键”动作,按下键盘快捷键,然后输入新按键组合,或按"
+"退格键清除。"
 
-#. Translators: This indicates a week label on a login history.
-#. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:93
-#, c-format
-msgctxt "login history week label"
-msgid "%s - %s"
-msgstr "%s - %s"
+#: panels/wacom/calibrator/calibrator.ui:60
+msgid ""
+"Please tap the target markers as they appear on screen to calibrate the "
+"tablet."
+msgstr "请触摸屏幕上出现的标记以校准平板电脑。"
 
-#. Translators: This is a time format string in the style of "22:58".
-#. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:177
-#: ../panels/user-accounts/um-user-panel.c:841
-msgctxt "login date-time"
-msgid "%k:%M"
-msgstr "%k:%M"
+#: panels/wacom/calibrator/calibrator.ui:77
+msgid "Mis-click detected, restarting…"
+msgstr "检测到误点击,重新开始校准…"
 
-#. Translators: This indicates a login date-time.
-#. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:180
-#: ../panels/user-accounts/um-user-panel.c:845
+#: panels/wacom/cc-wacom-button-row.c:253
 #, c-format
-msgctxt "login date-time"
-msgid "%s, %s"
-msgstr "%s, %s"
+msgid "Button %d"
+msgstr "按键 %d"
 
-#: ../panels/user-accounts/um-history-dialog.c:250
-msgid "Session Ended"
-msgstr "会话结束"
+#: panels/wacom/cc-wacom-button-row.h:34
+msgctxt "Wacom action-type"
+msgid "Application defined"
+msgstr "应用程序定义"
 
-#: ../panels/user-accounts/um-history-dialog.c:256
-msgid "Session Started"
-msgstr "会话开始"
+#: panels/wacom/cc-wacom-button-row.h:35
+msgctxt "Wacom action-type"
+msgid "Send Keystroke"
+msgstr "发送按键"
 
-#. Translators: This is the title of the "Account Activity" dialog.
-#. The %s is the user real name.
-#: ../panels/user-accounts/um-history-dialog.c:299
+#: panels/wacom/cc-wacom-button-row.h:36
+msgctxt "Wacom action-type"
+msgid "Switch Monitor"
+msgstr "切换显示器"
+
+#: panels/wacom/cc-wacom-button-row.h:37
+msgctxt "Wacom action-type"
+msgid "Show On-Screen Help"
+msgstr "显示屏幕帮助"
+
+#: panels/wacom/cc-wacom-mapping-panel.c:256
+msgid "Output:"
+msgstr "输出:"
+
+#. Keep ratio switch
+#: panels/wacom/cc-wacom-mapping-panel.c:268
+msgid "Keep aspect ratio (letterbox):"
+msgstr "保持长宽比(黑边):"
+
+#. Whole-desktop checkbox
+#: panels/wacom/cc-wacom-mapping-panel.c:279
+msgid "Map to single monitor"
+msgstr "映射到单个显示器"
+
+#: panels/wacom/cc-wacom-nav-button.c:84
 #, c-format
-msgid "%s - Account Activity"
-msgstr "%s - 账号活动"
+msgid "%d of %d"
+msgstr "%d/%d"
 
-#: ../panels/user-accounts/um-password-dialog.c:145
-msgid "Please choose another password."
-msgstr "请选择另一个密码。"
+#: panels/wacom/cc-wacom-page.c:530
+msgid "Display Mapping"
+msgstr "显示映射"
 
-#: ../panels/user-accounts/um-password-dialog.c:154
-msgid "Please type your current password again."
-msgstr "请再次输入当前密码。"
+#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119
+msgid "Stylus"
+msgstr "手写笔"
 
-#: ../panels/user-accounts/um-password-dialog.c:160
-msgid "Password could not be changed"
-msgstr "无法更改密码"
+#: panels/wacom/cc-wacom-stylus-page.c:355
+msgid "Button"
+msgstr "按键"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
-msgid "The passwords do not match."
-msgstr "密码不匹配。"
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
+#: panels/wacom/gnome-wacom-properties.ui:200
+msgid "Wacom Tablet"
+msgstr "Wacom 手写板"
 
-#: ../panels/user-accounts/um-photo-dialog.c:214
-msgid "Browse for more pictures"
-msgstr "浏览更多图片"
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr "为绘图用平板设备设置按键映射并调整触摸笔灵敏度"
 
-#: ../panels/user-accounts/um-photo-dialog.c:448
-msgid "Disable image"
-msgstr "禁用图像"
+#. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:19
+msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
+msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;手写板;手写板;写字笔;擦除器;鼠标;"
 
-#: ../panels/user-accounts/um-photo-dialog.c:466
-msgid "Take a photo…"
-msgstr "拍张照片…"
+#: panels/wacom/gnome-wacom-properties.ui:15
+msgid "Tablet (absolute)"
+msgstr "手写板(绝对)"
+
+#: panels/wacom/gnome-wacom-properties.ui:19
+msgid "Touchpad (relative)"
+msgstr "触摸板(相对)"
 
-#: ../panels/user-accounts/um-photo-dialog.c:484
-msgid "Browse for more pictures…"
-msgstr "浏览更多图片…"
+#: panels/wacom/gnome-wacom-properties.ui:27
+msgid "Tablet Preferences"
+msgstr "手写板首选项"
 
-#: ../panels/user-accounts/um-photo-dialog.c:708
-#, c-format
-msgid "Used by %s"
-msgstr "已被 %s 使用"
+#: panels/wacom/gnome-wacom-properties.ui:44
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: ../panels/user-accounts/um-realm-manager.c:350
-msgid "Cannot automatically join this type of domain"
-msgstr "无法自动加入此类域"
+#: panels/wacom/gnome-wacom-properties.ui:125
+msgid "No tablet detected"
+msgstr "未检测到手写板"
+
+#: panels/wacom/gnome-wacom-properties.ui:141
+msgid "Please plug in or turn on your Wacom tablet"
+msgstr "请插入并打开您的 Wacom 手写板"
+
+#: panels/wacom/gnome-wacom-properties.ui:161
+msgid "Bluetooth Settings"
+msgstr "蓝牙设置"
+
+#: panels/wacom/gnome-wacom-properties.ui:238
+msgid "Tracking Mode"
+msgstr "跟踪模式"
+
+# 左撇子有歧视色彩。
+#: panels/wacom/gnome-wacom-properties.ui:266
+msgid "Left-Handed Orientation"
+msgstr "惯用左手"
 
-#: ../panels/user-accounts/um-realm-manager.c:413
+#: panels/wacom/gnome-wacom-properties.ui:296
+msgid "Map to Monitor…"
+msgstr "映射到显示器…"
+
+#: panels/wacom/gnome-wacom-properties.ui:309
+msgid "Map Buttons…"
+msgstr "映射按键…"
+
+#: panels/wacom/gnome-wacom-properties.ui:322
+msgid "Calibrate…"
+msgstr "校准…"
+
+#: panels/wacom/gnome-wacom-properties.ui:340
+msgid "Adjust mouse settings"
+msgstr "调整鼠标设置"
+
+#: panels/wacom/gnome-wacom-properties.ui:356
+msgid "Adjust display resolution"
+msgstr "调整显示分辨率"
+
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:217
+msgid "New shortcut…"
+msgstr "新建快捷键…"
+
+#: panels/wacom/wacom-stylus-page.ui:25
+msgid "Default"
+msgstr "默认"
+
+#: panels/wacom/wacom-stylus-page.ui:29
+msgid "Middle Mouse Button Click"
+msgstr "鼠标中键单击"
+
+#: panels/wacom/wacom-stylus-page.ui:33
+msgid "Right Mouse Button Click"
+msgstr "鼠标右键单击"
+
+#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:242
+msgid "Back"
+msgstr "后退"
+
+#: panels/wacom/wacom-stylus-page.ui:41
+msgid "Forward"
+msgstr "前进"
+
+#: panels/wacom/wacom-stylus-page.ui:79
+msgid "No stylus found"
+msgstr "未找到触控笔"
+
+#: panels/wacom/wacom-stylus-page.ui:93
+msgid "Please move your stylus to the proximity of the tablet to configure it"
+msgstr "请将您的触控笔移到平板电脑附近以进行配置"
+
+#: panels/wacom/wacom-stylus-page.ui:159
+msgid "Eraser Pressure Feel"
+msgstr "擦除压力感应"
+
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
+msgid "Soft"
+msgstr "软"
+
+#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
+msgid "Firm"
+msgstr "硬"
+
+#: panels/wacom/wacom-stylus-page.ui:233
+msgid "Top Button"
+msgstr "顶部按钮"
+
+#: panels/wacom/wacom-stylus-page.ui:262
+msgid "Lower Button"
+msgstr "下部按钮"
+
+#: panels/wacom/wacom-stylus-page.ui:291
+msgid "Lowest Button"
+msgstr "底部按钮"
+
+#: panels/wacom/wacom-stylus-page.ui:320
+msgid "Tip Pressure Feel"
+msgstr "指尖压力感应"
+
+#: shell/appdata/gnome-control-center.appdata.xml.in:7
+msgid "GNOME Settings"
+msgstr "GNOME 设置"
+
+#: shell/appdata/gnome-control-center.appdata.xml.in:8
+msgid "Utility to configure the GNOME desktop"
+msgstr "用来配置 GNOME 桌面的工具"
+
+#: shell/appdata/gnome-control-center.appdata.xml.in:10
+msgid "Settings is the primary interface for configuring your system."
+msgstr "“设置”是配置您的系统的主要界面。"
+
+#: shell/appdata/gnome-control-center.appdata.xml.in:20
+msgid "The GNOME Project"
+msgstr "GNOME 项目"
+
+#: shell/cc-application.c:58
+msgid "Display version number"
+msgstr "显示版本号"
+
+#: shell/cc-application.c:59
+msgid "Enable verbose mode"
+msgstr "启用详细模式"
+
+#: shell/cc-application.c:60
+msgid "Search for the string"
+msgstr "搜索字符串"
+
+#: shell/cc-application.c:61
+msgid "List possible panel names and exit"
+msgstr "列出所有面板名称并退出"
+
+#: shell/cc-application.c:62
+msgid "Panel to display"
+msgstr "要显示的面板"
+
+#: shell/cc-application.c:62
+msgid "[PANEL] [ARGUMENT…]"
+msgstr "[面板] [参数…]"
+
+#: shell/cc-panel-loader.c:279
+msgid "Available panels:"
+msgstr "可用面板:"
+
+#: shell/cc-window.ui:146
+msgid "All Settings"
+msgstr "全部设置"
+
+#: shell/cc-window.ui:184
+msgid "Primary Menu"
+msgstr "主菜单"
+
+#: shell/cc-window.ui:326
+msgid "Warning: Development Version"
+msgstr "警告:开发版本"
+
+#: shell/cc-window.ui:327
+msgid ""
+"This version of Settings should only be used for development purposes. You "
+"may experience incorrect system behavior, data loss, and other unexpected "
+"issues. "
+msgstr ""
+"该版本的 GNOME 设置仅适用于开发工作。您可能会遇到不正常的系统行为、数据丢失及"
+"其他未预期的问题。"
+
+#: shell/cc-window.ui:338
+msgid "Help"
+msgstr "帮助"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: shell/gnome-control-center.desktop.in.in:17
+msgid "Preferences;Settings;"
+msgstr "Preferences;Settings;首选项;设置;"
+
+#: shell/help-overlay.ui:15
+msgctxt "shortcut window"
+msgid "General"
+msgstr "常规"
+
+#: shell/help-overlay.ui:20
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "退出"
+
+#: shell/help-overlay.ui:27 shell/help-overlay.ui:48
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "搜索"
+
+#: shell/help-overlay.ui:35
+msgctxt "shortcut window"
+msgid "Panels"
+msgstr "面板"
+
+#: shell/help-overlay.ui:40
+msgctxt "shortcut window"
+msgid "Go back to previous panel"
+msgstr "后退到上个面板"
+
+#: shell/help-overlay.ui:53
+msgctxt "shortcut window"
+msgid "Cancel search"
+msgstr "取消搜索"
+
+#: shell/org.gnome.ControlCenter.gschema.xml:5
+msgid "The identifier for the last Settings panel to be opened"
+msgstr "要打开最后面板的身份"
+
+#: shell/org.gnome.ControlCenter.gschema.xml:6
+msgid ""
+"The identifier for the last Settings panel to be opened. Unrecognised values "
+"will be ignored and the first panel in the list selected."
+msgstr "要打开最近面板的身份。未识别的值将被忽略,然后选中第一个面板。"
+
+#: shell/org.gnome.ControlCenter.gschema.xml:13
+msgid "Show warning when running a development build of Settings"
+msgstr "运行开发版本的 GNOME 设置时显示警告"
+
+#: shell/org.gnome.ControlCenter.gschema.xml:14
+msgid ""
+"Whether Settings should show a warning when running a development build."
+msgstr "是否在运行开发版本的 GNOME 设置时显示警告。"
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1871
 #, c-format
-msgid "No such domain or realm found"
-msgstr "无此域或 Realm"
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u 路输出"
 
-#: ../panels/user-accounts/um-realm-manager.c:815
-#: ../panels/user-accounts/um-realm-manager.c:829
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1881
 #, c-format
-msgid "Cannot log in as %s at the %s domain"
-msgstr "无法以 %s 的身份登录域 %s"
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u 路输入"
 
-#: ../panels/user-accounts/um-realm-manager.c:821
-msgid "Invalid password, please try again"
-msgstr "无效密码,请重试"
+#: subprojects/gvc/gvc-mixer-control.c:2736
+msgid "System Sounds"
+msgstr "系统声音"
 
-#: ../panels/user-accounts/um-realm-manager.c:834
-#, c-format
-msgid "Couldn't connect to the %s domain: %s"
-msgstr "无法连接到 %s 域:%s"
+#~ msgid "application-x-executable"
+#~ msgstr "application-x-executable"
 
-#: ../panels/user-accounts/um-user-panel.c:239
-msgid "Other Accounts"
-msgstr "其他帐号"
+# 图标条目,保留无需翻译。
+#~ msgid "preferences-desktop-wallpaper"
+#~ msgstr "preferences-desktop-wallpaper"
 
-#: ../panels/user-accounts/um-user-panel.c:447
-msgid "Failed to delete user"
-msgstr "删除用户失败"
+#~ msgid "bluetooth"
+#~ msgstr "bluetooth"
 
-#: ../panels/user-accounts/um-user-panel.c:507
-#: ../panels/user-accounts/um-user-panel.c:566
-#: ../panels/user-accounts/um-user-panel.c:618
-msgid "Failed to revoke remotely managed user"
-msgstr "吊销远程管理的用户失败"
+#~ msgid "preferences-color"
+#~ msgstr "preferences-color"
 
-#: ../panels/user-accounts/um-user-panel.c:674
-msgid "You cannot delete your own account."
-msgstr "不能删除自己的帐号。"
+#~ msgid "preferences-system-time"
+#~ msgstr "preferences-system-time"
 
-#: ../panels/user-accounts/um-user-panel.c:683
-#, c-format
-msgid "%s is still logged in"
-msgstr "%s 已经登录"
+#~ msgid "preferences-desktop-display"
+#~ msgstr "preferences-desktop-display"
 
-#: ../panels/user-accounts/um-user-panel.c:687
-msgid ""
-"Deleting a user while they are logged in can leave the system in an "
-"inconsistent state."
-msgstr "删除已登录帐号可能导致系统不一致。"
+#~ msgid "starred"
+#~ msgstr "starred"
+
+#~ msgid "help-about"
+#~ msgstr "help-about"
+
+#~ msgid "media-removable"
+#~ msgstr "media-removable"
+
+#~ msgid "input-keyboard"
+#~ msgstr "input-keyboard"
+
+#~ msgid "input-mouse"
+#~ msgstr "input-mouse"
+
+#~ msgid "Connection/SSID"
+#~ msgstr "连接/SSID"
+
+#~ msgid "network-workgroup"
+#~ msgstr "network-workgroup"
+
+#~ msgid "network-wireless"
+#~ msgstr "network-wireless"
+
+#~ msgid "preferences-system-notifications"
+#~ msgstr "preferences-system-notifications"
+
+#~ msgid "goa-panel"
+#~ msgstr "goa-panel"
+
+#~ msgid "gnome-power-manager"
+#~ msgstr "gnome-power-manager"
+
+#~ msgid "printer"
+#~ msgstr "printer"
+
+#~ msgid "Show _Notifications"
+#~ msgstr "显示通知(_N)"
+
+#~ msgid "preferences-system-privacy"
+#~ msgstr "preferences-system-privacy"
+
+#~ msgid "preferences-desktop-locale"
+#~ msgstr "preferences-desktop-locale"
+
+#~ msgid "preferences-system-search"
+#~ msgstr "preferences-system-search"
+
+#~ msgid "preferences-system-sharing"
+#~ msgstr "preferences-system-sharing"
+
+#~ msgid "multimedia-volume-control"
+#~ msgstr "multimedia-volume-control"
+
+#~ msgid "thunderbolt"
+#~ msgstr "thunderbolt"
+
+#~ msgid "preferences-desktop-accessibility"
+#~ msgstr "preferences-desktop-accessibility"
+
+#~ msgid "system-users"
+#~ msgstr "system-users"
+
+#~ msgid "input-tablet"
+#~ msgstr "input-tablet"
+
+#~ msgid "org.gnome.Settings"
+#~ msgstr "org.gnome.Settings"
+
+#~ msgid "Drag displays to match your setup."
+#~ msgstr "拖动显示屏以达到您的设置。"
+
+#~ msgctxt "balance"
+#~ msgid "Left"
+#~ msgstr "左"
+
+#~ msgctxt "balance"
+#~ msgid "Right"
+#~ msgstr "右"
+
+#~ msgctxt "balance"
+#~ msgid "Minimum"
+#~ msgstr "最小"
+
+#~ msgctxt "balance"
+#~ msgid "Maximum"
+#~ msgstr "最大"
+
+#~ msgid "_Subwoofer:"
+#~ msgstr "重低音(_S):"
+
+#~ msgctxt "volume"
+#~ msgid "Unamplified"
+#~ msgstr "减弱"
+
+#~ msgid "_Profile:"
+#~ msgstr "配置(_P):"
+
+#~ msgid "_Test Speakers"
+#~ msgstr "测试扬声器(_T)"
+
+#~ msgid "Peak detect"
+#~ msgstr "峰值检测"
+
+#~ msgid "Device"
+#~ msgstr "设备"
+
+#~ msgid "Speaker Testing for %s"
+#~ msgstr "%s 扬声器测试"
+
+#~ msgid "C_hoose a device for sound output:"
+#~ msgstr "选择音频输出设备(_H):"
+
+#~ msgid "Settings for the selected device:"
+#~ msgstr "选中设备的设置:"
+
+#~ msgid "_Input volume:"
+#~ msgstr "输入音量(_I):"
+
+#~ msgid "C_hoose a device for sound input:"
+#~ msgstr "选择音频输入设备(_H):"
+
+#~ msgid "Sound Effects"
+#~ msgstr "声音效果"
+
+#~ msgid "No application is currently playing or recording audio."
+#~ msgstr "没有正在播放或录制音频的程序。"
+
+#~ msgid "Built-in"
+#~ msgstr "内置"
+
+#~ msgid "Sound Preferences"
+#~ msgstr "声音首选项"
+
+#~ msgid "Testing event sound"
+#~ msgstr "测试事件声音"
+
+#~ msgid "From theme"
+#~ msgstr "来自主题"
+
+#~ msgid "C_hoose an alert sound:"
+#~ msgstr "选择警报声音(_H):"
+
+#~ msgid "Stop"
+#~ msgstr "停止"
+
+#~ msgid "Add input source"
+#~ msgstr "添加输入源"
+
+#~ msgid "Remove input source"
+#~ msgstr "移除输入源"
+
+#~ msgid "Move input source up"
+#~ msgstr "上移输入源"
+
+#~ msgid "Move input source down"
+#~ msgstr "下移输入源"
+
+#~ msgid "Configure input source"
+#~ msgstr "配置输入源"
+
+#~ msgid "Show input source keyboard layout"
+#~ msgstr "显示输入源键盘布局"
+
+#~ msgid "Primary Display"
+#~ msgstr "主显示器"
+
+#~ msgid "_Night Light"
+#~ msgstr "夜光(_N)"
+
+#~ msgid "Could not get screen information"
+#~ msgstr "无法获取屏幕信息"
+
+#~ msgid "GNOME Control Center"
+#~ msgstr "GNOME 控制中心"
+
+#~ msgid ""
+#~ "The control center is GNOME’s main interface for configuration of various "
+#~ "aspects of your desktop."
+#~ msgstr "控制中心是 GNOME 用于配置桌面各方面设置的主要界面。"
+
+#~ msgid "Switch to previous source"
+#~ msgstr "切换至上个输入源"
+
+#~ msgid "Switch to next source"
+#~ msgstr "切换至下个输入源"
+
+#~ msgid "Alternative switch to next source"
+#~ msgstr "切换至下个源第二组快捷键"
+
+#~ msgid "_Options"
+#~ msgstr "选项(_O)"
+
+#~ msgctxt "Account type"
+#~ msgid "Standard"
+#~ msgstr "标准"
+
+#~ msgctxt "Account type"
+#~ msgid "Administrator"
+#~ msgstr "管理员"
+
+#~ msgid "Quit"
+#~ msgstr "退出"
+
+#~ msgid "gnome-control-center"
+#~ msgstr "gnome-control-center"
+
+#~ msgid "My Home Network"
+#~ msgstr "家庭网络"
+
+#~ msgid "hardware"
+#~ msgstr "硬件"
+
+#~ msgid "reset"
+#~ msgstr "重置"
+
+#~ msgid "English (United Kingdom)"
+#~ msgstr "英语(英国)"
+
+#~ msgid "United Kingdom"
+#~ msgstr "英国"
+
+#~ msgid "_Verify New Password"
+#~ msgstr "确认新密码(_V)"
+
+#~ msgid "Passwords do not match."
+#~ msgstr "密码不匹配。"
+
+#~ msgid "page 3"
+#~ msgstr "第 3 页"
+
+#~ msgid "Show the overview"
+#~ msgstr "显示摘要"
+
+#~ msgid "Back­ground"
+#~ msgstr "背景"
+
+#~ msgid "Blue­tooth"
+#~ msgstr "蓝牙"
+
+#~ msgid "Co­lor"
+#~ msgstr "色彩"
+
+#~ msgid "Lid Closed"
+#~ msgstr "上盖已合上"
+
+#~ msgid "Mirrored"
+#~ msgstr "镜像显示"
+
+#~ msgid "Secondary"
+#~ msgstr "副显示器"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "安排多个显示"
+
+#~ msgid "%d Hz (NTSC)"
+#~ msgstr "%d Hz (NTSC)"
 
-#: ../panels/user-accounts/um-user-panel.c:696
-#, c-format
-msgid "Do you want to keep %s's files?"
-msgstr "要保留 %s 的文件吗?"
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
 
-#: ../panels/user-accounts/um-user-panel.c:700
-msgid ""
-"It is possible to keep the home directory, mail spool and temporary files "
-"around when deleting a user account."
-msgstr "删除用户时可以保留其主目录、电子邮件目录和临时文件。"
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "逆时针旋转 90°"
 
-#: ../panels/user-accounts/um-user-panel.c:703
-msgid "_Delete Files"
-msgstr "删除文件(_D)"
+#~ msgid "Rotate by 180°"
+#~ msgstr "旋转 180°"
 
-#: ../panels/user-accounts/um-user-panel.c:704
-msgid "_Keep Files"
-msgstr "保留文件(_K)"
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "顺时针旋转 90°"
 
-#: ../panels/user-accounts/um-user-panel.c:718
-#, c-format
-msgid "Are you sure you want to revoke remotely managed %s's account?"
-msgstr "您确定要吊销远程管理的帐号 %s 吗?"
+#~ msgid "Size"
+#~ msgstr "大小"
 
-#: ../panels/user-accounts/um-user-panel.c:722
-msgid "_Delete"
-msgstr "删除(_D)"
+#~ msgid "Aspect Ratio"
+#~ msgstr "宽高比"
 
-#: ../panels/user-accounts/um-user-panel.c:774
-msgctxt "Password mode"
-msgid "Account disabled"
-msgstr "帐号已禁用"
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr "在此显示器上显示顶栏和活动概览"
 
-#: ../panels/user-accounts/um-user-panel.c:782
-msgctxt "Password mode"
-msgid "To be set at next login"
-msgstr "下次登录时设置"
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr "将该显示器与另一显示器合并以扩展工作空间"
 
-#: ../panels/user-accounts/um-user-panel.c:785
-msgctxt "Password mode"
-msgid "None"
-msgstr "无"
+# 左撇子有歧视色彩。
+#~ msgid "Presentation"
+#~ msgstr "演示"
 
-#: ../panels/user-accounts/um-user-panel.c:834
-msgid "Logged in"
-msgstr "已登录"
+#~ msgid "Show slideshows and media only"
+#~ msgstr "只显示幻灯片和多媒体"
 
-#: ../panels/user-accounts/um-user-panel.c:1290
-msgid "Failed to contact the accounts service"
-msgstr "联系帐号服务失败"
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "在两块显示器上同时显示当前视图"
 
-#: ../panels/user-accounts/um-user-panel.c:1292
-msgid "Please make sure that the AccountService is installed and enabled."
-msgstr "请确定帐号服务已正确安装并启用。"
+#~ msgid "Turn Off"
+#~ msgstr "关闭"
 
-#: ../panels/user-accounts/um-user-panel.c:1334
-msgid ""
-"To make changes,\n"
-"click the * icon first"
-msgstr ""
-"要进行更改,\n"
-"请先点击 * 图标"
+#~ msgid "Don't use this display"
+#~ msgstr "不使用该显示器"
 
-#: ../panels/user-accounts/um-user-panel.c:1374
-msgid "Create a user account"
-msgstr "创建用户帐号"
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "安排多个显示(_A)"
 
-#: ../panels/user-accounts/um-user-panel.c:1385
-#: ../panels/user-accounts/um-user-panel.c:1677
-msgid ""
-"To create a user account,\n"
-"click the * icon first"
-msgstr ""
-"要创建用户帐号,\n"
-"请先点击 * 图标"
+#~ msgid "%s %d-bit (Build ID: %s)"
+#~ msgstr "%s %d 位(构建 ID:%s)"
 
-#: ../panels/user-accounts/um-user-panel.c:1395
-msgid "Delete the selected user account"
-msgstr "删除选中的用户帐号"
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d 位"
 
-#: ../panels/user-accounts/um-user-panel.c:1407
-#: ../panels/user-accounts/um-user-panel.c:1682
-msgid ""
-"To delete the selected user account,\n"
-"click the * icon first"
-msgstr ""
-"要删除选中的用户帐号,\n"
-"请先点击 * 图标"
+#~ msgid "Section"
+#~ msgstr "节"
 
-#: ../panels/user-accounts/um-user-panel.c:1591
-msgid "My Account"
-msgstr "我的帐号"
+#~ msgid "Overview"
+#~ msgstr "总览"
 
-#: ../panels/user-accounts/um-utils.c:563
-msgid "Sorry, that user name isn't available. Please try another."
-msgstr "抱歉,该用户名不可用。请试下别的。"
+#~ msgid "De­tails"
+#~ msgstr "详细信息"
 
-#: ../panels/user-accounts/um-utils.c:566
-#, c-format
-msgid "The username is too long."
-msgstr "用户名太长。"
+#~ msgid "Base system"
+#~ msgstr "基本系统"
 
-#: ../panels/user-accounts/um-utils.c:569
-msgid "The username cannot start with a '-'."
-msgstr "用户名不能以“-”开头。"
+#~ msgctxt "keybinding"
+#~ msgid "Search"
+#~ msgstr "搜索"
 
-#: ../panels/user-accounts/um-utils.c:572
-msgid ""
-"The username should only consist of upper and lower case letters from a-z, "
-"digits and the following characters: . - _"
-msgstr "用户名只能包含大小写英文字母(a 至 z)、数字和“.”“-”“_”符号"
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
 
-#: ../panels/user-accounts/um-utils.c:576
-msgid "This will be used to name your home folder and can't be changed."
-msgstr "将作为您主文件夹的名称且不可再次更改。"
+#~ msgid "Press Esc to cancel."
+#~ msgstr "按 Esc 键取消。"
 
-#: ../panels/wacom/button-mapping.ui.h:1
-msgid "Map Buttons"
-msgstr "映射按键"
+#~ msgid "Edit"
+#~ msgstr "编辑"
 
-#: ../panels/wacom/button-mapping.ui.h:3
-msgid "Map buttons to functions"
-msgstr "将功能映射到按键"
+#~ msgid "Server"
+#~ msgstr "服务器"
 
-#: ../panels/wacom/button-mapping.ui.h:4
-msgid ""
-"To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
-"shortcut button and hold down the new keys or press Backspace to clear."
-msgstr ""
-"要编辑快捷键,请选择“发送按键”动作,按下键盘快捷键,然后输入新按键组合,或按"
-"退格键清除。"
+#~ msgid "Delete DNS Server"
+#~ msgstr "删除 DNS 服务器"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:83
-msgid ""
-"Please tap the target markers as they appear on screen to calibrate the "
-"tablet."
-msgstr "请触摸屏幕上出现的标记以校准平板电脑。"
+#~ msgid "Make available to other _users"
+#~ msgstr "对其他用户可用(_U)"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting..."
-msgstr "检测到误点击,重新开始校准…"
+#~ msgid "Firewall _Zone"
+#~ msgstr "防火墙区域(_Z)"
 
-#: ../panels/wacom/cc-wacom-button-row.c:442
-msgctxt "Wacom tablet button"
-msgid "Up"
-msgstr "上键"
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "默认"
 
-#: ../panels/wacom/cc-wacom-button-row.c:443
-msgctxt "Wacom tablet button"
-msgid "Down"
-msgstr "下键"
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "此区域定义了对连接的信任级别"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
-msgctxt "Wacom action-type"
-msgid "None"
-msgstr "无"
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr "重置这个网络包括密码在内的设置,但仍作为首选连接"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
-msgctxt "Wacom action-type"
-msgid "Send Keystroke"
-msgstr "发送按键"
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr "删除关于这个网络的所有细节,不再尝试自动连接"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
-msgctxt "Wacom action-type"
-msgid "Switch Monitor"
-msgstr "切换显示器"
+#~ msgid "Net­work"
+#~ msgstr "网络"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
-msgctxt "Wacom action-type"
-msgid "Show On-Screen Help"
-msgstr "显示屏幕帮助"
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "如果有无线网络以外的方式连接互联网,您可以配置无线热点并与他人共享网络连"
+#~ "接。"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:263
-msgid "Output:"
-msgstr "输出:"
+#~ msgid "History"
+#~ msgstr "历史"
 
-#. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:275
-msgid "Keep aspect ratio (letterbox):"
-msgstr "保持长宽比(黑边):"
+#~ msgid "Proxy"
+#~ msgstr "代理"
 
-#. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:286
-msgid "Map to single monitor"
-msgstr "映射到单个显示器…"
+#~ msgid "_Add Profile…"
+#~ msgstr "添加配置(_A)…"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:88
-#, c-format
-msgid "%d of %d"
-msgstr "%d/%d"
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "无"
 
-#: ../panels/wacom/cc-wacom-page.c:522
-msgid "Display Mapping"
-msgstr "显示映射"
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "手动"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:377
-msgid "Button"
-msgstr "按键"
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "自动"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Wa­com Tab­let"
-msgstr "Wacom 手写板"
+#~ msgid "VPN Type"
+#~ msgstr "VPN 类型"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
-msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
-msgstr "为绘图用平板设备设置按键映射并调整触摸笔灵敏度"
+#~ msgid "Group Name"
+#~ msgstr "组名"
 
-#. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
-msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
-msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;手写板;手写板;写字笔;擦除器;鼠标;"
+#~ msgid "Group Password"
+#~ msgstr "组密码"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:1
-msgid "Tablet (absolute)"
-msgstr "手写板(绝对)"
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "用作热点(_U)…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:2
-msgid "Touchpad (relative)"
-msgstr "触摸板(相对)"
+#~ msgid "_History"
+#~ msgstr "历史(_H)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:3
-msgid "Tablet Preferences"
-msgstr "手写板首选项"
+#~ msgid "invalid EAP-TLS password: missing"
+#~ msgstr "无效的 EAP-TLS 密码:缺失"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:4
-msgid "_Help"
-msgstr "帮助(_H)"
+#~ msgid "2"
+#~ msgstr "2"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
-msgid "No tablet detected"
-msgstr "未检测到手写板"
+#~ msgid "3"
+#~ msgstr "3"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
-msgid "Please plug in or turn on your Wacom tablet"
-msgstr "请插入并打开您的 Wacom 手写板"
+#~ msgid "4"
+#~ msgstr "4"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
-msgid "Bluetooth Settings"
-msgstr "蓝牙设置"
+#~ msgctxt "notifications"
+#~ msgid "Notification _Banners"
+#~ msgstr "通知条幅(_B)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
-msgstr "Wacom 手写板"
+#~ msgid "No­ti­fi­ca­tions"
+#~ msgstr "通知"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
-msgid "Map to Monitor…"
-msgstr "映射到显示器…"
+#~ msgid "Notification _Banners"
+#~ msgstr "通知条幅"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
-msgid "Map Buttons…"
-msgstr "映射按键…"
+#~ msgid "Add Account"
+#~ msgstr "添加帐号"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
-msgid "Calibrate…"
-msgstr "校准…"
+#~ msgid "Mail"
+#~ msgstr "邮件"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
-msgid "Adjust display resolution"
-msgstr "调整显示分辨率"
+#~ msgid "Calendar"
+#~ msgstr "日历"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:14
-msgid "Adjust mouse settings"
-msgstr "调整鼠标设置"
+#~ msgid "Contacts"
+#~ msgstr "联系人"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:15
-msgid "Tracking Mode"
-msgstr "跟踪模式"
+#~ msgid "Chat"
+#~ msgstr "聊天"
 
-# 左撇子有歧视色彩。
-#: ../panels/wacom/gnome-wacom-properties.ui.h:16
-msgid "Left-Handed Orientation"
-msgstr "惯用左手"
+#~ msgid "Error creating account"
+#~ msgstr "创建帐号出错"
 
-#. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1028
-msgid "Left Ring"
-msgstr "左环模式"
+#~ msgid "Are you sure you want to remove the account?"
+#~ msgstr "确定要移除这个帐号吗?"
 
-#: ../panels/wacom/gsd-wacom-device.c:1039
-#, c-format
-msgid "Left Ring Mode #%d"
-msgstr "左环模式 #%d"
+#~ msgid "This will not remove the account on the server."
+#~ msgstr "这不会将该帐号从服务器上移除。"
 
-#. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1059
-msgid "Right Ring"
-msgstr "右环模式"
+#~ msgid "_Remove"
+#~ msgstr "移除(_R)"
 
-#: ../panels/wacom/gsd-wacom-device.c:1070
-#, c-format
-msgid "Right Ring Mode #%d"
-msgstr "右环模式 #%d"
+#~ msgid "No online accounts configured"
+#~ msgstr "未设置在线帐号"
 
-# Touchstrip和touchring都是商标。
-#. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1112
-msgid "Left Touchstrip"
-msgstr "左 Touchstrip 模式"
+# 统一下翻译
+#~ msgid ""
+#~ "Adding an account allows your applications to access it for documents, "
+#~ "mail, contacts, calendar, chat and more."
+#~ msgstr ""
+#~ "添加一个帐号以让您的应用访问帐号的文档、邮件、联系人、日历、聊天等。"
 
-# Touchstrip和touchring都是商标。
-#: ../panels/wacom/gsd-wacom-device.c:1123
-#, c-format
-msgid "Left Touchstrip Mode #%d"
-msgstr "左 Touchstrip 模式 #%d"
+#~ msgid "Po­wer"
+#~ msgstr "电源"
 
-#. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1143
-msgid "Right Touchstrip"
-msgstr "右 Touchstrip"
+#~ msgctxt "printer state"
+#~ msgid "Configuring"
+#~ msgstr "正在配置"
 
-#: ../panels/wacom/gsd-wacom-device.c:1154
-#, c-format
-msgid "Right Touchstrip Mode #%d"
-msgstr "右 Touchstrip 模式 #%d"
+# 以下几个level似乎译为“量”更好
+#~ msgid "Toner Level"
+#~ msgstr "碳粉量"
 
-#: ../panels/wacom/gsd-wacom-device.c:1180
-#, c-format
-msgid "Left Touchring Mode Switch"
-msgstr "左 Touchring 模式切换"
+#~ msgid "Supply Level"
+#~ msgstr "耗材量"
 
-#: ../panels/wacom/gsd-wacom-device.c:1182
-#, c-format
-msgid "Right Touchring Mode Switch"
-msgstr "右 Touchring 模式切换"
+#~ msgctxt "printer state"
+#~ msgid "Installing"
+#~ msgstr "正在安装"
 
-#: ../panels/wacom/gsd-wacom-device.c:1185
-#, c-format
-msgid "Left Touchstrip Mode Switch"
-msgstr "左 Touchstrip 模式切换"
+#~ msgid "%u active"
+#~ msgid_plural "%u active"
+#~ msgstr[0] "%u 项活动任务"
 
-#: ../panels/wacom/gsd-wacom-device.c:1187
-#, c-format
-msgid "Right Touchstrip Mode Switch"
-msgstr "右 Touchstrip 模式切换"
+#~ msgid "Add a New Printer"
+#~ msgstr "添加打印机"
 
-#: ../panels/wacom/gsd-wacom-device.c:1192
-#, c-format
-msgid "Mode Switch #%d"
-msgstr "模式切换 #%d"
+#~ msgid "No printers detected."
+#~ msgstr "未检测到打印机。"
 
-#: ../panels/wacom/gsd-wacom-device.c:1238
-#, c-format
-msgid "Left Button #%d"
-msgstr "左键 #%d"
+#~ msgid "Loading options…"
+#~ msgstr "正在载入选项…"
 
-#: ../panels/wacom/gsd-wacom-device.c:1241
-#, c-format
-msgid "Right Button #%d"
-msgstr "右键 #%d"
+#~ msgid "Supply"
+#~ msgstr "耗材"
 
-#: ../panels/wacom/gsd-wacom-device.c:1244
-#, c-format
-msgid "Top Button #%d"
-msgstr "上键 #%d"
+#~ msgid "Jobs"
+#~ msgstr "任务"
 
-#: ../panels/wacom/gsd-wacom-device.c:1247
-#, c-format
-msgid "Bottom Button #%d"
-msgstr "底键 #%d"
+#~ msgid "Show _Jobs"
+#~ msgstr "显示任务(_J)"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
-msgid "New shortcut…"
-msgstr "新建快捷键…"
+#~ msgid "label"
+#~ msgstr "标签"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
-msgid "No Action"
-msgstr "无动作"
+#~ msgid "Setting new driver…"
+#~ msgstr "正在设置新驱动…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:2
-msgid "Left Mouse Button Click"
-msgstr "鼠标左键单击"
+#~ msgid "Print _Test Page"
+#~ msgstr "打印测试页(_T)"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
-msgid "Middle Mouse Button Click"
-msgstr "鼠标中键单击"
+#~ msgid "Pri­va­cy"
+#~ msgstr "隐私"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
-msgid "Right Mouse Button Click"
-msgstr "鼠标右键单击"
+#~ msgid "Sha­ring"
+#~ msgstr "共享"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
-msgid "Scroll Up"
-msgstr "向上滚动"
+#~ msgid "Uni­ver­sal Access"
+#~ msgstr "通用辅助功能"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
-msgid "Scroll Down"
-msgstr "向下滚动"
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "请使用更多字母、数字和符号。"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
-msgid "Scroll Left"
-msgstr "向左滚动"
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "强度:较弱"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
-msgid "Scroll Right"
-msgstr "向右滚动"
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "强度:较低"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
-msgid "Back"
-msgstr "后退"
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "强度:中等"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:10
-msgid "Forward"
-msgstr "前进"
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "强度:良好"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
-msgid "Stylus"
-msgstr "手写笔"
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "强度:较高"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
-msgid "Eraser Pressure Feel"
-msgstr "擦除压力感应"
+#~ msgctxt "login history week label"
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
-msgid "Soft"
-msgstr "软"
+#~ msgid "Disable image"
+#~ msgstr "禁用图像"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
-msgid "Firm"
-msgstr "硬"
+#~ msgid "Browse for more pictures…"
+#~ msgstr "浏览更多图片…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
-msgid "Top Button"
-msgstr "上键"
+#~ msgid "Used by %s"
+#~ msgstr "已被 %s 使用"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
-msgid "Lower Button"
-msgstr "下键"
+#~ msgid "Other Accounts"
+#~ msgstr "其他帐号"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
-msgid "Tip Pressure Feel"
-msgstr "指尖压力感应"
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Up"
+#~ msgstr "上键"
 
-#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1478
-msgid "All Settings"
-msgstr "全部设置"
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Down"
+#~ msgstr "下键"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME 控制中心"
+#~ msgctxt "Wacom action-type"
+#~ msgid "None"
+#~ msgstr "无"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:2
-msgid "Utilities to configure the GNOME desktop"
-msgstr "用来配置 GNOME 桌面的工具"
+#~ msgid "Wa­com Tab­let"
+#~ msgstr "Wacom 手写板"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
-msgid ""
-"The control center is GNOME's main interface for configuration of various "
-"aspects of your desktop."
-msgstr "控制中心是 GNOME 用于配置桌面各方面设置的主要界面。"
+#~ msgid "Left Ring"
+#~ msgstr "左环模式"
 
-#: ../shell/cc-application.c:45
-msgid "Display version number"
-msgstr "显示版本号"
+#~ msgid "Left Ring Mode #%d"
+#~ msgstr "左环模式 #%d"
 
-#: ../shell/cc-application.c:46
-msgid "Enable verbose mode"
-msgstr "启用详细模式"
+#~ msgid "Right Ring Mode #%d"
+#~ msgstr "右环模式 #%d"
 
-#: ../shell/cc-application.c:47
-msgid "Show the overview"
-msgstr "显示摘要"
+# Touchstrip和touchring都是商标。
+#~ msgid "Left Touchstrip"
+#~ msgstr "左 Touchstrip 模式"
 
-#: ../shell/cc-application.c:48
-msgid "Search for the string"
-msgstr "搜索字符串"
+# Touchstrip和touchring都是商标。
+#~ msgid "Left Touchstrip Mode #%d"
+#~ msgstr "左 Touchstrip 模式 #%d"
 
-#: ../shell/cc-application.c:49
-msgid "List possible panel names and exit"
-msgstr "列出所有面板名称并退出"
+#~ msgid "Right Touchstrip"
+#~ msgstr "右 Touchstrip"
 
-#: ../shell/cc-application.c:50
-msgid "Panel to display"
-msgstr "要显示的面板"
+#~ msgid "Right Touchstrip Mode #%d"
+#~ msgstr "右 Touchstrip 模式 #%d"
 
-#: ../shell/cc-application.c:50
-msgid "[PANEL] [ARGUMENT…]"
-msgstr "[面板] [参数…]"
+#~ msgid "Left Touchring Mode Switch"
+#~ msgstr "左 Touchring 模式切换"
 
-#: ../shell/cc-application.c:113
-msgid "Available panels:"
-msgstr "可用面板"
+#~ msgid "Right Touchring Mode Switch"
+#~ msgstr "右 Touchring 模式切换"
 
-#: ../shell/cc-application.c:252
-msgid "Help"
-msgstr "帮助"
+#~ msgid "Left Touchstrip Mode Switch"
+#~ msgstr "左 Touchstrip 模式切换"
 
-#: ../shell/cc-application.c:253
-msgid "Quit"
-msgstr "退出"
+#~ msgid "Right Touchstrip Mode Switch"
+#~ msgstr "右 Touchstrip 模式切换"
 
-#. Add categories
-#: ../shell/cc-window.c:871
-msgctxt "category"
-msgid "Personal"
-msgstr "个人"
+#~ msgid "Mode Switch #%d"
+#~ msgstr "模式切换 #%d"
 
-#: ../shell/cc-window.c:872
-msgctxt "category"
-msgid "Hardware"
-msgstr "硬件"
+#~ msgid "Left Button #%d"
+#~ msgstr "左键 #%d"
 
-#: ../shell/cc-window.c:873
-msgctxt "category"
-msgid "System"
-msgstr "系统"
+#~ msgid "Right Button #%d"
+#~ msgstr "右键 #%d"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:2
-msgid "Preferences;Settings;"
-msgstr "Preferences;Settings;首选项;设置;"
+#~ msgid "Top Button #%d"
+#~ msgstr "上键 #%d"
 
-#: ../shell/help-overlay.ui.h:1
-msgctxt "shortcut window"
-msgid "General"
-msgstr "常规"
+#~ msgid "Bottom Button #%d"
+#~ msgstr "底键 #%d"
 
-#: ../shell/help-overlay.ui.h:2
-msgctxt "shortcut window"
-msgid "Quit"
-msgstr "退出"
+#~ msgid "No Action"
+#~ msgstr "无动作"
 
-#: ../shell/help-overlay.ui.h:3
-msgctxt "shortcut window"
-msgid "Search"
-msgstr "搜索"
+#~ msgid "Left Mouse Button Click"
+#~ msgstr "鼠标左键单击"
 
-#: ../shell/help-overlay.ui.h:4
-msgctxt "shortcut window"
-msgid "Panels"
-msgstr "面板"
+#~ msgid "Scroll Up"
+#~ msgstr "向上滚动"
 
-#: ../shell/help-overlay.ui.h:5
-msgctxt "shortcut window"
-msgid "Go back to the overview"
-msgstr "后退到总览视图"
+#~ msgid "Scroll Down"
+#~ msgstr "向下滚动"
 
-#: ../shell/help-overlay.ui.h:6
-msgctxt "shortcut window"
-msgid "Cancel search"
-msgstr "取消搜索"
+#~ msgid "Scroll Left"
+#~ msgstr "向左滚动"
 
-#. translators: This is the default hotspot name, need to be less than 32-bytes
-#: ../shell/hostname-helper.c:189
-msgctxt "hotspot"
-msgid "Hotspot"
-msgstr "热点"
+#~ msgid "Scroll Right"
+#~ msgstr "向右滚动"
 
-#: ../shell/panel-list.ui.h:3
-#, fuzzy
-#| msgid "No regions found"
-msgid "No results found"
-msgstr "无可用区域"
+#~ msgctxt "category"
+#~ msgid "Personal"
+#~ msgstr "个人"
+
+#~ msgctxt "category"
+#~ msgid "Hardware"
+#~ msgstr "硬件"
+
+#~ msgctxt "category"
+#~ msgid "System"
+#~ msgstr "系统"
 
 #~ msgid "Wayland"
 #~ msgstr "Wayland"
@@ -7281,15 +8538,6 @@ msgstr "无可用区域"
 #~ msgid "Set Shortcut"
 #~ msgstr "设置快捷键"
 
-#~ msgid "_Unlock"
-#~ msgstr "解锁(_U)"
-
-#~ msgid "Color"
-#~ msgstr "色彩"
-
-#~ msgid "_Name:"
-#~ msgstr "名称(_N):"
-
 #~ msgid "Add Shortcut"
 #~ msgstr "添加快捷键"
 
@@ -7415,12 +8663,6 @@ msgstr "无可用区域"
 #~ msgid "_Sign In"
 #~ msgstr "登录(_S)"
 
-#~ msgid "Power"
-#~ msgstr "电源"
-
-#~ msgid "Privacy"
-#~ msgstr "隐私"
-
 #~ msgctxt "Search Location"
 #~ msgid "Other"
 #~ msgstr "其他"
@@ -7440,12 +8682,6 @@ msgstr "无可用区域"
 #~ msgid "Add User Account"
 #~ msgstr "添加用户帐号"
 
-#~ msgid "Remove User Account"
-#~ msgstr "移除用户帐号"
-
-#~ msgid "Login Options"
-#~ msgstr "登录选项"
-
 #~ msgid "A user with the username '%s' already exists."
 #~ msgstr "用户“%s”已存在。"
 
@@ -7455,9 +8691,6 @@ msgstr "无可用区域"
 #~ msgid "Time _Zone"
 #~ msgstr "时区(_Z)"
 
-#~ msgid "Active Jobs"
-#~ msgstr "活动的任务"
-
 #~ msgid "Close"
 #~ msgstr "关闭"
 
@@ -7467,9 +8700,6 @@ msgstr "无可用区域"
 #~ msgid "Pause Printing"
 #~ msgstr "暂停打印"
 
-#~ msgid "Cancel Print Job"
-#~ msgstr "取消打印任务"
-
 #~ msgctxt "print job"
 #~ msgid "Held"
 #~ msgstr "挂起"
@@ -7585,9 +8815,6 @@ msgstr "无可用区域"
 #~ msgid "When battery power is _critical"
 #~ msgstr "电量严重不足时(_C)"
 
-#~ msgid "Power Off"
-#~ msgstr "电源关闭"
-
 #~ msgid "Power off"
 #~ msgstr "电源关闭"
 
@@ -7605,9 +8832,6 @@ msgstr "无可用区域"
 #~ msgid "Show help options"
 #~ msgstr "显示帮助选项"
 
-#~ msgid "- Settings"
-#~ msgstr "- 设置"
-
 #~ msgid ""
 #~ "%s\n"
 #~ "Run '%s --help' to see a full list of available command line options.\n"


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