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



commit 86f3d2bb9cc47dce359c58f41d49b68bc29010be
Author: Dz Chen <wsxy162 gmail com>
Date:   Wed May 8 09:26:50 2019 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 1914 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1058 insertions(+), 856 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c7050cc1..5925966e3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -25,15 +25,15 @@
 # Aron Xu <happyaron xu gmail com>, 2010, 2011, 2012, 2013, 2014, 2015.
 # Mingye Wang <arthur2e5 aosc xyz>, 2015.
 # Jeff Bai <jeffbai aosc xyz>, 2015, 2016.
-# Dingzhong Chen <wsxy162 gmail com>, 2016.
+# Dingzhong Chen <wsxy162 gmail com>, 2016, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 3.22\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Project-Id-Version: gnome-control-center 3.24\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-27 16:38+0000\n"
-"PO-Revision-Date: 2016-10-30 20:32+0800\n"
+"POT-Creation-Date: 2017-03-28 16:12+0000\n"
+"PO-Revision-Date: 2017-03-30 18:50+0800\n"
 "Last-Translator: Dingzhong Chen <wsxy162 gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
@@ -128,28 +128,28 @@ msgstr "您添加到 %s 文件夹的图片将在此显示"
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1561
-#: ../panels/display/cc-display-panel.c:2207
+#: ../panels/display/cc-display-panel.c:1580
+#: ../panels/display/cc-display-panel.c:2226
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 #: ../panels/network/connection-editor/vpn-helpers.c:181
 #: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1298
-#: ../panels/network/net-device-wifi.c:1535
+#: ../panels/network/net-device-wifi.c:1346
+#: ../panels/network/net-device-wifi.c:1585
 #: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2077
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:1048
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/pp-details-dialog.c:319
+#: ../panels/privacy/cc-privacy-panel.c:1049
 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
 #: ../panels/search/cc-search-locations-dialog.c:637
-#: ../panels/sharing/cc-sharing-panel.c:372
+#: ../panels/sharing/cc-sharing-panel.c:375
 #: ../panels/user-accounts/data/account-dialog.ui.h:2
 #: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:265
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
 #: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:217
-#: ../panels/user-accounts/um-user-panel.c:705
-#: ../panels/user-accounts/um-user-panel.c:723
+#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/user-accounts/um-user-panel.c:644
+#: ../panels/user-accounts/um-user-panel.c:662
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -242,7 +242,7 @@ msgstr "share;sharing;bluetooth;obex;分享;共享;蓝牙;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: ../panels/color/cc-color-calibrate.c:361
-msgid "Place your calibration device over the square and press 'Start'"
+msgid "Place your calibration device over the square and press “Start”"
 msgstr "将您的校准设备放在方块上并按“开始”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
@@ -250,7 +250,7 @@ msgstr "将您的校准设备放在方块上并按“开始”"
 #. * what to do...
 #: ../panels/color/cc-color-calibrate.c:367
 msgid ""
-"Move your calibration device to the calibrate position and press 'Continue'"
+"Move your calibration device to the calibrate position and press “Continue”"
 msgstr "将您的校准器移动到校准位置并按“继续”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
@@ -258,7 +258,7 @@ msgstr "将您的校准器移动到校准位置并按“继续”"
 #. * what to do...
 #: ../panels/color/cc-color-calibrate.c:373
 msgid ""
-"Move your calibration device to the surface position and press 'Continue'"
+"Move your calibration device to the surface position and press “Continue”"
 msgstr "将您的校准器移动到表面位置并按“继续”"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
@@ -689,12 +689,12 @@ msgstr ""
 "有所帮助。"
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:730
+#: ../panels/user-accounts/um-fingerprint-dialog.c:723
 msgid "Summary"
 msgstr "摘要"
 
 #: ../panels/color/color.ui.h:28
-msgid "Add profile"
+msgid "Add Profile"
 msgstr "添加配置"
 
 #: ../panels/color/color.ui.h:29
@@ -703,7 +703,7 @@ msgstr "导入文件(_I)…"
 
 #: ../panels/color/color.ui.h:31
 #: ../panels/network/connection-editor/net-connection-editor.c:546
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:4
 #: ../panels/region/input-chooser.ui.h:3
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "_Add"
@@ -923,19 +923,19 @@ msgstr "年"
 #. Translators: This is the full date and time format used in 12-hour mode.
 #: ../panels/datetime/cc-datetime-panel.c:340
 msgid "%e %B %Y, %l:%M %p"
-msgstr "%Y年%m月%d日, %p %-l:%M"
+msgstr "%Y年%m月%d日,%p %-l:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
 #: ../panels/datetime/cc-datetime-panel.c:345
 msgid "%e %B %Y, %R"
-msgstr "%Y年%m月%d日, %R"
+msgstr "%Y年%m月%d日,%R"
 
 #. Translators: "city, country"
 #: ../panels/datetime/cc-datetime-panel.c:523
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
-msgstr "%s, %s"
+msgstr "%s,%s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
@@ -1093,22 +1093,23 @@ msgstr "更改系统时间和日期设置"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "修改时间或日期设置需要认证。"
 
-#: ../panels/display/cc-display-panel.c:573
+#: ../panels/display/cc-display-panel.c:592
 msgid "Lid Closed"
 msgstr "上盖已合上"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:576
+#: ../panels/display/cc-display-panel.c:595
 msgid "Mirrored"
 msgstr "镜像显示"
 
-#: ../panels/display/cc-display-panel.c:578
-#: ../panels/display/cc-display-panel.c:2430
+#: ../panels/display/cc-display-panel.c:597
+#: ../panels/display/cc-display-panel.c:2449
 msgid "Primary"
 msgstr "主显示器"
 
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/notifications/cc-notifications-panel.c:257
+#: ../panels/display/cc-display-panel.c:599
+#: ../panels/display/cc-display-panel.c:2786
+#: ../panels/notifications/cc-notifications-panel.c:293
 #: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
 #: ../panels/privacy/cc-privacy-panel.c:190
 #: ../panels/privacy/cc-privacy-panel.c:257
@@ -1121,119 +1122,196 @@ msgstr "主显示器"
 msgid "Off"
 msgstr "关"
 
-#: ../panels/display/cc-display-panel.c:583
+#: ../panels/display/cc-display-panel.c:602
 msgid "Secondary"
 msgstr "副显示器"
 
 #. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1558
+#: ../panels/display/cc-display-panel.c:1577
 msgid "Arrange Combined Displays"
 msgstr "安排多个显示"
 
-#: ../panels/display/cc-display-panel.c:1562
-#: ../panels/display/cc-display-panel.c:2208
+#: ../panels/display/cc-display-panel.c:1581
+#: ../panels/display/cc-display-panel.c:2227
 #: ../panels/network/connection-editor/connection-editor.ui.h:2
 #: ../panels/network/network-wifi.ui.h:2
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: ../panels/display/cc-display-panel.c:1586
+#: ../panels/display/cc-display-panel.c:1605
 msgid "Drag displays to rearrange them"
 msgstr "拖动以重新排列显示屏拖动以重新排列显示屏"
 
 #. translators: example string is "60 Hz (NTSC)"
 #. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1793
+#: ../panels/display/cc-display-panel.c:1812
 #, c-format
 msgid "%d Hz (NTSC)"
 msgstr "%d Hz (NTSC)"
 
 #. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1799
+#: ../panels/display/cc-display-panel.c:1818
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../panels/display/cc-display-panel.c:2260
+#: ../panels/display/cc-display-panel.c:2279
 msgid "Rotate counterclockwise by 90°"
 msgstr "逆时针旋转 90°"
 
-#: ../panels/display/cc-display-panel.c:2278
+#: ../panels/display/cc-display-panel.c:2297
 msgid "Rotate by 180°"
 msgstr "旋转 180°"
 
-#: ../panels/display/cc-display-panel.c:2296
+#: ../panels/display/cc-display-panel.c:2315
 msgid "Rotate clockwise by 90°"
 msgstr "顺时针旋转 90°"
 
-#: ../panels/display/cc-display-panel.c:2317
+#: ../panels/display/cc-display-panel.c:2336
 msgid "Size"
 msgstr "大小"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2332
+#: ../panels/display/cc-display-panel.c:2351
 msgid "Aspect Ratio"
 msgstr "宽高比"
 
-#: ../panels/display/cc-display-panel.c:2355
+#: ../panels/display/cc-display-panel.c:2374
 #: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "分辨率"
 
-#: ../panels/display/cc-display-panel.c:2375
+#: ../panels/display/cc-display-panel.c:2394
 msgid "Adjust for TV"
 msgstr "为 TV 调整"
 
-#: ../panels/display/cc-display-panel.c:2399
+#: ../panels/display/cc-display-panel.c:2418
 msgid "Refresh Rate"
 msgstr "刷新频率"
 
-#: ../panels/display/cc-display-panel.c:2431
+#: ../panels/display/cc-display-panel.c:2450
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "在此显示器上显示顶栏和活动概览"
 
-#: ../panels/display/cc-display-panel.c:2437
+#: ../panels/display/cc-display-panel.c:2456
 msgid "Secondary Display"
 msgstr "副显示器"
 
-#: ../panels/display/cc-display-panel.c:2438
+#: ../panels/display/cc-display-panel.c:2457
 msgid "Join this display with another to create an extra workspace"
 msgstr "将该显示器与另一显示器合并以扩展工作空间"
 
 # 左撇子有歧视色彩。
-#: ../panels/display/cc-display-panel.c:2445
+#: ../panels/display/cc-display-panel.c:2464
 msgid "Presentation"
 msgstr "演示"
 
-#: ../panels/display/cc-display-panel.c:2446
+#: ../panels/display/cc-display-panel.c:2465
 msgid "Show slideshows and media only"
 msgstr "只显示幻灯片和多媒体"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2451
+#: ../panels/display/cc-display-panel.c:2470
 msgid "Mirror"
 msgstr "镜像"
 
-#: ../panels/display/cc-display-panel.c:2452
+#: ../panels/display/cc-display-panel.c:2471
 msgid "Show your existing view on both displays"
 msgstr "在两块显示器上同时显示当前视图"
 
-#: ../panels/display/cc-display-panel.c:2458
+#: ../panels/display/cc-display-panel.c:2477
 msgid "Turn Off"
 msgstr "关闭"
 
-#: ../panels/display/cc-display-panel.c:2459
-msgid "Don't use this display"
+#: ../panels/display/cc-display-panel.c:2478
+msgid "Don’t use this display"
 msgstr "不使用该显示器"
 
-#: ../panels/display/cc-display-panel.c:2770
+#. TRANSLATORS: the state of the night light setting
+#: ../panels/display/cc-display-panel.c:2786
+#: ../panels/notifications/cc-notifications-panel.c:293
+#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:269
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
+msgid "On"
+msgstr "开"
+
+#: ../panels/display/cc-display-panel.c:2826
 msgid "Could not get screen information"
 msgstr "无法获取屏幕信息"
 
-#: ../panels/display/cc-display-panel.c:2801
+#: ../panels/display/cc-display-panel.c:2857
 msgid "_Arrange Combined Displays"
 msgstr "安排多个显示(_A)"
 
+#: ../panels/display/cc-display-panel.c:2878
+msgid "_Night Light"
+msgstr "夜光(_N)"
+
+#. This cancels the redshift inhibit.
+#: ../panels/display/display.ui.h:2
+msgid "Restart Filter"
+msgstr "重启滤镜"
+
+#. Inhibit the redshift functionality until the next day starts
+#: ../panels/display/display.ui.h:4
+msgid "Temporarily Disabled Until Tomorrow"
+msgstr "暂时禁用直到明天"
+
+#: ../panels/display/display.ui.h:5
+msgid ""
+"Night light makes the screen color warmer. This can help to prevent eye "
+"strain and sleeplessness."
+msgstr "夜光使屏幕颜色更暖。这可以帮助预防眼疲劳和失眠。"
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: ../panels/display/display.ui.h:7
+msgid "Night Light"
+msgstr "夜光"
+
+#: ../panels/display/display.ui.h:8
+msgid "Schedule"
+msgstr "计划"
+
+#: ../panels/display/display.ui.h:9
+msgid "Sunset to Sunrise"
+msgstr "日落到日出"
+
+#: ../panels/display/display.ui.h:10
+#: ../panels/network/connection-editor/ce-page-ip4.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/network-wifi.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Manual"
+msgstr "手动"
+
+#: ../panels/display/display.ui.h:11
+msgid "From"
+msgstr "从"
+
+#: ../panels/display/display.ui.h:12
+msgid ":"
+msgstr ":"
+
+#. This is the short form for the time period in the morning
+#: ../panels/display/display.ui.h:14
+msgid "AM"
+msgstr "上午"
+
+#. This is the short form for the time period in the afternoon
+#: ../panels/display/display.ui.h:16
+msgid "PM"
+msgstr "下午"
+
+#: ../panels/display/display.ui.h:17
+msgid "To"
+msgstr "到"
+
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
 msgid "Dis­plays"
@@ -1245,69 +1323,79 @@ msgstr "选择如何使用接入的显示器和投影仪"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:5
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
+msgid ""
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;color;sunset;sunrise;"
 msgstr ""
-"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影仪;屏幕;分"
-"辨率;刷新;"
+"Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
+"redshift;color;sunset;sunrise;面板;投影仪;屏幕;分辨率;刷新;显示器;夜晚;光;蓝"
+"色;红移;颜色;日落;日出;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:434 ../panels/network/panel-common.c:123
+#: ../panels/info/cc-info-panel.c:384 ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "未知"
 
-#: ../panels/info/cc-info-panel.c:567
+#. translators: This is the name of the OS, followed by the type
+#. * of architecture and the build id, for example:
+#. * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or
+#. * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)"
+#: ../panels/info/cc-info-panel.c:517
 #, c-format
 msgid "%s %d-bit (Build ID: %s)"
 msgstr "%s %d 位(构建 ID:%s)"
 
-#: ../panels/info/cc-info-panel.c:569
+#: ../panels/info/cc-info-panel.c:519
 #, c-format
 msgid "%d-bit (Build ID: %s)"
 msgstr "%d 位(构建 ID:%s)"
 
-#: ../panels/info/cc-info-panel.c:577
+#. translators: This is the name of the OS, followed by the type
+#. * of architecture, for example:
+#. * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit"
+#: ../panels/info/cc-info-panel.c:527
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %d 位"
 
-#: ../panels/info/cc-info-panel.c:579
+#: ../panels/info/cc-info-panel.c:529
 #, c-format
 msgid "%d-bit"
 msgstr "%d 位"
 
-#: ../panels/info/cc-info-panel.c:1260
+#: ../panels/info/cc-info-panel.c:1175
 msgid "Ask what to do"
 msgstr "询问如何处理"
 
-#: ../panels/info/cc-info-panel.c:1264
+#: ../panels/info/cc-info-panel.c:1179
 msgid "Do nothing"
 msgstr "无动作"
 
-#: ../panels/info/cc-info-panel.c:1268
+#: ../panels/info/cc-info-panel.c:1183
 msgid "Open folder"
 msgstr "打开文件夹"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1274
 msgid "Other Media"
 msgstr "其他媒体"
 
-#: ../panels/info/cc-info-panel.c:1390
+#: ../panels/info/cc-info-panel.c:1305
 msgid "Select an application for audio CDs"
 msgstr "选择播放音频 CD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1391
+#: ../panels/info/cc-info-panel.c:1306
 msgid "Select an application for video DVDs"
 msgstr "选择播放视频 DVD 的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1392
+#: ../panels/info/cc-info-panel.c:1307
 msgid "Select an application to run when a music player is connected"
 msgstr "选择连接音乐播放器后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1393
+#: ../panels/info/cc-info-panel.c:1308
 msgid "Select an application to run when a camera is connected"
 msgstr "选择连接相机后运行的应用程序"
 
-#: ../panels/info/cc-info-panel.c:1394
+#: ../panels/info/cc-info-panel.c:1309
 msgid "Select an application for software CDs"
 msgstr "选择插入软件 CD 时运行的应用程序"
 
@@ -1316,72 +1404,72 @@ msgstr "选择插入软件 CD 时运行的应用程序"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1406
+#: ../panels/info/cc-info-panel.c:1321
 msgid "audio DVD"
 msgstr "音频 DVD"
 
-#: ../panels/info/cc-info-panel.c:1407
+#: ../panels/info/cc-info-panel.c:1322
 msgid "blank Blu-ray disc"
 msgstr "空白蓝光光盘"
 
-#: ../panels/info/cc-info-panel.c:1408
+#: ../panels/info/cc-info-panel.c:1323
 msgid "blank CD disc"
 msgstr "空白 CD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1409
+#: ../panels/info/cc-info-panel.c:1324
 msgid "blank DVD disc"
 msgstr "空白 DVD 光盘"
 
 # 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1410
+#: ../panels/info/cc-info-panel.c:1325
 msgid "blank HD DVD disc"
 msgstr "空白 HD DVD 光盘"
 
-#: ../panels/info/cc-info-panel.c:1411
+#: ../panels/info/cc-info-panel.c:1326
 msgid "Blu-ray video disc"
 msgstr "蓝光视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1412
+#: ../panels/info/cc-info-panel.c:1327
 msgid "e-book reader"
 msgstr "电子书阅读器"
 
-#: ../panels/info/cc-info-panel.c:1413
+#: ../panels/info/cc-info-panel.c:1328
 msgid "HD DVD video disc"
 msgstr "HD DVD 视频光盘"
 
-#: ../panels/info/cc-info-panel.c:1414
+#: ../panels/info/cc-info-panel.c:1329
 msgid "Picture CD"
 msgstr "图片 CD"
 
-#: ../panels/info/cc-info-panel.c:1415
+#: ../panels/info/cc-info-panel.c:1330
 msgid "Super Video CD"
 msgstr "超级 VCD "
 
-#: ../panels/info/cc-info-panel.c:1416
+#: ../panels/info/cc-info-panel.c:1331
 msgid "Video CD"
 msgstr "视频 CD"
 
-#: ../panels/info/cc-info-panel.c:1417
+#: ../panels/info/cc-info-panel.c:1332
 msgid "Windows software"
 msgstr "Windows 软件"
 
-#: ../panels/info/cc-info-panel.c:1540
+#: ../panels/info/cc-info-panel.c:1455
 msgid "Section"
 msgstr "节"
 
-#: ../panels/info/cc-info-panel.c:1549 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1464 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "总览"
 
-#: ../panels/info/cc-info-panel.c:1555 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1470 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "默认应用程序"
 
-#: ../panels/info/cc-info-panel.c:1560 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1475 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "可移动介质"
 
-#: ../panels/info/cc-info-panel.c:1585
+#: ../panels/info/cc-info-panel.c:1500
 #, c-format
 msgid "Version %s"
 msgstr "版本 %s"
@@ -1412,7 +1500,7 @@ msgstr "选择如何处理其他介质"
 
 #: ../panels/info/info.ui.h:2
 msgid "_Action:"
-msgstr "动作(_A):"
+msgstr "操作(_A):"
 
 #: ../panels/info/info.ui.h:3
 msgid "_Type:"
@@ -1572,8 +1660,8 @@ msgstr "启动器"
 msgid "Launch help browser"
 msgstr "启动帮助浏览器"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
-#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:277
+#: ../shell/alt/cc-window.c:830 ../shell/cc-window.c:1590
 #: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "设置"
@@ -1683,9 +1771,9 @@ msgstr "减小文本字号"
 msgid "High contrast on or off"
 msgstr "高对比度开关"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:522
-#: ../panels/keyboard/cc-keyboard-manager.c:830
+#: ../panels/keyboard/cc-keyboard-manager.c:512
+#: ../panels/keyboard/cc-keyboard-manager.c:520
+#: ../panels/keyboard/cc-keyboard-manager.c:828
 msgid "Custom Shortcuts"
 msgstr "自定义快捷键"
 
@@ -1700,7 +1788,7 @@ msgstr "自定义快捷键"
 #: ../panels/keyboard/shortcut-editor.ui.h:2
 #: ../panels/network/network-wifi.ui.h:31
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "禁用"
 
@@ -1724,33 +1812,53 @@ msgstr "Compose 键"
 msgid "Modifiers-only switch to next source"
 msgstr "切换至下一输入源的修饰键"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:217
+#: ../panels/keyboard/cc-keyboard-panel.c:181
+msgid "Reset All Shortcuts?"
+msgstr "重置所有快捷键?"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:184
+msgid ""
+"Resetting the shortcuts may affect your custom shortcuts. This cannot be "
+"undone."
+msgstr "重新设置快捷键可能影响您的自定义快捷键。此操作无法撤销。"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:188
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "取消"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:189
+msgid "Reset All"
+msgstr "全部重置"
+
+#: ../panels/keyboard/cc-keyboard-panel.c:281
 msgid "Reset the shortcut to its default value"
 msgstr "重置快捷键为它的默认值"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:433
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
 "disabled"
 msgstr "%s 已被用于 <b>%s</b>。如果您替换了它,%s 将被禁用"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
 msgid "Set Custom Shortcut"
 msgstr "设置自定义快捷键"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
-#: ../panels/keyboard/shortcut-editor.ui.h:7
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
 msgid "Set Shortcut"
 msgstr "设置快捷键"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:608
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "输入新的快捷键以更改<b>%s</b>。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:945
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1036
 msgid "Add Custom Shortcut"
 msgstr "添加自定义快捷键"
 
@@ -1769,10 +1877,23 @@ msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
+#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "Reset All…"
+msgstr "全部重置…"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "重置所有快捷键为它们的默认键绑定"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "No keyboard shortcut found"
 msgstr "未找到键盘快捷键"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 ../shell/panel-list.ui.h:4
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
 msgid "Try a different search"
 msgstr "尝试不同的搜索"
 
@@ -1781,6 +1902,7 @@ msgid "Press Esc to cancel."
 msgstr "按 Esc 键取消。"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/printers/details-dialog.ui.h:1
 #: ../panels/sound/gvc-mixer-dialog.c:1493
 #: ../panels/sound/gvc-sound-theme-chooser.c:564
 msgid "Name"
@@ -1795,43 +1917,37 @@ msgid "Shortcut"
 msgstr "快捷键"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:6
-msgid "Edit"
-msgstr "编辑"
+msgid "Set Shortcut…"
+msgstr "设置快捷键…"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: ../panels/keyboard/shortcut-editor.ui.h:7
 #: ../panels/network/network-wifi.ui.h:20
 msgid "None"
 msgstr "无"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:9
+#: ../panels/keyboard/shortcut-editor.ui.h:8
 msgid "Remove"
 msgstr "移除"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/keyboard/shortcut-editor.ui.h:9
 msgid "Enter the new shortcut"
 msgstr "输入新的快捷键"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "取消"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:12
 #: ../panels/network/connection-editor/ce-page-ip4.c:305
 #: ../panels/network/connection-editor/ce-page-ip6.c:277
 msgid "Add"
 msgstr "添加"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: ../panels/keyboard/shortcut-editor.ui.h:12
 msgid "Replace"
 msgstr "替换"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:14
+#: ../panels/keyboard/shortcut-editor.ui.h:13
 msgid "Set"
 msgstr "设置"
 
-#: ../panels/mouse/cc-mouse-panel.c:82
+#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
 msgid "Test Your _Settings"
 msgstr "测试您的设置(_S)"
 
@@ -1980,7 +2096,7 @@ msgstr "802.1X 安全性(_S)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:2
 #: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/wacom/wacom-stylus-page.ui.h:8
 msgid "page 1"
 msgstr "第 1 页"
 
@@ -1999,7 +2115,7 @@ msgstr "内部认证(_A)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
 #: ../panels/network/connection-editor/security-page.ui.h:6
-#: ../panels/printers/printers.ui.h:16
+#: ../panels/wacom/wacom-stylus-page.ui.h:16
 msgid "page 2"
 msgstr "第 2 页"
 
@@ -2021,34 +2137,34 @@ msgstr "配置 %d"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:214
-#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/net-device-wifi.c:215
+#: ../panels/network/net-device-wifi.c:391
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:218
-#: ../panels/network/net-device-wifi.c:395
+#: ../panels/network/net-device-wifi.c:219
+#: ../panels/network/net-device-wifi.c:396
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:222
+#: ../panels/network/net-device-wifi.c:223
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/net-device-wifi.c:228
 msgid "Enterprise"
 msgstr "企业"
 
 #: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:232
-#: ../panels/network/net-device-wifi.c:380
+#: ../panels/network/net-device-wifi.c:233
+#: ../panels/network/net-device-wifi.c:381
 msgctxt "Wifi security"
 msgid "None"
 msgstr "无"
@@ -2060,7 +2176,7 @@ msgstr "从不"
 
 #: ../panels/network/connection-editor/ce-page-details.c:104
 #: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/net-device-wifi.c:486
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2069,43 +2185,43 @@ msgstr[0] "%i 天前"
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:153
 #: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:542
+#: ../panels/network/net-device-wifi.c:544
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/秒"
 
 #: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/net-device-wifi.c:573
 msgctxt "Signal strength"
 msgid "None"
 msgstr "无"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/net-device-wifi.c:575
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "较弱"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/net-device-wifi.c:577
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "一般"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/net-device-wifi.c:579
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良好"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/net-device-wifi.c:581
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常好"
 
 #: ../panels/network/connection-editor/ce-page-details.c:225
-#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:269
 #: ../shell/panel-list.ui.h:2
 msgid "Details"
 msgstr "详细信息"
@@ -2121,6 +2237,7 @@ msgstr "身份"
 #: ../panels/network/connection-editor/ce-page-ip4.c:461
 #: ../panels/network/connection-editor/ce-page-ip6.c:180
 #: ../panels/network/connection-editor/ce-page-ip6.c:427
+#: ../panels/printers/details-dialog.ui.h:3
 msgid "Address"
 msgstr "地址"
 
@@ -2169,19 +2286,12 @@ msgstr "删除路由"
 msgid "Automatic (DHCP)"
 msgstr "自动 (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Manual"
-msgstr "手动"
-
 #: ../panels/network/connection-editor/ce-page-ip4.c:634
 #: ../panels/network/connection-editor/ce-page-ip6.c:596
 msgid "Link-Local Only"
 msgstr "仅本地链路"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:979
+#: ../panels/network/connection-editor/ce-page-ip4.c:980
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
@@ -2210,7 +2320,6 @@ msgid "IPv6"
 msgstr "IPv6"
 
 #: ../panels/network/connection-editor/ce-page-reset.c:78
-#: ../panels/network/network-wifi.ui.h:51
 msgid "Reset"
 msgstr "重置"
 
@@ -2445,7 +2554,7 @@ msgid "_Reset"
 msgstr "重置(_R)"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1536
+#: ../panels/network/net-device-wifi.c:1586
 #: ../panels/network/network-wifi.ui.h:42
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -2474,7 +2583,7 @@ msgstr "无法导入 VPN 连接"
 #: ../panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
+"The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
 "\n"
 "Error: %s."
@@ -2488,15 +2597,15 @@ msgid "Select file to import"
 msgstr "选择要导入的文件"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/cc-printers-panel.c:2078
-#: ../panels/sharing/cc-sharing-panel.c:373
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/printers/pp-details-dialog.c:320
+#: ../panels/sharing/cc-sharing-panel.c:376
+#: ../panels/user-accounts/um-photo-dialog.c:219
 msgid "_Open"
 msgstr "打开(_O)"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
-msgid "A file named \"%s\" already exists."
+msgid "A file named “%s” already exists."
 msgstr "名为“%s”的文件已存在。"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:232
@@ -2515,7 +2624,7 @@ msgstr "无法导入 VPN 连接"
 #: ../panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
+"The VPN connection “%s” could not be exported to %s.\n"
 "\n"
 "Error: %s."
 msgstr ""
@@ -2570,23 +2679,23 @@ msgstr ""
 "牙;虚拟专用网;域名系统;"
 
 #: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-wifi.c:472
 msgid "never"
 msgstr "从不"
 
 #: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:481
+#: ../panels/network/net-device-wifi.c:482
 msgid "today"
 msgstr "今天"
 
 #: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:483
+#: ../panels/network/net-device-wifi.c:484
 msgid "yesterday"
 msgstr "昨天"
 
 #: ../panels/network/net-device-ethernet.c:156
 #: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
-#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
+#: ../panels/network/panel-common.c:649
 msgid "IP Address"
 msgstr "IP 地址"
 
@@ -2607,7 +2716,7 @@ msgid "Wired"
 msgstr "有线"
 
 #: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1694
+#: ../panels/network/net-device-wifi.c:1744
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
@@ -2618,59 +2727,59 @@ msgstr "选项…"
 msgid "Add new connection"
 msgstr "添加新连接"
 
-#: ../panels/network/net-device-wifi.c:1205
+#: ../panels/network/net-device-wifi.c:1254
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
 msgstr ""
 "如果有无线网络以外的方式连接互联网,您可以配置无线热点并与他人共享网络连接。"
 
-#: ../panels/network/net-device-wifi.c:1209
+#: ../panels/network/net-device-wifi.c:1258
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "打开无线网热点将使您从 <b>%s</b> 断开。"
 
-#: ../panels/network/net-device-wifi.c:1213
+#: ../panels/network/net-device-wifi.c:1262
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr "启用热点模式时无法通过无线网络访问互联网。"
 
-#: ../panels/network/net-device-wifi.c:1296
+#: ../panels/network/net-device-wifi.c:1344
 msgid "Stop hotspot and disconnect any users?"
 msgstr "停止热点并断开所有用户?"
 
-#: ../panels/network/net-device-wifi.c:1299
+#: ../panels/network/net-device-wifi.c:1347
 msgid "_Stop Hotspot"
 msgstr "停止热点(_S)"
 
-#: ../panels/network/net-device-wifi.c:1397
+#: ../panels/network/net-device-wifi.c:1447
 msgid "System policy prohibits use as a Hotspot"
 msgstr "系统策略禁止作为热点使用"
 
-#: ../panels/network/net-device-wifi.c:1400
+#: ../panels/network/net-device-wifi.c:1450
 msgid "Wireless device does not support Hotspot mode"
 msgstr "无线设备不支持热点模式"
 
-#: ../panels/network/net-device-wifi.c:1532
+#: ../panels/network/net-device-wifi.c:1582
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "所选网络的细节,包括密码和全部自定义设置都将丢失。"
 
-#: ../panels/network/net-device-wifi.c:1842
+#: ../panels/network/net-device-wifi.c:1892
 msgid "History"
 msgstr "历史"
 
-#: ../panels/network/net-device-wifi.c:1846
+#: ../panels/network/net-device-wifi.c:1896
 #: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:505
 #: ../panels/wacom/gnome-wacom-properties.ui.h:5
 msgid "_Close"
 msgstr "关闭(_C)"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1854
+#: ../panels/network/net-device-wifi.c:1904
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "忘记(_F)"
@@ -2794,6 +2903,7 @@ msgstr "组密码"
 
 #: ../panels/network/network-vpn.ui.h:5
 #: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
 msgid "Username"
 msgstr "用户名"
 
@@ -2816,7 +2926,7 @@ msgstr "详细信息"
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
 #: ../panels/sharing/sharing.ui.h:9
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Password"
 msgstr "密码(_P)"
 
@@ -2884,6 +2994,11 @@ msgstr "重置"
 msgid "Hardware"
 msgstr "硬件"
 
+#: ../panels/network/network-wifi.ui.h:51
+msgctxt "tab"
+msgid "Reset"
+msgstr "重置"
+
 #: ../panels/network/network-wifi.ui.h:52
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi 热点"
@@ -2930,6 +3045,7 @@ msgstr "安全类型"
 
 #: ../panels/network/network-wifi.ui.h:63
 #: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/printers/new-printer-dialog.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "Password"
 msgstr "密码"
@@ -3581,18 +3697,6 @@ msgstr "无效的 wep-psk:无法将 64 字节作为十六进制来解析密钥
 msgid "_Type"
 msgstr "类型(_T)"
 
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-msgid "On"
-msgstr "开"
-
 #. This is the per application switch for message tray usage.
 #: ../panels/notifications/edit-dialog.ui.h:2
 msgctxt "notifications"
@@ -3607,21 +3711,27 @@ msgstr "声音警告(_A)"
 
 #: ../panels/notifications/edit-dialog.ui.h:5
 msgctxt "notifications"
-msgid "Notification _Banners"
-msgstr "通知条幅(_B)"
+msgid "Notification _Popups"
+msgstr "通知弹窗(_P)"
 
-#. Banners here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:7
-msgctxt "notifications"
-msgid "Show Message _Content in Banners"
-msgstr "在通知条幅中显示消息内容(_C)"
+#: ../panels/notifications/edit-dialog.ui.h:6
+msgid ""
+"Notifications will continue to appear in the notification list when popups "
+"are disabled."
+msgstr "禁用弹窗时通知将继续在通知列表里显示。"
 
+#. Popups here refers to message tray notifications in the middle of the screen.
 #: ../panels/notifications/edit-dialog.ui.h:8
 msgctxt "notifications"
+msgid "Show Message _Content in Popups"
+msgstr "在弹窗中显示消息内容(_C)"
+
+#: ../panels/notifications/edit-dialog.ui.h:9
+msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "锁屏通知(_L)"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: ../panels/notifications/edit-dialog.ui.h:10
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "锁屏时显示显示消息内容(_O)"
@@ -3642,8 +3752,8 @@ msgstr ""
 "Notifications;Banner;Message;Tray;Popup;通知;横幅;条幅;黑条;消息;托盘;弹出;"
 
 #: ../panels/notifications/notifications.ui.h:1
-msgid "Notification _Banners"
-msgstr "通知条幅"
+msgid "Notification _Popups"
+msgstr "通知弹窗(_P)"
 
 #: ../panels/notifications/notifications.ui.h:2
 msgid "_Lock Screen Notifications"
@@ -3655,56 +3765,29 @@ msgstr "锁屏通知(_L)"
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
+#: ../panels/online-accounts/cc-online-accounts-panel.c:148
 msgctxt "Online Account"
 msgid "Other"
 msgstr "其他"
 
-#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
-#: ../panels/online-accounts/online-accounts.ui.h:2
-msgid "Add Account"
-msgstr "添加帐号"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
-msgid "Mail"
-msgstr "邮件"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
-msgid "Calendar"
-msgstr "日历"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
-msgid "Chat"
-msgstr "聊天"
-
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
-msgid "Resources"
-msgstr "资源"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:640
-msgid "Error creating account"
-msgstr "创建帐号出错"
+#. translators: This is the title of the "Show Account" dialog. The
+#. * %s is the name of the provider. e.g., 'Google'.
+#: ../panels/online-accounts/cc-online-accounts-panel.c:580
+#, c-format
+msgid "%s Account"
+msgstr "%s 帐号"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:700
+#: ../panels/online-accounts/cc-online-accounts-panel.c:872
 msgid "Error removing account"
 msgstr "移除帐号出错"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:736
-msgid "Are you sure you want to remove the account?"
-msgstr "确定要移除这个帐号吗?"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:738
-msgid "This will not remove the account on the server."
-msgstr "这不会将该帐号从服务器上移除。"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:739
-msgid "_Remove"
-msgstr "移除(_R)"
+#. Translators: The %s is the username (eg., debarshi ray gmail com
+#. * or rishi).
+#.
+#: ../panels/online-accounts/cc-online-accounts-panel.c:937
+#, c-format
+msgid "<b>%s</b> removed"
+msgstr "<b>%s</b> 已移除"
 
 #. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
@@ -3726,24 +3809,24 @@ msgstr ""
 "线;聊天;日历;邮件;联系人;云存储;稍后阅读;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
-msgid "No online accounts configured"
-msgstr "未设置在线帐号"
+msgid "Undo"
+msgstr "撤销"
+
+#: ../panels/online-accounts/online-accounts.ui.h:2
+msgid "Connect to your data in the cloud"
+msgstr "连接您的云端数据"
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-msgid "Remove Account"
-msgstr "移除帐号"
+msgid "No internet connection — connect to set up new online accounts"
+msgstr "无互联网连接——连接以设置新在线帐号"
 
 #: ../panels/online-accounts/online-accounts.ui.h:4
-msgid "Add an online account"
-msgstr "添加在线帐号"
+msgid "Add an account"
+msgstr "添加帐号"
 
-# 统一下翻译
 #: ../panels/online-accounts/online-accounts.ui.h:5
-msgid ""
-"Adding an account allows your applications to access it for documents, mail, "
-"contacts, calendar, chat and more."
-msgstr "添加一个帐号以让您的应用访问帐号的文档、邮件、联系人、日历、聊天等。"
+msgid "Remove Account"
+msgstr "移除帐号"
 
 #: ../panels/power/cc-power-panel.c:253
 msgid "Unknown time"
@@ -3857,7 +3940,7 @@ msgid "Media player"
 msgstr "媒体播放器"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555
+#: ../panels/power/cc-power-panel.c:555 ../panels/wacom/cc-wacom-panel.c:793
 msgid "Tablet"
 msgstr "手写板"
 
@@ -3997,7 +4080,7 @@ msgstr "自动挂起"
 msgid "_When the Power Button is pressed"
 msgstr "按下电源按钮时(_W)"
 
-#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270
+#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:273
 #: ../shell/panel-list.ui.h:1
 msgid "Devices"
 msgstr "设备"
@@ -4096,240 +4179,125 @@ msgid "Authenticate"
 msgstr "认证"
 
 #: ../panels/printers/authentication-dialog.ui.h:6
+#: ../panels/printers/new-printer-dialog.ui.h:11
 msgid "Authentication Required"
 msgstr "需要认证"
 
-#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:684
-msgid "Low on toner"
-msgstr "墨粉不足"
+#. Translators: Addition of the new printer failed.
+#: ../panels/printers/cc-printers-panel.c:735
+msgid "Failed to add new printer."
+msgstr "添加新打印机失败。"
 
-#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:686
-msgid "Out of toner"
-msgstr "墨粉用尽"
+#. Translators: The XML file containing user interface can not be loaded
+#: ../panels/printers/cc-printers-panel.c:983
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "无法载入界面:%s"
 
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:689
-msgid "Low on developer"
-msgstr "显影剂不足"
+#: ../panels/printers/details-dialog.ui.h:2
+#: ../panels/printers/printer-entry.ui.h:6
+msgid "Location"
+msgstr "位置"
 
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:692
-msgid "Out of developer"
-msgstr "显影剂用尽"
+#. Translators: Name of column showing printer drivers
+#: ../panels/printers/details-dialog.ui.h:4
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "驱动"
 
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:694
-msgid "Low on a marker supply"
-msgstr "标记墨水不足"
+#: ../panels/printers/details-dialog.ui.h:5
+msgid "Searching for preferred drivers…"
+msgstr "正在搜索首选驱动…"
 
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:696
-msgid "Out of a marker supply"
-msgstr "标记墨水用尽"
+#: ../panels/printers/details-dialog.ui.h:6
+msgid "Search for Drivers"
+msgstr "搜索驱动"
 
-#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:698
-msgid "Open cover"
-msgstr "打开上盖"
+#: ../panels/printers/details-dialog.ui.h:7
+msgid "Select from Database…"
+msgstr "从数据库选择…"
 
-#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:700
-msgid "Open door"
-msgstr "打开后盖"
+#: ../panels/printers/details-dialog.ui.h:8
+msgid "Install PPD File…"
+msgstr "安装 PPD 文件…"
 
-#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:702
-msgid "Low on paper"
-msgstr "纸张不足"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Prin­ters"
+msgstr "打印机"
 
-#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:704
-msgid "Out of paper"
-msgstr "纸张用尽"
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr "添加打印机,查看打印任务和管理打印"
 
-#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:706
-msgctxt "printer state"
-msgid "Offline"
-msgstr "离线"
+#. Translators: those are keywords for the printing control-center panel
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
+msgid "Printer;Queue;Print;Paper;Ink;Toner;"
+msgstr ""
+"Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;硒鼓;墨"
+"盒;"
 
-#. Translators: Someone has stopped the Printer
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:708
-#: ../panels/printers/cc-printers-panel.c:898
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "已停止"
+#. Translators: this action removes (purges) all the listed jobs from the list.
+#: ../panels/printers/jobs-dialog.ui.h:2
+msgid "Clear All"
+msgstr "全部清除"
 
-#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:710
-msgid "Waste receptacle almost full"
-msgstr "废粉仓将满"
+#. Translators: this label describes the dialog empty state, with no jobs listed.
+#: ../panels/printers/jobs-dialog.ui.h:4
+msgid "No Active Printer Jobs"
+msgstr "没有活动的打印机任务"
 
-#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:712
-msgid "Waste receptacle full"
-msgstr "废粉仓已满"
+#. Translators: This is the title presented at top of the dialog.
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/printers/pp-new-printer-dialog.c:384
+#: ../panels/printers/pp-new-printer-dialog.c:456
+msgid "Add Printer"
+msgstr "添加打印机"
 
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:714
-msgid "The optical photo conductor is near end of life"
-msgstr "感光鼓使用寿命已快耗尽"
+#. Translators: This buttons submits the credentials for the selected server.
+#: ../panels/printers/new-printer-dialog.ui.h:6
+msgid "_Unlock"
+msgstr "解锁(_U)"
 
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:716
-msgid "The optical photo conductor is no longer functioning"
-msgstr "感光鼓故障"
+#. Translators: No printers were detected
+#: ../panels/printers/new-printer-dialog.ui.h:8
+msgid "No Printers Found"
+msgstr "无找到打印机"
 
-#. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:825
-msgctxt "printer state"
-msgid "Configuring"
-msgstr "正在配置"
+#. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
+#: ../panels/printers/new-printer-dialog.ui.h:10
+msgid "Enter a network address or search for a printer"
+msgstr "输入网络地址或搜索打印机"
 
-#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:884
-msgctxt "printer state"
-msgid "Ready"
-msgstr "就绪"
+#: ../panels/printers/new-printer-dialog.ui.h:12
+msgid "Enter username and password to view printers on Print Server."
+msgstr "输入用户名和密码以查看打印服务器上的打印机。"
 
-#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:889
-msgctxt "printer state"
-msgid "Does not accept jobs"
-msgstr "不接收任务"
+#: ../panels/printers/options-dialog.ui.h:1
+msgid "Loading options…"
+msgstr "正在载入选项…"
 
-#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:894
-msgctxt "printer state"
-msgid "Processing"
-msgstr "正在处理"
+#. Translators: This is the title of the dialog. %s is the printer name.
+#: ../panels/printers/pp-details-dialog.c:123
+#: ../panels/printers/pp-details-dialog.c:415
+#, c-format
+msgid "%s Details"
+msgstr "%s 详细信息"
 
-# 以下几个level似乎译为“量”更好
-#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1014
-msgid "Toner Level"
-msgstr "碳粉量"
+#: ../panels/printers/pp-details-dialog.c:172
+msgid "No suitable driver found"
+msgstr "未找到合适的驱动"
 
-#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1017
-msgid "Ink Level"
-msgstr "墨水量"
+#: ../panels/printers/pp-details-dialog.c:316
+msgid "Select PPD File"
+msgstr "选择 PPD 文件"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1020
-msgid "Supply Level"
-msgstr "耗材量"
-
-#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1038
-msgctxt "printer state"
-msgid "Installing"
-msgstr "正在安装"
-
-#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1552
-#, c-format
-msgid "%u active"
-msgid_plural "%u active"
-msgstr[0] "%u 项活动任务"
-
-#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1893
-msgid "Failed to add new printer."
-msgstr "添加新打印机失败。"
-
-#: ../panels/printers/cc-printers-panel.c:2074
-msgid "Select PPD File"
-msgstr "选择 PPD 文件"
-
-#: ../panels/printers/cc-printers-panel.c:2083
+#: ../panels/printers/pp-details-dialog.c:325
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript 打印机描述文件 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2390
-msgid "No suitable driver found"
-msgstr "未找到合适的驱动"
-
-#: ../panels/printers/cc-printers-panel.c:2461
-msgid "Searching for preferred drivers…"
-msgstr "正在搜索首选驱动…"
-
-#: ../panels/printers/cc-printers-panel.c:2482
-msgid "Select from database…"
-msgstr "从数据库选择…"
-
-#: ../panels/printers/cc-printers-panel.c:2491
-msgid "Provide PPD File…"
-msgstr "提供 PPD 文件…"
-
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2638
-#: ../panels/printers/cc-printers-panel.c:2661
-msgid "Test page"
-msgstr "测试页"
-
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3116
-#, c-format
-msgid "Could not load ui: %s"
-msgstr "无法载入界面:%s"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Prin­ters"
-msgstr "打印机"
-
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
-msgid "Add printers, view printer jobs and decide how you want to print"
-msgstr "添加打印机,查看打印任务和管理打印"
-
-#. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
-msgid "Printer;Queue;Print;Paper;Ink;Toner;"
-msgstr ""
-"Printer;Queue;Print;Paper;Ink;Toner;打印机;队列;打印;纸张;墨水;墨粉;硒鼓;墨"
-"盒;"
-
-#. Translators: this action removes (purges) all the listed jobs from the list.
-#: ../panels/printers/jobs-dialog.ui.h:2
-msgid "Clear All"
-msgstr "全部清除"
-
-#. Translators: this label describes the dialog empty state, with no jobs listed.
-#: ../panels/printers/jobs-dialog.ui.h:4
-msgid "No Active Printer Jobs"
-msgstr "没有活动的打印机任务"
-
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "添加打印机"
-
-#. Translators: This button opens authentication dialog for selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "A_uthenticate"
-msgstr "认证(_U)"
-
-#. Translators: No printers were found
-#: ../panels/printers/new-printer-dialog.ui.h:7
-msgid "No printers detected."
-msgstr "未检测到打印机。"
-
-#. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:9
-msgid "Enter a network address or search for a printer"
-msgstr "输入网络地址或搜索打印机"
-
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "正在载入选项…"
-
 #: ../panels/printers/ppd-selection-dialog.ui.h:1
 msgid "Select Printer Driver"
 msgstr "选择打印机驱动"
@@ -4340,16 +4308,16 @@ msgid "Select"
 msgstr "选择"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
-msgid "Loading drivers database..."
+msgid "Loading drivers database…"
 msgstr "正在载入驱动数据库…"
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:526
+#: ../panels/printers/pp-host.c:539
 msgid "JetDirect Printer"
 msgstr "JetDirect 打印机"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:782
+#: ../panels/printers/pp-host.c:795
 msgid "LPD Printer"
 msgstr "LPD 打印机"
 
@@ -4392,88 +4360,108 @@ msgid "Reverse portrait"
 msgstr "纵向倒转"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:103
+#: ../panels/printers/pp-jobs-dialog.c:104
 msgctxt "print job"
 msgid "Pending"
 msgstr "等待中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:107
+#: ../panels/printers/pp-jobs-dialog.c:108
 msgctxt "print job"
 msgid "Paused"
 msgstr "暂停"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:111
+#: ../panels/printers/pp-jobs-dialog.c:112
 msgctxt "print job"
 msgid "Processing"
 msgstr "正在处理"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:115
+#: ../panels/printers/pp-jobs-dialog.c:116
 msgctxt "print job"
 msgid "Stopped"
 msgstr "已停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:119
+#: ../panels/printers/pp-jobs-dialog.c:120
 msgctxt "print job"
 msgid "Canceled"
 msgstr "已取消"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:123
+#: ../panels/printers/pp-jobs-dialog.c:124
 msgctxt "print job"
 msgid "Aborted"
 msgstr "已中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:127
+#: ../panels/printers/pp-jobs-dialog.c:128
 msgctxt "print job"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: ../panels/printers/pp-jobs-dialog.c:289
+#: ../panels/printers/pp-jobs-dialog.c:310
 #, c-format
 msgctxt "Printer jobs dialog title"
-msgid "%s - Active Jobs"
-msgstr "%s 项活动任务"
+msgid "%s — Active Jobs"
+msgstr "%s — 活动任务"
+
+#: ../panels/printers/pp-new-printer-dialog.c:402
+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:406
+#, 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:411
+#, c-format
+msgid "Enter username and password to view printers on %s."
+msgstr "输入用户名和密码以查看 %s 上的打印机。"
+
+#: ../panels/printers/pp-new-printer-dialog.c:876
+msgid "Searching for Printers"
+msgstr "正在搜索打印机"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1659
+#: ../panels/printers/pp-new-printer-dialog.c:1799
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1664
+#: ../panels/printers/pp-new-printer-dialog.c:1804
 msgid "Serial Port"
 msgstr "串口"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1671
+#: ../panels/printers/pp-new-printer-dialog.c:1811
 msgid "Parallel Port"
 msgstr "并口"
 
 #. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/printers/pp-new-printer-dialog.c:1676
+#: ../panels/printers/pp-new-printer-dialog.c:1816
 msgid "Bluetooth"
 msgstr "蓝牙"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1713
+#: ../panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1718
+#: ../panels/printers/pp-new-printer-dialog.c:1858
 #, c-format
 msgid "Address: %s"
 msgstr "地址:%s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1747
+#: ../panels/printers/pp-new-printer-dialog.c:1887
 msgid "Server requires authentication"
 msgstr "服务器要求认证"
 
@@ -4602,89 +4590,175 @@ msgstr "无预过滤"
 msgid "Manufacturer"
 msgstr "厂商"
 
-#. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "驱动"
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: ../panels/printers/pp-printer-entry.c:443
+msgid "No Active Jobs"
+msgstr "无活动任务"
 
-#. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:248
+#. Translators: This is the label of the button that opens the Jobs Dialog.
+#: ../panels/printers/pp-printer-entry.c:448
 #, c-format
-msgid "Enter your username and password to view printers available on %s."
-msgstr "输入用户名和密码以查看 %s 上可用的打印机。"
+msgid "%u Job"
+msgid_plural "%u Jobs"
+msgstr[0] "%u 项任务"
 
-#: ../panels/printers/printers.ui.h:1
-msgid "Add Printer"
-msgstr "添加打印机"
+#. Translators: The printer is low on toner
+#: ../panels/printers/pp-printer-entry.c:584
+msgid "Low on toner"
+msgstr "墨粉不足"
 
-#: ../panels/printers/printers.ui.h:2
-msgid "Remove Printer"
-msgstr "移除打印机"
+#. Translators: The printer has no toner left
+#: ../panels/printers/pp-printer-entry.c:586
+msgid "Out of toner"
+msgstr "墨粉用尽"
 
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:4
-msgid "Supply"
-msgstr "耗材"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/pp-printer-entry.c:589
+msgid "Low on developer"
+msgstr "显影剂不足"
 
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:6
-msgid "Location"
-msgstr "位置"
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/pp-printer-entry.c:592
+msgid "Out of developer"
+msgstr "显影剂用尽"
 
-#. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:8
-msgid "_Default printer"
-msgstr "默认打印机(_D)"
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:594
+msgid "Low on a marker supply"
+msgstr "标记墨水不足"
 
-#: ../panels/printers/printers.ui.h:9
-msgid "Jobs"
-msgstr "任务"
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:596
+msgid "Out of a marker supply"
+msgstr "标记墨水用尽"
+
+#. Translators: One or more covers on the printer are open
+#: ../panels/printers/pp-printer-entry.c:598
+msgid "Open cover"
+msgstr "打开上盖"
+
+#. Translators: One or more doors on the printer are open
+#: ../panels/printers/pp-printer-entry.c:600
+msgid "Open door"
+msgstr "打开后盖"
+
+#. Translators: At least one input tray is low on media
+#: ../panels/printers/pp-printer-entry.c:602
+msgid "Low on paper"
+msgstr "纸张不足"
+
+#. Translators: At least one input tray is empty
+#: ../panels/printers/pp-printer-entry.c:604
+msgid "Out of paper"
+msgstr "纸张用尽"
+
+#. Translators: The printer is offline
+#: ../panels/printers/pp-printer-entry.c:606
+msgctxt "printer state"
+msgid "Offline"
+msgstr "离线"
+
+#. Translators: Someone has stopped the Printer
+#. Translators: Printer's state (no jobs can be processed)
+#: ../panels/printers/pp-printer-entry.c:608
+#: ../panels/printers/pp-printer-entry.c:738
+msgctxt "printer state"
+msgid "Stopped"
+msgstr "已停止"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: ../panels/printers/pp-printer-entry.c:610
+msgid "Waste receptacle almost full"
+msgstr "废粉仓将满"
+
+#. Translators: The printer marker supply waste receptacle is full
+#: ../panels/printers/pp-printer-entry.c:612
+msgid "Waste receptacle full"
+msgstr "废粉仓已满"
 
-#. Translators: Opens a dialog containing printer
-#: ../panels/printers/printers.ui.h:11
-msgid "Show _Jobs"
-msgstr "显示任务(_J)"
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/pp-printer-entry.c:614
+msgid "The optical photo conductor is near end of life"
+msgstr "感光鼓使用寿命已快耗尽"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/pp-printer-entry.c:616
+msgid "The optical photo conductor is no longer functioning"
+msgstr "感光鼓故障"
 
-#: ../panels/printers/printers.ui.h:12
+#. Translators: Printer's state (can start new job without waiting)
+#: ../panels/printers/pp-printer-entry.c:724
+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:729
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "不接收任务"
+
+#. Translators: Printer's state (jobs are processing)
+#: ../panels/printers/pp-printer-entry.c:734
+msgctxt "printer state"
+msgid "Processing"
+msgstr "正在处理"
+
+#: ../panels/printers/printer-entry.ui.h:1
+msgid "Printing Options"
+msgstr "打印选项"
+
+#: ../panels/printers/printer-entry.ui.h:2
+msgid "Printer Details"
+msgstr "打印机详细信息"
+
+#: ../panels/printers/printer-entry.ui.h:3
+msgid "Use Printer by Default"
+msgstr "默认使用打印机"
+
+#: ../panels/printers/printer-entry.ui.h:4
+msgid "Remove Printer"
+msgstr "移除打印机"
+
+#: ../panels/printers/printer-entry.ui.h:5
 msgid "Model"
 msgstr "型号"
 
-#: ../panels/printers/printers.ui.h:15
-msgid "label"
-msgstr "标签"
+#: ../panels/printers/printer-entry.ui.h:7
+msgid "Ink Level"
+msgstr "墨水量"
 
-#: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver…"
-msgstr "正在设置新驱动…"
+#. Translators: This is the message which follows the printer error.
+#: ../panels/printers/printer-entry.ui.h:9
+msgid "Please restart when the problem is resolved."
+msgstr "问题解决后请重启。"
 
-#: ../panels/printers/printers.ui.h:18
-msgid "page 3"
-msgstr "第 3 页"
-
-#. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:20
-msgid "Print _Test Page"
-msgstr "打印测试页(_T)"
+#. Translators: This is the button which restarts the printer.
+#: ../panels/printers/printer-entry.ui.h:11
+msgid "Restart"
+msgstr "重启"
 
-#. Translators: This button opens printer
-#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6
-msgid "_Options"
-msgstr "选项(_O)"
+#. Translators: This button adds new printer.
+#: ../panels/printers/printers.ui.h:2
+msgid "Add…"
+msgstr "添加…"
 
-#: ../panels/printers/printers.ui.h:23
+#: ../panels/printers/printers.ui.h:3
 msgid "No printers"
 msgstr "无打印机"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:25
-msgid "Add a Printer"
-msgstr "添加打印机"
+#: ../panels/printers/printers.ui.h:5
+msgid "Add a Printer…"
+msgstr "添加打印机…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:27
+#: ../panels/printers/printers.ui.h:7
 msgid ""
 "Sorry! The system printing service\n"
-"doesn't seem to be available."
+"doesn’t seem to be available."
 msgstr "抱歉,系统打印服务似乎不可用。"
 
 #: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
@@ -4713,51 +4787,51 @@ msgstr "定位服务"
 msgid "Usage & History"
 msgstr "用量及历史"
 
-#: ../panels/privacy/cc-privacy-panel.c:1067
+#: ../panels/privacy/cc-privacy-panel.c:1071
 msgid "Empty all items from Trash?"
 msgstr "清空回收站中的所有项目吗?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1068
+#: ../panels/privacy/cc-privacy-panel.c:1072
 msgid "All items in the Trash will be permanently deleted."
 msgstr "回收站内的所有项目将会永久删除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1073
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1092
+#: ../panels/privacy/cc-privacy-panel.c:1096
 msgid "Delete all the temporary files?"
 msgstr "删除所有临时文件吗?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1093
+#: ../panels/privacy/cc-privacy-panel.c:1097
 msgid "All the temporary files will be permanently deleted."
 msgstr "所有临时文件将会永久删除。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1098
 msgid "_Purge Temporary Files"
 msgstr "清理临时文件(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1120 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "清理回收站及临时文件"
 
-#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1160 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "软件使用统计"
 
-#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
+#: ../panels/privacy/cc-privacy-panel.c:1201 ../panels/privacy/privacy.ui.h:46
 msgid "Problem Reporting"
 msgstr "报告问题"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1211
+#: ../panels/privacy/cc-privacy-panel.c:1215
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
 "anonymously and are scrubbed of personal data."
 msgstr "发送匿名的技术问题报告能帮助我们改进 %s,这些报告中不含个人数据。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1227 ../panels/privacy/privacy.ui.h:41
 msgid "Privacy Policy"
 msgstr "隐私政策"
 
@@ -4879,6 +4953,14 @@ msgstr "自动清理临时文件(_F)"
 msgid "Purge _After"
 msgstr "清理延时(_A)"
 
+#: ../panels/privacy/privacy.ui.h:34
+msgid "_Empty Trash…"
+msgstr "清空回收站(_E)…"
+
+#: ../panels/privacy/privacy.ui.h:35
+msgid "_Purge Temporary Files…"
+msgstr "清理临时文件(_P)…"
+
 #: ../panels/privacy/privacy.ui.h:37
 msgid ""
 "Sending us information about which software you use helps us provide you "
@@ -4934,21 +5016,11 @@ msgctxt "Input Source"
 msgid "Other"
 msgstr "其他"
 
-#: ../panels/region/cc-region-panel.c:247
-#: ../panels/user-accounts/um-user-panel.c:1087
-msgid "Your session needs to be restarted for changes to take effect"
-msgstr "修改需要重启会话才能生效"
-
-#: ../panels/region/cc-region-panel.c:251
-#: ../panels/user-accounts/um-user-panel.c:1091
-msgid "Restart Now"
-msgstr "现在重启"
-
-#: ../panels/region/cc-region-panel.c:888
+#: ../panels/region/cc-region-panel.c:866
 msgid "No input source selected"
 msgstr "未选择输入源"
 
-#: ../panels/region/cc-region-panel.c:1779
+#: ../panels/region/cc-region-panel.c:1757
 msgid "Login _Screen"
 msgstr "登录屏幕(_S)"
 
@@ -5000,7 +5072,7 @@ msgid "Add an Input Source"
 msgstr "添加输入源"
 
 #: ../panels/region/input-chooser.ui.h:4
-msgid "Input methods can't be used on the login screen"
+msgid "Input methods can’t be used on the login screen"
 msgstr "不能在登录屏幕使用输入法"
 
 #: ../panels/region/input-options.ui.h:1
@@ -5015,10 +5087,6 @@ msgstr "所有窗口使用相同的输入源(_S)"
 msgid "Allow _different sources for each window"
 msgstr "每个窗口使用不同的输入源(_D)"
 
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
-msgid "Keyboard Shortcuts"
-msgstr "键盘快捷键"
-
 #: ../panels/region/input-options.ui.h:5
 msgid "Switch to previous source"
 msgstr "切换至上个输入源"
@@ -5048,51 +5116,65 @@ msgid "Left+Right Alt"
 msgstr "左+右 Alt"
 
 #: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "修改需要重启会话才能生效"
+
+#: ../panels/region/region.ui.h:2
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "现在重启"
+
+#: ../panels/region/region.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "语言(_L)"
 
-#: ../panels/region/region.ui.h:2
+#: ../panels/region/region.ui.h:4
 msgid "English (United Kingdom)"
 msgstr "英语(英国)"
 
-#: ../panels/region/region.ui.h:3
+#: ../panels/region/region.ui.h:5
 msgid "_Formats"
 msgstr "格式(_F)"
 
-#: ../panels/region/region.ui.h:4
+#: ../panels/region/region.ui.h:6
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../panels/region/region.ui.h:5
+#: ../panels/region/region.ui.h:7
 msgid "Input Sources"
 msgstr "输入源"
 
-#: ../panels/region/region.ui.h:7
+#: ../panels/region/region.ui.h:8
+msgid "_Options"
+msgstr "选项(_O)"
+
+#: ../panels/region/region.ui.h:9
 msgid "Add input source"
 msgstr "添加输入源"
 
-#: ../panels/region/region.ui.h:8
+#: ../panels/region/region.ui.h:10
 msgid "Remove input source"
 msgstr "移除输入源"
 
-#: ../panels/region/region.ui.h:9
+#: ../panels/region/region.ui.h:11
 msgid "Move input source up"
 msgstr "上移输入源"
 
-#: ../panels/region/region.ui.h:10
+#: ../panels/region/region.ui.h:12
 msgid "Move input source down"
 msgstr "下移输入源"
 
-#: ../panels/region/region.ui.h:11
+#: ../panels/region/region.ui.h:13
 msgid "Configure input source"
 msgstr "配置输入源"
 
-#: ../panels/region/region.ui.h:12
+#: ../panels/region/region.ui.h:14
 msgid "Show input source keyboard layout"
 msgstr "显示输入源键盘布局"
 
-#: ../panels/region/region.ui.h:13
+#: ../panels/region/region.ui.h:15
 msgid "Login settings are used by all users when logging into the system"
 msgstr "登录设置将对所有于本机登录的用户共享"
 
@@ -5157,32 +5239,32 @@ msgstr "首选项"
 msgid "No networks selected for sharing"
 msgstr "未选择要共享的网络"
 
-#: ../panels/sharing/cc-sharing-panel.c:263
+#: ../panels/sharing/cc-sharing-panel.c:266
 msgctxt "service is enabled"
 msgid "On"
 msgstr "已开启"
 
-#: ../panels/sharing/cc-sharing-panel.c:265
-#: ../panels/sharing/cc-sharing-panel.c:292
+#: ../panels/sharing/cc-sharing-panel.c:268
+#: ../panels/sharing/cc-sharing-panel.c:295
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "已关闭"
 
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:298
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:301
 msgctxt "service is active"
 msgid "Active"
 msgstr "活动"
 
-#: ../panels/sharing/cc-sharing-panel.c:369
+#: ../panels/sharing/cc-sharing-panel.c:372
 msgid "Choose a Folder"
 msgstr "选择文件夹"
 
-#: ../panels/sharing/cc-sharing-panel.c:680
+#: ../panels/sharing/cc-sharing-panel.c:683
 #, c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5191,7 +5273,7 @@ msgstr ""
 "个人网络共享允许您与当前网络中的其他人共享自己的共享文件夹,使用地址:<a "
 "href=\"dav://%s\">dav://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:682
+#: ../panels/sharing/cc-sharing-panel.c:685
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5201,7 +5283,7 @@ msgstr ""
 "当启用远程登录是,远程用户可以使用 SSH 命令来连接:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:684
+#: ../panels/sharing/cc-sharing-panel.c:687
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5210,11 +5292,11 @@ msgstr ""
 "屏幕共享允许远程用户查看或控制您的屏幕通过连接到:<a href=\"vnc://%s\">vnc://"
 "%s</a> "
 
-#: ../panels/sharing/cc-sharing-panel.c:796
+#: ../panels/sharing/cc-sharing-panel.c:799
 msgid "Copy"
 msgstr "复制"
 
-#: ../panels/sharing/cc-sharing-panel.c:1122
+#: ../panels/sharing/cc-sharing-panel.c:1125
 msgid "Sharing"
 msgstr "共享"
 
@@ -5519,6 +5601,7 @@ msgid "Testing event sound"
 msgstr "测试事件声音"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:554
+#: ../panels/wacom/wacom-stylus-page.ui.h:1
 msgid "Default"
 msgstr "默认"
 
@@ -5560,11 +5643,12 @@ msgstr "辅助视觉、听觉、打字和指点操作"
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
 msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;键盘;辅助功能;对比度;缩"
-"放;屏幕读取器;文本;字体;大小;粘滞键;慢速键;回弹键;鼠标;"
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;键盘;鼠标;辅"
+"助功能;对比度;缩放;屏幕;读取器;文本;字体;大小;粘滞键;按键;慢速键;回弹键;双击;"
+"点击;延迟;助手;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "_Always Show Universal Access Menu"
@@ -6047,17 +6131,17 @@ msgid "_Full Name"
 msgstr "全名(_F)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Standard"
 msgstr "标准"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "Administrator"
 msgstr "管理员"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Account _Type"
 msgstr "帐号类型(_T)"
 
@@ -6079,7 +6163,7 @@ msgid ""
 "used on this device. You can also use this account to access company "
 "resources on the internet."
 msgstr ""
-"企业登录允许在本设备上使用已有的、集中管理的用户帐号。您也可以使用此账号访问"
+"企业登录允许在本设备上使用已有的、集中管理的用户帐号。您也可以使用此帐号访问"
 "公司在互联网上的资源。"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:15
@@ -6132,7 +6216,7 @@ msgid "Right little finger"
 msgstr "右手小指"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:687
+#: ../panels/user-accounts/um-fingerprint-dialog.c:680
 msgid "Enable Fingerprint Login"
 msgstr "启用指纹登录"
 
@@ -6227,22 +6311,26 @@ msgstr "现在设置密码"
 msgid "_Add User…"
 msgstr "添加用户(_A)…"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "自动登录(_U)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Fingerprint Login"
 msgstr "指纹登录(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "User Icon"
 msgstr "用户图标"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "最近登录"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+msgid "Remove User…"
+msgstr "移除用户…"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "管理用户帐号"
@@ -6326,7 +6414,7 @@ msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
 "letters, numbers and punctuation."
-msgstr "请避免重复相同类型的字符:你需要混合字母、数字和标点符号。"
+msgstr "请避免重复相同类型的字符:您需要混合字母、数字和标点符号。"
 
 #: ../panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
@@ -6433,45 +6521,45 @@ msgstr "未知错误"
 msgid "Should match the web address of your login provider."
 msgstr "应与您登录提供商的网络地址相同。"
 
-#: ../panels/user-accounts/um-account-dialog.c:228
+#: ../panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
 msgstr "添加帐号失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:448
+#: ../panels/user-accounts/um-account-dialog.c:463
 msgid "Passwords do not match."
 msgstr "密码不匹配。"
 
-#: ../panels/user-accounts/um-account-dialog.c:702
-#: ../panels/user-accounts/um-account-dialog.c:748
-#: ../panels/user-accounts/um-account-dialog.c:769
+#: ../panels/user-accounts/um-account-dialog.c:718
+#: ../panels/user-accounts/um-account-dialog.c:764
+#: ../panels/user-accounts/um-account-dialog.c:785
 msgid "Failed to register account"
-msgstr "注册用户失败"
+msgstr "注册帐号失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:892
+#: ../panels/user-accounts/um-account-dialog.c:908
 msgid "No supported way to authenticate with this domain"
 msgstr "没有支持该域的验证方法"
 
-#: ../panels/user-accounts/um-account-dialog.c:965
+#: ../panels/user-accounts/um-account-dialog.c:981
 msgid "Failed to join domain"
 msgstr "加入域失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:1026
+#: ../panels/user-accounts/um-account-dialog.c:1042
 msgid ""
-"That login name didn't work.\n"
+"That login name didn’t work.\n"
 "Please try again."
 msgstr "登录名不正确,请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1033
+#: ../panels/user-accounts/um-account-dialog.c:1049
 msgid ""
-"That login password didn't work.\n"
+"That login password didn’t work.\n"
 "Please try again."
 msgstr "登录密码不正确,请重试。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1041
+#: ../panels/user-accounts/um-account-dialog.c:1057
 msgid "Failed to log into domain"
 msgstr "登录到域失败"
 
-#: ../panels/user-accounts/um-account-dialog.c:1099
+#: ../panels/user-accounts/um-account-dialog.c:1115
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "找不到该域名,也许拼写有误?"
 
@@ -6485,63 +6573,63 @@ msgctxt "Account type"
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:138
+#: ../panels/user-accounts/um-fingerprint-dialog.c:142
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "您未被允许访问该设备。请联系系统管理员。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:140
+#: ../panels/user-accounts/um-fingerprint-dialog.c:144
 msgid "The device is already in use."
 msgstr "设备正被占用。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: ../panels/user-accounts/um-fingerprint-dialog.c:146
 msgid "An internal error occurred."
 msgstr "发生了一个内部错误。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:217
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: ../panels/user-accounts/um-fingerprint-dialog.c:263
 msgid "Delete registered fingerprints?"
 msgstr "要删除已记录的指纹吗?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:268
+#: ../panels/user-accounts/um-fingerprint-dialog.c:267
 msgid "_Delete Fingerprints"
 msgstr "删除指纹(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:274
+#: ../panels/user-accounts/um-fingerprint-dialog.c:273
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "确定要删除已登记的指纹吗?这将禁用指纹登录。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:444
+#: ../panels/user-accounts/um-fingerprint-dialog.c:443
 msgid "Done!"
 msgstr "完成!"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:505
-#: ../panels/user-accounts/um-fingerprint-dialog.c:547
+#: ../panels/user-accounts/um-fingerprint-dialog.c:504
+#: ../panels/user-accounts/um-fingerprint-dialog.c:546
 #, c-format
-msgid "Could not access '%s' device"
+msgid "Could not access “%s” device"
 msgstr "无法访问设备“%s”"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:588
+#: ../panels/user-accounts/um-fingerprint-dialog.c:587
 #, c-format
-msgid "Could not start finger capture on '%s' device"
+msgid "Could not start finger capture on “%s” device"
 msgstr "无法在设备“%s”上启动指纹采集"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:631
 msgid "Could not access any fingerprint readers"
 msgstr "无法访问指纹读取器"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:639
+#: ../panels/user-accounts/um-fingerprint-dialog.c:632
 msgid "Please contact your system administrator for help."
 msgstr "请联系系统管理员以寻求帮助。"
 
@@ -6550,18 +6638,18 @@ msgstr "请联系系统管理员以寻求帮助。"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:721
+#: ../panels/user-accounts/um-fingerprint-dialog.c:714
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
+"using the “%s” device."
 msgstr "要启用指纹登录,您需要使用设备“%s”保存一个指纹。"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
 msgid "Selecting finger"
 msgstr "选择手指"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:722
 msgid "Enrolling fingerprints"
 msgstr "正在登记指纹"
 
@@ -6595,13 +6683,13 @@ msgstr "%Y %b %e"
 #: ../panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
-msgid "%s - %s"
-msgstr "%s - %s"
+msgid "%s — %s"
+msgstr "%s — %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
 #: ../panels/user-accounts/um-history-dialog.c:177
-#: ../panels/user-accounts/um-user-panel.c:841
+#: ../panels/user-accounts/um-user-panel.c:776
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -6609,11 +6697,11 @@ msgstr "%k:%M"
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
 #: ../panels/user-accounts/um-history-dialog.c:180
-#: ../panels/user-accounts/um-user-panel.c:845
+#: ../panels/user-accounts/um-user-panel.c:780
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
-msgstr "%s, %s"
+msgstr "%s,%s"
 
 #: ../panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
@@ -6627,8 +6715,8 @@ msgstr "会话开始"
 #. The %s is the user real name.
 #: ../panels/user-accounts/um-history-dialog.c:299
 #, c-format
-msgid "%s - Account Activity"
-msgstr "%s - 账号活动"
+msgid "%s — Account Activity"
+msgstr "%s — 帐号活动"
 
 #: ../panels/user-accounts/um-password-dialog.c:145
 msgid "Please choose another password."
@@ -6646,23 +6734,23 @@ msgstr "无法更改密码"
 msgid "The passwords do not match."
 msgstr "密码不匹配。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:214
+#: ../panels/user-accounts/um-photo-dialog.c:215
 msgid "Browse for more pictures"
 msgstr "浏览更多图片"
 
-#: ../panels/user-accounts/um-photo-dialog.c:448
+#: ../panels/user-accounts/um-photo-dialog.c:449
 msgid "Disable image"
 msgstr "禁用图像"
 
-#: ../panels/user-accounts/um-photo-dialog.c:466
+#: ../panels/user-accounts/um-photo-dialog.c:467
 msgid "Take a photo…"
 msgstr "拍张照片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:484
+#: ../panels/user-accounts/um-photo-dialog.c:485
 msgid "Browse for more pictures…"
 msgstr "浏览更多图片…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:708
+#: ../panels/user-accounts/um-photo-dialog.c:703
 #, c-format
 msgid "Used by %s"
 msgstr "已被 %s 使用"
@@ -6688,94 +6776,98 @@ msgstr "无效密码,请重试"
 
 #: ../panels/user-accounts/um-realm-manager.c:834
 #, c-format
-msgid "Couldn't connect to the %s domain: %s"
+msgid "Couldn’t connect to the %s domain: %s"
 msgstr "无法连接到 %s 域:%s"
 
-#: ../panels/user-accounts/um-user-panel.c:239
-msgid "Other Accounts"
-msgstr "其他帐号"
+#: ../panels/user-accounts/um-user-panel.c:195
+msgid "Your account"
+msgstr "您的帐号"
 
-#: ../panels/user-accounts/um-user-panel.c:447
+#: ../panels/user-accounts/um-user-panel.c:390
 msgid "Failed to delete user"
 msgstr "删除用户失败"
 
+#: ../panels/user-accounts/um-user-panel.c:448
 #: ../panels/user-accounts/um-user-panel.c:507
-#: ../panels/user-accounts/um-user-panel.c:566
-#: ../panels/user-accounts/um-user-panel.c:618
+#: ../panels/user-accounts/um-user-panel.c:559
 msgid "Failed to revoke remotely managed user"
 msgstr "吊销远程管理的用户失败"
 
-#: ../panels/user-accounts/um-user-panel.c:674
+#: ../panels/user-accounts/um-user-panel.c:613
 msgid "You cannot delete your own account."
 msgstr "不能删除自己的帐号。"
 
-#: ../panels/user-accounts/um-user-panel.c:683
+#: ../panels/user-accounts/um-user-panel.c:622
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s 已经登录"
 
-#: ../panels/user-accounts/um-user-panel.c:687
+#: ../panels/user-accounts/um-user-panel.c:626
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "删除已登录帐号可能导致系统不一致。"
 
-#: ../panels/user-accounts/um-user-panel.c:696
+#: ../panels/user-accounts/um-user-panel.c:635
 #, c-format
-msgid "Do you want to keep %s's files?"
+msgid "Do you want to keep %s’s files?"
 msgstr "要保留 %s 的文件吗?"
 
-#: ../panels/user-accounts/um-user-panel.c:700
+#: ../panels/user-accounts/um-user-panel.c:639
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
-msgstr "删除用户时可以保留其主目录、电子邮件目录和临时文件。"
+msgstr "删除用户帐号时可以保留其主目录、电子邮件目录和临时文件。"
 
-#: ../panels/user-accounts/um-user-panel.c:703
+#: ../panels/user-accounts/um-user-panel.c:642
 msgid "_Delete Files"
 msgstr "删除文件(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:704
+#: ../panels/user-accounts/um-user-panel.c:643
 msgid "_Keep Files"
 msgstr "保留文件(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:718
+#: ../panels/user-accounts/um-user-panel.c:657
 #, c-format
-msgid "Are you sure you want to revoke remotely managed %s's account?"
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "您确定要吊销远程管理的帐号 %s 吗?"
 
-#: ../panels/user-accounts/um-user-panel.c:722
+#: ../panels/user-accounts/um-user-panel.c:661
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:774
+#: ../panels/user-accounts/um-user-panel.c:711
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "帐号已禁用"
 
-#: ../panels/user-accounts/um-user-panel.c:782
+#: ../panels/user-accounts/um-user-panel.c:719
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "下次登录时设置"
 
-#: ../panels/user-accounts/um-user-panel.c:785
+#: ../panels/user-accounts/um-user-panel.c:722
 msgctxt "Password mode"
 msgid "None"
 msgstr "无"
 
-#: ../panels/user-accounts/um-user-panel.c:834
+#: ../panels/user-accounts/um-user-panel.c:769
 msgid "Logged in"
 msgstr "已登录"
 
-#: ../panels/user-accounts/um-user-panel.c:1290
+#: ../panels/user-accounts/um-user-panel.c:1117
 msgid "Failed to contact the accounts service"
 msgstr "联系帐号服务失败"
 
-#: ../panels/user-accounts/um-user-panel.c:1292
+#: ../panels/user-accounts/um-user-panel.c:1119
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "请确定帐号服务已正确安装并启用。"
 
-#: ../panels/user-accounts/um-user-panel.c:1334
+#. Translator comments:
+#. * We split the line in 2 here to "make it look good", as there's
+#. * no good way to do this in GTK+ for tooltips. See:
+#. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
+#: ../panels/user-accounts/um-user-panel.c:1155
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6783,12 +6875,12 @@ msgstr ""
 "要进行更改,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: ../panels/user-accounts/um-user-panel.c:1195
 msgid "Create a user account"
 msgstr "创建用户帐号"
 
+#: ../panels/user-accounts/um-user-panel.c:1206
 #: ../panels/user-accounts/um-user-panel.c:1385
-#: ../panels/user-accounts/um-user-panel.c:1677
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6796,12 +6888,12 @@ msgstr ""
 "要创建用户帐号,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:1395
+#: ../panels/user-accounts/um-user-panel.c:1216
 msgid "Delete the selected user account"
 msgstr "删除选中的用户帐号"
 
-#: ../panels/user-accounts/um-user-panel.c:1407
-#: ../panels/user-accounts/um-user-panel.c:1682
+#: ../panels/user-accounts/um-user-panel.c:1228
+#: ../panels/user-accounts/um-user-panel.c:1390
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6809,31 +6901,27 @@ msgstr ""
 "要删除选中的用户帐号,\n"
 "请先点击 * 图标"
 
-#: ../panels/user-accounts/um-user-panel.c:1591
-msgid "My Account"
-msgstr "我的帐号"
-
-#: ../panels/user-accounts/um-utils.c:563
-msgid "Sorry, that user name isn't available. Please try another."
+#: ../panels/user-accounts/um-utils.c:507
+msgid "Sorry, that user name isn’t available. Please try another."
 msgstr "抱歉,该用户名不可用。请试下别的。"
 
-#: ../panels/user-accounts/um-utils.c:566
+#: ../panels/user-accounts/um-utils.c:510
 #, c-format
 msgid "The username is too long."
 msgstr "用户名太长。"
 
-#: ../panels/user-accounts/um-utils.c:569
-msgid "The username cannot start with a '-'."
+#: ../panels/user-accounts/um-utils.c:513
+msgid "The username cannot start with a “-”."
 msgstr "用户名不能以“-”开头。"
 
-#: ../panels/user-accounts/um-utils.c:572
+#: ../panels/user-accounts/um-utils.c:516
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
 msgstr "用户名只能包含大小写英文字母(a 至 z)、数字和“.”“-”“_”符号"
 
-#: ../panels/user-accounts/um-utils.c:576
-msgid "This will be used to name your home folder and can't be changed."
+#: ../panels/user-accounts/um-utils.c:520
+msgid "This will be used to name your home folder and can’t be changed."
 msgstr "将作为您主文件夹的名称且不可再次更改。"
 
 #: ../panels/wacom/button-mapping.ui.h:1
@@ -6846,10 +6934,10 @@ msgstr "将功能映射到按键"
 
 #: ../panels/wacom/button-mapping.ui.h:4
 msgid ""
-"To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
+"To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
 msgstr ""
-"要编辑快捷键,请选择“发送按键”动作,按下键盘快捷键,然后输入新按键组合,或按"
+"要编辑快捷键,请选择“发送按键”操作,按下键盘快捷键,然后输入新按键组合,或按"
 "退格键清除。"
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:83
@@ -6859,63 +6947,63 @@ msgid ""
 msgstr "请触摸屏幕上出现的标记以校准平板电脑。"
 
 #: ../panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting..."
-msgstr "检测到误点击,重新开始校准…"
+msgid "Mis-click detected, restarting…"
+msgstr "检测到误点击,重新开始…"
 
-#: ../panels/wacom/cc-wacom-button-row.c:442
-msgctxt "Wacom tablet button"
-msgid "Up"
-msgstr "上键"
-
-#: ../panels/wacom/cc-wacom-button-row.c:443
-msgctxt "Wacom tablet button"
-msgid "Down"
-msgstr "下键"
+#: ../panels/wacom/cc-wacom-button-row.c:266
+#, c-format
+msgid "Button %d"
+msgstr "按键 %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
+#: ../panels/wacom/cc-wacom-button-row.h:53
 msgctxt "Wacom action-type"
-msgid "None"
-msgstr "无"
+msgid "Application defined"
+msgstr "应用程序已定义"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "发送按键"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "切换显示器"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
+#: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "显示屏幕帮助"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:263
+#: ../panels/wacom/cc-wacom-mapping-panel.c:260
 msgid "Output:"
 msgstr "输出:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:275
+#: ../panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Keep aspect ratio (letterbox):"
 msgstr "保持长宽比(黑边):"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:286
+#: ../panels/wacom/cc-wacom-mapping-panel.c:283
 msgid "Map to single monitor"
 msgstr "映射到单个显示器…"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:88
+#: ../panels/wacom/cc-wacom-nav-button.c:86
 #, c-format
 msgid "%d of %d"
 msgstr "%d/%d"
 
-#: ../panels/wacom/cc-wacom-page.c:522
+#: ../panels/wacom/cc-wacom-page.c:502
 msgid "Display Mapping"
 msgstr "显示映射"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:377
+#: ../panels/wacom/cc-wacom-panel.c:790
+#: ../panels/wacom/wacom-stylus-page.ui.h:9
+msgid "Stylus"
+msgstr "手写笔"
+
+#: ../panels/wacom/cc-wacom-stylus-page.c:347
 msgid "Button"
 msgstr "按键"
 
@@ -6994,167 +7082,64 @@ msgstr "跟踪模式"
 msgid "Left-Handed Orientation"
 msgstr "惯用左手"
 
-#. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1028
-msgid "Left Ring"
-msgstr "左环模式"
-
-#: ../panels/wacom/gsd-wacom-device.c:1039
-#, c-format
-msgid "Left Ring Mode #%d"
-msgstr "左环模式 #%d"
-
-#. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1059
-msgid "Right Ring"
-msgstr "右环模式"
-
-#: ../panels/wacom/gsd-wacom-device.c:1070
-#, c-format
-msgid "Right Ring Mode #%d"
-msgstr "右环模式 #%d"
-
-# Touchstrip和touchring都是商标。
-#. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1112
-msgid "Left Touchstrip"
-msgstr "左 Touchstrip 模式"
-
-# Touchstrip和touchring都是商标。
-#: ../panels/wacom/gsd-wacom-device.c:1123
-#, c-format
-msgid "Left Touchstrip Mode #%d"
-msgstr "左 Touchstrip 模式 #%d"
-
-#. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1143
-msgid "Right Touchstrip"
-msgstr "右 Touchstrip"
-
-#: ../panels/wacom/gsd-wacom-device.c:1154
-#, c-format
-msgid "Right Touchstrip Mode #%d"
-msgstr "右 Touchstrip 模式 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1180
-#, c-format
-msgid "Left Touchring Mode Switch"
-msgstr "左 Touchring 模式切换"
-
-#: ../panels/wacom/gsd-wacom-device.c:1182
-#, c-format
-msgid "Right Touchring Mode Switch"
-msgstr "右 Touchring 模式切换"
-
-#: ../panels/wacom/gsd-wacom-device.c:1185
-#, c-format
-msgid "Left Touchstrip Mode Switch"
-msgstr "左 Touchstrip 模式切换"
-
-#: ../panels/wacom/gsd-wacom-device.c:1187
-#, c-format
-msgid "Right Touchstrip Mode Switch"
-msgstr "右 Touchstrip 模式切换"
-
-#: ../panels/wacom/gsd-wacom-device.c:1192
-#, c-format
-msgid "Mode Switch #%d"
-msgstr "模式切换 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1238
-#, c-format
-msgid "Left Button #%d"
-msgstr "左键 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1241
-#, c-format
-msgid "Right Button #%d"
-msgstr "右键 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1244
-#, c-format
-msgid "Top Button #%d"
-msgstr "上键 #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1247
-#, c-format
-msgid "Bottom Button #%d"
-msgstr "底键 #%d"
-
 #: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "新建快捷键…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
-msgid "No Action"
-msgstr "无动作"
-
 #: ../panels/wacom/wacom-stylus-page.ui.h:2
-msgid "Left Mouse Button Click"
-msgstr "鼠标左键单击"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
 msgid "Middle Mouse Button Click"
 msgstr "鼠标中键单击"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: ../panels/wacom/wacom-stylus-page.ui.h:3
 msgid "Right Mouse Button Click"
 msgstr "鼠标右键单击"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
-msgid "Scroll Up"
-msgstr "向上滚动"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
-msgid "Scroll Down"
-msgstr "向下滚动"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
-msgid "Scroll Left"
-msgstr "向左滚动"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
-msgid "Scroll Right"
-msgstr "向右滚动"
-
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: ../panels/wacom/wacom-stylus-page.ui.h:4
 msgid "Back"
 msgstr "后退"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:10
+#: ../panels/wacom/wacom-stylus-page.ui.h:5
 msgid "Forward"
 msgstr "前进"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
-msgid "Stylus"
-msgstr "手写笔"
+#: ../panels/wacom/wacom-stylus-page.ui.h:6
+msgid "No stylus found"
+msgstr "未找到触控笔"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
+#: ../panels/wacom/wacom-stylus-page.ui.h:7
+msgid "Please move your stylus to the proximity of the tablet to configure it"
+msgstr "请将您的触控笔移到平板电脑附近以进行配置"
+
+#: ../panels/wacom/wacom-stylus-page.ui.h:10
 msgid "Eraser Pressure Feel"
 msgstr "擦除压力感应"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: ../panels/wacom/wacom-stylus-page.ui.h:11
 msgid "Soft"
 msgstr "软"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: ../panels/wacom/wacom-stylus-page.ui.h:12
 msgid "Firm"
 msgstr "硬"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: ../panels/wacom/wacom-stylus-page.ui.h:13
 msgid "Top Button"
 msgstr "上键"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: ../panels/wacom/wacom-stylus-page.ui.h:14
 msgid "Lower Button"
 msgstr "下键"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
+#: ../panels/wacom/wacom-stylus-page.ui.h:15
 msgid "Tip Pressure Feel"
 msgstr "指尖压力感应"
 
-#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
-#: ../shell/cc-window.c:1478
+#: ../panels/wacom/wacom-stylus-page.ui.h:17
+msgid "page 3"
+msgstr "第 3 页"
+
+#: ../shell/alt/cc-window.c:766 ../shell/cc-window.c:53
+#: ../shell/cc-window.c:1484
 msgid "All Settings"
 msgstr "全部设置"
 
@@ -7168,7 +7153,7 @@ msgstr "用来配置 GNOME 桌面的工具"
 
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
 msgid ""
-"The control center is GNOME's main interface for configuration of various "
+"The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
 msgstr "控制中心是 GNOME 用于配置桌面各方面设置的主要界面。"
 
@@ -7213,17 +7198,17 @@ msgid "Quit"
 msgstr "退出"
 
 #. Add categories
-#: ../shell/cc-window.c:871
+#: ../shell/cc-window.c:875
 msgctxt "category"
 msgid "Personal"
 msgstr "个人"
 
-#: ../shell/cc-window.c:872
+#: ../shell/cc-window.c:876
 msgctxt "category"
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../shell/cc-window.c:873
+#: ../shell/cc-window.c:877
 msgctxt "category"
 msgid "System"
 msgstr "系统"
@@ -7269,10 +7254,239 @@ msgid "Hotspot"
 msgstr "热点"
 
 #: ../shell/panel-list.ui.h:3
-#, fuzzy
-#| msgid "No regions found"
 msgid "No results found"
-msgstr "无可用区域"
+msgstr "未找到结果"
+
+#, fuzzy
+#~| msgid "Default"
+#~ msgctxt "cursor size"
+#~ msgid "Default"
+#~ msgstr "默认"
+
+#, fuzzy
+#~| msgctxt "Calibration quality"
+#~| msgid "Medium"
+#~ msgctxt "cursor size"
+#~ msgid "Medium"
+#~ msgstr "中"
+
+#, fuzzy
+#~| msgctxt "dwell click threshold"
+#~| msgid "Large"
+#~ msgctxt "cursor size"
+#~ msgid "Large"
+#~ msgstr "大"
+
+#, fuzzy
+#~| msgctxt "dwell click threshold"
+#~| msgid "Large"
+#~ msgctxt "cursor size"
+#~ msgid "Larger"
+#~ msgstr "大"
+
+#, fuzzy
+#~| msgctxt "dwell click threshold"
+#~| msgid "Large"
+#~ msgctxt "cursor size"
+#~ msgid "Largest"
+#~ msgstr "大"
+
+#, fuzzy
+#~| msgid "Cursor Blinking"
+#~ msgid "Cursor Size"
+#~ msgstr "光标闪烁"
+
+#~ msgid "<small>Your account</small>"
+#~ msgstr "<small>您的帐号</small>"
+
+#~ msgid "Edit"
+#~ msgstr "编辑"
+
+#~ msgctxt "notifications"
+#~ msgid "Notification _Banners"
+#~ msgstr "通知条幅(_B)"
+
+#~ msgid "Notification _Banners"
+#~ msgstr "通知条幅"
+
+#~ msgid "Add Account"
+#~ msgstr "添加帐号"
+
+#~ msgid "Mail"
+#~ msgstr "邮件"
+
+#~ msgid "Calendar"
+#~ msgstr "日历"
+
+#~ msgid "Contacts"
+#~ msgstr "联系人"
+
+#~ msgid "Chat"
+#~ msgstr "聊天"
+
+#~ msgid "Resources"
+#~ msgstr "资源"
+
+#~ msgid "Error creating account"
+#~ msgstr "创建帐号出错"
+
+#~ msgid "Are you sure you want to remove the account?"
+#~ msgstr "确定要移除这个帐号吗?"
+
+#~ msgid "This will not remove the account on the server."
+#~ msgstr "这不会将该帐号从服务器上移除。"
+
+#~ msgid "_Remove"
+#~ msgstr "移除(_R)"
+
+#~ msgid "No online accounts configured"
+#~ msgstr "未设置在线帐号"
+
+# 统一下翻译
+#~ msgid ""
+#~ "Adding an account allows your applications to access it for documents, "
+#~ "mail, contacts, calendar, chat and more."
+#~ msgstr ""
+#~ "添加一个帐号以让您的应用访问帐号的文档、邮件、联系人、日历、聊天等。"
+
+#~ msgctxt "printer state"
+#~ msgid "Configuring"
+#~ msgstr "正在配置"
+
+# 以下几个level似乎译为“量”更好
+#~ msgid "Toner Level"
+#~ msgstr "碳粉量"
+
+#~ msgid "Supply Level"
+#~ msgstr "耗材量"
+
+#~ msgctxt "printer state"
+#~ msgid "Installing"
+#~ msgstr "正在安装"
+
+#~ msgid "%u active"
+#~ msgid_plural "%u active"
+#~ msgstr[0] "%u 项活动任务"
+
+#~ msgid "Test page"
+#~ msgstr "测试页"
+
+#~ msgid "Add a New Printer"
+#~ msgstr "添加打印机"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "认证(_U)"
+
+#~ msgid "No printers detected."
+#~ msgstr "未检测到打印机。"
+
+#~ msgid "Supply"
+#~ msgstr "耗材"
+
+#~ msgid "_Default printer"
+#~ msgstr "默认打印机(_D)"
+
+#~ msgid "Jobs"
+#~ msgstr "任务"
+
+#~ msgid "Show _Jobs"
+#~ msgstr "显示任务(_J)"
+
+#~ msgid "label"
+#~ msgstr "标签"
+
+#~ msgid "Setting new driver…"
+#~ msgstr "正在设置新驱动…"
+
+#~ msgid "Print _Test Page"
+#~ msgstr "打印测试页(_T)"
+
+#~ msgctxt "login history week label"
+#~ msgid "%s - %s"
+#~ msgstr "%s - %s"
+
+#~ msgid "Other Accounts"
+#~ msgstr "其他帐号"
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Up"
+#~ msgstr "上键"
+
+#~ msgctxt "Wacom tablet button"
+#~ msgid "Down"
+#~ msgstr "下键"
+
+#~ msgctxt "Wacom action-type"
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid "Left Ring"
+#~ msgstr "左环模式"
+
+#~ msgid "Left Ring Mode #%d"
+#~ msgstr "左环模式 #%d"
+
+#~ msgid "Right Ring Mode #%d"
+#~ msgstr "右环模式 #%d"
+
+# Touchstrip和touchring都是商标。
+#~ msgid "Left Touchstrip"
+#~ msgstr "左 Touchstrip 模式"
+
+# Touchstrip和touchring都是商标。
+#~ msgid "Left Touchstrip Mode #%d"
+#~ msgstr "左 Touchstrip 模式 #%d"
+
+#~ msgid "Right Touchstrip"
+#~ msgstr "右 Touchstrip"
+
+#~ msgid "Right Touchstrip Mode #%d"
+#~ msgstr "右 Touchstrip 模式 #%d"
+
+#~ msgid "Left Touchring Mode Switch"
+#~ msgstr "左 Touchring 模式切换"
+
+#~ msgid "Right Touchring Mode Switch"
+#~ msgstr "右 Touchring 模式切换"
+
+#~ msgid "Left Touchstrip Mode Switch"
+#~ msgstr "左 Touchstrip 模式切换"
+
+#~ msgid "Right Touchstrip Mode Switch"
+#~ msgstr "右 Touchstrip 模式切换"
+
+#~ msgid "Mode Switch #%d"
+#~ msgstr "模式切换 #%d"
+
+#~ msgid "Left Button #%d"
+#~ msgstr "左键 #%d"
+
+#~ msgid "Right Button #%d"
+#~ msgstr "右键 #%d"
+
+#~ msgid "Top Button #%d"
+#~ msgstr "上键 #%d"
+
+#~ msgid "Bottom Button #%d"
+#~ msgstr "底键 #%d"
+
+#~ msgid "No Action"
+#~ msgstr "无动作"
+
+#~ msgid "Left Mouse Button Click"
+#~ msgstr "鼠标左键单击"
+
+#~ msgid "Scroll Up"
+#~ msgstr "向上滚动"
+
+#~ msgid "Scroll Down"
+#~ msgstr "向下滚动"
+
+#~ msgid "Scroll Left"
+#~ msgstr "向左滚动"
+
+#~ msgid "Scroll Right"
+#~ msgstr "向右滚动"
 
 #~ msgid "Wayland"
 #~ msgstr "Wayland"
@@ -7281,9 +7495,6 @@ msgstr "无可用区域"
 #~ msgid "Set Shortcut"
 #~ msgstr "设置快捷键"
 
-#~ msgid "_Unlock"
-#~ msgstr "解锁(_U)"
-
 #~ msgid "Color"
 #~ msgstr "色彩"
 
@@ -7440,12 +7651,6 @@ msgstr "无可用区域"
 #~ msgid "Add User Account"
 #~ msgstr "添加用户帐号"
 
-#~ msgid "Remove User Account"
-#~ msgstr "移除用户帐号"
-
-#~ msgid "Login Options"
-#~ msgstr "登录选项"
-
 #~ msgid "A user with the username '%s' already exists."
 #~ msgstr "用户“%s”已存在。"
 
@@ -7455,9 +7660,6 @@ msgstr "无可用区域"
 #~ msgid "Time _Zone"
 #~ msgstr "时区(_Z)"
 
-#~ msgid "Active Jobs"
-#~ msgstr "活动的任务"
-
 #~ msgid "Close"
 #~ msgstr "关闭"
 


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