sync with code

1 files changed, 556 insertions, 439 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b905ee1..c377905 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-04-02 13:30-0300\n"
+"POT-Creation-Date: 2009-08-17 17:15+0200\n"
 "PO-Revision-Date: 2009-04-09 13:03+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:626
+#: ../lib/network/connection/ethernet.pm:138 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "IP 地址"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:470
+#: ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:456
+#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:463
 #, c-format
 msgid "Driver"
 msgstr "驱动程序"
@@ -73,15 +73,13 @@ msgid "Apply"
 msgstr "应用"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
-#: ../bin/draknetprofile:142 ../bin/draknetprofile.orig:142
-#: ../bin/net_monitor:388
+#: ../bin/draknetprofile:159 ../bin/net_monitor:388
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
-#: ../bin/drakconnect-old:265 ../bin/draknetprofile:144
-#: ../bin/draknetprofile.orig:144 ../bin/net_monitor:389
+#: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -89,12 +87,12 @@ msgstr "确定"
 #: ../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:186
+#: ../lib/network/connection_manager.pm:206
+#: ../lib/network/connection_manager.pm:235
+#: ../lib/network/connection_manager.pm:351 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:143 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
-#: ../lib/network/netconnect.pm:726 ../lib/network/thirdparty.pm:354
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:354
 #: ../lib/network/thirdparty.pm:369
 #, c-format
 msgid "Please wait"
@@ -135,7 +133,7 @@ msgid "Adapter %s: %s"
 msgstr "适配器 %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
-#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/connection/ethernet.pm:145
 #, c-format
 msgid "Netmask"
 msgstr "子网掩码"
@@ -150,7 +148,7 @@ msgstr "启动协议"
 msgid "Started on boot"
 msgstr "开机时启动"
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:152
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:156
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 客户端"
@@ -214,7 +212,8 @@ msgstr ""
 "\n"
 "请确定在继续操作之前已经使用 DrakConnect 配置了您的网络/Internet 访问。\n"
 "\n"
-"注意: 您另外需要一块专用的网卡来设置局域网(LAN)。在继续前，您应该先将 Mandriva 防火墙从与局域网连接的网卡上去掉。"
+"注意: 您另外需要一块专用的网卡来设置局域网(LAN)。在继续前，您应该先将 "
+"Mandriva 防火墙从与局域网连接的网卡上去掉。"
 
 #: ../bin/drakgw:91
 #, c-format
@@ -262,8 +261,8 @@ msgstr "重新配置"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "请选择直接连接到 Internet 的网卡。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:372
-#: ../lib/network/netconnect.pm:407
+#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
+#: ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "网络设备"
@@ -282,11 +281,14 @@ msgid ""
 "disable the firewall protection on it using drakfirewall before\n"
 "configuring Internet Connection sharing."
 msgstr ""
-"您的系统中只有一块网卡被配置为局域网连接:\n\n"
+"您的系统中只有一块网卡被配置为局域网连接:\n"
+"\n"
 "%s\n"
 "\n"
-"现在即将使用该网卡配置局域网。\n\n"
-"如果您有连接到局域网的其它网卡，请在配置 Internet 连接共享前先使用 drakfirewall 禁用防火墙保护。"
+"现在即将使用该网卡配置局域网。\n"
+"\n"
+"如果您有连接到局域网的其它网卡，请在配置 Internet 连接共享前先使用 "
+"drakfirewall 禁用防火墙保护。"
 
 #: ../bin/drakgw:156
 #, c-format
@@ -312,7 +314,7 @@ msgstr "内部域名"
 
 #: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:245
 #: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
-#: ../bin/draknetprofile:149 ../bin/draknetprofile.orig:149 ../bin/draknfs:93
+#: ../bin/draknetprofile:166 ../bin/draknetprofile:186 ../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
@@ -331,16 +333,16 @@ msgstr "内部域名"
 #: ../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/connection_manager.pm:177
+#: ../lib/network/connection_manager.pm:181
+#: ../lib/network/connection_manager.pm:223
+#: ../lib/network/connection_manager.pm:479
+#: ../lib/network/connection_manager.pm:492 ../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:135
 #: ../lib/network/netconnect.pm:188 ../lib/network/netconnect.pm:234
-#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:840
+#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:847
 #: ../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
@@ -451,8 +453,10 @@ msgid ""
 "the Mandriva firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
-"您的系统上没有检测到配置为局域网的以太网卡。\n\n"
-"请运行硬件配置工具配置网卡，然后确保 Mandriva 防火墙没有在与局域网连接的网卡上启用。"
+"您的系统上没有检测到配置为局域网的以太网卡。\n"
+"\n"
+"请运行硬件配置工具配置网卡，然后确保 Mandriva 防火墙没有在与局域网连接的网卡"
+"上启用。"
 
 #: ../bin/drakgw:316
 #, c-format
@@ -556,7 +560,7 @@ msgstr "请输入有效的 IP 地址。"
 msgid "Same IP is already in %s file."
 msgstr "%s 文件中已经有同样的 IP 了。"
 
-#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:212
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:222
 #, c-format
 msgid "Host name"
 msgstr "主机名"
@@ -616,9 +620,9 @@ msgstr "删除"
 msgid "Failed to remove host."
 msgstr "删除主机失败。"
 
-#: ../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
+#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:205
+#: ../bin/net_applet:189 ../lib/network/drakroam.pm:93
+#: ../lib/network/netcenter.pm:171
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -631,7 +635,7 @@ msgstr "允许的地址"
 #: ../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:300 ../lib/network/drakfirewall.pm:304
+#: ../lib/network/drakfirewall.pm:312 ../lib/network/drakfirewall.pm:316
 #, c-format
 msgid "Interactive Firewall"
 msgstr "交互式防火墙"
@@ -792,7 +796,7 @@ msgstr "虚拟共享地址"
 msgid "Virtual ID"
 msgstr "虚拟 ID"
 
-#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:608
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:615
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -818,74 +822,108 @@ msgstr "同步网卡"
 msgid "Connection mark bit"
 msgstr "连接标志字"
 
-#: ../bin/draknetprofile:37 ../bin/draknetprofile.orig:37
+#: ../bin/draknetprofile:37
 #, c-format
 msgid "Network profiles"
 msgstr "网络配置文件"
 
-#: ../bin/draknetprofile:67 ../bin/draknetprofile.orig:67
+#: ../bin/draknetprofile:66
+#, fuzzy, c-format
+msgid "Module"
+msgstr "调制解调器"
+
+#: ../bin/draknetprofile:67
+#, fuzzy, c-format
+msgid "Enabled"
+msgstr "启用"
+
+#: ../bin/draknetprofile:68
+#, fuzzy, c-format
+msgid "Description"
+msgstr "加密"
+
+#: ../bin/draknetprofile:84
 #, c-format
 msgid "Profile"
 msgstr "配置文件"
 
-#: ../bin/draknetprofile:135 ../bin/draknetprofile.orig:135
+#: ../bin/draknetprofile:152
 #, c-format
 msgid "New profile..."
 msgstr "新建配置文件..."
 
-#: ../bin/draknetprofile:138 ../bin/draknetprofile.orig:138
+#: ../bin/draknetprofile:155
 #, c-format
 msgid ""
-"Name of the profile to create (the new profile is created as a copy of the "
-"current one):"
-msgstr "要创建的配置文件名称(新配置文件将会以当前配置文件为基础创建)："
+"Please specify the name of new network profile to create (e.g., work, home, "
+"roaming, ..). This new profile initially will be created with base on "
+"current settings, and you'll be able to configure your system configuration "
+"as usual afterwards."
+msgstr ""
 
-#: ../bin/draknetprofile:149 ../bin/draknetprofile.orig:149
+#: ../bin/draknetprofile:166
 #, c-format
 msgid "The \"%s\" profile already exists!"
 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:493
+#: ../bin/draknetprofile:172
+#, fuzzy, c-format
+msgid "New profile created"
+msgstr "新建配置文件..."
+
+#: ../bin/draknetprofile:172
+#, c-format
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+
+#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
+#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
+#: ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../bin/draknetprofile:165 ../bin/draknetprofile.orig:165
-#, c-format
-msgid "You can not delete the default profile"
+#: ../bin/draknetprofile:183
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the default profile?"
 msgstr "您不能删除默认配置文件"
 
-#: ../bin/draknetprofile:167 ../bin/draknetprofile.orig:167
-#, c-format
-msgid "You can not delete the current profile"
+#: ../bin/draknetprofile:186
+#, fuzzy, c-format
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
 msgstr "您不能删除当前配置文件"
 
-#: ../bin/draknetprofile:177 ../bin/draknetprofile.orig:177
+#: ../bin/draknetprofile:196
 #, c-format
-msgid ""
-"This tool allows to activate an existing network profile, and to manage "
-"(clone, delete) profiles."
-msgstr "此工具允许您激活现有的网络配置文件，以及管理(克隆、删除)配置文件。"
+msgid "This tool allows to control network profiles."
+msgstr ""
 
-#: ../bin/draknetprofile:177 ../bin/draknetprofile.orig:177
-#, c-format
-msgid "To modify a profile, you have to activate it first."
-msgstr "要修改配置文件，您必须先激活该配置文件。"
+#: ../bin/draknetprofile:197
+#, fuzzy, c-format
+msgid "Select the netprofile modules:"
+msgstr "选择要配置的调制解调器:"
 
-#: ../bin/draknetprofile:180 ../bin/draknetprofile.orig:180
+#: ../bin/draknetprofile:199
+#, fuzzy, c-format
+msgid "Select a network profile:"
+msgstr "选择您的服务商:"
+
+#: ../bin/draknetprofile:202
 #, c-format
 msgid "Activate"
 msgstr "激活"
 
-#: ../bin/draknetprofile:181 ../bin/draknetprofile.orig:181
+#: ../bin/draknetprofile:203
 #, c-format
-msgid "Clone"
-msgstr "克隆"
+msgid "New"
+msgstr ""
 
-#: ../bin/draknetprofile:182 ../bin/draknetprofile.orig:182
+#: ../bin/draknetprofile:204
 #, c-format
 msgid "Delete"
 msgstr "删除"
@@ -2182,7 +2220,7 @@ msgstr "活动接口"
 msgid "Profiles"
 msgstr "配置文件"
 
-#: ../bin/net_applet:180 ../lib/network/connection.pm:228
+#: ../bin/net_applet:180 ../lib/network/connection.pm:229
 #: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:365
 #: ../lib/network/vpn/openvpn.pm:379 ../lib/network/vpn/openvpn.pm:390
 #, c-format
@@ -2275,9 +2313,7 @@ msgstr ""
 #: ../bin/net_monitor:113
 #, c-format
 msgid "Connection time: "
-msgstr ""
-"连接"
-"时间: "
+msgstr "连接时间: "
 
 #: ../bin/net_monitor:120
 #, c-format
@@ -2385,67 +2421,72 @@ msgstr "尚未配置 Internet 连接"
 msgid "Unknown connection type"
 msgstr "未知连接类型"
 
-#: ../lib/network/connection.pm:161
+#: ../lib/network/connection.pm:162
 #, c-format
 msgid "Network access settings"
 msgstr "网络访问设置"
 
-#: ../lib/network/connection.pm:162
+#: ../lib/network/connection.pm:163
 #, c-format
 msgid "Access settings"
 msgstr "访问设置"
 
-#: ../lib/network/connection.pm:163
+#: ../lib/network/connection.pm:164
 #, c-format
 msgid "Address settings"
 msgstr "地址设置"
 
-#: ../lib/network/connection.pm:177 ../lib/network/connection.pm:197
+#: ../lib/network/connection.pm:178 ../lib/network/connection.pm:198
 #: ../lib/network/connection/isdn.pm:155 ../lib/network/netconnect.pm:217
-#: ../lib/network/netconnect.pm:485 ../lib/network/netconnect.pm:581
-#: ../lib/network/netconnect.pm:584
+#: ../lib/network/netconnect.pm:492 ../lib/network/netconnect.pm:588
+#: ../lib/network/netconnect.pm:591
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "未列出 - 手动编辑"
 
-#: ../lib/network/connection.pm:230 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:48 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection.pm:231 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection/wireless.pm:46 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: ../lib/network/connection.pm:242
+#: ../lib/network/connection.pm:243
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "允许用户管理连接"
 
-#: ../lib/network/connection.pm:243
+#: ../lib/network/connection.pm:244
 #, c-format
 msgid "Start the connection at boot"
 msgstr "启动时开启连接"
 
-#: ../lib/network/connection.pm:244
+#: ../lib/network/connection.pm:245
+#, fuzzy, c-format
+msgid "Account network traffic"
+msgstr "同步网卡"
+
+#: ../lib/network/connection.pm:246
 #, c-format
 msgid "Metric"
 msgstr "度量衡"
 
-#: ../lib/network/connection.pm:245
+#: ../lib/network/connection.pm:247
 #, c-format
 msgid "MTU"
 msgstr "MTU"
 
-#: ../lib/network/connection.pm:246
+#: ../lib/network/connection.pm:248
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
 msgstr "网络消息的最大大小(MTU)。如果不确定的话，请留空。"
 
-#: ../lib/network/connection.pm:318
+#: ../lib/network/connection.pm:324
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "在网卡 %s 检测到链接"
 
-#: ../lib/network/connection.pm:319 ../lib/network/connection/ethernet.pm:291
+#: ../lib/network/connection.pm:325 ../lib/network/connection/ethernet.pm:302
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "网卡 %s 的链接已断"
@@ -2465,19 +2506,19 @@ msgstr "有线调制解调器"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "使用 BPALogin (Telstra 需要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:609
+#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "身份验证"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:348 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:355 ../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:349 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
 msgstr "账户密码"
@@ -2586,12 +2627,12 @@ msgstr "手工配置"
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "自动 IP(BOOTP/DHCP)"
 
-#: ../lib/network/connection/ethernet.pm:125
+#: ../lib/network/connection/ethernet.pm:129
 #, c-format
 msgid "IP settings"
 msgstr "IP 设置"
 
-#: ../lib/network/connection/ethernet.pm:138
+#: ../lib/network/connection/ethernet.pm:142
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -2602,118 +2643,134 @@ msgstr ""
 "下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
 "(例如, 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:658
+#: ../lib/network/connection/ethernet.pm:146 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "网关"
 
-#: ../lib/network/connection/ethernet.pm:145
+#: ../lib/network/connection/ethernet.pm:149
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "从 DHCP 获取 DNS 服务器"
 
-#: ../lib/network/connection/ethernet.pm:147
+#: ../lib/network/connection/ethernet.pm:151
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS 服务器 1"
 
-#: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/connection/ethernet.pm:152
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS 服务器 2"
 
-#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/connection/ethernet.pm:153
 #, c-format
 msgid "Search domain"
 msgstr "搜索网域"
 
-#: ../lib/network/connection/ethernet.pm:150
+#: ../lib/network/connection/ethernet.pm:154
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "默认情况下, 搜索域名将会根据完全限定的主机名进行设定"
 
-#: ../lib/network/connection/ethernet.pm:153
+#: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP 超时(秒)"
 
-#: ../lib/network/connection/ethernet.pm:154
+#: ../lib/network/connection/ethernet.pm:158
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "从 DHCP 获取 YP 服务器"
 
-#: ../lib/network/connection/ethernet.pm:155
+#: ../lib/network/connection/ethernet.pm:159
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "从 DHCP 获取 NTPD 服务器"
 
-#: ../lib/network/connection/ethernet.pm:156
+#: ../lib/network/connection/ethernet.pm:160
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主机名"
 
-#: ../lib/network/connection/ethernet.pm:158
+#: ../lib/network/connection/ethernet.pm:162
 #, c-format
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "默认值不依据 Zeroconf (169.254.0.0 网络)"
 
-#: ../lib/network/connection/ethernet.pm:169
+#: ../lib/network/connection/ethernet.pm:173
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 地址的格式应该是 1.2.3.4"
 
-#: ../lib/network/connection/ethernet.pm:174
+#: ../lib/network/connection/ethernet.pm:178
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "子网掩码的格式应该是 255.255.224.0"
 
-#: ../lib/network/connection/ethernet.pm:179
+#: ../lib/network/connection/ethernet.pm:183
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IP 地址 %s 通常是被保留的！"
 
-#: ../lib/network/connection/ethernet.pm:185
-#, c-format
+#: ../lib/network/connection/ethernet.pm:192
+#, fuzzy, c-format
 msgid ""
-"%s is already used by connection that starts on boot. To use this address "
-"with this connection, first disable all other devices which use it, or "
-"configure them not to start on boot"
+"%s is already used by connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start on boot"
 msgstr ""
-"%s 已经被启动时的连接所占用。要在此连接中使用此地址，首先应禁用该连接上的其它服务，"
-"或者将这些服务配置为启动时不要启动"
+"%s 已经被启动时的连接所占用。要在此连接中使用此地址，首先应禁用该连接上的其它"
+"服务，或者将这些服务配置为启动时不要启动"
 
-#: ../lib/network/connection/ethernet.pm:210
+#: ../lib/network/connection/ethernet.pm:219
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "从 DHCP 地址指定主机名(或者生成唯一的主机名)"
 
-#: ../lib/network/connection/ethernet.pm:230
+#: ../lib/network/connection/ethernet.pm:220
+#, c-format
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+
+#: ../lib/network/connection/ethernet.pm:223
+#, c-format
+msgid ""
+"You should define the hostname of this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections. If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+
+#: ../lib/network/connection/ethernet.pm:241
 #, c-format
 msgid "Network Hotplugging"
 msgstr "网络热插拔"
 
-#: ../lib/network/connection/ethernet.pm:234
+#: ../lib/network/connection/ethernet.pm:245
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "启用 IPv6 到 IPv4 的隧道"
 
-#: ../lib/network/connection/ethernet.pm:290
+#: ../lib/network/connection/ethernet.pm:301
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "网卡 %s 监测到了链接信号"
 
-#: ../lib/network/connection/ethernet.pm:293
+#: ../lib/network/connection/ethernet.pm:304
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "正在通过网卡 %s 请求网络地址(%s 协议)..."
 
-#: ../lib/network/connection/ethernet.pm:294
+#: ../lib/network/connection/ethernet.pm:305
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "通过网卡 %s 获得了网络地址(%s 协议)"
 
-#: ../lib/network/connection/ethernet.pm:295
+#: ../lib/network/connection/ethernet.pm:306
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr "通过网卡 %s 获得网络地址失败(%s 协议)"
@@ -2723,22 +2780,22 @@ msgstr "通过网卡 %s 获得网络地址失败(%s 协议)"
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "I do not know"
 msgstr "我不知道"
 
-#: ../lib/network/connection/isdn.pm:199 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:199 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:200 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:200 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -2782,30 +2839,50 @@ msgstr "CHAP"
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: ../lib/network/connection/providers/cellular.pm:16
+#: ../lib/network/connection/providers/cellular.pm:15
+#: ../lib/network/connection/providers/xdsl.pm:191
+#: ../lib/network/connection/providers/xdsl.pm:201
+#: ../lib/network/connection/providers/xdsl.pm:210
+#: ../lib/network/connection/providers/xdsl.pm:219
+#, c-format
+msgid "Brazil"
+msgstr "巴西"
+
 #: ../lib/network/connection/providers/cellular.pm:20
-#: ../lib/network/connection/providers/cellular.pm:28
-#: ../lib/network/connection/providers/cellular.pm:34
-#: ../lib/network/connection/providers/cellular.pm:39
-#: ../lib/network/connection/providers/cellular.pm:45
-#: ../lib/network/connection/providers/cellular.pm:49
-#: ../lib/network/connection/providers/cellular.pm:53
-#: ../lib/network/connection/providers/cellular.pm:59
-#: ../lib/network/connection/providers/cellular.pm:63
+#: ../lib/network/connection/providers/cellular.pm:23
+#: ../lib/network/connection/providers/cellular.pm:26
+#: ../lib/network/connection/providers/cellular.pm:29
+#: ../lib/network/connection/providers/cellular.pm:32
+#: ../lib/network/connection/providers/cellular.pm:35
+#: ../lib/network/connection/providers/cellular.pm:38
+#, c-format
+msgid "Estonia"
+msgstr ""
+
+#: ../lib/network/connection/providers/cellular.pm:42
+#: ../lib/network/connection/providers/cellular.pm:46
+#: ../lib/network/connection/providers/cellular.pm:54
+#: ../lib/network/connection/providers/cellular.pm:60
+#: ../lib/network/connection/providers/cellular.pm:65
+#: ../lib/network/connection/providers/cellular.pm:71
+#: ../lib/network/connection/providers/cellular.pm:75
+#: ../lib/network/connection/providers/cellular.pm:79
+#: ../lib/network/connection/providers/cellular.pm:85
+#: ../lib/network/connection/providers/cellular.pm:89
 #: ../lib/network/connection/providers/xdsl.pm:483
 #, c-format
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../lib/network/connection/providers/cellular.pm:66
-#: ../lib/network/connection/providers/cellular.pm:69
-#: ../lib/network/connection/providers/cellular.pm:74
-#: ../lib/network/connection/providers/cellular.pm:79
-#: ../lib/network/connection/providers/cellular.pm:86
-#: ../lib/network/connection/providers/cellular.pm:91
-#: ../lib/network/connection/providers/cellular.pm:96
-#: ../lib/network/connection/providers/cellular.pm:99
-#: ../lib/network/connection/providers/cellular.pm:102
+#: ../lib/network/connection/providers/cellular.pm:92
+#: ../lib/network/connection/providers/cellular.pm:95
+#: ../lib/network/connection/providers/cellular.pm:100
+#: ../lib/network/connection/providers/cellular.pm:105
+#: ../lib/network/connection/providers/cellular.pm:112
+#: ../lib/network/connection/providers/cellular.pm:117
+#: ../lib/network/connection/providers/cellular.pm:122
+#: ../lib/network/connection/providers/cellular.pm:125
+#: ../lib/network/connection/providers/cellular.pm:128
 #: ../lib/network/connection/providers/xdsl.pm:492
 #: ../lib/network/connection/providers/xdsl.pm:504
 #: ../lib/network/connection/providers/xdsl.pm:516
@@ -2822,8 +2899,8 @@ msgstr "芬兰"
 msgid "France"
 msgstr "法国"
 
-#: ../lib/network/connection/providers/cellular.pm:105
-#: ../lib/network/connection/providers/cellular.pm:108
+#: ../lib/network/connection/providers/cellular.pm:131
+#: ../lib/network/connection/providers/cellular.pm:134
 #: ../lib/network/connection/providers/xdsl.pm:621
 #: ../lib/network/connection/providers/xdsl.pm:630
 #: ../lib/network/connection/providers/xdsl.pm:640
@@ -2831,10 +2908,10 @@ msgstr "法国"
 msgid "Germany"
 msgstr "德国"
 
-#: ../lib/network/connection/providers/cellular.pm:111
-#: ../lib/network/connection/providers/cellular.pm:116
-#: ../lib/network/connection/providers/cellular.pm:121
-#: ../lib/network/connection/providers/cellular.pm:126
+#: ../lib/network/connection/providers/cellular.pm:137
+#: ../lib/network/connection/providers/cellular.pm:142
+#: ../lib/network/connection/providers/cellular.pm:147
+#: ../lib/network/connection/providers/cellular.pm:152
 #: ../lib/network/connection/providers/xdsl.pm:814
 #: ../lib/network/connection/providers/xdsl.pm:825
 #: ../lib/network/connection/providers/xdsl.pm:835
@@ -2844,17 +2921,17 @@ 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/cellular.pm:157
+#: ../lib/network/connection/providers/cellular.pm:162
+#: ../lib/network/connection/providers/cellular.pm:167
+#: ../lib/network/connection/providers/cellular.pm:170
 #: ../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/cellular.pm:173
 #: ../lib/network/connection/providers/xdsl.pm:1330
 #: ../lib/network/connection/providers/xdsl.pm:1340
 #: ../lib/network/netconnect.pm:38
@@ -2862,6 +2939,12 @@ msgstr "波兰"
 msgid "United Kingdom"
 msgstr "英国"
 
+#: ../lib/network/connection/providers/cellular.pm:178
+#: ../lib/network/netconnect.pm:37
+#, c-format
+msgid "United States"
+msgstr "美国"
+
 #: ../lib/network/connection/providers/xdsl.pm:47
 #: ../lib/network/connection/providers/xdsl.pm:57
 #, c-format
@@ -2908,14 +2991,6 @@ msgstr "澳大利亚"
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../lib/network/connection/providers/xdsl.pm:191
-#: ../lib/network/connection/providers/xdsl.pm:201
-#: ../lib/network/connection/providers/xdsl.pm:210
-#: ../lib/network/connection/providers/xdsl.pm:219
-#, c-format
-msgid "Brazil"
-msgstr "巴西"
-
 #: ../lib/network/connection/providers/xdsl.pm:228
 #: ../lib/network/connection/providers/xdsl.pm:237
 #, c-format
@@ -3128,120 +3203,125 @@ msgstr "土耳其"
 msgid "United Arab Emirates"
 msgstr "阿拉伯联合酋长国"
 
-#: ../lib/network/connection/wireless.pm:15
+#: ../lib/network/connection/wireless.pm:13
 #, c-format
 msgid "Wireless"
 msgstr "无线"
 
-#: ../lib/network/connection/wireless.pm:16
+#: ../lib/network/connection/wireless.pm:14
 #, c-format
 msgid "Wireless (Wi-Fi)"
 msgstr "无线(Wi-Fi)"
 
-#: ../lib/network/connection/wireless.pm:32
+#: ../lib/network/connection/wireless.pm:30
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "使用 Windows 驱动程序(通过 ndiswrapper)"
 
-#: ../lib/network/connection/wireless.pm:49
+#: ../lib/network/connection/wireless.pm:47
 #, c-format
 msgid "Open WEP"
 msgstr "开放 WEP"
 
-#: ../lib/network/connection/wireless.pm:50
+#: ../lib/network/connection/wireless.pm:48
 #, c-format
 msgid "Restricted WEP"
 msgstr "限制 WEP"
 
-#: ../lib/network/connection/wireless.pm:51
+#: ../lib/network/connection/wireless.pm:49
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr "WPA/WPA2 预共享密钥"
 
-#: ../lib/network/connection/wireless.pm:52
+#: ../lib/network/connection/wireless.pm:50
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 企业"
 
-#: ../lib/network/connection/wireless.pm:271
+#: ../lib/network/connection/wireless.pm:269
 #, c-format
 msgid "Windows driver"
 msgstr "Window 驱动程序"
 
-#: ../lib/network/connection/wireless.pm:357
+#: ../lib/network/connection/wireless.pm:355
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "您的无线网卡已经禁用，请先启用无线开关。"
 
-#: ../lib/network/connection/wireless.pm:444
+#: ../lib/network/connection/wireless.pm:445
 #, c-format
 msgid "Wireless settings"
 msgstr "无线设置"
 
-#: ../lib/network/connection/wireless.pm:449
-#: ../lib/network/connection_manager.pm:277
+#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection_manager.pm:280
 #, c-format
 msgid "Operating Mode"
 msgstr "操作模式"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Managed"
 msgstr "受控的"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Repeater"
 msgstr "转发器"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Auto"
 msgstr "自动"
 
-#: ../lib/network/connection/wireless.pm:453
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "网络名称(ESSID)"
 
-#: ../lib/network/connection/wireless.pm:455
+#: ../lib/network/connection/wireless.pm:456
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:457
+#: ../lib/network/connection/wireless.pm:458
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:461
+#, fuzzy, c-format
+msgid "Hide password"
+msgstr "密码"
+
+#: ../lib/network/connection/wireless.pm:463
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "将此密钥强制使用为 ASCII 字符串(如 Livebox)"
 
-#: ../lib/network/connection/wireless.pm:466
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP 登录/用户名"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3252,12 +3332,12 @@ msgstr ""
 "用以下格式\n"
 "  域\\用户名"
 
-#: ../lib/network/connection/wireless.pm:471
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "EAP Password"
 msgstr "EAP 密码"
 
-#: ../lib/network/connection/wireless.pm:473
+#: ../lib/network/connection/wireless.pm:478
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -3289,12 +3369,12 @@ msgstr ""
 "模式。\n"
 "  TLS 模式完全基于证书，可能在此指定的用户名和密码无效。"
 
-#: ../lib/network/connection/wireless.pm:487
+#: ../lib/network/connection/wireless.pm:492
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP 客户证书"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -3306,37 +3386,32 @@ msgstr ""
 "证书可视为用户名/密码组合的代替品。\n"
 " 注意: 其它相关设置显示于高级页面中。"
 
-#: ../lib/network/connection/wireless.pm:493
-#, c-format
-msgid "Wireless regulatory domain"
-msgstr "无线受限域"
-
-#: ../lib/network/connection/wireless.pm:495
+#: ../lib/network/connection/wireless.pm:498
 #, c-format
 msgid "Network ID"
 msgstr "网络 ID"
 
-#: ../lib/network/connection/wireless.pm:496
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "Operating frequency"
 msgstr "运行频率"
 
-#: ../lib/network/connection/wireless.pm:497
+#: ../lib/network/connection/wireless.pm:500
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "灵敏度阀值"
 
-#: ../lib/network/connection/wireless.pm:498
+#: ../lib/network/connection/wireless.pm:501
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "比特率(每秒比特数, b/s)"
 
-#: ../lib/network/connection/wireless.pm:499
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:500
+#: ../lib/network/connection/wireless.pm:503
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -3355,17 +3430,17 @@ msgstr ""
 "包\n"
 "的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
 
-#: ../lib/network/connection/wireless.pm:507
+#: ../lib/network/connection/wireless.pm:510
 #, c-format
 msgid "Fragmentation"
 msgstr "块"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:511
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:509
+#: ../lib/network/connection/wireless.pm:512
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -3381,12 +3456,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:516
+#: ../lib/network/connection/wireless.pm:519
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:520
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -3404,12 +3479,12 @@ msgstr ""
 "\n"
 "请参看 iwpspy(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:528
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:527
+#: ../lib/network/connection/wireless.pm:530
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -3438,95 +3513,95 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:538
+#: ../lib/network/connection/wireless.pm:541
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP 协议"
 
-#: ../lib/network/connection/wireless.pm:539
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "Auto Detect"
 msgstr "自动检测"
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:541
+#: ../lib/network/connection/wireless.pm:544
 #, 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:543
+#: ../lib/network/connection/wireless.pm:546
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP 模式"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:546
+#: ../lib/network/connection/wireless.pm:549
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:548
+#: ../lib/network/connection/wireless.pm:551
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -3536,12 +3611,12 @@ msgstr ""
 "可能的值包括 WPA-EAP、\n"
 "IEEE8021X、无"
 
-#: ../lib/network/connection/wireless.pm:550
+#: ../lib/network/connection/wireless.pm:553
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP 外部身份"
 
-#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -3551,12 +3626,12 @@ msgstr ""
 "EAP 的匿名身份字符串: 用于支持不同的隧道身份的 EAP 不\n"
 "加密身份类型，如 TTLS"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:558
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:557
+#: ../lib/network/connection/wireless.pm:560
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -3565,12 +3640,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:564
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 证书"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -3584,12 +3659,12 @@ msgstr ""
 "如果可能的话，当使用 TLS 或 TTLS 或 PEAP 时总是应该配置可信的\n"
 "CA 证书。"
 
-#: ../lib/network/connection/wireless.pm:568
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP 证书主题匹配"
 
-#: ../lib/network/connection/wireless.pm:570
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -3599,12 +3674,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:575
-#, c-format
-msgid "EAP extra directives"
+#: ../lib/network/connection/wireless.pm:578
+#, fuzzy, c-format
+msgid "Extra directives"
 msgstr "EAP 额外指令"
 
-#: ../lib/network/connection/wireless.pm:577
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -3622,26 +3697,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:597
+#: ../lib/network/connection/wireless.pm:599
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要加密密钥。"
 
-#: ../lib/network/connection/wireless.pm:604
+#: ../lib/network/connection/wireless.pm:606
 #, 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:610
+#: ../lib/network/connection/wireless.pm:612
 #, 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:617
+#: ../lib/network/connection/wireless.pm:619
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -3650,24 +3725,24 @@ msgstr ""
 "频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
 "的“0”(零)。"
 
-#: ../lib/network/connection/wireless.pm:623
+#: ../lib/network/connection/wireless.pm:625
 #, 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:635
+#: ../lib/network/connection/wireless.pm:637
 #, c-format
 msgid "Allow access point roaming"
 msgstr "允许访问点漫游"
 
-#: ../lib/network/connection/wireless.pm:756
+#: ../lib/network/connection/wireless.pm:762
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "将无线网络“%s”关联到网卡 %s 上"
 
-#: ../lib/network/connection/wireless.pm:757
+#: ../lib/network/connection/wireless.pm:763
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "网卡 %s 丢失了到无线网络的关联"
@@ -3677,7 +3752,7 @@ msgstr "网卡 %s 丢失了到无线网络的关联"
 msgid "DSL"
 msgstr "DSL"
 
-#: ../lib/network/connection/xdsl.pm:97 ../lib/network/netconnect.pm:782
+#: ../lib/network/connection/xdsl.pm:97 ../lib/network/netconnect.pm:789
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "阿尔卡特 Speedtouch USB 调制解调器"
@@ -3767,160 +3842,165 @@ msgstr "网络设置"
 msgid "Please enter settings for network"
 msgstr "请输入网络设置"
 
-#: ../lib/network/connection_manager.pm:203
+#: ../lib/network/connection_manager.pm:206
 #, c-format
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../lib/network/connection_manager.pm:220
-#: ../lib/network/connection_manager.pm:476
-#: ../lib/network/connection_manager.pm:489 ../lib/network/drakvpn.pm:100
+#: ../lib/network/connection_manager.pm:223
+#: ../lib/network/connection_manager.pm:479
+#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:100
 #, c-format
 msgid "Connection failed."
 msgstr "连接失败。"
 
-#: ../lib/network/connection_manager.pm:232
+#: ../lib/network/connection_manager.pm:235
 #, c-format
 msgid "Disconnecting..."
 msgstr "正在断开连接..."
 
-#: ../lib/network/connection_manager.pm:274
+#: ../lib/network/connection_manager.pm:277
 #, c-format
 msgid "SSID"
 msgstr "SSID"
 
-#: ../lib/network/connection_manager.pm:275
+#: ../lib/network/connection_manager.pm:278
 #, c-format
 msgid "Signal strength"
 msgstr "信号强度"
 
-#: ../lib/network/connection_manager.pm:276
+#: ../lib/network/connection_manager.pm:279
 #, c-format
 msgid "Encryption"
 msgstr "加密"
 
-#: ../lib/network/connection_manager.pm:348 ../lib/network/netconnect.pm:208
+#: ../lib/network/connection_manager.pm:351 ../lib/network/netconnect.pm:208
 #, c-format
 msgid "Scanning for networks..."
 msgstr "正在扫描网络..."
 
-#: ../lib/network/connection_manager.pm:397 ../lib/network/drakroam.pm:91
+#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:91
 #, c-format
 msgid "Disconnect"
 msgstr "断开连接"
 
-#: ../lib/network/connection_manager.pm:397 ../lib/network/drakroam.pm:90
+#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:90
 #, c-format
 msgid "Connect"
 msgstr "连接"
 
-#: ../lib/network/connection_manager.pm:442
+#: ../lib/network/connection_manager.pm:445
 #, c-format
 msgid "Hostname changed to \"%s\""
 msgstr "主机名更改为“%s”"
 
-#: ../lib/network/drakfirewall.pm:13
+#: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
 msgstr "Web 服务器"
 
-#: ../lib/network/drakfirewall.pm:18
+#: ../lib/network/drakfirewall.pm:19
 #, c-format
 msgid "Domain Name Server"
 msgstr "域名服务器"
 
-#: ../lib/network/drakfirewall.pm:23
+#: ../lib/network/drakfirewall.pm:24
 #, c-format
 msgid "SSH server"
 msgstr "SSH 服务器"
 
-#: ../lib/network/drakfirewall.pm:28
+#: ../lib/network/drakfirewall.pm:29
 #, c-format
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../lib/network/drakfirewall.pm:33
+#: ../lib/network/drakfirewall.pm:34
 #, c-format
 msgid "DHCP Server"
 msgstr "DHCP 服务器"
 
-#: ../lib/network/drakfirewall.pm:39
+#: ../lib/network/drakfirewall.pm:40
 #, c-format
 msgid "Mail Server"
 msgstr "邮件服务器"
 
-#: ../lib/network/drakfirewall.pm:44
+#: ../lib/network/drakfirewall.pm:45
 #, c-format
 msgid "POP and IMAP Server"
 msgstr "POP 和 IMAP 服务器"
 
-#: ../lib/network/drakfirewall.pm:49
+#: ../lib/network/drakfirewall.pm:50
 #, c-format
 msgid "Telnet server"
 msgstr "Telnet 服务器"
 
-#: ../lib/network/drakfirewall.pm:55
+#: ../lib/network/drakfirewall.pm:56
 #, c-format
 msgid "NFS Server"
 msgstr "NFS 服务器"
 
-#: ../lib/network/drakfirewall.pm:63
+#: ../lib/network/drakfirewall.pm:64
 #, c-format
 msgid "Windows Files Sharing (SMB)"
 msgstr "Windows 文件共享(SMB)"
 
-#: ../lib/network/drakfirewall.pm:69
+#: ../lib/network/drakfirewall.pm:70
 #, c-format
 msgid "Bacula backup"
 msgstr "Bacula 备份"
 
-#: ../lib/network/drakfirewall.pm:75
+#: ../lib/network/drakfirewall.pm:76
 #, c-format
 msgid "Syslog network logging"
 msgstr "系统日志网络日志"
 
-#: ../lib/network/drakfirewall.pm:81
+#: ../lib/network/drakfirewall.pm:82
 #, c-format
 msgid "CUPS server"
 msgstr "CUPS 服务器"
 
-#: ../lib/network/drakfirewall.pm:87
+#: ../lib/network/drakfirewall.pm:88
 #, c-format
 msgid "MySQL server"
 msgstr "MySQL 服务器"
 
-#: ../lib/network/drakfirewall.pm:93
+#: ../lib/network/drakfirewall.pm:94
 #, c-format
 msgid "PostgreSQL server"
 msgstr "PostgreSQL 服务器"
 
-#: ../lib/network/drakfirewall.pm:99
+#: ../lib/network/drakfirewall.pm:100
 #, c-format
 msgid "Echo request (ping)"
 msgstr "回显请求(ping)"
 
-#: ../lib/network/drakfirewall.pm:104
+#: ../lib/network/drakfirewall.pm:105
+#, c-format
+msgid "AVAHI and mDNS"
+msgstr ""
+
+#: ../lib/network/drakfirewall.pm:111
 #, c-format
 msgid "BitTorrent"
 msgstr "BitTorrent"
 
-#: ../lib/network/drakfirewall.pm:110
+#: ../lib/network/drakfirewall.pm:117
 #, c-format
 msgid "Windows Mobile device synchronization"
 msgstr "Windows Mobile 设备同步"
 
-#: ../lib/network/drakfirewall.pm:119
+#: ../lib/network/drakfirewall.pm:126
 #, c-format
 msgid "Port scan detection"
 msgstr "端口扫描检测"
 
-#: ../lib/network/drakfirewall.pm:214 ../lib/network/drakfirewall.pm:220
+#: ../lib/network/drakfirewall.pm:225 ../lib/network/drakfirewall.pm:231
 #: ../lib/network/shorewall.pm:75
 #, c-format
 msgid "Firewall configuration"
 msgstr "防火墙配置"
 
-#: ../lib/network/drakfirewall.pm:214
+#: ../lib/network/drakfirewall.pm:225
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -3935,7 +4015,7 @@ msgstr ""
 "如果要配置强大的专用防火墙, 请考虑使用专门的\n"
 "Mandriva Security 防火墙发行版。"
 
-#: ../lib/network/drakfirewall.pm:220
+#: ../lib/network/drakfirewall.pm:231
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -3947,13 +4027,13 @@ msgstr ""
 "\n"
 "请确定您在继续任何操作前已经用“Drak 连接”配置了您的局域网/Internet 访问。"
 
-#: ../lib/network/drakfirewall.pm:237 ../lib/network/drakfirewall.pm:239
+#: ../lib/network/drakfirewall.pm:248 ../lib/network/drakfirewall.pm:250
 #: ../lib/network/shorewall.pm:167
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: ../lib/network/drakfirewall.pm:240
+#: ../lib/network/drakfirewall.pm:251
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -3964,7 +4044,7 @@ msgstr ""
 "例如, 可以这样: 139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
 "请参考 /etc/services 文件。"
 
-#: ../lib/network/drakfirewall.pm:246
+#: ../lib/network/drakfirewall.pm:257
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -3979,27 +4059,33 @@ msgstr ""
 "\n"
 "您也可以给出端口范围(如: 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:256
+#: ../lib/network/drakfirewall.pm:267
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "您想要本机上开放哪些服务?"
 
-#: ../lib/network/drakfirewall.pm:257
+#: ../lib/network/drakfirewall.pm:268 ../lib/network/netconnect.pm:127
+#: ../lib/network/network.pm:540
+#, c-format
+msgid "Those settings will be saved for the network profile <b>%s</b>"
+msgstr ""
+
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "全部(无防火墙)"
 
-#: ../lib/network/drakfirewall.pm:259
+#: ../lib/network/drakfirewall.pm:271
 #, c-format
 msgid "Other ports"
 msgstr "其它端口"
 
-#: ../lib/network/drakfirewall.pm:260
+#: ../lib/network/drakfirewall.pm:272
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "在系统日志中记录防火墙消息"
 
-#: ../lib/network/drakfirewall.pm:302
+#: ../lib/network/drakfirewall.pm:314
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -4009,7 +4095,7 @@ msgstr ""
 "您可以选择在有人访问本机上的服务或试图入侵您的计算机时得到警报。\n"
 "请选择应监视何种网络活动。"
 
-#: ../lib/network/drakfirewall.pm:307
+#: ../lib/network/drakfirewall.pm:319
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "使用交互式防火墙"
@@ -4034,7 +4120,7 @@ msgstr "配置"
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:788
+#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Wireless connection"
 msgstr "无线连接"
@@ -4173,8 +4259,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:625
-#: ../lib/network/netconnect.pm:642 ../lib/network/netconnect.pm:658
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:632
+#: ../lib/network/netconnect.pm:649 ../lib/network/netconnect.pm:665
 #, c-format
 msgid "Manual"
 msgstr "手动"
@@ -4182,10 +4268,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:620
-#: ../lib/network/netconnect.pm:625 ../lib/network/netconnect.pm:637
-#: ../lib/network/netconnect.pm:642 ../lib/network/netconnect.pm:658
-#: ../lib/network/netconnect.pm:660
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:627
+#: ../lib/network/netconnect.pm:632 ../lib/network/netconnect.pm:644
+#: ../lib/network/netconnect.pm:649 ../lib/network/netconnect.pm:665
+#: ../lib/network/netconnect.pm:667
 #, c-format
 msgid "Automatic"
 msgstr "自动"
@@ -4196,9 +4282,17 @@ msgid "No device supporting the %s ndiswrapper driver is present!"
 msgstr "目前没有支持 %s ndiswrapper 驱动程序的设备!"
 
 #: ../lib/network/ndiswrapper.pm:36
+#, fuzzy, c-format
+msgid "Please select the correct driver"
+msgstr "请选择您的网络运营商："
+
+#: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver (.inf file)"
-msgstr "请选择 Windows 驱动程序(.inf 文件)"
+msgid ""
+"Please select Windows driver description (.inf file), or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4256,23 +4350,23 @@ msgid ""
 "Monitor"
 msgstr "监视"
 
-#: ../lib/network/netcenter.pm:144
+#: ../lib/network/netcenter.pm:145
 #, c-format
 msgid "Network Center"
 msgstr "网络中心"
 
-#: ../lib/network/netcenter.pm:168
+#: ../lib/network/netcenter.pm:164
 #, c-format
-msgid "Advanced settings"
-msgstr "高级设置"
+msgid "You are currently using the network profile <b>%s</b>"
+msgstr ""
 
-#: ../lib/network/netconnect.pm:37
+#: ../lib/network/netcenter.pm:170
 #, c-format
-msgid "United States"
-msgstr "美国"
+msgid "Advanced settings"
+msgstr "高级设置"
 
-#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:515
-#: ../lib/network/netconnect.pm:529
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:522
+#: ../lib/network/netconnect.pm:536
 #, c-format
 msgid "Manual choice"
 msgstr "手动选择"
@@ -4311,8 +4405,8 @@ msgstr "网络和 Internet 配置"
 msgid "Choose the connection you want to configure"
 msgstr "选择您想要配置的连接"
 
-#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:370
-#: ../lib/network/netconnect.pm:815
+#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:377
+#: ../lib/network/netconnect.pm:822
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "选择要配置的网卡: "
@@ -4346,114 +4440,114 @@ msgstr ""
 "请选择您的连接协议。\n"
 "如果您不知道的话，请保持预先选择的协议。"
 
-#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:677
+#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:684
 #, c-format
 msgid "Connection control"
 msgstr "连接控制"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:726
+#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
 #, c-format
 msgid "Testing your connection..."
 msgstr "正在测试您的连接..."
 
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
 msgstr "连接配置"
 
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "请填写或选择下列项目"
 
-#: ../lib/network/netconnect.pm:340
+#: ../lib/network/netconnect.pm:347
 #, c-format
 msgid "Your personal phone number"
 msgstr "您自己的电话号码"
 
-#: ../lib/network/netconnect.pm:341
+#: ../lib/network/netconnect.pm:348
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "服务商名称(如 provider.net)"
 
-#: ../lib/network/netconnect.pm:342
+#: ../lib/network/netconnect.pm:349
 #, c-format
 msgid "Provider phone number"
 msgstr "服务商电话号码"
 
-#: ../lib/network/netconnect.pm:343
+#: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "服务商 DNS 1(可选)"
 
-#: ../lib/network/netconnect.pm:344
+#: ../lib/network/netconnect.pm:351
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "服务商 DNS 2(可选)"
 
-#: ../lib/network/netconnect.pm:345
+#: ../lib/network/netconnect.pm:352
 #, c-format
 msgid "Dialing mode"
 msgstr "拨号模式"
 
-#: ../lib/network/netconnect.pm:346
+#: ../lib/network/netconnect.pm:353
 #, c-format
 msgid "Connection speed"
 msgstr "连接速率"
 
-#: ../lib/network/netconnect.pm:347
+#: ../lib/network/netconnect.pm:354
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "连接超时(秒)"
 
-#: ../lib/network/netconnect.pm:350
+#: ../lib/network/netconnect.pm:357
 #, c-format
 msgid "Card IRQ"
 msgstr "网卡的 IRQ"
 
-#: ../lib/network/netconnect.pm:351
+#: ../lib/network/netconnect.pm:358
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "网卡内存(DMA)"
 
-#: ../lib/network/netconnect.pm:352
+#: ../lib/network/netconnect.pm:359
 #, c-format
 msgid "Card IO"
 msgstr "网卡 IO"
 
-#: ../lib/network/netconnect.pm:353
+#: ../lib/network/netconnect.pm:360
 #, c-format
 msgid "Card IO_0"
 msgstr "网卡 IO_0"
 
-#: ../lib/network/netconnect.pm:354
+#: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
 msgstr "网卡 IO_1"
 
-#: ../lib/network/netconnect.pm:373 ../lib/network/netconnect.pm:378
+#: ../lib/network/netconnect.pm:380 ../lib/network/netconnect.pm:385
 #, c-format
 msgid "External ISDN modem"
 msgstr "外置 ISDN 调制解调器"
 
-#: ../lib/network/netconnect.pm:406
+#: ../lib/network/netconnect.pm:413
 #, c-format
 msgid "Select a device!"
 msgstr "请选择设备！"
 
-#: ../lib/network/netconnect.pm:415 ../lib/network/netconnect.pm:425
-#: ../lib/network/netconnect.pm:435 ../lib/network/netconnect.pm:468
-#: ../lib/network/netconnect.pm:482
+#: ../lib/network/netconnect.pm:422 ../lib/network/netconnect.pm:432
+#: ../lib/network/netconnect.pm:442 ../lib/network/netconnect.pm:475
+#: ../lib/network/netconnect.pm:489
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN 配置"
 
-#: ../lib/network/netconnect.pm:416
+#: ../lib/network/netconnect.pm:423
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "请问您适配卡的种类?"
 
-#: ../lib/network/netconnect.pm:426
+#: ../lib/network/netconnect.pm:433
 #, c-format
 msgid ""
 "\n"
@@ -4467,22 +4561,22 @@ msgstr ""
 "\n"
 "如果您的卡是 PCMCIA 卡, 您必须知道它的“irq”和“io”。\n"
 
-#: ../lib/network/netconnect.pm:430
+#: ../lib/network/netconnect.pm:437
 #, c-format
 msgid "Continue"
 msgstr "继续"
 
-#: ../lib/network/netconnect.pm:430
+#: ../lib/network/netconnect.pm:437
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: ../lib/network/netconnect.pm:436
+#: ../lib/network/netconnect.pm:443
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "下列哪个是您的 ISDN 卡?"
 
-#: ../lib/network/netconnect.pm:454
+#: ../lib/network/netconnect.pm:461
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -4492,12 +4586,12 @@ msgstr ""
 "此调制解调器适用 CAPI 驱动程序。此 CAPI 驱动程序比免费驱动程序提供更多的功能"
 "(比如发送传真)。您想要使用哪个驱动程序?"
 
-#: ../lib/network/netconnect.pm:468
+#: ../lib/network/netconnect.pm:475
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "您将使用哪种协议?"
 
-#: ../lib/network/netconnect.pm:482
+#: ../lib/network/netconnect.pm:489
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -4506,12 +4600,12 @@ msgstr ""
 "选择您的提供商。\n"
 "如果该提供商未被列出, 请选择“未列出”。"
 
-#: ../lib/network/netconnect.pm:484 ../lib/network/netconnect.pm:580
+#: ../lib/network/netconnect.pm:491 ../lib/network/netconnect.pm:587
 #, c-format
 msgid "Provider:"
 msgstr "服务商:"
 
-#: ../lib/network/netconnect.pm:493
+#: ../lib/network/netconnect.pm:500
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -4520,132 +4614,132 @@ msgstr ""
 "您的调制解调器不被系统支持。\n"
 "请看看 http://www.linmodems.org"
 
-#: ../lib/network/netconnect.pm:512
+#: ../lib/network/netconnect.pm:519
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "选择要配置的调制解调器:"
 
-#: ../lib/network/netconnect.pm:514
+#: ../lib/network/netconnect.pm:521
 #, c-format
 msgid "Modem"
 msgstr "调制解调器"
 
-#: ../lib/network/netconnect.pm:549
+#: ../lib/network/netconnect.pm:556
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "请选择您的调制解调器是连接到哪个串行端口。"
 
-#: ../lib/network/netconnect.pm:578
+#: ../lib/network/netconnect.pm:585
 #, c-format
 msgid "Select your provider:"
 msgstr "选择您的服务商:"
 
-#: ../lib/network/netconnect.pm:602
+#: ../lib/network/netconnect.pm:609
 #, c-format
 msgid "Dialup: account options"
 msgstr "拨号: 账户设置"
 
-#: ../lib/network/netconnect.pm:605
+#: ../lib/network/netconnect.pm:612
 #, c-format
 msgid "Connection name"
 msgstr "连接名称"
 
-#: ../lib/network/netconnect.pm:606
+#: ../lib/network/netconnect.pm:613
 #, c-format
 msgid "Phone number"
 msgstr "电话号码"
 
-#: ../lib/network/netconnect.pm:607
+#: ../lib/network/netconnect.pm:614
 #, c-format
 msgid "Login ID"
 msgstr "登录 ID"
 
-#: ../lib/network/netconnect.pm:622 ../lib/network/netconnect.pm:655
+#: ../lib/network/netconnect.pm:629 ../lib/network/netconnect.pm:662
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "拨号: IP 参数"
 
-#: ../lib/network/netconnect.pm:625
+#: ../lib/network/netconnect.pm:632
 #, c-format
 msgid "IP parameters"
 msgstr "IP 参数"
 
-#: ../lib/network/netconnect.pm:627
+#: ../lib/network/netconnect.pm:634
 #, c-format
 msgid "Subnet mask"
 msgstr "子网掩码"
 
-#: ../lib/network/netconnect.pm:639
+#: ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "拨号: DNS 参数"
 
-#: ../lib/network/netconnect.pm:642
+#: ../lib/network/netconnect.pm:649
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/network/netconnect.pm:643
+#: ../lib/network/netconnect.pm:650
 #, c-format
 msgid "Domain name"
 msgstr "域名"
 
-#: ../lib/network/netconnect.pm:644
+#: ../lib/network/netconnect.pm:651
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "首选 DNS 服务器(可选)"
 
-#: ../lib/network/netconnect.pm:645
+#: ../lib/network/netconnect.pm:652
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "备选 DNS 服务器(可选)"
 
-#: ../lib/network/netconnect.pm:646
+#: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
 msgstr "由 IP 设置主机名"
 
-#: ../lib/network/netconnect.pm:659
+#: ../lib/network/netconnect.pm:666
 #, c-format
 msgid "Gateway IP address"
 msgstr "网关 IP 地址"
 
-#: ../lib/network/netconnect.pm:692
+#: ../lib/network/netconnect.pm:699
 #, c-format
 msgid "Automatically at boot"
 msgstr "开机时自动启动"
 
-#: ../lib/network/netconnect.pm:694
+#: ../lib/network/netconnect.pm:701
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "使用系统脱盘中的网络小程序"
 
-#: ../lib/network/netconnect.pm:696
+#: ../lib/network/netconnect.pm:703
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手动(启动时仍会激活网卡)"
 
-#: ../lib/network/netconnect.pm:705
+#: ../lib/network/netconnect.pm:712
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "您想要如何拨打此连接?"
 
-#: ../lib/network/netconnect.pm:718
+#: ../lib/network/netconnect.pm:725
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "您想要测试连接到 Internet 吗?"
 
-#: ../lib/network/netconnect.pm:745
+#: ../lib/network/netconnect.pm:752
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "您的系统现在正连接到 Internet。"
 
-#: ../lib/network/netconnect.pm:746
+#: ../lib/network/netconnect.pm:753
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "由于安全原因, 现在将断开连接。"
 
-#: ../lib/network/netconnect.pm:747
+#: ../lib/network/netconnect.pm:754
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -4654,133 +4748,130 @@ msgstr ""
 "看来系统没有连接到 Internet。\n"
 "请重新尝试配置您的连接。"
 
-#: ../lib/network/netconnect.pm:763
+#: ../lib/network/netconnect.pm:770
 #, c-format
 msgid "Problems occured during the network connectivity test."
 msgstr "网络连接测试时发生了问题。"
 
-#: ../lib/network/netconnect.pm:764
+#: ../lib/network/netconnect.pm:771
 #, c-format
 msgid ""
 "This can be caused by invalid network configuration, or problems with your "
 "modem or router."
 msgstr "这可能是无效的网络配置导致的，或者是您调制解调器或路由器的问题。"
 
-#: ../lib/network/netconnect.pm:765
+#: ../lib/network/netconnect.pm:772
 #, c-format
 msgid ""
 "You might want to relaunch the configuration to verify the connection "
 "settings."
 msgstr "您可能想要重新执行配置程序验证连接设置。"
 
-#: ../lib/network/netconnect.pm:768
+#: ../lib/network/netconnect.pm:775
 #, c-format
 msgid "Congratulations, the network configuration is finished."
-msgstr ""
-"恭喜, 网络和 Internet 配置完成。"
+msgstr "恭喜, 网络和 Internet 配置完成。"
 
-#: ../lib/network/netconnect.pm:768
+#: ../lib/network/netconnect.pm:775
 #, c-format
 msgid ""
 "However, the Internet connectivity test failed. You should test your "
 "connection manually, and verify your Internet modem or router."
 msgstr ""
-"但是，Internet 连接测试失败。您应该手动测试您的连接，然后检查您的 Internet 调制解调器或者路由器。"
+"但是，Internet 连接测试失败。您应该手动测试您的连接，然后检查您的 Internet 调"
+"制解调器或者路由器。"
 
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/netconnect.pm:776
 #, c-format
 msgid ""
 "If your connection does not work, you might want to relaunch the "
 "configuration."
-msgstr ""
-"如果您的连接不工作, 您可能想要重新配"
-"置。"
+msgstr "如果您的连接不工作, 您可能想要重新配置。"
 
-#: ../lib/network/netconnect.pm:771
+#: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "Congratulations, the network and Internet configuration are finished."
-msgstr ""
-"恭喜, 网络和 Internet 配置完成。"
+msgstr "恭喜, 网络和 Internet 配置完成。"
 
-#: ../lib/network/netconnect.pm:772
+#: ../lib/network/netconnect.pm:779
 #, 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:783
+#: ../lib/network/netconnect.pm:790
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB 调制解调器"
 
-#: ../lib/network/netconnect.pm:784 ../lib/network/netconnect.pm:785
+#: ../lib/network/netconnect.pm:791 ../lib/network/netconnect.pm:792
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan 调制解调器"
 
-#: ../lib/network/netconnect.pm:786
+#: ../lib/network/netconnect.pm:793
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus 调制解调器"
 
-#: ../lib/network/netconnect.pm:787
+#: ../lib/network/netconnect.pm:794
 #, c-format
 msgid "LAN connection"
 msgstr "局域网连接"
 
-#: ../lib/network/netconnect.pm:789
+#: ../lib/network/netconnect.pm:796
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 连接"
 
-#: ../lib/network/netconnect.pm:790
+#: ../lib/network/netconnect.pm:797
 #, c-format
 msgid "Cable connection"
 msgstr "有线电缆连接"
 
-#: ../lib/network/netconnect.pm:791
+#: ../lib/network/netconnect.pm:798
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 连接"
 
-#: ../lib/network/netconnect.pm:792
+#: ../lib/network/netconnect.pm:799
 #, c-format
 msgid "Modem connection"
 msgstr "调制解调器连接"
 
-#: ../lib/network/netconnect.pm:793
+#: ../lib/network/netconnect.pm:800
 #, c-format
 msgid "DVB connection"
 msgstr "DVB 连接"
 
-#: ../lib/network/netconnect.pm:795
+#: ../lib/network/netconnect.pm:802
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(在端口 %s 检测到)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:804
 #, c-format
 msgid "(detected %s)"
 msgstr "(检测到 %s)"
 
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:804
 #, c-format
 msgid "(detected)"
 msgstr "(检测到)"
 
-#: ../lib/network/netconnect.pm:798
+#: ../lib/network/netconnect.pm:805
 #, c-format
 msgid "Network Configuration"
 msgstr "网络配置"
 
-#: ../lib/network/netconnect.pm:799
+#: ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf 主机名解析"
 
-#: ../lib/network/netconnect.pm:800
+#: ../lib/network/netconnect.pm:807
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -4792,17 +4883,17 @@ msgstr ""
 "这将被您的计算机用于通知其未被网络管理的共享资源。\n"
 "大多数网络中不需要此设置。"
 
-#: ../lib/network/netconnect.pm:804
+#: ../lib/network/netconnect.pm:811
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf 主机名"
 
-#: ../lib/network/netconnect.pm:805
+#: ../lib/network/netconnect.pm:812
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf 主机名不能包含“.”"
 
-#: ../lib/network/netconnect.pm:806
+#: ../lib/network/netconnect.pm:813
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -4813,12 +4904,12 @@ msgstr ""
 "由于您正在执行网络安装, 您的网络已经配置好了。\n"
 "单击“确定”保存配置, 或“取消”重新配置网络。\n"
 
-#: ../lib/network/netconnect.pm:809
+#: ../lib/network/netconnect.pm:816
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "网络需要重新启动。您要重新启动吗?"
 
-#: ../lib/network/netconnect.pm:810
+#: ../lib/network/netconnect.pm:817
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -4829,7 +4920,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:811
+#: ../lib/network/netconnect.pm:818
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -4842,12 +4933,12 @@ msgstr ""
 "\n"
 "按“%s”继续。"
 
-#: ../lib/network/netconnect.pm:812
+#: ../lib/network/netconnect.pm:819
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "配置完成, 您想要应用设置吗?"
 
-#: ../lib/network/netconnect.pm:813
+#: ../lib/network/netconnect.pm:820
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -4858,24 +4949,24 @@ msgstr ""
 "选择您要使用的一种。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:814
+#: ../lib/network/netconnect.pm:821
 #, c-format
 msgid "Internet connection"
 msgstr "Internet 连接"
 
-#: ../lib/network/netconnect.pm:816
+#: ../lib/network/netconnect.pm:823
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "配置网络设备 %s(驱动程序 %s)"
 
-#: ../lib/network/netconnect.pm:817
+#: ../lib/network/netconnect.pm:824
 #, 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:818
+#: ../lib/network/netconnect.pm:825
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -4887,27 +4978,27 @@ msgstr ""
 "您的主机名称必需是个完全限定的名称, 例如“mybox.mylab.myco.com”。\n"
 "如果您有网关的话, 也请输入其 IP 地址。"
 
-#: ../lib/network/netconnect.pm:823
+#: ../lib/network/netconnect.pm:830
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "最后, 您还应该至少输入您 DNS 服务器的 IP 地址。"
 
-#: ../lib/network/netconnect.pm:824
+#: ../lib/network/netconnect.pm:831
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 服务器的格式应该是 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:825
+#: ../lib/network/netconnect.pm:832
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "网关地址的格式应该是 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:826
+#: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
 msgstr "网关设备"
 
-#: ../lib/network/netconnect.pm:840
+#: ../lib/network/netconnect.pm:847
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -4916,111 +5007,117 @@ msgstr ""
 "发生了意外错误: \n"
 "%s"
 
-#: ../lib/network/network.pm:494
+#: ../lib/network/network.pm:514
 #, c-format
 msgid "Advanced network settings"
 msgstr "高级网络设置"
 
-#: ../lib/network/network.pm:495
+#: ../lib/network/network.pm:515
 #, c-format
 msgid ""
 "Here you can configure advanced network settings. Please note that you have "
 "to reboot the machine for changes to take effect."
-msgstr "您可以在此配置高级网络设置。请注意，您需要重新启动计算机才能让更改生效。"
+msgstr ""
+"您可以在此配置高级网络设置。请注意，您需要重新启动计算机才能让更改生效。"
 
-#: ../lib/network/network.pm:496
+#: ../lib/network/network.pm:517
+#, c-format
+msgid "Wireless regulatory domain"
+msgstr "无线受限域"
+
+#: ../lib/network/network.pm:518
 #, c-format
 msgid "TCP/IP settings"
 msgstr "TCP/IP 设置"
 
-#: ../lib/network/network.pm:497
+#: ../lib/network/network.pm:519
 #, c-format
 msgid "Disable IPv6"
 msgstr "禁用 Ipv6"
 
-#: ../lib/network/network.pm:498
+#: ../lib/network/network.pm:520
 #, c-format
 msgid "Disable TCP Window Scaling"
 msgstr "禁用 TCP 窗口范围"
 
-#: ../lib/network/network.pm:499
+#: ../lib/network/network.pm:521
 #, c-format
 msgid "Disable TCP Timestamps"
 msgstr "禁用 TCP 时间戳"
 
-#: ../lib/network/network.pm:500
+#: ../lib/network/network.pm:522
 #, c-format
 msgid "Security settings (defined by MSEC policy)"
 msgstr "安全设置(由 MSEC 策略定义)"
 
-#: ../lib/network/network.pm:501
+#: ../lib/network/network.pm:523
 #, c-format
 msgid "Disable ICMP echo"
 msgstr "禁用 ICMP 响应"
 
-#: ../lib/network/network.pm:502
+#: ../lib/network/network.pm:524
 #, c-format
 msgid "Disable ICMP echo for broadcasting messages"
 msgstr "禁用广播消息的 ICMP 响应"
 
-#: ../lib/network/network.pm:503
+#: ../lib/network/network.pm:525
 #, c-format
 msgid "Disable invalid ICMP error responses"
 msgstr "禁用无效的 ICMP 错误响应"
 
-#: ../lib/network/network.pm:504
+#: ../lib/network/network.pm:526
 #, c-format
 msgid "Log strange packets"
 msgstr "记录奇怪的数据包"
 
-#: ../lib/network/network.pm:514
+#: ../lib/network/network.pm:539
 #, c-format
 msgid "Proxies configuration"
 msgstr "代理服务器配置"
 
-#: ../lib/network/network.pm:515
+#: ../lib/network/network.pm:540
 #, c-format
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
 "my_caching_server:8080)"
 msgstr "您可以在此处设定您的代理服务器配置(如: http://my_caching_server:8080)"
 
-#: ../lib/network/network.pm:516
+#: ../lib/network/network.pm:541
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理服务器"
 
-#: ../lib/network/network.pm:517
+#: ../lib/network/network.pm:542
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "HTTPS 连接也使用 HTTP 代理"
 
-#: ../lib/network/network.pm:518
+#: ../lib/network/network.pm:543
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS 代理服务器"
 
-#: ../lib/network/network.pm:519
+#: ../lib/network/network.pm:544
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理服务器"
 
-#: ../lib/network/network.pm:520
+#: ../lib/network/network.pm:545
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "以下地址不使用代理(用逗号分隔):"
 
-#: ../lib/network/network.pm:525
+#: ../lib/network/network.pm:550
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理服务器应该是 http://..."
 
-#: ../lib/network/network.pm:526
+#: ../lib/network/network.pm:551
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "代理应该是 http://... 或 https://..."
 
-#: ../lib/network/network.pm:527
+#: ../lib/network/network.pm:552
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 应该是以“ftp:”或“http:”开头"
@@ -5042,7 +5139,8 @@ msgstr ""
 "\n"
 "所有直接连接到 Internet 的接口都应该选中，而连接到局域网的接口可以不选。\n"
 "\n"
-"如果您想要使用 Mandriva Internet 连接共享，请不要选择将连接到局域网的接口。\n\n"
+"如果您想要使用 Mandriva Internet 连接共享，请不要选择将连接到局域网的接口。\n"
+"\n"
 "应该保护哪个接口?\n"
 
 #: ../lib/network/shorewall.pm:158
@@ -5301,3 +5399,22 @@ msgstr "NAT 模式"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "使用指定的 UDP 端口"
+
+#~ msgid ""
+#~ "Name of the profile to create (the new profile is created as a copy of "
+#~ "the current one):"
+#~ msgstr "要创建的配置文件名称(新配置文件将会以当前配置文件为基础创建)："
+
+#~ msgid ""
+#~ "This tool allows to activate an existing network profile, and to manage "
+#~ "(clone, delete) profiles."
+#~ msgstr "此工具允许您激活现有的网络配置文件，以及管理(克隆、删除)配置文件。"
+
+#~ msgid "To modify a profile, you have to activate it first."
+#~ msgstr "要修改配置文件，您必须先激活该配置文件。"
+
+#~ msgid "Clone"
+#~ msgstr "克隆"
+
+#~ msgid "Please select the Windows driver (.inf file)"
+#~ msgstr "请选择 Windows 驱动程序(.inf 文件)"