sync with code

1 files changed, 125 insertions, 105 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6a5476e..c722b5f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
-"POT-Creation-Date: 2008-03-17 15:16+0100\n"
+"POT-Creation-Date: 2008-04-02 16:11+0200\n"
 "PO-Revision-Date: 2008-03-31 23:15+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -86,7 +86,7 @@ msgstr "取消"
 msgid "Ok"
 msgstr "确定"
 
-#: ../bin/drakconnect-old:113 ../bin/drakgw:359 ../bin/draksambashare:228
+#: ../bin/drakconnect-old:113 ../bin/drakgw:344 ../bin/draksambashare:228
 #: ../bin/drakvpn-old:97 ../bin/drakvpn-old:127
 #: ../lib/network/connection_manager.pm:82
 #: ../lib/network/connection_manager.pm:186
@@ -426,29 +426,29 @@ msgstr "代理端口"
 msgid "Cache size (MB)"
 msgstr "缓存大小(MB)"
 
-#: ../bin/drakgw:296
+#: ../bin/drakgw:292
 #, c-format
 msgid "Broadcast printer information"
 msgstr "广播打印机信息"
 
-#: ../bin/drakgw:307
+#: ../bin/drakgw:303
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
 msgstr "您的系统里没有配置以太网卡。请运行硬件配置工具。"
 
-#: ../bin/drakgw:313
+#: ../bin/drakgw:309
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Internet 连接共享现已启用。"
 
-#: ../bin/drakgw:319
+#: ../bin/drakgw:315
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Internet 连接共享现已禁用。"
 
-#: ../bin/drakgw:325
+#: ../bin/drakgw:321
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -460,29 +460,29 @@ msgstr ""
 "您现在可以利用自动网络设置(DHCP)和透明代理缓存服务器(SQUID)让您的局域网上其它"
 "的电脑共享您的互联网连接了。"
 
-#: ../bin/drakgw:359
+#: ../bin/drakgw:344
 #, c-format
 msgid "Disabling servers..."
 msgstr "正在禁用服务器..."
 
-#: ../bin/drakgw:373
+#: ../bin/drakgw:358
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "发现防火墙配置！"
 
-#: ../bin/drakgw:374
+#: ../bin/drakgw:359
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr "警告！发现原来的配置利用了防火墙功能。您可能需要在安装之后手工修改。"
 
-#: ../bin/drakgw:379
+#: ../bin/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "正在配置..."
 
-#: ../bin/drakgw:380
+#: ../bin/drakgw:365
 #, c-format
 msgid "Configuring firewall..."
 msgstr "正在配置防火墙..."
@@ -616,8 +616,8 @@ msgstr "允许的地址"
 #: ../bin/drakids:40 ../bin/drakids:68 ../bin/drakids:187 ../bin/drakids:196
 #: ../bin/drakids:221 ../bin/drakids:230 ../bin/drakids:240 ../bin/drakids:332
 #: ../bin/net_applet:76 ../bin/net_applet:239 ../bin/net_applet:515
-#: ../bin/net_applet:543 ../lib/network/drakfirewall.pm:259
-#: ../lib/network/drakfirewall.pm:263
+#: ../bin/net_applet:543 ../lib/network/drakfirewall.pm:262
+#: ../lib/network/drakfirewall.pm:266
 #, c-format
 msgid "Interactive Firewall"
 msgstr "交互式防火墙"
@@ -1780,8 +1780,8 @@ msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
 msgstr ""
-"域主浏览器 = 是，将导致服务器注册 NetBIOS 名称 <pdc 名称>。此名称可为其它服"
-"务器所识别。"
+"域主浏览器 = 是，将导致服务器注册 NetBIOS 名称 <pdc 名称>。此名称可为其它服务"
+"器所识别。"
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -2049,7 +2049,8 @@ msgid ""
 "It seems this is the first time you run this tool.\n"
 "A wizard will appear to configure a basic Samba server"
 msgstr ""
-"似乎这是您第一次运行此工具。\n向导将会协助您配置基本的 Samba 服务器"
+"似乎这是您第一次运行此工具。\n"
+"向导将会协助您配置基本的 Samba 服务器"
 
 #: ../bin/draksambashare:1457
 #, c-format
@@ -3474,7 +3475,7 @@ msgid "Address settings"
 msgstr "地址设置"
 
 #: ../lib/network/connection.pm:192 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:40 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection/wireless.pm:42 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
@@ -4156,100 +4157,105 @@ msgstr "无线"
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "使用 Windows 驱动程序(通过 ndiswrapper)"
 
-#: ../lib/network/connection/wireless.pm:41
+#: ../lib/network/connection/wireless.pm:43
 #, c-format
 msgid "Open WEP"
 msgstr "开放 WEP"
 
-#: ../lib/network/connection/wireless.pm:42
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
 msgid "Restricted WEP"
 msgstr "限制 WEP"
 
-#: ../lib/network/connection/wireless.pm:43
+#: ../lib/network/connection/wireless.pm:45
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:44
+#: ../lib/network/connection/wireless.pm:46
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:231
+#: ../lib/network/connection/wireless.pm:234
 #, c-format
 msgid "Windows driver"
 msgstr "Windows 驱动"
 
-#: ../lib/network/connection/wireless.pm:298
+#: ../lib/network/connection/wireless.pm:301
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "您的无线网卡已经禁用，请先启用无线开关。"
 
-#: ../lib/network/connection/wireless.pm:361
+#: ../lib/network/connection/wireless.pm:366
 #, c-format
 msgid "Wireless settings"
 msgstr "无线设置"
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:371
 #: ../lib/network/connection_manager.pm:243
 #, c-format
 msgid "Operating Mode"
 msgstr "操作模式"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Managed"
 msgstr "受控的"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Repeater"
 msgstr "转发器"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Auto"
 msgstr "自动"
 
-#: ../lib/network/connection/wireless.pm:370
+#: ../lib/network/connection/wireless.pm:375
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "网络名称(ESSID)"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:377
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:374
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: ../lib/network/connection/wireless.pm:376
+#: ../lib/network/connection/wireless.pm:381
+#, c-format
+msgid "Force using this key as ASCII string (e.g. for Livebox)"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:388
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP 登录/用户名"
 
-#: ../lib/network/connection/wireless.pm:378
+#: ../lib/network/connection/wireless.pm:390
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4257,12 +4263,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:381
+#: ../lib/network/connection/wireless.pm:393
 #, c-format
 msgid "EAP Password"
 msgstr "EAP 密码"
 
-#: ../lib/network/connection/wireless.pm:383
+#: ../lib/network/connection/wireless.pm:395
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4281,12 +4287,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:397
+#: ../lib/network/connection/wireless.pm:409
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP 客户机证书"
 
-#: ../lib/network/connection/wireless.pm:399
+#: ../lib/network/connection/wireless.pm:411
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4295,32 +4301,32 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:403
+#: ../lib/network/connection/wireless.pm:415
 #, c-format
 msgid "Network ID"
 msgstr "网络 ID"
 
-#: ../lib/network/connection/wireless.pm:404
+#: ../lib/network/connection/wireless.pm:416
 #, c-format
 msgid "Operating frequency"
 msgstr "运行频率"
 
-#: ../lib/network/connection/wireless.pm:405
+#: ../lib/network/connection/wireless.pm:417
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "灵敏度阀值"
 
-#: ../lib/network/connection/wireless.pm:406
+#: ../lib/network/connection/wireless.pm:418
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "比特率(每秒比特数, b/s)"
 
-#: ../lib/network/connection/wireless.pm:407
+#: ../lib/network/connection/wireless.pm:419
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:408
+#: ../lib/network/connection/wireless.pm:420
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4339,17 +4345,17 @@ msgstr ""
 "包\n"
 "的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
 
-#: ../lib/network/connection/wireless.pm:415
+#: ../lib/network/connection/wireless.pm:427
 #, c-format
 msgid "Fragmentation"
 msgstr "块"
 
-#: ../lib/network/connection/wireless.pm:416
+#: ../lib/network/connection/wireless.pm:428
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:417
+#: ../lib/network/connection/wireless.pm:429
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4365,12 +4371,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:424
+#: ../lib/network/connection/wireless.pm:436
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:425
+#: ../lib/network/connection/wireless.pm:437
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4388,12 +4394,12 @@ msgstr ""
 "\n"
 "请参看 iwpspy(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:433
+#: ../lib/network/connection/wireless.pm:445
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:435
+#: ../lib/network/connection/wireless.pm:447
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4422,107 +4428,107 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:446
+#: ../lib/network/connection/wireless.pm:458
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP 协议"
 
-#: ../lib/network/connection/wireless.pm:447
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "Auto Detect"
 msgstr "自动检测"
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:449
+#: ../lib/network/connection/wireless.pm:461
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
 "a fallback to WPA version 1"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:451
+#: ../lib/network/connection/wireless.pm:463
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP 模式"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:454
+#: ../lib/network/connection/wireless.pm:466
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:456
+#: ../lib/network/connection/wireless.pm:468
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:458
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:460
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4530,12 +4536,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:463
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:477
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4544,12 +4550,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:469
+#: ../lib/network/connection/wireless.pm:481
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 证书"
 
-#: ../lib/network/connection/wireless.pm:471
+#: ../lib/network/connection/wireless.pm:483
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4559,12 +4565,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:476
+#: ../lib/network/connection/wireless.pm:488
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/connection/wireless.pm:490
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4574,12 +4580,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:495
 #, c-format
 msgid "EAP extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:485
+#: ../lib/network/connection/wireless.pm:497
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4597,12 +4603,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:517
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要加密密钥。"
 
-#: ../lib/network/connection/wireless.pm:511
+#: ../lib/network/connection/wireless.pm:524
+#, c-format
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:530
+#, c-format
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:537
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4611,24 +4631,24 @@ msgstr ""
 "频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
 "的“0”(零)。"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:543
 #, 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:529
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid "Allow access point roaming"
 msgstr "允许访问点漫游"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:665
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "将无线网络“%s”关联到网卡 %s 上"
 
-#: ../lib/network/connection/wireless.pm:640
+#: ../lib/network/connection/wireless.pm:666
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "网卡 %s 丢失了到无线网络的关联"
@@ -4826,13 +4846,13 @@ msgstr "BitTorrent"
 msgid "Port scan detection"
 msgstr "端口扫描检测"
 
-#: ../lib/network/drakfirewall.pm:166 ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:169 ../lib/network/drakfirewall.pm:175
 #: ../lib/network/shorewall.pm:63
 #, c-format
 msgid "Firewall configuration"
 msgstr "防火墙配置"
 
-#: ../lib/network/drakfirewall.pm:166
+#: ../lib/network/drakfirewall.pm:169
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -4847,7 +4867,7 @@ msgstr ""
 "如果要配置强大的专用防火墙, 请考虑使用专门的\n"
 "Mandriva Security 防火墙发行版。"
 
-#: ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:175
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -4859,18 +4879,18 @@ msgstr ""
 "\n"
 "请确定您在继续任何操作前已经用“Drak 连接”配置了您的局域网/Internet 访问。"
 
-#: ../lib/network/drakfirewall.pm:189
+#: ../lib/network/drakfirewall.pm:192
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "您想要本机上开放哪些服务?"
 
-#: ../lib/network/drakfirewall.pm:190 ../lib/network/drakfirewall.pm:192
-#: ../lib/network/shorewall.pm:150
+#: ../lib/network/drakfirewall.pm:193 ../lib/network/drakfirewall.pm:195
+#: ../lib/network/shorewall.pm:152
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: ../lib/network/drakfirewall.pm:193
+#: ../lib/network/drakfirewall.pm:196
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -4881,7 +4901,7 @@ msgstr ""
 "例如, 可以这样: 139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
 "请参考 /etc/services 文件。"
 
-#: ../lib/network/drakfirewall.pm:199
+#: ../lib/network/drakfirewall.pm:202
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -4896,22 +4916,22 @@ msgstr ""
 "\n"
 "您也可以给出端口范围(如: 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:209
+#: ../lib/network/drakfirewall.pm:212
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "全部(无防火墙)"
 
-#: ../lib/network/drakfirewall.pm:211
+#: ../lib/network/drakfirewall.pm:214
 #, c-format
 msgid "Other ports"
 msgstr "其它端口"
 
-#: ../lib/network/drakfirewall.pm:212
+#: ../lib/network/drakfirewall.pm:215
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "在系统日志中记录防火墙消息"
 
-#: ../lib/network/drakfirewall.pm:261
+#: ../lib/network/drakfirewall.pm:264
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -4921,7 +4941,7 @@ msgstr ""
 "您可以选择在有人访问本机上的服务或试图入侵您的计算机时得到警报。\n"
 "请选择应监视何种网络活动。"
 
-#: ../lib/network/drakfirewall.pm:266
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "使用交互式防火墙"
@@ -5868,17 +5888,17 @@ msgstr ""
 "\n"
 "应该保护哪个接口?\n"
 
-#: ../lib/network/shorewall.pm:141
+#: ../lib/network/shorewall.pm:143
 #, c-format
 msgid "Keep custom rules"
 msgstr "保留自定义规则"
 
-#: ../lib/network/shorewall.pm:142
+#: ../lib/network/shorewall.pm:144
 #, c-format
 msgid "Drop custom rules"
 msgstr "删除自定义规则"
 
-#: ../lib/network/shorewall.pm:147
+#: ../lib/network/shorewall.pm:149
 #, c-format
 msgid ""
 "Your firewall configuration has been manually edited and contains\n"