sync with code

1 files changed, 128 insertions, 114 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 39e97fb..0a957e5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\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-30 11:20+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
@@ -104,7 +104,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
@@ -442,29 +442,29 @@ msgstr "Proxy 連線埠"
 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"
@@ -476,17 +476,17 @@ msgstr ""
 "現在您可以藉由自動網路設定 (DHCP) 及 Transparent Proxy Cache server (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 "
@@ -495,12 +495,12 @@ msgstr ""
 "警告! 偵測到現有已經存在的防火牆組態設定.\n"
 "您應該在安裝之後手動修正某些設定."
 
-#: ../bin/drakgw:379
+#: ../bin/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "設定中..."
 
-#: ../bin/drakgw:380
+#: ../bin/drakgw:365
 #, c-format
 msgid "Configuring firewall..."
 msgstr "正在設定防火牆..."
@@ -634,8 +634,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 "互動式防火牆"
@@ -1728,8 +1728,7 @@ msgstr "Samba 伺服器設定精靈"
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
-msgstr ""
-"Samba 允許您的伺服器為非 Linux 系統的工作站提供檔案與列印伺服功能。"
+msgstr "Samba 允許您的伺服器為非 Linux 系統的工作站提供檔案與列印伺服功能。"
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1741,15 +1740,13 @@ msgstr "PDC 伺服器：網域主控者"
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
-msgstr ""
-"設定為 PDC 的伺服器將負責此網域的 Windows 認證。"
+msgstr "設定為 PDC 的伺服器將負責此網域的 Windows 認證。"
 
 #: ../bin/draksambashare:1073
 #, c-format
 msgid ""
 "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr ""
-"單一伺服器安裝可以使用 smbpasswd 或 tdbsam 的密碼後端"
+msgstr "單一伺服器安裝可以使用 smbpasswd 或 tdbsam 的密碼後端"
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1858,8 +1855,7 @@ msgstr "伺服器標語。"
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr ""
-"此標語是在 Windows 工作站中描述這台伺服器的方式。"
+msgstr "此標語是在 Windows 工作站中描述這台伺服器的方式。"
 
 #: ../bin/draksambashare:1143
 #, c-format
@@ -1881,8 +1877,7 @@ msgstr "Samba 紀錄"
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
-msgstr ""
-"記錄檔：使用 file.%m 來為每台連線的機器使用不同的記錄檔"
+msgstr "記錄檔：使用 file.%m 來為每台連線的機器使用不同的記錄檔"
 
 #: ../bin/draksambashare:1154
 #, c-format
@@ -1928,8 +1923,8 @@ msgid ""
 "If you have previously create some shares, they will appear in this "
 "configuration. Run 'drakwizard sambashare' to manage your shares."
 msgstr ""
-"如果您之前已經建立了一些共享，它們會出現在此設定中。執行 'drakwizard sambashare' "
-"來管理您的共享"
+"如果您之前已經建立了一些共享，它們會出現在此設定中。執行 'drakwizard "
+"sambashare' 來管理您的共享"
 
 #: ../bin/draksambashare:1173
 #, c-format
@@ -3362,7 +3357,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"
@@ -4044,100 +4039,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 "WPA/WPA2 Pre-Shared Key"
 
-#: ../lib/network/connection/wireless.pm:44
+#: ../lib/network/connection/wireless.pm:46
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../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 "您的無線網路卡是停用的，請先啟用無線網路 switch (RF kill switch)。"
 
-#: ../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"
@@ -4145,12 +4145,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"
@@ -4169,12 +4169,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"
@@ -4183,32 +4183,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 "
@@ -4222,17 +4222,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../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 "iwfonfig 指令的其他參數"
 
-#: ../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"
@@ -4243,12 +4243,12 @@ msgid ""
 msgstr ""
 
 #. -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"
@@ -4260,12 +4260,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../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 "
@@ -4283,107 +4283,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -4391,12 +4391,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"
@@ -4405,12 +4405,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"
@@ -4420,12 +4420,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"
@@ -4435,12 +4435,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"
@@ -4458,12 +4458,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 "
@@ -4472,7 +4486,7 @@ 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 "
@@ -4481,17 +4495,17 @@ 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 "已透過網路界面 %2$s 連結到無線網路 \"%1$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 到無線網路的連結"
@@ -4689,13 +4703,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"
@@ -4710,7 +4724,7 @@ msgstr ""
 "若您需要強大而專門的防火牆解決方案，請參考專門的 Mandriva Security\n"
 "Firewall 產品。"
 
-#: ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:175
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -4722,18 +4736,18 @@ msgstr ""
 "\n"
 "請確定在繼續之前您已經使用 drakconnect 來設定過網路/網際網路連線。"
 
-#: ../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"
@@ -4744,7 +4758,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"
@@ -4759,22 +4773,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 "
@@ -4784,7 +4798,7 @@ msgstr ""
 "您可以在有人連接到某項服務或試圖侵入您的電腦時收到警告。\n"
 "請選擇要監控的網路活動項目。"
 
-#: ../lib/network/drakfirewall.pm:266
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "使用互動式防火牆"
@@ -5734,17 +5748,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"