updated pot file

1 files changed, 994 insertions, 881 deletions

diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index 18a4e1c8f..67e8f1cdc 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ja\n"
-"POT-Creation-Date: 2005-05-22 20:07+0200\n"
-"PO-Revision-Date: 2005-04-22 20:15+0900\n"
+"POT-Creation-Date: 2005-05-31 13:03+0200\n"
+"PO-Revision-Date: 2005-05-27 11:30+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgstr ""
 "再起動ボタンをクリックし、プラグを抜いて書き込みプロテクトを外してから\n"
 "再度キーを差し込んで Mandriva Move を起動してください。"
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1325
 #, c-format
 msgid "Reboot"
 msgstr "再起動"
@@ -171,17 +171,20 @@ msgstr "デバイスの検出と設定を行っています。お待ちくださ
 #: diskdrake/interactive.pm:240 diskdrake/interactive.pm:401
 #: diskdrake/interactive.pm:419 diskdrake/interactive.pm:556
 #: diskdrake/interactive.pm:561 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:182
-#: install_any.pm:1698 install_any.pm:1721 install_steps.pm:82
+#: install_any.pm:1658 install_any.pm:1681 install_steps.pm:82
 #: install_steps_interactive.pm:38 interactive/http.pm:117
 #: interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:41
 #: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101
-#: network/netconnect.pm:1013 network/netconnect.pm:1121
-#: network/netconnect.pm:1125 network/netconnect.pm:1129
-#: network/netconnect.pm:1134 network/netconnect.pm:1266
-#: network/netconnect.pm:1270 network/netconnect.pm:1274
-#: network/netconnect.pm:1278 network/netconnect.pm:1386
-#: network/netconnect.pm:1391 network/netconnect.pm:1411
-#: network/netconnect.pm:1622 printer/printerdrake.pm:244
+#: network/netconnect.pm:915 network/netconnect.pm:1021
+#: network/netconnect.pm:1025 network/netconnect.pm:1029
+#: network/netconnect.pm:1034 network/netconnect.pm:1166
+#: network/netconnect.pm:1170 network/netconnect.pm:1174
+#: network/netconnect.pm:1178 network/netconnect.pm:1287
+#: network/netconnect.pm:1292 network/netconnect.pm:1312
+#: network/netconnect.pm:1523 network/thirdparty.pm:265
+#: network/thirdparty.pm:272 network/thirdparty.pm:308
+#: network/thirdparty.pm:310 network/thirdparty.pm:331
+#: network/thirdparty.pm:355 printer/printerdrake.pm:244
 #: printer/printerdrake.pm:251 printer/printerdrake.pm:276
 #: printer/printerdrake.pm:422 printer/printerdrake.pm:427
 #: printer/printerdrake.pm:440 printer/printerdrake.pm:450
@@ -220,14 +223,15 @@ msgstr "デバイスの検出と設定を行っています。お待ちくださ
 #: standalone/drakconnect:692 standalone/drakconnect:707
 #: standalone/drakfloppy:297 standalone/drakfloppy:300
 #: standalone/drakfloppy:306 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:261 standalone/drakroam:41 standalone/draksplash:26
+#: standalone/drakfont:261 standalone/drakgw:51 standalone/drakgw:191
+#: standalone/drakgw:220 standalone/drakgw:261 standalone/drakgw:295
+#: standalone/drakgw:400 standalone/drakroam:41 standalone/draksplash:15
 #: standalone/drakxtv:107 standalone/finish-install:39 standalone/logdrake:169
 #: standalone/logdrake:438 standalone/logdrake:443 standalone/scannerdrake:59
 #: standalone/scannerdrake:202 standalone/scannerdrake:261
 #: standalone/scannerdrake:715 standalone/scannerdrake:726
 #: standalone/scannerdrake:865 standalone/scannerdrake:876
 #: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
-#: wizards2.pm:95 wizards2.pm:99 wizards2.pm:121
 #, c-format
 msgid "Error"
 msgstr "エラー"
@@ -459,15 +463,16 @@ msgstr ""
 "このカードはXorg %s での3Dアクセラレーションが可能です。\n"
 "注意: これは実験的なサポートなので、マシンがフリーズするかもしれません。"
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:921
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:926
 #, c-format
 msgid "Custom"
 msgstr "カスタム"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:86 printer/printerdrake.pm:744
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4857
-#: standalone/draksplash:83 standalone/logdrake:174 standalone/net_applet:229
+#: install_steps_interactive.pm:86 install_steps_interactive.pm:1325
+#: printer/printerdrake.pm:744 printer/printerdrake.pm:4405
+#: printer/printerdrake.pm:4857 standalone/draksplash:85
+#: standalone/logdrake:174 standalone/net_applet:230
 #: standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
@@ -607,7 +612,7 @@ msgid "Resolutions"
 msgstr "解像度"
 
 #: Xconfig/resolution_and_depth.pm:310 diskdrake/hd_gtk.pm:339
-#: install_steps_gtk.pm:283 mouse.pm:168 services.pm:162
+#: install_steps_gtk.pm:284 mouse.pm:168 services.pm:162
 #: standalone/drakbackup:1581 standalone/drakperm:251
 #, c-format
 msgid "Other"
@@ -624,7 +629,7 @@ msgid "Graphics card: %s"
 msgstr "グラフィックカード: %s"
 
 #: Xconfig/resolution_and_depth.pm:374 interactive.pm:433
-#: interactive/gtk.pm:767 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/gtk.pm:808 interactive/http.pm:103 interactive/http.pm:156
 #: interactive/newt.pm:321 interactive/newt.pm:424 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
 #: standalone/drakTermServ:200 standalone/drakTermServ:518
@@ -633,15 +638,15 @@ msgstr "グラフィックカード: %s"
 #: standalone/drakconnect:166 standalone/drakconnect:885
 #: standalone/drakconnect:972 standalone/drakconnect:1071
 #: standalone/drakfont:574 standalone/drakfont:586 standalone/drakroam:392
-#: standalone/draksplash:145 standalone/drakups:212 standalone/net_monitor:345
+#: standalone/draksplash:160 standalone/drakups:212 standalone/net_monitor:345
 #: ugtk2.pm:409 ugtk2.pm:506 ugtk2.pm:908 ugtk2.pm:931
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
 #: Xconfig/resolution_and_depth.pm:374 diskdrake/smbnfs_gtk.pm:81 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:479 install_steps_interactive.pm:422
-#: install_steps_interactive.pm:827 interactive.pm:434 interactive/gtk.pm:771
+#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
+#: install_steps_interactive.pm:831 interactive.pm:434 interactive/gtk.pm:812
 #: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318
 #: interactive/newt.pm:428 interactive/stdio.pm:39 interactive/stdio.pm:142
 #: interactive/stdio.pm:176 printer/printerdrake.pm:3676
@@ -650,7 +655,7 @@ msgstr "OK"
 #: standalone/drakbackup:3947 standalone/drakconnect:165
 #: standalone/drakconnect:970 standalone/drakconnect:1070
 #: standalone/drakfont:586 standalone/drakfont:664 standalone/drakfont:741
-#: standalone/draksplash:145 standalone/drakups:219 standalone/logdrake:174
+#: standalone/draksplash:160 standalone/drakups:219 standalone/logdrake:174
 #: standalone/net_monitor:344 ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513
 #: ugtk2.pm:908
 #, c-format
@@ -658,8 +663,8 @@ msgid "Cancel"
 msgstr "キャンセル"
 
 #: Xconfig/resolution_and_depth.pm:374 diskdrake/hd_gtk.pm:153
-#: install_steps_gtk.pm:227 install_steps_gtk.pm:628 interactive.pm:528
-#: interactive/gtk.pm:637 interactive/gtk.pm:639 standalone/drakTermServ:285
+#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:528
+#: interactive/gtk.pm:678 interactive/gtk.pm:680 standalone/drakTermServ:285
 #: standalone/drakbackup:3881 standalone/drakbug:104
 #: standalone/drakconnect:161 standalone/drakconnect:246
 #: standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:336
@@ -809,10 +814,10 @@ msgid ""
 "other"
 msgstr "その他"
 
-#: any.pm:143 harddrake/sound.pm:191 interactive.pm:471 pkgs.pm:481
+#: any.pm:143 harddrake/sound.pm:191 interactive.pm:471 pkgs.pm:468
 #: standalone/drakconnect:168 standalone/drakconnect:646 standalone/draksec:68
 #: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:244
-#: standalone/service_harddrake:203
+#: standalone/service_harddrake:206
 #, c-format
 msgid "Please wait"
 msgstr "お待ちください"
@@ -969,7 +974,7 @@ msgid "Force No Local APIC"
 msgstr "ローカルAPIC無しを強制"
 
 #: any.pm:293 any.pm:637 authentication.pm:187 diskdrake/smbnfs_gtk.pm:180
-#: network/netconnect.pm:688 printer/printerdrake.pm:1663
+#: network/netconnect.pm:659 printer/printerdrake.pm:1663
 #: printer/printerdrake.pm:1784 standalone/drakbackup:1625
 #: standalone/drakbackup:3488 standalone/drakups:299
 #, c-format
@@ -1265,20 +1270,18 @@ msgstr "自動的に特定のユーザでログオンするように設定でき
 msgid "Do you want to use this feature?"
 msgstr "この機能を使いますか？"
 
-#: any.pm:690 help.pm:180 help.pm:285 help.pm:444 install_any.pm:887
+#: any.pm:690 help.pm:180 help.pm:285 help.pm:444 install_any.pm:861
 #: interactive.pm:158 modules/interactive.pm:71 printer/printerdrake.pm:743
-#: standalone/drakbackup:2501 standalone/drakgw:287 standalone/drakgw:288
-#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
-#: standalone/harddrake2:306 standalone/net_applet:309 ugtk2.pm:907
-#: wizards.pm:156 wizards2.pm:158
+#: standalone/drakbackup:2501 standalone/draksec:55 standalone/harddrake2:306
+#: standalone/net_applet:310 ugtk2.pm:907 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "はい"
 
 #: any.pm:690 help.pm:180 help.pm:285 help.pm:313 help.pm:444
-#: install_any.pm:887 interactive.pm:158 modules/interactive.pm:71
+#: install_any.pm:861 interactive.pm:158 modules/interactive.pm:71
 #: standalone/drakbackup:2501 standalone/draksec:54 standalone/harddrake2:307
-#: standalone/net_applet:305 ugtk2.pm:907 wizards.pm:156 wizards2.pm:158
+#: standalone/net_applet:306 ugtk2.pm:907 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "いいえ"
@@ -1324,56 +1327,56 @@ msgstr "Unicodeをデフォルトにする"
 msgid "All languages"
 msgstr "全ての言語"
 
-#: any.pm:794 help.pm:566 help.pm:855 install_steps_interactive.pm:947
+#: any.pm:798 help.pm:566 help.pm:855 install_steps_interactive.pm:952
 #, c-format
 msgid "Country / Region"
 msgstr "国名/地域"
 
-#: any.pm:795
+#: any.pm:799
 #, c-format
 msgid "Please choose your country."
 msgstr "お住いの国を選んでください"
 
-#: any.pm:797
+#: any.pm:801
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "利用可能なすべての国名のリスト"
 
-#: any.pm:798
+#: any.pm:802
 #, c-format
 msgid "Other Countries"
 msgstr "他の国"
 
-#: any.pm:798 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
+#: any.pm:802 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:394
 #, c-format
 msgid "Advanced"
 msgstr "詳細"
 
-#: any.pm:806
+#: any.pm:810
 #, c-format
 msgid "Input method:"
 msgstr "入力メソッド:"
 
-#: any.pm:807 install_any.pm:422 network/netconnect.pm:186
-#: network/netconnect.pm:380 network/netconnect.pm:385
-#: network/netconnect.pm:1377 printer/printerdrake.pm:105
+#: any.pm:811 install_any.pm:406 network/netconnect.pm:187
+#: network/netconnect.pm:381 network/netconnect.pm:386
+#: network/netconnect.pm:1278 printer/printerdrake.pm:105
 #: printer/printerdrake.pm:2199
 #, c-format
 msgid "None"
 msgstr "なし"
 
-#: any.pm:921
+#: any.pm:926
 #, c-format
 msgid "No sharing"
 msgstr "共有しない"
 
-#: any.pm:921
+#: any.pm:926
 #, c-format
 msgid "Allow all users"
 msgstr "全てのユーザに許可"
 
-#: any.pm:925
+#: any.pm:930
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1387,14 +1390,14 @@ msgstr ""
 "クリックするだけで共有することができます。\n"
 "[カスタム]を選ぶとユーザごとに細かく設定できます。\n"
 
-#: any.pm:937
+#: any.pm:942
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 伝統的なUnixファイル共有システム"
 
-#: any.pm:940
+#: any.pm:945
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -1402,18 +1405,18 @@ msgid ""
 msgstr ""
 "SMB: Windows/Mac OS X や新しいLinuxシステムで使われるファイル共有システム"
 
-#: any.pm:948
+#: any.pm:953
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "エクスポートにはNFSとSMBを使用できます。どちらを使いますか？"
 
-#: any.pm:973
+#: any.pm:978
 #, c-format
 msgid "Launch userdrake"
 msgstr "userdrakeを起動"
 
-#: any.pm:973 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903
+#: any.pm:978 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903
 #: printer/printerdrake.pm:3904 printer/printerdrake.pm:3905
 #: printer/printerdrake.pm:5166 standalone/drakTermServ:295
 #: standalone/drakbackup:4081 standalone/drakbug:126 standalone/drakfont:497
@@ -1423,7 +1426,7 @@ msgstr "userdrakeを起動"
 msgid "Close"
 msgstr "閉じる"
 
-#: any.pm:975
+#: any.pm:980
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1707,7 +1710,7 @@ msgstr "パスワードなし"
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "このパスワードは短すぎます(最低でも %d 文字以上にしてください)"
 
-#: authentication.pm:189 network/netconnect.pm:385 network/netconnect.pm:689
+#: authentication.pm:189 network/netconnect.pm:386 network/netconnect.pm:660
 #: standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:492
 #, c-format
 msgid "Authentication"
@@ -1846,7 +1849,7 @@ msgstr "オーストラリア"
 
 #: crypto.pm:16 crypto.pm:50 lang.pm:214 network/adsl_consts.pm:93
 #: network/adsl_consts.pm:102 network/adsl_consts.pm:114
-#: network/adsl_consts.pm:123 network/netconnect.pm:51
+#: network/adsl_consts.pm:123 network/netconnect.pm:52
 #, c-format
 msgid "Belgium"
 msgstr "ベルギー"
@@ -1916,7 +1919,7 @@ msgstr "フィンランド"
 #: network/adsl_consts.pm:431 network/adsl_consts.pm:442
 #: network/adsl_consts.pm:454 network/adsl_consts.pm:466
 #: network/adsl_consts.pm:477 network/adsl_consts.pm:488
-#: network/netconnect.pm:48
+#: network/netconnect.pm:49
 #, c-format
 msgid "France"
 msgstr "フランス"
@@ -1944,7 +1947,7 @@ msgstr "イスラエル"
 
 #: crypto.pm:32 crypto.pm:63 lang.pm:300 network/adsl_consts.pm:557
 #: network/adsl_consts.pm:569 network/adsl_consts.pm:580
-#: network/adsl_consts.pm:589 network/netconnect.pm:50 standalone/drakxtv:47
+#: network/adsl_consts.pm:589 network/netconnect.pm:51 standalone/drakxtv:47
 #, c-format
 msgid "Italy"
 msgstr "イタリア"
@@ -1956,7 +1959,7 @@ msgstr "日本"
 
 #: crypto.pm:34 crypto.pm:65 lang.pm:352 network/adsl_consts.pm:620
 #: network/adsl_consts.pm:629 network/adsl_consts.pm:638
-#: network/adsl_consts.pm:647 network/netconnect.pm:49
+#: network/adsl_consts.pm:647 network/netconnect.pm:50
 #, c-format
 msgid "Netherlands"
 msgstr "オランダ"
@@ -2015,7 +2018,7 @@ msgstr "台湾"
 msgid "South Africa"
 msgstr "南アフリカ"
 
-#: crypto.pm:78 crypto.pm:108 lang.pm:416 network/netconnect.pm:52
+#: crypto.pm:78 crypto.pm:108 lang.pm:416 network/netconnect.pm:53
 #, c-format
 msgid "United States"
 msgstr "アメリカ合衆国"
@@ -2122,7 +2125,7 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "パーティションをクリックしてください"
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:481
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482
 #: standalone/drakbackup:2936 standalone/drakbackup:2996
 #, c-format
 msgid "Details"
@@ -2728,7 +2731,7 @@ msgstr "DOSのドライブレター: %s (推定)\n"
 msgid "Type: "
 msgstr "種類: "
 
-#: diskdrake/interactive.pm:1197 install_steps_gtk.pm:295
+#: diskdrake/interactive.pm:1197 install_steps_gtk.pm:296
 #, c-format
 msgid "Name: "
 msgstr "名前: "
@@ -2756,7 +2759,7 @@ msgstr "シリンダ %d から %d まで\n"
 #: diskdrake/interactive.pm:1210
 #, c-format
 msgid "Number of logical extents: %d\n"
-msgstr ""
+msgstr "論理エクステントの数: %d\n"
 
 #: diskdrake/interactive.pm:1211
 #, c-format
@@ -2897,7 +2900,7 @@ msgstr "この暗号キーは簡単すぎます(最低でも %d 文字以上に�
 msgid "The encryption keys do not match"
 msgstr "暗号キーが一致しません"
 
-#: diskdrake/interactive.pm:1295 network/netconnect.pm:1222
+#: diskdrake/interactive.pm:1295 network/netconnect.pm:1122
 #: standalone/drakconnect:430
 #, c-format
 msgid "Encryption key"
@@ -3222,7 +3225,7 @@ msgstr "空き容量が少ないので自動的に割り当てられません"
 msgid "Nothing to do"
 msgstr "することがありません"
 
-#: harddrake/data.pm:62 install_any.pm:1639
+#: harddrake/data.pm:62 install_any.pm:1599
 #, c-format
 msgid "Floppy"
 msgstr "フロッピー"
@@ -3232,12 +3235,12 @@ msgstr "フロッピー"
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:88 install_any.pm:1640
+#: harddrake/data.pm:88 install_any.pm:1600
 #, c-format
 msgid "Hard Disk"
 msgstr "ディスク"
 
-#: harddrake/data.pm:97 install_any.pm:1641
+#: harddrake/data.pm:97 install_any.pm:1601
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
@@ -3265,7 +3268,7 @@ msgstr "ビデオカード"
 #: harddrake/data.pm:146
 #, c-format
 msgid "DVB card"
-msgstr ""
+msgstr "DVBカード"
 
 #: harddrake/data.pm:154
 #, c-format
@@ -3300,34 +3303,34 @@ msgstr "ISDNアダプタ"
 #: harddrake/data.pm:220
 #, c-format
 msgid "USB sound devices"
-msgstr ""
+msgstr "USBサウンドデバイス"
 
 #: harddrake/data.pm:229
 #, c-format
 msgid "Radio cards"
-msgstr ""
+msgstr "ラジオカード"
 
 #: harddrake/data.pm:238
 #, c-format
 msgid "ATM network cards"
-msgstr ""
+msgstr "ATMネットワークカード"
 
 #: harddrake/data.pm:247
 #, c-format
 msgid "WAN network cards"
-msgstr ""
+msgstr "WANネットワークカード"
 
 #: harddrake/data.pm:256
 #, c-format
 msgid "Bluetooth devices"
-msgstr ""
+msgstr "Bluetoothデバイス"
 
 #: harddrake/data.pm:265
 #, c-format
 msgid "Ethernetcard"
 msgstr "Ethernetカード"
 
-#: harddrake/data.pm:283 network/netconnect.pm:575
+#: harddrake/data.pm:283 network/netconnect.pm:573
 #, c-format
 msgid "Modem"
 msgstr "モデム"
@@ -3348,7 +3351,7 @@ msgid "AGP controllers"
 msgstr "AGPコントローラ"
 
 #: harddrake/data.pm:325 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:979
+#: install_steps_interactive.pm:984
 #, c-format
 msgid "Printer"
 msgstr "プリンタ"
@@ -3357,7 +3360,7 @@ msgstr "プリンタ"
 #: harddrake/data.pm:339
 #, c-format
 msgid "Game port controllers"
-msgstr ""
+msgstr "ゲームポートコントローラ"
 
 #: harddrake/data.pm:348
 #, c-format
@@ -3415,7 +3418,7 @@ msgid "Bridges and system controllers"
 msgstr "ブリッジとシステムコントローラ"
 
 #: harddrake/data.pm:448 help.pm:855 install_steps_interactive.pm:118
-#: install_steps_interactive.pm:939 standalone/keyboarddrake:29
+#: install_steps_interactive.pm:944 standalone/keyboarddrake:29
 #, c-format
 msgid "Keyboard"
 msgstr "キーボード"
@@ -3423,29 +3426,29 @@ msgstr "キーボード"
 #: harddrake/data.pm:461
 #, c-format
 msgid "Tablet and touchscreen"
-msgstr ""
+msgstr "タブレットとタッチスクリーン"
 
-#: harddrake/data.pm:469 help.pm:855 install_steps_interactive.pm:972
+#: harddrake/data.pm:470 help.pm:855 install_steps_interactive.pm:977
 #, c-format
 msgid "Mouse"
 msgstr "マウス"
 
-#: harddrake/data.pm:483
+#: harddrake/data.pm:484
 #, c-format
 msgid "UPS"
 msgstr "UPS"
 
-#: harddrake/data.pm:492
+#: harddrake/data.pm:493
 #, c-format
 msgid "Scanner"
 msgstr "スキャナ"
 
-#: harddrake/data.pm:502 standalone/harddrake2:440
+#: harddrake/data.pm:503 standalone/harddrake2:440
 #, c-format
 msgid "Unknown/Others"
 msgstr "不明/その他"
 
-#: harddrake/data.pm:530
+#: harddrake/data.pm:531
 #, c-format
 msgid "cpu # "
 msgstr "CPU # "
@@ -3541,8 +3544,8 @@ msgstr "ドライバ:"
 msgid "Trouble shooting"
 msgstr "不具合対策"
 
-#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1072
-#: network/ndiswrapper.pm:95 network/netconnect.pm:561
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1081
+#: network/ndiswrapper.pm:95 network/netconnect.pm:552
 #: printer/printerdrake.pm:1206 printer/printerdrake.pm:2230
 #: printer/printerdrake.pm:2316 printer/printerdrake.pm:2362
 #: printer/printerdrake.pm:2429 printer/printerdrake.pm:2464
@@ -3682,8 +3685,8 @@ msgstr ""
 "\n"
 "現在のドライバは %s で、お使いのサウンドカードは %s です。"
 
-#: harddrake/v4l.pm:14 standalone/net_applet:74 standalone/net_applet:75
-#: standalone/net_applet:77
+#: harddrake/v4l.pm:14 standalone/net_applet:75 standalone/net_applet:76
+#: standalone/net_applet:78
 #, c-format
 msgid "Auto-detect"
 msgstr "自動検出"
@@ -3763,8 +3766,8 @@ msgstr ""
 "全体に適用されます。全ての項目に同意する場合は \"%s\" を押してください。\n"
 "そうでない場合は \"%s\" をクリックしてコンピュータを再起動してください。"
 
-#: help.pm:14 install_steps_gtk.pm:551 install_steps_interactive.pm:92
-#: install_steps_interactive.pm:731 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:735 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "承諾する"
@@ -3848,12 +3851,12 @@ msgstr ""
 msgid "User name"
 msgstr "ユーザ名"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:232
-#: install_steps_gtk.pm:693 interactive.pm:433 interactive/newt.pm:321
-#: network/netconnect.pm:335 network/tools.pm:191 printer/printerdrake.pm:3678
-#: standalone/drakTermServ:383 standalone/drakbackup:3938
-#: standalone/drakbackup:4032 standalone/drakbackup:4049
-#: standalone/drakbackup:4067 ugtk2.pm:506
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
+#: install_steps_gtk.pm:694 interactive.pm:433 interactive/newt.pm:321
+#: network/netconnect.pm:336 network/thirdparty.pm:321
+#: printer/printerdrake.pm:3678 standalone/drakTermServ:383
+#: standalone/drakbackup:3938 standalone/drakbackup:4032
+#: standalone/drakbackup:4049 standalone/drakbackup:4067 ugtk2.pm:506
 #, c-format
 msgid "Next"
 msgstr "次へ"
@@ -4064,7 +4067,7 @@ msgstr "開発用"
 msgid "Graphical Environment"
 msgstr "グラフィカル環境"
 
-#: help.pm:146 install_steps_gtk.pm:230 install_steps_interactive.pm:642
+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
 #, c-format
 msgid "Individual package selection"
 msgstr "パッケージを個別に選択"
@@ -4175,7 +4178,7 @@ msgstr ""
 "マニュアルに掲載されているインターフェースはインストール中に使用したもの\n"
 "とほぼ同じです。"
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:606
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
 #: standalone/drakbackup:2325 standalone/drakbackup:2329
 #: standalone/drakbackup:2333 standalone/drakbackup:2337
 #, c-format
@@ -4247,7 +4250,7 @@ msgstr ""
 "です。このオプションを使うと、このマシンをローカルネットワーク内の他の\n"
 "マシンのタイムサーバとして機能させることができます。"
 
-#: help.pm:217 install_steps_interactive.pm:874
+#: help.pm:217 install_steps_interactive.pm:879
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "ハードウェアクロックをGMTに設定する"
@@ -4671,17 +4674,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "自動インストールフロッピーを作成"
 
-#: help.pm:409 install_steps_interactive.pm:1331
+#: help.pm:409 install_steps_interactive.pm:1336
 #, c-format
 msgid "Replay"
 msgstr "再現"
 
-#: help.pm:409 install_steps_interactive.pm:1331
+#: help.pm:409 install_steps_interactive.pm:1336
 #, c-format
 msgid "Automated"
 msgstr "自動"
 
-#: help.pm:409 install_steps_interactive.pm:1334
+#: help.pm:409 install_steps_interactive.pm:1339
 #, c-format
 msgid "Save packages selection"
 msgstr "パッケージの選択を保存する"
@@ -4730,7 +4733,7 @@ msgstr ""
 "ディスクの不良ブロックを検証するパーティションを選ぶには %s を\n"
 "クリックしてください。"
 
-#: help.pm:431 install_steps_gtk.pm:387 interactive.pm:434
+#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
 #: standalone/drakTermServ:362 standalone/drakbackup:3898
 #: standalone/drakbackup:3937 standalone/drakbackup:4048
@@ -4765,7 +4768,7 @@ msgstr ""
 "表示されたら内容を確認し、インストールする場合は %s を、中止する\n"
 "場合は %s を押してください。"
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:386
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
 #: install_steps_interactive.pm:156 standalone/drakbackup:4095
 #, c-format
 msgid "Install"
@@ -5501,8 +5504,8 @@ msgstr ""
 "表示されたサウンドカードがお使いのものでない場合は、ボタンをクリックして\n"
 "別のドライバを選んでください。"
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1006
-#: install_steps_interactive.pm:1023
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1011
+#: install_steps_interactive.pm:1028
 #, c-format
 msgid "Sound card"
 msgstr "サウンドカード"
@@ -5636,12 +5639,12 @@ msgstr ""
 " * %s: ここではどのサービスを有効にするかを細かく設定できます。\n"
 "サーバになるマシンであれば設定を見直すことをお勧めします。"
 
-#: help.pm:855 install_steps_interactive.pm:965 standalone/drakclock:100
+#: help.pm:855 install_steps_interactive.pm:970 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: help.pm:855 install_steps_interactive.pm:1039
+#: help.pm:855 install_steps_interactive.pm:1044
 #, c-format
 msgid "TV card"
 msgstr "テレビカード"
@@ -5656,33 +5659,33 @@ msgstr "ISDNカード"
 msgid "Graphical Interface"
 msgstr "グラフィカルインターフェース"
 
-#: help.pm:855 install_any.pm:1662 install_steps_interactive.pm:1057
+#: help.pm:855 install_any.pm:1622 install_steps_interactive.pm:1062
 #: standalone/drakbackup:2019
 #, c-format
 msgid "Network"
 msgstr "ネットワーク"
 
-#: help.pm:855 install_steps_interactive.pm:1072
+#: help.pm:855 install_steps_interactive.pm:1077
 #, c-format
 msgid "Proxies"
 msgstr "プロクシ"
 
-#: help.pm:855 install_steps_interactive.pm:1083
+#: help.pm:855 install_steps_interactive.pm:1088
 #, c-format
 msgid "Security Level"
 msgstr "セキュリティレベル"
 
-#: help.pm:855 install_steps_interactive.pm:1097
+#: help.pm:855 install_steps_interactive.pm:1102
 #, c-format
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: help.pm:855 install_steps_interactive.pm:1113
+#: help.pm:855 install_steps_interactive.pm:1118
 #, c-format
 msgid "Bootloader"
 msgstr "ブートローダ"
 
-#: help.pm:855 install_steps_interactive.pm:1126 services.pm:193
+#: help.pm:855 install_steps_interactive.pm:1131 services.pm:193
 #, c-format
 msgid "Services"
 msgstr "サービス"
@@ -5743,13 +5746,13 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "%s もフォーマットしてください"
 
-#: install_any.pm:406
+#: install_any.pm:390
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "他に補助的なメディアがありますか？"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:409
+#: install_any.pm:393
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -5762,7 +5765,7 @@ msgstr ""
 "\n"
 "この他に設定する補助的なインストールメディアはありますか？"
 
-#: install_any.pm:422 printer/printerdrake.pm:3022
+#: install_any.pm:406 printer/printerdrake.pm:3022
 #: printer/printerdrake.pm:3029 standalone/scannerdrake:182
 #: standalone/scannerdrake:190 standalone/scannerdrake:241
 #: standalone/scannerdrake:248
@@ -5770,49 +5773,49 @@ msgstr ""
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: install_any.pm:422
+#: install_any.pm:406
 #, c-format
 msgid "Network (http)"
 msgstr "ネットワーク(http)"
 
-#: install_any.pm:422
+#: install_any.pm:406
 #, c-format
 msgid "Network (ftp)"
 msgstr "ネットワーク(ftp)"
 
-#: install_any.pm:451
+#: install_any.pm:436
 #, c-format
 msgid "Insert the CD 1 again"
 msgstr "再度 CD 1 を入れてください"
 
-#: install_any.pm:479 standalone/drakbackup:112
+#: install_any.pm:460 standalone/drakbackup:112
 #, c-format
 msgid "No device found"
 msgstr "デバイスが見つかりません"
 
-#: install_any.pm:484
+#: install_any.pm:465
 #, c-format
 msgid "Insert the CD"
 msgstr "CDを挿入"
 
-#: install_any.pm:489
+#: install_any.pm:470
 #, c-format
 msgid "Unable to mount CD-ROM"
 msgstr "CD-ROMをマウントできません"
 
-#: install_any.pm:521 install_any.pm:525
+#: install_any.pm:502 install_any.pm:506
 #, c-format
 msgid "URL of the mirror?"
 msgstr "ミラーのURL"
 
-#: install_any.pm:558
+#: install_any.pm:539
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "このミラーにはhdlistファイルがありません"
 
-#: install_any.pm:725
+#: install_any.pm:699
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -5822,13 +5825,13 @@ msgstr ""
 "CD-ROMを交換してください。\n"
 "\"%s\" というCD-ROMをドライブにいれて[OK]を押してください。"
 
-#: install_any.pm:738
+#: install_any.pm:712
 #, c-format
 msgid "Copying in progress"
 msgstr "コピーしています"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:878
+#: install_any.pm:852
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5852,7 +5855,7 @@ msgstr ""
 "本当にこれらのサーバをインストールしますか？\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:901
+#: install_any.pm:875
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5865,22 +5868,22 @@ msgstr ""
 "\n"
 "これらのパッケージを削除してよろしいですか？\n"
 
-#: install_any.pm:1349 partition_table.pm:603
+#: install_any.pm:1309 partition_table.pm:603
 #, c-format
 msgid "Error reading file %s"
 msgstr "ファイル %s を読み込み中にエラー"
 
-#: install_any.pm:1559
+#: install_any.pm:1519
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "次のディスクの名前は変更されました:"
 
-#: install_any.pm:1561
+#: install_any.pm:1521
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (変更前の名前は %s)"
 
-#: install_any.pm:1599
+#: install_any.pm:1559
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5889,42 +5892,42 @@ msgstr ""
 "エラー発生 - 新しいファイルシステムを作成するためのデバイスが\n"
 "見つかりません。ハードウェアを確認してください。"
 
-#: install_any.pm:1643
+#: install_any.pm:1603
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: install_any.pm:1643
+#: install_any.pm:1603
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: install_any.pm:1643
+#: install_any.pm:1603
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: install_any.pm:1666
+#: install_any.pm:1626
 #, c-format
 msgid "Please choose a media"
 msgstr "メディアを選んでください"
 
-#: install_any.pm:1698
+#: install_any.pm:1658
 #, c-format
 msgid "Bad media %s"
 msgstr "不正なメディア %s"
 
-#: install_any.pm:1710
+#: install_any.pm:1670
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ファイルが既に存在します。上書きしますか？"
 
-#: install_any.pm:1761
+#: install_any.pm:1721
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "パーティション設定が終わるまでスクリーンショットは撮れません"
 
-#: install_any.pm:1768
+#: install_any.pm:1728
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "%s にインストール後スクリーンショットが可能になります"
@@ -5970,7 +5973,7 @@ msgstr ""
 "\n"
 "このまま続けますか？"
 
-#: install_interactive.pm:70 install_steps.pm:211
+#: install_interactive.pm:70 install_steps.pm:219
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "/boot/efiにマウントされたFATパーティションが必要です"
@@ -6470,12 +6473,12 @@ msgstr ""
 msgid "http://www.mandrivalinux.com/en/errata.php3"
 msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
-#: install_steps.pm:246
+#: install_steps.pm:254
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "マウントポイント %s は重複しています"
 
-#: install_steps.pm:479
+#: install_steps.pm:489
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -6492,78 +6495,83 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr "%s を開始\n"
 
-#: install_steps_gtk.pm:176
+#: install_steps_gtk.pm:177
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
+"リソースが足りません。Mandriva Linuxをインストール中に問題が発生する\n"
+"可能性があります。\n"
+"別の方法として、テキストモードでインストールすることもできます。\n"
+"その場合は、CD-ROMから起動した時に[F1]を押し、続いて'text'と入力\n"
+"してください。"
 
-#: install_steps_gtk.pm:223 install_steps_interactive.pm:624
+#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
 #, c-format
 msgid "Package Group Selection"
 msgstr "パッケージグループを選択"
 
 # Changed "total size" to "total", due to problem of available
 # space on screen.
-#: install_steps_gtk.pm:249 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "合計: %d/%d MB"
 
-#: install_steps_gtk.pm:294
+#: install_steps_gtk.pm:295
 #, c-format
 msgid "Bad package"
 msgstr "不正なパッケージ"
 
-#: install_steps_gtk.pm:296
+#: install_steps_gtk.pm:297
 #, c-format
 msgid "Version: "
 msgstr "バージョン: "
 
-#: install_steps_gtk.pm:297
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "Size: "
 msgstr "サイズ: "
 
-#: install_steps_gtk.pm:297
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:298
+#: install_steps_gtk.pm:299
 #, c-format
 msgid "Importance: "
 msgstr "重要性: "
 
-#: install_steps_gtk.pm:331
+#: install_steps_gtk.pm:332
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "このパッケージの選択/非選択は変更できません"
 
-#: install_steps_gtk.pm:335
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "due to missing %s"
 msgstr "%s がないために"
 
-#: install_steps_gtk.pm:336
+#: install_steps_gtk.pm:337
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s が依存を満たしていないために"
 
-#: install_steps_gtk.pm:337
+#: install_steps_gtk.pm:338
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s をアップグレードするために"
 
-#: install_steps_gtk.pm:338
+#: install_steps_gtk.pm:339
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s を維持するために"
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:344
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
@@ -6571,27 +6579,27 @@ msgid ""
 msgstr ""
 "このパッケージは選択できません。インストールに必要な空き容量がありません。"
 
-#: install_steps_gtk.pm:346
+#: install_steps_gtk.pm:347
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "以下のパッケージをインストールします"
 
-#: install_steps_gtk.pm:347
+#: install_steps_gtk.pm:348
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "以下のパッケージを削除します"
 
-#: install_steps_gtk.pm:371
+#: install_steps_gtk.pm:372
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "これは必須パッケージです。選択を解除することはできません。"
 
-#: install_steps_gtk.pm:373
+#: install_steps_gtk.pm:374
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "このパッケージの選択は解除できません。既にインストールされています。"
 
-#: install_steps_gtk.pm:376
+#: install_steps_gtk.pm:377
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6600,78 +6608,78 @@ msgstr ""
 "このパッケージはアップグレードが必要です。\n"
 "本当に選択を解除しますか？"
 
-#: install_steps_gtk.pm:379
+#: install_steps_gtk.pm:380
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
 msgstr "このパッケージの選択は解除できません。アップグレードが必要です。"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:385
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自動的に選択されたパッケージを表示"
 
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:390
 #, c-format
 msgid "Load/Save selection"
 msgstr "選択を読み込む/保存する"
 
-#: install_steps_gtk.pm:390
+#: install_steps_gtk.pm:391
 #, c-format
 msgid "Updating package selection"
 msgstr "パッケージの選択を更新"
 
-#: install_steps_gtk.pm:395
+#: install_steps_gtk.pm:396
 #, c-format
 msgid "Minimal install"
 msgstr "最小インストール"
 
-#: install_steps_gtk.pm:409 install_steps_interactive.pm:483
+#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "インストールするパッケージを選んでください"
 
-#: install_steps_gtk.pm:425 install_steps_interactive.pm:706
+#: install_steps_gtk.pm:426 install_steps_interactive.pm:710
 #, c-format
 msgid "Installing"
 msgstr "インストール中"
 
-#: install_steps_gtk.pm:432
+#: install_steps_gtk.pm:433
 #, c-format
 msgid "Estimating"
 msgstr "試算しています"
 
-#: install_steps_gtk.pm:481
+#: install_steps_gtk.pm:482
 #, c-format
 msgid "No details"
 msgstr "詳細なし"
 
-#: install_steps_gtk.pm:489
+#: install_steps_gtk.pm:490
 #, c-format
 msgid "Time remaining "
 msgstr "残り時間 "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:497
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "インストールを準備中。お待ちください.."
 
-#: install_steps_gtk.pm:511
+#: install_steps_gtk.pm:512
 #, c-format
 msgid "%d packages"
 msgstr "%d 個のパッケージ"
 
-#: install_steps_gtk.pm:516
+#: install_steps_gtk.pm:517
 #, c-format
 msgid "Installing package %s"
 msgstr "パッケージ %s をインストール"
 
-#: install_steps_gtk.pm:551 install_steps_interactive.pm:92
-#: install_steps_interactive.pm:731
+#: install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:735
 #, c-format
 msgid "Refuse"
 msgstr "拒否する"
 
-#: install_steps_gtk.pm:555 install_steps_interactive.pm:735
+#: install_steps_gtk.pm:556 install_steps_interactive.pm:739
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -6683,29 +6691,29 @@ msgstr ""
 "\"%s\" というCD-ROMをドライブにいれて[OK]を押してください。\n"
 "お持ちでない場合は[キャンセル]を押してください。"
 
-#: install_steps_gtk.pm:570 install_steps_interactive.pm:746
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:750
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "パッケージを並べかえ中にエラーが発生:"
 
-#: install_steps_gtk.pm:570 install_steps_gtk.pm:574
-#: install_steps_interactive.pm:746 install_steps_interactive.pm:750
+#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
+#: install_steps_interactive.pm:750 install_steps_interactive.pm:754
 #, c-format
 msgid "Go on anyway?"
 msgstr "続けますか？"
 
-#: install_steps_gtk.pm:574 install_steps_interactive.pm:750
+#: install_steps_gtk.pm:575 install_steps_interactive.pm:754
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "パッケージをインストール中にエラーが発生:"
 
-#: install_steps_gtk.pm:616 install_steps_interactive.pm:921
-#: install_steps_interactive.pm:1073
+#: install_steps_gtk.pm:617 install_steps_interactive.pm:926
+#: install_steps_interactive.pm:1078
 #, c-format
 msgid "not configured"
 msgstr "設定されていません"
 
-#: install_steps_gtk.pm:679
+#: install_steps_gtk.pm:680
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -6714,7 +6722,7 @@ msgstr ""
 "次のインストールメディアを検出しました。\n"
 "使用しないものがあればここで選択を解除してください。"
 
-#: install_steps_gtk.pm:688
+#: install_steps_gtk.pm:689
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -6726,7 +6734,7 @@ msgstr ""
 "そうするとインストーラはハードドライブからインストールを続けます。コピーされ"
 "たパッケージはインストール完了後も利用できます。"
 
-#: install_steps_gtk.pm:690
+#: install_steps_gtk.pm:691
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD全体をコピー"
@@ -6821,7 +6829,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "IDEを設定"
 
-#: install_steps_interactive.pm:256 network/tools.pm:181
+#: install_steps_interactive.pm:256
 #, c-format
 msgid "No partition available"
 msgstr "利用可能なパーティションがありません"
@@ -6901,7 +6909,7 @@ msgstr "インストール済みパッケージを探しています"
 msgid "Finding packages to upgrade..."
 msgstr "更新するパッケージを探しています"
 
-#: install_steps_interactive.pm:421 install_steps_interactive.pm:826
+#: install_steps_interactive.pm:421 install_steps_interactive.pm:830
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "パッケージを取得するミラーを選択"
@@ -6989,12 +6997,12 @@ msgstr ""
 msgid "Cd-Rom labeled \"%s\""
 msgstr "%s というCD-ROM"
 
-#: install_steps_interactive.pm:706
+#: install_steps_interactive.pm:710
 #, c-format
 msgid "Preparing installation"
 msgstr "インストールの準備"
 
-#: install_steps_interactive.pm:715
+#: install_steps_interactive.pm:719
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -7003,17 +7011,17 @@ msgstr ""
 "パッケージ %s をインストール\n"
 "%d%%"
 
-#: install_steps_interactive.pm:764
+#: install_steps_interactive.pm:768
 #, c-format
 msgid "Post-install configuration"
 msgstr "インストール後の設定"
 
-#: install_steps_interactive.pm:771
+#: install_steps_interactive.pm:775
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "更新モジュールメディアがドライブ %s に入っていることを確認してください"
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:804
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -7033,78 +7041,78 @@ msgstr ""
 "\n"
 "更新されたパッケージをインストールしますか？"
 
-#: install_steps_interactive.pm:821
+#: install_steps_interactive.pm:825
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "Mandriva Linuxのサイトに接続してミラーのリストを取得しています"
 
-#: install_steps_interactive.pm:840
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "ミラーに接続して利用可能なパッケージのリストを取得しています"
 
-#: install_steps_interactive.pm:844
+#: install_steps_interactive.pm:848
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "ミラー %s に接続できません"
 
-#: install_steps_interactive.pm:844
+#: install_steps_interactive.pm:848
 #, c-format
 msgid "Would you like to try again?"
 msgstr "もう一度試みますか？"
 
-#: install_steps_interactive.pm:870 standalone/drakclock:45
+#: install_steps_interactive.pm:875 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "タイムゾーンを選んでください。"
 
-#: install_steps_interactive.pm:875
+#: install_steps_interactive.pm:880
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自動的に時間を合わせる(NTPを使用)"
 
-#: install_steps_interactive.pm:883
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "NTP Server"
 msgstr "NTPサーバ"
 
-#: install_steps_interactive.pm:925 steps.pm:30
+#: install_steps_interactive.pm:930 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "要約"
 
-#: install_steps_interactive.pm:938 install_steps_interactive.pm:946
-#: install_steps_interactive.pm:964 install_steps_interactive.pm:971
-#: install_steps_interactive.pm:1125 services.pm:133
+#: install_steps_interactive.pm:943 install_steps_interactive.pm:951
+#: install_steps_interactive.pm:969 install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1130 services.pm:133
 #: standalone/drakbackup:1571
 #, c-format
 msgid "System"
 msgstr "システム"
 
-#: install_steps_interactive.pm:978 install_steps_interactive.pm:1005
-#: install_steps_interactive.pm:1022 install_steps_interactive.pm:1038
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:983 install_steps_interactive.pm:1010
+#: install_steps_interactive.pm:1027 install_steps_interactive.pm:1043
+#: install_steps_interactive.pm:1054
 #, c-format
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: install_steps_interactive.pm:984 install_steps_interactive.pm:993
+#: install_steps_interactive.pm:989 install_steps_interactive.pm:998
 #, c-format
 msgid "Remote CUPS server"
 msgstr "リモートCUPSサーバ"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "No printer"
 msgstr "プリンタなし"
 
-#: install_steps_interactive.pm:1026
+#: install_steps_interactive.pm:1031
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISAサウンドカードをお使いですか？"
 
-#: install_steps_interactive.pm:1028
+#: install_steps_interactive.pm:1033
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -7113,71 +7121,71 @@ msgstr ""
 "インストール後にalsaconfかsndconfigを実行してサウンドカードを設定してくださ"
 "い。"
 
-#: install_steps_interactive.pm:1030
+#: install_steps_interactive.pm:1035
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "サウンドカードが見つかりません。インストール後にharddrakeで再度設定を試みてく"
 "ださい。"
 
-#: install_steps_interactive.pm:1050
+#: install_steps_interactive.pm:1055
 #, c-format
 msgid "Graphical interface"
 msgstr "グラフィカルインターフェース"
 
-#: install_steps_interactive.pm:1056 install_steps_interactive.pm:1071
+#: install_steps_interactive.pm:1061 install_steps_interactive.pm:1076
 #, c-format
 msgid "Network & Internet"
 msgstr "ネットワークとインターネット"
 
-#: install_steps_interactive.pm:1073
+#: install_steps_interactive.pm:1078
 #, c-format
 msgid "configured"
 msgstr "設定済み"
 
-#: install_steps_interactive.pm:1082 install_steps_interactive.pm:1096
+#: install_steps_interactive.pm:1087 install_steps_interactive.pm:1101
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "セキュリティ"
 
-#: install_steps_interactive.pm:1101
+#: install_steps_interactive.pm:1106
 #, c-format
 msgid "activated"
 msgstr "有効"
 
-#: install_steps_interactive.pm:1101
+#: install_steps_interactive.pm:1106
 #, c-format
 msgid "disabled"
 msgstr "無効"
 
-#: install_steps_interactive.pm:1112
+#: install_steps_interactive.pm:1117
 #, c-format
 msgid "Boot"
 msgstr "起動"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1116
+#: install_steps_interactive.pm:1121
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s の %1$s"
 
-#: install_steps_interactive.pm:1130 services.pm:175
+#: install_steps_interactive.pm:1135 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "サービス: %d 個を起動(登録数は %d 個)"
 
-#: install_steps_interactive.pm:1140
+#: install_steps_interactive.pm:1145
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Xが設定されていません。本当によろしいですか？"
 
-#: install_steps_interactive.pm:1220
+#: install_steps_interactive.pm:1225
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "ブートローダを準備中.."
 
-#: install_steps_interactive.pm:1230
+#: install_steps_interactive.pm:1235
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -7189,12 +7197,12 @@ msgstr ""
 "ではyabootは動きません。インストールを続けますが、マシンを起動するには、BootX"
 "もしくは他の方法が必要です。'root fs'のカーネル引数は'root=%s'です。"
 
-#: install_steps_interactive.pm:1236
+#: install_steps_interactive.pm:1241
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "abootを使いますか？"
 
-#: install_steps_interactive.pm:1239
+#: install_steps_interactive.pm:1244
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7203,7 +7211,7 @@ msgstr ""
 "abootをインストール中にエラーが発生しました。\n"
 "最初のパーティションを破壊しますが、強制的にインストールしますか？"
 
-#: install_steps_interactive.pm:1260
+#: install_steps_interactive.pm:1265
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -7212,22 +7220,22 @@ msgstr ""
 "このセキュリティレベルでは、Windowsパーティションのファイルへのアクセスが管理"
 "者のみに限定されます"
 
-#: install_steps_interactive.pm:1289 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1294 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "空のフロッピーをドライブ %s に入れてください"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1299
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "ドライバディスク用に別のフロッピーを入れてください"
 
-#: install_steps_interactive.pm:1296
+#: install_steps_interactive.pm:1301
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "インストール自動化フロッピーを作成中.."
 
-#: install_steps_interactive.pm:1308
+#: install_steps_interactive.pm:1313
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7238,12 +7246,12 @@ msgstr ""
 "\n"
 "本当に終了しますか？"
 
-#: install_steps_interactive.pm:1324
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "インストール自動化フロッピーを作成"
 
-#: install_steps_interactive.pm:1326
+#: install_steps_interactive.pm:1331
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7260,8 +7268,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr ""
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linuxのインストール %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -7275,7 +7283,7 @@ msgstr "  <Tab>/<Alt-Tab> 項目間の移動  | <Space> 選択 | <F12> 次の画
 msgid "Choose a file"
 msgstr "ファイルを選択"
 
-#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakbackup:1512
+#: interactive.pm:318 interactive/gtk.pm:505 standalone/drakbackup:1512
 #: standalone/drakfont:656 standalone/drakroam:218 standalone/drakups:301
 #: standalone/drakups:361 standalone/drakups:381 standalone/drakvpn:333
 #: standalone/drakvpn:694
@@ -7283,12 +7291,12 @@ msgstr "ファイルを選択"
 msgid "Add"
 msgstr "追加"
 
-#: interactive.pm:318 interactive/gtk.pm:489
+#: interactive.pm:318 interactive/gtk.pm:505
 #, c-format
 msgid "Modify"
 msgstr "変更"
 
-#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakroam:202
+#: interactive.pm:318 interactive/gtk.pm:505 standalone/drakroam:202
 #: standalone/drakups:303 standalone/drakups:363 standalone/drakups:383
 #: standalone/drakvpn:333 standalone/drakvpn:694
 #, c-format
@@ -8600,7 +8608,7 @@ msgid "Gabon"
 msgstr "ガボン"
 
 #: lang.pm:269 network/adsl_consts.pm:944 network/adsl_consts.pm:955
-#: network/netconnect.pm:53
+#: network/netconnect.pm:54
 #, c-format
 msgid "United Kingdom"
 msgstr "イギリス"
@@ -9330,18 +9338,18 @@ msgstr "ザンビア"
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: lang.pm:1073
+#: lang.pm:1082
 #, c-format
 msgid "You should install the following packages: %s"
 msgstr "次のパッケージをインストールしてください: %s"
 
 #. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
-#: lang.pm:1076 standalone/scannerdrake:135
+#: lang.pm:1085 standalone/scannerdrake:135
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: lang.pm:1129
+#: lang.pm:1138
 #, c-format
 msgid "Welcome to %s"
 msgstr "%s へようこそ"
@@ -9547,9 +9555,9 @@ msgstr "GlidePoint"
 
 #: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
 #: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
-#: network/modem.pm:137 network/netconnect.pm:700 network/netconnect.pm:705
-#: network/netconnect.pm:717 network/netconnect.pm:722
-#: network/netconnect.pm:738 network/netconnect.pm:740
+#: network/modem.pm:137 network/netconnect.pm:671 network/netconnect.pm:676
+#: network/netconnect.pm:688 network/netconnect.pm:693
+#: network/netconnect.pm:709 network/netconnect.pm:711
 #, c-format
 msgid "Automatic"
 msgstr "自動"
@@ -9764,12 +9772,12 @@ msgstr "Sagem (PPPoAを使用) USB"
 msgid "Sagem (using DHCP) USB"
 msgstr "Sagem (DHCPを使用) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:906
+#: network/adsl.pm:35 network/netconnect.pm:808
 #, c-format
 msgid "Connect to the Internet"
 msgstr "インターネットに接続"
 
-#: network/adsl.pm:36 network/netconnect.pm:907
+#: network/adsl.pm:36 network/netconnect.pm:809
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -9780,7 +9788,7 @@ msgstr ""
 "PPTPやDHCPを使う接続方法もあります。\n"
 "わからなければ'PPPoEを使う'を選んでください。"
 
-#: network/adsl.pm:41 network/netconnect.pm:911
+#: network/adsl.pm:41 network/netconnect.pm:813
 #, c-format
 msgid "ADSL connection type:"
 msgstr "ADSL接続の種類:"
@@ -9909,36 +9917,36 @@ msgstr "全て(ファイアウォールなし)"
 msgid "Other ports"
 msgstr "その他のポート"
 
-#: network/isdn.pm:124 network/netconnect.pm:547 network/netconnect.pm:661
-#: network/netconnect.pm:664 network/netconnect.pm:822
-#: network/netconnect.pm:826
+#: network/isdn.pm:121 network/netconnect.pm:538 network/netconnect.pm:632
+#: network/netconnect.pm:635 network/netconnect.pm:779
+#: network/netconnect.pm:783
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "該当なし - 手動で編集"
 
-#: network/isdn.pm:167 network/netconnect.pm:479
+#: network/isdn.pm:164 network/netconnect.pm:470
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA/PCMCIA"
 
-#: network/isdn.pm:167 network/netconnect.pm:479
+#: network/isdn.pm:164 network/netconnect.pm:470
 #, c-format
 msgid "I do not know"
 msgstr "不明"
 
-#: network/isdn.pm:168 network/netconnect.pm:479
+#: network/isdn.pm:165 network/netconnect.pm:470
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:169 network/netconnect.pm:479
+#: network/isdn.pm:166 network/netconnect.pm:470
 #, c-format
 msgid "USB"
 msgstr "USB"
 
 #: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
-#: network/netconnect.pm:705 network/netconnect.pm:722
-#: network/netconnect.pm:738
+#: network/netconnect.pm:676 network/netconnect.pm:693
+#: network/netconnect.pm:709
 #, c-format
 msgid "Manual"
 msgstr "手動"
@@ -9977,44 +9985,44 @@ msgstr ""
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "ndiswrapperインターフェースがみつかりません"
 
-#: network/netconnect.pm:91 network/netconnect.pm:576
-#: network/netconnect.pm:580
+#: network/netconnect.pm:92 network/netconnect.pm:574
+#: network/netconnect.pm:581
 #, c-format
 msgid "Manual choice"
 msgstr "手動選択"
 
-#: network/netconnect.pm:91
+#: network/netconnect.pm:92
 #, c-format
 msgid "Internal ISDN card"
 msgstr "内蔵ISDNカード"
 
-#: network/netconnect.pm:104 printer/printerdrake.pm:1418
+#: network/netconnect.pm:105 printer/printerdrake.pm:1418
 #: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "手動設定"
 
-#: network/netconnect.pm:105
+#: network/netconnect.pm:106
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IPを自動設定 (BOOTP/DHCP)"
 
-#: network/netconnect.pm:107
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "IPを自動設定 (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:110
+#: network/netconnect.pm:111
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "その他のプロトコル"
 
-#: network/netconnect.pm:112 standalone/drakconnect:574
+#: network/netconnect.pm:113 standalone/drakconnect:574
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "ヨーロッパのプロトコル(EDSS1)"
 
-#: network/netconnect.pm:113 standalone/drakconnect:575
+#: network/netconnect.pm:114 standalone/drakconnect:575
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -10023,188 +10031,188 @@ msgstr ""
 "その他のプロトコル\n"
 "No D-Channel (leased lines)"
 
-#: network/netconnect.pm:153
+#: network/netconnect.pm:154 network/thirdparty.pm:183
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB モデム"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:155
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB モデム"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:156
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan モデム"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:157
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus モデム"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:161
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:161
+#: network/netconnect.pm:162
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "手動によるTCP/IP設定"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Point to Point Tunneling Protocol (PPTP)"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:164
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP over Ethernet (PPPoE)"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:166
 #, c-format
 msgid "DSL over CAPI"
 msgstr "DSL over CAPI"
 
-#: network/netconnect.pm:169
+#: network/netconnect.pm:170
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Bridged Ethernet LLC"
 
-#: network/netconnect.pm:170
+#: network/netconnect.pm:171
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Bridged Ethernet VC"
 
-#: network/netconnect.pm:171
+#: network/netconnect.pm:172
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Routed IP LLC"
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:173
 #, c-format
 msgid "Routed IP VC"
 msgstr "Routed IP VC"
 
-#: network/netconnect.pm:173
+#: network/netconnect.pm:174
 #, c-format
 msgid "PPPoA LLC"
 msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:175
 #, c-format
 msgid "PPPoA VC"
 msgstr "PPPoA VC"
 
-#: network/netconnect.pm:178 standalone/drakconnect:509
+#: network/netconnect.pm:179 standalone/drakconnect:509
 #, c-format
 msgid "Script-based"
 msgstr "スクリプトを使う認証"
 
-#: network/netconnect.pm:179 standalone/drakconnect:509
+#: network/netconnect.pm:180 standalone/drakconnect:509
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:180 standalone/drakconnect:509
+#: network/netconnect.pm:181 standalone/drakconnect:509
 #, c-format
 msgid "Terminal-based"
 msgstr "ターミナルからの認証"
 
-#: network/netconnect.pm:181 standalone/drakconnect:509
+#: network/netconnect.pm:182 standalone/drakconnect:509
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:182 standalone/drakconnect:509
+#: network/netconnect.pm:183 standalone/drakconnect:509
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:187
+#: network/netconnect.pm:188
 #, c-format
 msgid "Open WEP"
 msgstr "openモードWEP"
 
-#: network/netconnect.pm:188
+#: network/netconnect.pm:189
 #, c-format
 msgid "Restricted WEP"
 msgstr "restrictedモードWEP"
 
-#: network/netconnect.pm:189
+#: network/netconnect.pm:190
 #, c-format
 msgid "WPA Pre-Shared Key"
 msgstr "WPA事前共有鍵(PSK)"
 
-#: network/netconnect.pm:294 standalone/drakconnect:60
+#: network/netconnect.pm:295 standalone/drakconnect:60
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "ネットワークとインターネットの設定"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:301
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(ポート %s で検出)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:302
+#: network/netconnect.pm:303
 #, c-format
 msgid "(detected %s)"
 msgstr "(%s を検出)"
 
-#: network/netconnect.pm:302
+#: network/netconnect.pm:303
 #, c-format
 msgid "(detected)"
 msgstr "(検出)"
 
-#: network/netconnect.pm:304
+#: network/netconnect.pm:305
 #, c-format
 msgid "LAN connection"
 msgstr "LAN接続"
 
-#: network/netconnect.pm:305 network/netconnect.pm:324
+#: network/netconnect.pm:306 network/netconnect.pm:325
 #, c-format
 msgid "Wireless connection"
 msgstr "ワイヤレス接続"
 
-#: network/netconnect.pm:306
+#: network/netconnect.pm:307
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL接続"
 
-#: network/netconnect.pm:307
+#: network/netconnect.pm:308
 #, c-format
 msgid "Cable connection"
 msgstr "ケーブル接続"
 
-#: network/netconnect.pm:308
+#: network/netconnect.pm:309
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN接続"
 
-#: network/netconnect.pm:309
+#: network/netconnect.pm:310
 #, c-format
 msgid "Modem connection"
 msgstr "モデム接続"
 
-#: network/netconnect.pm:310
+#: network/netconnect.pm:311
 #, c-format
 msgid "DVB connection"
-msgstr ""
+msgstr "DVB接続"
 
-#: network/netconnect.pm:320
+#: network/netconnect.pm:321
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "設定する接続を選んでください"
 
-#: network/netconnect.pm:334
+#: network/netconnect.pm:335
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10217,141 +10225,140 @@ msgstr ""
 "\n"
 "続けるには %s を押してください。"
 
-#: network/netconnect.pm:342 network/netconnect.pm:958
+#: network/netconnect.pm:343 network/netconnect.pm:860
 #, c-format
 msgid "Connection Configuration"
 msgstr "接続の設定"
 
-#: network/netconnect.pm:343 network/netconnect.pm:959
+#: network/netconnect.pm:344 network/netconnect.pm:861
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "下記の項目を埋めるかチェックを入れてください"
 
-#: network/netconnect.pm:350 standalone/drakconnect:565
+#: network/netconnect.pm:351 standalone/drakconnect:565
 #, c-format
 msgid "Card IRQ"
 msgstr "カード IRQ"
 
-#: network/netconnect.pm:351 standalone/drakconnect:566
+#: network/netconnect.pm:352 standalone/drakconnect:566
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "カード mem (DMA)"
 
-#: network/netconnect.pm:352 standalone/drakconnect:567
+#: network/netconnect.pm:353 standalone/drakconnect:567
 #, c-format
 msgid "Card IO"
 msgstr "カード IO"
 
-#: network/netconnect.pm:353 standalone/drakconnect:568
+#: network/netconnect.pm:354 standalone/drakconnect:568
 #, c-format
 msgid "Card IO_0"
 msgstr "カード IO_0"
 
-#: network/netconnect.pm:354
+#: network/netconnect.pm:355
 #, c-format
 msgid "Card IO_1"
 msgstr "カード IO_1"
 
-#: network/netconnect.pm:355
+#: network/netconnect.pm:356
 #, c-format
 msgid "Your personal phone number"
 msgstr "あなたの電話番号"
 
-#: network/netconnect.pm:356 network/netconnect.pm:962
+#: network/netconnect.pm:357 network/netconnect.pm:864
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "プロバイダの名前(例: provider.net)"
 
-#: network/netconnect.pm:357 standalone/drakconnect:504
+#: network/netconnect.pm:358 standalone/drakconnect:504
 #, c-format
 msgid "Provider phone number"
 msgstr "プロバイダの電話番号"
 
-#: network/netconnect.pm:358
+#: network/netconnect.pm:359
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "プロバイダのDNS 1 (オプション)"
 
-#: network/netconnect.pm:359
+#: network/netconnect.pm:360
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "プロバイダのDNS 2 (オプション)"
 
-#: network/netconnect.pm:360 standalone/drakconnect:455
+#: network/netconnect.pm:361 standalone/drakconnect:455
 #, c-format
 msgid "Dialing mode"
 msgstr "ダイアルモード"
 
-#: network/netconnect.pm:361 standalone/drakconnect:460
+#: network/netconnect.pm:362 standalone/drakconnect:460
 #: standalone/drakconnect:528
 #, c-format
 msgid "Connection speed"
 msgstr "接続の速度"
 
-#: network/netconnect.pm:362 standalone/drakconnect:465
+#: network/netconnect.pm:363 standalone/drakconnect:465
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "接続のタイムアウト(秒)"
 
-#: network/netconnect.pm:365 network/netconnect.pm:386
-#: network/netconnect.pm:965 standalone/drakconnect:502
+#: network/netconnect.pm:366 network/netconnect.pm:387
+#: network/netconnect.pm:867 standalone/drakconnect:502
 #, c-format
 msgid "Account Login (user name)"
 msgstr "アカウントのログイン(ユーザ名)"
 
-#: network/netconnect.pm:366 network/netconnect.pm:387
-#: network/netconnect.pm:966 standalone/drakconnect:503
+#: network/netconnect.pm:367 network/netconnect.pm:388
+#: network/netconnect.pm:868 standalone/drakconnect:503
 #, c-format
 msgid "Account Password"
 msgstr "アカウントのパスワード"
 
-#: network/netconnect.pm:382
+#: network/netconnect.pm:383
 #, c-format
 msgid "Cable: account options"
 msgstr "ケーブル: アカウントのオプション"
 
-#: network/netconnect.pm:385
+#: network/netconnect.pm:386
 #, c-format
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALoginを使う(Telstraに必要)"
 
-#: network/netconnect.pm:419 network/netconnect.pm:775
-#: network/netconnect.pm:1004 network/netconnect.pm:1309
+#: network/netconnect.pm:420 network/netconnect.pm:746
+#: network/netconnect.pm:906 network/netconnect.pm:1210
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "設定するネットワークインターフェースを選択:"
 
-#: network/netconnect.pm:421 network/netconnect.pm:469
-#: network/netconnect.pm:776 network/netconnect.pm:1006
-#: network/shorewall.pm:96 standalone/drakconnect:720 standalone/drakgw:224
-#: standalone/drakvpn:221
+#: network/netconnect.pm:422 network/netconnect.pm:460
+#: network/netconnect.pm:747 network/netconnect.pm:908 network/shorewall.pm:72
+#: standalone/drakconnect:720 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "ネットデバイス"
 
-#: network/netconnect.pm:422 network/netconnect.pm:430
+#: network/netconnect.pm:423 network/netconnect.pm:431
 #, c-format
 msgid "External ISDN modem"
 msgstr "外付ISDNモデム"
 
-#: network/netconnect.pm:468 standalone/harddrake2:215
+#: network/netconnect.pm:459 standalone/harddrake2:215
 #, c-format
 msgid "Select a device!"
 msgstr "デバイスを選んでください"
 
-#: network/netconnect.pm:477 network/netconnect.pm:487
-#: network/netconnect.pm:497 network/netconnect.pm:530
-#: network/netconnect.pm:544
+#: network/netconnect.pm:468 network/netconnect.pm:478
+#: network/netconnect.pm:488 network/netconnect.pm:521
+#: network/netconnect.pm:535
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDNの設定"
 
-#: network/netconnect.pm:478
+#: network/netconnect.pm:469
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "お使いのカードの種類を指定してください"
 
-#: network/netconnect.pm:488
+#: network/netconnect.pm:479
 #, c-format
 msgid ""
 "\n"
@@ -10365,22 +10372,22 @@ msgstr ""
 "\n"
 "PCMCIAカードをお持ちの場合はカードのirqとioを調べる必要があります。\n"
 
-#: network/netconnect.pm:492
+#: network/netconnect.pm:483
 #, c-format
 msgid "Continue"
 msgstr "続ける"
 
-#: network/netconnect.pm:492
+#: network/netconnect.pm:483
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: network/netconnect.pm:498
+#: network/netconnect.pm:489
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "お使いのISDNカードを選んでください"
 
-#: network/netconnect.pm:516
+#: network/netconnect.pm:507
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -10390,25 +10397,25 @@ msgstr ""
 "お使いのモデムにはCAPIドライバが利用可能です。このドライバはフリーのドライバ"
 "より多くの機能(例:FAX送信)を備えています。どちらのドライバを使いますか？"
 
-#: network/netconnect.pm:518 standalone/drakconnect:117 standalone/drakups:251
+#: network/netconnect.pm:509 standalone/drakconnect:117 standalone/drakups:251
 #: standalone/harddrake2:132
 #, c-format
 msgid "Driver"
 msgstr "ドライバ"
 
-#: network/netconnect.pm:530
+#: network/netconnect.pm:521
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "どのプロトコルを使いますか？"
 
-#: network/netconnect.pm:532 standalone/drakconnect:117
+#: network/netconnect.pm:523 standalone/drakconnect:117
 #: standalone/drakconnect:311 standalone/drakconnect:573
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: network/netconnect.pm:544
+#: network/netconnect.pm:535
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10417,13 +10424,13 @@ msgstr ""
 "プロバイダを選んでください。\n"
 "リストにない場合は'該当なし'を選んでください。"
 
-#: network/netconnect.pm:546 network/netconnect.pm:660
-#: network/netconnect.pm:821
+#: network/netconnect.pm:537 network/netconnect.pm:631
+#: network/netconnect.pm:778
 #, c-format
 msgid "Provider:"
 msgstr "プロバイダ:"
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:552
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -10432,52 +10439,52 @@ msgstr ""
 "このモデムはサポートしていません。\n"
 "http://www.linmodems.org をご覧ください"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:571
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "設定するモデムを選択:"
 
-#: network/netconnect.pm:627
+#: network/netconnect.pm:599
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "モデムが接続されているシリアルポートを選んでください。"
 
-#: network/netconnect.pm:658
+#: network/netconnect.pm:629
 #, c-format
 msgid "Select your provider:"
 msgstr "プロバイダを選択:"
 
-#: network/netconnect.pm:682
+#: network/netconnect.pm:653
 #, c-format
 msgid "Dialup: account options"
 msgstr "ダイアルアップ: アカウントのオプション"
 
-#: network/netconnect.pm:685
+#: network/netconnect.pm:656
 #, c-format
 msgid "Connection name"
 msgstr "接続名"
 
-#: network/netconnect.pm:686
+#: network/netconnect.pm:657
 #, c-format
 msgid "Phone number"
 msgstr "電話番号"
 
-#: network/netconnect.pm:687
+#: network/netconnect.pm:658
 #, c-format
 msgid "Login ID"
 msgstr "ログインID"
 
-#: network/netconnect.pm:702 network/netconnect.pm:735
+#: network/netconnect.pm:673 network/netconnect.pm:706
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "ダイアルアップ: IPパラメータ"
 
-#: network/netconnect.pm:705
+#: network/netconnect.pm:676
 #, c-format
 msgid "IP parameters"
 msgstr "IPパラメータ"
 
-#: network/netconnect.pm:706 network/netconnect.pm:1096
+#: network/netconnect.pm:677 network/netconnect.pm:996
 #: printer/printerdrake.pm:460 standalone/drakconnect:117
 #: standalone/drakconnect:327 standalone/drakconnect:915
 #: standalone/drakups:286
@@ -10485,128 +10492,79 @@ msgstr "IPパラメータ"
 msgid "IP address"
 msgstr "IPアドレス"
 
-#: network/netconnect.pm:707
+#: network/netconnect.pm:678
 #, c-format
 msgid "Subnet mask"
 msgstr "サブネットマスク"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:690
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "ダイアルアップ: DNSパラメータ"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:693
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:723
+#: network/netconnect.pm:694
 #, c-format
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: network/netconnect.pm:724 network/netconnect.pm:963
+#: network/netconnect.pm:695 network/netconnect.pm:865
 #: standalone/drakconnect:1033
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "プライマリDNSサーバ(オプション)"
 
-#: network/netconnect.pm:725 network/netconnect.pm:964
+#: network/netconnect.pm:696 network/netconnect.pm:866
 #: standalone/drakconnect:1034
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "セカンドDNSサーバ(オプション)"
 
-#: network/netconnect.pm:726
+#: network/netconnect.pm:697
 #, c-format
 msgid "Set hostname from IP"
 msgstr "IPからホスト名を設定"
 
-#: network/netconnect.pm:738 standalone/drakconnect:338
+#: network/netconnect.pm:709 standalone/drakconnect:338
 #, c-format
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: network/netconnect.pm:739
+#: network/netconnect.pm:710
 #, c-format
 msgid "Gateway IP address"
 msgstr "ゲートウェイ IPアドレス"
 
-#: network/netconnect.pm:775
+#: network/netconnect.pm:746
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSLの設定"
 
-#: network/netconnect.pm:819
+#: network/netconnect.pm:776
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "ADSLプロバイダを選んでください"
 
-#: network/netconnect.pm:840
-#, c-format
-msgid ""
-"You need the Alcatel microcode.\n"
-"You can provide it now via a floppy or your windows partition,\n"
-"or skip and do it later."
-msgstr ""
-"Alcatel microcodeが必要です。\n"
-"フロッピー/Windowsパーティションから今供給するか、スキップして\n"
-"後で行うことができます。"
-
-#: network/netconnect.pm:844 network/netconnect.pm:849
-#, c-format
-msgid "Use a floppy"
-msgstr "フロッピーを使う"
-
-#: network/netconnect.pm:844 network/netconnect.pm:853
-#, c-format
-msgid "Use my Windows partition"
-msgstr "Windowsのパーティションを使う"
-
-#: network/netconnect.pm:844 network/netconnect.pm:856
-#, c-format
-msgid "Do it later"
-msgstr "後で行う"
-
-#: network/netconnect.pm:863
-#, c-format
-msgid "Firmware copy failed, file %s not found"
-msgstr "ファームウェアのコピーに失敗。ファイル %s が見つかりません。"
-
 #: network/netconnect.pm:870
 #, c-format
-msgid "Firmware copy succeeded"
-msgstr "ファームウェアをコピーしました"
-
-#: network/netconnect.pm:885
-#, c-format
-msgid ""
-"You need the Alcatel microcode.\n"
-"Download it at:\n"
-"%s\n"
-"and copy the mgmt.o in /usr/share/speedtouch"
-msgstr ""
-"alcatel microcodeが必要です。\n"
-"%s\n"
-"からダウンロードして、\n"
-"mgmt.o を /usr/share/speedtouch にコピーしてください。"
-
-#: network/netconnect.pm:968
-#, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:969
+#: network/netconnect.pm:871
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:972
+#: network/netconnect.pm:874
 #, c-format
 msgid "Encapsulation:"
 msgstr "カプセル化 :"
 
-#: network/netconnect.pm:994
+#: network/netconnect.pm:896 network/thirdparty.pm:204
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10618,33 +10576,35 @@ msgstr ""
 "\n"
 "http://eciadsl.flashtux.org/ からダウンロードできます。"
 
-#: network/netconnect.pm:1006
+#: network/netconnect.pm:908
 #, c-format
 msgid "Manually load a driver"
 msgstr "手動でドライバをロード"
 
-#: network/netconnect.pm:1006
+#: network/netconnect.pm:908
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "Windowsのドライバを使う(ndiswrapperと共に)"
 
-#: network/netconnect.pm:1013 network/netconnect.pm:1274
-#: network/netconnect.pm:1278 printer/printerdrake.pm:3741
+#: network/netconnect.pm:915 network/netconnect.pm:1174
+#: network/netconnect.pm:1178 printer/printerdrake.pm:3741
+#: standalone/drakgw:220 standalone/drakgw:261 standalone/drakgw:295
+#: standalone/drakgw:400
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "%s パッケージをインストールできません"
 
-#: network/netconnect.pm:1048
+#: network/netconnect.pm:950
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconfホスト名の解決"
 
-#: network/netconnect.pm:1049 network/netconnect.pm:1083
+#: network/netconnect.pm:951 network/netconnect.pm:983
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "ネットワークデバイス %s を設定 (ドライバ %s)"
 
-#: network/netconnect.pm:1050
+#: network/netconnect.pm:952
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
@@ -10653,7 +10613,7 @@ msgstr ""
 "LAN接続には以下のプロトコルが利用できます。使用するものをひとつ選んでくださ"
 "い。"
 
-#: network/netconnect.pm:1084
+#: network/netconnect.pm:984
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10664,186 +10624,186 @@ msgstr ""
 "それぞれの項目にはドット区切の形式でIPアドレスを入れてください。\n"
 "(例: 1.2.3.4)"
 
-#: network/netconnect.pm:1091 standalone/drakconnect:384
+#: network/netconnect.pm:991 standalone/drakconnect:384
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "DHCPアドレスからホスト名を割り当てる"
 
-#: network/netconnect.pm:1092 standalone/drakconnect:386
+#: network/netconnect.pm:992 standalone/drakconnect:386
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCPホスト名"
 
-#: network/netconnect.pm:1097 standalone/drakconnect:332
-#: standalone/drakconnect:916 standalone/drakgw:320
+#: network/netconnect.pm:997 standalone/drakconnect:332
+#: standalone/drakconnect:916 standalone/drakgw:184
 #, c-format
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: network/netconnect.pm:1099 standalone/drakconnect:448
+#: network/netconnect.pm:999 standalone/drakconnect:448
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "ネットワークカードのIDを追跡(ラップトップに有用)"
 
-#: network/netconnect.pm:1101 standalone/drakconnect:449
+#: network/netconnect.pm:1001 standalone/drakconnect:449
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
 
-#: network/netconnect.pm:1103 standalone/drakconnect:443
+#: network/netconnect.pm:1003 standalone/drakconnect:443
 #, c-format
 msgid "Start at boot"
 msgstr "起動時に開始"
 
-#: network/netconnect.pm:1105 standalone/drakconnect:471
+#: network/netconnect.pm:1005 standalone/drakconnect:471
 #, c-format
 msgid "Metric"
 msgstr "Metric"
 
-#: network/netconnect.pm:1107 standalone/drakconnect:380
+#: network/netconnect.pm:1007 standalone/drakconnect:380
 #: standalone/drakconnect:919
 #, c-format
 msgid "DHCP client"
 msgstr "DHCPクライアント"
 
-#: network/netconnect.pm:1109 standalone/drakconnect:390
+#: network/netconnect.pm:1009 standalone/drakconnect:390
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCPのタイムアウト(秒)"
 
-#: network/netconnect.pm:1110 standalone/drakconnect:393
+#: network/netconnect.pm:1010 standalone/drakconnect:393
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNSサーバをDHCPから取得"
 
-#: network/netconnect.pm:1111 standalone/drakconnect:394
+#: network/netconnect.pm:1011 standalone/drakconnect:394
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YPサーバをDHCPから取得"
 
-#: network/netconnect.pm:1112 standalone/drakconnect:395
+#: network/netconnect.pm:1012 standalone/drakconnect:395
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPDサーバをDHCPから取得"
 
-#: network/netconnect.pm:1121 printer/printerdrake.pm:1672
+#: network/netconnect.pm:1021 printer/printerdrake.pm:1672
 #: standalone/drakconnect:683
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IPアドレスは 1.2.3.4 のように入力してください"
 
-#: network/netconnect.pm:1125 standalone/drakconnect:687
+#: network/netconnect.pm:1025 standalone/drakconnect:687
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ネットマスクは 255.255.224.0 のように入力してください"
 
-#: network/netconnect.pm:1129
+#: network/netconnect.pm:1029
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IPアドレス %s は通常保留されています"
 
-#: network/netconnect.pm:1134 standalone/drakTermServ:1783
+#: network/netconnect.pm:1034 standalone/drakTermServ:1783
 #: standalone/drakTermServ:1784 standalone/drakTermServ:1785
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s はすでに使用されています\n"
 
-#: network/netconnect.pm:1167
+#: network/netconnect.pm:1067
 #, c-format
 msgid "Choose an ndiswrapper driver"
 msgstr "ndiswrapperドライバを選択"
 
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1069
 #, c-format
 msgid "Use the ndiswrapper driver %s"
 msgstr "ndiswrapperドライバ %s を使用"
 
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1069
 #, c-format
 msgid "Install a new driver"
 msgstr "新しいドライバをインストール"
 
-#: network/netconnect.pm:1181
+#: network/netconnect.pm:1081
 #, c-format
 msgid "Select a device:"
 msgstr "デバイスを選択:"
 
-#: network/netconnect.pm:1208
+#: network/netconnect.pm:1108
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "このカードのワイヤレスパラメータを入力してください:"
 
-#: network/netconnect.pm:1211 standalone/drakconnect:415
+#: network/netconnect.pm:1111 standalone/drakconnect:415
 #, c-format
 msgid "Operating Mode"
 msgstr "操作モード"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Master"
 msgstr "マスター"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Repeater"
 msgstr "リピータ"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Secondary"
 msgstr "２次"
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1112
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: network/netconnect.pm:1214 standalone/drakconnect:416
+#: network/netconnect.pm:1114 standalone/drakconnect:416
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "ネットワーク名(ESSID)"
 
-#: network/netconnect.pm:1215 standalone/drakconnect:417
+#: network/netconnect.pm:1115 standalone/drakconnect:417
 #, c-format
 msgid "Network ID"
 msgstr "ネットワークID"
 
-#: network/netconnect.pm:1216 standalone/drakconnect:418
+#: network/netconnect.pm:1116 standalone/drakconnect:418
 #, c-format
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: network/netconnect.pm:1217 standalone/drakconnect:419
+#: network/netconnect.pm:1117 standalone/drakconnect:419
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "感度のしきい値"
 
-#: network/netconnect.pm:1218 standalone/drakconnect:420
+#: network/netconnect.pm:1118 standalone/drakconnect:420
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "ビットレート(b/s)"
 
-#: network/netconnect.pm:1219
+#: network/netconnect.pm:1119
 #, c-format
 msgid "Encryption mode"
 msgstr "暗号化方式"
 
-#: network/netconnect.pm:1223 standalone/drakconnect:431
+#: network/netconnect.pm:1123 standalone/drakconnect:431
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1224
+#: network/netconnect.pm:1124
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10863,17 +10823,17 @@ msgstr ""
 "メカニズムを無効にする最大パケットサイズと同じです。\n"
 "このパラメータをauto/fixed/offに設定することもできます。"
 
-#: network/netconnect.pm:1231 standalone/drakconnect:432
+#: network/netconnect.pm:1131 standalone/drakconnect:432
 #, c-format
 msgid "Fragmentation"
 msgstr "フラグメンテーション"
 
-#: network/netconnect.pm:1232 standalone/drakconnect:433
+#: network/netconnect.pm:1132 standalone/drakconnect:433
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "iwconfigコマンドの補助引数"
 
-#: network/netconnect.pm:1233
+#: network/netconnect.pm:1133
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10889,12 +10849,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
-#: network/netconnect.pm:1240 standalone/drakconnect:434
+#: network/netconnect.pm:1140 standalone/drakconnect:434
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "iwspyコマンドの補助引数"
 
-#: network/netconnect.pm:1241
+#: network/netconnect.pm:1141
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10913,12 +10873,12 @@ msgstr ""
 "\n"
 "詳しくは'man iwspy(8)'を参照してください。"
 
-#: network/netconnect.pm:1250 standalone/drakconnect:435
+#: network/netconnect.pm:1150 standalone/drakconnect:435
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "iwprivコマンドの補助引数"
 
-#: network/netconnect.pm:1251
+#: network/netconnect.pm:1151
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10942,7 +10902,7 @@ msgstr ""
 "明されています。\n"
 "詳しくは'man iwpriv(8)'を参照してください。"
 
-#: network/netconnect.pm:1266
+#: network/netconnect.pm:1166
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10951,7 +10911,7 @@ msgstr ""
 "単位は k, M, G で入力してください(2.46 GHzの場合は 2.46G)。\n"
 "もしくは0(ゼロ)で桁を増やしてください。"
 
-#: network/netconnect.pm:1270
+#: network/netconnect.pm:1170
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10960,37 +10920,37 @@ msgstr ""
 "単位は k, M, G で入力してください(例: 11M)。\n"
 "もしくは0(ゼロ)で桁を増やしてください。"
 
-#: network/netconnect.pm:1309
+#: network/netconnect.pm:1210
 #, c-format
 msgid "DVB configuration"
-msgstr ""
+msgstr "DVBの設定"
 
-#: network/netconnect.pm:1310
+#: network/netconnect.pm:1211
 #, c-format
 msgid "DVB Adapter"
-msgstr ""
+msgstr "DVBアダプタ"
 
-#: network/netconnect.pm:1328
+#: network/netconnect.pm:1229
 #, c-format
 msgid "DVB adapter settings"
-msgstr ""
+msgstr "DVBアダプタの設定"
 
-#: network/netconnect.pm:1331
+#: network/netconnect.pm:1232
 #, c-format
 msgid "Adapter card"
-msgstr ""
+msgstr "アダプタカード"
 
-#: network/netconnect.pm:1332
+#: network/netconnect.pm:1233
 #, c-format
 msgid "Net demux"
-msgstr ""
+msgstr "Net demux"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1234
 #, c-format
 msgid "PID"
-msgstr ""
+msgstr "PID"
 
-#: network/netconnect.pm:1361
+#: network/netconnect.pm:1262
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -11002,67 +10962,67 @@ msgstr ""
 "'mybox.mylab.myco.com'のように完全修飾ホスト名を\n"
 "入れてください。ゲートウェイのIPアドレスも入力できます。"
 
-#: network/netconnect.pm:1366
+#: network/netconnect.pm:1267
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "DNSサーバのIPアドレスも入力できます。"
 
-#: network/netconnect.pm:1368 standalone/drakconnect:1032
+#: network/netconnect.pm:1269 standalone/drakconnect:1032
 #, c-format
 msgid "Host name (optional)"
 msgstr "ホスト名(オプション)"
 
-#: network/netconnect.pm:1368
+#: network/netconnect.pm:1269
 #, c-format
 msgid "Host name"
 msgstr "ホスト名:"
 
-#: network/netconnect.pm:1370
+#: network/netconnect.pm:1271
 #, c-format
 msgid "DNS server 1"
 msgstr "DNSサーバ 1"
 
-#: network/netconnect.pm:1371
+#: network/netconnect.pm:1272
 #, c-format
 msgid "DNS server 2"
 msgstr "DNSサーバ 2"
 
-#: network/netconnect.pm:1372
+#: network/netconnect.pm:1273
 #, c-format
 msgid "DNS server 3"
 msgstr "DNSサーバ 3"
 
-#: network/netconnect.pm:1373
+#: network/netconnect.pm:1274
 #, c-format
 msgid "Search domain"
 msgstr "検索ドメイン"
 
-#: network/netconnect.pm:1374
+#: network/netconnect.pm:1275
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "検索ドメインはデフォルトで完全修飾ホスト名から設定されます。"
 
-#: network/netconnect.pm:1375
+#: network/netconnect.pm:1276
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "ゲートウェイ(例 %s)"
 
-#: network/netconnect.pm:1377
+#: network/netconnect.pm:1278
 #, c-format
 msgid "Gateway device"
 msgstr "ゲートウェイデバイス"
 
-#: network/netconnect.pm:1386
+#: network/netconnect.pm:1287
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNSサーバのアドレスは 1.2.3.4 のように入力してください"
 
-#: network/netconnect.pm:1391 standalone/drakconnect:692
+#: network/netconnect.pm:1292 standalone/drakconnect:692
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "ゲートウェイのアドレスは 1.2.3.4 のように入力してください"
 
-#: network/netconnect.pm:1404
+#: network/netconnect.pm:1305
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -11075,17 +11035,17 @@ msgstr ""
 "共有リソースを提示する時に使用する名前です。\n"
 "たいていのネットワークでは必要ありません。"
 
-#: network/netconnect.pm:1408
+#: network/netconnect.pm:1309
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconfホスト名"
 
-#: network/netconnect.pm:1411
+#: network/netconnect.pm:1312
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconfホスト名は以下を含んではいけません:"
 
-#: network/netconnect.pm:1421
+#: network/netconnect.pm:1322
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -11096,57 +11056,57 @@ msgstr ""
 "お使いになるものを選んでください。\n"
 "\n"
 
-#: network/netconnect.pm:1423
+#: network/netconnect.pm:1324
 #, c-format
 msgid "Internet connection"
 msgstr "インターネット接続"
 
-#: network/netconnect.pm:1432
+#: network/netconnect.pm:1333
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "設定が完了しました。適用しますか？"
 
-#: network/netconnect.pm:1439
+#: network/netconnect.pm:1340
 #, c-format
 msgid "Do you want to allow users to start the connection?"
 msgstr "ユーザに接続の開始を許可しますか？"
 
-#: network/netconnect.pm:1459
+#: network/netconnect.pm:1360
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "起動時に接続を開始しますか？"
 
-#: network/netconnect.pm:1478
+#: network/netconnect.pm:1379
 #, c-format
 msgid "Automatically at boot"
 msgstr "起動時に自動的に開始"
 
-#: network/netconnect.pm:1480
+#: network/netconnect.pm:1381
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "システムトレイのNetアプレットを使う"
 
-#: network/netconnect.pm:1482
+#: network/netconnect.pm:1383
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手動(インターフェースは起動時に自動的に始動します)"
 
-#: network/netconnect.pm:1491
+#: network/netconnect.pm:1392
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "この接続にどのようにダイアルしますか？"
 
-#: network/netconnect.pm:1505
+#: network/netconnect.pm:1406
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "ネットワークの再起動が必要です。再起動しますか？"
 
-#: network/netconnect.pm:1512 network/netconnect.pm:1583
+#: network/netconnect.pm:1413 network/netconnect.pm:1484
 #, c-format
 msgid "Network Configuration"
 msgstr "ネットワークを設定"
 
-#: network/netconnect.pm:1513
+#: network/netconnect.pm:1414
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -11157,27 +11117,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1522
+#: network/netconnect.pm:1423
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "すぐにインターネットに接続しますか？"
 
-#: network/netconnect.pm:1530 standalone/drakconnect:1064
+#: network/netconnect.pm:1431 standalone/drakconnect:1064
 #, c-format
 msgid "Testing your connection..."
 msgstr "接続をテストしています.."
 
-#: network/netconnect.pm:1550
+#: network/netconnect.pm:1451
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "インターネットに接続しました。"
 
-#: network/netconnect.pm:1551
+#: network/netconnect.pm:1452
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "セキュリティ上の理由で、接続を切ります。"
 
-#: network/netconnect.pm:1552
+#: network/netconnect.pm:1453
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -11186,7 +11146,7 @@ msgstr ""
 "このシステムはインターネットにつながっていないようです。\n"
 "接続を再設定してください。"
 
-#: network/netconnect.pm:1567
+#: network/netconnect.pm:1468
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -11196,7 +11156,7 @@ msgstr ""
 "インターネットの設定が完了しました。\n"
 "\n"
 
-#: network/netconnect.pm:1570
+#: network/netconnect.pm:1471
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -11205,7 +11165,7 @@ msgstr ""
 "設定が完了したら、ホスト名に関連した問題を避けるために、Xを再起動することをお"
 "勧めします。"
 
-#: network/netconnect.pm:1571
+#: network/netconnect.pm:1472
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -11216,7 +11176,7 @@ msgstr ""
 "net_monitorかMCCで接続をテストしてください。接続できない場合は\n"
 "再設定してください。"
 
-#: network/netconnect.pm:1584
+#: network/netconnect.pm:1485
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -11228,7 +11188,7 @@ msgstr ""
 "現在の設定をそのまま使うには OK をクリックしてください。ネットワーク/\n"
 "インターネットを再設定する場合はキャンセルを押します。\n"
 
-#: network/netconnect.pm:1622
+#: network/netconnect.pm:1523
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -11237,46 +11197,32 @@ msgstr ""
 "予期せぬエラーが発生しました:\n"
 "%s"
 
-#: network/network.pm:316
+#: network/network.pm:337
 #, c-format
 msgid "Proxies configuration"
 msgstr "プロクシの設定"
 
-#: network/network.pm:317
+#: network/network.pm:338
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTPプロクシ"
 
-#: network/network.pm:318
+#: network/network.pm:339
 #, c-format
 msgid "FTP proxy"
 msgstr "FTPプロクシ"
 
-#: network/network.pm:321
+#: network/network.pm:342
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "プロクシは http://.. で始まります"
 
-#: network/network.pm:322
+#: network/network.pm:343
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLは ftp: か http: で始まります"
 
-#: network/shorewall.pm:25
-#, c-format
-msgid "Firewalling configuration detected!"
-msgstr "ファイアウォールの設定を検出しました"
-
-#: network/shorewall.pm:26
-#, c-format
-msgid ""
-"Warning! An existing firewalling configuration has been detected. You may "
-"need some manual fixes after installation."
-msgstr ""
-"警告: 既存のファイアウォールの設定を検出しました。\n"
-"インストール後に手動で修正する必要があるかもしれません。"
-
-#: network/shorewall.pm:89 standalone/drakgw:217 standalone/drakvpn:214
+#: network/shorewall.pm:57 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -11293,12 +11239,55 @@ msgstr ""
 "\t\teth0, eth1(ケーブル接続の場合)\n"
 "\t\tippp+(ISDN接続の場合)\n"
 
-#: network/tools.pm:190
+#: network/thirdparty.pm:195
+#, fuzzy, c-format
+msgid "Copy the Alcatel microcode as mgmt.o in /usr/share/speedtouch/"
+msgstr ""
+"alcatel microcodeが必要です。\n"
+"%s\n"
+"からダウンロードして、\n"
+"mgmt.o を /usr/share/speedtouch にコピーしてください。"
+
+#: network/thirdparty.pm:265
+#, fuzzy, c-format
+msgid "Could not install the packages (%s)!"
+msgstr "%s パッケージをインストールできません"
+
+#: network/thirdparty.pm:273
+#, c-format
+msgid "Some packages (%s) are required but aren't available."
+msgstr ""
+
+#: network/thirdparty.pm:274
+#, c-format
+msgid ""
+"These packages can be found in Mandriva Club or in Mandriva commercial "
+"releases."
+msgstr ""
+
+#: network/thirdparty.pm:275
+#, c-format
+msgid ""
+"The required files can also be installed from this URL:\n"
+"%s"
+msgstr ""
+
+#: network/thirdparty.pm:308
+#, fuzzy, c-format
+msgid "Unable to find \"%s\" on your Windows system!"
+msgstr "システムからフォントを削除"
+
+#: network/thirdparty.pm:310
+#, c-format
+msgid "No Windows system has been detected!"
+msgstr ""
+
+#: network/thirdparty.pm:320
 #, c-format
 msgid "Insert floppy"
 msgstr "フロッピーを挿入"
 
-#: network/tools.pm:191
+#: network/thirdparty.pm:321
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -11307,11 +11296,58 @@ msgstr ""
 "%2$s をルートディレクトリに置いて、FAT形式のフロッピーをドライブ %1$s に\n"
 "挿入し、%3$s を押してください。"
 
-#: network/tools.pm:196
+#: network/thirdparty.pm:331
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "フロッピーアクセスエラー: デバイス %s をマウントできません"
 
+#: network/thirdparty.pm:341
+#, c-format
+msgid ""
+"You need the Alcatel microcode.\n"
+"You can provide it now via a floppy or your windows partition,\n"
+"or skip and do it later."
+msgstr ""
+"Alcatel microcodeが必要です。\n"
+"フロッピー/Windowsパーティションから今供給するか、スキップして\n"
+"後で行うことができます。"
+
+#: network/thirdparty.pm:345 network/thirdparty.pm:347
+#, c-format
+msgid "Use a floppy"
+msgstr "フロッピーを使う"
+
+#: network/thirdparty.pm:345
+#, c-format
+msgid "Use my Windows partition"
+msgstr "Windowsのパーティションを使う"
+
+#: network/thirdparty.pm:355
+#, c-format
+msgid "Firmware copy failed, file %s not found"
+msgstr "ファームウェアのコピーに失敗。ファイル %s が見つかりません。"
+
+#: network/thirdparty.pm:360 standalone/drakautoinst:252
+#: standalone/drakvpn:902 standalone/scannerdrake:405
+#, c-format
+msgid "Congratulations!"
+msgstr "おめでとうございます"
+
+#: network/thirdparty.pm:360
+#, c-format
+msgid "Firmware copy succeeded"
+msgstr "ファームウェアをコピーしました"
+
+#: network/thirdparty.pm:425
+#, c-format
+msgid "Looking for required software and drivers..."
+msgstr ""
+
+#: network/thirdparty.pm:435
+#, fuzzy, c-format
+msgid "Please wait, running device configuration commands..."
+msgstr "デバイスの検出と設定を行っています。お待ちください.."
+
 #: partition_table.pm:397
 #, c-format
 msgid "mount failed: "
@@ -11360,32 +11396,32 @@ msgstr ""
 "データの完全性チェックに失敗しました。\n"
 "このディスクに書き込んでもデータは破損します。"
 
-#: pkgs.pm:23
+#: pkgs.pm:22
 #, c-format
 msgid "must have"
 msgstr "必須"
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "important"
 msgstr "重要"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "very nice"
 msgstr "優秀"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "nice"
 msgstr "秀"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "maybe"
 msgstr "可"
 
-#: pkgs.pm:481
+#: pkgs.pm:468
 #, c-format
 msgid "Downloading file %s..."
 msgstr "ファイル %s をダウンロード中.."
@@ -15357,7 +15393,7 @@ msgstr "バッファオーバーフローやフォーマットストリング攻
 #: security/level.pm:64
 #, c-format
 msgid "Security Administrator (login or email)"
-msgstr "セキュリティ管理者(ログイン名かEmail)"
+msgstr "セキュリティ管理者(ログイン名かメールアドレス)"
 
 #: services.pm:19
 #, c-format
@@ -17493,7 +17529,7 @@ msgstr "完了"
 #: standalone/drakTermServ:467 standalone/drakTermServ:847
 #, c-format
 msgid "%s failed"
-msgstr ""
+msgstr "%s 失敗"
 
 #: standalone/drakTermServ:476
 #, c-format
@@ -17502,6 +17538,9 @@ msgid ""
 "NBIs in %s.\n"
 "Needed: %d MB, Free: %d MB"
 msgstr ""
+"%s にNBIを作成するための\n"
+"十分なスペースがありません\n"
+"%d MB 必要(空きスペース: %d MD)"
 
 #: standalone/drakTermServ:482
 #, c-format
@@ -17826,6 +17865,16 @@ msgid ""
 "        \t\t\n"
 "        \tcat /usr/share/etherboot/zdsk/3c509.zdsk > /dev/fd0"
 msgstr ""
+"        - etherbootフロッピー/CDの作成:\n"
+"        \tディスクレスクライアントマシンが起動シーケンスを開始するためにはNIC"
+"上の\n"
+"        \tROMイメージまたは起動フロッピー/CDが必要です。drakTermServはクライ"
+"アント\n"
+"        \tマシンのNICに基いてこれらのイメージを作成するお手伝いをします。\n"
+"        \t\t\n"
+"        \t以下は 3Com 3c509 のための起動フロッピーを手動で作成する基本的な例"
+"です:        \t\t\n"
+"        \tcat /usr/share/etherboot/zdsk/3c509.zdsk > /dev/fd0"
 
 #: standalone/drakTermServ:666
 #, c-format
@@ -18098,11 +18147,13 @@ msgid ""
 "Dynamic IP Address Pool\n"
 "(needed for PXE clients):"
 msgstr ""
+"ダイナミックIPアドレスプール\n"
+"(PXEクライアントに必要):"
 
 #: standalone/drakTermServ:1503
 #, c-format
 msgid "Write to %s failed!"
-msgstr ""
+msgstr "%s への書き込みに失敗"
 
 #: standalone/drakTermServ:1515
 #, c-format
@@ -18287,12 +18338,6 @@ msgstr ""
 "\n"
 "自動インストールのパラメータは左に表示しています"
 
-#: standalone/drakautoinst:252 standalone/drakgw:597 standalone/drakvpn:902
-#: standalone/scannerdrake:405
-#, c-format
-msgid "Congratulations!"
-msgstr "おめでとうございます"
-
 #: standalone/drakautoinst:253
 #, c-format
 msgid ""
@@ -18346,22 +18391,26 @@ msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
 "whether incremental or differential mode is used."
 msgstr ""
-"変更されたファイルを保存します。実際の動作はバックアップのモードによって異な"
-"ります。"
+"このオプションを有効にすると、変更されたファイルのみを保存します。実際の動作"
+"はバックアップモード(増分/差分)によって異なります。"
 
 #: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
-msgstr "積み重ねバックアップは、前回のバックアップからの差分のみを保存します。"
+msgstr ""
+"増分バックアップは、前回のバックアップ以降に更新または作成されたファイルのみ"
+"を保存します。"
 
 #: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
 "original 'base' backup."
-msgstr "差分バックアップは、ベースバックアップからの差分のみを保存します。"
+msgstr ""
+"差分バックアップは、元のベースバックアップ以降に更新または作成されたファイル"
+"のみを保存します。"
 
 #: standalone/drakbackup:159
 #, c-format
@@ -18369,15 +18418,15 @@ msgid ""
 "This should be a local user or email address that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
-"バックアップの結果を送るローカルユーザもしくはEmailアドレス。有効なメールサー"
-"バを指定してください。"
+"バックアップレポートの送信先(ローカルユーザ名またはメールアドレス)。有効な"
+"メールサーバを定義する必要があります。"
 
 #: standalone/drakbackup:160
 #, c-format
 msgid ""
 "This should be the return address that you want the backup results sent "
 "from. Default is drakbakup."
-msgstr ""
+msgstr "バックアップレポートの送信元アドレス。デフォルトはdrakbakup。"
 
 #: standalone/drakbackup:161
 #, c-format
@@ -18436,7 +18485,7 @@ msgstr "Interval cronはroot以外では使えません"
 #: standalone/drakbackup:465 standalone/logdrake:438
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
-msgstr "\"%s\" はEmailとしてもローカルユーザ名としても無効です"
+msgstr "\"%s\" は有効なメールアドレス/ローカルユーザ名ではありません"
 
 #: standalone/drakbackup:469 standalone/logdrake:443
 #, c-format
@@ -18444,8 +18493,8 @@ msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
 "a complete email address!"
 msgstr ""
-"\"%s\" はローカルユーザですが、ローカルsmtpを選択されていないので、完全な"
-"Emailアドレスを使ってください。"
+"\"%s\" は有効なローカルユーザ名ですが、ローカルsmtpを選択されていないので、有"
+"効なメールアドレスを指定してください。"
 
 #: standalone/drakbackup:478
 #, c-format
@@ -18600,6 +18649,8 @@ msgid ""
 "Backup destination quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
+"バックアップ先の割り当てを越えました\n"
+"使用: %d MB - 割り当て: %d MD"
 
 #: standalone/drakbackup:951 standalone/drakbackup:983
 #, c-format
@@ -18929,6 +18980,8 @@ msgid ""
 "Maximum disk space\n"
 " allocated for backups (MB)"
 msgstr ""
+"バックアップに割り当てる\n"
+"最大ディスクスペース(MB)"
 
 #: standalone/drakbackup:1957
 #, c-format
@@ -18937,6 +18990,9 @@ msgid ""
 " backups older than N days\n"
 " (0 is keep all backups) to save space"
 msgstr ""
+"スペースを節約するために指定した日数\n"
+"より古い増分/差分バックアップを削除\n"
+"(0 の場合は全てのバックアップを残す)"
 
 #: standalone/drakbackup:2024
 #, c-format
@@ -19153,7 +19209,7 @@ msgstr "バックアップしたら以下にメールを送る:"
 #: standalone/drakbackup:2200
 #, c-format
 msgid "Return address for sent mail:"
-msgstr ""
+msgstr "送信メールの返信アドレス:"
 
 #: standalone/drakbackup:2206
 #, c-format
@@ -19303,7 +19359,7 @@ msgstr "\tディスクの使用を %s MBに制限\n"
 #: standalone/drakbackup:2494
 #, c-format
 msgid "\tDelete backups older than %s day(s)\n"
-msgstr ""
+msgstr "\t%s 日前より古いバックアップを削除\n"
 
 #: standalone/drakbackup:2497
 #, c-format
@@ -19417,7 +19473,7 @@ msgstr "\tメールを %s に送る\n"
 #: standalone/drakbackup:2522
 #, c-format
 msgid "\tSend mail from %s\n"
-msgstr ""
+msgstr "\t%s からメールを送る\n"
 
 #: standalone/drakbackup:2523
 #, c-format
@@ -19934,17 +19990,17 @@ msgstr "<control>Q"
 #: standalone/drakboot:117
 #, c-format
 msgid "Text only"
-msgstr ""
+msgstr "テキストのみ"
 
 #: standalone/drakboot:118
 #, c-format
 msgid "Verbose"
-msgstr ""
+msgstr "詳細モード"
 
 #: standalone/drakboot:119
 #, c-format
 msgid "Silent"
-msgstr ""
+msgstr "サイレントモード"
 
 #: standalone/drakboot:126
 #, c-format
@@ -20365,12 +20421,12 @@ msgstr "ビジー待ち"
 msgid "Modem sound"
 msgstr "モデムの音"
 
-#: standalone/drakconnect:553
+#: standalone/drakconnect:553 standalone/drakgw:108
 #, c-format
 msgid "Enable"
 msgstr "有効にする"
 
-#: standalone/drakconnect:553
+#: standalone/drakconnect:553 standalone/drakgw:108
 #, c-format
 msgid "Disable"
 msgstr "無効にする"
@@ -20401,7 +20457,7 @@ msgstr "バス"
 msgid "Location on the bus"
 msgstr "バスの位置"
 
-#: standalone/drakconnect:707 standalone/drakgw:247 standalone/drakpxe:138
+#: standalone/drakconnect:707 standalone/drakgw:325 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -20580,32 +20636,27 @@ msgstr "接続の種類: "
 msgid "Status:"
 msgstr "状態:"
 
-#: standalone/drakedm:34
+#: standalone/drakedm:40
 #, c-format
 msgid "GDM (GNOME Display Manager)"
 msgstr "GDM (GNOMEディスプレイマネージャ)"
 
-#: standalone/drakedm:35
+#: standalone/drakedm:41
 #, c-format
 msgid "KDM (KDE Display Manager)"
 msgstr "KDM (KDEディスプレイマネージャ)"
 
-#: standalone/drakedm:36
-#, c-format
-msgid "MdkKDM (Mandriva Linux Display Manager)"
-msgstr "MdkKDM (Mandriva Linuxディスプレイマネージャ)"
-
-#: standalone/drakedm:37
+#: standalone/drakedm:42
 #, c-format
 msgid "XDM (X Display Manager)"
 msgstr "XDM (Xディスプレイマネージャ)"
 
-#: standalone/drakedm:55
+#: standalone/drakedm:53
 #, c-format
 msgid "Choosing a display manager"
 msgstr "ディスプレイマネージャを選んでください"
 
-#: standalone/drakedm:56
+#: standalone/drakedm:54
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -20617,12 +20668,12 @@ msgstr ""
 "複数のXセッションを実行できるようになります。\n"
 "ディスプレイマネージャを選んでください。"
 
-#: standalone/drakedm:79
+#: standalone/drakedm:72
 #, c-format
 msgid "The change is done, do you want to restart the dm service?"
 msgstr "変更しました。dmサービスを再起動しますか？"
 
-#: standalone/drakedm:80
+#: standalone/drakedm:73
 #, c-format
 msgid ""
 "You are going to close all running programs and lose your current session. "
@@ -21103,95 +21154,17 @@ msgstr "システムからフォントを削除"
 msgid "Post Uninstall"
 msgstr "アンインストール後の処理"
 
-#: standalone/drakgw:58 standalone/drakgw:191
-#, c-format
-msgid "Internet Connection Sharing"
-msgstr "インターネット接続を共有"
-
-#: standalone/drakgw:111 standalone/drakvpn:51
+#: standalone/drakgw:51 standalone/drakvpn:51
 #, c-format
 msgid "Sorry, we support only 2.4 and above kernels."
 msgstr "2.4以上のカーネルのみをサポートしています。"
 
-#: standalone/drakgw:122
-#, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "インターネット接続の共有は現在無効になっています"
-
-#: standalone/drakgw:123
-#, c-format
-msgid ""
-"The setup of Internet connection sharing has already been done.\n"
-"It's currently disabled.\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"インターネット接続の共有は既に設定されています。\n"
-"現在は無効になっています。\n"
-"\n"
-"どうしますか？"
-
-#: standalone/drakgw:127 standalone/drakvpn:127
+#: standalone/drakgw:78
 #, c-format
-msgid "enable"
-msgstr "有効にする"
-
-#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
-#: standalone/drakvpn:127
-#, c-format
-msgid "reconfigure"
-msgstr "再設定"
-
-#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
-#: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
-#, c-format
-msgid "dismiss"
-msgstr "無視"
-
-#: standalone/drakgw:134
-#, c-format
-msgid "Enabling servers..."
-msgstr "サーバを有効にしています.."
-
-#: standalone/drakgw:146
-#, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "インターネット接続の共有を有効にしました"
-
-#: standalone/drakgw:149
-#, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "インターネット接続の共有は現在有効になっています"
-
-#: standalone/drakgw:150
-#, c-format
-msgid ""
-"The setup of Internet Connection Sharing has already been done.\n"
-"It's currently enabled.\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"インターネット接続の共有は既に設定されています。\n"
-"現在は有効になっています。\n"
-"\n"
-"どうしますか？"
-
-#: standalone/drakgw:154 standalone/drakvpn:101
-#, c-format
-msgid "disable"
-msgstr "無効にする"
-
-#: standalone/drakgw:157
-#, c-format
-msgid "Disabling servers..."
-msgstr "サーバを停止しています.."
-
-#: standalone/drakgw:172
-#, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "インターネット接続の共有を無効にしました"
+msgid "Internet Connection Sharing"
+msgstr "インターネット接続を共有"
 
-#: standalone/drakgw:192
+#: standalone/drakgw:82
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -21210,27 +21183,38 @@ msgstr ""
 "注意: ローカルエリアネットワーク(LAN)を構築するには\n"
 "専用のネットワークアダプタが必要です。"
 
-#: standalone/drakgw:236
-#, c-format
-msgid "Interface %s (using module %s)"
-msgstr "インターフェース %s(モジュール %s を使用)"
-
-#: standalone/drakgw:237
+#: standalone/drakgw:98
 #, c-format
-msgid "Interface %s"
-msgstr "インターフェース %s"
+msgid ""
+"The setup of Internet Connection Sharing has already been done.\n"
+"It's currently enabled.\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"インターネット接続の共有は既に設定されています。\n"
+"現在は有効になっています。\n"
+"\n"
+"どうしますか？"
 
-#: standalone/drakgw:246 standalone/drakpxe:137
+#: standalone/drakgw:102
 #, c-format
-msgid "No network adapter on your system!"
-msgstr "ネットワークアダプタがありません"
+msgid ""
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"インターネット接続の共有は既に設定されています。\n"
+"現在は無効になっています。\n"
+"\n"
+"どうしますか？"
 
-#: standalone/drakgw:253
-#, c-format
-msgid "Network interface"
-msgstr "ネットワークインターフェース"
+#: standalone/drakgw:108
+#, fuzzy, c-format
+msgid "Reconfigure"
+msgstr "再設定"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:148
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -21245,106 +21229,49 @@ msgstr ""
 "\n"
 "このアダプタでLANを設定します。"
 
-#: standalone/drakgw:260 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "ネットワークインターフェースを選択"
-
-#: standalone/drakgw:261
+#: standalone/drakgw:159
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "LANに接続するネットワークアダプタを選んでください。"
 
-#: standalone/drakgw:290
-#, c-format
-msgid "Network interface already configured"
-msgstr "ネットワークインターフェースは設定済みです"
-
-#: standalone/drakgw:291
-#, c-format
-msgid ""
-"Warning, the network adapter (%s) is already configured.\n"
-"\n"
-"Do you want an automatic re-configuration?\n"
-"\n"
-"You can do it manually but you need to know what you're doing."
-msgstr ""
-"警告: ネットワークアダプタ(%s)は設定済みです。\n"
-"\n"
-"自動的に再設定を行いますか？\n"
-"\n"
-"手動で行うこともできますが、設定には知識が必要です。"
+#: standalone/drakgw:180
+#, fuzzy, c-format
+msgid "Local Area Network setings"
+msgstr "ローカルネットワークのアドレス"
 
-#: standalone/drakgw:296
+#: standalone/drakgw:183
 #, c-format
-msgid "Automatic reconfiguration"
-msgstr "自動的に再設定"
+msgid "Local Network adress"
+msgstr "ローカルネットワークのアドレス"
 
-#: standalone/drakgw:296
+#: standalone/drakgw:185
 #, c-format
-msgid "No (experts only)"
-msgstr "いいえ(上級者用)"
+msgid "The internal domain name"
+msgstr "内部ドメイン名"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:191
 #, c-format
-msgid "Show current interface configuration"
-msgstr "現在のインターフェースの設定を表示"
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "現在の %s の設定ではLANアドレスが競合するかもしれません。\n"
 
-#: standalone/drakgw:298
-#, c-format
-msgid "Current interface configuration"
-msgstr "現在のインターフェースの設定"
+#: standalone/drakgw:207
+#, fuzzy, c-format
+msgid "Domain Name Server (DNS) configuration"
+msgstr "ターミナルサーバの設定"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:211
 #, c-format
-msgid ""
-"Current configuration of `%s':\n"
-"\n"
-"Network: %s\n"
-"IP address: %s\n"
-"IP attribution: %s\n"
-"Driver: %s"
+msgid "Use this gateway as domain name server"
 msgstr ""
-"%s の現在の設定:\n"
-"\n"
-"ネットワーク: %s\n"
-"IPアドレス: %s\n"
-"IP属性: %s\n"
-"ドライバ: %s"
 
-#: standalone/drakgw:312
+#: standalone/drakgw:212
 #, c-format
-msgid ""
-"I can keep your current configuration and assume you already set up a DHCP "
-"server; in that case please verify I correctly read the Network that you use "
-"for your local network; I will not reconfigure it and I will not touch your "
-"DHCP server configuration.\n"
-"\n"
-"The default DNS entry is the Caching Nameserver configured on the firewall. "
-"You can replace that with your ISP DNS IP, for example.\n"
-"\t\t      \n"
-"Otherwise, I can reconfigure your interface and (re)configure a DHCP server "
-"for you.\n"
-"\n"
-msgstr ""
-"既にDHCPサーバが設定されているものと判断して、現在の設定を維持することも可能"
-"です。ただし、ネットワークが正しく検出されていることを確認してください。この"
-"場合は、ネットワークを再設定しません。DHCPサーバの設定も一切変更しません。\n"
-"\n"
-"デフォルトのDNSエントリーは、ファイアウォールで設定されているCachingネーム"
-"サーバになります。これをお使いのISPのDNSのIP等に変更してもかまいません。\n"
-"\t\t      \n"
-"上記以外の場合は、インターフェースとDHCPサーバを(再)設定します。\n"
-"\n"
-
-#: standalone/drakgw:319
-#, c-format
-msgid "Local Network adress"
-msgstr "ローカルネットワークのアドレス"
+msgid "The DNS Server IP"
+msgstr "DNSサーバのIP"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:244
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -21357,72 +21284,77 @@ msgstr ""
 "ここでは、DHCPサーバの設定オプションを変更できます。\n"
 "オプションの意味が分からない場合は、そのままにしておいてください。"
 
-#: standalone/drakgw:327
-#, c-format
-msgid "(This) DHCP Server IP"
-msgstr "(この)DHCPサーバのIP"
-
-#: standalone/drakgw:328
-#, c-format
-msgid "The DNS Server IP"
-msgstr "DNSサーバのIP"
-
-#: standalone/drakgw:329
-#, c-format
-msgid "The internal domain name"
-msgstr "内部ドメイン名"
+#: standalone/drakgw:251
+#, fuzzy, c-format
+msgid "Use automatic configuration (DHCP)"
+msgstr "自動的に再設定"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:252
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCPのスタートレンジ"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:253
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCPのエンドレンジ"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:254
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "標準lease(秒)"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:255
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "最大lease(秒)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:281
 #, c-format
-msgid "Re-configure interface and DHCP server"
-msgstr "インターフェースとDHCPサーバを再設定"
+msgid "Proxy caching server (SQUID)"
+msgstr ""
 
-#: standalone/drakgw:341
+#: standalone/drakgw:285
 #, c-format
-msgid "The Local Network did not finish with `.0', bailing out."
-msgstr "ローカルネットワークが'.0'で終わっていません。中断します。"
+msgid "Use this gateway as proxy caching server"
+msgstr ""
 
-#: standalone/drakgw:351
+#: standalone/drakgw:286
 #, c-format
-msgid "Potential LAN address conflict found in current config of %s!\n"
-msgstr "現在の %s の設定ではLANアドレスが競合するかもしれません。\n"
+msgid "Admin mail"
+msgstr ""
 
-#: standalone/drakgw:361
-#, c-format
-msgid "Configuring..."
-msgstr "設定.."
+#: standalone/drakgw:287
+#, fuzzy, c-format
+msgid "Visible hostname"
+msgstr "リモートホスト名"
+
+#: standalone/drakgw:288
+#, fuzzy, c-format
+msgid "Proxy port"
+msgstr "プロパティ"
+
+#: standalone/drakgw:289
+#, fuzzy, c-format
+msgid "Cache size (MB)"
+msgstr "キャッシュのサイズ"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:314
+#, fuzzy, c-format
+msgid "Broadcast printer information"
+msgstr "ハードドライブの情報"
+
+#: standalone/drakgw:331
 #, c-format
-msgid "Configuring scripts, installing software, starting servers..."
-msgstr "スクリプトを設定、ソフトウェアをインストール、サーバを起動"
+msgid "Internet Connection Sharing is now enabled."
+msgstr "インターネット接続の共有を有効にしました"
 
-#: standalone/drakgw:402 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:337
 #, c-format
-msgid "Problems installing package %s"
-msgstr "パッケージ %s のインストール中に問題が発生"
+msgid "Internet Connection Sharing is now disabled."
+msgstr "インターネット接続の共有を無効にしました"
 
-#: standalone/drakgw:598
+#: standalone/drakgw:343
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -21434,6 +21366,35 @@ msgstr ""
 "DHCP(自動ネットワーク設定)とSQUID(Transparent Proxy Cache server)を\n"
 "使って、LANの他のマシンとインターネット接続を共有できます。"
 
+#: standalone/drakgw:378
+#, c-format
+msgid "Disabling servers..."
+msgstr "サーバを停止しています.."
+
+#: standalone/drakgw:392
+#, c-format
+msgid "Firewalling configuration detected!"
+msgstr "ファイアウォールの設定を検出しました"
+
+#: standalone/drakgw:393
+#, c-format
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+"警告: 既存のファイアウォールの設定を検出しました。\n"
+"インストール後に手動で修正する必要があるかもしれません。"
+
+#: standalone/drakgw:396
+#, c-format
+msgid "Configuring..."
+msgstr "設定.."
+
+#: standalone/drakgw:397
+#, c-format
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "スクリプトを設定、ソフトウェアをインストール、サーバを起動"
+
 #: standalone/drakhelp:17
 #, c-format
 msgid ""
@@ -21751,6 +21712,16 @@ msgstr ""
 "注意: ローカルエリアネットワーク(LAN)を設定するには、専用のネットワークアダプ"
 "タが必要です。"
 
+#: standalone/drakpxe:137
+#, c-format
+msgid "No network adapter on your system!"
+msgstr "ネットワークアダプタがありません"
+
+#: standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "ネットワークインターフェースを選択"
+
 #: standalone/drakpxe:143
 #, c-format
 msgid "Please choose which network interface will be used for the dhcp server."
@@ -21836,12 +21807,19 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "auto_install.cfg ファイルの場所"
 
+#: standalone/drakpxe:231 standalone/drakvpn:278
+#, c-format
+msgid "Problems installing package %s"
+msgstr "パッケージ %s のインストール中に問題が発生"
+
 #: standalone/drakroam:41
 #, c-format
 msgid ""
 "You do not have any wireless interface.\n"
 "Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
+"ワイヤレスインターフェースがありません。\n"
+"Mandriva Linux コントロールセンタで %s を実行してください。"
 
 #: standalone/drakroam:141
 #, c-format
@@ -21945,7 +21923,7 @@ msgid "Disconnect"
 msgstr "切断"
 
 #. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:241 standalone/net_applet:90
+#: standalone/drakroam:241 standalone/net_applet:91
 #: standalone/printerdrake:238
 #, c-format
 msgid "Refresh"
@@ -22032,7 +22010,7 @@ msgstr ""
 "\n"
 "'<span weight=\"bold\">セキュリティ管理者</span>'とは'<span weight=\"bold\">"
 "セキュリティ警告</span>'オプションを有効にした場合にセキュリティ警告を受け取"
-"る人のことを言います。ユーザ名またはEmailアドレスを指定してください。\n"
+"る人のことを言います。ユーザ名またはメールアドレスを指定してください。\n"
 "\n"
 "\n"
 "'<span weight=\"bold\"セキュリティレベル</span>'のメニューには、msecによって"
@@ -22161,7 +22139,7 @@ msgstr ""
 "注意: ISA PnPサウンドカードをお使いの場合は、alsaconfかsndconfigを使ってくだ"
 "さい。コンソールで'alsaconf'または'sndconfig'と入力します。"
 
-#: standalone/draksplash:26
+#: standalone/draksplash:15
 #, c-format
 msgid ""
 "package 'ImageMagick' is required to be able to complete configuration.\n"
@@ -22170,110 +22148,110 @@ msgstr ""
 "設定を完了するにはImageMagickが必要です。\n"
 "[OK]を押すとImageMagickをインストールします。[キャンセル]で中止します。"
 
-#: standalone/draksplash:32
+#: standalone/draksplash:34
 #, c-format
 msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr "テキストボックスのx座標を文字数で"
 
-#: standalone/draksplash:33
+#: standalone/draksplash:35
 #, c-format
 msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr "テキストボックスのy座標を文字数で"
 
-#: standalone/draksplash:34
+#: standalone/draksplash:36
 #, c-format
 msgid "text width"
 msgstr "テキストの幅"
 
-#: standalone/draksplash:35
+#: standalone/draksplash:37
 #, c-format
 msgid "text box height"
 msgstr "テキストボックスの高さ"
 
-#: standalone/draksplash:36
+#: standalone/draksplash:38
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr "進行バー左上隅のx座標"
 
-#: standalone/draksplash:37
+#: standalone/draksplash:39
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr "進行バー左上隅のy座標"
 
-#: standalone/draksplash:38
+#: standalone/draksplash:40
 #, c-format
 msgid "the width of the progress bar"
 msgstr "進行バーの幅"
 
-#: standalone/draksplash:39
+#: standalone/draksplash:41
 #, c-format
 msgid "the height of the progress bar"
 msgstr "進行バーの高さ"
 
-#: standalone/draksplash:56 standalone/draksplash:61
+#: standalone/draksplash:58 standalone/draksplash:63
 #, c-format
 msgid "Choose progress bar color"
-msgstr ""
+msgstr "進行バーの色を選択"
 
-#: standalone/draksplash:57 standalone/draksplash:62
+#: standalone/draksplash:59 standalone/draksplash:64
 #, c-format
 msgid "Choose picture"
-msgstr ""
+msgstr "画像を選択"
 
-#: standalone/draksplash:58
+#: standalone/draksplash:60
 #, c-format
 msgid "Silent bootsplash"
-msgstr ""
+msgstr "サイレント起動スプラッシュ"
 
-#: standalone/draksplash:63
+#: standalone/draksplash:65
 #, c-format
 msgid "Verbose bootsplash"
-msgstr ""
+msgstr "詳細起動スプラッシュ"
 
-#: standalone/draksplash:65
+#: standalone/draksplash:67
 #, c-format
 msgid "Display logo on Console"
 msgstr "コンソールにロゴを表示"
 
-#: standalone/draksplash:68
+#: standalone/draksplash:70
 #, c-format
 msgid "Console bootsplash"
-msgstr ""
+msgstr "コンソール起動スプラッシュ"
 
-#: standalone/draksplash:74
+#: standalone/draksplash:76
 #, c-format
 msgid "Theme name"
 msgstr "テーマ名"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:79
 #, c-format
 msgid "final resolution"
 msgstr "最終的な解像度"
 
-#: standalone/draksplash:82
+#: standalone/draksplash:84
 #, c-format
 msgid "Save theme"
 msgstr "テーマを保存"
 
-#: standalone/draksplash:130
+#: standalone/draksplash:145
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "起動スプラッシュのテーマを保存中.."
 
-#: standalone/draksplash:145
+#: standalone/draksplash:160
 #, c-format
 msgid "choose image"
 msgstr "画像を選択"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:177
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "進行バーの色を選択"
@@ -22473,6 +22451,22 @@ msgstr ""
 "\n"
 "どうしますか？"
 
+#: standalone/drakvpn:101
+#, c-format
+msgid "disable"
+msgstr "無効にする"
+
+#: standalone/drakvpn:101 standalone/drakvpn:127
+#, c-format
+msgid "reconfigure"
+msgstr "再設定"
+
+#: standalone/drakvpn:101 standalone/drakvpn:127 standalone/drakvpn:376
+#: standalone/drakvpn:735
+#, c-format
+msgid "dismiss"
+msgstr "無視"
+
 #: standalone/drakvpn:105
 #, c-format
 msgid "Disabling VPN..."
@@ -22503,6 +22497,11 @@ msgstr ""
 "\n"
 "どうしますか？"
 
+#: standalone/drakvpn:127
+#, c-format
+msgid "enable"
+msgstr "有効にする"
+
 #: standalone/drakvpn:135
 #, c-format
 msgid "Enabling VPN..."
@@ -25245,110 +25244,115 @@ msgstr "ネットワークをモニタ"
 
 #: standalone/net_applet:71
 #, c-format
+msgid "Manage wireless networks"
+msgstr ""
+
+#: standalone/net_applet:72
+#, c-format
 msgid "Configure Network"
 msgstr "ネットワークを設定"
 
-#: standalone/net_applet:73
+#: standalone/net_applet:74
 #, c-format
 msgid "Watched interface"
 msgstr "監視中のインターフェース"
 
-#: standalone/net_applet:82
+#: standalone/net_applet:83
 #, c-format
 msgid "Profiles"
 msgstr "プロファイル"
 
-#: standalone/net_applet:91
+#: standalone/net_applet:92
 #, c-format
 msgid "Get Online Help"
 msgstr "オンラインヘルプを見る"
 
-#: standalone/net_applet:223
+#: standalone/net_applet:224
 #, c-format
 msgid "Interactive intrusion detection"
 msgstr "インタラクティブ侵入検知"
 
-#: standalone/net_applet:227
+#: standalone/net_applet:228
 #, c-format
 msgid "Always launch on startup"
 msgstr "起動時に開始"
 
-#: standalone/net_applet:280
+#: standalone/net_applet:281
 #, c-format
 msgid "A port scanning attack has been attempted by %s."
 msgstr "%s がポートスキャン攻撃を試みました"
 
-#: standalone/net_applet:281
+#: standalone/net_applet:282
 #, c-format
 msgid "The %s service has been attacked by %s."
 msgstr "サービス %s が %s によって攻撃されました"
 
-#: standalone/net_applet:282
+#: standalone/net_applet:283
 #, c-format
 msgid "A password cracking attack has been attempted by %s."
 msgstr "%s がパスワードクラック攻撃を試みました"
 
-#: standalone/net_applet:290
+#: standalone/net_applet:291
 #, c-format
 msgid "Active Firewall: intrusion detected"
 msgstr "アクティブなファイアウォール: 侵入を検知しました "
 
-#: standalone/net_applet:301
+#: standalone/net_applet:302
 #, c-format
 msgid "Do you want to blacklist the attacker?"
 msgstr "この攻撃者をブラックリストに載せますか？"
 
-#: standalone/net_applet:315
+#: standalone/net_applet:316
 #, c-format
 msgid "Always blacklist (do not ask again)"
 msgstr "常にブラックリストに載せる(今後は確認しない)"
 
-#: standalone/net_applet:318
+#: standalone/net_applet:319
 #, c-format
 msgid "Attack details"
 msgstr "攻撃の詳細"
 
-#: standalone/net_applet:322
+#: standalone/net_applet:323
 #, c-format
 msgid "Attack time: %s"
 msgstr "攻撃の時間: %s"
 
-#: standalone/net_applet:323
+#: standalone/net_applet:324
 #, c-format
 msgid "Network interface: %s"
 msgstr "ネットワークインターフェース: %s"
 
-#: standalone/net_applet:324
+#: standalone/net_applet:325
 #, c-format
 msgid "Attack type: %s"
 msgstr "攻撃のタイプ: %s"
 
-#: standalone/net_applet:325
+#: standalone/net_applet:326
 #, c-format
 msgid "Protocol: %s"
 msgstr "プロトコル: %s"
 
-#: standalone/net_applet:326
+#: standalone/net_applet:327
 #, c-format
 msgid "Attacker IP address: %s"
 msgstr "攻撃者のIPアドレス: %s"
 
-#: standalone/net_applet:327
+#: standalone/net_applet:328
 #, c-format
 msgid "Attacker hostname: %s"
 msgstr "攻撃者のhostname: %s"
 
-#: standalone/net_applet:328
+#: standalone/net_applet:329
 #, c-format
 msgid "Service attacked: %s"
 msgstr "攻撃されたサービス: %s"
 
-#: standalone/net_applet:329
+#: standalone/net_applet:330
 #, c-format
 msgid "Port attacked: %s"
 msgstr "攻撃されたポート: %s"
 
-#: standalone/net_applet:330
+#: standalone/net_applet:331
 #, c-format
 msgid "Type of ICMP attack: %s"
 msgstr "ICMP攻撃のタイプ: %s"
@@ -26133,7 +26137,7 @@ msgstr "いくつかのデバイスを追加しました: %s\n"
 msgid "- %s was added\n"
 msgstr "- %s を追加しました\n"
 
-#: standalone/service_harddrake:203
+#: standalone/service_harddrake:206
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "ハードウェアを検出中"
@@ -26283,7 +26287,7 @@ msgstr "ツリーを折りたたむ"
 msgid "Toggle between flat and group sorted"
 msgstr "フラット表示/グループ別表示を切り替える"
 
-#: wizards.pm:95 wizards2.pm:95
+#: wizards.pm:95
 #, c-format
 msgid ""
 "%s is not installed\n"
@@ -26293,32 +26297,141 @@ msgstr ""
 "インストールするには[次へ]\n"
 "終了する場合は[キャンセル]を押してください。"
 
-#: wizards.pm:99 wizards2.pm:99
+#: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "インストール失敗"
 
-#~ msgid "Number of logical extents: %d"
-#~ msgstr "論理エクステントの数: %d"
-
 #~ msgid ""
 #~ "Your system is low on resources. You may have some problem installing\n"
-#~ "Mandriva Linux. If that occurs, you can try a text install instead. For "
+#~ "Mandrivalinux. If that occurs, you can try a text install instead. For "
 #~ "this,\n"
 #~ "press `F1' when booting on CDROM, then enter `text'."
 #~ msgstr ""
-#~ "リソースが足りません。Mandriva Linuxをインストール中に問題が発生する\n"
-#~ "可能性があります。\n"
-#~ "別の方法として、テキストモードでインストールすることもできます。\n"
-#~ "その場合は、CD-ROMから起動した時に[F1]を押し、続いて'text'と入力\n"
-#~ "してください。"
+#~ "システムのリソースが十分でないため、Mandrivalinuxのインストール中に\n"
+#~ "問題が発生する可能性があります。発生した場合は、以下の要領でテキスト\n"
+#~ "モードによるインストールを試してみてください。\n"
+#~ "CDROMから起動 -> [F1]を押す -> 'text'と入力"
+
+#~ msgid ""
+#~ "Contacting Mandrivalinux web site to get the list of available mirrors..."
+#~ msgstr ""
+#~ "Mandrivalinuxのウェブサイトに接続して利用可能なミラーのリストを取得してい"
+#~ "ます"
+
+#~ msgid "Mandrivalinux Installation %s"
+#~ msgstr "Mandrivalinuxのインストール %s"
+
+#~ msgid "Do it later"
+#~ msgstr "後で行う"
 
 #~ msgid ""
-#~ "Contacting Mandriva Linux web site to get the list of available mirrors..."
-#~ msgstr "Mandriva Linuxのサイトに接続してミラーのリストを取得しています"
+#~ "You need the Alcatel microcode.\n"
+#~ "Download it at:\n"
+#~ "%s\n"
+#~ "and copy the mgmt.o in /usr/share/speedtouch"
+#~ msgstr ""
+#~ "alcatel microcodeが必要です。\n"
+#~ "%s\n"
+#~ "からダウンロードして、\n"
+#~ "mgmt.o を /usr/share/speedtouch にコピーしてください。"
+
+#~ msgid "MdkKDM (Mandriva Linux Display Manager)"
+#~ msgstr "MdkKDM (Mandriva Linuxディスプレイマネージャ)"
 
-#~ msgid "Mandriva Linux Installation %s"
-#~ msgstr "Mandriva Linuxのインストール %s"
+#~ msgid "Internet Connection Sharing currently disabled"
+#~ msgstr "インターネット接続の共有は現在無効になっています"
+
+#~ msgid "Enabling servers..."
+#~ msgstr "サーバを有効にしています.."
+
+#~ msgid "Internet Connection Sharing currently enabled"
+#~ msgstr "インターネット接続の共有は現在有効になっています"
+
+#~ msgid "Interface %s (using module %s)"
+#~ msgstr "インターフェース %s(モジュール %s を使用)"
+
+#~ msgid "Interface %s"
+#~ msgstr "インターフェース %s"
+
+#~ msgid "Network interface"
+#~ msgstr "ネットワークインターフェース"
+
+#~ msgid "Network interface already configured"
+#~ msgstr "ネットワークインターフェースは設定済みです"
+
+#~ msgid ""
+#~ "Warning, the network adapter (%s) is already configured.\n"
+#~ "\n"
+#~ "Do you want an automatic re-configuration?\n"
+#~ "\n"
+#~ "You can do it manually but you need to know what you're doing."
+#~ msgstr ""
+#~ "警告: ネットワークアダプタ(%s)は設定済みです。\n"
+#~ "\n"
+#~ "自動的に再設定を行いますか？\n"
+#~ "\n"
+#~ "手動で行うこともできますが、設定には知識が必要です。"
+
+#~ msgid "No (experts only)"
+#~ msgstr "いいえ(上級者用)"
+
+#~ msgid "Show current interface configuration"
+#~ msgstr "現在のインターフェースの設定を表示"
+
+#~ msgid "Current interface configuration"
+#~ msgstr "現在のインターフェースの設定"
+
+#~ msgid ""
+#~ "Current configuration of `%s':\n"
+#~ "\n"
+#~ "Network: %s\n"
+#~ "IP address: %s\n"
+#~ "IP attribution: %s\n"
+#~ "Driver: %s"
+#~ msgstr ""
+#~ "%s の現在の設定:\n"
+#~ "\n"
+#~ "ネットワーク: %s\n"
+#~ "IPアドレス: %s\n"
+#~ "IP属性: %s\n"
+#~ "ドライバ: %s"
+
+#~ msgid ""
+#~ "I can keep your current configuration and assume you already set up a "
+#~ "DHCP server; in that case please verify I correctly read the Network that "
+#~ "you use for your local network; I will not reconfigure it and I will not "
+#~ "touch your DHCP server configuration.\n"
+#~ "\n"
+#~ "The default DNS entry is the Caching Nameserver configured on the "
+#~ "firewall. You can replace that with your ISP DNS IP, for example.\n"
+#~ "\t\t      \n"
+#~ "Otherwise, I can reconfigure your interface and (re)configure a DHCP "
+#~ "server for you.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "既にDHCPサーバが設定されているものと判断して、現在の設定を維持することも可"
+#~ "能です。ただし、ネットワークが正しく検出されていることを確認してください。"
+#~ "この場合は、ネットワークを再設定しません。DHCPサーバの設定も一切変更しませ"
+#~ "ん。\n"
+#~ "\n"
+#~ "デフォルトのDNSエントリーは、ファイアウォールで設定されているCachingネーム"
+#~ "サーバになります。これをお使いのISPのDNSのIP等に変更してもかまいません。\n"
+#~ "\t\t      \n"
+#~ "上記以外の場合は、インターフェースとDHCPサーバを(再)設定します。\n"
+#~ "\n"
+
+#~ msgid "(This) DHCP Server IP"
+#~ msgstr "(この)DHCPサーバのIP"
+
+#~ msgid "Re-configure interface and DHCP server"
+#~ msgstr "インターフェースとDHCPサーバを再設定"
+
+#~ msgid "The Local Network did not finish with `.0', bailing out."
+#~ msgstr "ローカルネットワークが'.0'で終わっていません。中断します。"
+
+#~ msgid "Number of logical extents: %d"
+#~ msgstr "論理エクステントの数: %d"
 
 #~ msgid ""
 #~ "WARNING: this device has been previously configured to connect to the "