[network-manager-applet] update Simplified Chinese (zh_CN) translation

From: YunQiang Su <yqsu src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-applet] update Simplified Chinese (zh_CN) translation
Date: Fri, 12 Jul 2013 14:08:44 +0000 (UTC)
commit 14d519b4c84fe4f73afe58790f781c8630ab6231
Author: Wylmer Wang <wantinghard gmail com>
Date:   Fri Jul 12 22:05:53 2013 +0800

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po |  647 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 336 insertions(+), 311 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c5f1d62..6257fb8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,8 +20,8 @@ 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: 2012-12-18 15:04+0000\n"
-"PO-Revision-Date: 2013-01-09 07:14+0800\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"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: \n"
@@ -125,37 +125,37 @@ msgstr "802.1X 认证"
 msgid "_Network name:"
 msgstr "网络名称(_N)："
 
-#: ../src/applet.c:513
+#: ../src/applet.c:541
 msgid "Failed to add/activate connection"
 msgstr "无法添加/启用连接"
 
-#: ../src/applet.c:515 ../src/applet.c:559 ../src/applet.c:585
+#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
 #: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../src/applet.c:518 ../src/applet.c:588 ../src/applet-device-wifi.c:1379
+#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
 #: ../src/applet-device-wifi.c:1398
 msgid "Connection failure"
 msgstr "连接失败"
 
-#: ../src/applet.c:557
+#: ../src/applet.c:585
 msgid "Device disconnect failed"
 msgstr "设备断开失败"
 
-#: ../src/applet.c:562
+#: ../src/applet.c:590
 msgid "Disconnect failure"
 msgstr "断开失败"
 
-#: ../src/applet.c:583
+#: ../src/applet.c:611
 msgid "Connection activation failed"
 msgstr "连接启用失败"
 
-#: ../src/applet.c:953 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:982 ../src/applet-device-wifi.c:1069
 msgid "Don't show this message again"
 msgstr "不再显示此信息"
 
-#: ../src/applet.c:1042
+#: ../src/applet.c:1071
 #, c-format
 msgid ""
 "\n"
@@ -165,7 +165,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。网络连接被中断。"
 
-#: ../src/applet.c:1045
+#: ../src/applet.c:1074
 #, c-format
 msgid ""
 "\n"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN 服务异常中断。"
 
-#: ../src/applet.c:1048
+#: ../src/applet.c:1077
 #, c-format
 msgid ""
 "\n"
@@ -184,7 +184,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN 服务返回了一个非法配置。"
 
-#: ../src/applet.c:1051
+#: ../src/applet.c:1080
 #, c-format
 msgid ""
 "\n"
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。连接超时。"
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:1083
 #, c-format
 msgid ""
 "\n"
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN 服务未在所需时间内启动。"
 
-#: ../src/applet.c:1057
+#: ../src/applet.c:1086
 #, c-format
 msgid ""
 "\n"
@@ -211,7 +211,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN 服务启动失败。"
 
-#: ../src/applet.c:1060
+#: ../src/applet.c:1089
 #, c-format
 msgid ""
 "\n"
@@ -220,7 +220,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。没有合法的 VPN secret。"
 
-#: ../src/applet.c:1063
+#: ../src/applet.c:1092
 #, c-format
 msgid ""
 "\n"
@@ -229,7 +229,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN secret 非法。"
 
-#: ../src/applet.c:1070
+#: ../src/applet.c:1099
 #, c-format
 msgid ""
 "\n"
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。"
 
-#: ../src/applet.c:1088
+#: ../src/applet.c:1117
 #, c-format
 msgid ""
 "\n"
@@ -248,7 +248,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”已断开。网络连接被中断。"
 
-#: ../src/applet.c:1091
+#: ../src/applet.c:1120
 #, c-format
 msgid ""
 "\n"
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”已断开。VPN 服务已停止。"
 
-#: ../src/applet.c:1097
+#: ../src/applet.c:1126
 #, c-format
 msgid ""
 "\n"
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”已断开。"
 
-#: ../src/applet.c:1127
+#: ../src/applet.c:1156
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -277,19 +277,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1129
+#: ../src/applet.c:1158
 msgid "VPN connection has been successfully established.\n"
 msgstr "已成功建立 VPN 连接。\n"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:1160
 msgid "VPN Login Message"
 msgstr "VPN 登录消息"
 
-#: ../src/applet.c:1137 ../src/applet.c:1145 ../src/applet.c:1195
+#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224
 msgid "VPN Connection Failed"
 msgstr "VPN 连接失败"
 
-#: ../src/applet.c:1202
+#: ../src/applet.c:1231
 #, c-format
 msgid ""
 "\n"
@@ -302,7 +302,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1205
+#: ../src/applet.c:1234
 #, c-format
 msgid ""
 "\n"
@@ -315,170 +315,171 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1520
+#: ../src/applet.c:1549
 msgid "device not ready (firmware missing)"
 msgstr "设备未就绪(缺少固件)"
 
-#: ../src/applet.c:1522
+#: ../src/applet.c:1551
 msgid "device not ready"
 msgstr "设备未就绪"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1532 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229
 msgid "disconnected"
 msgstr "已断开"
 
-#: ../src/applet.c:1548
+#: ../src/applet.c:1577
 msgid "Disconnect"
 msgstr "断开"
 
-#: ../src/applet.c:1562
+#: ../src/applet.c:1591
 msgid "device not managed"
 msgstr "设备未托管"
 
-#: ../src/applet.c:1606
+#: ../src/applet.c:1635
 msgid "No network devices available"
 msgstr "没有可用的网络设备"
 
-#: ../src/applet.c:1694
+#: ../src/applet.c:1723
 msgid "_VPN Connections"
 msgstr "_VPN 连接"
 
-#: ../src/applet.c:1751
+#: ../src/applet.c:1780
 msgid "_Configure VPN..."
 msgstr "配置 VPN(_C)..."
 
-#: ../src/applet.c:1755
+#: ../src/applet.c:1784
 msgid "_Disconnect VPN"
 msgstr "断开 VPN(_D)"
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1878
 msgid "NetworkManager is not running..."
 msgstr "网络管理器未运行..."
 
-#: ../src/applet.c:1854 ../src/applet.c:2656
+#: ../src/applet.c:1883 ../src/applet.c:2735
 msgid "Networking disabled"
 msgstr "网络已禁用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2075
+#: ../src/applet.c:2104
 msgid "Enable _Networking"
 msgstr "启用联网(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2084
+#: ../src/applet.c:2113
 msgid "Enable _Wi-Fi"
 msgstr "启用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2093
+#: ../src/applet.c:2122
 msgid "Enable _Mobile Broadband"
 msgstr "启用移动宽带(_M)"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2102
+#: ../src/applet.c:2131
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "启用 WiMA_X 移动宽带"
 
 #. Toggle notifications item
-#: ../src/applet.c:2113
+#: ../src/applet.c:2142
 msgid "Enable N_otifications"
 msgstr "启用通知(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2124
+#: ../src/applet.c:2153
 msgid "Connection _Information"
 msgstr "连接信息(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2134
+#: ../src/applet.c:2163
 msgid "Edit Connections..."
 msgstr "编辑连接..."
 
 #. Help item
-#: ../src/applet.c:2148
+#: ../src/applet.c:2177
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. About item
-#: ../src/applet.c:2157
+#: ../src/applet.c:2186
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/applet.c:2335
+#: ../src/applet.c:2364
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../src/applet.c:2336
+#: ../src/applet.c:2365
 msgid "The network connection has been disconnected."
 msgstr "网络连接现已断开。"
 
-#: ../src/applet.c:2519
+#: ../src/applet.c:2598
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "正在准备网络连接“%s”..."
 
-#: ../src/applet.c:2522
+#: ../src/applet.c:2601
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "网络连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2525 ../src/applet-device-bt.c:235
-#: ../src/applet-device-cdma.c:484 ../src/applet-device-gsm.c:538
-#: ../src/applet-device-wimax.c:469
+#: ../src/applet.c:2604 ../src/applet-device-bt.c:235
+#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "正在为“%s”请求一个网络地址..."
 
-#: ../src/applet.c:2528
+#: ../src/applet.c:2607
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "网络连接“%s”已处于活动状态"
 
-#: ../src/applet.c:2611
+#: ../src/applet.c:2690
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "正在启动 VPN 连接“%s”..."
 
-#: ../src/applet.c:2614
+#: ../src/applet.c:2693
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN 连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2696
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "正在为“%s”请求一个 VPN 地址..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2699
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN 连接“%s”已处于活动状态"
 
-#: ../src/applet.c:2661
+#: ../src/applet.c:2740
 msgid "No network connection"
 msgstr "没有网络连接"
 
-#: ../src/applet.c:3362
+#: ../src/applet.c:3442
 msgid "NetworkManager Applet"
 msgstr "网络管理器小程序"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:393
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-gsm.c:447
-#: ../src/applet-device-wifi.c:859 ../src/applet-device-wimax.c:275
+#: ../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
 msgid "Available"
 msgstr "可用的"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:435
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-gsm.c:489
-#: ../src/applet-device-wimax.c:419
+#: ../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:439
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-gsm.c:493
-#: ../src/applet-device-wifi.c:1261 ../src/applet-device-wimax.c:423
+#: ../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
 msgid "Connection Established"
 msgstr "连接已建立"
 
@@ -486,42 +487,37 @@ msgstr "连接已建立"
 msgid "You are now connected to the mobile broadband network."
 msgstr "您现在已连接到移动宽带网络。"
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-cdma.c:475
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:460
+#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
+#: ../src/mobile-helpers.c:585
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "正在准备移动宽带连接“%s”..."
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:463
+#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
+#: ../src/mobile-helpers.c:588
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "正在配置移动宽带连接“%s”..."
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:466
+#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
+#: ../src/mobile-helpers.c:591
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "移动宽带连接“%s”需要用户认证..."
 
-#: ../src/applet-device-bt.c:239 ../src/applet-device-cdma.c:502
-#: ../src/applet-device-gsm.c:556
+#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:611
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "移动宽带连接“%s”已处于活动状态"
 
-#: ../src/applet-device-cdma.c:182 ../src/connection-editor/page-mobile.c:715
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
-
-#: ../src/applet-device-cdma.c:339 ../src/applet-device-gsm.c:393
-#: ../src/applet-dialogs.c:424
+#: ../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:341 ../src/applet-device-gsm.c:395
+#: ../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
@@ -529,35 +525,26 @@ msgid "Mobile Broadband"
 msgstr "移动宽带"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:406
+#: ../src/applet-device-cdma.c:316
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "新建移动宽带(CDMA)连接..."
 
-#: ../src/applet-device-cdma.c:440
+#: ../src/applet-device-cdma.c:350
 msgid "You are now connected to the CDMA network."
 msgstr "您现在已连接到 CDMA 网络。"
 
-#: ../src/applet-device-cdma.c:497 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:478
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "移动宽带连接“%s”已处于活动状态：(%d%%%s%s)"
-
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:554
-#: ../src/applet-device-wimax.c:481
-msgid "roaming"
-msgstr "漫游中"
-
-#: ../src/applet-device-cdma.c:641 ../src/applet-device-cdma.c:647
+#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
 msgid "CDMA network."
 msgstr "CDMA 网络。"
 
 # 这里的"home network"与下面的“漫游网络”是对比的关闭，应和下文的其他地方译法一致为“主网络”才说的通。
-#: ../src/applet-device-cdma.c:642 ../src/applet-device-gsm.c:1154
+#: ../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:648 ../src/applet-device-gsm.c:1160
+#: ../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 "您现在已注册到一个漫游网络。"
 
@@ -616,109 +603,42 @@ msgstr "以太网连接 %s 已处于活动状态"
 msgid "DSL authentication"
 msgstr "DSL 认证"
 
-#: ../src/applet-device-gsm.c:214 ../src/connection-editor/page-mobile.c:718
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:460
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "新建移动宽带(GSM)连接..."
-
-#: ../src/applet-device-gsm.c:494
-msgid "You are now connected to the GSM network."
-msgstr "您现在已连接到 GSM 网络。"
-
-#: ../src/applet-device-gsm.c:655
-msgid "PIN code required"
-msgstr "需要 PIN 码"
-
-#: ../src/applet-device-gsm.c:663
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "移动宽带设备需要 PIN 码。"
-
-#: ../src/applet-device-gsm.c:784
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "%2$s 上 SIM 卡 %1$s 的 PIN 码"
+#: ../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-gsm.c:876
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:497
 msgid "Wrong PIN code; please contact your provider."
 msgstr "错误的 PIN 代码；请联络您的供应商。"
 
-#: ../src/applet-device-gsm.c:899
-msgid "Wrong PUK code; please contact your provider."
-msgstr "错误的 PUK 代码；请联络您的供应商。"
-
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:926
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:547
 msgid "Sending unlock code..."
 msgstr "正在发送解锁码..."
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN unlock required"
-msgstr "需要解锁 SIM PIN"
-
-#: ../src/applet-device-gsm.c:990
-msgid "SIM PIN Unlock Required"
-msgstr "需要解锁 SIM PIN"
-
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:992
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PIN 码。"
-
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:994
-msgid "PIN code:"
-msgstr "PIN 代码："
-
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:998
-msgid "Show PIN code"
-msgstr "显示 PIN 码"
-
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK unlock required"
-msgstr "需要解锁 SIM PUK"
-
-#: ../src/applet-device-gsm.c:1002
-msgid "SIM PUK Unlock Required"
-msgstr "需要解锁 SIM PUK"
-
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1004
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PUK 码。"
+#. Default connection item
+#: ../src/applet-device-broadband.c:785
+msgid "New Mobile Broadband connection..."
+msgstr "新移动宽带连接..."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "PUK code:"
-msgstr "PUK 码："
+#: ../src/applet-device-broadband.c:821
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "您现在已连接到移动宽带网络。"
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1009
-msgid "New PIN code:"
-msgstr "新的 PIN 码："
+#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963
+msgid "Mobile Broadband network."
+msgstr "移动宽带网络。"
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1011
-msgid "Re-enter new PIN code:"
-msgstr "再次输入新的 PIN 码："
+#. Default connection item
+#: ../src/applet-device-gsm.c:372
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "新建移动宽带(GSM)连接..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1016
-msgid "Show PIN/PUK codes"
-msgstr "显示 PIN/PUK 码："
+#: ../src/applet-device-gsm.c:406
+msgid "You are now connected to the GSM network."
+msgstr "您现在已连接到 GSM 网络。"
 
-#: ../src/applet-device-gsm.c:1153 ../src/applet-device-gsm.c:1159
+#: ../src/applet-device-gsm.c:677 ../src/applet-device-gsm.c:683
 msgid "GSM network."
 msgstr "GSM 网络。"
 
@@ -833,6 +753,15 @@ msgstr "WiMAX 已通过硬件开关禁用"
 msgid "You are now connected to the WiMAX network."
 msgstr "您现在已连接到 WiMAX 网络。"
 
+#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:606
+#, 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
+msgid "roaming"
+msgstr "漫游中"
+
 #: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "显示连接信息时出错："
@@ -920,7 +849,7 @@ msgstr "WiMAX (%s)"
 
 #. --- General ---
 #: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:327
+#: ../src/connection-editor/page-general.c:345
 msgid "General"
 msgstr "常规"
 
@@ -1027,7 +956,7 @@ msgstr "VPN Banner："
 msgid "Base Connection:"
 msgstr "基本连接："
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
 msgid "Unknown"
 msgstr "未知"
 
@@ -1072,6 +1001,68 @@ msgstr "连接到“%s”需要密码。"
 msgid "Password:"
 msgstr "密码："
 
+#: ../src/applet-dialogs.c:1310
+msgid "SIM PIN unlock required"
+msgstr "需要解锁 SIM PIN"
+
+#: ../src/applet-dialogs.c:1311
+msgid "SIM PIN Unlock Required"
+msgstr "需要解锁 SIM PIN"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1313
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PIN 码。"
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1315
+msgid "PIN code:"
+msgstr "PIN 代码："
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1319
+msgid "Show PIN code"
+msgstr "显示 PIN 码"
+
+#: ../src/applet-dialogs.c:1321
+msgid "SIM PUK unlock required"
+msgstr "需要解锁 SIM PUK"
+
+#: ../src/applet-dialogs.c:1322
+msgid "SIM PUK Unlock Required"
+msgstr "需要解锁 SIM PUK"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1324
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PUK 码。"
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1326
+msgid "PUK code:"
+msgstr "PUK 码："
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1329
+msgid "New PIN code:"
+msgstr "新的 PIN 码："
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1331
+msgid "Re-enter new PIN code:"
+msgstr "再次输入新的 PIN 码："
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1336
+msgid "Show PIN/PUK codes"
+msgstr "显示 PIN/PUK 码："
+
 #: ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
@@ -1121,8 +1112,8 @@ msgid ""
 msgstr ""
 "请选择您希望创建的连接的类型。\n"
 "\n"
-"如果您要创建 VPN 连接，但需要的类型不在列表中，您可能没有安装相应的 VPN "
-"插件。"
+"如果您要创建 VPN 连接，但需要的类型不在列表中，您可能没有安装相应的 VPN 插"
+"件。"
 
 #: ../src/connection-editor/ce-new-connection.ui.h:6
 msgid "Create…"
@@ -1166,7 +1157,7 @@ msgstr "ARP"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:10
 msgid "Bonded _connections:"
-msgstr ""
+msgstr "已绑定连接(_C)："
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
 msgid "_Mode:"
@@ -1211,20 +1202,19 @@ msgstr "ARP 目标(_T)："
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
-msgstr ""
-"检测连接状态时使用的 IP 地址，或以逗号分隔的 IP 地址列表。"
+msgstr "检测连接状态时使用的 IP 地址，或以逗号分隔的 IP 地址列表。"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid "Link _up delay:"
-msgstr ""
+msgstr "链接建立延时(_U)："
 
 #: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _down delay:"
-msgstr ""
+msgstr "链接断开延时(_D)："
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
-msgstr ""
+msgstr "路径成本(_C):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
@@ -1233,7 +1223,7 @@ msgstr "优先级(_P)："
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:3
 msgid "_Hairpin mode:"
-msgstr ""
+msgstr "_Hairpin 模式："
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
 msgid "Bridged _connections:"
@@ -1245,7 +1235,7 @@ msgstr "转发延时(_F)："
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Hello time:"
-msgstr ""
+msgstr "问候时间(_H)："
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "s"
@@ -1267,7 +1257,7 @@ msgstr "老化时间(_A)："
 msgid "automatic"
 msgstr "自动"
 
-#: ../src/connection-editor/ce-page.c:356
+#: ../src/connection-editor/ce-page.c:362
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "由于一个未知错误，更新连接 secret 时失败。"
 
@@ -1395,20 +1385,20 @@ msgid "bytes"
 msgstr "字节"
 
 #: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "_Automatically connect to this network when it is available"
-msgstr "可用时自动链接到这个网络(_A)"
+msgid "Automatically connect to _VPN when using this connection"
+msgstr "使用此连接时自动连接 _VPN"
 
 #: ../src/connection-editor/ce-page-general.ui.h:2
 msgid "All _users may connect to this network"
 msgstr "所有用户都可以连接这个网络(_U)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "Firewall _zone:"
-msgstr ""
+msgid "_Automatically connect to this network when it is available"
+msgstr "可用时自动链接到这个网络(_A)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "使用此连接时自动连接 _VPN"
+msgid "Firewall _zone:"
+msgstr "防火墙区(_Z)："
 
 #: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
@@ -1417,7 +1407,7 @@ msgstr "传输模式(_T)："
 #. IP-over-InfiniBand "datagram mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
-msgstr ""
+msgstr "数据报文"
 
 #. IP-over-InfiniBand "connected mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:8
@@ -1801,7 +1791,7 @@ msgstr "网关"
 #: ../src/connection-editor/ip4-routes-dialog.c:813
 #: ../src/connection-editor/ip6-routes-dialog.c:755
 msgid "Metric"
-msgstr "公制"
+msgstr "度量"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:721
 #: ../src/connection-editor/page-ip6.c:911
@@ -1815,13 +1805,13 @@ msgid "Ethernet"
 msgstr "以太网"
 
 #: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:470 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/page-wifi.c:483 ../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/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:75
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
 msgid "WiMAX"
 msgstr "WiMAX"
 
@@ -1834,20 +1824,23 @@ msgstr "DSL"
 #: ../src/connection-editor/page-infiniband.c:168
 #: ../src/libnm-gtk/nm-ui-utils.c:335
 msgid "InfiniBand"
-msgstr ""
+msgstr "InfiniBand"
 
 #: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/connection-editor/page-bond.c:439 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:559
 msgid "Bond"
-msgstr ""
+msgstr "绑定"
 
 #: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:212
+#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
 msgid "Bridge"
 msgstr "桥接"
 
 #: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/libnm-gtk/nm-ui-utils.c:563
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -1904,48 +1897,48 @@ msgid ""
 "was not found)."
 msgstr "连接编辑器找不到所需的一些资源(未找到 .ui 文件)。"
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:413
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:414
 msgid "Save any changes made to this connection."
 msgstr "保存对此连接的全部更改。"
 
-#: ../src/connection-editor/nm-connection-editor.c:410
+#: ../src/connection-editor/nm-connection-editor.c:415
 msgid "_Save..."
 msgstr "保存(_S)..."
 
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:416
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "为本机所有用户保存此连接需要认证。"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:432
 msgid "Could not create connection"
 msgstr "无法创建连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:432
 msgid "Could not edit connection"
 msgstr "无法编辑连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:434
 msgid "Unknown error creating connection editor dialog."
 msgstr "创建连接编辑器对话框出现未知错误。"
 
-#: ../src/connection-editor/nm-connection-editor.c:536
+#: ../src/connection-editor/nm-connection-editor.c:541
 msgid "Error saving connection"
 msgstr "保存连接出错"
 
-#: ../src/connection-editor/nm-connection-editor.c:537
+#: ../src/connection-editor/nm-connection-editor.c:542
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "属性“%s”/“%s”非法：%d"
 
-#: ../src/connection-editor/nm-connection-editor.c:631
+#: ../src/connection-editor/nm-connection-editor.c:641
 msgid "Error initializing editor"
 msgstr "初始化编辑器错误"
 
-#: ../src/connection-editor/nm-connection-editor.c:968
+#: ../src/connection-editor/nm-connection-editor.c:962
 msgid "Connection add failed"
 msgstr "添加连接失败"
 
@@ -2029,20 +2022,24 @@ msgstr "删除(_D)..."
 msgid "Authenticate to delete the selected connection"
 msgstr "进行认证以删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:942
-msgid "Error creating connection"
-msgstr "创建连接出错"
-
 #: ../src/connection-editor/nm-connection-list.c:943
+msgid "No VPN plugins are installed."
+msgstr "未安装 VPN 插件。"
+
+#: ../src/connection-editor/nm-connection-list.c:945
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "不知道如何创建“%s”连接"
 
-#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:947
+msgid "Error creating connection"
+msgstr "创建连接出错"
+
+#: ../src/connection-editor/nm-connection-list.c:1003
 msgid "Error editing connection"
 msgstr "编辑连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:1004
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "没有找到“%s”连接"
@@ -2059,20 +2056,20 @@ msgstr "无法加载 802.1X 安全配置用户界面。"
 msgid "Use 802.1_X security for this connection"
 msgstr "对此连接使用 802.1_X 安全配置"
 
-#: ../src/connection-editor/page-bond.c:422
+#: ../src/connection-editor/page-bond.c:442
 msgid "Could not load bond user interface."
-msgstr ""
+msgstr "无法加载绑定用户界面。"
 
-#: ../src/connection-editor/page-bond.c:561
+#: ../src/connection-editor/page-bond.c:584
 #, c-format
 msgid "Bond connection %d"
-msgstr ""
+msgstr "绑定连接 %d"
 
-#: ../src/connection-editor/page-bridge.c:214
+#: ../src/connection-editor/page-bridge.c:215
 msgid "Could not load bridge user interface."
 msgstr "无法加载桥接用户界面。"
 
-#: ../src/connection-editor/page-bridge.c:309
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "桥接连接 %d"
@@ -2118,34 +2115,36 @@ msgid "Ethernet connection %d"
 msgstr "以太网连接 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:59
 #: ../src/libnm-gtk/nm-mobile-providers.c:808
 msgid "Default"
 msgstr "默认"
 
-#: ../src/connection-editor/page-general.c:58
+#: ../src/connection-editor/page-general.c:60
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
+"区(zone)定义了连接的信任等级。默认值不是常规区，选择它会使用防火墙的默认区设"
+"置。只在防火墙启用时有用。"
 
-#: ../src/connection-editor/page-general.c:59
+#: ../src/connection-editor/page-general.c:61
 msgid "FirewallD is not running."
 msgstr "FirewallD 未运行。"
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:348
 msgid "Could not load General user interface."
 msgstr "无法加载常规用户界面。"
 
 #: ../src/connection-editor/page-infiniband.c:171
 msgid "Could not load InfiniBand user interface."
-msgstr ""
+msgstr "无法加载 InfiniBand 用户界面。"
 
 #: ../src/connection-editor/page-infiniband.c:263
 #, c-format
 msgid "InfiniBand connection %d"
-msgstr ""
+msgstr "InfiniBand 连接 %d"
 
 #: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:132
@@ -2243,10 +2242,10 @@ msgstr "IPv6 设置"
 msgid "Could not load IPv6 user interface."
 msgstr "无法加载 IPv6 用户界面。"
 
-#: ../src/connection-editor/page-master.c:290
+#: ../src/connection-editor/page-master.c:284
 #, c-format
 msgid "%s slave %d"
-msgstr ""
+msgstr "%s 从机 %d"
 
 #: ../src/connection-editor/page-mobile.c:391
 msgid "Could not load mobile broadband user interface."
@@ -2275,47 +2274,57 @@ msgstr "我的提供商使用基于 _GSM 的技术(如 GPRS、EDGE、UMTS、HSDP
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的提供商使用基于 C_DMA 的技术(如 1xRTT、EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:715 ../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/mobile-helpers.c:268
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:137
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:138
 #: ../src/wireless-security/eap-method-ttls.c:230
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
+#: ../src/connection-editor/page-ppp.c:139
 #: ../src/wireless-security/eap-method-ttls.c:280
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
+#: ../src/connection-editor/page-ppp.c:141
 #: ../src/wireless-security/eap-method-ttls.c:247
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:144
 msgid "none"
 msgstr "无"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../src/connection-editor/page-ppp.c:204
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "正在编辑 %s 的 PPP 认证方法"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:287
 msgid "PPP Settings"
 msgstr "PPP 设置"
 
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:289
 msgid "Could not load PPP user interface."
 msgstr "无法加载 PPP 用户界面。"
 
@@ -2386,11 +2395,11 @@ msgstr "默认"
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:472
+#: ../src/connection-editor/page-wifi.c:485
 msgid "Could not load Wi-Fi user interface."
 msgstr "无法加载 Wi-Fi 用户界面。"
 
-#: ../src/connection-editor/page-wifi.c:649
+#: ../src/connection-editor/page-wifi.c:663
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
@@ -2536,7 +2545,7 @@ 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:959
+#: ../src/gnome-bluetooth/nma-bt-device.c:985
 msgid "Your phone is now ready to use!"
 msgstr "您的电话已经可以使用！"
 
@@ -2565,26 +2574,26 @@ msgstr "意外断开与电话的连接。"
 msgid "timed out detecting phone details."
 msgstr "检测电话详细信息时超时。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:791
+#: ../src/gnome-bluetooth/nma-bt-device.c:816
 msgid "Detecting phone configuration..."
 msgstr "正在检测电话配置..."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:823
-msgid "error getting bus connection"
-msgstr "获取总线连接出错"
+#: ../src/gnome-bluetooth/nma-bt-device.c:869
+msgid "ModemManager is not running"
+msgstr "调制解调器管理器未运行"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:920
+#: ../src/gnome-bluetooth/nma-bt-device.c:946
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "在设置拨号网络连接前必须启用默认蓝牙适配器。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
+#: ../src/gnome-bluetooth/nma-bt-device.c:983
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "无法建立 PAN 连接：%s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:978
+#: ../src/gnome-bluetooth/nma-bt-device.c:1004
 #, c-format
 msgid "%s Network"
 msgstr "%s 网络"
@@ -2762,7 +2771,7 @@ msgstr "设置一个移动宽带连接"
 msgid "New Mobile Broadband Connection"
 msgstr "新移动宽带连接"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:367
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
 msgid "Wired"
 msgstr "有线"
 
@@ -2774,25 +2783,25 @@ msgstr "蓝牙"
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:402
+#: ../src/libnm-gtk/nm-ui-utils.c:405
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: ../src/libnm-gtk/nm-ui-utils.c:407
 msgid "USB"
 msgstr "USB"
 
 #. Translators: the first %s is a bus name (eg, "USB") or
 #. * product name, the second is a device type (eg,
 #. * "Ethernet"). You can change this to something like
-#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:480 ../src/libnm-gtk/nm-ui-utils.c:500
+#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -2802,45 +2811,45 @@ msgstr "%s %s"
 msgid "New..."
 msgstr "新建..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1055
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1154
 #, 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:1138
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1156
 msgid "Wi-Fi Network Authentication Required"
 msgstr "需要 Wi-Fi 网络认证"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 网络要求认证"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Create New Wi-Fi Network"
 msgstr "创建新的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "New Wi-Fi network"
 msgstr "新建 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "输入您要创建的 Wi-Fi 网络的名称。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1168
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "连接到隐藏的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Hidden Wi-Fi network"
 msgstr "隐藏的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1171
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -2876,88 +2885,101 @@ msgid ""
 "GNOME desktop environment."
 msgstr "它不是被设计用于命令行交互的，您应该在 GNOME 桌面环境中运行。"
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:72
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:77
+#: ../src/mb-menu-item.c:76
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:113
+#: ../src/mb-menu-item.c:112
 msgid "not enabled"
 msgstr "未启用"
 
-#: ../src/mb-menu-item.c:119
+#: ../src/mb-menu-item.c:118
 msgid "not registered"
 msgstr "未注册"
 
-#: ../src/mb-menu-item.c:137
-#, fuzzy, c-format
+#: ../src/mb-menu-item.c:136
+#, c-format
 msgid "Home network (%s)"
-msgstr "主网络(%s)"
+msgstr "家庭网络(%s)"
 
-#: ../src/mb-menu-item.c:139
-#, fuzzy, c-format
+#: ../src/mb-menu-item.c:138
+#, c-format
 msgid "Home network"
-msgstr "主网络"
+msgstr "家庭网络"
 
-#: ../src/mb-menu-item.c:147
+#: ../src/mb-menu-item.c:146
 msgid "searching"
 msgstr "正在搜索"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:149
 msgid "registration denied"
 msgstr "注册被拒绝"
 
-#: ../src/mb-menu-item.c:155 ../src/mb-menu-item.c:161
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s(%s 漫游中)"
 
-#: ../src/mb-menu-item.c:157 ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s(漫游中)"
 
-#: ../src/mb-menu-item.c:166
+#: ../src/mb-menu-item.c:165
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "漫游网络(%s)"
 
-#: ../src/mb-menu-item.c:168
+#: ../src/mb-menu-item.c:167
 #, c-format
 msgid "Roaming network"
 msgstr "漫游网络"
 
+#: ../src/mobile-helpers.c:317
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "%2$s 上 SIM 卡 %1$s 的 PIN 码"
+
+#: ../src/mobile-helpers.c:450
+msgid "PIN code required"
+msgstr "需要 PIN 码"
+
+#: ../src/mobile-helpers.c:458
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "移动宽带设备需要 PIN 码。"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
 #: ../src/utils/utils.c:174
 #, c-format
@@ -2974,8 +2996,8 @@ msgid ""
 "to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
 "Authority certificate?"
 msgstr ""
-"不使用认证中心(CA)证书可能导致连接到不安全的 Wi-Fi 网络。要选择一个认证"
-"中心证书吗？"
+"不使用认证中心(CA)证书可能导致连接到不安全的 Wi-Fi 网络。要选择一个认证中心证"
+"书吗？"
 
 #: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
@@ -3182,6 +3204,9 @@ msgstr "显示密钥(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP 索引(_X)："
 
+#~ msgid "error getting bus connection"
+#~ msgstr "获取总线连接出错"
+
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "无线网络(%s)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]