sync with code

1 files changed, 269 insertions, 28 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 50c437d..26c2b8b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 2007\n"
-"POT-Creation-Date: 2008-01-31 11:33+0100\n"
+"POT-Creation-Date: 2008-03-03 18:09+0100\n"
 "PO-Revision-Date: 2006-09-10 21:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -2063,12 +2063,7 @@ msgstr "恭喜"
 msgid "The wizard successfully added the printer Samba share"
 msgstr "向导成功添加了打印机 Samba 共享"
 
-#: ../bin/draksambashare:545
-#, c-format
-msgid "Failed to add printers."
-msgstr "添加打印机失败。"
-
-#: ../bin/draksambashare:560
+#: ../bin/draksambashare:551
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "请添加或选择 Samba 打印机共享，然后再修改。"
@@ -2444,12 +2439,7 @@ msgstr ""
 msgid "The wizard successfully configured your Samba server."
 msgstr "向导成功添加了打印机 Samba 共享"
 
-#: ../bin/draksambashare:1213
-#, fuzzy, c-format
-msgid "Failed to configure Samba server."
-msgstr "修改 Samba 共享失败。"
-
-#: ../bin/draksambashare:1263
+#: ../bin/draksambashare:1246
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
@@ -2514,7 +2504,19 @@ msgstr "Drak 用户管理"
 msgid "Samba Users"
 msgstr "Samba 用户"
 
-#: ../bin/draksambashare:1467
+#: ../bin/draksambashare:1449
+#, fuzzy, c-format
+msgid "Please configure your Samba server"
+msgstr "修改 Samba 共享失败。"
+
+#: ../bin/draksambashare:1449
+#, c-format
+msgid ""
+"It seems this is the first time you run this tool.\n"
+"A wizard will appear to configure a basic Samba server"
+msgstr ""
+
+#: ../bin/draksambashare:1457
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba 管理 Samba 共享"
@@ -4386,12 +4388,17 @@ msgstr "限制 WEP"
 msgid "WPA Pre-Shared Key"
 msgstr "WPA 预共享密钥"
 
-#: ../lib/network/connection/wireless.pm:197 ../lib/network/thirdparty.pm:175
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
-msgid "Firmware files are required for this device."
-msgstr "此设备需要固件文件。"
+msgid "WPA2/WPA Enterprise"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:231
+#, c-format
+msgid "Windows driver"
+msgstr ""
 
-#: ../lib/network/connection/wireless.pm:263
+#: ../lib/network/connection/wireless.pm:298
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4438,7 +4445,58 @@ msgstr "自动"
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:342
+#: ../lib/network/connection/wireless.pm:376
+#, fuzzy, c-format
+msgid "EAP Login/Username"
+msgstr "账户登录(用户名)"
+
+#: ../lib/network/connection/wireless.pm:378
+#, c-format
+msgid ""
+"The login or username. Format is plain text. If you\n"
+"need to specify domain then try the untested syntax\n"
+"  DOMAIN\\username"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:381
+#, fuzzy, c-format
+msgid "EAP Password"
+msgstr "密码"
+
+#: ../lib/network/connection/wireless.pm:383
+#, c-format
+msgid ""
+" Password: A string.\n"
+"Note that this is not the same thing as a psk.\n"
+"____________________________________________________\n"
+"RELATED ADDITIONAL INFORMATION:\n"
+"In the Advanced Page, you can select which EAP mode\n"
+"is used for authentication. For the eap mode setting\n"
+"   Auto Detect: implies all possible modes are tried.\n"
+"\n"
+"If Auto Detect fails, try the PEAP TTLS combo bofore others\n"
+"Note:\n"
+"\tThe settings MD5, MSCHAPV2, OTP and GTC imply\n"
+"automatically PEAP and TTLS modes.\n"
+"  TLS mode is completely certificate based and may ignore\n"
+"the username and password values specified here."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:397
+#, fuzzy, c-format
+msgid "EAP client certificate"
+msgstr "检查服务器证书"
+
+#: ../lib/network/connection/wireless.pm:399
+#, c-format
+msgid ""
+"The complete path and filename of client certificate. This is\n"
+"only used for EAP certificate based authentication. It could be\n"
+"considered as the alternative to username/password combo.\n"
+" Note: other related settings are shown on the Advanced page."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:408
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4519,7 +4577,182 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:387
+#: ../lib/network/connection/wireless.pm:446
+#, fuzzy, c-format
+msgid "EAP Protocol"
+msgstr "协议"
+
+#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "Auto Detect"
+msgstr "自动检测"
+
+#: ../lib/network/connection/wireless.pm:447
+#, c-format
+msgid "WPA2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:447
+#, fuzzy, c-format
+msgid "WPA"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:449
+#, c-format
+msgid ""
+"Auto Detect is recommended as it first tries WPA version 2 with\n"
+"a fallback to WPA version 1"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:451
+#, fuzzy, c-format
+msgid "EAP Mode"
+msgstr "模式"
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "PEAP"
+msgstr "PAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, fuzzy, c-format
+msgid "MSCHAPV2"
+msgstr "CHAP"
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "MD5"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "OTP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "GTC"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "LEAP"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "PEAP TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:452
+#, c-format
+msgid "TTLS TLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:454
+#, c-format
+msgid "EAP key_mgmt"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:456
+#, c-format
+msgid ""
+"list of accepted authenticated key management protocols.\n"
+"possible values are WPA-EAP, IEEE8021X, NONE"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:458
+#, c-format
+msgid "EAP outer identity"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:460
+#, c-format
+msgid ""
+"Anonymous identity string for EAP: to be used as the\n"
+"unencrypted identity with EAP types that support different\n"
+"tunnelled identity, e.g., TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:463
+#, c-format
+msgid "EAP phase2"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:465
+#, c-format
+msgid ""
+"Inner authentication with TLS tunnel parameters.\n"
+"input is string with field-value pairs, Examples:\n"
+"auth=MSCHAPV2 for PEAP or\n"
+"autheap=MSCHAPV2 autheap=MD5 for TTLS"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:469
+#, fuzzy, c-format
+msgid "EAP CA certificate"
+msgstr "证书"
+
+#: ../lib/network/connection/wireless.pm:471
+#, c-format
+msgid ""
+"Full file path to CA certificate file (PEM/DER). This file\n"
+"can have one or more trusted CA certificates. If ca_cert are not\n"
+"included, server certificate will not be verified. If possible,\n"
+"a trusted CA certificate should always be configured\n"
+"when using TLS or TTLS or PEAP."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:476
+#, c-format
+msgid "EAP certificate subject match"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:478
+#, c-format
+msgid ""
+" Substring to be matched against the subject of\n"
+"the authentication server certificate. If this string is set,\n"
+"the server sertificate is only accepted if it contains this\n"
+"string in the subject.  The subject string is in following format:\n"
+"/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:483
+#, c-format
+msgid "EAP extra directives"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:485
+#, c-format
+msgid ""
+"Here one can pass extra settings to wpa_supplicant\n"
+"The expected format is a string field=value pair. Multiple values\n"
+"maybe specified, separating each value with the # character.\n"
+"Note: directives are passed unchecked and may cause the wpa\n"
+"negotiation to fail silently. Supported directives are preserved\n"
+"across editing.\n"
+"Supported directives are :\n"
+"\tdisabled, id_str, bssid, priority, auth_alg, eapol_flags,\n"
+"\tproactive_key_caching, peerkey, ca_path, private_key,\n"
+"\tprivate_key_passwd, dh_file, altsubject_match, phase1,\n"
+"\tfragment_size and eap_workaround, pairwise, group\n"
+"\tOthers such as key_mgmt, eap maybe used to force\n"
+"\tspecial settings different from the U.I settings."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要加密密钥。"
@@ -5032,12 +5265,7 @@ msgstr "请选择 Windows 驱动程序(.inf 文件)"
 msgid "Unable to install the %s ndiswrapper driver!"
 msgstr "无法安装 %s ndiswrapper 驱动程序!"
 
-#: ../lib/network/ndiswrapper.pm:86
-#, c-format
-msgid "Unable to load the ndiswrapper module!"
-msgstr "无法装入 ndiswrapper 模块!"
-
-#: ../lib/network/ndiswrapper.pm:92
+#: ../lib/network/ndiswrapper.pm:103
 #, c-format
 msgid ""
 "The selected device has already been configured with the %s driver.\n"
@@ -5046,7 +5274,12 @@ msgstr ""
 "所选的设备已经以 %s 驱动程序配置过。\n"
 "您真的想要使用 ndiswrapper 驱动程序吗?"
 
-#: ../lib/network/ndiswrapper.pm:102
+#: ../lib/network/ndiswrapper.pm:118
+#, c-format
+msgid "Unable to load the ndiswrapper module!"
+msgstr "无法装入 ndiswrapper 模块!"
+
+#: ../lib/network/ndiswrapper.pm:124
 #, c-format
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "找不到 ndiswrapper 接口!"
@@ -5745,7 +5978,12 @@ msgstr ""
 "所需的文件也可从以下 URL 安装:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:178 ../lib/network/thirdparty.pm:183
+#: ../lib/network/thirdparty.pm:180
+#, c-format
+msgid "Firmware files are required for this device."
+msgstr "此设备需要固件文件。"
+
+#: ../lib/network/thirdparty.pm:183 ../lib/network/thirdparty.pm:188
 #, c-format
 msgid "Use a floppy"
 msgstr "使用软盘"
@@ -5944,3 +6182,6 @@ msgstr "使用 Cisco-UDP 封装"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "使用指定的 UDP 端口"
+
+#~ msgid "Failed to add printers."
+#~ msgstr "添加打印机失败。"