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



commit 107eb008a0c364b8c18623a997a8a04209ea2b63
Author: Boyuan Yang <073plan gmail com>
Date:   Wed Jul 1 14:29:40 2020 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 5461 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 3050 insertions(+), 2411 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 312add99a..966ee9388 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -26,87 +26,87 @@
 # Mingye Wang <arthur2e5 aosc xyz>, 2015.
 # Mingcong Bai <jeffbai aosc xyz>, 2015, 2016, 2018.
 # Dingzhong Chen <wsxy162 gmail com>, 2016-2019.
+# Yuchen Guo <egyc live com>, 2020.
 #
 msgid ""
 msgstr ""
 "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-09-07 14:25+0000\n"
-"PO-Revision-Date: 2019-09-10 01:47+0800\n"
-"Last-Translator: Dingzhong Chen <wsxy162 gmail com>\n"
+"POT-Creation-Date: 2020-06-30 10:19+0000\n"
+"PO-Revision-Date: 2020-07-01 10:21-0400\n"
+"Last-Translator: Boyuan Yang <073plan gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 3.32.1\n"
+"X-Generator: Poedit 2.3.1\n"
 
-#: panels/applications/cc-applications-panel.c:561
+#: panels/applications/cc-applications-panel.c:770
 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
+#: panels/applications/cc-applications-panel.c:770
+#: panels/applications/cc-applications-panel.c:772
+#: panels/applications/cc-applications-panel.c:785
+#: panels/applications/cc-applications-panel.c:790
 msgid "Full access"
 msgstr "完全访问"
 
-#: panels/applications/cc-applications-panel.c:563
+#: panels/applications/cc-applications-panel.c:772
 msgid "Session Bus"
 msgstr "会话总线"
 
-#: panels/applications/cc-applications-panel.c:568
-#: panels/power/cc-power-panel.c:2477 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:273
+#: panels/applications/cc-applications-panel.c:776
+#: panels/power/cc-power-panel.c:2443 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525
 msgid "Devices"
 msgstr "设备"
 
-#: panels/applications/cc-applications-panel.c:568
+#: panels/applications/cc-applications-panel.c:776
 msgid "Full access to /dev"
 msgstr "对 /dev 的完全访问"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:780
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
+#: panels/network/network-mobile.ui:252
 msgid "Network"
 msgstr "网络"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:780
 msgid "Has network access"
 msgstr "拥有网络访问"
 
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:581
-#: panels/search/cc-search-locations-dialog.c:292
+#: panels/applications/cc-applications-panel.c:785
+#: panels/applications/cc-applications-panel.c:787
+#: panels/search/cc-search-locations-dialog.c:361
 msgid "Home"
 msgstr "主目录"
 
-#: panels/applications/cc-applications-panel.c:581
-#: panels/applications/cc-applications-panel.c:586
+#: panels/applications/cc-applications-panel.c:787
+#: panels/applications/cc-applications-panel.c:792
 msgid "Read-only"
 msgstr "只读"
 
-#: panels/applications/cc-applications-panel.c:584
-#: panels/applications/cc-applications-panel.c:586
+#: panels/applications/cc-applications-panel.c:790
+#: panels/applications/cc-applications-panel.c:792
 msgid "File System"
 msgstr "文件系统"
 
-#: panels/applications/cc-applications-panel.c:591
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:277
-#: shell/cc-window.c:975 shell/cc-window.ui:132
+#: panels/applications/cc-applications-panel.c:796
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281
+#: shell/cc-window.c:964 shell/cc-window.ui:125
 #: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "设置"
 
-#: panels/applications/cc-applications-panel.c:591
+#: panels/applications/cc-applications-panel.c:796
 msgid "Can change settings"
 msgstr "可以修改设置"
 
-#: panels/applications/cc-applications-panel.c:596
+#: panels/applications/cc-applications-panel.c:798
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
@@ -115,70 +115,69 @@ msgstr ""
 "%s 拥有以下内置权限。这些无法被更改。如果您在意这些权限,请考虑移除该应用程"
 "序。"
 
-#: panels/applications/cc-applications-panel.c:738
+#: panels/applications/cc-applications-panel.c:959
 msgid "Web Links"
 msgstr "Web 链接"
 
-#: panels/applications/cc-applications-panel.c:748
+#: panels/applications/cc-applications-panel.c:969
 msgid "Git Links"
 msgstr "Git 链接"
 
-#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:975
 #, c-format
 msgid "%s Links"
 msgstr "%s 链接"
 
-#: panels/applications/cc-applications-panel.c:762
-#: panels/applications/cc-applications-panel.c:798
+#: panels/applications/cc-applications-panel.c:983
+#: panels/applications/cc-applications-panel.c:1019
 msgid "Unset"
 msgstr "未设置"
 
-#: panels/applications/cc-applications-panel.c:853
+#: panels/applications/cc-applications-panel.c:1074
 msgid "Links"
 msgstr "链接"
 
-#: panels/applications/cc-applications-panel.c:861
+#: panels/applications/cc-applications-panel.c:1082
 msgid "Hypertext Files"
 msgstr "超文本文件"
 
-#: panels/applications/cc-applications-panel.c:875
+#: panels/applications/cc-applications-panel.c:1096
 msgid "Text Files"
 msgstr "文本文件"
 
-#: panels/applications/cc-applications-panel.c:889
+#: panels/applications/cc-applications-panel.c:1110
 msgid "Image Files"
 msgstr "图像文件"
 
-#: panels/applications/cc-applications-panel.c:905
+#: panels/applications/cc-applications-panel.c:1126
 msgid "Font Files"
 msgstr "字体文件"
 
-#: panels/applications/cc-applications-panel.c:966
+#: panels/applications/cc-applications-panel.c:1187
 msgid "Archive Files"
 msgstr "归档文件"
 
-#: panels/applications/cc-applications-panel.c:986
+#: panels/applications/cc-applications-panel.c:1207
 msgid "Package Files"
 msgstr "软件包文件"
 
-#: panels/applications/cc-applications-panel.c:1009
+#: panels/applications/cc-applications-panel.c:1230
 msgid "Audio Files"
 msgstr "音频文件"
 
-#: panels/applications/cc-applications-panel.c:1026
+#: panels/applications/cc-applications-panel.c:1247
 msgid "Video Files"
 msgstr "视频文件"
 
-#: panels/applications/cc-applications-panel.c:1034
+#: panels/applications/cc-applications-panel.c:1255
 msgid "Other Files"
 msgstr "其它文件"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1376
-#: panels/applications/cc-applications-panel.ui:406
+#: panels/applications/cc-applications-panel.c:1595
+#: panels/applications/cc-applications-panel.ui:412
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
-#: panels/notifications/cc-notifications-panel.ui:167
-#: panels/privacy/cc-privacy-panel.ui:1085
+#: panels/notifications/cc-notifications-panel.ui:80
 msgid "Applications"
 msgstr "应用程序"
 
@@ -190,155 +189,164 @@ msgstr "没有应用程序"
 msgid "Install some…"
 msgstr "安装一些…"
 
-#: panels/applications/cc-applications-panel.ui:99
+#: panels/applications/cc-applications-panel.ui:96
 msgid "Permissions & Access"
 msgstr "权限和访问"
 
-#: panels/applications/cc-applications-panel.ui:111
+#: panels/applications/cc-applications-panel.ui:108
 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
+#: panels/applications/cc-applications-panel.ui:123
+#: panels/applications/cc-applications-panel.ui:129
+#: panels/camera/gnome-camera-panel.desktop.in.in:3
 msgid "Camera"
 msgstr "相机"
 
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
 #.
+#. TRANSLATORS: Status of Parental Controls setup
 #. 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/applications/cc-applications-panel.ui:130
+#: panels/applications/cc-applications-panel.ui:142
+#: panels/applications/cc-applications-panel.ui:154
+#: panels/applications/cc-applications-panel.ui:234
+#: panels/applications/cc-applications-panel.ui:264
 #: 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
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:93
+#: panels/keyboard/keyboard-shortcuts.c:368 panels/network/network-proxy.ui:126
+#: panels/user-accounts/cc-user-panel.c:865
+#: panels/user-accounts/cc-user-panel.c:957
 #: subprojects/gvc/gvc-mixer-control.c:1876
 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
+#: panels/applications/cc-applications-panel.ui:135
+#: panels/applications/cc-applications-panel.ui:141
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:3
 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
+#: panels/applications/cc-applications-panel.ui:147
+#: panels/applications/cc-applications-panel.ui:153
+#: panels/location/gnome-location-panel.desktop.in.in:3
 msgid "Location Services"
 msgstr "定位服务"
 
-#: panels/applications/cc-applications-panel.ui:162
-#: panels/applications/cc-applications-panel.ui:489
+#: panels/applications/cc-applications-panel.ui:159
+#: panels/applications/cc-applications-panel.ui:495
 msgid "Built-in Permissions"
 msgstr "内置权限"
 
-#: panels/applications/cc-applications-panel.ui:163
+#: panels/applications/cc-applications-panel.ui:160
 msgid "Cannot be changed"
 msgstr "无法被修改"
 
-#: panels/applications/cc-applications-panel.ui:180
+#: panels/applications/cc-applications-panel.ui:177
 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
+#: panels/applications/cc-applications-panel.ui:201
 msgid "Integration"
 msgstr "集成"
 
-#: panels/applications/cc-applications-panel.ui:216
+#: panels/applications/cc-applications-panel.ui:213
 msgid "System features used by this application."
 msgstr "此应用程序使用的系统功能。"
 
-#: panels/applications/cc-applications-panel.ui:230
-#: panels/applications/cc-applications-panel.ui:236
+#: panels/applications/cc-applications-panel.ui:227
+#: panels/applications/cc-applications-panel.ui:233
 #: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:162
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:155
 msgid "Search"
 msgstr "搜索"
 
-#: panels/applications/cc-applications-panel.ui:242
+#: panels/applications/cc-applications-panel.ui:239
 #: 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
+#: panels/applications/cc-applications-panel.ui:245
+msgid "Run in background"
+msgstr "后台运行"
+
+#: panels/applications/cc-applications-panel.ui:251
+msgid "Set Desktop Background"
+msgstr "设置桌面背景"
+
+#: panels/applications/cc-applications-panel.ui:257
+#: panels/applications/cc-applications-panel.ui:263
 msgid "Sounds"
 msgstr "声音"
 
-#: panels/applications/cc-applications-panel.ui:287
+#: panels/applications/cc-applications-panel.ui:296
 msgid "Default Handlers"
 msgstr "默认处理程序"
 
-#: panels/applications/cc-applications-panel.ui:299
+#: panels/applications/cc-applications-panel.ui:308
 msgid "Types of files and links that this application opens."
 msgstr "应用程序打开的文件和链接类型。"
 
-#: panels/applications/cc-applications-panel.ui:315
+#: panels/applications/cc-applications-panel.ui:324
 msgid "Reset"
 msgstr "重置"
 
-#: panels/applications/cc-applications-panel.ui:351
+#: panels/applications/cc-applications-panel.ui:360
 msgid "Usage"
 msgstr "占用"
 
-#: panels/applications/cc-applications-panel.ui:363
+#: panels/applications/cc-applications-panel.ui:372
 msgid "How much resources this application is using."
 msgstr "应用程序使用了多少资源。"
 
-#: panels/applications/cc-applications-panel.ui:378
-#: panels/applications/cc-applications-panel.ui:525
+#: panels/applications/cc-applications-panel.ui:387
+#: panels/applications/cc-applications-panel.ui:531
 msgid "Storage"
 msgstr "存储"
 
-#: panels/applications/cc-applications-panel.ui:413
+#: panels/applications/cc-applications-panel.ui:419
 msgid "Open in Software"
 msgstr "在“软件”中打开"
 
-#: panels/applications/cc-applications-panel.ui:463 shell/cc-panel-list.ui:190
+#: panels/applications/cc-applications-panel.ui:469 shell/cc-panel-list.ui:121
 msgid "No results found"
 msgstr "未找到结果"
 
-#: panels/applications/cc-applications-panel.ui:474
-#: panels/keyboard/cc-keyboard-panel.ui:157 shell/cc-panel-list.ui:201
+#: panels/applications/cc-applications-panel.ui:480
+#: panels/keyboard/cc-keyboard-panel.ui:188 shell/cc-panel-list.ui:132
 msgid "Try a different search"
 msgstr "尝试不同的搜索"
 
-#: panels/applications/cc-applications-panel.ui:542
+#: panels/applications/cc-applications-panel.ui:548
 msgid ""
 "How much disk space this application is occupying with app data and caches."
 msgstr "此应用程序包括应用数据和缓存占用了多少硬盘空间。"
 
-#: panels/applications/cc-applications-panel.ui:551
+#: panels/applications/cc-applications-panel.ui:557
 msgid "Application"
 msgstr "应用程序"
 
-#: panels/applications/cc-applications-panel.ui:557
+#: panels/applications/cc-applications-panel.ui:563
 msgid "Data"
 msgstr "数据"
 
-#: panels/applications/cc-applications-panel.ui:563
+#: panels/applications/cc-applications-panel.ui:569
 msgid "Cache"
 msgstr "缓存"
 
-#: panels/applications/cc-applications-panel.ui:569
+#: panels/applications/cc-applications-panel.ui:575
 msgid "<b>Total</b>"
 msgstr "<b>全部</b>"
 
-#: panels/applications/cc-applications-panel.ui:586
+#: panels/applications/cc-applications-panel.ui:592
 msgid "Clear Cache…"
 msgstr "清空缓存…"
 
@@ -352,61 +360,45 @@ msgstr "控制不同应用程序权限和设置"
 msgid "application;flatpak;permission;setting;"
 msgstr "application;flatpak;permission;setting;应用程序;权限;设置;"
 
-#: panels/background/cc-background-chooser.c:348
+#: panels/background/cc-background-chooser.c:346
 msgid "Select a picture"
 msgstr "选择图片"
 
-#: panels/background/cc-background-chooser.c:351
-#: 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/background/cc-background-chooser.c:349
+#: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:238
+#: panels/color/cc-color-panel.c:886 panels/color/cc-color-panel.ui:657
 #: panels/common/cc-language-chooser.ui:24
-#: panels/display/cc-display-panel.c:950
+#: panels/display/cc-display-panel.c:944
+#: panels/info-overview/cc-info-overview-panel.ui:236
+#: panels/network/cc-wifi-hotspot-dialog.ui:122
 #: 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:1260 panels/network/net-device-wifi.c:1340
-#: panels/network/net-device-wifi.c:1561 panels/network/network-wifi.ui:24
+#: panels/network/connection-editor/vpn-helpers.c:176
+#: panels/network/connection-editor/vpn-helpers.c:299
+#: panels/network/net-device-wifi.c:800 panels/network/net-device-wifi.c:908
 #: 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:613
-#: panels/sharing/cc-sharing-panel.c:428
+#: panels/printers/pp-details-dialog.c:252
+#: panels/region/cc-format-chooser.ui:28 panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:638
+#: panels/sharing/cc-sharing-panel.c:398 panels/usage/cc-usage-panel.c:133
 #: panels/user-accounts/cc-add-user-dialog.ui:28
 #: panels/user-accounts/cc-avatar-chooser.c:107
 #: panels/user-accounts/cc-avatar-chooser.c:235
+#: panels/user-accounts/cc-fingerprint-dialog.ui:36
 #: panels/user-accounts/cc-password-dialog.ui:20
-#: panels/user-accounts/cc-user-panel.c:641
-#: panels/user-accounts/cc-user-panel.c:659
+#: panels/user-accounts/cc-user-panel.c:652
+#: panels/user-accounts/cc-user-panel.c:670
 #: 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.c:352
-#: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:314
-#: panels/sharing/cc-sharing-panel.c:429
+#: panels/background/cc-background-chooser.c:350
+#: panels/network/connection-editor/vpn-helpers.c:177
+#: panels/printers/pp-details-dialog.c:253
+#: panels/sharing/cc-sharing-panel.c:399
 #: panels/user-accounts/cc-avatar-chooser.c:236
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: panels/background/cc-background-chooser.ui:104
-msgid "Set Background and Lock Screen"
-msgstr "设定背景和锁屏"
-
-#: panels/background/cc-background-chooser.ui:114
-msgid "Set Background"
-msgstr "设定背景"
-
-#: panels/background/cc-background-chooser.ui:121
-msgid "Set Lock Screen"
-msgstr "设定锁屏"
-
-#: panels/background/cc-background-chooser.ui:143
-msgid "Remove Background"
-msgstr "移除背景"
-
 #: panels/background/cc-background-item.c:140
 msgid "multiple sizes"
 msgstr "多个尺寸"
@@ -418,15 +410,15 @@ msgstr "多个尺寸"
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: panels/background/cc-background-item.c:278
+#: panels/background/cc-background-item.c:282
 msgid "No Desktop Background"
 msgstr "无桌面背景"
 
-#: panels/background/cc-background-panel.c:145
+#: panels/background/cc-background-panel.c:112
 msgid "Current background"
 msgstr "当前背景"
 
-#: panels/background/cc-background-panel.ui:63
+#: panels/background/cc-background-panel.ui:55
 msgid "Add Picture…"
 msgstr "添加图片…"
 
@@ -447,45 +439,45 @@ msgstr "将背景图片改为一张壁纸或照片"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;壁纸;墙纸;屏幕;桌面;背景;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:309
+#: panels/bluetooth/cc-bluetooth-panel.ui:31
 msgid "No Bluetooth Found"
 msgstr "未找到蓝牙"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:310
+#: panels/bluetooth/cc-bluetooth-panel.ui:42
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "插入蓝牙适配器以使用蓝牙。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:313
+#: panels/bluetooth/cc-bluetooth-panel.ui:69
 msgid "Bluetooth Turned Off"
 msgstr "蓝牙已关闭"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:314
+#: panels/bluetooth/cc-bluetooth-panel.ui:80
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "打开以连接设备和接收文件传送。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:317
+#: panels/bluetooth/cc-bluetooth-panel.ui:107
 msgid "Airplane Mode is on"
 msgstr "飞行模式已打开"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:318
+#: panels/bluetooth/cc-bluetooth-panel.ui:118
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "蓝牙已禁用当开启飞行模式时。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:321
+#: panels/bluetooth/cc-bluetooth-panel.ui:124
+msgid "Turn Off Airplane Mode"
+msgstr "关闭飞行模式"
+
+#: panels/bluetooth/cc-bluetooth-panel.ui:154
 msgid "Hardware Airplane Mode is on"
 msgstr "硬件飞行模式已打开"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:322
+#: panels/bluetooth/cc-bluetooth-panel.ui:165
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "关闭飞行模式开关以开启蓝牙。"
 
-#: 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/printers/pp-new-printer-dialog.c:1697
+#: panels/printers/pp-new-printer-dialog.c:1670
 msgid "Bluetooth"
 msgstr "蓝牙"
 
@@ -498,15 +490,55 @@ msgstr "开关蓝牙及连接您的设备"
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;分享;共享;蓝牙;"
 
+#: panels/camera/cc-camera-panel.ui:34
+msgid "Camera is turned off"
+msgstr "相机已关闭"
+
+#: panels/camera/cc-camera-panel.ui:43
+msgid "No applications can capture photos or video."
+msgstr "没有应用程序可以捕获照片或视频。"
+
+#: panels/camera/cc-camera-panel.ui:77
+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/camera/cc-camera-panel.ui:87
+msgid "Allow the applications below to use your camera."
+msgstr "允许以下应用程序使用您的相机。"
+
+#: panels/camera/cc-camera-panel.ui:107
+msgid "No Applications Have Asked for Camera Access"
+msgstr "没有应用程序要求访问摄像头"
+
+#: panels/camera/gnome-camera-panel.desktop.in.in:4
+msgid "Protect your pictures"
+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/camera/gnome-camera-panel.desktop.in.in:20
+#: panels/microphone/gnome-microphone-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;屏幕;锁;诊断;崩溃;私;最近;临时;索引;名称;网络;认证;标志;身"
+"份;"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: panels/color/cc-color-calibrate.c:348
+#: panels/color/cc-color-calibrate.c:347
 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:354
+#: panels/color/cc-color-calibrate.c:353
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr "将您的校准器移动到校准位置并按“继续”"
@@ -514,7 +546,7 @@ msgstr "将您的校准器移动到校准位置并按“继续”"
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: panels/color/cc-color-calibrate.c:360
+#: panels/color/cc-color-calibrate.c:359
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr "将您的校准器移动到表面位置并按“继续”"
@@ -522,57 +554,77 @@ 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:366
+#: panels/color/cc-color-calibrate.c:365
 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:397
+#: panels/color/cc-color-calibrate.c:396
 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:402
+#: panels/color/cc-color-calibrate.c:401
 msgid "Tools required for calibration are not installed."
 msgstr "未安装校准所需的工具。"
 
 #. TRANSLATORS: The profile failed for some reason
-#: panels/color/cc-color-calibrate.c:408
+#: panels/color/cc-color-calibrate.c:407
 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:414
+#: panels/color/cc-color-calibrate.c:413
 msgid "The target whitepoint was not obtainable."
 msgstr "无法获取目标白点。"
 
 #. TRANSLATORS: the display calibration process is finished
-#: panels/color/cc-color-calibrate.c:453
+#: panels/color/cc-color-calibrate.c:452
 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:461
+#: panels/color/cc-color-calibrate.c:460
 msgid "Calibration failed!"
 msgstr "校准失败!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: panels/color/cc-color-calibrate.c:468
+#: panels/color/cc-color-calibrate.c:467
 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:537
+#: panels/color/cc-color-calibrate.c:535
 msgid "Do not disturb the calibration device while in progress"
 msgstr "校准过程中不要干扰校准设备"
 
+#: panels/color/cc-color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "显示校准"
+
+#. This starts the calibration process
+#: panels/color/cc-color-calibrate.ui:40
+msgid "_Start"
+msgstr "开始(_S)"
+
+#. This resumes the calibration process
+#: panels/color/cc-color-calibrate.ui:54
+msgid "_Resume"
+msgstr "恢复(_R)"
+
+#. This button returns the user back to the color control panel
+#: panels/color/cc-color-calibrate.ui:67 panels/region/cc-format-chooser.ui:64
+#: panels/user-accounts/cc-fingerprint-dialog.ui:73
+msgid "_Done"
+msgstr "完成(_D)"
+
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
@@ -614,65 +666,65 @@ msgstr "%s 打印机"
 msgid "%s Webcam"
 msgstr "%s 摄像头"
 
-#: panels/color/cc-color-device.c:91
+#: panels/color/cc-color-device.c:90
 #, c-format
 msgid "Enable color management for %s"
 msgstr "为 %s 启用色彩管理"
 
-#: panels/color/cc-color-device.c:94
+#: panels/color/cc-color-device.c:93
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "为 %s 显示颜色管理"
 
 #. not calibrated
-#: panels/color/cc-color-device.c:303
+#: panels/color/cc-color-device.c:292
 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:170
+#: panels/color/cc-color-panel.c:167
 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:178
+#: panels/color/cc-color-panel.c:175
 msgid "Colorspace: "
 msgstr "色彩空间:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: panels/color/cc-color-panel.c:185
+#: panels/color/cc-color-panel.c:182
 msgid "Test profile: "
 msgstr "测试配置:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: panels/color/cc-color-panel.c:239
+#: panels/color/cc-color-panel.c:236
 msgid "Select ICC Profile File"
 msgstr "选择 ICC 配置文件"
 
-#: panels/color/cc-color-panel.c:242
+#: panels/color/cc-color-panel.c:239
 msgid "_Import"
 msgstr "导入(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:253
+#: panels/color/cc-color-panel.c:250
 msgid "Supported ICC profiles"
 msgstr "支持的 ICC 配置"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:260
-#: panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:257
+#: panels/network/wireless-security/eap-method-fast.c:356
 msgid "All files"
 msgstr "所有文件"
 
-#: panels/color/cc-color-panel.c:555
+#: panels/color/cc-color-panel.c:549
 msgid "Screen"
 msgstr "屏幕"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: panels/color/cc-color-panel.c:847
+#: panels/color/cc-color-panel.c:839
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "上传文件失败:%s"
@@ -680,51 +732,51 @@ msgstr "上传文件失败:%s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: panels/color/cc-color-panel.c:859
+#: panels/color/cc-color-panel.c:851
 msgid "The profile has been uploaded to:"
 msgstr "配置已上传到:"
 
-#: panels/color/cc-color-panel.c:861
+#: panels/color/cc-color-panel.c:853
 msgid "Write down this URL."
 msgstr "请记下此 URL。"
 
-#: panels/color/cc-color-panel.c:862
+#: panels/color/cc-color-panel.c:854
 msgid "Restart this computer and boot your normal operating system."
 msgstr "重启计算机并引导您日常使用的操作系统。"
 
-#: panels/color/cc-color-panel.c:863
+#: panels/color/cc-color-panel.c:855
 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:891
+#: panels/color/cc-color-panel.c:883
 msgid "Save Profile"
 msgstr "保存配置"
 
-#: panels/color/cc-color-panel.c:895
-#: panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:887
+#: panels/network/connection-editor/vpn-helpers.c:300
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: panels/color/cc-color-panel.c:1209
+#: panels/color/cc-color-panel.c:1196
 msgid "Create a color profile for the selected device"
 msgstr "为选中的设备创建一份色彩配置"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248
+#: panels/color/cc-color-panel.c:1211 panels/color/cc-color-panel.c:1235
 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:1258
+#: panels/color/cc-color-panel.c:1245
 msgid "The measuring instrument does not support printer profiling."
 msgstr "测量仪器不支持打印机校正。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1269
+#: panels/color/cc-color-panel.c:1256
 msgid "The device type is not currently supported."
 msgstr "目前不支持此设备类型。"
 
@@ -846,7 +898,6 @@ msgstr ""
 "有所帮助。"
 
 #: panels/color/cc-color-panel.ui:607
-#: panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "摘要"
 
@@ -859,7 +910,7 @@ msgid "_Import File…"
 msgstr "导入文件(_I)…"
 
 #: panels/color/cc-color-panel.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/network/connection-editor/net-connection-editor.c:510
 #: panels/printers/new-printer-dialog.ui:80
 #: panels/region/cc-input-chooser.ui:20
 #: panels/user-accounts/cc-add-user-dialog.ui:47
@@ -876,7 +927,9 @@ msgstr "检测到问题,此配置可能无法正常工作。<a href=\"\">显
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "每个设备都需要一份最新色彩配置以进行色彩管理。"
 
+#. translators: Text used in link to privacy policy
 #: panels/color/cc-color-panel.ui:812
+#: panels/diagnostics/cc-diagnostics-panel.c:143
 msgid "Learn more"
 msgstr "了解更多"
 
@@ -1010,13 +1063,13 @@ msgstr "D75"
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
-#: panels/color/cc-color-profile.c:100
+#: panels/color/cc-color-profile.c:98
 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:106
+#: panels/color/cc-color-profile.c:104
 msgid "Test Profile"
 msgstr "测试配置"
 
@@ -1024,7 +1077,7 @@ msgstr "测试配置"
 #. * by the color management system based on manufacturing data,
 #. * for instance the default monitor profile is created from the
 #. * primaries specified in the monitor EDID
-#: panels/color/cc-color-profile.c:114
+#: panels/color/cc-color-profile.c:112
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "自动"
@@ -1032,13 +1085,13 @@ msgstr "自动"
 #. TRANSLATORS: the profile quality - low quality profiles take
 #. * much less time to generate but may be a poor reflection of the
 #. * device capability
-#: panels/color/cc-color-profile.c:124
+#: panels/color/cc-color-profile.c:122
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "低质量"
 
 #. TRANSLATORS: the profile quality
-#: panels/color/cc-color-profile.c:129
+#: panels/color/cc-color-profile.c:127
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "中等质量"
@@ -1046,63 +1099,44 @@ 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
+#: panels/color/cc-color-profile.c:134
 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:153
+#: panels/color/cc-color-profile.c:151
 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:160
+#: panels/color/cc-color-profile.c:158
 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:167
+#: panels/color/cc-color-profile.c:165
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "默认灰度"
 
-#: panels/color/cc-color-profile.c:190
+#: panels/color/cc-color-profile.c:188
 msgid "Vendor supplied factory calibration data"
 msgstr "生产商提供的工厂校准数据"
 
-#: panels/color/cc-color-profile.c:199
+#: panels/color/cc-color-profile.c:197
 msgid "Full-screen display correction not possible with this profile"
 msgstr "无法使用此配置进行全屏显示校准"
 
-#: panels/color/cc-color-profile.c:221
+#: panels/color/cc-color-profile.c:219
 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 "色彩"
@@ -1122,12 +1156,11 @@ msgstr ""
 msgid "Other…"
 msgstr "其他…"
 
-#: panels/common/cc-language-chooser.c:125
-#: panels/region/cc-format-chooser.c:296 panels/region/cc-input-chooser.c:178
+#: panels/common/cc-language-chooser.c:127 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "更多…"
 
-#: panels/common/cc-language-chooser.c:142
+#: panels/common/cc-language-chooser.c:144
 msgid "No languages found"
 msgstr "未找到语言"
 
@@ -1139,13 +1172,53 @@ msgstr "选择语言"
 msgid "_Select"
 msgstr "选择(_S)"
 
+#: panels/common/cc-permission-infobar.ui:20
+msgid "Unlock…"
+msgstr "解锁…"
+
+#: panels/common/cc-permission-infobar.ui:45
+msgid "Unlock to Change Settings"
+msgstr "解锁以更改设置"
+
+#: panels/common/cc-permission-infobar.ui:55
+msgid "Some settings must be unlocked before they can be changed."
+msgstr "某些设置必须先解锁才能更改。"
+
+#: panels/common/cc-time-editor.ui:33
+msgid "Increment Hour"
+msgstr ""
+
+#: panels/common/cc-time-editor.ui:65
+msgid "Increment Minute"
+msgstr ""
+
+#: panels/common/cc-time-editor.ui:80
+msgid "Time"
+msgstr "时间"
+
+#: panels/common/cc-time-editor.ui:113
+msgid "Decrement Hour"
+msgstr ""
+
+#: panels/common/cc-time-editor.ui:145
+msgid "Decrement Minute"
+msgstr ""
+
+#: panels/common/cc-time-entry.c:219
+msgid "_Copy"
+msgstr "复制(_C)"
+
+#: panels/common/cc-time-entry.c:225
+msgid "Select _All"
+msgstr "选择全部(_A)"
+
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:106
+#: panels/network/connection-editor/ce-page-details.c:152
 msgid "Today"
 msgstr "今天"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:108
+#: panels/network/connection-editor/ce-page-details.c:154
 msgid "Yesterday"
 msgstr "昨天"
 
@@ -1159,6 +1232,66 @@ msgstr "%-m月%-d日"
 msgid "%b %e, %Y"
 msgstr "%Y年%-m月%-d日"
 
+#: panels/common/cc-util.c:165
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小时"
+
+#: panels/common/cc-util.c:166
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分钟"
+
+#: panels/common/cc-util.c:167
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#. 5 hours 2 minutes 12 seconds
+#: panels/common/cc-util.c:174
+#, c-format
+msgctxt "hours minutes seconds"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 5 hours 2 minutes
+#: panels/common/cc-util.c:179
+#, c-format
+msgctxt "hours minutes"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 5 hours
+#: panels/common/cc-util.c:184
+#, c-format
+msgctxt "hours"
+msgid "%s"
+msgstr ""
+
+#. 2 minutes 12 seconds
+#: panels/common/cc-util.c:192
+#, fuzzy, c-format
+#| msgctxt "time"
+#| msgid "%s %s"
+msgctxt "minutes seconds"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 2 minutes
+#: panels/common/cc-util.c:197
+#, c-format
+msgctxt "minutes"
+msgid "%s"
+msgstr "%s"
+
+#. 0 seconds
+#: panels/common/cc-util.c:208
+msgid "0 seconds"
+msgstr "0 秒"
+
 #. translators: This is the default hotspot name, need to be less than 32-bytes
 #: panels/common/hostname-helper.c:177
 msgctxt "hotspot"
@@ -1181,17 +1314,17 @@ msgid "Year"
 msgstr "年"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:334
+#: panels/datetime/cc-datetime-panel.c:257
 msgid "%e %B %Y, %l:%M %p"
 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:339
+#: panels/datetime/cc-datetime-panel.c:262
 msgid "%e %B %Y, %R"
 msgstr "%Y年%m月%d日,%R"
 
 #. Translators: "city, country"
-#: panels/datetime/cc-datetime-panel.c:504
+#: panels/datetime/cc-datetime-panel.c:431
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -1199,7 +1332,7 @@ msgstr "%s,%s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: panels/datetime/cc-datetime-panel.c:531
+#: panels/datetime/cc-datetime-panel.c:458
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -1207,23 +1340,23 @@ 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:538
+#: panels/datetime/cc-datetime-panel.c:465
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:543
+#: panels/datetime/cc-datetime-panel.c:470
 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:548
+#: panels/datetime/cc-datetime-panel.c:475
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: panels/datetime/cc-datetime-panel.c:553
+#: panels/datetime/cc-datetime-panel.c:480
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
@@ -1282,64 +1415,47 @@ msgstr "十二月"
 msgid "Date & Time"
 msgstr "日期和时间"
 
-#: panels/datetime/cc-datetime-panel.ui:113
-#: panels/display/cc-night-light-page.ui:194
-#: panels/display/cc-night-light-page.ui:314
-msgid "Hour"
-msgstr "时"
-
-#. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: panels/datetime/cc-datetime-panel.ui:128
-msgid "∶"
-msgstr "∶"
-
-#: panels/datetime/cc-datetime-panel.ui:152
-#: panels/display/cc-night-light-page.ui:222
-#: panels/display/cc-night-light-page.ui:342
-msgid "Minute"
-msgstr "分"
-
-#: panels/datetime/cc-datetime-panel.ui:219
+#: panels/datetime/cc-datetime-panel.ui:102
 msgid "Time Zone"
 msgstr "时区"
 
-#: panels/datetime/cc-datetime-panel.ui:240
+#: panels/datetime/cc-datetime-panel.ui:123
 msgid "Search for a city"
 msgstr "搜索城市"
 
-#: panels/datetime/cc-datetime-panel.ui:313
+#: panels/datetime/cc-datetime-panel.ui:196
 msgid "Automatic _Date & Time"
 msgstr "自动设置日期和时间(_D)"
 
-#: panels/datetime/cc-datetime-panel.ui:314
+#: panels/datetime/cc-datetime-panel.ui:197
 msgid "Requires internet access"
 msgstr "需要互联网连接"
 
-#: panels/datetime/cc-datetime-panel.ui:334
+#: panels/datetime/cc-datetime-panel.ui:217
 msgid "Automatic Time _Zone"
 msgstr "自动设置时区(_Z)"
 
-#: panels/datetime/cc-datetime-panel.ui:335
+#: panels/datetime/cc-datetime-panel.ui:218
 msgid "Requires location services enabled and internet access"
 msgstr "需要启用定位服务和互联网连接"
 
-#: panels/datetime/cc-datetime-panel.ui:350
+#: panels/datetime/cc-datetime-panel.ui:233
 msgid "Date & _Time"
 msgstr "日期和时间(_T)"
 
-#: panels/datetime/cc-datetime-panel.ui:366
+#: panels/datetime/cc-datetime-panel.ui:249
 msgid "Time Z_one"
 msgstr "时区(_O)"
 
-#: panels/datetime/cc-datetime-panel.ui:405
+#: panels/datetime/cc-datetime-panel.ui:288
 msgid "Time _Format"
 msgstr "时间格式(_F)"
 
-#: panels/datetime/cc-datetime-panel.ui:414
+#: panels/datetime/cc-datetime-panel.ui:297
 msgid "24-hour"
 msgstr "24 小时"
 
-#: panels/datetime/cc-datetime-panel.ui:415
+#: panels/datetime/cc-datetime-panel.ui:298
 msgid "AM / PM"
 msgstr "上午/下午"
 
@@ -1360,21 +1476,96 @@ msgstr "更改系统时间和日期设置"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "修改时间或日期设置需要认证。"
 
-#: panels/display/cc-display-panel.c:961
+#: panels/default-apps/cc-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "_Web"
+
+#: panels/default-apps/cc-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "邮件(_M)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "日历(_C)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "音乐(_U)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "视频(_V)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:162
+#: panels/removable-media/cc-removable-media-panel.ui:162
+msgid "_Photos"
+msgstr "照片(_P)"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "默认应用程序"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+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/default-apps/gnome-default-apps-panel.desktop.in.in:19
+msgid "default;application;preferred;media;"
+msgstr "default;application;preferred;media;默认;应用程序;首选;偏好;媒体;介质;"
+
+#. translators: The first '%s' is the distributor's name, such as 'Fedora', the second '%s' is a link to the 
privacy policy
+#: panels/diagnostics/cc-diagnostics-panel.c:145
+#, c-format
+msgid ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data. %s"
+msgstr "发送匿名的技术问题报告能帮助我们改进 %s,这些报告中不含个人数据。%s"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:30
+msgid "Problem Reporting"
+msgstr "报告问题"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:67
+msgid "_Automatic Problem Reporting"
+msgstr "自动报告问题(_A)"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:3
+msgid "Diagnostics"
+msgstr "诊断"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:4
+msgid "Report your problems"
+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/diagnostics/gnome-diagnostics-panel.desktop.in.in:20
+#: panels/location/gnome-location-panel.desktop.in.in:20
+#: panels/lock/gnome-lock-panel.desktop.in.in:20
+#: panels/usage/gnome-usage-panel.desktop.in.in:20
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;privacy;"
+msgstr ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;privacy;屏幕;锁;诊断;崩溃;私有;最近;临时;索引;名称;网络;认"
+"证;标志;身份;隐私;"
+
+#: panels/display/cc-display-panel.c:955
 #: panels/network/connection-editor/connection-editor.ui:27
-#: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: panels/display/cc-display-panel.c:982
+#: panels/display/cc-display-panel.c:976
 msgid "Apply Changes?"
 msgstr "应用更改?"
 
-#: panels/display/cc-display-panel.c:987
+#: panels/display/cc-display-panel.c:981
 msgid "Changes Cannot be Applied"
 msgstr "无法应用更改"
 
-#: panels/display/cc-display-panel.c:988
+#: panels/display/cc-display-panel.c:982
 msgid "This could be due to hardware limitations."
 msgstr "这可能是硬件限制造成的。"
 
@@ -1383,7 +1574,7 @@ msgid "Single Display"
 msgstr "单显示器"
 
 #: panels/display/cc-display-panel.ui:110
-#: panels/display/cc-display-panel.ui:315
+#: panels/display/cc-display-panel.ui:312
 msgid "Join Displays"
 msgstr "加入显示器"
 
@@ -1395,6 +1586,14 @@ msgstr "镜像"
 msgid "Display Mode"
 msgstr "显示模式"
 
+#: panels/display/cc-display-panel.ui:222
+msgid "Contains top bar and Activities"
+msgstr "包含顶栏和“活动”"
+
+#: panels/display/cc-display-panel.ui:223
+msgid "Primary Display"
+msgstr "主显示器"
+
 #: panels/display/cc-display-panel.ui:245
 msgid ""
 "Drag displays to match your physical display setup. Select a display to "
@@ -1405,17 +1604,21 @@ msgstr "拖动显示器来匹配您的物理显示器布局。选择显示器可
 msgid "Display Arrangement"
 msgstr "显示器布局"
 
-#: panels/display/cc-display-panel.ui:434
+#: panels/display/cc-display-panel.ui:376
+msgid "Active Display"
+msgstr "使用中的显示器"
+
+#: panels/display/cc-display-panel.ui:423
 msgid "Display Configuration"
 msgstr "显示配置"
 
-#: panels/display/cc-display-panel.ui:453
+#: panels/display/cc-display-panel.ui:442
 #: panels/display/gnome-display-panel.desktop.in.in:3
 msgid "Displays"
 msgstr "显示器"
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: panels/display/cc-display-panel.ui:464
+#: panels/display/cc-display-panel.ui:453
 #: panels/display/cc-night-light-page.ui:111
 msgid "Night Light"
 msgstr "夜灯"
@@ -1468,11 +1671,11 @@ msgctxt "display setting"
 msgid "Scale"
 msgstr "缩放"
 
-#: panels/display/cc-night-light-page.c:622
+#: panels/display/cc-night-light-page.c:627
 msgid "More Warm"
 msgstr "增加暖色"
 
-#: panels/display/cc-night-light-page.c:634
+#: panels/display/cc-night-light-page.c:639
 msgid "Less Warm"
 msgstr "减少暖色"
 
@@ -1505,7 +1708,7 @@ msgid "Manual Schedule"
 msgstr "手动计划"
 
 #: panels/display/cc-night-light-page.ui:148
-#: panels/region/cc-format-chooser.ui:154
+#: panels/region/cc-format-chooser.ui:346
 msgid "Times"
 msgstr "时间"
 
@@ -1513,28 +1716,38 @@ msgstr "时间"
 msgid "From"
 msgstr "从"
 
+#: panels/display/cc-night-light-page.ui:194
+#: panels/display/cc-night-light-page.ui:297
+msgid "Hour"
+msgstr "时"
+
 #: panels/display/cc-night-light-page.ui:203
-#: panels/display/cc-night-light-page.ui:323
+#: panels/display/cc-night-light-page.ui:306
 msgid ":"
 msgstr ":"
 
+#: panels/display/cc-night-light-page.ui:222
+#: panels/display/cc-night-light-page.ui:325
+msgid "Minute"
+msgstr "分"
+
 #. This is the short form for the time period in the morning
 #: panels/display/cc-night-light-page.ui:234
-#: panels/display/cc-night-light-page.ui:354
+#: panels/display/cc-night-light-page.ui:337
 msgid "AM"
 msgstr "上午"
 
 #. This is the short form for the time period in the afternoon
-#: panels/display/cc-night-light-page.ui:250
-#: panels/display/cc-night-light-page.ui:370
+#: panels/display/cc-night-light-page.ui:247
+#: panels/display/cc-night-light-page.ui:350
 msgid "PM"
 msgstr "下午"
 
-#: panels/display/cc-night-light-page.ui:284
+#: panels/display/cc-night-light-page.ui:267
 msgid "To"
 msgstr "到"
 
-#: panels/display/cc-night-light-page.ui:408
+#: panels/display/cc-night-light-page.ui:374
 msgid "Color Temperature"
 msgstr "色温"
 
@@ -1552,37 +1765,11 @@ msgstr ""
 "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:162
-msgid "_Photos"
-msgstr "照片(_P)"
-
-#. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:369
-#: panels/info/cc-info-overview-panel.c:440
-#: 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
+#: panels/info-overview/cc-info-overview-panel.c:416
+#: panels/info-overview/cc-info-overview-panel.c:431
+#: panels/info-overview/cc-info-overview-panel.c:443
+#: panels/info-overview/cc-info-overview-panel.c:489
+#: panels/info-overview/cc-info-overview-panel.c:519
 msgid "Unknown"
 msgstr "未知"
 
@@ -1590,218 +1777,104 @@ msgstr "未知"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info/cc-info-overview-panel.c:460
+#: panels/info-overview/cc-info-overview-panel.c:451
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s;构建 ID:%s"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:477
+#: panels/info-overview/cc-info-overview-panel.c:466
 #, c-format
 msgid "64-bit"
 msgstr "64 位"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:480
+#: panels/info-overview/cc-info-overview-panel.c:469
 #, c-format
 msgid "32-bit"
 msgstr "32 位"
 
-#: panels/info/cc-info-overview-panel.c:710
-#, c-format
-msgid "Version %s"
-msgstr "版本 %s"
+#: panels/info-overview/cc-info-overview-panel.c:675
+msgid "X11"
+msgstr "X11 窗口系统"
+
+#: panels/info-overview/cc-info-overview-panel.c:679
+msgid "Wayland"
+msgstr "Wayland"
+
+#: panels/info-overview/cc-info-overview-panel.c:681
+msgctxt "Windowing system (Wayland, X11, or Unknown)"
+msgid "Unknown"
+msgstr "未知"
 
-#: panels/info/cc-info-overview-panel.ui:70
-msgid "Device name"
+#: panels/info-overview/cc-info-overview-panel.ui:54
+msgid "Device Name"
 msgstr "设备名称"
 
-#: panels/info/cc-info-overview-panel.ui:86
+#: panels/info-overview/cc-info-overview-panel.ui:76
 msgid "Memory"
 msgstr "内存"
 
-#: panels/info/cc-info-overview-panel.ui:102
+#: panels/info-overview/cc-info-overview-panel.ui:85
 msgid "Processor"
 msgstr "处理器"
 
-#: panels/info/cc-info-overview-panel.ui:118
+#: panels/info-overview/cc-info-overview-panel.ui:94
 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-overview/cc-info-overview-panel.ui:103
+msgid "Disk Capacity"
+msgstr "磁盘容量"
 
-#: panels/info/cc-info-overview-panel.ui:181
-msgid "Disk"
-msgstr "磁盘"
-
-#: panels/info/cc-info-overview-panel.ui:293
+#: panels/info-overview/cc-info-overview-panel.ui:104
 msgid "Calculating…"
 msgstr "正在计算…"
 
-#: panels/info/cc-info-overview-panel.ui:333
-msgid "Check for updates"
-msgstr "检查更新"
+#. translators: this field contains the distro name and version
+#: panels/info-overview/cc-info-overview-panel.ui:126
+msgid "OS Name"
+msgstr "系统名称"
 
-#: panels/info/cc-info-removable-media-panel.c:307
-msgid "Ask what to do"
-msgstr "询问如何处理"
+#: panels/info-overview/cc-info-overview-panel.ui:135
+msgid "OS Type"
+msgstr "操作系统类型"
 
-#: panels/info/cc-info-removable-media-panel.c:311
-msgid "Do nothing"
-msgstr "无动作"
+#: panels/info-overview/cc-info-overview-panel.ui:144
+msgid "GNOME Version"
+msgstr "GNOME 版本"
 
-#: panels/info/cc-info-removable-media-panel.c:315
-msgid "Open folder"
-msgstr "打开文件夹"
+#: panels/info-overview/cc-info-overview-panel.ui:154
+msgid "Windowing System"
+msgstr "窗口系统"
 
-#: panels/info/cc-info-removable-media-panel.c:401
-msgid "Other Media"
-msgstr "其他介质"
+#: panels/info-overview/cc-info-overview-panel.ui:162
+msgid "Virtualization"
+msgstr "虚拟化"
 
-#: panels/info/cc-info-removable-media-panel.c:434
-msgid "Select an application for audio CDs"
-msgstr "选择播放音频 CD 的应用程序"
+#: panels/info-overview/cc-info-overview-panel.ui:171
+msgid "Software Updates"
+msgstr "软件更新"
 
-#: panels/info/cc-info-removable-media-panel.c:435
-msgid "Select an application for video DVDs"
-msgstr "选择播放视频 DVD 的应用程序"
+#: panels/info-overview/cc-info-overview-panel.ui:192
+msgid "Rename Device"
+msgstr "重命名设备"
 
-#: panels/info/cc-info-removable-media-panel.c:436
-msgid "Select an application to run when a music player is connected"
-msgstr "选择连接音乐播放器后运行的应用程序"
+#: panels/info-overview/cc-info-overview-panel.ui:209
+msgid ""
+"The device name is used to identify this device when it is viewed over the "
+"network, or when pairing Bluetooth devices."
+msgstr "通过网络查看该设备或配对蓝牙设备时,设备名称用于标识该设备。"
 
-#: panels/info/cc-info-removable-media-panel.c:437
-msgid "Select an application to run when a camera is connected"
-msgstr "选择连接相机后运行的应用程序"
+#: panels/info-overview/cc-info-overview-panel.ui:227
+msgid "_Rename"
+msgstr "重命名(_R)"
 
-#: panels/info/cc-info-removable-media-panel.c:438
-msgid "Select an application for software CDs"
-msgstr "选择插入软件 CD 时运行的应用程序"
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3
+msgid "About"
+msgstr "关于"
 
-#. translators: these strings are duplicates of shared-mime-info
-#. * strings, just here to fix capitalization of the English originals.
-#. * If the shared-mime-info translation works for your language,
-#. * simply leave these untranslated.
-#.
-#: panels/info/cc-info-removable-media-panel.c:450
-msgid "audio DVD"
-msgstr "音频 DVD"
-
-#: panels/info/cc-info-removable-media-panel.c:451
-msgid "blank Blu-ray disc"
-msgstr "空白蓝光光盘"
-
-#: panels/info/cc-info-removable-media-panel.c:452
-msgid "blank CD disc"
-msgstr "空白 CD 光盘"
-
-#: panels/info/cc-info-removable-media-panel.c:453
-msgid "blank DVD disc"
-msgstr "空白 DVD 光盘"
-
-# 空白 HD DVD 光盘
-#: panels/info/cc-info-removable-media-panel.c:454
-msgid "blank HD DVD disc"
-msgstr "空白 HD DVD 光盘"
-
-#: panels/info/cc-info-removable-media-panel.c:455
-msgid "Blu-ray video disc"
-msgstr "蓝光视频光盘"
-
-#: panels/info/cc-info-removable-media-panel.c:456
-msgid "e-book reader"
-msgstr "电子书阅读器"
-
-#: panels/info/cc-info-removable-media-panel.c:457
-msgid "HD DVD video disc"
-msgstr "HD DVD 视频光盘"
-
-#: panels/info/cc-info-removable-media-panel.c:458
-msgid "Picture CD"
-msgstr "图片 CD"
-
-#: panels/info/cc-info-removable-media-panel.c:459
-msgid "Super Video CD"
-msgstr "超级 VCD"
-
-#: panels/info/cc-info-removable-media-panel.c:460
-msgid "Video CD"
-msgstr "视频 CD"
-
-#: panels/info/cc-info-removable-media-panel.c:461
-msgid "Windows software"
-msgstr "Windows 软件"
-
-#: panels/info/cc-info-removable-media-panel.ui:44
-msgid "Select how media should be handled"
-msgstr "选择如何处理介质"
-
-#: panels/info/cc-info-removable-media-panel.ui:75
-msgid "CD _audio"
-msgstr "CD 音频(_A)"
-
-#: panels/info/cc-info-removable-media-panel.ui:92
-msgid "_DVD video"
-msgstr "_DVD 视频"
-
-#: panels/info/cc-info-removable-media-panel.ui:133
-msgid "_Music player"
-msgstr "音乐播放器(_M)"
-
-#: panels/info/cc-info-removable-media-panel.ui:191
-msgid "_Software"
-msgstr "软件(_S)"
-
-#: panels/info/cc-info-removable-media-panel.ui:229
-msgid "_Other Media…"
-msgstr "其他介质(_O)…"
-
-#: panels/info/cc-info-removable-media-panel.ui:287
-msgid "_Never prompt or start programs on media insertion"
-msgstr "介质插入时从不提示或启动程序(_N)"
-
-#: panels/info/cc-info-removable-media-panel.ui:339
-msgid "Select how other media should be handled"
-msgstr "选择如何处理其他介质"
-
-#: panels/info/cc-info-removable-media-panel.ui:378
-msgid "_Action:"
-msgstr "动作(_A):"
-
-#: panels/info/cc-info-removable-media-panel.ui:401
-msgid "_Type:"
-msgstr "类型(_T):"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:3
-msgid "Default Applications"
-msgstr "默认应用程序"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:4
-msgid "Configure Default Applications"
-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/gnome-info-overview-panel.desktop.in.in:3
-msgid "About"
-msgstr "关于"
-
-#: panels/info/gnome-info-overview-panel.desktop.in.in:4
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "查看系统信息"
 
@@ -1810,34 +1883,16 @@ msgstr "查看系统信息"
 #. 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
+#: panels/info-overview/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;"
+"device;system;information;hostname;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/gnome-removable-media-panel.desktop.in.in:3
-msgid "Removable Media"
-msgstr "可移动介质"
-
-#: panels/info/gnome-removable-media-panel.desktop.in.in:4
-msgid "Configure Removable Media settings"
-msgstr "配置可移动介质设置"
-
-#. 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:2
 msgid "Sound and Media"
 msgstr "声音和媒体"
@@ -2010,9 +2065,44 @@ msgstr "减小文本字号"
 msgid "High contrast on or off"
 msgstr "高对比度开关"
 
-#: panels/keyboard/cc-keyboard-manager.c:501
-#: panels/keyboard/cc-keyboard-manager.c:509
-#: panels/keyboard/cc-keyboard-manager.c:809
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:8
+#: panels/keyboard/cc-keyboard-panel.ui:72
+msgid "Alternate Characters Key"
+msgstr "备用字符键"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:28
+msgid ""
+"The alternate characters key can be used to enter additional characters. "
+"These are sometimes printed as a third-option on your keyboard."
+msgstr "备用字符键可用于输入其他字符。这些有时会作为第三选项打印在键盘上。"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:45
+msgid "Left Alt"
+msgstr "左Alt键"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:61
+msgid "Right Alt"
+msgstr "右Alt键"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:77
+msgid "Left Super"
+msgstr "左Super徽标键"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:93
+msgid "Right Super"
+msgstr "右Super徽标键"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:109
+msgid "Menu key"
+msgstr "菜单键"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:125
+msgid "Right Ctrl"
+msgstr "右Ctrl键"
+
+#: panels/keyboard/cc-keyboard-manager.c:486
+#: panels/keyboard/cc-keyboard-manager.c:494
+#: panels/keyboard/cc-keyboard-manager.c:779
 msgid "Custom Shortcuts"
 msgstr "自定义快捷键"
 
@@ -2036,302 +2126,614 @@ msgstr "Compose 键"
 msgid "Modifiers-only switch to next source"
 msgstr "切换至下一输入源的修饰键"
 
-#: panels/keyboard/cc-keyboard-panel.c:180
+#: panels/keyboard/cc-keyboard-panel.c:94
+msgctxt "keyboard key"
+msgid "Right Ctrl"
+msgstr "右Ctrl键"
+
+#: panels/keyboard/cc-keyboard-panel.c:95
+msgctxt "keyboard key"
+msgid "Menu Key"
+msgstr "菜单键"
+
+#: panels/keyboard/cc-keyboard-panel.c:96
+msgctxt "keyboard key"
+msgid "Left Super"
+msgstr "左Super徽标键"
+
+#: panels/keyboard/cc-keyboard-panel.c:97
+msgctxt "keyboard key"
+msgid "Right Super"
+msgstr "左Super徽标键"
+
+#: panels/keyboard/cc-keyboard-panel.c:98
+msgctxt "keyboard key"
+msgid "Left Alt"
+msgstr "左Alt键"
+
+#: panels/keyboard/cc-keyboard-panel.c:99
+msgctxt "keyboard key"
+msgid "Right Alt"
+msgstr "右Alt键"
+
+#: panels/keyboard/cc-keyboard-panel.c:201
 msgid "Reset All Shortcuts?"
 msgstr "重置所有快捷键?"
 
-#: panels/keyboard/cc-keyboard-panel.c:183
+#: panels/keyboard/cc-keyboard-panel.c:204
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
 msgstr "重新设置快捷键可能影响您的自定义快捷键。此操作无法撤销。"
 
-#: panels/keyboard/cc-keyboard-panel.c:187
-#: panels/keyboard/shortcut-editor.ui:346
+#: panels/keyboard/cc-keyboard-panel.c:208
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:323
 #: panels/printers/authentication-dialog.ui:29
 #: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "取消"
 
-#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/keyboard/cc-keyboard-panel.c:209
 msgid "Reset All"
 msgstr "全部重置"
 
-#: panels/keyboard/cc-keyboard-panel.c:284
+#: panels/keyboard/cc-keyboard-panel.c:305
 msgid "Reset the shortcut to its default value"
 msgstr "重置快捷键为它的默认值"
 
-#: panels/keyboard/cc-keyboard-panel.ui:116
+#: panels/keyboard/cc-keyboard-panel.ui:73
+msgid "Hold down and type to enter different characters"
+msgstr "按住并输入其他字符"
+
+#: panels/keyboard/cc-keyboard-panel.ui:147
 msgid "Reset All…"
 msgstr "全部重置…"
 
-#: panels/keyboard/cc-keyboard-panel.ui:117
+#: panels/keyboard/cc-keyboard-panel.ui:148
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "重置所有快捷键为它们的默认键绑定"
 
-#: panels/keyboard/cc-keyboard-panel.ui:146
+#: panels/keyboard/cc-keyboard-panel.ui:177
 msgid "No keyboard shortcut found"
 msgstr "未找到键盘快捷键"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:411
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:419
 #, 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 将被禁用"
+msgid "%s is already being used for %s. If you replace it, %s will be disabled"
+msgstr "%s 已被用于 %s。如果您替换了它,%s 将被禁用"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:581
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:577
 msgid "Set Custom Shortcut"
 msgstr "设置自定义快捷键"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:581
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:577
 msgid "Set Shortcut"
 msgstr "设置快捷键"
 
-#. Setup the top label
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:590
+#. TRANSLATORS: %s is replaced with a description of the keyboard shortcut
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:588
 #, c-format
-msgid "Enter new shortcut to change <b>%s</b>."
-msgstr "输入新的快捷键以更改<b>%s</b>。"
+msgid "Enter new shortcut to change %s."
+msgstr "输入新的快捷键以更%s。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1019
 msgid "Add Custom Shortcut"
 msgstr "添加自定义快捷键"
 
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
-#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:340
-msgid "Keyboard Shortcuts"
-msgstr "键盘快捷键"
-
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
-msgid "View and change keyboard shortcuts and set your typing preferences"
-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:68 panels/keyboard/shortcut-editor.ui:318
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:68
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:299
 msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
 msgstr "按 Esc 以取消或 Backspace 以停用此键盘快捷键。"
 
-#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:147
+#: panels/printers/pp-details-dialog.ui:40
 msgid "Name"
 msgstr "名称"
 
-#: panels/keyboard/shortcut-editor.ui:168
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:159
 msgid "Command"
 msgstr "命令"
 
-#: panels/keyboard/shortcut-editor.ui:180
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:171
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: panels/keyboard/shortcut-editor.ui:259
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:250
 msgid "Set Shortcut…"
 msgstr "设置快捷键…"
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:260
 msgid "None"
 msgstr "无"
 
-#: panels/keyboard/shortcut-editor.ui:303
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:284
 msgid "Enter the new shortcut"
 msgstr "输入新的快捷键"
 
-#: panels/keyboard/shortcut-editor.ui:357
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:334
 msgid "Remove"
 msgstr "移除"
 
-#: panels/keyboard/shortcut-editor.ui:367
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:344
 msgid "Add"
 msgstr "添加"
 
-#: panels/keyboard/shortcut-editor.ui:382
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:359
 msgid "Replace"
 msgstr "替换"
 
-#: panels/keyboard/shortcut-editor.ui:395
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:372
 msgid "Set"
 msgstr "设置"
 
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463
-msgid "Test Your _Settings"
-msgstr "测试您的设置(_S)"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:327
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
-msgid "Mouse & Touchpad"
-msgstr "鼠标和触摸板"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "查看和更改快捷并设置打字偏好"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+#. 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 ""
-"Change your mouse or touchpad sensitivity and select right or left-handed"
-msgstr "改变鼠标和触摸板灵敏度,并选择右手或左手习惯"
-
-#. 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;"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
-"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;触摸板;指针;触摸;单"
-"击;双击;按钮;轨迹球;滚动;"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;快捷"
+"键;工作空间;窗口;更改大小;缩放;对比度;输入;源;锁定;音量;"
 
-#: panels/mouse/gnome-mouse-properties.ui:50
-msgid "General"
-msgstr "常规"
+#: panels/location/cc-location-panel.ui:31
+msgid "Location services turned off"
+msgstr "定位服务已关闭"
 
-#: panels/mouse/gnome-mouse-properties.ui:88
-msgid "Primary Button"
-msgstr "主按钮"
+#: panels/location/cc-location-panel.ui:40
+msgid "No applications can obtain location information."
+msgstr "没有应用程序可以获取位置信息。"
 
-#: panels/mouse/gnome-mouse-properties.ui:107
-msgid "Sets the order of physical buttons on mice and touchpads."
-msgstr "设置鼠标和触控板上的物理按钮的排列。"
+#: panels/location/cc-location-panel.ui:74
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
+msgstr ""
+"定位服务允许应用得知您的地理定位。使用 Wi-Fi 和移动宽带可以提高精确度。"
 
-#: panels/mouse/gnome-mouse-properties.ui:136
-#: panels/sound/cc-balance-slider.ui:13
-msgid "Left"
-msgstr "左"
+#: panels/location/cc-location-panel.ui:83
+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/mouse/gnome-mouse-properties.ui:146
-#: panels/sound/cc-balance-slider.ui:15
-msgid "Right"
-msgstr "右"
+#: panels/location/cc-location-panel.ui:95
+msgid "Allow the applications below to determine your location."
+msgstr "允许以下应用程序确定您的位置。"
 
-#: panels/mouse/gnome-mouse-properties.ui:182
-msgid "Mouse"
-msgstr "鼠标"
+#: panels/location/cc-location-panel.ui:115
+msgid "No Applications Have Asked for Location Access"
+msgstr "没有应用程序要求访问位置"
 
-#: panels/mouse/gnome-mouse-properties.ui:221
-msgid "Mouse Speed"
-msgstr "鼠标速度"
+#: panels/location/gnome-location-panel.desktop.in.in:4
+msgid "Protect your location information"
+msgstr "保护您的位置信息"
 
-#: panels/mouse/gnome-mouse-properties.ui:243
-#: panels/mouse/gnome-mouse-properties.ui:535
-msgid "Double-click timeout"
-msgstr "双击超时"
+#. FIXME
+#: panels/lock/cc-lock-panel.ui:29
+#, fuzzy
+#| msgid ""
+#| "Automatically locking the screen prevents others from access the computer "
+#| "while you're away."
+msgid ""
+"Automatically locking the screen prevents others from accessing the computer "
+"while you're away."
+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:280
-#: panels/mouse/gnome-mouse-properties.ui:443
-msgid "Natural Scrolling"
-msgstr "自然滚动"
+#: panels/lock/cc-lock-panel.ui:46
+msgid "Blank Screen Delay"
+msgstr "息屏延时"
 
-#: panels/mouse/gnome-mouse-properties.ui:296
-#: panels/mouse/gnome-mouse-properties.ui:459
-msgid "Scrolling moves the content, not the view."
-msgstr "滚动移动内容而非视图。"
+#: panels/lock/cc-lock-panel.ui:47
+msgid "Period of inactivity after which the screen will go blank."
+msgstr "闲置一段时间后,屏幕将变为空白。"
 
-#: panels/mouse/gnome-mouse-properties.ui:346
-#: panels/mouse/gnome-mouse-properties.ui:391
-msgid "Touchpad"
-msgstr "触摸板"
+#: panels/lock/cc-lock-panel.ui:67
+msgid "Automatic Screen _Lock"
+msgstr "自动锁屏(_L)"
 
-#: panels/mouse/gnome-mouse-properties.ui:514
-msgid "Touchpad Speed"
-msgstr "触摸板速度"
+#: panels/lock/cc-lock-panel.ui:84
+msgid "Automatic _Screen Lock Delay"
+msgstr "自动锁屏延迟(_S)"
 
-#: panels/mouse/gnome-mouse-properties.ui:573
-msgid "Tap to Click"
-msgstr "轻拍以点击"
+#: panels/lock/cc-lock-panel.ui:85
+msgid "Period after the screen blanks when the screen is automatically locked."
+msgstr "屏幕空白后屏幕自动锁定的时间。"
 
-#: panels/mouse/gnome-mouse-properties.ui:625
-msgid "Two-finger Scrolling"
-msgstr "双指滚动"
+#: panels/lock/cc-lock-panel.ui:105
+msgid "Show _Notifications on Lock Screen"
+msgstr "在锁定屏幕上显示通知"
 
-#: panels/mouse/gnome-mouse-properties.ui:678
-msgid "Edge Scrolling"
-msgstr "边缘滚动"
+#: panels/lock/cc-lock-panel.ui:122
+msgid "Forbid new _USB devices"
+msgstr "禁止新 _USB 设备"
 
-#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25
-msgid "Try clicking, double clicking, scrolling"
-msgstr "尝试单击、双击、滚动"
+#: panels/lock/cc-lock-panel.ui:123
+msgid ""
+"Prevent new USB devices from interacting with the system when the screen is "
+"locked."
+msgstr "在屏幕锁定时阻止新 USB 设备与系统进行交互。"
 
-#: panels/mouse/gnome-mouse-test.c:137
-msgid "Five clicks, GEGL time!"
-msgstr "点击五次,开始 GEGL!"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:168
+msgctxt "lock_screen"
+msgid "Screen Turns Off"
+msgstr "屏幕关闭"
 
-#: panels/mouse/gnome-mouse-test.c:142
-msgid "Double click, primary button"
-msgstr "主键双击"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:172
+msgctxt "lock_screen"
+msgid "30 seconds"
+msgstr "30 秒"
 
-#: panels/mouse/gnome-mouse-test.c:142
-msgid "Single click, primary button"
-msgstr "主键单击"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:176
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 分钟"
 
-#: panels/mouse/gnome-mouse-test.c:145
-msgid "Double click, middle button"
-msgstr "中键双击"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:180
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 分钟"
 
-#: panels/mouse/gnome-mouse-test.c:145
-msgid "Single click, middle button"
-msgstr "中键单击"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:184
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 分钟"
 
-#: panels/mouse/gnome-mouse-test.c:148
-msgid "Double click, secondary button"
-msgstr "副键双击"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:188
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 分钟"
 
-#: panels/mouse/gnome-mouse-test.c:148
-msgid "Single click, secondary button"
-msgstr "副键单击"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:192
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 分钟"
 
-#. add proxy to device list
-#: panels/network/cc-network-panel.c:590
-msgid "Network proxy"
-msgstr "网络代理"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:196
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 小时"
 
-#. Translators: this is the title of the connection details
-#. * window for vpn connections, it is also used to display
-#. * vpn connections in the device list.
-#.
-#: 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"
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:211 panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
+msgid "1 minute"
+msgstr "1 分钟"
 
-#: panels/network/cc-network-panel.c:789 panels/network/cc-wifi-panel.ui:306
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:215 panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
+msgid "2 minutes"
+msgstr "2 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:219 panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
+msgid "3 minutes"
+msgstr "3 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:223 panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
+msgid "4 minutes"
+msgstr "4 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:227 panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
+msgid "5 minutes"
+msgstr "5 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:231 panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
+msgid "8 minutes"
+msgstr "8 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:235 panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
+msgid "10 minutes"
+msgstr "10 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:239 panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
+msgid "12 minutes"
+msgstr "12 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:243 panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 分钟"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:247 panels/power/cc-power-panel.ui:99
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "从不"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:3
+msgid "Screen Lock"
+msgstr "锁屏"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:4
+msgid "Lock your screen"
+msgstr "锁定屏幕"
+
+#. FIXME
+#: panels/microphone/cc-microphone-panel.ui:34
+msgid "Microphone is turned off"
+msgstr "麦克风已关闭"
+
+#: panels/microphone/cc-microphone-panel.ui:43
+msgid "No applications can record sound."
+msgstr "未找到音频录制应用。"
+
+#: panels/microphone/cc-microphone-panel.ui:77
+msgid ""
+"Use of the microphone allows applications to record and listen to audio. "
+"Disabling the microphone may cause some applications to not function "
+"properly."
+msgstr ""
+"使用麦克风允许应用程序录制声音。禁用麦克风可能会导致一些应用程序功能无法正常"
+"使用。"
+
+#: panels/microphone/cc-microphone-panel.ui:87
+msgid "Allow the applications below to use your microphone."
+msgstr "允许以下应用程序使用您的麦克风。"
+
+#: panels/microphone/cc-microphone-panel.ui:107
+msgid "No Applications Have Asked for Microphone Access"
+msgstr "没有应用程序要求访问麦克风"
+
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:4
+msgid "Protect your conversations"
+msgstr "保护对话"
+
+#. FIXME
+#: panels/mouse/cc-mouse-panel.ui:37
+msgid "General"
+msgstr "常规"
+
+#: panels/mouse/cc-mouse-panel.ui:75
+msgid "Primary Button"
+msgstr "主按钮"
+
+#: panels/mouse/cc-mouse-panel.ui:94
+msgid "Sets the order of physical buttons on mice and touchpads."
+msgstr "设置鼠标和触控板上的物理按钮的排列。"
+
+#: panels/mouse/cc-mouse-panel.ui:123 panels/sound/cc-balance-slider.ui:13
+msgid "Left"
+msgstr "左"
+
+#: panels/mouse/cc-mouse-panel.ui:133 panels/sound/cc-balance-slider.ui:15
+msgid "Right"
+msgstr "右"
+
+#: panels/mouse/cc-mouse-panel.ui:169
+msgid "Mouse"
+msgstr "鼠标"
+
+#: panels/mouse/cc-mouse-panel.ui:208
+msgid "Mouse Speed"
+msgstr "鼠标速度"
+
+#: panels/mouse/cc-mouse-panel.ui:230 panels/mouse/cc-mouse-panel.ui:522
+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/cc-mouse-panel.ui:267 panels/mouse/cc-mouse-panel.ui:430
+msgid "Natural Scrolling"
+msgstr "自然滚动"
+
+#: panels/mouse/cc-mouse-panel.ui:283 panels/mouse/cc-mouse-panel.ui:446
+msgid "Scrolling moves the content, not the view."
+msgstr "滚动移动内容而非视图。"
+
+#: panels/mouse/cc-mouse-panel.ui:333 panels/mouse/cc-mouse-panel.ui:378
+msgid "Touchpad"
+msgstr "触摸板"
+
+#: panels/mouse/cc-mouse-panel.ui:501
+msgid "Touchpad Speed"
+msgstr "触摸板速度"
+
+#: panels/mouse/cc-mouse-panel.ui:560
+msgid "Tap to Click"
+msgstr "轻拍以点击"
+
+#: panels/mouse/cc-mouse-panel.ui:612
+msgid "Two-finger Scrolling"
+msgstr "双指滚动"
+
+#: panels/mouse/cc-mouse-panel.ui:665
+msgid "Edge Scrolling"
+msgstr "边缘滚动"
+
+#: panels/mouse/cc-mouse-panel.ui:719 panels/wacom/cc-wacom-panel.c:425
+msgid "Test Your _Settings"
+msgstr "测试您的设置(_S)"
+
+#: panels/mouse/cc-mouse-test.c:132 panels/mouse/cc-mouse-test.ui:25
+msgid "Try clicking, double clicking, scrolling"
+msgstr "尝试单击、双击、滚动"
+
+#: panels/mouse/cc-mouse-test.c:137
+msgid "Five clicks, GEGL time!"
+msgstr "点击五次,开始 GEGL!"
+
+#: panels/mouse/cc-mouse-test.c:142
+msgid "Double click, primary button"
+msgstr "主键双击"
+
+#: panels/mouse/cc-mouse-test.c:142
+msgid "Single click, primary button"
+msgstr "主键单击"
+
+#: panels/mouse/cc-mouse-test.c:145
+msgid "Double click, middle button"
+msgstr "中键双击"
+
+#: panels/mouse/cc-mouse-test.c:145
+msgid "Single click, middle button"
+msgstr "中键单击"
+
+#: panels/mouse/cc-mouse-test.c:148
+msgid "Double click, secondary button"
+msgstr "副键双击"
+
+#: panels/mouse/cc-mouse-test.c:148
+msgid "Single click, secondary button"
+msgstr "副键单击"
+
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
+msgstr "鼠标和触摸板"
+
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr "改变鼠标和触摸板灵敏度,并选择右手或左手习惯"
+
+#. 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;Scroll;触摸板;指针;触摸;单"
+"击;双击;按钮;轨迹球;滚动;"
+
+#: panels/network/cc-network-panel.c:648 panels/network/cc-wifi-panel.ui:306
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "抱歉,发生错误。请联系软件提供商。"
 
-#: panels/network/cc-network-panel.c:795
+#: panels/network/cc-network-panel.c:654
 msgid "NetworkManager needs to be running."
 msgstr "需要运行 NetworkManager。"
 
-#: panels/network/cc-network-panel.ui:102
+#: panels/network/cc-network-panel.ui:68
 msgid "Other Devices"
 msgstr "其他设备"
 
-#: panels/network/cc-network-panel.ui:143
-#: panels/network/connection-editor/net-connection-editor.c:581
+#: panels/network/cc-network-panel.ui:109
+#: panels/network/connection-editor/net-connection-editor.c:593
 msgid "VPN"
 msgstr "VPN"
 
-#: panels/network/cc-network-panel.ui:195
+#: panels/network/cc-network-panel.ui:153
 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
+#: panels/network/cc-wifi-connection-row.c:198
 #, c-format
 msgctxt "Wi-Fi Connection"
 msgid "%s (SSID: %s)"
 msgstr "%s (SSID: %s)"
 
+#: panels/network/cc-wifi-connection-row.c:258
+msgid "Insecure network (WEP)"
+msgstr "不安全网络(WEP)"
+
+#: panels/network/cc-wifi-connection-row.c:263
+msgid "Secure network (WPA)"
+msgstr "安全网络(WPA)"
+
+#: panels/network/cc-wifi-connection-row.c:268
+msgid "Secure network (WPA2)"
+msgstr "安全网络(WPA2)"
+
+#: panels/network/cc-wifi-connection-row.c:273
+msgid "Secure network (WPA3)"
+msgstr "安全网络(WPA3)"
+
+#: panels/network/cc-wifi-connection-row.c:278
+msgid "Secure network"
+msgstr "安全网络"
+
 #: panels/network/cc-wifi-connection-row.ui:102
-#: 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
+#: panels/network/net-device-ethernet.c:317
+#: panels/network/network-bluetooth.ui:76
+#: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414
+#: panels/network/network-vpn.ui:75
 msgid "Options…"
 msgstr "选项…"
 
-#: panels/network/cc-wifi-panel.c:284
+#. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name
+#: panels/network/cc-wifi-hotspot-dialog.c:132
+#, c-format
+msgid ""
+"Turning on the hotspot will disconnect from %s, and it will not be possible "
+"to access the internet through Wi-Fi."
+msgstr "开启热点将从 %s 断开连接,并将无法通过 Wi-Fi 连接网络。"
+
+#: panels/network/cc-wifi-hotspot-dialog.c:248
+msgid "Must have a minimum of 8 characters"
+msgstr "至少包含8个字符"
+
+#: panels/network/cc-wifi-hotspot-dialog.c:458
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "要打开 Wi-Fi 热点吗?"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:19
+msgid ""
+"Wi-Fi hotspot allows others to share your internet connection, by creating a "
+"Wi-Fi network that they can connect to. To do this, you must have an "
+"internet connection through a source other than Wi-Fi."
+msgstr ""
+"Wi-Fi热点允许其他人通过创建他们可以连接的Wi-Fi网络来共享您的互联网连接。 为"
+"此,您必须通过Wi-Fi以外的其他来源建立互联网连接。"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:44
+#: panels/network/network-wifi.ui:105
+msgid "Network Name"
+msgstr "网络名称"
+
+#. Translators: This is a password needed for printing.
+#: panels/network/cc-wifi-hotspot-dialog.ui:69
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:383
+#: panels/printers/pp-jobs-dialog.ui:70
+#: panels/user-accounts/cc-add-user-dialog.ui:249
+msgid "Password"
+msgstr "密码"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:83
+msgid "Generate Random Password"
+msgstr "生成随机密码"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:84
+msgid "Autogenerate Password"
+msgstr "自动生成密码"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:130
+msgid "_Turn On"
+msgstr "打开(_T)"
+
+#: panels/network/cc-wifi-panel.c:312
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1738
+#: panels/network/network-wifi.ui:233
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
@@ -2367,57 +2769,33 @@ msgstr "可见网络"
 msgid "NetworkManager needs to be running"
 msgstr "需要运行 NetworkManager"
 
-#: panels/network/connection-editor/8021x-security-page.ui:26
+#: panels/network/connection-editor/8021x-security-page.ui:20
 msgid "802.1x _Security"
 msgstr "802.1X 安全性(_S)"
 
-#: 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: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:238
-#: panels/network/connection-editor/security-page.ui:237
-msgid "Inner _authentication"
-msgstr "内部认证(_A)"
-
-#: 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:445
-#: panels/network/connection-editor/details-page.ui:86
-#: panels/network/network-wifi.ui:239
+#: panels/network/connection-editor/ce-page-8021x-security.c:112
+#: panels/network/connection-editor/ce-page-security.c:404
+#: panels/network/connection-editor/details-page.ui:90
 msgid "Security"
 msgstr "安全"
 
-#: panels/network/connection-editor/ce-page.c:396
+#: panels/network/connection-editor/ce-page.c:234
 msgid "Preserve"
 msgstr "预留"
 
-#: panels/network/connection-editor/ce-page.c:397
+#: panels/network/connection-editor/ce-page.c:235
 msgid "Permanent"
 msgstr "永久"
 
-#: panels/network/connection-editor/ce-page.c:398
+#: panels/network/connection-editor/ce-page.c:236
 msgid "Random"
 msgstr "随机"
 
-#: panels/network/connection-editor/ce-page.c:399
+#: panels/network/connection-editor/ce-page.c:237
 msgid "Stable"
 msgstr "固定"
 
-#: panels/network/connection-editor/ce-page.c:403
+#: panels/network/connection-editor/ce-page.c:241
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
 "network device this connection is activated on. This feature is known as MAC "
@@ -2426,300 +2804,278 @@ msgstr ""
 "此处输入的 MAC 地址将用作此连接激活所在的网络设备的硬件地址。该特性被称为 "
 "MAC 克隆或欺骗。例如:00:11:22:33:44:55"
 
-#: panels/network/connection-editor/ce-page.c:538
-msgid "automatic"
-msgstr "自动"
-
-#: panels/network/connection-editor/ce-page.c:578
+#: panels/network/connection-editor/ce-page.c:399
 #, c-format
 msgid "Profile %d"
 msgstr "配置 %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:134 panels/network/net-device-wifi.c:314
+#: panels/network/connection-editor/ce-page-details.c:93
+#: panels/network/net-device-wifi.c:235
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:138 panels/network/net-device-wifi.c:319
-#: panels/network/network-wifi.ui:592
+#: panels/network/connection-editor/ce-page-details.c:97
+#: panels/network/net-device-wifi.c:240
 msgid "WPA"
 msgstr "WPA"
 
+#. TRANSLATORS: this WPA3 WiFi security
+#: panels/network/connection-editor/ce-page-details.c:103
+msgid "WPA3"
+msgstr "WPA3"
+
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:142
+#: panels/network/connection-editor/ce-page-details.c:109
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:147
+#: panels/network/connection-editor/ce-page-details.c:115
 msgid "Enterprise"
 msgstr "企业"
 
-#: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:152 panels/network/net-device-wifi.c:304
+#: panels/network/connection-editor/ce-page-details.c:120
+#: panels/network/net-device-wifi.c:225
 msgctxt "Wifi security"
 msgid "None"
 msgstr "无"
 
-#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/network/connection-editor/ce-page-details.c:141
 msgid "Never"
 msgstr "从不"
 
-#: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:137
-#: panels/network/net-device-wifi.c:413
+#: panels/network/connection-editor/ce-page-details.c:156
+#: panels/network/net-device-ethernet.c:108
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 天前"
 
+#: panels/network/connection-editor/ce-page-details.c:281
+#, c-format
+msgid "%d Mb/s (%1.1f GHz)"
+msgstr "%d Mb/s (%1.1f GHz)"
+
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:228
-#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:536
+#: panels/network/connection-editor/ce-page-details.c:283
+#: panels/network/net-device-ethernet.c:202
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/秒"
 
-#: panels/network/connection-editor/ce-page-details.c:249
-#: panels/network/net-device-wifi.c:565
+#: panels/network/connection-editor/ce-page-details.c:300
+msgid "2.4 GHz / 5 GHz"
+msgstr "2.4 GHz / 5 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:302
+msgid "2.4 GHz"
+msgstr "2.4 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:304
+msgid "5 GHz"
+msgstr "5 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:324
 msgctxt "Signal strength"
 msgid "None"
 msgstr "无"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:567
+#: panels/network/connection-editor/ce-page-details.c:326
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "较弱"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:569
+#: panels/network/connection-editor/ce-page-details.c:328
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "一般"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:571
+#: panels/network/connection-editor/ce-page-details.c:330
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:573
+#: panels/network/connection-editor/ce-page-details.c:332
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常好"
 
-#: panels/network/connection-editor/ce-page-details.c:300
+#: panels/network/connection-editor/ce-page-details.c:390
+#: panels/network/connection-editor/details-page.ui:108
+#: panels/network/net-device-ethernet.c:143
+#: panels/network/net-device-mobile.c:430
+msgid "IPv4 Address"
+msgstr "IPv4 地址"
+
+#: panels/network/connection-editor/ce-page-details.c:391
+#: panels/network/connection-editor/details-page.ui:126
+#: panels/network/net-device-ethernet.c:144
+#: panels/network/net-device-ethernet.c:148
+#: panels/network/net-device-mobile.c:431 panels/network/network-mobile.ui:200
+msgid "IPv6 Address"
+msgstr "IPv6 地址"
+
+#: panels/network/connection-editor/ce-page-details.c:394
+#: panels/network/connection-editor/ce-page-details.c:395
+#: panels/network/net-device-ethernet.c:146
+#: panels/network/net-device-mobile.c:434
+#: panels/network/net-device-mobile.c:435 panels/network/network-mobile.ui:183
+msgid "IP Address"
+msgstr "IP 地址"
+
+#: panels/network/connection-editor/ce-page-details.c:428
 msgid "Forget Connection"
 msgstr "忘记连接"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:430
 msgid "Remove Connection Profile"
 msgstr "移除连接配置"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:432
 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:269
+#: panels/network/connection-editor/ce-page-details.c:450
 msgid "Details"
 msgstr "详细信息"
 
-#: panels/network/connection-editor/ce-page-ethernet.c:177
-#: panels/network/connection-editor/ce-page-vpn.c:188
-#: panels/network/connection-editor/ce-page-wifi.c:196
-#: panels/network/network-wifi.ui:1437
+#: panels/network/connection-editor/ce-page-ethernet.c:71
+msgid "automatic"
+msgstr "自动"
+
+#: panels/network/connection-editor/ce-page-ethernet.c:144
+#: panels/network/connection-editor/ce-page-vpn.c:150
+#: panels/network/connection-editor/ce-page-wifi.c:129
 msgid "Identity"
 msgstr "身份"
 
-#: panels/network/connection-editor/ce-page-ip4.c:251
-#: panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:268
+#: panels/network/connection-editor/ce-page-ip6.c:249
 msgid "Delete Address"
 msgstr "删除地址"
 
-#: panels/network/connection-editor/ce-page-ip4.c:422
-#: panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:428
+#: panels/network/connection-editor/ce-page-ip6.c:398
 msgid "Delete Route"
 msgstr "删除路由"
 
-#: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1441
+#: panels/network/connection-editor/ce-page-ip4.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1445
+#: panels/network/connection-editor/ce-page-ip6.c:782
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:260
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "无"
 
-#: panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:283
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 位密钥(Hex 或 ASCII)"
 
-#: panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:293
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码"
 
-#: panels/network/connection-editor/ce-page-security.c:291
-#: panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:306
+#: panels/network/wireless-security/ws-dynamic-wep.ui:20
+#: panels/network/wireless-security/ws-wpa-eap.ui:25
 msgid "LEAP"
 msgstr "LEAP"
 
-#: panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:319
 msgid "Dynamic WEP (802.1x)"
 msgstr "动态 WEP (802.1X)"
 
-#: panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:333
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 和 WPA2 个人"
 
-#: panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:347
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 和 WPA2 企业"
 
+#: panels/network/connection-editor/ce-page-security.c:361
+msgid "WPA3 Personal"
+msgstr "WPA3个人"
+
 #: 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:52
-#: panels/network/network-wifi.ui:207
+#: panels/network/connection-editor/details-page.ui:54
 msgid "Link speed"
 msgstr "链路速度"
 
-#: 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: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:140
-#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
+#: panels/network/connection-editor/details-page.ui:144
+#: panels/network/net-device-ethernet.c:151
 msgid "Hardware Address"
 msgstr "硬件地址"
 
-#: 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
+#: panels/network/connection-editor/details-page.ui:162
+msgid "Supported Frequencies"
+msgstr "支持频率"
+
+#: panels/network/connection-editor/details-page.ui:180
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/network-mobile.ui:217
 msgid "Default Route"
 msgstr "默认路由"
 
-#: 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
+#: panels/network/connection-editor/details-page.ui:199
+#: panels/network/connection-editor/ip4-page.ui:211
+#: panels/network/connection-editor/ip6-page.ui:225
+#: panels/network/net-device-ethernet.c:157
+#: panels/network/network-mobile.ui:235
 msgid "DNS"
 msgstr "DNS"
 
-#: panels/network/connection-editor/details-page.ui:195
+#: panels/network/connection-editor/details-page.ui:217
 msgid "Last Used"
 msgstr "上次使用"
 
-#: panels/network/connection-editor/details-page.ui:324
+#: panels/network/connection-editor/details-page.ui:376
 msgid "Connect _automatically"
 msgstr "自动连接(_A)"
 
-#: panels/network/connection-editor/details-page.ui:343
+#: panels/network/connection-editor/details-page.ui:395
 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/details-page.ui:428
+msgid "_Metered connection: has data limits or can incur charges"
+msgstr "计费连接:有数据限制或可能产生费用"
 
-#: panels/network/connection-editor/ethernet-page.ui:22
-msgid "Attachment Unit Interface (AUI)"
-msgstr "连接单元接口 (AUI)"
+#: panels/network/connection-editor/details-page.ui:439
+msgid ""
+"Software updates and other large downloads will not be started automatically."
+msgstr "软件更新和其他大型下载将不会自动启动。"
 
 #: panels/network/connection-editor/ethernet-page.ui:25
-msgid "BNC"
-msgstr "BNC"
-
-#: panels/network/connection-editor/ethernet-page.ui:28
-msgid "Media Independent Interface (MII)"
-msgstr "媒体独立接口 (MII)"
-
-#: panels/network/connection-editor/ethernet-page.ui:42
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:45
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:48
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:51
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: 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:100
+#: panels/network/connection-editor/ethernet-page.ui:54
 #: 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:151
+#: panels/network/connection-editor/ethernet-page.ui:105
 msgid "M_TU"
 msgstr "M_TU"
 
-#: panels/network/connection-editor/ethernet-page.ui:168
+#: panels/network/connection-editor/ethernet-page.ui:122
 #: panels/network/connection-editor/wifi-page.ui:102
 msgid "_Cloned Address"
 msgstr "克隆的地址(_C)"
 
-#: panels/network/connection-editor/ethernet-page.ui:183
+#: panels/network/connection-editor/ethernet-page.ui:137
 msgid "bytes"
 msgstr "字节"
 
@@ -2728,7 +3084,6 @@ msgid "IPv_4 Method"
 msgstr "IPv_4 方式"
 
 #: 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)"
 
@@ -2739,9 +3094,7 @@ msgstr "仅本地链路"
 
 #: 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
+#: panels/network/net-proxy.c:72 panels/network/network-proxy.ui:116
 msgid "Manual"
 msgstr "手动"
 
@@ -2750,61 +3103,74 @@ msgstr "手动"
 msgid "Disable"
 msgstr "禁用"
 
-#: panels/network/connection-editor/ip4-page.ui:111
-#: panels/network/connection-editor/ip6-page.ui:125
+#: panels/network/connection-editor/ip4-page.ui:97
+#: panels/network/connection-editor/ip6-page.ui:111
+msgid "Shared to other computers"
+msgstr "已与其他计算机共享"
+
+#: panels/network/connection-editor/ip4-page.ui:125
+#: panels/network/connection-editor/ip6-page.ui:139
 msgid "Addresses"
 msgstr "地址"
 
-#: 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
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/printers/pp-details-dialog.ui:95
 msgid "Address"
 msgstr "地址"
 
-#: panels/network/connection-editor/ip4-page.ui:143
-#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
 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
+#: panels/network/connection-editor/ip4-page.ui:171
+#: panels/network/connection-editor/ip4-page.ui:355
+#: panels/network/connection-editor/ip6-page.ui:185
+#: panels/network/connection-editor/ip6-page.ui:369
 msgid "Gateway"
 msgstr "网关"
 
-#: 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:223
+#: panels/network/connection-editor/ip4-page.ui:291
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:237
+#: panels/network/connection-editor/ip6-page.ui:305
+#: panels/network/net-proxy.c:74 panels/network/network-proxy.ui:106
+#: panels/network/wireless-security/eap-method-peap.ui:33
+msgid "Automatic"
+msgstr "自动"
+
+#: panels/network/connection-editor/ip4-page.ui:234
+#: panels/network/connection-editor/ip6-page.ui:248
+msgid "Automatic DNS"
+msgstr "自动 DNS"
 
-#: panels/network/connection-editor/ip4-page.ui:244
-#: panels/network/connection-editor/ip6-page.ui:258
+#: panels/network/connection-editor/ip4-page.ui:258
+#: panels/network/connection-editor/ip6-page.ui:272
 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
+#: panels/network/connection-editor/ip4-page.ui:279
+#: panels/network/connection-editor/ip6-page.ui:293
 msgid "Routes"
 msgstr "路由"
 
-#: panels/network/connection-editor/ip4-page.ui:288
-#: panels/network/connection-editor/ip6-page.ui:302
+#: panels/network/connection-editor/ip4-page.ui:302
+#: panels/network/connection-editor/ip6-page.ui:316
 msgid "Automatic Routes"
 msgstr "自动路由"
 
 #. 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
+#: panels/network/connection-editor/ip4-page.ui:368
+#: panels/network/connection-editor/ip6-page.ui:382
 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
+#: panels/network/connection-editor/ip4-page.ui:398
+#: panels/network/connection-editor/ip6-page.ui:412
 msgid "Use this connection _only for resources on its network"
 msgstr "仅对该网络上的资源使用此连接(_O)"
 
@@ -2816,37 +3182,36 @@ msgstr "IPv_6 方式"
 msgid "Automatic, DHCP only"
 msgstr "自动,仅 DHCP"
 
-#: panels/network/connection-editor/ip6-page.ui:157
-#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Prefix"
 msgstr "前缀"
 
-#: panels/network/connection-editor/net-connection-editor.c:261
+#: panels/network/connection-editor/net-connection-editor.c:288
 msgid "Unable to open connection editor"
 msgstr "无法打开连接编辑器"
 
-#: panels/network/connection-editor/net-connection-editor.c:279
+#: panels/network/connection-editor/net-connection-editor.c:304
 msgid "New Profile"
 msgstr "新配置"
 
-#: panels/network/connection-editor/net-connection-editor.c:727
+#: panels/network/connection-editor/net-connection-editor.c:737
 msgid "Import from file…"
 msgstr "从文件导入…"
 
-#: panels/network/connection-editor/net-connection-editor.c:759
+#: panels/network/connection-editor/net-connection-editor.c:769
 msgid "Add VPN"
 msgstr "添加 VPN"
 
-#: panels/network/connection-editor/security-page.ui:26
-#: panels/network/network-wifi.ui:529
+#: panels/network/connection-editor/security-page.ui:20
 msgid "S_ecurity"
 msgstr "安全(_E)"
 
-#: panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:139
 msgid "Cannot import VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:141
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2858,29 +3223,29 @@ msgstr ""
 "\n"
 "错误:%s。"
 
-#: panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:173
 msgid "Select file to import"
 msgstr "选择要导入的文件"
 
-#: panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:225
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "名为“%s”的文件已存在。"
 
-#: panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:227
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:229
 #, 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:264
 msgid "Cannot export VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:266
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -2891,7 +3256,7 @@ msgstr ""
 "\n"
 "错误:%s。"
 
-#: panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:296
 msgid "Export VPN connection"
 msgstr "导出 VPN 连接"
 
@@ -2900,12 +3265,10 @@ msgid "(Error: unable to load VPN connection editor)"
 msgstr "(错误:无法载入 VPN 连接编辑器)"
 
 #: 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:36
-#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
@@ -2931,28 +3294,19 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;网络;无线;无线保真;"
 "互联网协议;局域网;宽带;域名系统;热点;"
 
-#: panels/network/net-device-ethernet.c:123
-#: panels/network/net-device-wifi.c:399
+#: panels/network/net-device-ethernet.c:96
 msgid "never"
 msgstr "从不"
 
-#: panels/network/net-device-ethernet.c:133
-#: panels/network/net-device-wifi.c:409
+#: panels/network/net-device-ethernet.c:104
 msgid "today"
 msgstr "今天"
 
-#: panels/network/net-device-ethernet.c:135
-#: panels/network/net-device-wifi.c:411
+#: panels/network/net-device-ethernet.c:106
 msgid "yesterday"
 msgstr "昨天"
 
-#: 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:189 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:162
 msgid "Last used"
 msgstr "上次使用"
 
@@ -2961,81 +3315,55 @@ msgstr "上次使用"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:291
-#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
+#: panels/network/net-device-ethernet.c:251
+#: panels/network/network-bluetooth.ui:38 panels/network/network-ethernet.ui:18
 msgid "Wired"
 msgstr "有线"
 
-#: panels/network/net-device-mobile.c:236
+#: panels/network/net-device-mobile.c:207
 msgid "Add new connection"
 msgstr "添加新连接"
 
-#: panels/network/net-device-wifi.c:1217
-#, 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:1221
-msgid ""
-"It is not possible to access the Internet through your wireless while the "
-"hotspot is active."
-msgstr "启用热点模式时无法通过无线网络访问互联网。"
-
-#: panels/network/net-device-wifi.c:1228
-msgid "Turn On Wi-Fi Hotspot?"
-msgstr "要打开 Wi-Fi 热点吗?"
-
-#: panels/network/net-device-wifi.c:1250
-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:1261
-msgid "_Turn On"
-msgstr "打开(_T)"
-
-#: panels/network/net-device-wifi.c:1338
+#: panels/network/net-device-wifi.c:798
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户?"
 
-#: panels/network/net-device-wifi.c:1341
+#: panels/network/net-device-wifi.c:801
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
-#: panels/network/net-device-wifi.c:1397
-msgid "System policy prohibits use as a Hotspot"
-msgstr "系统策略禁止作为热点使用"
-
-#: panels/network/net-device-wifi.c:1400
-msgid "Wireless device does not support Hotspot mode"
-msgstr "无线设备不支持热点模式"
-
-#: panels/network/net-device-wifi.c:1558
+#: panels/network/net-device-wifi.c:905
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "所选网络的细节,包括密码和全部自定义设置都将丢失。"
 
-#: panels/network/net-device-wifi.c:1562 panels/network/network-wifi.ui:1350
+#: panels/network/net-device-wifi.c:909
 msgid "_Forget"
 msgstr "忘记(_F)"
 
-#: panels/network/net-device-wifi.c:1725 panels/network/net-device-wifi.c:1732
+#: panels/network/net-device-wifi.c:1065 panels/network/net-device-wifi.c:1072
 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:1769
+#: panels/network/net-device-wifi.c:1107
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "忘记(_F)"
 
-#: panels/network/net-proxy.c:54
-#: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2085
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
+#: panels/network/net-device-wifi.c:1271
+msgid "System policy prohibits use as a Hotspot"
+msgstr "系统策略禁止作为热点使用"
+
+#: panels/network/net-device-wifi.c:1274
+msgid "Wireless device does not support Hotspot mode"
+msgstr "无线设备不支持热点模式"
+
+#: panels/network/net-proxy.c:70
+#: panels/notifications/cc-notifications-panel.c:268
+#: panels/power/cc-power-panel.c:2043 panels/power/cc-power-panel.c:2054
+#: panels/universal-access/cc-ua-panel.c:480
 #: panels/universal-access/cc-ua-panel.c:840
 #: panels/universal-access/cc-ua-panel.c:853
 #: panels/universal-access/cc-ua-panel.c:865
@@ -3047,12 +3375,12 @@ msgstr "忘记(_F)"
 #: panels/universal-access/cc-ua-panel.ui:674
 #: panels/universal-access/cc-ua-panel.ui:720
 #: panels/universal-access/cc-ua-panel.ui:766
-#: panels/universal-access/cc-ua-panel.ui:918
+#: panels/universal-access/cc-ua-panel.ui:950
 msgid "Off"
 msgstr "关"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:113
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "若未提供配置 URL,将使用网络代理自动发现。"
@@ -3061,664 +3389,566 @@ 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:110
+#: panels/network/net-proxy.c:121
 msgid "This is not recommended for untrusted public networks."
 msgstr "对于不可信的公共网络,不建议这样做。"
 
-#: panels/network/network-mobile.ui:30
+#. update title
+#. Translators: this is the title of the connection details
+#. * window for vpn connections, it is also used to display
+#. * vpn connections in the device list.
+#.
+#: panels/network/net-vpn.c:66 panels/network/net-vpn.c:163
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
+
+#: panels/network/network-bluetooth.ui:50
+msgid "Turn device off"
+msgstr "关闭设备"
+
+#: panels/network/network-mobile.ui:29
 msgid "IMEI"
 msgstr "IMEI"
 
-#: panels/network/network-mobile.ui:48
+#: panels/network/network-mobile.ui:47
 msgid "Provider"
 msgstr "提供者"
 
-#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:95
 msgid "Network Proxy"
 msgstr "网络代理"
 
-#: panels/network/network-proxy.ui:173
+#: panels/network/network-proxy.ui:176
 msgid "_HTTP Proxy"
 msgstr "_HTTP 代理"
 
-#: panels/network/network-proxy.ui:192
+#: panels/network/network-proxy.ui:195
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS 代理"
 
-#: panels/network/network-proxy.ui:211
+#: panels/network/network-proxy.ui:214
 msgid "_FTP Proxy"
 msgstr "_FTP 代理"
 
-#: panels/network/network-proxy.ui:230
+#: panels/network/network-proxy.ui:233
 msgid "_Socks Host"
 msgstr "_Socks 主机"
 
-#: panels/network/network-proxy.ui:249
+#: panels/network/network-proxy.ui:252
 msgid "_Ignore Hosts"
 msgstr "忽略主机(_I)"
 
-#: panels/network/network-proxy.ui:287
+#: panels/network/network-proxy.ui:290
 msgid "HTTP proxy port"
 msgstr "HTTP 代理端口"
 
-#: panels/network/network-proxy.ui:364
+#: panels/network/network-proxy.ui:367
 msgid "HTTPS proxy port"
 msgstr "HTTPS 代理端口"
 
-#: panels/network/network-proxy.ui:385
+#: panels/network/network-proxy.ui:388
 msgid "FTP proxy port"
 msgstr "FTP 代理端口"
 
-#: panels/network/network-proxy.ui:406
+#: panels/network/network-proxy.ui:409
 msgid "Socks proxy port"
 msgstr "SOCKS 代理端口"
 
-#: panels/network/network-proxy.ui:435
+#: panels/network/network-proxy.ui:438
 msgid "_Configuration URL"
 msgstr "配置 URL(_C)"
 
-#: panels/network/network-simple.ui:50
-msgid "Turn device off"
-msgstr "关闭设备"
-
-#: panels/network/network-vpn.ui:56
+#: panels/network/network-vpn.ui:55
 msgid "Turn VPN connection off"
 msgstr "关闭 VPN 连接"
 
-#: panels/network/network-wifi.ui:127
-msgid "Automatic _Connect"
-msgstr "自动连接(_C)"
-
-#: panels/network/network-wifi.ui:474
-msgid "details"
-msgstr "详细信息"
-
-#: 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:216
-msgid "_Password"
-msgstr "密码(_P)"
-
-#: panels/network/network-wifi.ui:621
-msgid "Show P_assword"
-msgstr "显示密码(_A)"
-
-#: panels/network/network-wifi.ui:651
-msgid "Make available to other users"
-msgstr "对其他用户可用"
-
-#: panels/network/network-wifi.ui:679
-msgid "identity"
-msgstr "身份"
-
-#: 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:779 panels/network/network-wifi.ui:1056
-msgid "Link-local only"
-msgstr "仅本地链路"
-
-#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
-msgid "Shared with other computers"
-msgstr "与其他计算机共享"
-
-#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193
-msgid "_Ignore automatically obtained routes"
-msgstr "忽略自动获取的路由(_I)"
-
-#: panels/network/network-wifi.ui:959
-msgid "ipv4"
-msgstr "ipv4"
-
-#: 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:1276
-msgid "_Cloned MAC Address"
-msgstr "克隆的 MAC 地址(_C)"
-
-#: panels/network/network-wifi.ui:1334
-msgid "_Reset"
-msgstr "重置(_R)"
-
-#: 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:1387
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect to it."
-msgstr "删除关于这个网络的所有细节,不再尝试自动连接。"
-
-#: panels/network/network-wifi.ui:1449
-msgid "Hardware"
-msgstr "硬件"
-
-#: panels/network/network-wifi.ui:1453
-msgctxt "tab"
-msgid "Reset"
-msgstr "重置"
-
-#: panels/network/network-wifi.ui:1505
+#: panels/network/network-wifi.ui:37
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi 热点"
 
-#: panels/network/network-wifi.ui:1523
+#: panels/network/network-wifi.ui:55
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "关闭以连接到无线网络"
 
-#: panels/network/network-wifi.ui:1572
-msgid "Network Name"
-msgstr "网络名称"
-
-#: panels/network/network-wifi.ui:1590
-msgid "Connected Devices"
-msgstr "已连接的设备"
-
-#: panels/network/network-wifi.ui:1608
+#: panels/network/network-wifi.ui:123
 msgid "Security type"
 msgstr "安全类型"
 
-#: panels/network/network-wifi.ui:1671
+#: panels/network/network-wifi.ui:175
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "密码"
 
-#: panels/network/network-wifi.ui:1768
+#: panels/network/network-wifi.ui:264
 msgid "Turn Wi-Fi off"
 msgstr "关闭 Wi-Fi"
 
-#: panels/network/network-wifi.ui:1800
+#: panels/network/network-wifi.ui:296
 msgid "_Connect to Hidden Network…"
 msgstr "连接到隐藏网络(_C)…"
 
-#: panels/network/network-wifi.ui:1810
+#: panels/network/network-wifi.ui:307
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "打开 Wi-Fi 热点(_T)…"
 
-#: panels/network/network-wifi.ui:1820
+#: panels/network/network-wifi.ui:318
 msgid "_Known Wi-Fi Networks"
 msgstr "已知的 Wi-Fi 网络(_K)"
 
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:127
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#. TRANSLATORS: AP type
-#: 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:37
 msgid "Status unknown"
 msgstr "未知状态"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:151
+#: panels/network/panel-common.c:41
 msgid "Unmanaged"
 msgstr "未托管"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:155
+#. TRANSLATORS: Status of Parental Controls setup
+#: panels/network/panel-common.c:45 panels/user-accounts/cc-user-panel.c:950
 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:55
 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:59
 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:63
 msgid "Connected"
 msgstr "已连接"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:177
+#: panels/network/panel-common.c:67
 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:71
 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:75
 msgid "Status unknown (missing)"
 msgstr "未知状态(丢失)"
 
-#. TRANSLATORS: VPN status
-#: 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:96
 msgid "Configuration failed"
 msgstr "配置失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:252
+#: panels/network/panel-common.c:100
 msgid "IP configuration failed"
 msgstr "IP 配置失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:256
+#: panels/network/panel-common.c:104
 msgid "IP configuration expired"
 msgstr "IP 配置已过期"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:260
+#: panels/network/panel-common.c:108
 msgid "Secrets were required, but not provided"
 msgstr "需要认证凭据,但没有提供"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:264
+#: panels/network/panel-common.c:112
 msgid "802.1x supplicant disconnected"
 msgstr "802.1X 客户端已断开"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:268
+#: panels/network/panel-common.c:116
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1X 客户端配置失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:272
+#: panels/network/panel-common.c:120
 msgid "802.1x supplicant failed"
 msgstr "802.1X 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:276
+#: panels/network/panel-common.c:124
 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:128
 msgid "PPP service failed to start"
 msgstr "PPP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:284
+#: panels/network/panel-common.c:132
 msgid "PPP service disconnected"
 msgstr "PPP 服务已断开"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:288
+#: panels/network/panel-common.c:136
 msgid "PPP failed"
 msgstr "PPP 失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:292
+#: panels/network/panel-common.c:140
 msgid "DHCP client failed to start"
 msgstr "DHCP 客户端启动失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:296
+#: panels/network/panel-common.c:144
 msgid "DHCP client error"
 msgstr "DHCP 客户端错误"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:300
+#: panels/network/panel-common.c:148
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:304
+#: panels/network/panel-common.c:152
 msgid "Shared connection service failed to start"
 msgstr "共享连接服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:308
+#: panels/network/panel-common.c:156
 msgid "Shared connection service failed"
 msgstr "共享连接服务失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:312
+#: panels/network/panel-common.c:160
 msgid "AutoIP service failed to start"
 msgstr "AutoIP 服务启动失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:316
+#: panels/network/panel-common.c:164
 msgid "AutoIP service error"
 msgstr "AutoIP 服务出错"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:320
+#: panels/network/panel-common.c:168
 msgid "AutoIP service failed"
 msgstr "AutoIP 服务失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:324
+#: panels/network/panel-common.c:172
 msgid "Line busy"
 msgstr "线路忙"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:328
+#: panels/network/panel-common.c:176
 msgid "No dial tone"
 msgstr "无拨号音"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:332
+#: panels/network/panel-common.c:180
 msgid "No carrier could be established"
 msgstr "无法建立载波"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:336
+#: panels/network/panel-common.c:184
 msgid "Dialing request timed out"
 msgstr "拨号请求超时"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:340
+#: panels/network/panel-common.c:188
 msgid "Dialing attempt failed"
 msgstr "拨号尝试失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:344
+#: panels/network/panel-common.c:192
 msgid "Modem initialization failed"
 msgstr "调制解调器初始化失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:348
+#: panels/network/panel-common.c:196
 msgid "Failed to select the specified APN"
 msgstr "无法选择指定的 APN"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:352
+#: panels/network/panel-common.c:200
 msgid "Not searching for networks"
 msgstr "未在搜索网络"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:356
+#: panels/network/panel-common.c:204
 msgid "Network registration denied"
 msgstr "网络注册被拒绝"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:360
+#: panels/network/panel-common.c:208
 msgid "Network registration timed out"
 msgstr "网络注册超时"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:364
+#: panels/network/panel-common.c:212
 msgid "Failed to register with the requested network"
 msgstr "无法在请求的网络上注册"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:368
+#: panels/network/panel-common.c:216
 msgid "PIN check failed"
 msgstr "PIN 检查失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:372
+#: panels/network/panel-common.c:220
 msgid "Firmware for the device may be missing"
 msgstr "设备可能缺少固件"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:376
+#: panels/network/panel-common.c:224
 msgid "Connection disappeared"
 msgstr "连接丢失"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:380
+#: panels/network/panel-common.c:228
 msgid "Existing connection was assumed"
 msgstr "已假定为现有连接"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:384
+#: panels/network/panel-common.c:232
 msgid "Modem not found"
 msgstr "未找到调制解调器"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:388
+#: panels/network/panel-common.c:236
 msgid "Bluetooth connection failed"
 msgstr "蓝牙连接失败"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:392
+#: panels/network/panel-common.c:240
 msgid "SIM Card not inserted"
 msgstr "未插入 SIM 卡"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:396
+#: panels/network/panel-common.c:244
 msgid "SIM Pin required"
 msgstr "需要 SIM PIN 码"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:400
+#: panels/network/panel-common.c:248
 msgid "SIM Puk required"
 msgstr "需要 SIM PUK 码"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:404
+#: panels/network/panel-common.c:252
 msgid "SIM wrong"
 msgstr "SIM 错误"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:408
+#: panels/network/panel-common.c:256
 msgid "Connection dependency failed"
 msgstr "连接依赖失败"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:433
+#: panels/network/panel-common.c:351
 msgid "Firmware missing"
 msgstr "固件缺失"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:437
+#: panels/network/panel-common.c:355
 msgid "Cable unplugged"
 msgstr "线缆已拔出"
 
-#: panels/network/wireless-security/eap-method.c:69
+#: panels/network/wireless-security/eap-method.c:92
 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:195
 msgid "no file selected"
 msgstr "未选择文件"
 
-#: panels/network/wireless-security/eap-method.c:276
+#: panels/network/wireless-security/eap-method.c:222
 msgid "unspecified error validating eap-method file"
 msgstr "验证 eap-method 文件时发生未知错误"
 
-#: panels/network/wireless-security/eap-method.c:451
+#: panels/network/wireless-security/eap-method.c:397
 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:454
+#: panels/network/wireless-security/eap-method.c:400
 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:87
 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:361
-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:299
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:347
 msgid "Choose a PAC file"
 msgstr "选择 PAC 文件"
 
-#: panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:352
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:22
+#: panels/network/wireless-security/eap-method-fast.ui:13
+#: panels/network/wireless-security/eap-method-peap.ui:21
+#: panels/network/wireless-security/eap-method-ttls.ui:37
+msgid "GTC"
+msgstr "GTC"
+
+#: panels/network/wireless-security/eap-method-fast.ui:17
+#: panels/network/wireless-security/eap-method-peap.ui:13
+#: panels/network/wireless-security/eap-method-ttls.ui:21
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: panels/network/wireless-security/eap-method-fast.ui:29
 msgid "Anonymous"
 msgstr "匿名"
 
-#: panels/network/wireless-security/eap-method-fast.ui:25
+#: panels/network/wireless-security/eap-method-fast.ui:32
 msgid "Authenticated"
 msgstr "已认证"
 
-#: panels/network/wireless-security/eap-method-fast.ui:28
+#: panels/network/wireless-security/eap-method-fast.ui:35
 msgid "Both"
 msgstr "两者"
 
-#: panels/network/wireless-security/eap-method-fast.ui:76
+#: panels/network/wireless-security/eap-method-fast.ui:49
+#: panels/network/wireless-security/eap-method-peap.ui:52
+#: panels/network/wireless-security/eap-method-ttls.ui:51
+msgid "Anony_mous identity"
+msgstr "匿名身份(_M)"
+
+#: panels/network/wireless-security/eap-method-fast.ui:75
 msgid "PAC _file"
 msgstr "PAC 文件(_F)"
 
-#: 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:123
+#: panels/network/wireless-security/eap-method-fast.ui:115
+#: panels/network/wireless-security/eap-method-peap.ui:150
+#: panels/network/wireless-security/eap-method-ttls.ui:143
 msgid "_Inner authentication"
 msgstr "内部认证(_I)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:156
+#: panels/network/wireless-security/eap-method-fast.ui:144
 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:64
 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:73
 msgid "missing EAP-LEAP password"
 msgstr "缺失 EAP-LEAP 密码"
 
-#: 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/network/wireless-security/eap-method-leap.ui:17
+#: panels/network/wireless-security/eap-method-simple.ui:17
+#: panels/network/wireless-security/ws-leap.ui:18
 #: 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: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
+#: panels/network/wireless-security/eap-method-leap.ui:31
+#: panels/network/wireless-security/eap-method-simple.ui:31
+#: panels/network/wireless-security/ws-leap.ui:32
+#: panels/network/wireless-security/ws-wpa-psk.ui:14
+#: panels/sharing/cc-sharing-panel.ui:204
+#: 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:436
+msgid "_Password"
+msgstr "密码(_P)"
+
+#: panels/network/wireless-security/eap-method-leap.ui:55
+#: panels/network/wireless-security/eap-method-simple.ui:73
+#: panels/network/wireless-security/eap-method-tls.ui:157
+#: panels/network/wireless-security/ws-leap.ui:56
+#: panels/network/wireless-security/ws-wpa-psk.ui:64
 msgid "Sho_w password"
 msgstr "显示密码(_W)"
 
-#: panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:87
 #, 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:96
 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:346
-#: 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:492
-#: panels/network/wireless-security/eap-method-ttls.c:440
+#: panels/network/wireless-security/eap-method-peap.c:328
+#: panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-ttls.c:336
 msgid "Choose a Certificate Authority certificate"
 msgstr "选择 CA 证书"
 
-#: panels/network/wireless-security/eap-method-peap.ui:25
+#: panels/network/wireless-security/eap-method-peap.ui:17
+#: panels/network/wireless-security/eap-method-ttls.ui:33
+#: panels/network/wireless-security/ws-wpa-eap.ui:15
+msgid "MD5"
+msgstr "MD5"
+
+#: panels/network/wireless-security/eap-method-peap.ui:36
 msgid "Version 0"
 msgstr "版本 0"
 
-#: panels/network/wireless-security/eap-method-peap.ui:28
+#: panels/network/wireless-security/eap-method-peap.ui:39
 msgid "Version 1"
 msgstr "版本 1"
 
-#: 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:82
+#: panels/network/wireless-security/eap-method-peap.ui:78
+#: panels/network/wireless-security/eap-method-tls.ui:68
+#: panels/network/wireless-security/eap-method-ttls.ui:102
 msgid "C_A certificate"
 msgstr "C_A 证书"
 
-#: 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:105
+#: panels/network/wireless-security/eap-method-peap.ui:100
+#: panels/network/wireless-security/eap-method-tls.ui:90
+#: panels/network/wireless-security/eap-method-ttls.ui:125
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 证书(_R)"
 
-#: panels/network/wireless-security/eap-method-peap.ui:114
+#: panels/network/wireless-security/eap-method-peap.ui:118
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)"
 
-#: panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:78
 msgid "missing EAP username"
 msgstr "缺失 EAP 用户名"
 
-#: panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:91
 msgid "missing EAP password"
 msgstr "缺失 EAP 密码"
 
-#: panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:91
 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:101
 #, 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:111
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "无效的 EAP-TLS CA 证书:未指定证书"
 
-#: panels/network/wireless-security/eap-method-tls.c:100
+#: panels/network/wireless-security/eap-method-tls.c:125
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "无效的 EAP-TLS CA 私钥:%s"
 
-#: panels/network/wireless-security/eap-method-tls.c:110
+#: panels/network/wireless-security/eap-method-tls.c:135
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "无效的 EAP-TLS 用户证书:%s"
 
-#: panels/network/wireless-security/eap-method-tls.c:307
+#: panels/network/wireless-security/eap-method-tls.c:266
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私钥不安全"
 
-#: panels/network/wireless-security/eap-method-tls.c:310
+#: panels/network/wireless-security/eap-method-tls.c:269
 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 "
@@ -3731,92 +3961,97 @@ msgstr ""
 "\n"
 "(您可以使用 openssl 来对私钥进行密码保护)"
 
-#: panels/network/wireless-security/eap-method-tls.c:486
+#: panels/network/wireless-security/eap-method-tls.c:500
 msgid "Choose your personal certificate"
 msgstr "选择您的个人证书"
 
-#: panels/network/wireless-security/eap-method-tls.c:498
+#: panels/network/wireless-security/eap-method-tls.c:514
 msgid "Choose your private key"
 msgstr "选择您的私钥"
 
-#: panels/network/wireless-security/eap-method-tls.ui:24
+#: panels/network/wireless-security/eap-method-tls.ui:17
 msgid "I_dentity"
 msgstr "身份(_D)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:50
+#: panels/network/wireless-security/eap-method-tls.ui:43
 msgid "_User certificate"
 msgstr "用户证书(_U)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:115
+#: panels/network/wireless-security/eap-method-tls.ui:108
 msgid "Private _key"
 msgstr "私钥(_K)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:140
+#: panels/network/wireless-security/eap-method-tls.ui:133
 msgid "_Private key password"
 msgstr "私钥密码(_P)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:98
 #, 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:106
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "无效的 EAP-TTLS CA 证书:未指定证书"
 
-#: panels/network/wireless-security/eap-method-ttls.c:269
+#: panels/network/wireless-security/eap-method-ttls.ui:13
 msgid "PAP"
 msgstr "PAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:284
+#: panels/network/wireless-security/eap-method-ttls.ui:17
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:315
+#: panels/network/wireless-security/eap-method-ttls.ui:25
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2(无 EAP)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:331
+#: panels/network/wireless-security/eap-method-ttls.ui:29
 msgid "CHAP"
 msgstr "CHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.ui:56
+#: panels/network/wireless-security/eap-method-ttls.ui:76
 #: panels/user-accounts/cc-add-user-dialog.ui:507
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "域(_D)"
 
-#: panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:71
 msgid "Unknown error validating 802.1X security"
 msgstr "验证 802.1X 安全性时发生未知错误"
 
-#: panels/network/wireless-security/wireless-security.c:453
+#: panels/network/wireless-security/ws-dynamic-wep.ui:15
+#: panels/network/wireless-security/ws-wpa-eap.ui:20
 msgid "TLS"
 msgstr "TLS"
 
-#: panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/ws-dynamic-wep.ui:25
+#: panels/network/wireless-security/ws-wpa-eap.ui:30
 msgid "PWD"
 msgstr "PWD"
 
-#: panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/ws-dynamic-wep.ui:30
+#: panels/network/wireless-security/ws-wpa-eap.ui:35
 msgid "FAST"
 msgstr "FAST"
 
-#: panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/ws-dynamic-wep.ui:35
+#: panels/network/wireless-security/ws-wpa-eap.ui:40
 msgid "Tunneled TLS"
 msgstr "隧道 TLS"
 
-#: panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/ws-dynamic-wep.ui:40
+#: panels/network/wireless-security/ws-wpa-eap.ui:45
 msgid "Protected EAP (PEAP)"
 msgstr "受保护的 EAP (PEAP)"
 
-#: 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
+#: panels/network/wireless-security/ws-dynamic-wep.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:102
+#: panels/network/wireless-security/ws-wpa-eap.ui:61
 msgid "Au_thentication"
 msgstr "认证(_T)"
 
-#: panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:65
 msgid "missing leap-username"
 msgstr "缺失 leap-username"
 
@@ -3868,15 +4103,15 @@ msgstr "开放系统"
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: panels/network/wireless-security/ws-wep-key.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:48
 msgid "_Key"
 msgstr "密钥(_K)"
 
-#: panels/network/wireless-security/ws-wep-key.ui:94
+#: panels/network/wireless-security/ws-wep-key.ui:84
 msgid "Sho_w key"
 msgstr "显示密钥(_W)"
 
-#: panels/network/wireless-security/ws-wep-key.ui:152
+#: panels/network/wireless-security/ws-wep-key.ui:134
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)"
 
@@ -3892,7 +4127,7 @@ msgstr ""
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "无效的 wep-psk:无法将 64 字节作为十六进制来解析密钥"
 
-#: panels/network/wireless-security/ws-wpa-psk.ui:50
+#: panels/network/wireless-security/ws-wpa-psk.ui:42
 msgid "_Type"
 msgstr "类型(_T)"
 
@@ -3935,10 +4170,9 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "锁屏时显示显示消息内容(_O)"
 
-#: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2080 panels/power/cc-power-panel.c:2087
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
+#: panels/notifications/cc-notifications-panel.c:268
+#: panels/power/cc-power-panel.c:2049 panels/power/cc-power-panel.c:2056
+#: panels/universal-access/cc-ua-panel.c:480
 #: panels/universal-access/cc-ua-panel.c:840
 #: panels/universal-access/cc-ua-panel.c:853
 #: panels/universal-access/cc-ua-panel.c:865
@@ -3946,11 +4180,11 @@ msgstr "锁屏时显示显示消息内容(_O)"
 msgid "On"
 msgstr "开"
 
-#: panels/notifications/cc-notifications-panel.ui:70
-msgid "Notification _Popups"
-msgstr "通知弹窗(_P)"
+#: panels/notifications/cc-notifications-panel.ui:49
+msgid "_Do Not Disturb"
+msgstr "勿扰(_D)"
 
-#: panels/notifications/cc-notifications-panel.ui:121
+#: panels/notifications/cc-notifications-panel.ui:57
 msgid "_Lock Screen Notifications"
 msgstr "锁屏通知(_L)"
 
@@ -3964,29 +4198,29 @@ msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr ""
 "Notifications;Banner;Message;Tray;Popup;通知;横幅;条幅;消息;托盘;弹出;弹窗;"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:150
+#: panels/online-accounts/cc-online-accounts-panel.c:151
 msgctxt "Online Account"
 msgid "Other"
 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
+#: panels/online-accounts/cc-online-accounts-panel.c:625
 #, c-format
 msgid "%s Account"
 msgstr "%s 帐号"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:923
+#: panels/online-accounts/cc-online-accounts-panel.c:918
 msgid "Error removing account"
 msgstr "移除帐号出错"
 
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: panels/online-accounts/cc-online-accounts-panel.c:988
+#: panels/online-accounts/cc-online-accounts-panel.c:984
 #, c-format
-msgid "<b>%s</b> removed"
-msgstr "<b>%s</b> 已移除"
+msgid "%s removed"
+msgstr "%s 已移除"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
 msgid "Online Accounts"
@@ -4010,7 +4244,7 @@ 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
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:61
 msgid "Undo"
 msgstr "撤消"
 
@@ -4026,21 +4260,21 @@ msgstr "无互联网连接——连接以设置新的在线帐号"
 msgid "Add an account"
 msgstr "添加帐号"
 
-#: panels/online-accounts/online-accounts.ui:243
+#: panels/online-accounts/online-accounts.ui:240
 msgid "Remove Account"
 msgstr "移除帐号"
 
-#: panels/power/cc-power-panel.c:327
+#: panels/power/cc-power-panel.c:334
 msgid "Unknown time"
 msgstr "未知时间"
 
-#: panels/power/cc-power-panel.c:333
+#: panels/power/cc-power-panel.c:340
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分钟"
 
-#: panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:352
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -4048,292 +4282,255 @@ 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:353
+#: panels/power/cc-power-panel.c:360
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: panels/power/cc-power-panel.c:354
+#: panels/power/cc-power-panel.c:361
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "时"
 
-#: panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:362
 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:373
+#: panels/power/cc-power-panel.c:380
 #, 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:380
+#: panels/power/cc-power-panel.c:387
 #, 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:385
+#: panels/power/cc-power-panel.c:392
 #, c-format
 msgid "%s remaining"
 msgstr "剩余 %s"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:390 panels/power/cc-power-panel.c:420
+#: panels/power/cc-power-panel.c:397 panels/power/cc-power-panel.c:427
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424
+#: panels/power/cc-power-panel.c:401 panels/power/cc-power-panel.c:431
 msgid "Not charging"
 msgstr "未充电"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428
+#: panels/power/cc-power-panel.c:405 panels/power/cc-power-panel.c:435
 msgid "Empty"
 msgstr "已耗尽"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:411
+#: panels/power/cc-power-panel.c:418
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:416
+#: panels/power/cc-power-panel.c:423
 msgid "Discharging"
 msgstr "正在放电"
 
-#: panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:556
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主电池"
 
-#: panels/power/cc-power-panel.c:551
+#: panels/power/cc-power-panel.c:558
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "附加电池"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:626
+#: panels/power/cc-power-panel.c:633
 msgid "Wireless mouse"
 msgstr "无线鼠标"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:636
 msgid "Wireless keyboard"
 msgstr "无线键盘"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:639
 msgid "Uninterruptible power supply"
 msgstr "不间断电源(UPS)"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:635
+#: panels/power/cc-power-panel.c:642
 msgid "Personal digital assistant"
 msgstr "个人数字助理(PDA)"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:638
+#: panels/power/cc-power-panel.c:645
 msgid "Cellphone"
 msgstr "手机"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:648
 msgid "Media player"
 msgstr "媒体播放器"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:644 panels/wacom/cc-wacom-panel.c:848
+#: panels/power/cc-power-panel.c:651 panels/wacom/cc-wacom-panel.c:794
 msgid "Tablet"
 msgstr "手写板"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:647
+#: panels/power/cc-power-panel.c:654
 msgid "Computer"
 msgstr "计算机"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:650
+#: panels/power/cc-power-panel.c:657
 msgid "Gaming input device"
 msgstr "游戏输入设备"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:653 panels/power/cc-power-panel.c:911
-#: panels/power/cc-power-panel.c:2430
+#: panels/power/cc-power-panel.c:660 panels/power/cc-power-panel.c:940
+#: panels/power/cc-power-panel.c:2396
 msgid "Battery"
 msgstr "电池"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:714
+#: panels/power/cc-power-panel.c:721
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "正在充电"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:721
+#: panels/power/cc-power-panel.c:728
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "警告"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:726
+#: panels/power/cc-power-panel.c:733
 msgctxt "Battery power"
 msgid "Low"
 msgstr "低"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:731
+#: panels/power/cc-power-panel.c:738
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充足"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:736
+#: panels/power/cc-power-panel.c:743
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "已充满"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:740
+#: panels/power/cc-power-panel.c:747
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "电池已耗尽"
 
-#: panels/power/cc-power-panel.c:909
+#: panels/power/cc-power-panel.c:938
 msgid "Batteries"
 msgstr "电池"
 
-#: panels/power/cc-power-panel.c:1274
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d 小时"
-
-#: panels/power/cc-power-panel.c:1276
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d 分钟"
-
-#: panels/power/cc-power-panel.c:1279
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
-
-#. 5 hours 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1284
-#, c-format
-msgctxt "time"
-msgid "%s %s %s"
-msgstr "%s %s %s"
-
-#. 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1287
-#, c-format
-msgctxt "time"
-msgid "%s %s"
-msgstr "%s %s"
-
-#. 0 seconds
-#: panels/power/cc-power-panel.c:1293
-msgid "0 seconds"
-msgstr "0 秒"
-
-#: panels/power/cc-power-panel.c:1390
+#: panels/power/cc-power-panel.c:1366
 msgid "When _idle"
 msgstr "空闲时(_I)"
 
-#: panels/power/cc-power-panel.c:1835
+#: panels/power/cc-power-panel.c:1804
 msgid "Power Saving"
 msgstr "节电"
 
-#: panels/power/cc-power-panel.c:1869
+#: panels/power/cc-power-panel.c:1838
 msgid "_Screen Brightness"
 msgstr "屏幕亮度(_S)"
 
-#: panels/power/cc-power-panel.c:1890
+#: panels/power/cc-power-panel.c:1859
 msgid "Automatic Brightness"
 msgstr "自动亮度"
 
-#: panels/power/cc-power-panel.c:1903
+#: panels/power/cc-power-panel.c:1872
 msgid "_Keyboard Brightness"
 msgstr "键盘亮度(_K)"
 
-#: panels/power/cc-power-panel.c:1914
+#: panels/power/cc-power-panel.c:1883
 msgid "_Dim Screen When Inactive"
 msgstr "无操作时使屏幕变暗(_D)"
 
-#: panels/power/cc-power-panel.c:1932
+#: panels/power/cc-power-panel.c:1901
 msgid "_Blank Screen"
 msgstr "息屏(_B)"
 
-#: panels/power/cc-power-panel.c:1955
+#: panels/power/cc-power-panel.c:1924
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: panels/power/cc-power-panel.c:1956
+#: panels/power/cc-power-panel.c:1925
 msgid "Wi-Fi can be turned off to save power."
 msgstr "可以关闭 Wi-Fi 以节省电源。"
 
-#: panels/power/cc-power-panel.c:1972
+#: panels/power/cc-power-panel.c:1941
 msgid "_Mobile Broadband"
 msgstr "移动宽带(_M)"
 
-#: panels/power/cc-power-panel.c:1973
+#: panels/power/cc-power-panel.c:1942
 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
 msgstr "可以关闭移动宽带(LTE、4G、3G 等)以节省电源。"
 
-#: panels/power/cc-power-panel.c:2023
+#: panels/power/cc-power-panel.c:1992
 msgid "_Bluetooth"
 msgstr "蓝牙(_B)"
 
-#: panels/power/cc-power-panel.c:2024
+#: panels/power/cc-power-panel.c:1993
 msgid "Bluetooth can be turned off to save power."
 msgstr "可以关闭蓝牙以节省电源。"
 
-#: panels/power/cc-power-panel.c:2076
+#: panels/power/cc-power-panel.c:2045
 msgid "When on battery power"
 msgstr "电池供电时"
 
-#: panels/power/cc-power-panel.c:2078
+#: panels/power/cc-power-panel.c:2047
 msgid "When plugged in"
 msgstr "插入电源时"
 
-#: panels/power/cc-power-panel.c:2172
+#: panels/power/cc-power-panel.c:2138
 msgid "Suspend"
 msgstr "挂起"
 
-#: panels/power/cc-power-panel.c:2173
+#: panels/power/cc-power-panel.c:2139
 msgid "Power Off"
 msgstr "电源关闭"
 
-#: panels/power/cc-power-panel.c:2174
+#: panels/power/cc-power-panel.c:2140
 msgid "Hibernate"
 msgstr "休眠"
 
-#: panels/power/cc-power-panel.c:2175
+#: panels/power/cc-power-panel.c:2141
 msgid "Nothing"
 msgstr "不处理"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2275
+#: panels/power/cc-power-panel.c:2240
 msgid "Suspend & Power Button"
 msgstr "挂起和关机按钮"
 
-#: panels/power/cc-power-panel.c:2316
+#: panels/power/cc-power-panel.c:2281
 msgid "_Automatic Suspend"
 msgstr "自动挂起(_A)"
 
-#: panels/power/cc-power-panel.c:2317
+#: panels/power/cc-power-panel.c:2282
 msgid "Automatic suspend"
 msgstr "自动挂起"
 
-#: panels/power/cc-power-panel.c:2374
+#: panels/power/cc-power-panel.c:2340
 msgid "Po_wer Button Action"
 msgstr "电源按钮操作(_W)"
 
@@ -4397,66 +4594,6 @@ msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 小时"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:63
-msgctxt "blank_screen"
-msgid "1 minute"
-msgstr "1 分钟"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:67
-msgctxt "blank_screen"
-msgid "2 minutes"
-msgstr "2 分钟"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:71
-msgctxt "blank_screen"
-msgid "3 minutes"
-msgstr "3 分钟"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:75
-msgctxt "blank_screen"
-msgid "4 minutes"
-msgstr "4 分钟"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:79
-msgctxt "blank_screen"
-msgid "5 minutes"
-msgstr "5 分钟"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:83
-msgctxt "blank_screen"
-msgid "8 minutes"
-msgstr "8 分钟"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:87
-msgctxt "blank_screen"
-msgid "10 minutes"
-msgstr "10 分钟"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:91
-msgctxt "blank_screen"
-msgid "12 minutes"
-msgstr "12 分钟"
-
-#. 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 "自动挂起"
@@ -4470,7 +4607,7 @@ msgid "On _Battery Power"
 msgstr "使用电池时(_B)"
 
 #: panels/power/cc-power-panel.ui:233 panels/power/cc-power-panel.ui:293
-#: panels/universal-access/cc-ua-panel.ui:1495
+#: panels/universal-access/cc-ua-panel.ui:1527
 msgid "Delay"
 msgstr "延迟"
 
@@ -4486,9 +4623,10 @@ msgstr "查看电池状态并更改省电设置"
 #: panels/power/gnome-power-panel.desktop.in.in:19
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"Energy;"
 msgstr ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"电源;睡眠;挂起;休眠;电池;亮度;暗;空白;监视器;显示器;空闲;"
+"Energy;电源;睡眠;挂起;休眠;电池;亮度;暗;空白;监视器;显示器;空闲;能源;能耗;"
 
 #: panels/printers/authentication-dialog.ui:11
 msgid " "
@@ -4500,65 +4638,33 @@ 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
+#: panels/printers/new-printer-dialog.ui:362
+#: panels/printers/pp-jobs-dialog.ui:57
 msgid "Username"
 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 "密码"
-
 #: panels/printers/authentication-dialog.ui:139
 #: panels/printers/new-printer-dialog.ui:337
 msgid "Authentication Required"
 msgstr "需要认证"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:715
+#: panels/printers/cc-printers-panel.c:721
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "已删除打印机“%s”"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:938
+#: panels/printers/cc-printers-panel.c:990
 msgid "Failed to add new printer."
 msgstr "添加新打印机失败。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1242
+#: panels/printers/cc-printers-panel.c:1322
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "无法载入界面:%s"
 
-#: panels/printers/details-dialog.ui:64 panels/printers/printer-entry.ui:223
-msgid "Location"
-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/details-dialog.ui:152
-msgid "Searching for preferred drivers…"
-msgstr "正在搜索首选驱动…"
-
-#: panels/printers/details-dialog.ui:174
-msgid "Search for Drivers"
-msgstr "搜索驱动"
-
-#: panels/printers/details-dialog.ui:182
-msgid "Select from Database…"
-msgstr "从数据库选择…"
-
-#: panels/printers/details-dialog.ui:190
-msgid "Install PPD File…"
-msgstr "安装 PPD 文件…"
-
 #: panels/printers/gnome-printers-panel.desktop.in.in:3
 msgid "Printers"
 msgstr "打印机"
@@ -4574,35 +4680,10 @@ 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: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:354
-msgid "No Active Printer Jobs"
-msgstr "没有活动的打印机任务"
-
 #. 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
+#: panels/printers/pp-new-printer-dialog.c:356
+#: panels/printers/pp-new-printer-dialog.c:413
 msgid "Add Printer"
 msgstr "添加打印机"
 
@@ -4627,33 +4708,53 @@ msgstr "输入网络地址或搜索打印机"
 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
+#: panels/printers/pp-details-dialog.c:75
+#: panels/printers/pp-details-dialog.c:370
 #, c-format
 msgid "%s Details"
 msgstr "%s 详细信息"
 
-#: panels/printers/pp-details-dialog.c:180
+#: panels/printers/pp-details-dialog.c:122
 msgid "No suitable driver found"
 msgstr "未找到合适的驱动"
 
-#: panels/printers/pp-details-dialog.c:310
+#: panels/printers/pp-details-dialog.c:249
 msgid "Select PPD File"
 msgstr "选择 PPD 文件"
 
-#: panels/printers/pp-details-dialog.c:319
+#: panels/printers/pp-details-dialog.c:258
 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/pp-details-dialog.ui:68 panels/printers/printer-entry.ui:223
+msgid "Location"
+msgstr "位置"
+
+#. Translators: Name of column showing printer drivers
+#: panels/printers/pp-details-dialog.ui:122
+#: panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "驱动"
+
+#: panels/printers/pp-details-dialog.ui:162
+msgid "Searching for preferred drivers…"
+msgstr "正在搜索首选驱动…"
+
+#: panels/printers/pp-details-dialog.ui:183
+msgid "Search for Drivers"
+msgstr "搜索驱动"
+
+#: panels/printers/pp-details-dialog.ui:192
+msgid "Select from Database…"
+msgstr "从数据库选择…"
+
+#: panels/printers/pp-details-dialog.ui:201
+msgid "Install PPD File…"
+msgstr "安装 PPD 文件…"
+
 #: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "选择打印机驱动"
@@ -4668,12 +4769,12 @@ msgid "Loading drivers database…"
 msgstr "正在载入驱动数据库…"
 
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:472
+#: panels/printers/pp-host.c:479
 msgid "JetDirect Printer"
 msgstr "JetDirect 打印机"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:707
+#: panels/printers/pp-host.c:714
 msgid "LPD Printer"
 msgstr "LPD 打印机"
 
@@ -4716,215 +4817,247 @@ msgid "Reverse portrait"
 msgstr "纵向倒转"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: panels/printers/pp-jobs-dialog.c:234
+#: panels/printers/pp-jobs-dialog.c:222
 msgctxt "print job"
 msgid "Pending"
 msgstr "等待中"
 
 #. Translators: Job's state (job is held for printing)
-#: panels/printers/pp-jobs-dialog.c:240
+#: panels/printers/pp-jobs-dialog.c:228
 msgctxt "print job"
 msgid "Paused"
 msgstr "暂停"
 
 #. Translators: Job's state (job needs authentication to proceed further)
-#: panels/printers/pp-jobs-dialog.c:245
+#: panels/printers/pp-jobs-dialog.c:233
 msgctxt "print job"
 msgid "Authentication required"
 msgstr "需要认证"
 
 #. Translators: Job's state (job is currently printing)
-#: panels/printers/pp-jobs-dialog.c:250
+#: panels/printers/pp-jobs-dialog.c:238
 msgctxt "print job"
 msgid "Processing"
 msgstr "正在处理"
 
 #. Translators: Job's state (job has been stopped)
-#: panels/printers/pp-jobs-dialog.c:254
+#: panels/printers/pp-jobs-dialog.c:242
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: panels/printers/pp-jobs-dialog.c:258
+#: panels/printers/pp-jobs-dialog.c:246
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: panels/printers/pp-jobs-dialog.c:262
+#: panels/printers/pp-jobs-dialog.c:250
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: panels/printers/pp-jobs-dialog.c:266
+#: panels/printers/pp-jobs-dialog.c:254
 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
+#: panels/printers/pp-jobs-dialog.c:363
 #, 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:613
+#: panels/printers/pp-jobs-dialog.c:520
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — 活动任务"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:617
+#: panels/printers/pp-jobs-dialog.c:524
 #, c-format
 msgid "Enter credentials to print from %s."
 msgstr "从 %s 输入凭据以打印。"
 
-#: panels/printers/pp-new-printer-dialog.c:380
+#. Translators: This is a windows domain used with SMB protocol.
+#: panels/printers/pp-jobs-dialog.ui:44
+msgid "Domain"
+msgstr "域"
+
+#. Translators: This button authenticates all print jobs and send them for printing.
+#: panels/printers/pp-jobs-dialog.ui:129
+msgid "A_uthenticate"
+msgstr "认证(_U)"
+
+#. Translators: this action removes (purges) all the listed jobs from the list.
+#: panels/printers/pp-jobs-dialog.ui:169
+msgid "Clear All"
+msgstr "全部清除"
+
+#. Translators: This button pop up authentication dialog for print jobs which need credentials.
+#: panels/printers/pp-jobs-dialog.ui:232
+msgid "_Authenticate"
+msgstr "认证(_A)"
+
+#. Translators: this label describes the dialog empty state, with no jobs listed.
+#: panels/printers/pp-jobs-dialog.ui:358
+msgid "No Active Printer Jobs"
+msgstr "没有活动的打印机任务"
+
+#: panels/printers/pp-new-printer-dialog.c:371
 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
+#: panels/printers/pp-new-printer-dialog.c:375
 #, 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
+#: panels/printers/pp-new-printer-dialog.c:379
 #, c-format
 msgid "Enter username and password to view printers on %s."
 msgstr "输入用户名和密码以查看 %s 上的打印机。"
 
-#: panels/printers/pp-new-printer-dialog.c:838
+#: panels/printers/pp-new-printer-dialog.c:816
 msgid "Searching for Printers"
 msgstr "正在搜索打印机"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1680
+#: panels/printers/pp-new-printer-dialog.c:1653
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1685
+#: panels/printers/pp-new-printer-dialog.c:1658
 msgid "Serial Port"
 msgstr "串口"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1692
+#: panels/printers/pp-new-printer-dialog.c:1665
 msgid "Parallel Port"
 msgstr "并口"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1734
+#: panels/printers/pp-new-printer-dialog.c:1707
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1739
+#: panels/printers/pp-new-printer-dialog.c:1712
 #, 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:1766
+#: panels/printers/pp-new-printer-dialog.c:1739
 msgid "Server requires authentication"
 msgstr "服务器要求认证"
 
-#: panels/printers/pp-options-dialog.c:90
+#: panels/printers/pp-options-dialog.c:91
 msgid "Two Sided"
 msgstr "双面"
 
-#: panels/printers/pp-options-dialog.c:91
+#: panels/printers/pp-options-dialog.c:92
 msgid "Paper Type"
 msgstr "纸张类型"
 
-#: panels/printers/pp-options-dialog.c:92
+#: panels/printers/pp-options-dialog.c:93
 msgid "Paper Source"
 msgstr "纸张来源"
 
-#: panels/printers/pp-options-dialog.c:93
+#: panels/printers/pp-options-dialog.c:94
 msgid "Output Tray"
 msgstr "出纸托盘"
 
-#: panels/printers/pp-options-dialog.c:94
+#: panels/printers/pp-options-dialog.c:95
 msgctxt "printing option"
 msgid "Resolution"
 msgstr "分辨率"
 
-#: panels/printers/pp-options-dialog.c:95
+#: panels/printers/pp-options-dialog.c:96
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript 预过滤"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: panels/printers/pp-options-dialog.c:548
+#: panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "每面页数"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: panels/printers/pp-options-dialog.c:560
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "双面"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/printers/pp-options-dialog.c:572
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "方向"
 
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:669
+#: panels/printers/pp-options-dialog.c:655
 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:672
+#: panels/printers/pp-options-dialog.c:658
 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:675
+#: panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "可安装选项"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:678
+#: panels/printers/pp-options-dialog.c:664
 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:681
+#: panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "图像质量"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: panels/printers/pp-options-dialog.c:684
+#: panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "色彩"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:687
+#: panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "正在完成"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:690
+#: panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "高级"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:920
+#. Translators: This button triggers the printing of a test page.
+#: panels/printers/pp-options-dialog.c:869
+#: panels/printers/pp-options-dialog.ui:18
+msgid "Test Page"
+msgstr "测试页"
+
+#. Translators: Name of job which makes printer to print test page
+#: panels/printers/pp-options-dialog.c:882
 msgid "Test page"
 msgstr "测试页"
 
@@ -4970,17 +5103,22 @@ msgid "Manufacturer"
 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
+#: panels/printers/pp-printer-entry.c:592 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "无活动任务"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:611
+#: panels/printers/pp-printer-entry.c:597
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u 项任务"
 
+#. Translators: Name of job which makes printer to clean its heads
+#: panels/printers/pp-printer-entry.c:715
+msgid "Clean print heads"
+msgstr "清理喷墨头"
+
 #. Translators: The printer is low on toner
 #: panels/printers/pp-printer-entry.c:766
 msgid "Low on toner"
@@ -5042,7 +5180,7 @@ 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
+#: panels/printers/pp-printer-entry.c:933
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "已停止"
@@ -5068,28 +5206,23 @@ 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
+#: panels/printers/pp-printer-entry.c:919
 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
+#: panels/printers/pp-printer-entry.c:924
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "不接收任务"
 
 #. Translators: Printer's state (jobs are processing)
-#: panels/printers/pp-printer-entry.c:914
+#: panels/printers/pp-printer-entry.c:929
 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 "打印选项"
@@ -5131,7 +5264,7 @@ msgid "Restart"
 msgstr "重启"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:20
+#: panels/printers/printers.ui:12
 msgid "Add…"
 msgstr "添加…"
 
@@ -5151,415 +5284,74 @@ msgid ""
 "doesn’t seem to be available."
 msgstr "抱歉,系统打印服务似乎不可用。"
 
-#: panels/privacy/cc-privacy-panel.c:423 panels/privacy/cc-privacy-panel.ui:280
-msgid "Screen Lock"
-msgstr "锁屏"
-
-#: panels/privacy/cc-privacy-panel.c:467
-msgid "In use"
-msgstr "已占用"
-
-#: panels/privacy/cc-privacy-panel.c:472
-msgctxt "Location services status"
-msgid "On"
-msgstr "开启"
-
-#: panels/privacy/cc-privacy-panel.c:473
-msgctxt "Location services status"
-msgid "Off"
-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: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:1157
-msgid "Empty all items from Trash?"
-msgstr "清空回收站中的所有项目吗?"
-
-#: panels/privacy/cc-privacy-panel.c:1158
-msgid "All items in the Trash will be permanently deleted."
-msgstr "回收站内的所有项目将会永久删除。"
-
-#: panels/privacy/cc-privacy-panel.c:1159
-msgid "_Empty Trash"
-msgstr "清空回收站(_E)"
-
-#: panels/privacy/cc-privacy-panel.c:1180
-msgid "Delete all the temporary files?"
-msgstr "删除所有临时文件吗?"
-
-#: panels/privacy/cc-privacy-panel.c:1181
-msgid "All the temporary files will be permanently deleted."
-msgstr "所有临时文件将会永久删除。"
-
-#: panels/privacy/cc-privacy-panel.c:1182
-msgid "_Purge Temporary Files"
-msgstr "清理临时文件(_P)"
-
-#: 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:1237
-#: panels/privacy/cc-privacy-panel.ui:637
-msgid "Software Usage"
-msgstr "软件使用统计"
-
-#: 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: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:1300
-#: panels/privacy/cc-privacy-panel.ui:719
-msgid "Privacy Policy"
-msgstr "隐私政策"
-
-#. 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 "屏幕关闭"
-
-#. 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 秒"
-
-#. 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 天"
-
-#. 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 天"
-
-#. 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 天"
-
-#. 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 天"
-
-#. 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 天"
-
-#. 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 天"
-
-#. 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 天"
-
-#. 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 天"
-
-#. 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 天"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:118
-msgctxt "retain_history"
-msgid "Forever"
-msgstr "永久"
-
-#: 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/cc-privacy-panel.ui:176
-msgid "_Recently Used"
-msgstr "最近使用(_R)"
-
-#: panels/privacy/cc-privacy-panel.ui:207
-msgid "Retain _History"
-msgstr "保留历史(_H)"
-
-#: panels/privacy/cc-privacy-panel.ui:247
-msgid "Cl_ear Recent History"
-msgstr "清理最近历史(_E)"
-
-#: panels/privacy/cc-privacy-panel.ui:301
-msgid "The Screen Lock protects your privacy when you are away."
-msgstr "离开时锁定屏幕可以保护隐私。"
-
-#: panels/privacy/cc-privacy-panel.ui:328
-msgid "Automatic Screen _Lock"
-msgstr "自动锁屏(_L)"
-
-#: panels/privacy/cc-privacy-panel.ui:362
-msgid "Lock screen _after blank for"
-msgstr "黑屏至锁屏的等待时间(_A)"
-
-#: panels/privacy/cc-privacy-panel.ui:394
-msgid "Lock Screen _Notifications"
-msgstr "锁屏通知(_N)"
-
-#: 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/cc-privacy-panel.ui:483
-msgid "Automatically empty _Trash"
-msgstr "自动清空回收站(_T)"
-
-#: panels/privacy/cc-privacy-panel.ui:515
-msgid "Automatically purge Temporary _Files"
-msgstr "自动清理临时文件(_F)"
-
-#: panels/privacy/cc-privacy-panel.ui:546
-msgid "Purge _After"
-msgstr "清理延时(_A)"
-
-#: 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 "
-"software.\n"
-"\n"
-"All the information we collect is made anonymous, and we will never share "
-"your data with third parties."
-msgstr ""
-"发送软件的使用情况有助于我们向提供更准确的推荐,帮助改进软件。\n"
-"\n"
-"信息均为匿名收集,不会与他人分享。"
-
-#: panels/privacy/cc-privacy-panel.ui:681
-msgid "_Send software usage statistics"
-msgstr "发送软件使用统计信息(_S)"
-
-#: 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 和移动宽带可以提高精确度。"
-
-#: 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/cc-privacy-panel.ui:1038
-msgid "_Location Services"
-msgstr "定位服务(_L)"
-
-#: panels/privacy/cc-privacy-panel.ui:1236
-msgid "_Automatic Problem Reporting"
-msgstr "自动报告问题(_A)"
-
-#: 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:133
+#: panels/region/cc-format-chooser.c:148
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "英制"
 
-#: panels/region/cc-format-chooser.c:135
+#: panels/region/cc-format-chooser.c:150
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "公制"
 
-#: panels/region/cc-format-chooser.c:314
-msgid "No regions found"
-msgstr "无可用区域"
-
-#: panels/region/cc-format-chooser.ui:7
+#: panels/region/cc-format-chooser.c:255 panels/region/cc-format-chooser.c:296
+#: panels/region/cc-format-chooser.ui:6
 msgid "Formats"
 msgstr "格式"
 
-#: panels/region/cc-format-chooser.ui:106
+#: panels/region/cc-format-chooser.ui:48
+#: panels/user-accounts/cc-fingerprint-dialog.ui:53
+#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:232
+msgid "Back"
+msgstr "后退"
+
+#: panels/region/cc-format-chooser.ui:103
+msgid ""
+"Choose the format for numbers, dates and currencies. Changes take effect on "
+"next login."
+msgstr "选择数字,日期和货币的格式。 更改将在下次登录时生效。"
+
+#: panels/region/cc-format-chooser.ui:119
+msgid "Search locales..."
+msgstr "搜索地区..."
+
+#: panels/region/cc-format-chooser.ui:160
+msgid "Common Formats"
+msgstr "常见格式"
+
+#: panels/region/cc-format-chooser.ui:191
+msgid "All Formats"
+msgstr "所有格式"
+
+#: panels/region/cc-format-chooser.ui:244
+msgid "No Search Results"
+msgstr "无结果"
+
+#: panels/region/cc-format-chooser.ui:257
+msgid "Searches can be for countries or languages."
+msgstr "搜索可以是国家或语言。"
+
+#: panels/region/cc-format-chooser.ui:309
 msgid "Preview"
 msgstr "预览"
 
-#: panels/region/cc-format-chooser.ui:123
+#: panels/region/cc-format-chooser.ui:324
 msgid "Dates"
 msgstr "日期"
 
-#: panels/region/cc-format-chooser.ui:185
+#: panels/region/cc-format-chooser.ui:368
 msgid "Dates & Times"
 msgstr "日期与时间"
 
-#: panels/region/cc-format-chooser.ui:216
+#: panels/region/cc-format-chooser.ui:390
 msgid "Numbers"
 msgstr "数字"
 
-#: panels/region/cc-format-chooser.ui:233
+#: panels/region/cc-format-chooser.ui:412
 msgid "Measurement"
 msgstr "度量"
 
-#: panels/region/cc-format-chooser.ui:250
+#: panels/region/cc-format-chooser.ui:434
 msgid "Paper"
 msgstr "纸张"
 
@@ -5580,7 +5372,7 @@ msgstr "添加输入源"
 msgid "Input methods can’t be used on the login screen"
 msgstr "无法在登录屏幕上使用输入法"
 
-#: panels/region/cc-region-panel.c:1511
+#: panels/region/cc-region-panel.c:1507
 msgid "Login _Screen"
 msgstr "登录屏幕(_S)"
 
@@ -5667,15 +5459,188 @@ msgstr "选择您的显示语言、格式、键盘布局和输入源"
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Language;Layout;Keyboard;Input;语言;布局;键盘;输入;"
 
-#: panels/search/cc-search-locations-dialog.c:610
+#: panels/removable-media/cc-removable-media-panel.c:267
+msgid "Ask what to do"
+msgstr "询问如何处理"
+
+#: panels/removable-media/cc-removable-media-panel.c:271
+msgid "Do nothing"
+msgstr "无动作"
+
+#: panels/removable-media/cc-removable-media-panel.c:275
+msgid "Open folder"
+msgstr "打开文件夹"
+
+#: panels/removable-media/cc-removable-media-panel.c:341
+msgid "Other Media"
+msgstr "其他介质"
+
+#: panels/removable-media/cc-removable-media-panel.c:362
+msgid "Select an application for audio CDs"
+msgstr "选择播放音频 CD 的应用程序"
+
+#: panels/removable-media/cc-removable-media-panel.c:363
+msgid "Select an application for video DVDs"
+msgstr "选择播放视频 DVD 的应用程序"
+
+#: panels/removable-media/cc-removable-media-panel.c:364
+msgid "Select an application to run when a music player is connected"
+msgstr "选择连接音乐播放器后运行的应用程序"
+
+#: panels/removable-media/cc-removable-media-panel.c:365
+msgid "Select an application to run when a camera is connected"
+msgstr "选择连接相机后运行的应用程序"
+
+#: panels/removable-media/cc-removable-media-panel.c:366
+msgid "Select an application for software CDs"
+msgstr "选择插入软件 CD 时运行的应用程序"
+
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: panels/removable-media/cc-removable-media-panel.c:378
+msgid "audio DVD"
+msgstr "音频 DVD"
+
+#: panels/removable-media/cc-removable-media-panel.c:379
+msgid "blank Blu-ray disc"
+msgstr "空白蓝光光盘"
+
+#: panels/removable-media/cc-removable-media-panel.c:380
+msgid "blank CD disc"
+msgstr "空白 CD 光盘"
+
+#: panels/removable-media/cc-removable-media-panel.c:381
+msgid "blank DVD disc"
+msgstr "空白 DVD 光盘"
+
+# 空白 HD DVD 光盘
+#: panels/removable-media/cc-removable-media-panel.c:382
+msgid "blank HD DVD disc"
+msgstr "空白 HD DVD 光盘"
+
+#: panels/removable-media/cc-removable-media-panel.c:383
+msgid "Blu-ray video disc"
+msgstr "蓝光视频光盘"
+
+#: panels/removable-media/cc-removable-media-panel.c:384
+msgid "e-book reader"
+msgstr "电子书阅读器"
+
+#: panels/removable-media/cc-removable-media-panel.c:385
+msgid "HD DVD video disc"
+msgstr "HD DVD 视频光盘"
+
+#: panels/removable-media/cc-removable-media-panel.c:386
+msgid "Picture CD"
+msgstr "图片 CD"
+
+#: panels/removable-media/cc-removable-media-panel.c:387
+msgid "Super Video CD"
+msgstr "超级 VCD"
+
+#: panels/removable-media/cc-removable-media-panel.c:388
+msgid "Video CD"
+msgstr "视频 CD"
+
+#: panels/removable-media/cc-removable-media-panel.c:389
+msgid "Windows software"
+msgstr "Windows 软件"
+
+#: panels/removable-media/cc-removable-media-panel.ui:44
+msgid "Select how media should be handled"
+msgstr "选择如何处理介质"
+
+#: panels/removable-media/cc-removable-media-panel.ui:75
+msgid "CD _audio"
+msgstr "CD 音频(_A)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:92
+msgid "_DVD video"
+msgstr "_DVD 视频"
+
+#: panels/removable-media/cc-removable-media-panel.ui:133
+msgid "_Music player"
+msgstr "音乐播放器(_M)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:191
+msgid "_Software"
+msgstr "软件(_S)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:229
+msgid "_Other Media…"
+msgstr "其他介质(_O)…"
+
+#: panels/removable-media/cc-removable-media-panel.ui:288
+msgid "_Never prompt or start programs on media insertion"
+msgstr "介质插入时从不提示或启动程序(_N)"
+
+#: panels/removable-media/cc-removable-media-panel.ui:342
+msgid "Select how other media should be handled"
+msgstr "选择如何处理其他介质"
+
+#: panels/removable-media/cc-removable-media-panel.ui:389
+msgid "_Action:"
+msgstr "动作(_A):"
+
+#: panels/removable-media/cc-removable-media-panel.ui:412
+msgid "_Type:"
+msgstr "类型(_T):"
+
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "可移动介质"
+
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:4
+msgid "Configure Removable Media settings"
+msgstr "配置可移动介质设置"
+
+#. 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/removable-media/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/search/cc-search-locations-dialog.c:635
 msgid "Select Location"
 msgstr "选择位置"
 
-#: panels/search/cc-search-locations-dialog.c:614
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: panels/search/cc-search-panel.c:153
+#: panels/search/cc-search-locations-dialog.ui:9
+#: panels/search/cc-search-panel.ui:61
+msgid "Search Locations"
+msgstr "搜索位置"
+
+#: panels/search/cc-search-locations-dialog.ui:32
+#: panels/search/cc-search-locations-dialog.ui:69
+#: panels/search/cc-search-locations-dialog.ui:107
+msgid ""
+"Folders which are searched by system applications, such as Files, Photos and "
+"Videos."
+msgstr "系统应用程序所搜索的文件夹,比如文件、照片和视频。"
+
+#: panels/search/cc-search-locations-dialog.ui:52
+msgid "Places"
+msgstr "位置"
+
+#: panels/search/cc-search-locations-dialog.ui:91
+msgid "Bookmarks"
+msgstr "书签"
+
+#: panels/search/cc-search-locations-dialog.ui:156
+msgid "Other"
+msgstr "其他"
+
+#: panels/search/cc-search-panel.c:152
 msgid "No applications found"
 msgstr "未找到应用"
 
@@ -5687,7 +5652,7 @@ msgstr "上移"
 msgid "Move Down"
 msgstr "下移"
 
-#: panels/search/cc-search-panel.ui:32
+#: panels/search/cc-search-panel.ui:33
 msgid ""
 "Control which search results are shown in the Activities Overview. The order "
 "of search results can also be changed by moving rows in the list."
@@ -5695,11 +5660,6 @@ msgstr ""
 "控制活动概览中显示哪些搜索结果。搜索结果顺序也可以通过移动列表中的行排序进行"
 "更改。"
 
-#: panels/search/cc-search-panel.ui:60
-#: panels/search/search-locations-dialog.ui:9
-msgid "Search Locations"
-msgstr "搜索位置"
-
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
@@ -5711,88 +5671,71 @@ msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;搜索;查找;寻找;索引;隐藏;隐私;结果;"
 
-#: panels/search/search-locations-dialog.ui:32
-#: panels/search/search-locations-dialog.ui:69
-#: panels/search/search-locations-dialog.ui:107
-msgid ""
-"Folders which are searched by system applications, such as Files, Photos and "
-"Videos."
-msgstr "系统应用程序所搜索的文件夹,比如文件、照片和视频。"
-
-#: panels/search/search-locations-dialog.ui:52
-msgid "Places"
-msgstr "位置"
-
-#: panels/search/search-locations-dialog.ui:91
-msgid "Bookmarks"
-msgstr "书签"
-
-#: panels/search/search-locations-dialog.ui:156
-msgid "Other"
-msgstr "其他"
-
 #. Label
-#: panels/sharing/cc-sharing-networks.c:307
+#: panels/sharing/cc-sharing-networks.c:306
 msgid "No networks selected for sharing"
 msgstr "未选择要共享的网络"
 
-#: panels/sharing/cc-sharing-panel.c:320
+#: panels/sharing/cc-sharing-networks.ui:19
+msgid "Networks"
+msgstr "网络"
+
+#: panels/sharing/cc-sharing-panel.c:291
 msgctxt "service is enabled"
 msgid "On"
 msgstr "已开启"
 
-#: panels/sharing/cc-sharing-panel.c:322 panels/sharing/cc-sharing-panel.c:349
+#: panels/sharing/cc-sharing-panel.c:293 panels/sharing/cc-sharing-panel.c:320
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "已关闭"
 
-#: panels/sharing/cc-sharing-panel.c:352
+#: panels/sharing/cc-sharing-panel.c:323
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "已启用"
 
-#: panels/sharing/cc-sharing-panel.c:355
+#: panels/sharing/cc-sharing-panel.c:326
 msgctxt "service is active"
 msgid "Active"
 msgstr "活动"
 
-#: panels/sharing/cc-sharing-panel.c:425
+#: panels/sharing/cc-sharing-panel.c:395
 msgid "Choose a Folder"
 msgstr "选择文件夹"
 
-#: panels/sharing/cc-sharing-panel.c:725
+#. TRANSLATORS: %s is replaced with a link to a dav://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:698
 #, c-format
 msgid ""
 "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>"
+"current network using: %s"
+msgstr "文件共享可以共享“公共”文件夹,使用地址:%s"
 
-#: panels/sharing/cc-sharing-panel.c:727
+#. TRANSLATORS: %s is replaced with a link to a "ssh <hostname>" command to run
+#: panels/sharing/cc-sharing-panel.c:704
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"%s"
 msgstr ""
-"当启用远程登录是,远程用户可以使用 SSH 命令来连接:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"当启用远程登录时,远程用户可以使用 SSH 命令来连接:\n"
+"%s"
 
-#: panels/sharing/cc-sharing-panel.c:729
+#. TRANSLATORS: %s is replaced with a link to a vnc://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:710
 #, 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>"
+"connecting to %s"
+msgstr "屏幕共享允许远程用户查看或控制您的屏幕%s"
 
-#: panels/sharing/cc-sharing-panel.c:833
+#: panels/sharing/cc-sharing-panel.c:815
 msgid "Copy"
 msgstr "复制"
 
-#: panels/sharing/cc-sharing-panel.c:1286
+#: panels/sharing/cc-sharing-panel.c:1276
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "共享"
@@ -5801,79 +5744,79 @@ msgstr "共享"
 msgid "_Computer Name"
 msgstr "计算机名(_C)"
 
-#: panels/sharing/cc-sharing-panel.ui:94
+#: panels/sharing/cc-sharing-panel.ui:81
 msgid "_File Sharing"
 msgstr "文件共享(_F)"
 
-#: panels/sharing/cc-sharing-panel.ui:139
+#: panels/sharing/cc-sharing-panel.ui:89
 msgid "_Screen Sharing"
 msgstr "屏幕共享(_S)"
 
-#: panels/sharing/cc-sharing-panel.ui:184
+#: panels/sharing/cc-sharing-panel.ui:97
 msgid "_Media Sharing"
 msgstr "媒体共享(_M)"
 
-#: panels/sharing/cc-sharing-panel.ui:229
+#: panels/sharing/cc-sharing-panel.ui:105
 msgid "_Remote Login"
 msgstr "远程登录(_R)"
 
-#: panels/sharing/cc-sharing-panel.ui:268
+#: panels/sharing/cc-sharing-panel.ui:121
 msgid "Some services are disabled because of no network access."
 msgstr "因为没有网络,一些服务已经禁用。"
 
-#: panels/sharing/cc-sharing-panel.ui:286
-#: panels/sharing/cc-sharing-panel.ui:413
+#: panels/sharing/cc-sharing-panel.ui:139
+#: panels/sharing/cc-sharing-panel.ui:266
 msgid "File Sharing"
 msgstr "文件共享"
 
-#: panels/sharing/cc-sharing-panel.ui:333
+#: panels/sharing/cc-sharing-panel.ui:186
 msgid "_Require Password"
 msgstr "需要密码(_R)"
 
-#: panels/sharing/cc-sharing-panel.ui:424
-#: panels/sharing/cc-sharing-panel.ui:494
+#: panels/sharing/cc-sharing-panel.ui:277
+#: panels/sharing/cc-sharing-panel.ui:347
 msgid "Remote Login"
 msgstr "远程登录"
 
-#: panels/sharing/cc-sharing-panel.ui:517
-#: panels/sharing/cc-sharing-panel.ui:763
+#: panels/sharing/cc-sharing-panel.ui:370
+#: panels/sharing/cc-sharing-panel.ui:592
 msgid "Screen Sharing"
 msgstr "屏幕共享"
 
-#: panels/sharing/cc-sharing-panel.ui:575
+#: panels/sharing/cc-sharing-panel.ui:424
 msgid "_Allow connections to control the screen"
 msgstr "允许连接控制屏幕(_A)"
 
-#: panels/sharing/cc-sharing-panel.ui:620
+#: panels/sharing/cc-sharing-panel.ui:449
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: panels/sharing/cc-sharing-panel.ui:650
+#: panels/sharing/cc-sharing-panel.ui:479
 msgid "_Show Password"
 msgstr "显示密码(_S)"
 
-#: panels/sharing/cc-sharing-panel.ui:681
+#: panels/sharing/cc-sharing-panel.ui:510
 msgid "Access Options"
 msgstr "访问选项"
 
-#: panels/sharing/cc-sharing-panel.ui:695
+#: panels/sharing/cc-sharing-panel.ui:524
 msgid "_New connections must ask for access"
 msgstr "建立新连接前必须询问访问权限(_N)"
 
-#: panels/sharing/cc-sharing-panel.ui:713
+#: panels/sharing/cc-sharing-panel.ui:542
 msgid "_Require a password"
 msgstr "需要密码(_R)"
 
-#: panels/sharing/cc-sharing-panel.ui:774
-#: panels/sharing/cc-sharing-panel.ui:868
+#: panels/sharing/cc-sharing-panel.ui:603
+#: panels/sharing/cc-sharing-panel.ui:697
 msgid "Media Sharing"
 msgstr "媒体共享"
 
-#: panels/sharing/cc-sharing-panel.ui:807
+#: panels/sharing/cc-sharing-panel.ui:636
 msgid "Share music, photos and videos over the network."
 msgstr "通过网络共享音乐、照片和视频。"
 
-#: panels/sharing/cc-sharing-panel.ui:822
+#: panels/sharing/cc-sharing-panel.ui:651
 msgid "Folders"
 msgstr "文件夹"
 
@@ -5891,10 +5834,6 @@ msgstr ""
 "movies;server;renderer;共享;主机;名称;远程;桌面;介质;媒体;音频;视频;图片;照"
 "片;电影;服务器;渲染;"
 
-#: 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 "启用或禁用远程登录"
@@ -5907,19 +5846,19 @@ msgstr "启用或禁用远程登录需要认证"
 msgid "Custom"
 msgstr "自定义"
 
-#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9
+#: panels/sound/cc-alert-chooser.ui:12
 msgid "Bark"
 msgstr "犬吠"
 
-#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15
+#: panels/sound/cc-alert-chooser.ui:19
 msgid "Drip"
 msgstr "雨滴"
 
-#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21
+#: panels/sound/cc-alert-chooser.ui:26
 msgid "Glass"
 msgstr "玻璃"
 
-#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27
+#: panels/sound/cc-alert-chooser.ui:33
 msgid "Sonar"
 msgstr "声纳"
 
@@ -5993,7 +5932,7 @@ msgstr "音量"
 msgid "Alert Sound"
 msgstr "警报声"
 
-#: panels/sound/cc-volume-slider.c:63
+#: panels/sound/cc-volume-slider.c:115
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
@@ -6063,7 +6002,7 @@ msgstr "未知状态"
 #. Translators: The time point the device was authorized.
 #: panels/thunderbolt/cc-bolt-device-dialog.c:177
 msgid "Authorized at:"
-msgstr "认证于:"
+msgstr "授权于:"
 
 #. Translators: The time point the device was connected.
 #: panels/thunderbolt/cc-bolt-device-dialog.c:183
@@ -6078,7 +6017,7 @@ msgstr "登记于:"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:264
 msgid "Failed to authorize device: "
-msgstr "无法认证设备:"
+msgstr "无法授权设备:"
 
 #: panels/thunderbolt/cc-bolt-device-dialog.c:333
 msgid "Failed to forget device: "
@@ -6118,39 +6057,39 @@ msgstr "错误"
 #: panels/thunderbolt/cc-bolt-device-entry.c:146
 msgctxt "Thunderbolt Device Status"
 msgid "Authorized"
-msgstr "已认证"
+msgstr "已授权"
 
-#: panels/thunderbolt/cc-bolt-panel.c:176
+#: panels/thunderbolt/cc-bolt-panel.c:175
 msgid ""
 "The Thunderbolt subsystem (boltd) is not installed or not set up properly."
-msgstr "Thunderbolt 子系统 (boltd) 未安装或配置不正确。"
+msgstr "雷雳子系统 (boltd) 未安装或配置不正确。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:469
+#: panels/thunderbolt/cc-bolt-panel.c:468
 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 中被禁用,抑或是设置成了不被支持的"
-"安全级别。"
+"无法探测到 雷雳。\n"
+"可能是该系统无 雷雳支持,或在 BIOS 中被禁用,抑或是设置成了不被支持的安全级"
+"别。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:513
+#: panels/thunderbolt/cc-bolt-panel.c:512
 msgid "Thunderbolt support has been disabled in the BIOS."
-msgstr "Thunderbolt 支持在 BIOS 中被禁用。"
+msgstr "雷雳支持在 BIOS 中被禁用。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:517
+#: panels/thunderbolt/cc-bolt-panel.c:516
 msgid "Thunderbolt security level could not be determined."
-msgstr "无法确定 Thunderbolt 安全级别。"
+msgstr "无法确定 雷雳安全级别。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:622
+#: panels/thunderbolt/cc-bolt-panel.c:621
 #, c-format
 msgid "Error switching direct mode: %s"
 msgstr "无法切换为直接模式:%s"
 
 #: panels/thunderbolt/cc-bolt-panel.ui:143
 msgid "No Thunderbolt support"
-msgstr "无 Thunderbolt 支持"
+msgstr "无 雷雳支持"
 
 #: panels/thunderbolt/cc-bolt-panel.ui:246
 msgid "Direct Access"
@@ -6174,45 +6113,45 @@ msgstr "未连接设备"
 
 #: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:3
 msgid "Thunderbolt"
-msgstr "Thunderbolt"
+msgstr "雷雳"
 
 #: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:4
 msgid "Manage Thunderbolt devices"
-msgstr "管理 Thunderbolt 设备"
+msgstr "管理 雷雳设备"
 
 #. 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;"
+msgid "Thunderbolt;privacy;"
+msgstr "Thunderbolt;privacy;雷雳;雷电;隐私;"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:497
+#: panels/universal-access/cc-ua-panel.c:500
 msgctxt "cursor size"
 msgid "Default"
 msgstr "默认"
 
-#: panels/universal-access/cc-ua-panel.c:500
+#: panels/universal-access/cc-ua-panel.c:503
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "中"
 
-#: panels/universal-access/cc-ua-panel.c:503
+#: panels/universal-access/cc-ua-panel.c:506
 msgctxt "cursor size"
 msgid "Large"
 msgstr "大"
 
-#: panels/universal-access/cc-ua-panel.c:506
+#: panels/universal-access/cc-ua-panel.c:509
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "更大"
 
-#: panels/universal-access/cc-ua-panel.c:509
+#: panels/universal-access/cc-ua-panel.c:512
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "最大"
 
-#: panels/universal-access/cc-ua-panel.c:513
+#: panels/universal-access/cc-ua-panel.c:516
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
@@ -6248,7 +6187,7 @@ msgid "Screen _Reader"
 msgstr "屏幕朗读(_R)"
 
 #: panels/universal-access/cc-ua-panel.ui:397
-#: panels/universal-access/cc-ua-panel.ui:1231
+#: panels/universal-access/cc-ua-panel.ui:1263
 msgid "_Sound Keys"
 msgstr "发声键(_S)"
 
@@ -6257,7 +6196,7 @@ msgid "Hearing"
 msgstr "听觉"
 
 #: panels/universal-access/cc-ua-panel.ui:503
-#: panels/universal-access/cc-ua-panel.ui:1334
+#: panels/universal-access/cc-ua-panel.ui:1366
 msgid "_Visual Alerts"
 msgstr "视觉警报(_V)"
 
@@ -6286,248 +6225,252 @@ msgid "_Mouse Keys"
 msgstr "鼠标键(_M)"
 
 #: panels/universal-access/cc-ua-panel.ui:900
+msgid "_Locate Pointer"
+msgstr "定位打印机(_L)"
+
+#: panels/universal-access/cc-ua-panel.ui:932
 msgid "_Click Assist"
 msgstr "点击助手(_C)"
 
-#: panels/universal-access/cc-ua-panel.ui:946
+#: panels/universal-access/cc-ua-panel.ui:978
 msgid "_Double-Click Delay"
 msgstr "双击延时(_D)"
 
-#: panels/universal-access/cc-ua-panel.ui:966
+#: panels/universal-access/cc-ua-panel.ui:998
 msgid "Double-Click Delay"
 msgstr "双击延时"
 
-#: panels/universal-access/cc-ua-panel.ui:1036
+#: panels/universal-access/cc-ua-panel.ui:1068
 msgid "Cursor Size"
 msgstr "光标大小"
 
-#: panels/universal-access/cc-ua-panel.ui:1063
+#: panels/universal-access/cc-ua-panel.ui:1095
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr "可通过缩放光标大小来更清晰地看见光标。"
 
-#: panels/universal-access/cc-ua-panel.ui:1099
+#: panels/universal-access/cc-ua-panel.ui:1131
 msgid "Screen Reader"
 msgstr "屏幕朗读"
 
-#: panels/universal-access/cc-ua-panel.ui:1116
+#: panels/universal-access/cc-ua-panel.ui:1148
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr "移动焦点时朗读显示的文本。"
 
-#: panels/universal-access/cc-ua-panel.ui:1149
+#: panels/universal-access/cc-ua-panel.ui:1181
 msgid "_Screen Reader"
 msgstr "屏幕朗读(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1188
+#: panels/universal-access/cc-ua-panel.ui:1220
 msgid "Sound Keys"
 msgstr "发声键"
 
-#: panels/universal-access/cc-ua-panel.ui:1206
+#: panels/universal-access/cc-ua-panel.ui:1238
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "数字键盘锁定或大小写锁定开启或关闭时发出蜂鸣声。"
 
-#: panels/universal-access/cc-ua-panel.ui:1276
+#: panels/universal-access/cc-ua-panel.ui:1308
 msgid "Visual Alerts"
 msgstr "视觉警报"
 
-#: panels/universal-access/cc-ua-panel.ui:1280
+#: panels/universal-access/cc-ua-panel.ui:1312
 msgid "_Test flash"
 msgstr "测试闪烁(_T)"
 
-#: panels/universal-access/cc-ua-panel.ui:1309
+#: panels/universal-access/cc-ua-panel.ui:1341
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "发出警报声时使用视觉提示。"
 
-#: panels/universal-access/cc-ua-panel.ui:1360
-msgid "Flash the _window title"
-msgstr "闪烁窗口标题栏(_W)"
+#: panels/universal-access/cc-ua-panel.ui:1392
+msgid "Flash the entire _window"
+msgstr "闪烁整个窗口(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1378
+#: panels/universal-access/cc-ua-panel.ui:1410
 msgid "Flash the entire _screen"
 msgstr "闪烁整个屏幕(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1423
+#: panels/universal-access/cc-ua-panel.ui:1455
 msgid "Repeat Keys"
 msgstr "重复"
 
-#: panels/universal-access/cc-ua-panel.ui:1453
+#: panels/universal-access/cc-ua-panel.ui:1485
 msgid "Key presses repeat when key is held down."
 msgstr "按住某一键时重复该键。"
 
-#: panels/universal-access/cc-ua-panel.ui:1533
+#: panels/universal-access/cc-ua-panel.ui:1565
 msgid "Repeat keys delay"
 msgstr "重复键延时"
 
-#: panels/universal-access/cc-ua-panel.ui:1581
-#: panels/universal-access/cc-ua-panel.ui:1716
+#: panels/universal-access/cc-ua-panel.ui:1613
+#: panels/universal-access/cc-ua-panel.ui:1748
 msgid "Speed"
 msgstr "速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1620
+#: panels/universal-access/cc-ua-panel.ui:1652
 msgid "Repeat keys speed"
 msgstr "重复键速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1644
+#: panels/universal-access/cc-ua-panel.ui:1676
 msgid "Cursor Blinking"
 msgstr "光标闪烁"
 
-#: panels/universal-access/cc-ua-panel.ui:1674
+#: panels/universal-access/cc-ua-panel.ui:1706
 msgid "Cursor blinks in text fields."
 msgstr "文本字段中光标闪烁。"
 
-#: panels/universal-access/cc-ua-panel.ui:1753
+#: panels/universal-access/cc-ua-panel.ui:1785
 msgid "Cursor blinking speed"
 msgstr "光标闪烁速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1789
+#: panels/universal-access/cc-ua-panel.ui:1821
 msgid "Typing Assist"
 msgstr "打字助手"
 
-#: panels/universal-access/cc-ua-panel.ui:1828
+#: panels/universal-access/cc-ua-panel.ui:1860
 msgid "_Sticky Keys"
 msgstr "粘滞键(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1845
+#: panels/universal-access/cc-ua-panel.ui:1877
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "将一系列按键当作组合键"
 
-#: panels/universal-access/cc-ua-panel.ui:1869
+#: panels/universal-access/cc-ua-panel.ui:1901
 msgid "_Disable if two keys are pressed together"
 msgstr "同时按下两个键时禁用输入(_D)"
 
-#: panels/universal-access/cc-ua-panel.ui:1887
+#: panels/universal-access/cc-ua-panel.ui:1919
 msgid "Beep when a _modifier key is pressed"
 msgstr "按修饰键时蜂鸣(_M)"
 
-#: panels/universal-access/cc-ua-panel.ui:1935
+#: panels/universal-access/cc-ua-panel.ui:1967
 msgid "S_low Keys"
 msgstr "慢速键(_L)"
 
-#: panels/universal-access/cc-ua-panel.ui:1952
+#: panels/universal-access/cc-ua-panel.ui:1984
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "在按下按键和接受按键之间添加延迟"
 
-#: panels/universal-access/cc-ua-panel.ui:1985
-#: panels/universal-access/cc-ua-panel.ui:2198
-#: panels/universal-access/cc-ua-panel.ui:2535
+#: panels/universal-access/cc-ua-panel.ui:2017
+#: panels/universal-access/cc-ua-panel.ui:2230
+#: panels/universal-access/cc-ua-panel.ui:2567
 msgid "A_cceptance delay:"
 msgstr "按键接受延迟(_C):"
 
-#: panels/universal-access/cc-ua-panel.ui:2007
+#: panels/universal-access/cc-ua-panel.ui:2039
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2026
+#: panels/universal-access/cc-ua-panel.ui:2058
 msgid "Slow keys typing delay"
 msgstr "慢速键输入延迟"
 
-#: panels/universal-access/cc-ua-panel.ui:2041
+#: panels/universal-access/cc-ua-panel.ui:2073
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "长"
 
-#: panels/universal-access/cc-ua-panel.ui:2068
+#: panels/universal-access/cc-ua-panel.ui:2100
 msgid "Beep when a key is pr_essed"
 msgstr "按键时蜂鸣(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:2085
+#: panels/universal-access/cc-ua-panel.ui:2117
 msgid "Beep when a key is _accepted"
 msgstr "按键被接受时蜂鸣(_A)"
 
-#: panels/universal-access/cc-ua-panel.ui:2102
-#: panels/universal-access/cc-ua-panel.ui:2281
+#: panels/universal-access/cc-ua-panel.ui:2134
+#: panels/universal-access/cc-ua-panel.ui:2313
 msgid "Beep when a key is _rejected"
 msgstr "按键被拒绝时蜂鸣(_R)"
 
-#: panels/universal-access/cc-ua-panel.ui:2148
+#: panels/universal-access/cc-ua-panel.ui:2180
 msgid "_Bounce Keys"
 msgstr "重复键(_B)"
 
-#: panels/universal-access/cc-ua-panel.ui:2165
+#: panels/universal-access/cc-ua-panel.ui:2197
 msgid "Ignores fast duplicate keypresses"
 msgstr "忽略快速重复按键"
 
-#: panels/universal-access/cc-ua-panel.ui:2220
+#: panels/universal-access/cc-ua-panel.ui:2252
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2239
+#: panels/universal-access/cc-ua-panel.ui:2271
 msgid "Bounce keys typing delay"
 msgstr "重复键输入延迟"
 
-#: panels/universal-access/cc-ua-panel.ui:2254
+#: panels/universal-access/cc-ua-panel.ui:2286
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "长"
 
-#: panels/universal-access/cc-ua-panel.ui:2367
+#: panels/universal-access/cc-ua-panel.ui:2399
 msgid "_Enable by Keyboard"
 msgstr "通过键盘启用(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:2384
+#: panels/universal-access/cc-ua-panel.ui:2416
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "通过键盘开关辅助功能特性"
 
-#: panels/universal-access/cc-ua-panel.ui:2448
+#: panels/universal-access/cc-ua-panel.ui:2480
 msgid "Click Assist"
 msgstr "点击助手"
 
-#: panels/universal-access/cc-ua-panel.ui:2484
+#: panels/universal-access/cc-ua-panel.ui:2516
 msgid "_Simulated Secondary Click"
 msgstr "模拟副键点击(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:2502
+#: panels/universal-access/cc-ua-panel.ui:2534
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "按住鼠标主键不放时触发副键点击"
 
-#: panels/universal-access/cc-ua-panel.ui:2556
+#: panels/universal-access/cc-ua-panel.ui:2588
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2575
+#: panels/universal-access/cc-ua-panel.ui:2607
 msgid "Secondary click delay"
 msgstr "副键点击延迟"
 
-#: panels/universal-access/cc-ua-panel.ui:2590
+#: panels/universal-access/cc-ua-panel.ui:2622
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "长"
 
-#: panels/universal-access/cc-ua-panel.ui:2647
+#: panels/universal-access/cc-ua-panel.ui:2679
 msgid "_Hover Click"
 msgstr "悬停点击(_H)"
 
-#: panels/universal-access/cc-ua-panel.ui:2665
+#: panels/universal-access/cc-ua-panel.ui:2697
 msgid "Trigger a click when the pointer hovers"
 msgstr "指针悬停时触发点击"
 
-#: panels/universal-access/cc-ua-panel.ui:2698
+#: panels/universal-access/cc-ua-panel.ui:2730
 msgid "D_elay:"
 msgstr "延迟(_E):"
 
-#: panels/universal-access/cc-ua-panel.ui:2720
+#: panels/universal-access/cc-ua-panel.ui:2752
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/cc-ua-panel.ui:2751
+#: panels/universal-access/cc-ua-panel.ui:2783
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "长"
 
-#: panels/universal-access/cc-ua-panel.ui:2787
+#: panels/universal-access/cc-ua-panel.ui:2819
 msgid "Motion _threshold:"
 msgstr "运动阈值(_T):"
 
-#: panels/universal-access/cc-ua-panel.ui:2809
+#: panels/universal-access/cc-ua-panel.ui:2841
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: panels/universal-access/cc-ua-panel.ui:2840
+#: panels/universal-access/cc-ua-panel.ui:2872
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
@@ -6550,27 +6493,27 @@ msgstr ""
 "本;文字;字体;大小;粘滞;按键;慢;回弹;鼠标;双击;点击;单击;延迟;速度;助手;重复;"
 "闪烁;可视化;视觉;听觉;音频;输入;打字;"
 
-#: panels/universal-access/zoom-options.c:305
+#: panels/universal-access/zoom-options.c:303
 msgctxt "Distance"
 msgid "Short"
 msgstr "短"
 
-#: panels/universal-access/zoom-options.c:306
+#: panels/universal-access/zoom-options.c:304
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ 屏幕"
 
-#: panels/universal-access/zoom-options.c:307
+#: panels/universal-access/zoom-options.c:305
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ 屏幕"
 
-#: panels/universal-access/zoom-options.c:308
+#: panels/universal-access/zoom-options.c:306
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ 屏幕"
 
-#: panels/universal-access/zoom-options.c:309
+#: panels/universal-access/zoom-options.c:307
 msgctxt "Distance"
 msgid "Long"
 msgstr "长"
@@ -6726,6 +6669,180 @@ msgstr "色彩效果:"
 msgid "Color Effects"
 msgstr "色彩效果"
 
+#: panels/usage/cc-usage-panel.c:154
+msgid "Empty all items from Trash?"
+msgstr "清空回收站中的所有项目吗?"
+
+#: panels/usage/cc-usage-panel.c:155
+msgid "All items in the Trash will be permanently deleted."
+msgstr "回收站内的所有项目将会永久删除。"
+
+#: panels/usage/cc-usage-panel.c:156
+msgid "_Empty Trash"
+msgstr "清空回收站(_E)"
+
+#: panels/usage/cc-usage-panel.c:177
+msgid "Delete all the temporary files?"
+msgstr "删除所有临时文件吗?"
+
+#: panels/usage/cc-usage-panel.c:178
+msgid "All the temporary files will be permanently deleted."
+msgstr "所有临时文件将会永久删除。"
+
+#: panels/usage/cc-usage-panel.c:179
+msgid "_Purge Temporary Files"
+msgstr "清理临时文件(_P)"
+
+#: panels/usage/cc-usage-panel.ui:31
+msgid "File History"
+msgstr "文件历史"
+
+#: panels/usage/cc-usage-panel.ui:43
+msgid ""
+"File history keeps a record of files that you have used. This information is "
+"shared between applications, and makes it easier to find files that you "
+"might want to use."
+msgstr ""
+"文件历史记录会记录您已使用的文件。此信息在应用程序之间共享,使查找您可能想要"
+"使用的文件更加容易。"
+
+#: panels/usage/cc-usage-panel.ui:58
+msgid "File H_istory"
+msgstr "文件历史(_H)"
+
+#: panels/usage/cc-usage-panel.ui:80
+msgid "File _History Duration"
+msgstr "文件历史持续时间"
+
+#: panels/usage/cc-usage-panel.ui:121
+msgid "_Clear History…"
+msgstr "清理历史"
+
+#: panels/usage/cc-usage-panel.ui:137
+msgid "Trash & Temporary Files"
+msgstr "回收站及临时文件"
+
+#: panels/usage/cc-usage-panel.ui:147
+msgid ""
+"Trash and temporary files can sometimes include personal or sensitive "
+"information. Automatically deleting them can help to protect privacy."
+msgstr ""
+"回收站和临时文件有时可能包含个人信息或敏感信息。自动删除它们可以帮助保护隐"
+"私。"
+
+#: panels/usage/cc-usage-panel.ui:161
+msgid "Automatically Delete _Trash Content"
+msgstr "自动清空回收站(_T)"
+
+#: panels/usage/cc-usage-panel.ui:176
+msgid "Automatically Delete Temporary _Files"
+msgstr "自动清理临时文件(_F)"
+
+#: panels/usage/cc-usage-panel.ui:198
+msgid "Automatically Delete _Period"
+msgstr "自动清空周期(_P)"
+
+#: panels/usage/cc-usage-panel.ui:240
+msgid "_Empty Trash…"
+msgstr "清空回收站(_E)…"
+
+#: panels/usage/cc-usage-panel.ui:252
+msgid "_Delete Temporary Files…"
+msgstr "清除临时文件(_D)…"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:280
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 小时"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:284
+msgctxt "purge_files"
+msgid "1 day"
+msgstr "1 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:288
+msgctxt "purge_files"
+msgid "2 days"
+msgstr "2 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:292
+msgctxt "purge_files"
+msgid "3 days"
+msgstr "3 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:296
+msgctxt "purge_files"
+msgid "4 days"
+msgstr "4 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:300
+msgctxt "purge_files"
+msgid "5 days"
+msgstr "5 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:304
+msgctxt "purge_files"
+msgid "6 days"
+msgstr "6 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:308
+msgctxt "purge_files"
+msgid "7 days"
+msgstr "7 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:312
+msgctxt "purge_files"
+msgid "14 days"
+msgstr "14 天"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:316
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:331
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:335
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:339
+msgctxt "retain_history"
+msgid "30 days"
+msgstr "30 天"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:343
+msgctxt "retain_history"
+msgid "Forever"
+msgstr "永久"
+
+#: panels/usage/gnome-usage-panel.desktop.in.in:3
+msgid "File History & Trash"
+msgstr "文件历史与回收站"
+
+#: panels/usage/gnome-usage-panel.desktop.in.in:4
+msgid "Don't leave traces"
+msgstr "不留痕迹"
+
+#. FIXME
 #: panels/user-accounts/cc-add-user-dialog.c:34
 msgid "Should match the web address of your login provider."
 msgstr "应与您登录提供商的网络地址相同。"
@@ -6739,21 +6856,21 @@ msgstr "添加帐号失败"
 msgid "The passwords do not match."
 msgstr "密码不匹配。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:898
-#: panels/user-accounts/cc-add-user-dialog.c:944
-#: panels/user-accounts/cc-add-user-dialog.c:965
+#: panels/user-accounts/cc-add-user-dialog.c:896
+#: panels/user-accounts/cc-add-user-dialog.c:942
+#: panels/user-accounts/cc-add-user-dialog.c:963
 msgid "Failed to register account"
 msgstr "注册用户失败"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1088
+#: panels/user-accounts/cc-add-user-dialog.c:1084
 msgid "No supported way to authenticate with this domain"
 msgstr "没有支持该域的验证方法"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1161
+#: panels/user-accounts/cc-add-user-dialog.c:1157
 msgid "Failed to join domain"
 msgstr "加入域失败"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1222
+#: panels/user-accounts/cc-add-user-dialog.c:1218
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
@@ -6761,7 +6878,7 @@ msgstr ""
 "登录名不正确。\n"
 "请重试。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1229
+#: panels/user-accounts/cc-add-user-dialog.c:1225
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
@@ -6769,11 +6886,11 @@ msgstr ""
 "登录密码不正确。\n"
 "请重试。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1237
+#: panels/user-accounts/cc-add-user-dialog.c:1233
 msgid "Failed to log into domain"
 msgstr "登录到域失败"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1295
+#: panels/user-accounts/cc-add-user-dialog.c:1291
 msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "找不到该域名,也许拼写有误?"
 
@@ -6787,17 +6904,14 @@ msgid "_Full Name"
 msgstr "全名(_F)"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:206
-#: panels/user-accounts/cc-user-panel.ui:153
 msgid "Standard"
 msgstr "标准"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:216
-#: panels/user-accounts/cc-user-panel.ui:163
 msgid "Administrator"
 msgstr "管理员"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:232
-#: panels/user-accounts/cc-user-panel.ui:181
 msgid "Account _Type"
 msgstr "帐号类型(_T)"
 
@@ -6847,6 +6961,188 @@ msgstr "拍张照片…"
 msgid "Select a File…"
 msgstr "选择文件…"
 
+#: panels/user-accounts/cc-fingerprint-dialog.ui:8
+msgid "Fingerprint Manager"
+msgstr "指纹管理器"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:23
+msgid "Fingerprint"
+msgstr "指纹"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:118
+msgid "_No"
+msgstr "否(_N)"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:128
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:155
+msgid ""
+"Do you want to delete your registered fingerprints so fingerprint login is "
+"disabled?"
+msgstr "确定要删除已登记的指纹吗?这将禁用指纹登录。"
+
+#. Translators: This is the empty state page label which states that there are no devices ready.
+#: panels/user-accounts/cc-fingerprint-dialog.ui:249
+msgid "No Fingerprint device"
+msgstr "无指纹设备"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:259
+msgid "Ensure the device is properly connected."
+msgstr "请确保设备已正常连接。"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:264
+msgid "No fingerprint device"
+msgstr "无指纹设备"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:280
+msgid "Choose the fingerprint device you want to configure"
+msgstr ""
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:309
+msgid "Fingerprint Device"
+msgstr "指纹设备"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:322
+msgid ""
+"Fingerprint login allows you to unlock and log into your computer with your "
+"finger"
+msgstr ""
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:352
+msgid "_Delete Fingerprints"
+msgstr "删除指纹(_D)"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:363
+msgid "Fingerprint Login"
+msgstr "指纹登录"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:412
+msgid "Fingerprint Enroll"
+msgstr "指纹登记"
+
+#: panels/user-accounts/cc-fingerprint-dialog.ui:436
+msgid "_Re-enroll this finger…"
+msgstr "重新登记该手指(_R)…"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:470
+#, c-format
+msgid "Failed to list fingerprints: %s"
+msgstr "列出指纹失败:%s"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:536
+#, c-format
+msgid "Failed to delete saved fingerprints: %s"
+msgstr "删除已保存的指纹失败:%s"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:565
+msgid "Left thumb"
+msgstr "左手拇指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:567
+msgid "Left middle finger"
+msgstr "左手中指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:569
+msgid "_Left index finger"
+msgstr "左手食指(_L)"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:571
+msgid "Left ring finger"
+msgstr "左手无名指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:573
+msgid "Left little finger"
+msgstr "左手小指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:575
+msgid "Right thumb"
+msgstr "右手拇指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:577
+msgid "Right middle finger"
+msgstr "右手中指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:579
+msgid "_Right index finger"
+msgstr "右手食指(_R)"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:581
+msgid "Right ring finger"
+msgstr "右手无名指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:583
+msgid "Right little finger"
+msgstr "右手小指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:585
+msgid "Unknown Finger"
+msgstr "未知手指"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:719
+msgctxt "Fingerprint enroll state"
+msgid "Complete"
+msgstr "完成"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:729
+msgid "Fingerprint device disconnected"
+msgstr "指纹设备已断开连接"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:731
+msgid "Fingerprint device storage is full"
+msgstr "指纹设备存储已满"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:733
+msgid "Failed to enroll new fingerprint"
+msgstr "登记新指纹失败"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:764
+#, c-format
+msgid "Failed to start enrollment: %s"
+msgstr "登记过程初始化失败:%s"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:772
+msgctxt "Fingerprint enroll state"
+msgid "Failed to enroll new fingerprint"
+msgstr "登记新指纹失败"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:803
+#, c-format
+msgid "Failed to stop enrollment: %s"
+msgstr "停止登记过程失败:%s"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:847
+msgid ""
+"Repeatedly lift and place your finger on the reader to enroll your "
+"fingerprint"
+msgstr "要登记指纹,请重复将手指举起然后放置在读取设备上的动作"
+
+#. TRANSLATORS: This is the label for the button to enroll a new finger
+#: panels/user-accounts/cc-fingerprint-dialog.c:989
+msgid "Scan new fingerprint"
+msgstr "扫描新指纹"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:1029
+#, c-format
+msgid "Failed to release fingerprint device %s: %s"
+msgstr "释放指纹设备 %s 失败:%s"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:1100
+msgctxt "Fingerprint enroll state"
+msgid "Problem Reading Device"
+msgstr "读取设备时出现问题"
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:1133
+#, c-format
+msgid "Failed to claim fingerprint device %s: %s"
+msgstr ""
+
+#: panels/user-accounts/cc-fingerprint-dialog.c:1270
+#, c-format
+msgid "Failed to get fingerprint devices: %s"
+msgstr "获取指纹设备失败:%s"
+
 #: panels/user-accounts/cc-login-history-dialog.c:69
 msgid "This Week"
 msgstr "本周"
@@ -6883,7 +7179,7 @@ msgstr "%s — %s"
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
 #: panels/user-accounts/cc-login-history-dialog.c:173
-#: panels/user-accounts/cc-user-panel.c:771
+#: panels/user-accounts/cc-user-panel.c:782
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -6891,7 +7187,7 @@ msgstr "%k:%M"
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
 #: panels/user-accounts/cc-login-history-dialog.c:176
-#: panels/user-accounts/cc-user-panel.c:775
+#: panels/user-accounts/cc-user-panel.c:786
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -6952,110 +7248,116 @@ msgstr "允许用户下次登录时更改密码"
 msgid "Set a password now"
 msgstr "现在设置密码"
 
-#: panels/user-accounts/cc-realm-manager.c:307
+#: panels/user-accounts/cc-realm-manager.c:306
 msgid "Cannot automatically join this type of domain"
 msgstr "无法自动加入此类域"
 
-#: panels/user-accounts/cc-realm-manager.c:310
+#: panels/user-accounts/cc-realm-manager.c:309
 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
+#: panels/user-accounts/cc-realm-manager.c:731
+#: panels/user-accounts/cc-realm-manager.c:745
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "无法以 %s 的身份登录域 %s"
 
-#: panels/user-accounts/cc-realm-manager.c:738
+#: panels/user-accounts/cc-realm-manager.c:737
 msgid "Invalid password, please try again"
 msgstr "无效密码,请重试"
 
-#: panels/user-accounts/cc-realm-manager.c:751
+#: panels/user-accounts/cc-realm-manager.c:750
 #, c-format
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "无法连接到 %s 域:%s"
 
-#: panels/user-accounts/cc-user-panel.c:214
+#: panels/user-accounts/cc-user-panel.c:220
 msgid "Your account"
 msgstr "您的帐号"
 
-#: panels/user-accounts/cc-user-panel.c:389
+#: panels/user-accounts/cc-user-panel.c:401
 msgid "Failed to delete user"
 msgstr "删除用户失败"
 
-#: panels/user-accounts/cc-user-panel.c:447
-#: panels/user-accounts/cc-user-panel.c:506
-#: panels/user-accounts/cc-user-panel.c:558
+#: panels/user-accounts/cc-user-panel.c:459
+#: panels/user-accounts/cc-user-panel.c:518
+#: panels/user-accounts/cc-user-panel.c:570
 msgid "Failed to revoke remotely managed user"
 msgstr "吊销远程管理的用户失败"
 
-#: panels/user-accounts/cc-user-panel.c:610
+#: panels/user-accounts/cc-user-panel.c:621
 msgid "You cannot delete your own account."
 msgstr "不能删除自己的帐号。"
 
-#: panels/user-accounts/cc-user-panel.c:619
+#: panels/user-accounts/cc-user-panel.c:630
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 已经登录"
 
-#: panels/user-accounts/cc-user-panel.c:623
+#: panels/user-accounts/cc-user-panel.c:634
 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:632
+#: panels/user-accounts/cc-user-panel.c:643
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "要保留 %s 的文件吗?"
 
-#: panels/user-accounts/cc-user-panel.c:636
+#: panels/user-accounts/cc-user-panel.c:647
 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:639
+#: panels/user-accounts/cc-user-panel.c:650
 msgid "_Delete Files"
 msgstr "删除文件(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:640
+#: panels/user-accounts/cc-user-panel.c:651
 msgid "_Keep Files"
 msgstr "保留文件(_K)"
 
-#: panels/user-accounts/cc-user-panel.c:654
+#: panels/user-accounts/cc-user-panel.c:665
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "您确定要吊销远程管理的帐号 %s 吗?"
 
-#: panels/user-accounts/cc-user-panel.c:658
+#: panels/user-accounts/cc-user-panel.c:669
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:708
+#: panels/user-accounts/cc-user-panel.c:719
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帐号已禁用"
 
-#: panels/user-accounts/cc-user-panel.c:716
+#: panels/user-accounts/cc-user-panel.c:727
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "下次登录时设置"
 
-#: panels/user-accounts/cc-user-panel.c:719
+#: panels/user-accounts/cc-user-panel.c:730
 msgctxt "Password mode"
 msgid "None"
 msgstr "无"
 
-#: panels/user-accounts/cc-user-panel.c:764
+#: panels/user-accounts/cc-user-panel.c:775
 msgid "Logged in"
 msgstr "已登录"
 
-#: panels/user-accounts/cc-user-panel.c:1098
+#. TRANSLATORS: Status of Parental Controls setup
+#: panels/user-accounts/cc-user-panel.c:863
+#: panels/user-accounts/cc-user-panel.c:954
+msgid "Enabled"
+msgstr "已启用"
+
+#: panels/user-accounts/cc-user-panel.c:1265
 msgid "Failed to contact the accounts service"
 msgstr "联系帐号服务失败"
 
-#: panels/user-accounts/cc-user-panel.c:1100
+#: panels/user-accounts/cc-user-panel.c:1267
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "请确定帐号服务已正确安装并启用。"
 
@@ -7063,7 +7365,7 @@ msgstr "请确定帐号服务已正确安装并启用。"
 #. * 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:1132
+#: panels/user-accounts/cc-user-panel.c:1299
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -7071,25 +7373,12 @@ msgstr ""
 "要进行更改,\n"
 "请先点击 * 图标"
 
-#: panels/user-accounts/cc-user-panel.c:1205
-msgid "Create a user account"
-msgstr "创建用户帐号"
-
-#: panels/user-accounts/cc-user-panel.c:1216
-#: panels/user-accounts/cc-user-panel.c:1344
-msgid ""
-"To create a user account,\n"
-"click the * icon first"
-msgstr ""
-"要创建用户帐号,\n"
-"请先点击 * 图标"
-
-#: panels/user-accounts/cc-user-panel.c:1225
+#: panels/user-accounts/cc-user-panel.c:1373
 msgid "Delete the selected user account"
 msgstr "删除选中的用户帐号"
 
-#: panels/user-accounts/cc-user-panel.c:1237
-#: panels/user-accounts/cc-user-panel.c:1348
+#: panels/user-accounts/cc-user-panel.c:1385
+#: panels/user-accounts/cc-user-panel.c:1506
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7097,102 +7386,73 @@ msgstr ""
 "要删除选中的用户帐号,\n"
 "请先点击 * 图标"
 
-#: panels/user-accounts/cc-user-panel.ui:18
+#: panels/user-accounts/cc-user-panel.ui:5
 msgid "_Add User…"
 msgstr "添加用户(_A)…"
 
-#: panels/user-accounts/cc-user-panel.ui:70
+#: panels/user-accounts/cc-user-panel.ui:8
+msgid "Create a user account"
+msgstr "创建用户帐号"
+
+#: panels/user-accounts/cc-user-panel.ui:63
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "修改需要重启会话才能生效"
 
-#: panels/user-accounts/cc-user-panel.ui:78
+#: panels/user-accounts/cc-user-panel.ui:71
 msgid "Restart Now"
 msgstr "现在重启"
 
-#: panels/user-accounts/cc-user-panel.ui:256
-msgid "A_utomatic Login"
-msgstr "自动登录(_U)"
-
-#: panels/user-accounts/cc-user-panel.ui:298
-msgid "_Fingerprint Login"
-msgstr "指纹登录(_F)"
-
-#: panels/user-accounts/cc-user-panel.ui:324
-#: panels/user-accounts/cc-user-panel.ui:340
+#: panels/user-accounts/cc-user-panel.ui:152
+#: panels/user-accounts/cc-user-panel.ui:168
 msgid "User Icon"
 msgstr "用户图标"
 
-#: panels/user-accounts/cc-user-panel.ui:404
-msgid "Last Login"
-msgstr "最近登录"
-
-#: panels/user-accounts/cc-user-panel.ui:453
-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:486
-msgid "No Users Found"
-msgstr "未找到用户"
-
-#: panels/user-accounts/cc-user-panel.ui:496
-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/cc-user-panel.ui:244
+msgid "Account Settings"
+msgstr "帐号设置"
 
-#: panels/user-accounts/data/account-fingerprint.ui:21
-msgid "Left little finger"
-msgstr "左手小指"
+#: panels/user-accounts/cc-user-panel.ui:271
+msgid "_Administrator"
+msgstr "管理员"
 
-#: panels/user-accounts/data/account-fingerprint.ui:24
-msgid "Right thumb"
-msgstr "右手拇指"
+#: panels/user-accounts/cc-user-panel.ui:291
+msgid ""
+"Administrators can add and remove other users, and can change settings for "
+"all users."
+msgstr "管理员可以增删用户,也能更改设置。"
 
-#: panels/user-accounts/data/account-fingerprint.ui:27
-msgid "Right middle finger"
-msgstr "右手中指"
+#: panels/user-accounts/cc-user-panel.ui:320
+msgid "_Parental Controls"
+msgstr "家长控制(_P)"
 
-#: panels/user-accounts/data/account-fingerprint.ui:30
-msgid "Right ring finger"
-msgstr "右手无名指"
+#: panels/user-accounts/cc-user-panel.ui:410
+msgid "Authentication & Login"
+msgstr "认证与登录"
 
-#: panels/user-accounts/data/account-fingerprint.ui:33
-msgid "Right little finger"
-msgstr "右手小指"
+#: panels/user-accounts/cc-user-panel.ui:479
+msgid "_Fingerprint Login"
+msgstr "指纹登录(_F)"
 
-#: panels/user-accounts/data/account-fingerprint.ui:39
-#: panels/user-accounts/um-fingerprint-dialog.c:677
-msgid "Enable Fingerprint Login"
-msgstr "启用指纹登录"
+#: panels/user-accounts/cc-user-panel.ui:521
+msgid "A_utomatic Login"
+msgstr "自动登录(_U)"
 
-#: panels/user-accounts/data/account-fingerprint.ui:89
-msgid "_Right index finger"
-msgstr "右手食指(_R)"
+#: panels/user-accounts/cc-user-panel.ui:551
+msgid "Account Activity"
+msgstr "帐号活动"
 
-#: panels/user-accounts/data/account-fingerprint.ui:105
-msgid "_Left index finger"
-msgstr "左手食指(_L)"
+#: panels/user-accounts/cc-user-panel.ui:592
+msgid "Remove User…"
+msgstr "移除用户…"
 
-#: panels/user-accounts/data/account-fingerprint.ui:126
-msgid "_Other finger:"
-msgstr "其他手指(_O):"
+#. 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:631
+msgid "No Users Found"
+msgstr "未找到用户"
 
-#: panels/user-accounts/data/account-fingerprint.ui:324
-msgid ""
-"Your fingerprint was successfully saved. You should now be able to log in "
-"using your fingerprint reader."
-msgstr "您的指纹已成功保存,从现在起可以使用指纹登录。"
+#: panels/user-accounts/cc-user-panel.ui:641
+msgid "Unlock to add a user account."
+msgstr "解锁以添加用户帐号。"
 
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
@@ -7343,158 +7603,78 @@ msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
 msgstr "增加更多字母、数字和标点可进一步提高密码强度。"
 
-#: panels/user-accounts/run-passwd.c:422
+#: panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: panels/user-accounts/run-passwd.c:502
+#: panels/user-accounts/run-passwd.c:504
 #, c-format
 msgid "The new password is too short"
 msgstr "新密码太短"
 
-#: panels/user-accounts/run-passwd.c:508
+#: panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "新密码太简单"
 
-#: panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:516
 #, 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:519
 #, 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:522
 #, 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:526
 #, 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:530
 #, 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:534
 #, 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:538
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: panels/user-accounts/user-utils.c:427
+#: panels/user-accounts/user-utils.c:435
 msgid ""
 "The username should usually only consist of lower case letters from a-z, "
 "digits and the following characters: - _"
-msgstr "用户名只能包含小写英文字母(a 至 z)、数字和“.”“-”“_”符号"
+msgstr "用户名只能包含小写英文字母(a 至 z)、数字和“-”、“_”符号"
 
-#: panels/user-accounts/user-utils.c:431
+#: panels/user-accounts/user-utils.c:439
 msgid "Sorry, that user name isn’t available. Please try another."
 msgstr "抱歉,该用户名不可用。请试下别的。"
 
-#: panels/user-accounts/user-utils.c:476
+#: panels/user-accounts/user-utils.c:484
 msgid "The username is too long."
 msgstr "用户名太长。"
 
-#: panels/user-accounts/user-utils.c:526
+#: panels/user-accounts/user-utils.c:546
 msgid "This will be used to name your home folder and can’t be changed."
 msgstr "将作为您主文件夹的名称且不可再次更改。"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:139
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
-msgstr "您未被允许访问该设备。请联系系统管理员。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:141
-msgid "The device is already in use."
-msgstr "设备正被占用。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:143
-msgid "An internal error occurred."
-msgstr "发生了一个内部错误。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:214
-msgid "Enabled"
-msgstr "已启用"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:260
-msgid "Delete registered fingerprints?"
-msgstr "要删除已登记的指纹吗?"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:264
-msgid "_Delete Fingerprints"
-msgstr "删除指纹(_D)"
-
-#: 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: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:501
-#: panels/user-accounts/um-fingerprint-dialog.c:543
-#, c-format
-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:584
-#, c-format
-msgid "Could not start finger capture on “%s” device"
-msgstr "无法在设备“%s”上启动指纹采集"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:628
-msgid "Could not access any fingerprint readers"
-msgstr "无法访问指纹读取器"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:629
-msgid "Please contact your system administrator for help."
-msgstr "请联系系统管理员以寻求帮助。"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "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:711
-#, c-format
-msgid ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the “%s” device."
-msgstr "要启用指纹登录,您需要使用设备“%s”保存一个指纹。"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:718
-msgid "Selecting finger"
-msgstr "选择手指"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:719
-msgid "Enrolling fingerprints"
-msgstr "正在登记指纹"
-
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "映射按键"
 
-#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:512
 #: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "关闭(_C)"
@@ -7521,7 +7701,7 @@ msgstr "请触摸屏幕上出现的标记以校准平板电脑。"
 msgid "Mis-click detected, restarting…"
 msgstr "检测到误点击,重新开始校准…"
 
-#: panels/wacom/cc-wacom-button-row.c:253
+#: panels/wacom/cc-wacom-button-row.c:244
 #, c-format
 msgid "Button %d"
 msgstr "按键 %d"
@@ -7546,17 +7726,17 @@ msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "显示屏幕帮助"
 
-#: panels/wacom/cc-wacom-mapping-panel.c:256
+#: panels/wacom/cc-wacom-mapping-panel.c:245
 msgid "Output:"
 msgstr "输出:"
 
 #. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:268
+#: panels/wacom/cc-wacom-mapping-panel.c:257
 msgid "Keep aspect ratio (letterbox):"
 msgstr "保持长宽比(黑边):"
 
 #. Whole-desktop checkbox
-#: panels/wacom/cc-wacom-mapping-panel.c:279
+#: panels/wacom/cc-wacom-mapping-panel.c:268
 msgid "Map to single monitor"
 msgstr "映射到单个显示器"
 
@@ -7565,15 +7745,15 @@ msgstr "映射到单个显示器"
 msgid "%d of %d"
 msgstr "%d/%d"
 
-#: panels/wacom/cc-wacom-page.c:530
+#: panels/wacom/cc-wacom-page.c:509
 msgid "Display Mapping"
 msgstr "显示映射"
 
-#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119
+#: panels/wacom/cc-wacom-panel.c:791 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "手写笔"
 
-#: panels/wacom/cc-wacom-stylus-page.c:355
+#: panels/wacom/cc-wacom-stylus-page.c:357
 msgid "Button"
 msgstr "按键"
 
@@ -7629,6 +7809,7 @@ msgid "Left-Handed Orientation"
 msgstr "惯用左手"
 
 #: panels/wacom/gnome-wacom-properties.ui:296
+#: panels/wacom/gnome-wacom-properties.ui:401
 msgid "Map to Monitor…"
 msgstr "映射到显示器…"
 
@@ -7648,6 +7829,11 @@ msgstr "调整鼠标设置"
 msgid "Adjust display resolution"
 msgstr "调整显示分辨率"
 
+#: panels/wacom/gnome-wacom-properties.ui:376
+#, fuzzy
+msgid "Decouple Display"
+msgstr "断开显示器"
+
 #: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "新建快捷键…"
@@ -7664,10 +7850,6 @@ msgstr "鼠标中键单击"
 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 "前进"
@@ -7684,27 +7866,27 @@ msgstr "请将您的触控笔移到平板电脑附近以进行配置"
 msgid "Eraser Pressure Feel"
 msgstr "擦除压力感应"
 
-#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:341
 msgid "Soft"
 msgstr "软"
 
-#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
+#: panels/wacom/wacom-stylus-page.ui:211 panels/wacom/wacom-stylus-page.ui:372
 msgid "Firm"
 msgstr "硬"
 
-#: panels/wacom/wacom-stylus-page.ui:233
+#: panels/wacom/wacom-stylus-page.ui:234
 msgid "Top Button"
 msgstr "顶部按钮"
 
-#: panels/wacom/wacom-stylus-page.ui:262
+#: panels/wacom/wacom-stylus-page.ui:263
 msgid "Lower Button"
 msgstr "下部按钮"
 
-#: panels/wacom/wacom-stylus-page.ui:291
+#: panels/wacom/wacom-stylus-page.ui:292
 msgid "Lowest Button"
 msgstr "底部按钮"
 
-#: panels/wacom/wacom-stylus-page.ui:320
+#: panels/wacom/wacom-stylus-page.ui:321
 msgid "Tip Pressure Feel"
 msgstr "指尖压力感应"
 
@@ -7748,23 +7930,27 @@ msgstr "要显示的面板"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[面板] [参数…]"
 
-#: shell/cc-panel-loader.c:279
+#: shell/cc-panel-list.ui:45 shell/cc-window.c:277
+msgid "Privacy"
+msgstr "隐私"
+
+#: shell/cc-panel-loader.c:288
 msgid "Available panels:"
 msgstr "可用面板:"
 
-#: shell/cc-window.ui:147
+#: shell/cc-window.ui:140
 msgid "All Settings"
 msgstr "全部设置"
 
-#: shell/cc-window.ui:185
+#: shell/cc-window.ui:178
 msgid "Primary Menu"
 msgstr "主菜单"
 
-#: shell/cc-window.ui:332
+#: shell/cc-window.ui:319
 msgid "Warning: Development Version"
 msgstr "警告:开发版本"
 
-#: shell/cc-window.ui:333
+#: shell/cc-window.ui:320
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7773,7 +7959,7 @@ msgstr ""
 "该版本的 GNOME 设置仅适用于开发工作。您可能会遇到不正常的系统行为、数据丢失及"
 "其他未预期的问题。"
 
-#: shell/cc-window.ui:344
+#: shell/cc-window.ui:331
 msgid "Help"
 msgstr "帮助"
 
@@ -7851,6 +8037,496 @@ msgstr[0] "%u 路输入"
 msgid "System Sounds"
 msgstr "系统声音"
 
+#~ msgid "Add user accounts and change passwords"
+#~ msgstr "添加用户及更改密码"
+
+#~ msgid "Play and record sound"
+#~ msgstr "播放和录制声音"
+
+#~ msgid "Detect network devices using mDNS/DNS-SD (Bonjour/zeroconf)"
+#~ msgstr "使用mDNS / DNS-SD(Bonjour / zeroconf)检测网络设备"
+
+#~ msgid "Access bluetooth hardware directly"
+#~ msgstr "直接访问蓝牙硬件"
+
+#~ msgid "Use bluetooth devices"
+#~ msgstr "使用蓝牙设备"
+
+#~ msgid "Use your camera"
+#~ msgstr "使用相机"
+
+#~ msgid "Print documents"
+#~ msgstr "打印文档"
+
+#~ msgid "Use any connected joystick"
+#~ msgstr "使用任何连接的操纵杆"
+
+#~ msgid "Allow connecting to the Docker service"
+#~ msgstr "允许连接Docker服务"
+
+#~ msgid "Configure network firewall"
+#~ msgstr "配置网络防火墙"
+
+#~ msgid "Setup and use privileged FUSE filesystems"
+#~ msgstr "设置和使用特权FUSE文件系统"
+
+#~ msgid "Update firmware on this device"
+#~ msgstr "更新此设备上的固件"
+
+#~ msgid "Access hardware information"
+#~ msgstr "访问硬件信息"
+
+#~ msgid "Provide entropy to hardware random number generator"
+#~ msgstr "向硬件随机数生成器提供熵"
+
+#~ msgid "Use hardware-generated random numbers"
+#~ msgstr "使用硬件生成的随机数"
+
+#~ msgid "Access files in your home folder"
+#~ msgstr "访问主文件夹中的文件"
+
+#~ msgid "Access libvirt service"
+#~ msgstr "访问libvirt服务"
+
+#~ msgid "Change system language and region settings"
+#~ msgstr "更改系统语言与区域设置"
+
+#~ msgid "Change location settings and providers"
+#~ msgstr "更改位置设置和提供者"
+
+#~ msgid "Access your location"
+#~ msgstr "读取位置"
+
+#~ msgid "Read system and application logs"
+#~ msgstr "读取系统和应用程序日志"
+
+#~ msgid "Access LXD service"
+#~ msgstr "访问LXD服务"
+
+#~ msgid "access the media-hub service"
+#~ msgstr "访问媒体中心服务"
+
+#~ msgid "Use and configure modems"
+#~ msgstr "使用和配置调制解调器"
+
+#~ msgid "Read system mount information and disk quotas"
+#~ msgstr "阅读系统安装信息和磁盘配额"
+
+#~ msgid "Control music and video players"
+#~ msgstr "控制音视频播放器"
+
+#~ msgid "Change low-level network settings"
+#~ msgstr "更改底层网络设置"
+
+#~ msgid ""
+#~ "Access the NetworkManager service to read and change network settings"
+#~ msgstr "访问NetworkManager服务以读取和更改网络设置"
+
+#~ msgid "Read access to network settings"
+#~ msgstr "对网络设置的读取权限"
+
+#~ msgid "Change network settings"
+#~ msgstr "更改网络设置"
+
+#~ msgid "Read network settings"
+#~ msgstr "读取网络设置"
+
+#~ msgid ""
+#~ "Access the ofono service to read and change network settings for mobile "
+#~ "telephony"
+#~ msgstr "访问ofono服务以读取和更改电话网络设置"
+
+#~ msgid "Control Open vSwitch hardware"
+#~ msgstr "控制Open vSwitch硬件"
+
+#~ msgid "Read from CD/DVD"
+#~ msgstr "从CD / DVD读取"
+
+#~ msgid "Read, add, change, or remove saved passwords"
+#~ msgstr "增减或修改密码"
+
+#~ msgid ""
+#~ "Access pppd and ppp devices for configuring Point-to-Point Protocol "
+#~ "connections"
+#~ msgstr "访问pppd和ppp设备以配置点对点协议连接"
+
+#~ msgid "Pause or end any process on the system"
+#~ msgstr "暂停或结束系统上的任何进程"
+
+#~ msgid "Access USB hardware directly"
+#~ msgstr "直接访问USB硬件"
+
+#~ msgid "Read/write files on removable storage devices"
+#~ msgstr "在可移动存储设备上读写文件"
+
+#~ msgid "Prevent screen sleep/lock"
+#~ msgstr "阻止屏幕锁定"
+
+#~ msgid "Access serial port hardware"
+#~ msgstr "访问串行端口硬件"
+
+#~ msgid "Restart or power off the device"
+#~ msgstr "重新启动或关闭设备电源"
+
+#~ msgid "Install, remove and configure software"
+#~ msgstr "安装,删除和配置软件"
+
+#~ msgid "Access Storage Framework service"
+#~ msgstr "访问存储框架服务"
+
+#~ msgid "Read process and system information"
+#~ msgstr "读取过程和系统信息"
+
+#~ msgid "Monitor and control any running program"
+#~ msgstr "监视和控制任何正在运行的程序"
+
+#~ msgid "Change the date and time"
+#~ msgstr "更改日期、时间"
+
+#~ msgid "Change time server settings"
+#~ msgstr "更改时间服务器设置"
+
+#~ msgid "Change the time zone"
+#~ msgstr "更改时区"
+
+#~ msgid "Access the UDisks2 service for configuring disks and removable media"
+#~ msgstr "访问用于配置磁盘和可移动媒体的UDisks2服务"
+
+#~ msgid "Read/change shared calendar events in Ubuntu Unity 8"
+#~ msgstr "在Ubuntu Unity 8中读取/更改共享日历事件"
+
+#~ msgid "Read/change shared contacts in Ubuntu Unity 8"
+#~ msgstr "阅读/更改Ubuntu Unity 8中的共享联系人"
+
+#~ msgid "Access energy usage data"
+#~ msgstr "访问能源使用数据"
+
+#~ msgid "Read/write access to U2F devices exposed"
+#~ msgstr "U2F设备的读/写访问已开启"
+
+#~ msgid "Set Background and Lock Screen"
+#~ msgstr "设定背景和锁屏"
+
+#~ msgid "Set Background"
+#~ msgstr "设定背景"
+
+#~ msgid "Set Lock Screen"
+#~ msgstr "设定锁屏"
+
+#~ msgid "Remove Background"
+#~ msgstr "移除背景"
+
+#~ msgid "∶"
+#~ msgstr "∶"
+
+#~ msgid "Reports are sent anonymously and are scrubbed of personal data."
+#~ msgstr "报告以匿名方式发送,并清除了个人数据。"
+
+#~ msgid ""
+#~ "Sending reports of technical problems help us improve this operating "
+#~ "system."
+#~ msgstr "发送技术问题报告有助于我们改进此操作系统。"
+
+#~ msgid ""
+#~ "To create a user account,\n"
+#~ "click the * icon first"
+#~ msgstr ""
+#~ "要创建用户帐号,\n"
+#~ "请先点击 * 图标"
+
+#~ msgid "Enable Fingerprint Login"
+#~ msgstr "启用指纹登录"
+
+#~ msgid "_Other finger:"
+#~ msgstr "其他手指(_O):"
+
+#~ msgid ""
+#~ "Your fingerprint was successfully saved. You should now be able to log in "
+#~ "using your fingerprint reader."
+#~ msgstr "您的指纹已成功保存,从现在起可以使用指纹登录。"
+
+#~ msgid ""
+#~ "You are not allowed to access the device. Contact your system "
+#~ "administrator."
+#~ msgstr "您未被允许访问该设备。请联系系统管理员。"
+
+#~ msgid "The device is already in use."
+#~ msgstr "设备正被占用。"
+
+#~ msgid "An internal error occurred."
+#~ msgstr "发生了一个内部错误。"
+
+#~ msgid "Delete registered fingerprints?"
+#~ msgstr "要删除已登记的指纹吗?"
+
+#~ msgid "Done!"
+#~ msgstr "完成!"
+
+#~ msgid "Could not access “%s” device"
+#~ msgstr "无法访问设备“%s”"
+
+#~ msgid "Could not start finger capture on “%s” device"
+#~ msgstr "无法在设备“%s”上启动指纹采集"
+
+#~ msgid "Could not access any fingerprint readers"
+#~ msgstr "无法访问指纹读取器"
+
+#~ msgid "Please contact your system administrator for help."
+#~ msgstr "请联系系统管理员以寻求帮助。"
+
+#~ msgid ""
+#~ "To enable fingerprint login, you need to save one of your fingerprints, "
+#~ "using the “%s” device."
+#~ msgstr "要启用指纹登录,您需要使用设备“%s”保存一个指纹。"
+
+#~ msgid "Selecting finger"
+#~ msgstr "选择手指"
+
+#~ msgid "Version %s"
+#~ msgstr "版本 %s"
+
+#~ msgid "OS name"
+#~ msgstr "系统名称"
+
+#~ msgid "OS type"
+#~ msgstr "系统类型"
+
+#~ msgid "Disk"
+#~ msgstr "磁盘"
+
+#~ msgid "Check for updates"
+#~ msgstr "检查更新"
+
+#~ msgid "Network proxy"
+#~ msgstr "网络代理"
+
+#~ msgid "page 1"
+#~ msgstr "第 1 页"
+
+#~ msgid "Inner _authentication"
+#~ msgstr "内部认证(_A)"
+
+#~ msgid "page 2"
+#~ msgstr "第 2 页"
+
+#~ msgid "Restrict background data usage"
+#~ msgstr "限制后台数据的使用"
+
+#~ msgid "Appropriate for connections that have data charges or limits."
+#~ msgstr "适用于有数据费用或限制的连接。"
+
+#~ msgid "Twisted Pair (TP)"
+#~ msgstr "双绞线 (TP)"
+
+#~ msgid "Attachment Unit Interface (AUI)"
+#~ msgstr "连接单元接口 (AUI)"
+
+#~ msgid "BNC"
+#~ msgstr "BNC"
+
+#~ msgid "Media Independent Interface (MII)"
+#~ msgstr "媒体独立接口 (MII)"
+
+#~ msgid "10 Mb/s"
+#~ msgstr "10 Mb/s"
+
+#~ msgid "100 Mb/s"
+#~ msgstr "100 Mb/s"
+
+#~ msgid "1 Gb/s"
+#~ msgstr "1 Gb/s"
+
+#~ msgid "10 Gb/s"
+#~ msgstr "10 Gb/s"
+
+#~ msgid ""
+#~ "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+#~ msgstr "打开无线网热点将使您从 <b>%s</b> 断开。"
+
+#~ msgid ""
+#~ "It is not possible to access the Internet through your wireless while the "
+#~ "hotspot is active."
+#~ msgstr "启用热点模式时无法通过无线网络访问互联网。"
+
+#~ msgid ""
+#~ "Wi-Fi hotspots are usually used to share an additional Internet "
+#~ "connection over Wi-Fi."
+#~ msgstr "Wi-Fi 热点常用于在 Wi-Fi 上共享其互联网连接。"
+
+#~ msgid "Automatic _Connect"
+#~ msgstr "自动连接(_C)"
+
+#~ msgid "details"
+#~ msgstr "详细信息"
+
+#~ msgid "Show P_assword"
+#~ msgstr "显示密码(_A)"
+
+#~ msgid "Make available to other users"
+#~ msgstr "对其他用户可用"
+
+#~ msgid "identity"
+#~ msgstr "身份"
+
+#~ msgid "IPv_4"
+#~ msgstr "IPv_4"
+
+#~ msgid "_Addresses"
+#~ msgstr "地址(_A)"
+
+#~ msgid "Automatic (DHCP) addresses only"
+#~ msgstr "仅自动分配地址 (DHCP)"
+
+#~ msgid "Link-local only"
+#~ msgstr "仅本地链路"
+
+#~ msgid "_Ignore automatically obtained routes"
+#~ msgstr "忽略自动获取的路由(_I)"
+
+#~ msgid "ipv4"
+#~ msgstr "ipv4"
+
+#~ msgid "IPv_6"
+#~ msgstr "IPv_6"
+
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
+
+#~ msgid "_Cloned MAC Address"
+#~ msgstr "克隆的 MAC 地址(_C)"
+
+#~ msgid "_Reset"
+#~ msgstr "重置(_R)"
+
+#~ msgid ""
+#~ "Reset the settings for this connection to their defaults, but remember as "
+#~ "a preferred connection."
+#~ msgstr "将这个连接的设置重置为默认值,但仍作为首选连接。"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect to it."
+#~ msgstr "删除关于这个网络的所有细节,不再尝试自动连接。"
+
+#~ msgid "Hardware"
+#~ msgstr "硬件"
+
+#~ msgctxt "tab"
+#~ msgid "Reset"
+#~ msgstr "重置"
+
+#~ msgid "Connected Devices"
+#~ msgstr "已连接的设备"
+
+#~ msgid "Ad-hoc"
+#~ msgstr "Ad-hoc"
+
+#~ msgid "Infrastructure"
+#~ msgstr "架构"
+
+#~ msgid "Not connected"
+#~ msgstr "未连接"
+
+#~ msgid "Notification _Popups"
+#~ msgstr "通知弹窗(_P)"
+
+#~ msgid "In use"
+#~ msgstr "已占用"
+
+#~ msgctxt "Location services status"
+#~ msgid "On"
+#~ msgstr "开启"
+
+#~ msgctxt "Location services status"
+#~ msgid "Off"
+#~ msgstr "关闭"
+
+#~ msgctxt "Camera status"
+#~ msgid "Off"
+#~ msgstr "关闭"
+
+#~ msgctxt "Camera status"
+#~ msgid "On"
+#~ msgstr "开启"
+
+#~ msgctxt "Microphone status"
+#~ msgid "Off"
+#~ msgstr "关闭"
+
+#~ msgctxt "Microphone status"
+#~ msgid "On"
+#~ msgstr "开启"
+
+#~ msgid "Usage & History"
+#~ msgstr "用量及历史"
+
+#~ msgid "Privacy Policy"
+#~ msgstr "隐私政策"
+
+#~ msgid ""
+#~ "Remembering your history makes things easier to find again. These items "
+#~ "are never shared over the network."
+#~ msgstr "记住历史能够在下次使用时方便查找。这些条目永远不会通过网络共享。"
+
+#~ msgid "_Recently Used"
+#~ msgstr "最近使用(_R)"
+
+#~ msgid "Retain _History"
+#~ msgstr "保留历史(_H)"
+
+#~ msgid "The Screen Lock protects your privacy when you are away."
+#~ msgstr "离开时锁定屏幕可以保护隐私。"
+
+#~ msgid "Lock screen _after blank for"
+#~ msgstr "黑屏至锁屏的等待时间(_A)"
+
+#~ msgid "Lock Screen _Notifications"
+#~ msgstr "锁屏通知(_N)"
+
+#~ msgid ""
+#~ "Automatically purge the Trash and temporary files to help keep your "
+#~ "computer free of unnecessary sensitive information."
+#~ msgstr "自动清理回收站和临时文件,避免计算机保存不必要的敏感信息。"
+
+#~ msgid "Purge _After"
+#~ msgstr "清理延时(_A)"
+
+#~ msgid ""
+#~ "Sending us information about which software you use helps us provide you "
+#~ "with more accurate recommendations. It also helps us to improve our "
+#~ "software.\n"
+#~ "\n"
+#~ "All the information we collect is made anonymous, and we will never share "
+#~ "your data with third parties."
+#~ msgstr ""
+#~ "发送软件的使用情况有助于我们向提供更准确的推荐,帮助改进软件。\n"
+#~ "\n"
+#~ "信息均为匿名收集,不会与他人分享。"
+
+#~ msgid "_Send software usage statistics"
+#~ msgstr "发送软件使用统计信息(_S)"
+
+#~ msgid "_Camera"
+#~ msgstr "相机(_C)"
+
+#~ msgid "_Microphone"
+#~ msgstr "麦克风(_M)"
+
+#~ msgid "_Location Services"
+#~ msgstr "定位服务(_L)"
+
+#~ msgid "Protect your personal information and control what others might see"
+#~ msgstr "保护个人信息并控制他人可见的信息"
+
+#~ msgid "No regions found"
+#~ msgstr "无可用区域"
+
+#~ msgid "Flash the _window title"
+#~ msgstr "闪烁窗口标题栏(_W)"
+
+#~ msgid "Last Login"
+#~ msgstr "最近登录"
+
 #~ msgid "_Background"
 #~ msgstr "背景(_B)"
 
@@ -7969,9 +8645,6 @@ msgstr "系统声音"
 #~ msgid "printer"
 #~ msgstr "printer"
 
-#~ msgid "Show _Notifications"
-#~ msgstr "显示通知(_N)"
-
 #~ msgid "preferences-system-privacy"
 #~ msgstr "preferences-system-privacy"
 
@@ -8058,9 +8731,6 @@ msgstr "系统声音"
 #~ msgid "Sound Effects"
 #~ msgstr "声音效果"
 
-#~ msgid "No application is currently playing or recording audio."
-#~ msgstr "没有正在播放或录制音频的程序。"
-
 #~ msgid "Built-in"
 #~ msgstr "内置"
 
@@ -8091,15 +8761,9 @@ 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)"
 
@@ -8297,9 +8961,6 @@ msgstr "系统声音"
 #~ "如果有无线网络以外的方式连接互联网,您可以配置无线热点并与他人共享网络连"
 #~ "接。"
 
-#~ msgid "History"
-#~ msgstr "历史"
-
 #~ msgid "Proxy"
 #~ msgstr "代理"
 
@@ -8318,15 +8979,9 @@ msgstr "系统声音"
 #~ msgid "Automatic"
 #~ msgstr "自动"
 
-#~ msgid "VPN Type"
-#~ msgstr "VPN 类型"
-
 #~ msgid "Group Name"
 #~ msgstr "组名"
 
-#~ msgid "Group Password"
-#~ msgstr "组密码"
-
 #~ msgid "_Use as Hotspot…"
 #~ msgstr "用作热点(_U)…"
 
@@ -8573,10 +9228,6 @@ msgstr "系统声音"
 #~ msgid "Scroll Right"
 #~ msgstr "向右滚动"
 
-#~ msgctxt "category"
-#~ msgid "Personal"
-#~ msgstr "个人"
-
 #~ msgctxt "category"
 #~ msgid "Hardware"
 #~ msgstr "硬件"
@@ -8585,9 +9236,6 @@ msgstr "系统声音"
 #~ msgid "System"
 #~ msgstr "系统"
 
-#~ msgid "Wayland"
-#~ msgstr "Wayland"
-
 #~ msgctxt "button"
 #~ msgid "Set Shortcut"
 #~ msgstr "设置快捷键"
@@ -8699,9 +9347,6 @@ msgstr "系统声音"
 #~ msgid "Don't _warn me again"
 #~ msgstr "不再警告(_W)"
 
-#~ msgid "No"
-#~ msgstr "否"
-
 #~ msgid "Yes"
 #~ msgstr "是"
 
@@ -8764,9 +9409,6 @@ msgstr "系统声音"
 #~ msgid "Job State"
 #~ msgstr "任务状态"
 
-#~ msgid "Time"
-#~ msgstr "时间"
-
 #~ msgid "Used to determine your geographical location"
 #~ msgstr "用于获得您的位置信息"
 
@@ -8860,9 +9502,6 @@ msgstr "系统声音"
 #~ msgid "Bluetooth is disabled"
 #~ msgstr "蓝牙已禁用"
 
-#~ msgid "Security key"
-#~ msgstr "安全密钥"
-
 #~ msgid "Wireless devices require extra power"
 #~ msgstr "无线设备需要消耗更多电"
 



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