[network-manager-applet/nma-0-9-10] update zh_CN translation

From: YunQiang Su <yqsu src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-applet/nma-0-9-10] update zh_CN translation
Date: Sun, 21 Sep 2014 06:20:34 +0000 (UTC)
commit 2e7774db2480de2deb418d960c2b531c7c7a197f
Author: Tong Hui <tonghuix gmail com>
Date:   Sun Sep 21 14:19:54 2014 +0800

    update zh_CN translation

 po/zh_CN.po |  575 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 292 insertions(+), 283 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ab17b12..b22f1ff 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@
 # YunQiang Su <wzssyqa gmail com>, 2012.
 # tuhaihe <wangdianjin linuxdeepin com>, 2012.
 # Aron Xu <aronxu gnome org>, 2010, 2013.
-# Tong Hui <tonghuix gmail com>, 2013.
+# Tong Hui <tonghuix gmail com>, 2013, 2014.
 # Sphinx Jiang <yishanj gmail com>, 2014.
 #
 msgid ""
@@ -22,9 +22,9 @@ 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: 2014-02-22 00:32+0000\n"
-"PO-Revision-Date: 2014-02-23 18:56+0800\n"
-"Last-Translator: Sphinx Jiang <yishanj gmail com>\n"
+"POT-Creation-Date: 2014-08-29 11:47+0000\n"
+"PO-Revision-Date: 2014-08-03 19:33+0800\n"
+"Last-Translator: Tong Hui <tonghuix gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -367,7 +367,7 @@ msgstr "断开 VPN(_D)"
 msgid "NetworkManager is not running..."
 msgstr "网络管理器未运行..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2940
+#: ../src/applet.c:1970 ../src/applet.c:2948
 msgid "Networking disabled"
 msgstr "网络已禁用"
 
@@ -429,57 +429,57 @@ msgstr "已断开连接"
 msgid "The network connection has been disconnected."
 msgstr "网络连接现已断开。"
 
-#: ../src/applet.c:2802
+#: ../src/applet.c:2810
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "正在准备网络连接“%s”..."
 
-#: ../src/applet.c:2805
+#: ../src/applet.c:2813
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "网络连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
+#: ../src/applet.c:2816 ../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:2811
+#: ../src/applet.c:2819
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "网络连接“%s”已处于活动状态"
 
-#: ../src/applet.c:2894
+#: ../src/applet.c:2902
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "正在启动 VPN 连接“%s”..."
 
-#: ../src/applet.c:2897
+#: ../src/applet.c:2905
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN 连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2900
+#: ../src/applet.c:2908
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "正在为“%s”请求一个 VPN 地址..."
 
-#: ../src/applet.c:2903
+#: ../src/applet.c:2911
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN 连接“%s”已处于活动状态"
 
-#: ../src/applet.c:2945
+#: ../src/applet.c:2953
 msgid "No network connection"
 msgstr "没有网络连接"
 
-#: ../src/applet.c:3615
+#: ../src/applet.c:3629
 msgid "NetworkManager Applet"
 msgstr "网络管理器小程序"
 
 #: ../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-broadband.c:770 ../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
@@ -488,7 +488,7 @@ msgid "Available"
 msgstr "可用的"
 
 #: ../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-broadband.c:797 ../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
@@ -564,13 +564,13 @@ msgstr "错误的 PIN 代码；请联络您的供应商。"
 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
+#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "移动宽带(%s)"
 
-#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
+#: ../src/applet-device-broadband.c:718 ../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
@@ -579,25 +579,25 @@ msgid "Mobile Broadband"
 msgstr "移动宽带"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:782
+#: ../src/applet-device-broadband.c:783
 msgid "New Mobile Broadband connection..."
 msgstr "新移动宽带连接..."
 
-#: ../src/applet-device-broadband.c:797
+#: ../src/applet-device-broadband.c:798
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "您现在已连接到移动宽带网络。"
 
-#: ../src/applet-device-broadband.c:932 ../src/applet-device-broadband.c:938
+#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
 msgid "Mobile Broadband network."
 msgstr "移动宽带网络。"
 
 # 这里的"home network"与下面的“漫游网络”是对比的关闭，应和下文的其他地方译法一致为“主网络”才说的通。
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
+#: ../src/applet-device-broadband.c:934 ../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-broadband.c:940 ../src/applet-device-cdma.c:409
 #: ../src/applet-device-gsm.c:668
 msgid "You are now registered on a roaming network."
 msgstr "您现在已注册到一个漫游网络。"
@@ -930,8 +930,8 @@ msgstr "显示连接信息时出错："
 
 #: ../src/applet-dialogs.c:109
 #: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:918
-#: ../src/wireless-security/wireless-security.c:441
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
+#: ../src/wireless-security/wireless-security.c:442
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -959,12 +959,12 @@ msgstr "无"
 msgid "%s (default)"
 msgstr "%s (默认)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "未知"
@@ -984,150 +984,138 @@ msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "未知"
 
-#: ../src/applet-dialogs.c:407
+#. Address
+#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
+msgid "IP Address:"
+msgstr "IP 地址："
+
+#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+msgctxt "Address"
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/applet-dialogs.c:400
+msgid "Broadcast Address:"
+msgstr "广播地址："
+
+#. Prefix
+#: ../src/applet-dialogs.c:409
+msgid "Subnet Mask:"
+msgstr "子网掩码："
+
+#: ../src/applet-dialogs.c:411
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
+msgid "Default Route:"
+msgstr "默认路由："
+
+#: ../src/applet-dialogs.c:530
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "以太网(%s)"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:533
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:540
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:542
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:546
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
 #: ../src/connection-editor/page-general.c:327
 msgid "General"
 msgstr "常规"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:556
 msgid "Interface:"
 msgstr "接口："
 
-#: ../src/applet-dialogs.c:449
+#: ../src/applet-dialogs.c:572
 msgid "Hardware Address:"
 msgstr "硬件地址："
 
 #. Driver
-#: ../src/applet-dialogs.c:457
+#: ../src/applet-dialogs.c:580
 msgid "Driver:"
 msgstr "驱动程序："
 
-#: ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:609
 msgid "Speed:"
 msgstr "速度："
 
-#: ../src/applet-dialogs.c:496
+#: ../src/applet-dialogs.c:619
 msgid "Security:"
 msgstr "安全性："
 
-#: ../src/applet-dialogs.c:509
+#: ../src/applet-dialogs.c:632
 msgid "CINR:"
 msgstr "CINR："
 
-#: ../src/applet-dialogs.c:522
+#: ../src/applet-dialogs.c:645
 msgid "BSID:"
 msgstr "BSID："
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
-msgid "IP Address:"
-msgstr "IP 地址："
-
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
-msgctxt "Address"
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/applet-dialogs.c:566
-msgid "Broadcast Address:"
-msgstr "广播地址："
-
-#. Prefix
-#: ../src/applet-dialogs.c:575
-msgid "Subnet Mask:"
-msgstr "子网掩码："
-
-#: ../src/applet-dialogs.c:577
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
-msgid "Default Route:"
-msgstr "默认路由："
-
-#: ../src/applet-dialogs.c:597
-msgid "Primary DNS:"
-msgstr "主 DNS："
-
-#: ../src/applet-dialogs.c:606
-msgid "Secondary DNS:"
-msgstr "第二 DNS："
-
-#: ../src/applet-dialogs.c:616
-msgid "Ternary DNS:"
-msgstr "第三 DNS："
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:631
+#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
 msgid "Ignored"
 msgstr "已忽略"
 
-#: ../src/applet-dialogs.c:793
+#: ../src/applet-dialogs.c:814
 msgid "VPN Type:"
 msgstr "VPN 类型："
 
-#: ../src/applet-dialogs.c:800
+#: ../src/applet-dialogs.c:821
 msgid "VPN Gateway:"
 msgstr "VPN 网关："
 
-#: ../src/applet-dialogs.c:806
+#: ../src/applet-dialogs.c:827
 msgid "VPN Username:"
 msgstr "VPN 用户名："
 
-#: ../src/applet-dialogs.c:812
+#: ../src/applet-dialogs.c:833
 msgid "VPN Banner:"
 msgstr "VPN Banner："
 
-#: ../src/applet-dialogs.c:818
+#: ../src/applet-dialogs.c:839
 msgid "Base Connection:"
 msgstr "基本连接："
 
-#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
 msgid "Unknown"
 msgstr "未知"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:883
+#: ../src/applet-dialogs.c:956
 msgid "No valid active connections found!"
 msgstr "未找到合法的活动连接！"
 
-#: ../src/applet-dialogs.c:911
+#: ../src/applet-dialogs.c:984
 msgid ""
 "Copyright © 2004-2011 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1137,42 +1125,42 @@ msgstr ""
 "版权所有 (C) 2005-2008 Novell 公司\n"
 "和其他众多社区贡献者和翻译者"
 
-#: ../src/applet-dialogs.c:914
+#: ../src/applet-dialogs.c:987
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "管理您网络设备和连接的通知区域小程序。"
 
-#: ../src/applet-dialogs.c:916
+#: ../src/applet-dialogs.c:989
 msgid "NetworkManager Website"
 msgstr "NetworkManager 网站"
 
-#: ../src/applet-dialogs.c:931
+#: ../src/applet-dialogs.c:1004
 msgid "Missing resources"
 msgstr "缺少资源"
 
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:1029
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1038
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "连接到“%s”需要密码。"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:1053
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/applet-dialogs.c:1261
+#: ../src/applet-dialogs.c:1334
 msgid "SIM PIN unlock required"
 msgstr "需要解锁 SIM PIN"
 
-#: ../src/applet-dialogs.c:1262
+#: ../src/applet-dialogs.c:1335
 msgid "SIM PIN Unlock Required"
 msgstr "需要解锁 SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1264
+#: ../src/applet-dialogs.c:1337
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1180,25 +1168,25 @@ msgid ""
 msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PIN 码。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1266
+#: ../src/applet-dialogs.c:1339
 msgid "PIN code:"
 msgstr "PIN 代码："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1270
+#: ../src/applet-dialogs.c:1343
 msgid "Show PIN code"
 msgstr "显示 PIN 码"
 
-#: ../src/applet-dialogs.c:1272
+#: ../src/applet-dialogs.c:1345
 msgid "SIM PUK unlock required"
 msgstr "需要解锁 SIM PUK"
 
-#: ../src/applet-dialogs.c:1273
+#: ../src/applet-dialogs.c:1346
 msgid "SIM PUK Unlock Required"
 msgstr "需要解锁 SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1275
+#: ../src/applet-dialogs.c:1348
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1206,29 +1194,29 @@ msgid ""
 msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PUK 码。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1277
+#: ../src/applet-dialogs.c:1350
 msgid "PUK code:"
 msgstr "PUK 码："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1280
+#: ../src/applet-dialogs.c:1353
 msgid "New PIN code:"
 msgstr "新的 PIN 码："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1355
 msgid "Re-enter new PIN code:"
 msgstr "再次输入新的 PIN 码："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1360
 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
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1337,7 +1325,7 @@ msgstr "编辑(_E)"
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:5
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:702
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -1664,7 +1652,7 @@ msgstr "密码(_P)："
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
+#: ../src/connection-editor/page-ip6.c:150
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "自动"
@@ -1791,7 +1779,7 @@ msgstr "自动使用手工设置的 DNS"
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
+#: ../src/connection-editor/page-ip6.c:199
 msgid "Manual"
 msgstr "手动"
 
@@ -1803,17 +1791,17 @@ msgstr "本地连接"
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip6.c:219
 msgid "Shared to other computers"
 msgstr "与其它计算机共享"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "方法(_M)："
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "地址"
 
@@ -1827,7 +1815,7 @@ msgstr ""
 "标识符，请在此输入。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1838,16 +1826,16 @@ msgid "D_HCP client ID:"
 msgstr "D_HCP 客户端 ID："
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/page-ip4.c:308
-#: ../src/connection-editor/page-ip6.c:307
+#: ../src/connection-editor/page-ip6.c:321
 msgid "S_earch domains:"
 msgstr "搜索域(_E)："
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 #: ../src/connection-editor/page-ip4.c:299
-#: ../src/connection-editor/page-ip6.c:298
+#: ../src/connection-editor/page-ip6.c:312
 msgid "DNS ser_vers:"
 msgstr "_DNS 服务器："
 
@@ -1870,11 +1858,24 @@ msgstr ""
 "成。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "_Routes…"
 msgstr "路由(_R)..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:197
+msgid "Disabled"
+msgstr "已禁用"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr "已启用(公共地址优先)"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr "已启用(临时地址优先)"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 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 "
@@ -1883,11 +1884,15 @@ msgstr ""
 "用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。本地连接"
 "地址会自动配置到连接中的接口。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
+msgid "IPv6 _privacy extensions:"
+msgstr "IPv6 隐私扩展(_P)："
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "需要 IPv_6 地址完成这个连接"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2166,7 +2171,7 @@ msgstr ""
 #: ../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
+#: ../src/connection-editor/page-ip6.c:924
 msgid "Address"
 msgstr "地址"
 
@@ -2178,7 +2183,7 @@ msgstr "子网掩码"
 #: ../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
+#: ../src/connection-editor/page-ip6.c:958
 msgid "Gateway"
 msgstr "网关"
 
@@ -2188,7 +2193,7 @@ msgid "Metric"
 msgstr "度量"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:904
+#: ../src/connection-editor/page-ip6.c:941
 msgid "Prefix"
 msgstr "前缀"
 
@@ -2221,25 +2226,25 @@ msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:430 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/connection-editor/page-bond.c:433 ../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:144
-#: ../src/connection-editor/page-team.c:255 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/page-team.c:244 ../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/connection-editor/page-bridge.c:208
 #: ../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:156
-#: ../src/connection-editor/page-vlan.c:482 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
 #: ../src/libnm-gtk/nm-ui-utils.c:568
 msgid "VLAN"
 msgstr "VLAN"
@@ -2306,38 +2311,34 @@ msgid "Save any changes made to this connection."
 msgstr "保存对此连接的全部更改。"
 
 #: ../src/connection-editor/nm-connection-editor.c:420
-msgid "_Save..."
-msgstr "保存(_S)..."
-
-#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "为本机所有用户保存此连接需要认证。"
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: ../src/connection-editor/nm-connection-editor.c:436
 msgid "Could not create connection"
 msgstr "无法创建连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: ../src/connection-editor/nm-connection-editor.c:436
 msgid "Could not edit connection"
 msgstr "无法编辑连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:439
+#: ../src/connection-editor/nm-connection-editor.c:438
 msgid "Unknown error creating connection editor dialog."
 msgstr "创建连接编辑器对话框出现未知错误。"
 
-#: ../src/connection-editor/nm-connection-editor.c:573
+#: ../src/connection-editor/nm-connection-editor.c:572
 msgid "Error initializing editor"
 msgstr "初始化编辑器错误"
 
-#: ../src/connection-editor/nm-connection-editor.c:906
+#: ../src/connection-editor/nm-connection-editor.c:905
 msgid "Connection add failed"
 msgstr "添加连接失败"
 
-#: ../src/connection-editor/nm-connection-editor.c:946
+#: ../src/connection-editor/nm-connection-editor.c:945
 msgid "Error saving connection"
 msgstr "保存连接出错"
 
-#: ../src/connection-editor/nm-connection-editor.c:947
+#: ../src/connection-editor/nm-connection-editor.c:946
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "属性“%s”/“%s”非法：%d"
@@ -2403,43 +2404,35 @@ msgid "Edit the selected connection"
 msgstr "编辑选中的连接"
 
 #: ../src/connection-editor/nm-connection-list.c:688
-msgid "_Edit..."
-msgstr "编辑(_E)..."
-
-#: ../src/connection-editor/nm-connection-list.c:689
 msgid "Authenticate to edit the selected connection"
 msgstr "进行认证以编辑选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:703
 msgid "Delete the selected connection"
 msgstr "删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:705
-msgid "_Delete..."
-msgstr "删除(_D)..."
-
-#: ../src/connection-editor/nm-connection-list.c:706
+#: ../src/connection-editor/nm-connection-list.c:704
 msgid "Authenticate to delete the selected connection"
 msgstr "进行认证以删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "No VPN plugins are installed."
 msgstr "未安装 VPN 插件。"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:935
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "不知道如何创建“%s”连接"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:937
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:993
 msgid "Error editing connection"
 msgstr "编辑连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:996
+#: ../src/connection-editor/nm-connection-list.c:994
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "没有找到“%s”连接"
@@ -2456,20 +2449,20 @@ msgstr "无法加载 802.1X 安全配置用户界面。"
 msgid "Use 802.1_X security for this connection"
 msgstr "对此连接使用 802.1_X 安全配置"
 
-#: ../src/connection-editor/page-bond.c:433
+#: ../src/connection-editor/page-bond.c:436
 msgid "Could not load bond user interface."
 msgstr "无法加载绑定用户界面。"
 
-#: ../src/connection-editor/page-bond.c:587
+#: ../src/connection-editor/page-bond.c:590
 #, c-format
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:211
 msgid "Could not load bridge user interface."
 msgstr "无法加载桥接用户界面。"
 
-#: ../src/connection-editor/page-bridge.c:310
+#: ../src/connection-editor/page-bridge.c:306
 #, c-format
 msgid "Bridge connection %d"
 msgstr "桥接连接 %d"
@@ -2485,11 +2478,11 @@ msgstr "桥接端口"
 msgid "Could not load bridge port user interface."
 msgstr "无法加载桥接端口用户界面。"
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:606
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:609
+#: ../src/connection-editor/page-dcb.c:608
 msgid "Could not load DCB user interface."
 msgstr "无法加载 DSL 用户界面。"
 
@@ -2555,32 +2548,32 @@ msgid "InfiniBand connection %d"
 msgstr "InfiniBand 连接 %d"
 
 #: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (VPN)"
 msgstr "自动(VPN)"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:141
 msgid "Automatic (VPN) addresses only"
 msgstr "自动(VPN)仅地址"
 
 #: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:144
 msgid "Automatic (PPP)"
 msgstr "自动(PPP)"
 
 #: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:145
 msgid "Automatic (PPP) addresses only"
 msgstr "自动(PPP)仅地址"
 
 #: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip6.c:147
 msgid "Automatic (PPPoE)"
 msgstr "自动(PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Automatic (PPPoE) addresses only"
 msgstr "自动(PPPoE)仅地址"
 
@@ -2593,21 +2586,17 @@ msgid "Automatic (DHCP) addresses only"
 msgstr "自动(DHCP)仅地址"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip6.c:212
 msgid "Link-Local Only"
 msgstr "仅本地连接"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "已禁用"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:310
 msgid "Additional DNS ser_vers:"
 msgstr "附加 _DNS 服务器："
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:319
 msgid "Additional s_earch domains:"
 msgstr "附加搜索域(_E)："
 
@@ -2624,28 +2613,28 @@ msgstr "IPv4 设置"
 msgid "Could not load IPv4 user interface."
 msgstr "无法加载 IPv4 用户界面。"
 
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip6.c:151
 msgid "Automatic, addresses only"
 msgstr "自动，仅地址"
 
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip6.c:163
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:187
 msgid "Automatic, DHCP only"
 msgstr "自动，仅 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:819
+#: ../src/connection-editor/page-ip6.c:856
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "正在编辑 %s 的 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:969
+#: ../src/connection-editor/page-ip6.c:1007
 msgid "IPv6 Settings"
 msgstr "IPv6 设置"
 
-#: ../src/connection-editor/page-ip6.c:971
+#: ../src/connection-editor/page-ip6.c:1009
 msgid "Could not load IPv6 user interface."
 msgstr "无法加载 IPv6 用户界面。"
 
@@ -2713,24 +2702,24 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/wireless-security/eap-method-ttls.c:255
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:298
+#: ../src/wireless-security/eap-method-ttls.c:300
 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:264
-#: ../src/wireless-security/eap-method-ttls.c:281
+#: ../src/wireless-security/eap-method-fast.c:281
+#: ../src/wireless-security/eap-method-peap.c:269
+#: ../src/wireless-security/eap-method-ttls.c:285
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../src/wireless-security/eap-method-ttls.c:270
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -2752,22 +2741,22 @@ msgstr "PPP 设置"
 msgid "Could not load PPP user interface."
 msgstr "无法加载 PPP 用户界面。"
 
-#: ../src/connection-editor/page-team.c:94
+#: ../src/connection-editor/page-team.c:92
 #: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:234
+#: ../src/connection-editor/vpn-helpers.c:239
 msgid "Select file to import"
 msgstr "选择要导入的文件"
 
-#: ../src/connection-editor/page-team.c:114
+#: ../src/connection-editor/page-team.c:112
 #: ../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
+#: ../src/connection-editor/page-team.c:247
 msgid "Could not load team user interface."
 msgstr "无法加载组队用户界面。"
 
-#: ../src/connection-editor/page-team.c:353
+#: ../src/connection-editor/page-team.c:342
 #, c-format
 msgid "Team connection %d"
 msgstr "组队连接 %d"
@@ -2786,16 +2775,16 @@ 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
+#: ../src/connection-editor/page-vlan.c:323
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (通过“%s”）"
 
-#: ../src/connection-editor/page-vlan.c:484
+#: ../src/connection-editor/page-vlan.c:489
 msgid "Could not load vlan user interface."
 msgstr "无法加载 VLAN 用户界面。"
 
-#: ../src/connection-editor/page-vlan.c:680
+#: ../src/connection-editor/page-vlan.c:685
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 连接 %d"
@@ -2861,27 +2850,27 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
 #: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:892
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 位密钥(十六进制或 ASCII)"
 
 #: ../src/connection-editor/page-wifi-security.c:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:901
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码句"
 
 #: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
 msgid "Dynamic WEP (802.1x)"
 msgstr "动态 WEP (802.1x)"
 
 #: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:945
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 及 WPA2 个人"
 
 #: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:959
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 及 WPA2 企业"
 
@@ -2906,11 +2895,11 @@ msgstr "无法加载 WiMAX 用户界面。"
 msgid "WiMAX connection %d"
 msgstr "WiMAX 连接 %d"
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:212
 msgid "Cannot import VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:214
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2922,25 +2911,25 @@ msgstr ""
 "\n"
 "错误：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:284
+#: ../src/connection-editor/vpn-helpers.c:289
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "名为“%s”的文件已存在。"
 
-#: ../src/connection-editor/vpn-helpers.c:286
+#: ../src/connection-editor/vpn-helpers.c:291
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:288
+#: ../src/connection-editor/vpn-helpers.c:293
 #, 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:324
+#: ../src/connection-editor/vpn-helpers.c:329
 msgid "Cannot export VPN connection"
 msgstr "无法导出 VPN 连接"
 
-#: ../src/connection-editor/vpn-helpers.c:326
+#: ../src/connection-editor/vpn-helpers.c:331
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2951,7 +2940,7 @@ msgstr ""
 "\n"
 "错误：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:361
+#: ../src/connection-editor/vpn-helpers.c:366
 msgid "Export VPN connection..."
 msgstr "导出 VPN 连接..."
 
@@ -2992,7 +2981,7 @@ msgid "Failed to create DUN connection: %s"
 msgstr "无法建立 DUN 连接：%s"
 
 #: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:947
+#: ../src/gnome-bluetooth/nma-bt-device.c:957
 msgid "Your phone is now ready to use!"
 msgstr "您的电话已经可以使用！"
 
@@ -3008,39 +2997,39 @@ msgstr "未知电话设备类型(不是 GSM 或者 CDMA)"
 msgid "unknown modem type."
 msgstr "未知调制解调器类型。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
+#: ../src/gnome-bluetooth/nma-bt-device.c:726
+#: ../src/gnome-bluetooth/nma-bt-device.c:732
 msgid "failed to connect to the phone."
 msgstr "连接到电话失败。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:758
+#: ../src/gnome-bluetooth/nma-bt-device.c:745
+msgid "error getting bus connection"
+msgstr "获取总线连接出错"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:799
 msgid "unexpectedly disconnected from the phone."
 msgstr "意外断开与电话的连接。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:768
+#: ../src/gnome-bluetooth/nma-bt-device.c:809
 msgid "timed out detecting phone details."
 msgstr "检测电话详细信息时超时。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:779
+#: ../src/gnome-bluetooth/nma-bt-device.c:820
 msgid "Detecting phone configuration..."
 msgstr "正在检测电话配置..."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:811
-msgid "error getting bus connection"
-msgstr "获取总线连接出错"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:908
+#: ../src/gnome-bluetooth/nma-bt-device.c:918
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "在设置拨号网络连接前必须启用默认蓝牙适配器。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:945
+#: ../src/gnome-bluetooth/nma-bt-device.c:955
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "无法建立 PAN 连接：%s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:966
+#: ../src/gnome-bluetooth/nma-bt-device.c:976
 #, c-format
 msgid "%s Network"
 msgstr "%s 网络"
@@ -3093,23 +3082,23 @@ msgstr ""
 "访问网络资源，请检查您的设置。要修改您的移动宽带设置，在系统 >> 首选项菜单中"
 "选择“网络连接”。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:266
+#: ../src/libnm-gtk/nm-mobile-wizard.c:267
 msgid "Confirm Mobile Broadband Settings"
 msgstr "确认移动宽带设置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:330
+#: ../src/libnm-gtk/nm-mobile-wizard.c:331
 msgid "Unlisted"
 msgstr "未列出"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:462
 msgid "_Select your plan:"
 msgstr "选择您的套餐(_S)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:485
+#: ../src/libnm-gtk/nm-mobile-wizard.c:486
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "所选套餐的 _APN (访问点名称)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:505
+#: ../src/libnm-gtk/nm-mobile-wizard.c:506
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -3120,101 +3109,101 @@ msgstr ""
 "\n"
 "如果您不确定您的套餐，请询问您的提供商以获取套餐的 APN。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:512
+#: ../src/libnm-gtk/nm-mobile-wizard.c:514
 msgid "Choose your Billing Plan"
 msgstr "选择您的付费套餐"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:561
+#: ../src/libnm-gtk/nm-mobile-wizard.c:563
 msgid "My plan is not listed..."
 msgstr "我的套餐未被列出..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:714
+#: ../src/libnm-gtk/nm-mobile-wizard.c:716
 msgid "Select your provider from a _list:"
 msgstr "从列表中选择您的提供商(_L)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:727
+#: ../src/libnm-gtk/nm-mobile-wizard.c:729
 msgid "Provider"
 msgstr "提供商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:752
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "找不到我的提供商，希望手动输入(_M)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:765
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
 msgid "Provider:"
 msgstr "提供商："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:782
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "我的提供商使用 GSM 技术(GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../src/libnm-gtk/nm-mobile-wizard.c:786
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "我的提供商使用 CDMA 技术(1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:795
+#: ../src/libnm-gtk/nm-mobile-wizard.c:797
 msgid "Choose your Provider"
 msgstr "选择您的提供商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
 msgid "Country or Region List:"
 msgstr "国家或地区列表："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
 msgid "Country or region"
 msgstr "国家或地区"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
 msgid "My country is not listed"
 msgstr "我所在国家/地区没有被列出"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
 msgid "Choose your Provider's Country or Region"
 msgstr "选择您的提供商的国家或地区"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
 msgid "Installed GSM device"
 msgstr "已安装的 GSM 设备"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
 msgid "Installed CDMA device"
 msgstr "已安装的 CDMA 设备"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
 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:1350
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
 msgid "You will need the following information:"
 msgstr "您将需要以下信息："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
 msgid "Your broadband provider's name"
 msgstr "您的宽带提供商名称"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
 msgid "Your broadband billing plan name"
 msgstr "您的宽带付费套餐名称"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(在某些情况下)您的宽带付费套餐 APN (访问点名称)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "为此移动宽带设备创建一个连接(_T)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
 msgid "Any device"
 msgstr "任何设备"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
 msgid "Set up a Mobile Broadband Connection"
 msgstr "设置一个移动宽带连接"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
 msgid "New Mobile Broadband Connection"
 msgstr "新移动宽带连接"
 
@@ -3254,54 +3243,54 @@ msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:435
+#: ../src/libnm-gtk/nm-wifi-dialog.c:441
 msgid "New..."
 msgstr "新建..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "无"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
 #, 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:1132
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
 msgid "Wi-Fi Network Authentication Required"
 msgstr "需要 Wi-Fi 网络认证"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 网络要求认证"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
 msgid "Create New Wi-Fi Network"
 msgstr "创建新的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
 msgid "New Wi-Fi network"
 msgstr "新建 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "输入您要创建的 Wi-Fi 网络的名称。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "连接到隐藏的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
 msgid "Hidden Wi-Fi network"
 msgstr "隐藏的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3446,11 +3435,11 @@ msgstr "移动宽带设备需要 PIN 码。"
 msgid "%s connection"
 msgstr "%s 连接"
 
-#: ../src/utils/utils.c:376
+#: ../src/utils/utils.c:379
 msgid "Store the password only for this _user"
 msgstr "只为当前用户保存密码(_U)"
 
-#: ../src/utils/utils.c:378
+#: ../src/utils/utils.c:381
 msgid "Store the password for _all users"
 msgstr "为所有用户保存密码(_A)"
 
@@ -3462,20 +3451,21 @@ msgstr "DER，PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
 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:298
+#: ../src/wireless-security/eap-method-fast.c:266
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:330
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:400
+#: ../src/wireless-security/eap-method-fast.c:404
 msgid "Choose a PAC file..."
 msgstr "选择一个 PAC 文件..."
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:411
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:415
 msgid "All files"
 msgstr "所有文件"
 
@@ -3511,14 +3501,15 @@ msgstr "内部认证(_I)："
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允许自动 PAC 配置(_V)"
 
-#: ../src/wireless-security/eap-method-peap.c:281
-#: ../src/wireless-security/wireless-security.c:417
+#: ../src/wireless-security/eap-method-peap.c:284
+#: ../src/wireless-security/eap-method-ttls.c:315
+#: ../src/wireless-security/wireless-security.c:418
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:377
-#: ../src/wireless-security/eap-method-tls.c:464
-#: ../src/wireless-security/eap-method-ttls.c:377
+#: ../src/wireless-security/eap-method-peap.c:378
+#: ../src/wireless-security/eap-method-tls.c:461
+#: ../src/wireless-security/eap-method-ttls.c:409
 msgid "Choose a Certificate Authority certificate..."
 msgstr "选择一个认证中心证书..."
 
@@ -3550,11 +3541,11 @@ msgstr "PEAP 版本(_V)："
 msgid "As_k for this password every time"
 msgstr "总是询问该密码(_K)"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../src/wireless-security/eap-method-tls.c:276
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私钥是不安全的"
 
-#: ../src/wireless-security/eap-method-tls.c:282
+#: ../src/wireless-security/eap-method-tls.c:279
 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 "
@@ -3567,11 +3558,11 @@ msgstr ""
 "\n"
 "(您可以使用 openssl 来对私钥进行密码保护)"
 
-#: ../src/wireless-security/eap-method-tls.c:458
+#: ../src/wireless-security/eap-method-tls.c:455
 msgid "Choose your personal certificate..."
 msgstr "选择您的个人证书..."
 
-#: ../src/wireless-security/eap-method-tls.c:470
+#: ../src/wireless-security/eap-method-tls.c:467
 msgid "Choose your private key..."
 msgstr "选择您的私钥..."
 
@@ -3591,7 +3582,7 @@ msgstr "私钥(_K)："
 msgid "_Private key password:"
 msgstr "私钥密码(_P)："
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:430
 msgid "TLS"
 msgstr "TLS"
 
@@ -3641,6 +3632,24 @@ msgstr "显示密钥(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP 索引(_X)："
 
+#~ msgid "Primary DNS:"
+#~ msgstr "主 DNS："
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "第二 DNS："
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "第三 DNS："
+
+#~ msgid "_Save..."
+#~ msgstr "保存(_S)..."
+
+#~ msgid "_Edit..."
+#~ msgstr "编辑(_E)..."
+
+#~ msgid "_Delete..."
+#~ msgstr "删除(_D)..."
+
 #~ msgid "ModemManager is not running"
 #~ msgstr "调制解调器管理器未运行"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]