merge with code (to make "Any" translatable, #40926)

1 files changed, 485 insertions, 496 deletions

diff --git a/po/ja.po b/po/ja.po
index 0619ebd..d8ba21a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-ja\n"
-"POT-Creation-Date: 2008-04-02 16:11+0200\n"
+"POT-Creation-Date: 2008-05-19 14:44+0200\n"
 "PO-Revision-Date: 2008-03-15 22:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -29,19 +29,19 @@ msgid "Interface"
 msgstr "インターフェース"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:196
-#: ../lib/network/connection/ethernet.pm:131 ../lib/network/netconnect.pm:617
+#: ../lib/network/connection/ethernet.pm:133 ../lib/network/netconnect.pm:614
 #: ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "IP アドレス"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:258 ../bin/drakvpn-old:839
-#: ../lib/network/netconnect.pm:461
+#: ../lib/network/netconnect.pm:458
 #, c-format
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:447
+#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:444
 #, c-format
 msgid "Driver"
 msgstr "ドライバ"
@@ -71,7 +71,7 @@ msgstr "LAN の設定"
 msgid "Configure Local Area Network..."
 msgstr "LAN を設定..."
 
-#: ../bin/drakconnect-old:106 ../bin/draknfs:186 ../bin/net_applet:136
+#: ../bin/drakconnect-old:106 ../bin/draknfs:186 ../bin/net_applet:170
 #, c-format
 msgid "Help"
 msgstr "ヘルプ"
@@ -82,26 +82,27 @@ msgid "Apply"
 msgstr "適用"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
-#: ../bin/draknetprofile:106 ../bin/net_monitor:347
+#: ../bin/draknetprofile:133 ../bin/net_monitor:347
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
-#: ../bin/drakconnect-old:265 ../bin/draknetprofile:108 ../bin/net_monitor:348
+#: ../bin/drakconnect-old:265 ../bin/draknetprofile:135 ../bin/net_monitor:348
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../bin/drakconnect-old:113 ../bin/drakgw:344 ../bin/draksambashare:228
+#: ../bin/drakconnect-old:113 ../bin/drakgw:345 ../bin/draksambashare:228
 #: ../bin/drakvpn-old:97 ../bin/drakvpn-old:127
 #: ../lib/network/connection_manager.pm:82
-#: ../lib/network/connection_manager.pm:186
-#: ../lib/network/connection_manager.pm:203
-#: ../lib/network/connection_manager.pm:286 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:33 ../lib/network/netconnect.pm:181
-#: ../lib/network/netconnect.pm:214 ../lib/network/netconnect.pm:717
-#: ../lib/network/thirdparty.pm:354 ../lib/network/thirdparty.pm:369
+#: ../lib/network/connection_manager.pm:195
+#: ../lib/network/connection_manager.pm:212
+#: ../lib/network/connection_manager.pm:295 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:33 ../lib/network/netconnect.pm:185
+#: ../lib/network/netconnect.pm:207 ../lib/network/netconnect.pm:304
+#: ../lib/network/netconnect.pm:714 ../lib/network/thirdparty.pm:354
+#: ../lib/network/thirdparty.pm:369
 #, c-format
 msgid "Please wait"
 msgstr "お待ちください"
@@ -141,7 +142,7 @@ msgid "Adapter %s: %s"
 msgstr "アダプタ %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:177
-#: ../lib/network/connection/ethernet.pm:138
+#: ../lib/network/connection/ethernet.pm:140
 #, c-format
 msgid "Netmask"
 msgstr "ネットマスク"
@@ -156,7 +157,7 @@ msgstr "起動プロトコル"
 msgid "Started on boot"
 msgstr "起動時に開始"
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:149
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:151
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP クライアント"
@@ -170,7 +171,7 @@ msgstr ""
 "このインターフェースはまだ設定されていません。\n"
 "Mandriva Linux コントロールセンターの「%s」を実行してください。"
 
-#: ../bin/drakconnect-old:247 ../bin/net_applet:68
+#: ../bin/drakconnect-old:247 ../bin/net_applet:102
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "新しいネットワーク・インターフェースを設定 (LAN/ISDN/ADSL...)"
@@ -267,8 +268,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "インターネットに直接接続するネットワークインターフェースを選んでください。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:363
-#: ../lib/network/netconnect.pm:398
+#: ../bin/drakgw:123 ../lib/network/netconnect.pm:360
+#: ../lib/network/netconnect.pm:395
 #, c-format
 msgid "Net Device"
 msgstr "ネットデバイス"
@@ -312,7 +313,7 @@ msgstr "内部ドメイン名"
 
 #: ../bin/drakgw:184 ../bin/drakhosts:100 ../bin/drakhosts:245
 #: ../bin/drakhosts:252 ../bin/drakhosts:259 ../bin/drakinvictus:72
-#: ../bin/draknetprofile:113 ../bin/draknfs:88 ../bin/draknfs:109
+#: ../bin/draknetprofile:140 ../bin/draknfs:88 ../bin/draknfs:109
 #: ../bin/draknfs:279 ../bin/draknfs:412 ../bin/draknfs:414 ../bin/draknfs:417
 #: ../bin/draknfs:509 ../bin/draknfs:516 ../bin/draknfs:579 ../bin/draknfs:586
 #: ../bin/draknfs:593 ../bin/draksambashare:392 ../bin/draksambashare:399
@@ -326,18 +327,18 @@ msgstr "内部ドメイン名"
 #: ../bin/draksambashare:1357 ../bin/draksambashare:1379
 #: ../bin/draksambashare:1388 ../bin/draksambashare:1407
 #: ../bin/draksambashare:1416 ../bin/draksambashare:1428
-#: ../lib/network/connection/xdsl.pm:332
-#: ../lib/network/connection_manager.pm:61
-#: ../lib/network/connection_manager.pm:67
+#: ../lib/network/connection/xdsl.pm:339
+#: ../lib/network/connection_manager.pm:60
+#: ../lib/network/connection_manager.pm:66
 #: ../lib/network/connection_manager.pm:77
 #: ../lib/network/connection_manager.pm:85
-#: ../lib/network/connection_manager.pm:157
-#: ../lib/network/connection_manager.pm:161 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:166
+#: ../lib/network/connection_manager.pm:170 ../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:131
-#: ../lib/network/netconnect.pm:183 ../lib/network/netconnect.pm:240
-#: ../lib/network/netconnect.pm:281 ../lib/network/netconnect.pm:826
+#: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:134
+#: ../lib/network/netconnect.pm:187 ../lib/network/netconnect.pm:233
+#: ../lib/network/netconnect.pm:274 ../lib/network/netconnect.pm:823
 #: ../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
@@ -433,12 +434,12 @@ msgstr "プロキシポート"
 msgid "Cache size (MB)"
 msgstr "キャッシュサイズ (MB)"
 
-#: ../bin/drakgw:292
+#: ../bin/drakgw:293
 #, c-format
 msgid "Broadcast printer information"
 msgstr "プリンタ情報をブロードキャスト"
 
-#: ../bin/drakgw:303
+#: ../bin/drakgw:304
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -447,17 +448,17 @@ msgstr ""
 "イーサネットアダプタを検出できませんでした。\n"
 "ハードウェア設定ツールを実行してください。"
 
-#: ../bin/drakgw:309
+#: ../bin/drakgw:310
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "インターネット接続の共有を有効にしました。"
 
-#: ../bin/drakgw:315
+#: ../bin/drakgw:316
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "インターネット接続の共有を無効にしました。"
 
-#: ../bin/drakgw:321
+#: ../bin/drakgw:322
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -469,17 +470,17 @@ msgstr ""
 "DHCP (自動ネットワーク設定) と SQUID (Transparent Proxy Cache server) を\n"
 "使って、LAN の他のマシンとインターネット接続を共有できます。"
 
-#: ../bin/drakgw:344
+#: ../bin/drakgw:345
 #, c-format
 msgid "Disabling servers..."
 msgstr "サーバを停止しています..."
 
-#: ../bin/drakgw:358
+#: ../bin/drakgw:359
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "ファイアウォールの設定を検出しました"
 
-#: ../bin/drakgw:359
+#: ../bin/drakgw:360
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -488,12 +489,12 @@ msgstr ""
 "警告: 既存のファイアウォールの設定を検出しました。\n"
 "インストール後に手動で修正する必要があるかもしれません。"
 
-#: ../bin/drakgw:364
+#: ../bin/drakgw:365
 #, c-format
 msgid "Configuring..."
 msgstr "設定中..."
 
-#: ../bin/drakgw:365
+#: ../bin/drakgw:366
 #, c-format
 msgid "Configuring firewall..."
 msgstr "ファイアウォールを設定..."
@@ -550,7 +551,7 @@ msgstr "有効な IP アドレスを入力してください。"
 msgid "Same IP is already in %s file."
 msgstr "同じ IP が既に %s ファイルにあります。"
 
-#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:209
+#: ../bin/drakhosts:196 ../lib/network/connection/ethernet.pm:211
 #, c-format
 msgid "Host name"
 msgstr "ホスト名:"
@@ -612,9 +613,9 @@ msgstr "削除"
 msgid "Failed to remove host."
 msgstr "ホストの削除に失敗しました。"
 
-#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:147
-#: ../bin/net_applet:137 ../lib/network/drakroam.pm:117
-#: ../lib/network/netcenter.pm:127
+#: ../bin/drakhosts:262 ../bin/drakinvictus:141 ../bin/draknetprofile:174
+#: ../bin/net_applet:171 ../lib/network/drakroam.pm:118
+#: ../lib/network/netcenter.pm:132
 #, c-format
 msgid "Quit"
 msgstr "終了"
@@ -626,16 +627,15 @@ 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:262
-#: ../lib/network/drakfirewall.pm:266
+#: ../bin/net_applet:110 ../bin/net_applet:261
+#: ../lib/network/drakfirewall.pm:262 ../lib/network/drakfirewall.pm:266
 #, c-format
 msgid "Interactive Firewall"
 msgstr "対話式ファイアウォール"
 
 #: ../bin/drakids:68 ../bin/drakids:187 ../bin/drakids:196 ../bin/drakids:221
 #: ../bin/drakids:230 ../bin/drakids:240 ../bin/drakids:332
-#: ../bin/net_applet:239 ../bin/net_applet:515
+#: ../bin/net_applet:261
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "デーモンに接続できません"
@@ -645,12 +645,12 @@ msgstr "デーモンに接続できません"
 msgid "Log"
 msgstr "ログ"
 
-#: ../bin/drakids:83 ../bin/drakids:102 ../bin/net_applet:673
+#: ../bin/drakids:83 ../bin/drakids:102
 #, c-format
 msgid "Allow"
 msgstr "許可"
 
-#: ../bin/drakids:84 ../bin/drakids:93 ../bin/net_applet:674
+#: ../bin/drakids:84 ../bin/drakids:93
 #, c-format
 msgid "Block"
 msgstr "ブロック"
@@ -677,12 +677,12 @@ msgstr "ブロックするサービス"
 msgid "Clear logs"
 msgstr "ログを消去"
 
-#: ../bin/drakids:112 ../bin/drakids:117 ../bin/net_applet:612
+#: ../bin/drakids:112 ../bin/drakids:117
 #, c-format
 msgid "Blacklist"
 msgstr "ブラックリスト"
 
-#: ../bin/drakids:113 ../bin/drakids:130 ../bin/net_applet:617
+#: ../bin/drakids:113 ../bin/drakids:130
 #, c-format
 msgid "Whitelist"
 msgstr "ホワイトリスト"
@@ -791,7 +791,7 @@ msgstr "仮想共有アドレス"
 msgid "Virtual ID"
 msgstr "仮想 ID"
 
-#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:599
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:596
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -817,7 +817,7 @@ msgstr "ネットワークインターフェースの同期"
 msgid "Connection mark bit"
 msgstr "接続マークビット"
 
-#: ../bin/draknetprofile:36
+#: ../bin/draknetprofile:37
 #, c-format
 msgid "Network profiles"
 msgstr "ネットワークプロファイル"
@@ -827,12 +827,12 @@ msgstr "ネットワークプロファイル"
 msgid "Profile"
 msgstr "プロファイル"
 
-#: ../bin/draknetprofile:99
+#: ../bin/draknetprofile:126
 #, c-format
 msgid "New profile..."
 msgstr "新規プロファイル..."
 
-#: ../bin/draknetprofile:102
+#: ../bin/draknetprofile:129
 #, c-format
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
@@ -841,29 +841,29 @@ msgstr ""
 "作成するプロファイルの名前 (新しいプロファイルは現在のプロファイルのコピーと"
 "して作成します):"
 
-#: ../bin/draknetprofile:113
+#: ../bin/draknetprofile:140
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "プロファイル \"%s\" は既に存在します"
 
-#: ../bin/draknetprofile:129 ../bin/draknetprofile:131 ../bin/drakproxy:36
+#: ../bin/draknetprofile:156 ../bin/draknetprofile:158
 #: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
-#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:484
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:481
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../bin/draknetprofile:129
+#: ../bin/draknetprofile:156
 #, c-format
 msgid "You can not delete the default profile"
 msgstr "デフォルトのプロファイルは削除できません"
 
-#: ../bin/draknetprofile:131
+#: ../bin/draknetprofile:158
 #, c-format
 msgid "You can not delete the current profile"
 msgstr "現在のプロファイルは削除できません"
 
-#: ../bin/draknetprofile:141
+#: ../bin/draknetprofile:168
 #, c-format
 msgid ""
 "This tool allows to activate an existing network profile, and to manage "
@@ -872,22 +872,22 @@ msgstr ""
 "このツールでは、既存のネットワークプロファイルの有効化と、プロファイルの管理 "
 "(複製や削除) を行います。"
 
-#: ../bin/draknetprofile:141
+#: ../bin/draknetprofile:168
 #, c-format
 msgid "To modify a profile, you have to activate it first."
 msgstr "プロファイルを編集するには、先にそれを有効にしなければなりません。"
 
-#: ../bin/draknetprofile:144
+#: ../bin/draknetprofile:171
 #, c-format
 msgid "Activate"
 msgstr "有効にする"
 
-#: ../bin/draknetprofile:145
+#: ../bin/draknetprofile:172
 #, c-format
 msgid "Clone"
 msgstr "複製する"
 
-#: ../bin/draknetprofile:146
+#: ../bin/draknetprofile:173
 #, c-format
 msgid "Delete"
 msgstr "削除"
@@ -1276,11 +1276,6 @@ msgstr "NFS 共有の変更に失敗しました。"
 msgid "Failed to remove an NFS share."
 msgstr "NFS 共有の削除に失敗しました。"
 
-#: ../bin/drakproxy:36
-#, c-format
-msgid "You need to log out and back in again for changes to take effect"
-msgstr "変更を有効にするには再ログインしてください。"
-
 #: ../bin/draksambashare:64
 #, c-format
 msgid "User name"
@@ -3342,32 +3337,32 @@ msgstr "使用"
 msgid "unique"
 msgstr "固有"
 
-#: ../bin/net_applet:60
+#: ../bin/net_applet:94
 #, c-format
 msgid "Network is up on interface %s."
 msgstr "インターフェース %s のネットワークが動作中"
 
-#: ../bin/net_applet:61
+#: ../bin/net_applet:95
 #, c-format
 msgid "IP address: %s"
 msgstr "IP アドレス: %s"
 
-#: ../bin/net_applet:62
+#: ../bin/net_applet:96
 #, c-format
 msgid "Gateway: %s"
 msgstr "ゲートウェイ: %s"
 
-#: ../bin/net_applet:63
+#: ../bin/net_applet:97
 #, c-format
 msgid "Connected to %s (link level: %d %%)"
 msgstr "%s に接続しました (リンクレベル: %d %%)"
 
-#: ../bin/net_applet:65
+#: ../bin/net_applet:99
 #, c-format
 msgid "Network is down on interface %s."
 msgstr "インターフェース %s のネットワークはダウンしています"
 
-#: ../bin/net_applet:67
+#: ../bin/net_applet:101
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -3376,190 +3371,93 @@ msgstr ""
 "インターネットの接続が設定されていません。\n"
 "Mandriva Linux コントロールセンターの「%s」を実行してください。"
 
-#: ../bin/net_applet:73 ../bin/net_monitor:475
+#: ../bin/net_applet:107 ../bin/net_monitor:475
 #, c-format
 msgid "Connect %s"
 msgstr "%s に接続"
 
-#: ../bin/net_applet:74 ../bin/net_monitor:475
+#: ../bin/net_applet:108 ../bin/net_monitor:475
 #, c-format
 msgid "Disconnect %s"
 msgstr "%s を切断"
 
-#: ../bin/net_applet:75
+#: ../bin/net_applet:109
 #, c-format
 msgid "Monitor Network"
 msgstr "ネットワークをモニタ"
 
-#: ../bin/net_applet:77
+#: ../bin/net_applet:111
 #, c-format
 msgid "Manage wireless networks"
 msgstr "ワイヤレスネットワークを管理"
 
-#: ../bin/net_applet:79
+#: ../bin/net_applet:113
 #, c-format
 msgid "Manage VPN connections"
 msgstr "VPN 接続を管理"
 
-#: ../bin/net_applet:83
+#: ../bin/net_applet:117
 #, c-format
 msgid "Configure Network"
 msgstr "ネットワークを設定"
 
-#: ../bin/net_applet:85
+#: ../bin/net_applet:119
 #, c-format
 msgid "Watched interface"
 msgstr "監視中のインターフェース"
 
-#: ../bin/net_applet:86 ../bin/net_applet:87 ../bin/net_applet:89
+#: ../bin/net_applet:120 ../bin/net_applet:121 ../bin/net_applet:123
 #, c-format
 msgid "Auto-detect"
 msgstr "自動検出"
 
-#: ../bin/net_applet:94
+#: ../bin/net_applet:128
 #, c-format
 msgid "Active interfaces"
 msgstr "アクティブなインターフェース"
 
-#: ../bin/net_applet:118
+#: ../bin/net_applet:152
 #, c-format
 msgid "Profiles"
 msgstr "プロファイル"
 
-#: ../bin/net_applet:128 ../lib/network/connection.pm:190
+#: ../bin/net_applet:162 ../lib/network/connection.pm:218
 #: ../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
 msgid "VPN connection"
 msgstr "VPN 接続"
 
-#: ../bin/net_applet:319
+#: ../bin/net_applet:341
 #, c-format
 msgid "Network connection"
 msgstr "ネットワーク接続"
 
-#: ../bin/net_applet:439
+#: ../bin/net_applet:425
 #, c-format
 msgid "More networks"
 msgstr "他のネットワーク"
 
-#: ../bin/net_applet:466
+#: ../bin/net_applet:452
 #, c-format
 msgid "Interactive Firewall automatic mode"
 msgstr "対話式ファイアウォールの自動モード"
 
-#: ../bin/net_applet:471
+#: ../bin/net_applet:457
 #, c-format
 msgid "Always launch on startup"
 msgstr "起動時に開始"
 
-#: ../bin/net_applet:476
+#: ../bin/net_applet:462
 #, c-format
 msgid "Wireless networks"
 msgstr "ワイヤレスネットワーク"
 
-#: ../bin/net_applet:483 ../bin/net_monitor:96
+#: ../bin/net_applet:469 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "設定"
 
-#. -PO: "Process" is a verb
-#: ../bin/net_applet:554
-#, c-format
-msgid "Process attack"
-msgstr "攻撃を処理"
-
-#: ../bin/net_applet:567
-#, c-format
-msgid "Interactive Firewall: intrusion detected"
-msgstr "対話型ファイアウォール: 侵入を検知しました "
-
-#: ../bin/net_applet:584
-#, c-format
-msgid "What do you want to do with this attacker?"
-msgstr "この攻撃者をどうしますか？"
-
-#: ../bin/net_applet:587
-#, c-format
-msgid "Attack details"
-msgstr "攻撃の詳細"
-
-#: ../bin/net_applet:591
-#, c-format
-msgid "Attack time: %s"
-msgstr "攻撃の時間: %s"
-
-#: ../bin/net_applet:592
-#, c-format
-msgid "Network interface: %s"
-msgstr "ネットワークインターフェース: %s"
-
-#: ../bin/net_applet:593
-#, c-format
-msgid "Attack type: %s"
-msgstr "攻撃のタイプ: %s"
-
-#: ../bin/net_applet:594
-#, c-format
-msgid "Protocol: %s"
-msgstr "プロトコル: %s"
-
-#: ../bin/net_applet:595
-#, c-format
-msgid "Attacker IP address: %s"
-msgstr "攻撃者の IP アドレス: %s"
-
-#: ../bin/net_applet:596
-#, c-format
-msgid "Attacker hostname: %s"
-msgstr "攻撃者のホスト名: %s"
-
-#: ../bin/net_applet:599
-#, c-format
-msgid "Service attacked: %s"
-msgstr "攻撃されたサービス: %s"
-
-#: ../bin/net_applet:600
-#, c-format
-msgid "Port attacked: %s"
-msgstr "攻撃されたポート: %s"
-
-#: ../bin/net_applet:602
-#, c-format
-msgid "Type of ICMP attack: %s"
-msgstr "ICMP 攻撃のタイプ: %s"
-
-#: ../bin/net_applet:607
-#, c-format
-msgid "Always blacklist (do not ask again)"
-msgstr "常にブラックリストに載せる (今後は確認しない)"
-
-#: ../bin/net_applet:622
-#, c-format
-msgid "Ignore"
-msgstr "無視"
-
-#: ../bin/net_applet:640 ../bin/net_applet:658
-#, c-format
-msgid "Interactive Firewall: new service"
-msgstr "対話型ファイアウォール: 新しいサービス"
-
-#. -PO: "Process" is a verb
-#: ../bin/net_applet:646
-#, c-format
-msgid "Process connection"
-msgstr "接続を処理"
-
-#: ../bin/net_applet:668
-#, c-format
-msgid "Do you want to open this service?"
-msgstr "このサービスを開きますか？"
-
-#: ../bin/net_applet:671
-#, c-format
-msgid "Remember this answer"
-msgstr "この答えを記憶する"
-
 #: ../bin/net_monitor:60 ../bin/net_monitor:65
 #, c-format
 msgid "Network Monitoring"
@@ -3733,34 +3631,42 @@ msgstr "アクセスの設定"
 msgid "Address settings"
 msgstr "アドレスの設定"
 
-#: ../lib/network/connection.pm:192 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:42 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection.pm:172 ../lib/network/connection.pm:187
+#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:216
+#: ../lib/network/netconnect.pm:473 ../lib/network/netconnect.pm:569
+#: ../lib/network/netconnect.pm:572
+#, c-format
+msgid "Unlisted - edit manually"
+msgstr "該当なし - 手動で編集"
+
+#: ../lib/network/connection.pm:220 ../lib/network/connection/cable.pm:41
+#: ../lib/network/connection/wireless.pm:43 ../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:204
+#: ../lib/network/connection.pm:232
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "ユーザに接続の管理を許可しますか？"
 
-#: ../lib/network/connection.pm:205
+#: ../lib/network/connection.pm:233
 #, c-format
 msgid "Start the connection at boot"
 msgstr "起動時に接続を開始"
 
-#: ../lib/network/connection.pm:206
+#: ../lib/network/connection.pm:234
 #, c-format
 msgid "Metric"
 msgstr "Metric"
 
-#: ../lib/network/connection.pm:271
+#: ../lib/network/connection.pm:304
 #, c-format
 msgid "Link detected on interface %s"
 msgstr "インターフェース %s にリンクを検出"
 
-#: ../lib/network/connection.pm:272 ../lib/network/connection/ethernet.pm:286
+#: ../lib/network/connection.pm:305 ../lib/network/connection/ethernet.pm:288
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr "インターフェース %s でリンクビートが失われました"
@@ -3780,24 +3686,24 @@ msgstr "ケーブルモデム"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin を使う (Telstra に必要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:600
+#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:597
 #, c-format
 msgid "Authentication"
 msgstr "認証"
 
-#: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:339 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:30
+#: ../lib/network/netconnect.pm:336 ../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:340 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:31
+#: ../lib/network/netconnect.pm:337 ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
 msgstr "アカウントのパスワード"
 
-#: ../lib/network/connection/cellular.pm:48
+#: ../lib/network/connection/cellular.pm:66
 #, c-format
 msgid "Access Point Name"
 msgstr "アクセスポイント名"
@@ -3822,23 +3728,23 @@ msgstr "PIN のフォーマットが不正です。4 桁の数字でなければ
 msgid "GPRS/Edge/3G"
 msgstr "GPRS/Edge/3G"
 
-#: ../lib/network/connection/cellular_card.pm:70
+#: ../lib/network/connection/cellular_card.pm:91
 #: ../lib/network/vpn/openvpn.pm:391
 #, c-format
 msgid "PIN number"
 msgstr "PIN 番号"
 
-#: ../lib/network/connection/cellular_card.pm:142
+#: ../lib/network/connection/cellular_card.pm:167
 #, c-format
 msgid "Unable to open device %s"
 msgstr "デバイス %s を開けません"
 
-#: ../lib/network/connection/cellular_card.pm:169
+#: ../lib/network/connection/cellular_card.pm:199
 #, c-format
 msgid "Please check that your SIM card is inserted."
 msgstr "SIM カードが挿入されていることを確認してください。"
 
-#: ../lib/network/connection/cellular_card.pm:180
+#: ../lib/network/connection/cellular_card.pm:210
 #, c-format
 msgid ""
 "You entered a wrong PIN code.\n"
@@ -3889,22 +3795,22 @@ msgstr ""
 "選択されたデバイス (%s ドライバを使用) にはネットワークインターフェースが見つ"
 "かりません。"
 
-#: ../lib/network/connection/ethernet.pm:67 ../lib/network/vpn/openvpn.pm:207
+#: ../lib/network/connection/ethernet.pm:69 ../lib/network/vpn/openvpn.pm:207
 #, c-format
 msgid "Manual configuration"
 msgstr "手動設定"
 
-#: ../lib/network/connection/ethernet.pm:68
+#: ../lib/network/connection/ethernet.pm:70
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP を自動設定 (BOOTP/DHCP)"
 
-#: ../lib/network/connection/ethernet.pm:122
+#: ../lib/network/connection/ethernet.pm:124
 #, c-format
 msgid "IP settings"
 msgstr "IP の設定"
 
-#: ../lib/network/connection/ethernet.pm:135
+#: ../lib/network/connection/ethernet.pm:137
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -3915,113 +3821,113 @@ msgstr ""
 "それぞれの項目にはドット区切の形式で IP アドレスを入れてください。\n"
 "(例: 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:139 ../lib/network/netconnect.pm:649
+#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:646
 #: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../lib/network/connection/ethernet.pm:142
+#: ../lib/network/connection/ethernet.pm:144
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:144
+#: ../lib/network/connection/ethernet.pm:146
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS サーバ 1"
 
-#: ../lib/network/connection/ethernet.pm:145
+#: ../lib/network/connection/ethernet.pm:147
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS サーバ 2"
 
-#: ../lib/network/connection/ethernet.pm:146
+#: ../lib/network/connection/ethernet.pm:148
 #, c-format
 msgid "Search domain"
 msgstr "検索ドメイン"
 
-#: ../lib/network/connection/ethernet.pm:147
+#: ../lib/network/connection/ethernet.pm:149
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "検索ドメインはデフォルトで完全修飾ホスト名から設定されます。"
 
-#: ../lib/network/connection/ethernet.pm:150
+#: ../lib/network/connection/ethernet.pm:152
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP のタイムアウト (秒)"
 
-#: ../lib/network/connection/ethernet.pm:151
+#: ../lib/network/connection/ethernet.pm:153
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/connection/ethernet.pm:154
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD サーバを DHCP から取得"
 
-#: ../lib/network/connection/ethernet.pm:153
+#: ../lib/network/connection/ethernet.pm:155
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP ホスト名"
 
-#: ../lib/network/connection/ethernet.pm:155
+#: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Zeroconf (169.254.0.0 ネットワーク) にフォールバックしない"
 
-#: ../lib/network/connection/ethernet.pm:166
+#: ../lib/network/connection/ethernet.pm:168
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP アドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/connection/ethernet.pm:171
+#: ../lib/network/connection/ethernet.pm:173
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ネットマスクは 255.255.224.0 のように入力してください"
 
-#: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/connection/ethernet.pm:178
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IP アドレス %s は通常保留されています"
 
-#: ../lib/network/connection/ethernet.pm:182
+#: ../lib/network/connection/ethernet.pm:184
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s は既に使用されています\n"
 
-#: ../lib/network/connection/ethernet.pm:207
+#: ../lib/network/connection/ethernet.pm:209
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "DHCP アドレスからホスト名を割り当てる"
 
-#: ../lib/network/connection/ethernet.pm:227
+#: ../lib/network/connection/ethernet.pm:229
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
 
-#: ../lib/network/connection/ethernet.pm:231
+#: ../lib/network/connection/ethernet.pm:233
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr "IPv6 to IPv4 トンネルを有効にする"
 
-#: ../lib/network/connection/ethernet.pm:285
+#: ../lib/network/connection/ethernet.pm:287
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr "インターフェース %s にリンクビートを検出"
 
-#: ../lib/network/connection/ethernet.pm:288
+#: ../lib/network/connection/ethernet.pm:290
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr "インターフェース %s (%s プロトコル) でネットワークアドレスを要求..."
 
-#: ../lib/network/connection/ethernet.pm:289
+#: ../lib/network/connection/ethernet.pm:291
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr "インターフェース %s (%s プロトコル) でネットワークアドレスを取得"
 
-#: ../lib/network/connection/ethernet.pm:290
+#: ../lib/network/connection/ethernet.pm:292
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr ""
@@ -4033,30 +3939,22 @@ msgstr ""
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:202
-#: ../lib/network/netconnect.pm:205 ../lib/network/netconnect.pm:223
-#: ../lib/network/netconnect.pm:476 ../lib/network/netconnect.pm:572
-#: ../lib/network/netconnect.pm:575
-#, c-format
-msgid "Unlisted - edit manually"
-msgstr "該当なし - 手動で編集"
-
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:405
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA/PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:405
 #, c-format
 msgid "I do not know"
 msgstr "不明"
 
-#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:405
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:408
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:405
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -4075,35 +3973,54 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "アナログ電話モデム (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:74
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:77
 #, c-format
 msgid "Script-based"
 msgstr "スクリプトを使う認証"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:75
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:78
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:76
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:79
 #, c-format
 msgid "Terminal-based"
 msgstr "ターミナルからの認証"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:77
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:80
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:81
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: ../lib/network/connection/providers/cellular.pm:13
+#: ../lib/network/connection/providers/cellular.pm:16
 #: ../lib/network/connection/providers/cellular.pm:20
-#: ../lib/network/connection/providers/cellular.pm:25
-#: ../lib/network/connection/providers/cellular.pm:30
+#: ../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/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/xdsl.pm:492
 #: ../lib/network/connection/providers/xdsl.pm:504
 #: ../lib/network/connection/providers/xdsl.pm:516
@@ -4120,6 +4037,19 @@ msgstr "PAP/CHAP"
 msgid "France"
 msgstr "フランス"
 
+#: ../lib/network/connection/providers/cellular.pm:102
+#: ../lib/network/connection/providers/cellular.pm:107
+#: ../lib/network/connection/providers/cellular.pm:112
+#: ../lib/network/connection/providers/cellular.pm:117
+#: ../lib/network/connection/providers/xdsl.pm:814
+#: ../lib/network/connection/providers/xdsl.pm:825
+#: ../lib/network/connection/providers/xdsl.pm:835
+#: ../lib/network/connection/providers/xdsl.pm:846
+#: ../lib/network/netconnect.pm:35
+#, c-format
+msgid "Italy"
+msgstr "イタリア"
+
 #: ../lib/network/connection/providers/xdsl.pm:47
 #: ../lib/network/connection/providers/xdsl.pm:57
 #, c-format
@@ -4139,6 +4069,16 @@ msgstr "アルゼンチン"
 msgid "Austria"
 msgstr "オーストリア"
 
+#: ../lib/network/connection/providers/xdsl.pm:87
+#: ../lib/network/connection/providers/xdsl.pm:446
+#: ../lib/network/connection/providers/xdsl.pm:650
+#: ../lib/network/connection/providers/xdsl.pm:668
+#: ../lib/network/connection/providers/xdsl.pm:787
+#: ../lib/network/connection/providers/xdsl.pm:1258
+#, fuzzy, c-format
+msgid "Any"
+msgstr "すべて"
+
 #: ../lib/network/connection/providers/xdsl.pm:114
 #: ../lib/network/connection/providers/xdsl.pm:124
 #: ../lib/network/connection/providers/xdsl.pm:134
@@ -4212,11 +4152,6 @@ msgstr "デンマーク"
 msgid "Egypt"
 msgstr "エジプト"
 
-#: ../lib/network/connection/providers/xdsl.pm:483
-#, c-format
-msgid "Finland"
-msgstr "フィンランド"
-
 #: ../lib/network/connection/providers/xdsl.pm:621
 #: ../lib/network/connection/providers/xdsl.pm:630
 #: ../lib/network/connection/providers/xdsl.pm:640
@@ -4265,15 +4200,6 @@ msgstr "インド"
 msgid "Iceland"
 msgstr "アイスランド"
 
-#: ../lib/network/connection/providers/xdsl.pm:814
-#: ../lib/network/connection/providers/xdsl.pm:825
-#: ../lib/network/connection/providers/xdsl.pm:835
-#: ../lib/network/connection/providers/xdsl.pm:846
-#: ../lib/network/netconnect.pm:35
-#, c-format
-msgid "Italy"
-msgstr "イタリア"
-
 #: ../lib/network/connection/providers/xdsl.pm:858
 #, c-format
 msgid "Sri Lanka"
@@ -4410,42 +4336,42 @@ msgstr "アラブ首長国連邦"
 msgid "United Kingdom"
 msgstr "イギリス"
 
-#: ../lib/network/connection/wireless.pm:8
+#: ../lib/network/connection/wireless.pm:11
 #, c-format
 msgid "Wireless"
 msgstr "ワイヤレス"
 
-#: ../lib/network/connection/wireless.pm:24
+#: ../lib/network/connection/wireless.pm:27
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "Windows のドライバを使う (ndiswrapper と共に)"
 
-#: ../lib/network/connection/wireless.pm:43
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
 msgid "Open WEP"
 msgstr "open モード WEP"
 
-#: ../lib/network/connection/wireless.pm:44
+#: ../lib/network/connection/wireless.pm:45
 #, c-format
 msgid "Restricted WEP"
 msgstr "restricted モード WEP"
 
-#: ../lib/network/connection/wireless.pm:45
+#: ../lib/network/connection/wireless.pm:46
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr "WPA/WPA2 事前共有鍵"
 
-#: ../lib/network/connection/wireless.pm:46
+#: ../lib/network/connection/wireless.pm:47
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:234
+#: ../lib/network/connection/wireless.pm:235
 #, c-format
 msgid "Windows driver"
 msgstr "Windows ドライバ"
 
-#: ../lib/network/connection/wireless.pm:301
+#: ../lib/network/connection/wireless.pm:302
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4454,73 +4380,73 @@ msgstr ""
 "ワイヤレスカードが無効になっています。先にワイヤレススイッチ (RF Kill スイッ"
 "チ) を有効にしてください。"
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:381
 #, c-format
 msgid "Wireless settings"
 msgstr "ワイヤレスの設定"
 
-#: ../lib/network/connection/wireless.pm:371
-#: ../lib/network/connection_manager.pm:243
+#: ../lib/network/connection/wireless.pm:386
+#: ../lib/network/connection_manager.pm:252
 #, c-format
 msgid "Operating Mode"
 msgstr "操作モード"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Master"
 msgstr "マスター"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Repeater"
 msgstr "リピータ"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Secondary"
 msgstr "セカンダリ"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:387
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: ../lib/network/connection/wireless.pm:375
+#: ../lib/network/connection/wireless.pm:390
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "ネットワーク名 (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:377
+#: ../lib/network/connection/wireless.pm:392
 #, c-format
 msgid "Encryption mode"
 msgstr "暗号化モード"
 
-#: ../lib/network/connection/wireless.pm:379
+#: ../lib/network/connection/wireless.pm:394
 #, c-format
 msgid "Encryption key"
 msgstr "暗号鍵"
 
-#: ../lib/network/connection/wireless.pm:381
+#: ../lib/network/connection/wireless.pm:396
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:388
+#: ../lib/network/connection/wireless.pm:403
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP ログイン/ユーザ名"
 
-#: ../lib/network/connection/wireless.pm:390
+#: ../lib/network/connection/wireless.pm:405
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4528,12 +4454,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:393
+#: ../lib/network/connection/wireless.pm:408
 #, c-format
 msgid "EAP Password"
 msgstr "EAP パスワード"
 
-#: ../lib/network/connection/wireless.pm:395
+#: ../lib/network/connection/wireless.pm:410
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4552,12 +4478,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:409
+#: ../lib/network/connection/wireless.pm:424
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP クライアント証明書"
 
-#: ../lib/network/connection/wireless.pm:411
+#: ../lib/network/connection/wireless.pm:426
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4566,32 +4492,32 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:415
+#: ../lib/network/connection/wireless.pm:430
 #, c-format
 msgid "Network ID"
 msgstr "ネットワーク ID"
 
-#: ../lib/network/connection/wireless.pm:416
+#: ../lib/network/connection/wireless.pm:431
 #, c-format
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: ../lib/network/connection/wireless.pm:417
+#: ../lib/network/connection/wireless.pm:432
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "感度のしきい値"
 
-#: ../lib/network/connection/wireless.pm:418
+#: ../lib/network/connection/wireless.pm:433
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "ビットレート (b/s)"
 
-#: ../lib/network/connection/wireless.pm:419
+#: ../lib/network/connection/wireless.pm:434
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:420
+#: ../lib/network/connection/wireless.pm:435
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4611,17 +4537,17 @@ msgstr ""
 "のメカニズムを無効にする最大パケットサイズと同じです。\n"
 "このパラメータを auto/fixed/off に設定することもできます。"
 
-#: ../lib/network/connection/wireless.pm:427
+#: ../lib/network/connection/wireless.pm:442
 #, c-format
 msgid "Fragmentation"
 msgstr "フラグメンテーション"
 
-#: ../lib/network/connection/wireless.pm:428
+#: ../lib/network/connection/wireless.pm:443
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:429
+#: ../lib/network/connection/wireless.pm:444
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4637,12 +4563,12 @@ msgstr ""
 "詳しくは man iwconfig(8) を参照してください。"
 
 #. -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:436
+#: ../lib/network/connection/wireless.pm:451
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:437
+#: ../lib/network/connection/wireless.pm:452
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4661,12 +4587,12 @@ msgstr ""
 "\n"
 "詳しくは man iwspy(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:445
+#: ../lib/network/connection/wireless.pm:460
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:462
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4690,28 +4616,28 @@ msgstr ""
 "明されています。\n"
 "詳しくは man iwpriv(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:458
+#: ../lib/network/connection/wireless.pm:473
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP プロトコル"
 
-#: ../lib/network/connection/wireless.pm:459
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "Auto Detect"
 msgstr "自動検出"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:474
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:474
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:461
+#: ../lib/network/connection/wireless.pm:476
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4720,79 +4646,79 @@ msgstr ""
 "自動検出は最初に WPA のバージョン 2 を試し、使えない場合は\n"
 "バージョン 1 にフォールバックするので、これをお勧めします。"
 
-#: ../lib/network/connection/wireless.pm:463
+#: ../lib/network/connection/wireless.pm:478
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP モード"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:479
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:466
+#: ../lib/network/connection/wireless.pm:481
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:483
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4800,12 +4726,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:490
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP フェーズ 2"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:492
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4814,12 +4740,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:481
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 証明書"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:498
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4829,12 +4755,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:488
+#: ../lib/network/connection/wireless.pm:503
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:490
+#: ../lib/network/connection/wireless.pm:505
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4844,12 +4770,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:495
+#: ../lib/network/connection/wireless.pm:510
 #, c-format
 msgid "EAP extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:497
+#: ../lib/network/connection/wireless.pm:512
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4867,26 +4793,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:532
 #, c-format
 msgid "An encryption key is required."
 msgstr "暗号鍵が必要です。"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:539
 #, 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
+#: ../lib/network/connection/wireless.pm:545
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:537
+#: ../lib/network/connection/wireless.pm:552
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4895,7 +4821,7 @@ msgstr ""
 "単位は k, M, G で入力してください (2.46 GHz の場合は 2.46G)。\n"
 "もしくは 0 (ゼロ) で桁を増やしてください。"
 
-#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/connection/wireless.pm:558
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4904,17 +4830,17 @@ msgstr ""
 "単位は k, M, G で入力してください (例: 11M)。\n"
 "もしくは 0 (ゼロ) で桁を増やしてください。"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "Allow access point roaming"
 msgstr "アクセスポイントローミングを許可"
 
-#: ../lib/network/connection/wireless.pm:665
+#: ../lib/network/connection/wireless.pm:688
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "インターフェース %s のワイヤレスネットワーク \"%s\" に関連付けました"
 
-#: ../lib/network/connection/wireless.pm:666
+#: ../lib/network/connection/wireless.pm:689
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "インターフェース %s のワイヤレスネットワークへの関連付けが失われました"
@@ -4924,7 +4850,7 @@ msgstr "インターフェース %s のワイヤレスネットワークへの�
 msgid "DSL"
 msgstr "DSL"
 
-#: ../lib/network/connection/xdsl.pm:76 ../lib/network/netconnect.pm:768
+#: ../lib/network/connection/xdsl.pm:76 ../lib/network/netconnect.pm:765
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB モデム"
@@ -4980,76 +4906,76 @@ msgstr "PPP over Ethernet (PPPoE)"
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: ../lib/network/connection/xdsl.pm:231
+#: ../lib/network/connection/xdsl.pm:238
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: ../lib/network/connection/xdsl.pm:232
+#: ../lib/network/connection/xdsl.pm:239
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: ../lib/network/connection/xdsl.pm:332
-#: ../lib/network/connection_manager.pm:61 ../lib/network/drakvpn.pm:45
-#: ../lib/network/netconnect.pm:131 ../lib/network/thirdparty.pm:123
+#: ../lib/network/connection/xdsl.pm:339
+#: ../lib/network/connection_manager.pm:60 ../lib/network/drakvpn.pm:45
+#: ../lib/network/netconnect.pm:134 ../lib/network/thirdparty.pm:123
 #, c-format
 msgid "Could not install the packages (%s)!"
 msgstr "パッケージ (%s) をインストールできませんでした"
 
 #: ../lib/network/connection_manager.pm:73
-#: ../lib/network/connection_manager.pm:130
+#: ../lib/network/connection_manager.pm:136
 #, c-format
 msgid "Network settings"
 msgstr "ネットワークの設定"
 
 #: ../lib/network/connection_manager.pm:74
-#: ../lib/network/connection_manager.pm:131
+#: ../lib/network/connection_manager.pm:137
 #, c-format
 msgid "Please enter settings for network"
 msgstr "ネットワークの設定を入力してください"
 
-#: ../lib/network/connection_manager.pm:82 ../lib/network/netconnect.pm:181
+#: ../lib/network/connection_manager.pm:82 ../lib/network/netconnect.pm:185
 #, c-format
 msgid "Configuring device..."
 msgstr "デバイスを設定..."
 
-#: ../lib/network/connection_manager.pm:186
+#: ../lib/network/connection_manager.pm:195
 #, c-format
 msgid "Connecting..."
 msgstr "接続..."
 
-#: ../lib/network/connection_manager.pm:203
+#: ../lib/network/connection_manager.pm:212
 #, c-format
 msgid "Disconnecting..."
 msgstr "切断します..."
 
-#: ../lib/network/connection_manager.pm:240
+#: ../lib/network/connection_manager.pm:249
 #, c-format
 msgid "SSID"
 msgstr "SSID"
 
-#: ../lib/network/connection_manager.pm:241
+#: ../lib/network/connection_manager.pm:250
 #, c-format
 msgid "Signal strength"
 msgstr "信号強度"
 
-#: ../lib/network/connection_manager.pm:242
+#: ../lib/network/connection_manager.pm:251
 #, c-format
 msgid "Encryption"
 msgstr "暗号化"
 
-#: ../lib/network/connection_manager.pm:286 ../lib/network/netconnect.pm:214
+#: ../lib/network/connection_manager.pm:295 ../lib/network/netconnect.pm:207
 #, c-format
 msgid "Scanning for networks..."
 msgstr "ネットワークをスキャンしています..."
 
-#: ../lib/network/connection_manager.pm:323 ../lib/network/drakroam.pm:115
+#: ../lib/network/connection_manager.pm:332 ../lib/network/drakroam.pm:116
 #, c-format
 msgid "Disconnect"
 msgstr "切断"
 
-#: ../lib/network/connection_manager.pm:323 ../lib/network/drakroam.pm:114
+#: ../lib/network/connection_manager.pm:332 ../lib/network/drakroam.pm:115
 #, c-format
 msgid "Connect"
 msgstr "接続"
@@ -5221,27 +5147,27 @@ msgstr "対話式ファイアウォールを使う"
 msgid "No device found"
 msgstr "デバイスが見つかりません"
 
-#: ../lib/network/drakroam.pm:60
+#: ../lib/network/drakroam.pm:61
 #, c-format
 msgid "Hostname changed to \"%s\""
 msgstr "ホスト名が \"%s\" に変わりました"
 
-#: ../lib/network/drakroam.pm:109
+#: ../lib/network/drakroam.pm:110
 #, c-format
 msgid "Device: "
 msgstr "デバイス: "
 
-#: ../lib/network/drakroam.pm:113 ../lib/network/netcenter.pm:86
+#: ../lib/network/drakroam.pm:114 ../lib/network/netcenter.pm:86
 #, c-format
 msgid "Configure"
 msgstr "設定"
 
-#: ../lib/network/drakroam.pm:116 ../lib/network/netcenter.pm:91
+#: ../lib/network/drakroam.pm:117 ../lib/network/netcenter.pm:91
 #, c-format
 msgid "Refresh"
 msgstr "更新"
 
-#: ../lib/network/drakroam.pm:127 ../lib/network/netconnect.pm:774
+#: ../lib/network/drakroam.pm:128 ../lib/network/netconnect.pm:771
 #, c-format
 msgid "Wireless connection"
 msgstr "ワイヤレス接続"
@@ -5296,7 +5222,7 @@ msgstr "必要なキーを入力してください"
 msgid "Please enter the settings of your VPN connection"
 msgstr "あなたの VPN 接続の設定を入力してください"
 
-#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:304
+#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:297
 #, c-format
 msgid "Do you want to start the connection now?"
 msgstr "今接続を開始しますか？"
@@ -5387,8 +5313,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:616
-#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:613
+#: ../lib/network/netconnect.pm:630 ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Manual"
 msgstr "手動"
@@ -5396,10 +5322,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:611
-#: ../lib/network/netconnect.pm:616 ../lib/network/netconnect.pm:628
-#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
-#: ../lib/network/netconnect.pm:651
+#: ../lib/network/modem.pm:110 ../lib/network/netconnect.pm:608
+#: ../lib/network/netconnect.pm:613 ../lib/network/netconnect.pm:625
+#: ../lib/network/netconnect.pm:630 ../lib/network/netconnect.pm:646
+#: ../lib/network/netconnect.pm:648
 #, c-format
 msgid "Automatic"
 msgstr "自動"
@@ -5463,7 +5389,7 @@ msgstr "デバイスを選択:"
 msgid "Network Center"
 msgstr "ネットワークセンター"
 
-#: ../lib/network/netcenter.pm:76 ../lib/network/netconnect.pm:217
+#: ../lib/network/netcenter.pm:76 ../lib/network/netconnect.pm:210
 #, c-format
 msgid "Please select your network:"
 msgstr "ネットワークを選んでください:"
@@ -5480,8 +5406,8 @@ msgstr "モニタ"
 msgid "United States"
 msgstr "アメリカ合衆国"
 
-#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:506
-#: ../lib/network/netconnect.pm:520
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:503
+#: ../lib/network/netconnect.pm:517
 #, c-format
 msgid "Manual choice"
 msgstr "手動選択"
@@ -5491,17 +5417,17 @@ msgstr "手動選択"
 msgid "Internal ISDN card"
 msgstr "内蔵 ISDN カード"
 
-#: ../lib/network/netconnect.pm:65
+#: ../lib/network/netconnect.pm:68
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "その他のプロトコル"
 
-#: ../lib/network/netconnect.pm:67
+#: ../lib/network/netconnect.pm:70
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "ヨーロッパのプロトコル (EDSS1)"
 
-#: ../lib/network/netconnect.pm:68
+#: ../lib/network/netconnect.pm:71
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -5510,38 +5436,38 @@ msgstr ""
 "その他のプロトコル\n"
 "No D-Channel (leased lines)"
 
-#: ../lib/network/netconnect.pm:118
+#: ../lib/network/netconnect.pm:121
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "ネットワークとインターネットの設定"
 
-#: ../lib/network/netconnect.pm:123
+#: ../lib/network/netconnect.pm:126
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "設定する接続を選んでください"
 
-#: ../lib/network/netconnect.pm:145 ../lib/network/netconnect.pm:361
-#: ../lib/network/netconnect.pm:801
+#: ../lib/network/netconnect.pm:148 ../lib/network/netconnect.pm:358
+#: ../lib/network/netconnect.pm:798
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "設定するネットワークインターフェースを選択:"
 
-#: ../lib/network/netconnect.pm:164
+#: ../lib/network/netconnect.pm:167
 #, c-format
 msgid "No device can be found for this connection type."
 msgstr "この接続タイプのデバイスが見つかりません。"
 
-#: ../lib/network/netconnect.pm:173
+#: ../lib/network/netconnect.pm:176
 #, c-format
 msgid "Hardware Configuration"
 msgstr "ハードウェアの設定"
 
-#: ../lib/network/netconnect.pm:199
+#: ../lib/network/netconnect.pm:200
 #, c-format
 msgid "Please select your provider:"
 msgstr "プロバイダを選んでください:"
 
-#: ../lib/network/netconnect.pm:254
+#: ../lib/network/netconnect.pm:247
 #, c-format
 msgid ""
 "Please select your connection protocol.\n"
@@ -5550,109 +5476,114 @@ msgstr ""
 "接続プロトコルを選んでください。\n"
 "不明な場合はそのままにしておいてください。"
 
-#: ../lib/network/netconnect.pm:298 ../lib/network/netconnect.pm:668
+#: ../lib/network/netconnect.pm:291 ../lib/network/netconnect.pm:665
 #, c-format
 msgid "Connection control"
 msgstr "接続のコントロール"
 
-#: ../lib/network/netconnect.pm:328
+#: ../lib/network/netconnect.pm:304 ../lib/network/netconnect.pm:714
+#, c-format
+msgid "Testing your connection..."
+msgstr "接続をテストしています..."
+
+#: ../lib/network/netconnect.pm:325
 #, c-format
 msgid "Connection Configuration"
 msgstr "接続の設定"
 
-#: ../lib/network/netconnect.pm:328
+#: ../lib/network/netconnect.pm:325
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "下記の項目を埋めるかチェックを入れてください"
 
-#: ../lib/network/netconnect.pm:331
+#: ../lib/network/netconnect.pm:328
 #, c-format
 msgid "Your personal phone number"
 msgstr "あなたの電話番号"
 
-#: ../lib/network/netconnect.pm:332
+#: ../lib/network/netconnect.pm:329
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "プロバイダの名前 (例: provider.net)"
 
-#: ../lib/network/netconnect.pm:333
+#: ../lib/network/netconnect.pm:330
 #, c-format
 msgid "Provider phone number"
 msgstr "プロバイダの電話番号"
 
-#: ../lib/network/netconnect.pm:334
+#: ../lib/network/netconnect.pm:331
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "プロバイダの DNS 1 (オプション)"
 
-#: ../lib/network/netconnect.pm:335
+#: ../lib/network/netconnect.pm:332
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "プロバイダの DNS 2 (オプション)"
 
-#: ../lib/network/netconnect.pm:336
+#: ../lib/network/netconnect.pm:333
 #, c-format
 msgid "Dialing mode"
 msgstr "ダイアルモード"
 
-#: ../lib/network/netconnect.pm:337
+#: ../lib/network/netconnect.pm:334
 #, c-format
 msgid "Connection speed"
 msgstr "接続の速度"
 
-#: ../lib/network/netconnect.pm:338
+#: ../lib/network/netconnect.pm:335
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "接続のタイムアウト (秒)"
 
-#: ../lib/network/netconnect.pm:341
+#: ../lib/network/netconnect.pm:338
 #, c-format
 msgid "Card IRQ"
 msgstr "カード IRQ"
 
-#: ../lib/network/netconnect.pm:342
+#: ../lib/network/netconnect.pm:339
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "カード mem (DMA)"
 
-#: ../lib/network/netconnect.pm:343
+#: ../lib/network/netconnect.pm:340
 #, c-format
 msgid "Card IO"
 msgstr "カード IO"
 
-#: ../lib/network/netconnect.pm:344
+#: ../lib/network/netconnect.pm:341
 #, c-format
 msgid "Card IO_0"
 msgstr "カード IO_0"
 
-#: ../lib/network/netconnect.pm:345
+#: ../lib/network/netconnect.pm:342
 #, c-format
 msgid "Card IO_1"
 msgstr "カード IO_1"
 
-#: ../lib/network/netconnect.pm:364 ../lib/network/netconnect.pm:369
+#: ../lib/network/netconnect.pm:361 ../lib/network/netconnect.pm:366
 #, c-format
 msgid "External ISDN modem"
 msgstr "外付 ISDN モデム"
 
-#: ../lib/network/netconnect.pm:397
+#: ../lib/network/netconnect.pm:394
 #, c-format
 msgid "Select a device!"
 msgstr "デバイスを選んでください"
 
-#: ../lib/network/netconnect.pm:406 ../lib/network/netconnect.pm:416
-#: ../lib/network/netconnect.pm:426 ../lib/network/netconnect.pm:459
-#: ../lib/network/netconnect.pm:473
+#: ../lib/network/netconnect.pm:403 ../lib/network/netconnect.pm:413
+#: ../lib/network/netconnect.pm:423 ../lib/network/netconnect.pm:456
+#: ../lib/network/netconnect.pm:470
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN の設定"
 
-#: ../lib/network/netconnect.pm:407
+#: ../lib/network/netconnect.pm:404
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "お使いのカードの種類を指定してください"
 
-#: ../lib/network/netconnect.pm:417
+#: ../lib/network/netconnect.pm:414
 #, c-format
 msgid ""
 "\n"
@@ -5666,22 +5597,22 @@ msgstr ""
 "\n"
 "PCMCIA カードをお持ちの場合はカードの irq と io を調べる必要があります。\n"
 
-#: ../lib/network/netconnect.pm:421
+#: ../lib/network/netconnect.pm:418
 #, c-format
 msgid "Continue"
 msgstr "続ける"
 
-#: ../lib/network/netconnect.pm:421
+#: ../lib/network/netconnect.pm:418
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: ../lib/network/netconnect.pm:427
+#: ../lib/network/netconnect.pm:424
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "お使いの ISDN カードを選んでください"
 
-#: ../lib/network/netconnect.pm:445
+#: ../lib/network/netconnect.pm:442
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -5692,12 +5623,12 @@ msgstr ""
 "バより多くの機能 (例: FAX 送信) を備えています。どちらのドライバを使います"
 "か？"
 
-#: ../lib/network/netconnect.pm:459
+#: ../lib/network/netconnect.pm:456
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "どのプロトコルを使いますか？"
 
-#: ../lib/network/netconnect.pm:473
+#: ../lib/network/netconnect.pm:470
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -5706,12 +5637,12 @@ msgstr ""
 "プロバイダを選んでください。\n"
 "リストにない場合は「該当なし」を選んでください。"
 
-#: ../lib/network/netconnect.pm:475 ../lib/network/netconnect.pm:571
+#: ../lib/network/netconnect.pm:472 ../lib/network/netconnect.pm:568
 #, c-format
 msgid "Provider:"
 msgstr "プロバイダ:"
 
-#: ../lib/network/netconnect.pm:484
+#: ../lib/network/netconnect.pm:481
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -5720,137 +5651,132 @@ msgstr ""
 "このモデムはサポートしていません。\n"
 "http://www.linmodems.org をご覧ください"
 
-#: ../lib/network/netconnect.pm:503
+#: ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "設定するモデムを選択:"
 
-#: ../lib/network/netconnect.pm:505
+#: ../lib/network/netconnect.pm:502
 #, c-format
 msgid "Modem"
 msgstr "モデム"
 
-#: ../lib/network/netconnect.pm:540
+#: ../lib/network/netconnect.pm:537
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "モデムが接続されているシリアルポートを選んでください。"
 
-#: ../lib/network/netconnect.pm:569
+#: ../lib/network/netconnect.pm:566
 #, c-format
 msgid "Select your provider:"
 msgstr "プロバイダを選択:"
 
-#: ../lib/network/netconnect.pm:593
+#: ../lib/network/netconnect.pm:590
 #, c-format
 msgid "Dialup: account options"
 msgstr "ダイアルアップ: アカウントのオプション"
 
-#: ../lib/network/netconnect.pm:596
+#: ../lib/network/netconnect.pm:593
 #, c-format
 msgid "Connection name"
 msgstr "接続名"
 
-#: ../lib/network/netconnect.pm:597
+#: ../lib/network/netconnect.pm:594
 #, c-format
 msgid "Phone number"
 msgstr "電話番号"
 
-#: ../lib/network/netconnect.pm:598
+#: ../lib/network/netconnect.pm:595
 #, c-format
 msgid "Login ID"
 msgstr "ログイン ID"
 
-#: ../lib/network/netconnect.pm:613 ../lib/network/netconnect.pm:646
+#: ../lib/network/netconnect.pm:610 ../lib/network/netconnect.pm:643
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "ダイアルアップ: IP パラメータ"
 
-#: ../lib/network/netconnect.pm:616
+#: ../lib/network/netconnect.pm:613
 #, c-format
 msgid "IP parameters"
 msgstr "IP パラメータ"
 
-#: ../lib/network/netconnect.pm:618
+#: ../lib/network/netconnect.pm:615
 #, c-format
 msgid "Subnet mask"
 msgstr "サブネットマスク"
 
-#: ../lib/network/netconnect.pm:630
+#: ../lib/network/netconnect.pm:627
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "ダイアルアップ: DNS パラメータ"
 
-#: ../lib/network/netconnect.pm:633
+#: ../lib/network/netconnect.pm:630
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/network/netconnect.pm:634
+#: ../lib/network/netconnect.pm:631
 #, c-format
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: ../lib/network/netconnect.pm:635
+#: ../lib/network/netconnect.pm:632
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "プライマリ DNS サーバ (オプション)"
 
-#: ../lib/network/netconnect.pm:636
+#: ../lib/network/netconnect.pm:633
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "セカンド DNS サーバ (オプション)"
 
-#: ../lib/network/netconnect.pm:637
+#: ../lib/network/netconnect.pm:634
 #, c-format
 msgid "Set hostname from IP"
 msgstr "IP からホスト名を設定"
 
-#: ../lib/network/netconnect.pm:650
+#: ../lib/network/netconnect.pm:647
 #, c-format
 msgid "Gateway IP address"
 msgstr "ゲートウェイ IP アドレス"
 
-#: ../lib/network/netconnect.pm:683
+#: ../lib/network/netconnect.pm:680
 #, c-format
 msgid "Automatically at boot"
 msgstr "起動時に自動的に開始"
 
-#: ../lib/network/netconnect.pm:685
+#: ../lib/network/netconnect.pm:682
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "システムトレイの Net アプレットを使う"
 
-#: ../lib/network/netconnect.pm:687
+#: ../lib/network/netconnect.pm:684
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手動 (インターフェースは起動時に自動的に始動します)"
 
-#: ../lib/network/netconnect.pm:696
+#: ../lib/network/netconnect.pm:693
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "この接続にどのようにダイアルしますか？"
 
-#: ../lib/network/netconnect.pm:709
+#: ../lib/network/netconnect.pm:706
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "すぐにインターネットに接続しますか？"
 
-#: ../lib/network/netconnect.pm:717
-#, c-format
-msgid "Testing your connection..."
-msgstr "接続をテストしています..."
-
-#: ../lib/network/netconnect.pm:736
+#: ../lib/network/netconnect.pm:733
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "インターネットに接続しました。"
 
-#: ../lib/network/netconnect.pm:737
+#: ../lib/network/netconnect.pm:734
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "セキュリティ上の理由で、接続を切ります。"
 
-#: ../lib/network/netconnect.pm:738
+#: ../lib/network/netconnect.pm:735
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -5859,7 +5785,7 @@ msgstr ""
 "このシステムはインターネットにつながっていないようです。\n"
 "接続を再設定してください。"
 
-#: ../lib/network/netconnect.pm:753
+#: ../lib/network/netconnect.pm:750
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -5869,7 +5795,7 @@ msgstr ""
 "インターネットの設定が完了しました。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:756
+#: ../lib/network/netconnect.pm:753
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -5878,7 +5804,7 @@ msgstr ""
 "設定が完了したら、ホスト名に関連した問題を避けるために、X を再起動することを"
 "お勧めします。"
 
-#: ../lib/network/netconnect.pm:757
+#: ../lib/network/netconnect.pm:754
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -5889,78 +5815,78 @@ msgstr ""
 "net_monitor か Mandriva コントロールセンターで接続をテストしてください。\n"
 "接続できない場合は再設定してください。"
 
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/netconnect.pm:766
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB モデム"
 
-#: ../lib/network/netconnect.pm:770 ../lib/network/netconnect.pm:771
+#: ../lib/network/netconnect.pm:767 ../lib/network/netconnect.pm:768
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan モデム"
 
-#: ../lib/network/netconnect.pm:772
+#: ../lib/network/netconnect.pm:769
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus モデム"
 
-#: ../lib/network/netconnect.pm:773
+#: ../lib/network/netconnect.pm:770
 #, c-format
 msgid "LAN connection"
 msgstr "LAN 接続"
 
-#: ../lib/network/netconnect.pm:775
+#: ../lib/network/netconnect.pm:772
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../lib/network/netconnect.pm:776
+#: ../lib/network/netconnect.pm:773
 #, c-format
 msgid "Cable connection"
 msgstr "ケーブル接続"
 
-#: ../lib/network/netconnect.pm:777
+#: ../lib/network/netconnect.pm:774
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 接続"
 
-#: ../lib/network/netconnect.pm:778
+#: ../lib/network/netconnect.pm:775
 #, c-format
 msgid "Modem connection"
 msgstr "モデム接続"
 
-#: ../lib/network/netconnect.pm:779
+#: ../lib/network/netconnect.pm:776
 #, c-format
 msgid "DVB connection"
 msgstr "DVB 接続"
 
-#: ../lib/network/netconnect.pm:781
+#: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(ポート %s で検出)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:780
 #, c-format
 msgid "(detected %s)"
 msgstr "(%s を検出)"
 
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:780
 #, c-format
 msgid "(detected)"
 msgstr "(検出)"
 
-#: ../lib/network/netconnect.pm:784
+#: ../lib/network/netconnect.pm:781
 #, c-format
 msgid "Network Configuration"
 msgstr "ネットワークを設定"
 
-#: ../lib/network/netconnect.pm:785
+#: ../lib/network/netconnect.pm:782
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf ホスト名の解決"
 
-#: ../lib/network/netconnect.pm:786
+#: ../lib/network/netconnect.pm:783
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -5973,17 +5899,17 @@ msgstr ""
 "共有リソースを提示するときに使用する名前です。\n"
 "たいていのネットワークでは必要ありません。"
 
-#: ../lib/network/netconnect.pm:790
+#: ../lib/network/netconnect.pm:787
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf ホスト名"
 
-#: ../lib/network/netconnect.pm:791
+#: ../lib/network/netconnect.pm:788
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf ホスト名にはピリオド (.) を含めることはできません。"
 
-#: ../lib/network/netconnect.pm:792
+#: ../lib/network/netconnect.pm:789
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -5995,12 +5921,12 @@ msgstr ""
 "現在の設定をそのまま使うには「OK」をクリックしてください。ネットワーク/\n"
 "インターネットを再設定する場合は「キャンセル」を押します。\n"
 
-#: ../lib/network/netconnect.pm:795
+#: ../lib/network/netconnect.pm:792
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "ネットワークの再起動が必要です。再起動しますか？"
 
-#: ../lib/network/netconnect.pm:796
+#: ../lib/network/netconnect.pm:793
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -6011,7 +5937,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:794
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -6024,12 +5950,12 @@ msgstr ""
 "\n"
 "続けるには「%s」を押してください。"
 
-#: ../lib/network/netconnect.pm:798
+#: ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "設定が完了しました。適用しますか？"
 
-#: ../lib/network/netconnect.pm:799
+#: ../lib/network/netconnect.pm:796
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -6040,17 +5966,17 @@ msgstr ""
 "お使いになるものを選んでください。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:800
+#: ../lib/network/netconnect.pm:797
 #, c-format
 msgid "Internet connection"
 msgstr "インターネット接続"
 
-#: ../lib/network/netconnect.pm:802
+#: ../lib/network/netconnect.pm:799
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "ネットワークデバイス %s を設定 (ドライバ %s)"
 
-#: ../lib/network/netconnect.pm:803
+#: ../lib/network/netconnect.pm:800
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
@@ -6059,7 +5985,7 @@ msgstr ""
 "以下のプロトコルが LAN 接続の設定に使用できます。使用するものを選んでくださ"
 "い。"
 
-#: ../lib/network/netconnect.pm:804
+#: ../lib/network/netconnect.pm:801
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -6071,27 +5997,27 @@ msgstr ""
 "'mybox.mylab.myco.com' のように完全修飾ホスト名を\n"
 "入れてください。ゲートウェイの IP アドレスも入力できます。"
 
-#: ../lib/network/netconnect.pm:809
+#: ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "DNS サーバの IP アドレスも入力できます。"
 
-#: ../lib/network/netconnect.pm:810
+#: ../lib/network/netconnect.pm:807
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS サーバのアドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/netconnect.pm:811
+#: ../lib/network/netconnect.pm:808
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "ゲートウェイのアドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/netconnect.pm:812
+#: ../lib/network/netconnect.pm:809
 #, c-format
 msgid "Gateway device"
 msgstr "ゲートウェイデバイス"
 
-#: ../lib/network/netconnect.pm:826
+#: ../lib/network/netconnect.pm:823
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -6100,12 +6026,12 @@ msgstr ""
 "予期しないエラーが発生しました:\n"
 "%s"
 
-#: ../lib/network/network.pm:429
+#: ../lib/network/network.pm:442
 #, c-format
 msgid "Proxies configuration"
 msgstr "プロキシの設定"
 
-#: ../lib/network/network.pm:430
+#: ../lib/network/network.pm:443
 #, c-format
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
@@ -6113,42 +6039,42 @@ msgid ""
 msgstr ""
 "ここでプロキシを設定をすることができます (例: http://my_caching_server:8080)"
 
-#: ../lib/network/network.pm:431
+#: ../lib/network/network.pm:444
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP プロキシ"
 
-#: ../lib/network/network.pm:432
+#: ../lib/network/network.pm:445
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "HTTPS 接続に HTTP プロキシを使う"
 
-#: ../lib/network/network.pm:433
+#: ../lib/network/network.pm:446
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS プロキシ"
 
-#: ../lib/network/network.pm:434
+#: ../lib/network/network.pm:447
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP プロキシ"
 
-#: ../lib/network/network.pm:435
+#: ../lib/network/network.pm:448
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "プロキシなし (カンマで区切って指定):"
 
-#: ../lib/network/network.pm:440
+#: ../lib/network/network.pm:453
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "プロキシは http://... で始まります"
 
-#: ../lib/network/network.pm:441
+#: ../lib/network/network.pm:454
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "プロキシは http://... または https://... でなければなりません"
 
-#: ../lib/network/network.pm:442
+#: ../lib/network/network.pm:455
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL は ftp: か http: で始まります"
@@ -6417,15 +6343,78 @@ msgid "Username"
 msgstr "ユーザ名"
 
 #: ../lib/network/vpn/vpnc.pm:61
-#, c-format
-msgid "Use Cisco-UDP encapsulation"
-msgstr "Cisco-UDP カプセル化を使う"
+#, fuzzy, c-format
+msgid "NAT Mode"
+msgstr "EAP モード"
 
 #: ../lib/network/vpn/vpnc.pm:67
 #, c-format
 msgid "Use specific UDP port"
 msgstr "特定の UDP ポートを使う"
 
+#~ msgid "You need to log out and back in again for changes to take effect"
+#~ msgstr "変更を有効にするには再ログインしてください。"
+
+#~ msgid "Process attack"
+#~ msgstr "攻撃を処理"
+
+#~ msgid "Interactive Firewall: intrusion detected"
+#~ msgstr "対話型ファイアウォール: 侵入を検知しました "
+
+#~ msgid "What do you want to do with this attacker?"
+#~ msgstr "この攻撃者をどうしますか？"
+
+#~ msgid "Attack details"
+#~ msgstr "攻撃の詳細"
+
+#~ msgid "Attack time: %s"
+#~ msgstr "攻撃の時間: %s"
+
+#~ msgid "Network interface: %s"
+#~ msgstr "ネットワークインターフェース: %s"
+
+#~ msgid "Attack type: %s"
+#~ msgstr "攻撃のタイプ: %s"
+
+#~ msgid "Protocol: %s"
+#~ msgstr "プロトコル: %s"
+
+#~ msgid "Attacker IP address: %s"
+#~ msgstr "攻撃者の IP アドレス: %s"
+
+#~ msgid "Attacker hostname: %s"
+#~ msgstr "攻撃者のホスト名: %s"
+
+#~ msgid "Service attacked: %s"
+#~ msgstr "攻撃されたサービス: %s"
+
+#~ msgid "Port attacked: %s"
+#~ msgstr "攻撃されたポート: %s"
+
+#~ msgid "Type of ICMP attack: %s"
+#~ msgstr "ICMP 攻撃のタイプ: %s"
+
+#~ msgid "Always blacklist (do not ask again)"
+#~ msgstr "常にブラックリストに載せる (今後は確認しない)"
+
+#~ msgid "Ignore"
+#~ msgstr "無視"
+
+#~ msgid "Interactive Firewall: new service"
+#~ msgstr "対話型ファイアウォール: 新しいサービス"
+
+#~ msgid "Process connection"
+#~ msgstr "接続を処理"
+
+#~ msgid "Do you want to open this service?"
+#~ msgstr "このサービスを開きますか？"
+
+#~ msgid "Remember this answer"
+#~ msgstr "この答えを記憶する"
+
+#~ msgid "Use Cisco-UDP encapsulation"
+#~ msgstr "Cisco-UDP カプセル化を使う"
+
 #~ msgid "Gateway:"
 #~ msgstr "ゲートウェイ:"