From 291bfd79939acfb79faa2704665781645a0cf0e7 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@gmail.com>
Date: Sat, 27 May 2006 15:37:19 +0000
Subject: [PATCH] Updated NetworkManager zh_CN translation.

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1770 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 po/ChangeLog |   4 +
 po/zh_CN.po  | 616 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 407 insertions(+), 213 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index ae389ce36f..139a218cc4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-27  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
 2006-05-01  Josep Puigdemont Casamajó  <josep.puigdemont@gmail.com>
 
 	* ca.po: Updated Catalan translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cfcbaf5e35..e4b2e1d8b1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-16 03:43+0200\n"
-"PO-Revision-Date: 2005-10-16 17:47+0800\n"
+"POT-Creation-Date: 2006-05-27 12:26+0200\n"
+"PO-Revision-Date: 2006-05-27 23:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -16,392 +16,437 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:874
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "无线网络 %s 的密码句"
 
-#: ../gnome/applet/applet-dbus-info.c:1092
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr ""
-"所请求的无线网络“%s”似乎不在范围内。如果有其它无线网络的话，将会切换到可用的"
-"无线网络。"
-
-#: ../gnome/applet/applet-dbus.c:317
+#: ../gnome/applet/applet-dbus.c:383
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "到无线网络“%s”的连接失败。"
 
-#: ../gnome/applet/applet-dbus.c:322
+#: ../gnome/applet/applet-dbus.c:388
 msgid "Connection to the wired network failed."
 msgstr "连接到有线网络失败。"
 
-#: ../gnome/applet/applet.c:181
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
 msgstr "显示连接信息出错："
 
-#: ../gnome/applet/applet.c:200
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "序找不到所需的资源(glade 文件未找到)！"
 
-#: ../gnome/applet/applet.c:211
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "没有活动的连接！"
 
-#: ../gnome/applet/applet.c:226
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "有线以太网(%s)"
 
-#: ../gnome/applet/applet.c:228
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "无线以太网(%s)"
 
-#: ../gnome/applet/applet.c:314 ../gnome/applet/applet.c:332
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "网络管理器小程序"
 
-#: ../gnome/applet/applet.c:316 ../gnome/applet/applet.c:334
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "版权 (C) 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:317 ../gnome/applet/applet.c:335
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "管理您网络设备和连接的通知区域小程序"
 
-#: ../gnome/applet/applet.c:339
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Funda Wang <fundawang@linux.net.cn>"
 
-#: ../gnome/applet/applet.c:424
-msgid "VPN Error"
-msgstr "VPN 出错"
-
-#: ../gnome/applet/applet.c:428
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN 登录失败"
 
-#: ../gnome/applet/applet.c:429
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "无法启动 VPN 连接“%s”，原因是登录失败。"
 
-#: ../gnome/applet/applet.c:433
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN 启动失败"
 
-#: ../gnome/applet/applet.c:434
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 msgstr "无法启动 VPN 连接“%s”，原因是调用 VPN 程序失败。"
 
-#: ../gnome/applet/applet.c:438 ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN 连接失败"
 
-#: ../gnome/applet/applet.c:439
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "无法启动 VPN 连接“%s”，原因是连接出错。"
 
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN 配置错误"
 
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN 连接“%s”未正确配置。"
 
-#: ../gnome/applet/applet.c:449
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 msgstr "无法启动 VPN 连接“%s”，原因是 VPN 服务器未返回足够的网络配置。"
 
-#: ../gnome/applet/applet.c:457
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "VPN 服务说：“%s”"
-
-#: ../gnome/applet/applet.c:526
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN 连接“%s”说："
-
-#: ../gnome/applet/applet.c:528
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN 登录消息"
 
-#: ../gnome/applet/applet.c:746 ../gnome/applet/applet.c:2321
-#: ../gnome/applet/other-network-dialog.c:417
-#: ../gnome/applet/passphrase-dialog.c:384
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "网络管理器小程序找不到所需的资源(glade 文件未找到)。"
 
-#: ../gnome/applet/applet.c:758
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "网络设备“%s(%s)”不支持无线扫描。"
 
-#: ../gnome/applet/applet.c:766
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "网络设备“%s(%s)”不支持链接检测。"
 
-#: ../gnome/applet/applet.c:910
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "正在为有线网络准备设备 %s..."
 
-#: ../gnome/applet/applet.c:912
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "正在为无线网络“%2$s”准备设备 %1$s..."
 
-#: ../gnome/applet/applet.c:920
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "正在为有线网络配置设备 %s..."
 
-#: ../gnome/applet/applet.c:922
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "正在试图加入无线网络“%s”..."
 
-#: ../gnome/applet/applet.c:930
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "正在等待无线网络“%s”的网络密钥..."
 
-#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "正在从有线网络请求网络地址..."
 
-#: ../gnome/applet/applet.c:940 ../gnome/applet/applet.c:950
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "正在从无线网络“%s”请求网络地址..."
 
-#: ../gnome/applet/applet.c:958
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "正在完成到有线网络的连接..."
 
-#: ../gnome/applet/applet.c:960
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "正在完成到无线网络“%s”的连接..."
 
-#: ../gnome/applet/applet.c:1077
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "网络管理器未运行"
 
-#: ../gnome/applet/applet.c:1089
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr "网络已禁用"
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "没有网络连接"
 
-#: ../gnome/applet/applet.c:1094
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "有线网络连接"
 
-#: ../gnome/applet/applet.c:1098
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "已连接到 Ad-Hoc 无线网络"
 
-#: ../gnome/applet/applet.c:1100
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "到“%s”的无线网络连接(%d%%)"
 
-#: ../gnome/applet/applet.c:1122
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "到“%s”的 VPN 连接"
 
-#: ../gnome/applet/applet.c:1130
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "连接到“%s”的 VPN"
 
-#: ../gnome/applet/applet.c:1518
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "连接到其它无线网络(_C)..."
 
-#: ../gnome/applet/applet.c:1539
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "创建新的无线网络(_N)..."
 
-#: ../gnome/applet/applet.c:1652
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN 连接"
 
-#: ../gnome/applet/applet.c:1684
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "配置 VPN(_C)..."
 
-#: ../gnome/applet/applet.c:1688
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "断开 VPN(_D)..."
 
-#: ../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "拨号连接(_D)"
 
-#: ../gnome/applet/applet.c:1719
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "正在连接到 %s..."
 
-#: ../gnome/applet/applet.c:1769
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "正在从 %s 断开..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "没有发现网络设备"
 
-#: ../gnome/applet/applet.c:1939
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "网络管理器未运行..."
 
-#. Wireless Enabled item
-#: ../gnome/applet/applet.c:2041
-msgid "_Wireless Enabled"
-msgstr "无线已启用(_W)"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr "启用联网(_N)"
 
-#. Connection Information item
-#: ../gnome/applet/applet.c:2047
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr "启用无线(_W)"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "连接信息(_I)"
 
 #. Help item
-#: ../gnome/applet/applet.c:2057
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. About item
-#: ../gnome/applet/applet.c:2065
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../gnome/applet/applet.c:2457
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "网络管理器小程序找不到所需的资源。无法继续。\n"
 
-#: ../gnome/applet/eggtrayicon.c:127
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr "开放式系统"
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr "共享密钥"
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "自动(默认)"
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "动态 WEP"
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr "无"
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128 位 ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128 位十六进制"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128 位密码句"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 企业"
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA 企业"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 个人"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA 个人"
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "方向"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "托盘方向。"
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "有线网络(%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "有线网络(_W)"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "无线网络(%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "无线网络"
 
-#: ../gnome/applet/menu-items.c:303
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (无效的 Unicode)"
 
-#: ../gnome/applet/other-network-dialog.c:148
-#: ../gnome/applet/applet.glade.h:42
-msgid "_Passphrase:"
-msgstr "密码句(_P)："
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr "默认情况下，无线网络的名称会设定为您的计算机名称，%s，如果没有加密的话"
 
-#: ../gnome/applet/other-network-dialog.c:151
-msgid "_ASCII Key:"
-msgstr "_ASCII 密钥："
-
-#: ../gnome/applet/other-network-dialog.c:154
-msgid "_Hex Key:"
-msgstr "十六进制密钥(_H)："
-
-#: ../gnome/applet/other-network-dialog.c:243
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "创建新的无线网络"
 
-#: ../gnome/applet/other-network-dialog.c:244
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr "输入您想要创建的无线网络的 ESSID 和安全设置。"
+msgstr "输入您想要创建的无线网络的名称和安全设置。"
 
-#: ../gnome/applet/other-network-dialog.c:245
-msgid "By default, the ESSID is set to your computer's name,"
-msgstr "默认情况下，ESSID 会设定为您的计算机名称 "
-
-#: ../gnome/applet/other-network-dialog.c:247
-msgid ", with no encryption enabled."
-msgstr "，并且不启用加密。"
-
-#: ../gnome/applet/other-network-dialog.c:249
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "创建新的无线网络"
 
-#: ../gnome/applet/other-network-dialog.c:254
-msgid "Custom wireless network"
-msgstr "自定义无线网络"
+#: ../gnome/applet/other-network-dialog.c:368
+msgid "Existing wireless network"
+msgstr "现有无线网络"
 
-#: ../gnome/applet/other-network-dialog.c:255
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "输入您想要连接的无线网络的 ESSID。"
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "输入您想要连接的无线网络的名称。"
 
-#: ../gnome/applet/other-network-dialog.c:257
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "连接到其它无线网络"
 
-#: ../gnome/applet/passphrase-dialog.c:155
-msgid "Passphrase:"
-msgstr "密码句："
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "连接到无线网络出错"
 
-#: ../gnome/applet/passphrase-dialog.c:158
-msgid "ASCII Key:"
-msgstr "ASCII 密钥："
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr "您的硬件不支持请求的无线网络所需的安全特性。"
 
-#: ../gnome/applet/passphrase-dialog.c:161
-msgid "Hex Key:"
-msgstr "十六进制密钥："
-
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "无法启动 VPN 连接“%s”"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
 msgstr "找不到 VPN 连接类型“%s”的身份验证对话。请联系您的系统管理员。"
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -414,30 +459,10 @@ msgstr " "
 
 #: ../gnome/applet/applet.glade.h:2
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128 位密码句(WEP)\n"
-"ASCII 密钥(WEP)\n"
-"十六进制密钥(WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128 位密码句(WEP)\n"
-"ASCII 密钥(WEP)\n"
-"十六进制密钥(WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">活动连接信息</span>"
 
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -450,7 +475,7 @@ msgstr ""
 "\n"
 "要访问无线网络“%s”，需要提供密码句或加密密钥。"
 
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -461,7 +486,7 @@ msgstr ""
 "\n"
 "%s  该网络无法完整工作。"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -476,105 +501,207 @@ msgstr ""
 "您选择登录到无线网络“%s”。如果您确定此无线网络是安全的，请选中下面的复选框，"
 "网络管理器在以后登录时将不会请求确认。"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "匿名身份："
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "认证："
+
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "广播地址："
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "CA 证书文件："
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../gnome/applet/applet.glade.h:23
-msgid "Connect with _encryption enabled"
-msgstr "启用加密连接(_E)"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "客户端证书文件："
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "连接信息"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "默认路由："
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "目的地址："
 
-#: ../gnome/applet/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "驱动程序："
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP 方法："
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "硬件地址："
 
-#: ../gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP 地址："
 
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "身份："
+
 #: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "接口："
 
 #: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "密钥类型："
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr "密钥："
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"无\n"
+"WEP 128 位密码句\n"
+"WEP 64/128 位十六进制\n"
+"WEP 64/128 位 ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr "开放式系统\n共享密钥"
+
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "其它无线网络..."
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "密码句："
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr "密码："
+
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "主 DNS："
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "私钥文件："
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "私用密钥密码："
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "辅 DNS："
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "选择 CA 证书文件"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "选择客户端证书文件"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "选择私钥文件"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "显示密钥"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "显示密码句"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "显示密码"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "显示密码"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "速度："
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "子网掩码："
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr "类型："
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr "用户名："
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "需要无线网络密钥"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "无线适配器(_A)："
 
-#: ../gnome/applet/applet.glade.h:36
-msgid "Wireless _network:"
-msgstr "无线网络(_N)："
-
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "总是信任此无线网络(_A)"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "以后不再提醒(_D)"
 
-#: ../gnome/applet/applet.glade.h:39
-msgid "_Key Type:"
-msgstr "密钥类型(_K)："
-
-#: ../gnome/applet/applet.glade.h:40
-msgid "_Key type:"
-msgstr "密钥类型(_K)："
-
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "登录到网络(_L)"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:372
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr "网络名称(_N)："
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Wireless Security:"
+msgstr "无线安全性(_W)："
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:378
 msgid "Cannot add VPN connection"
 msgstr "无法添加 VPN 连接"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+#: ../gnome/vpn-properties/nm-vpn-properties.c:380
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr "您的系统上未找到合适的 VPN 软件。请联系您的系统管理员。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:426
+#: ../gnome/vpn-properties/nm-vpn-properties.c:432
 msgid "Cannot import VPN connection"
 msgstr "没有导入 VPN 连接"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+#: ../gnome/vpn-properties/nm-vpn-properties.c:434
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -582,24 +709,24 @@ msgid ""
 msgstr ""
 "找不到合适的软件来导入 VPN 连接类型“%s”的文件“%s”。请联系您的系统管理员。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:568
+#: ../gnome/vpn-properties/nm-vpn-properties.c:574
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "获取 VPN 连接“%s”出错"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:571
+#: ../gnome/vpn-properties/nm-vpn-properties.c:577
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 msgstr "找不到 VPN 连接类型“%s”的用户界面文件。请联系您的系统管理员。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:731
+#: ../gnome/vpn-properties/nm-vpn-properties.c:734
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "删除 VPN 连接“%s”吗？"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:734
+#: ../gnome/vpn-properties/nm-vpn-properties.c:737
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -609,16 +736,16 @@ msgstr ""
 "关于 VPN 连接“%s”的全部信息都将丢失。要创建新连接的话，您就必须请求您的系统管"
 "理员提供相应信息。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:940
+#: ../gnome/vpn-properties/nm-vpn-properties.c:947
 msgid "Unable to load"
 msgstr "无法装入"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:942
+#: ../gnome/vpn-properties/nm-vpn-properties.c:949
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "找不到所需的资源(glade 文件)！"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1060
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1058
 msgid "Edit VPN Connection"
 msgstr "编辑 VPN 连接"
 
@@ -691,34 +818,97 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN 连接"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "40 位 WEP"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "104 位 WEP"
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr "WPA TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr "WPA CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA 自动"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr "WPA2 TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr "WPA2 CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 自动"
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr "无"
+
+#: ../src/nm-netlink-monitor.c:170
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr "无法创建监视有线以太网设备的网络连接套接字 - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:188
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr "无法绑定到监视有线以太网设备的网络连接套接字 - %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
 msgstr "操作时间太长"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
 msgstr "从错误的发送者类型收到数据"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
 msgstr "从未知的发送者收到数据"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:664
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "向套接字发送的数据太多，其中有些已经丢失"
 
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
 msgstr "等候套接字上的数据时发生了错误"
+
+#: ../gnome/applet/applet-dbus-devices.c:922
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "您现在已连接到 Ad-Hoc 无线网络“%s”。"
+
+#: ../gnome/applet/applet-dbus-devices.c:927
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "您现在已连接到无线网络“%s”。"
+
+#: ../gnome/applet/applet-dbus-devices.c:934
+msgid "You are now connected to the wired network."
+msgstr "您现在已连接到有线网络。"
+
+#: ../gnome/applet/applet-dbus-devices.c:940
+msgid "Connection Established"
+msgstr "连接已建立"
+
+#: ../gnome/applet/applet-dbus-devices.c:983
+msgid "Disconnected"
+msgstr "已断开连接"
+
+#: ../gnome/applet/applet-dbus-devices.c:984
+msgid "The network connection has been disconnected."
+msgstr "网络连接现已断开。"
+