[gnome-control-center/gnome-3-26] Update Chinese (China) translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gnome-3-26] Update Chinese (China) translation
- Date: Wed, 8 May 2019 09:24:49 +0000 (UTC)
commit d1110592ecb616331607cce3068023624bd7ceea
Author: Dz Chen <wsxy162 gmail com>
Date: Wed May 8 09:24:35 2019 +0000
Update Chinese (China) translation
po/zh_CN.po | 3608 +++++++++++++++++++++++++++++++++--------------------------
1 file changed, 1991 insertions(+), 1617 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c7050cc1..52846bd5c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
-# Simplified Chinese translation for gnome-control-center.
-# Copyright (C) 2002, 2003, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
-# This file is distributed under the same license as gnome-control-center package.
+# Chinese (China) translation for gnome-control-center.
+# Copyright (C) 2001-2017 gnome-control-center's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-control-center package.
# Some translations are taken from tranditional Chinese translation.
# by Abel Cheung <maddog linuxhall org>, 2001.
# He Qiangqiang <carton linux net cn>, 2002.
@@ -24,24 +24,24 @@
# Eleanor Chen <chenyueg gmail com>, 2014.
# Aron Xu <happyaron xu gmail com>, 2010, 2011, 2012, 2013, 2014, 2015.
# Mingye Wang <arthur2e5 aosc xyz>, 2015.
-# Jeff Bai <jeffbai aosc xyz>, 2015, 2016.
-# Dingzhong Chen <wsxy162 gmail com>, 2016.
+# Dingzhong Chen <wsxy162 gmail com>, 2016, 2017.
+# Mingcong Bai <jeffbai aosc xyz>, 2015, 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.26\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"
-"Last-Translator: Dingzhong Chen <wsxy162 gmail com>\n"
+"POT-Creation-Date: 2017-10-25 14:31+0000\n"
+"PO-Revision-Date: 2017-09-02 03:43+0800\n"
+"Last-Translator: Mingcong Bai <jeffbai aosc xyz>\n"
"Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.2\n"
#: ../panels/background/background.ui.h:1
msgid "_Background"
@@ -87,73 +87,73 @@ msgctxt "background, style"
msgid "Span"
msgstr "适合宽度"
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:426
msgid "Wallpapers"
msgstr "壁纸"
-#: ../panels/background/cc-background-chooser-dialog.c:446
+#: ../panels/background/cc-background-chooser-dialog.c:435
msgid "Colors"
msgstr "色彩"
#. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:483
+#: ../panels/background/cc-background-chooser-dialog.c:468
msgid "Select Background"
msgstr "选择背景"
-#: ../panels/background/cc-background-chooser-dialog.c:511
+#: ../panels/background/cc-background-chooser-dialog.c:496
msgid "Pictures"
msgstr "图片"
#. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:543
+#: ../panels/background/cc-background-chooser-dialog.c:528
msgid "No Pictures Found"
msgstr "无图片"
#. translators: "Home" is used in place of the Pictures
#. * directory in the string below when XDG_PICTURES_DIR is
#. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:561
+#: ../panels/background/cc-background-chooser-dialog.c:546
#: ../panels/search/cc-search-locations-dialog.c:302
msgid "Home"
msgstr "主目录"
#. translators: %s here is the name of the Pictures directory, the string should be translated in
#. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:573
+#: ../panels/background/cc-background-chooser-dialog.c:558
#, c-format
msgid "You can add images to your %s folder and they will show up here"
msgstr "您添加到 %s 文件夹的图片将在此显示"
-#: ../panels/background/cc-background-chooser-dialog.c:580
+#: ../panels/background/cc-background-chooser-dialog.c:565
#: ../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:2697
#: ../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:1325
+#: ../panels/network/net-device-wifi.c:1405
+#: ../panels/network/net-device-wifi.c:1641
#: ../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/search/cc-search-locations-dialog.c:642
+#: ../panels/sharing/cc-sharing-panel.c:382
#: ../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:221
+#: ../panels/user-accounts/um-user-panel.c:644
+#: ../panels/user-accounts/um-user-panel.c:662
msgid "_Cancel"
msgstr "取消(_C)"
-#: ../panels/background/cc-background-chooser-dialog.c:581
+#: ../panels/background/cc-background-chooser-dialog.c:566
msgid "_Select"
msgstr "选择(_S)"
@@ -172,7 +172,7 @@ msgstr "%d × %d"
msgid "No Desktop Background"
msgstr "无桌面背景"
-#: ../panels/background/cc-background-panel.c:493
+#: ../panels/background/cc-background-panel.c:483
msgid "Current background"
msgstr "当前背景"
@@ -190,7 +190,7 @@ msgstr "将背景图片改为一张壁纸或照片"
msgid "Wallpaper;Screen;Desktop;"
msgstr "Wallpaper;Screen;Desktop;壁纸;墙纸;屏幕;桌面;背景;"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+#: ../panels/bluetooth/cc-bluetooth-panel.c:265
msgid "Turn Off Airplane Mode"
msgstr "关闭飞行模式"
@@ -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
@@ -702,8 +702,8 @@ msgid "_Import File…"
msgstr "导入文件(_I)…"
#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/network/connection-editor/net-connection-editor.c:519
+#: ../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"
@@ -872,7 +872,7 @@ msgid "Other…"
msgstr "其他…"
#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-format-chooser.c:269
#: ../panels/region/cc-input-chooser.c:169
msgid "More…"
msgstr "更多…"
@@ -882,12 +882,12 @@ msgid "No languages found"
msgstr "未找到语言"
#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: ../panels/network/connection-editor/ce-page-details.c:106
msgid "Today"
msgstr "今天"
#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/network/connection-editor/ce-page-details.c:108
msgid "Yesterday"
msgstr "昨天"
@@ -921,25 +921,25 @@ msgid "Year"
msgstr "年"
#. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: ../panels/datetime/cc-datetime-panel.c:330
msgid "%e %B %Y, %l:%M %p"
-msgstr "%Y年%m月%d日, %p %-l:%M"
+msgstr "%Y年%m月%d日，%p %-l:%M"
#. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:345
+#: ../panels/datetime/cc-datetime-panel.c:335
msgid "%e %B %Y, %R"
-msgstr "%Y年%m月%d日, %R"
+msgstr "%Y年%m月%d日，%R"
#. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: ../panels/datetime/cc-datetime-panel.c:511
#, c-format
msgctxt "timezone loc"
msgid "%s, %s"
-msgstr "%s, %s"
+msgstr "%s，%s"
#. Update the timezone on the listbow row
#. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: ../panels/datetime/cc-datetime-panel.c:540
#, c-format
msgctxt "timezone desc"
msgid "%s (%s)"
@@ -947,23 +947,23 @@ msgstr "%s (%s)"
#. Translators: UTC here means the Coordinated Universal Time.
#. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:561
+#: ../panels/datetime/cc-datetime-panel.c:548
msgid "UTC%:::z"
msgstr "UTC%:::z"
#. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: ../panels/datetime/cc-datetime-panel.c:553
msgid "%l:%M %p"
msgstr "%p %-l:%M"
#. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:571
+#: ../panels/datetime/cc-datetime-panel.c:558
msgid "%R"
msgstr "%R"
#. Update the text bubble in the timezone map
#. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: ../panels/datetime/cc-datetime-panel.c:563
#, c-format
msgctxt "timezone map"
msgid "%s (%s)"
@@ -1093,146 +1093,196 @@ msgstr "更改系统时间和日期设置"
msgid "To change time or date settings, you need to authenticate."
msgstr "修改时间或日期设置需要认证。"
-#: ../panels/display/cc-display-panel.c:573
-msgid "Lid Closed"
-msgstr "上盖已合上"
+#: ../panels/display/cc-display-panel.c:738
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "横向"
+
+#: ../panels/display/cc-display-panel.c:741
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "纵向朝右"
+
+#: ../panels/display/cc-display-panel.c:744
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "纵向朝左"
+
+#: ../panels/display/cc-display-panel.c:747
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "横向倒置"
+
+# 左撇子有歧视色彩。
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/display/cc-display-panel.c:788
+#: ../panels/display/cc-display-panel.c:838
+#: ../panels/printers/pp-options-dialog.c:558
+msgid "Orientation"
+msgstr "方向"
+
+#: ../panels/display/cc-display-panel.c:881
+#: ../panels/display/cc-display-panel.c:933
+#: ../panels/display/cc-display-panel.c:1751
+#: ../panels/display/cc-display-panel.c:1797
+#: ../panels/printers/pp-options-dialog.c:87
+msgid "Resolution"
+msgstr "分辨率"
+
+#: ../panels/display/cc-display-panel.c:978
+#: ../panels/display/cc-display-panel.c:1049
+msgid "Refresh Rate"
+msgstr "刷新频率"
+
+#: ../panels/display/cc-display-panel.c:1186
+msgid "Scale"
+msgstr "比例缩放"
-#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:576
-msgid "Mirrored"
-msgstr "镜像显示"
+#: ../panels/display/cc-display-panel.c:1239
+msgid "Adjust for TV"
+msgstr "为 TV 调整"
-#: ../panels/display/cc-display-panel.c:578
-#: ../panels/display/cc-display-panel.c:2430
-msgid "Primary"
+#: ../panels/display/cc-display-panel.c:1451
+#: ../panels/display/cc-display-panel.c:1497
+msgid "Primary Display"
msgstr "主显示器"
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:590
-#: ../panels/universal-access/cc-ua-panel.c:603
-#: ../panels/universal-access/cc-ua-panel.c:615
-#: ../panels/universal-access/cc-ua-panel.c:786
-#: ../panels/universal-access/uap.ui.h:6
-msgid "Off"
-msgstr "关"
+#: ../panels/display/cc-display-panel.c:1546
+msgid "Display Arrangement"
+msgstr "显示排布"
+
+#: ../panels/display/cc-display-panel.c:1547
+msgid ""
+"Drag displays to match your setup. The top bar is placed on the primary "
+"display."
+msgstr "拖拽显示示意以匹配您的桌面排布。顶栏将置于主显示器。"
+
+#: ../panels/display/cc-display-panel.c:1985
+msgid "Display Mode"
+msgstr "显示模式"
+
+#: ../panels/display/cc-display-panel.c:2001
+msgid "Join Displays"
+msgstr "拼接显示器"
+
+#: ../panels/display/cc-display-panel.c:2004
+msgid "Mirror"
+msgstr "镜像"
-#: ../panels/display/cc-display-panel.c:583
-msgid "Secondary"
-msgstr "副显示器"
+#: ../panels/display/cc-display-panel.c:2007
+msgid "Single Display"
+msgstr "单显示器"
-#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1558
-msgid "Arrange Combined Displays"
-msgstr "安排多个显示"
+#: ../panels/display/cc-display-panel.c:2693
+msgid "Apply Changes?"
+msgstr "应用更改？"
-#: ../panels/display/cc-display-panel.c:1562
-#: ../panels/display/cc-display-panel.c:2208
+#: ../panels/display/cc-display-panel.c:2707
#: ../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
-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
-#, 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:3083
#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
-
-#: ../panels/display/cc-display-panel.c:2260
-msgid "Rotate counterclockwise by 90°"
-msgstr "逆时针旋转 90°"
-
-#: ../panels/display/cc-display-panel.c:2278
-msgid "Rotate by 180°"
-msgstr "旋转 180°"
-
-#: ../panels/display/cc-display-panel.c:2296
-msgid "Rotate clockwise by 90°"
-msgstr "顺时针旋转 90°"
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
-#: ../panels/display/cc-display-panel.c:2317
-msgid "Size"
-msgstr "大小"
+#. TRANSLATORS: the state of the night light setting
+#: ../panels/display/cc-display-panel.c:3299
+#: ../panels/notifications/cc-notifications-panel.c:292
+#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+msgid "On"
+msgstr "开"
-#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2332
-msgid "Aspect Ratio"
-msgstr "宽高比"
+#: ../panels/display/cc-display-panel.c:3299 ../panels/network/net-proxy.c:54
+#: ../panels/notifications/cc-notifications-panel.c:292
+#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:331
+#: ../panels/universal-access/cc-ua-panel.c:712
+#: ../panels/universal-access/cc-ua-panel.c:725
+#: ../panels/universal-access/cc-ua-panel.c:737
+#: ../panels/universal-access/cc-ua-panel.c:908
+#: ../panels/universal-access/uap.ui.h:7
+msgid "Off"
+msgstr "关"
-#: ../panels/display/cc-display-panel.c:2355
-#: ../panels/printers/pp-options-dialog.c:85
-msgid "Resolution"
-msgstr "分辨率"
+#: ../panels/display/cc-display-panel.c:3320
+msgid "_Night Light"
+msgstr "夜光(_N)"
-#: ../panels/display/cc-display-panel.c:2375
-msgid "Adjust for TV"
-msgstr "为 TV 调整"
+#: ../panels/display/cc-display-panel.c:3385
+msgid "Could not get screen information"
+msgstr "无法获取屏幕信息"
-#: ../panels/display/cc-display-panel.c:2399
-msgid "Refresh Rate"
-msgstr "刷新频率"
+#. This cancels the redshift inhibit.
+#: ../panels/display/display.ui.h:2
+msgid "Restart Filter"
+msgstr "重启滤镜"
-#: ../panels/display/cc-display-panel.c:2431
-msgid "Show the top bar and Activities Overview on this display"
-msgstr "在此显示器上显示顶栏和活动概览"
+#. Inhibit the redshift functionality until the next day starts
+#: ../panels/display/display.ui.h:4
+msgid "Temporarily Disabled Until Tomorrow"
+msgstr "暂时禁用直到明天"
-#: ../panels/display/cc-display-panel.c:2437
-msgid "Secondary Display"
-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 "夜光使屏幕颜色更暖。这可以帮助预防眼疲劳和失眠。"
-#: ../panels/display/cc-display-panel.c:2438
-msgid "Join this display with another to create an extra workspace"
-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/cc-display-panel.c:2445
-msgid "Presentation"
-msgstr "演示"
+#: ../panels/display/display.ui.h:8
+msgid "Schedule"
+msgstr "计划"
-#: ../panels/display/cc-display-panel.c:2446
-msgid "Show slideshows and media only"
-msgstr "只显示幻灯片和多媒体"
+#: ../panels/display/display.ui.h:9
+msgid "Sunset to Sunrise"
+msgstr "日落到日出"
-#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2451
-msgid "Mirror"
-msgstr "镜像"
+#: ../panels/display/display.ui.h:10
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
+#: ../panels/network/network-wifi.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Manual"
+msgstr "手动"
-#: ../panels/display/cc-display-panel.c:2452
-msgid "Show your existing view on both displays"
-msgstr "在两块显示器上同时显示当前视图"
+#: ../panels/display/display.ui.h:11
+msgid "From"
+msgstr "从"
-#: ../panels/display/cc-display-panel.c:2458
-msgid "Turn Off"
-msgstr "关闭"
+#: ../panels/display/display.ui.h:12
+msgid ":"
+msgstr ":"
-#: ../panels/display/cc-display-panel.c:2459
-msgid "Don't use this display"
-msgstr "不使用该显示器"
+#. This is the short form for the time period in the morning
+#: ../panels/display/display.ui.h:14
+msgid "AM"
+msgstr "上午"
-#: ../panels/display/cc-display-panel.c:2770
-msgid "Could not get screen information"
-msgstr "无法获取屏幕信息"
+#. This is the short form for the time period in the afternoon
+#: ../panels/display/display.ui.h:16
+msgid "PM"
+msgstr "下午"
-#: ../panels/display/cc-display-panel.c:2801
-msgid "_Arrange Combined Displays"
-msgstr "安排多个显示(_A)"
+#: ../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
@@ -1245,69 +1295,96 @@ 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-overview-panel.c:381
+#: ../panels/info/cc-info-overview-panel.c:468
+#: ../panels/network/panel-common.c:123
msgid "Unknown"
msgstr "未知"
-#: ../panels/info/cc-info-panel.c:567
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: ../panels/info/cc-info-overview-panel.c:476
#, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d 位（构建 ID：%s）"
+msgid "%s; Build ID: %s"
+msgstr "%s；构建 ID：%s"
-#: ../panels/info/cc-info-panel.c:569
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
#, c-format
-msgid "%d-bit (Build ID: %s)"
-msgstr "%d 位（构建 ID：%s）"
+msgid "64-bit"
+msgstr "64 位"
-#: ../panels/info/cc-info-panel.c:577
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
#, c-format
-msgid "%s %d-bit"
-msgstr "%s %d 位"
+msgid "32-bit"
+msgstr "32 位"
-#: ../panels/info/cc-info-panel.c:579
+#: ../panels/info/cc-info-overview-panel.c:807
#, c-format
-msgid "%d-bit"
-msgstr "%d 位"
+msgid "Version %s"
+msgstr "版本 %s"
+
+#: ../panels/info/cc-info-panel.c:135
+msgid "Section"
+msgstr "节"
+
+#: ../panels/info/cc-info-panel.c:144 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "总览"
+
+#: ../panels/info/cc-info-panel.c:150 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "默认应用程序"
-#: ../panels/info/cc-info-panel.c:1260
+#: ../panels/info/cc-info-panel.c:155 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "可移动介质"
+
+#: ../panels/info/cc-info-removable-media-panel.c:312
msgid "Ask what to do"
msgstr "询问如何处理"
-#: ../panels/info/cc-info-panel.c:1264
+#: ../panels/info/cc-info-removable-media-panel.c:316
msgid "Do nothing"
msgstr "无动作"
-#: ../panels/info/cc-info-panel.c:1268
+#: ../panels/info/cc-info-removable-media-panel.c:320
msgid "Open folder"
msgstr "打开文件夹"
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-removable-media-panel.c:411
msgid "Other Media"
msgstr "其他媒体"
-#: ../panels/info/cc-info-panel.c:1390
+#: ../panels/info/cc-info-removable-media-panel.c:444
msgid "Select an application for audio CDs"
msgstr "选择播放音频 CD 的应用程序"
-#: ../panels/info/cc-info-panel.c:1391
+#: ../panels/info/cc-info-removable-media-panel.c:445
msgid "Select an application for video DVDs"
msgstr "选择播放视频 DVD 的应用程序"
-#: ../panels/info/cc-info-panel.c:1392
+#: ../panels/info/cc-info-removable-media-panel.c:446
msgid "Select an application to run when a music player is connected"
msgstr "选择连接音乐播放器后运行的应用程序"
-#: ../panels/info/cc-info-panel.c:1393
+#: ../panels/info/cc-info-removable-media-panel.c:447
msgid "Select an application to run when a camera is connected"
msgstr "选择连接相机后运行的应用程序"
-#: ../panels/info/cc-info-panel.c:1394
+#: ../panels/info/cc-info-removable-media-panel.c:448
msgid "Select an application for software CDs"
msgstr "选择插入软件 CD 时运行的应用程序"
@@ -1316,86 +1393,82 @@ msgstr "选择插入软件 CD 时运行的应用程序"
#. * If the shared-mime-info translation works for your language,
#. * simply leave these untranslated.
#.
-#: ../panels/info/cc-info-panel.c:1406
+#: ../panels/info/cc-info-removable-media-panel.c:460
msgid "audio DVD"
msgstr "音频 DVD"
-#: ../panels/info/cc-info-panel.c:1407
+#: ../panels/info/cc-info-removable-media-panel.c:461
msgid "blank Blu-ray disc"
msgstr "空白蓝光光盘"
-#: ../panels/info/cc-info-panel.c:1408
+#: ../panels/info/cc-info-removable-media-panel.c:462
msgid "blank CD disc"
msgstr "空白 CD 光盘"
-#: ../panels/info/cc-info-panel.c:1409
+#: ../panels/info/cc-info-removable-media-panel.c:463
msgid "blank DVD disc"
msgstr "空白 DVD 光盘"
# 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1410
+#: ../panels/info/cc-info-removable-media-panel.c:464
msgid "blank HD DVD disc"
msgstr "空白 HD DVD 光盘"
-#: ../panels/info/cc-info-panel.c:1411
+#: ../panels/info/cc-info-removable-media-panel.c:465
msgid "Blu-ray video disc"
msgstr "蓝光视频光盘"
-#: ../panels/info/cc-info-panel.c:1412
+#: ../panels/info/cc-info-removable-media-panel.c:466
msgid "e-book reader"
msgstr "电子书阅读器"
-#: ../panels/info/cc-info-panel.c:1413
+#: ../panels/info/cc-info-removable-media-panel.c:467
msgid "HD DVD video disc"
msgstr "HD DVD 视频光盘"
-#: ../panels/info/cc-info-panel.c:1414
+#: ../panels/info/cc-info-removable-media-panel.c:468
msgid "Picture CD"
msgstr "图片 CD"
-#: ../panels/info/cc-info-panel.c:1415
+#: ../panels/info/cc-info-removable-media-panel.c:469
msgid "Super Video CD"
msgstr "超级 VCD "
-#: ../panels/info/cc-info-panel.c:1416
+#: ../panels/info/cc-info-removable-media-panel.c:470
msgid "Video CD"
msgstr "视频 CD"
-#: ../panels/info/cc-info-panel.c:1417
+#: ../panels/info/cc-info-removable-media-panel.c:471
msgid "Windows software"
msgstr "Windows 软件"
-#: ../panels/info/cc-info-panel.c:1540
-msgid "Section"
-msgstr "节"
-
-#: ../panels/info/cc-info-panel.c:1549 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "总览"
-
-#: ../panels/info/cc-info-panel.c:1555 ../panels/info/info.ui.h:21
-msgid "Default Applications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
+msgid "Default Applications"
msgstr "默认应用程序"
-#: ../panels/info/cc-info-panel.c:1560 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "可移动介质"
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+msgid "Configure Default Applications"
+msgstr "配置默认应用程序"
-#: ../panels/info/cc-info-panel.c:1585
-#, c-format
-msgid "Version %s"
-msgstr "版本 %s"
+#. Translators: those are keywords for the Default Applications panel
+#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+msgid "default;application;preferred;media;"
+msgstr ""
+"default;application;preferred;media;默认;应用程序;首选;偏好;媒体;介质;光盘;"
#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "Details"
-msgstr "详细信息"
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
+msgid "About"
+msgstr "关于"
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
msgid "View information about your system"
msgstr "查看系统信息"
#. sure that you use the same "translation" for those keywords
+#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
msgid ""
"device;system;information;memory;processor;version;default;application;"
@@ -1406,107 +1479,137 @@ msgstr ""
"内存;处理器;CPU;版本;默认;应用程序;首选;回滚;喜好;音频;视频;光盘;光碟;盘片;可"
"擦写;可移除;媒体;介质;自动运行;"
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "选择如何处理其他介质"
-
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "动作(_A)："
-
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "类型(_T)："
-
-#: ../panels/info/info.ui.h:4
-msgid "Device name"
-msgstr "设备名称"
-
-#: ../panels/info/info.ui.h:5
-msgid "Memory"
-msgstr "内存"
-
-#: ../panels/info/info.ui.h:6
-msgid "Processor"
-msgstr "处理器"
-
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-msgstr "基本系统"
-
-#: ../panels/info/info.ui.h:9
-msgid "Disk"
-msgstr "磁盘"
-
-#: ../panels/info/info.ui.h:10
-msgid "Calculating…"
-msgstr "正在计算…"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "Details"
+msgstr "详细信息"
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-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/info/gnome-removable-media-panel.desktop.in.in.h:2
+msgid "Removable Media"
+msgstr "可移动介质"
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "虚拟化"
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+msgid "Configure Removable Media settings"
+msgstr "配置可移动介质"
-#: ../panels/info/info.ui.h:13
-msgid "Check for updates"
-msgstr "检查更新"
+#. Translators: those are keywords for the Removable Media panel
+#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;设备;系统;信息;内存;处理器;CPU;版本;默认;应用程序;首"
+"选;回滚;喜好;音频;视频;光盘;光碟;盘片;可擦写;可移除;媒体;介质;自动运行;"
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info-default-apps.ui.h:1
msgid "_Web"
msgstr "_Web"
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info-default-apps.ui.h:2
msgid "_Mail"
msgstr "邮件(_M)"
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info-default-apps.ui.h:3
msgid "_Calendar"
msgstr "日历(_C)"
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info-default-apps.ui.h:4
msgid "M_usic"
msgstr "音乐(_U)"
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info-default-apps.ui.h:5
msgid "_Video"
msgstr "视频(_V)"
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info-default-apps.ui.h:6
+#: ../panels/info/info-removable-media.ui.h:5
msgid "_Photos"
msgstr "照片(_P)"
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-overview.ui.h:1
+msgid "Device name"
+msgstr "设备名称"
+
+#: ../panels/info/info-overview.ui.h:2
+msgid "Memory"
+msgstr "内存"
+
+#: ../panels/info/info-overview.ui.h:3
+msgid "Processor"
+msgstr "处理器"
+
+#: ../panels/info/info-overview.ui.h:4
+msgid "Graphics"
+msgstr "图形"
+
+#. To translators: this field contains the distro name and version
+#: ../panels/info/info-overview.ui.h:6
+msgid "OS name"
+msgstr "OS 名称"
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+msgid "OS type"
+msgstr "OS 类型"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "虚拟化"
+
+#: ../panels/info/info-overview.ui.h:10
+msgid "Disk"
+msgstr "磁盘"
+
+#: ../panels/info/info-overview.ui.h:11
+msgid "Calculating…"
+msgstr "正在计算…"
+
+#: ../panels/info/info-overview.ui.h:12
+msgid "Check for updates"
+msgstr "检查更新"
+
+#: ../panels/info/info-removable-media.ui.h:1
msgid "Select how media should be handled"
msgstr "选择如何处理介质"
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
msgid "CD _audio"
msgstr "CD 音频(_A)"
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info-removable-media.ui.h:3
msgid "_DVD video"
msgstr "_DVD 视频"
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info-removable-media.ui.h:4
msgid "_Music player"
msgstr "音乐播放器(_M)"
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
msgid "_Software"
msgstr "软件(_S)"
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
msgid "_Other Media…"
msgstr "其他媒体(_O)…"
-#: ../panels/info/info.ui.h:28
+#: ../panels/info/info-removable-media.ui.h:8
msgid "_Never prompt or start programs on media insertion"
msgstr "介质插入时从不提示或启动程序(_N)"
+#: ../panels/info/info-removable-media.ui.h:9
+msgid "Select how other media should be handled"
+msgstr "选择如何处理其他介质"
+
+#: ../panels/info/info-removable-media.ui.h:10
+msgid "_Action:"
+msgstr "操作(_A)："
+
+#: ../panels/info/info-removable-media.ui.h:11
+msgid "_Type:"
+msgstr "类型(_T)："
+
#: ../panels/keyboard/00-multimedia.xml.in.h:1
msgid "Sound and Media"
msgstr "声音和媒体"
@@ -1552,7 +1655,7 @@ msgid "Eject"
msgstr "弹出"
#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:12
msgid "Typing"
msgstr "打字"
@@ -1572,8 +1675,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:1590
+#: ../shell/cc-window.c:251 ../shell/cc-window.c:828
#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
msgid "Settings"
msgstr "设置"
@@ -1683,9 +1786,9 @@ msgstr "减小文本字号"
msgid "High contrast on or off"
msgstr "高对比度开关"
+#: ../panels/keyboard/cc-keyboard-manager.c:506
#: ../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:822
msgid "Custom Shortcuts"
msgstr "自定义快捷键"
@@ -1696,11 +1799,12 @@ msgstr "自定义快捷键"
#. * The device has been disabled
#: ../panels/keyboard/cc-keyboard-option.c:276
#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/keyboard-shortcuts.c:435
#: ../panels/keyboard/shortcut-editor.ui.h:2
+#: ../panels/network/network-proxy.ui.h:4
#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: ../panels/sound/gvc/gvc-mixer-control.c:1866
+#: ../panels/user-accounts/um-fingerprint-dialog.c:214
msgid "Disabled"
msgstr "禁用"
@@ -1724,33 +1828,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:9
+#: ../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:427
#, 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:597
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:597
msgid "Set Shortcut"
msgstr "设置快捷键"
#. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
#, 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:1033
msgid "Add Custom Shortcut"
msgstr "添加自定义快捷键"
@@ -1765,24 +1889,41 @@ msgstr "查看和更改快捷并设置打字偏好"
#. Translators: those are keywords for the keyboard control-center panel
#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
-msgid "Shortcut;Repeat;Blink;"
-msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;快捷"
+"键;工作空间;窗口;更改大小;缩放;对比度;输入;源;锁定;音量;"
#: ../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 "尝试不同的搜索"
#: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "按 Esc 键取消。"
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgstr "按 Esc 以取消或 Backspace 以重置键盘快捷键。"
#: ../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
+#: ../panels/sound/gvc-sound-theme-chooser.c:563
msgid "Name"
msgstr "名称"
@@ -1795,43 +1936,35 @@ 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
-msgid "Remove"
-msgstr "移除"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/keyboard/shortcut-editor.ui.h:8
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:10
+msgid "Remove"
+msgstr "移除"
-#: ../panels/keyboard/shortcut-editor.ui.h:12
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
+#: ../panels/keyboard/shortcut-editor.ui.h:11
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)"
@@ -1946,13 +2079,8 @@ msgstr "辅键双击"
msgid "Single click, secondary button"
msgstr "辅键单击"
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:349
-msgid "Air_plane Mode"
-msgstr "飞行模式(_P)"
-
-#: ../panels/network/cc-network-panel.c:953
+#. add proxy to device list
+#: ../panels/network/cc-network-panel.c:579
msgid "Network proxy"
msgstr "网络代理"
@@ -1960,51 +2088,58 @@ msgstr "网络代理"
#. * window for vpn connections, it is also used to display
#. * vpn connections in the device list.
#.
-#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
-#: ../panels/network/net-vpn.c:440
+#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192
+#: ../panels/network/net-vpn.c:321
#, c-format
msgid "%s VPN"
msgstr "%s VPN"
-#: ../panels/network/cc-network-panel.c:1194
+#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
msgid "Oops, something has gone wrong. Please contact your software vendor."
msgstr "抱歉，发生错误。请联系软件提供商。"
-#: ../panels/network/cc-network-panel.c:1200
+#: ../panels/network/cc-network-panel.c:785
msgid "NetworkManager needs to be running."
msgstr "需要运行 NetworkManager。"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/cc-wifi-panel.c:209
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
+#: ../panels/network/network-wifi.ui.h:58
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
msgid "802.1x _Security"
msgstr "802.1X 安全性(_S)"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/printers/printers.ui.h:14
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/wacom/wacom-stylus-page.ui.h:8
msgid "page 1"
msgstr "第 1 页"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
msgid "Anony_mous identity"
msgstr "匿名身份(_M)"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:4
msgid "Inner _authentication"
msgstr "内部认证(_A)"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
-#: ../panels/printers/printers.ui.h:16
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/wacom/wacom-stylus-page.ui.h:16
msgid "page 2"
msgstr "第 2 页"
#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
+#: ../panels/network/connection-editor/ce-page-security.c:445
#: ../panels/network/connection-editor/details-page.ui.h:3
#: ../panels/network/network-wifi.ui.h:6
msgid "Security"
@@ -2020,227 +2155,162 @@ msgid "Profile %d"
msgstr "配置 %d"
#. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:214
-#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:231
+#: ../panels/network/net-device-wifi.c:407
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/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:412
#: ../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/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:239
msgid "WPA2"
msgstr "WPA2"
#. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:244
msgid "Enterprise"
msgstr "企业"
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:232
-#: ../panels/network/net-device-wifi.c:380
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:249
+#: ../panels/network/net-device-wifi.c:397
msgctxt "Wifi security"
msgid "None"
msgstr "无"
-#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/network/connection-editor/ce-page-details.c:95
#: ../panels/power/power.ui.h:17
msgid "Never"
msgstr "从不"
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:110
#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/net-device-wifi.c:506
#, c-format
msgid "%i day ago"
msgid_plural "%i days ago"
msgstr[0] "%i 天前"
#. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/connection-editor/ce-page-details.c:176
#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:542
+#: ../panels/network/net-device-wifi.c:562
#, c-format
msgid "%d Mb/s"
msgstr "%d Mb/秒"
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:591
msgctxt "Signal strength"
msgid "None"
msgstr "无"
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:593
msgctxt "Signal strength"
msgid "Weak"
msgstr "较弱"
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:595
msgctxt "Signal strength"
msgid "Ok"
msgstr "一般"
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:597
msgctxt "Signal strength"
msgid "Good"
msgstr "良好"
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:599
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/connection-editor/ce-page-details.c:248
+msgid "Forget Connection"
+msgstr "取消保存"
+
+#: ../panels/network/connection-editor/ce-page-details.c:250
+msgid "Remove Connection Profile"
+msgstr "移除连接配置"
+
+#: ../panels/network/connection-editor/ce-page-details.c:252
+msgid "Remove VPN"
+msgstr "移除 VPN"
+
+#: ../panels/network/connection-editor/ce-page-details.c:280
+#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
#: ../shell/panel-list.ui.h:2
msgid "Details"
msgstr "详细信息"
-#: ../panels/network/connection-editor/ce-page-ethernet.c:215
-#: ../panels/network/connection-editor/ce-page-vpn.c:221
-#: ../panels/network/connection-editor/ce-page-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-ethernet.c:173
+#: ../panels/network/connection-editor/ce-page-vpn.c:188
+#: ../panels/network/connection-editor/ce-page-wifi.c:194
#: ../panels/network/network-wifi.ui.h:47
msgid "Identity"
msgstr "身份"
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
-msgid "Address"
-msgstr "地址"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
-msgid "Netmask"
-msgstr "子网掩码"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
-#: ../panels/network/network-vpn.ui.h:2
-msgid "Gateway"
-msgstr "网关"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: ../panels/network/connection-editor/ce-page-ip4.c:251
+#: ../panels/network/connection-editor/ce-page-ip6.c:230
msgid "Delete Address"
msgstr "删除地址"
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
-msgid "Server"
-msgstr "服务器"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
-msgid "Delete DNS Server"
-msgstr "删除 DNS 服务器"
-
-#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
-msgctxt "network parameters"
-msgid "Metric"
-msgstr "权重"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: ../panels/network/connection-editor/ce-page-ip4.c:422
+#: ../panels/network/connection-editor/ce-page-ip6.c:390
msgid "Delete Route"
msgstr "删除路由"
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "自动 (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Manual"
-msgstr "手动"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "仅本地链路"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:979
+#: ../panels/network/connection-editor/ce-page-ip4.c:896
#: ../panels/network/network-wifi.ui.h:48
msgid "IPv4"
msgstr "IPv4"
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
-msgid "Prefix"
-msgstr "前缀"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "自动"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "自动，仅 DHCP"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
+#: ../panels/network/connection-editor/ce-page-ip6.c:827
#: ../panels/network/network-wifi.ui.h:49
msgid "IPv6"
msgstr "IPv6"
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-#: ../panels/network/network-wifi.ui.h:51
-msgid "Reset"
-msgstr "重置"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: ../panels/network/connection-editor/ce-page-security.c:245
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "无"
-#: ../panels/network/connection-editor/ce-page-security.c:271
+#: ../panels/network/connection-editor/ce-page-security.c:268
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128 位密钥（Hex 或 ASCII）"
-#: ../panels/network/connection-editor/ce-page-security.c:281
+#: ../panels/network/connection-editor/ce-page-security.c:278
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128 位密码"
-#: ../panels/network/connection-editor/ce-page-security.c:294
-#: ../panels/network/wireless-security/wireless-security.c:463
+#: ../panels/network/connection-editor/ce-page-security.c:291
+#: ../panels/network/wireless-security/wireless-security.c:465
msgid "LEAP"
msgstr "LEAP"
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: ../panels/network/connection-editor/ce-page-security.c:304
msgid "Dynamic WEP (802.1x)"
msgstr "动态 WEP (802.1X)"
-#: ../panels/network/connection-editor/ce-page-security.c:321
+#: ../panels/network/connection-editor/ce-page-security.c:318
msgid "WPA & WPA2 Personal"
msgstr "WPA 和 WPA2 个人"
-#: ../panels/network/connection-editor/ce-page-security.c:335
+#: ../panels/network/connection-editor/ce-page-security.c:332
msgid "WPA & WPA2 Enterprise"
msgstr "WPA 和 WPA2 企业"
@@ -2256,7 +2326,6 @@ msgstr "链路速度"
#: ../panels/network/connection-editor/details-page.ui.h:4
#: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-simple.ui.h:3
#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
msgid "IPv4 Address"
msgstr "IPv4 地址"
@@ -2265,14 +2334,12 @@ msgstr "IPv4 地址"
#: ../panels/network/net-device-ethernet.c:154
#: ../panels/network/net-device-ethernet.c:158
#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-simple.ui.h:4
#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
msgid "IPv6 Address"
msgstr "IPv6 地址"
#: ../panels/network/connection-editor/details-page.ui.h:6
#: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-simple.ui.h:2
#: ../panels/network/network-wifi.ui.h:9
msgid "Hardware Address"
msgstr "硬件地址"
@@ -2280,17 +2347,15 @@ msgstr "硬件地址"
#: ../panels/network/connection-editor/details-page.ui.h:7
#: ../panels/network/net-device-ethernet.c:165
#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:5
#: ../panels/network/network-wifi.ui.h:10
msgid "Default Route"
msgstr "默认路由"
#: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: ../panels/network/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
#: ../panels/network/net-device-ethernet.c:167
#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:6
#: ../panels/network/network-wifi.ui.h:11
msgid "DNS"
msgstr "DNS"
@@ -2299,6 +2364,23 @@ msgstr "DNS"
msgid "Last Used"
msgstr "上次使用"
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "自动连接(_A)"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+msgid "Make available to _other users"
+msgstr "对其他用户可用(_O)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "自动"
+
#: ../panels/network/connection-editor/ethernet-page.ui.h:2
msgid "Twisted Pair (TP)"
msgstr "双绞线 (TP)"
@@ -2355,113 +2437,111 @@ msgstr "克隆的地址(_C)"
msgid "bytes"
msgstr "字节"
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "对其他用户可用(_U)"
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+msgid "IPv_4 Method"
+msgstr "IPv4 方式(_4)"
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "自动连接(_A)"
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "自动 (DHCP)"
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "防火墙区域(_Z)"
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "仅本地链路"
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-#: ../panels/network/connection-editor/firewall-helpers.c:118
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "默认"
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+msgid "Disable"
+msgstr "禁用"
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "此区域定义了对连接的信任级别"
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+msgid "Addresses"
+msgstr "地址"
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv_4"
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/printers/details-dialog.ui.h:3
+msgid "Address"
+msgstr "地址"
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "地址(_A)"
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+msgid "Netmask"
+msgstr "子网掩码"
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
+msgid "Gateway"
+msgstr "网关"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:12
+#: ../panels/network/connection-editor/ip6-page.ui.h:12
msgid "Automatic DNS"
msgstr "自动 DNS"
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:13
+#: ../panels/network/connection-editor/ip6-page.ui.h:13
+msgid "Separate IP addresses with commas"
+msgstr "使用逗号间隔 IP 地址"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:14
+#: ../panels/network/connection-editor/ip6-page.ui.h:14
#: ../panels/network/network-wifi.ui.h:32
msgid "Routes"
msgstr "路由"
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:15
+#: ../panels/network/connection-editor/ip6-page.ui.h:15
msgid "Automatic Routes"
msgstr "自动路由"
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ip4-page.ui.h:17
+#: ../panels/network/connection-editor/ip6-page.ui.h:17
+msgid "Metric"
+msgstr "权值"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:18
+#: ../panels/network/connection-editor/ip6-page.ui.h:18
#: ../panels/network/network-wifi.ui.h:34
msgid "Use this connection _only for resources on its network"
msgstr "仅对该网络上的资源使用此连接(_O)"
#: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv_6"
+msgid "IPv_6 Method"
+msgstr "IPv6 方式(_6)"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "自动，仅 DHCP"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
+msgid "Prefix"
+msgstr "前缀"
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: ../panels/network/connection-editor/net-connection-editor.c:273
msgid "Unable to open connection editor"
msgstr "无法打开连接编辑器"
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: ../panels/network/connection-editor/net-connection-editor.c:291
msgid "New Profile"
msgstr "新配置"
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: ../panels/network/connection-editor/net-connection-editor.c:603
+#: ../panels/network/network.ui.h:2
msgid "VPN"
msgstr "VPN"
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: ../panels/network/connection-editor/net-connection-editor.c:751
msgid "Import from file…"
msgstr "从文件导入…"
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: ../panels/network/connection-editor/net-connection-editor.c:785
msgid "Add VPN"
msgstr "添加 VPN"
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "重置(_R)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1536
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "忘记(_F)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr "重置这个网络包括密码在内的设置，但仍作为首选连接"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr "删除关于这个网络的所有细节，不再尝试自动连接"
-
#: ../panels/network/connection-editor/security-page.ui.h:1
#: ../panels/network/network-wifi.ui.h:16
msgid "S_ecurity"
@@ -2474,7 +2554,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 +2568,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:383
+#: ../panels/user-accounts/um-photo-dialog.c:222
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 +2595,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 ""
@@ -2527,7 +2607,7 @@ msgstr ""
msgid "Export VPN connection"
msgstr "导出 VPN 连接"
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
msgid "(Error: unable to load VPN connection editor)"
msgstr "（错误：无法载入 VPN 连接编辑器）"
@@ -2546,10 +2626,6 @@ msgstr "_BSSID"
msgid "My Home Network"
msgstr "家庭网络"
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-msgstr "对其他用户可用(_O)"
-
#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
msgid "Network"
@@ -2569,24 +2645,35 @@ msgstr ""
"DNS;网络;无线;无线保真;无线;互联网协议;局域网;代理;广域网;宽带;调制解调器;蓝"
"牙;虚拟专用网;域名系统;"
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+msgid "Control how you connect to Wi-Fi networks"
+msgstr "控制连接到 Wi-Fi 网络的方式"
+
+#. Translators: those are keywords for the wi-fi control-center panel
+#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
+msgstr ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;网络;无线;无线保真;无线;互联"
+"网协议;局域网;代理;广域网;宽带;调制解调器;蓝牙;虚拟专用网;域名系统;"
+
#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-wifi.c:492
msgid "never"
msgstr "从不"
#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:481
+#: ../panels/network/net-device-wifi.c:502
msgid "today"
msgstr "今天"
#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:483
+#: ../panels/network/net-device-wifi.c:504
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 地址"
@@ -2600,83 +2687,89 @@ msgstr "上次使用"
#. * profile. It is also used to display ethernet in the
#. * device list.
#.
-#: ../panels/network/net-device-ethernet.c:280
+#: ../panels/network/net-device-ethernet.c:275
#: ../panels/network/network-ethernet.ui.h:1
#: ../panels/network/network-simple.ui.h:1
msgid "Wired"
msgstr "有线"
-#: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1694
-#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/net-device-ethernet.c:343
+#: ../panels/network/net-device-wifi.c:1800
+#: ../panels/network/network-ethernet.ui.h:2
#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
+#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
msgid "Options…"
msgstr "选项…"
-#: ../panels/network/net-device-mobile.c:223
+#: ../panels/network/net-device-mobile.c:238
msgid "Add new connection"
msgstr "添加新连接"
-#: ../panels/network/net-device-wifi.c:1205
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"如果有无线网络以外的方式连接互联网，您可以配置无线热点并与他人共享网络连接。"
-
-#: ../panels/network/net-device-wifi.c:1209
+#: ../panels/network/net-device-wifi.c:1282
#, 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:1286
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:1293
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "要打开 Wi-Fi 热点吗？"
+
+#: ../panels/network/net-device-wifi.c:1315
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr "Wi-Fi 热点常用于基于 Wi-Fi 共享网络连接。"
+
+#: ../panels/network/net-device-wifi.c:1326
+msgid "_Turn On"
+msgstr "打开(_T)"
+
+#: ../panels/network/net-device-wifi.c:1403
msgid "Stop hotspot and disconnect any users?"
msgstr "停止热点并断开所有用户？"
-#: ../panels/network/net-device-wifi.c:1299
+#: ../panels/network/net-device-wifi.c:1406
msgid "_Stop Hotspot"
msgstr "停止热点(_S)"
-#: ../panels/network/net-device-wifi.c:1397
+#: ../panels/network/net-device-wifi.c:1503
msgid "System policy prohibits use as a Hotspot"
msgstr "系统策略禁止作为热点使用"
-#: ../panels/network/net-device-wifi.c:1400
+#: ../panels/network/net-device-wifi.c:1506
msgid "Wireless device does not support Hotspot mode"
msgstr "无线设备不支持热点模式"
-#: ../panels/network/net-device-wifi.c:1532
+#: ../panels/network/net-device-wifi.c:1638
msgid ""
"Network details for the selected networks, including passwords and any "
"custom configuration will be lost."
msgstr "所选网络的细节，包括密码和全部自定义设置都将丢失。"
-#: ../panels/network/net-device-wifi.c:1842
-msgid "History"
-msgstr "历史"
+#: ../panels/network/net-device-wifi.c:1642
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "忘记(_F)"
-#: ../panels/network/net-device-wifi.c:1846
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "关闭(_C)"
+#: ../panels/network/net-device-wifi.c:1951
+#: ../panels/network/net-device-wifi.c:1958
+msgid "Known Wi-Fi Networks"
+msgstr "已知 Wi-Fi 网络"
#. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1854
+#: ../panels/network/net-device-wifi.c:1991
msgctxt "Wi-Fi Network"
msgid "_Forget"
msgstr "忘记(_F)"
#. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
+#: ../panels/network/net-proxy.c:102
msgid ""
"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
msgstr "若未提供配置 URL，将使用网络代理自动发现。"
@@ -2685,18 +2778,10 @@ msgstr "若未提供配置 URL，将使用网络代理自动发现。"
#. * network, then anyone else on that network can tell your
#. * machine that it should proxy all of your web traffic
#. * through them.
-#: ../panels/network/net-proxy.c:75
+#: ../panels/network/net-proxy.c:110
msgid "This is not recommended for untrusted public networks."
msgstr "对于不可信的公共网络，不建议这样做。"
-#: ../panels/network/net-proxy.c:410
-msgid "Proxy"
-msgstr "代理"
-
-#: ../panels/network/network-ethernet.ui.h:2
-msgid "_Add Profile…"
-msgstr "添加配置(_A)…"
-
#: ../panels/network/network-mobile.ui.h:1
msgid "IMEI"
msgstr "IMEI"
@@ -2710,94 +2795,64 @@ msgid "Network"
msgstr "网络"
#: ../panels/network/network-proxy.ui.h:1
-msgctxt "proxy method"
-msgid "None"
-msgstr "无"
-
-#: ../panels/network/network-proxy.ui.h:2
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "手动"
-
-#: ../panels/network/network-proxy.ui.h:3
-msgctxt "proxy method"
-msgid "Automatic"
-msgstr "自动"
-
-#: ../panels/network/network-proxy.ui.h:4
-msgid "_Method"
-msgstr "方式(_M)"
+msgid "Network Proxy"
+msgstr "网络代理"
#: ../panels/network/network-proxy.ui.h:5
-msgid "_Configuration URL"
-msgstr "配置 URL (_C)"
-
-#: ../panels/network/network-proxy.ui.h:6
msgid "_HTTP Proxy"
msgstr "_HTTP 代理"
-#: ../panels/network/network-proxy.ui.h:7
+#: ../panels/network/network-proxy.ui.h:6
msgid "H_TTPS Proxy"
msgstr "H_TTPS 代理"
-#: ../panels/network/network-proxy.ui.h:8
+#: ../panels/network/network-proxy.ui.h:7
msgid "_FTP Proxy"
msgstr "_FTP 代理"
-#: ../panels/network/network-proxy.ui.h:9
+#: ../panels/network/network-proxy.ui.h:8
msgid "_Socks Host"
msgstr "_Socks 主机"
-#: ../panels/network/network-proxy.ui.h:10
+#: ../panels/network/network-proxy.ui.h:9
msgid "_Ignore Hosts"
msgstr "忽略主机(_I)"
-#: ../panels/network/network-proxy.ui.h:11
+#: ../panels/network/network-proxy.ui.h:10
msgid "HTTP proxy port"
msgstr "HTTP 代理端口"
-#: ../panels/network/network-proxy.ui.h:12
+#: ../panels/network/network-proxy.ui.h:11
msgid "HTTPS proxy port"
msgstr "HTTPS 代理端口"
-#: ../panels/network/network-proxy.ui.h:13
+#: ../panels/network/network-proxy.ui.h:12
msgid "FTP proxy port"
msgstr "FTP 代理端口"
-#: ../panels/network/network-proxy.ui.h:14
+#: ../panels/network/network-proxy.ui.h:13
msgid "Socks proxy port"
msgstr "SOCKS 代理端口"
-#: ../panels/network/network-simple.ui.h:7
+#: ../panels/network/network-proxy.ui.h:14
+msgid "_Configuration URL"
+msgstr "配置 URL (_C)"
+
+#: ../panels/network/network-simple.ui.h:2
msgid "Turn device off"
msgstr "关闭设备"
+#. Translators: The found device is a printer connected via Bluetooth
#: ../panels/network/network.ui.h:1
-msgid "Add Device"
-msgstr "添加设备"
+#: ../panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
+msgstr "蓝牙"
-#: ../panels/network/network.ui.h:2
-msgid "Remove Device"
-msgstr "移除设备"
+#: ../panels/network/network.ui.h:3
+msgid "Not set up"
+msgstr "未配置"
#: ../panels/network/network-vpn.ui.h:1
-msgid "VPN Type"
-msgstr "VPN 类型"
-
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Group Name"
-msgstr "组名"
-
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Password"
-msgstr "组密码"
-
-#: ../panels/network/network-vpn.ui.h:5
-#: ../panels/printers/authentication-dialog.ui.h:4
-msgid "Username"
-msgstr "用户名"
-
-#: ../panels/network/network-vpn.ui.h:6
msgid "Turn VPN connection off"
msgstr "关闭 VPN 连接"
@@ -2816,7 +2871,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)"
@@ -2832,6 +2887,14 @@ msgstr "对其他用户可用"
msgid "identity"
msgstr "身份"
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "地址(_A)"
+
#: ../panels/network/network-wifi.ui.h:28
msgid "Automatic (DHCP) addresses only"
msgstr "仅自动分配地址 (DHCP)"
@@ -2852,6 +2915,10 @@ msgstr "忽略自动获取的路由(_I)"
msgid "ipv4"
msgstr "ipv4"
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv_6"
+
#: ../panels/network/network-wifi.ui.h:37
msgid "ipv6"
msgstr "ipv6"
@@ -2864,6 +2931,10 @@ msgstr "克隆的 MAC 地址(_C)"
msgid "hardware"
msgstr "硬件"
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "重置(_R)"
+
#: ../panels/network/network-wifi.ui.h:43
msgid ""
"Reset the settings for this connection to their defaults, but remember as a "
@@ -2884,62 +2955,84 @@ 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 热点"
#: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "打开(_T)"
-
-#: ../panels/network/network-wifi.ui.h:54
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:55
-msgid "Turn Wi-Fi off"
-msgstr "关闭 Wi-Fi"
-
-#: ../panels/network/network-wifi.ui.h:56
-msgid "_Use as Hotspot…"
-msgstr "用作热点(_U)…"
-
-#: ../panels/network/network-wifi.ui.h:57
-msgid "_Connect to Hidden Network…"
-msgstr "连接到隐藏网络(_C)…"
-
-#: ../panels/network/network-wifi.ui.h:58
-msgid "_History"
-msgstr "历史(_H)"
-
-#: ../panels/network/network-wifi.ui.h:59
msgid "Switch off to connect to a Wi-Fi network"
msgstr "关闭以连接到无线网络"
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:54
msgid "Network Name"
msgstr "网络名称"
-#: ../panels/network/network-wifi.ui.h:61
+#: ../panels/network/network-wifi.ui.h:55
msgid "Connected Devices"
msgstr "已连接的设备"
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:56
msgid "Security type"
msgstr "安全类型"
-#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/network/network-wifi.ui.h:57
#: ../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 "密码"
-#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:127
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#. TRANSLATORS: AP type
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Turn Wi-Fi off"
+msgstr "关闭 Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:60
+msgid "_Connect to Hidden Network…"
+msgstr "连接到隐藏网络(_C)…"
+
+#: ../panels/network/network-wifi.ui.h:61
+msgid "_Turn On Wi-Fi Hotspot…"
+msgstr "打开 Wi-Fi 热点(_T)…"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "_Known Wi-Fi Networks"
+msgstr "已知 Wi-Fi 网络(_K)"
+
+#: ../panels/network/wifi.ui.h:1
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "请确保您已插入并打开 Wi-Fi 适配器"
+
+#: ../panels/network/wifi.ui.h:2
+msgid "No Wi-Fi Adapter Found"
+msgstr "未找到 Wi-Fi 适配器"
+
+#: ../panels/network/wifi.ui.h:3
+msgid "Airplane Mode"
+msgstr "飞行模式"
+
+#: ../panels/network/wifi.ui.h:4
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "禁用 Wi-Fi，蓝牙及蜂窝网络"
+
+#: ../panels/network/wifi.ui.h:5
+msgid "Visible Networks"
+msgstr "可见网络"
+
+#: ../panels/network/wifi.ui.h:6
+msgid "NetworkManager needs to be running"
+msgstr "NetworkManager 必须在后台运行"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:127
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
#: ../panels/network/panel-common.c:131
msgid "Infrastructure"
msgstr "架构"
@@ -3215,23 +3308,23 @@ msgstr "固件缺失"
msgid "Cable unplugged"
msgstr "线缆已拔出"
-#: ../panels/network/wireless-security/eap-method.c:69
-msgid "undefined error in 802.1x security (wpa-eap)"
+#: ../panels/network/wireless-security/eap-method.c:57
+msgid "undefined error in 802.1X security (wpa-eap)"
msgstr "802.1x 安全性里未定义的错误 (wpa-eap)"
-#: ../panels/network/wireless-security/eap-method.c:245
+#: ../panels/network/wireless-security/eap-method.c:233
msgid "no file selected"
msgstr "未选择文件"
-#: ../panels/network/wireless-security/eap-method.c:276
+#: ../panels/network/wireless-security/eap-method.c:264
msgid "unspecified error validating eap-method file"
msgstr "验证 eap-method 文件时发生未知错误"
-#: ../panels/network/wireless-security/eap-method.c:480
+#: ../panels/network/wireless-security/eap-method.c:439
msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
msgstr "DER、PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
-#: ../panels/network/wireless-security/eap-method.c:483
+#: ../panels/network/wireless-security/eap-method.c:442
msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
msgstr "DER 或 PEM 证书 (*.der, *.pem, *.crt, *.cer)"
@@ -3241,13 +3334,13 @@ msgstr "缺失 EAP-FAST PAC 文件"
#: ../panels/network/wireless-security/eap-method-fast.c:268
#: ../panels/network/wireless-security/eap-method-peap.c:302
-#: ../panels/network/wireless-security/eap-method-ttls.c:333
+#: ../panels/network/wireless-security/eap-method-ttls.c:351
msgid "GTC"
msgstr "GTC"
#: ../panels/network/wireless-security/eap-method-fast.c:283
#: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:288
+#: ../panels/network/wireless-security/eap-method-ttls.c:289
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
@@ -3260,37 +3353,28 @@ msgid "PAC files (*.pac)"
msgstr "PAC 文件(*.pac)"
#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
-#: ../panels/printers/authentication-dialog.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
msgid "Anonymous"
msgstr "匿名"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
msgid "Authenticated"
msgstr "已认证"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
msgid "Both"
msgstr "两者"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
msgid "PAC _file"
msgstr "PAC 文件(_F)"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
msgid "_Inner authentication"
msgstr "内部认证(_I)"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
msgid "Allow automatic PAC pro_visioning"
msgstr "允许自动 PAC 配置(_V)"
@@ -3327,38 +3411,38 @@ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
msgstr "无效的 EAP-PEAP CA 证书：未指定证书"
#: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:318
-#: ../panels/network/wireless-security/wireless-security.c:439
+#: ../panels/network/wireless-security/eap-method-ttls.c:336
+#: ../panels/network/wireless-security/wireless-security.c:441
msgid "MD5"
msgstr "MD5"
#: ../panels/network/wireless-security/eap-method-peap.c:381
#: ../panels/network/wireless-security/eap-method-tls.c:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:412
+#: ../panels/network/wireless-security/eap-method-ttls.c:430
msgid "Choose a Certificate Authority certificate"
msgstr "选择 CA 证书"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
msgid "Version 0"
msgstr "版本 0"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
msgid "Version 1"
msgstr "版本 1"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
msgid "C_A certificate"
msgstr "C_A 证书"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
msgid "No CA certificate is _required"
msgstr "不需要 CA 证书(_R)"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
msgid "PEAP _version"
msgstr "PEAP 版本(_V)"
@@ -3403,16 +3487,16 @@ msgstr "未加密的私钥不安全"
#: ../panels/network/wireless-security/eap-method-tls.c:319
msgid ""
-"The selected private key does not appear to be protected by a password. "
-"This could allow your security credentials to be compromised. Please select "
-"a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password. This "
+"could allow your security credentials to be compromised. Please select a "
+"password-protected private key.\n"
"\n"
"(You can password-protect your private key with openssl)"
msgstr ""
"选择的私钥未设置密码，可能使您的安全凭据遭受攻击并失效。请选择一个带有密码的"
"私钥。\n"
"\n"
-"（您可以使用 openssl 来向私钥添加密码）"
+"（您可以使用 openssl 来向私钥添加密码保护）"
#: ../panels/network/wireless-security/eap-method-tls.c:495
msgid "Choose your personal certificate"
@@ -3447,45 +3531,49 @@ msgstr "无效的 EAP-TTLS CA 证书：%s"
msgid "invalid EAP-TTLS CA certificate: no certificate specified"
msgstr "无效的 EAP-TTLS CA 证书：未指定证书"
-#: ../panels/network/wireless-security/eap-method-ttls.c:258
+#: ../panels/network/wireless-security/eap-method-ttls.c:259
msgid "PAP"
msgstr "PAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:273
+#: ../panels/network/wireless-security/eap-method-ttls.c:274
msgid "MSCHAP"
msgstr "MSCHAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:303
+#: ../panels/network/wireless-security/eap-method-ttls.c:305
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2（无 EAP）"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:321
msgid "CHAP"
msgstr "CHAP"
#: ../panels/network/wireless-security/wireless-security.c:87
-msgid "Unknown error validating 802.1x security"
+msgid "Unknown error validating 802.1X security"
msgstr "验证 802.1x 安全性时发生未知错误"
-#: ../panels/network/wireless-security/wireless-security.c:451
+#: ../panels/network/wireless-security/wireless-security.c:453
msgid "TLS"
msgstr "TLS"
-#: ../panels/network/wireless-security/wireless-security.c:475
+#: ../panels/network/wireless-security/wireless-security.c:477
msgid "PWD"
msgstr "PWD"
-#: ../panels/network/wireless-security/wireless-security.c:486
+#: ../panels/network/wireless-security/wireless-security.c:488
msgid "FAST"
msgstr "FAST"
-#: ../panels/network/wireless-security/wireless-security.c:497
+#: ../panels/network/wireless-security/wireless-security.c:499
msgid "Tunneled TLS"
msgstr "隧道 TLS"
-#: ../panels/network/wireless-security/wireless-security.c:508
+#: ../panels/network/wireless-security/wireless-security.c:510
msgid "Protected EAP (PEAP)"
msgstr "受保护的 EAP (PEAP)"
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
msgid "Au_thentication"
msgstr "认证(_T)"
@@ -3534,34 +3622,22 @@ msgid "1 (Default)"
msgstr "1（默认）"
#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
-
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
msgid "Open System"
msgstr "开放系统"
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
msgid "Shared Key"
msgstr "共享密钥"
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
msgid "_Key"
msgstr "密钥(_K)"
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
msgid "Sho_w key"
msgstr "显示密钥(_W)"
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
msgid "WEP inde_x"
msgstr "WEP 索引(_X)"
@@ -3581,18 +3657,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 +3671,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 +3712,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 +3725,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:551
+#, c-format
+msgid "%s Account"
+msgstr "%s 帐号"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:700
+#: ../panels/online-accounts/cc-online-accounts-panel.c:843
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:908
+#, 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
@@ -3725,25 +3768,27 @@ msgstr ""
"Kerberos;IMAP;SMTP;Pocket;ReadItLater;谷歌;脸谱;脸书;推特;雅虎;互联网;网络;在"
"线;聊天;日历;邮件;联系人;云存储;稍后阅读;"
+#. Translators: This is the button which allows undoing the removal of the printer.
#: ../panels/online-accounts/online-accounts.ui.h:1
-msgid "No online accounts configured"
-msgstr "未设置在线帐号"
+#: ../panels/printers/printers.ui.h:4
+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 +3902,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 "手写板"
@@ -3868,7 +3913,7 @@ msgstr "计算机"
#. TRANSLATORS: secondary battery, misc
#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2366
+#: ../panels/power/cc-power-panel.c:2356
msgid "Battery"
msgstr "电池"
@@ -3920,84 +3965,88 @@ msgstr "空闲时(_I)"
msgid "Power Saving"
msgstr "节电"
-#: ../panels/power/cc-power-panel.c:1716
+#: ../panels/power/cc-power-panel.c:1712
msgid "_Screen brightness"
msgstr "屏幕亮度(_S)"
-#: ../panels/power/cc-power-panel.c:1735
+#: ../panels/power/cc-power-panel.c:1731
msgid "Automatic brightness"
msgstr "自动亮度"
-#: ../panels/power/cc-power-panel.c:1755
+#: ../panels/power/cc-power-panel.c:1751
msgid "_Keyboard brightness"
msgstr "键盘亮度(_K)"
-#: ../panels/power/cc-power-panel.c:1765
+#: ../panels/power/cc-power-panel.c:1761
msgid "_Dim screen when inactive"
msgstr "无操作时使屏幕变暗(_D)"
-#: ../panels/power/cc-power-panel.c:1790
+#: ../panels/power/cc-power-panel.c:1786
msgid "_Blank screen"
msgstr "空白屏幕(_B)"
-#: ../panels/power/cc-power-panel.c:1827
+#: ../panels/power/cc-power-panel.c:1823
msgid "_Wi-Fi"
msgstr "_Wi-Fi"
-#: ../panels/power/cc-power-panel.c:1832
+#: ../panels/power/cc-power-panel.c:1828
msgid "Turn off Wi-Fi to save power."
msgstr "关闭 Wi-Fi 以节省电源。"
-#: ../panels/power/cc-power-panel.c:1857
+#: ../panels/power/cc-power-panel.c:1853
msgid "_Mobile broadband"
msgstr "移动宽带(_M)"
-#: ../panels/power/cc-power-panel.c:1862
+#: ../panels/power/cc-power-panel.c:1858
msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
msgstr "关闭移动宽带（3G、4G、WiMax 等）以节省电源。"
-#: ../panels/power/cc-power-panel.c:1907
+#: ../panels/power/cc-power-panel.c:1903
msgid "_Bluetooth"
msgstr "蓝牙(_B)"
-#: ../panels/power/cc-power-panel.c:1970
+#: ../panels/power/cc-power-panel.c:1966
msgid "When on battery power"
msgstr "电池供电时"
-#: ../panels/power/cc-power-panel.c:1972
+#: ../panels/power/cc-power-panel.c:1968
msgid "When plugged in"
msgstr "插入电源时"
-#: ../panels/power/cc-power-panel.c:2067
+#: ../panels/power/cc-power-panel.c:2063
msgid "Suspend"
msgstr "挂起"
-#: ../panels/power/cc-power-panel.c:2068
+#: ../panels/power/cc-power-panel.c:2064
+msgid "Power Off"
+msgstr "电源关闭"
+
+#: ../panels/power/cc-power-panel.c:2065
msgid "Hibernate"
msgstr "休眠"
-#: ../panels/power/cc-power-panel.c:2069
+#: ../panels/power/cc-power-panel.c:2066
msgid "Nothing"
msgstr "不处理"
#. Frame header
-#: ../panels/power/cc-power-panel.c:2183
+#: ../panels/power/cc-power-panel.c:2180
msgid "Suspend & Power Button"
msgstr "挂起和关机按钮"
-#: ../panels/power/cc-power-panel.c:2226
+#: ../panels/power/cc-power-panel.c:2219
msgid "_Automatic suspend"
msgstr "自动挂起(_A)"
-#: ../panels/power/cc-power-panel.c:2227
+#: ../panels/power/cc-power-panel.c:2220
msgid "Automatic suspend"
msgstr "自动挂起"
-#: ../panels/power/cc-power-panel.c:2294
+#: ../panels/power/cc-power-panel.c:2287
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:2406 ../shell/cc-window.c:247
#: ../shell/panel-list.ui.h:1
msgid "Devices"
msgstr "设备"
@@ -4087,199 +4136,71 @@ msgstr "已插入电源(_P)"
msgid "On _Battery Power"
msgstr "使用电池时(_B)"
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33
+#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
msgid "Delay"
msgstr "延迟"
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
#: ../panels/printers/authentication-dialog.ui.h:3
msgid "Authenticate"
msgstr "认证"
+#: ../panels/printers/authentication-dialog.ui.h:4
+#: ../panels/printers/new-printer-dialog.ui.h:13
+msgid "Username"
+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: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:686
-msgid "Out of toner"
-msgstr "墨粉用尽"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:689
-msgid "Low on developer"
-msgstr "显影剂不足"
-
-#. Translators: "Developer" is a chemical for photo development,
-#. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:692
-msgid "Out of developer"
-msgstr "显影剂用尽"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:694
-msgid "Low on a marker supply"
-msgstr "标记墨水不足"
-
-#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:696
-msgid "Out of a marker supply"
-msgstr "标记墨水用尽"
-
-#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:698
-msgid "Open cover"
-msgstr "打开上盖"
-
-#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:700
-msgid "Open door"
-msgstr "打开后盖"
-
-#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:702
-msgid "Low on paper"
-msgstr "纸张不足"
-
-#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:704
-msgid "Out of paper"
-msgstr "纸张用尽"
-
-#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:706
-msgctxt "printer state"
-msgid "Offline"
-msgstr "离线"
-
-#. Translators: Someone has stopped the Printer
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:708
-#: ../panels/printers/cc-printers-panel.c:898
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "已停止"
-
-#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:710
-msgid "Waste receptacle almost full"
-msgstr "废粉仓将满"
-
-#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:712
-msgid "Waste receptacle full"
-msgstr "废粉仓已满"
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:714
-msgid "The optical photo conductor is near end of life"
-msgstr "感光鼓使用寿命已快耗尽"
-
-#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:716
-msgid "The optical photo conductor is no longer functioning"
-msgstr "感光鼓故障"
-
-#. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:825
-msgctxt "printer state"
-msgid "Configuring"
-msgstr "正在配置"
-
-#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:884
-msgctxt "printer state"
-msgid "Ready"
-msgstr "就绪"
-
-#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:889
-msgctxt "printer state"
-msgid "Does not accept jobs"
-msgstr "不接收任务"
-
-#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:894
-msgctxt "printer state"
-msgid "Processing"
-msgstr "正在处理"
-
-# 以下几个level似乎译为“量”更好
-#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1014
-msgid "Toner Level"
-msgstr "碳粉量"
-
-#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1017
-msgid "Ink Level"
-msgstr "墨水量"
-
-#. 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
+#. Translators: %s is the printer name
+#: ../panels/printers/cc-printers-panel.c:718
#, c-format
-msgid "%u active"
-msgid_plural "%u active"
-msgstr[0] "%u 项活动任务"
+msgid "Printer “%s” has been deleted"
+msgstr "已删除打印机“%s”"
#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1893
+#: ../panels/printers/cc-printers-panel.c:909
msgid "Failed to add new printer."
msgstr "添加新打印机失败。"
-#: ../panels/printers/cc-printers-panel.c:2074
-msgid "Select PPD File"
-msgstr "选择 PPD 文件"
+#. Translators: The XML file containing user interface can not be loaded
+#: ../panels/printers/cc-printers-panel.c:1221
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "无法载入界面：%s"
-#: ../panels/printers/cc-printers-panel.c:2083
-msgid ""
-"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
-"PPD.GZ)"
-msgstr "PostScript 打印机描述文件 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
+#: ../panels/printers/details-dialog.ui.h:2
+#: ../panels/printers/printer-entry.ui.h:9
+msgid "Location"
+msgstr "位置"
-#: ../panels/printers/cc-printers-panel.c:2390
-msgid "No suitable driver found"
-msgstr "未找到合适的驱动"
+#. Translators: Name of column showing printer drivers
+#: ../panels/printers/details-dialog.ui.h:4
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "驱动"
-#: ../panels/printers/cc-printers-panel.c:2461
+#: ../panels/printers/details-dialog.ui.h:5
msgid "Searching for preferred drivers…"
msgstr "正在搜索首选驱动…"
-#: ../panels/printers/cc-printers-panel.c:2482
-msgid "Select from database…"
-msgstr "从数据库选择…"
+#: ../panels/printers/details-dialog.ui.h:6
+msgid "Search for Drivers"
+msgstr "搜索驱动"
-#: ../panels/printers/cc-printers-panel.c:2491
-msgid "Provide PPD File…"
-msgstr "提供 PPD 文件…"
+#: ../panels/printers/details-dialog.ui.h:7
+msgid "Select from Database…"
+msgstr "从数据库选择…"
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2638
-#: ../panels/printers/cc-printers-panel.c:2661
-msgid "Test page"
-msgstr "测试页"
-
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3116
-#, c-format
-msgid "Could not load ui: %s"
-msgstr "无法载入界面：%s"
+#: ../panels/printers/details-dialog.ui.h:8
+msgid "Install PPD File…"
+msgstr "安装 PPD 文件…"
#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
@@ -4307,28 +4228,59 @@ msgstr "全部清除"
msgid "No Active Printer Jobs"
msgstr "没有活动的打印机任务"
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
+#. Translators: This is the title presented at top of the dialog.
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/printers/pp-new-printer-dialog.c:384
+#: ../panels/printers/pp-new-printer-dialog.c:456
+msgid "Add Printer"
msgstr "添加打印机"
-#. Translators: This button opens authentication dialog for selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:5
-msgid "A_uthenticate"
-msgstr "认证(_U)"
+#. Translators: This buttons submits the credentials for the selected server.
+#: ../panels/printers/new-printer-dialog.ui.h:6
+msgid "_Unlock"
+msgstr "解锁(_U)"
-#. Translators: No printers were found
-#: ../panels/printers/new-printer-dialog.ui.h:7
-msgid "No printers detected."
-msgstr "未检测到打印机。"
+#. Translators: No printers were detected
+#: ../panels/printers/new-printer-dialog.ui.h:8
+msgid "No Printers Found"
+msgstr "未找到打印机"
#. Translators: The entered text should contain network address of a printer or a text which will filter
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:9
+#: ../panels/printers/new-printer-dialog.ui.h:10
msgid "Enter a network address or search for a printer"
msgstr "输入网络地址或搜索打印机"
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-msgstr "正在载入选项…"
+#: ../panels/printers/new-printer-dialog.ui.h:12
+msgid "Enter username and password to view printers on Print Server."
+msgstr "输入用户名和密码以查看打印服务器上的打印机。"
+
+#. Translators: This button triggers the printing of a test page.
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/printers/pp-options-dialog.c:893
+msgid "Test Page"
+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 详细信息"
+
+#: ../panels/printers/pp-details-dialog.c:172
+msgid "No suitable driver found"
+msgstr "未找到合适的驱动"
+
+#: ../panels/printers/pp-details-dialog.c:316
+msgid "Select PPD File"
+msgstr "选择 PPD 文件"
+
+#: ../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/ppd-selection-dialog.ui.h:1
msgid "Select Printer Driver"
@@ -4340,16 +4292,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,175 +4344,189 @@ 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
-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 "服务器要求认证"
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
msgid "Two Sided"
msgstr "双面"
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
msgid "Paper Type"
msgstr "纸张类型"
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
msgid "Paper Source"
msgstr "纸张来源"
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
msgid "Output Tray"
msgstr "出纸托盘"
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/printers/pp-options-dialog.c:88
msgid "GhostScript pre-filtering"
msgstr "GhostScript 预过滤"
#. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:533
+#: ../panels/printers/pp-options-dialog.c:534
msgid "Pages per side"
msgstr "每面页数"
#. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:545
+#: ../panels/printers/pp-options-dialog.c:546
msgid "Two-sided"
msgstr "双面"
-# 左撇子有歧视色彩。
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
-msgid "Orientation"
-msgstr "方向"
-
#. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../panels/printers/pp-options-dialog.c:655
msgctxt "Printer Option Group"
msgid "General"
msgstr "常规"
#. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:657
+#: ../panels/printers/pp-options-dialog.c:658
msgctxt "Printer Option Group"
msgid "Page Setup"
msgstr "页面设置"
#. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM,
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:660
+#: ../panels/printers/pp-options-dialog.c:661
msgctxt "Printer Option Group"
msgid "Installable Options"
msgstr "可安装选项"
#. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:663
+#: ../panels/printers/pp-options-dialog.c:664
msgctxt "Printer Option Group"
msgid "Job"
msgstr "任务"
#. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:666
+#: ../panels/printers/pp-options-dialog.c:667
msgctxt "Printer Option Group"
msgid "Image Quality"
msgstr "图像质量"
#. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:669
+#: ../panels/printers/pp-options-dialog.c:670
msgctxt "Printer Option Group"
msgid "Color"
msgstr "色彩"
#. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:672
+#: ../panels/printers/pp-options-dialog.c:673
msgctxt "Printer Option Group"
msgid "Finishing"
msgstr "正在完成"
#. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:675
+#: ../panels/printers/pp-options-dialog.c:676
msgctxt "Printer Option Group"
msgid "Advanced"
msgstr "高级"
+#. Translators: Name of job which makes printer to print test page
+#: ../panels/printers/pp-options-dialog.c:908
+msgid "Test page"
+msgstr "测试页"
+
#. Translators: this is an option of "Paper Source"
#: ../panels/printers/pp-ppd-option-widget.c:76
#: ../panels/printers/pp-ppd-option-widget.c:78
@@ -4602,89 +4568,186 @@ 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:577
+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:582
#, 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:730
+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:732
+msgid "Out of toner"
+msgstr "墨粉用尽"
+
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/pp-printer-entry.c:735
+msgid "Low on developer"
+msgstr "显影剂不足"
+
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/pp-printer-entry.c:738
+msgid "Out of developer"
+msgstr "显影剂用尽"
+
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:740
+msgid "Low on a marker supply"
+msgstr "标记墨水不足"
+
+#. Translators: "marker" is one color bin of the printer
+#: ../panels/printers/pp-printer-entry.c:742
+msgid "Out of a marker supply"
+msgstr "标记墨水用尽"
+
+#. Translators: One or more covers on the printer are open
+#: ../panels/printers/pp-printer-entry.c:744
+msgid "Open cover"
+msgstr "打开上盖"
+
+#. Translators: One or more doors on the printer are open
+#: ../panels/printers/pp-printer-entry.c:746
+msgid "Open door"
+msgstr "打开后盖"
+
+#. Translators: At least one input tray is low on media
+#: ../panels/printers/pp-printer-entry.c:748
+msgid "Low on paper"
+msgstr "纸张不足"
+
+#. Translators: At least one input tray is empty
+#: ../panels/printers/pp-printer-entry.c:750
+msgid "Out of paper"
+msgstr "纸张用尽"
+
+#. Translators: The printer is offline
+#: ../panels/printers/pp-printer-entry.c:752
+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:754
+#: ../panels/printers/pp-printer-entry.c:884
+msgctxt "printer state"
+msgid "Stopped"
+msgstr "已停止"
+
+#. Translators: The printer marker supply waste receptacle is almost full
+#: ../panels/printers/pp-printer-entry.c:756
+msgid "Waste receptacle almost full"
+msgstr "废粉仓将满"
+
+#. Translators: The printer marker supply waste receptacle is full
+#: ../panels/printers/pp-printer-entry.c:758
+msgid "Waste receptacle full"
+msgstr "废粉仓已满"
+
+#. Translators: Optical photo conductors are used in laser printers
+#: ../panels/printers/pp-printer-entry.c:760
+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:762
+msgid "The optical photo conductor is no longer functioning"
+msgstr "感光鼓故障"
+
+#. Translators: Printer's state (can start new job without waiting)
+#: ../panels/printers/pp-printer-entry.c:870
+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:875
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "不接收任务"
+
+#. Translators: Printer's state (jobs are processing)
+#: ../panels/printers/pp-printer-entry.c:880
+msgctxt "printer state"
+msgid "Processing"
+msgstr "正在处理"
+
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:904
+msgid "Clean print heads"
+msgstr "清理喷墨头"
-#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/printers.ui.h:4
-msgid "Supply"
-msgstr "耗材"
+#: ../panels/printers/printer-entry.ui.h:1
+msgid "Printing Options"
+msgstr "打印选项"
-#. Translators: Location of the printer (e.g. Lab, 1st floor,...).
-#: ../panels/printers/printers.ui.h:6
-msgid "Location"
-msgstr "位置"
+#: ../panels/printers/printer-entry.ui.h:2
+msgid "Printer Details"
+msgstr "打印机详细信息"
-#. Translators: This checkbox is checked when the default printer is selected.
-#: ../panels/printers/printers.ui.h:8
-msgid "_Default printer"
-msgstr "默认打印机(_D)"
+#. Set this printer as default
+#: ../panels/printers/printer-entry.ui.h:4
+msgid "Use Printer by Default"
+msgstr "设置使用打印机"
-#: ../panels/printers/printers.ui.h:9
-msgid "Jobs"
-msgstr "任务"
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:6
+msgid "Clean Print Heads"
+msgstr "清理喷墨头"
-#. Translators: Opens a dialog containing printer
-#: ../panels/printers/printers.ui.h:11
-msgid "Show _Jobs"
-msgstr "显示任务(_J)"
+#: ../panels/printers/printer-entry.ui.h:7
+msgid "Remove Printer"
+msgstr "移除打印机"
-#: ../panels/printers/printers.ui.h:12
+#: ../panels/printers/printer-entry.ui.h:8
msgid "Model"
msgstr "型号"
-#: ../panels/printers/printers.ui.h:15
-msgid "label"
-msgstr "标签"
-
-#: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver…"
-msgstr "正在设置新驱动…"
+#: ../panels/printers/printer-entry.ui.h:10
+msgid "Ink Level"
+msgstr "墨水量"
-#: ../panels/printers/printers.ui.h:18
-msgid "page 3"
-msgstr "第 3 页"
+#. Translators: This is the message which follows the printer error.
+#: ../panels/printers/printer-entry.ui.h:12
+msgid "Please restart when the problem is resolved."
+msgstr "问题解决后请重启。"
-#. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:20
-msgid "Print _Test Page"
-msgstr "打印测试页(_T)"
+#. Translators: This is the button which restarts the printer.
+#: ../panels/printers/printer-entry.ui.h:14
+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:5
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:7
+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:9
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 +4776,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 +4942,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 "
@@ -4911,17 +4982,17 @@ msgstr "定位服务(_L)"
msgid "_Automatic Problem Reporting"
msgstr "自动报告问题(_A)"
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:118
msgctxt "measurement format"
msgid "Imperial"
msgstr "英制"
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
msgctxt "measurement format"
msgid "Metric"
msgstr "公制"
-#: ../panels/region/cc-format-chooser.c:287
+#: ../panels/region/cc-format-chooser.c:285
msgid "No regions found"
msgstr "无可用区域"
@@ -4929,26 +5000,16 @@ msgstr "无可用区域"
msgid "No input sources found"
msgstr "无输入源"
-#: ../panels/region/cc-input-chooser.c:992
+#: ../panels/region/cc-input-chooser.c:1012
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:881
msgid "No input source selected"
msgstr "未选择输入源"
-#: ../panels/region/cc-region-panel.c:1779
+#: ../panels/region/cc-region-panel.c:1773
msgid "Login _Screen"
msgstr "登录屏幕(_S)"
@@ -4969,14 +5030,18 @@ msgid "Times"
msgstr "时间"
#: ../panels/region/format-chooser.ui.h:7
+msgid "Dates & Times"
+msgstr "日期和时间"
+
+#: ../panels/region/format-chooser.ui.h:8
msgid "Numbers"
msgstr "数字"
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
msgid "Measurement"
msgstr "度量"
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
msgid "Paper"
msgstr "纸张"
@@ -5000,7 +5065,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 +5080,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,7 +5109,7 @@ 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:11
msgid "_Language"
msgstr "语言(_L)"
@@ -5057,54 +5118,66 @@ msgid "English (United Kingdom)"
msgstr "英语（英国）"
#: ../panels/region/region.ui.h:3
+msgid "Restart the session for changes to take effect"
+msgstr "需要重启会话以让更改生效"
+
+#: ../panels/region/region.ui.h:4
+msgid "Restart…"
+msgstr "重启…"
+
+#: ../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 "登录设置将对所有于本机登录的用户共享"
-#: ../panels/search/cc-search-locations-dialog.c:634
+#: ../panels/search/cc-search-locations-dialog.c:639
msgid "Select Location"
msgstr "选择位置"
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: ../panels/search/cc-search-locations-dialog.c:643
msgid "_OK"
msgstr "确定(_O)"
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
msgid "No applications found"
msgstr "未找到应用"
@@ -5157,32 +5230,32 @@ msgstr "首选项"
msgid "No networks selected for sharing"
msgstr "未选择要共享的网络"
-#: ../panels/sharing/cc-sharing-panel.c:263
+#: ../panels/sharing/cc-sharing-panel.c:273
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:275
+#: ../panels/sharing/cc-sharing-panel.c:302
msgctxt "service is disabled"
msgid "Off"
msgstr "已关闭"
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:305
msgctxt "service is enabled"
msgid "Enabled"
msgstr "已启用"
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:308
msgctxt "service is active"
msgid "Active"
msgstr "活动"
-#: ../panels/sharing/cc-sharing-panel.c:369
+#: ../panels/sharing/cc-sharing-panel.c:379
msgid "Choose a Folder"
msgstr "选择文件夹"
-#: ../panels/sharing/cc-sharing-panel.c:680
+#: ../panels/sharing/cc-sharing-panel.c:690
#, c-format
msgid ""
"Personal File Sharing allows you to share your Public folder with others on "
@@ -5191,7 +5264,7 @@ msgstr ""
"个人网络共享允许您与当前网络中的其他人共享自己的共享文件夹，使用地址：<a "
"href=\"dav://%s\">dav://%s</a>"
-#: ../panels/sharing/cc-sharing-panel.c:682
+#: ../panels/sharing/cc-sharing-panel.c:692
#, c-format
msgid ""
"When remote login is enabled, remote users can connect using the Secure "
@@ -5201,7 +5274,7 @@ msgstr ""
"当启用远程登录是，远程用户可以使用 SSH 命令来连接：\n"
"<a href=\"ssh %s\">ssh %s</a>"
-#: ../panels/sharing/cc-sharing-panel.c:684
+#: ../panels/sharing/cc-sharing-panel.c:694
#, c-format
msgid ""
"Screen sharing allows remote users to view or control your screen by "
@@ -5210,11 +5283,11 @@ msgstr ""
"屏幕共享允许远程用户查看或控制您的屏幕通过连接到：<a href=\"vnc://%s\">vnc://"
"%s</a> "
-#: ../panels/sharing/cc-sharing-panel.c:796
+#: ../panels/sharing/cc-sharing-panel.c:806
msgid "Copy"
msgstr "复制"
-#: ../panels/sharing/cc-sharing-panel.c:1122
+#: ../panels/sharing/cc-sharing-panel.c:1233
msgid "Sharing"
msgstr "共享"
@@ -5364,54 +5437,54 @@ msgstr "玻璃"
msgid "Sonar"
msgstr "声纳"
-#: ../panels/sound/gvc-balance-bar.c:105
+#: ../panels/sound/gvc-balance-bar.c:104
msgctxt "balance"
msgid "Left"
msgstr "左"
-#: ../panels/sound/gvc-balance-bar.c:106
+#: ../panels/sound/gvc-balance-bar.c:105
msgctxt "balance"
msgid "Right"
msgstr "右"
-#: ../panels/sound/gvc-balance-bar.c:109
+#: ../panels/sound/gvc-balance-bar.c:108
msgctxt "balance"
msgid "Rear"
msgstr "后"
-#: ../panels/sound/gvc-balance-bar.c:110
+#: ../panels/sound/gvc-balance-bar.c:109
msgctxt "balance"
msgid "Front"
msgstr "前"
-#: ../panels/sound/gvc-balance-bar.c:113
+#: ../panels/sound/gvc-balance-bar.c:112
msgctxt "balance"
msgid "Minimum"
msgstr "最小"
-#: ../panels/sound/gvc-balance-bar.c:114
+#: ../panels/sound/gvc-balance-bar.c:113
msgctxt "balance"
msgid "Maximum"
msgstr "最大"
-#: ../panels/sound/gvc-balance-bar.c:289
+#: ../panels/sound/gvc-balance-bar.c:288
msgid "_Balance:"
msgstr "均衡(_B)："
-#: ../panels/sound/gvc-balance-bar.c:292
+#: ../panels/sound/gvc-balance-bar.c:291
msgid "_Fade:"
msgstr "淡出淡入(_F)："
-#: ../panels/sound/gvc-balance-bar.c:295
+#: ../panels/sound/gvc-balance-bar.c:294
msgid "_Subwoofer:"
msgstr "重低音(_S)："
-#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620
+#: ../panels/sound/gvc-channel-bar.c:610 ../panels/sound/gvc-channel-bar.c:619
msgctxt "volume"
msgid "100%"
msgstr "100%"
-#: ../panels/sound/gvc-channel-bar.c:615
+#: ../panels/sound/gvc-channel-bar.c:614
msgctxt "volume"
msgid "Unamplified"
msgstr "减弱"
@@ -5423,7 +5496,7 @@ msgstr "配置(_P)："
#. translators:
#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
+#: ../panels/sound/gvc/gvc-mixer-control.c:1873
#, c-format
msgid "%u Output"
msgid_plural "%u Outputs"
@@ -5431,13 +5504,13 @@ msgstr[0] "%u 路输出"
#. translators:
#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
+#: ../panels/sound/gvc/gvc-mixer-control.c:1883
#, c-format
msgid "%u Input"
msgid_plural "%u Inputs"
msgstr[0] "%u 路输入"
-#: ../panels/sound/gvc/gvc-mixer-control.c:2373
+#: ../panels/sound/gvc/gvc-mixer-control.c:2738
msgid "System Sounds"
msgstr "系统声音"
@@ -5502,44 +5575,45 @@ msgstr "警告音量(_A)："
msgid "No application is currently playing or recording audio."
msgstr "没有正在播放或录制音频的程序。"
-#: ../panels/sound/gvc-sound-theme-chooser.c:188
+#: ../panels/sound/gvc-sound-theme-chooser.c:187
msgid "Built-in"
msgstr "内置"
-#: ../panels/sound/gvc-sound-theme-chooser.c:454
-#: ../panels/sound/gvc-sound-theme-chooser.c:466
-#: ../panels/sound/gvc-sound-theme-chooser.c:478
+#: ../panels/sound/gvc-sound-theme-chooser.c:453
+#: ../panels/sound/gvc-sound-theme-chooser.c:465
+#: ../panels/sound/gvc-sound-theme-chooser.c:477
msgid "Sound Preferences"
msgstr "声音首选项"
-#: ../panels/sound/gvc-sound-theme-chooser.c:457
-#: ../panels/sound/gvc-sound-theme-chooser.c:468
-#: ../panels/sound/gvc-sound-theme-chooser.c:480
+#: ../panels/sound/gvc-sound-theme-chooser.c:456
+#: ../panels/sound/gvc-sound-theme-chooser.c:467
+#: ../panels/sound/gvc-sound-theme-chooser.c:479
msgid "Testing event sound"
msgstr "测试事件声音"
-#: ../panels/sound/gvc-sound-theme-chooser.c:554
+#: ../panels/sound/gvc-sound-theme-chooser.c:553
+#: ../panels/wacom/wacom-stylus-page.ui.h:1
msgid "Default"
msgstr "默认"
-#: ../panels/sound/gvc-sound-theme-chooser.c:555
+#: ../panels/sound/gvc-sound-theme-chooser.c:554
msgid "From theme"
msgstr "来自主题"
-#: ../panels/sound/gvc-sound-theme-chooser.c:740
+#: ../panels/sound/gvc-sound-theme-chooser.c:736
msgid "C_hoose an alert sound:"
msgstr "选择警告声音(_H)："
-#: ../panels/sound/gvc-speaker-test.c:231
+#: ../panels/sound/gvc-speaker-test.c:229
msgid "Stop"
msgstr "停止"
-#: ../panels/sound/gvc-speaker-test.c:231
-#: ../panels/sound/gvc-speaker-test.c:343
+#: ../panels/sound/gvc-speaker-test.c:229
+#: ../panels/sound/gvc-speaker-test.c:341
msgid "Test"
msgstr "测试"
-#: ../panels/sound/gvc-speaker-test.c:239
+#: ../panels/sound/gvc-speaker-test.c:237
msgid "Subwoofer"
msgstr "重低音"
@@ -5547,6 +5621,39 @@ msgstr "重低音"
msgid "Custom"
msgstr "自定义"
+#. translators: the labels will read:
+#. * Cursor Size: Default
+#: ../panels/universal-access/cc-ua-panel.c:351
+msgctxt "cursor size"
+msgid "Default"
+msgstr "默认"
+
+#: ../panels/universal-access/cc-ua-panel.c:354
+msgctxt "cursor size"
+msgid "Medium"
+msgstr "中"
+
+#: ../panels/universal-access/cc-ua-panel.c:357
+msgctxt "cursor size"
+msgid "Large"
+msgstr "大"
+
+#: ../panels/universal-access/cc-ua-panel.c:360
+msgctxt "cursor size"
+msgid "Larger"
+msgstr "较大"
+
+#: ../panels/universal-access/cc-ua-panel.c:363
+msgctxt "cursor size"
+msgid "Largest"
+msgstr "特大"
+
+#: ../panels/universal-access/cc-ua-panel.c:367
+#, c-format
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d 像素"
+
#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
msgid "Universal Access"
@@ -5560,11 +5667,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;Repeat;Blink;"
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;Repeat;Blink;"
+"键盘;鼠标;辅助功能;对比度;缩放;屏幕;读取器;文本;字体;大小;粘滞键;按键;慢速键;"
+"回弹键;双击;点击;延迟;助手;重复;闪烁;"
#: ../panels/universal-access/uap.ui.h:1
msgid "_Always Show Universal Access Menu"
@@ -5583,280 +5691,293 @@ msgid "_Large Text"
msgstr "大号文本(_L)"
#: ../panels/universal-access/uap.ui.h:5
+msgid "C_ursor Size"
+msgstr "光标大小(_U)"
+
+#: ../panels/universal-access/uap.ui.h:6
#: ../panels/universal-access/zoom-options.ui.h:7
msgid "_Zoom"
msgstr "缩放(_Z)"
-#: ../panels/universal-access/uap.ui.h:7
+#: ../panels/universal-access/uap.ui.h:8
msgid "Screen _Reader"
msgstr "屏幕朗读(_R)"
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:9
msgid "_Sound Keys"
msgstr "发声键(_S)"
-#: ../panels/universal-access/uap.ui.h:9
+#: ../panels/universal-access/uap.ui.h:10
msgid "Hearing"
msgstr "听觉"
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:11
msgid "_Visual Alerts"
msgstr "视觉警告(_V)"
-#: ../panels/universal-access/uap.ui.h:12
+#: ../panels/universal-access/uap.ui.h:13
msgid "Screen _Keyboard"
msgstr "屏幕键盘(_K)"
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:14
msgid "R_epeat Keys"
msgstr "重复键(_E)"
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:15
msgid "Cursor _Blinking"
msgstr "光标闪烁(_B)"
-#: ../panels/universal-access/uap.ui.h:15
+#: ../panels/universal-access/uap.ui.h:16
msgid "_Typing Assist (AccessX)"
msgstr "AccessX 打字助手(_T)"
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:17
msgid "Pointing & Clicking"
msgstr "指向和点击"
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:18
msgid "_Mouse Keys"
msgstr "鼠标键(_M)"
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:19
msgid "_Click Assist"
msgstr "点击助手(_C)"
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:20
msgid "_Double-Click Delay"
msgstr "双击延时(_D)"
-#: ../panels/universal-access/uap.ui.h:20
+#: ../panels/universal-access/uap.ui.h:21
msgid "Double-Click Delay"
msgstr "双击延时"
-#: ../panels/universal-access/uap.ui.h:21
+#: ../panels/universal-access/uap.ui.h:22
+msgid "Cursor Size"
+msgstr "光标大小"
+
+#: ../panels/universal-access/uap.ui.h:23
+msgid ""
+"Cursor size can be combined with zoom to make it easier to see the cursor."
+msgstr "可通过缩放光标大小来更清晰地看见光标。"
+
+#: ../panels/universal-access/uap.ui.h:24
msgid "Screen Reader"
msgstr "屏幕朗读"
-#: ../panels/universal-access/uap.ui.h:22
+#: ../panels/universal-access/uap.ui.h:25
msgid "The screen reader reads displayed text as you move the focus."
msgstr "移动焦点时朗读显示的文本。"
-#: ../panels/universal-access/uap.ui.h:23
+#: ../panels/universal-access/uap.ui.h:26
msgid "_Screen Reader"
msgstr "屏幕朗读(_S)"
-#: ../panels/universal-access/uap.ui.h:24
+#: ../panels/universal-access/uap.ui.h:27
msgid "Sound Keys"
msgstr "发声键"
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:28
msgid "Beep when Num Lock or Caps Lock are turned on or off."
msgstr "数字键盘锁定或大小写锁定开启或关闭时发出蜂鸣声。"
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:29
msgid "Visual Alerts"
msgstr "视觉警告"
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:30
msgid "_Test flash"
msgstr "测试闪烁(_T)"
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:31
msgid "Use a visual indication when an alert sound occurs."
msgstr "发出警告声时使用视觉提示。"
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:32
msgid "Flash the _window title"
msgstr "闪烁窗口标题栏(_W)"
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:33
msgid "Flash the entire _screen"
msgstr "闪烁整个屏幕(_S)"
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:34
msgid "Repeat Keys"
msgstr "重复"
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:35
msgid "Key presses repeat when key is held down."
msgstr "按住某一键时重复该键。"
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:37
msgid "Repeat keys delay"
msgstr "重复键延时"
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:38
msgid "Speed"
msgstr "速度"
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:39
msgid "Repeat keys speed"
msgstr "重复键速度"
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:40
msgid "Cursor Blinking"
msgstr "光标闪烁"
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:41
msgid "Cursor blinks in text fields."
msgstr "文本字段中光标闪烁。"
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:42
msgid "Cursor blinking speed"
msgstr "光标闪烁速度"
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:43
msgid "Typing Assist"
msgstr "打字助手"
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:44
msgid "_Sticky Keys"
msgstr "粘滞键(_S)"
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:45
msgid "Treats a sequence of modifier keys as a key combination"
msgstr "将一系列按键当作组合键"
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:46
msgid "_Disable if two keys are pressed together"
msgstr "同时按下两个键时禁用输入(_D)"
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:47
msgid "Beep when a _modifier key is pressed"
msgstr "按修饰键时蜂鸣(_M)"
-#: ../panels/universal-access/uap.ui.h:45
+#: ../panels/universal-access/uap.ui.h:48
msgid "S_low Keys"
msgstr "慢速键(_L)"
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:49
msgid "Puts a delay between when a key is pressed and when it is accepted"
msgstr "在按下按键和接受按键之间添加延迟"
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:50
msgid "A_cceptance delay:"
msgstr "按键接受延迟(_C)："
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:51
msgctxt "slow keys delay"
msgid "Short"
msgstr "短"
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:52
msgid "Slow keys typing delay"
msgstr "慢速键输入延迟"
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:53
msgctxt "slow keys delay"
msgid "Long"
msgstr "长"
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:54
msgid "Beep when a key is pr_essed"
msgstr "按键时蜂鸣(_E)"
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:55
msgid "Beep when a key is _accepted"
msgstr "按键被接受时蜂鸣(_A)"
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:56
msgid "Beep when a key is _rejected"
msgstr "按键被拒绝时蜂鸣(_R)"
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:57
msgid "_Bounce Keys"
msgstr "重复键(_B)"
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:58
msgid "Ignores fast duplicate keypresses"
msgstr "忽略快速重复按键"
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:59
msgctxt "bounce keys delay"
msgid "Short"
msgstr "短"
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:60
msgid "Bounce keys typing delay"
msgstr "重复键输入延迟"
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:61
msgctxt "bounce keys delay"
msgid "Long"
msgstr "长"
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:62
msgid "_Enable by Keyboard"
msgstr "通过键盘启用(_E)"
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:63
msgid "Turn accessibility features on and off using the keyboard"
msgstr "通过键盘开关辅助功能特性"
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:64
msgid "Click Assist"
msgstr "点击助手"
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:65
msgid "_Simulated Secondary Click"
msgstr "模拟右键点击(_S)"
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:66
msgid "Trigger a secondary click by holding down the primary button"
msgstr "按住鼠标主键不放时触发右键点击"
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:67
msgctxt "secondary click"
msgid "Short"
msgstr "短"
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:68
msgid "Secondary click delay"
msgstr "右键点击延迟"
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:69
msgctxt "secondary click delay"
msgid "Long"
msgstr "长"
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:70
msgid "_Hover Click"
msgstr "悬停点击(_H)"
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:71
msgid "Trigger a click when the pointer hovers"
msgstr "指针悬停时触发点击。"
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:72
msgid "D_elay:"
msgstr "延迟(_E)："
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:73
msgctxt "dwell click delay"
msgid "Short"
msgstr "短"
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:74
msgctxt "dwell click delay"
msgid "Long"
msgstr "长"
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:75
msgid "Motion _threshold:"
msgstr "运动阈值(_T)："
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:76
msgctxt "dwell click threshold"
msgid "Small"
msgstr "小"
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:77
msgctxt "dwell click threshold"
msgid "Large"
msgstr "大"
@@ -6047,17 +6168,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 +6200,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 +6253,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 +6348,34 @@ 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:2
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "修改需要重启会话才能生效"
+
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+msgid "Restart Now"
+msgstr "现在重启"
+
+#: ../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 +6459,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"
@@ -6335,8 +6468,10 @@ msgstr "请避免使用如 1234 或 abcd 的有规律序列。"
#: ../panels/user-accounts/pw-utils.c:115
msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "请使用更多字母、数字和符号。"
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr "请混用字母、数字和标点符号。"
#: ../panels/user-accounts/pw-utils.c:117
msgctxt "Password hint"
@@ -6346,39 +6481,8 @@ msgstr "密码需要大小写字母混用并试着使用一到两个数字。"
#: ../panels/user-accounts/pw-utils.c:119
msgctxt "Password hint"
msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
-msgstr "密码不错！增加更多字母、数字和标点可进一步提高密码强度。"
-
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "强度：较弱"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "强度：较低"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "强度：中等"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "强度：良好"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "强度：较高"
+"Adding more letters, numbers and punctuation will make the password stronger."
+msgstr "添加更多字母、数字和标点可进一步提高密码强度。"
#: ../panels/user-accounts/run-passwd.c:422
msgid "Authentication failed"
@@ -6433,47 +6537,47 @@ 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:462
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:717
+#: ../panels/user-accounts/um-account-dialog.c:763
+#: ../panels/user-accounts/um-account-dialog.c:784
msgid "Failed to register account"
-msgstr "注册用户失败"
+msgstr "注册帐号失败"
-#: ../panels/user-accounts/um-account-dialog.c:892
+#: ../panels/user-accounts/um-account-dialog.c:907
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:980
msgid "Failed to join domain"
msgstr "加入域失败"
-#: ../panels/user-accounts/um-account-dialog.c:1026
+#: ../panels/user-accounts/um-account-dialog.c:1041
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:1048
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:1056
msgid "Failed to log into domain"
msgstr "登录到域失败"
-#: ../panels/user-accounts/um-account-dialog.c:1099
-msgid "Unable find the domain. Maybe you misspelled it?"
-msgstr "找不到该域名，也许拼写有误？"
+#: ../panels/user-accounts/um-account-dialog.c:1114
+msgid "Unable to find the domain. Maybe you misspelled it?"
+msgstr "找不到该域。也许拼写有误？"
#: ../panels/user-accounts/um-account-type.c:34
msgctxt "Account type"
@@ -6485,63 +6589,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 +6654,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 +6699,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 +6713,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,42 +6731,42 @@ 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
+#: ../panels/user-accounts/um-password-dialog.c:144
msgid "Please choose another password."
msgstr "请选择另一个密码。"
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
msgid "Please type your current password again."
msgstr "请再次输入当前密码。"
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
msgid "Password could not be changed"
msgstr "无法更改密码"
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
msgid "The passwords do not match."
msgstr "密码不匹配。"
-#: ../panels/user-accounts/um-photo-dialog.c:214
+#: ../panels/user-accounts/um-photo-dialog.c:218
msgid "Browse for more pictures"
msgstr "浏览更多图片"
-#: ../panels/user-accounts/um-photo-dialog.c:448
+#: ../panels/user-accounts/um-photo-dialog.c:452
msgid "Disable image"
msgstr "禁用图像"
-#: ../panels/user-accounts/um-photo-dialog.c:466
+#: ../panels/user-accounts/um-photo-dialog.c:470
msgid "Take a photo…"
msgstr "拍张照片…"
-#: ../panels/user-accounts/um-photo-dialog.c:484
+#: ../panels/user-accounts/um-photo-dialog.c:488
msgid "Browse for more pictures…"
msgstr "浏览更多图片…"
-#: ../panels/user-accounts/um-photo-dialog.c:708
+#: ../panels/user-accounts/um-photo-dialog.c:714
#, c-format
msgid "Used by %s"
msgstr "已被 %s 使用"
@@ -6688,94 +6792,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 +6891,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 +6904,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,47 +6917,48 @@ 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
msgid "Map Buttons"
msgstr "映射按键"
+#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+msgid "_Close"
+msgstr "关闭(_C)"
+
#: ../panels/wacom/button-mapping.ui.h:3
msgid "Map buttons to functions"
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 +6968,63 @@ msgid ""
msgstr "请触摸屏幕上出现的标记以校准平板电脑。"
#: ../panels/wacom/calibrator/calibrator-gui.c:87
-msgid "Mis-click detected, restarting..."
-msgstr "检测到误点击，重新开始校准…"
-
-#: ../panels/wacom/cc-wacom-button-row.c:442
-msgctxt "Wacom tablet button"
-msgid "Up"
-msgstr "上键"
+msgid "Mis-click detected, restarting…"
+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:544
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,170 +7103,83 @@ 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:53 ../shell/alt/cc-window.c:1484
+#: ../shell/cc-window.c:755
msgid "All Settings"
msgstr "全部设置"
+#. Add categories
+#: ../shell/alt/cc-window.c:875
+msgctxt "category"
+msgid "Personal"
+msgstr "个人"
+
+#: ../shell/alt/cc-window.c:876
+msgctxt "category"
+msgid "Hardware"
+msgstr "硬件"
+
+#: ../shell/alt/cc-window.c:877
+msgctxt "category"
+msgid "System"
+msgstr "系统"
+
#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
msgid "GNOME Control Center"
msgstr "GNOME 控制中心"
@@ -7168,7 +7190,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 用于配置桌面各方面设置的主要界面。"
@@ -7212,22 +7234,6 @@ msgstr "帮助"
msgid "Quit"
msgstr "退出"
-#. Add categories
-#: ../shell/cc-window.c:871
-msgctxt "category"
-msgid "Personal"
-msgstr "个人"
-
-#: ../shell/cc-window.c:872
-msgctxt "category"
-msgid "Hardware"
-msgstr "硬件"
-
-#: ../shell/cc-window.c:873
-msgctxt "category"
-msgid "System"
-msgstr "系统"
-
#: ../shell/gnome-control-center.desktop.in.in.h:2
msgid "Preferences;Settings;"
msgstr "Preferences;Settings;首选项;设置;"
@@ -7269,10 +7275,396 @@ msgid "Hotspot"
msgstr "热点"
#: ../shell/panel-list.ui.h:3
-#, fuzzy
-#| msgid "No regions found"
msgid "No results found"
-msgstr "无可用区域"
+msgstr "未找到结果"
+
+#~ msgid "Apply"
+#~ msgstr "应用"
+
+#~ msgid "Lid Closed"
+#~ msgstr "上盖已合上"
+
+#~ msgid "Mirrored"
+#~ msgstr "镜像显示"
+
+#~ msgid "Primary"
+#~ msgstr "主显示器"
+
+#~ msgid "Secondary"
+#~ msgstr "副显示器"
+
+#~ msgid "Arrange Combined Displays"
+#~ msgstr "安排多个显示"
+
+#~ msgid "Drag displays to rearrange them"
+#~ msgstr "拖动以重新排列显示屏拖动以重新排列显示屏"
+
+#~ msgid "%d Hz (NTSC)"
+#~ msgstr "%d Hz (NTSC)"
+
+#~ msgid "%d Hz"
+#~ msgstr "%d Hz"
+
+#~ msgid "Rotate counterclockwise by 90°"
+#~ msgstr "逆时针旋转 90°"
+
+#~ msgid "Rotate by 180°"
+#~ msgstr "旋转 180°"
+
+#~ msgid "Rotate clockwise by 90°"
+#~ msgstr "顺时针旋转 90°"
+
+#~ msgid "Size"
+#~ msgstr "大小"
+
+#~ msgid "Aspect Ratio"
+#~ msgstr "宽高比"
+
+#~ msgid "Show the top bar and Activities Overview on this display"
+#~ msgstr "在此显示器上显示顶栏和活动概览"
+
+#~ msgid "Join this display with another to create an extra workspace"
+#~ msgstr "将该显示器与另一显示器合并以扩展工作空间"
+
+# 左撇子有歧视色彩。
+#~ msgid "Presentation"
+#~ msgstr "演示"
+
+#~ msgid "Show slideshows and media only"
+#~ msgstr "只显示幻灯片和多媒体"
+
+#~ msgid "Show your existing view on both displays"
+#~ msgstr "在两块显示器上同时显示当前视图"
+
+#~ msgid "Turn Off"
+#~ msgstr "关闭"
+
+#~ msgid "Don’t use this display"
+#~ msgstr "不使用该显示器"
+
+#~ msgid "_Arrange Combined Displays"
+#~ msgstr "安排多个显示(_A)"
+
+#~ msgid "Server"
+#~ msgstr "服务器"
+
+#~ msgid "Delete DNS Server"
+#~ msgstr "删除 DNS 服务器"
+
+#~ msgid "Reset"
+#~ msgstr "重置"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "对其他用户可用(_U)"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr "重置这个网络包括密码在内的设置，但仍作为首选连接"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr "删除关于这个网络的所有细节，不再尝试自动连接"
+
+#~ msgid "Proxy"
+#~ msgstr "代理"
+
+#~ msgid "_Add Profile…"
+#~ msgstr "添加配置(_A)…"
+
+#~ msgctxt "proxy method"
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgctxt "proxy method"
+#~ msgid "Manual"
+#~ msgstr "手动"
+
+#~ msgctxt "proxy method"
+#~ msgid "Automatic"
+#~ msgstr "自动"
+
+#~ msgid "Add Device"
+#~ msgstr "添加设备"
+
+#~ msgid "Remove Device"
+#~ msgstr "移除设备"
+
+#~ msgid "VPN Type"
+#~ msgstr "VPN 类型"
+
+#~ msgid "Group Name"
+#~ msgstr "组名"
+
+#~ msgid "Group Password"
+#~ msgstr "组密码"
+
+#~ msgid "_Use as Hotspot…"
+#~ msgstr "用作热点(_U)…"
+
+#~ msgid "_History"
+#~ msgstr "历史(_H)"
+
+#~ msgid "%s %d-bit (Build ID: %s)"
+#~ msgstr "%s %d 位（构建 ID：%s）"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d 位"
+
+#~ msgid "Base system"
+#~ msgstr "基本系统"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr "Shortcut;Repeat;Blink;快捷键;重复;闪烁;"
+
+#~ msgid "Press Esc to cancel."
+#~ msgstr "按 Esc 键取消。"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "防火墙区域(_Z)"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "默认"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "此区域定义了对连接的信任级别"
+
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "如果有无线网络以外的方式连接互联网，您可以配置无线热点并与他人共享网络连"
+#~ "接。"
+
+#~ msgid "History"
+#~ msgstr "历史"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "Loading options…"
+#~ msgstr "正在载入选项…"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "请使用更多字母、数字和符号。"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "强度：较弱"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "强度：较低"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "强度：中等"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "强度：良好"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ 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 "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 +7673,6 @@ msgstr "无可用区域"
#~ msgid "Set Shortcut"
#~ msgstr "设置快捷键"
-#~ msgid "_Unlock"
-#~ msgstr "解锁(_U)"
-
#~ msgid "Color"
#~ msgstr "色彩"
@@ -7440,12 +7829,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 +7838,6 @@ msgstr "无可用区域"
#~ msgid "Time _Zone"
#~ msgstr "时区(_Z)"
-#~ msgid "Active Jobs"
-#~ msgstr "活动的任务"
-
#~ msgid "Close"
#~ msgstr "关闭"
@@ -7467,9 +7847,6 @@ msgstr "无可用区域"
#~ msgid "Pause Printing"
#~ msgstr "暂停打印"
-#~ msgid "Cancel Print Job"
-#~ msgstr "取消打印任务"
-
#~ msgctxt "print job"
#~ msgid "Held"
#~ msgstr "挂起"
@@ -7585,9 +7962,6 @@ msgstr "无可用区域"
#~ msgid "When battery power is _critical"
#~ msgstr "电量严重不足时(_C)"
-#~ msgid "Power Off"
-#~ msgstr "电源关闭"
-
#~ msgid "Power off"
#~ msgstr "电源关闭"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
