merge last updates

1 files changed, 370 insertions, 364 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8bcafc9..2be2e9d 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-10-20 08:41-0200\n"
+"POT-Creation-Date: 2011-05-03 15:42+0200\n"
 "PO-Revision-Date: 2009-04-09 13:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <mageia-i18n@mandrivalinux.org>\n"
@@ -20,9 +20,9 @@ msgstr "网络配置(%d 网卡)"
 msgid "Interface"
 msgstr "网卡"
 
-#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:138 ../lib/network/netconnect.pm:633
-#: ../lib/network/vpn/openvpn.pm:221
+#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
+#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP 地址"
@@ -63,7 +63,7 @@ msgstr "局域网配置"
 msgid "Configure Local Area Network..."
 msgstr "配置局域网..."
 
-#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:190
+#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -90,11 +90,11 @@ msgstr "确定"
 #: ../lib/network/connection_manager.pm:89
 #: ../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/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
-#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:354
-#: ../lib/network/thirdparty.pm:369
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -134,7 +134,7 @@ msgid "Adapter %s: %s"
 msgstr "适配器 %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
-#: ../lib/network/connection/ethernet.pm:145
+#: ../lib/network/connection/ethernet.pm:148
 #, c-format
 msgid "Netmask"
 msgstr "子网掩码"
@@ -149,21 +149,21 @@ msgstr "启动协议"
 msgid "Started on boot"
 msgstr "开机时启动"
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:156
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 客户端"
 
 #: ../bin/drakconnect-old:247
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mageia Control Center"
+"Run the \"%s\" assistant from the Mageia Linux Control Center"
 msgstr ""
 "这块网卡还没有配置过。\n"
 "请从 Mageia 控制中心运行“%s”助手"
 
-#: ../bin/drakconnect-old:247 ../bin/net_applet:104
+#: ../bin/drakconnect-old:247 ../bin/net_applet:105
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "设置新的网络连接(局域网、ISDN、ADSL……)"
@@ -303,7 +303,7 @@ msgstr "请选择您将使用哪张网卡连接您的局域网。"
 msgid "Local Area Network settings"
 msgstr "局域网设置"
 
-#: ../bin/drakgw:180 ../lib/network/vpn/openvpn.pm:227
+#: ../bin/drakgw:180 ../lib/network/vpn/openvpn.pm:229
 #, c-format
 msgid "Local IP address"
 msgstr "本地 IP 地址"
@@ -313,8 +313,8 @@ msgstr "本地 IP 地址"
 msgid "The internal domain name"
 msgstr "内部域名"
 
-#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:245
-#: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
+#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:236
+#: ../bin/drakhosts:243 ../bin/drakhosts:250 ../bin/drakinvictus:72
 #: ../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
@@ -322,13 +322,13 @@ msgstr "内部域名"
 #: ../bin/draksambashare:403 ../bin/draksambashare:455
 #: ../bin/draksambashare:479 ../bin/draksambashare:552
 #: ../bin/draksambashare:629 ../bin/draksambashare:695
-#: ../bin/draksambashare:795 ../bin/draksambashare:802
-#: ../bin/draksambashare:941 ../bin/draksambashare:1095
-#: ../bin/draksambashare:1114 ../bin/draksambashare:1146
-#: ../bin/draksambashare:1252 ../bin/draksambashare:1354
-#: ../bin/draksambashare:1363 ../bin/draksambashare:1385
-#: ../bin/draksambashare:1394 ../bin/draksambashare:1413
-#: ../bin/draksambashare:1422 ../bin/draksambashare:1434
+#: ../bin/draksambashare:795 ../bin/draksambashare:803
+#: ../bin/draksambashare:942 ../bin/draksambashare:1096
+#: ../bin/draksambashare:1115 ../bin/draksambashare:1147
+#: ../bin/draksambashare:1253 ../bin/draksambashare:1355
+#: ../bin/draksambashare:1364 ../bin/draksambashare:1386
+#: ../bin/draksambashare:1395 ../bin/draksambashare:1414
+#: ../bin/draksambashare:1423 ../bin/draksambashare:1435
 #: ../lib/network/connection/xdsl.pm:361
 #: ../lib/network/connection_manager.pm:62
 #: ../lib/network/connection_manager.pm:68
@@ -337,16 +337,15 @@ msgstr "内部域名"
 #: ../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/connection_manager.pm:481 ../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: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
+#: ../lib/network/thirdparty.pm:230 ../lib/network/thirdparty.pm:232
+#: ../lib/network/thirdparty.pm:253
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -543,10 +542,9 @@ msgstr "主机名:"
 msgid "Host Aliases:"
 msgstr "主机别名:"
 
-#: ../bin/drakhosts:122 ../bin/drakhosts:128 ../bin/draknfs:116
-#: ../bin/draksambashare:230 ../bin/draksambashare:253
-#: ../bin/draksambashare:397 ../bin/draksambashare:625
-#: ../bin/draksambashare:791
+#: ../bin/drakhosts:122 ../bin/draknfs:116 ../bin/draksambashare:230
+#: ../bin/draksambashare:253 ../bin/draksambashare:397
+#: ../bin/draksambashare:625 ../bin/draksambashare:791
 #, c-format
 msgid "Error!"
 msgstr "错误！"
@@ -556,73 +554,68 @@ msgstr "错误！"
 msgid "Please enter a valid IP address."
 msgstr "请输入有效的 IP 地址。"
 
-#: ../bin/drakhosts:128
-#, c-format
-msgid "Same IP is already in %s file."
-msgstr "%s 文件中已经有同样的 IP 了。"
-
-#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:222
+#: ../bin/drakhosts:187 ../lib/network/connection/ethernet.pm:225
 #, c-format
 msgid "Host name"
 msgstr "主机名"
 
-#: ../bin/drakhosts:196
+#: ../bin/drakhosts:187
 #, c-format
 msgid "Host Aliases"
 msgstr "主机别名"
 
-#: ../bin/drakhosts:206 ../bin/drakhosts:236
+#: ../bin/drakhosts:197 ../bin/drakhosts:227
 #, c-format
 msgid "Manage hosts definitions"
 msgstr "管理主机定义"
 
-#: ../bin/drakhosts:222 ../bin/drakhosts:249 ../bin/draknfs:369
+#: ../bin/drakhosts:213 ../bin/drakhosts:240 ../bin/draknfs:369
 #, c-format
 msgid "Modify entry"
 msgstr "修改项"
 
-#: ../bin/drakhosts:241 ../bin/draknfs:601 ../bin/draksambashare:1347
-#: ../bin/draksambashare:1378 ../bin/draksambashare:1409
+#: ../bin/drakhosts:232 ../bin/draknfs:601 ../bin/draksambashare:1348
+#: ../bin/draksambashare:1379 ../bin/draksambashare:1410
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: ../bin/drakhosts:242
+#: ../bin/drakhosts:233
 #, c-format
 msgid "Add entry"
 msgstr "添加项"
 
-#: ../bin/drakhosts:245
+#: ../bin/drakhosts:236
 #, c-format
 msgid "Failed to add host."
 msgstr "添加主机失败。"
 
-#: ../bin/drakhosts:248 ../bin/draknfs:608 ../bin/draksambashare:1304
-#: ../bin/draksambashare:1349 ../bin/draksambashare:1380
-#: ../bin/draksambashare:1417
+#: ../bin/drakhosts:239 ../bin/draknfs:608 ../bin/draksambashare:1305
+#: ../bin/draksambashare:1350 ../bin/draksambashare:1381
+#: ../bin/draksambashare:1418
 #, c-format
 msgid "Modify"
 msgstr "修改"
 
-#: ../bin/drakhosts:252
+#: ../bin/drakhosts:243
 #, c-format
 msgid "Failed to Modify host."
 msgstr "修改主机失败。"
 
-#: ../bin/drakhosts:255 ../bin/drakids:95 ../bin/drakids:104
-#: ../bin/draknfs:615 ../bin/draksambashare:1305 ../bin/draksambashare:1357
-#: ../bin/draksambashare:1388 ../bin/draksambashare:1425
+#: ../bin/drakhosts:246 ../bin/drakids:95 ../bin/drakids:104
+#: ../bin/draknfs:615 ../bin/draksambashare:1306 ../bin/draksambashare:1358
+#: ../bin/draksambashare:1389 ../bin/draksambashare:1426
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: ../bin/drakhosts:259
+#: ../bin/drakhosts:250
 #, c-format
 msgid "Failed to remove host."
 msgstr "删除主机失败。"
 
-#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:219
-#: ../bin/net_applet:191 ../lib/network/drakroam.pm:93
+#: ../bin/drakhosts:253 ../bin/drakinvictus:141 ../bin/draknetprofile:219
+#: ../bin/net_applet:221 ../lib/network/drakroam.pm:93
 #: ../lib/network/netcenter.pm:178
 #, c-format
 msgid "Quit"
@@ -635,15 +628,15 @@ 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:134 ../bin/net_applet:313
-#: ../lib/network/drakfirewall.pm:311 ../lib/network/drakfirewall.pm:315
+#: ../bin/net_applet:145 ../bin/net_applet:353
+#: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
 #, c-format
 msgid "Interactive Firewall"
 msgstr "交互式防火墙"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:313
+#: ../bin/net_applet:353
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "无法连接守护程序"
@@ -720,7 +713,7 @@ msgstr "日期"
 msgid "Remote host"
 msgstr "远程主机"
 
-#: ../bin/drakids:258 ../lib/network/vpn/openvpn.pm:115
+#: ../bin/drakids:258 ../lib/network/vpn/openvpn.pm:117
 #, c-format
 msgid "Type"
 msgstr "类型"
@@ -1522,8 +1515,8 @@ msgid "Draksambashare"
 msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
-#, c-format
-msgid "Copyright (C) %s by Mageia"
+#, fuzzy, c-format
+msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mageia"
 
 #: ../bin/draksambashare:198
@@ -1628,7 +1621,7 @@ msgstr "已经存在 PDF 生成器。"
 msgid "Printers and print$ already exist."
 msgstr "打印机和 print$ 已经存在。"
 
-#: ../bin/draksambashare:529 ../bin/draksambashare:1197
+#: ../bin/draksambashare:529 ../bin/draksambashare:1198
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
@@ -1759,52 +1752,52 @@ msgid ""
 "Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr "创建掩码、创建模式和目录掩码必须是数字。即: 0755。"
 
-#: ../bin/draksambashare:802
+#: ../bin/draksambashare:803
 #, c-format
 msgid "Please create this Samba user: %s"
 msgstr "请创建此 Samba 用户: %s"
 
-#: ../bin/draksambashare:914
+#: ../bin/draksambashare:915
 #, c-format
 msgid "Add Samba user"
 msgstr "添加 Samba 用户"
 
-#: ../bin/draksambashare:929
+#: ../bin/draksambashare:930
 #, c-format
 msgid "User information"
 msgstr "用户信息"
 
-#: ../bin/draksambashare:931
+#: ../bin/draksambashare:932
 #, c-format
 msgid "User name:"
 msgstr "用户名:"
 
-#: ../bin/draksambashare:932
+#: ../bin/draksambashare:933
 #, c-format
 msgid "Password:"
 msgstr "密码："
 
-#: ../bin/draksambashare:1046
+#: ../bin/draksambashare:1047
 #, c-format
 msgid "PDC - primary domain controller"
 msgstr "PDC - 主域控制器"
 
-#: ../bin/draksambashare:1047
+#: ../bin/draksambashare:1048
 #, c-format
 msgid "Standalone - standalone server"
 msgstr "独立 - 独立服务器"
 
-#: ../bin/draksambashare:1053
+#: ../bin/draksambashare:1054
 #, c-format
 msgid "Samba Wizard"
 msgstr "Samba 向导"
 
-#: ../bin/draksambashare:1056
+#: ../bin/draksambashare:1057
 #, c-format
 msgid "Samba server configuration Wizard"
 msgstr "Samba 服务器配置向导"
 
-#: ../bin/draksambashare:1056
+#: ../bin/draksambashare:1057
 #, c-format
 msgid ""
 "Samba allows your server to behave as a file and print server for "
@@ -1812,25 +1805,25 @@ msgid ""
 msgstr ""
 "Samba 让您的服务器为运行 Linux 以外操作系统的工作站提供文件和打印服务。"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid "PDC server: primary domain controller"
 msgstr "PDC 服务器: 主域控制器"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
 msgstr "配置为 PDC 的服务器担负着域中进行 Windows 验证的责任。"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Single server installations may use smbpasswd or tdbsam password backends"
 msgstr "单服务器安装可以使用 smbpasswd 或 tdbsam 密码后端"
 
-#: ../bin/draksambashare:1072
+#: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -1839,27 +1832,27 @@ msgstr ""
 "域主浏览器 = 是，将导致服务器注册 NetBIOS 名称 <pdc 名称>。此名称可为其它服务"
 "器所识别。"
 
-#: ../bin/draksambashare:1089
+#: ../bin/draksambashare:1090
 #, c-format
 msgid "Wins support:"
 msgstr "Wins 支持:"
 
-#: ../bin/draksambashare:1090
+#: ../bin/draksambashare:1091
 #, c-format
 msgid "admin users:"
 msgstr "管理员用户:"
 
-#: ../bin/draksambashare:1090
+#: ../bin/draksambashare:1091
 #, c-format
 msgid "root @adm"
 msgstr "root @adm"
 
-#: ../bin/draksambashare:1091
+#: ../bin/draksambashare:1092
 #, c-format
 msgid "Os level:"
 msgstr "操作系统级别:"
 
-#: ../bin/draksambashare:1091
+#: ../bin/draksambashare:1092
 #, c-format
 msgid ""
 "The global os level option dictates the operating system level at which "
@@ -1872,42 +1865,42 @@ msgstr ""
 "进行选择并成为主浏览器，您可以将上面操作系统的级别设定为网络中最高的值，如 "
 "os level = 34"
 
-#: ../bin/draksambashare:1095
+#: ../bin/draksambashare:1096
 #, c-format
 msgid "The domain is wrong."
 msgstr "域不对。"
 
-#: ../bin/draksambashare:1102
+#: ../bin/draksambashare:1103
 #, c-format
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../bin/draksambashare:1102
+#: ../bin/draksambashare:1103
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba 要服务的 Windows 工作组。"
 
-#: ../bin/draksambashare:1109 ../bin/draksambashare:1176
+#: ../bin/draksambashare:1110 ../bin/draksambashare:1177
 #, c-format
 msgid "Workgroup:"
 msgstr "工作组:"
 
-#: ../bin/draksambashare:1110
+#: ../bin/draksambashare:1111
 #, c-format
 msgid "Netbios name:"
 msgstr "Netbios 名称:"
 
-#: ../bin/draksambashare:1114
+#: ../bin/draksambashare:1115
 #, c-format
 msgid "The Workgroup is wrong."
 msgstr "工作组不对。"
 
-#: ../bin/draksambashare:1121 ../bin/draksambashare:1131
+#: ../bin/draksambashare:1122 ../bin/draksambashare:1132
 #, c-format
 msgid "Security mode"
 msgstr "安全性模式"
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid ""
 "User level: the client sends a session setup request directly following "
@@ -1915,12 +1908,12 @@ msgid ""
 msgstr ""
 "用户级别: 客户端根据协议直接发送会话建立请求，此请求将提供用户名和密码。"
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
 msgstr "共享级别: 客户端为每个认证提供单独的身份验证"
 
-#: ../bin/draksambashare:1121
+#: ../bin/draksambashare:1122
 #, c-format
 msgid ""
 "Domain level: provides a mechanism for storing all user and group accounts "
@@ -1930,76 +1923,76 @@ msgstr ""
 "域级: 在集中的共享帐户仓库中存储全部用户和组帐户。集中式帐户仓库在域控制器之"
 "间共享。"
 
-#: ../bin/draksambashare:1132
+#: ../bin/draksambashare:1133
 #, c-format
 msgid "Hosts allow"
 msgstr "允许的主机"
 
-#: ../bin/draksambashare:1137
+#: ../bin/draksambashare:1138
 #, c-format
 msgid "Server Banner."
 msgstr "服务器标语。"
 
-#: ../bin/draksambashare:1137
+#: ../bin/draksambashare:1138
 #, c-format
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "这个标语会显示在 Windows 网络邻居中这个服务器名字旁边作为描述。"
 
-#: ../bin/draksambashare:1142
+#: ../bin/draksambashare:1143
 #, c-format
 msgid "Banner:"
 msgstr "标语:"
 
-#: ../bin/draksambashare:1146
+#: ../bin/draksambashare:1147
 #, c-format
 msgid "The Server Banner is incorrect."
 msgstr "服务器标语不对。"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Samba Log"
 msgstr "Samba 日志"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr "日志文件：使用 file.%m 为每台连接的计算机是用独立的日志文件"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
 msgstr "日志级别: 设定日志的详细级别(0 <= 日志级别 <= 10)"
 
-#: ../bin/draksambashare:1153
+#: ../bin/draksambashare:1154
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
 msgstr "日志最大大小：限制日志文件的大小(以 K 字节计)。"
 
-#: ../bin/draksambashare:1160 ../bin/draksambashare:1178
+#: ../bin/draksambashare:1161 ../bin/draksambashare:1179
 #, c-format
 msgid "Log file:"
 msgstr "日志文件:"
 
-#: ../bin/draksambashare:1161
+#: ../bin/draksambashare:1162
 #, c-format
 msgid "Max log size:"
 msgstr "日志最大大小:"
 
-#: ../bin/draksambashare:1162
+#: ../bin/draksambashare:1163
 #, c-format
 msgid "Log level:"
 msgstr "日志级别:"
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "为了配置 Samba，向导收集了下列需要的参数。"
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -2008,7 +2001,7 @@ msgstr ""
 "要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改它"
 "们。"
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1168
 #, c-format
 msgid ""
 "If you have previously create some shares, they will appear in this "
@@ -2017,112 +2010,112 @@ msgstr ""
 "如果您先前创建了共享，此配置中将会显示出来。请运行“drakwizard sambashare”管理"
 "您的共享。"
 
-#: ../bin/draksambashare:1175
+#: ../bin/draksambashare:1176
 #, c-format
 msgid "Samba type:"
 msgstr "Samba 类型:"
 
-#: ../bin/draksambashare:1177
+#: ../bin/draksambashare:1178
 #, c-format
 msgid "Server banner:"
 msgstr "服务器标语:"
 
-#: ../bin/draksambashare:1179
+#: ../bin/draksambashare:1180
 #, c-format
 msgid " "
 msgstr " "
 
-#: ../bin/draksambashare:1180
+#: ../bin/draksambashare:1181
 #, c-format
 msgid "Unix Charset:"
 msgstr "Unix 字符集:"
 
-#: ../bin/draksambashare:1181
+#: ../bin/draksambashare:1182
 #, c-format
 msgid "Dos Charset:"
 msgstr "Dos 字符集:"
 
-#: ../bin/draksambashare:1182
+#: ../bin/draksambashare:1183
 #, c-format
 msgid "Display Charset:"
 msgstr "显示字符集:"
 
-#: ../bin/draksambashare:1197
+#: ../bin/draksambashare:1198
 #, c-format
 msgid "The wizard successfully configured your Samba server."
 msgstr "向导成功地配置了您的 Samba 服务器。"
 
-#: ../bin/draksambashare:1252
+#: ../bin/draksambashare:1253
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr "Samba 向导意外失败:"
 
-#: ../bin/draksambashare:1266
+#: ../bin/draksambashare:1267
 #, c-format
 msgid "Manage Samba configuration"
 msgstr "管理 Samba 配置"
 
-#: ../bin/draksambashare:1354
+#: ../bin/draksambashare:1355
 #, c-format
 msgid "Failed to Modify Samba share."
 msgstr "修改 Samba 共享失败。"
 
-#: ../bin/draksambashare:1363
+#: ../bin/draksambashare:1364
 #, c-format
 msgid "Failed to remove a Samba share."
 msgstr "删除 Samba 共享失败。"
 
-#: ../bin/draksambashare:1370
+#: ../bin/draksambashare:1371
 #, c-format
 msgid "File share"
 msgstr "文件共享"
 
-#: ../bin/draksambashare:1385
+#: ../bin/draksambashare:1386
 #, c-format
 msgid "Failed to Modify."
 msgstr "修改失败。"
 
-#: ../bin/draksambashare:1394
+#: ../bin/draksambashare:1395
 #, c-format
 msgid "Failed to remove."
 msgstr "删除失败。"
 
-#: ../bin/draksambashare:1401
+#: ../bin/draksambashare:1402
 #, c-format
 msgid "Printers"
 msgstr "打印机"
 
-#: ../bin/draksambashare:1413
+#: ../bin/draksambashare:1414
 #, c-format
 msgid "Failed to add user."
 msgstr "添加用户失败。"
 
-#: ../bin/draksambashare:1422
+#: ../bin/draksambashare:1423
 #, c-format
 msgid "Failed to change user password."
 msgstr "更改用户密码。"
 
-#: ../bin/draksambashare:1434
+#: ../bin/draksambashare:1435
 #, c-format
 msgid "Failed to delete user."
 msgstr "删除用户失败。"
 
-#: ../bin/draksambashare:1439
+#: ../bin/draksambashare:1440
 #, c-format
 msgid "Userdrake"
 msgstr "Drak 用户管理"
 
-#: ../bin/draksambashare:1447
+#: ../bin/draksambashare:1448
 #, c-format
 msgid "Samba Users"
 msgstr "Samba 用户"
 
-#: ../bin/draksambashare:1455
+#: ../bin/draksambashare:1456
 #, c-format
 msgid "Please configure your Samba server"
 msgstr "请配置您的 Samba 服务器"
 
-#: ../bin/draksambashare:1455
+#: ../bin/draksambashare:1456
 #, c-format
 msgid ""
 "It seems this is the first time you run this tool.\n"
@@ -2131,138 +2124,138 @@ msgstr ""
 "似乎这是您第一次运行此工具。\n"
 "向导将会协助您配置基本的 Samba 服务器"
 
-#: ../bin/draksambashare:1464
+#: ../bin/draksambashare:1465
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba 管理 Samba 共享"
 
-#: ../bin/net_applet:95
+#: ../bin/net_applet:96
 #, c-format
 msgid "Network is up on interface %s."
 msgstr "网卡 %s 的网络已通。"
 
-#: ../bin/net_applet:96
+#: ../bin/net_applet:97
 #, c-format
 msgid "IP address: %s"
 msgstr "IP 地址: %s"
 
-#: ../bin/net_applet:97
+#: ../bin/net_applet:98
 #, c-format
 msgid "Gateway: %s"
 msgstr "网关: %s"
 
-#: ../bin/net_applet:98
+#: ../bin/net_applet:99
 #, c-format
 msgid "DNS: %s"
 msgstr "DNS：%s"
 
-#: ../bin/net_applet:99
+#: ../bin/net_applet:100
 #, c-format
 msgid "Connected to %s (link level: %d %%)"
 msgstr "已经连接到 %s(连接等级: %d %%)"
 
-#: ../bin/net_applet:101
+#: ../bin/net_applet:102
 #, c-format
 msgid "Network is down on interface %s."
 msgstr "网卡 %s 的网络已断。"
 
-#: ../bin/net_applet:103
-#, c-format
+#: ../bin/net_applet:104
+#, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mageia Control Center"
+"Run the \"%s\" assistant from the Mageia Linux Control Center"
 msgstr ""
 "您从未配置过 Internet 连接。\n"
 "请从 Mageia 控制中心运行“%s”助手"
 
-#: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
+#: ../bin/net_applet:107 ../lib/network/connection_manager.pm:206
 #, c-format
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../bin/net_applet:131 ../bin/net_monitor:519
+#: ../bin/net_applet:133 ../bin/net_monitor:519
 #, c-format
 msgid "Connect %s"
 msgstr "连接 %s"
 
-#: ../bin/net_applet:132 ../bin/net_monitor:519
+#: ../bin/net_applet:137 ../bin/net_monitor:519
 #, c-format
 msgid "Disconnect %s"
 msgstr "断开 %s"
 
-#: ../bin/net_applet:133
+#: ../bin/net_applet:141
 #, c-format
 msgid "Monitor Network"
 msgstr "监视网络"
 
-#: ../bin/net_applet:135
+#: ../bin/net_applet:149
 #, c-format
 msgid "Manage wireless networks"
 msgstr "管理无线网络"
 
-#: ../bin/net_applet:137
+#: ../bin/net_applet:153
 #, c-format
 msgid "Manage VPN connections"
 msgstr "管理 VPN 连接"
 
-#: ../bin/net_applet:141
+#: ../bin/net_applet:157
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../bin/net_applet:143
+#: ../bin/net_applet:161
 #, c-format
 msgid "Watched interface"
 msgstr "监视的接口"
 
-#: ../bin/net_applet:144 ../bin/net_applet:145 ../bin/net_applet:147
+#: ../bin/net_applet:162 ../bin/net_applet:165 ../bin/net_applet:168
 #, c-format
 msgid "Auto-detect"
 msgstr "自动检测"
 
-#: ../bin/net_applet:152
+#: ../bin/net_applet:173
 #, c-format
 msgid "Active interfaces"
 msgstr "活动接口"
 
-#: ../bin/net_applet:172
+#: ../bin/net_applet:193
 #, c-format
 msgid "Profiles"
 msgstr "配置文件"
 
-#: ../bin/net_applet:182 ../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
+#: ../bin/net_applet:203 ../lib/network/connection.pm:233
+#: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:367
+#: ../lib/network/vpn/openvpn.pm:381 ../lib/network/vpn/openvpn.pm:392
 #, c-format
 msgid "VPN connection"
 msgstr "VPN 连接"
 
-#: ../bin/net_applet:394
+#: ../bin/net_applet:434
 #, c-format
 msgid "Network connection"
 msgstr "网络连接"
 
-#: ../bin/net_applet:481
+#: ../bin/net_applet:521
 #, c-format
 msgid "More networks"
 msgstr "更多网络"
 
-#: ../bin/net_applet:508
+#: ../bin/net_applet:548
 #, c-format
 msgid "Interactive Firewall automatic mode"
 msgstr "交互式防火墙自动模式"
 
-#: ../bin/net_applet:513
+#: ../bin/net_applet:553
 #, c-format
 msgid "Always launch on startup"
 msgstr "启动时自动调用"
 
-#: ../bin/net_applet:518
+#: ../bin/net_applet:558
 #, c-format
 msgid "Wireless networks"
 msgstr "无线网络"
 
-#: ../bin/net_applet:525 ../bin/net_monitor:96
+#: ../bin/net_applet:565 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "设置"
@@ -2361,10 +2354,10 @@ msgid "Connection complete."
 msgstr "连接完成。"
 
 #: ../bin/net_monitor:258
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mageia Control Center."
+"Verify your configuration in the Mageia Linux Control Center."
 msgstr ""
 "连接失败。\n"
 "请在 Mageia 控制中心中检查您的配置。"
@@ -2431,22 +2424,22 @@ msgstr "尚未配置 Internet 连接"
 msgid "Unknown connection type"
 msgstr "未知连接类型"
 
-#: ../lib/network/connection.pm:162
+#: ../lib/network/connection.pm:166
 #, c-format
 msgid "Network access settings"
 msgstr "网络访问设置"
 
-#: ../lib/network/connection.pm:163
+#: ../lib/network/connection.pm:167
 #, c-format
 msgid "Access settings"
 msgstr "访问设置"
 
-#: ../lib/network/connection.pm:164
+#: ../lib/network/connection.pm:168
 #, c-format
 msgid "Address settings"
 msgstr "地址设置"
 
-#: ../lib/network/connection.pm:178 ../lib/network/connection.pm:198
+#: ../lib/network/connection.pm:182 ../lib/network/connection.pm:202
 #: ../lib/network/connection/isdn.pm:155 ../lib/network/netconnect.pm:217
 #: ../lib/network/netconnect.pm:492 ../lib/network/netconnect.pm:588
 #: ../lib/network/netconnect.pm:591
@@ -2454,49 +2447,54 @@ msgstr "地址设置"
 msgid "Unlisted - edit manually"
 msgstr "未列出 - 手动编辑"
 
-#: ../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
+#: ../lib/network/connection.pm:235 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection/wireless.pm:46 ../lib/network/vpn/openvpn.pm:129
+#: ../lib/network/vpn/openvpn.pm:173 ../lib/network/vpn/openvpn.pm:341
 #, c-format
 msgid "None"
 msgstr "无"
 
-#: ../lib/network/connection.pm:243
+#: ../lib/network/connection.pm:247
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "允许用户管理连接"
 
-#: ../lib/network/connection.pm:244
+#: ../lib/network/connection.pm:248
 #, c-format
 msgid "Start the connection at boot"
 msgstr "启动时开启连接"
 
-#: ../lib/network/connection.pm:245
+#: ../lib/network/connection.pm:249
 #, c-format
 msgid "Enable traffic accounting"
 msgstr "启用流量统计"
 
-#: ../lib/network/connection.pm:246
+#: ../lib/network/connection.pm:250
+#, c-format
+msgid "Allow interface to be controlled by Network Manager"
+msgstr ""
+
+#: ../lib/network/connection.pm:251
 #, c-format
 msgid "Metric"
 msgstr "度量衡"
 
-#: ../lib/network/connection.pm:247
+#: ../lib/network/connection.pm:252
 #, c-format
 msgid "MTU"
 msgstr "MTU"
 
-#: ../lib/network/connection.pm:248
+#: ../lib/network/connection.pm:253
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
 msgstr "网络消息的最大大小(MTU)。如果不确定的话，请留空。"
 
-#: ../lib/network/connection.pm:324
+#: ../lib/network/connection.pm:333
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "在网卡 %s 检测到链接"
 
-#: ../lib/network/connection.pm:325 ../lib/network/connection/ethernet.pm:302
+#: ../lib/network/connection.pm:334 ../lib/network/connection/ethernet.pm:305
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "网卡 %s 的链接已断"
@@ -2522,13 +2520,13 @@ msgid "Authentication"
 msgstr "身份验证"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "账户登录(用户名)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "账户密码"
@@ -2558,22 +2556,22 @@ msgstr "错误的 PIN 数字格式: 应改为四位数字。"
 msgid "GPRS/Edge/3G"
 msgstr "GPRS/Edge/3G"
 
-#: ../lib/network/connection/cellular_card.pm:110
+#: ../lib/network/connection/cellular_card.pm:140
 #, c-format
 msgid "PIN number (4 digits). Leave empty if PIN is not required."
 msgstr "PIN 号码(4位)。如果不需要的话，请留空。"
 
-#: ../lib/network/connection/cellular_card.pm:186
+#: ../lib/network/connection/cellular_card.pm:216
 #, c-format
 msgid "Unable to open device %s"
 msgstr "无法打开设备 %s"
 
-#: ../lib/network/connection/cellular_card.pm:218
+#: ../lib/network/connection/cellular_card.pm:248
 #, c-format
 msgid "Please check that your SIM card is inserted."
 msgstr "请检查您的 SIM 卡是否已经插入。"
 
-#: ../lib/network/connection/cellular_card.pm:229
+#: ../lib/network/connection/cellular_card.pm:259
 #, c-format
 msgid ""
 "You entered a wrong PIN code.\n"
@@ -2627,7 +2625,7 @@ msgstr "虚拟网卡"
 msgid "Unable to find network interface for selected device (using %s driver)."
 msgstr "找不到选中设备(使用 %s 驱动程序)的网络网卡。"
 
-#: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:207
+#: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
 msgid "Manual configuration"
 msgstr "手工配置"
@@ -2637,12 +2635,12 @@ msgstr "手工配置"
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "自动 IP(BOOTP/DHCP)"
 
-#: ../lib/network/connection/ethernet.pm:129
+#: ../lib/network/connection/ethernet.pm:132
 #, c-format
 msgid "IP settings"
 msgstr "IP 设置"
 
-#: ../lib/network/connection/ethernet.pm:142
+#: ../lib/network/connection/ethernet.pm:145
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -2653,78 +2651,78 @@ msgstr ""
 "下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
 "(例如, 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:146 ../lib/network/netconnect.pm:665
-#: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
+#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "网关"
 
-#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/connection/ethernet.pm:152
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "从 DHCP 获取 DNS 服务器"
 
-#: ../lib/network/connection/ethernet.pm:151
+#: ../lib/network/connection/ethernet.pm:154
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS 服务器 1"
 
-#: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/connection/ethernet.pm:155
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS 服务器 2"
 
-#: ../lib/network/connection/ethernet.pm:153
+#: ../lib/network/connection/ethernet.pm:156
 #, c-format
 msgid "Search domain"
 msgstr "搜索网域"
 
-#: ../lib/network/connection/ethernet.pm:154
+#: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "默认情况下, 搜索域名将会根据完全限定的主机名进行设定"
 
-#: ../lib/network/connection/ethernet.pm:157
+#: ../lib/network/connection/ethernet.pm:160
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP 超时(秒)"
 
-#: ../lib/network/connection/ethernet.pm:158
+#: ../lib/network/connection/ethernet.pm:161
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "从 DHCP 获取 YP 服务器"
 
-#: ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/connection/ethernet.pm:162
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "从 DHCP 获取 NTPD 服务器"
 
-#: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/connection/ethernet.pm:163
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主机名"
 
-#: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/connection/ethernet.pm:165
 #, c-format
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "默认值不依据 Zeroconf (169.254.0.0 网络)"
 
-#: ../lib/network/connection/ethernet.pm:173
+#: ../lib/network/connection/ethernet.pm:176
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 地址的格式应该是 1.2.3.4"
 
-#: ../lib/network/connection/ethernet.pm:178
+#: ../lib/network/connection/ethernet.pm:181
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "子网掩码的格式应该是 255.255.224.0"
 
-#: ../lib/network/connection/ethernet.pm:183
+#: ../lib/network/connection/ethernet.pm:186
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IP 地址 %s 通常是被保留的！"
 
-#: ../lib/network/connection/ethernet.pm:192
+#: ../lib/network/connection/ethernet.pm:195
 #, c-format
 msgid ""
 "%s is already used by a connection that starts on boot (%s). To use this "
@@ -2734,12 +2732,12 @@ msgstr ""
 "%s 已经被启动时的连接所占用(%s)。要在此连接中使用此地址，首先应禁用该连接上的"
 "其它服务，或者将这些服务配置为启动时不要启动"
 
-#: ../lib/network/connection/ethernet.pm:219
+#: ../lib/network/connection/ethernet.pm:222
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "从 DHCP 地址指定主机名(或者生成唯一的主机名)"
 
-#: ../lib/network/connection/ethernet.pm:220
+#: ../lib/network/connection/ethernet.pm:223
 #, c-format
 msgid ""
 "This will allow the server to attribute a name for this machine. If the "
@@ -2749,7 +2747,7 @@ msgstr ""
 "这将允许服务器为此计算机指定名称。如果服务器不提供有效的主机名的话，系统将会"
 "自动生成一个主机名。"
 
-#: ../lib/network/connection/ethernet.pm:223
+#: ../lib/network/connection/ethernet.pm:226
 #, c-format
 msgid ""
 "You should define a hostname for this machine, which will identify this PC. "
@@ -2759,32 +2757,32 @@ msgstr ""
 "您应该为此计算机定义一个主机名，以便标识这台计算机。请注意，此主机名将会在所"
 "有网络连接中共享。如果留空的话，将会使用“localhost.localdomain”。"
 
-#: ../lib/network/connection/ethernet.pm:241
+#: ../lib/network/connection/ethernet.pm:244
 #, c-format
 msgid "Network Hotplugging"
 msgstr "网络热插拔"
 
-#: ../lib/network/connection/ethernet.pm:245
+#: ../lib/network/connection/ethernet.pm:248
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "启用 IPv6 到 IPv4 的隧道"
 
-#: ../lib/network/connection/ethernet.pm:301
+#: ../lib/network/connection/ethernet.pm:304
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "网卡 %s 监测到了链接信号"
 
-#: ../lib/network/connection/ethernet.pm:304
+#: ../lib/network/connection/ethernet.pm:307
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "正在通过网卡 %s 请求网络地址(%s 协议)..."
 
-#: ../lib/network/connection/ethernet.pm:305
+#: ../lib/network/connection/ethernet.pm:308
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "通过网卡 %s 获得了网络地址(%s 协议)"
 
-#: ../lib/network/connection/ethernet.pm:306
+#: ../lib/network/connection/ethernet.pm:309
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr "通过网卡 %s 获得网络地址失败(%s 协议)"
@@ -4007,90 +4005,90 @@ msgstr "WPA/WPA2 预共享密钥"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 企业"
 
-#: ../lib/network/connection/wireless.pm:269
+#: ../lib/network/connection/wireless.pm:281
 #, c-format
 msgid "Windows driver"
 msgstr "Window 驱动程序"
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:369
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "您的无线网卡已经禁用，请先启用无线开关。"
 
-#: ../lib/network/connection/wireless.pm:456
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "Wireless settings"
 msgstr "无线设置"
 
-#: ../lib/network/connection/wireless.pm:461
+#: ../lib/network/connection/wireless.pm:464
 #: ../lib/network/connection_manager.pm:280
 #, c-format
 msgid "Operating Mode"
 msgstr "操作模式"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Managed"
 msgstr "受控的"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Repeater"
 msgstr "转发器"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: ../lib/network/connection/wireless.pm:462
+#: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Auto"
 msgstr "自动"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:468
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "网络名称(ESSID)"
 
-#: ../lib/network/connection/wireless.pm:467
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:469
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Hide password"
 msgstr "隐藏密码"
 
-#: ../lib/network/connection/wireless.pm:474
+#: ../lib/network/connection/wireless.pm:477
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "将此密钥强制使用为 ASCII 字符串(如 Livebox)"
 
-#: ../lib/network/connection/wireless.pm:481
+#: ../lib/network/connection/wireless.pm:484
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP 登录/用户名"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:486
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4101,12 +4099,12 @@ msgstr ""
 "用以下格式\n"
 "  域\\用户名"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:489
 #, c-format
 msgid "EAP Password"
 msgstr "EAP 密码"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:492
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4138,12 +4136,12 @@ msgstr ""
 "模式。\n"
 "  TLS 模式完全基于证书，可能在此指定的用户名和密码无效。"
 
-#: ../lib/network/connection/wireless.pm:503
+#: ../lib/network/connection/wireless.pm:506
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP 客户证书"
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:508
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4155,32 +4153,32 @@ msgstr ""
 "证书可视为用户名/密码组合的代替品。\n"
 " 注意: 其它相关设置显示于高级页面中。"
 
-#: ../lib/network/connection/wireless.pm:509
+#: ../lib/network/connection/wireless.pm:512
 #, c-format
 msgid "Network ID"
 msgstr "网络 ID"
 
-#: ../lib/network/connection/wireless.pm:510
+#: ../lib/network/connection/wireless.pm:513
 #, c-format
 msgid "Operating frequency"
 msgstr "运行频率"
 
-#: ../lib/network/connection/wireless.pm:511
+#: ../lib/network/connection/wireless.pm:514
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "灵敏度阀值"
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:515
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "比特率(每秒比特数, b/s)"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:517
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4199,17 +4197,17 @@ msgstr ""
 "包\n"
 "的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
 
-#: ../lib/network/connection/wireless.pm:521
+#: ../lib/network/connection/wireless.pm:524
 #, c-format
 msgid "Fragmentation"
 msgstr "块"
 
-#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/connection/wireless.pm:525
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/connection/wireless.pm:526
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4225,12 +4223,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:530
+#: ../lib/network/connection/wireless.pm:533
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:531
+#: ../lib/network/connection/wireless.pm:534
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4248,12 +4246,12 @@ msgstr ""
 "\n"
 "请参看 iwpspy(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:541
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4282,95 +4280,95 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP 协议"
 
-#: ../lib/network/connection/wireless.pm:553
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "Auto Detect"
 msgstr "自动检测"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:556
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:553
+#: ../lib/network/connection/wireless.pm:556
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:558
 #, 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:557
+#: ../lib/network/connection/wireless.pm:560
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP 模式"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:561
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:563
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:562
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4380,12 +4378,12 @@ msgstr ""
 "可能的值包括 WPA-EAP、\n"
 "IEEE8021X、无"
 
-#: ../lib/network/connection/wireless.pm:564
+#: ../lib/network/connection/wireless.pm:567
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP 外部身份"
 
-#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:569
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4395,12 +4393,12 @@ msgstr ""
 "EAP 的匿名身份字符串: 用于支持不同的隧道身份的 EAP 不\n"
 "加密身份类型，如 TTLS"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:572
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:571
+#: ../lib/network/connection/wireless.pm:574
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4409,12 +4407,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:575
+#: ../lib/network/connection/wireless.pm:578
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 证书"
 
-#: ../lib/network/connection/wireless.pm:577
+#: ../lib/network/connection/wireless.pm:580
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4428,12 +4426,12 @@ msgstr ""
 "如果可能的话，当使用 TLS 或 TTLS 或 PEAP 时总是应该配置可信的\n"
 "CA 证书。"
 
-#: ../lib/network/connection/wireless.pm:582
+#: ../lib/network/connection/wireless.pm:585
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP 证书主题匹配"
 
-#: ../lib/network/connection/wireless.pm:584
+#: ../lib/network/connection/wireless.pm:587
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4443,12 +4441,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:589
+#: ../lib/network/connection/wireless.pm:592
 #, c-format
 msgid "Extra directives"
 msgstr "额外指令"
 
-#: ../lib/network/connection/wireless.pm:590
+#: ../lib/network/connection/wireless.pm:593
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4466,26 +4464,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:610
+#: ../lib/network/connection/wireless.pm:613
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要加密密钥。"
 
-#: ../lib/network/connection/wireless.pm:617
+#: ../lib/network/connection/wireless.pm:620
 #, 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:623
+#: ../lib/network/connection/wireless.pm:626
 #, 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:630
+#: ../lib/network/connection/wireless.pm:633
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4494,24 +4492,24 @@ msgstr ""
 "频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
 "的“0”(零)。"
 
-#: ../lib/network/connection/wireless.pm:636
+#: ../lib/network/connection/wireless.pm:639
 #, 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:648
+#: ../lib/network/connection/wireless.pm:651
 #, c-format
 msgid "Allow access point roaming"
 msgstr "允许访问点漫游"
 
-#: ../lib/network/connection/wireless.pm:773
+#: ../lib/network/connection/wireless.pm:776
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "将无线网络“%s”关联到网卡 %s 上"
 
-#: ../lib/network/connection/wireless.pm:774
+#: ../lib/network/connection/wireless.pm:777
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "网卡 %s 丢失了到无线网络的关联"
@@ -4612,8 +4610,7 @@ msgid "Please enter settings for network"
 msgstr "请输入网络设置"
 
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:479
-#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:100
+#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:100
 #, c-format
 msgid "Connection failed."
 msgstr "连接失败。"
@@ -4638,22 +4635,22 @@ msgstr "信号强度"
 msgid "Encryption"
 msgstr "加密"
 
-#: ../lib/network/connection_manager.pm:351 ../lib/network/netconnect.pm:208
+#: ../lib/network/connection_manager.pm:353 ../lib/network/netconnect.pm:208
 #, c-format
 msgid "Scanning for networks..."
 msgstr "正在扫描网络..."
 
-#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:91
+#: ../lib/network/connection_manager.pm:402 ../lib/network/drakroam.pm:91
 #, c-format
 msgid "Disconnect"
 msgstr "断开连接"
 
-#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:90
+#: ../lib/network/connection_manager.pm:402 ../lib/network/drakroam.pm:90
 #, c-format
 msgid "Connect"
 msgstr "连接"
 
-#: ../lib/network/connection_manager.pm:445
+#: ../lib/network/connection_manager.pm:447
 #, c-format
 msgid "Hostname changed to \"%s\""
 msgstr "主机名更改为“%s”"
@@ -4758,7 +4755,7 @@ msgstr "Windows Mobile 设备同步"
 msgid "Port scan detection"
 msgstr "端口扫描检测"
 
-#: ../lib/network/drakfirewall.pm:224 ../lib/network/drakfirewall.pm:230
+#: ../lib/network/drakfirewall.pm:224 ../lib/network/drakfirewall.pm:228
 #: ../lib/network/shorewall.pm:75
 #, c-format
 msgid "Firewall configuration"
@@ -4769,17 +4766,10 @@ msgstr "防火墙配置"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mageia machine.\n"
-"For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mageia Security Firewall distribution."
+"This configures a personal firewall for this Mageia machine."
 msgstr ""
-"“Drak 防火墙”配置\n"
-"\n"
-"此程序可为您的 Mageia 机器配置个人防火墙。\n"
-"如果要配置强大的专用防火墙, 请考虑使用专门的\n"
-"Mageia Security 防火墙发行版。"
 
-#: ../lib/network/drakfirewall.pm:230
+#: ../lib/network/drakfirewall.pm:228
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -4791,13 +4781,13 @@ msgstr ""
 "\n"
 "请确定您在继续任何操作前已经用“Drak 连接”配置了您的局域网/Internet 访问。"
 
-#: ../lib/network/drakfirewall.pm:247 ../lib/network/drakfirewall.pm:249
+#: ../lib/network/drakfirewall.pm:245 ../lib/network/drakfirewall.pm:247
 #: ../lib/network/shorewall.pm:167
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: ../lib/network/drakfirewall.pm:250
+#: ../lib/network/drakfirewall.pm:248
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -4808,7 +4798,7 @@ msgstr ""
 "例如, 可以这样: 139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
 "请参考 /etc/services 文件。"
 
-#: ../lib/network/drakfirewall.pm:256
+#: ../lib/network/drakfirewall.pm:254
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -4823,33 +4813,33 @@ msgstr ""
 "\n"
 "您也可以给出端口范围(如: 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:266
+#: ../lib/network/drakfirewall.pm:264
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "您想要本机上开放哪些服务?"
 
-#: ../lib/network/drakfirewall.pm:267 ../lib/network/netconnect.pm:127
-#: ../lib/network/network.pm:540
+#: ../lib/network/drakfirewall.pm:265 ../lib/network/netconnect.pm:127
+#: ../lib/network/network.pm:549
 #, c-format
 msgid "Those settings will be saved for the network profile <b>%s</b>"
 msgstr "这些设置将会保存在网络配置文件 <b>%s</b> 中"
 
-#: ../lib/network/drakfirewall.pm:268
+#: ../lib/network/drakfirewall.pm:266
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "全部(无防火墙)"
 
-#: ../lib/network/drakfirewall.pm:270
+#: ../lib/network/drakfirewall.pm:268
 #, c-format
 msgid "Other ports"
 msgstr "其它端口"
 
-#: ../lib/network/drakfirewall.pm:271
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "在系统日志中记录防火墙消息"
 
-#: ../lib/network/drakfirewall.pm:313
+#: ../lib/network/drakfirewall.pm:311
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -4859,7 +4849,7 @@ msgstr ""
 "您可以选择在有人访问本机上的服务或试图入侵您的计算机时得到警报。\n"
 "请选择应监视何种网络活动。"
 
-#: ../lib/network/drakfirewall.pm:318
+#: ../lib/network/drakfirewall.pm:316
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "使用交互式防火墙"
@@ -5773,12 +5763,12 @@ msgstr ""
 "发生了意外错误: \n"
 "%s"
 
-#: ../lib/network/network.pm:514
+#: ../lib/network/network.pm:523
 #, c-format
 msgid "Advanced network settings"
 msgstr "高级网络设置"
 
-#: ../lib/network/network.pm:515
+#: ../lib/network/network.pm:524
 #, c-format
 msgid ""
 "Here you can configure advanced network settings. Please note that you have "
@@ -5786,104 +5776,104 @@ msgid ""
 msgstr ""
 "您可以在此配置高级网络设置。请注意，您需要重新启动计算机才能让更改生效。"
 
-#: ../lib/network/network.pm:517
+#: ../lib/network/network.pm:526
 #, c-format
 msgid "Wireless regulatory domain"
 msgstr "无线受限域"
 
-#: ../lib/network/network.pm:518
+#: ../lib/network/network.pm:527
 #, c-format
 msgid "TCP/IP settings"
 msgstr "TCP/IP 设置"
 
-#: ../lib/network/network.pm:519
+#: ../lib/network/network.pm:528
 #, c-format
 msgid "Disable IPv6"
 msgstr "禁用 Ipv6"
 
-#: ../lib/network/network.pm:520
+#: ../lib/network/network.pm:529
 #, c-format
 msgid "Disable TCP Window Scaling"
 msgstr "禁用 TCP 窗口范围"
 
-#: ../lib/network/network.pm:521
+#: ../lib/network/network.pm:530
 #, c-format
 msgid "Disable TCP Timestamps"
 msgstr "禁用 TCP 时间戳"
 
-#: ../lib/network/network.pm:522
+#: ../lib/network/network.pm:531
 #, c-format
 msgid "Security settings (defined by MSEC policy)"
 msgstr "安全设置(由 MSEC 策略定义)"
 
-#: ../lib/network/network.pm:523
+#: ../lib/network/network.pm:532
 #, c-format
 msgid "Disable ICMP echo"
 msgstr "禁用 ICMP 响应"
 
-#: ../lib/network/network.pm:524
+#: ../lib/network/network.pm:533
 #, c-format
 msgid "Disable ICMP echo for broadcasting messages"
 msgstr "禁用广播消息的 ICMP 响应"
 
-#: ../lib/network/network.pm:525
+#: ../lib/network/network.pm:534
 #, c-format
 msgid "Disable invalid ICMP error responses"
 msgstr "禁用无效的 ICMP 错误响应"
 
-#: ../lib/network/network.pm:526
+#: ../lib/network/network.pm:535
 #, c-format
 msgid "Log strange packets"
 msgstr "记录奇怪的数据包"
 
-#: ../lib/network/network.pm:539
+#: ../lib/network/network.pm:548
 #, c-format
 msgid "Proxies configuration"
 msgstr "代理服务器配置"
 
-#: ../lib/network/network.pm:540
+#: ../lib/network/network.pm:549
 #, 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:541
+#: ../lib/network/network.pm:550
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理服务器"
 
-#: ../lib/network/network.pm:542
+#: ../lib/network/network.pm:551
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "HTTPS 连接也使用 HTTP 代理"
 
-#: ../lib/network/network.pm:543
+#: ../lib/network/network.pm:552
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS 代理服务器"
 
-#: ../lib/network/network.pm:544
+#: ../lib/network/network.pm:553
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理服务器"
 
-#: ../lib/network/network.pm:545
+#: ../lib/network/network.pm:554
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "以下地址不使用代理(用逗号分隔):"
 
-#: ../lib/network/network.pm:550
+#: ../lib/network/network.pm:559
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理服务器应该是 http://..."
 
-#: ../lib/network/network.pm:551
+#: ../lib/network/network.pm:560
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "代理应该是 http://... 或 https://..."
 
-#: ../lib/network/network.pm:552
+#: ../lib/network/network.pm:561
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 应该是以“ftp:”或“http:”开头"
@@ -5947,12 +5937,12 @@ msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr "这些包可以在 %s 中找到，或者在 %s 的官方软件包仓库中找到。"
 
-#: ../lib/network/thirdparty.pm:154
+#: ../lib/network/thirdparty.pm:152
 #, c-format
 msgid "The following component is missing: %s"
 msgstr "缺少下列组件：%s"
 
-#: ../lib/network/thirdparty.pm:156
+#: ../lib/network/thirdparty.pm:154
 #, c-format
 msgid ""
 "The required files can also be installed from this URL:\n"
@@ -5961,47 +5951,47 @@ msgstr ""
 "所需的文件也可从以下 URL 安装:\n"
 "%s"
 
-#: ../lib/network/thirdparty.pm:192
+#: ../lib/network/thirdparty.pm:190
 #, c-format
 msgid "Firmware files are required for this device."
 msgstr "此设备需要固件文件。"
 
-#: ../lib/network/thirdparty.pm:195 ../lib/network/thirdparty.pm:200
+#: ../lib/network/thirdparty.pm:193 ../lib/network/thirdparty.pm:198
 #, c-format
 msgid "Use a floppy"
 msgstr "使用软盘"
 
-#: ../lib/network/thirdparty.pm:196 ../lib/network/thirdparty.pm:203
+#: ../lib/network/thirdparty.pm:194 ../lib/network/thirdparty.pm:201
 #, c-format
 msgid "Use my Windows partition"
 msgstr "使用我的 Windows 分区"
 
-#: ../lib/network/thirdparty.pm:197
+#: ../lib/network/thirdparty.pm:195
 #, c-format
 msgid "Select file"
 msgstr "选择文件"
 
-#: ../lib/network/thirdparty.pm:208
+#: ../lib/network/thirdparty.pm:206
 #, c-format
 msgid "Please select the firmware file (for example: %s)"
 msgstr "请选择固件文件(如：%s)"
 
-#: ../lib/network/thirdparty.pm:232
+#: ../lib/network/thirdparty.pm:230
 #, c-format
 msgid "Unable to find \"%s\" on your Windows system!"
 msgstr "在 Windows 系统中找不到“%s”!"
 
-#: ../lib/network/thirdparty.pm:234
+#: ../lib/network/thirdparty.pm:232
 #, c-format
 msgid "No Windows system has been detected!"
 msgstr "未检测到 Windows 系统!"
 
-#: ../lib/network/thirdparty.pm:244
+#: ../lib/network/thirdparty.pm:242
 #, c-format
 msgid "Insert floppy"
 msgstr "插入软盘"
 
-#: ../lib/network/thirdparty.pm:245
+#: ../lib/network/thirdparty.pm:243
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -6010,128 +6000,128 @@ msgstr ""
 "请在驱动器 %s 中插入一张 FAT 格式的软盘, 该软盘要求在根目录有 %s。然后, 请按 "
 "%s"
 
-#: ../lib/network/thirdparty.pm:245
+#: ../lib/network/thirdparty.pm:243
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../lib/network/thirdparty.pm:255
+#: ../lib/network/thirdparty.pm:253
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "软驱访问错误, 无法挂载 %s"
 
-#: ../lib/network/thirdparty.pm:354
+#: ../lib/network/thirdparty.pm:352
 #, c-format
 msgid "Looking for required software and drivers..."
 msgstr "正在查找所需的软件或驱动程序..."
 
-#: ../lib/network/thirdparty.pm:369
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait, running device configuration commands..."
 msgstr "请稍候, 正在运行设备配置命令..."
 
-#: ../lib/network/vpn/openvpn.pm:107
+#: ../lib/network/vpn/openvpn.pm:109
 #, c-format
 msgid "X509 Public Key Infrastructure"
 msgstr "X509 公钥架构"
 
-#: ../lib/network/vpn/openvpn.pm:108
+#: ../lib/network/vpn/openvpn.pm:110
 #, c-format
 msgid "Static Key"
 msgstr "静态密钥"
 
 #. -PO: please don't translate the CA acronym
-#: ../lib/network/vpn/openvpn.pm:142
+#: ../lib/network/vpn/openvpn.pm:144
 #, c-format
 msgid "Certificate Authority (CA)"
 msgstr "证书颁发机构(CA)"
 
-#: ../lib/network/vpn/openvpn.pm:148
+#: ../lib/network/vpn/openvpn.pm:150
 #, c-format
 msgid "Certificate"
 msgstr "证书"
 
-#: ../lib/network/vpn/openvpn.pm:154
+#: ../lib/network/vpn/openvpn.pm:156
 #, c-format
 msgid "Key"
 msgstr "密钥"
 
-#: ../lib/network/vpn/openvpn.pm:160
+#: ../lib/network/vpn/openvpn.pm:162
 #, c-format
 msgid "TLS control channel key"
 msgstr "TLS 控制频道密钥"
 
-#: ../lib/network/vpn/openvpn.pm:167
+#: ../lib/network/vpn/openvpn.pm:169
 #, c-format
 msgid "Key direction"
 msgstr "密钥方向"
 
-#: ../lib/network/vpn/openvpn.pm:175
+#: ../lib/network/vpn/openvpn.pm:177
 #, c-format
 msgid "Authenticate using username and password"
 msgstr "使用用户名和密码进行身份验证"
 
-#: ../lib/network/vpn/openvpn.pm:181
+#: ../lib/network/vpn/openvpn.pm:183
 #, c-format
 msgid "Check server certificate"
 msgstr "检查服务器证书"
 
-#: ../lib/network/vpn/openvpn.pm:187
+#: ../lib/network/vpn/openvpn.pm:189
 #, c-format
 msgid "Cipher algorithm"
 msgstr "加密算法"
 
-#: ../lib/network/vpn/openvpn.pm:191
+#: ../lib/network/vpn/openvpn.pm:193
 #, c-format
 msgid "Default"
 msgstr "默认"
 
-#: ../lib/network/vpn/openvpn.pm:195
+#: ../lib/network/vpn/openvpn.pm:197
 #, c-format
 msgid "Size of cipher key"
 msgstr "加密密钥的大小"
 
-#: ../lib/network/vpn/openvpn.pm:206
+#: ../lib/network/vpn/openvpn.pm:208
 #, c-format
 msgid "Get from server"
 msgstr "从服务器获得"
 
-#: ../lib/network/vpn/openvpn.pm:216
+#: ../lib/network/vpn/openvpn.pm:218
 #, c-format
 msgid "Gateway port"
 msgstr "网关端口"
 
-#: ../lib/network/vpn/openvpn.pm:232
+#: ../lib/network/vpn/openvpn.pm:234
 #, c-format
 msgid "Remote IP address"
 msgstr "远程 IP 地址"
 
-#: ../lib/network/vpn/openvpn.pm:237
+#: ../lib/network/vpn/openvpn.pm:239
 #, c-format
 msgid "Use TCP protocol"
 msgstr "使用 TCP 协议"
 
-#: ../lib/network/vpn/openvpn.pm:243
+#: ../lib/network/vpn/openvpn.pm:245
 #, c-format
 msgid "Virtual network device type"
 msgstr "虚拟网络设备类型"
 
-#: ../lib/network/vpn/openvpn.pm:250
+#: ../lib/network/vpn/openvpn.pm:252
 #, c-format
 msgid "Virtual network device number (optional)"
 msgstr "虚拟网络设备编号(可选)"
 
-#: ../lib/network/vpn/openvpn.pm:365
+#: ../lib/network/vpn/openvpn.pm:367
 #, c-format
 msgid "Starting connection.."
 msgstr "启动连接.."
 
-#: ../lib/network/vpn/openvpn.pm:380
+#: ../lib/network/vpn/openvpn.pm:382
 #, c-format
 msgid "Please insert your token"
 msgstr "请插入您的令牌"
 
-#: ../lib/network/vpn/openvpn.pm:391
+#: ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "PIN number"
 msgstr "PIN 号码"
@@ -6165,3 +6155,19 @@ msgstr "NAT 模式"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "使用指定的 UDP 端口"
+
+#~ msgid "Same IP is already in %s file."
+#~ msgstr "%s 文件中已经有同样的 IP 了。"
+
+#~ msgid ""
+#~ "drakfirewall configurator\n"
+#~ "\n"
+#~ "This configures a personal firewall for this Mageia machine.\n"
+#~ "For a powerful and dedicated firewall solution, please look to the\n"
+#~ "specialized Mageia Security Firewall distribution."
+#~ msgstr ""
+#~ "“Drak 防火墙”配置\n"
+#~ "\n"
+#~ "此程序可为您的 Mageia 机器配置个人防火墙。\n"
+#~ "如果要配置强大的专用防火墙, 请考虑使用专门的\n"
+#~ "Mageia Security 防火墙发行版。"