po: sync with code for network connection problems solutions.

1 files changed, 194 insertions, 160 deletions

diff --git a/po/ja.po b/po/ja.po
index 062f512..0728d58 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: 2009-03-30 16:28-0300\n"
+"POT-Creation-Date: 2009-03-31 10:42-0300\n"
 "PO-Revision-Date: 2009-03-22 21:05+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:134 ../lib/network/netconnect.pm:614
+#: ../lib/network/connection/ethernet.pm:134 ../lib/network/netconnect.pm:617
 #: ../lib/network/vpn/openvpn.pm:221
 #, c-format
 msgid "IP address"
 msgstr "IP アドレス"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:458
+#: ../lib/network/netconnect.pm:461
 #, c-format
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:444
+#: ../bin/drakconnect-old:64 ../lib/network/netconnect.pm:447
 #, c-format
 msgid "Driver"
 msgstr "ドライバ"
@@ -101,9 +101,9 @@ msgstr "OK"
 #: ../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:185
-#: ../lib/network/netconnect.pm:207 ../lib/network/netconnect.pm:304
-#: ../lib/network/netconnect.pm:714 ../lib/network/thirdparty.pm:354
+#: ../lib/network/netcenter.pm:142 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:717 ../lib/network/thirdparty.pm:354
 #: ../lib/network/thirdparty.pm:369
 #, c-format
 msgid "Please wait"
@@ -271,8 +271,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "インターネットに直接接続するネットワークインターフェースを選んでください。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:360
-#: ../lib/network/netconnect.pm:395
+#: ../bin/drakgw:123 ../lib/network/netconnect.pm:363
+#: ../lib/network/netconnect.pm:398
 #, c-format
 msgid "Net Device"
 msgstr "ネットデバイス"
@@ -342,9 +342,9 @@ msgstr "内部ドメイン名"
 #: ../lib/network/connection_manager.pm:489 ../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:134
-#: ../lib/network/netconnect.pm:187 ../lib/network/netconnect.pm:233
-#: ../lib/network/netconnect.pm:274 ../lib/network/netconnect.pm:823
+#: ../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:831
 #: ../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
@@ -798,7 +798,7 @@ msgstr "仮想共有アドレス"
 msgid "Virtual ID"
 msgstr "仮想 ID"
 
-#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:596
+#: ../bin/drakinvictus:110 ../lib/network/netconnect.pm:599
 #: ../lib/network/vpn/vpnc.pm:56
 #, c-format
 msgid "Password"
@@ -856,7 +856,7 @@ 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:481
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:484
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -2428,9 +2428,9 @@ msgid "Address settings"
 msgstr "アドレスの設定"
 
 #: ../lib/network/connection.pm:175 ../lib/network/connection.pm:195
-#: ../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
+#: ../lib/network/connection/isdn.pm:153 ../lib/network/netconnect.pm:217
+#: ../lib/network/netconnect.pm:476 ../lib/network/netconnect.pm:572
+#: ../lib/network/netconnect.pm:575
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "該当なし - 手動で編集"
@@ -2492,19 +2492,19 @@ msgstr "ケーブルモデム"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin を使う (Telstra に必要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:597
+#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:600
 #, c-format
 msgid "Authentication"
 msgstr "認証"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:336 ../lib/network/vpn/openvpn.pm:393
+#: ../lib/network/netconnect.pm:339 ../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:337 ../lib/network/vpn/openvpn.pm:394
+#: ../lib/network/netconnect.pm:340 ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
 msgstr "アカウントのパスワード"
@@ -2631,7 +2631,7 @@ msgstr ""
 "それぞれの項目にはドット区切の形式で IP アドレスを入れてください。\n"
 "(例: 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:646
+#: ../lib/network/connection/ethernet.pm:142 ../lib/network/netconnect.pm:649
 #: ../lib/network/vpn/openvpn.pm:212 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
@@ -2755,22 +2755,22 @@ msgstr ""
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:405
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA/PCMCIA"
 
-#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:405
+#: ../lib/network/connection/isdn.pm:196 ../lib/network/netconnect.pm:408
 #, c-format
 msgid "I do not know"
 msgstr "不明"
 
-#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:405
+#: ../lib/network/connection/isdn.pm:197 ../lib/network/netconnect.pm:408
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:405
+#: ../lib/network/connection/isdn.pm:198 ../lib/network/netconnect.pm:408
 #, c-format
 msgid "USB"
 msgstr "USB"
@@ -2789,27 +2789,27 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "アナログ電話モデム (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:77
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "スクリプトを使う認証"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "ターミナルからの認証"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3684,7 +3684,7 @@ msgstr "インターフェース %s のワイヤレスネットワークへの�
 msgid "DSL"
 msgstr "DSL"
 
-#: ../lib/network/connection/xdsl.pm:95 ../lib/network/netconnect.pm:765
+#: ../lib/network/connection/xdsl.pm:95 ../lib/network/netconnect.pm:773
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB モデム"
@@ -3752,13 +3752,13 @@ msgstr "Virtual Circuit ID (VCI):"
 
 #: ../lib/network/connection/xdsl.pm:359
 #: ../lib/network/connection_manager.pm:62 ../lib/network/drakvpn.pm:45
-#: ../lib/network/netconnect.pm:134 ../lib/network/thirdparty.pm:123
+#: ../lib/network/netconnect.pm:135 ../lib/network/thirdparty.pm:123
 #, c-format
 msgid "Could not install the packages (%s)!"
 msgstr "パッケージ (%s) をインストールできませんでした"
 
 #: ../lib/network/connection_manager.pm:74
-#: ../lib/network/connection_manager.pm:89 ../lib/network/netconnect.pm:185
+#: ../lib/network/connection_manager.pm:89 ../lib/network/netconnect.pm:186
 #, c-format
 msgid "Configuring device..."
 msgstr "デバイスを設定..."
@@ -3807,7 +3807,7 @@ msgstr "信号強度"
 msgid "Encryption"
 msgstr "暗号化"
 
-#: ../lib/network/connection_manager.pm:348 ../lib/network/netconnect.pm:207
+#: ../lib/network/connection_manager.pm:348 ../lib/network/netconnect.pm:208
 #, c-format
 msgid "Scanning for networks..."
 msgstr "ネットワークをスキャンしています..."
@@ -4044,7 +4044,7 @@ msgstr "設定"
 msgid "Refresh"
 msgstr "更新"
 
-#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:771
+#: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:779
 #, c-format
 msgid "Wireless connection"
 msgstr "ワイヤレス接続"
@@ -4099,7 +4099,7 @@ msgstr "必要なキーを入力してください"
 msgid "Please enter the settings of your VPN connection"
 msgstr "あなたの VPN 接続の設定を入力してください"
 
-#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:297
+#: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:298
 #, c-format
 msgid "Do you want to start the connection now?"
 msgstr "今接続を開始しますか？"
@@ -4185,8 +4185,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:613
-#: ../lib/network/netconnect.pm:630 ../lib/network/netconnect.pm:646
+#: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:616
+#: ../lib/network/netconnect.pm:633 ../lib/network/netconnect.pm:649
 #, c-format
 msgid "Manual"
 msgstr "手動"
@@ -4194,10 +4194,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: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
+#: ../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
 #, c-format
 msgid "Automatic"
 msgstr "自動"
@@ -4256,7 +4256,7 @@ msgstr "新しいドライバをインストール"
 msgid "Select a device:"
 msgstr "デバイスを選択:"
 
-#: ../lib/network/netcenter.pm:54 ../lib/network/netconnect.pm:210
+#: ../lib/network/netcenter.pm:54 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
 msgstr "ネットワークを選んでください:"
@@ -4283,8 +4283,8 @@ msgstr "上級設定"
 msgid "United States"
 msgstr "アメリカ合衆国"
 
-#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:503
-#: ../lib/network/netconnect.pm:517
+#: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:506
+#: ../lib/network/netconnect.pm:520
 #, c-format
 msgid "Manual choice"
 msgstr "手動選択"
@@ -4294,17 +4294,17 @@ msgstr "手動選択"
 msgid "Internal ISDN card"
 msgstr "内蔵 ISDN カード"
 
-#: ../lib/network/netconnect.pm:68
+#: ../lib/network/netconnect.pm:69
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "その他のプロトコル"
 
-#: ../lib/network/netconnect.pm:70
+#: ../lib/network/netconnect.pm:71
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "ヨーロッパのプロトコル (EDSS1)"
 
-#: ../lib/network/netconnect.pm:71
+#: ../lib/network/netconnect.pm:72
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -4313,43 +4313,43 @@ msgstr ""
 "その他のプロトコル\n"
 "No D-Channel (leased lines)"
 
-#: ../lib/network/netconnect.pm:121
+#: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "ネットワークとインターネットの設定"
 
-#: ../lib/network/netconnect.pm:126
+#: ../lib/network/netconnect.pm:127
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "設定する接続を選んでください"
 
-#: ../lib/network/netconnect.pm:148 ../lib/network/netconnect.pm:358
-#: ../lib/network/netconnect.pm:798
+#: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:361
+#: ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "設定するネットワークインターフェースを選択:"
 
-#: ../lib/network/netconnect.pm:150
+#: ../lib/network/netconnect.pm:151
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/network/netconnect.pm:167
+#: ../lib/network/netconnect.pm:168
 #, c-format
 msgid "No device can be found for this connection type."
 msgstr "この接続タイプのデバイスが見つかりません。"
 
-#: ../lib/network/netconnect.pm:176
+#: ../lib/network/netconnect.pm:177
 #, c-format
 msgid "Hardware Configuration"
 msgstr "ハードウェアの設定"
 
-#: ../lib/network/netconnect.pm:200
+#: ../lib/network/netconnect.pm:201
 #, c-format
 msgid "Please select your provider:"
 msgstr "プロバイダを選んでください:"
 
-#: ../lib/network/netconnect.pm:247
+#: ../lib/network/netconnect.pm:248
 #, c-format
 msgid ""
 "Please select your connection protocol.\n"
@@ -4358,114 +4358,114 @@ msgstr ""
 "接続プロトコルを選んでください。\n"
 "不明な場合はそのままにしておいてください。"
 
-#: ../lib/network/netconnect.pm:291 ../lib/network/netconnect.pm:665
+#: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:668
 #, c-format
 msgid "Connection control"
 msgstr "接続のコントロール"
 
-#: ../lib/network/netconnect.pm:304 ../lib/network/netconnect.pm:714
+#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:717
 #, c-format
 msgid "Testing your connection..."
 msgstr "接続をテストしています..."
 
-#: ../lib/network/netconnect.pm:325
+#: ../lib/network/netconnect.pm:328
 #, c-format
 msgid "Connection Configuration"
 msgstr "接続の設定"
 
-#: ../lib/network/netconnect.pm:325
+#: ../lib/network/netconnect.pm:328
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "下記の項目を埋めるかチェックを入れてください"
 
-#: ../lib/network/netconnect.pm:328
+#: ../lib/network/netconnect.pm:331
 #, c-format
 msgid "Your personal phone number"
 msgstr "あなたの電話番号"
 
-#: ../lib/network/netconnect.pm:329
+#: ../lib/network/netconnect.pm:332
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "プロバイダの名前 (例: provider.net)"
 
-#: ../lib/network/netconnect.pm:330
+#: ../lib/network/netconnect.pm:333
 #, c-format
 msgid "Provider phone number"
 msgstr "プロバイダの電話番号"
 
-#: ../lib/network/netconnect.pm:331
+#: ../lib/network/netconnect.pm:334
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "プロバイダの DNS 1 (オプション)"
 
-#: ../lib/network/netconnect.pm:332
+#: ../lib/network/netconnect.pm:335
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "プロバイダの DNS 2 (オプション)"
 
-#: ../lib/network/netconnect.pm:333
+#: ../lib/network/netconnect.pm:336
 #, c-format
 msgid "Dialing mode"
 msgstr "ダイアルモード"
 
-#: ../lib/network/netconnect.pm:334
+#: ../lib/network/netconnect.pm:337
 #, c-format
 msgid "Connection speed"
 msgstr "接続の速度"
 
-#: ../lib/network/netconnect.pm:335
+#: ../lib/network/netconnect.pm:338
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "接続のタイムアウト (秒)"
 
-#: ../lib/network/netconnect.pm:338
+#: ../lib/network/netconnect.pm:341
 #, c-format
 msgid "Card IRQ"
 msgstr "カード IRQ"
 
-#: ../lib/network/netconnect.pm:339
+#: ../lib/network/netconnect.pm:342
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "カード mem (DMA)"
 
-#: ../lib/network/netconnect.pm:340
+#: ../lib/network/netconnect.pm:343
 #, c-format
 msgid "Card IO"
 msgstr "カード IO"
 
-#: ../lib/network/netconnect.pm:341
+#: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Card IO_0"
 msgstr "カード IO_0"
 
-#: ../lib/network/netconnect.pm:342
+#: ../lib/network/netconnect.pm:345
 #, c-format
 msgid "Card IO_1"
 msgstr "カード IO_1"
 
-#: ../lib/network/netconnect.pm:361 ../lib/network/netconnect.pm:366
+#: ../lib/network/netconnect.pm:364 ../lib/network/netconnect.pm:369
 #, c-format
 msgid "External ISDN modem"
 msgstr "外付 ISDN モデム"
 
-#: ../lib/network/netconnect.pm:394
+#: ../lib/network/netconnect.pm:397
 #, c-format
 msgid "Select a device!"
 msgstr "デバイスを選んでください"
 
-#: ../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
+#: ../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
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN の設定"
 
-#: ../lib/network/netconnect.pm:404
+#: ../lib/network/netconnect.pm:407
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "お使いのカードの種類を指定してください"
 
-#: ../lib/network/netconnect.pm:414
+#: ../lib/network/netconnect.pm:417
 #, c-format
 msgid ""
 "\n"
@@ -4479,22 +4479,22 @@ msgstr ""
 "\n"
 "PCMCIA カードをお持ちの場合はカードの irq と io を調べる必要があります。\n"
 
-#: ../lib/network/netconnect.pm:418
+#: ../lib/network/netconnect.pm:421
 #, c-format
 msgid "Continue"
 msgstr "続ける"
 
-#: ../lib/network/netconnect.pm:418
+#: ../lib/network/netconnect.pm:421
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: ../lib/network/netconnect.pm:424
+#: ../lib/network/netconnect.pm:427
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "お使いの ISDN カードを選んでください"
 
-#: ../lib/network/netconnect.pm:442
+#: ../lib/network/netconnect.pm:445
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -4505,12 +4505,12 @@ msgstr ""
 "バより多くの機能 (例: FAX 送信) を備えています。どちらのドライバを使います"
 "か？"
 
-#: ../lib/network/netconnect.pm:456
+#: ../lib/network/netconnect.pm:459
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "どのプロトコルを使いますか？"
 
-#: ../lib/network/netconnect.pm:470
+#: ../lib/network/netconnect.pm:473
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -4519,12 +4519,12 @@ msgstr ""
 "プロバイダを選んでください。\n"
 "リストにない場合は「該当なし」を選んでください。"
 
-#: ../lib/network/netconnect.pm:472 ../lib/network/netconnect.pm:568
+#: ../lib/network/netconnect.pm:475 ../lib/network/netconnect.pm:571
 #, c-format
 msgid "Provider:"
 msgstr "プロバイダ:"
 
-#: ../lib/network/netconnect.pm:481
+#: ../lib/network/netconnect.pm:484
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -4533,132 +4533,132 @@ msgstr ""
 "このモデムはサポートしていません。\n"
 "http://www.linmodems.org をご覧ください"
 
-#: ../lib/network/netconnect.pm:500
+#: ../lib/network/netconnect.pm:503
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "設定するモデムを選択:"
 
-#: ../lib/network/netconnect.pm:502
+#: ../lib/network/netconnect.pm:505
 #, c-format
 msgid "Modem"
 msgstr "モデム"
 
-#: ../lib/network/netconnect.pm:537
+#: ../lib/network/netconnect.pm:540
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "モデムが接続されているシリアルポートを選んでください。"
 
-#: ../lib/network/netconnect.pm:566
+#: ../lib/network/netconnect.pm:569
 #, c-format
 msgid "Select your provider:"
 msgstr "プロバイダを選択:"
 
-#: ../lib/network/netconnect.pm:590
+#: ../lib/network/netconnect.pm:593
 #, c-format
 msgid "Dialup: account options"
 msgstr "ダイアルアップ: アカウントのオプション"
 
-#: ../lib/network/netconnect.pm:593
+#: ../lib/network/netconnect.pm:596
 #, c-format
 msgid "Connection name"
 msgstr "接続名"
 
-#: ../lib/network/netconnect.pm:594
+#: ../lib/network/netconnect.pm:597
 #, c-format
 msgid "Phone number"
 msgstr "電話番号"
 
-#: ../lib/network/netconnect.pm:595
+#: ../lib/network/netconnect.pm:598
 #, c-format
 msgid "Login ID"
 msgstr "ログイン ID"
 
-#: ../lib/network/netconnect.pm:610 ../lib/network/netconnect.pm:643
+#: ../lib/network/netconnect.pm:613 ../lib/network/netconnect.pm:646
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "ダイアルアップ: IP パラメータ"
 
-#: ../lib/network/netconnect.pm:613
+#: ../lib/network/netconnect.pm:616
 #, c-format
 msgid "IP parameters"
 msgstr "IP パラメータ"
 
-#: ../lib/network/netconnect.pm:615
+#: ../lib/network/netconnect.pm:618
 #, c-format
 msgid "Subnet mask"
 msgstr "サブネットマスク"
 
-#: ../lib/network/netconnect.pm:627
+#: ../lib/network/netconnect.pm:630
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "ダイアルアップ: DNS パラメータ"
 
-#: ../lib/network/netconnect.pm:630
+#: ../lib/network/netconnect.pm:633
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: ../lib/network/netconnect.pm:631
+#: ../lib/network/netconnect.pm:634
 #, c-format
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: ../lib/network/netconnect.pm:632
+#: ../lib/network/netconnect.pm:635
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "プライマリ DNS サーバ (オプション)"
 
-#: ../lib/network/netconnect.pm:633
+#: ../lib/network/netconnect.pm:636
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "セカンド DNS サーバ (オプション)"
 
-#: ../lib/network/netconnect.pm:634
+#: ../lib/network/netconnect.pm:637
 #, c-format
 msgid "Set hostname from IP"
 msgstr "IP からホスト名を設定"
 
-#: ../lib/network/netconnect.pm:647
+#: ../lib/network/netconnect.pm:650
 #, c-format
 msgid "Gateway IP address"
 msgstr "ゲートウェイ IP アドレス"
 
-#: ../lib/network/netconnect.pm:680
+#: ../lib/network/netconnect.pm:683
 #, c-format
 msgid "Automatically at boot"
 msgstr "起動時に自動的に開始"
 
-#: ../lib/network/netconnect.pm:682
+#: ../lib/network/netconnect.pm:685
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "システムトレイの Net アプレットを使う"
 
-#: ../lib/network/netconnect.pm:684
+#: ../lib/network/netconnect.pm:687
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手動 (インターフェースは起動時に自動的に始動します)"
 
-#: ../lib/network/netconnect.pm:693
+#: ../lib/network/netconnect.pm:696
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "この接続にどのようにダイアルしますか？"
 
-#: ../lib/network/netconnect.pm:706
+#: ../lib/network/netconnect.pm:709
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "すぐにインターネットに接続しますか？"
 
-#: ../lib/network/netconnect.pm:733
+#: ../lib/network/netconnect.pm:736
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "インターネットに接続しました。"
 
-#: ../lib/network/netconnect.pm:734
+#: ../lib/network/netconnect.pm:737
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "セキュリティ上の理由で、接続を切ります。"
 
-#: ../lib/network/netconnect.pm:735
+#: ../lib/network/netconnect.pm:738
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -4667,108 +4667,142 @@ msgstr ""
 "このシステムはインターネットにつながっていないようです。\n"
 "接続を再設定してください。"
 
-#: ../lib/network/netconnect.pm:750
+#: ../lib/network/netconnect.pm:754
+#, fuzzy, c-format
+msgid "Problems occured during the network connectivity test."
+msgstr ""
+"ネットワークの再起動中に問題が発生: \n"
+"\n"
+"%s"
+
+#: ../lib/network/netconnect.pm:755
 #, c-format
 msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+
+#: ../lib/network/netconnect.pm:756
+#, c-format
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
+msgstr ""
+
+#: ../lib/network/netconnect.pm:759
+#, fuzzy, c-format
+msgid "Congratulations, the network configuration is finished."
 msgstr ""
 "おめでとうございます。ネットワークと\n"
 "インターネットの設定が完了しました。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:753
+#: ../lib/network/netconnect.pm:759
 #, c-format
 msgid ""
-"After this is done, we recommend that you restart your X environment to "
-"avoid any hostname-related problems."
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
 msgstr ""
-"設定が完了したら、ホスト名に関連した問題を避けるために、X を再起動することを"
-"お勧めします。"
 
-#: ../lib/network/netconnect.pm:754
-#, c-format
+#: ../lib/network/netconnect.pm:760
+#, fuzzy, c-format
 msgid ""
-"Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection does not "
-"work, you might want to relaunch the configuration."
+"If your connection does not work, you might want to relaunch the "
+"configuration."
 msgstr ""
 "設定中に問題が発生しました。\n"
 "net_monitor か Mandriva コントロールセンターで接続をテストしてください。\n"
 "接続できない場合は再設定してください。"
 
-#: ../lib/network/netconnect.pm:766
+#: ../lib/network/netconnect.pm:762
+#, fuzzy, c-format
+msgid "Congratulations, the network and Internet configuration are finished."
+msgstr ""
+"おめでとうございます。ネットワークと\n"
+"インターネットの設定が完了しました。\n"
+"\n"
+
+#: ../lib/network/netconnect.pm:763
+#, c-format
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+"設定が完了したら、ホスト名に関連した問題を避けるために、X を再起動することを"
+"お勧めします。"
+
+#: ../lib/network/netconnect.pm:774
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB モデム"
 
-#: ../lib/network/netconnect.pm:767 ../lib/network/netconnect.pm:768
+#: ../lib/network/netconnect.pm:775 ../lib/network/netconnect.pm:776
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan モデム"
 
-#: ../lib/network/netconnect.pm:769
+#: ../lib/network/netconnect.pm:777
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus モデム"
 
-#: ../lib/network/netconnect.pm:770
+#: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "LAN connection"
 msgstr "LAN 接続"
 
-#: ../lib/network/netconnect.pm:772
+#: ../lib/network/netconnect.pm:780
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../lib/network/netconnect.pm:773
+#: ../lib/network/netconnect.pm:781
 #, c-format
 msgid "Cable connection"
 msgstr "ケーブル接続"
 
-#: ../lib/network/netconnect.pm:774
+#: ../lib/network/netconnect.pm:782
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 接続"
 
-#: ../lib/network/netconnect.pm:775
+#: ../lib/network/netconnect.pm:783
 #, c-format
 msgid "Modem connection"
 msgstr "モデム接続"
 
-#: ../lib/network/netconnect.pm:776
+#: ../lib/network/netconnect.pm:784
 #, c-format
 msgid "DVB connection"
 msgstr "DVB 接続"
 
-#: ../lib/network/netconnect.pm:778
+#: ../lib/network/netconnect.pm:786
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(ポート %s で検出)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: ../lib/network/netconnect.pm:780
+#: ../lib/network/netconnect.pm:788
 #, c-format
 msgid "(detected %s)"
 msgstr "(%s を検出)"
 
-#: ../lib/network/netconnect.pm:780
+#: ../lib/network/netconnect.pm:788
 #, c-format
 msgid "(detected)"
 msgstr "(検出)"
 
-#: ../lib/network/netconnect.pm:781
+#: ../lib/network/netconnect.pm:789
 #, c-format
 msgid "Network Configuration"
 msgstr "ネットワークを設定"
 
-#: ../lib/network/netconnect.pm:782
+#: ../lib/network/netconnect.pm:790
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf ホスト名の解決"
 
-#: ../lib/network/netconnect.pm:783
+#: ../lib/network/netconnect.pm:791
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -4781,17 +4815,17 @@ msgstr ""
 "共有リソースを提示するときに使用する名前です。\n"
 "たいていのネットワークでは必要ありません。"
 
-#: ../lib/network/netconnect.pm:787
+#: ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf ホスト名"
 
-#: ../lib/network/netconnect.pm:788
+#: ../lib/network/netconnect.pm:796
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf ホスト名にはピリオド (.) を含めることはできません。"
 
-#: ../lib/network/netconnect.pm:789
+#: ../lib/network/netconnect.pm:797
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -4803,12 +4837,12 @@ msgstr ""
 "現在の設定をそのまま使うには「OK」をクリックしてください。ネットワーク/\n"
 "インターネットを再設定する場合は「キャンセル」を押します。\n"
 
-#: ../lib/network/netconnect.pm:792
+#: ../lib/network/netconnect.pm:800
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "ネットワークの再起動が必要です。再起動しますか？"
 
-#: ../lib/network/netconnect.pm:793
+#: ../lib/network/netconnect.pm:801
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -4819,7 +4853,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/network/netconnect.pm:794
+#: ../lib/network/netconnect.pm:802
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -4832,12 +4866,12 @@ msgstr ""
 "\n"
 "続けるには「%s」を押してください。"
 
-#: ../lib/network/netconnect.pm:795
+#: ../lib/network/netconnect.pm:803
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "設定が完了しました。適用しますか？"
 
-#: ../lib/network/netconnect.pm:796
+#: ../lib/network/netconnect.pm:804
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -4848,17 +4882,17 @@ msgstr ""
 "お使いになるものを選んでください。\n"
 "\n"
 
-#: ../lib/network/netconnect.pm:797
+#: ../lib/network/netconnect.pm:805
 #, c-format
 msgid "Internet connection"
 msgstr "インターネット接続"
 
-#: ../lib/network/netconnect.pm:799
+#: ../lib/network/netconnect.pm:807
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "ネットワークデバイス %s を設定 (ドライバ %s)"
 
-#: ../lib/network/netconnect.pm:800
+#: ../lib/network/netconnect.pm:808
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
@@ -4867,7 +4901,7 @@ msgstr ""
 "以下のプロトコルが LAN 接続の設定に使用できます。使用するものを選んでくださ"
 "い。"
 
-#: ../lib/network/netconnect.pm:801
+#: ../lib/network/netconnect.pm:809
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -4879,27 +4913,27 @@ msgstr ""
 "'mybox.mylab.myco.com' のように完全修飾ホスト名を\n"
 "入れてください。ゲートウェイの IP アドレスも入力できます。"
 
-#: ../lib/network/netconnect.pm:806
+#: ../lib/network/netconnect.pm:814
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "DNS サーバの IP アドレスも入力できます。"
 
-#: ../lib/network/netconnect.pm:807
+#: ../lib/network/netconnect.pm:815
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS サーバのアドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/netconnect.pm:808
+#: ../lib/network/netconnect.pm:816
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "ゲートウェイのアドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/netconnect.pm:809
+#: ../lib/network/netconnect.pm:817
 #, c-format
 msgid "Gateway device"
 msgstr "ゲートウェイデバイス"
 
-#: ../lib/network/netconnect.pm:823
+#: ../lib/network/netconnect.pm:831
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"