po: sync with code for network connection problems solutions.

1 files changed, 192 insertions, 159 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d6c33a5..7b9d2e1 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-03-30 16:28-0300\n"
+"POT-Creation-Date: 2009-03-31 10:42-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"
@@ -20,19 +20,19 @@ msgid "Interface"
 msgstr "网卡"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:134 ../lib/network/netconnect.pm:614
+#: ../lib/network/connection/ethernet.pm:134 ../lib/network/netconnect.pm:617
 #: ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "IP 地址"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:458
+#: ../lib/network/netconnect.pm:461
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:444
+#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:447
 #, c-format
 msgid "Driver"
 msgstr "驱动程序"
@@ -92,9 +92,9 @@ msgstr "确定"
 #: ../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/netcenter.pm:142 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:717 ../lib/network/thirdparty.pm:354
 #: ../lib/network/thirdparty.pm:369
 #, c-format
 msgid "Please wait"
@@ -262,8 +262,8 @@ msgstr "重新配置"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "请选择直接连接到 Internet 的网卡。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:360
-#: ../lib/network/netconnect.pm:395
+#: ../bin/drakgw:123 ../lib/network/netconnect.pm:363
+#: ../lib/network/netconnect.pm:398
 #, c-format
 msgid "Net Device"
 msgstr "网络设备"
@@ -333,9 +333,9 @@ msgstr "内部域名"
 #: ../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/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/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
+#: ../lib/network/netconnect.pm:188 ../lib/network/netconnect.pm:234
+#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:831
 #: ../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
@@ -785,7 +785,7 @@ msgstr "虚拟共享地址"
 msgid "Virtual ID"
 msgstr "虚拟 ID"
 
-#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:596
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:599
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -841,7 +841,7 @@ msgstr "配置文件“%s”已经存在！"
 #: ../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
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:484
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -2394,9 +2394,9 @@ msgid "Address settings"
 msgstr "地址设置"
 
 #: ../lib/network/connection.pm:175 ../lib/network/connection.pm:195
-#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:216
-#: ../lib/network/netconnect.pm:473 ../lib/network/netconnect.pm:569
-#: ../lib/network/netconnect.pm:572
+#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:217
+#: ../lib/network/netconnect.pm:476 ../lib/network/netconnect.pm:572
+#: ../lib/network/netconnect.pm:575
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "未列出 - 手动编辑"
@@ -2458,19 +2458,19 @@ msgstr "有线调制解调器"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "使用 BPALogin (Telstra 需要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:597
+#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:600
 #, c-format
 msgid "Authentication"
 msgstr "身份验证"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:336 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:339 ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "Account Login (user name)"
 msgstr "账户登录(用户名)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:337 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:340 ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
 msgstr "账户密码"
@@ -2595,7 +2595,7 @@ msgstr ""
 "下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
 "(例如, 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:646
+#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:649
 #: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
@@ -2714,22 +2714,22 @@ msgstr "通过网卡 %s 获得网络地址失败(%s 协议)"
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:405
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:405
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
 #, c-format
 msgid "I do not know"
 msgstr "我不知道"
 
-#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:405
+#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:408
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:405
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:408
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -2748,27 +2748,27 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "模拟电话调制解调器(POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:77
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "基于脚本登录"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "基于终端"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3668,7 +3668,7 @@ msgstr "网卡 %s 丢失了到无线网络的关联"
 msgid "DSL"
 msgstr "DSL"
 
-#: ../lib/network/connection/xdsl.pm:95 ../lib/network/netconnect.pm:765
+#: ../lib/network/connection/xdsl.pm:95 ../lib/network/netconnect.pm:773
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "阿尔卡特 Speedtouch USB 调制解调器"
@@ -3735,13 +3735,13 @@ msgstr "虚拟电路 ID (VCI):"
 
 #: ../lib/network/connection/xdsl.pm:359
 #: ../lib/network/connection_manager.pm:62 ../lib/network/drakvpn.pm:45
-#: ../lib/network/netconnect.pm:134 ../lib/network/thirdparty.pm:123
+#: ../lib/network/netconnect.pm:135 ../lib/network/thirdparty.pm:123
 #, c-format
 msgid "Could not install the packages (%s)!"
 msgstr "无法安装软件包(%s)!"
 
 #: ../lib/network/connection_manager.pm:74
-#: ../lib/network/connection_manager.pm:89 ../lib/network/netconnect.pm:185
+#: ../lib/network/connection_manager.pm:89 ../lib/network/netconnect.pm:186
 #, c-format
 msgid "Configuring device..."
 msgstr "正在配置设备..."
@@ -3790,7 +3790,7 @@ msgstr "信号强度"
 msgid "Encryption"
 msgstr "加密"
 
-#: ../lib/network/connection_manager.pm:348 ../lib/network/netconnect.pm:207
+#: ../lib/network/connection_manager.pm:348 ../lib/network/netconnect.pm:208
 #, c-format
 msgid "Scanning for networks..."
 msgstr "正在扫描网络..."
@@ -4025,7 +4025,7 @@ msgstr "配置"
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:771
+#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:779
 #, c-format
 msgid "Wireless connection"
 msgstr "无线连接"
@@ -4080,7 +4080,7 @@ msgstr "请输入所需密钥"
 msgid "Please enter the settings of your VPN connection"
 msgstr "请输入您 VPN 连接的设置"
 
-#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:297
+#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:298
 #, c-format
 msgid "Do you want to start the connection now?"
 msgstr "您现在就想启动连接吗？"
@@ -4164,8 +4164,8 @@ msgid "port %d"
 msgstr "端口 %d"
 
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:613
-#: ../lib/network/netconnect.pm:630 ../lib/network/netconnect.pm:646
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:616
+#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
 #, c-format
 msgid "Manual"
 msgstr "手动"
@@ -4173,10 +4173,10 @@ msgstr "手动"
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
 #: ../lib/network/modem.pm:44 ../lib/network/modem.pm:63
 #: ../lib/network/modem.pm:76 ../lib/network/modem.pm:81
-#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:608
-#: ../lib/network/netconnect.pm:613 ../lib/network/netconnect.pm:625
-#: ../lib/network/netconnect.pm:630 ../lib/network/netconnect.pm:646
-#: ../lib/network/netconnect.pm:648
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:611
+#: ../lib/network/netconnect.pm:616 ../lib/network/netconnect.pm:628
+#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
+#: ../lib/network/netconnect.pm:651
 #, c-format
 msgid "Automatic"
 msgstr "自动"
@@ -4235,7 +4235,7 @@ msgstr "安装新驱动程序"
 msgid "Select a device:"
 msgstr "选择设备:"
 
-#: ../lib/network/netcenter.pm:54 ../lib/network/netconnect.pm:210
+#: ../lib/network/netcenter.pm:54 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
 msgstr "请选择您的网络："
@@ -4262,8 +4262,8 @@ msgstr "高级选项"
 msgid "United States"
 msgstr "美国"
 
-#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:503
-#: ../lib/network/netconnect.pm:517
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:506
+#: ../lib/network/netconnect.pm:520
 #, c-format
 msgid "Manual choice"
 msgstr "手动选择"
@@ -4273,17 +4273,17 @@ msgstr "手动选择"
 msgid "Internal ISDN card"
 msgstr "内置 ISDN 卡"
 
-#: ../lib/network/netconnect.pm:68
+#: ../lib/network/netconnect.pm:69
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "世界其它地区的协议"
 
-#: ../lib/network/netconnect.pm:70
+#: ../lib/network/netconnect.pm:71
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "欧洲协议(EDSS1)"
 
-#: ../lib/network/netconnect.pm:71
+#: ../lib/network/netconnect.pm:72
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -4292,43 +4292,43 @@ msgstr ""
 "世界其它地区的协议\n"
 "没有 D-信道(专线)"
 
-#: ../lib/network/netconnect.pm:121
+#: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "网络和 Internet 配置"
 
-#: ../lib/network/netconnect.pm:126
+#: ../lib/network/netconnect.pm:127
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "选择您想要配置的连接"
 
-#: ../lib/network/netconnect.pm:148 ../lib/network/netconnect.pm:358
-#: ../lib/network/netconnect.pm:798
+#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:361
+#: ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "选择要配置的网卡: "
 
-#: ../lib/network/netconnect.pm:150
+#: ../lib/network/netconnect.pm:151
 #, fuzzy, c-format
 msgid "%s: %s"
 msgstr "DNS"
 
-#: ../lib/network/netconnect.pm:167
+#: ../lib/network/netconnect.pm:168
 #, c-format
 msgid "No device can be found for this connection type."
 msgstr "未找到此连接类型的设备。"
 
-#: ../lib/network/netconnect.pm:176
+#: ../lib/network/netconnect.pm:177
 #, c-format
 msgid "Hardware Configuration"
 msgstr "硬件配置"
 
-#: ../lib/network/netconnect.pm:200
+#: ../lib/network/netconnect.pm:201
 #, c-format
 msgid "Please select your provider:"
 msgstr "请选择您的网络运营商："
 
-#: ../lib/network/netconnect.pm:247
+#: ../lib/network/netconnect.pm:248
 #, c-format
 msgid ""
 "Please select your connection protocol.\n"
@@ -4337,114 +4337,114 @@ msgstr ""
 "请选择您的连接协议。\n"
 "如果您不知道的话，请保持预先选择的协议。"
 
-#: ../lib/network/netconnect.pm:291 ../lib/network/netconnect.pm:665
+#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:668
 #, c-format
 msgid "Connection control"
 msgstr "连接控制"
 
-#: ../lib/network/netconnect.pm:304 ../lib/network/netconnect.pm:714
+#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:717
 #, c-format
 msgid "Testing your connection..."
 msgstr "正在测试您的连接..."
 
-#: ../lib/network/netconnect.pm:325
+#: ../lib/network/netconnect.pm:328
 #, c-format
 msgid "Connection Configuration"
 msgstr "连接配置"
 
-#: ../lib/network/netconnect.pm:325
+#: ../lib/network/netconnect.pm:328
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "请填写或选择下列项目"
 
-#: ../lib/network/netconnect.pm:328
+#: ../lib/network/netconnect.pm:331
 #, c-format
 msgid "Your personal phone number"
 msgstr "您自己的电话号码"
 
-#: ../lib/network/netconnect.pm:329
+#: ../lib/network/netconnect.pm:332
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "服务商名称(如 provider.net)"
 
-#: ../lib/network/netconnect.pm:330
+#: ../lib/network/netconnect.pm:333
 #, c-format
 msgid "Provider phone number"
 msgstr "服务商电话号码"
 
-#: ../lib/network/netconnect.pm:331
+#: ../lib/network/netconnect.pm:334
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "服务商 DNS 1(可选)"
 
-#: ../lib/network/netconnect.pm:332
+#: ../lib/network/netconnect.pm:335
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "服务商 DNS 2(可选)"
 
-#: ../lib/network/netconnect.pm:333
+#: ../lib/network/netconnect.pm:336
 #, c-format
 msgid "Dialing mode"
 msgstr "拨号模式"
 
-#: ../lib/network/netconnect.pm:334
+#: ../lib/network/netconnect.pm:337
 #, c-format
 msgid "Connection speed"
 msgstr "连接速率"
 
-#: ../lib/network/netconnect.pm:335
+#: ../lib/network/netconnect.pm:338
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "连接超时(秒)"
 
-#: ../lib/network/netconnect.pm:338
+#: ../lib/network/netconnect.pm:341
 #, c-format
 msgid "Card IRQ"
 msgstr "网卡的 IRQ"
 
-#: ../lib/network/netconnect.pm:339
+#: ../lib/network/netconnect.pm:342
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "网卡内存(DMA)"
 
-#: ../lib/network/netconnect.pm:340
+#: ../lib/network/netconnect.pm:343
 #, c-format
 msgid "Card IO"
 msgstr "网卡 IO"
 
-#: ../lib/network/netconnect.pm:341
+#: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Card IO_0"
 msgstr "网卡 IO_0"
 
-#: ../lib/network/netconnect.pm:342
+#: ../lib/network/netconnect.pm:345
 #, c-format
 msgid "Card IO_1"
 msgstr "网卡 IO_1"
 
-#: ../lib/network/netconnect.pm:361 ../lib/network/netconnect.pm:366
+#: ../lib/network/netconnect.pm:364 ../lib/network/netconnect.pm:369
 #, c-format
 msgid "External ISDN modem"
 msgstr "外置 ISDN 调制解调器"
 
-#: ../lib/network/netconnect.pm:394
+#: ../lib/network/netconnect.pm:397
 #, c-format
 msgid "Select a device!"
 msgstr "请选择设备！"
 
-#: ../lib/network/netconnect.pm:403 ../lib/network/netconnect.pm:413
-#: ../lib/network/netconnect.pm:423 ../lib/network/netconnect.pm:456
-#: ../lib/network/netconnect.pm:470
+#: ../lib/network/netconnect.pm:406 ../lib/network/netconnect.pm:416
+#: ../lib/network/netconnect.pm:426 ../lib/network/netconnect.pm:459
+#: ../lib/network/netconnect.pm:473
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN 配置"
 
-#: ../lib/network/netconnect.pm:404
+#: ../lib/network/netconnect.pm:407
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "请问您适配卡的种类?"
 
-#: ../lib/network/netconnect.pm:414
+#: ../lib/network/netconnect.pm:417
 #, c-format
 msgid ""
 "\n"
@@ -4458,22 +4458,22 @@ msgstr ""
 "\n"
 "如果您的卡是 PCMCIA 卡, 您必须知道它的“irq”和“io”。\n"
 
-#: ../lib/network/netconnect.pm:418
+#: ../lib/network/netconnect.pm:421
 #, c-format
 msgid "Continue"
 msgstr "继续"
 
-#: ../lib/network/netconnect.pm:418
+#: ../lib/network/netconnect.pm:421
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: ../lib/network/netconnect.pm:424
+#: ../lib/network/netconnect.pm:427
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "下列哪个是您的 ISDN 卡?"
 
-#: ../lib/network/netconnect.pm:442
+#: ../lib/network/netconnect.pm:445
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -4483,12 +4483,12 @@ msgstr ""
 "此调制解调器适用 CAPI 驱动程序。此 CAPI 驱动程序比免费驱动程序提供更多的功能"
 "(比如发送传真)。您想要使用哪个驱动程序?"
 
-#: ../lib/network/netconnect.pm:456
+#: ../lib/network/netconnect.pm:459
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "您将使用哪种协议?"
 
-#: ../lib/network/netconnect.pm:470
+#: ../lib/network/netconnect.pm:473
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -4497,12 +4497,12 @@ msgstr ""
 "选择您的提供商。\n"
 "如果该提供商未被列出, 请选择“未列出”。"
 
-#: ../lib/network/netconnect.pm:472 ../lib/network/netconnect.pm:568
+#: ../lib/network/netconnect.pm:475 ../lib/network/netconnect.pm:571
 #, c-format
 msgid "Provider:"
 msgstr "服务商:"
 
-#: ../lib/network/netconnect.pm:481
+#: ../lib/network/netconnect.pm:484
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -4511,132 +4511,132 @@ msgstr ""
 "您的调制解调器不被系统支持。\n"
 "请看看 http://www.linmodems.org"
 
-#: ../lib/network/netconnect.pm:500
+#: ../lib/network/netconnect.pm:503
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "选择要配置的调制解调器:"
 
-#: ../lib/network/netconnect.pm:502
+#: ../lib/network/netconnect.pm:505
 #, c-format
 msgid "Modem"
 msgstr "调制解调器"
 
-#: ../lib/network/netconnect.pm:537
+#: ../lib/network/netconnect.pm:540
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "请选择您的调制解调器是连接到哪个串行端口。"
 
-#: ../lib/network/netconnect.pm:566
+#: ../lib/network/netconnect.pm:569
 #, c-format
 msgid "Select your provider:"
 msgstr "选择您的服务商:"
 
-#: ../lib/network/netconnect.pm:590
+#: ../lib/network/netconnect.pm:593
 #, c-format
 msgid "Dialup: account options"
 msgstr "拨号: 账户设置"
 
-#: ../lib/network/netconnect.pm:593
+#: ../lib/network/netconnect.pm:596
 #, c-format
 msgid "Connection name"
 msgstr "连接名称"
 
-#: ../lib/network/netconnect.pm:594
+#: ../lib/network/netconnect.pm:597
 #, c-format
 msgid "Phone number"
 msgstr "电话号码"
 
-#: ../lib/network/netconnect.pm:595
+#: ../lib/network/netconnect.pm:598
 #, c-format
 msgid "Login ID"
 msgstr "登录 ID"
 
-#: ../lib/network/netconnect.pm:610 ../lib/network/netconnect.pm:643
+#: ../lib/network/netconnect.pm:613 ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "拨号: IP 参数"
 
-#: ../lib/network/netconnect.pm:613
+#: ../lib/network/netconnect.pm:616
 #, c-format
 msgid "IP parameters"
 msgstr "IP 参数"
 
-#: ../lib/network/netconnect.pm:615
+#: ../lib/network/netconnect.pm:618
 #, c-format
 msgid "Subnet mask"
 msgstr "子网掩码"
 
-#: ../lib/network/netconnect.pm:627
+#: ../lib/network/netconnect.pm:630
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "拨号: DNS 参数"
 
-#: ../lib/network/netconnect.pm:630
+#: ../lib/network/netconnect.pm:633
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/network/netconnect.pm:631
+#: ../lib/network/netconnect.pm:634
 #, c-format
 msgid "Domain name"
 msgstr "域名"
 
-#: ../lib/network/netconnect.pm:632
+#: ../lib/network/netconnect.pm:635
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "首选 DNS 服务器(可选)"
 
-#: ../lib/network/netconnect.pm:633
+#: ../lib/network/netconnect.pm:636
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "备选 DNS 服务器(可选)"
 
-#: ../lib/network/netconnect.pm:634
+#: ../lib/network/netconnect.pm:637
 #, c-format
 msgid "Set hostname from IP"
 msgstr "由 IP 设置主机名"
 
-#: ../lib/network/netconnect.pm:647
+#: ../lib/network/netconnect.pm:650
 #, c-format
 msgid "Gateway IP address"
 msgstr "网关 IP 地址"
 
-#: ../lib/network/netconnect.pm:680
+#: ../lib/network/netconnect.pm:683
 #, c-format
 msgid "Automatically at boot"
 msgstr "开机时自动启动"
 
-#: ../lib/network/netconnect.pm:682
+#: ../lib/network/netconnect.pm:685
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "使用系统脱盘中的网络小程序"
 
-#: ../lib/network/netconnect.pm:684
+#: ../lib/network/netconnect.pm:687
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手动(启动时仍会激活网卡)"
 
-#: ../lib/network/netconnect.pm:693
+#: ../lib/network/netconnect.pm:696
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "您想要如何拨打此连接?"
 
-#: ../lib/network/netconnect.pm:706
+#: ../lib/network/netconnect.pm:709
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "您想要测试连接到 Internet 吗?"
 
-#: ../lib/network/netconnect.pm:733
+#: ../lib/network/netconnect.pm:736
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "您的系统现在正连接到 Internet。"
 
-#: ../lib/network/netconnect.pm:734
+#: ../lib/network/netconnect.pm:737
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "由于安全原因, 现在将断开连接。"
 
-#: ../lib/network/netconnect.pm:735
+#: ../lib/network/netconnect.pm:738
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -4645,105 +4645,138 @@ msgstr ""
 "看来系统没有连接到 Internet。\n"
 "请重新尝试配置您的连接。"
 
-#: ../lib/network/netconnect.pm:750
+#: ../lib/network/netconnect.pm:754
+#, fuzzy, c-format
+msgid "Problems occured during the network connectivity test."
+msgstr ""
+"重新启动网络时发生错误:\n"
+"\n"
+"%s"
+
+#: ../lib/network/netconnect.pm:755
 #, c-format
 msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+
+#: ../lib/network/netconnect.pm:756
+#, c-format
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
+msgstr ""
+
+#: ../lib/network/netconnect.pm:759
+#, fuzzy, c-format
+msgid "Congratulations, the network configuration is finished."
 msgstr ""
 "恭喜, 网络和 Internet 配置完成。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:753
+#: ../lib/network/netconnect.pm:759
 #, c-format
 msgid ""
-"After this is done, we recommend that you restart your X environment to "
-"avoid any hostname-related problems."
-msgstr "建议重启动 X 环境以避免任何与主机名有关的问题。"
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
+msgstr ""
 
-#: ../lib/network/netconnect.pm:754
-#, c-format
+#: ../lib/network/netconnect.pm:760
+#, fuzzy, c-format
 msgid ""
-"Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection does not "
-"work, you might want to relaunch the configuration."
+"If your connection does not work, you might want to relaunch the "
+"configuration."
 msgstr ""
 "配置过程中出现错误。\n"
 "请从网络监视器或者控制中心测试您的连接。如果您的连接不工作, 您可能想要重新配"
 "置。"
 
-#: ../lib/network/netconnect.pm:766
+#: ../lib/network/netconnect.pm:762
+#, fuzzy, c-format
+msgid "Congratulations, the network and Internet configuration are finished."
+msgstr ""
+"恭喜, 网络和 Internet 配置完成。\n"
+"\n"
+
+#: ../lib/network/netconnect.pm:763
+#, c-format
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr "建议重启动 X 环境以避免任何与主机名有关的问题。"
+
+#: ../lib/network/netconnect.pm:774
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB 调制解调器"
 
-#: ../lib/network/netconnect.pm:767 ../lib/network/netconnect.pm:768
+#: ../lib/network/netconnect.pm:775 ../lib/network/netconnect.pm:776
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan 调制解调器"
 
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/netconnect.pm:777
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus 调制解调器"
 
-#: ../lib/network/netconnect.pm:770
+#: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "LAN connection"
 msgstr "局域网连接"
 
-#: ../lib/network/netconnect.pm:772
+#: ../lib/network/netconnect.pm:780
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 连接"
 
-#: ../lib/network/netconnect.pm:773
+#: ../lib/network/netconnect.pm:781
 #, c-format
 msgid "Cable connection"
 msgstr "有线电缆连接"
 
-#: ../lib/network/netconnect.pm:774
+#: ../lib/network/netconnect.pm:782
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 连接"
 
-#: ../lib/network/netconnect.pm:775
+#: ../lib/network/netconnect.pm:783
 #, c-format
 msgid "Modem connection"
 msgstr "调制解调器连接"
 
-#: ../lib/network/netconnect.pm:776
+#: ../lib/network/netconnect.pm:784
 #, c-format
 msgid "DVB connection"
 msgstr "DVB 连接"
 
-#: ../lib/network/netconnect.pm:778
+#: ../lib/network/netconnect.pm:786
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(在端口 %s 检测到)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: ../lib/network/netconnect.pm:780
+#: ../lib/network/netconnect.pm:788
 #, c-format
 msgid "(detected %s)"
 msgstr "(检测到 %s)"
 
-#: ../lib/network/netconnect.pm:780
+#: ../lib/network/netconnect.pm:788
 #, c-format
 msgid "(detected)"
 msgstr "(检测到)"
 
-#: ../lib/network/netconnect.pm:781
+#: ../lib/network/netconnect.pm:789
 #, c-format
 msgid "Network Configuration"
 msgstr "网络配置"
 
-#: ../lib/network/netconnect.pm:782
+#: ../lib/network/netconnect.pm:790
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf 主机名解析"
 
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:791
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -4755,17 +4788,17 @@ msgstr ""
 "这将被您的计算机用于通知其未被网络管理的共享资源。\n"
 "大多数网络中不需要此设置。"
 
-#: ../lib/network/netconnect.pm:787
+#: ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf 主机名"
 
-#: ../lib/network/netconnect.pm:788
+#: ../lib/network/netconnect.pm:796
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf 主机名不能包含“.”"
 
-#: ../lib/network/netconnect.pm:789
+#: ../lib/network/netconnect.pm:797
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -4776,12 +4809,12 @@ msgstr ""
 "由于您正在执行网络安装, 您的网络已经配置好了。\n"
 "单击“确定”保存配置, 或“取消”重新配置网络。\n"
 
-#: ../lib/network/netconnect.pm:792
+#: ../lib/network/netconnect.pm:800
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "网络需要重新启动。您要重新启动吗?"
 
-#: ../lib/network/netconnect.pm:793
+#: ../lib/network/netconnect.pm:801
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -4792,7 +4825,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:794
+#: ../lib/network/netconnect.pm:802
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -4805,12 +4838,12 @@ msgstr ""
 "\n"
 "按“%s”继续。"
 
-#: ../lib/network/netconnect.pm:795
+#: ../lib/network/netconnect.pm:803
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "配置完成, 您想要应用设置吗?"
 
-#: ../lib/network/netconnect.pm:796
+#: ../lib/network/netconnect.pm:804
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -4821,24 +4854,24 @@ msgstr ""
 "选择您要使用的一种。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:805
 #, c-format
 msgid "Internet connection"
 msgstr "Internet 连接"
 
-#: ../lib/network/netconnect.pm:799
+#: ../lib/network/netconnect.pm:807
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "配置网络设备 %s(驱动程序 %s)"
 
-#: ../lib/network/netconnect.pm:800
+#: ../lib/network/netconnect.pm:808
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
 "choose the one you want to use."
 msgstr "您可使用下列协议配置局域网连接。请选择您想要使用的协议。"
 
-#: ../lib/network/netconnect.pm:801
+#: ../lib/network/netconnect.pm:809
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -4850,27 +4883,27 @@ msgstr ""
 "您的主机名称必需是个完全限定的名称, 例如“mybox.mylab.myco.com”。\n"
 "如果您有网关的话, 也请输入其 IP 地址。"
 
-#: ../lib/network/netconnect.pm:806
+#: ../lib/network/netconnect.pm:814
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "最后, 您还应该至少输入您 DNS 服务器的 IP 地址。"
 
-#: ../lib/network/netconnect.pm:807
+#: ../lib/network/netconnect.pm:815
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 服务器的格式应该是 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:808
+#: ../lib/network/netconnect.pm:816
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "网关地址的格式应该是 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:809
+#: ../lib/network/netconnect.pm:817
 #, c-format
 msgid "Gateway device"
 msgstr "网关设备"
 
-#: ../lib/network/netconnect.pm:823
+#: ../lib/network/netconnect.pm:831
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"