[network-manager-applet] Update Chinese simplified translation
- From: Wylmer Wang <wylmerwang src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] Update Chinese simplified translation
- Date: Sat, 28 Dec 2013 11:26:47 +0000 (UTC)
commit 5c4cfda3d37f65f4e6d8935a228ee1543e73f02d
Author: Tong Hui <tonghuix gmmail com>
Date: Sat Dec 28 19:26:25 2013 +0800
Update Chinese simplified translation
po/zh_CN.po | 1380 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 830 insertions(+), 550 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b489d84..bc7496e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,17 +14,18 @@
# YunQiang Su <wzssyqa gmail com>, 2012.
# tuhaihe <wangdianjin linuxdeepin com>, 2012.
# Aron Xu <aronxu gnome org>, 2010, 2013.
+# Tong Hui <tonghuix gmail com>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: network-manager-applet master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2013-07-10 14:49+0000\n"
-"PO-Revision-Date: 2013-07-07 20:05+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"POT-Creation-Date: 2013-12-19 15:53+0000\n"
+"PO-Revision-Date: 2013-12-28 19:18+0800\n"
+"Last-Translator: Tong Hui <tonghuix gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
-"Language: \n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -101,22 +102,30 @@ msgid ""
msgstr "设为 true 以禁止使用小程序时创建 adhoc 网络。"
#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr "在通知区域显示小程序图标"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "设为 FALSE 以禁止小程序图标在通知区域显示。"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
msgid "Ignore CA certificate"
msgstr "忽略 CA 证书"
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
msgid ""
"Set this to true to disable warnings about CA certificates in EAP "
"authentication."
msgstr "将此项设为 true 以禁用在 EAP 认证中关于 CA 证书的警告。"
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
msgid ""
"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
"authentication."
msgstr "将此项设为 true 以禁用在 EAP 认证第 2 阶段中关于 CA 证书的警告。"
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
msgid "802.1X authentication"
msgstr "802.1X 认证"
@@ -125,37 +134,37 @@ msgstr "802.1X 认证"
msgid "_Network name:"
msgstr "网络名称(_N)："
-#: ../src/applet.c:541
+#: ../src/applet.c:574
msgid "Failed to add/activate connection"
msgstr "无法添加/启用连接"
-#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
+#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
msgid "Unknown error"
msgstr "未知错误"
-#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1350
msgid "Connection failure"
msgstr "连接失败"
-#: ../src/applet.c:585
+#: ../src/applet.c:618
msgid "Device disconnect failed"
msgstr "设备断开失败"
-#: ../src/applet.c:590
+#: ../src/applet.c:623
msgid "Disconnect failure"
msgstr "断开失败"
-#: ../src/applet.c:611
+#: ../src/applet.c:644
msgid "Connection activation failed"
msgstr "连接启用失败"
-#: ../src/applet.c:982 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
msgid "Don't show this message again"
msgstr "不再显示此信息"
-#: ../src/applet.c:1071
+#: ../src/applet.c:1046
#, c-format
msgid ""
"\n"
@@ -165,7 +174,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。网络连接被中断。"
-#: ../src/applet.c:1074
+#: ../src/applet.c:1049
#, c-format
msgid ""
"\n"
@@ -174,7 +183,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN 服务异常中断。"
-#: ../src/applet.c:1077
+#: ../src/applet.c:1052
#, c-format
msgid ""
"\n"
@@ -184,7 +193,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN 服务返回了一个非法配置。"
-#: ../src/applet.c:1080
+#: ../src/applet.c:1055
#, c-format
msgid ""
"\n"
@@ -193,7 +202,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。连接超时。"
-#: ../src/applet.c:1083
+#: ../src/applet.c:1058
#, c-format
msgid ""
"\n"
@@ -202,7 +211,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN 服务未在所需时间内启动。"
-#: ../src/applet.c:1086
+#: ../src/applet.c:1061
#, c-format
msgid ""
"\n"
@@ -211,7 +220,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN 服务启动失败。"
-#: ../src/applet.c:1089
+#: ../src/applet.c:1064
#, c-format
msgid ""
"\n"
@@ -220,7 +229,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。没有合法的 VPN secret。"
-#: ../src/applet.c:1092
+#: ../src/applet.c:1067
#, c-format
msgid ""
"\n"
@@ -229,7 +238,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN secret 非法。"
-#: ../src/applet.c:1099
+#: ../src/applet.c:1074
#, c-format
msgid ""
"\n"
@@ -238,7 +247,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。"
-#: ../src/applet.c:1117
+#: ../src/applet.c:1092
#, c-format
msgid ""
"\n"
@@ -248,7 +257,7 @@ msgstr ""
"\n"
"VPN 连接“%s”已断开。网络连接被中断。"
-#: ../src/applet.c:1120
+#: ../src/applet.c:1095
#, c-format
msgid ""
"\n"
@@ -257,7 +266,7 @@ msgstr ""
"\n"
"VPN 连接“%s”已断开。VPN 服务已停止。"
-#: ../src/applet.c:1126
+#: ../src/applet.c:1101
#, c-format
msgid ""
"\n"
@@ -266,7 +275,7 @@ msgstr ""
"\n"
"VPN 连接“%s”已断开。"
-#: ../src/applet.c:1156
+#: ../src/applet.c:1131
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -277,19 +286,19 @@ msgstr ""
"\n"
"%s\n"
-#: ../src/applet.c:1158
+#: ../src/applet.c:1133
msgid "VPN connection has been successfully established.\n"
msgstr "已成功建立 VPN 连接。\n"
-#: ../src/applet.c:1160
+#: ../src/applet.c:1135
msgid "VPN Login Message"
msgstr "VPN 登录消息"
-#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224
+#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
msgid "VPN Connection Failed"
msgstr "VPN 连接失败"
-#: ../src/applet.c:1231
+#: ../src/applet.c:1206
#, c-format
msgid ""
"\n"
@@ -302,7 +311,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1234
+#: ../src/applet.c:1209
#, c-format
msgid ""
"\n"
@@ -315,450 +324,602 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1549
+#: ../src/applet.c:1533
msgid "device not ready (firmware missing)"
msgstr "设备未就绪(缺少固件)"
-#: ../src/applet.c:1551
+#: ../src/applet.c:1535
msgid "device not ready"
msgstr "设备未就绪"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
+#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
msgid "disconnected"
msgstr "已断开"
-#: ../src/applet.c:1577
+#: ../src/applet.c:1561
msgid "Disconnect"
msgstr "断开"
-#: ../src/applet.c:1591
+#: ../src/applet.c:1575
msgid "device not managed"
msgstr "设备未托管"
-#: ../src/applet.c:1635
+#: ../src/applet.c:1735
msgid "No network devices available"
msgstr "没有可用的网络设备"
-#: ../src/applet.c:1723
+#: ../src/applet.c:1788
msgid "_VPN Connections"
msgstr "_VPN 连接"
-#: ../src/applet.c:1780
+#: ../src/applet.c:1845
msgid "_Configure VPN..."
msgstr "配置 VPN(_C)..."
-#: ../src/applet.c:1784
+#: ../src/applet.c:1849
msgid "_Disconnect VPN"
msgstr "断开 VPN(_D)"
-#: ../src/applet.c:1878
+#: ../src/applet.c:1965
msgid "NetworkManager is not running..."
msgstr "网络管理器未运行..."
-#: ../src/applet.c:1883 ../src/applet.c:2735
+#: ../src/applet.c:1970 ../src/applet.c:2940
msgid "Networking disabled"
msgstr "网络已禁用"
#. 'Enable Networking' item
-#: ../src/applet.c:2104
+#: ../src/applet.c:2190
msgid "Enable _Networking"
msgstr "启用联网(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:2113
+#: ../src/applet.c:2199
msgid "Enable _Wi-Fi"
msgstr "启用 _Wi-Fi"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2122
+#: ../src/applet.c:2208
msgid "Enable _Mobile Broadband"
msgstr "启用移动宽带(_M)"
#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2131
+#: ../src/applet.c:2217
msgid "Enable WiMA_X Mobile Broadband"
msgstr "启用 WiMA_X 移动宽带"
#. Toggle notifications item
-#: ../src/applet.c:2142
+#: ../src/applet.c:2228
msgid "Enable N_otifications"
msgstr "启用通知(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:2153
+#: ../src/applet.c:2239
msgid "Connection _Information"
msgstr "连接信息(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:2163
+#: ../src/applet.c:2249
msgid "Edit Connections..."
msgstr "编辑连接..."
#. Help item
-#: ../src/applet.c:2177
+#: ../src/applet.c:2263
msgid "_Help"
msgstr "帮助(_H)"
#. About item
-#: ../src/applet.c:2186
+#: ../src/applet.c:2272
msgid "_About"
msgstr "关于(_A)"
-#: ../src/applet.c:2364
+#: ../src/applet.c:2525
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "您现在已连接到“%s”。"
+
+#: ../src/applet.c:2566
msgid "Disconnected"
msgstr "已断开连接"
-#: ../src/applet.c:2365
+#: ../src/applet.c:2567
msgid "The network connection has been disconnected."
msgstr "网络连接现已断开。"
-#: ../src/applet.c:2598
+#: ../src/applet.c:2802
#, c-format
msgid "Preparing network connection '%s'..."
msgstr "正在准备网络连接“%s”..."
-#: ../src/applet.c:2601
+#: ../src/applet.c:2805
#, c-format
msgid "User authentication required for network connection '%s'..."
msgstr "网络连接“%s”需要用户认证..."
-#: ../src/applet.c:2604 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594
+#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
+#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
#, c-format
msgid "Requesting a network address for '%s'..."
msgstr "正在为“%s”请求一个网络地址..."
-#: ../src/applet.c:2607
+#: ../src/applet.c:2811
#, c-format
msgid "Network connection '%s' active"
msgstr "网络连接“%s”已处于活动状态"
-#: ../src/applet.c:2690
+#: ../src/applet.c:2894
#, c-format
msgid "Starting VPN connection '%s'..."
msgstr "正在启动 VPN 连接“%s”..."
-#: ../src/applet.c:2693
+#: ../src/applet.c:2897
#, c-format
msgid "User authentication required for VPN connection '%s'..."
msgstr "VPN 连接“%s”需要用户认证..."
-#: ../src/applet.c:2696
+#: ../src/applet.c:2900
#, c-format
msgid "Requesting a VPN address for '%s'..."
msgstr "正在为“%s”请求一个 VPN 地址..."
-#: ../src/applet.c:2699
+#: ../src/applet.c:2903
#, c-format
msgid "VPN connection '%s' active"
msgstr "VPN 连接“%s”已处于活动状态"
-#: ../src/applet.c:2740
+#: ../src/applet.c:2945
msgid "No network connection"
msgstr "没有网络连接"
-#: ../src/applet.c:3442
+#: ../src/applet.c:3615
msgid "NetworkManager Applet"
msgstr "网络管理器小程序"
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
-#: ../src/applet-device-gsm.c:359 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
+#: ../src/applet-device-broadband.c:769 ../src/applet-device-bt.c:90
+#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
+#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
+#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
msgid "Available"
msgstr "可用的"
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
-#: ../src/applet-device-gsm.c:401 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "您现在已连接到“%s”。"
-
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
-#: ../src/applet-device-gsm.c:405 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
+#: ../src/applet-device-broadband.c:796 ../src/applet-device-bt.c:102
+#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
+#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
+#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
+#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
msgid "Connection Established"
msgstr "连接已建立"
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-bond.c:90
+msgid "You are now connected to the bonded network."
+msgstr "您现在已连接到绑定的网络。"
+
+#: ../src/applet-device-bond.c:114
+#, c-format
+msgid "Preparing bond connection '%s'..."
+msgstr "正在准备绑定连接“%s”..."
+
+#: ../src/applet-device-bond.c:117
+#, c-format
+msgid "Configuring bond connection '%s'..."
+msgstr "正在配置绑定连接“%s”..."
+
+#: ../src/applet-device-bond.c:120
+#, c-format
+msgid "User authentication required for bond connection '%s'..."
+msgstr "绑定连接“%s”需要用户认证..."
+
+#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
+#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
+#: ../src/applet-device-vlan.c:237
+#, c-format
+msgid "Requesting address for '%s'..."
+msgstr "正在为“%s”请求地址..."
+
+#: ../src/applet-device-bond.c:127
+#, c-format
+msgid "Bond connection '%s' active"
+msgstr "绑定连接“%s”已处于活动状态"
+
+#: ../src/applet-device-bridge.c:90
+msgid "You are now connected to the bridged network."
+msgstr "您现在已连接到桥接的网络。"
+
+#: ../src/applet-device-bridge.c:114
+#, c-format
+msgid "Preparing bridge connection '%s'..."
+msgstr "正在准备桥接网络连接“%s”..."
+
+#: ../src/applet-device-bridge.c:117
+#, c-format
+msgid "Configuring bridge connection '%s'..."
+msgstr "正在配置桥接网络连接 %s..."
+
+#: ../src/applet-device-bridge.c:120
+#, c-format
+msgid "User authentication required for bridge connection '%s'..."
+msgstr "桥接网络“%s”需要用户认证..."
+
+#: ../src/applet-device-bridge.c:127
+#, c-format
+msgid "Bridge connection '%s' active"
+msgstr "桥接网络连接“%s”已处于活动状态"
+
+#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+msgid "Wrong PUK code; please contact your provider."
+msgstr "错误的 PUK 代码；请联络您的供应商。"
+
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+msgid "Wrong PIN code; please contact your provider."
+msgstr "错误的 PIN 代码；请联络您的供应商。"
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
+msgid "Sending unlock code..."
+msgstr "正在发送解锁码..."
+
+#: ../src/applet-device-broadband.c:715 ../src/applet-device-cdma.c:247
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "移动宽带(%s)"
+
+#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
+#: ../src/applet-device-gsm.c:305
+#: ../src/connection-editor/new-connection.c:114
+#: ../src/connection-editor/page-mobile.c:351
+#: ../src/libnm-gtk/nm-ui-utils.c:333
+msgid "Mobile Broadband"
+msgstr "移动宽带"
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:782
+msgid "New Mobile Broadband connection..."
+msgstr "新移动宽带连接..."
+
+#: ../src/applet-device-broadband.c:797
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "您现在已连接到移动宽带网络。"
+
+#: ../src/applet-device-broadband.c:932 ../src/applet-device-broadband.c:938
+msgid "Mobile Broadband network."
+msgstr "移动宽带网络。"
+
+# 这里的"home network"与下面的“漫游网络”是对比的关闭，应和下文的其他地方译法一致为“主网络”才说的通。
+#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
+#: ../src/applet-device-gsm.c:662
+msgid "You are now registered on the home network."
+msgstr "您现在已注册到主网络。"
+
+#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
+#: ../src/applet-device-gsm.c:668
+msgid "You are now registered on a roaming network."
+msgstr "您现在已注册到一个漫游网络。"
+
+#: ../src/applet-device-bt.c:103
msgid "You are now connected to the mobile broadband network."
msgstr "您现在已连接到移动宽带网络。"
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
+#: ../src/mobile-helpers.c:582
#, c-format
msgid "Preparing mobile broadband connection '%s'..."
msgstr "正在准备移动宽带连接“%s”..."
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
+#: ../src/mobile-helpers.c:585
#, c-format
msgid "Configuring mobile broadband connection '%s'..."
msgstr "正在配置移动宽带连接“%s”..."
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:591
+#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
+#: ../src/mobile-helpers.c:588
#, c-format
msgid "User authentication required for mobile broadband connection '%s'..."
msgstr "移动宽带连接“%s”需要用户认证..."
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:611
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
#, c-format
msgid "Mobile broadband connection '%s' active"
msgstr "移动宽带连接“%s”已处于活动状态"
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:718
-#: ../src/applet-device-gsm.c:305 ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "移动宽带(%s)"
-
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:720
-#: ../src/applet-device-gsm.c:307
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "移动宽带"
-
#. Default connection item
-#: ../src/applet-device-cdma.c:316
+#: ../src/applet-device-cdma.c:314
msgid "New Mobile Broadband (CDMA) connection..."
msgstr "新建移动宽带(CDMA)连接..."
-#: ../src/applet-device-cdma.c:350
+#: ../src/applet-device-cdma.c:341
msgid "You are now connected to the CDMA network."
msgstr "您现在已连接到 CDMA 网络。"
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
+#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
msgid "CDMA network."
msgstr "CDMA 网络。"
-# 这里的"home network"与下面的“漫游网络”是对比的关闭，应和下文的其他地方译法一致为“主网络”才说的通。
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:958
-#: ../src/applet-device-gsm.c:678
-msgid "You are now registered on the home network."
-msgstr "您现在已注册到主网络。"
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:964
-#: ../src/applet-device-gsm.c:684
-msgid "You are now registered on a roaming network."
-msgstr "您现在已注册到一个漫游网络。"
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:44
msgid "Auto Ethernet"
msgstr "自动以太网"
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:96
#, c-format
msgid "Ethernet Networks (%s)"
msgstr "以太网(%s)"
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:98
#, c-format
msgid "Ethernet Network (%s)"
msgstr "以太网(%s)"
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:101
msgid "Ethernet Networks"
msgstr "以太网"
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:103
msgid "Ethernet Network"
msgstr "以太网"
-#: ../src/applet-device-ethernet.c:271
+#: ../src/applet-device-ethernet.c:147
msgid "You are now connected to the ethernet network."
msgstr "您现已连接到以太网。"
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:171
#, c-format
msgid "Preparing ethernet network connection '%s'..."
msgstr "正在准备以太网连接 %s..."
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:174
#, c-format
msgid "Configuring ethernet network connection '%s'..."
msgstr "正在配置以太网连接 %s..."
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:177
#, c-format
msgid "User authentication required for ethernet network connection '%s'..."
msgstr "以太网连接 %s 需要用户认证..."
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:180
#, c-format
msgid "Requesting an ethernet network address for '%s'..."
msgstr "正在为 %s 请求一个以太网连接地址..."
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:184
#, c-format
msgid "Ethernet network connection '%s' active"
msgstr "以太网连接 %s 已处于活动状态"
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:365
msgid "DSL authentication"
msgstr "DSL 认证"
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:520
-msgid "Wrong PUK code; please contact your provider."
-msgstr "错误的 PUK 代码；请联络您的供应商。"
-
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:497
-msgid "Wrong PIN code; please contact your provider."
-msgstr "错误的 PIN 代码；请联络您的供应商。"
-
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:547
-msgid "Sending unlock code..."
-msgstr "正在发送解锁码..."
-
-#. Default connection item
-#: ../src/applet-device-broadband.c:785
-msgid "New Mobile Broadband connection..."
-msgstr "新移动宽带连接..."
-
-#: ../src/applet-device-broadband.c:821
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "您现在已连接到移动宽带网络。"
-
-#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963
-msgid "Mobile Broadband network."
-msgstr "移动宽带网络。"
-
#. Default connection item
-#: ../src/applet-device-gsm.c:372
+#: ../src/applet-device-gsm.c:370
msgid "New Mobile Broadband (GSM) connection..."
msgstr "新建移动宽带(GSM)连接..."
-#: ../src/applet-device-gsm.c:406
+#: ../src/applet-device-gsm.c:397
msgid "You are now connected to the GSM network."
msgstr "您现在已连接到 GSM 网络。"
-#: ../src/applet-device-gsm.c:677 ../src/applet-device-gsm.c:683
+#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
msgid "GSM network."
msgstr "GSM 网络。"
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-infiniband.c:40
+msgid "Auto InfiniBand"
+msgstr "自动 InfiniBand"
+
+#: ../src/applet-device-infiniband.c:92
+#, c-format
+msgid "InfiniBand Networks (%s)"
+msgstr "InfiniBand 网络（%s）"
+
+#: ../src/applet-device-infiniband.c:94
+#, c-format
+msgid "InfiniBand Network (%s)"
+msgstr "InfiniBand 网络（%s）"
+
+#: ../src/applet-device-infiniband.c:97
+msgid "InfiniBand Networks"
+msgstr "InfiniBand 网络"
+
+#: ../src/applet-device-infiniband.c:99
+msgid "InfiniBand Network"
+msgstr "InfiniBand 网络"
+
+#: ../src/applet-device-infiniband.c:143
+msgid "You are now connected to the InfiniBand network."
+msgstr "您现在已连接到 InfiniBand 网络。"
+
+#: ../src/applet-device-infiniband.c:167
+#, c-format
+msgid "Preparing InfiniBand connection '%s'..."
+msgstr "正在准备 InfiniBand 网络连接“%s”..."
+
+#: ../src/applet-device-infiniband.c:170
+#, c-format
+msgid "Configuring InfiniBand connection '%s'..."
+msgstr "正在配置 InfiniBand 网络连接 %s..."
+
+#: ../src/applet-device-infiniband.c:173
+#, c-format
+msgid "User authentication required for InfiniBand connection '%s'..."
+msgstr "InfiniBand 网络“%s”需要用户认证..."
+
+#: ../src/applet-device-infiniband.c:180
+#, c-format
+msgid "InfiniBand connection '%s' active"
+msgstr "InfiniBand 连接“%s”开启 "
+
+#: ../src/applet-device-team.c:86
+msgid "You are now connected to the teamed network."
+msgstr "您现已连接到组队网络。"
+
+#: ../src/applet-device-team.c:110
+#, c-format
+msgid "Preparing team connection '%s'..."
+msgstr "正在准备组队网络连接“%s”..."
+
+#: ../src/applet-device-team.c:113
+#, c-format
+msgid "Configuring team connection '%s'..."
+msgstr "正在配置组队网络连接 %s..."
+
+#: ../src/applet-device-team.c:116
+#, c-format
+msgid "User authentication required for team connection '%s'..."
+msgstr "组队连接“%s”需要用户认证..."
+
+#: ../src/applet-device-team.c:123
+#, c-format
+msgid "Team connection '%s' active"
+msgstr "组队连接“%s”开启"
+
+#: ../src/applet-device-vlan.c:204
+msgid "You are now connected to the VLAN."
+msgstr "您现在已连接到 VLAN 网络。"
+
+#: ../src/applet-device-vlan.c:228
+#, c-format
+msgid "Preparing VLAN connection '%s'..."
+msgstr "正在启动 VLAN 连接“%s”..."
+
+#: ../src/applet-device-vlan.c:231
+#, c-format
+msgid "Configuring VLAN connection '%s'..."
+msgstr "正在启动 VLAN 连接“%s”..."
+
+#: ../src/applet-device-vlan.c:234
+#, c-format
+msgid "User authentication required for VLAN connection '%s'..."
+msgstr "VLAN 连接“%s”需要用户认证..."
+
+#: ../src/applet-device-vlan.c:241
+#, c-format
+msgid "VLAN connection '%s' active"
+msgstr "VLAN 连接“%s”已处于活动状态"
+
+#: ../src/applet-device-wifi.c:96
msgid "_Connect to Hidden Wi-Fi Network..."
msgstr "连接到隐藏的 Wi-Fi 网络(_C)..."
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:147
msgid "Create _New Wi-Fi Network..."
msgstr "创建新的 Wi-Fi 网络(_N)..."
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:291
msgid "(none)"
msgstr "(无)"
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:769
#, c-format
msgid "Wi-Fi Networks (%s)"
msgstr "Wi-Fi 网络(%s)"
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:771
#, c-format
msgid "Wi-Fi Network (%s)"
msgstr "Wi-Fi 网络(%s)"
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:773
msgid "Wi-Fi Network"
msgid_plural "Wi-Fi Networks"
msgstr[0] "Wi-Fi 网络"
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:802
msgid "Wi-Fi is disabled"
msgstr "Wi-Fi 已禁用"
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:803
msgid "Wi-Fi is disabled by hardware switch"
msgstr "Wi-Fi 已通过硬件开关禁用"
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:864
msgid "More networks"
msgstr "更多网络"
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1042
msgid "Wi-Fi Networks Available"
msgstr "Wi-Fi 网络可用"
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1043
msgid "Use the network menu to connect to a Wi-Fi network"
msgstr "使用网络菜单连接到 Wi-Fi 网络"
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1242
#, c-format
msgid "You are now connected to the Wi-Fi network '%s'."
msgstr "您现在已连接到 Wi-Fi 网络 %s。"
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1273
#, c-format
msgid "Preparing Wi-Fi network connection '%s'..."
msgstr "正在准备 Wi-Fi 网络连接 %s..."
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1276
#, c-format
msgid "Configuring Wi-Fi network connection '%s'..."
msgstr "正在配置 Wi-Fi 网络连接 %s..."
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1279
#, c-format
msgid "User authentication required for Wi-Fi network '%s'..."
msgstr "Wi-Fi 网络 %s 需要用户认证..."
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1282
#, c-format
msgid "Requesting a Wi-Fi network address for '%s'..."
msgstr "正在为 %s 请求一个网络地址..."
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1303
#, c-format
msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
msgstr "Wi-Fi 网络连接 %s 处于活动状态：%s (%d%%)"
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1308
#, c-format
msgid "Wi-Fi network connection '%s' active"
msgstr "Wi-Fi 网络连接 %s 已处于活动状态"
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1326
msgid "Failed to activate connection"
msgstr "无法启用连接"
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1345
msgid "Failed to add new connection"
msgstr "无法添加新连接"
-#: ../src/applet-device-wimax.c:227
+#: ../src/applet-device-wimax.c:228
#, c-format
msgid "WiMAX Mobile Broadband (%s)"
msgstr "WiMAX 移动宽带(%s)"
-#: ../src/applet-device-wimax.c:229
+#: ../src/applet-device-wimax.c:230
msgid "WiMAX Mobile Broadband"
msgstr "WiMAX 移动宽带"
-#: ../src/applet-device-wimax.c:255
+#: ../src/applet-device-wimax.c:256
msgid "WiMAX is disabled"
msgstr "WiMAX 已禁用"
-#: ../src/applet-device-wimax.c:256
+#: ../src/applet-device-wimax.c:257
msgid "WiMAX is disabled by hardware switch"
msgstr "WiMAX 已通过硬件开关禁用"
-#: ../src/applet-device-wimax.c:424
+#: ../src/applet-device-wimax.c:402
msgid "You are now connected to the WiMAX network."
msgstr "您现在已连接到 WiMAX 网络。"
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:606
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
#, c-format
msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
msgstr "移动宽带连接“%s”已处于活动状态：(%d%%%s%s)"
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:609
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
msgid "roaming"
msgstr "漫游中"
@@ -767,9 +928,9 @@ msgid "Error displaying connection information:"
msgstr "显示连接信息时出错："
#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnm-gtk/nm-wifi-dialog.c:918
+#: ../src/wireless-security/wireless-security.c:441
msgid "LEAP"
msgstr "LEAP"
@@ -777,195 +938,195 @@ msgstr "LEAP"
msgid "Dynamic WEP"
msgstr "动态 WEP"
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
+#: ../src/applet-dialogs.c:244
msgid "WPA/WPA2"
msgstr "WPA/WPA2"
-#: ../src/applet-dialogs.c:243
+#: ../src/applet-dialogs.c:240
msgid "WEP"
msgstr "WEP"
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
+#: ../src/connection-editor/page-wifi-security.c:261
+msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "无"
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:274
#, c-format
msgid "%s (default)"
msgstr "%s (默认)"
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
#, c-format
msgid "%u Mb/s"
msgstr "%u Mb/s"
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
msgctxt "Speed"
msgid "Unknown"
msgstr "未知"
-#: ../src/applet-dialogs.c:361
+#: ../src/applet-dialogs.c:358
#, c-format
msgid "%d dB"
msgstr "%d dB"
-#: ../src/applet-dialogs.c:363
+#: ../src/applet-dialogs.c:360
msgctxt "WiMAX CINR"
msgid "unknown"
msgstr "未知"
-#: ../src/applet-dialogs.c:375
+#: ../src/applet-dialogs.c:372
msgctxt "WiMAX Base Station ID"
msgid "unknown"
msgstr "未知"
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:407
#, c-format
msgid "Ethernet (%s)"
msgstr "以太网(%s)"
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:410
#, c-format
msgid "802.11 WiFi (%s)"
msgstr "802.11 WiFi (%s)"
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:417
#, c-format
msgid "GSM (%s)"
msgstr "GSM (%s)"
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:419
#, c-format
msgid "CDMA (%s)"
msgstr "CDMA (%s)"
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:423
#, c-format
msgid "WiMAX (%s)"
msgstr "WiMAX (%s)"
#. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:345
+#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
+#: ../src/connection-editor/page-general.c:327
msgid "General"
msgstr "常规"
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:433
msgid "Interface:"
msgstr "接口："
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:449
msgid "Hardware Address:"
msgstr "硬件地址："
#. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:457
msgid "Driver:"
msgstr "驱动程序："
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:486
msgid "Speed:"
msgstr "速度："
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:496
msgid "Security:"
msgstr "安全性："
-#: ../src/applet-dialogs.c:512
+#: ../src/applet-dialogs.c:509
msgid "CINR:"
msgstr "CINR："
-#: ../src/applet-dialogs.c:525
+#: ../src/applet-dialogs.c:522
msgid "BSID:"
msgstr "BSID："
#. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:539
msgid "IPv4"
msgstr "IPv4"
#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
+#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
msgid "IP Address:"
msgstr "IP 地址："
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
msgctxt "Address"
msgid "Unknown"
msgstr "未知"
-#: ../src/applet-dialogs.c:569
+#: ../src/applet-dialogs.c:566
msgid "Broadcast Address:"
msgstr "广播地址："
#. Prefix
-#: ../src/applet-dialogs.c:578
+#: ../src/applet-dialogs.c:575
msgid "Subnet Mask:"
msgstr "子网掩码："
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:577
msgctxt "Subnet Mask"
msgid "Unknown"
msgstr "未知"
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
msgid "Default Route:"
msgstr "默认路由："
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:597
msgid "Primary DNS:"
msgstr "主 DNS："
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:606
msgid "Secondary DNS:"
msgstr "第二 DNS："
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:616
msgid "Ternary DNS:"
msgstr "第三 DNS："
#. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:631
msgid "IPv6"
msgstr "IPv6"
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:640
msgid "Ignored"
msgstr "已忽略"
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:793
msgid "VPN Type:"
msgstr "VPN 类型："
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:800
msgid "VPN Gateway:"
msgstr "VPN 网关："
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:806
msgid "VPN Username:"
msgstr "VPN 用户名："
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:812
msgid "VPN Banner:"
msgstr "VPN Banner："
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:818
msgid "Base Connection:"
msgstr "基本连接："
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
msgid "Unknown"
msgstr "未知"
#. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:883
msgid "No valid active connections found!"
msgstr "未找到合法的活动连接！"
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:911
msgid ""
"Copyright © 2004-2011 Red Hat, Inc.\n"
"Copyright © 2005-2008 Novell, Inc.\n"
@@ -975,42 +1136,42 @@ msgstr ""
"版权所有 (C) 2005-2008 Novell 公司\n"
"和其他众多社区贡献者和翻译者"
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:914
msgid ""
"Notification area applet for managing your network devices and connections."
msgstr "管理您网络设备和连接的通知区域小程序。"
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:916
msgid "NetworkManager Website"
msgstr "NetworkManager 网站"
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:931
msgid "Missing resources"
msgstr "缺少资源"
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:956
msgid "Mobile broadband network password"
msgstr "移动宽带网络密码"
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:965
#, c-format
msgid "A password is required to connect to '%s'."
msgstr "连接到“%s”需要密码。"
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:980
msgid "Password:"
msgstr "密码："
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1261
msgid "SIM PIN unlock required"
msgstr "需要解锁 SIM PIN"
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1262
msgid "SIM PIN Unlock Required"
msgstr "需要解锁 SIM PIN"
#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1264
#, c-format
msgid ""
"The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1018,25 +1179,25 @@ msgid ""
msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PIN 码。"
#. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1266
msgid "PIN code:"
msgstr "PIN 代码："
#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1270
msgid "Show PIN code"
msgstr "显示 PIN 码"
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1272
msgid "SIM PUK unlock required"
msgstr "需要解锁 SIM PUK"
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1273
msgid "SIM PUK Unlock Required"
msgstr "需要解锁 SIM PUK"
#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1275
#, c-format
msgid ""
"The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1044,22 +1205,22 @@ msgid ""
msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PUK 码。"
#. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1277
msgid "PUK code:"
msgstr "PUK 码："
#. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1280
msgid "New PIN code:"
msgstr "新的 PIN 码："
#. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1282
msgid "Re-enter new PIN code:"
msgstr "再次输入新的 PIN 码："
#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1287
msgid "Show PIN/PUK codes"
msgstr "显示 PIN/PUK 码："
@@ -1100,10 +1261,14 @@ msgid " "
msgstr " "
#: ../src/connection-editor/ce-new-connection.ui.h:2
+msgid "Create…"
+msgstr "新建..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:3
msgid "Choose a Connection Type"
msgstr "选择连接类型"
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
msgid ""
"Select the type of connection you wish to create.\n"
"\n"
@@ -1115,10 +1280,6 @@ msgstr ""
"如果您要创建 VPN 连接，但需要的类型不在列表中，您可能没有安装相应的 VPN 插"
"件。"
-#: ../src/connection-editor/ce-new-connection.ui.h:6
-msgid "Create…"
-msgstr "新建..."
-
#: ../src/connection-editor/ce-page-bond.ui.h:1
msgid "Round-robin"
msgstr "轮循"
@@ -1166,14 +1327,16 @@ msgstr "模式(_M)："
#. Edit
#: ../src/connection-editor/ce-page-bond.ui.h:12
#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:686
msgid "_Edit"
msgstr "编辑(_E)"
#. Delete
#: ../src/connection-editor/ce-page-bond.ui.h:13
#: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:703
msgid "_Delete"
msgstr "删除(_D)"
@@ -1187,6 +1350,7 @@ msgstr "毫秒"
#: ../src/connection-editor/ce-page-bond.ui.h:16
#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:6
msgid "_Interface name:"
msgstr "接口名称(_I)："
@@ -1212,6 +1376,16 @@ msgstr "链接建立延时(_U)："
msgid "Link _down delay:"
msgstr "链接断开延时(_D)："
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "_Primary:"
+msgstr "主要(_P)："
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr "主设备的接口名称。如果设置，在此设备可用时将一直是活动从机。"
+
#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
msgid "Path _cost:"
msgstr "路径成本(_C):"
@@ -1253,11 +1427,11 @@ msgstr "最大老化时间(_M)："
msgid "_Aging time:"
msgstr "老化时间(_A)："
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:67
msgid "automatic"
msgstr "自动"
-#: ../src/connection-editor/ce-page.c:362
+#: ../src/connection-editor/ce-page.c:342
msgid "Failed to update connection secrets due to an unknown error."
msgstr "由于一个未知错误，更新连接 secret 时失败。"
@@ -1276,7 +1450,7 @@ msgstr "服务(_S)："
#: ../src/connection-editor/ce-page-dsl.ui.h:3
#: ../src/wireless-security/eap-method-leap.ui.h:3
#: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:7
#: ../src/wireless-security/ws-leap.ui.h:3
#: ../src/wireless-security/ws-wpa-psk.ui.h:3
msgid "Sho_w password"
@@ -1284,6 +1458,7 @@ msgstr "显示密码(_W)"
#: ../src/connection-editor/ce-page-dsl.ui.h:4
#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
#: ../src/wireless-security/eap-method-leap.ui.h:2
#: ../src/wireless-security/eap-method-simple.ui.h:2
#: ../src/wireless-security/ws-leap.ui.h:2
@@ -1483,7 +1658,6 @@ msgid "DNS ser_vers:"
msgstr "_DNS 服务器："
#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
msgid ""
"IP addresses of domain name servers used to resolve host names. Use commas "
"to separate multiple domain name server addresses."
@@ -1506,6 +1680,15 @@ msgstr ""
msgid "_Routes…"
msgstr "路由(_R)..."
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses. Link-local addresses will "
+"be automatically scoped to the connecting interface."
+msgstr ""
+"用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。本地连接"
+"地址会自动配置到连接中的接口。"
+
#: ../src/connection-editor/ce-page-ip6.ui.h:13
msgid "Require IPv_6 addressing for this connection to complete"
msgstr "需要 IPv_6 地址完成这个连接"
@@ -1635,6 +1818,23 @@ msgstr "回声"
msgid "Send PPP _echo packets"
msgstr "发送 PPP 回响包(_E)"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr "_JSON 配置："
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr "从文件导入组队配置(_I)..."
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "_Teamed connections:"
+msgstr "已组队的连接(_T)："
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "I_mport team configuration from a file..."
+msgstr "从文件导入组队配置(_M)..."
+
#: ../src/connection-editor/ce-page-vlan.ui.h:1
msgid "_Parent interface:"
msgstr "上级接口(_P)："
@@ -1769,179 +1969,185 @@ msgstr ""
"大多数情况下，服务商的 PPP 服务器支持所有的认证方法。如连接失败，请尝试禁用一"
"些方法的支持。"
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip4-routes-dialog.c:724
+#: ../src/connection-editor/ip6-routes-dialog.c:666
+#: ../src/connection-editor/page-ip4.c:924
+#: ../src/connection-editor/page-ip6.c:887
msgid "Address"
msgstr "地址"
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/ip4-routes-dialog.c:741
+#: ../src/connection-editor/page-ip4.c:941
msgid "Netmask"
msgstr "子网掩码"
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:758
+#: ../src/connection-editor/ip6-routes-dialog.c:700
+#: ../src/connection-editor/page-ip4.c:958
+#: ../src/connection-editor/page-ip6.c:921
msgid "Gateway"
msgstr "网关"
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:775
+#: ../src/connection-editor/ip6-routes-dialog.c:717
msgid "Metric"
msgstr "度量"
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip6-routes-dialog.c:683
+#: ../src/connection-editor/page-ip6.c:904
msgid "Prefix"
msgstr "前缀"
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/connection-editor/new-connection.c:102
+#: ../src/connection-editor/page-ethernet.c:242
#: ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Ethernet"
msgstr "以太网"
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:483 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/new-connection.c:108
+#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Wi-Fi"
msgstr "Wi-Fi"
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
+#: ../src/connection-editor/new-connection.c:120
+#: ../src/connection-editor/page-wimax.c:125
#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
msgid "WiMAX"
msgstr "WiMAX"
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/new-connection.c:126
+#: ../src/connection-editor/page-dsl.c:137
msgid "DSL"
msgstr "DSL"
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:168
+#: ../src/connection-editor/new-connection.c:132
+#: ../src/connection-editor/page-infiniband.c:159
#: ../src/libnm-gtk/nm-ui-utils.c:335
msgid "InfiniBand"
msgstr "InfiniBand"
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:439 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../src/connection-editor/new-connection.c:138
+#: ../src/connection-editor/page-bond.c:430 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:562
msgid "Bond"
msgstr "绑定"
-#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/new-connection.c:144
+#: ../src/connection-editor/page-team.c:255 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:564
+msgid "Team"
+msgstr "组队"
+
+#: ../src/connection-editor/new-connection.c:150
#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
msgid "Bridge"
msgstr "桥接"
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/new-connection.c:156
+#: ../src/connection-editor/page-vlan.c:482 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:568
msgid "VLAN"
msgstr "VLAN"
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/new-connection.c:169
+#: ../src/connection-editor/new-connection.c:309
#: ../src/connection-editor/page-vpn.c:113
msgid "VPN"
msgstr "VPN"
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/new-connection.c:259
msgid "Hardware"
msgstr "硬件"
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/new-connection.c:279
msgid "Virtual"
msgstr "虚拟"
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/new-connection.c:347
+#: ../src/connection-editor/new-connection.c:349
msgid "Import a saved VPN configuration..."
msgstr "导入 VPN 配置..."
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/new-connection.c:378
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr "由于一个未知错误，连接编辑器对话框无法初始化。"
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/new-connection.c:387
msgid "Could not create new connection"
msgstr "无法建立新连接"
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/new-connection.c:522
msgid "Connection delete failed"
msgstr "删除连接失败"
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/new-connection.c:569
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "是否确认删除连接 %s？"
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../src/connection-editor/nm-connection-editor.c:122
#, c-format
msgid "Editing %s"
msgstr "正在编辑 %s"
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:126
msgid "Editing un-named connection"
msgstr "编辑未命名连接"
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:286
msgid ""
"The connection editor could not find some required resources (the .ui file "
"was not found)."
msgstr "连接编辑器找不到所需的一些资源(未找到 .ui 文件)。"
-#: ../src/connection-editor/nm-connection-editor.c:413
+#: ../src/connection-editor/nm-connection-editor.c:417
msgid "_Save"
msgstr "保存(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:418
msgid "Save any changes made to this connection."
msgstr "保存对此连接的全部更改。"
-#: ../src/connection-editor/nm-connection-editor.c:415
+#: ../src/connection-editor/nm-connection-editor.c:419
msgid "_Save..."
msgstr "保存(_S)..."
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:420
msgid "Authenticate to save this connection for all users of this machine."
msgstr "为本机所有用户保存此连接需要认证。"
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:436
msgid "Could not create connection"
msgstr "无法创建连接"
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:436
msgid "Could not edit connection"
msgstr "无法编辑连接"
-#: ../src/connection-editor/nm-connection-editor.c:434
+#: ../src/connection-editor/nm-connection-editor.c:438
msgid "Unknown error creating connection editor dialog."
msgstr "创建连接编辑器对话框出现未知错误。"
-#: ../src/connection-editor/nm-connection-editor.c:541
+#: ../src/connection-editor/nm-connection-editor.c:572
+msgid "Error initializing editor"
+msgstr "初始化编辑器错误"
+
+#: ../src/connection-editor/nm-connection-editor.c:903
+msgid "Connection add failed"
+msgstr "添加连接失败"
+
+#: ../src/connection-editor/nm-connection-editor.c:943
msgid "Error saving connection"
msgstr "保存连接出错"
-#: ../src/connection-editor/nm-connection-editor.c:542
+#: ../src/connection-editor/nm-connection-editor.c:944
#, c-format
msgid "The property '%s' / '%s' is invalid: %d"
msgstr "属性“%s”/“%s”非法：%d"
-#: ../src/connection-editor/nm-connection-editor.c:641
-msgid "Error initializing editor"
-msgstr "初始化编辑器错误"
-
-#: ../src/connection-editor/nm-connection-editor.c:962
-msgid "Connection add failed"
-msgstr "添加连接失败"
-
#: ../src/connection-editor/nm-connection-editor.ui.h:2
msgid "Connection _name:"
msgstr "连接名称(_N)："
@@ -1990,56 +2196,56 @@ msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年以前"
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:632
msgid "Name"
msgstr "名称"
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:645
msgid "Last Used"
msgstr "最后使用的"
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:687
msgid "Edit the selected connection"
msgstr "编辑选中的连接"
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:688
msgid "_Edit..."
msgstr "编辑(_E)..."
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:689
msgid "Authenticate to edit the selected connection"
msgstr "进行认证以编辑选中的连接"
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:704
msgid "Delete the selected connection"
msgstr "删除选中的连接"
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:705
msgid "_Delete..."
msgstr "删除(_D)..."
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:706
msgid "Authenticate to delete the selected connection"
msgstr "进行认证以删除选中的连接"
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:935
msgid "No VPN plugins are installed."
msgstr "未安装 VPN 插件。"
-#: ../src/connection-editor/nm-connection-list.c:945
+#: ../src/connection-editor/nm-connection-list.c:937
#, c-format
msgid "Don't know how to create '%s' connections"
msgstr "不知道如何创建“%s”连接"
-#: ../src/connection-editor/nm-connection-list.c:947
+#: ../src/connection-editor/nm-connection-list.c:939
msgid "Error creating connection"
msgstr "创建连接出错"
-#: ../src/connection-editor/nm-connection-list.c:1003
+#: ../src/connection-editor/nm-connection-list.c:995
msgid "Error editing connection"
msgstr "编辑连接出错"
-#: ../src/connection-editor/nm-connection-list.c:1004
+#: ../src/connection-editor/nm-connection-list.c:996
#, c-format
msgid "Did not find a connection with UUID '%s'"
msgstr "没有找到“%s”连接"
@@ -2052,15 +2258,15 @@ msgstr "802.1X 安全性"
msgid "Could not load 802.1x Security user interface."
msgstr "无法加载 802.1X 安全配置用户界面。"
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:137
msgid "Use 802.1_X security for this connection"
msgstr "对此连接使用 802.1_X 安全配置"
-#: ../src/connection-editor/page-bond.c:442
+#: ../src/connection-editor/page-bond.c:433
msgid "Could not load bond user interface."
msgstr "无法加载绑定用户界面。"
-#: ../src/connection-editor/page-bond.c:584
+#: ../src/connection-editor/page-bond.c:587
#, c-format
msgid "Bond connection %d"
msgstr "绑定连接 %d"
@@ -2085,19 +2291,19 @@ msgstr "桥接端口"
msgid "Could not load bridge port user interface."
msgstr "无法加载桥接端口用户界面。"
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dsl.c:139
msgid "Could not load DSL user interface."
msgstr "无法加载 DSL 用户界面。"
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:231
#, c-format
msgid "DSL connection %d"
msgstr "DSL 连接 %d"
-#: ../src/connection-editor/page-ethernet.c:90
-#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:81
+#: ../src/connection-editor/page-infiniband.c:65
+#: ../src/connection-editor/page-wifi.c:95
+#: ../src/connection-editor/page-wimax.c:61
msgid ""
"This option locks this connection to the network device specified by its "
"permanent MAC address entered here. Example: 00:11:22:33:44:55"
@@ -2105,22 +2311,22 @@ msgstr ""
"此选项可将此连接锁定至以在此输入的 MAC 地址指定的网络设备。例如："
"00:11:22:33:44:55"
-#: ../src/connection-editor/page-ethernet.c:253
+#: ../src/connection-editor/page-ethernet.c:244
msgid "Could not load ethernet user interface."
msgstr "无法加载以太网用户界面。"
-#: ../src/connection-editor/page-ethernet.c:396
+#: ../src/connection-editor/page-ethernet.c:387
#, c-format
msgid "Ethernet connection %d"
msgstr "以太网连接 %d"
#. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:59
+#: ../src/connection-editor/page-general.c:55
#: ../src/libnm-gtk/nm-mobile-providers.c:808
msgid "Default"
msgstr "默认"
-#: ../src/connection-editor/page-general.c:60
+#: ../src/connection-editor/page-general.c:56
msgid ""
"The zone defines the trust level of the connection. Default is not a regular "
"zone, selecting it results in the use of the default zone set in the "
@@ -2129,19 +2335,19 @@ msgstr ""
"区(zone)定义了连接的信任等级。默认值不是常规区，选择它会使用防火墙的默认区设"
"置。只在防火墙启用时有用。"
-#: ../src/connection-editor/page-general.c:61
+#: ../src/connection-editor/page-general.c:57
msgid "FirewallD is not running."
msgstr "FirewallD 未运行。"
-#: ../src/connection-editor/page-general.c:348
+#: ../src/connection-editor/page-general.c:330
msgid "Could not load General user interface."
msgstr "无法加载常规用户界面。"
-#: ../src/connection-editor/page-infiniband.c:171
+#: ../src/connection-editor/page-infiniband.c:162
msgid "Could not load InfiniBand user interface."
msgstr "无法加载 InfiniBand 用户界面。"
-#: ../src/connection-editor/page-infiniband.c:263
+#: ../src/connection-editor/page-infiniband.c:254
#, c-format
msgid "InfiniBand connection %d"
msgstr "InfiniBand 连接 %d"
@@ -2203,16 +2409,16 @@ msgstr "附加 _DNS 服务器："
msgid "Additional s_earch domains:"
msgstr "附加搜索域(_E)："
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:856
#, c-format
msgid "Editing IPv4 routes for %s"
msgstr "正在编辑 %s 的 IPv4 路由"
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1008
msgid "IPv4 Settings"
msgstr "IPv4 设置"
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1010
msgid "Could not load IPv4 user interface."
msgstr "无法加载 IPv4 用户界面。"
@@ -2221,7 +2427,6 @@ msgid "Automatic, addresses only"
msgstr "自动，仅地址"
#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
msgid "Ignore"
msgstr "忽略"
@@ -2229,57 +2434,74 @@ msgstr "忽略"
msgid "Automatic, DHCP only"
msgstr "自动，仅 DHCP"
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:819
#, c-format
msgid "Editing IPv6 routes for %s"
msgstr "正在编辑 %s 的 IPv6 路由"
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:969
msgid "IPv6 Settings"
msgstr "IPv6 设置"
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:971
msgid "Could not load IPv6 user interface."
msgstr "无法加载 IPv6 用户界面。"
-#: ../src/connection-editor/page-master.c:284
+#: ../src/connection-editor/page-master.c:244
+#: ../src/connection-editor/page-master.c:255
+msgid "Duplicate slaves"
+msgstr "重叠的从机"
+
+#: ../src/connection-editor/page-master.c:245
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr "从机“%s”与“%s”都应用于设备“%s“"
+
+#: ../src/connection-editor/page-master.c:256
+#, c-format
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr "从机“%s”和“%s”应用于同一物理设备的不同虚拟端口(“%s”和“%s”)。"
+
+#: ../src/connection-editor/page-master.c:373
#, c-format
msgid "%s slave %d"
msgstr "%s 从机 %d"
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:353
msgid "Could not load mobile broadband user interface."
msgstr "无法加载移动宽带用户界面。"
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:370
msgid "Unsupported mobile broadband connection type."
msgstr "不支持的移动宽带连接类型。"
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:620
msgid "Select Mobile Broadband Provider Type"
msgstr "选择移动宽带提供商类型"
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:647
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
msgstr "选择您的移动宽带提供商使用的技术。如不确定，请询问您的提供商。"
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:652
msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
msgstr "我的提供商使用基于 _GSM 的技术(如 GPRS、EDGE、UMTS、HSDPA)"
-#: ../src/connection-editor/page-mobile.c:705
+#: ../src/connection-editor/page-mobile.c:659
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr "我的提供商使用基于 C_DMA 的技术(如 1xRTT、EVDO)"
-#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:270
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
#: ../src/mobile-helpers.c:268
msgid "GSM"
msgstr "GSM"
@@ -2289,24 +2511,24 @@ msgid "EAP"
msgstr "EAP"
#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/wireless-security/eap-method-ttls.c:248
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/wireless-security/eap-method-ttls.c:298
msgid "CHAP"
msgstr "CHAP"
#: ../src/connection-editor/page-ppp.c:140
#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/eap-method-ttls.c:281
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/wireless-security/eap-method-ttls.c:265
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -2328,11 +2550,50 @@ msgstr "PPP 设置"
msgid "Could not load PPP user interface."
msgstr "无法加载 PPP 用户界面。"
-#: ../src/connection-editor/page-vlan.c:482
+#: ../src/connection-editor/page-team.c:94
+#: ../src/connection-editor/page-team-port.c:77
+#: ../src/connection-editor/vpn-helpers.c:234
+msgid "Select file to import"
+msgstr "选择要导入的文件"
+
+#: ../src/connection-editor/page-team.c:114
+#: ../src/connection-editor/page-team-port.c:97
+msgid "Error: file doesn't contain a valid JSON configuration"
+msgstr "错误：此文件不含任何有效的 JSON 配置"
+
+#: ../src/connection-editor/page-team.c:258
+msgid "Could not load team user interface."
+msgstr "无法加载组队用户界面。"
+
+#: ../src/connection-editor/page-team.c:353
+#, c-format
+msgid "Team connection %d"
+msgstr "组队连接 %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:157
+msgid "Team Port"
+msgstr "组队端口"
+
+#: ../src/connection-editor/page-team-port.c:159
+msgid "Could not load team port user interface."
+msgstr "无法加载组队端口用户界面。"
+
+#. Translators: the first %s is a device name (eg, "em1"), the
+#. * second is a connection name (eg, "Auto Ethernet").
+#.
+#: ../src/connection-editor/page-vlan.c:318
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr "%s (通过“%s”）"
+
+#: ../src/connection-editor/page-vlan.c:484
msgid "Could not load vlan user interface."
msgstr "无法加载 VLAN 用户界面。"
-#: ../src/connection-editor/page-vlan.c:678
+#: ../src/connection-editor/page-vlan.c:680
#, c-format
msgid "VLAN connection %d"
msgstr "VLAN 连接 %d"
@@ -2375,7 +2636,7 @@ msgstr ""
"请为新建连接选择一个 VPN 类型。如果您希望建立的 VPN 连接类型未出现在列表中，"
"您可能没有安装正确的 VPN 插件。"
-#: ../src/connection-editor/page-wifi.c:98
+#: ../src/connection-editor/page-wifi.c:85
msgid ""
"This option locks this connection to the Wi-Fi access point (AP) specified "
"by the BSSID entered here. Example: 00:11:22:33:44:55"
@@ -2383,74 +2644,69 @@ msgstr ""
"此选项可将此连接锁定至以在此输入的 BSSID 指定的 Wi-Fi 访问点(AP)。例如："
"00:11:22:33:44:55"
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:176
+#: ../src/connection-editor/page-wifi.c:197
#, c-format
msgid "default"
msgstr "默认"
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:201
#, c-format
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:485
+#: ../src/connection-editor/page-wifi.c:467
msgid "Could not load Wi-Fi user interface."
msgstr "无法加载 Wi-Fi 用户界面。"
-#: ../src/connection-editor/page-wifi.c:663
+#: ../src/connection-editor/page-wifi.c:638
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 连接 %d"
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "无"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/libnm-gtk/nm-wifi-dialog.c:892
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128 位密钥(十六进制或 ASCII)"
-#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:296
+#: ../src/libnm-gtk/nm-wifi-dialog.c:901
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128 位密码句"
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../src/connection-editor/page-wifi-security.c:322
+#: ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "Dynamic WEP (802.1x)"
msgstr "动态 WEP (802.1x)"
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:336
+#: ../src/libnm-gtk/nm-wifi-dialog.c:945
msgid "WPA & WPA2 Personal"
msgstr "WPA 及 WPA2 个人"
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:350
+#: ../src/libnm-gtk/nm-wifi-dialog.c:959
msgid "WPA & WPA2 Enterprise"
msgstr "WPA 及 WPA2 企业"
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:391
msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
msgstr "无法加载 Wi-Fi 安全性用户界面，缺少 Wi-Fi 设置。"
-#: ../src/connection-editor/page-wifi-security.c:407
+#: ../src/connection-editor/page-wifi-security.c:402
msgid "Wi-Fi Security"
msgstr "Wi-Fi 安全性"
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:404
msgid "Could not load Wi-Fi security user interface."
msgstr "无法加载 Wi-Fi 安全性用户界面。"
-#: ../src/connection-editor/page-wimax.c:137
+#: ../src/connection-editor/page-wimax.c:128
msgid "Could not load WiMAX user interface."
msgstr "无法加载 WiMAX 用户界面。"
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wimax.c:224
#, c-format
msgid "WiMAX connection %d"
msgstr "WiMAX 连接 %d"
@@ -2471,29 +2727,25 @@ msgstr ""
"\n"
"错误：%s。"
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "选择要导入的文件"
-
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:284
#, c-format
msgid "A file named \"%s\" already exists."
msgstr "名为“%s”的文件已存在。"
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:286
msgid "_Replace"
msgstr "替换(_R)"
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:288
#, c-format
msgid "Do you want to replace %s with the VPN connection you are saving?"
msgstr "是否要将 %s 替换为您正在保存的 VPN 连接？"
-#: ../src/connection-editor/vpn-helpers.c:332
+#: ../src/connection-editor/vpn-helpers.c:324
msgid "Cannot export VPN connection"
msgstr "无法导出 VPN 连接"
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:326
#, c-format
msgid ""
"The VPN connection '%s' could not be exported to %s.\n"
@@ -2504,11 +2756,11 @@ msgstr ""
"\n"
"错误：%s。"
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:361
msgid "Export VPN connection..."
msgstr "导出 VPN 连接..."
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
msgid ""
"The NetworkManager Applet could not find some required resources (the .ui "
"file was not found)."
@@ -2526,86 +2778,86 @@ msgid ""
"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
msgstr "蓝牙配置不可用(查找 NetworkManager 出错：(%s) %s)。"
-#: ../src/gnome-bluetooth/bt-widget.c:445
+#: ../src/gnome-bluetooth/bt-widget.c:441
msgid "Use your mobile phone as a network device (PAN/NAP)"
msgstr "使用您的移动电话作为网络设备(PAN/NAP)"
-#: ../src/gnome-bluetooth/bt-widget.c:454
+#: ../src/gnome-bluetooth/bt-widget.c:450
msgid "Access the Internet using your mobile phone (DUN)"
msgstr "使用您的手机访问互联网(DUN)"
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
+#: ../src/gnome-bluetooth/nma-bt-device.c:324
#, c-format
msgid "Error: %s"
msgstr "错误：%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
+#: ../src/gnome-bluetooth/nma-bt-device.c:431
#, c-format
msgid "Failed to create DUN connection: %s"
msgstr "无法建立 DUN 连接：%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:985
+#: ../src/gnome-bluetooth/nma-bt-device.c:433
+#: ../src/gnome-bluetooth/nma-bt-device.c:947
msgid "Your phone is now ready to use!"
msgstr "您的电话已经可以使用！"
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
+#: ../src/gnome-bluetooth/nma-bt-device.c:456
msgid "Mobile wizard was canceled"
msgstr "移动连接向导已被取消"
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
+#: ../src/gnome-bluetooth/nma-bt-device.c:465
msgid "Unknown phone device type (not GSM or CDMA)"
msgstr "未知电话设备类型(不是 GSM 或者 CDMA)"
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
+#: ../src/gnome-bluetooth/nma-bt-device.c:501
msgid "unknown modem type."
msgstr "未知调制解调器类型。"
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
+#: ../src/gnome-bluetooth/nma-bt-device.c:721
+#: ../src/gnome-bluetooth/nma-bt-device.c:727
msgid "failed to connect to the phone."
msgstr "连接到电话失败。"
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
+#: ../src/gnome-bluetooth/nma-bt-device.c:758
msgid "unexpectedly disconnected from the phone."
msgstr "意外断开与电话的连接。"
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
+#: ../src/gnome-bluetooth/nma-bt-device.c:768
msgid "timed out detecting phone details."
msgstr "检测电话详细信息时超时。"
-#: ../src/gnome-bluetooth/nma-bt-device.c:816
+#: ../src/gnome-bluetooth/nma-bt-device.c:779
msgid "Detecting phone configuration..."
msgstr "正在检测电话配置..."
-#: ../src/gnome-bluetooth/nma-bt-device.c:869
-msgid "ModemManager is not running"
-msgstr "调制解调器管理器未运行"
+#: ../src/gnome-bluetooth/nma-bt-device.c:811
+msgid "error getting bus connection"
+msgstr "获取总线连接出错"
-#: ../src/gnome-bluetooth/nma-bt-device.c:946
+#: ../src/gnome-bluetooth/nma-bt-device.c:908
msgid ""
"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
"Networking connection."
msgstr "在设置拨号网络连接前必须启用默认蓝牙适配器。"
-#: ../src/gnome-bluetooth/nma-bt-device.c:983
+#: ../src/gnome-bluetooth/nma-bt-device.c:945
#, c-format
msgid "Failed to create PAN connection: %s"
msgstr "无法建立 PAN 连接：%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:1004
+#: ../src/gnome-bluetooth/nma-bt-device.c:966
#, c-format
msgid "%s Network"
msgstr "%s 网络"
#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "自动解锁此设备"
-
-#: ../src/gsm-unlock.ui.h:2
msgid "_Unlock"
msgstr "解锁(_U)"
+#: ../src/gsm-unlock.ui.h:2
+msgid "Automatically unlock this device"
+msgstr "自动解锁此设备"
+
#: ../src/info.ui.h:1
msgid "Connection Information"
msgstr "连接信息"
@@ -2614,27 +2866,27 @@ msgstr "连接信息"
msgid "Active Network Connections"
msgstr "活动的网络连接"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../src/libnm-gtk/nm-mobile-wizard.c:204
msgid ""
"Your mobile broadband connection is configured with the following settings:"
msgstr "您的移动宽带连接已按以下设定配置："
#. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnm-gtk/nm-mobile-wizard.c:211
msgid "Your Device:"
msgstr "您的设备："
#. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnm-gtk/nm-mobile-wizard.c:222
msgid "Your Provider:"
msgstr "您的服务商："
#. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnm-gtk/nm-mobile-wizard.c:233
msgid "Your Plan:"
msgstr "您的套餐："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../src/libnm-gtk/nm-mobile-wizard.c:254
msgid ""
"A connection will now be made to your mobile broadband provider using the "
"settings you selected. If the connection fails or you cannot access network "
@@ -2646,23 +2898,23 @@ msgstr ""
"访问网络资源，请检查您的设置。要修改您的移动宽带设置，在系统 >> 首选项菜单中"
"选择“网络连接”。"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnm-gtk/nm-mobile-wizard.c:266
msgid "Confirm Mobile Broadband Settings"
msgstr "确认移动宽带设置"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnm-gtk/nm-mobile-wizard.c:330
msgid "Unlisted"
msgstr "未列出"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnm-gtk/nm-mobile-wizard.c:461
msgid "_Select your plan:"
msgstr "选择您的套餐(_S)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../src/libnm-gtk/nm-mobile-wizard.c:485
msgid "Selected plan _APN (Access Point Name):"
msgstr "所选套餐的 _APN (访问点名称)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:541
+#: ../src/libnm-gtk/nm-mobile-wizard.c:505
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your "
"broadband account or may prevent connectivity.\n"
@@ -2673,105 +2925,105 @@ msgstr ""
"\n"
"如果您不确定您的套餐，请询问您的提供商以获取套餐的 APN。"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnm-gtk/nm-mobile-wizard.c:512
msgid "Choose your Billing Plan"
msgstr "选择您的付费套餐"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnm-gtk/nm-mobile-wizard.c:561
msgid "My plan is not listed..."
msgstr "我的套餐未被列出..."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../src/libnm-gtk/nm-mobile-wizard.c:714
msgid "Select your provider from a _list:"
msgstr "从列表中选择您的提供商(_L)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnm-gtk/nm-mobile-wizard.c:727
msgid "Provider"
msgstr "提供商"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../src/libnm-gtk/nm-mobile-wizard.c:752
msgid "I can't find my provider and I wish to enter it _manually:"
msgstr "找不到我的提供商，希望手动输入(_M)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnm-gtk/nm-mobile-wizard.c:765
msgid "Provider:"
msgstr "提供商："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../src/libnm-gtk/nm-mobile-wizard.c:782
msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
msgstr "我的提供商使用 GSM 技术(GPRS, EDGE, UMTS, HSPA)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:833
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "我的提供商使用 CDMA 技术(1xRTT, EVDO)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnm-gtk/nm-mobile-wizard.c:795
msgid "Choose your Provider"
msgstr "选择您的提供商"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
msgid "Country or Region List:"
msgstr "国家或地区列表："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
msgid "Country or region"
msgstr "国家或地区"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
msgid "My country is not listed"
msgstr "我所在国家/地区没有被列出"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
msgid "Choose your Provider's Country or Region"
msgstr "选择您的提供商的国家或地区"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
msgid "Installed GSM device"
msgstr "已安装的 GSM 设备"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
msgid "Installed CDMA device"
msgstr "已安装的 CDMA 设备"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
"cellular (3G) network."
msgstr "此助手程序可帮助您简单地设置一个到蜂窝(3G)网络的移动宽带连接。"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
msgid "You will need the following information:"
msgstr "您将需要以下信息："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
msgid "Your broadband provider's name"
msgstr "您的宽带提供商名称"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
msgid "Your broadband billing plan name"
msgstr "您的宽带付费套餐名称"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "(在某些情况下)您的宽带付费套餐 APN (访问点名称)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
msgid "Create a connection for _this mobile broadband device:"
msgstr "为此移动宽带设备创建一个连接(_T)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
msgid "Any device"
msgstr "任何设备"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
msgid "Set up a Mobile Broadband Connection"
msgstr "设置一个移动宽带连接"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
msgid "New Mobile Broadband Connection"
msgstr "新移动宽带连接"
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
msgid "Wired"
msgstr "有线"
@@ -2783,15 +3035,15 @@ msgstr "蓝牙"
msgid "OLPC Mesh"
msgstr "OLPC Mesh"
-#: ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:345
msgid "ADSL"
msgstr "ADSL"
-#: ../src/libnm-gtk/nm-ui-utils.c:405
+#: ../src/libnm-gtk/nm-ui-utils.c:408
msgid "PCI"
msgstr "PCI"
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:410
msgid "USB"
msgstr "USB"
@@ -2801,60 +3053,73 @@ msgstr "USB"
#. * "%2$s (%1$s)" if there's no grammatical way to combine
#. * the strings otherwise.
#.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
#, c-format
msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnm-gtk/nm-wifi-dialog.c:435
msgid "New..."
msgstr "新建..."
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1055
+#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "无"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
msgid "C_reate"
msgstr "创建(_R)"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
#, c-format
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
msgstr "需要密码或密钥来访问 Wi-Fi 网络 %s。"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1156
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
msgid "Wi-Fi Network Authentication Required"
msgstr "需要 Wi-Fi 网络认证"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
msgid "Authentication required by Wi-Fi network"
msgstr "Wi-Fi 网络要求认证"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
msgid "Create New Wi-Fi Network"
msgstr "创建新的 Wi-Fi 网络"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
msgid "New Wi-Fi network"
msgstr "新建 Wi-Fi 网络"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
msgid "Enter a name for the Wi-Fi network you wish to create."
msgstr "输入您要创建的 Wi-Fi 网络的名称。"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
msgid "Connect to Hidden Wi-Fi Network"
msgstr "连接到隐藏的 Wi-Fi 网络"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
msgid "Hidden Wi-Fi network"
msgstr "隐藏的 Wi-Fi 网络"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1171
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
msgid ""
"Enter the name and security details of the hidden Wi-Fi network you wish to "
"connect to."
msgstr "输入您要连接的隐藏的 Wi-Fi 网络的名称及安全性详细信息。"
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Secondary Password:"
+msgstr "次要密码(_S)："
+
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
+msgid "Sh_ow passwords"
+msgstr "显示密码(_O)"
+
#: ../src/libnm-gtk/wifi.ui.h:2
msgid "Wi-Fi _security:"
msgstr "Wi-Fi 安全性(_S)："
@@ -2876,8 +3141,8 @@ msgid ""
"This program is a component of NetworkManager (https://wiki.gnome.org/";
"Projects/NetworkManager/)."
msgstr ""
-"此程序是 NetworkManager 的一个组件(https://wiki.gnome.org/";
-"Projects/NetworkManager/)。"
+"此程序是 NetworkManager 的一个组件(https://wiki.gnome.org/Projects/";
+"NetworkManager/)。"
#: ../src/main.c:76
msgid ""
@@ -2967,16 +3232,16 @@ msgstr "漫游网络(%s)"
msgid "Roaming network"
msgstr "漫游网络"
-#: ../src/mobile-helpers.c:317
+#: ../src/mobile-helpers.c:318
#, c-format
msgid "PIN code for SIM card '%s' on '%s'"
msgstr "%2$s 上 SIM 卡 %1$s 的 PIN 码"
-#: ../src/mobile-helpers.c:450
+#: ../src/mobile-helpers.c:451
msgid "PIN code required"
msgstr "需要 PIN 码"
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:459
msgid "PIN code is needed for the mobile broadband device"
msgstr "移动宽带设备需要 PIN 码。"
@@ -2986,45 +3251,36 @@ msgstr "移动宽带设备需要 PIN 码。"
msgid "%s connection"
msgstr "%s 连接"
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "未选定认证中心证书"
+#: ../src/utils/utils.c:376
+msgid "Store the password only for this _user"
+msgstr "只为当前用户保存密码(_U)"
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"不使用认证中心(CA)证书可能导致连接到不安全的 Wi-Fi 网络。要选择一个认证中心证"
-"书吗？"
-
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "选择 CA 证书文件"
+#: ../src/utils/utils.c:378
+msgid "Store the password for _all users"
+msgstr "为所有用户保存密码(_A)"
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER，PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:440
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER，PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
-#: ../src/wireless-security/eap-method.c:648
+#: ../src/wireless-security/eap-method.c:443
msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
msgstr "DER 或 PEM 证书(*.der, *.pem, *.crt, *.cer)"
#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-peap.c:298
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:400
msgid "Choose a PAC file..."
msgstr "选择一个 PAC 文件..."
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:407
msgid "PAC files (*.pac)"
msgstr "PAC 文件(*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:411
msgid "All files"
msgstr "所有文件"
@@ -3051,8 +3307,8 @@ msgid "PAC _file:"
msgstr "PAC 文件(_F)："
#: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
msgid "_Inner authentication:"
msgstr "内部认证(_I)："
@@ -3060,14 +3316,14 @@ msgstr "内部认证(_I)："
msgid "Allow automatic PAC pro_visioning"
msgstr "允许自动 PAC 配置(_V)"
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-peap.c:281
+#: ../src/wireless-security/wireless-security.c:417
msgid "MD5"
msgstr "MD5"
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../src/wireless-security/eap-method-peap.c:377
+#: ../src/wireless-security/eap-method-tls.c:464
+#: ../src/wireless-security/eap-method-ttls.c:377
msgid "Choose a Certificate Authority certificate..."
msgstr "选择一个认证中心证书..."
@@ -3085,7 +3341,13 @@ msgstr "版本 1"
msgid "C_A certificate:"
msgstr "C_A 证书："
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "No CA certificate is _required"
+msgstr "不需要 CA 证书(_R)"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
msgid "PEAP _version:"
msgstr "PEAP 版本(_V)："
@@ -3093,11 +3355,11 @@ msgstr "PEAP 版本(_V)："
msgid "As_k for this password every time"
msgstr "总是询问该密码(_K)"
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:279
msgid "Unencrypted private keys are insecure"
msgstr "未加密的私钥是不安全的"
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:282
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 "
@@ -3110,11 +3372,11 @@ msgstr ""
"\n"
"(您可以使用 openssl 来对私钥进行密码保护)"
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:458
msgid "Choose your personal certificate..."
msgstr "选择您的个人证书..."
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:470
msgid "Choose your private key..."
msgstr "选择您的私钥..."
@@ -3126,27 +3388,31 @@ msgstr "身份(_D)："
msgid "_User certificate:"
msgstr "用户证书(_U)："
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
msgid "Private _key:"
msgstr "私钥(_K)："
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
msgid "_Private key password:"
msgstr "私钥密码(_P)："
-#: ../src/wireless-security/wireless-security.c:394
+#: ../src/wireless-security/wireless-security.c:429
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:454
+msgid "PWD"
+msgstr "PWD"
+
+#: ../src/wireless-security/wireless-security.c:465
msgid "FAST"
msgstr "FAST"
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:476
msgid "Tunneled TLS"
msgstr "隧道 TLS"
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:487
msgid "Protected EAP (PEAP)"
msgstr "受保护的 EAP (PEAP)"
@@ -3157,29 +3423,29 @@ msgid "Au_thentication:"
msgstr "认证(_T)："
#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "开放式系统"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "共享密钥"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:3
msgid "1 (Default)"
msgstr "1 (默认)"
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: ../src/wireless-security/ws-wep-key.ui.h:2
msgid "2"
msgstr "2"
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:3
msgid "3"
msgstr "3"
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wep-key.ui.h:4
msgid "4"
msgstr "4"
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "开放式系统"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "共享密钥"
+
#: ../src/wireless-security/ws-wep-key.ui.h:7
msgid "_Key:"
msgstr "密钥(_K)："
@@ -3192,8 +3458,22 @@ msgstr "显示密钥(_W)"
msgid "WEP inde_x:"
msgstr "WEP 索引(_X)："
-#~ msgid "error getting bus connection"
-#~ msgstr "获取总线连接出错"
+#~ msgid "ModemManager is not running"
+#~ msgstr "调制解调器管理器未运行"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "未选定认证中心证书"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "不使用认证中心(CA)证书可能导致连接到不安全的 Wi-Fi 网络。要选择一个认证中"
+#~ "心证书吗？"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "选择 CA 证书文件"
#~ msgid "Wireless Networks (%s)"
#~ msgstr "无线网络(%s)"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
