po: sync with code.

1 files changed, 543 insertions, 479 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7099ed9..05fc7a9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 2007\n"
-"POT-Creation-Date: 2009-02-13 20:39-0200\n"
+"POT-Creation-Date: 2009-03-25 15:35-0300\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"
@@ -26,7 +26,7 @@ msgstr "网卡"
 msgid "IP address"
 msgstr "IP 地址"
 
-#: ../bin/drakconnect-old:64 ../bin/drakids:258
+#: ../bin/drakconnect-old:64 ../bin/drakids:261
 #: ../lib/network/netconnect.pm:458
 #, c-format
 msgid "Protocol"
@@ -62,7 +62,7 @@ msgstr "局域网配置"
 msgid "Configure Local Area Network..."
 msgstr "配置局域网..."
 
-#: ../bin/drakconnect-old:106 ../bin/draknfs:189 ../bin/net_applet:188
+#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:188
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -73,24 +73,26 @@ msgid "Apply"
 msgstr "应用"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
-#: ../bin/draknetprofile:133 ../bin/net_monitor:388
+#: ../bin/draknetprofile:142 ../bin/draknetprofile.orig:142
+#: ../bin/net_monitor:388
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
-#: ../bin/drakconnect-old:265 ../bin/draknetprofile:135 ../bin/net_monitor:389
+#: ../bin/drakconnect-old:265 ../bin/draknetprofile:144
+#: ../bin/draknetprofile.orig:144 ../bin/net_monitor:389
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../bin/drakconnect-old:113 ../bin/drakgw:345 ../bin/draknfs:582
-#: ../bin/draksambashare:229 ../lib/network/connection_manager.pm:73
-#: ../lib/network/connection_manager.pm:88
-#: ../lib/network/connection_manager.pm:202
-#: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:339 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:143 ../lib/network/netconnect.pm:185
+#: ../bin/drakconnect-old:113 ../bin/drakgw:351 ../bin/draknfs:584
+#: ../bin/draksambashare:229 ../lib/network/connection_manager.pm:74
+#: ../lib/network/connection_manager.pm:89
+#: ../lib/network/connection_manager.pm:203
+#: ../lib/network/connection_manager.pm:232
+#: ../lib/network/connection_manager.pm:348 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:142 ../lib/network/netconnect.pm:185
 #: ../lib/network/netconnect.pm:207 ../lib/network/netconnect.pm:304
 #: ../lib/network/netconnect.pm:714 ../lib/network/thirdparty.pm:354
 #: ../lib/network/thirdparty.pm:369
@@ -132,7 +134,7 @@ msgstr "LAN 配置"
 msgid "Adapter %s: %s"
 msgstr "适配器 %s: %s"
 
-#: ../bin/drakconnect-old:209 ../bin/drakgw:177
+#: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:141
 #, c-format
 msgid "Netmask"
@@ -194,7 +196,7 @@ msgid "Internet Connection Sharing"
 msgstr "Internet 连接共享"
 
 #: ../bin/drakgw:75
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -204,7 +206,8 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN)."
+"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
 "现在将要把您电脑上的 Internet 连接配置为共享给其它电脑。\n"
 "使用此特性, 局域网上的其它计算机都将可以使用本机上的 Internet 连接。\n"
@@ -268,96 +271,99 @@ msgstr "网络设备"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one configured network adapter on your system:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
-"I am about to setup your Local Area Network with that adapter."
-msgstr ""
-"您的系统中只配置了一块网卡: \n"
+"I am about to setup your Local Area Network with that adapter.\n"
 "\n"
-"%s\n"
-"\n"
-"即将对这块网卡设置您的局域网。"
+"If you have any other adapter connected to Local Area Network,\n"
+"disable the firewall protection on it using drakfirewall before\n"
+"configuring Internet Connection sharing."
+msgstr ""
 
-#: ../bin/drakgw:152
+#: ../bin/drakgw:156
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "请选择您将使用哪张网卡连接您的局域网。"
 
-#: ../bin/drakgw:173
+#: ../bin/drakgw:177
 #, c-format
 msgid "Local Area Network settings"
 msgstr "局域网设置"
 
-#: ../bin/drakgw:176 ../lib/network/vpn/openvpn.pm:227
+#: ../bin/drakgw:180 ../lib/network/vpn/openvpn.pm:227
 #, c-format
 msgid "Local IP address"
 msgstr "本地 IP 地址"
 
-#: ../bin/drakgw:178
+#: ../bin/drakgw:182
 #, c-format
 msgid "The internal domain name"
 msgstr "内部域名"
 
-#: ../bin/drakgw:184 ../bin/drakhosts:100 ../bin/drakhosts:245
+#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:245
 #: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
-#: ../bin/draknetprofile:140 ../bin/draknfs:91 ../bin/draknfs:112
-#: ../bin/draknfs:280 ../bin/draknfs:427 ../bin/draknfs:429 ../bin/draknfs:432
-#: ../bin/draknfs:524 ../bin/draknfs:531 ../bin/draknfs:599 ../bin/draknfs:606
-#: ../bin/draknfs:613 ../bin/draksambashare:393 ../bin/draksambashare:400
+#: ../bin/draknetprofile:149 ../bin/draknetprofile.orig:149 ../bin/draknfs:93
+#: ../bin/draknfs:282 ../bin/draknfs:429 ../bin/draknfs:431 ../bin/draknfs:434
+#: ../bin/draknfs:526 ../bin/draknfs:533 ../bin/draknfs:605 ../bin/draknfs:612
+#: ../bin/draknfs:619 ../bin/draksambashare:393 ../bin/draksambashare:400
 #: ../bin/draksambashare:403 ../bin/draksambashare:455
 #: ../bin/draksambashare:479 ../bin/draksambashare:552
-#: ../bin/draksambashare:630 ../bin/draksambashare:697
-#: ../bin/draksambashare:797 ../bin/draksambashare:804
-#: ../bin/draksambashare:943 ../bin/draksambashare:1097
-#: ../bin/draksambashare:1116 ../bin/draksambashare:1148
-#: ../bin/draksambashare:1254 ../bin/draksambashare:1356
-#: ../bin/draksambashare:1365 ../bin/draksambashare:1387
-#: ../bin/draksambashare:1396 ../bin/draksambashare:1415
-#: ../bin/draksambashare:1424 ../bin/draksambashare:1436
+#: ../bin/draksambashare:629 ../bin/draksambashare:695
+#: ../bin/draksambashare:795 ../bin/draksambashare:802
+#: ../bin/draksambashare:941 ../bin/draksambashare:1095
+#: ../bin/draksambashare:1114 ../bin/draksambashare:1146
+#: ../bin/draksambashare:1252 ../bin/draksambashare:1354
+#: ../bin/draksambashare:1363 ../bin/draksambashare:1385
+#: ../bin/draksambashare:1394 ../bin/draksambashare:1413
+#: ../bin/draksambashare:1422 ../bin/draksambashare:1434
 #: ../lib/network/connection/xdsl.pm:359
-#: ../lib/network/connection_manager.pm:61
-#: ../lib/network/connection_manager.pm:67
-#: ../lib/network/connection_manager.pm:83
-#: ../lib/network/connection_manager.pm:91
-#: ../lib/network/connection_manager.pm:173
-#: ../lib/network/connection_manager.pm:177 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:62
+#: ../lib/network/connection_manager.pm:68
+#: ../lib/network/connection_manager.pm:84
+#: ../lib/network/connection_manager.pm:92
+#: ../lib/network/connection_manager.pm:174
+#: ../lib/network/connection_manager.pm:178
+#: ../lib/network/connection_manager.pm:220
+#: ../lib/network/connection_manager.pm:476
+#: ../lib/network/connection_manager.pm:489 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
-#: ../lib/network/ndiswrapper.pm:124 ../lib/network/netcenter.pm:218
-#: ../lib/network/netconnect.pm:134 ../lib/network/netconnect.pm:187
-#: ../lib/network/netconnect.pm:233 ../lib/network/netconnect.pm:274
-#: ../lib/network/netconnect.pm:823 ../lib/network/thirdparty.pm:123
-#: ../lib/network/thirdparty.pm:141 ../lib/network/thirdparty.pm:232
-#: ../lib/network/thirdparty.pm:234 ../lib/network/thirdparty.pm:255
+#: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:134
+#: ../lib/network/netconnect.pm:187 ../lib/network/netconnect.pm:233
+#: ../lib/network/netconnect.pm:274 ../lib/network/netconnect.pm:823
+#: ../lib/network/thirdparty.pm:123 ../lib/network/thirdparty.pm:141
+#: ../lib/network/thirdparty.pm:232 ../lib/network/thirdparty.pm:234
+#: ../lib/network/thirdparty.pm:255
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../bin/drakgw:184
+#: ../bin/drakgw:188
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "在当前的 %s 配置中发现可能的 LAN 地址冲突！\n"
 
-#: ../bin/drakgw:200
+#: ../bin/drakgw:204
 #, c-format
 msgid "Domain Name Server (DNS) configuration"
 msgstr "域名服务器(DNS)配置"
 
-#: ../bin/drakgw:204
+#: ../bin/drakgw:208
 #, c-format
 msgid "Use this gateway as domain name server"
 msgstr "使用此网关作为域名服务器"
 
-#: ../bin/drakgw:205
+#: ../bin/drakgw:209
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DNS 服务器 IP"
 
-#: ../bin/drakgw:232
+#: ../bin/drakgw:236
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -370,84 +376,88 @@ msgstr ""
 "在此您可以选择 DHCP 服务器配置的不同选项。\n"
 "如果您不知道选项的含义, 那么就不管它, 不必进行修改。"
 
-#: ../bin/drakgw:239
+#: ../bin/drakgw:243
 #, c-format
 msgid "Use automatic configuration (DHCP)"
 msgstr "使用自动重新配置(DHCP)"
 
-#: ../bin/drakgw:240
+#: ../bin/drakgw:244
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP 起始范围"
 
-#: ../bin/drakgw:241
+#: ../bin/drakgw:245
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP 终止范围"
 
-#: ../bin/drakgw:242
+#: ../bin/drakgw:246
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "默认租期(以秒为单位)"
 
-#: ../bin/drakgw:243
+#: ../bin/drakgw:247
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "最长租期(以秒为单位)"
 
-#: ../bin/drakgw:266
+#: ../bin/drakgw:270
 #, c-format
 msgid "Proxy caching server (SQUID)"
 msgstr "代理缓存服务器(SQUID)"
 
-#: ../bin/drakgw:270
+#: ../bin/drakgw:274
 #, c-format
 msgid "Use this gateway as proxy caching server"
 msgstr "使用此网关作为代理缓存服务器"
 
-#: ../bin/drakgw:271
+#: ../bin/drakgw:275
 #, c-format
 msgid "Admin mail"
 msgstr "管理员电子邮件"
 
-#: ../bin/drakgw:272
+#: ../bin/drakgw:276
 #, c-format
 msgid "Visible hostname"
 msgstr "可见主机名"
 
-#: ../bin/drakgw:273
+#: ../bin/drakgw:277
 #, c-format
 msgid "Proxy port"
 msgstr "代理端口"
 
-#: ../bin/drakgw:274
+#: ../bin/drakgw:278
 #, c-format
 msgid "Cache size (MB)"
 msgstr "缓存大小(MB)"
 
-#: ../bin/drakgw:293
+#: ../bin/drakgw:297
 #, c-format
 msgid "Broadcast printer information"
 msgstr "广播打印机信息"
 
-#: ../bin/drakgw:304
+#: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter has been detected on your system. Please run the "
-"hardware configuration tool."
-msgstr "您的系统里没有配置以太网卡。请运行硬件配置工具。"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
+"\n"
+"Please run the hardware configuration tool to configure it, and certify that "
+"the Mandirva firewall is not enabled for network adapter connected to your "
+"LAN network."
+msgstr ""
 
-#: ../bin/drakgw:310
+#: ../bin/drakgw:316
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Internet 连接共享现已启用。"
 
-#: ../bin/drakgw:316
+#: ../bin/drakgw:322
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Internet 连接共享现已禁用。"
 
-#: ../bin/drakgw:322
+#: ../bin/drakgw:328
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -459,29 +469,29 @@ msgstr ""
 "您现在可以利用自动网络设置(DHCP)和透明代理缓存服务器(SQUID)让您的局域网上其它"
 "的电脑共享您的互联网连接了。"
 
-#: ../bin/drakgw:345
+#: ../bin/drakgw:351
 #, c-format
 msgid "Disabling servers..."
 msgstr "正在禁用服务器..."
 
-#: ../bin/drakgw:359
+#: ../bin/drakgw:365
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "发现防火墙配置！"
 
-#: ../bin/drakgw:360
+#: ../bin/drakgw:366
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr "警告！发现原来的配置利用了防火墙功能。您可能需要在安装之后手工修改。"
 
-#: ../bin/drakgw:365
+#: ../bin/drakgw:371
 #, c-format
 msgid "Configuring..."
 msgstr "正在配置..."
 
-#: ../bin/drakgw:366
+#: ../bin/drakgw:372
 #, c-format
 msgid "Configuring firewall..."
 msgstr "正在配置防火墙..."
@@ -521,9 +531,10 @@ msgstr "主机名:"
 msgid "Host Aliases:"
 msgstr "主机别名:"
 
-#: ../bin/drakhosts:122 ../bin/drakhosts:128 ../bin/draksambashare:230
-#: ../bin/draksambashare:251 ../bin/draksambashare:397
-#: ../bin/draksambashare:626 ../bin/draksambashare:793
+#: ../bin/drakhosts:122 ../bin/drakhosts:128 ../bin/draknfs:116
+#: ../bin/draksambashare:230 ../bin/draksambashare:253
+#: ../bin/draksambashare:397 ../bin/draksambashare:625
+#: ../bin/draksambashare:791
 #, c-format
 msgid "Error!"
 msgstr "错误！"
@@ -553,13 +564,13 @@ msgstr "主机别名"
 msgid "Manage hosts definitions"
 msgstr "管理主机定义"
 
-#: ../bin/drakhosts:222 ../bin/drakhosts:249 ../bin/draknfs:367
+#: ../bin/drakhosts:222 ../bin/drakhosts:249 ../bin/draknfs:369
 #, c-format
 msgid "Modify entry"
 msgstr "修改项"
 
-#: ../bin/drakhosts:241 ../bin/draknfs:595 ../bin/draksambashare:1349
-#: ../bin/draksambashare:1380 ../bin/draksambashare:1411
+#: ../bin/drakhosts:241 ../bin/draknfs:601 ../bin/draksambashare:1347
+#: ../bin/draksambashare:1378 ../bin/draksambashare:1409
 #, c-format
 msgid "Add"
 msgstr "添加"
@@ -574,9 +585,9 @@ msgstr "添加项"
 msgid "Failed to add host."
 msgstr "添加主机失败。"
 
-#: ../bin/drakhosts:248 ../bin/draknfs:602 ../bin/draksambashare:1306
-#: ../bin/draksambashare:1351 ../bin/draksambashare:1382
-#: ../bin/draksambashare:1419
+#: ../bin/drakhosts:248 ../bin/draknfs:608 ../bin/draksambashare:1304
+#: ../bin/draksambashare:1349 ../bin/draksambashare:1380
+#: ../bin/draksambashare:1417
 #, c-format
 msgid "Modify"
 msgstr "修改"
@@ -586,9 +597,9 @@ msgstr "修改"
 msgid "Failed to Modify host."
 msgstr "修改主机失败。"
 
-#: ../bin/drakhosts:255 ../bin/drakids:92 ../bin/drakids:101
-#: ../bin/draknfs:609 ../bin/draksambashare:1307 ../bin/draksambashare:1359
-#: ../bin/draksambashare:1390 ../bin/draksambashare:1427
+#: ../bin/drakhosts:255 ../bin/drakids:95 ../bin/drakids:104
+#: ../bin/draknfs:615 ../bin/draksambashare:1305 ../bin/draksambashare:1357
+#: ../bin/draksambashare:1388 ../bin/draksambashare:1425
 #, c-format
 msgid "Remove"
 msgstr "删除"
@@ -598,9 +609,9 @@ msgstr "删除"
 msgid "Failed to remove host."
 msgstr "删除主机失败。"
 
-#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:174
-#: ../bin/net_applet:189 ../lib/network/drakroam.pm:118
-#: ../lib/network/netcenter.pm:170
+#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:183
+#: ../bin/draknetprofile.orig:183 ../bin/net_applet:189
+#: ../lib/network/drakroam.pm:93 ../lib/network/netcenter.pm:169
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -610,124 +621,124 @@ msgstr "退出"
 msgid "Allowed addresses"
 msgstr "允许的地址"
 
-#: ../bin/drakids:40 ../bin/drakids:68 ../bin/drakids:187 ../bin/drakids:196
-#: ../bin/drakids:221 ../bin/drakids:230 ../bin/drakids:240 ../bin/drakids:332
-#: ../bin/net_applet:132 ../bin/net_applet:278
-#: ../lib/network/drakfirewall.pm:261 ../lib/network/drakfirewall.pm:265
+#: ../bin/drakids:40 ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199
+#: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
+#: ../bin/net_applet:132 ../bin/net_applet:292
+#: ../lib/network/drakfirewall.pm:270 ../lib/network/drakfirewall.pm:274
 #, c-format
 msgid "Interactive Firewall"
 msgstr "交互式防火墙"
 
-#: ../bin/drakids:68 ../bin/drakids:187 ../bin/drakids:196 ../bin/drakids:221
-#: ../bin/drakids:230 ../bin/drakids:240 ../bin/drakids:332
-#: ../bin/net_applet:278
+#: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
+#: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
+#: ../bin/net_applet:292
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "无法连接守护程序"
 
-#: ../bin/drakids:79 ../bin/drakids:107
+#: ../bin/drakids:82 ../bin/drakids:110
 #, c-format
 msgid "Log"
 msgstr "日志"
 
-#: ../bin/drakids:83 ../bin/drakids:102
+#: ../bin/drakids:86 ../bin/drakids:105
 #, c-format
 msgid "Allow"
 msgstr "允许"
 
-#: ../bin/drakids:84 ../bin/drakids:93
+#: ../bin/drakids:87 ../bin/drakids:96
 #, c-format
 msgid "Block"
 msgstr "屏蔽"
 
-#: ../bin/drakids:85 ../bin/drakids:94 ../bin/drakids:103 ../bin/drakids:114
-#: ../bin/drakids:127 ../bin/drakids:135 ../bin/draknfs:194
+#: ../bin/drakids:88 ../bin/drakids:97 ../bin/drakids:106 ../bin/drakids:117
+#: ../bin/drakids:130 ../bin/drakids:138 ../bin/draknfs:197
 #: ../bin/net_monitor:122
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../bin/drakids:88
+#: ../bin/drakids:91
 #, c-format
 msgid "Allowed services"
 msgstr "允许的服务"
 
-#: ../bin/drakids:97
+#: ../bin/drakids:100
 #, c-format
 msgid "Blocked services"
 msgstr "屏蔽的服务"
 
-#: ../bin/drakids:111
+#: ../bin/drakids:114
 #, c-format
 msgid "Clear logs"
 msgstr "清除日志"
 
-#: ../bin/drakids:112 ../bin/drakids:117
+#: ../bin/drakids:115 ../bin/drakids:120
 #, c-format
 msgid "Blacklist"
 msgstr "黑名单"
 
-#: ../bin/drakids:113 ../bin/drakids:130
+#: ../bin/drakids:116 ../bin/drakids:133
 #, c-format
 msgid "Whitelist"
 msgstr "白名单"
 
-#: ../bin/drakids:121
+#: ../bin/drakids:124
 #, c-format
 msgid "Remove from blacklist"
 msgstr "从黑名单中移除"
 
-#: ../bin/drakids:122
+#: ../bin/drakids:125
 #, c-format
 msgid "Move to whitelist"
 msgstr "移动到白名单"
 
-#: ../bin/drakids:134
+#: ../bin/drakids:137
 #, c-format
 msgid "Remove from whitelist"
 msgstr "从白名单中移除"
 
-#: ../bin/drakids:253
+#: ../bin/drakids:256
 #, c-format
 msgid "Date"
 msgstr "日期"
 
-#: ../bin/drakids:254
+#: ../bin/drakids:257
 #, c-format
 msgid "Remote host"
 msgstr "远程主机"
 
-#: ../bin/drakids:255 ../lib/network/vpn/openvpn.pm:115
+#: ../bin/drakids:258 ../lib/network/vpn/openvpn.pm:115
 #, c-format
 msgid "Type"
 msgstr "类型"
 
-#: ../bin/drakids:256 ../bin/drakids:289
+#: ../bin/drakids:259 ../bin/drakids:292
 #, c-format
 msgid "Service"
 msgstr "服务"
 
-#: ../bin/drakids:257
+#: ../bin/drakids:260
 #, c-format
 msgid "Network interface"
 msgstr "网卡"
 
-#: ../bin/drakids:288
+#: ../bin/drakids:291
 #, c-format
 msgid "Application"
 msgstr "应用程序"
 
-#: ../bin/drakids:290
+#: ../bin/drakids:293
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../bin/drakids:292
+#: ../bin/drakids:295
 #, c-format
 msgid "Allowed"
 msgstr "已允许"
 
-#: ../bin/drakids:293
+#: ../bin/drakids:296
 #, c-format
 msgid "Blocked"
 msgstr "已屏蔽"
@@ -800,160 +811,161 @@ msgstr "同步网卡"
 msgid "Connection mark bit"
 msgstr "连接标志字"
 
-#: ../bin/draknetprofile:37
+#: ../bin/draknetprofile:37 ../bin/draknetprofile.orig:37
 #, c-format
 msgid "Network profiles"
 msgstr "网络配置文件"
 
-#: ../bin/draknetprofile:67
+#: ../bin/draknetprofile:67 ../bin/draknetprofile.orig:67
 #, c-format
 msgid "Profile"
 msgstr "配置文件"
 
-#: ../bin/draknetprofile:126
+#: ../bin/draknetprofile:135 ../bin/draknetprofile.orig:135
 #, c-format
 msgid "New profile..."
 msgstr "新建配置文件..."
 
-#: ../bin/draknetprofile:129
+#: ../bin/draknetprofile:138 ../bin/draknetprofile.orig:138
 #, c-format
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
 msgstr "要创建的配置文件名称(新配置文件将会以当前配置文件为基础创建)："
 
-#: ../bin/draknetprofile:140
+#: ../bin/draknetprofile:149 ../bin/draknetprofile.orig:149
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "配置文件“%s”已经存在！"
 
-#: ../bin/draknetprofile:156 ../bin/draknetprofile:158
+#: ../bin/draknetprofile:165 ../bin/draknetprofile:167
+#: ../bin/draknetprofile.orig:165 ../bin/draknetprofile.orig:167
 #: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
 #: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:481
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../bin/draknetprofile:156
+#: ../bin/draknetprofile:165 ../bin/draknetprofile.orig:165
 #, c-format
 msgid "You can not delete the default profile"
 msgstr "您不能删除默认配置文件"
 
-#: ../bin/draknetprofile:158
+#: ../bin/draknetprofile:167 ../bin/draknetprofile.orig:167
 #, c-format
 msgid "You can not delete the current profile"
 msgstr "您不能删除当前配置文件"
 
-#: ../bin/draknetprofile:168
+#: ../bin/draknetprofile:177 ../bin/draknetprofile.orig:177
 #, c-format
 msgid ""
 "This tool allows to activate an existing network profile, and to manage "
 "(clone, delete) profiles."
 msgstr "此工具允许您激活现有的网络配置文件，以及管理(克隆、删除)配置文件。"
 
-#: ../bin/draknetprofile:168
+#: ../bin/draknetprofile:177 ../bin/draknetprofile.orig:177
 #, c-format
 msgid "To modify a profile, you have to activate it first."
 msgstr "要修改配置文件，您必须先激活该配置文件。"
 
-#: ../bin/draknetprofile:171
+#: ../bin/draknetprofile:180 ../bin/draknetprofile.orig:180
 #, c-format
 msgid "Activate"
 msgstr "激活"
 
-#: ../bin/draknetprofile:172
+#: ../bin/draknetprofile:181 ../bin/draknetprofile.orig:181
 #, c-format
 msgid "Clone"
 msgstr "克隆"
 
-#: ../bin/draknetprofile:173
+#: ../bin/draknetprofile:182 ../bin/draknetprofile.orig:182
 #, c-format
 msgid "Delete"
 msgstr "删除"
 
-#: ../bin/draknfs:47
+#: ../bin/draknfs:49
 #, c-format
 msgid "map root user as anonymous"
 msgstr "将 root 用户映射为匿名者"
 
-#: ../bin/draknfs:48
+#: ../bin/draknfs:50
 #, c-format
 msgid "map all users to anonymous user"
 msgstr "将所有用户映射为匿名用户"
 
-#: ../bin/draknfs:49
+#: ../bin/draknfs:51
 #, c-format
 msgid "No user UID mapping"
 msgstr "无用户 UID 映射"
 
-#: ../bin/draknfs:50
+#: ../bin/draknfs:52
 #, c-format
 msgid "allow real remote root access"
 msgstr "允许真正的远程 root 访问"
 
-#: ../bin/draknfs:64 ../bin/draknfs:65 ../bin/draknfs:66
+#: ../bin/draknfs:66 ../bin/draknfs:67 ../bin/draknfs:68
 #: ../bin/draksambashare:175 ../bin/draksambashare:176
 #: ../bin/draksambashare:177
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../bin/draknfs:65 ../bin/draksambashare:176
+#: ../bin/draknfs:67 ../bin/draksambashare:176
 #, c-format
 msgid "/_Write conf"
 msgstr "/写入配置(_W)"
 
-#: ../bin/draknfs:66 ../bin/draksambashare:177
+#: ../bin/draknfs:68 ../bin/draksambashare:177
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../bin/draknfs:66 ../bin/draksambashare:177
+#: ../bin/draknfs:68 ../bin/draksambashare:177
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../bin/draknfs:69 ../bin/draknfs:70 ../bin/draknfs:71
+#: ../bin/draknfs:71 ../bin/draknfs:72 ../bin/draknfs:73
 #, c-format
 msgid "/_NFS Server"
 msgstr "/_NFS 服务器"
 
-#: ../bin/draknfs:70 ../bin/draksambashare:181
+#: ../bin/draknfs:72 ../bin/draksambashare:181
 #, c-format
 msgid "/_Restart"
 msgstr "/_重新启动"
 
-#: ../bin/draknfs:71 ../bin/draksambashare:182
+#: ../bin/draknfs:73 ../bin/draksambashare:182
 #, c-format
 msgid "/R_eload"
 msgstr "/重新装入(_E)"
 
-#: ../bin/draknfs:90
+#: ../bin/draknfs:92
 #, c-format
 msgid "NFS server"
 msgstr "NFS 服务器"
 
-#: ../bin/draknfs:90
+#: ../bin/draknfs:92
 #, c-format
 msgid "Restarting/Reloading NFS server..."
 msgstr "正在重新启动/重新装入 NFS 服务器..."
 
-#: ../bin/draknfs:91
+#: ../bin/draknfs:93
 #, c-format
 msgid "Error Restarting/Reloading NFS server"
 msgstr "重新启动/重新装入 NFS 服务器出错"
 
-#: ../bin/draknfs:107 ../bin/draksambashare:246
-#, c-format
-msgid "Directory Selection"
+#: ../bin/draknfs:109 ../bin/draksambashare:246
+#, fuzzy, c-format
+msgid "Directory selection"
 msgstr "目录选择"
 
-#: ../bin/draknfs:112 ../bin/draksambashare:251
+#: ../bin/draknfs:116 ../bin/draksambashare:253
 #, c-format
 msgid "Should be a directory."
 msgstr "应该为目录。"
 
-#: ../bin/draknfs:143
+#: ../bin/draknfs:146
 #, c-format
 msgid ""
 "<span weight=\"bold\">NFS clients</span> may be specified in a number of "
@@ -997,7 +1009,7 @@ msgstr ""
 "<span foreground=\"royalblue3\">IP 子网:</span> 您还可以同时将目录导出给 IP "
 "子网中的全部主机。例如，追加到网络基地址后的“/255.255.252.0”或“/22”。\n"
 
-#: ../bin/draknfs:158
+#: ../bin/draknfs:161
 #, c-format
 msgid ""
 "<span weight=\"bold\">User ID options</span>\n"
@@ -1042,32 +1054,32 @@ msgstr ""
 "<span foreground=\"royalblue3\">anonuid 和 anongid:</span> 显式设置匿名账户"
 "的 uid 和 gid。\n"
 
-#: ../bin/draknfs:174
+#: ../bin/draknfs:177
 #, c-format
 msgid "Synchronous access:"
 msgstr "同步访问:"
 
-#: ../bin/draknfs:175
+#: ../bin/draknfs:178
 #, c-format
 msgid "Secured Connection:"
 msgstr "安全连接:"
 
-#: ../bin/draknfs:176
+#: ../bin/draknfs:179
 #, c-format
 msgid "Read-Only share:"
 msgstr "只读共享:"
 
-#: ../bin/draknfs:177
+#: ../bin/draknfs:180
 #, c-format
 msgid "Subtree checking:"
 msgstr "子树检查:"
 
-#: ../bin/draknfs:179
+#: ../bin/draknfs:182
 #, c-format
 msgid "Advanced Options"
 msgstr "高级选项"
 
-#: ../bin/draknfs:180
+#: ../bin/draknfs:183
 #, c-format
 msgid ""
 "<span foreground=\"royalblue3\">%s</span> this option requires that requests "
@@ -1077,7 +1089,7 @@ msgstr ""
 "<span foreground=\"royalblue3\">%s</span> 此选项需要发出请求的互联网端口小于 "
 "IPPORT_RESERVED (1024)。此选项默认打开。"
 
-#: ../bin/draknfs:181
+#: ../bin/draknfs:184
 #, c-format
 msgid ""
 "<span foreground=\"royalblue3\">%s</span> allow either only read or both "
@@ -1088,7 +1100,7 @@ msgstr ""
 "<span foreground=\"royalblue3\">%s</span> 允许此 NFS 卷上的只读或读写请求。默"
 "认值为不允许任何会更改文件系统的请求。您也可以显式使用此选项。"
 
-#: ../bin/draknfs:182
+#: ../bin/draknfs:185
 #, c-format
 msgid ""
 "<span foreground=\"royalblue3\">%s</span> disallows the NFS server to "
@@ -1098,7 +1110,7 @@ msgstr ""
 "<span foreground=\"royalblue3\">%s</span> 禁止 NFS 暴露 NFS 协议，并在请求对"
 "存储设备发生实际更改之前先回复请求。"
 
-#: ../bin/draknfs:183
+#: ../bin/draknfs:186
 #, c-format
 msgid ""
 "<span foreground=\"royalblue3\">%s</span> enable subtree checking which can "
@@ -1108,139 +1120,139 @@ msgstr ""
 "<span foreground=\"royalblue3\">%s</span> 允许子树检查，在某些情况下这将改善"
 "安全性，但可靠性可能降低。更多信息请查看 exports(5) 的手册页。"
 
-#: ../bin/draknfs:188 ../bin/draksambashare:624 ../bin/draksambashare:791
+#: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
 msgid "Information"
 msgstr "信息"
 
-#: ../bin/draknfs:269
+#: ../bin/draknfs:271
 #, c-format
 msgid "Directory"
 msgstr "目录"
 
-#: ../bin/draknfs:280
+#: ../bin/draknfs:282
 #, c-format
 msgid "Please add an NFS share to be able to modify it."
 msgstr "请添加 NFS 共享再进行修改。"
 
-#: ../bin/draknfs:354
+#: ../bin/draknfs:356
 #, fuzzy, c-format
 msgid "Advanced"
 msgstr "高级选项"
 
-#: ../bin/draknfs:377
+#: ../bin/draknfs:379
 #, c-format
 msgid "NFS directory"
 msgstr "NFS 目录"
 
-#: ../bin/draknfs:378 ../bin/draksambashare:382 ../bin/draksambashare:589
-#: ../bin/draksambashare:768
+#: ../bin/draknfs:380 ../bin/draksambashare:382 ../bin/draksambashare:588
+#: ../bin/draksambashare:766
 #, c-format
 msgid "Directory:"
 msgstr "目录:"
 
-#: ../bin/draknfs:379
+#: ../bin/draknfs:381
 #, c-format
 msgid "Host access"
 msgstr "主机访问"
 
-#: ../bin/draknfs:380
+#: ../bin/draknfs:382
 #, c-format
 msgid "Access:"
 msgstr "访问:"
 
-#: ../bin/draknfs:381
+#: ../bin/draknfs:383
 #, c-format
 msgid "User ID Mapping"
 msgstr "用户 ID 映射"
 
-#: ../bin/draknfs:382
+#: ../bin/draknfs:384
 #, c-format
 msgid "User ID:"
 msgstr "用户 ID:"
 
-#: ../bin/draknfs:383
+#: ../bin/draknfs:385
 #, c-format
 msgid "Anonymous user ID:"
 msgstr "匿名用户 ID:"
 
-#: ../bin/draknfs:384
+#: ../bin/draknfs:386
 #, c-format
 msgid "Anonymous Group ID:"
 msgstr "匿名组 ID:"
 
-#: ../bin/draknfs:427
+#: ../bin/draknfs:429
 #, c-format
 msgid "Please specify a directory to share."
 msgstr "请指定要共享的目录。"
 
-#: ../bin/draknfs:429
+#: ../bin/draknfs:431
 #, c-format
 msgid "Can't create this directory."
 msgstr "无法创建此目录。"
 
-#: ../bin/draknfs:432
+#: ../bin/draknfs:434
 #, c-format
 msgid "You must specify hosts access."
 msgstr "您必须指定主机访问。"
 
-#: ../bin/draknfs:512
+#: ../bin/draknfs:514
 #, c-format
 msgid "Share Directory"
 msgstr "共享目录"
 
-#: ../bin/draknfs:512
+#: ../bin/draknfs:514
 #, c-format
 msgid "Hosts Wildcard"
 msgstr "主机通配符"
 
-#: ../bin/draknfs:512
+#: ../bin/draknfs:514
 #, c-format
 msgid "General Options"
 msgstr "常规选项"
 
-#: ../bin/draknfs:512
+#: ../bin/draknfs:514
 #, c-format
 msgid "Custom Options"
 msgstr "自定义选项"
 
-#: ../bin/draknfs:524 ../bin/draksambashare:397 ../bin/draksambashare:626
-#: ../bin/draksambashare:793
+#: ../bin/draknfs:526 ../bin/draksambashare:397 ../bin/draksambashare:625
+#: ../bin/draksambashare:791
 #, c-format
 msgid "Please enter a directory to share."
 msgstr "请输入要共享的目录。"
 
-#: ../bin/draknfs:531
+#: ../bin/draknfs:533
 #, c-format
 msgid "Please use the modify button to set right access."
 msgstr "请使用修改按钮设定访问权限。"
 
-#: ../bin/draknfs:546
+#: ../bin/draknfs:548
 #, c-format
 msgid "Manage NFS shares"
 msgstr "管理 NFS 共享"
 
-#: ../bin/draknfs:582
+#: ../bin/draknfs:584
 #, c-format
 msgid "Starting the NFS-server"
 msgstr "启动 NFS 服务器"
 
-#: ../bin/draknfs:590
+#: ../bin/draknfs:596
 #, c-format
 msgid "DrakNFS manage NFS shares"
 msgstr "DrakNFS 可管理 NFS 共享"
 
-#: ../bin/draknfs:599
+#: ../bin/draknfs:605
 #, c-format
 msgid "Failed to add NFS share."
 msgstr "添加 NFS 共享失败。"
 
-#: ../bin/draknfs:606
+#: ../bin/draknfs:612
 #, c-format
 msgid "Failed to Modify NFS share."
 msgstr "修改 NFS 共享失败。"
 
-#: ../bin/draknfs:613
+#: ../bin/draknfs:619
 #, c-format
 msgid "Failed to remove an NFS share."
 msgstr "删除 NFS 共享失败。"
@@ -1297,7 +1309,7 @@ msgid "Read list"
 msgstr "读取列表"
 
 #: ../bin/draksambashare:81 ../bin/draksambashare:126
-#: ../bin/draksambashare:603
+#: ../bin/draksambashare:602
 #, c-format
 msgid "Write list"
 msgstr "写入列表"
@@ -1357,7 +1369,7 @@ msgstr "打印机名称"
 msgid "Path"
 msgstr "路径"
 
-#: ../bin/draksambashare:121 ../bin/draksambashare:595
+#: ../bin/draksambashare:121 ../bin/draksambashare:594
 #, c-format
 msgid "Printable"
 msgstr "可打印"
@@ -1378,7 +1390,7 @@ msgid "Guest ok"
 msgstr "Guest 可访问"
 
 #: ../bin/draksambashare:127 ../bin/draksambashare:168
-#: ../bin/draksambashare:604
+#: ../bin/draksambashare:603
 #, c-format
 msgid "Inherit permissions"
 msgstr "继承权限"
@@ -1490,8 +1502,8 @@ msgstr "正在重新启动/重新装入 Samba 服务器..."
 msgid "Error Restarting/Reloading Samba server"
 msgstr "重新启动/重新装入 Samba 服务器出错"
 
-#: ../bin/draksambashare:370 ../bin/draksambashare:568
-#: ../bin/draksambashare:689
+#: ../bin/draksambashare:370 ../bin/draksambashare:567
+#: ../bin/draksambashare:687
 #, c-format
 msgid "Open"
 msgstr "打开"
@@ -1511,8 +1523,8 @@ msgstr "添加共享"
 msgid "Name of the share:"
 msgstr "共享名称:"
 
-#: ../bin/draksambashare:381 ../bin/draksambashare:588
-#: ../bin/draksambashare:769
+#: ../bin/draksambashare:381 ../bin/draksambashare:587
+#: ../bin/draksambashare:767
 #, c-format
 msgid "Comment:"
 msgstr "注释:"
@@ -1529,8 +1541,8 @@ msgstr "同名共享已经存在，或者共享名为空，请另选一个名称
 msgid "Can't create the directory, please enter a correct path."
 msgstr "无法创建目录，请输入正确的路径。"
 
-#: ../bin/draksambashare:403 ../bin/draksambashare:624
-#: ../bin/draksambashare:791
+#: ../bin/draksambashare:403 ../bin/draksambashare:623
+#: ../bin/draksambashare:789
 #, c-format
 msgid "Please enter a Comment for this share."
 msgstr "请输入此共享的注释。"
@@ -1566,7 +1578,7 @@ msgstr "已经存在 PDF 生成器。"
 msgid "Printers and print$ already exist."
 msgstr "打印机和 print$ 已经存在。"
 
-#: ../bin/draksambashare:529 ../bin/draksambashare:1199
+#: ../bin/draksambashare:529 ../bin/draksambashare:1197
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
@@ -1581,168 +1593,168 @@ msgstr "向导成功添加了打印机 Samba 共享"
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr "请添加或选择 Samba 打印机共享，然后再修改。"
 
-#: ../bin/draksambashare:571
+#: ../bin/draksambashare:570
 #, c-format
 msgid "DrakSamba Printers entry"
 msgstr "DrakSamba 打印机项"
 
-#: ../bin/draksambashare:584
+#: ../bin/draksambashare:583
 #, c-format
 msgid "Printer share"
 msgstr "打印机共享"
 
-#: ../bin/draksambashare:587
+#: ../bin/draksambashare:586
 #, c-format
 msgid "Printer name:"
 msgstr "打印机名称:"
 
-#: ../bin/draksambashare:593 ../bin/draksambashare:774
+#: ../bin/draksambashare:592 ../bin/draksambashare:772
 #, c-format
 msgid "Writable:"
 msgstr "可写入:"
 
-#: ../bin/draksambashare:594 ../bin/draksambashare:775
+#: ../bin/draksambashare:593 ../bin/draksambashare:773
 #, c-format
 msgid "Browseable:"
 msgstr "可浏览:"
 
-#: ../bin/draksambashare:599
+#: ../bin/draksambashare:598
 #, c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
-#: ../bin/draksambashare:601
+#: ../bin/draksambashare:600
 #, c-format
 msgid "Printer access"
 msgstr "打印机访问"
 
-#: ../bin/draksambashare:605
+#: ../bin/draksambashare:604
 #, c-format
 msgid "Guest ok:"
 msgstr "Guest 可访问:"
 
-#: ../bin/draksambashare:606
+#: ../bin/draksambashare:605
 #, c-format
 msgid "Create mode:"
 msgstr "创建模式:"
 
-#: ../bin/draksambashare:610
+#: ../bin/draksambashare:609
 #, c-format
 msgid "Printer command"
 msgstr "打印机命令"
 
-#: ../bin/draksambashare:612
+#: ../bin/draksambashare:611
 #, c-format
 msgid "Print command:"
 msgstr "打印命令:"
 
-#: ../bin/draksambashare:613
+#: ../bin/draksambashare:612
 #, c-format
 msgid "LPQ command:"
 msgstr "LPQ 命令:"
 
-#: ../bin/draksambashare:614
+#: ../bin/draksambashare:613
 #, c-format
 msgid "Printing:"
 msgstr "打印:"
 
-#: ../bin/draksambashare:630
+#: ../bin/draksambashare:629
 #, c-format
 msgid "create mode should be numeric. ie: 0755."
 msgstr "创建模式必须是数字。如: 0755。"
 
-#: ../bin/draksambashare:692
+#: ../bin/draksambashare:690
 #, c-format
 msgid "DrakSamba entry"
 msgstr "DrakSamba 项"
 
-#: ../bin/draksambashare:697
+#: ../bin/draksambashare:695
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
 msgstr "请添加或选择 Samba 共享，再修改。"
 
-#: ../bin/draksambashare:720
+#: ../bin/draksambashare:718
 #, c-format
 msgid "Samba user access"
 msgstr "Samba 用户访问"
 
-#: ../bin/draksambashare:728
+#: ../bin/draksambashare:726
 #, c-format
 msgid "Mask options"
 msgstr "掩码选项"
 
-#: ../bin/draksambashare:742
+#: ../bin/draksambashare:740
 #, c-format
 msgid "Display options"
 msgstr "显示选项"
 
-#: ../bin/draksambashare:764
+#: ../bin/draksambashare:762
 #, c-format
 msgid "Samba share directory"
 msgstr "Samba 共享目录"
 
-#: ../bin/draksambashare:767
+#: ../bin/draksambashare:765
 #, c-format
 msgid "Share name:"
 msgstr "共享名:"
 
-#: ../bin/draksambashare:773
+#: ../bin/draksambashare:771
 #, c-format
 msgid "Public:"
 msgstr "公开:"
 
-#: ../bin/draksambashare:797
+#: ../bin/draksambashare:795
 #, c-format
 msgid ""
 "Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr "创建掩码、创建模式和目录掩码必须是数字。即: 0755。"
 
-#: ../bin/draksambashare:804
+#: ../bin/draksambashare:802
 #, c-format
 msgid "Please create this Samba user: %s"
 msgstr "请创建此 Samba 用户: %s"
 
-#: ../bin/draksambashare:916
+#: ../bin/draksambashare:914
 #, c-format
 msgid "Add Samba user"
 msgstr "添加 Samba 用户"
 
-#: ../bin/draksambashare:931
+#: ../bin/draksambashare:929
 #, c-format
 msgid "User information"
 msgstr "用户信息"
 
-#: ../bin/draksambashare:933
+#: ../bin/draksambashare:931
 #, c-format
 msgid "User name:"
 msgstr "用户名:"
 
-#: ../bin/draksambashare:934
+#: ../bin/draksambashare:932
 #, c-format
 msgid "Password:"
 msgstr "密码："
 
-#: ../bin/draksambashare:1048
+#: ../bin/draksambashare:1046
 #, c-format
 msgid "PDC - primary domain controller"
 msgstr "PDC - 主域控制器"
 
-#: ../bin/draksambashare:1049
+#: ../bin/draksambashare:1047
 #, c-format
 msgid "Standalone - standalone server"
 msgstr "独立 - 独立服务器"
 
-#: ../bin/draksambashare:1055
+#: ../bin/draksambashare:1053
 #, c-format
 msgid "Samba Wizard"
 msgstr "Samba 向导"
 
-#: ../bin/draksambashare:1058
+#: ../bin/draksambashare:1056
 #, c-format
 msgid "Samba server configuration Wizard"
 msgstr "Samba 服务器配置向导"
 
-#: ../bin/draksambashare:1058
+#: ../bin/draksambashare:1056
 #, c-format
 msgid ""
 "Samba allows your server to behave as a file and print server for "
@@ -1750,25 +1762,25 @@ msgid ""
 msgstr ""
 "Samba 让您的服务器为运行 Linux 以外操作系统的工作站提供文件和打印服务。"
 
-#: ../bin/draksambashare:1074
+#: ../bin/draksambashare:1072
 #, c-format
 msgid "PDC server: primary domain controller"
 msgstr "PDC 服务器: 主域控制器"
 
-#: ../bin/draksambashare:1074
+#: ../bin/draksambashare:1072
 #, c-format
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
 msgstr "配置为 PDC 的服务器担负着域中进行 Windows 验证的责任。"
 
-#: ../bin/draksambashare:1074
+#: ../bin/draksambashare:1072
 #, c-format
 msgid ""
 "Single server installations may use smbpasswd or tdbsam password backends"
 msgstr "单服务器安装可以使用 smbpasswd 或 tdbsam 密码后端"
 
-#: ../bin/draksambashare:1074
+#: ../bin/draksambashare:1072
 #, c-format
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -1777,27 +1789,27 @@ msgstr ""
 "域主浏览器 = 是，将导致服务器注册 NetBIOS 名称 <pdc 名称>。此名称可为其它服务"
 "器所识别。"
 
-#: ../bin/draksambashare:1091
+#: ../bin/draksambashare:1089
 #, c-format
 msgid "Wins support:"
 msgstr "Wins 支持:"
 
-#: ../bin/draksambashare:1092
+#: ../bin/draksambashare:1090
 #, c-format
 msgid "admin users:"
 msgstr "管理员用户:"
 
-#: ../bin/draksambashare:1092
+#: ../bin/draksambashare:1090
 #, c-format
 msgid "root @adm"
 msgstr "root @adm"
 
-#: ../bin/draksambashare:1093
+#: ../bin/draksambashare:1091
 #, c-format
 msgid "Os level:"
 msgstr "操作系统级别:"
 
-#: ../bin/draksambashare:1093
+#: ../bin/draksambashare:1091
 #, c-format
 msgid ""
 "The global os level option dictates the operating system level at which "
@@ -1810,42 +1822,42 @@ msgstr ""
 "进行选择并成为主浏览器，您可以将上面操作系统的级别设定为网络中最高的值，如 "
 "os level = 34"
 
-#: ../bin/draksambashare:1097
+#: ../bin/draksambashare:1095
 #, c-format
 msgid "The domain is wrong."
 msgstr "域不对。"
 
-#: ../bin/draksambashare:1104
+#: ../bin/draksambashare:1102
 #, c-format
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../bin/draksambashare:1104
+#: ../bin/draksambashare:1102
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba 要服务的 Windows 工作组。"
 
-#: ../bin/draksambashare:1111 ../bin/draksambashare:1178
+#: ../bin/draksambashare:1109 ../bin/draksambashare:1176
 #, c-format
 msgid "Workgroup:"
 msgstr "工作组:"
 
-#: ../bin/draksambashare:1112
+#: ../bin/draksambashare:1110
 #, c-format
 msgid "Netbios name:"
 msgstr "Netbios 名称:"
 
-#: ../bin/draksambashare:1116
+#: ../bin/draksambashare:1114
 #, c-format
 msgid "The Workgroup is wrong."
 msgstr "工作组不对。"
 
-#: ../bin/draksambashare:1123 ../bin/draksambashare:1133
+#: ../bin/draksambashare:1121 ../bin/draksambashare:1131
 #, c-format
 msgid "Security mode"
 msgstr "安全性模式"
 
-#: ../bin/draksambashare:1123
+#: ../bin/draksambashare:1121
 #, c-format
 msgid ""
 "User level: the client sends a session setup request directly following "
@@ -1853,12 +1865,12 @@ msgid ""
 msgstr ""
 "用户级别: 客户端根据协议直接发送会话建立请求，此请求将提供用户名和密码。"
 
-#: ../bin/draksambashare:1123
+#: ../bin/draksambashare:1121
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
 msgstr "共享级别: 客户端为每个认证提供单独的身份验证"
 
-#: ../bin/draksambashare:1123
+#: ../bin/draksambashare:1121
 #, c-format
 msgid ""
 "Domain level: provides a mechanism for storing all user and group accounts "
@@ -1868,76 +1880,76 @@ msgstr ""
 "域级: 在集中的共享帐户仓库中存储全部用户和组帐户。集中式帐户仓库在域控制器之"
 "间共享。"
 
-#: ../bin/draksambashare:1134
+#: ../bin/draksambashare:1132
 #, c-format
 msgid "Hosts allow"
 msgstr "允许的主机"
 
-#: ../bin/draksambashare:1139
+#: ../bin/draksambashare:1137
 #, c-format
 msgid "Server Banner."
 msgstr "服务器标语。"
 
-#: ../bin/draksambashare:1139
+#: ../bin/draksambashare:1137
 #, c-format
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "这个标语会显示在 Windows 网络邻居中这个服务器名字旁边作为描述。"
 
-#: ../bin/draksambashare:1144
+#: ../bin/draksambashare:1142
 #, c-format
 msgid "Banner:"
 msgstr "标语:"
 
-#: ../bin/draksambashare:1148
+#: ../bin/draksambashare:1146
 #, c-format
 msgid "The Server Banner is incorrect."
 msgstr "服务器标语不对。"
 
-#: ../bin/draksambashare:1155
+#: ../bin/draksambashare:1153
 #, c-format
 msgid "Samba Log"
 msgstr "Samba 日志"
 
-#: ../bin/draksambashare:1155
+#: ../bin/draksambashare:1153
 #, c-format
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr "日志文件：使用 file.%m 为每台连接的计算机是用独立的日志文件"
 
-#: ../bin/draksambashare:1155
+#: ../bin/draksambashare:1153
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
 msgstr "日志级别: 设定日志的详细级别(0 <= 日志级别 <= 10)"
 
-#: ../bin/draksambashare:1155
+#: ../bin/draksambashare:1153
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
 msgstr "日志最大大小：限制日志文件的大小(以 K 字节计)。"
 
-#: ../bin/draksambashare:1162 ../bin/draksambashare:1180
+#: ../bin/draksambashare:1160 ../bin/draksambashare:1178
 #, c-format
 msgid "Log file:"
 msgstr "日志文件:"
 
-#: ../bin/draksambashare:1163
+#: ../bin/draksambashare:1161
 #, c-format
 msgid "Max log size:"
 msgstr "日志最大大小:"
 
-#: ../bin/draksambashare:1164
+#: ../bin/draksambashare:1162
 #, c-format
 msgid "Log level:"
 msgstr "日志级别:"
 
-#: ../bin/draksambashare:1169
+#: ../bin/draksambashare:1167
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "为了配置 Samba，向导收集了下列需要的参数。"
 
-#: ../bin/draksambashare:1169
+#: ../bin/draksambashare:1167
 #, c-format
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -1946,7 +1958,7 @@ msgstr ""
 "要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改它"
 "们。"
 
-#: ../bin/draksambashare:1169
+#: ../bin/draksambashare:1167
 #, c-format
 msgid ""
 "If you have previously create some shares, they will appear in this "
@@ -1955,112 +1967,112 @@ msgstr ""
 "如果您先前创建了共享，此配置中将会显示出来。请运行“drakwizard sambashare”管理"
 "您的共享。"
 
-#: ../bin/draksambashare:1177
+#: ../bin/draksambashare:1175
 #, c-format
 msgid "Samba type:"
 msgstr "Samba 类型:"
 
-#: ../bin/draksambashare:1179
+#: ../bin/draksambashare:1177
 #, c-format
 msgid "Server banner:"
 msgstr "服务器标语:"
 
-#: ../bin/draksambashare:1181
+#: ../bin/draksambashare:1179
 #, c-format
 msgid " "
 msgstr " "
 
-#: ../bin/draksambashare:1182
+#: ../bin/draksambashare:1180
 #, c-format
 msgid "Unix Charset:"
 msgstr "Unix 字符集:"
 
-#: ../bin/draksambashare:1183
+#: ../bin/draksambashare:1181
 #, c-format
 msgid "Dos Charset:"
 msgstr "Dos 字符集:"
 
-#: ../bin/draksambashare:1184
+#: ../bin/draksambashare:1182
 #, c-format
 msgid "Display Charset:"
 msgstr "显示字符集:"
 
-#: ../bin/draksambashare:1199
+#: ../bin/draksambashare:1197
 #, c-format
 msgid "The wizard successfully configured your Samba server."
 msgstr "向导成功地配置了您的 Samba 服务器。"
 
-#: ../bin/draksambashare:1254
+#: ../bin/draksambashare:1252
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Samba 向导意外失败:"
 
-#: ../bin/draksambashare:1268
+#: ../bin/draksambashare:1266
 #, c-format
 msgid "Manage Samba configuration"
 msgstr "管理 Samba 配置"
 
-#: ../bin/draksambashare:1356
+#: ../bin/draksambashare:1354
 #, c-format
 msgid "Failed to Modify Samba share."
 msgstr "修改 Samba 共享失败。"
 
-#: ../bin/draksambashare:1365
+#: ../bin/draksambashare:1363
 #, c-format
 msgid "Failed to remove a Samba share."
 msgstr "删除 Samba 共享失败。"
 
-#: ../bin/draksambashare:1372
+#: ../bin/draksambashare:1370
 #, c-format
 msgid "File share"
 msgstr "文件共享"
 
-#: ../bin/draksambashare:1387
+#: ../bin/draksambashare:1385
 #, c-format
 msgid "Failed to Modify."
 msgstr "修改失败。"
 
-#: ../bin/draksambashare:1396
+#: ../bin/draksambashare:1394
 #, c-format
 msgid "Failed to remove."
 msgstr "删除失败。"
 
-#: ../bin/draksambashare:1403
+#: ../bin/draksambashare:1401
 #, c-format
 msgid "Printers"
 msgstr "打印机"
 
-#: ../bin/draksambashare:1415
+#: ../bin/draksambashare:1413
 #, c-format
 msgid "Failed to add user."
 msgstr "添加用户失败。"
 
-#: ../bin/draksambashare:1424
+#: ../bin/draksambashare:1422
 #, c-format
 msgid "Failed to change user password."
 msgstr "更改用户密码。"
 
-#: ../bin/draksambashare:1436
+#: ../bin/draksambashare:1434
 #, c-format
 msgid "Failed to delete user."
 msgstr "删除用户失败。"
 
-#: ../bin/draksambashare:1441
+#: ../bin/draksambashare:1439
 #, c-format
 msgid "Userdrake"
 msgstr "Drak 用户管理"
 
-#: ../bin/draksambashare:1449
+#: ../bin/draksambashare:1447
 #, c-format
 msgid "Samba Users"
 msgstr "Samba 用户"
 
-#: ../bin/draksambashare:1457
+#: ../bin/draksambashare:1455
 #, c-format
 msgid "Please configure your Samba server"
 msgstr "请配置您的 Samba 服务器"
 
-#: ../bin/draksambashare:1457
+#: ../bin/draksambashare:1455
 #, c-format
 msgid ""
 "It seems this is the first time you run this tool.\n"
@@ -2069,7 +2081,7 @@ msgstr ""
 "似乎这是您第一次运行此工具。\n"
 "向导将会协助您配置基本的 Samba 服务器"
 
-#: ../bin/draksambashare:1466
+#: ../bin/draksambashare:1464
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba 管理 Samba 共享"
@@ -2170,32 +2182,32 @@ msgstr "配置文件"
 msgid "VPN connection"
 msgstr "VPN 连接"
 
-#: ../bin/net_applet:358
+#: ../bin/net_applet:373
 #, c-format
 msgid "Network connection"
 msgstr "网络连接"
 
-#: ../bin/net_applet:442
+#: ../bin/net_applet:457
 #, c-format
 msgid "More networks"
 msgstr "更多网络"
 
-#: ../bin/net_applet:469
+#: ../bin/net_applet:484
 #, c-format
 msgid "Interactive Firewall automatic mode"
 msgstr "交互式防火墙自动模式"
 
-#: ../bin/net_applet:474
+#: ../bin/net_applet:489
 #, c-format
 msgid "Always launch on startup"
 msgstr "启动时自动调用"
 
-#: ../bin/net_applet:479
+#: ../bin/net_applet:494
 #, c-format
 msgid "Wireless networks"
 msgstr "无线网络"
 
-#: ../bin/net_applet:486 ../bin/net_monitor:96
+#: ../bin/net_applet:501 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "设置"
@@ -2390,7 +2402,7 @@ msgid "Unlisted - edit manually"
 msgstr "未列出 - 手动编辑"
 
 #: ../lib/network/connection.pm:228 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:45 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection/wireless.pm:48 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
@@ -2411,12 +2423,22 @@ msgstr "启动时开启连接"
 msgid "Metric"
 msgstr "度量衡"
 
-#: ../lib/network/connection.pm:313
+#: ../lib/network/connection.pm:243
+#, c-format
+msgid "MTU"
+msgstr ""
+
+#: ../lib/network/connection.pm:244
+#, c-format
+msgid "Maximum size of network message (MTU). If unsure, left blank."
+msgstr ""
+
+#: ../lib/network/connection.pm:316
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "在网卡 %s 检测到链接"
 
-#: ../lib/network/connection.pm:314 ../lib/network/connection/ethernet.pm:289
+#: ../lib/network/connection.pm:317 ../lib/network/connection/ethernet.pm:291
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "网卡 %s 的链接已断"
@@ -2479,22 +2501,21 @@ msgid "GPRS/Edge/3G"
 msgstr "GPRS/Edge/3G"
 
 #: ../lib/network/connection/cellular_card.pm:110
-#: ../lib/network/vpn/openvpn.pm:391
 #, c-format
-msgid "PIN number"
-msgstr "PIN 号码"
+msgid "PIN number (4 digits). Leave empty if PIN is not required."
+msgstr ""
 
 #: ../lib/network/connection/cellular_card.pm:186
 #, c-format
 msgid "Unable to open device %s"
 msgstr "无法打开设备 %s"
 
-#: ../lib/network/connection/cellular_card.pm:218
+#: ../lib/network/connection/cellular_card.pm:222
 #, c-format
 msgid "Please check that your SIM card is inserted."
 msgstr "请检查您的 SIM 卡是否已经插入。"
 
-#: ../lib/network/connection/cellular_card.pm:229
+#: ../lib/network/connection/cellular_card.pm:233
 #, c-format
 msgid ""
 "You entered a wrong PIN code.\n"
@@ -2668,22 +2689,22 @@ msgstr "网络热插拔"
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "启用 IPv6 到 IPv4 的隧道"
 
-#: ../lib/network/connection/ethernet.pm:288
+#: ../lib/network/connection/ethernet.pm:290
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "网卡 %s 监测到了链接信号"
 
-#: ../lib/network/connection/ethernet.pm:291
+#: ../lib/network/connection/ethernet.pm:293
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "正在通过网卡 %s 请求网络地址(%s 协议)..."
 
-#: ../lib/network/connection/ethernet.pm:292
+#: ../lib/network/connection/ethernet.pm:294
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "通过网卡 %s 获得了网络地址(%s 协议)"
 
-#: ../lib/network/connection/ethernet.pm:293
+#: ../lib/network/connection/ethernet.pm:295
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr "通过网卡 %s 获得网络地址失败(%s 协议)"
@@ -2814,6 +2835,24 @@ msgstr "德国"
 msgid "Italy"
 msgstr "意大利"
 
+#: ../lib/network/connection/providers/cellular.pm:131
+#: ../lib/network/connection/providers/cellular.pm:136
+#: ../lib/network/connection/providers/cellular.pm:141
+#: ../lib/network/connection/providers/cellular.pm:144
+#: ../lib/network/connection/providers/xdsl.pm:1001
+#: ../lib/network/connection/providers/xdsl.pm:1011
+#, c-format
+msgid "Poland"
+msgstr "波兰"
+
+#: ../lib/network/connection/providers/cellular.pm:147
+#: ../lib/network/connection/providers/xdsl.pm:1330
+#: ../lib/network/connection/providers/xdsl.pm:1340
+#: ../lib/network/netconnect.pm:38
+#, c-format
+msgid "United Kingdom"
+msgstr "英国"
+
 #: ../lib/network/connection/providers/xdsl.pm:47
 #: ../lib/network/connection/providers/xdsl.pm:57
 #, c-format
@@ -3003,12 +3042,6 @@ msgstr "挪威"
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: ../lib/network/connection/providers/xdsl.pm:1001
-#: ../lib/network/connection/providers/xdsl.pm:1011
-#, c-format
-msgid "Poland"
-msgstr "波兰"
-
 #: ../lib/network/connection/providers/xdsl.pm:1022
 #, c-format
 msgid "Portugal"
@@ -3086,127 +3119,120 @@ msgstr "土耳其"
 msgid "United Arab Emirates"
 msgstr "阿拉伯联合酋长国"
 
-#: ../lib/network/connection/providers/xdsl.pm:1330
-#: ../lib/network/connection/providers/xdsl.pm:1340
-#: ../lib/network/netconnect.pm:38
-#, c-format
-msgid "United Kingdom"
-msgstr "英国"
-
-#: ../lib/network/connection/wireless.pm:12
+#: ../lib/network/connection/wireless.pm:15
 #, c-format
 msgid "Wireless"
 msgstr "无线"
 
-#: ../lib/network/connection/wireless.pm:13
+#: ../lib/network/connection/wireless.pm:16
 #, fuzzy, c-format
 msgid "Wireless (Wi-Fi)"
 msgstr "无线"
 
-#: ../lib/network/connection/wireless.pm:29
+#: ../lib/network/connection/wireless.pm:32
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "使用 Windows 驱动程序(通过 ndiswrapper)"
 
-#: ../lib/network/connection/wireless.pm:46
+#: ../lib/network/connection/wireless.pm:49
 #, c-format
 msgid "Open WEP"
 msgstr "开放 WEP"
 
-#: ../lib/network/connection/wireless.pm:47
+#: ../lib/network/connection/wireless.pm:50
 #, c-format
 msgid "Restricted WEP"
 msgstr "限制 WEP"
 
-#: ../lib/network/connection/wireless.pm:48
+#: ../lib/network/connection/wireless.pm:51
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr "WPA/WPA2 预共享密钥"
 
-#: ../lib/network/connection/wireless.pm:49
+#: ../lib/network/connection/wireless.pm:52
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 企业"
 
-#: ../lib/network/connection/wireless.pm:260
+#: ../lib/network/connection/wireless.pm:271
 #, c-format
 msgid "Windows driver"
 msgstr "Window 驱动程序"
 
-#: ../lib/network/connection/wireless.pm:346
+#: ../lib/network/connection/wireless.pm:357
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "您的无线网卡已经禁用，请先启用无线开关。"
 
-#: ../lib/network/connection/wireless.pm:431
+#: ../lib/network/connection/wireless.pm:444
 #, c-format
 msgid "Wireless settings"
 msgstr "无线设置"
 
-#: ../lib/network/connection/wireless.pm:436
-#: ../lib/network/connection_manager.pm:268
+#: ../lib/network/connection/wireless.pm:449
+#: ../lib/network/connection_manager.pm:277
 #, c-format
 msgid "Operating Mode"
 msgstr "操作模式"
 
-#: ../lib/network/connection/wireless.pm:437
+#: ../lib/network/connection/wireless.pm:450
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:437
+#: ../lib/network/connection/wireless.pm:450
 #, c-format
 msgid "Managed"
 msgstr "受控的"
 
-#: ../lib/network/connection/wireless.pm:437
+#: ../lib/network/connection/wireless.pm:450
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: ../lib/network/connection/wireless.pm:437
+#: ../lib/network/connection/wireless.pm:450
 #, c-format
 msgid "Repeater"
 msgstr "转发器"
 
-#: ../lib/network/connection/wireless.pm:437
+#: ../lib/network/connection/wireless.pm:450
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: ../lib/network/connection/wireless.pm:437
+#: ../lib/network/connection/wireless.pm:450
 #, c-format
 msgid "Auto"
 msgstr "自动"
 
-#: ../lib/network/connection/wireless.pm:440
+#: ../lib/network/connection/wireless.pm:453
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "网络名称(ESSID)"
 
-#: ../lib/network/connection/wireless.pm:442
+#: ../lib/network/connection/wireless.pm:455
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:444
+#: ../lib/network/connection/wireless.pm:457
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: ../lib/network/connection/wireless.pm:446
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "将此密钥强制使用为 ASCII 字符串(如 Livebox)"
 
-#: ../lib/network/connection/wireless.pm:453
+#: ../lib/network/connection/wireless.pm:466
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP 登录/用户名"
 
-#: ../lib/network/connection/wireless.pm:455
+#: ../lib/network/connection/wireless.pm:468
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3217,12 +3243,12 @@ msgstr ""
 "用以下格式\n"
 "  域\\用户名"
 
-#: ../lib/network/connection/wireless.pm:458
+#: ../lib/network/connection/wireless.pm:471
 #, c-format
 msgid "EAP Password"
 msgstr "EAP 密码"
 
-#: ../lib/network/connection/wireless.pm:460
+#: ../lib/network/connection/wireless.pm:473
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -3254,12 +3280,12 @@ msgstr ""
 "模式。\n"
 "  TLS 模式完全基于证书，可能在此指定的用户名和密码无效。"
 
-#: ../lib/network/connection/wireless.pm:474
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP 客户证书"
 
-#: ../lib/network/connection/wireless.pm:476
+#: ../lib/network/connection/wireless.pm:489
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -3271,32 +3297,37 @@ msgstr ""
 "证书可视为用户名/密码组合的代替品。\n"
 " 注意: 其它相关设置显示于高级页面中。"
 
-#: ../lib/network/connection/wireless.pm:480
+#: ../lib/network/connection/wireless.pm:493
+#, fuzzy, c-format
+msgid "Wireless regulatory domain"
+msgstr "无线网络"
+
+#: ../lib/network/connection/wireless.pm:495
 #, c-format
 msgid "Network ID"
 msgstr "网络 ID"
 
-#: ../lib/network/connection/wireless.pm:481
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid "Operating frequency"
 msgstr "运行频率"
 
-#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/connection/wireless.pm:497
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "灵敏度阀值"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:498
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "比特率(每秒比特数, b/s)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:485
+#: ../lib/network/connection/wireless.pm:500
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -3315,17 +3346,17 @@ msgstr ""
 "包\n"
 "的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:507
 #, c-format
 msgid "Fragmentation"
 msgstr "块"
 
-#: ../lib/network/connection/wireless.pm:493
+#: ../lib/network/connection/wireless.pm:508
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:494
+#: ../lib/network/connection/wireless.pm:509
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -3341,12 +3372,12 @@ msgstr ""
 "请参看 iwconfig(8) man page 中的更多信息。"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:501
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:502
+#: ../lib/network/connection/wireless.pm:517
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -3364,12 +3395,12 @@ msgstr ""
 "\n"
 "请参看 iwpspy(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:510
+#: ../lib/network/connection/wireless.pm:525
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -3398,95 +3429,95 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/connection/wireless.pm:538
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP 协议"
 
-#: ../lib/network/connection/wireless.pm:524
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "Auto Detect"
 msgstr "自动检测"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:539
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:539
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:541
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
 "a fallback to WPA version 1"
 msgstr "推荐使用自动检测，因为它首先尝试 WPA 第2版，失败后再尝试 WPA 第1版"
 
-#: ../lib/network/connection/wireless.pm:528
+#: ../lib/network/connection/wireless.pm:543
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP 模式"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:531
+#: ../lib/network/connection/wireless.pm:546
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:548
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -3496,12 +3527,12 @@ msgstr ""
 "可能的值包括 WPA-EAP、\n"
 "IEEE8021X、无"
 
-#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/connection/wireless.pm:550
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP 外部身份"
 
-#: ../lib/network/connection/wireless.pm:537
+#: ../lib/network/connection/wireless.pm:552
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -3511,12 +3542,12 @@ msgstr ""
 "EAP 的匿名身份字符串: 用于支持不同的隧道身份的 EAP 不\n"
 "加密身份类型，如 TTLS"
 
-#: ../lib/network/connection/wireless.pm:540
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:557
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -3525,12 +3556,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:546
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 证书"
 
-#: ../lib/network/connection/wireless.pm:548
+#: ../lib/network/connection/wireless.pm:563
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -3544,12 +3575,12 @@ msgstr ""
 "如果可能的话，当使用 TLS 或 TTLS 或 PEAP 时总是应该配置可信的\n"
 "CA 证书。"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP 证书主题匹配"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -3559,12 +3590,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid "EAP extra directives"
 msgstr "EAP 额外指令"
 
-#: ../lib/network/connection/wireless.pm:562
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -3582,26 +3613,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:582
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要加密密钥。"
 
-#: ../lib/network/connection/wireless.pm:589
+#: ../lib/network/connection/wireless.pm:604
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr "预共享密钥应该由 8 到 63 位 ASCII 字符或者 64 位十六进制字符组成。"
 
-#: ../lib/network/connection/wireless.pm:595
+#: ../lib/network/connection/wireless.pm:610
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr "WEP 密钥应该至少由 %d 位 ASCII 字符或 %d 位十六进制字符组成。"
 
-#: ../lib/network/connection/wireless.pm:602
+#: ../lib/network/connection/wireless.pm:617
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -3610,24 +3641,24 @@ msgstr ""
 "频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
 "的“0”(零)。"
 
-#: ../lib/network/connection/wireless.pm:608
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "速度应该有后缀 k, M 或 G(如“11M”代表 11M), 或者后带足够的“0”(零)。"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:635
 #, c-format
 msgid "Allow access point roaming"
 msgstr "允许访问点漫游"
 
-#: ../lib/network/connection/wireless.pm:741
+#: ../lib/network/connection/wireless.pm:756
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "将无线网络“%s”关联到网卡 %s 上"
 
-#: ../lib/network/connection/wireless.pm:742
+#: ../lib/network/connection/wireless.pm:757
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "网卡 %s 丢失了到无线网络的关联"
@@ -3703,142 +3734,159 @@ msgid "Virtual Circuit ID (VCI):"
 msgstr "虚拟电路 ID (VCI):"
 
 #: ../lib/network/connection/xdsl.pm:359
-#: ../lib/network/connection_manager.pm:61 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:62 ../lib/network/drakvpn.pm:45
 #: ../lib/network/netconnect.pm:134 ../lib/network/thirdparty.pm:123
 #, c-format
 msgid "Could not install the packages (%s)!"
 msgstr "无法安装软件包(%s)!"
 
-#: ../lib/network/connection_manager.pm:73
-#: ../lib/network/connection_manager.pm:88 ../lib/network/netconnect.pm:185
+#: ../lib/network/connection_manager.pm:74
+#: ../lib/network/connection_manager.pm:89 ../lib/network/netconnect.pm:185
 #, c-format
 msgid "Configuring device..."
 msgstr "正在配置设备..."
 
-#: ../lib/network/connection_manager.pm:78
-#: ../lib/network/connection_manager.pm:143
+#: ../lib/network/connection_manager.pm:79
+#: ../lib/network/connection_manager.pm:144
 #, c-format
 msgid "Network settings"
 msgstr "网络设置"
 
-#: ../lib/network/connection_manager.pm:79
-#: ../lib/network/connection_manager.pm:144
+#: ../lib/network/connection_manager.pm:80
+#: ../lib/network/connection_manager.pm:145
 #, c-format
 msgid "Please enter settings for network"
 msgstr "请输入网络设置"
 
-#: ../lib/network/connection_manager.pm:202
+#: ../lib/network/connection_manager.pm:203
 #, c-format
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../lib/network/connection_manager.pm:223
+#: ../lib/network/connection_manager.pm:220
+#: ../lib/network/connection_manager.pm:476
+#: ../lib/network/connection_manager.pm:489 ../lib/network/drakvpn.pm:100
+#, c-format
+msgid "Connection failed."
+msgstr "连接失败。"
+
+#: ../lib/network/connection_manager.pm:232
 #, c-format
 msgid "Disconnecting..."
 msgstr "正在断开连接..."
 
-#: ../lib/network/connection_manager.pm:265
+#: ../lib/network/connection_manager.pm:274
 #, c-format
 msgid "SSID"
 msgstr "SSID"
 
-#: ../lib/network/connection_manager.pm:266
+#: ../lib/network/connection_manager.pm:275
 #, c-format
 msgid "Signal strength"
 msgstr "信号强度"
 
-#: ../lib/network/connection_manager.pm:267
+#: ../lib/network/connection_manager.pm:276
 #, c-format
 msgid "Encryption"
 msgstr "加密"
 
-#: ../lib/network/connection_manager.pm:339 ../lib/network/netconnect.pm:207
+#: ../lib/network/connection_manager.pm:348 ../lib/network/netconnect.pm:207
 #, c-format
 msgid "Scanning for networks..."
 msgstr "正在扫描网络..."
 
-#: ../lib/network/connection_manager.pm:388 ../lib/network/drakroam.pm:116
+#: ../lib/network/connection_manager.pm:397 ../lib/network/drakroam.pm:91
 #, c-format
 msgid "Disconnect"
 msgstr "断开连接"
 
-#: ../lib/network/connection_manager.pm:388 ../lib/network/drakroam.pm:115
+#: ../lib/network/connection_manager.pm:397 ../lib/network/drakroam.pm:90
 #, c-format
 msgid "Connect"
 msgstr "连接"
 
-#: ../lib/network/drakfirewall.pm:12
+#: ../lib/network/connection_manager.pm:442
+#, c-format
+msgid "Hostname changed to \"%s\""
+msgstr "主机名更改为“%s”"
+
+#: ../lib/network/drakfirewall.pm:13
 #, c-format
 msgid "Web Server"
 msgstr "Web 服务器"
 
-#: ../lib/network/drakfirewall.pm:17
+#: ../lib/network/drakfirewall.pm:18
 #, c-format
 msgid "Domain Name Server"
 msgstr "域名服务器"
 
-#: ../lib/network/drakfirewall.pm:22
+#: ../lib/network/drakfirewall.pm:23
 #, c-format
 msgid "SSH server"
 msgstr "SSH 服务器"
 
-#: ../lib/network/drakfirewall.pm:27
+#: ../lib/network/drakfirewall.pm:28
 #, c-format
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../lib/network/drakfirewall.pm:32
+#: ../lib/network/drakfirewall.pm:33
 #, c-format
 msgid "Mail Server"
 msgstr "邮件服务器"
 
-#: ../lib/network/drakfirewall.pm:37
+#: ../lib/network/drakfirewall.pm:38
 #, c-format
 msgid "POP and IMAP Server"
 msgstr "POP 和 IMAP 服务器"
 
-#: ../lib/network/drakfirewall.pm:42
+#: ../lib/network/drakfirewall.pm:43
 #, c-format
 msgid "Telnet server"
 msgstr "Telnet 服务器"
 
-#: ../lib/network/drakfirewall.pm:48
+#: ../lib/network/drakfirewall.pm:49
+#, fuzzy, c-format
+msgid "NFS Server"
+msgstr "/_NFS 服务器"
+
+#: ../lib/network/drakfirewall.pm:57
 #, c-format
 msgid "Windows Files Sharing (SMB)"
 msgstr "Windows 文件共享(SMB)"
 
-#: ../lib/network/drakfirewall.pm:54
+#: ../lib/network/drakfirewall.pm:63
 #, c-format
 msgid "CUPS server"
 msgstr "CUPS 服务器"
 
-#: ../lib/network/drakfirewall.pm:60
+#: ../lib/network/drakfirewall.pm:69
 #, c-format
 msgid "Echo request (ping)"
 msgstr "回显请求(ping)"
 
-#: ../lib/network/drakfirewall.pm:65
+#: ../lib/network/drakfirewall.pm:74
 #, c-format
 msgid "BitTorrent"
 msgstr "BitTorrent"
 
-#: ../lib/network/drakfirewall.pm:71
+#: ../lib/network/drakfirewall.pm:80
 #, c-format
 msgid "Windows Mobile device synchronization"
 msgstr "Windows Mobile 设备同步"
 
-#: ../lib/network/drakfirewall.pm:80
+#: ../lib/network/drakfirewall.pm:89
 #, c-format
 msgid "Port scan detection"
 msgstr "端口扫描检测"
 
-#: ../lib/network/drakfirewall.pm:175 ../lib/network/drakfirewall.pm:181
+#: ../lib/network/drakfirewall.pm:184 ../lib/network/drakfirewall.pm:190
 #: ../lib/network/shorewall.pm:75
 #, c-format
 msgid "Firewall configuration"
 msgstr "防火墙配置"
 
-#: ../lib/network/drakfirewall.pm:175
+#: ../lib/network/drakfirewall.pm:184
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -3853,7 +3901,7 @@ msgstr ""
 "如果要配置强大的专用防火墙, 请考虑使用专门的\n"
 "Mandriva Security 防火墙发行版。"
 
-#: ../lib/network/drakfirewall.pm:181
+#: ../lib/network/drakfirewall.pm:190
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -3865,13 +3913,13 @@ msgstr ""
 "\n"
 "请确定您在继续任何操作前已经用“Drak 连接”配置了您的局域网/Internet 访问。"
 
-#: ../lib/network/drakfirewall.pm:198 ../lib/network/drakfirewall.pm:200
-#: ../lib/network/shorewall.pm:164
+#: ../lib/network/drakfirewall.pm:207 ../lib/network/drakfirewall.pm:209
+#: ../lib/network/shorewall.pm:167
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: ../lib/network/drakfirewall.pm:201
+#: ../lib/network/drakfirewall.pm:210
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -3882,7 +3930,7 @@ msgstr ""
 "例如, 可以这样: 139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
 "请参考 /etc/services 文件。"
 
-#: ../lib/network/drakfirewall.pm:207
+#: ../lib/network/drakfirewall.pm:216
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -3897,27 +3945,27 @@ msgstr ""
 "\n"
 "您也可以给出端口范围(如: 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:217
+#: ../lib/network/drakfirewall.pm:226
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "您想要本机上开放哪些服务?"
 
-#: ../lib/network/drakfirewall.pm:218
+#: ../lib/network/drakfirewall.pm:227
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "全部(无防火墙)"
 
-#: ../lib/network/drakfirewall.pm:220
+#: ../lib/network/drakfirewall.pm:229
 #, c-format
 msgid "Other ports"
 msgstr "其它端口"
 
-#: ../lib/network/drakfirewall.pm:221
+#: ../lib/network/drakfirewall.pm:230
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "在系统日志中记录防火墙消息"
 
-#: ../lib/network/drakfirewall.pm:263
+#: ../lib/network/drakfirewall.pm:272
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -3927,7 +3975,7 @@ msgstr ""
 "您可以选择在有人访问本机上的服务或试图入侵您的计算机时得到警报。\n"
 "请选择应监视何种网络活动。"
 
-#: ../lib/network/drakfirewall.pm:268
+#: ../lib/network/drakfirewall.pm:277
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "使用交互式防火墙"
@@ -3937,27 +3985,22 @@ msgstr "使用交互式防火墙"
 msgid "No device found"
 msgstr "没有发现设备"
 
-#: ../lib/network/drakroam.pm:61
-#, c-format
-msgid "Hostname changed to \"%s\""
-msgstr "主机名更改为“%s”"
-
-#: ../lib/network/drakroam.pm:110
+#: ../lib/network/drakroam.pm:85
 #, c-format
 msgid "Device: "
 msgstr "设备: "
 
-#: ../lib/network/drakroam.pm:114 ../lib/network/netcenter.pm:66
+#: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:65
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: ../lib/network/drakroam.pm:117 ../lib/network/netcenter.pm:71
+#: ../lib/network/drakroam.pm:92 ../lib/network/netcenter.pm:70
 #, c-format
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../lib/network/drakroam.pm:128 ../lib/network/netconnect.pm:771
+#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:771
 #, c-format
 msgid "Wireless connection"
 msgstr "无线连接"
@@ -4017,11 +4060,6 @@ msgstr "请输入您 VPN 连接的设置"
 msgid "Do you want to start the connection now?"
 msgstr "您现在就想启动连接吗？"
 
-#: ../lib/network/drakvpn.pm:100 ../lib/network/netcenter.pm:218
-#, c-format
-msgid "Connection failed."
-msgstr "连接失败。"
-
 #: ../lib/network/drakvpn.pm:108
 #, c-format
 msgid ""
@@ -4037,57 +4075,57 @@ msgstr ""
 "此 VPN 连接可以在网络连接有效时自动启动。\n"
 "如果您需要这么做的话，请重新配置网络连接，然后选择此 VPN 连接。\n"
 
-#: ../lib/network/ifw.pm:131
+#: ../lib/network/ifw.pm:132
 #, c-format
 msgid "Port scanning"
 msgstr "端口扫描"
 
-#: ../lib/network/ifw.pm:132
+#: ../lib/network/ifw.pm:133
 #, c-format
 msgid "Service attack"
 msgstr "服务攻击"
 
-#: ../lib/network/ifw.pm:133
+#: ../lib/network/ifw.pm:134
 #, c-format
 msgid "Password cracking"
 msgstr "密码破解"
 
-#: ../lib/network/ifw.pm:134
+#: ../lib/network/ifw.pm:135
 #, c-format
 msgid "New connection"
 msgstr "新建连接"
 
-#: ../lib/network/ifw.pm:135
+#: ../lib/network/ifw.pm:136
 #, c-format
 msgid "\"%s\" attack"
 msgstr "“%s”攻击"
 
-#: ../lib/network/ifw.pm:137
+#: ../lib/network/ifw.pm:138
 #, c-format
 msgid "A port scanning attack has been attempted by %s."
 msgstr "%s 试图进行端口扫描攻击。"
 
-#: ../lib/network/ifw.pm:138
+#: ../lib/network/ifw.pm:139
 #, c-format
 msgid "The %s service has been attacked by %s."
 msgstr "%s 服务已被 %s 攻击。"
 
-#: ../lib/network/ifw.pm:139
+#: ../lib/network/ifw.pm:140
 #, c-format
 msgid "A password cracking attack has been attempted by %s."
 msgstr "%s 正在尝试密码破解攻击。"
 
-#: ../lib/network/ifw.pm:140
+#: ../lib/network/ifw.pm:141
 #, c-format
 msgid "%s is connecting on the %s service."
 msgstr "%s 正连接到 %s 服务。"
 
-#: ../lib/network/ifw.pm:141
+#: ../lib/network/ifw.pm:142
 #, c-format
 msgid "A \"%s\" attack has been attempted by %s"
 msgstr "%2$s 试图进行“%1$s”攻击"
 
-#: ../lib/network/ifw.pm:150
+#: ../lib/network/ifw.pm:151
 #, c-format
 msgid ""
 "The \"%s\" application is trying to make a service (%s) available to the "
@@ -4095,7 +4133,7 @@ msgid ""
 msgstr "“%s”应用程序试图成为网络上的服务(%s)。"
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
-#: ../lib/network/ifw.pm:154
+#: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
 msgstr "端口 %d"
@@ -4172,24 +4210,24 @@ msgstr "安装新驱动程序"
 msgid "Select a device:"
 msgstr "选择设备:"
 
-#: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:210
+#: ../lib/network/netcenter.pm:54 ../lib/network/netconnect.pm:210
 #, c-format
 msgid "Please select your network:"
 msgstr "请选择您的网络："
 
-#: ../lib/network/netcenter.pm:62
+#: ../lib/network/netcenter.pm:61
 #, c-format
 msgid ""
 "_: This is a verb\n"
 "Monitor"
 msgstr "监视"
 
-#: ../lib/network/netcenter.pm:145
+#: ../lib/network/netcenter.pm:144
 #, c-format
 msgid "Network Center"
 msgstr "网络中心"
 
-#: ../lib/network/netcenter.pm:169
+#: ../lib/network/netcenter.pm:168
 #, fuzzy, c-format
 msgid "Advanced settings"
 msgstr "高级选项"
@@ -4926,13 +4964,16 @@ msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 应该是以“ftp:”或“http:”开头"
 
 #: ../lib/network/shorewall.pm:77
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please select the interfaces that will be protected by the firewall.\n"
 "\n"
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
+"If you intend to use Mandriva Internet Connection sharing,\n"
+"unselect interfaces which will be connected to local network.\n"
+"\n"
 "Which interfaces should be protected?\n"
 msgstr ""
 "请选择想要被防火墙所保护的接口。\n"
@@ -4941,17 +4982,17 @@ msgstr ""
 "\n"
 "应该保护哪个接口?\n"
 
-#: ../lib/network/shorewall.pm:155
+#: ../lib/network/shorewall.pm:158
 #, c-format
 msgid "Keep custom rules"
 msgstr "保留自定义规则"
 
-#: ../lib/network/shorewall.pm:156
+#: ../lib/network/shorewall.pm:159
 #, c-format
 msgid "Drop custom rules"
 msgstr "删除自定义规则"
 
-#: ../lib/network/shorewall.pm:161
+#: ../lib/network/shorewall.pm:164
 #, c-format
 msgid ""
 "Your firewall configuration has been manually edited and contains\n"
@@ -5163,6 +5204,11 @@ msgstr "启动连接.."
 msgid "Please insert your token"
 msgstr "请插入您的令牌"
 
+#: ../lib/network/vpn/openvpn.pm:391
+#, c-format
+msgid "PIN number"
+msgstr "PIN 号码"
+
 #: ../lib/network/vpn/vpnc.pm:9
 #, c-format
 msgid "Cisco VPN Concentrator"
@@ -5193,6 +5239,24 @@ msgstr "NAT 模式"
 msgid "Use specific UDP port"
 msgstr "使用指定的 UDP 端口"
 
+#~ msgid ""
+#~ "There is only one configured network adapter on your system:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "I am about to setup your Local Area Network with that adapter."
+#~ msgstr ""
+#~ "您的系统中只配置了一块网卡: \n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "即将对这块网卡设置您的局域网。"
+
+#~ msgid ""
+#~ "No ethernet network adapter has been detected on your system. Please run "
+#~ "the hardware configuration tool."
+#~ msgstr "您的系统里没有配置以太网卡。请运行硬件配置工具。"
+
 #~ msgid "Connection type: "
 #~ msgstr "连接类型:"