sync with code

1 files changed, 530 insertions, 416 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 123e042..b96e850 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: 2009-04-02 13:30-0300\n"
+"POT-Creation-Date: 2009-08-17 17:15+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"
@@ -40,19 +40,19 @@ msgid "Interface"
 msgstr "介面"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:134 ../lib/network/netconnect.pm:626
+#: ../lib/network/connection/ethernet.pm:138 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "IP 位址"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:470
+#: ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:456
+#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:463
 #, c-format
 msgid "Driver"
 msgstr "驅動程式"
@@ -93,15 +93,13 @@ msgid "Apply"
 msgstr "套用"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
-#: ../bin/draknetprofile:142 ../bin/draknetprofile.orig:142
-#: ../bin/net_monitor:388
+#: ../bin/draknetprofile:159 ../bin/net_monitor:388
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
-#: ../bin/drakconnect-old:265 ../bin/draknetprofile:144
-#: ../bin/draknetprofile.orig:144 ../bin/net_monitor:389
+#: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -109,12 +107,12 @@ msgstr "確定"
 #: ../bin/drakconnect-old:113 ../bin/drakgw:351 ../bin/draknfs:584
 #: ../bin/draksambashare:229 ../lib/network/connection_manager.pm:74
 #: ../lib/network/connection_manager.pm:89
-#: ../lib/network/connection_manager.pm:203
-#: ../lib/network/connection_manager.pm:232
-#: ../lib/network/connection_manager.pm:348 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:142 ../lib/network/netconnect.pm:186
+#: ../lib/network/connection_manager.pm:206
+#: ../lib/network/connection_manager.pm:235
+#: ../lib/network/connection_manager.pm:351 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:143 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
-#: ../lib/network/netconnect.pm:726 ../lib/network/thirdparty.pm:354
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:354
 #: ../lib/network/thirdparty.pm:369
 #, c-format
 msgid "Please wait"
@@ -155,7 +153,7 @@ msgid "Adapter %s: %s"
 msgstr "介面卡 %s： %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
-#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/connection/ethernet.pm:145
 #, c-format
 msgid "Netmask"
 msgstr "網路遮罩"
@@ -170,7 +168,7 @@ msgstr "通訊協定"
 msgid "Started on boot"
 msgstr "於開機時啟動"
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:152
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:156
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 用戶端"
@@ -280,8 +278,8 @@ msgstr "重新設定"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "請選取直接連結到網際網路的網路界面。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:372
-#: ../lib/network/netconnect.pm:407
+#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
+#: ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "網路裝置"
@@ -325,7 +323,7 @@ msgstr "內部網域的名稱"
 
 #: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:245
 #: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
-#: ../bin/draknetprofile:149 ../bin/draknetprofile.orig:149 ../bin/draknfs:93
+#: ../bin/draknetprofile:166 ../bin/draknetprofile:186 ../bin/draknfs:93
 #: ../bin/draknfs:282 ../bin/draknfs:429 ../bin/draknfs:431 ../bin/draknfs:434
 #: ../bin/draknfs:526 ../bin/draknfs:533 ../bin/draknfs:605 ../bin/draknfs:612
 #: ../bin/draknfs:619 ../bin/draksambashare:393 ../bin/draksambashare:400
@@ -344,16 +342,16 @@ msgstr "內部網域的名稱"
 #: ../lib/network/connection_manager.pm:68
 #: ../lib/network/connection_manager.pm:84
 #: ../lib/network/connection_manager.pm:92
-#: ../lib/network/connection_manager.pm:174
-#: ../lib/network/connection_manager.pm:178
-#: ../lib/network/connection_manager.pm:220
-#: ../lib/network/connection_manager.pm:476
-#: ../lib/network/connection_manager.pm:489 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:177
+#: ../lib/network/connection_manager.pm:181
+#: ../lib/network/connection_manager.pm:223
+#: ../lib/network/connection_manager.pm:479
+#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
 #: ../lib/network/netconnect.pm:188 ../lib/network/netconnect.pm:234
-#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:840
+#: ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:847
 #: ../lib/network/thirdparty.pm:123 ../lib/network/thirdparty.pm:141
 #: ../lib/network/thirdparty.pm:232 ../lib/network/thirdparty.pm:234
 #: ../lib/network/thirdparty.pm:255
@@ -569,7 +567,7 @@ msgstr "請輸入一個合法的 IP 位址。"
 msgid "Same IP is already in %s file."
 msgstr "在檔案 %s 中已經有了相同的 IP 位址。"
 
-#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:212
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:222
 #, c-format
 msgid "Host name"
 msgstr "主機名稱"
@@ -629,9 +627,9 @@ msgstr "移除"
 msgid "Failed to remove host."
 msgstr "移除主機失敗。"
 
-#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:183
-#: ../bin/draknetprofile.orig:183 ../bin/net_applet:189
-#: ../lib/network/drakroam.pm:93 ../lib/network/netcenter.pm:169
+#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:205
+#: ../bin/net_applet:189 ../lib/network/drakroam.pm:93
+#: ../lib/network/netcenter.pm:171
 #, c-format
 msgid "Quit"
 msgstr "離開"
@@ -644,7 +642,7 @@ msgstr "允許的位址"
 #: ../bin/drakids:40 ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:132 ../bin/net_applet:292
-#: ../lib/network/drakfirewall.pm:300 ../lib/network/drakfirewall.pm:304
+#: ../lib/network/drakfirewall.pm:312 ../lib/network/drakfirewall.pm:316
 #, c-format
 msgid "Interactive Firewall"
 msgstr "互動式防火牆"
@@ -805,7 +803,7 @@ msgstr "虛擬共享位址"
 msgid "Virtual ID"
 msgstr "虛擬 ID"
 
-#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:608
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:615
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -831,75 +829,108 @@ msgstr "同步網路介面"
 msgid "Connection mark bit"
 msgstr "連線標記位元"
 
-#: ../bin/draknetprofile:37 ../bin/draknetprofile.orig:37
+#: ../bin/draknetprofile:37
 #, c-format
 msgid "Network profiles"
 msgstr "網路設定檔"
 
-#: ../bin/draknetprofile:67 ../bin/draknetprofile.orig:67
+#: ../bin/draknetprofile:66
+#, fuzzy, c-format
+msgid "Module"
+msgstr "數據機"
+
+#: ../bin/draknetprofile:67
+#, fuzzy, c-format
+msgid "Enabled"
+msgstr "啟動"
+
+#: ../bin/draknetprofile:68
+#, fuzzy, c-format
+msgid "Description"
+msgstr "加密"
+
+#: ../bin/draknetprofile:84
 #, c-format
 msgid "Profile"
 msgstr "自訂"
 
-#: ../bin/draknetprofile:135 ../bin/draknetprofile.orig:135
+#: ../bin/draknetprofile:152
 #, c-format
 msgid "New profile..."
 msgstr "新設定檔..."
 
-#: ../bin/draknetprofile:138 ../bin/draknetprofile.orig:138
+#: ../bin/draknetprofile:155
 #, c-format
 msgid ""
-"Name of the profile to create (the new profile is created as a copy of the "
-"current one):"
-msgstr "要建立的設定檔名 (新的設定檔將建立為現在的設定檔之副本)："
+"Please specify the name of new network profile to create (e.g., work, home, "
+"roaming, ..). This new profile initially will be created with base on "
+"current settings, and you'll be able to configure your system configuration "
+"as usual afterwards."
+msgstr ""
 
-#: ../bin/draknetprofile:149 ../bin/draknetprofile.orig:149
+#: ../bin/draknetprofile:166
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "\"%s\" 設定檔已經存在！"
 
-#: ../bin/draknetprofile:165 ../bin/draknetprofile:167
-#: ../bin/draknetprofile.orig:165 ../bin/draknetprofile.orig:167
-#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
-#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:493
+#: ../bin/draknetprofile:172
+#, fuzzy, c-format
+msgid "New profile created"
+msgstr "新設定檔..."
+
+#: ../bin/draknetprofile:172
+#, c-format
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+
+#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
+#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
+#: ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../bin/draknetprofile:165 ../bin/draknetprofile.orig:165
-#, c-format
-msgid "You can not delete the default profile"
+#: ../bin/draknetprofile:183
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the default profile?"
 msgstr "您不能刪除預設設定檔"
 
-#: ../bin/draknetprofile:167 ../bin/draknetprofile.orig:167
-#, c-format
-msgid "You can not delete the current profile"
+#: ../bin/draknetprofile:186
+#, fuzzy, c-format
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
 msgstr "您無法刪除現在的設定檔"
 
-#: ../bin/draknetprofile:177 ../bin/draknetprofile.orig:177
+#: ../bin/draknetprofile:196
 #, c-format
-msgid ""
-"This tool allows to activate an existing network profile, and to manage "
-"(clone, delete) profiles."
+msgid "This tool allows to control network profiles."
 msgstr ""
-"這個工具讓您可以啟用一個現存的網路設定檔，以及管理 (複製、刪除) 設定檔。"
 
-#: ../bin/draknetprofile:177 ../bin/draknetprofile.orig:177
-#, c-format
-msgid "To modify a profile, you have to activate it first."
-msgstr "要修改設定檔之前，您必須先啟用它。"
+#: ../bin/draknetprofile:197
+#, fuzzy, c-format
+msgid "Select the netprofile modules:"
+msgstr "選取要設定的數據機："
 
-#: ../bin/draknetprofile:180 ../bin/draknetprofile.orig:180
+#: ../bin/draknetprofile:199
+#, fuzzy, c-format
+msgid "Select a network profile:"
+msgstr "選擇您的提供者："
+
+#: ../bin/draknetprofile:202
 #, c-format
 msgid "Activate"
 msgstr "啟用"
 
-#: ../bin/draknetprofile:181 ../bin/draknetprofile.orig:181
+#: ../bin/draknetprofile:203
 #, c-format
-msgid "Clone"
-msgstr "複製"
+msgid "New"
+msgstr ""
 
-#: ../bin/draknetprofile:182 ../bin/draknetprofile.orig:182
+#: ../bin/draknetprofile:204
 #, c-format
 msgid "Delete"
 msgstr "刪除"
@@ -2142,7 +2173,7 @@ msgstr "啟動的界面"
 msgid "Profiles"
 msgstr "自訂檔案"
 
-#: ../bin/net_applet:180 ../lib/network/connection.pm:228
+#: ../bin/net_applet:180 ../lib/network/connection.pm:229
 #: ../lib/network/drakvpn.pm:62 ../lib/network/vpn/openvpn.pm:365
 #: ../lib/network/vpn/openvpn.pm:379 ../lib/network/vpn/openvpn.pm:390
 #, c-format
@@ -2343,67 +2374,72 @@ msgstr "沒有設定好的網路連線設定"
 msgid "Unknown connection type"
 msgstr "不詳的連線類別"
 
-#: ../lib/network/connection.pm:161
+#: ../lib/network/connection.pm:162
 #, c-format
 msgid "Network access settings"
 msgstr "網路連結設定"
 
-#: ../lib/network/connection.pm:162
+#: ../lib/network/connection.pm:163
 #, c-format
 msgid "Access settings"
 msgstr "連結設定"
 
-#: ../lib/network/connection.pm:163
+#: ../lib/network/connection.pm:164
 #, c-format
 msgid "Address settings"
 msgstr "位址設定"
 
-#: ../lib/network/connection.pm:177 ../lib/network/connection.pm:197
+#: ../lib/network/connection.pm:178 ../lib/network/connection.pm:198
 #: ../lib/network/connection/isdn.pm:155 ../lib/network/netconnect.pm:217
-#: ../lib/network/netconnect.pm:485 ../lib/network/netconnect.pm:581
-#: ../lib/network/netconnect.pm:584
+#: ../lib/network/netconnect.pm:492 ../lib/network/netconnect.pm:588
+#: ../lib/network/netconnect.pm:591
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "未列出 - 手動編輯"
 
-#: ../lib/network/connection.pm:230 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:48 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection.pm:231 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection/wireless.pm:46 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
 msgstr "無"
 
-#: ../lib/network/connection.pm:242
+#: ../lib/network/connection.pm:243
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "允許使用者管理此連線"
 
-#: ../lib/network/connection.pm:243
+#: ../lib/network/connection.pm:244
 #, c-format
 msgid "Start the connection at boot"
 msgstr "開機時啟動此連線"
 
-#: ../lib/network/connection.pm:244
+#: ../lib/network/connection.pm:245
+#, fuzzy, c-format
+msgid "Account network traffic"
+msgstr "同步網路介面"
+
+#: ../lib/network/connection.pm:246
 #, c-format
 msgid "Metric"
 msgstr "公制"
 
-#: ../lib/network/connection.pm:245
+#: ../lib/network/connection.pm:247
 #, c-format
 msgid "MTU"
 msgstr ""
 
-#: ../lib/network/connection.pm:246
+#: ../lib/network/connection.pm:248
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
 msgstr ""
 
-#: ../lib/network/connection.pm:318
+#: ../lib/network/connection.pm:324
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "於介面 %s 偵測到連結"
 
-#: ../lib/network/connection.pm:319 ../lib/network/connection/ethernet.pm:291
+#: ../lib/network/connection.pm:325 ../lib/network/connection/ethernet.pm:302
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "於介面 %s 遺失連結"
@@ -2423,19 +2459,19 @@ msgstr "Cable 數據機"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "使用 BPALogin (Telstra 需要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:609
+#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "認證方式"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:348 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "Account Login (user name)"
 msgstr "帳號登入 (使用者名稱)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:349 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
 msgstr "帳號的密碼"
@@ -2544,12 +2580,12 @@ msgstr "手動組態設定"
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "自動 IP (BOOTP/DHCP)"
 
-#: ../lib/network/connection/ethernet.pm:125
+#: ../lib/network/connection/ethernet.pm:129
 #, c-format
 msgid "IP settings"
 msgstr "IP 設定"
 
-#: ../lib/network/connection/ethernet.pm:138
+#: ../lib/network/connection/ethernet.pm:142
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -2560,116 +2596,132 @@ msgstr ""
 "每個項目都應該用小數點間隔的 IP 位址來輸入\n"
 "(例如 1.2.3.4)。"
 
-#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:658
+#: ../lib/network/connection/ethernet.pm:146 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "閘道"
 
-#: ../lib/network/connection/ethernet.pm:145
+#: ../lib/network/connection/ethernet.pm:149
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "由 DHCP 取得 DNS 主機"
 
-#: ../lib/network/connection/ethernet.pm:147
+#: ../lib/network/connection/ethernet.pm:151
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS 伺服器 1"
 
-#: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/connection/ethernet.pm:152
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS 伺服器 2"
 
-#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/connection/ethernet.pm:153
 #, c-format
 msgid "Search domain"
 msgstr "搜尋網域"
 
-#: ../lib/network/connection/ethernet.pm:150
+#: ../lib/network/connection/ethernet.pm:154
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "預設搜尋網域會從完整的主機名稱中取得"
 
-#: ../lib/network/connection/ethernet.pm:153
+#: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP 連線逾時 (以秒為單位)"
 
-#: ../lib/network/connection/ethernet.pm:154
+#: ../lib/network/connection/ethernet.pm:158
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "由 DHCP 取得 YP 伺服器"
 
-#: ../lib/network/connection/ethernet.pm:155
+#: ../lib/network/connection/ethernet.pm:159
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "由 DHCP 取得 NTPD 伺服器"
 
-#: ../lib/network/connection/ethernet.pm:156
+#: ../lib/network/connection/ethernet.pm:160
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主機名稱"
 
-#: ../lib/network/connection/ethernet.pm:158
+#: ../lib/network/connection/ethernet.pm:162
 #, c-format
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "不要預設使用 Zeroconf（169.254.0.0 網路）"
 
-#: ../lib/network/connection/ethernet.pm:169
+#: ../lib/network/connection/ethernet.pm:173
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 位址應該是 1.2.3.4 這類的格式"
 
-#: ../lib/network/connection/ethernet.pm:174
+#: ../lib/network/connection/ethernet.pm:178
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "網路遮罩應該是 255.255.224.0 這類的格式"
 
-#: ../lib/network/connection/ethernet.pm:179
+#: ../lib/network/connection/ethernet.pm:183
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告：IP 位址 %s 通常是保留下來的！"
 
-#: ../lib/network/connection/ethernet.pm:185
+#: ../lib/network/connection/ethernet.pm:192
 #, c-format
 msgid ""
-"%s is already used by connection that starts on boot. To use this address "
-"with this connection, first disable all other devices which use it, or "
-"configure them not to start on boot"
+"%s is already used by connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start on boot"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:210
+#: ../lib/network/connection/ethernet.pm:219
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "由 DHCP 伺服器指派主機名稱"
 
-#: ../lib/network/connection/ethernet.pm:230
+#: ../lib/network/connection/ethernet.pm:220
+#, c-format
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+
+#: ../lib/network/connection/ethernet.pm:223
+#, c-format
+msgid ""
+"You should define the hostname of this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections. If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+
+#: ../lib/network/connection/ethernet.pm:241
 #, c-format
 msgid "Network Hotplugging"
 msgstr "網路熱插拔"
 
-#: ../lib/network/connection/ethernet.pm:234
+#: ../lib/network/connection/ethernet.pm:245
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "啟用 IPv6 到 IPv4 通道"
 
-#: ../lib/network/connection/ethernet.pm:290
+#: ../lib/network/connection/ethernet.pm:301
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "在界面 %s 上偵測到連結"
 
-#: ../lib/network/connection/ethernet.pm:293
+#: ../lib/network/connection/ethernet.pm:304
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "正在要求網路界面 %s (%s 協定) 的網路位址..."
 
-#: ../lib/network/connection/ethernet.pm:294
+#: ../lib/network/connection/ethernet.pm:305
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "取得網路介面 %s 的網路位址 (%s 協定)"
 
-#: ../lib/network/connection/ethernet.pm:295
+#: ../lib/network/connection/ethernet.pm:306
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr "網路介面 %s 的網路位址取得失敗 (%s 協定)"
@@ -2679,22 +2731,22 @@ msgstr "網路介面 %s 的網路位址取得失敗 (%s 協定)"
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "I do not know"
 msgstr "我不清楚"
 
-#: ../lib/network/connection/isdn.pm:199 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:199 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:200 ../lib/network/netconnect.pm:417
+#: ../lib/network/connection/isdn.pm:200 ../lib/network/netconnect.pm:424
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -2738,30 +2790,50 @@ msgstr "CHAP"
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: ../lib/network/connection/providers/cellular.pm:16
+#: ../lib/network/connection/providers/cellular.pm:15
+#: ../lib/network/connection/providers/xdsl.pm:191
+#: ../lib/network/connection/providers/xdsl.pm:201
+#: ../lib/network/connection/providers/xdsl.pm:210
+#: ../lib/network/connection/providers/xdsl.pm:219
+#, c-format
+msgid "Brazil"
+msgstr "巴西"
+
 #: ../lib/network/connection/providers/cellular.pm:20
-#: ../lib/network/connection/providers/cellular.pm:28
-#: ../lib/network/connection/providers/cellular.pm:34
-#: ../lib/network/connection/providers/cellular.pm:39
-#: ../lib/network/connection/providers/cellular.pm:45
-#: ../lib/network/connection/providers/cellular.pm:49
-#: ../lib/network/connection/providers/cellular.pm:53
-#: ../lib/network/connection/providers/cellular.pm:59
-#: ../lib/network/connection/providers/cellular.pm:63
+#: ../lib/network/connection/providers/cellular.pm:23
+#: ../lib/network/connection/providers/cellular.pm:26
+#: ../lib/network/connection/providers/cellular.pm:29
+#: ../lib/network/connection/providers/cellular.pm:32
+#: ../lib/network/connection/providers/cellular.pm:35
+#: ../lib/network/connection/providers/cellular.pm:38
+#, c-format
+msgid "Estonia"
+msgstr ""
+
+#: ../lib/network/connection/providers/cellular.pm:42
+#: ../lib/network/connection/providers/cellular.pm:46
+#: ../lib/network/connection/providers/cellular.pm:54
+#: ../lib/network/connection/providers/cellular.pm:60
+#: ../lib/network/connection/providers/cellular.pm:65
+#: ../lib/network/connection/providers/cellular.pm:71
+#: ../lib/network/connection/providers/cellular.pm:75
+#: ../lib/network/connection/providers/cellular.pm:79
+#: ../lib/network/connection/providers/cellular.pm:85
+#: ../lib/network/connection/providers/cellular.pm:89
 #: ../lib/network/connection/providers/xdsl.pm:483
 #, c-format
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../lib/network/connection/providers/cellular.pm:66
-#: ../lib/network/connection/providers/cellular.pm:69
-#: ../lib/network/connection/providers/cellular.pm:74
-#: ../lib/network/connection/providers/cellular.pm:79
-#: ../lib/network/connection/providers/cellular.pm:86
-#: ../lib/network/connection/providers/cellular.pm:91
-#: ../lib/network/connection/providers/cellular.pm:96
-#: ../lib/network/connection/providers/cellular.pm:99
-#: ../lib/network/connection/providers/cellular.pm:102
+#: ../lib/network/connection/providers/cellular.pm:92
+#: ../lib/network/connection/providers/cellular.pm:95
+#: ../lib/network/connection/providers/cellular.pm:100
+#: ../lib/network/connection/providers/cellular.pm:105
+#: ../lib/network/connection/providers/cellular.pm:112
+#: ../lib/network/connection/providers/cellular.pm:117
+#: ../lib/network/connection/providers/cellular.pm:122
+#: ../lib/network/connection/providers/cellular.pm:125
+#: ../lib/network/connection/providers/cellular.pm:128
 #: ../lib/network/connection/providers/xdsl.pm:492
 #: ../lib/network/connection/providers/xdsl.pm:504
 #: ../lib/network/connection/providers/xdsl.pm:516
@@ -2778,8 +2850,8 @@ msgstr "芬蘭"
 msgid "France"
 msgstr "法國"
 
-#: ../lib/network/connection/providers/cellular.pm:105
-#: ../lib/network/connection/providers/cellular.pm:108
+#: ../lib/network/connection/providers/cellular.pm:131
+#: ../lib/network/connection/providers/cellular.pm:134
 #: ../lib/network/connection/providers/xdsl.pm:621
 #: ../lib/network/connection/providers/xdsl.pm:630
 #: ../lib/network/connection/providers/xdsl.pm:640
@@ -2787,10 +2859,10 @@ msgstr "法國"
 msgid "Germany"
 msgstr "德國"
 
-#: ../lib/network/connection/providers/cellular.pm:111
-#: ../lib/network/connection/providers/cellular.pm:116
-#: ../lib/network/connection/providers/cellular.pm:121
-#: ../lib/network/connection/providers/cellular.pm:126
+#: ../lib/network/connection/providers/cellular.pm:137
+#: ../lib/network/connection/providers/cellular.pm:142
+#: ../lib/network/connection/providers/cellular.pm:147
+#: ../lib/network/connection/providers/cellular.pm:152
 #: ../lib/network/connection/providers/xdsl.pm:814
 #: ../lib/network/connection/providers/xdsl.pm:825
 #: ../lib/network/connection/providers/xdsl.pm:835
@@ -2800,17 +2872,17 @@ msgstr "德國"
 msgid "Italy"
 msgstr "義大利"
 
-#: ../lib/network/connection/providers/cellular.pm:131
-#: ../lib/network/connection/providers/cellular.pm:136
-#: ../lib/network/connection/providers/cellular.pm:141
-#: ../lib/network/connection/providers/cellular.pm:144
+#: ../lib/network/connection/providers/cellular.pm:157
+#: ../lib/network/connection/providers/cellular.pm:162
+#: ../lib/network/connection/providers/cellular.pm:167
+#: ../lib/network/connection/providers/cellular.pm:170
 #: ../lib/network/connection/providers/xdsl.pm:1001
 #: ../lib/network/connection/providers/xdsl.pm:1011
 #, c-format
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../lib/network/connection/providers/cellular.pm:147
+#: ../lib/network/connection/providers/cellular.pm:173
 #: ../lib/network/connection/providers/xdsl.pm:1330
 #: ../lib/network/connection/providers/xdsl.pm:1340
 #: ../lib/network/netconnect.pm:38
@@ -2818,6 +2890,12 @@ msgstr "波蘭"
 msgid "United Kingdom"
 msgstr "英國"
 
+#: ../lib/network/connection/providers/cellular.pm:178
+#: ../lib/network/netconnect.pm:37
+#, c-format
+msgid "United States"
+msgstr "美國"
+
 #: ../lib/network/connection/providers/xdsl.pm:47
 #: ../lib/network/connection/providers/xdsl.pm:57
 #, c-format
@@ -2864,14 +2942,6 @@ msgstr "澳洲"
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../lib/network/connection/providers/xdsl.pm:191
-#: ../lib/network/connection/providers/xdsl.pm:201
-#: ../lib/network/connection/providers/xdsl.pm:210
-#: ../lib/network/connection/providers/xdsl.pm:219
-#, c-format
-msgid "Brazil"
-msgstr "巴西"
-
 #: ../lib/network/connection/providers/xdsl.pm:228
 #: ../lib/network/connection/providers/xdsl.pm:237
 #, c-format
@@ -3084,120 +3154,125 @@ msgstr "土耳其"
 msgid "United Arab Emirates"
 msgstr "阿拉伯聯合大公國"
 
-#: ../lib/network/connection/wireless.pm:15
+#: ../lib/network/connection/wireless.pm:13
 #, c-format
 msgid "Wireless"
 msgstr "無線"
 
-#: ../lib/network/connection/wireless.pm:16
+#: ../lib/network/connection/wireless.pm:14
 #, c-format
 msgid "Wireless (Wi-Fi)"
 msgstr "Wi-Fi無線網路"
 
-#: ../lib/network/connection/wireless.pm:32
+#: ../lib/network/connection/wireless.pm:30
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "使用 Windows 驅動程式 (藉由 ndiswrapper)"
 
-#: ../lib/network/connection/wireless.pm:49
+#: ../lib/network/connection/wireless.pm:47
 #, c-format
 msgid "Open WEP"
 msgstr "開放的 WEP"
 
-#: ../lib/network/connection/wireless.pm:50
+#: ../lib/network/connection/wireless.pm:48
 #, c-format
 msgid "Restricted WEP"
 msgstr "私有的 WEP"
 
-#: ../lib/network/connection/wireless.pm:51
+#: ../lib/network/connection/wireless.pm:49
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr "WPA/WPA2 Pre-Shared Key"
 
-#: ../lib/network/connection/wireless.pm:52
+#: ../lib/network/connection/wireless.pm:50
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:271
+#: ../lib/network/connection/wireless.pm:269
 #, c-format
 msgid "Windows driver"
 msgstr "Windows 驅動程式"
 
-#: ../lib/network/connection/wireless.pm:357
+#: ../lib/network/connection/wireless.pm:355
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "您的無線網路卡是停用的，請先啟用無線網路 switch (RF kill switch)。"
 
-#: ../lib/network/connection/wireless.pm:444
+#: ../lib/network/connection/wireless.pm:445
 #, c-format
 msgid "Wireless settings"
 msgstr "無線網路設定"
 
-#: ../lib/network/connection/wireless.pm:449
-#: ../lib/network/connection_manager.pm:277
+#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection_manager.pm:280
 #, c-format
 msgid "Operating Mode"
 msgstr "運作模式"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Managed"
 msgstr "固定的"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Repeater"
 msgstr "重複"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: ../lib/network/connection/wireless.pm:450
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: ../lib/network/connection/wireless.pm:453
+#: ../lib/network/connection/wireless.pm:454
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "網路名稱 (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:455
+#: ../lib/network/connection/wireless.pm:456
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:457
+#: ../lib/network/connection/wireless.pm:458
 #, c-format
 msgid "Encryption key"
 msgstr "加密金鑰"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:461
+#, fuzzy, c-format
+msgid "Hide password"
+msgstr "密碼"
+
+#: ../lib/network/connection/wireless.pm:463
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "將此金鑰強制視為 ASCII 字串使用（為了給 Livebox 使用）"
 
-#: ../lib/network/connection/wireless.pm:466
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP 登入/使用者名稱"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3205,12 +3280,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:471
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "EAP Password"
 msgstr "EAP 密碼"
 
-#: ../lib/network/connection/wireless.pm:473
+#: ../lib/network/connection/wireless.pm:478
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -3229,12 +3304,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:487
+#: ../lib/network/connection/wireless.pm:492
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP 用戶端認證"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -3243,37 +3318,32 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:493
-#, fuzzy, c-format
-msgid "Wireless regulatory domain"
-msgstr "無線網路"
-
-#: ../lib/network/connection/wireless.pm:495
+#: ../lib/network/connection/wireless.pm:498
 #, c-format
 msgid "Network ID"
 msgstr "網路 ID"
 
-#: ../lib/network/connection/wireless.pm:496
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "Operating frequency"
 msgstr "工作頻率"
 
-#: ../lib/network/connection/wireless.pm:497
+#: ../lib/network/connection/wireless.pm:500
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "敏感度臨界點"
 
-#: ../lib/network/connection/wireless.pm:498
+#: ../lib/network/connection/wireless.pm:501
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "連線速率 (b/s)"
 
-#: ../lib/network/connection/wireless.pm:499
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:500
+#: ../lib/network/connection/wireless.pm:503
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -3287,17 +3357,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:507
+#: ../lib/network/connection/wireless.pm:510
 #, c-format
 msgid "Fragmentation"
 msgstr "區塊切分"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:511
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwfonfig 指令的其他參數"
 
-#: ../lib/network/connection/wireless.pm:509
+#: ../lib/network/connection/wireless.pm:512
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -3308,12 +3378,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:516
+#: ../lib/network/connection/wireless.pm:519
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy 指令的其他參數"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:520
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -3325,12 +3395,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:528
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv 指令的其他參數"
 
-#: ../lib/network/connection/wireless.pm:527
+#: ../lib/network/connection/wireless.pm:530
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -3348,107 +3418,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:538
+#: ../lib/network/connection/wireless.pm:541
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP 通訊協定"
 
-#: ../lib/network/connection/wireless.pm:539
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "Auto Detect"
 msgstr "自動偵測"
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:539
+#: ../lib/network/connection/wireless.pm:542
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:541
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
 "a fallback to WPA version 1"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/connection/wireless.pm:546
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP 模式"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:547
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:546
+#: ../lib/network/connection/wireless.pm:549
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP 金鑰管理"
 
-#: ../lib/network/connection/wireless.pm:548
+#: ../lib/network/connection/wireless.pm:551
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:550
+#: ../lib/network/connection/wireless.pm:553
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -3456,12 +3526,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:558
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:557
+#: ../lib/network/connection/wireless.pm:560
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -3470,12 +3540,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:564
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 憑證"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -3485,12 +3555,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:568
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:570
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -3500,12 +3570,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:575
+#: ../lib/network/connection/wireless.pm:578
 #, c-format
-msgid "EAP extra directives"
+msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:577
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -3523,26 +3593,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:597
+#: ../lib/network/connection/wireless.pm:599
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要網路金鑰。"
 
-#: ../lib/network/connection/wireless.pm:604
+#: ../lib/network/connection/wireless.pm:606
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:610
+#: ../lib/network/connection/wireless.pm:612
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr "WEP安全金鑰至多容許 %d 個ASCII字元或 %d 個十六進位字元"
 
-#: ../lib/network/connection/wireless.pm:617
+#: ../lib/network/connection/wireless.pm:619
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -3551,7 +3621,7 @@ msgstr ""
 "頻率後面應該加上 k、M 或 G 等單位 (例如：\"2.46G\" 代表頻率為 2.46 GHz)，或加"
 "上足夠的 '0' (零)。"
 
-#: ../lib/network/connection/wireless.pm:623
+#: ../lib/network/connection/wireless.pm:625
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -3560,17 +3630,17 @@ msgstr ""
 "速率後面應該加上 k、M 或 G 等單位 (例如：\"11M\" 代表頻率為 11M)，或加上足夠"
 "的 '0' (零)。"
 
-#: ../lib/network/connection/wireless.pm:635
+#: ../lib/network/connection/wireless.pm:637
 #, c-format
 msgid "Allow access point roaming"
 msgstr "允許無線網路基地台漫遊"
 
-#: ../lib/network/connection/wireless.pm:756
+#: ../lib/network/connection/wireless.pm:762
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "已透過網路界面 %2$s 連結到無線網路 \"%1$s\""
 
-#: ../lib/network/connection/wireless.pm:757
+#: ../lib/network/connection/wireless.pm:763
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "已遺失網路界面 %s 到無線網路的連結"
@@ -3580,7 +3650,7 @@ msgstr "已遺失網路界面 %s 到無線網路的連結"
 msgid "DSL"
 msgstr "DSL"
 
-#: ../lib/network/connection/xdsl.pm:97 ../lib/network/netconnect.pm:782
+#: ../lib/network/connection/xdsl.pm:97 ../lib/network/netconnect.pm:789
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB 數據機"
@@ -3670,160 +3740,165 @@ msgstr "網路設定"
 msgid "Please enter settings for network"
 msgstr "請輸入網路設定"
 
-#: ../lib/network/connection_manager.pm:203
+#: ../lib/network/connection_manager.pm:206
 #, c-format
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: ../lib/network/connection_manager.pm:220
-#: ../lib/network/connection_manager.pm:476
-#: ../lib/network/connection_manager.pm:489 ../lib/network/drakvpn.pm:100
+#: ../lib/network/connection_manager.pm:223
+#: ../lib/network/connection_manager.pm:479
+#: ../lib/network/connection_manager.pm:492 ../lib/network/drakvpn.pm:100
 #, c-format
 msgid "Connection failed."
 msgstr "連線失敗"
 
-#: ../lib/network/connection_manager.pm:232
+#: ../lib/network/connection_manager.pm:235
 #, c-format
 msgid "Disconnecting..."
 msgstr "正在中斷連線..."
 
-#: ../lib/network/connection_manager.pm:274
+#: ../lib/network/connection_manager.pm:277
 #, c-format
 msgid "SSID"
 msgstr "SSID"
 
-#: ../lib/network/connection_manager.pm:275
+#: ../lib/network/connection_manager.pm:278
 #, c-format
 msgid "Signal strength"
 msgstr "訊號強度"
 
-#: ../lib/network/connection_manager.pm:276
+#: ../lib/network/connection_manager.pm:279
 #, c-format
 msgid "Encryption"
 msgstr "加密"
 
-#: ../lib/network/connection_manager.pm:348 ../lib/network/netconnect.pm:208
+#: ../lib/network/connection_manager.pm:351 ../lib/network/netconnect.pm:208
 #, c-format
 msgid "Scanning for networks..."
 msgstr "掃描網路中..."
 
-#: ../lib/network/connection_manager.pm:397 ../lib/network/drakroam.pm:91
+#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:91
 #, c-format
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../lib/network/connection_manager.pm:397 ../lib/network/drakroam.pm:90
+#: ../lib/network/connection_manager.pm:400 ../lib/network/drakroam.pm:90
 #, c-format
 msgid "Connect"
 msgstr "連線"
 
-#: ../lib/network/connection_manager.pm:442
+#: ../lib/network/connection_manager.pm:445
 #, c-format
 msgid "Hostname changed to \"%s\""
 msgstr "主機名稱改變為 \"%s\""
 
-#: ../lib/network/drakfirewall.pm:13
+#: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
 msgstr "網頁伺服器 (Web)"
 
-#: ../lib/network/drakfirewall.pm:18
+#: ../lib/network/drakfirewall.pm:19
 #, c-format
 msgid "Domain Name Server"
 msgstr "網域名稱伺服器 (DNS)"
 
-#: ../lib/network/drakfirewall.pm:23
+#: ../lib/network/drakfirewall.pm:24
 #, c-format
 msgid "SSH server"
 msgstr "SSH 伺服器"
 
-#: ../lib/network/drakfirewall.pm:28
+#: ../lib/network/drakfirewall.pm:29
 #, c-format
 msgid "FTP server"
 msgstr "FTP 伺服器"
 
-#: ../lib/network/drakfirewall.pm:33
+#: ../lib/network/drakfirewall.pm:34
 #, c-format
 msgid "DHCP Server"
 msgstr "DHCP伺服器"
 
-#: ../lib/network/drakfirewall.pm:39
+#: ../lib/network/drakfirewall.pm:40
 #, c-format
 msgid "Mail Server"
 msgstr "Mail 伺服器"
 
-#: ../lib/network/drakfirewall.pm:44
+#: ../lib/network/drakfirewall.pm:45
 #, c-format
 msgid "POP and IMAP Server"
 msgstr "POP 與 IMAP 伺服器"
 
-#: ../lib/network/drakfirewall.pm:49
+#: ../lib/network/drakfirewall.pm:50
 #, c-format
 msgid "Telnet server"
 msgstr "Telnet 伺服器"
 
-#: ../lib/network/drakfirewall.pm:55
+#: ../lib/network/drakfirewall.pm:56
 #, c-format
 msgid "NFS Server"
 msgstr "NFS伺服器"
 
-#: ../lib/network/drakfirewall.pm:63
+#: ../lib/network/drakfirewall.pm:64
 #, c-format
 msgid "Windows Files Sharing (SMB)"
 msgstr "Wndows 檔案共享 (SMB)"
 
-#: ../lib/network/drakfirewall.pm:69
+#: ../lib/network/drakfirewall.pm:70
 #, c-format
 msgid "Bacula backup"
 msgstr ""
 
-#: ../lib/network/drakfirewall.pm:75
+#: ../lib/network/drakfirewall.pm:76
 #, fuzzy, c-format
 msgid "Syslog network logging"
 msgstr "網路熱插拔"
 
-#: ../lib/network/drakfirewall.pm:81
+#: ../lib/network/drakfirewall.pm:82
 #, c-format
 msgid "CUPS server"
 msgstr "CUPS 伺服器"
 
-#: ../lib/network/drakfirewall.pm:87
+#: ../lib/network/drakfirewall.pm:88
 #, c-format
 msgid "MySQL server"
 msgstr "MySQL伺服器"
 
-#: ../lib/network/drakfirewall.pm:93
+#: ../lib/network/drakfirewall.pm:94
 #, c-format
 msgid "PostgreSQL server"
 msgstr "PostgreSQL 伺服器"
 
-#: ../lib/network/drakfirewall.pm:99
+#: ../lib/network/drakfirewall.pm:100
 #, c-format
 msgid "Echo request (ping)"
 msgstr "回應要求 (ping)"
 
-#: ../lib/network/drakfirewall.pm:104
+#: ../lib/network/drakfirewall.pm:105
+#, c-format
+msgid "AVAHI and mDNS"
+msgstr ""
+
+#: ../lib/network/drakfirewall.pm:111
 #, c-format
 msgid "BitTorrent"
 msgstr "BitTorrent"
 
-#: ../lib/network/drakfirewall.pm:110
+#: ../lib/network/drakfirewall.pm:117
 #, c-format
 msgid "Windows Mobile device synchronization"
 msgstr "與 Windows Mobile 裝置同步"
 
-#: ../lib/network/drakfirewall.pm:119
+#: ../lib/network/drakfirewall.pm:126
 #, c-format
 msgid "Port scan detection"
 msgstr "連接埠掃描偵測"
 
-#: ../lib/network/drakfirewall.pm:214 ../lib/network/drakfirewall.pm:220
+#: ../lib/network/drakfirewall.pm:225 ../lib/network/drakfirewall.pm:231
 #: ../lib/network/shorewall.pm:75
 #, c-format
 msgid "Firewall configuration"
 msgstr "防火牆組態設定"
 
-#: ../lib/network/drakfirewall.pm:214
+#: ../lib/network/drakfirewall.pm:225
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -3838,7 +3913,7 @@ msgstr ""
 "若您需要強大而專門的防火牆解決方案，請參考專門的 Mandriva Security\n"
 "Firewall 產品。"
 
-#: ../lib/network/drakfirewall.pm:220
+#: ../lib/network/drakfirewall.pm:231
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -3850,13 +3925,13 @@ msgstr ""
 "\n"
 "請確定在繼續之前您已經使用 drakconnect 來設定過網路/網際網路連線。"
 
-#: ../lib/network/drakfirewall.pm:237 ../lib/network/drakfirewall.pm:239
+#: ../lib/network/drakfirewall.pm:248 ../lib/network/drakfirewall.pm:250
 #: ../lib/network/shorewall.pm:167
 #, c-format
 msgid "Firewall"
 msgstr "防火牆"
 
-#: ../lib/network/drakfirewall.pm:240
+#: ../lib/network/drakfirewall.pm:251
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -3867,7 +3942,7 @@ msgstr ""
 "有效的例子為：139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
 "請查閱 /etc/services 以取得資訊。"
 
-#: ../lib/network/drakfirewall.pm:246
+#: ../lib/network/drakfirewall.pm:257
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -3882,27 +3957,33 @@ msgstr ""
 "\n"
 "您也可以指定一個範圍的通訊埠 (例如：24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:256
+#: ../lib/network/drakfirewall.pm:267
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "您要允許網路可連線至何種服務呢？"
 
-#: ../lib/network/drakfirewall.pm:257
+#: ../lib/network/drakfirewall.pm:268 ../lib/network/netconnect.pm:127
+#: ../lib/network/network.pm:540
+#, c-format
+msgid "Those settings will be saved for the network profile <b>%s</b>"
+msgstr ""
+
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "全部 (沒有防火牆)"
 
-#: ../lib/network/drakfirewall.pm:259
+#: ../lib/network/drakfirewall.pm:271
 #, c-format
 msgid "Other ports"
 msgstr "其它通訊埠"
 
-#: ../lib/network/drakfirewall.pm:260
+#: ../lib/network/drakfirewall.pm:272
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "將防火牆訊息記錄到系統日誌中"
 
-#: ../lib/network/drakfirewall.pm:302
+#: ../lib/network/drakfirewall.pm:314
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -3912,7 +3993,7 @@ msgstr ""
 "您可以在有人連接到某項服務或試圖侵入您的電腦時收到警告。\n"
 "請選擇要監控的網路活動項目。"
 
-#: ../lib/network/drakfirewall.pm:307
+#: ../lib/network/drakfirewall.pm:319
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "使用互動式防火牆"
@@ -3937,7 +4018,7 @@ msgstr "設定"
 msgid "Refresh"
 msgstr "重新載入"
 
-#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:788
+#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Wireless connection"
 msgstr "無線網路連線"
@@ -4076,8 +4157,8 @@ msgid "port %d"
 msgstr "通訊埠 %d"
 
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
-#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:625
-#: ../lib/network/netconnect.pm:642 ../lib/network/netconnect.pm:658
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:632
+#: ../lib/network/netconnect.pm:649 ../lib/network/netconnect.pm:665
 #, c-format
 msgid "Manual"
 msgstr "手動"
@@ -4085,10 +4166,10 @@ msgstr "手動"
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
 #: ../lib/network/modem.pm:44 ../lib/network/modem.pm:63
 #: ../lib/network/modem.pm:76 ../lib/network/modem.pm:81
-#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:620
-#: ../lib/network/netconnect.pm:625 ../lib/network/netconnect.pm:637
-#: ../lib/network/netconnect.pm:642 ../lib/network/netconnect.pm:658
-#: ../lib/network/netconnect.pm:660
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:627
+#: ../lib/network/netconnect.pm:632 ../lib/network/netconnect.pm:644
+#: ../lib/network/netconnect.pm:649 ../lib/network/netconnect.pm:665
+#: ../lib/network/netconnect.pm:667
 #, c-format
 msgid "Automatic"
 msgstr "自動"
@@ -4099,9 +4180,17 @@ msgid "No device supporting the %s ndiswrapper driver is present!"
 msgstr "沒有找到支援 %s ndiswrapper 驅動程式的裝置！"
 
 #: ../lib/network/ndiswrapper.pm:36
+#, fuzzy, c-format
+msgid "Please select the correct driver"
+msgstr "請選擇您的提供者："
+
+#: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver (.inf file)"
-msgstr "請選取 Windows 驅動程式 (.inf 檔)"
+msgid ""
+"Please select Windows driver description (.inf file), or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4159,23 +4248,23 @@ msgid ""
 "Monitor"
 msgstr "監控"
 
-#: ../lib/network/netcenter.pm:144
+#: ../lib/network/netcenter.pm:145
 #, c-format
 msgid "Network Center"
 msgstr "網路中心"
 
-#: ../lib/network/netcenter.pm:168
+#: ../lib/network/netcenter.pm:164
 #, c-format
-msgid "Advanced settings"
-msgstr "進階選項"
+msgid "You are currently using the network profile <b>%s</b>"
+msgstr ""
 
-#: ../lib/network/netconnect.pm:37
+#: ../lib/network/netcenter.pm:170
 #, c-format
-msgid "United States"
-msgstr "美國"
+msgid "Advanced settings"
+msgstr "進階選項"
 
-#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:515
-#: ../lib/network/netconnect.pm:529
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:522
+#: ../lib/network/netconnect.pm:536
 #, c-format
 msgid "Manual choice"
 msgstr "手動選擇"
@@ -4214,8 +4303,8 @@ msgstr "網路 & 網際網路設定"
 msgid "Choose the connection you want to configure"
 msgstr "選擇您要設定的連線項目"
 
-#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:370
-#: ../lib/network/netconnect.pm:815
+#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:377
+#: ../lib/network/netconnect.pm:822
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "選取要設定的網路介面："
@@ -4249,114 +4338,114 @@ msgstr ""
 "請選擇您的連線協定。\n"
 "如果您不知道，請保留預先選取的協定。"
 
-#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:677
+#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:684
 #, c-format
 msgid "Connection control"
 msgstr "連線控制"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:726
+#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
 #, c-format
 msgid "Testing your connection..."
 msgstr "正在測試您的連線..."
 
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
 msgstr "連線組態設定"
 
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "請您填入或檢查下面欄位"
 
-#: ../lib/network/netconnect.pm:340
+#: ../lib/network/netconnect.pm:347
 #, c-format
 msgid "Your personal phone number"
 msgstr "您的個人電話號碼"
 
-#: ../lib/network/netconnect.pm:341
+#: ../lib/network/netconnect.pm:348
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "提供者的名稱 (ex provider.net)"
 
-#: ../lib/network/netconnect.pm:342
+#: ../lib/network/netconnect.pm:349
 #, c-format
 msgid "Provider phone number"
 msgstr "提供者的電話號碼"
 
-#: ../lib/network/netconnect.pm:343
+#: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "提供者 DNS 1 (選擇性輸入)"
 
-#: ../lib/network/netconnect.pm:344
+#: ../lib/network/netconnect.pm:351
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "提供者 DNS 2 (選擇性輸入)"
 
-#: ../lib/network/netconnect.pm:345
+#: ../lib/network/netconnect.pm:352
 #, c-format
 msgid "Dialing mode"
 msgstr "撥接的模式"
 
-#: ../lib/network/netconnect.pm:346
+#: ../lib/network/netconnect.pm:353
 #, c-format
 msgid "Connection speed"
 msgstr "連線速度"
 
-#: ../lib/network/netconnect.pm:347
+#: ../lib/network/netconnect.pm:354
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "連線逾時 (以秒為單位)"
 
-#: ../lib/network/netconnect.pm:350
+#: ../lib/network/netconnect.pm:357
 #, c-format
 msgid "Card IRQ"
 msgstr "卡的 IRQ"
 
-#: ../lib/network/netconnect.pm:351
+#: ../lib/network/netconnect.pm:358
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "卡的 mem (DMA)"
 
-#: ../lib/network/netconnect.pm:352
+#: ../lib/network/netconnect.pm:359
 #, c-format
 msgid "Card IO"
 msgstr "卡的 IO"
 
-#: ../lib/network/netconnect.pm:353
+#: ../lib/network/netconnect.pm:360
 #, c-format
 msgid "Card IO_0"
 msgstr "卡的 IO_0"
 
-#: ../lib/network/netconnect.pm:354
+#: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
 msgstr "卡的 IO_1"
 
-#: ../lib/network/netconnect.pm:373 ../lib/network/netconnect.pm:378
+#: ../lib/network/netconnect.pm:380 ../lib/network/netconnect.pm:385
 #, c-format
 msgid "External ISDN modem"
 msgstr "外接式 ISDN 數據機"
 
-#: ../lib/network/netconnect.pm:406
+#: ../lib/network/netconnect.pm:413
 #, c-format
 msgid "Select a device!"
 msgstr "選取一個裝置！"
 
-#: ../lib/network/netconnect.pm:415 ../lib/network/netconnect.pm:425
-#: ../lib/network/netconnect.pm:435 ../lib/network/netconnect.pm:468
-#: ../lib/network/netconnect.pm:482
+#: ../lib/network/netconnect.pm:422 ../lib/network/netconnect.pm:432
+#: ../lib/network/netconnect.pm:442 ../lib/network/netconnect.pm:475
+#: ../lib/network/netconnect.pm:489
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN 設定"
 
-#: ../lib/network/netconnect.pm:416
+#: ../lib/network/netconnect.pm:423
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "您有那種的卡？"
 
-#: ../lib/network/netconnect.pm:426
+#: ../lib/network/netconnect.pm:433
 #, c-format
 msgid ""
 "\n"
@@ -4370,22 +4459,22 @@ msgstr ""
 "\n"
 "如果您使用的是 PCMCIA 卡，那您必須要知道這張卡的\"irq\" 與 \"io\"值。\n"
 
-#: ../lib/network/netconnect.pm:430
+#: ../lib/network/netconnect.pm:437
 #, c-format
 msgid "Continue"
 msgstr "繼續"
 
-#: ../lib/network/netconnect.pm:430
+#: ../lib/network/netconnect.pm:437
 #, c-format
 msgid "Abort"
 msgstr "放棄"
 
-#: ../lib/network/netconnect.pm:436
+#: ../lib/network/netconnect.pm:443
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "下列何者是您的 ISDN 卡?"
 
-#: ../lib/network/netconnect.pm:454
+#: ../lib/network/netconnect.pm:461
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -4395,12 +4484,12 @@ msgstr ""
 "有一個 CAPI 驅動程式可供這個數據機使用。這個 CAPI 驅動程式可以比自由的驅動程"
 "式提供更多的功能 (例如發送傳真)。您要用哪一個呢？"
 
-#: ../lib/network/netconnect.pm:468
+#: ../lib/network/netconnect.pm:475
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "您要使用那個通訊協定?"
 
-#: ../lib/network/netconnect.pm:482
+#: ../lib/network/netconnect.pm:489
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -4409,12 +4498,12 @@ msgstr ""
 "選擇您的提供者.\n"
 "如果並沒有包含在清單內, 請選則未列在清單內(Unlisted)."
 
-#: ../lib/network/netconnect.pm:484 ../lib/network/netconnect.pm:580
+#: ../lib/network/netconnect.pm:491 ../lib/network/netconnect.pm:587
 #, c-format
 msgid "Provider:"
 msgstr "提供者:"
 
-#: ../lib/network/netconnect.pm:493
+#: ../lib/network/netconnect.pm:500
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -4423,132 +4512,132 @@ msgstr ""
 "系統不支援您的數據機。\n"
 "請到 http://www.linmodems.org 查詢。"
 
-#: ../lib/network/netconnect.pm:512
+#: ../lib/network/netconnect.pm:519
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "選取要設定的數據機："
 
-#: ../lib/network/netconnect.pm:514
+#: ../lib/network/netconnect.pm:521
 #, c-format
 msgid "Modem"
 msgstr "數據機"
 
-#: ../lib/network/netconnect.pm:549
+#: ../lib/network/netconnect.pm:556
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "請選取您數據機連接的序列埠。"
 
-#: ../lib/network/netconnect.pm:578
+#: ../lib/network/netconnect.pm:585
 #, c-format
 msgid "Select your provider:"
 msgstr "選擇您的提供者："
 
-#: ../lib/network/netconnect.pm:602
+#: ../lib/network/netconnect.pm:609
 #, c-format
 msgid "Dialup: account options"
 msgstr "撥號：帳號選項"
 
-#: ../lib/network/netconnect.pm:605
+#: ../lib/network/netconnect.pm:612
 #, c-format
 msgid "Connection name"
 msgstr "連線名稱"
 
-#: ../lib/network/netconnect.pm:606
+#: ../lib/network/netconnect.pm:613
 #, c-format
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: ../lib/network/netconnect.pm:607
+#: ../lib/network/netconnect.pm:614
 #, c-format
 msgid "Login ID"
 msgstr "登入的 ID"
 
-#: ../lib/network/netconnect.pm:622 ../lib/network/netconnect.pm:655
+#: ../lib/network/netconnect.pm:629 ../lib/network/netconnect.pm:662
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "撥號：IP 參數"
 
-#: ../lib/network/netconnect.pm:625
+#: ../lib/network/netconnect.pm:632
 #, c-format
 msgid "IP parameters"
 msgstr "IP 參數"
 
-#: ../lib/network/netconnect.pm:627
+#: ../lib/network/netconnect.pm:634
 #, c-format
 msgid "Subnet mask"
 msgstr "子網路遮罩"
 
-#: ../lib/network/netconnect.pm:639
+#: ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "撥號：DNS 參數"
 
-#: ../lib/network/netconnect.pm:642
+#: ../lib/network/netconnect.pm:649
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/network/netconnect.pm:643
+#: ../lib/network/netconnect.pm:650
 #, c-format
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: ../lib/network/netconnect.pm:644
+#: ../lib/network/netconnect.pm:651
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "第一台 DNS 伺服器 (選擇性輸入)"
 
-#: ../lib/network/netconnect.pm:645
+#: ../lib/network/netconnect.pm:652
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "第二台 DNS 伺服器 (選擇性輸入)"
 
-#: ../lib/network/netconnect.pm:646
+#: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
 msgstr "由 IP 設定主機名稱"
 
-#: ../lib/network/netconnect.pm:659
+#: ../lib/network/netconnect.pm:666
 #, c-format
 msgid "Gateway IP address"
 msgstr "閘道 IP 位址"
 
-#: ../lib/network/netconnect.pm:692
+#: ../lib/network/netconnect.pm:699
 #, c-format
 msgid "Automatically at boot"
 msgstr "開機時自動啟動"
 
-#: ../lib/network/netconnect.pm:694
+#: ../lib/network/netconnect.pm:701
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "使用系統列的 Net Applet 啟動"
 
-#: ../lib/network/netconnect.pm:696
+#: ../lib/network/netconnect.pm:703
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手動 (開機時啟用仍將啟動此介面)"
 
-#: ../lib/network/netconnect.pm:705
+#: ../lib/network/netconnect.pm:712
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "您想要如何撥接這個連線？"
 
-#: ../lib/network/netconnect.pm:718
+#: ../lib/network/netconnect.pm:725
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "現在您想要試著連線到網際網路上嗎？"
 
-#: ../lib/network/netconnect.pm:745
+#: ../lib/network/netconnect.pm:752
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "系統現在連上網際網路了。"
 
-#: ../lib/network/netconnect.pm:746
+#: ../lib/network/netconnect.pm:753
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "因為安全因素考量，它現在將會被切斷連線。"
 
-#: ../lib/network/netconnect.pm:747
+#: ../lib/network/netconnect.pm:754
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -4557,7 +4646,7 @@ msgstr ""
 "系統目前看起來似乎並沒有連上網際網路。\n"
 "請嘗試重新設定您的連線。"
 
-#: ../lib/network/netconnect.pm:763
+#: ../lib/network/netconnect.pm:770
 #, fuzzy, c-format
 msgid "Problems occured during the network connectivity test."
 msgstr ""
@@ -4565,33 +4654,33 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:764
+#: ../lib/network/netconnect.pm:771
 #, c-format
 msgid ""
 "This can be caused by invalid network configuration, or problems with your "
 "modem or router."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:765
+#: ../lib/network/netconnect.pm:772
 #, c-format
 msgid ""
 "You might want to relaunch the configuration to verify the connection "
 "settings."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:768
+#: ../lib/network/netconnect.pm:775
 #, c-format
 msgid "Congratulations, the network configuration is finished."
 msgstr "恭喜，網路設定已經完成了。"
 
-#: ../lib/network/netconnect.pm:768
+#: ../lib/network/netconnect.pm:775
 #, c-format
 msgid ""
 "However, the Internet connectivity test failed. You should test your "
 "connection manually, and verify your Internet modem or router."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/netconnect.pm:776
 #, fuzzy, c-format
 msgid ""
 "If your connection does not work, you might want to relaunch the "
@@ -4601,12 +4690,12 @@ msgstr ""
 "以 net_monitor 或 mcc 測試您的連線狀態。若是您發現您的網路連線沒有作用，您或"
 "許需要重新進行設定。"
 
-#: ../lib/network/netconnect.pm:771
+#: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "Congratulations, the network and Internet configuration are finished."
 msgstr "恭喜！網路與網際網路設定已經完成了。"
 
-#: ../lib/network/netconnect.pm:772
+#: ../lib/network/netconnect.pm:779
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -4615,78 +4704,78 @@ msgstr ""
 "在完成這個項目後，我們建議您重新啟動您的 X 環境\n"
 "以避免任何關於主機名稱所造成的問題。"
 
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:790
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB 數據機"
 
-#: ../lib/network/netconnect.pm:784 ../lib/network/netconnect.pm:785
+#: ../lib/network/netconnect.pm:791 ../lib/network/netconnect.pm:792
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan 數據機"
 
-#: ../lib/network/netconnect.pm:786
+#: ../lib/network/netconnect.pm:793
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus 數據機"
 
-#: ../lib/network/netconnect.pm:787
+#: ../lib/network/netconnect.pm:794
 #, c-format
 msgid "LAN connection"
 msgstr "區域網路連線"
 
-#: ../lib/network/netconnect.pm:789
+#: ../lib/network/netconnect.pm:796
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 連線"
 
-#: ../lib/network/netconnect.pm:790
+#: ../lib/network/netconnect.pm:797
 #, c-format
 msgid "Cable connection"
 msgstr "Cable 連線"
 
-#: ../lib/network/netconnect.pm:791
+#: ../lib/network/netconnect.pm:798
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 連線"
 
-#: ../lib/network/netconnect.pm:792
+#: ../lib/network/netconnect.pm:799
 #, c-format
 msgid "Modem connection"
 msgstr "Modem 連線"
 
-#: ../lib/network/netconnect.pm:793
+#: ../lib/network/netconnect.pm:800
 #, c-format
 msgid "DVB connection"
 msgstr "DVB 連線"
 
-#: ../lib/network/netconnect.pm:795
+#: ../lib/network/netconnect.pm:802
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(於 port %s 被偵測到)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:804
 #, c-format
 msgid "(detected %s)"
 msgstr "(偵測到 %s)"
 
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:804
 #, c-format
 msgid "(detected)"
 msgstr "(被偵測到)"
 
-#: ../lib/network/netconnect.pm:798
+#: ../lib/network/netconnect.pm:805
 #, c-format
 msgid "Network Configuration"
 msgstr "網路設定"
 
-#: ../lib/network/netconnect.pm:799
+#: ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf 主機名稱解析"
 
-#: ../lib/network/netconnect.pm:800
+#: ../lib/network/netconnect.pm:807
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -4695,17 +4784,17 @@ msgid ""
 "It is not necessary on most networks."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:804
+#: ../lib/network/netconnect.pm:811
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf 主機名稱"
 
-#: ../lib/network/netconnect.pm:805
+#: ../lib/network/netconnect.pm:812
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf 主機名稱必須包含一個 ."
 
-#: ../lib/network/netconnect.pm:806
+#: ../lib/network/netconnect.pm:813
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -4717,12 +4806,12 @@ msgstr ""
 "您可以點選確定來保留您的組態設定，或者選取取消來重新設定網路 & 網際網路連"
 "線。\n"
 
-#: ../lib/network/netconnect.pm:809
+#: ../lib/network/netconnect.pm:816
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "網路需要被重新啟動。您想要重新啟動它嗎？"
 
-#: ../lib/network/netconnect.pm:810
+#: ../lib/network/netconnect.pm:817
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -4733,7 +4822,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:811
+#: ../lib/network/netconnect.pm:818
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -4746,12 +4835,12 @@ msgstr ""
 "\n"
 "請按 \"%s\" 以繼續。"
 
-#: ../lib/network/netconnect.pm:812
+#: ../lib/network/netconnect.pm:819
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "設定完成，您想要套用設定值？"
 
-#: ../lib/network/netconnect.pm:813
+#: ../lib/network/netconnect.pm:820
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -4762,17 +4851,17 @@ msgstr ""
 "請選擇其中一個您要使用的項目。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:814
+#: ../lib/network/netconnect.pm:821
 #, c-format
 msgid "Internet connection"
 msgstr "網際網路連線"
 
-#: ../lib/network/netconnect.pm:816
+#: ../lib/network/netconnect.pm:823
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "正在設定網路裝置 %s (驅動程式 %s)"
 
-#: ../lib/network/netconnect.pm:817
+#: ../lib/network/netconnect.pm:824
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
@@ -4780,7 +4869,7 @@ msgid ""
 msgstr ""
 "下列的通訊協定可以用來設定一個區域網路 (LAN) 連線，請選擇您要使用哪一個。"
 
-#: ../lib/network/netconnect.pm:818
+#: ../lib/network/netconnect.pm:825
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -4793,27 +4882,27 @@ msgstr ""
 "例如 ``mybox.mylab.myco.com''。\n"
 "如果您有閘道器的話，也請在這邊輸入閘道器的 IP 位址。"
 
-#: ../lib/network/netconnect.pm:823
+#: ../lib/network/netconnect.pm:830
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: ../lib/network/netconnect.pm:824
+#: ../lib/network/netconnect.pm:831
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 伺服器位址必須要用 1.2.3.4 的格式來輸入"
 
-#: ../lib/network/netconnect.pm:825
+#: ../lib/network/netconnect.pm:832
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Gateway 位址必須要用類似 1.2.3.4 的格式來輸入"
 
-#: ../lib/network/netconnect.pm:826
+#: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
 msgstr "閘道器裝置"
 
-#: ../lib/network/netconnect.pm:840
+#: ../lib/network/netconnect.pm:847
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -4822,12 +4911,12 @@ msgstr ""
 "發生了一個無預期的錯誤：\n"
 "%s"
 
-#: ../lib/network/network.pm:494
+#: ../lib/network/network.pm:514
 #, c-format
 msgid "Advanced network settings"
 msgstr "進階網路設定"
 
-#: ../lib/network/network.pm:495
+#: ../lib/network/network.pm:515
 #, c-format
 msgid ""
 "Here you can configure advanced network settings. Please note that you have "
@@ -4835,99 +4924,104 @@ msgid ""
 msgstr ""
 "您可以在此設定網路的進階設定。請注意您需要重新啟動您的電腦使新的設定生效。"
 
-#: ../lib/network/network.pm:496
+#: ../lib/network/network.pm:517
+#, fuzzy, c-format
+msgid "Wireless regulatory domain"
+msgstr "無線網路"
+
+#: ../lib/network/network.pm:518
 #, c-format
 msgid "TCP/IP settings"
 msgstr "TCP/IP 設定"
 
-#: ../lib/network/network.pm:497
+#: ../lib/network/network.pm:519
 #, c-format
 msgid "Disable IPv6"
 msgstr "不啟用 IPv6"
 
-#: ../lib/network/network.pm:498
+#: ../lib/network/network.pm:520
 #, c-format
 msgid "Disable TCP Window Scaling"
 msgstr ""
 
-#: ../lib/network/network.pm:499
+#: ../lib/network/network.pm:521
 #, c-format
 msgid "Disable TCP Timestamps"
 msgstr ""
 
-#: ../lib/network/network.pm:500
+#: ../lib/network/network.pm:522
 #, c-format
 msgid "Security settings (defined by MSEC policy)"
 msgstr ""
 
-#: ../lib/network/network.pm:501
+#: ../lib/network/network.pm:523
 #, c-format
 msgid "Disable ICMP echo"
 msgstr ""
 
-#: ../lib/network/network.pm:502
+#: ../lib/network/network.pm:524
 #, c-format
 msgid "Disable ICMP echo for broadcasting messages"
 msgstr ""
 
-#: ../lib/network/network.pm:503
+#: ../lib/network/network.pm:525
 #, c-format
 msgid "Disable invalid ICMP error responses"
 msgstr ""
 
-#: ../lib/network/network.pm:504
+#: ../lib/network/network.pm:526
 #, c-format
 msgid "Log strange packets"
 msgstr "紀錄異常封包"
 
-#: ../lib/network/network.pm:514
+#: ../lib/network/network.pm:539
 #, c-format
 msgid "Proxies configuration"
 msgstr "代理伺服器設定"
 
-#: ../lib/network/network.pm:515
+#: ../lib/network/network.pm:540
 #, c-format
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
 "my_caching_server:8080)"
 msgstr "您可以設定您的代理伺服器 (例如：http://my_caching_server:8080)"
 
-#: ../lib/network/network.pm:516
+#: ../lib/network/network.pm:541
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理伺服器"
 
-#: ../lib/network/network.pm:517
+#: ../lib/network/network.pm:542
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "HTTPS 連線也使用 HTTP 代理伺服器"
 
-#: ../lib/network/network.pm:518
+#: ../lib/network/network.pm:543
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS 代理伺服器"
 
-#: ../lib/network/network.pm:519
+#: ../lib/network/network.pm:544
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理伺服器"
 
-#: ../lib/network/network.pm:520
+#: ../lib/network/network.pm:545
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "以下不使用代理伺服器 (以逗號分隔清單)："
 
-#: ../lib/network/network.pm:525
+#: ../lib/network/network.pm:550
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理伺服器的設定格式必須為 http://..."
 
-#: ../lib/network/network.pm:526
+#: ../lib/network/network.pm:551
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "代理伺服器的設定格式應該是 http://... 或 https://..."
 
-#: ../lib/network/network.pm:527
+#: ../lib/network/network.pm:552
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 應該是以 'ftp:' 或 'http:' 開頭"
@@ -5209,3 +5303,23 @@ msgstr "NAT 模式"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "使用指定的 UDP 埠"
+
+#~ msgid ""
+#~ "Name of the profile to create (the new profile is created as a copy of "
+#~ "the current one):"
+#~ msgstr "要建立的設定檔名 (新的設定檔將建立為現在的設定檔之副本)："
+
+#~ msgid ""
+#~ "This tool allows to activate an existing network profile, and to manage "
+#~ "(clone, delete) profiles."
+#~ msgstr ""
+#~ "這個工具讓您可以啟用一個現存的網路設定檔，以及管理 (複製、刪除) 設定檔。"
+
+#~ msgid "To modify a profile, you have to activate it first."
+#~ msgstr "要修改設定檔之前，您必須先啟用它。"
+
+#~ msgid "Clone"
+#~ msgstr "複製"
+
+#~ msgid "Please select the Windows driver (.inf file)"
+#~ msgstr "請選取 Windows 驅動程式 (.inf 檔)"