[gnome-control-center] update Simplified Chinese (zh_CN) translation
- From: YunQiang Su <yqsu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] update Simplified Chinese (zh_CN) translation
- Date: Thu, 6 Jun 2013 03:37:30 +0000 (UTC)
commit 830e17415c8b0259aa03aad491eab24357687df2
Author: Wylmer Wang <wantinghard gmail com>
Date: Thu Jun 6 11:37:13 2013 +0800
update Simplified Chinese (zh_CN) translation
po/zh_CN.po | 1377 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 862 insertions(+), 515 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 22e9c9d..6195cbb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -27,8 +27,8 @@ msgstr ""
"Project-Id-Version: gnome-control-center master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-08 04:04+0000\n"
-"PO-Revision-Date: 2013-03-12 14:38+0800\n"
+"POT-Creation-Date: 2013-06-05 16:30+0000\n"
+"PO-Revision-Date: 2013-05-12 14:38+0800\n"
"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"Language: zh_CN\n"
@@ -74,27 +74,41 @@ msgid "Span"
msgstr "适合宽度"
#. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:199
+#: ../panels/background/cc-background-chooser-dialog.c:300
msgid "Select Background"
msgstr "选择背景"
-#: ../panels/background/cc-background-chooser-dialog.c:218
+#: ../panels/background/cc-background-chooser-dialog.c:319
msgid "Wallpapers"
msgstr "壁纸"
-#: ../panels/background/cc-background-chooser-dialog.c:227
+#: ../panels/background/cc-background-chooser-dialog.c:328
msgid "Pictures"
msgstr "图片"
-#: ../panels/background/cc-background-chooser-dialog.c:235
+#: ../panels/background/cc-background-chooser-dialog.c:336
msgid "Colors"
msgstr "色彩"
-#: ../panels/background/cc-background-chooser-dialog.c:244
+#: ../panels/background/cc-background-chooser-dialog.c:345
msgid "Flickr"
msgstr "Flickr"
-#: ../panels/background/cc-background-chooser-dialog.c:286
+#. translators: No pictures were found
+#: ../panels/background/cc-background-chooser-dialog.c:400
+#, fuzzy
+#| msgid "No input sources found"
+msgid "No Pictures Found"
+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:415
+#, c-format
+msgid "You can add images to your %s folder and they will show up here"
+msgstr ""
+
+#: ../panels/background/cc-background-chooser-dialog.c:444
#: ../panels/printers/ppd-selection-dialog.ui.h:3
#: ../panels/user-accounts/data/photo-dialog.ui.h:9
#: ../panels/user-accounts/um-photo-dialog.c:98
@@ -116,7 +130,7 @@ msgstr "%d × %d"
msgid "No Desktop Background"
msgstr "无桌面背景"
-#: ../panels/background/cc-background-panel.c:453
+#: ../panels/background/cc-background-panel.c:460
msgid "Current background"
msgstr "当前背景"
@@ -163,7 +177,7 @@ msgstr "第 2 页"
msgid "Paired"
msgstr "已配对"
-#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:842
msgid "Type"
msgstr "类型"
@@ -192,43 +206,43 @@ msgstr "键盘设置"
msgid "Send Files…"
msgstr "发送文件…"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/bluetooth/cc-bluetooth-panel.c:358
#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
msgid "Yes"
msgstr "是"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/bluetooth/cc-bluetooth-panel.c:358
#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
msgid "No"
msgstr "否"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:469
+#: ../panels/bluetooth/cc-bluetooth-panel.c:472
msgid "Bluetooth is disabled"
msgstr "蓝牙已禁用"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:474
+#: ../panels/bluetooth/cc-bluetooth-panel.c:477
msgid "Bluetooth is disabled by hardware switch"
msgstr "蓝牙已通过硬件开关禁用"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:478
+#: ../panels/bluetooth/cc-bluetooth-panel.c:481
msgid "No Bluetooth adapters found"
msgstr "未找到蓝牙适配器"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:577
+#: ../panels/bluetooth/cc-bluetooth-panel.c:580
msgid "Visibility"
msgstr "可见性"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:581
+#: ../panels/bluetooth/cc-bluetooth-panel.c:584
#, c-format
msgid "Visibility of “%s”"
msgstr "“%s”的可见性"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:625
+#: ../panels/bluetooth/cc-bluetooth-panel.c:628
#, c-format
msgid "Remove '%s' from the list of devices?"
msgstr "将“%s”从设备列表中移除吗？"
-#: ../panels/bluetooth/cc-bluetooth-panel.c:627
+#: ../panels/bluetooth/cc-bluetooth-panel.c:630
msgid ""
"If you remove the device, you will have to set it up again before next use."
msgstr "如果您移除该设备，下次使用前您需要重新设置它。"
@@ -374,70 +388,95 @@ msgstr "未校准"
#. TRANSLATORS: this is a profile prefix to signify the
#. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:133
+#: ../panels/color/cc-color-panel.c:136
msgid "Default: "
msgstr "默认："
#. TRANSLATORS: this is a profile prefix to signify the
#. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:141
+#: ../panels/color/cc-color-panel.c:144
msgid "Colorspace: "
msgstr "色彩空间："
#. TRANSLATORS: this is a profile prefix to signify the
#. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:148
+#: ../panels/color/cc-color-panel.c:151
msgid "Test profile: "
msgstr "测试配置："
#. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:216
+#: ../panels/color/cc-color-panel.c:219
msgid "Select ICC Profile File"
msgstr "选择 ICC 配置文件"
-#: ../panels/color/cc-color-panel.c:219
+#: ../panels/color/cc-color-panel.c:222
msgid "_Import"
msgstr "导入(_I)"
#. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:230
+#: ../panels/color/cc-color-panel.c:233
msgid "Supported ICC profiles"
msgstr "支持的 ICC 配置"
#. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:237
+#: ../panels/color/cc-color-panel.c:240
#: ../panels/network/wireless-security/eap-method-fast.c:410
msgid "All files"
msgstr "所有文件"
-#: ../panels/color/cc-color-panel.c:581
+#: ../panels/color/cc-color-panel.c:587
msgid "Screen"
msgstr "屏幕"
+#. TRANSLATORS: this is when the upload of the profile failed
+#: ../panels/color/cc-color-panel.c:913
+#, c-format
+msgid "Failed to upload file: %s"
+msgstr "上传文件失败：%s"
+
+#. TRANSLATORS: these are instructions on how to recover
+#. * the ICC profile on the native operating system and are
+#. * only shown when the user uses a LiveCD to calibrate
+#: ../panels/color/cc-color-panel.c:927
+msgid "The profile has been uploaded to:"
+msgstr "配置已上传到："
+
+#: ../panels/color/cc-color-panel.c:929
+msgid "Write down this URL."
+msgstr "请记下此 URL。"
+
+#: ../panels/color/cc-color-panel.c:930
+msgid "Restart this computer and boot your normal operating system."
+msgstr "重启此计算机并启动您平时用的操作系统。"
+
+#: ../panels/color/cc-color-panel.c:931
+msgid "Type the URL into your browser to download and install the profile."
+msgstr "在浏览器中输入该 URL 来下载和安装该配置。"
+
#. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:853
+#: ../panels/color/cc-color-panel.c:965
msgid "Save Profile"
msgstr "保存配置"
#. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1214
+#: ../panels/color/cc-color-panel.c:1326
msgid "Create a color profile for the selected device"
msgstr "为所选设备创建一份色彩配置"
#. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
+#: ../panels/color/cc-color-panel.c:1341 ../panels/color/cc-color-panel.c:1365
msgid ""
"The measuring instrument is not detected. Please check it is turned on and "
"correctly connected."
msgstr "没有检测到测量仪器。请检查它是否打开和正确连接。"
#. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1263
+#: ../panels/color/cc-color-panel.c:1375
msgid "The measuring instrument does not support printer profiling."
msgstr "测量仪器不支持打印机校正。"
#. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1274
+#: ../panels/color/cc-color-panel.c:1386
msgid "The device type is not currently supported."
msgstr "目前不支持该设备类型。"
@@ -525,7 +564,7 @@ msgstr "显示校准"
#: ../panels/printers/authentication-dialog.ui.h:2
#: ../panels/printers/ppd-selection-dialog.ui.h:2
#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1067
+#: ../panels/user-accounts/um-account-dialog.c:1407
msgid "Cancel"
msgstr "取消"
@@ -544,8 +583,11 @@ msgstr "恢复"
msgid "Done"
msgstr "完成"
+#. Timeout parameters
+#. 5000 = 5 sec
+#. 750 = 0.75 sec
#. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/gui_gtk.c:78
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
msgid "Screen Calibration"
msgstr "屏幕校准"
@@ -637,10 +679,22 @@ msgid "Profile successfully created!"
msgstr "配置成功创建！"
#: ../panels/color/color.ui.h:22
-msgid "Export"
-msgstr "导出"
+msgid "Copy profile"
+msgstr "复制配置"
#: ../panels/color/color.ui.h:23
+msgid "Requires writable media"
+msgstr "需要有可写的媒体"
+
+#: ../panels/color/color.ui.h:24
+msgid "Upload profile"
+msgstr "上传配置"
+
+#: ../panels/color/color.ui.h:25
+msgid "Requires Internet connection"
+msgstr "需要互联网连接"
+
+#: ../panels/color/color.ui.h:26
msgid ""
"You may find these instructions on how to use the profile on <a href=\"linux"
"\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
@@ -650,157 +704,177 @@ msgstr ""
"和 <a href=\"windows\">Microsoft Windows</a> 系统中使用个人资料的这些说明可能"
"对您有所帮助。"
-#: ../panels/color/color.ui.h:24
+#: ../panels/color/color.ui.h:27
#: ../panels/user-accounts/um-fingerprint-dialog.c:743
msgid "Summary"
msgstr "摘要"
-#: ../panels/color/color.ui.h:25
+#: ../panels/color/color.ui.h:28
msgid "Import File…"
msgstr "导入文件…"
-#: ../panels/color/color.ui.h:26
+#: ../panels/color/color.ui.h:29
msgid ""
"Problems detected. The profile may not work correctly. <a href=\"\">Show "
"details.</a>"
msgstr "探测到问题。此配置可能无法正常工作。<a href=\"\">显示详细信息。</a>"
-#: ../panels/color/color.ui.h:27
+#: ../panels/color/color.ui.h:30
msgid "Device type:"
msgstr "设备类型："
-#: ../panels/color/color.ui.h:28
+#: ../panels/color/color.ui.h:31
msgid "Manufacturer:"
msgstr "厂商："
-#: ../panels/color/color.ui.h:29
+#: ../panels/color/color.ui.h:32
msgid "Model:"
msgstr "型号："
-#: ../panels/color/color.ui.h:30
+#: ../panels/color/color.ui.h:33
msgid ""
"Image files can be dragged on this window to auto-complete the above fields."
msgstr "可以将图像文件拖放到此窗口来自动填写以上字段。"
-#: ../panels/color/color.ui.h:31
+#: ../panels/color/color.ui.h:34
#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
msgid "Color"
msgstr "色彩"
-#: ../panels/color/color.ui.h:32
+#: ../panels/color/color.ui.h:35
msgid "Each device needs an up to date color profile to be color managed."
msgstr "每个设备需要一份最新的色彩配置以进行色彩管理。"
-#: ../panels/color/color.ui.h:33
+#: ../panels/color/color.ui.h:36
msgid "Learn more"
msgstr "了解更多"
-#: ../panels/color/color.ui.h:34
+#: ../panels/color/color.ui.h:37
msgid "Learn more about color management"
msgstr "了解更多有关色彩管理的信息"
-#: ../panels/color/color.ui.h:35
+#: ../panels/color/color.ui.h:38
msgid "Set for all users"
msgstr "为所有用户设置"
-#: ../panels/color/color.ui.h:36
+#: ../panels/color/color.ui.h:39
msgid "Set this profile for all users on this computer"
msgstr "为此计算机上的所有用户设置此配置"
-#: ../panels/color/color.ui.h:37
+#: ../panels/color/color.ui.h:40
msgid "Enable"
msgstr "启用"
-#: ../panels/color/color.ui.h:38
+#: ../panels/color/color.ui.h:41
msgid "Add profile"
msgstr "添加配置"
-#: ../panels/color/color.ui.h:39
+#: ../panels/color/color.ui.h:42
#: ../panels/wacom/gnome-wacom-properties.ui.h:10
msgid "Calibrate…"
msgstr "校准..."
-#: ../panels/color/color.ui.h:40
+#: ../panels/color/color.ui.h:43
msgid "Calibrate the device"
msgstr "校准该设备"
-#: ../panels/color/color.ui.h:41
+#: ../panels/color/color.ui.h:44
msgid "Remove profile"
msgstr "移除配置"
-#: ../panels/color/color.ui.h:42
+#: ../panels/color/color.ui.h:45
msgid "View details"
msgstr "查看详情"
-#: ../panels/color/color.ui.h:43
+#: ../panels/color/color.ui.h:46
msgid "Unable to detect any devices that can be color managed"
msgstr "无法检测到可以管理颜色的设备"
-#: ../panels/color/color.ui.h:44
+#: ../panels/color/color.ui.h:47
msgid "LCD"
msgstr "LCD"
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:48
msgid "LED"
msgstr "LED"
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:49
msgid "CRT"
msgstr "CRT"
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:50
msgid "Projector"
msgstr "投影仪"
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:51
msgid "Plasma"
msgstr "等离子"
-#: ../panels/color/color.ui.h:49
+#: ../panels/color/color.ui.h:52
+msgid "LCD (CCFL backlight)"
+msgstr "LCD (CCFL 背光)"
+
+#: ../panels/color/color.ui.h:53
+msgid "LCD (RGB LED backlight)"
+msgstr "LCD (RGB LED 背光)"
+
+#: ../panels/color/color.ui.h:54
+msgid "LCD (white LED backlight)"
+msgstr "LCD (白色 LED 背光)"
+
+#: ../panels/color/color.ui.h:55
+msgid "Wide gamut LCD (CCFL backlight)"
+msgstr "宽色域 LCD (CCFL 背光)"
+
+#: ../panels/color/color.ui.h:56
+msgid "Wide gamut LCD (RGB LED backlight)"
+msgstr "宽色域 LCD (RGB LED 背光)"
+
+#: ../panels/color/color.ui.h:57
msgctxt "Calibration quality"
msgid "High"
msgstr "高"
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:58
msgid "40 minutes"
msgstr "40 分钟"
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:59
msgctxt "Calibration quality"
msgid "Medium"
msgstr "中"
-#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4
#: ../panels/privacy/privacy.ui.h:7
msgid "30 minutes"
msgstr "30 分钟"
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:61
msgctxt "Calibration quality"
msgid "Low"
msgstr "低"
-#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3
msgid "15 minutes"
msgstr "15 分钟"
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:63
msgid "Native to display"
msgstr "原生显示"
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:64
msgid "D50 (Printing and publishing)"
msgstr "D50 (打印和出版)"
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:65
msgid "D55"
msgstr "D55"
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:66
msgid "D65 (Photography and graphics)"
msgstr "D65 (摄影及图像)"
-#: ../panels/color/color.ui.h:59
+#: ../panels/color/color.ui.h:67
msgid "D75"
msgstr "D75"
@@ -816,132 +890,40 @@ msgstr ""
"颜色;色彩;配置;校准;打印机;显示;Color;ICC;Profile;Calibrate;Printer;Display;"
#. Add some common regions
-#: ../panels/common/cc-common-language.c:677
+#: ../panels/common/cc-common-language.c:682
msgid "United States"
msgstr "美国"
-#: ../panels/common/cc-common-language.c:678
+#: ../panels/common/cc-common-language.c:683
msgid "Germany"
msgstr "德国"
-#: ../panels/common/cc-common-language.c:679
+#: ../panels/common/cc-common-language.c:684
msgid "France"
msgstr "法国"
-#: ../panels/common/cc-common-language.c:680
+#: ../panels/common/cc-common-language.c:685
msgid "Spain"
msgstr "西班牙"
-#: ../panels/common/cc-common-language.c:681
+#: ../panels/common/cc-common-language.c:686
msgid "China"
msgstr "中国"
-#: ../panels/common/cc-common-language.c:747
+#: ../panels/common/cc-common-language.c:752
msgid "Other…"
msgstr "其他…"
-#: ../panels/common/cc-language-chooser.c:176
+#: ../panels/common/cc-language-chooser.c:121
#: ../panels/region/cc-format-chooser.c:266
-#: ../panels/region/cc-input-chooser.c:172
+#: ../panels/region/cc-input-chooser.c:171
msgid "More…"
msgstr "更多…"
-#: ../panels/common/cc-language-chooser.c:193
+#: ../panels/common/cc-language-chooser.c:138
msgid "No languages found"
msgstr "未找到语言"
-#. translators:
-#. * The device has been disabled
-#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:408
-#: ../panels/keyboard/keyboard-shortcuts.c:1160
-#: ../panels/network/network-wifi.ui.h:29
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "禁用"
-
-#: ../panels/common/cc-util.c:29
-msgid "Left Shift"
-msgstr "左 Shift"
-
-#: ../panels/common/cc-util.c:30
-msgid "Left Alt"
-msgstr "左 Alt"
-
-#: ../panels/common/cc-util.c:31
-msgid "Left Ctrl"
-msgstr "左 Ctrl"
-
-#: ../panels/common/cc-util.c:32
-msgid "Right Shift"
-msgstr "右 Shift"
-
-#: ../panels/common/cc-util.c:33
-msgid "Right Alt"
-msgstr "右 Alt"
-
-#: ../panels/common/cc-util.c:34
-msgid "Right Ctrl"
-msgstr "右 Ctrl"
-
-#: ../panels/common/cc-util.c:35
-msgid "Left Alt+Shift"
-msgstr "左 Alt+Shift"
-
-#: ../panels/common/cc-util.c:36
-msgid "Right Alt+Shift"
-msgstr "右 Alt+Shift"
-
-#: ../panels/common/cc-util.c:37
-msgid "Left Ctrl+Shift"
-msgstr "左 Ctrl+Shift"
-
-#: ../panels/common/cc-util.c:38
-msgid "Right Ctrl+Shift"
-msgstr "右 Ctrl+Shift"
-
-#: ../panels/common/cc-util.c:39
-msgid "Left+Right Shift"
-msgstr "左+右 Shift"
-
-#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
-msgid "Left+Right Alt"
-msgstr "左+右 Alt"
-
-#: ../panels/common/cc-util.c:41
-msgid "Left+Right Ctrl"
-msgstr "左+右 Ctrl"
-
-#: ../panels/common/cc-util.c:42
-msgid "Alt+Shift"
-msgstr "Ctrl+Alt+Shift+Space"
-
-#: ../panels/common/cc-util.c:43
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Alt+Shift+Space"
-
-#: ../panels/common/cc-util.c:44
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
-
-#: ../panels/common/cc-util.c:45
-msgid "Caps"
-msgstr "Caps"
-
-#: ../panels/common/cc-util.c:46
-msgid "Shift+Caps"
-msgstr "Shift+Caps"
-
-#: ../panels/common/cc-util.c:47
-msgid "Alt+Caps"
-msgstr "Alt+Caps"
-
-#: ../panels/common/cc-util.c:48
-msgid "Ctrl+Caps"
-msgstr "Ctrl+Caps"
-
#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
msgid "Language"
msgstr "语言"
@@ -1192,53 +1174,53 @@ msgstr ""
"新;"
#. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127
msgid "Unknown"
msgstr "未知"
-#: ../panels/info/cc-info-panel.c:541
+#: ../panels/info/cc-info-panel.c:532
#, c-format
msgid "%s %d-bit"
msgstr "%s %d 位"
-#: ../panels/info/cc-info-panel.c:543
+#: ../panels/info/cc-info-panel.c:534
#, c-format
msgid "%d-bit"
msgstr "%d 位"
-#: ../panels/info/cc-info-panel.c:1218
+#: ../panels/info/cc-info-panel.c:1209
msgid "Ask what to do"
msgstr "询问如何处理"
-#: ../panels/info/cc-info-panel.c:1222
+#: ../panels/info/cc-info-panel.c:1213
msgid "Do nothing"
msgstr "不处理"
-#: ../panels/info/cc-info-panel.c:1226
+#: ../panels/info/cc-info-panel.c:1217
msgid "Open folder"
msgstr "打开文件夹"
-#: ../panels/info/cc-info-panel.c:1317
+#: ../panels/info/cc-info-panel.c:1308
msgid "Other Media"
msgstr "其他媒体"
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1339
msgid "Select an application for audio CDs"
msgstr "选择播放音频 CD 的应用程序"
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1340
msgid "Select an application for video DVDs"
msgstr "选择播放视频 DVD 的应用程序"
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1341
msgid "Select an application to run when a music player is connected"
msgstr "选择要在连接音乐播放器后运行的应用程序"
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1342
msgid "Select an application to run when a camera is connected"
msgstr "选择要在连接相机后运行的应用程序"
-#: ../panels/info/cc-info-panel.c:1352
+#: ../panels/info/cc-info-panel.c:1343
msgid "Select an application for software CDs"
msgstr "选择要在插入软件 CD 时运行的应用程序"
@@ -1247,90 +1229,90 @@ msgstr "选择要在插入软件 CD 时运行的应用程序"
#. * If the shared-mime-info translation works for your language,
#. * simply leave these untranslated.
#.
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1355
msgid "audio DVD"
msgstr "音频 DVD"
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1356
msgid "blank Blu-ray disc"
msgstr "空白蓝光光盘"
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1357
msgid "blank CD disc"
msgstr "空白 CD 光盘"
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1358
msgid "blank DVD disc"
msgstr "空白 DVD 光盘"
# 空白 HD DVD 光盘
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1359
msgid "blank HD DVD disc"
msgstr "空白 HD DVD 光盘"
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1360
msgid "Blu-ray video disc"
msgstr "蓝光视频光盘"
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1361
msgid "e-book reader"
msgstr "电子书阅读器"
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1362
msgid "HD DVD video disc"
msgstr "HD DVD 视频光盘"
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1363
msgid "Picture CD"
msgstr "图片 CD"
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1364
msgid "Super Video CD"
msgstr "超级 VCD"
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1365
msgid "Video CD"
msgstr "视频 CD"
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1366
msgid "Windows software"
msgstr "Windows 软件"
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1367
msgid "Software"
msgstr "软件"
-#: ../panels/info/cc-info-panel.c:1499
-#: ../panels/keyboard/keyboard-shortcuts.c:1697
+#: ../panels/info/cc-info-panel.c:1490
+#: ../panels/keyboard/keyboard-shortcuts.c:1696
msgid "Section"
msgstr "节"
-#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1499 ../panels/info/info.ui.h:13
msgid "Overview"
msgstr "总览"
-#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1505 ../panels/info/info.ui.h:20
msgid "Default Applications"
msgstr "默认应用程序"
-#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:28
msgid "Removable Media"
msgstr "可移动介质"
-#: ../panels/info/cc-info-panel.c:1544
+#: ../panels/info/cc-info-panel.c:1535
#, c-format
msgid "Version %s"
msgstr "版本 %s"
-#: ../panels/info/cc-info-panel.c:1594
+#: ../panels/info/cc-info-panel.c:1585
msgid "Install Updates"
msgstr "安装更新"
-#: ../panels/info/cc-info-panel.c:1598
+#: ../panels/info/cc-info-panel.c:1589
msgid "System Up-To-Date"
msgstr "系统已是最新"
-#: ../panels/info/cc-info-panel.c:1602
+#: ../panels/info/cc-info-panel.c:1593
msgid "Checking for Updates"
msgstr "正在检查更新"
@@ -1620,15 +1602,35 @@ msgstr "减小文本字号"
msgid "High contrast on or off"
msgstr "高对比度开或关"
-#: ../panels/keyboard/cc-keyboard-option.c:362
+#. translators:
+#. * The device has been disabled
+#: ../panels/keyboard/cc-keyboard-option.c:271
+#: ../panels/keyboard/cc-keyboard-option.c:390
+#: ../panels/keyboard/keyboard-shortcuts.c:1159
+#: ../panels/network/network-wifi.ui.h:29
+#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "禁用"
+
+#. Translators: This key is also known as 'third level
+#. * chooser'. AltGr is often used for this purpose. See
+#. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
+#.
+#: ../panels/keyboard/cc-keyboard-option.c:349
msgid "Alternative Characters Key"
msgstr "替代的字符键"
-#: ../panels/keyboard/cc-keyboard-option.c:367
+#. Translators: The Compose key is used to initiate key
+#. * sequences that are combined to form a single character.
+#. * See http://en.wikipedia.org/wiki/Compose_key
+#.
+#: ../panels/keyboard/cc-keyboard-option.c:358
msgid "Compose Key"
msgstr "组合键"
-#: ../panels/keyboard/cc-keyboard-option.c:371
+#: ../panels/keyboard/cc-keyboard-option.c:363
#, fuzzy
msgid "Modifiers-only switch to next source"
msgstr "修饰键仅切换至下个源"
@@ -1749,7 +1751,7 @@ msgstr "自定义快捷键"
msgid "<Unknown Action>"
msgstr "<未知动作>"
-#: ../panels/keyboard/keyboard-shortcuts.c:1301
+#: ../panels/keyboard/keyboard-shortcuts.c:1300
#, c-format
msgid ""
"The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1759,7 +1761,7 @@ msgstr ""
"“%s”不能用作快捷键，因为使用此键将无法正常输入。\n"
"请组合 Ctrl、Alt 或 Shift 键再试一次"
-#: ../panels/keyboard/keyboard-shortcuts.c:1333
+#: ../panels/keyboard/keyboard-shortcuts.c:1332
#, c-format
msgid ""
"The shortcut \"%s\" is already used for\n"
@@ -1768,17 +1770,17 @@ msgstr ""
"快捷键“%s”已被用于\n"
"“%s”"
-#: ../panels/keyboard/keyboard-shortcuts.c:1338
+#: ../panels/keyboard/keyboard-shortcuts.c:1337
#, c-format
msgid ""
"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
msgstr "如果你重新分配快捷键 %s，则快捷键 %s 将被禁用"
-#: ../panels/keyboard/keyboard-shortcuts.c:1344
+#: ../panels/keyboard/keyboard-shortcuts.c:1343
msgid "_Reassign"
msgstr "重新分配(_R)"
-#: ../panels/mouse/cc-mouse-panel.c:123
+#: ../panels/mouse/cc-mouse-panel.c:94
msgid "Test Your _Settings"
msgstr "测试您的设置(_S)"
@@ -1807,7 +1809,7 @@ msgid "General"
msgstr "常规"
#: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgctxt "mouse, speed"
+msgctxt "double click, speed"
msgid "Slow"
msgstr "慢"
@@ -1816,7 +1818,7 @@ msgid "Double-click timeout"
msgstr "双击超时"
#: ../panels/mouse/gnome-mouse-properties.ui.h:5
-msgctxt "mouse, speed"
+msgctxt "double click, speed"
msgid "Fast"
msgstr "快"
@@ -1847,76 +1849,101 @@ msgid "_Pointer speed"
msgstr "指针速度(_P)"
#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+msgctxt "mouse pointer, speed"
+msgid "Slow"
+msgstr "慢"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+msgctxt "mouse pointer, speed"
+msgid "Fast"
+msgstr "快"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
msgid "Touchpad"
msgstr "触摸板"
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+msgctxt "touchpad pointer, speed"
+msgid "Slow"
+msgstr "慢"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+msgctxt "touchpad pointer, speed"
+msgid "Fast"
+msgstr "快"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
msgid "Disable while _typing"
msgstr "打字时禁用(_T)"
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
msgid "Tap to _click"
msgstr "轻触表示点击(_C)"
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:19
msgid "Two _finger scroll"
msgstr "双指滚动(_F)"
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:20
#, fuzzy
msgid "C_ontent sticks to fingers"
msgstr "内容吸附手指(_O)"
-#: ../panels/mouse/gnome-mouse-test.c:134
+#: ../panels/mouse/gnome-mouse-test.c:132
#: ../panels/mouse/gnome-mouse-test.ui.h:1
msgid "Try clicking, double clicking, scrolling"
msgstr "尝试单击，双击，滚动"
-#: ../panels/mouse/gnome-mouse-test.c:139
+#: ../panels/mouse/gnome-mouse-test.c:137
msgid "Five clicks, GEGL time!"
msgstr ""
-#: ../panels/mouse/gnome-mouse-test.c:144
+#: ../panels/mouse/gnome-mouse-test.c:142
msgid "Double click, primary button"
msgstr "双击，主键"
-#: ../panels/mouse/gnome-mouse-test.c:144
+#: ../panels/mouse/gnome-mouse-test.c:142
msgid "Single click, primary button"
msgstr "单击，主键"
-#: ../panels/mouse/gnome-mouse-test.c:147
+#: ../panels/mouse/gnome-mouse-test.c:145
msgid "Double click, middle button"
msgstr "双击，中键"
-#: ../panels/mouse/gnome-mouse-test.c:147
+#: ../panels/mouse/gnome-mouse-test.c:145
msgid "Single click, middle button"
msgstr "单击，中键"
-#: ../panels/mouse/gnome-mouse-test.c:150
+#: ../panels/mouse/gnome-mouse-test.c:148
msgid "Double click, secondary button"
msgstr "双击，次键"
-#: ../panels/mouse/gnome-mouse-test.c:150
+#: ../panels/mouse/gnome-mouse-test.c:148
msgid "Single click, secondary button"
msgstr "单击，次键"
#. TRANSLATORS: this is to disable the radio hardware in the
#. * network panel
-#: ../panels/network/cc-network-panel.c:347
+#: ../panels/network/cc-network-panel.c:364
msgid "Air_plane Mode"
msgstr "飞行模式(_P)"
-#: ../panels/network/cc-network-panel.c:912
+#: ../panels/network/cc-network-panel.c:927
msgid "Network proxy"
msgstr "网络代理"
-#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:280
+#. Translators: this is the title of the connection details
+#. * window for vpn connections, it is also used to display
+#. * vpn connections in the device list.
+#.
+#: ../panels/network/cc-network-panel.c:1106 ../panels/network/net-vpn.c:285
+#: ../panels/network/net-vpn.c:438
#, c-format
msgid "%s VPN"
msgstr "%s VPN"
#. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:1225
+#: ../panels/network/cc-network-panel.c:1241
msgid "The system network services are not compatible with this version."
msgstr "系统的网络服务与此版本的网络管理器不兼容。"
@@ -1944,7 +1971,7 @@ msgstr "内部认证(_A)"
msgid "Security"
msgstr "安全性"
-#: ../panels/network/connection-editor/ce-page.c:502
+#: ../panels/network/connection-editor/ce-page.c:507
msgid "automatic"
msgstr "自动"
@@ -1988,12 +2015,12 @@ msgid "Never"
msgstr "从不"
#: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:770
+#: ../panels/user-accounts/um-utils.c:787
msgid "Today"
msgstr "今天"
#: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:773
+#: ../panels/user-accounts/um-utils.c:790
msgid "Yesterday"
msgstr "昨天"
@@ -2043,9 +2070,9 @@ msgctxt "Signal strength"
msgid "Excellent"
msgstr "良好"
-#: ../panels/network/connection-editor/ce-page-ethernet.c:200
-#: ../panels/network/connection-editor/ce-page-vpn.c:172
-#: ../panels/network/connection-editor/ce-page-wifi.c:243
+#: ../panels/network/connection-editor/ce-page-ethernet.c:213
+#: ../panels/network/connection-editor/ce-page-vpn.c:204
+#: ../panels/network/connection-editor/ce-page-wifi.c:255
#: ../panels/network/network-wifi.ui.h:45
msgid "Identity"
msgstr "认证"
@@ -2285,17 +2312,34 @@ msgid "_Cloned Address"
msgstr "克隆的地址"
#: ../panels/network/connection-editor/ethernet-page.ui.h:14
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Connect _automatically"
-msgstr "自动连接(_A)"
+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/ethernet-page.ui.h:16
-msgid "bytes"
-msgstr "字节"
+#: ../panels/network/connection-editor/wifi-page.ui.h:7
+msgid "Connect _automatically"
+msgstr "自动连接(_A)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:17
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: ../panels/network/connection-editor/wifi-page.ui.h:8
+msgid "Firewall _Zone"
+msgstr "防火墙区域(_Z)"
+
+#: ../panels/network/connection-editor/firewall-helpers.c:48
+#: ../panels/network/connection-editor/firewall-helpers.c:112
+msgctxt "Firewall zone"
+msgid "Default"
+msgstr "默认"
+
+#: ../panels/network/connection-editor/firewall-helpers.c:49
+msgid "The zone defines the trust level of the connection"
+msgstr "此区域定义了对连接的信任级别"
#: ../panels/network/connection-editor/ip4-page.ui.h:1
#: ../panels/network/network-wifi.ui.h:22
@@ -2339,42 +2383,42 @@ msgstr "IPv_6"
msgid "Unable to open connection editor"
msgstr "蓝牙连接失败"
-#: ../panels/network/connection-editor/net-connection-editor.c:283
+#: ../panels/network/connection-editor/net-connection-editor.c:286
msgid "New Profile"
msgstr "无配置"
-#: ../panels/network/connection-editor/net-connection-editor.c:505
+#: ../panels/network/connection-editor/net-connection-editor.c:511
#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1068
+#: ../panels/user-accounts/um-account-dialog.c:1408
msgid "_Add"
msgstr "添加(_A)"
-#: ../panels/network/connection-editor/net-connection-editor.c:587
+#: ../panels/network/connection-editor/net-connection-editor.c:593
#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
msgid "VPN"
msgstr "VPN"
-#: ../panels/network/connection-editor/net-connection-editor.c:588
+#: ../panels/network/connection-editor/net-connection-editor.c:594
msgid "Bond"
msgstr "绑定"
-#: ../panels/network/connection-editor/net-connection-editor.c:589
+#: ../panels/network/connection-editor/net-connection-editor.c:595
msgid "Bridge"
msgstr "桥接"
-#: ../panels/network/connection-editor/net-connection-editor.c:590
+#: ../panels/network/connection-editor/net-connection-editor.c:596
msgid "VLAN"
msgstr "虚拟局域网"
-#: ../panels/network/connection-editor/net-connection-editor.c:740
+#: ../panels/network/connection-editor/net-connection-editor.c:746
msgid "Could not load VPN plugins"
msgstr "无法装入 VPN 插件"
-#: ../panels/network/connection-editor/net-connection-editor.c:804
+#: ../panels/network/connection-editor/net-connection-editor.c:810
msgid "Import from file…"
msgstr "从文件导入..."
-#: ../panels/network/connection-editor/net-connection-editor.c:871
+#: ../panels/network/connection-editor/net-connection-editor.c:877
msgid "Add Network Connection"
msgstr "添加网络连接"
@@ -2459,7 +2503,7 @@ msgstr ""
msgid "Export VPN connection..."
msgstr "导出 VPN 连接..."
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: ../panels/network/connection-editor/vpn-page.ui.h:4
msgid "(Error: unable to load VPN connection editor)"
msgstr "(错误：无法载入 VPN 连接编辑器)"
@@ -2478,7 +2522,7 @@ msgstr "_BSSID"
msgid "My Home Network"
msgstr "家庭网络"
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
+#: ../panels/network/connection-editor/wifi-page.ui.h:6
msgid "Make available to _other users"
msgstr "对于其它用户可用(_O)"
@@ -2493,10 +2537,12 @@ msgstr "控制如何连接到互联网。"
#. Translators: those are keywords for the network control-center panel
#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+msgid ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
+"vlan;bridge;bond;"
msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;网络;"
-"无线;蓝牙;宽带;上网;"
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
+"vlan;bridge;bond;网络;无线;代理;宽带;调制解调器;蓝牙;桥;绑定;"
#: ../panels/network/net-device-bond.c:77
msgid "Bond slaves"
@@ -2533,19 +2579,32 @@ msgstr "IP 地址"
msgid "Last used"
msgstr "上次使用的"
-#: ../panels/network/net-device-ethernet.c:337
+#. Translators: This is used as the title of the connection
+#. * details window for ethernet, if there is only a single
+#. * profile. It is also used to display ethernet in the
+#. * device list.
+#.
+#: ../panels/network/net-device-ethernet.c:288
+#: ../panels/network/network-ethernet.ui.h:1
+#: ../panels/network/network-simple.ui.h:1
+msgid "Wired"
+msgstr "有线"
+
+#: ../panels/network/net-device-ethernet.c:356
#: ../panels/network/net-device-wifi.c:1549
#: ../panels/network/network-ethernet.ui.h:3
+#: ../panels/network/network-mobile.ui.h:8
+#: ../panels/network/network-simple.ui.h:8
#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
msgid "Options…"
msgstr "选项…"
-#: ../panels/network/net-device-ethernet.c:472
+#: ../panels/network/net-device-ethernet.c:491
#, c-format
msgid "Profile %d"
msgstr "配置 %d"
-#: ../panels/network/net-device-mobile.c:241
+#: ../panels/network/net-device-mobile.c:239
msgid "Add new connection"
msgstr "添加新连接"
@@ -2617,11 +2676,6 @@ msgstr "对于不可信的公共网络，不建议这样做。"
msgid "Proxy"
msgstr "代理"
-#: ../panels/network/network-ethernet.ui.h:1
-#: ../panels/network/network-simple.ui.h:1
-msgid "Wired"
-msgstr "有线"
-
#: ../panels/network/network-ethernet.ui.h:2
msgid "_Add Profile…"
msgstr "添加配置(_A)"
@@ -2634,11 +2688,6 @@ msgstr "IMEI"
msgid "Provider"
msgstr "提供商"
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:8
-msgid "_Options…"
-msgstr "选项(_O)…"
-
#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
msgctxt "proxy method"
msgid "None"
@@ -2752,7 +2801,7 @@ msgstr "详细信息"
#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
#: ../panels/network/wireless-security/ws-leap.ui.h:2
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
msgid "_Password"
msgstr "密码(_P)"
@@ -3246,7 +3295,7 @@ msgstr "两者"
#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
#: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
msgid "_Username"
msgstr "用户名(_U)"
@@ -3479,63 +3528,64 @@ msgstr "显示弹出条幅"
msgid "Show in Lock Screen"
msgstr "在锁屏显示"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:190
-#: ../panels/region/cc-input-chooser.c:1073
-#: ../panels/search/cc-search-locations-dialog.c:480
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:191
+#, fuzzy
+#| msgid "Other"
+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/cc-online-accounts-add-account-dialog.c:292
#: ../panels/online-accounts/online-accounts.ui.h:2
msgid "Add Account"
msgstr "添加账户"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:330
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:331
msgid "Mail"
msgstr "邮件"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:336
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:337
msgid "Contacts"
msgstr "联系人"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:342
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:343
msgid "Resources"
msgstr "资源"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:358
+#: ../panels/online-accounts/cc-online-accounts-panel.c:425
msgid "Error logging into the account"
msgstr "登录到该账户出错"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:430
+#: ../panels/online-accounts/cc-online-accounts-panel.c:497
msgid "Credentials have expired."
msgstr "证书已经过期"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:434
+#: ../panels/online-accounts/cc-online-accounts-panel.c:501
msgid "Sign in to enable this account."
msgstr "登入启用此账户。"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:439
+#: ../panels/online-accounts/cc-online-accounts-panel.c:506
msgid "_Sign In"
msgstr "登入(_S)"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:684
+#: ../panels/online-accounts/cc-online-accounts-panel.c:747
msgid "Error creating account"
msgstr "创建账户出错"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:726
+#: ../panels/online-accounts/cc-online-accounts-panel.c:787
msgid "Error removing account"
msgstr "移除账户出错"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:762
+#: ../panels/online-accounts/cc-online-accounts-panel.c:823
msgid "Are you sure you want to remove the account?"
msgstr "您确定要移除该账户吗？"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:764
+#: ../panels/online-accounts/cc-online-accounts-panel.c:825
msgid "This will not remove the account on the server."
msgstr "这不会将该账户从服务器上移除。"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:765
+#: ../panels/online-accounts/cc-online-accounts-panel.c:826
msgid "_Remove"
msgstr "移除(_R)"
@@ -3549,10 +3599,11 @@ msgstr "连接在线账户并决定如何使用"
#. Translators: those are keywords for the online-accounts control-center panel
#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
-msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+msgid ""
+"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
msgstr ""
-"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;谷歌;脸"
-"谱;脸书;推特;雅虎;微博;网络;在线;聊天;日历;邮件;联系人;"
+"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
+"谷歌;脸谱;脸书;推特;雅虎;微博;网络;在线;聊天;日历;邮件;联系人;云存储"
#: ../panels/online-accounts/online-accounts.ui.h:1
msgid "No online accounts configured"
@@ -3755,15 +3806,21 @@ msgid "Power Saving"
msgstr "省电"
#: ../panels/power/cc-power-panel.c:1430
-msgid "_Screen Brightness"
+#, fuzzy
+#| msgid "_Screen Brightness"
+msgid "_Screen brightness"
msgstr "屏幕亮度(_S)"
#: ../panels/power/cc-power-panel.c:1458
-msgid "_Dim Screen when Inactive"
+#, fuzzy
+#| msgid "_Dim Screen when Inactive"
+msgid "_Dim screen when inactive"
msgstr "无操作时屏幕变暗"
#: ../panels/power/cc-power-panel.c:1481
-msgid "_Blank Screen"
+#, fuzzy
+#| msgid "_Blank Screen"
+msgid "_Blank screen"
msgstr "空白屏幕(_B)"
#: ../panels/power/cc-power-panel.c:1516
@@ -3775,11 +3832,15 @@ msgid "Turns off wireless devices"
msgstr "关闭无线设备"
#: ../panels/power/cc-power-panel.c:1544
-msgid "_Mobile Broadband"
+#, fuzzy
+#| msgid "_Mobile Broadband"
+msgid "_Mobile broadband"
msgstr "移动宽带(_M)"
#: ../panels/power/cc-power-panel.c:1549
-msgid "Turns off Mobile Broadband (3G, 4G, WiMax, etc.) devices"
+#, fuzzy
+#| msgid "Turns off Mobile Broadband (3G, 4G, WiMax, etc.) devices"
+msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
msgstr "关闭移动宽带(3G、4G、WiMax 等)设备"
#: ../panels/power/cc-power-panel.c:1582
@@ -3799,11 +3860,15 @@ msgid "Suspend & Power Off"
msgstr "挂起和关机"
#: ../panels/power/cc-power-panel.c:1793
-msgid "_Automatic Suspend"
+#, fuzzy
+#| msgid "_Automatic Suspend"
+msgid "_Automatic suspend"
msgstr "自动挂起(_A)"
#: ../panels/power/cc-power-panel.c:1815
-msgid "When Battery Power is _Critical"
+#, fuzzy
+#| msgid "When Battery Power is _Critical"
+msgid "When battery power is _critical"
msgstr "电量严重不足时(_C)"
#: ../panels/power/cc-power-panel.c:1848
@@ -3920,6 +3985,7 @@ msgstr "认证"
#: ../panels/printers/authentication-dialog.ui.h:5
#: ../panels/sharing/sharing.ui.h:22
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
msgid "Password"
msgstr "密码"
@@ -4065,51 +4131,51 @@ msgid "No printers available"
msgstr "无可用打印机"
#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1429
+#: ../panels/printers/cc-printers-panel.c:1432
#, c-format
msgid "%u active"
msgid_plural "%u active"
msgstr[0] "%u 项活动任务"
#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1773
+#: ../panels/printers/cc-printers-panel.c:1776
msgid "Failed to add new printer."
msgstr "添加新打印机失败。"
-#: ../panels/printers/cc-printers-panel.c:1940
+#: ../panels/printers/cc-printers-panel.c:1943
msgid "Select PPD File"
msgstr "选择 PPD 文件"
-#: ../panels/printers/cc-printers-panel.c:1949
+#: ../panels/printers/cc-printers-panel.c:1952
msgid ""
"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
msgstr "PostScript 打印机描述文件(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
-#: ../panels/printers/cc-printers-panel.c:2254
+#: ../panels/printers/cc-printers-panel.c:2257
msgid "No suitable driver found"
msgstr "未找到合适的驱动"
-#: ../panels/printers/cc-printers-panel.c:2323
+#: ../panels/printers/cc-printers-panel.c:2326
msgid "Searching for preferred drivers…"
msgstr "正在搜索首选的驱动…"
-#: ../panels/printers/cc-printers-panel.c:2338
+#: ../panels/printers/cc-printers-panel.c:2341
msgid "Select from database…"
msgstr "从数据库选择…"
-#: ../panels/printers/cc-printers-panel.c:2347
+#: ../panels/printers/cc-printers-panel.c:2350
msgid "Provide PPD File…"
msgstr "提供 PPD 文件…"
#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2498
-#: ../panels/printers/cc-printers-panel.c:2521
+#: ../panels/printers/cc-printers-panel.c:2501
+#: ../panels/printers/cc-printers-panel.c:2524
msgid "Test page"
msgstr "测试页"
#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2929
+#: ../panels/printers/cc-printers-panel.c:2932
#, c-format
msgid "Could not load ui: %s"
msgstr "无法装入界面：%s"
@@ -4157,7 +4223,7 @@ msgid "Add a New Printer"
msgstr "添加新打印机"
#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-user-panel.c:467
+#: ../panels/user-accounts/um-user-panel.c:501
msgid "_Cancel"
msgstr "取消(_C)"
@@ -4278,7 +4344,7 @@ msgid "%s Active Jobs"
msgstr "%s 个活动的任务"
#. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1465
+#: ../panels/printers/pp-new-printer-dialog.c:1468
msgid "No printers detected."
msgstr "未检测到打印机。"
@@ -4307,65 +4373,65 @@ 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:532
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:544
msgid "Two-sided"
msgstr "双面"
# 左撇子有歧视色彩。
#. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
+#: ../panels/printers/pp-options-dialog.c:556
msgid "Orientation"
msgstr "方向"
#. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../panels/printers/pp-options-dialog.c:653
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:656
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:659
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:662
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:665
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:668
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:671
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:674
msgctxt "Printer Option Group"
msgid "Advanced"
msgstr "高级"
@@ -4628,7 +4694,7 @@ msgid "Automatic Screen _Lock"
msgstr "自动锁屏(_L)"
#: ../panels/privacy/privacy.ui.h:34
-msgid "Lock Screen _After Blank For"
+msgid "Lock screen _after blank for"
msgstr "空闲锁屏的等待时间(_A)："
#: ../panels/privacy/privacy.ui.h:35
@@ -4650,11 +4716,11 @@ msgid ""
msgstr "自动清理回收站和临时文件，帮助计算机保存避免不必要的敏感信息。"
#: ../panels/privacy/privacy.ui.h:40
-msgid "Automatically Empty _Trash"
-msgstr "自动清理回收站(_T)"
+msgid "Automatically empty _Trash"
+msgstr "自动清空回收站(_T)"
#: ../panels/privacy/privacy.ui.h:41
-msgid "Automatically Purge Temporary _Files"
+msgid "Automatically purge Temporary _Files"
msgstr "自动清理临时文件(_F)"
#: ../panels/privacy/privacy.ui.h:42
@@ -4675,36 +4741,43 @@ msgstr "公制"
msgid "No regions found"
msgstr "未找到区域"
-#: ../panels/region/cc-input-chooser.c:186
+#: ../panels/region/cc-input-chooser.c:185
msgid "No input sources found"
msgstr "未找到输入源"
-#: ../panels/region/cc-region-panel.c:239
+#: ../panels/region/cc-input-chooser.c:1088
+#, fuzzy
+#| msgid "Other"
+msgctxt "Input Source"
+msgid "Other"
+msgstr "其他"
+
+#: ../panels/region/cc-region-panel.c:240
msgid "Your session needs to be restarted for changes to take effect"
msgstr "修改需要重启会话才能生效"
-#: ../panels/region/cc-region-panel.c:240
+#: ../panels/region/cc-region-panel.c:241
msgid "Restart Now"
msgstr "现在重启"
-#: ../panels/region/cc-region-panel.c:550
+#: ../panels/region/cc-region-panel.c:566
msgctxt "Language"
msgid "None"
msgstr "无"
-#: ../panels/region/cc-region-panel.c:1040
+#: ../panels/region/cc-region-panel.c:1058
msgid "Sorry"
msgstr "抱歉"
-#: ../panels/region/cc-region-panel.c:1042
+#: ../panels/region/cc-region-panel.c:1060
msgid "Input methods can't be used on the login screen"
msgstr "输入法不能在登录屏幕使用"
-#: ../panels/region/cc-region-panel.c:1491
+#: ../panels/region/cc-region-panel.c:1509
msgid "No input source selected"
msgstr "未选择输入源"
-#: ../panels/region/cc-region-panel.c:1652
+#: ../panels/region/cc-region-panel.c:1690
msgid "Login Screen"
msgstr "登录屏幕"
@@ -4794,6 +4867,10 @@ msgstr "可以在键盘设置中修改快捷键"
msgid "Alternative switch to next source"
msgstr "选择性的切换至下个源"
+#: ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "左+右 Alt"
+
#: ../panels/region/region.ui.h:2
msgid "English (United Kingdom)"
msgstr "英语 (英国)"
@@ -4815,13 +4892,26 @@ msgid "Home"
msgstr "主目录"
#: ../panels/search/cc-search-locations-dialog.c:476
+#, fuzzy
+#| msgid "Places"
+msgctxt "Search Location"
msgid "Places"
msgstr "位置"
#: ../panels/search/cc-search-locations-dialog.c:478
+#, fuzzy
+#| msgid "Bookmarks"
+msgctxt "Search Location"
msgid "Bookmarks"
msgstr "书签"
+#: ../panels/search/cc-search-locations-dialog.c:480
+#, fuzzy
+#| msgid "Other"
+msgctxt "Search Location"
+msgid "Other"
+msgstr "其他"
+
#: ../panels/search/cc-search-locations-dialog.c:676
msgid "Select Location"
msgstr "选择位置"
@@ -4861,21 +4951,21 @@ msgstr "下移"
msgid "Preferences"
msgstr "首选项"
-#: ../panels/sharing/cc-sharing-panel.c:259
+#: ../panels/sharing/cc-sharing-panel.c:268
msgctxt "service is enabled"
msgid "On"
msgstr "开"
-#: ../panels/sharing/cc-sharing-panel.c:261
+#: ../panels/sharing/cc-sharing-panel.c:270
msgctxt "service is disabled"
msgid "Off"
msgstr "关"
-#: ../panels/sharing/cc-sharing-panel.c:407
+#: ../panels/sharing/cc-sharing-panel.c:416
msgid "Choose a Folder"
msgstr "选择文件夹"
-#: ../panels/sharing/cc-sharing-panel.c:585
+#: ../panels/sharing/cc-sharing-panel.c:594
msgid "Copy"
msgstr "复制"
@@ -5119,8 +5209,8 @@ msgctxt "volume"
msgid "Unamplified"
msgstr "减弱"
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
-#: ../panels/sound/gvc-mixer-dialog.c:526
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261
+#: ../panels/sound/gvc-mixer-dialog.c:527
msgid "_Profile:"
msgstr "配置(_P)："
@@ -5144,73 +5234,73 @@ msgstr[0] "%u 路输入"
msgid "System Sounds"
msgstr "系统声音"
-#: ../panels/sound/gvc-mixer-dialog.c:262
+#: ../panels/sound/gvc-mixer-dialog.c:263
msgid "_Test Speakers"
msgstr "测试扬声器(_T)"
-#: ../panels/sound/gvc-mixer-dialog.c:431
+#: ../panels/sound/gvc-mixer-dialog.c:432
msgid "Peak detect"
msgstr "峰值检测"
-#: ../panels/sound/gvc-mixer-dialog.c:1508
+#: ../panels/sound/gvc-mixer-dialog.c:1509
#: ../panels/sound/gvc-sound-theme-chooser.c:595
msgid "Name"
msgstr "名称"
-#: ../panels/sound/gvc-mixer-dialog.c:1527
+#: ../panels/sound/gvc-mixer-dialog.c:1528
msgid "Device"
msgstr "设备"
-#: ../panels/sound/gvc-mixer-dialog.c:1590
+#: ../panels/sound/gvc-mixer-dialog.c:1591
#, c-format
msgid "Speaker Testing for %s"
msgstr "%s 扬声器测试"
-#: ../panels/sound/gvc-mixer-dialog.c:1644
+#: ../panels/sound/gvc-mixer-dialog.c:1648
msgid "_Output volume:"
msgstr "输出音量(_O)："
-#: ../panels/sound/gvc-mixer-dialog.c:1658
+#: ../panels/sound/gvc-mixer-dialog.c:1662
msgid "Output"
msgstr "输出"
-#: ../panels/sound/gvc-mixer-dialog.c:1663
+#: ../panels/sound/gvc-mixer-dialog.c:1667
msgid "C_hoose a device for sound output:"
msgstr "选择音频输出设备(_H)："
-#: ../panels/sound/gvc-mixer-dialog.c:1688
+#: ../panels/sound/gvc-mixer-dialog.c:1692
msgid "Settings for the selected device:"
msgstr "选中设备的设置："
-#: ../panels/sound/gvc-mixer-dialog.c:1699
+#: ../panels/sound/gvc-mixer-dialog.c:1703
msgid "Input"
msgstr "输入"
-#: ../panels/sound/gvc-mixer-dialog.c:1706
+#: ../panels/sound/gvc-mixer-dialog.c:1710
msgid "_Input volume:"
msgstr "输入音量(_I)："
-#: ../panels/sound/gvc-mixer-dialog.c:1729
+#: ../panels/sound/gvc-mixer-dialog.c:1733
msgid "Input level:"
msgstr "输入等级："
-#: ../panels/sound/gvc-mixer-dialog.c:1757
+#: ../panels/sound/gvc-mixer-dialog.c:1761
msgid "C_hoose a device for sound input:"
msgstr "选择音频输入设备(_H)："
-#: ../panels/sound/gvc-mixer-dialog.c:1784
+#: ../panels/sound/gvc-mixer-dialog.c:1788
msgid "Sound Effects"
msgstr "声音效果"
-#: ../panels/sound/gvc-mixer-dialog.c:1791
+#: ../panels/sound/gvc-mixer-dialog.c:1795
msgid "_Alert volume:"
msgstr "警告音量(_A)："
-#: ../panels/sound/gvc-mixer-dialog.c:1804
+#: ../panels/sound/gvc-mixer-dialog.c:1808
msgid "Applications"
msgstr "应用程序"
-#: ../panels/sound/gvc-mixer-dialog.c:1808
+#: ../panels/sound/gvc-mixer-dialog.c:1812
msgid "No application is currently playing or recording audio."
msgstr "没有程序正在播放或录制音频。"
@@ -5761,48 +5851,58 @@ msgctxt "Account type"
msgid "Administrator"
msgstr "管理员"
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
-msgid "Add account"
-msgstr "添加账户"
-
#: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Local Account"
-msgstr "本地账户(_L)"
+#, fuzzy
+#| msgid "_Full name"
+msgid "_Full Name"
+msgstr "全名(_F)"
#: ../panels/user-accounts/data/account-dialog.ui.h:5
-msgid "_Enterprise Login"
-msgstr "企业登录(_E)"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+msgid "Account _Type"
+msgstr "账户类型(_T)"
#: ../panels/user-accounts/data/account-dialog.ui.h:7
-msgid "_Full name"
-msgstr "全名(_F)"
+#, fuzzy
+#| msgid "Choose password at next login"
+msgid "Allow user to set a password when they next login"
+msgstr "下次登录时更改密码"
#: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Account _Type"
-msgstr "账户类型(_T)"
+#: ../panels/user-accounts/data/password-dialog.ui.h:1
+msgid "Set a password now"
+msgstr "现在设置密码"
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
+#, fuzzy
+#| msgid "C_onfirm password"
+msgid "_Confirm Password"
+msgstr "确认密码(_O)"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
msgid "_Domain"
msgstr "域(_D)"
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
msgid "_Login Name"
msgstr "登录名(_L)"
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-msgid "Tip: Enterprise domain or realm name"
-msgstr "提示：企业域或 realm 名"
-
#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid "C_ontinue"
-msgstr "继续(_O)"
+#, fuzzy
+#| msgid "_Password"
+msgid "Login _Password"
+msgstr "密码(_P)"
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+msgid "_Enroll"
+msgstr ""
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:16
msgid "Domain Administrator Login"
msgstr "域管理员登录"
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
msgid ""
"In order to use enterprise logins, this computer needs to be\n"
"enrolled in the domain. Please have your network administrator\n"
@@ -5812,11 +5912,11 @@ msgstr ""
"注册该计算机。请网络管理员在此\n"
"输入域密码。"
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: ../panels/user-accounts/data/account-dialog.ui.h:20
msgid "Administrator _Name"
msgstr "管理员名称(_N)"
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
+#: ../panels/user-accounts/data/account-dialog.ui.h:21
msgid "Administrator Password"
msgstr "管理员密码"
@@ -5906,10 +6006,6 @@ msgstr "下一周"
msgid "Next week"
msgstr "下一周"
-#: ../panels/user-accounts/data/password-dialog.ui.h:1
-msgid "Set a password now"
-msgstr "现在设置密码"
-
#: ../panels/user-accounts/data/password-dialog.ui.h:2
msgid "Choose password at next login"
msgstr "下次登录时更改密码"
@@ -6036,40 +6132,133 @@ msgstr "管理用户账户"
msgid "Authentication is required to change user data"
msgstr "改变用户数据需要认证"
-#: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:597
-msgctxt "Password strength"
-msgid "Too short"
-msgstr "太短"
+#: ../panels/user-accounts/pw-utils.c:81
+#, fuzzy
+#| msgid "The new password does not contain enough different characters"
+msgctxt "Password hint"
+msgid "The new password needs to be different from the old one."
+msgstr "新密码必须包含足够的不同字符"
+
+#: ../panels/user-accounts/pw-utils.c:83
+msgctxt "Password hint"
+msgid "Try changing some letters and numbers."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
+#, fuzzy
+#| msgid "Changing password for"
+msgctxt "Password hint"
+msgid "Try changing the password a bit more."
+msgstr "更改此用户的密码"
+
+#: ../panels/user-accounts/pw-utils.c:87
+msgctxt "Password hint"
+msgid "A password without your user name would be stronger."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:89
+msgctxt "Password hint"
+msgid "Try to avoid using your name in the password."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:91
+msgctxt "Password hint"
+msgid "Try to avoid some of the words included in the password."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:95
+msgctxt "Password hint"
+msgid "Try to avoid common words."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:97
+msgctxt "Password hint"
+msgid "Try to avoid reordering existing words."
+msgstr ""
#: ../panels/user-accounts/pw-utils.c:99
+msgctxt "Password hint"
+msgid "Try to use more numbers."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:101
+msgctxt "Password hint"
+msgid "Try to use more uppercase letters."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:103
+msgctxt "Password hint"
+msgid "Try to use more lowercase letters."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:105
+msgctxt "Password hint"
+msgid "Try to use more special characters, like punctuation."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:107
+msgctxt "Password hint"
+msgid "Try to use a mixture of letters, numbers and punctuation."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:109
+msgctxt "Password hint"
+msgid "Try to avoid repeating the same character."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:111
+msgctxt "Password hint"
+msgid ""
+"Try to avoid repeating the same type of character: you need to mix up "
+"letters, numbers and punctuation."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:113
+msgctxt "Password hint"
+msgid "Try to avoid sequences like 1234 or abcd."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:115
+msgctxt "Password hint"
+msgid "Try to add more characters."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:118
+msgctxt "Password hint"
+msgid "Mix uppercase and lowercase and use a number or two."
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:140
+#: ../panels/user-accounts/pw-utils.c:170
msgctxt "Password strength"
-msgid "Not good enough"
-msgstr "不够好"
+msgid "Strength: Weak"
+msgstr ""
-#: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:598
+#: ../panels/user-accounts/pw-utils.c:144
+#: ../panels/user-accounts/pw-utils.c:171
+#, fuzzy
+#| msgid "Length:"
msgctxt "Password strength"
-msgid "Weak"
-msgstr "弱"
+msgid "Strength: Low"
+msgstr "长度："
-#: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:599
+#: ../panels/user-accounts/pw-utils.c:147
+#: ../panels/user-accounts/pw-utils.c:172
msgctxt "Password strength"
-msgid "Fair"
-msgstr "一般"
+msgid "Strength: Medium"
+msgstr ""
-#: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:600
+#: ../panels/user-accounts/pw-utils.c:150
+#: ../panels/user-accounts/pw-utils.c:173
msgctxt "Password strength"
-msgid "Good"
-msgstr "好"
+msgid "Strength: Good"
+msgstr ""
-#: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:601
+#: ../panels/user-accounts/pw-utils.c:153
+#: ../panels/user-accounts/pw-utils.c:174
msgctxt "Password strength"
-msgid "Strong"
-msgstr "强"
+msgid "Strength: High"
+msgstr ""
#: ../panels/user-accounts/run-passwd.c:424
msgid "Authentication failed"
@@ -6120,27 +6309,71 @@ msgstr "新密码必须包含足够的不同字符"
msgid "Unknown error"
msgstr "未知错误"
-#: ../panels/user-accounts/um-account-dialog.c:182
+#: ../panels/user-accounts/um-account-dialog.c:212
msgid "Failed to add account"
msgstr "添加账户失败"
-#: ../panels/user-accounts/um-account-dialog.c:403
-#: ../panels/user-accounts/um-account-dialog.c:444
+#: ../panels/user-accounts/um-account-dialog.c:317
+msgid "This will be used to name your home folder and can't be changed."
+msgstr ""
+
+#: ../panels/user-accounts/um-account-dialog.c:407
+#, fuzzy
+#| msgid "Passwords do not match"
+msgid "Passwords do not match."
+msgstr "密码不匹配"
+
+#: ../panels/user-accounts/um-account-dialog.c:408
+#: ../panels/user-accounts/um-password-dialog.c:387
+msgid "Passwords do not match"
+msgstr "密码不匹配"
+
+#: ../panels/user-accounts/um-account-dialog.c:661
+#: ../panels/user-accounts/um-account-dialog.c:707
msgid "Failed to register account"
msgstr "注册用户失败"
-#: ../panels/user-accounts/um-account-dialog.c:577
+#: ../panels/user-accounts/um-account-dialog.c:845
msgid "No supported way to authenticate with this domain"
msgstr "没有支持这个域验证的方法"
-#: ../panels/user-accounts/um-account-dialog.c:631
+#: ../panels/user-accounts/um-account-dialog.c:904
msgid "Failed to join domain"
msgstr "加入域失败"
-#: ../panels/user-accounts/um-account-dialog.c:688
+#: ../panels/user-accounts/um-account-dialog.c:965
+msgid ""
+"Login not recognized.\n"
+"Please try again."
+msgstr ""
+
+#: ../panels/user-accounts/um-account-dialog.c:973
+#, fuzzy
+#| msgid "Invalid password, please try again"
+msgid ""
+"Invalid password.\n"
+"Please try again."
+msgstr "无效密码，请重试"
+
+#: ../panels/user-accounts/um-account-dialog.c:982
msgid "Failed to log into domain"
msgstr "登入域失败"
+#: ../panels/user-accounts/um-account-dialog.c:1040
+#, fuzzy
+#| msgid "Modem not found"
+msgid "Domain not found."
+msgstr "未找到调制解调器"
+
+#: ../panels/user-accounts/um-account-dialog.c:1383
+msgid "Add User"
+msgstr "添加用户"
+
+#. Create enterprise toggle button.
+#: ../panels/user-accounts/um-account-dialog.c:1396
+msgid "_Enterprise Login"
+msgstr "企业登录(_E)"
+
#: ../panels/user-accounts/um-fingerprint-dialog.c:139
msgid ""
"You are not allowed to access the device. Contact your system administrator."
@@ -6246,38 +6479,59 @@ msgstr "请再次输入您的当前密码。"
msgid "Password could not be changed"
msgstr "无法更改密码"
-#: ../panels/user-accounts/um-password-dialog.c:301
+#: ../panels/user-accounts/um-password-dialog.c:303
msgid "You need to enter a new password"
msgstr "您需要输入一个新密码"
-#: ../panels/user-accounts/um-password-dialog.c:304
+#: ../panels/user-accounts/um-password-dialog.c:306
msgid "The new password is not strong enough"
msgstr "新密码不够强"
-#: ../panels/user-accounts/um-password-dialog.c:310
+#: ../panels/user-accounts/um-password-dialog.c:312
msgid "You need to confirm the password"
msgstr "你需要重新输入密码以便确认"
-#: ../panels/user-accounts/um-password-dialog.c:313
+#: ../panels/user-accounts/um-password-dialog.c:315
msgid "The passwords do not match"
msgstr "密码不匹配"
-#: ../panels/user-accounts/um-password-dialog.c:319
+#: ../panels/user-accounts/um-password-dialog.c:321
msgid "You need to enter your current password"
msgstr "您需要输入当前密码"
-#: ../panels/user-accounts/um-password-dialog.c:322
+#: ../panels/user-accounts/um-password-dialog.c:324
msgid "The current password is not correct"
msgstr "当前密码错误"
-#: ../panels/user-accounts/um-password-dialog.c:385
-msgid "Passwords do not match"
-msgstr "密码不匹配"
-
-#: ../panels/user-accounts/um-password-dialog.c:439
+#: ../panels/user-accounts/um-password-dialog.c:441
msgid "Wrong password"
msgstr "密码错误"
+#: ../panels/user-accounts/um-password-dialog.c:599
+msgctxt "Password strength"
+msgid "Too short"
+msgstr "太短"
+
+#: ../panels/user-accounts/um-password-dialog.c:600
+msgctxt "Password strength"
+msgid "Weak"
+msgstr "弱"
+
+#: ../panels/user-accounts/um-password-dialog.c:601
+msgctxt "Password strength"
+msgid "Fair"
+msgstr "一般"
+
+#: ../panels/user-accounts/um-password-dialog.c:602
+msgctxt "Password strength"
+msgid "Good"
+msgstr "好"
+
+#: ../panels/user-accounts/um-password-dialog.c:603
+msgctxt "Password strength"
+msgid "Strong"
+msgstr "强"
+
#: ../panels/user-accounts/um-photo-dialog.c:443
msgid "Disable image"
msgstr "禁用图像"
@@ -6304,7 +6558,8 @@ msgstr "不能自动加入此类域"
msgid "No such domain or realm found"
msgstr "未发现此域或 realm"
-#: ../panels/user-accounts/um-realm-manager.c:815
+#: ../panels/user-accounts/um-realm-manager.c:814
+#: ../panels/user-accounts/um-realm-manager.c:828
#, c-format
msgid "Cannot log in as %s at the %s domain"
msgstr "不能以 %s 身份登录 %s 域"
@@ -6313,77 +6568,81 @@ msgstr "不能以 %s 身份登录 %s 域"
msgid "Invalid password, please try again"
msgstr "无效密码，请重试"
-#: ../panels/user-accounts/um-realm-manager.c:824
+#: ../panels/user-accounts/um-realm-manager.c:833
#, c-format
msgid "Couldn't connect to the %s domain: %s"
msgstr "无法连接到 %s 域：%s"
-#: ../panels/user-accounts/um-user-panel.c:376
+#: ../panels/user-accounts/um-user-panel.c:189
+msgid "Other Accounts"
+msgstr "其他账户"
+
+#: ../panels/user-accounts/um-user-panel.c:405
msgid "Failed to delete user"
msgstr "删除用户失败"
-#: ../panels/user-accounts/um-user-panel.c:436
+#: ../panels/user-accounts/um-user-panel.c:470
msgid "You cannot delete your own account."
msgstr "您不能删除自己的账户。"
-#: ../panels/user-accounts/um-user-panel.c:445
+#: ../panels/user-accounts/um-user-panel.c:479
#, c-format
msgid "%s is still logged in"
msgstr "%s 仍在登录状态"
-#: ../panels/user-accounts/um-user-panel.c:449
+#: ../panels/user-accounts/um-user-panel.c:483
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:458
+#: ../panels/user-accounts/um-user-panel.c:492
#, c-format
msgid "Do you want to keep %s's files?"
msgstr "您想要保留 %s 的文件吗？"
-#: ../panels/user-accounts/um-user-panel.c:462
+#: ../panels/user-accounts/um-user-panel.c:496
msgid ""
"It is possible to keep the home directory, mail spool and temporary files "
"around when deleting a user account."
msgstr "删除用户时可以保留用户主目录、电子邮件目录和临时文件。"
-#: ../panels/user-accounts/um-user-panel.c:465
+#: ../panels/user-accounts/um-user-panel.c:499
msgid "_Delete Files"
msgstr "删除文件(_D)"
-#: ../panels/user-accounts/um-user-panel.c:466
+#: ../panels/user-accounts/um-user-panel.c:500
msgid "_Keep Files"
msgstr "保留文件(_K)"
-#: ../panels/user-accounts/um-user-panel.c:518
+#: ../panels/user-accounts/um-user-panel.c:552
msgctxt "Password mode"
msgid "Account disabled"
msgstr "账户已禁用"
-#: ../panels/user-accounts/um-user-panel.c:526
+#: ../panels/user-accounts/um-user-panel.c:560
msgctxt "Password mode"
msgid "To be set at next login"
msgstr "下次登录时设置"
-#: ../panels/user-accounts/um-user-panel.c:529
+#: ../panels/user-accounts/um-user-panel.c:563
msgctxt "Password mode"
msgid "None"
msgstr "无"
-#: ../panels/user-accounts/um-user-panel.c:578
+#: ../panels/user-accounts/um-user-panel.c:612
msgid "Logged in"
msgstr "已登录"
-#: ../panels/user-accounts/um-user-panel.c:942
+#: ../panels/user-accounts/um-user-panel.c:987
msgid "Failed to contact the accounts service"
msgstr "联系账户服务失败"
-#: ../panels/user-accounts/um-user-panel.c:944
+#: ../panels/user-accounts/um-user-panel.c:989
msgid "Please make sure that the AccountService is installed and enabled."
msgstr "请确定 AccountService 已经正确安装并启用。"
-#: ../panels/user-accounts/um-user-panel.c:985
+#: ../panels/user-accounts/um-user-panel.c:1030
msgid ""
"To make changes,\n"
"click the * icon first"
@@ -6391,12 +6650,12 @@ msgstr ""
"要进行更改，\n"
"请先点击 * 图标"
-#: ../panels/user-accounts/um-user-panel.c:1023
+#: ../panels/user-accounts/um-user-panel.c:1068
msgid "Create a user account"
msgstr "创建用户账户"
-#: ../panels/user-accounts/um-user-panel.c:1034
-#: ../panels/user-accounts/um-user-panel.c:1320
+#: ../panels/user-accounts/um-user-panel.c:1079
+#: ../panels/user-accounts/um-user-panel.c:1369
msgid ""
"To create a user account,\n"
"click the * icon first"
@@ -6404,12 +6663,12 @@ msgstr ""
"要创建用户账户，\n"
"请先点击 * 图标"
-#: ../panels/user-accounts/um-user-panel.c:1043
+#: ../panels/user-accounts/um-user-panel.c:1089
msgid "Delete the selected user account"
msgstr "删除选中的用户账户"
-#: ../panels/user-accounts/um-user-panel.c:1055
-#: ../panels/user-accounts/um-user-panel.c:1325
+#: ../panels/user-accounts/um-user-panel.c:1101
+#: ../panels/user-accounts/um-user-panel.c:1374
msgid ""
"To delete the selected user account,\n"
"click the * icon first"
@@ -6417,34 +6676,34 @@ msgstr ""
"要删除选中的用户账户，\n"
"请先点击 * 图标"
-#: ../panels/user-accounts/um-user-panel.c:1229
+#: ../panels/user-accounts/um-user-panel.c:1284
msgid "My Account"
msgstr "我的账户"
-#: ../panels/user-accounts/um-user-panel.c:1238
-msgid "Other Accounts"
-msgstr "其他账户"
-
-#: ../panels/user-accounts/um-utils.c:516
+#: ../panels/user-accounts/um-utils.c:535
#, c-format
msgid "A user with the username '%s' already exists"
msgstr "以 %s 为用户名的用户已存在"
-#: ../panels/user-accounts/um-utils.c:520
+#: ../panels/user-accounts/um-utils.c:539
#, c-format
msgid "The username is too long"
msgstr "用户名太长"
-#: ../panels/user-accounts/um-utils.c:523
+#: ../panels/user-accounts/um-utils.c:542
msgid "The username cannot start with a '-'"
msgstr "用户名不能以“-”开头"
-#: ../panels/user-accounts/um-utils.c:526
+#: ../panels/user-accounts/um-utils.c:545
+#, fuzzy
+#| msgid ""
+#| "The username must only consist of:\n"
+#| " ➣ letters from the English alphabet\n"
+#| " ➣ digits\n"
+#| " ➣ any of the characters '.', '-' and '_'"
msgid ""
-"The username must only consist of:\n"
-" ➣ letters from the English alphabet\n"
-" ➣ digits\n"
-" ➣ any of the characters '.', '-' and '_'"
+"The username should only consist of lower and upper case letters from a-z, "
+"digits and any of characters '.', '-' and '_'"
msgstr ""
"用户名只能包含：\n"
" ➣ 英文字母\n"
@@ -6459,13 +6718,13 @@ msgstr "映射按键"
msgid "Map buttons to functions"
msgstr "将功能映射到按键"
-#: ../panels/wacom/calibrator/gui_gtk.c:79
+#: ../panels/wacom/calibrator/calibrator-gui.c:82
msgid ""
"Please tap the target markers as they appear on screen to calibrate the "
"tablet."
msgstr "当标记出现在屏幕上时，请触摸它们，以校准您的平板电脑。"
-#: ../panels/wacom/calibrator/gui_gtk.c:368
+#: ../panels/wacom/calibrator/calibrator-gui.c:86
msgid "Mis-click detected, restarting..."
msgstr "检测到误点击，正在重新开始..."
@@ -6488,50 +6747,50 @@ msgstr "映射到单个显示器..."
msgid "%d of %d"
msgstr "%d/%d"
-#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:384
+#: ../panels/wacom/cc-wacom-page.c:123 ../panels/wacom/cc-wacom-page.c:433
msgctxt "Wacom action-type"
msgid "None"
msgstr "无"
-#: ../panels/wacom/cc-wacom-page.c:119
+#: ../panels/wacom/cc-wacom-page.c:124
msgctxt "Wacom action-type"
msgid "Send Keystroke"
msgstr "发送按键"
-#: ../panels/wacom/cc-wacom-page.c:120
+#: ../panels/wacom/cc-wacom-page.c:125
msgctxt "Wacom action-type"
msgid "Switch Monitor"
msgstr "切换显示器"
-#: ../panels/wacom/cc-wacom-page.c:121
+#: ../panels/wacom/cc-wacom-page.c:126
msgctxt "Wacom action-type"
msgid "Show On-Screen Help"
msgstr "显示屏幕帮助"
-#: ../panels/wacom/cc-wacom-page.c:621
+#: ../panels/wacom/cc-wacom-page.c:674
msgctxt "Wacom tablet button"
msgid "Up"
msgstr "上"
-#: ../panels/wacom/cc-wacom-page.c:621
+#: ../panels/wacom/cc-wacom-page.c:674
msgctxt "Wacom tablet button"
msgid "Down"
msgstr "下"
-#: ../panels/wacom/cc-wacom-page.c:662
+#: ../panels/wacom/cc-wacom-page.c:715
msgid "Switch Modes"
msgstr "模式切换"
-#: ../panels/wacom/cc-wacom-page.c:752
+#: ../panels/wacom/cc-wacom-page.c:805
#: ../panels/wacom/cc-wacom-stylus-page.c:373
msgid "Button"
msgstr "按键"
-#: ../panels/wacom/cc-wacom-page.c:810
+#: ../panels/wacom/cc-wacom-page.c:863
msgid "Action"
msgstr "动作"
-#: ../panels/wacom/cc-wacom-page.c:920
+#: ../panels/wacom/cc-wacom-page.c:973
msgid "Display Mapping"
msgstr "显示映射"
@@ -6586,97 +6845,101 @@ msgid "Adjust display resolution"
msgstr "调整显示分辨率"
#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+msgid "Adjust mouse settings"
+msgstr "调整鼠标设置"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:13
msgid "Tracking Mode"
msgstr "跟踪模式"
# 左撇子有歧视色彩。
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+#: ../panels/wacom/gnome-wacom-properties.ui.h:14
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:1076
+#: ../panels/wacom/gsd-wacom-device.c:1078
msgid "Left Ring"
msgstr "左环模式"
-#: ../panels/wacom/gsd-wacom-device.c:1086
+#: ../panels/wacom/gsd-wacom-device.c:1089
#, 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:1105
+#: ../panels/wacom/gsd-wacom-device.c:1109
msgid "Right Ring"
msgstr "右环模式"
-#: ../panels/wacom/gsd-wacom-device.c:1115
+#: ../panels/wacom/gsd-wacom-device.c:1120
#, 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:1156
+#: ../panels/wacom/gsd-wacom-device.c:1162
msgid "Left Touchstrip"
msgstr "左 Touchstrip 模式"
# Touchstrip和touchring都是商标。
-#: ../panels/wacom/gsd-wacom-device.c:1166
+#: ../panels/wacom/gsd-wacom-device.c:1173
#, 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:1185
+#: ../panels/wacom/gsd-wacom-device.c:1193
msgid "Right Touchstrip"
msgstr "右 Touchstrip"
-#: ../panels/wacom/gsd-wacom-device.c:1195
+#: ../panels/wacom/gsd-wacom-device.c:1204
#, c-format
msgid "Right Touchstrip Mode #%d"
msgstr "右 Touchstrip 模式 #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1220
+#: ../panels/wacom/gsd-wacom-device.c:1230
#, c-format
msgid "Left Touchring Mode Switch"
msgstr "左 Touchring 模式切换"
-#: ../panels/wacom/gsd-wacom-device.c:1222
+#: ../panels/wacom/gsd-wacom-device.c:1232
#, c-format
msgid "Right Touchring Mode Switch"
msgstr "右 Touchring 模式切换"
-#: ../panels/wacom/gsd-wacom-device.c:1225
+#: ../panels/wacom/gsd-wacom-device.c:1235
#, c-format
msgid "Left Touchstrip Mode Switch"
msgstr "左 Touchstrip 模式切换"
-#: ../panels/wacom/gsd-wacom-device.c:1227
+#: ../panels/wacom/gsd-wacom-device.c:1237
#, c-format
msgid "Right Touchstrip Mode Switch"
msgstr "右 Touchstrip 模式切换"
-#: ../panels/wacom/gsd-wacom-device.c:1232
+#: ../panels/wacom/gsd-wacom-device.c:1242
#, c-format
msgid "Mode Switch #%d"
msgstr "模式切换 #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1336
+#: ../panels/wacom/gsd-wacom-device.c:1351
#, c-format
msgid "Left Button #%d"
msgstr "左键 #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1339
+#: ../panels/wacom/gsd-wacom-device.c:1354
#, c-format
msgid "Right Button #%d"
msgstr "右键 #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1342
+#: ../panels/wacom/gsd-wacom-device.c:1357
#, c-format
msgid "Top Button #%d"
msgstr "上键 #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1345
+#: ../panels/wacom/gsd-wacom-device.c:1360
#, c-format
msgid "Bottom Button #%d"
msgstr "底键 #%d"
@@ -6749,40 +7012,40 @@ msgstr "下键"
msgid "Tip Pressure Feel"
msgstr "指尖压力感应"
-#: ../shell/cc-application.c:67
+#: ../shell/cc-application.c:69
msgid "Enable verbose mode"
msgstr "启用详细模式"
-#: ../shell/cc-application.c:68
+#: ../shell/cc-application.c:70
msgid "Show the overview"
msgstr "显示摘要"
-#: ../shell/cc-application.c:69
+#: ../shell/cc-application.c:71
msgid "Search for the string"
msgstr "搜索字符串"
-#: ../shell/cc-application.c:70
+#: ../shell/cc-application.c:72
msgid "List possible panel names and exit"
msgstr "列出可能的面板名并退出"
-#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
-#: ../shell/cc-application.c:73
+#: ../shell/cc-application.c:73 ../shell/cc-application.c:74
+#: ../shell/cc-application.c:75
msgid "Show help options"
msgstr "显示帮助选项"
-#: ../shell/cc-application.c:74
+#: ../shell/cc-application.c:76
msgid "Panel to display"
msgstr "显示面板"
-#: ../shell/cc-application.c:74
+#: ../shell/cc-application.c:76
msgid "[PANEL] [ARGUMENT…]"
msgstr "[面板] [参数…]"
-#: ../shell/cc-application.c:116
+#: ../shell/cc-application.c:142
msgid "- Settings"
msgstr "- 设置"
-#: ../shell/cc-application.c:124
+#: ../shell/cc-application.c:160
#, c-format
msgid ""
"%s\n"
@@ -6791,39 +7054,39 @@ msgstr ""
"%s\n"
"运行 “%s --help” 查看所有可用的命令行选项。\n"
-#: ../shell/cc-application.c:154
+#: ../shell/cc-application.c:190
msgid "Available panels:"
msgstr "可用面板"
-#: ../shell/cc-application.c:273
+#: ../shell/cc-application.c:325
msgid "Help"
msgstr "帮助"
-#: ../shell/cc-application.c:274
+#: ../shell/cc-application.c:326
msgid "Quit"
msgstr "退出"
-#: ../shell/cc-window.c:62 ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../shell/cc-window.c:61 ../shell/gnome-control-center.desktop.in.in.h:1
msgid "Settings"
msgstr "设置"
#. Add categories
-#: ../shell/cc-window.c:858
+#: ../shell/cc-window.c:857
msgctxt "category"
msgid "Personal"
msgstr "个人"
-#: ../shell/cc-window.c:859
+#: ../shell/cc-window.c:858
msgctxt "category"
msgid "Hardware"
msgstr "硬件"
-#: ../shell/cc-window.c:860
+#: ../shell/cc-window.c:859
msgctxt "category"
msgid "System"
msgstr "系统"
-#: ../shell/cc-window.c:1411
+#: ../shell/cc-window.c:1424
msgid "All Settings"
msgstr "全部设置"
@@ -6831,6 +7094,93 @@ msgstr "全部设置"
msgid "Preferences;Settings;"
msgstr "Preferences;Settings;首选项;设置;"
+#~ msgid "Left Shift"
+#~ msgstr "左 Shift"
+
+#~ msgid "Left Alt"
+#~ msgstr "左 Alt"
+
+#~ msgid "Left Ctrl"
+#~ msgstr "左 Ctrl"
+
+#~ msgid "Right Shift"
+#~ msgstr "右 Shift"
+
+#~ msgid "Right Alt"
+#~ msgstr "右 Alt"
+
+#~ msgid "Right Ctrl"
+#~ msgstr "右 Ctrl"
+
+#~ msgid "Left Alt+Shift"
+#~ msgstr "左 Alt+Shift"
+
+#~ msgid "Right Alt+Shift"
+#~ msgstr "右 Alt+Shift"
+
+#~ msgid "Left Ctrl+Shift"
+#~ msgstr "左 Ctrl+Shift"
+
+#~ msgid "Right Ctrl+Shift"
+#~ msgstr "右 Ctrl+Shift"
+
+#~ msgid "Left+Right Shift"
+#~ msgstr "左+右 Shift"
+
+#~ msgid "Left+Right Ctrl"
+#~ msgstr "左+右 Ctrl"
+
+#~ msgid "Alt+Shift"
+#~ msgstr "Ctrl+Alt+Shift+Space"
+
+#~ msgid "Ctrl+Shift"
+#~ msgstr "Ctrl+Alt+Shift+Space"
+
+#~ msgid "Alt+Ctrl"
+#~ msgstr "Alt+Ctrl"
+
+#~ msgid "Caps"
+#~ msgstr "Caps"
+
+#~ msgid "Shift+Caps"
+#~ msgstr "Shift+Caps"
+
+#~ msgid "Alt+Caps"
+#~ msgstr "Alt+Caps"
+
+#~ msgid "Ctrl+Caps"
+#~ msgstr "Ctrl+Caps"
+
+#~ msgid "Add account"
+#~ msgstr "添加账户"
+
+#~ msgid "_Local Account"
+#~ msgstr "本地账户(_L)"
+
+#~ msgid "Tip: Enterprise domain or realm name"
+#~ msgstr "提示：企业域或 realm 名"
+
+#~ msgid "C_ontinue"
+#~ msgstr "继续(_O)"
+
+#~ msgctxt "Password strength"
+#~ msgid "Not good enough"
+#~ msgstr "不够好"
+
+#~ msgid "Export"
+#~ msgstr "导出"
+
+#~ msgctxt "mouse, speed"
+#~ msgid "Slow"
+#~ msgstr "慢"
+
+#~ msgctxt "mouse, speed"
+#~ msgid "Fast"
+#~ msgstr "快"
+
+#~ msgid "_Options…"
+#~ msgstr "选项(_O)…"
+
#~ msgid "blablabla"
#~ msgstr "blablabla"
@@ -7487,9 +7837,6 @@ msgstr "Preferences;Settings;首选项;设置;"
#~ msgid "Printer Options"
#~ msgstr "打印机选项"
-#~ msgid "Add User"
-#~ msgstr "添加用户"
-
#~ msgid "Allowed users"
#~ msgstr "允许的用户"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
