reverted ' \n' from pablo because I managed to correct the way we wrap for the advertising

1 files changed, 5642 insertions, 2482 deletions

diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index ba7e76394..6a886fa7d 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -1,12 +1,20 @@
 # DrakX Japanese Translation.
+# 「」“”
+# for Japanese text use 「 and 」 instead of ugly \" and \"
+# for ascii text in the transltion you can also use“ and ”
+# also, even if the English text has no lineabreak ( \n ) at
+# all, you must add some if the Japanese text is too long,
+# because the current toolkits are unable to wordwrap Japanese
+# text due to the lack of word delimiters. 
+#
 # Copyright (c) 1999 MandrakeSoft
 # Junichi Kimura <jun@kde.gr.jp>, 1999-2000
-# YAMAGATA Hiroo <hiyori13@alum.mit.edu>, 1999-2001
+# YAMAGATA Hiroo <hiyori13@alum.mit.edu>, 1999-2002
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"POT-Creation-Date: 2002-03-11 18:29+0100\n"
 "PO-Revision-Date: 1999-12-10 16:27+0100\n"
 "Last-Translator: YAMAGATA Hiroo <hiyori13@alum.mit.edu>\n"
 "Language-Team: Japanese\n"
@@ -14,24 +22,24 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:231
+#: ../../Xconfigurator.pm_.c:242
 msgid "Configure all heads independently"
 msgstr "ヘッドをそれぞれ独立に設定"
 
-#: ../../Xconfigurator.pm_.c:232
+#: ../../Xconfigurator.pm_.c:243
 msgid "Use Xinerama extension"
 msgstr "Xinerama 拡張を使う"
 
-#: ../../Xconfigurator.pm_.c:235
+#: ../../Xconfigurator.pm_.c:246
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
-msgstr "以下のカードだけを設定： \"%s\" (%s)"
+msgstr "以下のカードだけを設定： “%s”(%s)"
 
-#: ../../Xconfigurator.pm_.c:238
+#: ../../Xconfigurator.pm_.c:249
 msgid "Multi-head configuration"
 msgstr "マルチヘッド設定"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:250
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -39,33 +47,41 @@ msgstr ""
 "あなたのシステムはマルチヘッドの設定ができます。\n"
 "どうしますか？"
 
-#: ../../Xconfigurator.pm_.c:248
+#: ../../Xconfigurator.pm_.c:261
 msgid "Graphic card"
 msgstr "グラフィックカード"
 
-#: ../../Xconfigurator.pm_.c:248
+#: ../../Xconfigurator.pm_.c:262
 msgid "Select a graphic card"
 msgstr "グラフィックカードを選択して下さい"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:286
 msgid "Choose a X server"
 msgstr "X サーバを選んで下さい"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:286
 msgid "X server"
 msgstr "X サーバ"
 
-#: ../../Xconfigurator.pm_.c:307 ../../Xconfigurator.pm_.c:313
-#: ../../Xconfigurator.pm_.c:363 ../../Xconfigurator.pm_.c:1435
+#: ../../Xconfigurator.pm_.c:293
+msgid "Choose a X driver"
+msgstr "X ドライバを選んで下さい"
+
+#: ../../Xconfigurator.pm_.c:293
+msgid "X driver"
+msgstr "X ドライバ"
+
+#: ../../Xconfigurator.pm_.c:360 ../../Xconfigurator.pm_.c:366
+#: ../../Xconfigurator.pm_.c:416 ../../Xconfigurator.pm_.c:1507
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:310
+#: ../../Xconfigurator.pm_.c:363
 msgid "Which configuration of XFree do you want to have?"
 msgstr "どの構成のXFree にしますか"
 
-#: ../../Xconfigurator.pm_.c:321
+#: ../../Xconfigurator.pm_.c:374
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -74,18 +90,18 @@ msgstr ""
 "このカードはXFree %s でのみ3Dアクセラレーション可能です。\n"
 "XFree %s でのこのカードのサポートは、2D のほうがすぐれています。"
 
-#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
+#: ../../Xconfigurator.pm_.c:376 ../../Xconfigurator.pm_.c:409
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr "このカードはXFree %s で3Dアクセラレーション可能です。"
 
-#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
-#: ../../Xconfigurator.pm_.c:1435
+#: ../../Xconfigurator.pm_.c:378 ../../Xconfigurator.pm_.c:411
+#: ../../Xconfigurator.pm_.c:1507
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "ハードウェア3DアクセラレーションつきのXFree %s"
 
-#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
+#: ../../Xconfigurator.pm_.c:386 ../../Xconfigurator.pm_.c:400
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -94,12 +110,12 @@ msgstr ""
 "このカードはXFree %s で3Dアクセラレーション可能です。\n"
 "ただしあくまで、実験的なサポートで、マシンフリーズの可能性があります。"
 
-#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
+#: ../../Xconfigurator.pm_.c:388 ../../Xconfigurator.pm_.c:402
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "実験段階のハードウェア3DアクセラレーションつきのXFree %s"
 
-#: ../../Xconfigurator.pm_.c:344
+#: ../../Xconfigurator.pm_.c:397
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -110,31 +126,31 @@ msgstr ""
 "ただしあくまで、実験的なサポートで、マシンフリーズの可能性があります。\n"
 "XFree %s でのこのカードのサポートは、2D のほうがすぐれています。"
 
-#: ../../Xconfigurator.pm_.c:364
+#: ../../Xconfigurator.pm_.c:417
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (インストールディスプレイドライバ)"
 
-#: ../../Xconfigurator.pm_.c:368
+#: ../../Xconfigurator.pm_.c:421
 msgid "XFree configuration"
 msgstr "XFreeの設定"
 
-#: ../../Xconfigurator.pm_.c:434
+#: ../../Xconfigurator.pm_.c:496
 msgid "Select the memory size of your graphic card"
 msgstr "グラフィックカードのメモリサイズを選択して下さい"
 
-#: ../../Xconfigurator.pm_.c:492
+#: ../../Xconfigurator.pm_.c:550
 msgid "Choose options for server"
 msgstr "サーバのオプションを選んで下さい"
 
-#: ../../Xconfigurator.pm_.c:516
+#: ../../Xconfigurator.pm_.c:574
 msgid "Choose a monitor"
 msgstr "モニタを選んで下さい"
 
-#: ../../Xconfigurator.pm_.c:516
+#: ../../Xconfigurator.pm_.c:574
 msgid "Monitor"
 msgstr "モニタ"
 
-#: ../../Xconfigurator.pm_.c:519
+#: ../../Xconfigurator.pm_.c:577
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -155,40 +171,40 @@ msgstr ""
 "モニタがダメージを受けるかも知れません。\n"
 "分からない場合は, 低めの設定にして下さい。"
 
-#: ../../Xconfigurator.pm_.c:526
+#: ../../Xconfigurator.pm_.c:584
 msgid "Horizontal refresh rate"
 msgstr "水平リフレッシュレート"
 
-#: ../../Xconfigurator.pm_.c:527
+#: ../../Xconfigurator.pm_.c:585
 msgid "Vertical refresh rate"
 msgstr "垂直リフレッシュレート"
 
-#: ../../Xconfigurator.pm_.c:564
+#: ../../Xconfigurator.pm_.c:622
 msgid "Monitor not configured"
 msgstr "モニタが設定されてません"
 
-#: ../../Xconfigurator.pm_.c:567
+#: ../../Xconfigurator.pm_.c:625
 msgid "Graphic card not configured yet"
 msgstr "グラフィックカードが設定されてません"
 
-#: ../../Xconfigurator.pm_.c:570
+#: ../../Xconfigurator.pm_.c:628
 msgid "Resolutions not chosen yet"
 msgstr "解像度が選択されてません"
 
-#: ../../Xconfigurator.pm_.c:587
+#: ../../Xconfigurator.pm_.c:646
 msgid "Do you want to test the configuration?"
 msgstr "この設定で試してみますか？"
 
-#: ../../Xconfigurator.pm_.c:591
+#: ../../Xconfigurator.pm_.c:650
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "警告：このグラフィックカードをテストするとマシンがフリーズするかもしれません"
 
-#: ../../Xconfigurator.pm_.c:594
+#: ../../Xconfigurator.pm_.c:653
 msgid "Test of the configuration"
 msgstr "設定を試します"
 
-#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
+#: ../../Xconfigurator.pm_.c:692 ../../Xconfigurator.pm_.c:704
 msgid ""
 "\n"
 "try to change some parameters"
@@ -196,156 +212,175 @@ msgstr ""
 "\n"
 "いくつかパラメータを変えてみてください"
 
-#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
+#: ../../Xconfigurator.pm_.c:692 ../../Xconfigurator.pm_.c:704
 msgid "An error has occurred:"
 msgstr "エラー発生"
 
-#: ../../Xconfigurator.pm_.c:668
+#: ../../Xconfigurator.pm_.c:731
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "あと %d 秒で戻ります"
 
-#: ../../Xconfigurator.pm_.c:679
+#: ../../Xconfigurator.pm_.c:742
 msgid "Is this the correct setting?"
 msgstr "設定はこれでいいですか？"
 
-#: ../../Xconfigurator.pm_.c:688
+#: ../../Xconfigurator.pm_.c:751
 msgid "An error has occurred, try to change some parameters"
 msgstr "エラー発生，いくつかのパラメータを変えてみてください"
 
-#: ../../Xconfigurator.pm_.c:759
+#: ../../Xconfigurator.pm_.c:822
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../../Xconfigurator.pm_.c:810
+#: ../../Xconfigurator.pm_.c:874
 msgid "Choose the resolution and the color depth"
 msgstr "解像度と色深度"
 
-#: ../../Xconfigurator.pm_.c:812
+#: ../../Xconfigurator.pm_.c:876
 #, c-format
 msgid "Graphic card: %s"
 msgstr "グラフィックカード: %s"
 
-#: ../../Xconfigurator.pm_.c:813
+#: ../../Xconfigurator.pm_.c:877
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 サーバ: %s"
 
-#: ../../Xconfigurator.pm_.c:829 ../../printerdrake.pm_.c:1885
-#: ../../standalone/draknet_.c:298 ../../standalone/draknet_.c:301
+#: ../../Xconfigurator.pm_.c:891 ../../diskdrake/interactive.pm_.c:259
+#: ../../install_steps_interactive.pm_.c:208
+msgid "More"
+msgstr "次"
+
+#: ../../Xconfigurator.pm_.c:891 ../../install_gtk.pm_.c:84
+#: ../../install_steps_gtk.pm_.c:328 ../../interactive.pm_.c:127
+#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:317
+#: ../../interactive.pm_.c:349 ../../interactive_http.pm_.c:104
+#: ../../interactive_newt.pm_.c:170 ../../interactive_stdio.pm_.c:141
+#: ../../interactive_stdio.pm_.c:142 ../../my_gtk.pm_.c:686
+#: ../../my_gtk.pm_.c:1019 ../../my_gtk.pm_.c:1041
+#: ../../standalone/drakbackup_.c:2298 ../../standalone/drakbackup_.c:2369
+#: ../../standalone/drakbackup_.c:2385
+msgid "Ok"
+msgstr "OK"
+
+#: ../../Xconfigurator.pm_.c:893 ../../network/netconnect.pm_.c:169
+#: ../../printerdrake.pm_.c:2470 ../../standalone/draknet_.c:275
+#: ../../standalone/draknet_.c:278
 msgid "Expert Mode"
 msgstr "エキスパートモード"
 
-#: ../../Xconfigurator.pm_.c:830
+#: ../../Xconfigurator.pm_.c:894
 msgid "Show all"
 msgstr "全てを表示"
 
-#: ../../Xconfigurator.pm_.c:875
+#: ../../Xconfigurator.pm_.c:939
 msgid "Resolutions"
 msgstr "解像度"
 
-#: ../../Xconfigurator.pm_.c:1437
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "キーボードレイアウト: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1438
+#: ../../Xconfigurator.pm_.c:1510
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "マウスの種類: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1439
+#: ../../Xconfigurator.pm_.c:1511
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "マウスデバイス: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1440
+#: ../../Xconfigurator.pm_.c:1512
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "モニタ: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1441
+#: ../../Xconfigurator.pm_.c:1513
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "モニタ水平同期: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1442
+#: ../../Xconfigurator.pm_.c:1514
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "モニタ垂直リフレッシュ: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1515
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "グラフィックカード: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1444
+#: ../../Xconfigurator.pm_.c:1516
 #, c-format
 msgid "Graphic card identification: %s\n"
 msgstr "グラフィックカード id: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1445
+#: ../../Xconfigurator.pm_.c:1517
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "グラフィックメモリ: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1447
+#: ../../Xconfigurator.pm_.c:1519
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "色深度: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1448
+#: ../../Xconfigurator.pm_.c:1520
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "解像度: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1450
+#: ../../Xconfigurator.pm_.c:1522
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 サーバ: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1451
+#: ../../Xconfigurator.pm_.c:1523
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 ドライバ: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1469
+#: ../../Xconfigurator.pm_.c:1541
 msgid "Preparing X-Window configuration"
 msgstr "X Window System の設定の準備"
 
-#: ../../Xconfigurator.pm_.c:1489
+#: ../../Xconfigurator.pm_.c:1561
 msgid "What do you want to do?"
 msgstr "どうしますか？"
 
-#: ../../Xconfigurator.pm_.c:1494
+#: ../../Xconfigurator.pm_.c:1566
 msgid "Change Monitor"
 msgstr "モニタの変更"
 
-#: ../../Xconfigurator.pm_.c:1495
+#: ../../Xconfigurator.pm_.c:1567
 msgid "Change Graphic card"
 msgstr "グラフィックカードの変更"
 
-#: ../../Xconfigurator.pm_.c:1497
+#: ../../Xconfigurator.pm_.c:1570
 msgid "Change Server options"
 msgstr "サーバオプションの変更"
 
-#: ../../Xconfigurator.pm_.c:1498
+#: ../../Xconfigurator.pm_.c:1571
 msgid "Change Resolution"
 msgstr "解像度の変更"
 
-#: ../../Xconfigurator.pm_.c:1499
+#: ../../Xconfigurator.pm_.c:1572
 msgid "Show information"
 msgstr "情報を表示"
 
-#: ../../Xconfigurator.pm_.c:1500
+#: ../../Xconfigurator.pm_.c:1573
 msgid "Test again"
 msgstr "もう一回テスト"
 
-#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
+#: ../../Xconfigurator.pm_.c:1574 ../../printerdrake.pm_.c:2473
+#: ../../standalone/logdrake_.c:225
 msgid "Quit"
 msgstr "終了"
 
-#: ../../Xconfigurator.pm_.c:1509
+#: ../../Xconfigurator.pm_.c:1582
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -358,20 +393,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1532
-#, c-format
-msgid "Please relog into %s to activate the changes"
-msgstr "変更を有効にするには %s にログインしなおして下さい"
-
-#: ../../Xconfigurator.pm_.c:1552
-msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "ログアウトした上で Ctrl-Alt-BackSpace を押して下さい"
-
-#: ../../Xconfigurator.pm_.c:1555
+#: ../../Xconfigurator.pm_.c:1603
 msgid "X at startup"
 msgstr "X の起動"
 
-#: ../../Xconfigurator.pm_.c:1556
+#: ../../Xconfigurator.pm_.c:1604
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -379,6 +405,15 @@ msgstr ""
 "コンピュータをブートした時，自動的に X が立ち上がる設定にできます。\n"
 "リブートした時 X を立ち上げますか？"
 
+#: ../../Xconfigurator.pm_.c:1610
+#, c-format
+msgid "Please relog into %s to activate the changes"
+msgstr "変更を有効にするには %s にログインしなおして下さい"
+
+#: ../../Xconfigurator.pm_.c:1625
+msgid "Please log out and then use Ctrl-Alt-BackSpace"
+msgstr "ログアウトした上で Ctrl-Alt-BackSpace を押して下さい"
+
 #: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
 msgstr "256 色(8 bits)"
@@ -399,253 +434,263 @@ msgstr "1600万色 (24 bits)"
 msgid "4 billion colors (32 bits)"
 msgstr "40億色 (32 bits)"
 
-#: ../../Xconfigurator_consts.pm_.c:106
+#: ../../Xconfigurator_consts.pm_.c:113
 msgid "256 kB"
 msgstr "256 KB"
 
-#: ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:114
 msgid "512 kB"
 msgstr "512 KB"
 
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:115
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:116
 msgid "2 MB"
 msgstr "2 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:110
+#: ../../Xconfigurator_consts.pm_.c:117
 msgid "4 MB"
 msgstr "4 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:111
+#: ../../Xconfigurator_consts.pm_.c:118
 msgid "8 MB"
 msgstr "8 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:112
+#: ../../Xconfigurator_consts.pm_.c:119
 msgid "16 MB"
 msgstr "16 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:113
+#: ../../Xconfigurator_consts.pm_.c:120
 msgid "32 MB"
 msgstr "32 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:114
+#: ../../Xconfigurator_consts.pm_.c:121
 msgid "64 MB or more"
 msgstr "64 MB 以上"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Standard VGA, 640x480 at 60 Hz"
-msgstr "スタンダード VGA, 640x480 at 60Hz"
+msgstr "スタンダード VGA, 640x480 で 60Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:123
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Super VGA, 800x600 at 56 Hz"
-msgstr "スーパー VGA, 800x600 at 56 Hz"
+msgstr "スーパー VGA, 800x600 で 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:124
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-msgstr "8514 互換, 1024x768 at 87 Hz interlaced (no 800x600)"
+msgstr "8514 互換, 1024x768 at 87 Hz インターレース (no 800x600)"
 
-#: ../../Xconfigurator_consts.pm_.c:125
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
-msgstr "スーパー VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
+msgstr "スーパー VGA, 1024x768 で 87 Hz インターレース, 800x600 で 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
-msgstr "拡張 スーパー VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
+msgstr "拡張 スーパー VGA, 800x600 で 60 Hz, 640x480 で 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:134
 msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
 msgstr "1024x768 at 60 Hz, 800x600 at 72 HzのノンインターレスSVGA"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:135
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "1280x1024 at 70 HzのHigh Frequency SVGA"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:136
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "1280x1024 at 60 Hzが可能なマルチスキャンモニタ"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:137
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "1280x1024 at 74 Hzが可能なマルチスキャンモニタ"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:138
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "1280x1024 at 76 Hzが可能なマルチスキャンモニタ"
 
-#: ../../Xconfigurator_consts.pm_.c:132
+#: ../../Xconfigurator_consts.pm_.c:139
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "1600x1200 at 70 Hz が可能なモニタ"
 
-#: ../../Xconfigurator_consts.pm_.c:133
+#: ../../Xconfigurator_consts.pm_.c:140
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "1600x1200 at 76 Hz が可能なモニタ"
 
-#: ../../any.pm_.c:96 ../../any.pm_.c:121
+#: ../../any.pm_.c:116 ../../any.pm_.c:141
 msgid "First sector of boot partition"
 msgstr "ブートパーティションの最初のセクタ"
 
-#: ../../any.pm_.c:96 ../../any.pm_.c:121 ../../any.pm_.c:194
+#: ../../any.pm_.c:116 ../../any.pm_.c:141 ../../any.pm_.c:218
 msgid "First sector of drive (MBR)"
 msgstr "ドライブの最初のセクタ (MBR)"
 
-#: ../../any.pm_.c:100
+#: ../../any.pm_.c:120
 msgid "SILO Installation"
 msgstr "SILO のインストール"
 
-#: ../../any.pm_.c:101 ../../any.pm_.c:114
+#: ../../any.pm_.c:121 ../../any.pm_.c:134
 msgid "Where do you want to install the bootloader?"
 msgstr "ブートローダをどこにインストールしますか？"
 
-#: ../../any.pm_.c:113
+#: ../../any.pm_.c:133
 msgid "LILO/grub Installation"
 msgstr "LILO/grub のインストール"
 
-#: ../../any.pm_.c:125 ../../any.pm_.c:139
+#: ../../any.pm_.c:145 ../../any.pm_.c:159
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:127
+#: ../../any.pm_.c:147
 msgid "LILO with text menu"
 msgstr "テキストメニュー版 LILO"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:139
+#: ../../any.pm_.c:148 ../../any.pm_.c:159
 msgid "LILO with graphical menu"
 msgstr "グラフィックメニュー版 LILO"
 
-#: ../../any.pm_.c:131
+#: ../../any.pm_.c:151
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:135
+#: ../../any.pm_.c:155
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr "DOS/Windowsから起動 (loadlin 使用)"
 
-#: ../../any.pm_.c:137 ../../any.pm_.c:139
+#: ../../any.pm_.c:157 ../../any.pm_.c:159
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:145 ../../any.pm_.c:177
+#: ../../any.pm_.c:166 ../../any.pm_.c:198
 msgid "Bootloader main options"
 msgstr "ブートローダのメインオプション"
 
-#: ../../any.pm_.c:146 ../../any.pm_.c:178
+#: ../../any.pm_.c:167 ../../any.pm_.c:199
 msgid "Bootloader to use"
 msgstr "使用するブートローダ"
 
-#: ../../any.pm_.c:148
+#: ../../any.pm_.c:169
 msgid "Bootloader installation"
 msgstr "ブートローダのインストール"
 
-#: ../../any.pm_.c:150 ../../any.pm_.c:180
+#: ../../any.pm_.c:171 ../../any.pm_.c:201
 msgid "Boot device"
 msgstr "ブートデバイス"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:172
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (古い BIOS では動かない)"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:173
 msgid "Compact"
 msgstr "コンパクト"
 
-#: ../../any.pm_.c:152
+#: ../../any.pm_.c:173
 msgid "compact"
 msgstr "コンパクト"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:250
+#: ../../any.pm_.c:174 ../../any.pm_.c:298
 msgid "Video mode"
 msgstr "ビデオモード"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:176
 msgid "Delay before booting default image"
 msgstr "デフォルトイメージ起動の待ち時間"
 
-#: ../../any.pm_.c:157 ../../any.pm_.c:730
-#: ../../install_steps_interactive.pm_.c:938 ../../network/modem.pm_.c:46
-#: ../../printerdrake.pm_.c:402 ../../printerdrake.pm_.c:481
-#: ../../standalone/draknet_.c:603
+#: ../../any.pm_.c:178 ../../any.pm_.c:796
+#: ../../install_steps_interactive.pm_.c:1115 ../../network/modem.pm_.c:48
+#: ../../printerdrake.pm_.c:708 ../../printerdrake.pm_.c:806
+#: ../../standalone/draknet_.c:625
 msgid "Password"
 msgstr "パスワード"
 
-#: ../../any.pm_.c:158 ../../any.pm_.c:731
-#: ../../install_steps_interactive.pm_.c:939
+#: ../../any.pm_.c:179 ../../any.pm_.c:797
+#: ../../install_steps_interactive.pm_.c:1116
 msgid "Password (again)"
 msgstr "パスワード (もう一度)"
 
-#: ../../any.pm_.c:159
+#: ../../any.pm_.c:180
 msgid "Restrict command line options"
 msgstr "コマンドラインオプションの制限"
 
-#: ../../any.pm_.c:159
+#: ../../any.pm_.c:180
 msgid "restrict"
 msgstr "制限"
 
-#: ../../any.pm_.c:161
+#: ../../any.pm_.c:182
 msgid "Clean /tmp at each boot"
 msgstr "各ブート時に /tmp 以下を消す"
 
 # added a \n to the translation to avoid that the dialog window
 # in which it appears to be tooooo laaaaarge
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:183
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 "必要なら正確なRAMサイズを入れてください\n"
 "（%d MBが見つかりました）"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:185
 msgid "Enable multi profiles"
 msgstr "マルチプロファイルを有効に"
 
-#: ../../any.pm_.c:168
+#: ../../any.pm_.c:189
 msgid "Give the ram size in MB"
 msgstr "RamサイズをMBで入力"
 
-#: ../../any.pm_.c:170
+#: ../../any.pm_.c:191
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "“コマンドラインオプションの制限”オプションはパスワードがないと\n"
 "役にたちません。"
 
-#: ../../any.pm_.c:171 ../../any.pm_.c:707
-#: ../../install_steps_interactive.pm_.c:933
+#: ../../any.pm_.c:192 ../../any.pm_.c:773
+#: ../../diskdrake/interactive.pm_.c:1135
+#: ../../install_steps_interactive.pm_.c:1110
 msgid "Please try again"
 msgstr "もう一度試して下さい"
 
-#: ../../any.pm_.c:171 ../../any.pm_.c:707
-#: ../../install_steps_interactive.pm_.c:933
+#: ../../any.pm_.c:192 ../../any.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:1110
 msgid "The passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: ../../any.pm_.c:179
+#: ../../any.pm_.c:200
 msgid "Init Message"
 msgstr "初期化メッセージ"
 
-#: ../../any.pm_.c:181
+#: ../../any.pm_.c:202
 msgid "Open Firmware Delay"
 msgstr "オープンファームウェアのディレイ"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:203
 msgid "Kernel Boot Timeout"
 msgstr "カーネルブートのタイムアウト"
 
-#: ../../any.pm_.c:183
+#: ../../any.pm_.c:204
 msgid "Enable CD Boot?"
 msgstr "CD からの起動を有効にしますか？"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:205
 msgid "Enable OF Boot?"
 msgstr "OF からの起動を有効にしますか？"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:206
 msgid "Default OS?"
 msgstr "デフォルトの OS は？"
 
-#: ../../any.pm_.c:207
+#: ../../any.pm_.c:240
+msgid ""
+"You decided to install the bootloader on a partition.\n"
+"This implies you already have a bootloader on the hard drive you boot (eg: "
+"System Commander).\n"
+"\n"
+"On which drive are you booting?"
+msgstr ""
+
+#: ../../any.pm_.c:255
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -653,144 +698,153 @@ msgstr ""
 "エントリは以下のとおりです。\n"
 "追加・変更できます。"
 
-#: ../../any.pm_.c:217
+#: ../../any.pm_.c:265 ../../standalone/drakbackup_.c:752
+#: ../../standalone/drakbackup_.c:861 ../../standalone/drakfont_.c:789
+#: ../../standalone/drakfont_.c:826
 msgid "Add"
 msgstr "加える"
 
-#: ../../any.pm_.c:217 ../../any.pm_.c:718 ../../diskdrake.pm_.c:161
-#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1846
-#: ../../printerdrake.pm_.c:1847 ../../printerdrake.pm_.c:1904
-#: ../../printerdrake.pm_.c:1948
+#: ../../any.pm_.c:265 ../../any.pm_.c:784 ../../diskdrake/hd_gtk.pm_.c:153
+#: ../../diskdrake/removable.pm_.c:27 ../../diskdrake/smbnfs_gtk.pm_.c:86
+#: ../../interactive_http.pm_.c:153
 msgid "Done"
 msgstr "終了"
 
-#: ../../any.pm_.c:217
+#: ../../any.pm_.c:265
 msgid "Modify"
 msgstr "変更"
 
-#: ../../any.pm_.c:225
+#: ../../any.pm_.c:273
 msgid "Which type of entry do you want to add?"
 msgstr "どのタイプを追加しますか"
 
-#: ../../any.pm_.c:226
+#: ../../any.pm_.c:274 ../../standalone/drakbackup_.c:895
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:226
+#: ../../any.pm_.c:274
 msgid "Other OS (SunOS...)"
 msgstr "他の OS (SunOSなど...)"
 
-#: ../../any.pm_.c:227
+#: ../../any.pm_.c:275
 msgid "Other OS (MacOS...)"
 msgstr "他の OS (MacOSなど...)"
 
-#: ../../any.pm_.c:227
+#: ../../any.pm_.c:275
 msgid "Other OS (windows...)"
 msgstr "他の OS (ウィンドウズなど...)"
 
-#: ../../any.pm_.c:246
+#: ../../any.pm_.c:294
 msgid "Image"
 msgstr "イメージ"
 
-#: ../../any.pm_.c:247 ../../any.pm_.c:258
+#: ../../any.pm_.c:295 ../../any.pm_.c:306
 msgid "Root"
 msgstr "ルート"
 
-#: ../../any.pm_.c:248 ../../any.pm_.c:277
+#: ../../any.pm_.c:296 ../../any.pm_.c:325
 msgid "Append"
 msgstr "追加"
 
-#: ../../any.pm_.c:252
+#: ../../any.pm_.c:300
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:253
+#: ../../any.pm_.c:301
 msgid "Read-write"
 msgstr "読み書き"
 
-#: ../../any.pm_.c:260
+#: ../../any.pm_.c:308
 msgid "Table"
 msgstr "テーブル"
 
-#: ../../any.pm_.c:261
+#: ../../any.pm_.c:309
 msgid "Unsafe"
 msgstr "危険"
 
-#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
+#: ../../any.pm_.c:316 ../../any.pm_.c:321 ../../any.pm_.c:324
 msgid "Label"
 msgstr "ラベル"
 
-#: ../../any.pm_.c:270 ../../any.pm_.c:281
+#: ../../any.pm_.c:318 ../../any.pm_.c:329
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../../any.pm_.c:278
+#: ../../any.pm_.c:326
 msgid "Initrd-size"
 msgstr "Initrdサイズ"
 
-#: ../../any.pm_.c:280
+#: ../../any.pm_.c:328
 msgid "NoVideo"
 msgstr "ビデオなし"
 
-#: ../../any.pm_.c:288
+#: ../../any.pm_.c:336
 msgid "Remove entry"
 msgstr "エントリを消す"
 
-#: ../../any.pm_.c:291
+#: ../../any.pm_.c:339
 msgid "Empty label not allowed"
 msgstr "空白のラベルは許されていません"
 
-#: ../../any.pm_.c:292
+#: ../../any.pm_.c:340
+msgid "You must specify a kernel image"
+msgstr "カーネルイメージを指定してください"
+
+#: ../../any.pm_.c:340
+msgid "You must specify a root partition"
+msgstr "rootパーティションは必ず指定してください"
+
+#: ../../any.pm_.c:341
 msgid "This label is already used"
 msgstr "このラベルはすでに使われています"
 
-#: ../../any.pm_.c:597
+#: ../../any.pm_.c:656
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "%s %s インターフェースが見つかりました"
 
-#: ../../any.pm_.c:598
+#: ../../any.pm_.c:657
 msgid "Do you have another one?"
 msgstr "別のものはありますか？"
 
-#: ../../any.pm_.c:599
+#: ../../any.pm_.c:658
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "%s インターフェースはありますか？"
 
-#: ../../any.pm_.c:601 ../../any.pm_.c:760 ../../interactive.pm_.c:112
-#: ../../my_gtk.pm_.c:715
+#: ../../any.pm_.c:660 ../../any.pm_.c:832 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:1018
 msgid "No"
 msgstr "いいえ"
 
-#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
-#: ../../my_gtk.pm_.c:715
+#: ../../any.pm_.c:660 ../../any.pm_.c:831 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:1018
 msgid "Yes"
 msgstr "はい"
 
-#: ../../any.pm_.c:602
+#: ../../any.pm_.c:661
 msgid "See hardware info"
 msgstr "ハードウェアの情報を見て下さい"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:637
+#: ../../any.pm_.c:695
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "%s カード %s のドライバインストール中"
 
-#: ../../any.pm_.c:638
+#: ../../any.pm_.c:696
 #, c-format
 msgid "(module %s)"
 msgstr "(モジュール %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:707
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "どの %s ドライバを試しましょうか？"
 
-#: ../../any.pm_.c:657
+#: ../../any.pm_.c:715
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -807,20 +861,24 @@ msgstr ""
 "させてみますか？　プローブ中にコンピュータが停止するかも知れませんが，\n"
 "マシンがこわれたりすることはありません。"
 
-#: ../../any.pm_.c:662
+#: ../../any.pm_.c:720
 msgid "Autoprobe"
 msgstr "オートプローブ"
 
-#: ../../any.pm_.c:662
+#: ../../any.pm_.c:720
 msgid "Specify options"
 msgstr "オプション指定"
 
-#: ../../any.pm_.c:666
+#: ../../any.pm_.c:725
 #, c-format
-msgid "You may now provide its options to module %s."
-msgstr "モジュール %s のオプションを指定してください。"
+msgid ""
+"You may now provide its options to module %s.\n"
+"Note that any address should be entered with the prefix 0x like '0x123'"
+msgstr ""
+"ではモジュール %s のオプションを指定してください。\n"
+"なお、アドレスはすべて、頭に 0x をつけて入力すること。例： '0x123'"
 
-#: ../../any.pm_.c:672
+#: ../../any.pm_.c:731
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -831,11 +889,11 @@ msgstr ""
 "オプションのフォーマットは“名前=値 名前2=値2 ...”です。\n"
 "例: “io=0x300 irq=7”"
 
-#: ../../any.pm_.c:675
+#: ../../any.pm_.c:734
 msgid "Module options:"
 msgstr "モジュールのオプション"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:745
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -844,33 +902,49 @@ msgstr ""
 "モジュール %s のロードができませんでした。\n"
 "パラメータを変えてやりなおしてみますか？"
 
-#: ../../any.pm_.c:704
+#: ../../any.pm_.c:761
+msgid "access to X programs"
+msgstr "X プログラムへのアクセス"
+
+#: ../../any.pm_.c:762
+msgid "access to rpm tools"
+msgstr "rpm ツールへのアクセス"
+
+#: ../../any.pm_.c:763
+msgid "allow \"su\""
+msgstr "“su”を許す"
+
+#: ../../any.pm_.c:764
+msgid "access to administrative files"
+msgstr "管理ファイルへのアクセス"
+
+#: ../../any.pm_.c:769
 #, c-format
 msgid "(already added %s)"
-msgstr "(すでに %s は加わっています)"
+msgstr "(%s は追加済み)"
 
-#: ../../any.pm_.c:708
+#: ../../any.pm_.c:774
 msgid "This password is too simple"
 msgstr "パスワードが簡単すぎます"
 
-#: ../../any.pm_.c:709
+#: ../../any.pm_.c:775
 msgid "Please give a user name"
 msgstr "ユーザ名を与えて下さい"
 
-#: ../../any.pm_.c:710
+#: ../../any.pm_.c:776
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "ユーザ名には英小文字，数字、「-」や「_」しか使えません。"
 
-#: ../../any.pm_.c:711
+#: ../../any.pm_.c:777
 msgid "This user name is already added"
 msgstr "このユーザ名はすでに存在します"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:781
 msgid "Add user"
 msgstr "ユーザを追加"
 
-#: ../../any.pm_.c:716
+#: ../../any.pm_.c:782
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -879,32 +953,32 @@ msgstr ""
 "ユーザ名を入力して下さい\n"
 "%s"
 
-#: ../../any.pm_.c:717
+#: ../../any.pm_.c:783
 msgid "Accept user"
 msgstr "受け付けるユーザ"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:794
 msgid "Real name"
 msgstr "実際の氏名"
 
-#: ../../any.pm_.c:729 ../../printerdrake.pm_.c:401
-#: ../../printerdrake.pm_.c:480
+#: ../../any.pm_.c:795 ../../printerdrake.pm_.c:707
+#: ../../printerdrake.pm_.c:805
 msgid "User name"
 msgstr "ユーザ名"
 
-#: ../../any.pm_.c:732
+#: ../../any.pm_.c:798
 msgid "Shell"
 msgstr "シェル"
 
-#: ../../any.pm_.c:734
+#: ../../any.pm_.c:800
 msgid "Icon"
 msgstr "アイコン"
 
-#: ../../any.pm_.c:756
+#: ../../any.pm_.c:828
 msgid "Autologin"
 msgstr "自動ログイン"
 
-#: ../../any.pm_.c:757
+#: ../../any.pm_.c:829
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
 "Do you want to use this feature?"
@@ -912,32 +986,195 @@ msgstr ""
 "自動的に特定ユーザがログオンするようにコンピュータを設定できます。\n"
 "この機能を使いますか？"
 
-#: ../../any.pm_.c:761
+#: ../../any.pm_.c:833
 msgid "Choose the default user:"
 msgstr "デフォルトユーザの選択:"
 
-#: ../../any.pm_.c:762
+#: ../../any.pm_.c:834
 msgid "Choose the window manager to run:"
 msgstr "使うウィンドウマネージャを選んで下さい："
 
-#: ../../any.pm_.c:771
-msgid "Please, choose a language to use."
+#: ../../any.pm_.c:849
+msgid "Please choose a language to use."
 msgstr "どの言語を使うか選んでくださいね。"
 
-#: ../../any.pm_.c:773
+#: ../../any.pm_.c:851
 msgid "You can choose other languages that will be available after install"
 msgstr "インストール後使用可能になるほかの言語を選択できます"
 
-#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+#: ../../any.pm_.c:863 ../../install_steps_interactive.pm_.c:719
+#: ../../standalone/drakxtv_.c:54
 msgid "All"
 msgstr "ぜんぶ"
 
+#: ../../any.pm_.c:955
+msgid "Allow all users"
+msgstr "すべてのユーザを認める"
+
+#: ../../any.pm_.c:955 ../../install_steps_interactive.pm_.c:521
+msgid "Custom"
+msgstr "カスタム"
+
+#: ../../any.pm_.c:955
+msgid "No sharing"
+msgstr "ファイル共有しない"
+
+#: ../../any.pm_.c:965 ../../network/smbnfs.pm_.c:45
+#, c-format
+msgid "The package %s needs to be installed. Do you want to install it?"
+msgstr "パッケージ %s が必要です。インストールしますか？"
+
+#: ../../any.pm_.c:968
+msgid "You can export using NFS or Samba. Which one do you want"
+msgstr "エクスポートには NFS か Samba が使えます。どちらにしますか？"
+
+#: ../../any.pm_.c:976 ../../network/smbnfs.pm_.c:49
+#, c-format
+msgid "Mandatory package %s is missing"
+msgstr "必要パッケージ %s がありません"
+
+#: ../../any.pm_.c:982
+msgid ""
+"Do you want to allow users to export some directories in their home?\n"
+"Allowing this will permit users to simply click on \"Share\" in konqueror "
+"and nautilus.\n"
+"\n"
+"\"Custom\" permit a per-user granularity.\n"
+msgstr ""
+
+#: ../../any.pm_.c:996 ../../bootlook.pm_.c:161
+#: ../../diskdrake/smbnfs_gtk.pm_.c:85 ../../install_steps_gtk.pm_.c:464
+#: ../../install_steps_gtk.pm_.c:522 ../../install_steps_interactive.pm_.c:594
+#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:317
+#: ../../interactive.pm_.c:349 ../../interactive_stdio.pm_.c:141
+#: ../../my_gtk.pm_.c:687 ../../my_gtk.pm_.c:690 ../../my_gtk.pm_.c:1019
+#: ../../network/netconnect.pm_.c:47 ../../printerdrake.pm_.c:1586
+#: ../../standalone/drakautoinst_.c:204 ../../standalone/drakbackup_.c:2264
+#: ../../standalone/drakbackup_.c:2289 ../../standalone/drakbackup_.c:2310
+#: ../../standalone/drakbackup_.c:2331 ../../standalone/drakbackup_.c:2349
+#: ../../standalone/drakbackup_.c:2397 ../../standalone/drakbackup_.c:2417
+#: ../../standalone/drakbackup_.c:2436 ../../standalone/drakfont_.c:767
+#: ../../standalone/drakgw_.c:721 ../../standalone/draknet_.c:116
+#: ../../standalone/draknet_.c:148 ../../standalone/draknet_.c:290
+#: ../../standalone/draknet_.c:538 ../../standalone/draknet_.c:680
+#: ../../standalone/logdrake_.c:225 ../../standalone/logdrake_.c:512
+#: ../../standalone/tinyfirewall_.c:65
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: ../../any.pm_.c:996
+msgid "Launch userdrake"
+msgstr "userdrake を起動"
+
+#: ../../any.pm_.c:998
+msgid ""
+"The per-user sharing uses the group \"fileshare\". \n"
+"You can use userdrake to add a user in this group."
+msgstr ""
+"ユーザ毎の共有は、“fileshare”グループを使います。\n"
+"このグループにユーザを追加するには、userdrake が使えますよ。"
+
+#: ../../any.pm_.c:1035
+msgid "Welcome To Crackers"
+msgstr "悪質なクラッカー様も侵入しほうだい"
+
+#: ../../any.pm_.c:1036
+msgid "Poor"
+msgstr "きわめて低い"
+
+#: ../../any.pm_.c:1037 ../../mouse.pm_.c:31
+msgid "Standard"
+msgstr "標準"
+
+#: ../../any.pm_.c:1038
+msgid "High"
+msgstr "高い"
+
+#: ../../any.pm_.c:1039
+msgid "Higher"
+msgstr "もっと高い"
+
+#: ../../any.pm_.c:1040
+msgid "Paranoid"
+msgstr "神経質なほど高水準"
+
+#: ../../any.pm_.c:1043
+msgid ""
+"This level is to be used with care. It makes your system more easy to use,\n"
+"but very sensitive: it must not be used for a machine connected to others\n"
+"or to the Internet. There is no password access."
+msgstr ""
+"このレベルを使うなら注意が必要です。システムを使うのは簡単になりますが、\n"
+"だれにでもアクセスできてしまいます。他のマシンやインターネット\n"
+"につながったマシンでは使わないでください。パスワード制限もありません。"
+
+#: ../../any.pm_.c:1046
+msgid ""
+"Password are now enabled, but use as a networked computer is still not "
+"recommended."
+msgstr ""
+"パスワードが有効になりましたが、ネットワークにつなぐのはまだ\n"
+"お奨めできません。"
+
+#: ../../any.pm_.c:1047
+msgid ""
+"This is the standard security recommended for a computer that will be used "
+"to connect to the Internet as a client."
+msgstr ""
+"これは標準のセキュリティで、クライアントとしてインターネット接続するマシンで"
+"の推奨レベルです。"
+
+#: ../../any.pm_.c:1048
+msgid ""
+"There are already some restrictions, and more automatic checks are run every "
+"night."
+msgstr "すでに制限がかかっていて、さらに毎晩自動チェックがもっとかかります。"
+
+#: ../../any.pm_.c:1049
+msgid ""
+"With this security level, the use of this system as a server becomes "
+"possible.\n"
+"The security is now high enough to use the system as a server which accept\n"
+"connections from many clients. Note: if your machine is only a client on the "
+"Internet, you should better choose a lower level."
+msgstr ""
+"このセキュリティレベルだと、システムをサーバとして使えるようになります。\n"
+"多数のクライアントから接続を受けるサーバとしても使えるだけのセキュリティ\n"
+"水準になっています。註：あなたのマシンがインターネット上のクライアント専用な"
+"ら、もっと低いレベルを選んだほうがいいですよ。"
+
+#: ../../any.pm_.c:1052
+msgid ""
+"Based on the previous level, but the system is entirely closed.\n"
+"Security features are at their maximum."
+msgstr ""
+"前のレベルに基づいていますが、これでシステムは完全にとじた状態\n"
+"になっています。セキュリティは最大です。"
+
+#: ../../any.pm_.c:1058
+msgid "Choose security level"
+msgstr "セキュリティの水準を選んでください"
+
+#: ../../any.pm_.c:1061
+msgid "Security level"
+msgstr "セキュリティ水準"
+
+#: ../../any.pm_.c:1063
+msgid "Use libsafe for servers"
+msgstr "サーバにlibsafeを使う"
+
+#: ../../any.pm_.c:1064
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+"バッファオーバーフローやフォーマットストリング攻撃を防御するライブラリ。"
+
 # NOTE: this message will be displayed by SILO at boot time; that is
 # only the ascii charset will be available
 # so use only 7bit for this message
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:259
+#: ../../bootloader.pm_.c:355
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -961,52 +1198,52 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:835
+#: ../../bootloader.pm_.c:928
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "GRUB operating system chooser-he youkosou!"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:838
+#: ../../bootloader.pm_.c:931
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "%c, %c key wo tukatte entry wo shitei shite kudasai."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:841
+#: ../../bootloader.pm_.c:934
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Kono OS wo kidou suru nara Enter, Kidou mae no jikkou command"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:844
+#: ../../bootloader.pm_.c:937
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "no henshuu niha 'e', command line nara 'c' wo oshi masu."
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:847
+#: ../../bootloader.pm_.c:940
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Sentaku shita OS ga %d byou de jidoutekini kidou shimasu."
 
-#: ../../bootloader.pm_.c:851
+#: ../../bootloader.pm_.c:944
 msgid "not enough room in /boot"
 msgstr "/boot の容量不足です"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:951
+#: ../../bootloader.pm_.c:1044
 msgid "Desktop"
 msgstr "デスクトップ"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:953
+#: ../../bootloader.pm_.c:1046
 msgid "Start Menu"
 msgstr "スタートメニュー"
 
-#: ../../bootloader.pm_.c:972
+#: ../../bootloader.pm_.c:1065
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "ブートローダは %s パーティションにはインストールできません\n"
@@ -1019,15 +1256,15 @@ msgstr "ヘルプはまだ実装されていません。\n"
 msgid "Boot Style Configuration"
 msgstr "起動方式の設定"
 
-#: ../../bootlook.pm_.c:79
+#: ../../bootlook.pm_.c:79 ../../standalone/logdrake_.c:101
 msgid "/_File"
 msgstr "/ファイル(F)"
 
-#: ../../bootlook.pm_.c:80
+#: ../../bootlook.pm_.c:80 ../../standalone/logdrake_.c:107
 msgid "/File/_Quit"
 msgstr "/ファイル(F)/終了(Q)"
 
-#: ../../bootlook.pm_.c:80
+#: ../../bootlook.pm_.c:80 ../../standalone/logdrake_.c:107
 msgid "<control>Q"
 msgstr "<control>Q"
 
@@ -1051,11 +1288,15 @@ msgstr "ふつうの Gtk+ モニタ"
 msgid "Launch Aurora at boot time"
 msgstr "起動時にAuroraを実行"
 
-#: ../../bootlook.pm_.c:100
+#: ../../bootlook.pm_.c:98
 msgid "Lilo/grub mode"
 msgstr "Lilo/grub モード"
 
-#: ../../bootlook.pm_.c:102
+#: ../../bootlook.pm_.c:98
+msgid "Yaboot mode"
+msgstr "Yaboot モード"
+
+#: ../../bootlook.pm_.c:104
 #, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
@@ -1064,100 +1305,141 @@ msgstr ""
 "いま、ブートマネージャには %s をお使いです。\n"
 "設定ウィザードを起動するには「設定」をクリックしましょう。"
 
-#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
-#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+#: ../../bootlook.pm_.c:106 ../../standalone/drakbackup_.c:1467
+#: ../../standalone/drakbackup_.c:1478 ../../standalone/drakgw_.c:715
+#: ../../standalone/tinyfirewall_.c:59
 msgid "Configure"
 msgstr "設定"
 
-#: ../../bootlook.pm_.c:108
-msgid "Boot mode"
-msgstr "ブートモード"
-
-#: ../../bootlook.pm_.c:136
+#: ../../bootlook.pm_.c:141
 msgid "System mode"
 msgstr "システムモード"
 
-#: ../../bootlook.pm_.c:138
+#: ../../bootlook.pm_.c:143
 msgid "Launch the X-Window system at start"
 msgstr "起動時に X ウィンドウを実行"
 
-#: ../../bootlook.pm_.c:143
+#: ../../bootlook.pm_.c:148
 msgid "No, I don't want autologin"
 msgstr "自動ログインはしない"
 
-#: ../../bootlook.pm_.c:145
+#: ../../bootlook.pm_.c:150
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "この (ユーザ、デスクトップ）で自動ログインする"
 
-#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:108
-#: ../../standalone/draknet_.c:140 ../../standalone/draknet_.c:208
-#: ../../standalone/draknet_.c:320 ../../standalone/draknet_.c:433
-#: ../../standalone/draknet_.c:507 ../../standalone/draknet_.c:543
-#: ../../standalone/draknet_.c:644
+#: ../../bootlook.pm_.c:160 ../../network/netconnect.pm_.c:102
+#: ../../standalone/drakbackup_.c:2441 ../../standalone/drakbackup_.c:3345
+#: ../../standalone/drakfont_.c:532 ../../standalone/drakfont_.c:655
+#: ../../standalone/drakfont_.c:719 ../../standalone/drakfont_.c:765
+#: ../../standalone/draknet_.c:109 ../../standalone/draknet_.c:141
+#: ../../standalone/draknet_.c:297 ../../standalone/draknet_.c:436
+#: ../../standalone/draknet_.c:522 ../../standalone/draknet_.c:565
+#: ../../standalone/draknet_.c:666 ../../standalone/logdrake_.c:505
 msgid "OK"
 msgstr "OK"
 
-#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:516
-#: ../../interactive.pm_.c:122 ../../interactive.pm_.c:286
-#: ../../interactive.pm_.c:308 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:419 ../../my_gtk.pm_.c:716
-#: ../../printerdrake.pm_.c:1158 ../../standalone/drakgw_.c:648
-#: ../../standalone/draknet_.c:115 ../../standalone/draknet_.c:147
-#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:519
-#: ../../standalone/draknet_.c:658 ../../standalone/tinyfirewall_.c:63
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../../bootlook.pm_.c:224
+#: ../../bootlook.pm_.c:229
 #, c-format
 msgid "can not open /etc/inittab for reading: %s"
 msgstr "/etc/inittab が読みとり用に開けません: %s"
 
-#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "LILO のインストールに失敗しました。以下のエラーが発生:"
-
-#: ../../common.pm_.c:93
+#: ../../common.pm_.c:94
 msgid "GB"
 msgstr "GB"
 
-#: ../../common.pm_.c:93
+#: ../../common.pm_.c:94
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334
+#: ../../common.pm_.c:94
 msgid "MB"
 msgstr "MB"
 
-#: ../../common.pm_.c:101
+#: ../../common.pm_.c:102
 msgid "TB"
 msgstr "TB"
 
-#: ../../common.pm_.c:109
+#: ../../common.pm_.c:110
 #, c-format
 msgid "%d minutes"
 msgstr "あと %d 分"
 
-#: ../../common.pm_.c:111
+#: ../../common.pm_.c:112
 msgid "1 minute"
 msgstr "あと 1 分"
 
-#: ../../common.pm_.c:113
+#: ../../common.pm_.c:114
 #, c-format
 msgid "%d seconds"
 msgstr "あと %d 秒"
 
-#: ../../diskdrake.pm_.c:100
+#: ../../common.pm_.c:159
+msgid "Can't make screenshots before partitioning"
+msgstr "パーティションを追加するまでスクリーンショットは撮れません"
+
+#: ../../common.pm_.c:166
+#, c-format
+msgid "Screenshots will be available after install in %s"
+msgstr "%s のインストール後にスクリーンショットが可能です"
+
+#: ../../crypto.pm_.c:12 ../../crypto.pm_.c:26 ../../standalone/drakxtv_.c:50
+msgid "France"
+msgstr "フランス"
+
+#: ../../crypto.pm_.c:13
+msgid "Costa Rica"
+msgstr "コスタリカ"
+
+#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:27
+msgid "Belgium"
+msgstr "ベルギー"
+
+#: ../../crypto.pm_.c:15 ../../crypto.pm_.c:28
+msgid "Czech Republic"
+msgstr "チェコ共和国"
+
+#: ../../crypto.pm_.c:16 ../../crypto.pm_.c:29
+msgid "Germany"
+msgstr "ドイツ"
+
+#: ../../crypto.pm_.c:17 ../../crypto.pm_.c:30
+msgid "Greece"
+msgstr "ギリシャ"
+
+#: ../../crypto.pm_.c:18 ../../crypto.pm_.c:31
+msgid "Norway"
+msgstr "ノルウェー"
+
+#: ../../crypto.pm_.c:19 ../../crypto.pm_.c:32
+msgid "Sweden"
+msgstr "スウェーデン"
+
+#: ../../crypto.pm_.c:20 ../../crypto.pm_.c:34
+msgid "Netherlands"
+msgstr "オランダ"
+
+#: ../../crypto.pm_.c:21 ../../crypto.pm_.c:35 ../../standalone/drakxtv_.c:50
+msgid "Italy"
+msgstr "イタリア"
+
+#: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36
+msgid "Austria"
+msgstr "オーストリア"
+
+#: ../../crypto.pm_.c:33 ../../crypto.pm_.c:67
+msgid "United States"
+msgstr "アメリカ合衆国"
+
+#: ../../diskdrake/hd_gtk.pm_.c:94
 msgid "Please make a backup of your data first"
 msgstr "データのバックアップを取って下さい"
 
-#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
-#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:891
+#: ../../diskdrake/interactive.pm_.c:900 ../../diskdrake/interactive.pm_.c:954
 msgid "Read carefully!"
 msgstr "よく読んで下さい！"
 
-#: ../../diskdrake.pm_.c:103
+#: ../../diskdrake/hd_gtk.pm_.c:97
 msgid ""
 "If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
 "enough)\n"
@@ -1166,54 +1448,23 @@ msgstr ""
 "もし aboot を使うつもりなら、ディスクの先頭に空き領域 (2048セクタくらい)\n"
 "を残すよう気を付けて下さい。"
 
-#: ../../diskdrake.pm_.c:122 ../../diskdrake_interactive.pm_.c:313
-#: ../../diskdrake_interactive.pm_.c:328 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:310 ../../interactive_http.pm_.c:119
-#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:62
+#: ../../diskdrake/hd_gtk.pm_.c:116 ../../diskdrake/interactive.pm_.c:325
+#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/smbnfs_gtk.pm_.c:45
+#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:67
+#: ../../install_steps_interactive.pm_.c:356 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:84
 msgid "Error"
 msgstr "エラー"
 
-#: ../../diskdrake.pm_.c:159
+#: ../../diskdrake/hd_gtk.pm_.c:151
 msgid "Wizard"
 msgstr "ウィザード"
 
-#: ../../diskdrake.pm_.c:181
-msgid "New"
-msgstr "新規"
-
-#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
-msgid "Remote"
-msgstr "リモート"
-
-#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
-#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
-msgid "Mount point"
-msgstr "マウントポイント"
-
-#: ../../diskdrake.pm_.c:209
-msgid "Options"
-msgstr "オプション"
-
-#: ../../diskdrake.pm_.c:211 ../../diskdrake.pm_.c:417
-#: ../../diskdrake.pm_.c:534 ../../diskdrake_interactive.pm_.c:353
-#: ../../diskdrake_interactive.pm_.c:488
-msgid "Type"
-msgstr "タイプ"
-
-#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
-msgid "Unmount"
-msgstr "アンマウント"
-
-#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
-msgid "Mount"
-msgstr "マウント"
-
-#: ../../diskdrake.pm_.c:228
+#: ../../diskdrake/hd_gtk.pm_.c:181 ../../diskdrake/removable_gtk.pm_.c:24
 msgid "Choose action"
 msgstr "動作を選択"
 
-#: ../../diskdrake.pm_.c:235
+#: ../../diskdrake/hd_gtk.pm_.c:185
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -1225,88 +1476,77 @@ msgstr ""
 "まずはこいつをリサイズするのがいいでしょう\n"
 "（そのパーティションをクリックして、次に「リサイズ」をクリックして下さい)"
 
-#: ../../diskdrake.pm_.c:238
+#: ../../diskdrake/hd_gtk.pm_.c:188
 msgid "Please click on a partition"
 msgstr "変更するパーティションをクリックしてください"
 
-#: ../../diskdrake.pm_.c:240
-msgid "Please click on a media"
-msgstr "メディアをクリックしてください"
-
-#: ../../diskdrake.pm_.c:243
-msgid ""
-"Please click on a button above\n"
-"\n"
-"Or use \"New\""
-msgstr ""
-"上のボタンをクリックするか\n"
-"\n"
-"\"New\"を使います"
-
-#: ../../diskdrake.pm_.c:244
-msgid "Use \"New\""
-msgstr "\"New\"を使います"
-
-#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+#: ../../diskdrake/hd_gtk.pm_.c:202 ../../diskdrake/smbnfs_gtk.pm_.c:67
+#: ../../install_steps_gtk.pm_.c:523
 msgid "Details"
 msgstr "詳細"
 
-#: ../../diskdrake.pm_.c:395
+#: ../../diskdrake/hd_gtk.pm_.c:320
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:395
+#: ../../diskdrake/hd_gtk.pm_.c:320
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:395
+#: ../../diskdrake/hd_gtk.pm_.c:320
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:395
+#: ../../diskdrake/hd_gtk.pm_.c:320
 msgid "Journalised FS"
 msgstr "ジャーナリングファイルシステム"
 
-#: ../../diskdrake.pm_.c:395
+#: ../../diskdrake/hd_gtk.pm_.c:320
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:395
+#: ../../diskdrake/hd_gtk.pm_.c:320
 msgid "Swap"
 msgstr "スワップ"
 
-#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
+#: ../../diskdrake/hd_gtk.pm_.c:321 ../../diskdrake/interactive.pm_.c:1050
 msgid "Empty"
 msgstr "空"
 
-#: ../../diskdrake.pm_.c:396 ../../install_steps_gtk.pm_.c:373
-#: ../../install_steps_gtk.pm_.c:433 ../../mouse.pm_.c:161
-#: ../../services.pm_.c:161
+#: ../../diskdrake/hd_gtk.pm_.c:321 ../../install_steps_gtk.pm_.c:379
+#: ../../install_steps_gtk.pm_.c:439 ../../mouse.pm_.c:162
+#: ../../services.pm_.c:157 ../../standalone/drakbackup_.c:944
 msgid "Other"
 msgstr "その他"
 
-#: ../../diskdrake.pm_.c:400
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "Filesystem types:"
 msgstr "ファイルシステム タイプ:"
 
-#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+#: ../../diskdrake/hd_gtk.pm_.c:342 ../../diskdrake/interactive.pm_.c:386
 msgid "Create"
 msgstr "作成"
 
-#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#: ../../diskdrake/hd_gtk.pm_.c:342 ../../diskdrake/interactive.pm_.c:365
+#: ../../diskdrake/interactive.pm_.c:499 ../../diskdrake/removable.pm_.c:26
+#: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17
+msgid "Type"
+msgstr "タイプ"
+
+#: ../../diskdrake/hd_gtk.pm_.c:342 ../../diskdrake/hd_gtk.pm_.c:344
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "代わりに“%s”を使って下さい"
 
-#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+#: ../../diskdrake/hd_gtk.pm_.c:344 ../../diskdrake/interactive.pm_.c:374
 msgid "Delete"
 msgstr "削除"
 
-#: ../../diskdrake.pm_.c:423
+#: ../../diskdrake/hd_gtk.pm_.c:348
 msgid "Use ``Unmount'' first"
 msgstr "最初に「アンマウント」を使って下さい"
 
-#: ../../diskdrake.pm_.c:424 ../../diskdrake_interactive.pm_.c:480
+#: ../../diskdrake/hd_gtk.pm_.c:349 ../../diskdrake/interactive.pm_.c:491
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -1314,131 +1554,67 @@ msgstr ""
 "パーティションの型を %s に変更した後、このパーティション上のデータは失われま"
 "す"
 
-#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "デバイス %s をどこにマウントしますか？"
-
-#: ../../diskdrake.pm_.c:500
-msgid "Mount options"
-msgstr "マウントオプション"
-
-#: ../../diskdrake.pm_.c:507
-msgid "Various"
-msgstr "その他"
-
-#: ../../diskdrake.pm_.c:525
-msgid "Removable media"
-msgstr "リムーバブルメディア"
-
-#: ../../diskdrake.pm_.c:532
-msgid "Change type"
-msgstr "タイプの変更"
-
-#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
-msgid "Which filesystem do you want?"
-msgstr "どのファイルシステムにしますか？"
-
-#: ../../diskdrake.pm_.c:564
-msgid "Scanning available nfs shared resource"
-msgstr "nfs 共有リソースで使えるものをスキャン中"
-
-#: ../../diskdrake.pm_.c:569
-#, c-format
-msgid "Scanning available nfs shared resource of server %s"
-msgstr "サーバ %s の nfs 共有リソースで使えるものをスキャン中"
-
-#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
-msgid "If the list above doesn't contain the wanted entry, enter it here:"
-msgstr "上の一覧に希望のエントリがなければここに入力しましょう:"
-
-#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
-msgid "Server"
-msgstr "サーバ"
-
-#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
-msgid "Shared resource"
-msgstr "共有リソース"
-
-#: ../../diskdrake.pm_.c:615
-msgid "Scanning available samba shared resource"
-msgstr "samba 共有リソースで使えるものをスキャン中"
-
-#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
-#, c-format
-msgid "Scanning available samba shared resource of server %s"
-msgstr "サーバ %s の samba 共有リソースで使えるものをスキャン中"
-
-#: ../../diskdrake_interactive.pm_.c:163
+#: ../../diskdrake/interactive.pm_.c:171
 msgid "Choose a partition"
 msgstr "パーティションを選択"
 
-#: ../../diskdrake_interactive.pm_.c:163
+#: ../../diskdrake/interactive.pm_.c:171
 msgid "Choose another partition"
 msgstr "別のパーティションを選ぶ"
 
-#: ../../diskdrake_interactive.pm_.c:188
+#: ../../diskdrake/interactive.pm_.c:196
 msgid "Exit"
 msgstr "終了"
 
-#: ../../diskdrake_interactive.pm_.c:210
+#: ../../diskdrake/interactive.pm_.c:218
 msgid "Toggle to expert mode"
 msgstr "エキスパートモードに移る"
 
-#: ../../diskdrake_interactive.pm_.c:210
+#: ../../diskdrake/interactive.pm_.c:218
 msgid "Toggle to normal mode"
 msgstr "ノーマルモードに移る"
 
-#: ../../diskdrake_interactive.pm_.c:210
+#: ../../diskdrake/interactive.pm_.c:218
 msgid "Undo"
 msgstr "もとに戻す"
 
-#: ../../diskdrake_interactive.pm_.c:229
+#: ../../diskdrake/interactive.pm_.c:237
 msgid "Continue anyway?"
 msgstr "それでも続けますか？"
 
-#: ../../diskdrake_interactive.pm_.c:234
+#: ../../diskdrake/interactive.pm_.c:242
 msgid "Quit without saving"
 msgstr "セーブせず終了"
 
-#: ../../diskdrake_interactive.pm_.c:234
+#: ../../diskdrake/interactive.pm_.c:242
 msgid "Quit without writing the partition table?"
 msgstr "パーティションテーブルを更新せずに終了？"
 
-#: ../../diskdrake_interactive.pm_.c:237
+#: ../../diskdrake/interactive.pm_.c:247
 msgid "Do you want to save /etc/fstab modifications"
 msgstr " /etc/fstab の変更を保存しますか？"
 
-#: ../../diskdrake_interactive.pm_.c:247
+#: ../../diskdrake/interactive.pm_.c:259
 msgid "Auto allocate"
 msgstr "自動割り当て"
 
-#: ../../diskdrake_interactive.pm_.c:247
+#: ../../diskdrake/interactive.pm_.c:259
 msgid "Clear all"
 msgstr "全てをクリア"
 
-#: ../../diskdrake_interactive.pm_.c:247
-#: ../../install_steps_interactive.pm_.c:171
-msgid "More"
-msgstr "次"
-
-#: ../../diskdrake_interactive.pm_.c:250
+#: ../../diskdrake/interactive.pm_.c:262
 msgid "Hard drive information"
 msgstr "ハードドライブの情報"
 
-#: ../../diskdrake_interactive.pm_.c:267
-msgid "Not enough space for auto-allocating"
-msgstr "自動割り当てができるほど空き容量がありません"
-
-#: ../../diskdrake_interactive.pm_.c:273
+#: ../../diskdrake/interactive.pm_.c:283
 msgid "All primary partitions are used"
 msgstr "全てのプライマリパーティションが使われています"
 
-#: ../../diskdrake_interactive.pm_.c:274
+#: ../../diskdrake/interactive.pm_.c:284
 msgid "I can't add any more partition"
 msgstr "これ以上のパーティションは追加できません"
 
-#: ../../diskdrake_interactive.pm_.c:275
+#: ../../diskdrake/interactive.pm_.c:285
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -1446,31 +1622,31 @@ msgstr ""
 "パーティションを増やしたいなら，拡張パーティションが\n"
 "作れるようにどこかのパーティションを消して下さい。"
 
-#: ../../diskdrake_interactive.pm_.c:285
+#: ../../diskdrake/interactive.pm_.c:295
 msgid "Save partition table"
 msgstr "パーティションテーブルを保存"
 
-#: ../../diskdrake_interactive.pm_.c:286
+#: ../../diskdrake/interactive.pm_.c:296
 msgid "Restore partition table"
 msgstr "パーティションテーブルを再生"
 
-#: ../../diskdrake_interactive.pm_.c:287
+#: ../../diskdrake/interactive.pm_.c:297
 msgid "Rescue partition table"
 msgstr "パーティションテーブルを残す"
 
-#: ../../diskdrake_interactive.pm_.c:289
+#: ../../diskdrake/interactive.pm_.c:299
 msgid "Reload partition table"
 msgstr "パーティションテーブルを再読込"
 
-#: ../../diskdrake_interactive.pm_.c:293
+#: ../../diskdrake/interactive.pm_.c:304
 msgid "Removable media automounting"
 msgstr "リムーバブルメディア自動再マウント中"
 
-#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+#: ../../diskdrake/interactive.pm_.c:313 ../../diskdrake/interactive.pm_.c:333
 msgid "Select file"
 msgstr "ファイルを選択"
 
-#: ../../diskdrake_interactive.pm_.c:308
+#: ../../diskdrake/interactive.pm_.c:320
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1478,11 +1654,11 @@ msgstr ""
 "バックアップするパーティションテーブルのサイズが違います\n"
 "続けますか？"
 
-#: ../../diskdrake_interactive.pm_.c:322
+#: ../../diskdrake/interactive.pm_.c:334
 msgid "Warning"
 msgstr "警告"
 
-#: ../../diskdrake_interactive.pm_.c:323
+#: ../../diskdrake/interactive.pm_.c:335
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1490,97 +1666,122 @@ msgstr ""
 "フロッピーをドライブに挿入してください\n"
 "フロッピー上の全てのデータは失われます"
 
-#: ../../diskdrake_interactive.pm_.c:334
+#: ../../diskdrake/interactive.pm_.c:346
 msgid "Trying to rescue partition table"
 msgstr "パーティションテーブルを救出してみます"
 
-#: ../../diskdrake_interactive.pm_.c:340
+#: ../../diskdrake/interactive.pm_.c:352
 msgid "Detailed information"
 msgstr "詳細な情報"
 
-#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+#: ../../diskdrake/interactive.pm_.c:364 ../../diskdrake/interactive.pm_.c:534
+#: ../../diskdrake/interactive.pm_.c:554 ../../diskdrake/removable.pm_.c:24
+#: ../../diskdrake/removable_gtk.pm_.c:15 ../../diskdrake/smbnfs_gtk.pm_.c:83
+msgid "Mount point"
+msgstr "マウントポイント"
+
+#: ../../diskdrake/interactive.pm_.c:366 ../../diskdrake/removable.pm_.c:25
+#: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:84
+msgid "Options"
+msgstr "オプション"
+
+#: ../../diskdrake/interactive.pm_.c:367 ../../diskdrake/interactive.pm_.c:621
 msgid "Resize"
 msgstr "リサイズ"
 
-#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+#: ../../diskdrake/interactive.pm_.c:368 ../../diskdrake/interactive.pm_.c:674
 msgid "Move"
 msgstr "移動"
 
-#: ../../diskdrake_interactive.pm_.c:356
+#: ../../diskdrake/interactive.pm_.c:369
 msgid "Format"
 msgstr "フォーマット"
 
-#: ../../diskdrake_interactive.pm_.c:358
-msgid "Active"
-msgstr "アクティブ"
+#: ../../diskdrake/interactive.pm_.c:370 ../../diskdrake/smbnfs_gtk.pm_.c:80
+msgid "Mount"
+msgstr "マウント"
 
-#: ../../diskdrake_interactive.pm_.c:359
+#: ../../diskdrake/interactive.pm_.c:371
 msgid "Add to RAID"
 msgstr "RAID に加える"
 
-#: ../../diskdrake_interactive.pm_.c:360
+#: ../../diskdrake/interactive.pm_.c:372
 msgid "Add to LVM"
 msgstr "LVM に加える"
 
-#: ../../diskdrake_interactive.pm_.c:363
+#: ../../diskdrake/interactive.pm_.c:373 ../../diskdrake/smbnfs_gtk.pm_.c:79
+msgid "Unmount"
+msgstr "アンマウント"
+
+#: ../../diskdrake/interactive.pm_.c:375
 msgid "Remove from RAID"
 msgstr "RAID から除く"
 
-#: ../../diskdrake_interactive.pm_.c:364
+#: ../../diskdrake/interactive.pm_.c:376
 msgid "Remove from LVM"
 msgstr "LVM から除く"
 
-#: ../../diskdrake_interactive.pm_.c:365
+#: ../../diskdrake/interactive.pm_.c:377
 msgid "Modify RAID"
 msgstr "RAIDの変更"
 
-#: ../../diskdrake_interactive.pm_.c:366
+#: ../../diskdrake/interactive.pm_.c:378
 msgid "Use for loopback"
 msgstr "ループバックの使用"
 
-#: ../../diskdrake_interactive.pm_.c:409
+#: ../../diskdrake/interactive.pm_.c:417
 msgid "Create a new partition"
 msgstr "新しいパーティションを作成"
 
-#: ../../diskdrake_interactive.pm_.c:412
+#: ../../diskdrake/interactive.pm_.c:420
 msgid "Start sector: "
 msgstr "開始セクタ: "
 
-#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+#: ../../diskdrake/interactive.pm_.c:422 ../../diskdrake/interactive.pm_.c:773
 msgid "Size in MB: "
 msgstr "MB でのサイズ: "
 
-#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+#: ../../diskdrake/interactive.pm_.c:423 ../../diskdrake/interactive.pm_.c:774
 msgid "Filesystem type: "
 msgstr "ファイルシステムタイプ: "
 
-#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
-#: ../../diskdrake_interactive.pm_.c:1010
+#: ../../diskdrake/interactive.pm_.c:424
+#: ../../diskdrake/interactive.pm_.c:1034
+#: ../../diskdrake/interactive.pm_.c:1108
 msgid "Mount point: "
 msgstr "マウントポイント: "
 
-#: ../../diskdrake_interactive.pm_.c:420
+#: ../../diskdrake/interactive.pm_.c:428
 msgid "Preference: "
 msgstr "プリファレンス: "
 
-#: ../../diskdrake_interactive.pm_.c:462
+#: ../../diskdrake/interactive.pm_.c:472
 msgid "Remove the loopback file?"
 msgstr "ループバックファイルを削除しますか？"
 
-#: ../../diskdrake_interactive.pm_.c:486
+#: ../../diskdrake/interactive.pm_.c:497
 msgid "Change partition type"
 msgstr "パーティションタイプの変更"
 
-#: ../../diskdrake_interactive.pm_.c:491
+#: ../../diskdrake/interactive.pm_.c:498 ../../diskdrake/removable.pm_.c:48
+msgid "Which filesystem do you want?"
+msgstr "どのファイルシステムにしますか？"
+
+#: ../../diskdrake/interactive.pm_.c:502
 msgid "Switching from ext2 to ext3"
 msgstr "ext2 から ext3 に変更しています"
 
-#: ../../diskdrake_interactive.pm_.c:521
+#: ../../diskdrake/interactive.pm_.c:532
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "ループバックファイル %s をどこにマウントしますか？"
 
-#: ../../diskdrake_interactive.pm_.c:528
+#: ../../diskdrake/interactive.pm_.c:533 ../../diskdrake/interactive.pm_.c:553
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "デバイス %s をどこにマウントしますか？"
+
+#: ../../diskdrake/interactive.pm_.c:539
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1589,117 +1790,125 @@ msgstr ""
 "マウントポイントから取り就くことが出来ません。\n"
 "まずループバックを解除してください。"
 
-#: ../../diskdrake_interactive.pm_.c:549
+#: ../../diskdrake/interactive.pm_.c:577
 msgid "Computing FAT filesystem bounds"
 msgstr "fat ファイルシステムの境界を計算"
 
-#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
-#: ../../install_interactive.pm_.c:116
+#: ../../diskdrake/interactive.pm_.c:577 ../../diskdrake/interactive.pm_.c:636
+#: ../../install_interactive.pm_.c:130
 msgid "Resizing"
 msgstr "リサイズ中"
 
-#: ../../diskdrake_interactive.pm_.c:578
+#: ../../diskdrake/interactive.pm_.c:609
 msgid "This partition is not resizeable"
 msgstr "このパーティションはリサイズできません"
 
-#: ../../diskdrake_interactive.pm_.c:583
+#: ../../diskdrake/interactive.pm_.c:614
 msgid "All data on this partition should be backed-up"
 msgstr "このパーティション上のデータはバックアップするべきです"
 
-#: ../../diskdrake_interactive.pm_.c:585
+#: ../../diskdrake/interactive.pm_.c:616
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "リサイズ後には、パーティション %s 上のデータは失われます"
 
-#: ../../diskdrake_interactive.pm_.c:590
+#: ../../diskdrake/interactive.pm_.c:621
 msgid "Choose the new size"
 msgstr "新しいサイズを選択"
 
-#: ../../diskdrake_interactive.pm_.c:591
+#: ../../diskdrake/interactive.pm_.c:622
 msgid "New size in MB: "
 msgstr "MB でのサイズ: "
 
-#: ../../diskdrake_interactive.pm_.c:631
+#: ../../diskdrake/interactive.pm_.c:675
 msgid "Which disk do you want to move it to?"
 msgstr "どのディスクに移動しますか?"
 
-#: ../../diskdrake_interactive.pm_.c:632
+#: ../../diskdrake/interactive.pm_.c:676
 msgid "Sector"
 msgstr "セクタ"
 
-#: ../../diskdrake_interactive.pm_.c:633
+#: ../../diskdrake/interactive.pm_.c:677
 msgid "Which sector do you want to move it to?"
 msgstr "どのセクタを移動しますか？"
 
-#: ../../diskdrake_interactive.pm_.c:636
+#: ../../diskdrake/interactive.pm_.c:680
 msgid "Moving"
 msgstr "移動中"
 
-#: ../../diskdrake_interactive.pm_.c:636
+#: ../../diskdrake/interactive.pm_.c:680
 msgid "Moving partition..."
 msgstr "パーティションを移動中..."
 
-#: ../../diskdrake_interactive.pm_.c:657
+#: ../../diskdrake/interactive.pm_.c:697
 msgid "Choose an existing RAID to add to"
 msgstr "追加する既存の RAID を選んで下さい"
 
-#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+#: ../../diskdrake/interactive.pm_.c:698 ../../diskdrake/interactive.pm_.c:716
 msgid "new"
 msgstr "新規"
 
-#: ../../diskdrake_interactive.pm_.c:674
+#: ../../diskdrake/interactive.pm_.c:714
 msgid "Choose an existing LVM to add to"
 msgstr "追加する既存の LVM を選んで下さい"
 
-#: ../../diskdrake_interactive.pm_.c:679
+#: ../../diskdrake/interactive.pm_.c:719
 msgid "LVM name?"
 msgstr "LVM 名は？"
 
-#: ../../diskdrake_interactive.pm_.c:718
+#: ../../diskdrake/interactive.pm_.c:759
 msgid "This partition can't be used for loopback"
 msgstr "このパーティションはループバックには使えません"
 
-#: ../../diskdrake_interactive.pm_.c:730
+#: ../../diskdrake/interactive.pm_.c:771
 msgid "Loopback"
 msgstr "ループバック"
 
-#: ../../diskdrake_interactive.pm_.c:731
+#: ../../diskdrake/interactive.pm_.c:772
 msgid "Loopback file name: "
 msgstr "ループバックファイル名: "
 
-#: ../../diskdrake_interactive.pm_.c:736
+#: ../../diskdrake/interactive.pm_.c:777
 msgid "Give a file name"
 msgstr "ファイル名を入力"
 
-#: ../../diskdrake_interactive.pm_.c:739
+#: ../../diskdrake/interactive.pm_.c:780
 msgid "File already used by another loopback, choose another one"
 msgstr "ファイルはすでに別のループバックで使用中。他のを選びましょう"
 
-#: ../../diskdrake_interactive.pm_.c:740
+#: ../../diskdrake/interactive.pm_.c:781
 msgid "File already exists. Use it?"
 msgstr "ファイルはすでに存在します。いまあるのを使いますか？"
 
-#: ../../diskdrake_interactive.pm_.c:784
+#: ../../diskdrake/interactive.pm_.c:804
+msgid "Mount options"
+msgstr "マウントオプション"
+
+#: ../../diskdrake/interactive.pm_.c:811
+msgid "Various"
+msgstr "その他"
+
+#: ../../diskdrake/interactive.pm_.c:874
 msgid "device"
 msgstr "デバイス"
 
-#: ../../diskdrake_interactive.pm_.c:785
+#: ../../diskdrake/interactive.pm_.c:875
 msgid "level"
 msgstr "レベル"
 
-#: ../../diskdrake_interactive.pm_.c:786
+#: ../../diskdrake/interactive.pm_.c:876
 msgid "chunk size"
 msgstr "チャンクサイズ"
 
-#: ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake/interactive.pm_.c:891
 msgid "Be careful: this operation is dangerous."
 msgstr "注意: この操作は危険です。"
 
-#: ../../diskdrake_interactive.pm_.c:816
+#: ../../diskdrake/interactive.pm_.c:906
 msgid "What type of partitioning?"
 msgstr "どんなパーティションですか？"
 
-#: ../../diskdrake_interactive.pm_.c:834
+#: ../../diskdrake/interactive.pm_.c:924
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1710,7 +1919,7 @@ msgstr ""
 "そこに /boot は作れません。/bootがそこだと、LILO がうまく働かないし，\n"
 "LILO を使わないなら /boot は要りませんから"
 
-#: ../../diskdrake_interactive.pm_.c:838
+#: ../../diskdrake/interactive.pm_.c:928
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1722,7 +1931,7 @@ msgstr ""
 "持っていませんね。LILO をブートマネージャに使うなら，/boot パーティ\n"
 "ションの追加をお忘れなく。"
 
-#: ../../diskdrake_interactive.pm_.c:844
+#: ../../diskdrake/interactive.pm_.c:934
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -1732,44 +1941,44 @@ msgstr ""
 "/boot パーティション無しでこれを操作出来るブートローダはありません。\n"
 "ですから /boot パーティションの追加をお忘れなく。"
 
-#: ../../diskdrake_interactive.pm_.c:864
+#: ../../diskdrake/interactive.pm_.c:954
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "ドライブ %s のパーティションテーブルをディスクに書き込みます！"
 
-#: ../../diskdrake_interactive.pm_.c:868
+#: ../../diskdrake/interactive.pm_.c:958
 msgid "You'll need to reboot before the modification can take place"
 msgstr "リブートしてパーティションテーブルの変更を反映させる必要があります"
 
-#: ../../diskdrake_interactive.pm_.c:879
+#: ../../diskdrake/interactive.pm_.c:969
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "フォーマットしたら、パーティション %s 上のデータは失われます。"
 
-#: ../../diskdrake_interactive.pm_.c:881
+#: ../../diskdrake/interactive.pm_.c:971
 msgid "Formatting"
 msgstr "フォーマット中"
 
-#: ../../diskdrake_interactive.pm_.c:882
+#: ../../diskdrake/interactive.pm_.c:972
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "ループバックファイル %s をフォーマット中"
 
-#: ../../diskdrake_interactive.pm_.c:883
-#: ../../install_steps_interactive.pm_.c:419
+#: ../../diskdrake/interactive.pm_.c:973
+#: ../../install_steps_interactive.pm_.c:465
 #, c-format
 msgid "Formatting partition %s"
 msgstr "パーティション %s をフォーマット中"
 
-#: ../../diskdrake_interactive.pm_.c:894
+#: ../../diskdrake/interactive.pm_.c:984
 msgid "Hide files"
 msgstr "ファイルを隠す"
 
-#: ../../diskdrake_interactive.pm_.c:894
+#: ../../diskdrake/interactive.pm_.c:984
 msgid "Move files to the new partition"
 msgstr "新しいパーティションにファイルを移動"
 
-#: ../../diskdrake_interactive.pm_.c:895
+#: ../../diskdrake/interactive.pm_.c:985
 #, c-format
 msgid ""
 "Directory %s already contain some data\n"
@@ -1778,76 +1987,83 @@ msgstr ""
 "ディレクトリ %s にはすでにデータがあります\n"
 "(%s)"
 
-#: ../../diskdrake_interactive.pm_.c:906
+#: ../../diskdrake/interactive.pm_.c:996
 msgid "Moving files to the new partition"
 msgstr "新しいパーティションにファイルを移動中"
 
-#: ../../diskdrake_interactive.pm_.c:910
+#: ../../diskdrake/interactive.pm_.c:1000
 #, c-format
 msgid "Copying %s"
 msgstr "%s コピー中"
 
-#: ../../diskdrake_interactive.pm_.c:914
+#: ../../diskdrake/interactive.pm_.c:1004
 #, c-format
 msgid "Removing %s"
 msgstr "%s 削除中"
 
-#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+#: ../../diskdrake/interactive.pm_.c:1014
+#, c-format
+msgid "partition %s is now known as %s"
+msgstr "パーティション %s はこれで %sになりました。"
+
+#: ../../diskdrake/interactive.pm_.c:1035
+#: ../../diskdrake/interactive.pm_.c:1094
 msgid "Device: "
 msgstr "デバイス: "
 
-#: ../../diskdrake_interactive.pm_.c:938
+#: ../../diskdrake/interactive.pm_.c:1036
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS デバイスレター: %s (推定)\n"
 
-#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
-#: ../../diskdrake_interactive.pm_.c:1014
+#: ../../diskdrake/interactive.pm_.c:1040
+#: ../../diskdrake/interactive.pm_.c:1048
+#: ../../diskdrake/interactive.pm_.c:1112
 msgid "Type: "
 msgstr "タイプ: "
 
-#: ../../diskdrake_interactive.pm_.c:946
+#: ../../diskdrake/interactive.pm_.c:1044
 msgid "Name: "
 msgstr "名前: "
 
-#: ../../diskdrake_interactive.pm_.c:954
+#: ../../diskdrake/interactive.pm_.c:1052
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "開始: セクタ %s\n"
 
-#: ../../diskdrake_interactive.pm_.c:955
+#: ../../diskdrake/interactive.pm_.c:1053
 #, c-format
 msgid "Size: %s"
 msgstr "サイズ: %s"
 
-#: ../../diskdrake_interactive.pm_.c:957
+#: ../../diskdrake/interactive.pm_.c:1055
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s セクタ"
 
-#: ../../diskdrake_interactive.pm_.c:959
+#: ../../diskdrake/interactive.pm_.c:1057
 #, c-format
-msgid "Cylinder %d to cylinder %d\n"
+msgid "Cylinder %d to %d\n"
 msgstr "シリンダ %d からシリンダ %d\n"
 
-#: ../../diskdrake_interactive.pm_.c:960
+#: ../../diskdrake/interactive.pm_.c:1058
 msgid "Formatted\n"
 msgstr "フォーマット済み\n"
 
-#: ../../diskdrake_interactive.pm_.c:961
+#: ../../diskdrake/interactive.pm_.c:1059
 msgid "Not formatted\n"
 msgstr "未フォーマット\n"
 
-#: ../../diskdrake_interactive.pm_.c:962
+#: ../../diskdrake/interactive.pm_.c:1060
 msgid "Mounted\n"
 msgstr "マウント済み\n"
 
-#: ../../diskdrake_interactive.pm_.c:963
+#: ../../diskdrake/interactive.pm_.c:1061
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake_interactive.pm_.c:965
+#: ../../diskdrake/interactive.pm_.c:1063
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -1856,7 +2072,7 @@ msgstr ""
 "ループバックファイル:\n"
 "   %s\n"
 
-#: ../../diskdrake_interactive.pm_.c:966
+#: ../../diskdrake/interactive.pm_.c:1064
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -1864,27 +2080,27 @@ msgstr ""
 "デフォルトでパーティションブート\n"
 "    (MS-DOS のブート, lilo ではない)\n"
 
-#: ../../diskdrake_interactive.pm_.c:968
+#: ../../diskdrake/interactive.pm_.c:1066
 #, c-format
 msgid "Level %s\n"
 msgstr "レベル %s\n"
 
-#: ../../diskdrake_interactive.pm_.c:969
+#: ../../diskdrake/interactive.pm_.c:1067
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "チャンクサイズ %s\n"
 
-#: ../../diskdrake_interactive.pm_.c:970
+#: ../../diskdrake/interactive.pm_.c:1068
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAIDディスク %s\n"
 
-#: ../../diskdrake_interactive.pm_.c:972
+#: ../../diskdrake/interactive.pm_.c:1070
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "ループバックファイル名: %s"
 
-#: ../../diskdrake_interactive.pm_.c:975
+#: ../../diskdrake/interactive.pm_.c:1073
 msgid ""
 "\n"
 "Chances are, this partition is\n"
@@ -1896,7 +2112,7 @@ msgstr ""
 "ドライバ・パーティションらしいですよ。\n"
 "いじらないほうがいいでしょう。\n"
 
-#: ../../diskdrake_interactive.pm_.c:978
+#: ../../diskdrake/interactive.pm_.c:1076
 msgid ""
 "\n"
 "This special Bootstrap\n"
@@ -1908,65 +2124,99 @@ msgstr ""
 "パーティションは、\n"
 "デュアルブートシステム用です。\n"
 
-#: ../../diskdrake_interactive.pm_.c:997
+#: ../../diskdrake/interactive.pm_.c:1095
 #, c-format
 msgid "Size: %s\n"
 msgstr "サイズ: %s\n"
 
-#: ../../diskdrake_interactive.pm_.c:998
+#: ../../diskdrake/interactive.pm_.c:1096
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "ジオメトリ: %s シリンダ, %s ヘッド, %s セクタ\n"
 
-#: ../../diskdrake_interactive.pm_.c:999
+#: ../../diskdrake/interactive.pm_.c:1097
 msgid "Info: "
 msgstr "情報: "
 
-#: ../../diskdrake_interactive.pm_.c:1000
+#: ../../diskdrake/interactive.pm_.c:1098
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVMディスク %s\n"
 
-#: ../../diskdrake_interactive.pm_.c:1001
+#: ../../diskdrake/interactive.pm_.c:1099
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "パーティションテーブルタイプ: %s\n"
 
-#: ../../diskdrake_interactive.pm_.c:1002
+#: ../../diskdrake/interactive.pm_.c:1100
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "バス %d id %d\n"
 
-#: ../../diskdrake_interactive.pm_.c:1016
+#: ../../diskdrake/interactive.pm_.c:1114
 #, c-format
 msgid "Options: %s"
 msgstr "オプション: %s"
 
-#: ../../fs.pm_.c:447 ../../fs.pm_.c:457 ../../fs.pm_.c:461 ../../fs.pm_.c:465
-#: ../../fs.pm_.c:469 ../../fs.pm_.c:473
+#: ../../diskdrake/interactive.pm_.c:1130
+msgid "Filesystem encryption key"
+msgstr "ファイル暗号化の鍵"
+
+#: ../../diskdrake/interactive.pm_.c:1131
+msgid "Choose your filesystem encryption key"
+msgstr "ファイルシステム暗号化用の鍵を選んでください"
+
+#: ../../diskdrake/interactive.pm_.c:1134
+#, c-format
+msgid "This encryption key is too simple (must be at least %d characters long)"
+msgstr "この暗号鍵は簡単すぎます（最低でも %d 文字使ってください）"
+
+#: ../../diskdrake/interactive.pm_.c:1135
+msgid "The encryption keys do not match"
+msgstr "暗号鍵が一致しません"
+
+#: ../../diskdrake/interactive.pm_.c:1138
+msgid "Encryption key"
+msgstr "暗号鍵"
+
+#: ../../diskdrake/interactive.pm_.c:1139
+msgid "Encryption key (again)"
+msgstr "暗号鍵（もう一度入力してください）"
+
+#: ../../diskdrake/removable.pm_.c:47
+msgid "Change type"
+msgstr "タイプの変更"
+
+#: ../../diskdrake/removable_gtk.pm_.c:28
+msgid "Please click on a media"
+msgstr "メディアをクリックしてください"
+
+#: ../../diskdrake/smbnfs_gtk.pm_.c:165
+msgid "Search servers"
+msgstr "サーバを検索"
+
+#: ../../fs.pm_.c:485 ../../fs.pm_.c:495 ../../fs.pm_.c:499 ../../fs.pm_.c:503
+#: ../../fs.pm_.c:507 ../../fs.pm_.c:511
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s フォーマット, %s 失敗"
 
-#: ../../fs.pm_.c:506
+#: ../../fs.pm_.c:548
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "%s を タイプ %s でフォーマットする方法を知りません"
 
-#: ../../fs.pm_.c:568
-msgid "mount failed"
-msgstr "マウントに失敗"
+#: ../../fs.pm_.c:620 ../../fs.pm_.c:649 ../../fs.pm_.c:655
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "パーティション %s をディレクトリ %s にマウントできませんでした"
 
-#: ../../fs.pm_.c:588
+#: ../../fs.pm_.c:640
 #, c-format
 msgid "fsck failed with exit code %d or signal %d"
 msgstr "fsck 失敗、exit code  %d または signal %d"
 
-#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
-msgid "mount failed: "
-msgstr "マウントに失敗: "
-
-#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
+#: ../../fs.pm_.c:670 ../../partition_table.pm_.c:596
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "%s をアンマウント中にエラー: %s"
@@ -1975,48 +2225,65 @@ msgstr "%s をアンマウント中にエラー: %s"
 msgid "simple"
 msgstr "簡単に"
 
+#: ../../fsedit.pm_.c:25
+msgid "with /usr"
+msgstr "/usr で"
+
 #: ../../fsedit.pm_.c:30
 msgid "server"
 msgstr "サーバ"
 
-#: ../../fsedit.pm_.c:461
+#: ../../fsedit.pm_.c:467
 msgid "You can't use JFS for partitions smaller than 16MB"
 msgstr "16MB以下のパーティションに JFS は使えません"
 
-#: ../../fsedit.pm_.c:462
+#: ../../fsedit.pm_.c:468
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "32MB以下のパーティションに ReiserFS は使えません"
 
-#: ../../fsedit.pm_.c:471
+#: ../../fsedit.pm_.c:477
 msgid "Mount points must begin with a leading /"
 msgstr "マウントポイントは / で始まる必要があります"
 
-#: ../../fsedit.pm_.c:472
+#: ../../fsedit.pm_.c:478
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "パーティションはマウントポイント %s にマウント済み\n"
 
-#: ../../fsedit.pm_.c:476
+#: ../../fsedit.pm_.c:482
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "LVM 論理ボリュームはマウントポイント %s には使えません"
 
-#: ../../fsedit.pm_.c:478
+#: ../../fsedit.pm_.c:484
 msgid "This directory should remain within the root filesystem"
 msgstr "このディレクトリは root ファイルシステム内に残してください"
 
-#: ../../fsedit.pm_.c:480
+#: ../../fsedit.pm_.c:486
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "このマウントポイントには、実在するファイルシステム (ext2, reiserfs) \n"
 "が必要です。\n"
 
-#: ../../fsedit.pm_.c:596
+#: ../../fsedit.pm_.c:488
+#, c-format
+msgid "You can't use an encrypted file system for mount point %s"
+msgstr "マウントポイント %s には暗号化ファイルシステムは使えません"
+
+#: ../../fsedit.pm_.c:546
+msgid "Not enough free space for auto-allocating"
+msgstr "自動割り当てができるほど空き容量がありません"
+
+#: ../../fsedit.pm_.c:548
+msgid "Nothing to do"
+msgstr "することがありません"
+
+#: ../../fsedit.pm_.c:612
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "書き込みのため %s を開くときエラーが発生: %s"
 
-#: ../../fsedit.pm_.c:681
+#: ../../fsedit.pm_.c:697
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -2024,7 +2291,7 @@ msgstr ""
 "エラー発生 - 新しいファイルシステムを構築できるようなデバイスが\n"
 "見付かりません。なにが原因か、ハードウェアをチェックしてください"
 
-#: ../../fsedit.pm_.c:704
+#: ../../fsedit.pm_.c:720
 msgid "You don't have any partitions!"
 msgstr "パーティションがありません！"
 
@@ -2041,14 +2308,14 @@ msgid ""
 "system would not work any more. If you make a serious mistake as a regular\n"
 "user, you may only lose some information, but not the entire system.\n"
 "\n"
-"First, you have to enter your real name. This is not mandatory, of course -\n"
+"First, you have to enter your real name. This is not mandatory, of course\n"
 "as you can actually enter whatever you want. DrakX will then take the first\n"
 "word you have entered in the box and will bring it over to the \"User\n"
-"name\". This is the name this particular user will use to log into the\n"
+"name\". This is the name this particular user will use to log onto the\n"
 "system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as that of\n"
-"\"root\" from a security point of view, but that is no reason to neglect it\n"
-"- after all, your files are at risk.\n"
+"non-privileged (regular) user's password is not as crucial as \"root\"' one\n"
+"from a security point of view, but that is no reason to neglect it: after\n"
+"all, your files are at risk.\n"
 "\n"
 "If you click on \"Accept user\", you can then add as many as you want. Add\n"
 "a user for each one of your friends: your father or your sister, for\n"
@@ -2086,7 +2353,7 @@ msgstr ""
 msgid ""
 "Listed above are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, they are good for most common\n"
-"installs. If you make any changes, you must at least define a root\n"
+"installations. If you make any changes, you must at least define a root\n"
 "partition (\"/\"). Do not choose too small a partition or you will not be\n"
 "able to install enough software. If you want to store your data on a\n"
 "separate partition, you will also need to create a partition for \"/home\"\n"
@@ -2103,11 +2370,11 @@ msgid ""
 "\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
 "hard drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
 "\n"
 " * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
@@ -2150,12 +2417,12 @@ msgstr ""
 
 #: ../../help.pm_.c:72
 msgid ""
-"The Mandrake Linux installation is spread out over several CDROMs. DrakX\n"
-"knows if a selected package is located on another CDROM and will eject the\n"
+"The Mandrake Linux installation is spread out over several CD-ROMs. DrakX\n"
+"knows if a selected package is located on another CD-ROM and will eject the\n"
 "current CD and ask you to insert a different one as required."
 msgstr ""
-"Mandrake Linux インストールはCDROM数枚にまたがります。DrakX\n"
-"は、選んだパッケージが別のCDROM上にあるときは、いまのCDを\n"
+"Mandrake Linux インストールはCD-ROM数枚にまたがります。DrakX\n"
+"は、選んだパッケージが別のCD-ROM上にあるときは、いまのCDを\n"
 "吐き出して、必要な別の CD を入れるよう要求します。"
 
 #: ../../help.pm_.c:77
@@ -2164,8 +2431,8 @@ msgid ""
 "system. There are thousands of packages available for Mandrake Linux, and\n"
 "you are not supposed to know them all by heart.\n"
 "\n"
-"If you are performing a standard installation from CDROM, you will first be\n"
-"asked to specify the CDs you currently have (in Expert mode only). Check\n"
+"If you are performing a standard installation from a CD-ROM, you will first\n"
+"be asked to specify the CDs you currently have (in Expert mode only). Check\n"
 "the CD labels and highlight the boxes corresponding to the CDs you have\n"
 "available for installation. Click \"OK\" when you are ready to continue.\n"
 "\n"
@@ -2174,28 +2441,40 @@ msgid ""
 "\n"
 " * \"Workstation\": if you plan to use your machine as a workstation, "
 "select\n"
-"one or more of the corresponding groups.\n"
+"one or more of the corresponding groups;\n"
 "\n"
-" * \"Development\": if the machine is to be used for programming, choose "
-"the\n"
-"desired group(s).\n"
+" * \"Development\": if your machine is to be used for programming, choose\n"
+"the desired group(s);\n"
 "\n"
-" * \"Server\": finally, if the machine is intended to be a server, you will\n"
-"be able to select which of the most common services you wish to see\n"
-"installed on the machine.\n"
+" * \"Server\": if your machine is intended to be a server, you will be able\n"
+"to select which of the most common services you wish to install on your\n"
+"machine;\n"
 "\n"
-" * \"Graphical Environment\": this is where you will choose your preferred\n"
-"graphical environment. At least one must be selected if you want to have a\n"
-"graphical workstation!\n"
+" * \"Graphical Environment\": finally, this is where you will choose your\n"
+"preferred graphical environment. At least one must be selected if you want\n"
+"to have a graphical workstation!\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group.\n"
+"text about that group. If you deselect all groups when performing a regular\n"
+"installation (by opposition to an upgrade), a dialog will pop up proposing\n"
+"different options for a minimal installation:\n"
+"\n"
+" * \"With X\": install the fewer packages possible to have a working\n"
+"graphical desktop;\n"
+"\n"
+" * \"With basic documentation\": installs the base system plus basic\n"
+"utilities and their documentation. This installation is suitable for\n"
+"setting up a server;\n"
+"\n"
+" * \"Truly minimal install\": will install the strict minimum necessary to\n"
+"get a working Linux system, in command line only. This installation is\n"
+"about 65Mb large.\n"
 "\n"
 "You can check the \"Individual package selection\" box, which is useful if\n"
 "you are familiar with the packages being offered or if you want to have\n"
 "total control over what will be installed.\n"
 "\n"
-"If you started the installation in \"Update\" mode, you can unselect all\n"
+"If you started the installation in \"Upgrade\" mode, you can unselect all\n"
 "groups to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
@@ -2203,73 +2482,67 @@ msgstr ""
 "Mandrake Linux で使えるソフトは何千とありますし、全部を覚えられる人は\n"
 "いません。\n"
 "\n"
-"CDROM からの標準インストールをしているなら、まず手持ちのCDを教えるよう\n"
-"言われます。手持ちCDのラベルを調べて、インストール用に使えるCDのチェック\n"
-"ボックスをハイライトしましょう。全部すんだらOKをクリックします。\n"
+"CD-ROM からの標準インストールをしているなら、まず手持ちのCDを教えるよう\n"
+"言われます（エキスパートモードでのみ）。手持ちCDのラベルを調べて、イン\n"
+"ストール用に使えるCDのチェックボックスをハイライトしましょう。全部すん\n"
+"だらOKをクリックします。\n"
 "\n"
 "パッケージは、マシンの使い方に応じてグループごとにまとめられています。\n"
 "グループ自体も４つの部分で整理されています:\n"
 "\n"
-" * ワークステーション: ワークステーションとしてマシンを使うなら、以下の\n"
+" * 「ワークステーション」: ワークステーションとしてマシンを使うなら、以下の\n"
 "グループで使うものを全部選びましょう。\n"
 "\n"
-" * グラフィック環境: ここでは好みのグラフィック環境を選びます。\n"
-"グラフィックワークステーションがほしければ、最低一つは選びましょう!\n"
-"\n"
-" * 開発: マシンをプログラミングに使うなら、以下からほしいグループを\n"
+" * 「開発」: マシンをプログラミングに使うなら、以下からほしいグループを\n"
 "いくつでも選びましょう。\n"
 "\n"
-" * サーバ: 最後に、これがサーバ用マシンになるなら、マシンにインス\n"
+" * 「サーバ」: これがサーバ用マシンになるなら、マシンにインス\n"
 "トールしたい一般的なサービスをここで選べます。\n"
 "\n"
-"マウスのカーソルをグループ名上に動かすと、そのグループについての短い\n"
-"説明がでます。\n"
+" * 「グラフィック環境」: 最後に、ここでは好みのグラフィック環境を選びます。\n"
+"グラフィックワークステーションがほしければ、最低一つは選びましょう!\n"
 "\n"
-"「高度な選択」ボタンを押すと、「個別パッケージの選択」オプション\n"
-"が使えるようになります。提供されているパッケージを熟知しているか、\n"
-"インストールされるものを完全に把握したければこれを使います。\n"
+"マウスのカーソルをグループ名上に動かすと、そのグループについての短い\n"
+"説明がでます。通常インストール時（アップグレードではなく）に何も\n"
+"グループを選ばないと、ダイアログがポップアップして、各種の最低限\n"
+"インストールを提案してくれます：\n"
 "\n"
-"インストールを「更新」モードで開始したら、全グループを非選択にする\n"
-"と新しいパッケージは入れずに、既存システムの修復更新をするだけにな\n"
-"ります。\n"
+" * 「X を使う」インストールは、グラフィックデスクトップを実現する\n"
+"必要最低限のパッケージだけをインストールします;\n"
 "\n"
-"最後に、個別パッケージを選んだ場合には、すべてのパッケージをグループ\n"
-"とサブグループ別にまとめたツリーが表示されます。このツリーを見ながら\n"
-"グループ丸ごと、サブグループ丸ごと、パッケージ個別に追加削除できます。\n"
+" * 「基本的な文書も入れる」基本システムと、基本ユーティリティや\n"
+"そのドキュメンテーションも導入、このインストールはサーバ設置用に\n"
+"向いています。\n"
 "\n"
-"ツリーのパッケージを選ぶと、その説明が右に出ます。\n"
-"選択が終わったら「インストール」ボタンを押しましょう。インストールが\n"
-"始まります。パッケージをたくさん選んだ人は、時間がかかるのでお茶でも\n"
-"どうぞ。\n"
+" * 「本当に最低限のインストール」とにかくLInuxシステムを稼働させる\n"
+"必要最低限のものだけをインストール。コマンドラインのみ。このインストール\n"
+"は全部で 65Mb 程度です。\n"
 "\n"
-"!! サーバパッケージを選んだら、それが意図的でも何かグループの一部\n"
-"でも、本当にインストールしたいか確認を求められます。Mandrake Linux\n"
-"では、インストールしたサーバは起動時にデフォルトで起動されます。\n"
-"出荷時には安全でも、後からセキュリティホールが見つかることもあり\n"
-"ます。具体的には、もしそれがどんなサービスかわからなければ、「No」を\n"
-"クリックすればいいでしょう。「Yes」をクリックしたら、デフォルトで\n"
-"有効になります。 !!\n"
+"「個別パッケージの選択」オプションをチェックすることもできます。\n"
+"提供されているパッケージを熟知しているか、インストールされるものを\n"
+"完全に把握したければこれを使います。\n"
 "\n"
-"自動依存関係オプションは、あなたの選択したパッケージを有効にするために、\n"
-"インストーラが自動的にパッケージを選んだときに出る警告を消すだけです。"
+"インストールを「更新」モードで開始したら、全グループを非選択にする\n"
+"と新しいパッケージは入れずに、既存システムの修復更新をするだけにな\n"
+"ります。"
 
-#: ../../help.pm_.c:115
+#: ../../help.pm_.c:128
 msgid ""
-"Finally, depending on your choice of whether or not to select individual\n"
-"packages, you will be presented a tree containing all packages classified\n"
-"by groups and subgroups. While browsing the tree, you can select entire\n"
-"groups, subgroups, or individual packages.\n"
+"Finally, depending on whether or not you selected individual packages, you\n"
+"will be presented a tree containing all packages classified by groups and\n"
+"subgroups. While browsing the tree, you can select entire groups,\n"
+"subgroups, or individual packages.\n"
 "\n"
 "Whenever you select a package on the tree, a description appears on the\n"
 "right. When your selection is finished, click the \"Install\" button which\n"
 "will then launch the installation process. Depending on the speed of your\n"
 "hardware and the number of packages that need to be installed, it may take\n"
-"a while to complete the process. A time to complete estimate is displayed\n"
-"on the screen to help you gauge if there is sufficient time to enjoy a cup\n"
-"of coffee.\n"
+"a while to complete the process. An estimate of the time it will take to\n"
+"install everything is displayed on the screen, to help you gauge if there\n"
+"is sufficient time to enjoy a cup of coffee.\n"
 "\n"
-"!! If a server package has been selected either intentionally or because it\n"
-"was part of a whole group, you will be asked to confirm that you really\n"
+"!! If a server package has been selected, either intentionally or because\n"
+"it was part of a whole group, you will be asked to confirm that you really\n"
 "want those servers to be installed. Under Mandrake Linux, any installed\n"
 "servers are started by default at boot time. Even if they are safe and have\n"
 "no known issues at the time the distribution was shipped, it may happen\n"
@@ -2284,8 +2557,8 @@ msgid ""
 "occurs because it has determined that it needs to satisfy a dependency with\n"
 "another package in order to successfully complete the installation.\n"
 "\n"
-"The tiny floppy disc icon at the bottom of the list allows to load the\n"
-"packages list chosen during a previous installation. Clicking on this icon\n"
+"The tiny floppy disk icon at the bottom of the list allows to load the\n"
+"package list chosen during a previous installation. Clicking on this icon\n"
 "will ask you to insert a floppy disk previously created at the end of\n"
 "another installation. See the second tip of last step on how to create such\n"
 "a floppy."
@@ -2323,33 +2596,36 @@ msgstr ""
 "ように支持が出ます。こういうフロッピーの作り方は、さいごのステップ\n"
 "の二番目のヒントを読んでください。"
 
-#: ../../help.pm_.c:151
+#: ../../help.pm_.c:164
 msgid ""
-"If you wish to connect your computer to the Internet or to a local network,\n"
-"please choose the correct option. Please turn on your device before\n"
-"choosing the correct option to let DrakX detect it automatically.\n"
+"You are now proposed to set up your Internet/network connection. If you\n"
+"wish to connect your computer to the Internet or to a local network, click\n"
+"\"OK\". The autodetection of network devices and modem will be launched. If\n"
+"this detection fails, uncheck the \"Use auto detection\" box next time. You\n"
+"may also choose not to configure the network, or do it later; in that case,\n"
+"simply click the \"Cancel\" button.\n"
 "\n"
-"Mandrake Linux proposes the configuration of an Internet connection at\n"
-"installation time. Available connections are: traditional modem, ISDN\n"
-"modem, ADSL connection, cable modem, and finally a simple LAN connection\n"
-"(Ethernet).\n"
+"Available connections are: traditional modem, ISDN modem, ADSL connection,\n"
+"cable modem, and finally a simple LAN connection (Ethernet).\n"
 "\n"
 "Here, we will not detail each configuration. Simply make sure that you have\n"
 "all the parameters from your Internet Service Provider or system\n"
 "administrator.\n"
 "\n"
-"You can consult the manual chapter about Internet connections for details\n"
-"about the configuration, or simply wait until your system is installed and\n"
-"use the program described there to configure your connection.\n"
+"You can consult the ``User Guide'' chapter about Internet connections for\n"
+"details about the configuration, or simply wait until your system is\n"
+"installed and use the program described there to configure your connection.\n"
 "\n"
-"If you wish to configure the network later after installation or if you\n"
-"have finished configuring your network connection, click \"Cancel\"."
+"If you wish to configure the network later after installation, or if you\n"
+"are finished configuring your network connection, click \"Cancel\"."
 msgstr ""
-"マシンをインターネットやLANにつなぎたいなら、正しいオプションを選んで\n"
-"ください。あらかじめそのデバイスのスイッチを入れて、DrakXがそれを自動\n"
-"検出できるようにしておきましょう。\n"
+"ここでは、インターネット/ネットワーク接続の設定ができます。マシンを\n"
+"インターネットやLANにつなぎたいなら「OK」をクリックしてください。\n"
+"ネットワークデバイスやモデムの自動検出が開始されます。もしこの検出\n"
+"がうまくいかなければ、次回は「自動検出を使う」のチェックをはずして\n"
+"おきましょう。またネットワーク設定をしない、あるいは後回しにもでき\n"
+"ます。その場合には「キャンセル」をクリックするだけです。\n"
 "\n"
-"Mandrake Linux はインストール時にインターネット接続の設定もできます。\n"
 "可能な接続は、普通のモデム、ISDNモデム、ADSL接続、ケーブルモデム、そして\n"
 "通常のLAN接続（イーサネット）です。\n"
 "\n"
@@ -2363,7 +2639,7 @@ msgstr ""
 "ネットワークの設定はインストール後にやりたい、あるいはネットワーク設定が\n"
 "すんでいるなら「キャンセル」を押します。"
 
-#: ../../help.pm_.c:172
+#: ../../help.pm_.c:186
 msgid ""
 "You may now choose which services you wish to start at boot time.\n"
 "\n"
@@ -2375,57 +2651,77 @@ msgid ""
 "specific service. However, if you are not sure whether a service is useful\n"
 "or not, it is safer to leave the default behavior.\n"
 "\n"
-"At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
+"!! At this stage, be very careful if you intend to use your machine as a\n"
+"server: you will probably not want to start any services which you do not\n"
 "need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need."
+"enabled on a server. In general, select only the services you really need.\n"
+"!!"
 msgstr ""
 "ではマシンの起動時に自動的に開始したいサービスを選びましょう。\n"
 "\n"
 "ここには現在のインストールで使えるサービスが全部挙がっています。\n"
 "よく見て、起動時に必ずしも必要ないもののチェックをはずしましょう。\n"
 "\n"
-"項目の上にマウスをもってくると、それが何のサービスか説明する\n"
-"小さな吹き出しが出てきます。でも、そのサービスが役に立つかわから\n"
-"なければ、デフォルトのままにしておくほうが無難です。\n"
+"各サービスを選ぶと、説明が出ます。でも、そのサービスが役に立つか\n"
+"わからなければ、デフォルトのままにしておくほうが無難です。\n"
 "\n"
 "このマシンをサーバにするつもりなら、ここでは特に気をつけましょう。\n"
 "使わないサービスをむやみに開始させてはいけません。一部のサービスは、\n"
 "サーバ上で使うと危険だというのをお忘れなく。\n"
 "一般に、本当に必要なサービスだけ選んでください。"
 
-#: ../../help.pm_.c:188
+#: ../../help.pm_.c:203
 msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
-"local time according to the time zone you selected."
+"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
+"local time according to the time zone you selected. It is however possible\n"
+"to deactivate this by deselecting \"Hardware clock set to GMT\" so that the\n"
+"hardware clock is the same as the system clock. This is useful when the\n"
+"machine is hosting another operating system like Windows.\n"
+"\n"
+"The \"Automatic time synchronization\" option will automatically regulate\n"
+"the clock by connecting to a remote time server on the Internet. In the\n"
+"list that is presented, choose a server located near you. Of course you\n"
+"must have a working Internet connection for this feature to work. It will\n"
+"actually install on your machine a time server which can be optionally used\n"
+"by other machines on your local network."
 msgstr ""
-"Linux は時間をGMT、つまり「グリニッジ標準時」で管理していて、それを\n"
-"あなたの選んだ時間帯にあわせて変換します。"
+"GNU/Linux は時間を GMT (グリニッジ標準時) で管理して、選ばれた時間帯を\n"
+"もとに現地時間に変換します。でも、「ハードウェアクロックをGMTにあわせる」\n"
+"を非選択にすれば、この方式をやめて、ハードウェアクロックとシステムクロック\n"
+"が同じ時間になるようにできます。もしこのマシンでウィンドウズのような別の\n"
+"OS を動かしているなら、そのほうがいいでしょう。\n"
+"\n"
+"「自動時間あわせ」オプションを選ぶと、インターネット上のリモートタイム\n"
+"サーバに接続して、自動的に時間あわせを行います。出てきた一覧から、最寄り\n"
+"のサーバを選んでください。もちろんこの機能を使うには、インターネット接続\n"
+"が必要になります。あなたのマシン上にタイムサーバをインストールして、\n"
+"オプションによってはローカルネットワーク上の他のマシンが、それに接続して\n"
+"時間あわせをすることもできます。"
 
-#: ../../help.pm_.c:192
+#: ../../help.pm_.c:217
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
-"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
-"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, DrakX\n"
 "will try to configure X automatically.\n"
 "\n"
 "It is extremely rare for it to fail, unless the hardware is very old (or\n"
 "very new). If it succeeds, it will start X automatically with the best\n"
-"resolution possible depending on the size of the monitor. A window will\n"
+"resolution possible, depending on the size of the monitor. A window will\n"
 "then appear and ask you if you can see it.\n"
 "\n"
-"If you are doing an \"Expert\" install, you will enter the X configuration\n"
-"wizard. See the corresponding section of the manual for more information\n"
-"about this wizard.\n"
+"If you are doing an \"Expert\" installation, you will enter the X\n"
+"configuration wizard. See the corresponding section of the manual for more\n"
+"information about this wizard.\n"
 "\n"
-"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
-"the next step. If you cannot see the message, it simply means that the\n"
-"configuration was wrong and the test will automatically end after 10\n"
-"seconds, restoring the screen."
+"If you can see the message during the test, and answer \"Yes\", then DrakX\n"
+"will proceed to the next step. If you cannot see the message, it simply\n"
+"means that the configuration was wrong and the test will automatically end\n"
+"after 10 seconds, restoring the screen."
 msgstr ""
 "X (X ウィンドウシステム) は、GNU/Linux グラフィックインターフェースの\n"
 "キモで、Mandrake Linux についているグラフィック環境 (KDE, Gnome, \n"
-"AfterStep, WindowMaker...)はすべてこれに依存します。ここでは、drakX\n"
+"AfterStep, WindowMaker...)はすべてこれに依存します。ここでは、DrakX\n"
 "は自動的に X を設定しようとします。\n"
 "\n"
 "これが失敗することはまずありません。失敗する可能性として考えられるの\n"
@@ -2436,11 +2732,11 @@ msgstr ""
 "「エキスパート」インストールの場合には、X 設定ウィザードに入ります。\n"
 "このウィザードについて詳しくは、マニュアルを見てください。\n"
 "\n"
-"メッセージが見えて、それに「はい」と答えたら、drakXは次に進みます。\n"
+"メッセージが見えて、それに「はい」と答えたら、DrakX は次に進みます。\n"
 "メッセージが見えなければ、設定がまちがっているということなので、その\n"
 "テストは10秒で終了して、もとの画面に戻ります。"
 
-#: ../../help.pm_.c:212
+#: ../../help.pm_.c:237
 msgid ""
 "The first time you try the X configuration, you may not be very satisfied\n"
 "with its display (screen is too small, shifted left or right...). Hence,\n"
@@ -2450,11 +2746,11 @@ msgid ""
 "\n"
 "As a last resort, if you still cannot get X to work, choose \"Change\n"
 "graphics card\", select \"Unlisted card\", and when prompted on which\n"
-"server you want, choose \"FBDev\". This is a failsafe option which works\n"
-"with any modern graphics card. Then choose \"Test again\" to be sure."
+"server, choose \"FBDev\". This is a failsafe option which works with any\n"
+"modern graphics card. Then choose \"Test again\" to be sure."
 msgstr ""
 "一発目だと、あまり画面の具合がよくないかもしれません。\n"
-"画面が小さすぎるとか、左右にずれているとか）。だからXが正しく\n"
+"画面が小さすぎるとか、左右にずれているとか）。だから X が正しく\n"
 "起動した場合にでも、DrakX は設定が適切かどうかきいて、可能な各種の\n"
 "モードを表示して、好きなのを選べと言うわけです。\n"
 "\n"
@@ -2463,7 +2759,7 @@ msgstr ""
 "選びます。これはフェールセーフな選択肢で、最近のすべてのグラフィックス\n"
 "カードで使えます。それから「再テスト」を選んで確認しましょう。"
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:249
 msgid ""
 "Finally, you will be asked whether you want to see the graphical interface\n"
 "at boot. Note this question will be asked even if you chose not to test the\n"
@@ -2476,17 +2772,16 @@ msgstr ""
 "ディスプレイの設定がうまくいかなかった時には、ここではもちろん「いいえ」\n"
 "と答えましょう。"
 
-#: ../../help.pm_.c:231
+#: ../../help.pm_.c:256
 msgid ""
-"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
-"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
-"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"The Mandrake LinuxCD-ROM has a built-in rescue mode. You can access it by\n"
+"booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<\n"
+"at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
 "should come back to this step for help in at least two situations:\n"
 "\n"
-" * when installing the boot loader, DrakX will rewrite the boot sector "
-"(MBR)\n"
-"of your main disk (unless you are using another boot manager) so that you\n"
-"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
+"of your main disk (unless you are using another boot manager), to allow you\n"
+"to start up with either Windows or GNU/Linux (assuming you have Windows in\n"
 "your system). If you need to reinstall Windows, the Microsoft install\n"
 "process will rewrite the boot sector, and then you will not be able to\n"
 "start GNU/Linux!\n"
@@ -2522,29 +2817,29 @@ msgstr ""
 "が入っています。\n"
 "\n"
 "このステップをクリックすると、フロッピーディスクをドライブに入れろと\n"
-"要求されます。\n"
-"挿入するフロッピーディスクは、空か、不要なデータしか入っていないもの\n"
-"にしましょう。フォーマットする必要はありません。DrakXが完全にそれを\n"
-"書き換えます。"
+"要求されます。挿入するフロッピーディスクは、空か、不要なデータしか\n"
+"入っていないものにしましょう。フォーマットする必要はありません。\n"
+"DrakXが完全にそれを書き換えます。"
 
-#: ../../help.pm_.c:255
+#: ../../help.pm_.c:280
 msgid ""
-"At this point you need to choose where on your hard drive to install your\n"
-"Mandrake Linux operating system. If your hard drive is empty or if an\n"
-"existing operating system is using all the space available, you will need\n"
-"to partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Mandrake Linux system.\n"
+"At this point, you need to choose where you want to install the Mandrake\n"
+"Linux operating system on your hard drive. If your hard drive is empty or\n"
+"if an existing operating system is using all the available space, you will\n"
+"need to partition it. Basically, partitioning a hard drive consists of\n"
+"logically dividing it to create space to install your new Mandrake Linux\n"
+"system.\n"
 "\n"
-"Because the effects of the partitioning process are usually irreversible,\n"
+"Because the partitioning process' effects are usually irreversible,\n"
 "partitioning can be intimidating and stressful if you are an inexperienced\n"
 "user. Fortunately, there is a wizard which simplifies this process. Before\n"
 "beginning, please consult the manual and take your time.\n"
 "\n"
-"If you are running the install in Expert mode, you will enter DiskDrake,\n"
-"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
-"partitions. See the DiskDrake chapter of the manual. From the installation\n"
-"interface, you can use the wizards as described here by clicking the\n"
-"\"Wizard\" button of the dialog.\n"
+"If you are running the installation in Expert mode, you will enter\n"
+"DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
+"fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"
+"From the installation interface, you can use the wizards as described here\n"
+"by clicking the dialog's \"Wizard\" button.\n"
 "\n"
 "If partitions have already been defined, either from a previous\n"
 "installation or from another partitioning tool, simply select those to\n"
@@ -2555,43 +2850,45 @@ msgid ""
 "available:\n"
 "\n"
 " * \"Use free space\": this option will simply lead to an automatic\n"
-"partitioning of your blank drive(s). You will not be prompted further.\n"
+"partitioning of your blank drive(s). You will not be prompted further;\n"
 "\n"
 " * \"Use existing partition\": the wizard has detected one or more existing\n"
 "Linux partitions on your hard drive. If you want to use them, choose this\n"
-"option.\n"
+"option;\n"
 "\n"
-" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+" * \"Use the free space on the Windows; partition\": if MicrosoftWindows is\n"
 "installed on your hard drive and takes all the space available on it, you\n"
-"have to create free space for Linux data. To do that, you can delete your\n"
-"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
-"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
-"be performed without the loss of any data. This solution is recommended if\n"
-"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
+"have to create free space for Linux data. To do so, you can delete your\n"
+"MicrosoftWindows partition and data (see ``Erase entire disk'' or ``Expert\n"
+"mode'' solutions) or resize your MicrosoftWindows partition. Resizing can\n"
+"be performed without the loss of any data, provided you previously\n"
+"defragment the Windows partition. Backing up your data won't hurt either..\n"
+"This solution is recommended if you want to use both Mandrake Linux and\n"
+"MicrosoftWindows on the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this "
 "procedure,\n"
-"the size of your Microsoft Windows partition will be smaller than at the\n"
-"present time. You will have less free space under Microsoft Windows to\n"
-"store your data or to install new software.\n"
+"the size of your MicrosoftWindows partition will be smaller than at the\n"
+"present time. You will have less free space under MicrosoftWindows to store\n"
+"your data or to install new software;\n"
 "\n"
 " * \"Erase entire disk\": if you want to delete all data and all partitions\n"
 "present on your hard drive and replace them with your new Mandrake Linux\n"
 "system, choose this option. Be careful with this solution because you will\n"
-"not be able to revert your choice after confirmation.\n"
+"not be able to revert your choice after you confirm;\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
 " * \"Remove Windows\": this will simply erase everything on the drive and\n"
 "begin fresh, partitioning everything from scratch. All data on your disk\n"
-"will be lost.\n"
+"will be lost;\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
 " * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
-"can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing."
+"your hard drive. Be careful it is a powerful but dangerous choice. You can\n"
+"very easily lose all your data. Hence, do not choose this unless you know\n"
+"what you are doing."
 msgstr ""
 "さてこんどは、ハードディスク上でMandrake Linux OS をどこにインストール\n"
 "するか選ぶことになります。もしハードディスクが空か、すでに別の OS が\n"
@@ -2657,7 +2954,7 @@ msgstr ""
 "  危険な選択でもあります。ディスク上の全データをあっさり消してしまえます。\n"
 "  よくよくわかったうえでなければ、これは選ばないでください。"
 
-#: ../../help.pm_.c:319
+#: ../../help.pm_.c:347
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
 "ready to use. Just click \"OK\" to reboot the system. You can start\n"
@@ -2672,18 +2969,19 @@ msgid ""
 "\n"
 "   Note that two different options are available after clicking the button:\n"
 "\n"
-"    * \"Replay\". This is a partially automated install as the partitioning\n"
-"step (and only this one) remains interactive.\n"
+"    * \"Replay\". This is a partially automated installation as the\n"
+"partitioning step (and only this one) remains interactive;\n"
 "\n"
-"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"    * \"Automated\". Fully automated installation: the hard disk is "
+"completely\n"
 "rewritten, all data is lost.\n"
 "\n"
 "   This feature is very handy when installing a great number of similar\n"
-"machines. See the Auto install section at our web site.\n"
+"machines. See the Auto install section on our web site;\n"
 "\n"
-" * \"Save packages selection\"(*): saves the packages selection as made\n"
+" * \"Save packages selection\"(*): saves the package selection as done\n"
 "previously. Then, when doing another installation, insert the floppy inside\n"
-"the driver and run the installation going to the help screen by pressing on\n"
+"the drive and run the installation going to the help screen by pressing on\n"
 "the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
 "(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
@@ -2693,12 +2991,12 @@ msgstr ""
 "ようになりましたよ。OK をクリックするとシステムが再起動します。もし\n"
 "デュアルブートにしていたら、ウィンドウズでもLinuxでも選べます。\n"
 "\n"
-"「高度」ボタンを押すと、さらに二つボタンが出てきます:\n"
+"「高度」ボタン（エキスパートモードのみ）を押すと、二つボタンが出てきます:\n"
 "\n"
 " * 自動インストールフロッピーを作る: 何も手出ししなくても自動的に、\n"
 "いまやったのとほとんど同じインストールをしてくれるフロッピーを作成。\n"
 "\n"
-"   このボタンをクリックすると、二つのオプションが選べるます:\n"
+"   このボタンをクリックすると、二つのオプションが選べます:\n"
 "\n"
 "    * 再現: これは主に自動インストールです。パーティション切りだけは\n"
 "対話型で行われます。\n"
@@ -2711,15 +3009,15 @@ msgstr ""
 "\n"
 " * パッケージ選択を保存(*): いま選んだパッケージのリストを保存。\n"
 "こうしておくと、別のインストール時にもドライブにこのフロッピーを\n"
-"入れて、ヘルプ画面 F1 で >>linux defcfg=\"floppy\"<<　ですみます。\n"
+"入れて、ヘルプ画面 F1 で 「linux defcfg=\"floppy\"」ですみます。\n"
 "\n"
-"(*) FAT 形式のフロッピーが必要（GNU/Linux で作るには\"mformat a:\"\n"
+"(*) FAT 形式のフロッピーが必要（GNU/Linux で作るには「mformat a:」\n"
 "とタイプします。)"
 
-#: ../../help.pm_.c:350
+#: ../../help.pm_.c:378
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
+"(formatting means creating a filesystem).\n"
 "\n"
 "At this time, you may wish to reformat some already existing partitions to\n"
 "erase any data they contain. If you wish to do that, please select those\n"
@@ -2733,7 +3031,7 @@ msgid ""
 "\n"
 "Please be careful when selecting partitions. After formatting, all data on\n"
 "the selected partitions will be deleted and you will not be able to recover\n"
-"any of them.\n"
+"any of it.\n"
 "\n"
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
@@ -2741,7 +3039,7 @@ msgid ""
 "Mandrake Linux operating system installation.\n"
 "\n"
 "Click on \"Advanced\" if you wish to select partitions that will be checked\n"
-"for bad blocks on the disc."
+"for bad blocks on the disk."
 msgstr ""
 "新しくつくったパーティションは、すべてフォーマットしないと使えません\n"
 "（フォーマットとはファイルシステムをつくるということです）。\n"
@@ -2764,7 +3062,7 @@ msgstr ""
 "「キャンセル」をクリックしてください。\n"
 "不良ブロックのチェックをしたければ「高度な選択」をクリックします。"
 
-#: ../../help.pm_.c:376
+#: ../../help.pm_.c:404
 msgid ""
 "Your new Mandrake Linux operating system is currently being installed.\n"
 "Depending on the number of packages you will be installing and the speed of\n"
@@ -2778,12 +3076,39 @@ msgstr ""
 "\n"
 "しばらくお待ちを。"
 
-#: ../../help.pm_.c:384
+#: ../../help.pm_.c:412
+msgid ""
+"At the time you are installing Mandrake Linux, it is likely that some\n"
+"packages have been updated since the initial release. Some bugs may have\n"
+"been fixed, and security issues solved. To allow you to benefit from these\n"
+"updates, you are now proposed to download them from the Internet. Choose\n"
+"\"Yes\" if you have a working Internet connection, or \"No\" if you prefer\n"
+"to install updated packages later.\n"
+"\n"
+"Choosing \"Yes\" displays a list of places from which updates can be\n"
+"retrieved. Choose the one nearest you. Then a package-selection tree\n"
+"appears: review the selection, and press \"Install\" to retrieve and\n"
+"install the selected package(s), or \"Cancel\" to abort."
+msgstr ""
+"Mandrake Linux をあなたがインストールする頃には、たぶんいくつかのパッケージ\n"
+"が更新されているはずです。バグフィクスが行われたり、セキュリティ問題が解決\n"
+"されているかもしれません。こういう更新の恩恵を被るため、それをインターネッ"
+"ト\n"
+"からダウンロードするかどうかきかれます。インターネット接続があれば「はい」\n"
+"を選び、更新パッケージのインストールを後回しにするなら「いいえ」を選びま"
+"す。\n"
+"\n"
+"「はい」を選ぶと、更新パッケージの置かれた場所一覧が表示されます。\n"
+"最寄りの場所を選んでください。するとパッケージ選択ツリーが表示されます。\n"
+"何が選ばれたか確認しましょう。「インストール」を押すと、選択パッケージ\n"
+"が読み込みインストールされます。「キャンセル」で中断です。"
+
+#: ../../help.pm_.c:425
 msgid ""
-"Before continuing you should read carefully the terms of the license. It\n"
+"Before continuing, you should read carefully the terms of the license. It\n"
 "covers the whole Mandrake Linux distribution, and if you do not agree with\n"
 "all the terms in it, click on the \"Refuse\" button which will immediately\n"
-"terminate the installation. To continue with the installation, click the\n"
+"terminate the installation. To continue with the installation, click on the\n"
 "\"Accept\" button."
 msgstr ""
 "先に進む前にライセンス条件を慎重に読んでください。これは Mandrake Linux\n"
@@ -2791,14 +3116,14 @@ msgstr ""
 "を押してください。するとインストールがすぐに終わります。インストールを\n"
 "続けるには、「同意する」ボタンを押してください。"
 
-#: ../../help.pm_.c:391
+#: ../../help.pm_.c:432
 msgid ""
 "At this point, it is time to choose the security level desired for the\n"
 "machine. As a rule of thumb, the more exposed the machine is, and the more\n"
 "the data stored in it is crucial, the higher the security level should be.\n"
-"However, a higher security level is generally obtained at the expenses of\n"
-"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
-"get more information about the meaning of these levels.\n"
+"However, a higher security level is generally obtained at the expense of\n"
+"easiness of use. Refer to the \"msec\" chapter of the ``Reference Manual''\n"
+"to get more information about the meaning of these levels.\n"
 "\n"
 "If you do not know what to choose, keep the default option."
 msgstr ""
@@ -2810,49 +3135,63 @@ msgstr ""
 "\n"
 "何を選べばいいかわからなければ、デフォルトのままにしておきましょう。"
 
-#: ../../help.pm_.c:401
+#: ../../help.pm_.c:442
 msgid ""
-"At this point, you need to choose what partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have been already\n"
+"At this point, you need to choose which partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or from another\n"
-"partitioning tool, you can use existing partitions. Otherwise hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
 "\n"
 "To create partitions, you must first select a hard drive. You can select\n"
-"the disk for partitioning by clicking on \"hda\" for the first IDE drive,\n"
-"\"hdb\" for the second, \"sda\" for the first SCSI drive and so on.\n"
+"the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
+"``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
 "To partition the selected hard drive, you can use these options:\n"
 "\n"
 " * \"Clear all\": this option deletes all partitions on the selected hard\n"
-"drive.\n"
+"drive;\n"
 "\n"
-" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
-"and swap partitions in free space of your hard drive.\n"
+" * \"Auto allocate\": this option enables to automatically create \"Ext2\"\n"
+"and swap partitions in free space of your hard drive;\n"
 "\n"
-" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+" * \"More\": gives access to additional features:\n"
+"\n"
+"    * \"Save partition table\": saves the partition table to a floppy. "
+"Useful\n"
+"for later partition-table recovery if necessary. It is strongly recommended\n"
+"to perform this step;\n"
+"\n"
+"    * \"Restore partition table\": allows to restore a previously saved\n"
+"partition table from floppy disk;\n"
+"\n"
+"    * \"Rescue partition table\": if your partition table is damaged, you "
+"can\n"
 "try to recover it using this option. Please be careful and remember that it\n"
-"can fail.\n"
+"can fail;\n"
 "\n"
-" * \"Undo\": use this option to cancel your changes.\n"
+"    * \"Reload partition table\": discards all changes and loads your "
+"initial\n"
+"partition table;\n"
 "\n"
-" * \"Reload\": you can use this option if you wish to undo all changes and\n"
-"load your initial partitions table.\n"
+"    * \"Removable media automounting\": unchecking this option will force "
+"users\n"
+"to manually mount and unmount removable medias such as floppies and\n"
+"CD-ROMs.\n"
 "\n"
 " * \"Wizard\": use this option if you wish to use a wizard to partition "
 "your\n"
 "hard drive. This is recommended if you do not have a good knowledge of\n"
-"partitioning.\n"
+"partitioning;\n"
 "\n"
-" * \"Restore from floppy\": this option will allow you to restore a\n"
-"previously saved partition table from floppy disk.\n"
+" * \"Undo\": use this option to cancel your changes;\n"
 "\n"
-" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
-"later partition-table recovery if necessary. It is strongly recommended to\n"
-"perform this step.\n"
+" * \"Toggle to normal/expert mode\": allows additional actions on "
+"partitions\n"
+"(type, options, format) and gives more information;\n"
 "\n"
-" * \"Done\": when you have finished partitioning your hard drive, this will\n"
-"save your changes back to disc.\n"
+" * \"Done\": when you are finished partitioning your hard drive, this will\n"
+"save your changes back to disk.\n"
 "\n"
 "Note: you can reach any option using the keyboard. Navigate through the\n"
 "partitions using [Tab] and [Up/Down] arrows.\n"
@@ -2865,17 +3204,20 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point.\n"
 "\n"
+"To get information about the different filesystem types available, please\n"
+"read the ext2fs chapter from the ``Reference Manual''.\n"
+"\n"
 "If you are installing on a PPC machine, you will want to create a small HFS\n"
-"\"bootstrap\" partition of at least 1MB which will be used by the yaboot\n"
-"boot loader. If you opt to make the partition a bit larger, say 50MB, you\n"
+"``bootstrap'' partition of at least 1MB, which will be used by the yaboot\n"
+"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"さてここで、新しい Mandrake Linux システムの\n"
-"インストールにどのパーティションを使うか指定します。もし\n"
-"パーティションが定義済みなら（前に GNU/Linux をインストールした\n"
-"ことがあったり別のツールを使ったりした場合）、それをそのまま使う\n"
-"こともできます。それ以外は、パーティション定義が必要です。\n"
+"さてここで、新しい Mandrake Linux システムのインストールにどの\n"
+"パーティションを使うか指定します。もしパーティションが定義済みなら\n"
+"（前に GNU/Linux をインストールしたことがあったり別のツールを使った\n"
+"りした場合）、それをそのまま使うこともできます。それ以外は、\n"
+"パーティション定義が必要です。\n"
 "\n"
 "パーティションをつくるには、まずハードディスクを選びます。もし\n"
 "最初の IDE ドライブを選ぶなら「hda」、二番目の IDE なら「hdb」、\n"
@@ -2883,32 +3225,44 @@ msgstr ""
 "\n"
 "ハードディスクのパーティションを切るには、以下のオプションが使えます:\n"
 "\n"
-"   * 全消去: 選んだハードディスク上の全パーティションを消去します。\n"
+"   * 「全消去」: 選んだハードディスク上の全パーティションを消去します。\n"
 "\n"
-"   * 自動割り当て: ハードディスクの空き部分に、自動的に Ext2 と\n"
+"   * 「自動割り当て」: ハードディスクの空き部分に、自動的に Ext2 と\n"
 "     スワップパーティションをつくります。\n"
 "\n"
-"   * パーティションテーブル修復: パーティションテーブルが破壊され\n"
+"   * 「もっと」: さらに追加機能にアクセスできるようになります:\n"
+"\n"
+"   * 「パーティションテーブルを保存」: パーティションテーブルをフロッピー\n"
+"     に保存します。後日パーティションテーブル修復が必要なときに便利です。\n"
+"     これは是非やっておくようお勧めします。\n"
+"\n"
+"   * 「パーティションテーブルを復元」: 前にフロッピーに保存したパーティショ"
+"ン\n"
+"     テーブルを復元します。\n"
+"\n"
+"   * 「パーティションテーブル修復」: パーティションテーブルが破壊され\n"
 "     たら、このオプションでそれを修復してみることができます。\n"
 "     慎重に使って、これが万能でないことは承知しておいてください。\n"
 "\n"
-"   * 取り消し: 変更を取り消します。\n"
+"    * 「パーティションテーブル再読込」: 変更をすべて捨てて、最初の\n"
+"      パーティションテーブルに戻す\n"
 "\n"
-"   * リロード: 変更を全部取り消して、もとのパーティションテーブルを読み込みま"
-"す。\n"
+"    * 「リムーバブルメディアの自動マウント」: このオプションのチェックを\n"
+"      はずすと、ユーザは手動でリムーバブルメディア、たとえばフロッピーや \n"
+"      CD-ROMを手動でマウント/アンマウントする必要があります。\n"
 "\n"
-"   * ウィザード: ハードディスクのパーティションウィザードを使うときの\n"
-"     オプションです。パーティションについての知識がない人は、これが\n"
-"     お奨めです。\n"
+" * 「ウィザード」: ハードディスクのパーティションウィザードを使うときの\n"
+"オプションです。パーティションについての知識がない人は、これがお奨めです。\n"
 "\n"
-"   * フロッピーから回復: 以前のインストールで、パーティションテーブルを\n"
-"     フロッピーに保存これでそれを回復できます。\n"
+" * 「取り消し」: このオプションを使って変更を取り消します。\n"
 "\n"
-"   * フロッピーに保存: 回復用にパーティションテーブルをフロッピーに\n"
-"     保存したいときに使います。これを使うよう強くお奨めします。\n"
+" * 「通常/エキスパートモードへの切り替え」: パーティションに対して追加の\n"
+"指定ができるっようになる（種類、オプション、フォーマントなど）。また情報も\n"
+"詳しく表示される。\n"
 "\n"
-"   * 完了: ハードディスクのパーティション切りが終わったら、このオプションを\n"
-"     使って変更を保存します。\n"
+" * 「完了」: ハードディスクのパーティション切りが終わったら、このオプション"
+"を\n"
+"使って変更を保存します。\n"
 "\n"
 "参考までに、キーボードから各オプションが選べます。タブと上下矢印を使って\n"
 "パーティションを選びましょう。\n"
@@ -2921,15 +3275,15 @@ msgstr ""
 "\n"
 "     * Ctrl-m：マウントポイントをセット\n"
 "\n"
-"PPC マシンにインストールしている場合には、yaboot ブートローダ用に、最低 1 MB "
-"の小さな HFS「ブートストラップ」パーティションを作りましょう。\n"
-"このパーティションを、たとえば 50 MB とか大きめにしておくと、そこに予備のカー"
-"ネルやramdisk イメージを保存しておけて、緊急起動に使えて便利です。"
+"PPC マシンにインストールしている場合には、yaboot ブートローダ用に、\n"
+"最低 1 MB の小さな HFS「ブートストラップ」パーティションを作りましょう。\n"
+"このパーティションを、たとえば 50 MB とか大きめにしておくと、そこに予備の\n"
+"カーネルやramdisk イメージを保存しておけて、緊急起動に使えて便利です。"
 
-#: ../../help.pm_.c:460
+#: ../../help.pm_.c:513
 msgid ""
-"More than one Microsoft Windows partition has been detected on your hard\n"
-"drive. Please choose the one you want resize in order to install your new\n"
+"More than one Microsoft partition has been detected on your hard drive.\n"
+"Please choose the one you want to resize in order to install your new\n"
 "Mandrake Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
@@ -2944,11 +3298,11 @@ msgid ""
 "\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
 "hard drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
 "\n"
 " * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
@@ -2988,48 +3342,66 @@ msgstr ""
 "「ウィンドウズ名」は、ウィンドウズでのドライブ文字です（最初のディスク\n"
 "やパーティションは「C:」ドライブです)。"
 
-#: ../../help.pm_.c:491
+#: ../../help.pm_.c:544
 msgid "Please be patient. This operation can take several minutes."
 msgstr "しばらくお待ちを。この操作はしばらくかかりますので。"
 
-#: ../../help.pm_.c:494
+#: ../../help.pm_.c:547
 msgid ""
 "DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
-"installation or if you want to have greater control (\"Expert\"). You also\n"
-"have the choice of performing a new install or an upgrade of an existing\n"
-"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
-"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
-"existing system.\n"
-"\n"
-"Please choose \"Install\" if there are no previous version of Mandrake\n"
-"Linux installed or if you wish to boot between various operating systems.\n"
+"installation or if you want to have greater control (\"Expert\"). You can\n"
+"also choose to do a new install or an upgrade of an existing Mandrake Linux\n"
+"system:\n"
+"\n"
+" * \"Install\": completely wipes out the old system. In fact, depending on\n"
+"what currently holds your machine, you will be able to keep some old (Linux\n"
+"or other) partitions unchanged;\n"
+"\n"
+" * \"Upgrade\": this installation class allows to simply update the "
+"packages\n"
+"currently installed on your Mandrake Linux system. It keeps the current\n"
+"partitions of your hard drives as well as user configurations. All other\n"
+"configuration steps remain available with respect to plain installation;\n"
+"\n"
+" * \"Upgrade Packages Only\": this brand new class allows to upgrade an\n"
+"existing Mandrake Linux system while keeping all system configurations\n"
+"unchanged. Adding new packages to the current installation is also\n"
+"possible.\n"
 "\n"
-"Please choose \"Update\" if you wish to update or repair an already\n"
-"installed version of Mandrake Linux.\n"
+"Upgrades should work fine for Mandrake Linux systems starting from \"8.1\"\n"
+"release.\n"
 "\n"
-"Depending on your knowledge of GNU/Linux, please choose one of the\n"
-"following to install or update your Mandrake Linux operating system:\n"
+"Depending on your knowledge of GNU/Linux, select one of the following\n"
+"choices:\n"
 "\n"
 " * Recommended: choose this if you have never installed a GNU/Linux\n"
 "operating system. The installation will be very easy and you will only be\n"
-"asked a few questions.\n"
+"asked a few questions;\n"
 "\n"
 " * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
 "installation class. The expert installation will allow you to perform a\n"
-"highly customized installation. Answering some of the questions can be\n"
-"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
-"this unless you know what you are doing."
+"highly-customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux, so do not\n"
+"choose this unless you know what you are doing."
 msgstr ""
 "DrakXはこんどは、どんな種類のインストールをしたいか尋ねます。デフォルト\n"
 "（推奨）インストールか、もっとコントロールしたいか（「エキスパート」）\n"
 "です。また新規インストールか既存のMandrake Linuxを更新するのかも選べます。\n"
-"「インストール」をクリックすると古いシステムはすべて消えます。更新や、\n"
-"既存システムの修復なら「アップグレード（更新）」を選びます。\n"
 "\n"
-"Mandrake Linuxの旧版がインストールされていないか、複数の OSを並行\n"
-"して使う場合には、「インストール」を選びましょう。\n"
+" * 「インストール」 古いシステムを完全に消去します。実は、いまのマシンの\n"
+"種類によっては、古い（Linuxのみならず他の）パーティションを変更しないまま\n"
+"保存できます。\n"
+"\n"
+" * 「更新」 このインストールクラスでは、いまの Mandrake Linux システム\n"
+"上のパッケージを更新するだけです。ハードドライブのパーティションや各種\n"
+"ユーザによる設定は残ります。それ以外は通常インストールとまったく同じ\n"
+"選択肢が得られます。\n"
 "\n"
-"古いMandrake Linuxを更新したいのなら「更新」を選びます。\n"
+" * 「パッケージのみ更新」 この新しいクラスは、既存 Mandrake Linux を更新\n"
+"しつつ、いままでのシステム設定は変えません。カレントのインストールに対して\n"
+"新しいパッケージを追加するときもここです。\n"
+"\n"
+"Mandrake Linux8.1以降を更新したいのなら「更新」でだいじょうぶでしょう。\n"
 "\n"
 "GNU/Linux への習熟度に応じて、以下のインストール・更新レベルが\n"
 "選べます:\n"
@@ -3037,22 +3409,15 @@ msgstr ""
 "* 推奨: GNU/Linux  のインストールが初めてならこれを選んでください。\n"
 "うるさい質問もあまりなく、とても簡単にインストールできます。\n"
 "\n"
-"* カスタマイズ: GNU/Linux のことをよく知っている人は、システムの\n"
-"主な使い方を選んでください（ワークステーション、サーバ、開発）。\n"
-"「推奨」よりはたくさん質問に答えることになるので、このクラスを\n"
-"選ぶには GNU/Linux の仕組みについて知識がいります。\n"
-"\n"
 "* エキスパート: GNU/Linux に詳しい人は、このインストールクラスを\n"
-"選べます。「カスタマイズ」と同じく、主な用途（ワークステーション、\n"
-"サーバ、開発）を選べます。このインストールクラスを選ぶ前に\n"
-"よく考えてください。きわめてカスタム化したインストールができます。\n"
+"選べます。きわめてカスタム化したインストールができます。\n"
 "GNU/Linuxについてよほど詳しくないと、なかなか答えられない質問が\n"
 "あります。わかった人以外は、このクラスは選ばないこと。"
 
-#: ../../help.pm_.c:521
+#: ../../help.pm_.c:583
 msgid ""
 "Normally, DrakX selects the right keyboard for you (depending on the\n"
-"language you have chosen) and you will not even see this step. However, you\n"
+"language you have chosen) and you won't even see this step. However, you\n"
 "might not have a keyboard that corresponds exactly to your language: for\n"
 "example, if you are an English speaking Swiss person, you may still want\n"
 "your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
@@ -3073,7 +3438,7 @@ msgstr ""
 "\n"
 "「もっと」ボタンを押すと、サポートされるキーボードがすべて表示されます。"
 
-#: ../../help.pm_.c:534
+#: ../../help.pm_.c:596
 msgid ""
 "Please choose your preferred language for installation and system usage.\n"
 "\n"
@@ -3082,10 +3447,10 @@ msgid ""
 "will install the language-specific files for system documentation and\n"
 "applications. For example, if you will host users from Spain on your\n"
 "machine, select English as the main language in the tree view and in the\n"
-"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
+"Advanced section click on the box corresponding to \"Spanish|Spain\".\n"
 "\n"
 "Note that multiple languages may be installed. Once you have selected any\n"
-"additional locales click the \"OK\" button to continue."
+"additional locales, click the \"OK\" button to continue."
 msgstr ""
 "インストールとシステム利用で使う言語を選んでください。\n"
 "\n"
@@ -3097,19 +3462,20 @@ msgstr ""
 "言語は複数選べます。追加の言語（ロケール）を選んで、OKを押して確認したら、\n"
 "自動的に次のステップに進みます。"
 
-#: ../../help.pm_.c:547
+#: ../../help.pm_.c:609
 msgid ""
-"By default, DrakX assumes you have a two-button mouse and will set it up\n"
-"for third-button emulation. DrakX will automatically know whether it is a\n"
-"PS/2, serial or USB mouse.\n"
+"DrakX generally detects the number of buttons your mouse has. If not, it\n"
+"assumes you have a two-button mouse and will set it up for third-button\n"
+"emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
+"USB mouse.\n"
 "\n"
 "If you wish to specify a different type of mouse select the appropriate\n"
-"type from the list provided.\n"
+"type from the provided list.\n"
 "\n"
-"If you choose a mouse other than the default you will be presented with a\n"
-"mouse test screen. Use the buttons and wheel to verify that the settings\n"
-"are good. If the mouse is not working correctly press the space bar or\n"
-"RETURN to \"Cancel\" and choose again."
+"If you choose a mouse other than the default, a test screen will be\n"
+"displayed. Use the buttons and wheel to verify that the settings are\n"
+"correct. If the mouse is not working well, press the space bar or [Return]\n"
+"to \"Cancel\" and choose again."
 msgstr ""
 "デフォルトだと、DrakX は２ボタンマウスを想定して、中央ボタンをエミュレート\n"
 "する設定になっています。DrakX は、それがPS/2マウスかUSBマウスかを自動判定\n"
@@ -3122,31 +3488,31 @@ msgstr ""
 "動かなければ、スペースか「リターン」を押してキャンセルして、選びなおし\n"
 "ます。"
 
-#: ../../help.pm_.c:560
+#: ../../help.pm_.c:623
 msgid ""
-"Please select the correct port. For example, the COM1 port under MS Windows\n"
-"is named ttyS0 under GNU/Linux."
+"Please select the correct port. For example, the \"COM1\" port under\n"
+"Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
 "正しいポートを選んでください。たとえば、MS ウィンドウズでの\n"
 "COM1ポートは、GNU/Linuxでは ttyS0 という名前になります。"
 
-#: ../../help.pm_.c:564
+#: ../../help.pm_.c:627
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
 "system: you have to enter the \"root\" password. \"root\" is the system\n"
 "administrator and is the only one authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
 "do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
-"choose not to enter a password, but we strongly advise you against this if\n"
-"only for one reason: do not think that because you booted GNU/Linux that\n"
-"your other operating systems are safe from mistakes. Since \"root\" can\n"
-"overcome all limitations and unintentionally erase all data on partitions\n"
-"by carelessly accessing the partitions themselves, it is important for it\n"
-"to be difficult to become \"root\".\n"
+"guess DrakX will tell you if it is too easy. As you can see, you can choose\n"
+"not to enter a password, but we strongly advise you against this if only\n"
+"for one reason: do not think that because you booted GNU/Linux that your\n"
+"other operating systems are safe from mistakes. Since \"root\" can overcome\n"
+"all limitations and unintentionally erase all data on partitions by\n"
+"carelessly accessing the partitions themselves, it is important for it to\n"
+"be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password - it makes it too\n"
+"characters long. Never write down the \"root\" password it makes it too\n"
 "easy to compromise a system.\n"
 "\n"
 "However, please do not make the password too long or complicated because\n"
@@ -3155,12 +3521,12 @@ msgid ""
 "The password will not be displayed on screen as you type it in. Hence, you\n"
 "will have to type the password twice to reduce the chance of a typing\n"
 "error. If you do happen to make the same typing error twice, this\n"
-"\"incorrect\" password will have to be used the first time you connect.\n"
+"``incorrect'' password will have to be used the first time you connect.\n"
 "\n"
-"In expert mode, you will be asked if you will be connecting to an\n"
+"In Expert mode, you will be asked if you will be connecting to an\n"
 "authentication server, like NIS or LDAP.\n"
 "\n"
-"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"If your network uses the LDAP (or NIS) protocol for authentication, select\n"
 "\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
 "network administrator.\n"
 "\n"
@@ -3194,55 +3560,55 @@ msgstr ""
 "「NISを使う」オプションを選びます。「OK」を押したら、必要な情報\n"
 "を入力します。"
 
-#: ../../help.pm_.c:600
+#: ../../help.pm_.c:663
 msgid ""
-"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
-"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
+"automated. In fact, DrakX analyzes the disk boot sector and acts\n"
 "accordingly, depending on what it finds here:\n"
 "\n"
-" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
-"boot\n"
-"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
+" * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
+"boot sector. Hence, you will be able to load either GNU/Linux or another\n"
+"OS;\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one;\n"
+" * if a grub or LILO boot sector is found, it will replace it with a new\n"
+"one.\n"
 "\n"
 "If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-" * \"Boot loader to use\": you have three choices:\n"
+" * \"Bootloader to use\": you have three choices:\n"
+"\n"
+"    * \"GRUB\": if you prefer grub (text menu).\n"
 "\n"
 "    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
 "interface.\n"
 "\n"
-"    * \"GRUB\": if you prefer GRUB (text menu).\n"
-"\n"
 "    * \"LILO with text menu\": if you prefer LILO with its text menu "
 "interface.\n"
 "\n"
 " * \"Boot device\": in most cases, you will not change the default\n"
-"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
-"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
+"(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
 "\n"
 " * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"this is the delay granted to the user to choose in the bootloader menu,\n"
 "another boot entry than the default one.\n"
 "\n"
-"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"!! Beware that if you choose not to install a bootloader (by selecting\n"
 "\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
-"Linux system! Also be sure you know what you do before changing any of the\n"
+"Linux system! Also, be sure you know what you do before changing any of the\n"
 "options. !!\n"
 "\n"
 "Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
 "options, which are reserved to the expert user.\n"
 "\n"
-"Mandrake Linux installs its own boot loader, which will let you boot either\n"
-"GNU/Linux or any other operating systems which you have on your system.\n"
+"After you have configured the general bootloader parameters, the list of\n"
+"boot options which will be available at boot time will be displayed.\n"
 "\n"
-"If there is another operating system installed on your machine, it will be\n"
-"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
-"existing options. Double-clicking on an existing entry allows you to change\n"
-"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
-"on to the next installation step."
+"If there is another operating system installed on your machine, it will\n"
+"automatically be added to the boot menu. Here, you can choose to fine-tune\n"
+"the existing options. Select an entry and click \"Modify\" to modify or\n"
+"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+"installation step."
 msgstr ""
 "LILO と GRUB は GNU/Linux の起動に使われるブートローダです。この段階は\n"
 "ふつう、完全に自動化されています。DrakXはディスクのブートセクタを分析して\n"
@@ -3255,20 +3621,20 @@ msgstr ""
 "\n"
 "わからなければ、drakX は各種オプションを挙げたダイアログを表示します。\n"
 "\n"
-" * 使うブートローダ: 選択肢は3つあります:\n"
+" * 「使うブートローダ」: 選択肢は3つあります:\n"
 "\n"
-"    * LILO、グラフィックメニューつき: グラフィックメニューつきの LILO がよけ"
-"ればこれを。\n"
+"    * 「LILO、グラフィックメニューつき」: グラフィックメニューつきの LILO が"
+"よければこれを。\n"
 "\n"
-"    * Grub: GRUB (テキストメニュー)の場合。\n"
+"    * 「Grub」: GRUB (テキストメニュー)の場合。\n"
 "\n"
-"    * LILO テキストメニュー: テキストメニューつき LILO の場合。\n"
+"    * 「LILO テキストメニュー」: テキストメニューつき LILO の場合。\n"
 "\n"
-" * ブートデバイス: ほとんどは、デフォルト (/dev/hda) のままですが\n"
+" * 「ブートデバイス」: ほとんどは、デフォルト (/dev/hda) のままですが\n"
 "場合によってはブートローダを二番目のハードディスク (/dev/hdb)や、\n"
 "フロッピーディスクに置けます (/dev/fd0)。\n"
 "\n"
-" * デフォルトイメージ起動の待ち時間: コンピュータを再起動したとき、\n"
+" * 「デフォルトイメージ起動の待ち時間」: コンピュータを再起動したとき、\n"
 "ブートローダのデフォルト以外のメニューを選ぶための時間を指定します。\n"
 "\n"
 "!! ブートローダをインストールしないと（ここで「キャンセル」を選んだ\n"
@@ -3280,8 +3646,8 @@ msgstr ""
 "このダイアログで「高度な選択」ボタンを押すと、高度なユーザ専用の\n"
 "各種詳細オプションが出てきます。\n"
 "\n"
-"Mandrake Linux は独自のブートローダをインストールします。これは\n"
-"GNU/Linux でもその他システム上のすべての OS でも起動できます。\n"
+"汎用ブートローダのパラメータを設定したら、こんどは起動時に選べる\n"
+"ブートオプションの一覧が示されます。\n"
 "\n"
 "別のオペレーティングシステムがシステム上にあれば、自動的に起動\n"
 "メニューに追加されます。既存のオプションの細かい設定もできます。\n"
@@ -3289,9 +3655,9 @@ msgstr ""
 "たりできます。「完了」を押せば、インストールの次のステップへ進み\n"
 "ます。"
 
-#: ../../help.pm_.c:647
+#: ../../help.pm_.c:711
 msgid ""
-"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
+"LILO (the LInux LOader) and grub are bootloaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
@@ -3311,7 +3677,7 @@ msgstr ""
 "場合にはそのOSのエントリを削除しておきましょう。ただしこの場合は、\n"
 "そのOSを使うときには起動ディスクが要りますよ！"
 
-#: ../../help.pm_.c:658
+#: ../../help.pm_.c:722
 msgid ""
 "You must indicate where you wish to place the information required to boot\n"
 "to GNU/Linux.\n"
@@ -3323,32 +3689,32 @@ msgstr ""
 "\n"
 "よくわからないなら「ドライブの最初のセクタ(MBR)」を選んでください。"
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:729
 msgid ""
-"Here we select a printing system for your computer to use. Other OSes may\n"
-"offer you one, but Mandrake offers three.\n"
+"Here, we select a printing system for your computer. Other OSs may offer\n"
+"you one, but Mandrake Linux offers three.\n"
 "\n"
-" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
-"a\n"
+" * \"pdq\" which means ``print, don't queue'', is the choice if you have a\n"
 "direct connection to your printer and you want to be able to panic out of\n"
-"printer jams, and you do not have any networked printers. It will handle\n"
-"only very simple network cases and is somewhat slow for networks. Pick\n"
-"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
-"choices after install by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button.\n"
-"\n"
-" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
-"your local printer and also halfway round the planet. It is simple and can\n"
-"act like a server or a client for the ancient \"lpd\" printing system, so\n"
-"it is compatible with the systems that went before. It can do many tricks,\n"
-"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
-"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"printer jams, and you do not have networked printers. It will handle only\n"
+"very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
+"if this is your maiden voyage to GNU/Linux. You can change your choices\n"
+"after installation by running PrinterDrake from the Mandrake Control Center\n"
+"and clicking the expert button.\n"
+"\n"
+" * \"CUPS\"``Common Unix Printing System'', is excellent at printing to "
+"your\n"
+"local printer and also halfway-around the planet. It is simple and can act\n"
+"as a server or a client for the ancient \"lpd\" printing system. Hence, it\n"
+"is compatible with the systems that went before. It can do many tricks, but\n"
+"the basic setup is almost as easy as \"pdq\". If you need this to emulate\n"
+"an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
 "graphical front-ends for printing or choosing printer options.\n"
 "\n"
-" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+" * \"lprNG\"``line printer daemon New Generation''. This system can do\n"
 "approximately the same things the others can do, but it will print to\n"
-"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
-"it can print directly to shell commands. If you have need of Novell or\n"
+"printers mounted on a Novell Network, because it supports the IPX protocol,\n"
+"and it can print directly to shell commands. If you have need of Novell or\n"
 "printing to commands without using a separate pipe construct, use lprNG.\n"
 "Otherwise, CUPS is preferable as it is simpler and better at working over\n"
 "networks."
@@ -3364,7 +3730,7 @@ msgstr ""
 "もPrinterDrakeをMandrake コントロールセンターから選んで「エキスパート」\n"
 "ボタンを押せば、後から選択は変えられます。\n"
 "\n"
-" * \"CUPS\" - 「Common Unix Printing System（共通Unix印刷システム）」\n"
+" * \"CUPS\"「Common Unix Printing System（共通Unix印刷システム）」\n"
 "はローカルプリンタへの印刷も、地球の裏側のプリンタへの印刷も見事に処理\n"
 "します。サーバ状にも使えるし、昔ながらの \"lpd\" 印刷システムのクライ\n"
 "アントにもなるので、古いシステムと互換性もあります。いろいろ芸もできま\n"
@@ -3380,33 +3746,33 @@ msgstr ""
 "さもなければ、CUPS のほうが簡単だしネットワーク上での性能が優れているので\n"
 "CUPSにしましょう。"
 
-#: ../../help.pm_.c:693
+#: ../../help.pm_.c:757
 msgid ""
-"DrakX is now detecting any IDE devices present in your computer. It will\n"
-"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
-"is found DrakX will automatically install the appropriate driver.\n"
+"DrakX now detects any IDE device present in your computer. It will also\n"
+"scan for one or more PCI SCSI card(s) on your system. If a SCSI card is\n"
+"found, DrakX will automatically install the appropriate driver.\n"
 "\n"
-"Because hardware detection will sometimes not detect a piece of hardware\n"
+"Because hardware detection does not always detect a piece of hardware,\n"
 "DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
 "if you know that there is a SCSI card installed in your machine. You will\n"
 "be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
-"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"no SCSI hardware. If you are unsure, you can check the list of hardware\n"
 "detected in your machine by selecting \"See hardware info\" and clicking\n"
 "\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
 "return to the SCSI interface question.\n"
 "\n"
 "If you have to manually specify your adapter, DrakX will ask if you want to\n"
 "specify options for it. You should allow DrakX to probe the hardware for\n"
-"the card-specific options that the hardware needs to initialize. This\n"
+"the card-specific options which the hardware needs to initialize. This\n"
 "usually works well.\n"
 "\n"
-"If DrakX is not able to probe for the options that need to be passed, you\n"
-"will need to manually provide options to the driver. Please review the\n"
-"``User Guide'' (chapter 3, section \"Collecting information on your\n"
-"hardware\") for hints on retrieving the parameters required from hardware\n"
-"documentation, from the manufacturer's web site (if you have Internet\n"
-"access) or from Microsoft Windows (if you used this hardware with Windows\n"
-"on your system)."
+"If DrakX is not able to probe for the options which need to be passed, you\n"
+"will need to provide options to the driver manually. Please review the\n"
+"``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
+"Hardware'' section) for hints on retrieving the parameters required from\n"
+"hardware documentation, from the manufacturer's web site (if you have\n"
+"Internet access) or from MicrosoftWindows (if you used this hardware with\n"
+"Windows on your system)."
 msgstr ""
 "DrakXはマシン上のIDEデバイスを全部見つけようとします。またPCI SCSI\n"
 "アダプタもあれば検出しようとします。SCSIカードみつけたら、適切なドライバ\n"
@@ -3430,23 +3796,24 @@ msgstr ""
 "あるいは（システム上にあれば）MS Windows からどうやって必要情報を得るか\n"
 "を調べてください。"
 
-#: ../../help.pm_.c:720
+#: ../../help.pm_.c:784
 msgid ""
 "You can add additional entries for yaboot, either for other operating\n"
 "systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"For other OS's, the entry consists only of a label and the root partition.\n"
+"For other OSs, the entry consists only of a label and the \"root\"\n"
+"partition.\n"
 "\n"
 "For Linux, there are a few possible options:\n"
 "\n"
 " * Label: this is simply the name you will have to type at the yaboot "
 "prompt\n"
-"to select this boot option.\n"
+"to select this boot option;\n"
 "\n"
 " * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
-"or a variation of vmlinux with an extension.\n"
+"or a variation of vmlinux with an extension;\n"
 "\n"
-" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
+" * Root: the \"root\" device or ``/'' for your Linux installation;\n"
 "\n"
 " * Append: on Apple hardware, the kernel append option is used quite often\n"
 "to assist in initializing video hardware, or to enable keyboard mouse\n"
@@ -3460,22 +3827,22 @@ msgid ""
 "\n"
 " * Initrd: this option can be used either to load initial modules, before\n"
 "the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
+"boot situation;\n"
 "\n"
 " * Initrd-size: the default ramdisk size is generally 4,096 bytes. If you\n"
-"need to allocate a large ramdisk, this option can be used.\n"
+"need to allocate a large ramdisk, this option can be used;\n"
 "\n"
 " * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes \"live\".\n"
-"Here, you can override this option.\n"
+"read-only, to allow a file system check before the system becomes ``live''.\n"
+"Here, you can override this option;\n"
 "\n"
 " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in \"novideo\" mode, with\n"
-"native frame buffer support.\n"
+"problematic, you can select this option to boot in ``novideo'' mode, with\n"
+"native frame buffer support;\n"
 "\n"
 " * Default: selects this entry as being the default Linux selection,\n"
 "selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
-"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"also be highlighted with a ``*'', if you press [Tab] to see the boot\n"
 "selections."
 msgstr ""
 "yaboot用の追加エントリをここで追加できます。他のOSの場合でも、他の\n"
@@ -3522,38 +3889,36 @@ msgstr ""
 "エントリはまた、TABを押して起動時の選択肢を表示させたときには、\n"
 "「*」がついてハイライトされています。"
 
-#: ../../help.pm_.c:765
+#: ../../help.pm_.c:830
 msgid ""
-"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot\n"
 "either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
 "these other operating systems are correctly detected and installed. If this\n"
-"is not the case, you can add an entry by hand in this screen. Be careful as\n"
-"to choose the correct parameters.\n"
+"is not the case, you can add an entry by hand in this screen. Be careful to\n"
+"choose the correct parameters.\n"
 "\n"
 "Yaboot's main options are:\n"
 "\n"
-" * Init Message: a simple text message that is displayed before the boot\n"
-"prompt.\n"
+" * Init Message: a simple text message displayed before the boot prompt;\n"
 "\n"
-" * Boot Device: indicate where you want to place the information required "
-"to\n"
-"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
-"hold this information.\n"
+" * Boot Device: indicates where you want to place the information required\n"
+"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
+"to hold this information;\n"
 "\n"
 " * Open Firmware Delay: unlike LILO, there are two delays available with\n"
 "yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux.\n"
+"choose between CD, OF boot, MacOS or Linux;\n"
 "\n"
 " * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
 "After selecting Linux, you will have this delay in 0.1 second before your\n"
-"default kernel description is selected.\n"
+"default kernel description is selected;\n"
 "\n"
-" * Enable CD Boot?: checking this option allows you to choose \"C\" for CD\n"
-"at the first boot prompt.\n"
+" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
+"at the first boot prompt;\n"
 "\n"
-" * Enable OF Boot?: checking this option allows you to choose \"N\" for "
+" * Enable OF Boot?: checking this option allows you to choose ``N'' for "
 "Open\n"
-"Firmware at the first boot prompt.\n"
+"Firmware at the first boot prompt;\n"
 "\n"
 " * Default OS: you can select which OS will boot by default when the Open\n"
 "Firmware Delay expires."
@@ -3589,74 +3954,74 @@ msgstr ""
 "  * デフォルト OS: オープンファームウェアの待ち時間が過ぎたとき、どの\n"
 "OSが起動するかを指定します。"
 
-#: ../../help.pm_.c:798
+#: ../../help.pm_.c:862
 msgid ""
 "Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may - or not, see the following entries:\n"
+"your installed hardware, you may or not, see the following entries:\n"
 "\n"
-" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
-"button to change it if necessary.\n"
+" * \"Mouse\": check the current mouse configuration and click on the button\n"
+"to change it if necessary;\n"
 "\n"
-" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
-"click on the button to change that if necessary.\n"
+" * \"Keyboard\": check the current keyboard map configuration and click on\n"
+"the button to change that if necessary;\n"
 "\n"
-" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
-"the\n"
-"language you have chosen. But here again, as for the choice of a keyboard,\n"
-"you may not be in the country for which the chosen language should\n"
-"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
-"order to configure the clock according to the time zone you are in.\n"
+" * \"Timezone\": DrakX, by default, guesses your time zone from the "
+"language\n"
+"you have chosen. But here again, as for the choice of a keyboard, you may\n"
+"not be in the country for which the chosen language should correspond.\n"
+"Hence, you may need to click on the \"Timezone\" button in order to\n"
+"configure the clock according to the time zone you are in;\n"
 "\n"
 " * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard.\n"
+"configuration wizard;\n"
 "\n"
 " * \"Sound card\": if a sound card is detected on your system, it is\n"
-"displayed here. No modification possible at installation time.\n"
+"displayed here. No modification possible at installation time;\n"
 "\n"
 " * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. No modification possible at installation time.\n"
+"here. No modification possible at installation time;\n"
 "\n"
 " * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
 "displayed here. You can click on the button to change the parameters\n"
-"associated to it."
+"associated with it."
 msgstr ""
 "あなたのマシンに関する各種のパラメータを示します。ハードウェアにも\n"
 "よりますが、以下のような項目が出てくるはずです:\n"
 "\n"
-" * マウス: マウス。現在のマウス設定を見て、必要ならボタンをクリックして変更し"
-"ます。\n"
+" * 「マウス」: マウス。現在のマウス設定を見て、必要ならボタンをクリック\n"
+"して変更します。\n"
 "\n"
-" * キーボード：キーボード。いまのキーボードの割付設定を見て、必要なら\n"
+" * 「キーボード」：キーボード。いまのキーボードの割付設定を見て、必要なら\n"
 "ボタンをクリックして変更します。\n"
 "\n"
-" * 時間帯: 時間帯　DrakX はデフォルトで、あなたの選んだ言語に応じて\n"
+" * 「時間帯」: 時間帯　DrakX はデフォルトで、あなたの選んだ言語に応じて\n"
 "時間帯を推定します。でもここでもキーボードの選択と同じで、言語とは\n"
 "ちがう国にいるときには、時間帯ボタンを押して、自分の時間帯にあわせた\n"
 "設定にできます。\n"
 "\n"
-" * プリンタ: 「プリンタなし」ボタンを押すと、プリンタ設定ウィザード\n"
+" * 「プリンタ」: 「プリンタなし」ボタンを押すと、プリンタ設定ウィザード\n"
 "が開きます。\n"
 "\n"
-" * サウンドカード: サウンドカードが検出されたらここに表示されます。\n"
+" * 「サウンドカード」: サウンドカードが検出されたらここに表示されます。\n"
 "インストール時には変更できません。\n"
 "\n"
-" * TV カード: TV カードが検出されたらここに表示されます。\n"
+" * 「TV カード」: TV カードが検出されたらここに表示されます。\n"
 "インストール時には変更できません。\n"
 "\n"
-" * ISDN カード: ISDN 検出されたらここに表示されます。\n"
+" * 「ISDN カード」: ISDN カードが検出されたらここに表示されます。\n"
 "ボタンをクリックすると関連パラメータが変えられます。"
 
-#: ../../help.pm_.c:827
+#: ../../help.pm_.c:891
 msgid ""
-"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
-"partition. Be careful, all data present on it will be lost and will not be\n"
-"recoverable!"
+"Choose the hard drive you want to erase in order to install your new\n"
+"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
+"and will not be recoverable!"
 msgstr ""
 "新しい Mandrake Linux パーティションのインストール用に消去したい\n"
 "ハードディスクを選んでください。そのハードディスク上のデータは全部\n"
 "消えて回復できません。注意してください。"
 
-#: ../../help.pm_.c:832
+#: ../../help.pm_.c:896
 msgid ""
 "Click on \"OK\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
@@ -3674,15 +4039,20 @@ msgstr ""
 "この操作を取りやめて、ハードディスク上のデータやパーティションを\n"
 "そのままにしておくには「キャンセル」をクリックしましょう。"
 
-#: ../../install2.pm_.c:114
+#: ../../install2.pm_.c:113
 #, c-format
 msgid ""
-"Can't access kernel modules corresponding to your kernel (file %s is missing)"
+"Can't access kernel modules corresponding to your kernel (file %s is "
+"missing), this generally means your boot floppy in not in sync with the "
+"Installation medium (please create a newer boot floppy)"
 msgstr ""
-"カーネルに対応したカーネルモジュールをアクセスできません（ファイル%sがありま"
-"せん)"
 
-#: ../../install_any.pm_.c:421
+#: ../../install2.pm_.c:169
+#, c-format
+msgid "You must also format %s"
+msgstr "%s もフォーマットしてください"
+
+#: ../../install_any.pm_.c:411
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3706,7 +4076,7 @@ msgstr ""
 "\n"
 "本当にこのサーバをインストールしていいですね？\n"
 
-#: ../../install_any.pm_.c:457
+#: ../../install_any.pm_.c:447
 msgid "Can't use broadcast with no NIS domain"
 msgstr "NIS ドメインがないのでブロードキャストが使えません"
 
@@ -3727,20 +4097,11 @@ msgstr ""
 "この保存したパッケージ選択を使うには、インストールの起動時に「linux "
 "defcfg=floppy」と指定します。"
 
-#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:763
 #, c-format
 msgid "Error reading file %s"
 msgstr "ファイル %s の読みとりエラーです"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
-#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
-#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
-#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
-#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
-msgid "Ok"
-msgstr "OK"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3750,7 +4111,7 @@ msgstr ""
 "あなたのマシン上のハードの中には、「非公開の」ドライバが必要なものが\n"
 "あります。以下の情報を見てください: %s"
 
-#: ../../install_interactive.pm_.c:44
+#: ../../install_interactive.pm_.c:58
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3760,11 +4121,11 @@ msgstr ""
 "新しくパーティションをつくるか、既存のものをクリックして選びます。\n"
 "そして“マウントポイント”アクションを選び、「/」にセットします"
 
-#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:63
 msgid "You must have a swap partition"
 msgstr "スワップパーティションが必要です"
 
-#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:64
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3774,59 +4135,59 @@ msgstr ""
 "\n"
 "構わずに続けますか？"
 
-#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:163
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "/boot/efi に FAT パーティションをマウントしてください"
 
-#: ../../install_interactive.pm_.c:76
+#: ../../install_interactive.pm_.c:90
 msgid "Use free space"
 msgstr "フリースペースの使用"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:92
 msgid "Not enough free space to allocate new partitions"
 msgstr "新しいパーティションに割り当てる十分なフリースペースがありません"
 
-#: ../../install_interactive.pm_.c:86
+#: ../../install_interactive.pm_.c:100
 msgid "Use existing partition"
 msgstr "既存のパーティションを使用"
 
-#: ../../install_interactive.pm_.c:88
+#: ../../install_interactive.pm_.c:102
 msgid "There is no existing partition to use"
 msgstr "存在しないパーティション"
 
-#: ../../install_interactive.pm_.c:95
+#: ../../install_interactive.pm_.c:109
 msgid "Use the Windows partition for loopback"
 msgstr "Windows パーティションをループバックに使用"
 
-#: ../../install_interactive.pm_.c:98
+#: ../../install_interactive.pm_.c:112
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "どのパーティションにLinux4Winを入れますか"
 
-#: ../../install_interactive.pm_.c:100
+#: ../../install_interactive.pm_.c:114
 msgid "Choose the sizes"
 msgstr "サイズを選択"
 
-#: ../../install_interactive.pm_.c:101
+#: ../../install_interactive.pm_.c:115
 msgid "Root partition size in MB: "
 msgstr "ルートパーティションのサイズ (MB)"
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:116
 msgid "Swap partition size in MB: "
 msgstr "スワップパーティションのサイズ (MB): "
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:125
 msgid "Use the free space on the Windows partition"
 msgstr "ウィンドウズパーティション上のフリースペースを使用"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:128
 msgid "Which partition do you want to resize?"
 msgstr "どのパーティションをリサイズしますか？"
 
-#: ../../install_interactive.pm_.c:116
+#: ../../install_interactive.pm_.c:130
 msgid "Computing Windows filesystem bounds"
 msgstr "ウィンドウズファイルシステムの境界を計算"
 
-#: ../../install_interactive.pm_.c:119
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3835,44 +4196,46 @@ msgstr ""
 "FAT リサイザーはパーティション操作ができません。\n"
 "以下のエラーが発生: %s"
 
-#: ../../install_interactive.pm_.c:122
+#: ../../install_interactive.pm_.c:136
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr "ウィンドウズパーティションが断片化しすぎです。“デフラグ”してください。"
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:137
 msgid ""
 "WARNING!\n"
 "\n"
-"DrakX will now resize your Windows partition. Be careful: this operation is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
+"DrakX will now resize your Windows partition. Be careful:\n"
+"this operation is dangerous. If you have not already done\n"
+"so, you should first exit the installation, run scandisk\n"
+"under Windows (and optionally run defrag), then restart the\n"
+"installation. You should also backup your data.\n"
 "When sure, press Ok."
 msgstr ""
 "注意！\n"
 "\n"
 "DrakX はこれからウィンドウズのパーティションサイズを変更します。\n"
-"注意:この操作は危険です。まだリサイズしていないのなら、いちどインストールを\n"
-"中断し、scandiskをかけましょう（さらにdefragもかけたほうがいいです)。\n"
+"注意:この操作は危険です。もし事前に scandisk をかけていなければ、\n"
+"ここでインストールを中断し、scandiskをかけましょう（さらにdefrag\n"
+"もかけたほうがいいです)。\n"
 "データもバックアップしてありますか？　いまのうちにして\n"
 "おいてください。\n"
 "大丈夫なら Ok を押して下さい。"
 
-#: ../../install_interactive.pm_.c:132
+#: ../../install_interactive.pm_.c:147
 msgid "Which size do you want to keep for windows on"
 msgstr "ウィンドウズ用にどのくらいのサイズを残しておきますが"
 
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:148
 #, c-format
 msgid "partition %s"
 msgstr "パーティション %s"
 
-#: ../../install_interactive.pm_.c:139
+#: ../../install_interactive.pm_.c:155
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT のリサイズに失敗: %s"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:170
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -3880,33 +4243,33 @@ msgstr ""
 "リサイズやループバック用のFATパーティションがありません (または十分なスペース"
 "が無い)"
 
-#: ../../install_interactive.pm_.c:160
+#: ../../install_interactive.pm_.c:176
 msgid "Erase entire disk"
 msgstr "全ディスク消去"
 
-#: ../../install_interactive.pm_.c:160
+#: ../../install_interactive.pm_.c:176
 msgid "Remove Windows(TM)"
 msgstr "Windows(TM) を削除"
 
-#: ../../install_interactive.pm_.c:163
+#: ../../install_interactive.pm_.c:179
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 "複数のハードドライブを持っていますね、どれに linux をインストールしますか？"
 
-#: ../../install_interactive.pm_.c:166
+#: ../../install_interactive.pm_.c:182
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "ドライブ %s 上のパーティションおよびデータは全部失われます"
 
-#: ../../install_interactive.pm_.c:174
+#: ../../install_interactive.pm_.c:190
 msgid "Custom disk partitioning"
 msgstr "パーティションを自分で指定"
 
-#: ../../install_interactive.pm_.c:178
+#: ../../install_interactive.pm_.c:194
 msgid "Use fdisk"
 msgstr "fdiskを使う"
 
-#: ../../install_interactive.pm_.c:181
+#: ../../install_interactive.pm_.c:197
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3915,32 +4278,32 @@ msgstr ""
 "%s をパーティションできます。\n"
 "終わったら、必ず「w」を使って保存しましょう。"
 
-#: ../../install_interactive.pm_.c:210
+#: ../../install_interactive.pm_.c:226
 msgid "You don't have enough free space on your Windows partition"
 msgstr "ウィンドウズパーティション上のフリースペースが足りません"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:242
 msgid "I can't find any room for installing"
 msgstr "インストール用の空きが見つかりませんが"
 
-#: ../../install_interactive.pm_.c:230
+#: ../../install_interactive.pm_.c:246
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX パーティションウィザードは以下の解法を見付けました:"
 
-#: ../../install_interactive.pm_.c:235
+#: ../../install_interactive.pm_.c:251
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "パーティショニングに失敗: %s"
 
-#: ../../install_interactive.pm_.c:241
+#: ../../install_interactive.pm_.c:261
 msgid "Bringing up the network"
 msgstr "ネットワークをたちあげる"
 
-#: ../../install_interactive.pm_.c:246
+#: ../../install_interactive.pm_.c:266
 msgid "Bringing down the network"
 msgstr "ネットワークを停止する"
 
-#: ../../install_steps.pm_.c:73
+#: ../../install_steps.pm_.c:76
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
@@ -3948,12 +4311,12 @@ msgstr ""
 "エラー発生，うまく処理する方法がわかりません。\n"
 "自分の責任で続けて下さい。"
 
-#: ../../install_steps.pm_.c:207
+#: ../../install_steps.pm_.c:205
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "マウントポイント %s が重なっています"
 
-#: ../../install_steps.pm_.c:384
+#: ../../install_steps.pm_.c:388
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -3966,93 +4329,21 @@ msgstr ""
 "してみてください：\n"
 "「 rpm -qpl Mandrake/RPMS/*.rpm 」\n"
 
-#: ../../install_steps.pm_.c:459
+#: ../../install_steps.pm_.c:458
 #, c-format
 msgid "Welcome to %s"
 msgstr "%s へようこそ"
 
-#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
+#: ../../install_steps.pm_.c:513 ../../install_steps.pm_.c:755
 msgid "No floppy drive available"
 msgstr "有効なフロッピードライブがありません"
 
-#: ../../install_steps_auto_install.pm_.c:77
-#: ../../install_steps_stdio.pm_.c:23
+#: ../../install_steps_auto_install.pm_.c:76
+#: ../../install_steps_stdio.pm_.c:22
 #, c-format
 msgid "Entering step `%s'\n"
 msgstr "ステップ 「%s」を始めます\n"
 
-#: ../../install_steps_graphical.pm_.c:287
-msgid "Choose the size you want to install"
-msgstr "インストールするサイズを選んで下さい"
-
-#: ../../install_steps_graphical.pm_.c:334
-msgid "Total size: "
-msgstr "合計サイズ: "
-
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:387
-#, c-format
-msgid "Version: %s\n"
-msgstr "バージョン: %s\n"
-
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:388
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "サイズ: %d KB\n"
-
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:481
-#: ../../install_steps_interactive.pm_.c:509
-msgid "Choose the packages you want to install"
-msgstr "インストールしたいパッケージを選んで下さい"
-
-#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:571
-msgid "Info"
-msgstr "情報"
-
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:457
-#: ../../install_steps_interactive.pm_.c:212
-msgid "Install"
-msgstr "インストール"
-
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:497
-#: ../../install_steps_interactive.pm_.c:695
-msgid "Installing"
-msgstr "インストール中"
-
-#: ../../install_steps_graphical.pm_.c:499
-msgid "Please wait, "
-msgstr "しばらくお待ち下さい，"
-
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:510
-msgid "Time remaining "
-msgstr "残り時間 "
-
-#: ../../install_steps_graphical.pm_.c:502
-msgid "Total time "
-msgstr "合計時間 "
-
-#: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:695
-msgid "Preparing installation"
-msgstr "インストールの準備"
-
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:558
-#, c-format
-msgid "Installing package %s"
-msgstr "パッケージ %s のインストール"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
-#: ../../install_steps_gtk.pm_.c:646
-msgid "Go on anyway?"
-msgstr "かまわず先に進みますか？"
-
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:642
-msgid "There was an error ordering packages:"
-msgstr "パッケージの整列でエラーが発生:"
-
-#: ../../install_steps_graphical.pm_.c:577
-msgid "Use existing configuration for X11?"
-msgstr "すでにある X11 の設定を使いますか？"
-
 #: ../../install_steps_gtk.pm_.c:148
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
@@ -4066,12 +4357,12 @@ msgstr ""
 "これをするには、CDROM からブートしたとき、「F1」を押し、「text」と入力して\n"
 "ください。"
 
-#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:224
 msgid "Install Class"
 msgstr "インストールクラス"
 
 #: ../../install_steps_gtk.pm_.c:162
-msgid "Please, choose one of the following classes of installation:"
+msgid "Please choose one of the following classes of installation:"
 msgstr "以下のインストールクラスをどれか選んでください"
 
 #: ../../install_steps_gtk.pm_.c:228
@@ -4119,59 +4410,69 @@ msgstr "次のステップではもっと細かい選択が出来ます"
 msgid "Percentage of packages to install"
 msgstr "インストールするパッケージ中の割合"
 
-#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:619
+#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:705
 msgid "Package Group Selection"
 msgstr "パッケージグループを選択"
 
-#: ../../install_steps_gtk.pm_.c:320 ../../install_steps_interactive.pm_.c:634
+#: ../../install_steps_gtk.pm_.c:323 ../../install_steps_interactive.pm_.c:720
 msgid "Individual package selection"
 msgstr "個別パッケージの選択"
 
-#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#: ../../install_steps_gtk.pm_.c:346 ../../install_steps_interactive.pm_.c:645
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "合計サイズ: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:385
+#: ../../install_steps_gtk.pm_.c:391
 msgid "Bad package"
 msgstr "パッケージが壊れています"
 
-#: ../../install_steps_gtk.pm_.c:386
+#: ../../install_steps_gtk.pm_.c:392
 #, c-format
 msgid "Name: %s\n"
 msgstr "名前: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:389
+#: ../../install_steps_gtk.pm_.c:393
+#, c-format
+msgid "Version: %s\n"
+msgstr "バージョン: %s\n"
+
+#: ../../install_steps_gtk.pm_.c:394
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "サイズ: %d KB\n"
+
+#: ../../install_steps_gtk.pm_.c:395
 #, c-format
 msgid "Importance: %s\n"
 msgstr "重要: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:411
+#: ../../install_steps_gtk.pm_.c:417
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr "このパッケージは選択できません。ディスクの空き容量が不足です。"
 
-#: ../../install_steps_gtk.pm_.c:416
+#: ../../install_steps_gtk.pm_.c:422
 msgid "The following packages are going to be installed"
 msgstr "以下のパッケージがインストールされます"
 
-#: ../../install_steps_gtk.pm_.c:417
+#: ../../install_steps_gtk.pm_.c:423
 msgid "The following packages are going to be removed"
 msgstr "以下のパッケージが取り除かれます"
 
-#: ../../install_steps_gtk.pm_.c:429
+#: ../../install_steps_gtk.pm_.c:435
 msgid "You can't select/unselect this package"
 msgstr "このパッケージは選択・非選択できません"
 
-#: ../../install_steps_gtk.pm_.c:441
+#: ../../install_steps_gtk.pm_.c:447
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "これは不可欠なパッケージです。非選択にはできません"
 
-#: ../../install_steps_gtk.pm_.c:443
+#: ../../install_steps_gtk.pm_.c:449
 msgid "You can't unselect this package. It is already installed"
 msgstr "このパッケージは非選択にできません。すでにインストール済みです"
 
-#: ../../install_steps_gtk.pm_.c:447
+#: ../../install_steps_gtk.pm_.c:453
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -4179,40 +4480,100 @@ msgstr ""
 "このパッケージはアップグレードが必要です。\n"
 "本当に選択解除していいんですか？"
 
-#: ../../install_steps_gtk.pm_.c:451
+#: ../../install_steps_gtk.pm_.c:457
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "このパッケージは選択解除できません。アップグレードが必要です"
 
-#: ../../install_steps_gtk.pm_.c:456
+#: ../../install_steps_gtk.pm_.c:462
 msgid "Show automatically selected packages"
 msgstr "自動選択されたパッケージを表示"
 
-#: ../../install_steps_gtk.pm_.c:460
+#: ../../install_steps_gtk.pm_.c:463 ../../install_steps_interactive.pm_.c:246
+#: ../../install_steps_interactive.pm_.c:250
+msgid "Install"
+msgstr "インストール"
+
+#: ../../install_steps_gtk.pm_.c:466
 msgid "Load/Save on floppy"
 msgstr "フロッピーにセーブ/ロードする"
 
-#: ../../install_steps_gtk.pm_.c:461
+#: ../../install_steps_gtk.pm_.c:467
 msgid "Updating package selection"
 msgstr "パッケージ選択の更新"
 
-#: ../../install_steps_gtk.pm_.c:466
+#: ../../install_steps_gtk.pm_.c:472
 msgid "Minimal install"
 msgstr "最小インストール"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:487 ../../install_steps_interactive.pm_.c:555
+msgid "Choose the packages you want to install"
+msgstr "インストールしたいパッケージを選んで下さい"
+
+#: ../../install_steps_gtk.pm_.c:503 ../../install_steps_interactive.pm_.c:787
+msgid "Installing"
+msgstr "インストール中"
+
+#: ../../install_steps_gtk.pm_.c:509
 msgid "Estimating"
 msgstr "試算しています"
 
-#: ../../install_steps_gtk.pm_.c:522
+#: ../../install_steps_gtk.pm_.c:516
+msgid "Time remaining "
+msgstr "残り時間 "
+
+#: ../../install_steps_gtk.pm_.c:528
 msgid "Please wait, preparing installation"
 msgstr "インストールの準備中、少々お待ちを"
 
-#: ../../install_steps_gtk.pm_.c:553
+#: ../../install_steps_gtk.pm_.c:611
 #, c-format
 msgid "%d packages"
 msgstr "%d パッケージ"
 
-#: ../../install_steps_gtk.pm_.c:599
+#: ../../install_steps_gtk.pm_.c:616
+#, c-format
+msgid "Installing package %s"
+msgstr "パッケージ %s のインストール"
+
+#: ../../install_steps_gtk.pm_.c:657 ../../install_steps_interactive.pm_.c:185
+#: ../../install_steps_interactive.pm_.c:811
+#: ../../standalone/drakautoinst_.c:203
+msgid "Accept"
+msgstr "認める"
+
+#: ../../install_steps_gtk.pm_.c:657 ../../install_steps_interactive.pm_.c:185
+#: ../../install_steps_interactive.pm_.c:811
+msgid "Refuse"
+msgstr "拒否"
+
+#: ../../install_steps_gtk.pm_.c:658 ../../install_steps_interactive.pm_.c:812
+#, c-format
+msgid ""
+"Change your Cd-Rom!\n"
+"\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
+"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
+msgstr ""
+"Cd-Rom を交換してください！\n"
+"「 %s 」という Cd-Rom をドライブにいれて、 Ok を押してください。\n"
+"CDがなければ、Cancel を押してこの Cd-Rom からのインストールを回避して下さい。"
+
+#: ../../install_steps_gtk.pm_.c:672 ../../install_steps_gtk.pm_.c:676
+#: ../../install_steps_interactive.pm_.c:824
+#: ../../install_steps_interactive.pm_.c:828
+msgid "Go on anyway?"
+msgstr "かまわず先に進みますか？"
+
+#: ../../install_steps_gtk.pm_.c:672 ../../install_steps_interactive.pm_.c:824
+msgid "There was an error ordering packages:"
+msgstr "パッケージの整列でエラーが発生:"
+
+#: ../../install_steps_gtk.pm_.c:676 ../../install_steps_interactive.pm_.c:828
+msgid "There was an error installing packages:"
+msgstr "パッケージのインストールでエラーが発生:"
+
+#: ../../install_steps_interactive.pm_.c:10
 msgid ""
 "\n"
 "Warning\n"
@@ -4272,40 +4633,19 @@ msgstr ""
 "作者に属し、ソフトウェアプログラムに適用される知的財産と著作権法に\n"
 "よって保護されています。\n"
 
-#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
-msgid "Accept"
-msgstr "認める"
-
-#: ../../install_steps_gtk.pm_.c:627 ../../install_steps_interactive.pm_.c:148
-msgid "Refuse"
-msgstr "拒否"
-
-#: ../../install_steps_gtk.pm_.c:628
-#, c-format
-msgid ""
-"Change your Cd-Rom!\n"
-"\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
-"done.\n"
-"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
-msgstr ""
-"Cd-Rom を交換してください！\n"
-"「 %s 」という Cd-Rom をドライブにいれて、 Ok を押してください。\n"
-"CDがなければ、Cancel を押してこの Cd-Rom からのインストールを回避して下さい。"
-
-#: ../../install_steps_gtk.pm_.c:646
-msgid "There was an error installing packages:"
-msgstr "パッケージのインストールでエラーが発生:"
-
-#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:67
 msgid "An error occurred"
 msgstr "エラー発生"
 
-#: ../../install_steps_interactive.pm_.c:71
+#: ../../install_steps_interactive.pm_.c:85
+msgid "Do you really want to leave the installation?"
+msgstr "本当にインストールを中断しますか？"
+
+#: ../../install_steps_interactive.pm_.c:108
 msgid "License agreement"
 msgstr "ソフト使用ライセンス条項"
 
-#: ../../install_steps_interactive.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:109
 msgid ""
 "Introduction\n"
 "\n"
@@ -4536,99 +4876,104 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
-#: ../../install_steps_interactive.pm_.c:168
-#: ../../install_steps_interactive.pm_.c:871
+#: ../../install_steps_interactive.pm_.c:205
+#: ../../install_steps_interactive.pm_.c:1045
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "キーボード"
 
-#: ../../install_steps_interactive.pm_.c:169
-#: ../../standalone/keyboarddrake_.c:29
-msgid "Please, choose your keyboard layout."
+#: ../../install_steps_interactive.pm_.c:206
+msgid "Please choose your keyboard layout."
 msgstr "キーボードレイアウトは何ですか？"
 
-#: ../../install_steps_interactive.pm_.c:170
+#: ../../install_steps_interactive.pm_.c:207
 msgid "Here is the full list of keyboards available"
 msgstr "使えるキーボードレイアウトの一覧を表示します。"
 
-#: ../../install_steps_interactive.pm_.c:187
+#: ../../install_steps_interactive.pm_.c:224
 msgid "Which installation class do you want?"
 msgstr "どのインストールクラスを望みますか？"
 
-#: ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:226
 msgid "Install/Update"
 msgstr "インストール/更新"
 
-#: ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:226
 msgid "Is this an install or an update?"
 msgstr "インストールですか，更新ですか？"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:235
 msgid "Recommended"
 msgstr "推奨"
 
-#: ../../install_steps_interactive.pm_.c:201
-#: ../../install_steps_interactive.pm_.c:204
+#: ../../install_steps_interactive.pm_.c:238
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Expert"
 msgstr "エキスパート"
 
-#: ../../install_steps_interactive.pm_.c:212
-msgid "Update"
+#: ../../install_steps_interactive.pm_.c:246
+#: ../../install_steps_interactive.pm_.c:250
+msgid "Upgrade"
 msgstr "更新"
 
-#: ../../install_steps_interactive.pm_.c:224 ../../standalone/mousedrake_.c:48
-msgid "Please, choose the type of your mouse."
+#: ../../install_steps_interactive.pm_.c:246
+#: ../../install_steps_interactive.pm_.c:250
+msgid "Upgrade packages only"
+msgstr "パッケージだけを更新"
+
+#: ../../install_steps_interactive.pm_.c:266
+msgid "Please choose the type of your mouse."
 msgstr "マウスの型はなんですか？"
 
-#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
+#: ../../install_steps_interactive.pm_.c:272 ../../standalone/mousedrake_.c:65
 msgid "Mouse Port"
 msgstr "マウスポート"
 
-#: ../../install_steps_interactive.pm_.c:231 ../../standalone/mousedrake_.c:65
+#: ../../install_steps_interactive.pm_.c:273 ../../standalone/mousedrake_.c:66
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "マウスはどのシリアルポートにつながっていますか？"
 
-#: ../../install_steps_interactive.pm_.c:239
+#: ../../install_steps_interactive.pm_.c:281
 msgid "Buttons emulation"
 msgstr "ボタンエミュレーション"
 
-#: ../../install_steps_interactive.pm_.c:241
+#: ../../install_steps_interactive.pm_.c:283
 msgid "Button 2 Emulation"
 msgstr "ボタン2のエミュレーション"
 
-#: ../../install_steps_interactive.pm_.c:242
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Button 3 Emulation"
 msgstr "ボタン3のエミュレーション"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:305
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIAカードの設定中..."
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:305
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:266
+#: ../../install_steps_interactive.pm_.c:312
 msgid "Configuring IDE"
 msgstr "IDE の設定"
 
-#: ../../install_steps_interactive.pm_.c:266
+#: ../../install_steps_interactive.pm_.c:312
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:281
+#: ../../install_steps_interactive.pm_.c:327
 msgid "no available partitions"
 msgstr "使えるパーティションがありません"
 
-#: ../../install_steps_interactive.pm_.c:284
+#: ../../install_steps_interactive.pm_.c:330
 msgid "Scanning partitions to find mount points"
 msgstr "パーティションをスキャンしてマウントポイントを探しています"
 
-#: ../../install_steps_interactive.pm_.c:292
+#: ../../install_steps_interactive.pm_.c:338
 msgid "Choose the mount points"
 msgstr "マウントポイントの選択"
 
-#: ../../install_steps_interactive.pm_.c:311
+#: ../../install_steps_interactive.pm_.c:357
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -4646,7 +4991,7 @@ msgstr ""
 "\n"
 "全パーティションを消去してよろしいですね？\n"
 
-#: ../../install_steps_interactive.pm_.c:324
+#: ../../install_steps_interactive.pm_.c:370
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -4654,7 +4999,7 @@ msgstr ""
 "DiskDrake はパーティションテーブルを正しく読めませんでした。\n"
 "ここから先は何が起きてもしりませんよ！"
 
-#: ../../install_steps_interactive.pm_.c:340
+#: ../../install_steps_interactive.pm_.c:386
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
@@ -4663,78 +5008,74 @@ msgstr ""
 "が、システムの起動には DiskDrake でブーツストラップパーティションを作ってくだ"
 "さい."
 
-#: ../../install_steps_interactive.pm_.c:349
+#: ../../install_steps_interactive.pm_.c:395
 msgid "No root partition found to perform an upgrade"
 msgstr "更新できるルートパーティションが見つかりません"
 
-#: ../../install_steps_interactive.pm_.c:350
+#: ../../install_steps_interactive.pm_.c:396
 msgid "Root Partition"
 msgstr "ルートパーティション"
 
-#: ../../install_steps_interactive.pm_.c:351
+#: ../../install_steps_interactive.pm_.c:397
 msgid "What is the root partition (/) of your system?"
 msgstr "システムのルートパーティション(/) はなんですか？"
 
-#: ../../install_steps_interactive.pm_.c:365
+#: ../../install_steps_interactive.pm_.c:411
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "パーティションテーブルの変更を反映するにはリブートしてください"
 
-#: ../../install_steps_interactive.pm_.c:389
+#: ../../install_steps_interactive.pm_.c:435
 msgid "Choose the partitions you want to format"
 msgstr "フォーマットするパーティションを選んでください"
 
-#: ../../install_steps_interactive.pm_.c:390
+#: ../../install_steps_interactive.pm_.c:436
 msgid "Check bad blocks?"
 msgstr "不良ブロックを検査しますか？"
 
-#: ../../install_steps_interactive.pm_.c:416
+#: ../../install_steps_interactive.pm_.c:462
 msgid "Formatting partitions"
 msgstr "パーティションをフォーマット"
 
-#: ../../install_steps_interactive.pm_.c:418
+#: ../../install_steps_interactive.pm_.c:464
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "ファイル %s の作成とフォーマット"
 
-#: ../../install_steps_interactive.pm_.c:421
+#: ../../install_steps_interactive.pm_.c:467
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "インストールに十分なスワップがありません，スワップを加えて下さい"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:473
 msgid "Looking for available packages"
 msgstr "手持ちのパッケージをさがしています"
 
-#: ../../install_steps_interactive.pm_.c:433
+#: ../../install_steps_interactive.pm_.c:479
 msgid "Finding packages to upgrade"
 msgstr "アップグレードするパッケージをさがしています"
 
-#: ../../install_steps_interactive.pm_.c:450
+#: ../../install_steps_interactive.pm_.c:496
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 "インストールやアップグレードに必要なディスクの空き容量が不足です。 (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:469
+#: ../../install_steps_interactive.pm_.c:515
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "完全 (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:469
+#: ../../install_steps_interactive.pm_.c:515
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "最小 (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:469
+#: ../../install_steps_interactive.pm_.c:515
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "推奨 (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:475
-msgid "Custom"
-msgstr "カスタム"
-
-#: ../../install_steps_interactive.pm_.c:522
+#: ../../install_steps_interactive.pm_.c:568
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
@@ -4742,31 +5083,56 @@ msgstr ""
 "フロッピーへのパッケージ選択の保存か読み込みを選んでください。\n"
 "形式は auto_install で生成したフロッピーと同じです。"
 
-#: ../../install_steps_interactive.pm_.c:525
+#: ../../install_steps_interactive.pm_.c:571
 msgid "Load from floppy"
 msgstr "フロッピーから読み込む"
 
-#: ../../install_steps_interactive.pm_.c:527
+#: ../../install_steps_interactive.pm_.c:573
 msgid "Loading from floppy"
 msgstr "フロッピーから読み込み中"
 
-#: ../../install_steps_interactive.pm_.c:527
+#: ../../install_steps_interactive.pm_.c:573
 msgid "Package selection"
 msgstr "パッケージを選択"
 
-#: ../../install_steps_interactive.pm_.c:532
+#: ../../install_steps_interactive.pm_.c:578
 msgid "Insert a floppy containing package selection"
 msgstr "パッケージ選択の入ったフロッピーを挿入"
 
-#: ../../install_steps_interactive.pm_.c:544
+#: ../../install_steps_interactive.pm_.c:590
 msgid "Save on floppy"
 msgstr "フロッピーにセーブする"
 
-#: ../../install_steps_interactive.pm_.c:605
+#: ../../install_steps_interactive.pm_.c:658
 msgid "Selected size is larger than available space"
 msgstr "選んだもののサイズは空きスペースを越えています"
 
-#: ../../install_steps_interactive.pm_.c:670
+#: ../../install_steps_interactive.pm_.c:671
+msgid "Type of install"
+msgstr "インストールの種類"
+
+#: ../../install_steps_interactive.pm_.c:672
+#, fuzzy
+msgid ""
+"You haven't selected any group of packages.\n"
+"Please choose the minimal installation you want:"
+msgstr ""
+"パッケージグループが選ばれていません。\n"
+"最低限欲しいインストールを選んでください"
+
+#: ../../install_steps_interactive.pm_.c:675
+msgid "With X"
+msgstr "X を使う"
+
+#: ../../install_steps_interactive.pm_.c:677
+msgid "With basic documentation (recommended!)"
+msgstr "基本的なドキュメンテーションを入れる（推奨！）"
+
+#: ../../install_steps_interactive.pm_.c:678
+msgid "Truly minimal install (especially no urpmi)"
+msgstr "本当に最低限のインストール（urpmi もなし）"
+
+#: ../../install_steps_interactive.pm_.c:762
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -4776,12 +5142,16 @@ msgstr ""
 "CDが一つもなければ、キャンセルをクリックしてください。\n"
 "手元にないCDがあれば、それを選択からはずしてからOkをクリックします。"
 
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:767
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "「 %s 」というCd-Rom"
 
-#: ../../install_steps_interactive.pm_.c:704
+#: ../../install_steps_interactive.pm_.c:787
+msgid "Preparing installation"
+msgstr "インストールの準備"
+
+#: ../../install_steps_interactive.pm_.c:796
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4790,21 +5160,21 @@ msgstr ""
 "パッケージ %s をインストール\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:713
+#: ../../install_steps_interactive.pm_.c:842
 msgid "Post-install configuration"
 msgstr "インストール設定を確定"
 
-#: ../../install_steps_interactive.pm_.c:719
+#: ../../install_steps_interactive.pm_.c:848
 #, c-format
 msgid "Please insert the Boot floppy used in drive %s"
 msgstr "使った起動フロッピーをドライブ %s に挿入"
 
-#: ../../install_steps_interactive.pm_.c:725
+#: ../../install_steps_interactive.pm_.c:854
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "更新モジュールフロッピーをドライブ %s に挿入して下さい"
 
-#: ../../install_steps_interactive.pm_.c:750
+#: ../../install_steps_interactive.pm_.c:874
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4868,133 +5238,167 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:912
+msgid ""
+"You have now the possibility to download updated packages that have\n"
+"been released after the distribution has been made available.\n"
+"\n"
+"You will get security fixes or bug fixes, but you need to have an\n"
+"Internet connection configured to proceed.\n"
+"\n"
+"Do you want to install the updates ?"
+msgstr ""
+"ディストリビューション公開時以降に更新されたパッケージを\n"
+"ダウンロードできます。\n"
+"\n"
+"セキュリティフィックスやバグフィックスが得られますが、\n"
+"これにはインターネット接続が必要です。\n"
+"\n"
+"更新パッケージをインストールしますか？"
+
+#: ../../install_steps_interactive.pm_.c:926
+msgid "Contacting Mandrake Linux web site to get the list of available mirrors"
+msgstr "Mandrake Linux サイトに接続してミラー一覧を取得しています"
+
+#: ../../install_steps_interactive.pm_.c:931
 msgid "Choose a mirror from which to get the packages"
 msgstr "どのサイトからパッケージを持ってくるかを選択"
 
-#: ../../install_steps_interactive.pm_.c:793
+#: ../../install_steps_interactive.pm_.c:940
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "サイトに接続してパッケージ一覧を取得しています"
 
-#: ../../install_steps_interactive.pm_.c:796
-msgid "Please choose the packages you want to install."
-msgstr "インストールしたいパッケージを選んで下さい"
-
-#: ../../install_steps_interactive.pm_.c:808
+#: ../../install_steps_interactive.pm_.c:967
 msgid "Which is your timezone?"
 msgstr "あなたの時間帯はどれですか？"
 
-#: ../../install_steps_interactive.pm_.c:813
+#: ../../install_steps_interactive.pm_.c:972
 msgid "Hardware clock set to GMT"
 msgstr "ハードウェアクロックは GMT にセットしてあります"
 
-#: ../../install_steps_interactive.pm_.c:814
+#: ../../install_steps_interactive.pm_.c:973
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自動時間あわせ（NTPを使う）"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:980
 msgid "NTP Server"
 msgstr "NTP サーバ"
 
-#: ../../install_steps_interactive.pm_.c:855
-#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
+#: ../../install_steps_interactive.pm_.c:1014
+#: ../../install_steps_interactive.pm_.c:1022
 msgid "Remote CUPS server"
 msgstr "リモートCUPS サーバ"
 
-#: ../../install_steps_interactive.pm_.c:856
+#: ../../install_steps_interactive.pm_.c:1015
 msgid "No printer"
 msgstr "プリンタなし"
 
-#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+#: ../../install_steps_interactive.pm_.c:1032
+msgid "Do you have an ISA sound card?"
+msgstr "ISA サウンドカードはありますか？"
+
+#: ../../install_steps_interactive.pm_.c:1034
+msgid "Run \"sndconfig\" after installation to configure your sound card"
+msgstr ""
+"インストール後に「sndconfig」を実行してサウンドカードを設定してください。"
+
+#: ../../install_steps_interactive.pm_.c:1036
+msgid "No sound card detected. Try \"harddrake\" after installation"
+msgstr ""
+"サウンドカードが検出できませんでした。\n"
+"インストール後に「harddrake」を試してください"
+
+#: ../../install_steps_interactive.pm_.c:1041 ../../steps.pm_.c:27
 msgid "Summary"
 msgstr "まとめ"
 
-#: ../../install_steps_interactive.pm_.c:870
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Mouse"
 msgstr "マウス"
 
-#: ../../install_steps_interactive.pm_.c:872
+#: ../../install_steps_interactive.pm_.c:1046
 msgid "Timezone"
 msgstr "時間帯"
 
-#: ../../install_steps_interactive.pm_.c:873 ../../printerdrake.pm_.c:1773
-#: ../../printerdrake.pm_.c:1844
+#: ../../install_steps_interactive.pm_.c:1047 ../../printerdrake.pm_.c:2276
+#: ../../printerdrake.pm_.c:2354
 msgid "Printer"
 msgstr "プリンタ"
 
-#: ../../install_steps_interactive.pm_.c:875
+#: ../../install_steps_interactive.pm_.c:1049
 msgid "ISDN card"
 msgstr "ISDNカード"
 
-#: ../../install_steps_interactive.pm_.c:878
+#: ../../install_steps_interactive.pm_.c:1052
+#: ../../install_steps_interactive.pm_.c:1054
 msgid "Sound card"
 msgstr "サウンドカード"
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:1056
 msgid "TV card"
 msgstr "テレビカード"
 
-#: ../../install_steps_interactive.pm_.c:917
-#: ../../install_steps_interactive.pm_.c:941
-#: ../../install_steps_interactive.pm_.c:945
+#: ../../install_steps_interactive.pm_.c:1094
+#: ../../install_steps_interactive.pm_.c:1118
+#: ../../install_steps_interactive.pm_.c:1122
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../../install_steps_interactive.pm_.c:918
-#: ../../install_steps_interactive.pm_.c:941
-#: ../../install_steps_interactive.pm_.c:954
+#: ../../install_steps_interactive.pm_.c:1095
+#: ../../install_steps_interactive.pm_.c:1118
+#: ../../install_steps_interactive.pm_.c:1131
 msgid "NIS"
 msgstr "NIS"
 
-#: ../../install_steps_interactive.pm_.c:919
-#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:1096
+#: ../../install_steps_interactive.pm_.c:1118
 msgid "Local files"
 msgstr "ローカルファイル"
 
-#: ../../install_steps_interactive.pm_.c:928
-#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1105
+#: ../../install_steps_interactive.pm_.c:1106 ../../steps.pm_.c:24
 msgid "Set root password"
 msgstr "ルートパスワード"
 
-#: ../../install_steps_interactive.pm_.c:930
+#: ../../install_steps_interactive.pm_.c:1107
 msgid "No password"
 msgstr "パスワードなし"
 
-#: ../../install_steps_interactive.pm_.c:935
+#: ../../install_steps_interactive.pm_.c:1112
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "このパスワードは簡単すぎます（最低でも %d 文字使ってください）"
 
-#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
-#: ../../standalone/draknet_.c:604
+#: ../../install_steps_interactive.pm_.c:1118 ../../network/modem.pm_.c:49
+#: ../../standalone/draknet_.c:626 ../../standalone/logdrake_.c:172
 msgid "Authentication"
 msgstr "認証"
 
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:1126
 msgid "Authentication LDAP"
 msgstr "認証LDAP"
 
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../install_steps_interactive.pm_.c:1127
 msgid "LDAP Base dn"
 msgstr "LDAPベースdn"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:1128
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
-#: ../../install_steps_interactive.pm_.c:957
+#: ../../install_steps_interactive.pm_.c:1134
 msgid "Authentication NIS"
 msgstr "認証NIS"
 
-#: ../../install_steps_interactive.pm_.c:958
+#: ../../install_steps_interactive.pm_.c:1135
 msgid "NIS Domain"
 msgstr "NIS ドメイン"
 
-#: ../../install_steps_interactive.pm_.c:959
+#: ../../install_steps_interactive.pm_.c:1136
 msgid "NIS Server"
 msgstr "NIS サーバ"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1171
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -5021,19 +5425,20 @@ msgstr ""
 "ブートディスクを作るならば、フロッピィディスクをドライブに挿入し、\n"
 "「OK」を押してください。"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1187
 msgid "First floppy drive"
 msgstr "最初のフロッピードライブ"
 
-#: ../../install_steps_interactive.pm_.c:1011
+#: ../../install_steps_interactive.pm_.c:1188
 msgid "Second floppy drive"
 msgstr "二番目のフロッピードライブ"
 
-#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
+#: ../../install_steps_interactive.pm_.c:1189 ../../printerdrake.pm_.c:1848
 msgid "Skip"
 msgstr "スキップ"
 
-#: ../../install_steps_interactive.pm_.c:1017
+#: ../../install_steps_interactive.pm_.c:1194
+#, c-format
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -5044,7 +5449,8 @@ msgid ""
 "with\n"
 "the Mandrake rescue image, making it much easier to recover from severe "
 "system\n"
-"failures. Would you like to create a bootdisk for your system?"
+"failures. Would you like to create a bootdisk for your system?\n"
+"%s"
 msgstr ""
 "カスタムブートディスクがあると、通常のブートローダを使わずに Linux を\n"
 "起動できます。LILO (またはGRUB)をインストールしたくない場合や、他の OS が\n"
@@ -5052,30 +5458,45 @@ msgstr ""
 "しない場合に使用できます。\n"
 "カスタムブートディスクは、Mandrake のシステム復旧用のレスキューイメージ\n"
 "としても使用できます。これがあればシステムが危機におちいったときに\n"
-"復旧するのが楽になります。ブートディスクを作りますか？"
+"復旧するのが楽になります。ブートディスクを作りますか？\n"
+"%s"
 
-#: ../../install_steps_interactive.pm_.c:1026
+#: ../../install_steps_interactive.pm_.c:1200
+msgid ""
+"\n"
+"\n"
+"(WARNING! You're using XFS for your root partition,\n"
+"creating a bootdisk on a 1.44 Mb floppy will probably fail,\n"
+"because XFS needs a very large driver)."
+msgstr ""
+"\n"
+"\n"
+"(警告！　root パーティションに XFS を使っていますね。\n"
+"1.44 Mb フロッピーで起動ディスクを作るのはたぶん無理です。\n"
+"XFS はとても大きなドライバが必要だからです)."
+
+#: ../../install_steps_interactive.pm_.c:1208
 msgid "Sorry, no floppy drive available"
 msgstr "有効なフロッピードライブがありません，ごめんなさい"
 
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1212
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "ブートディスクを作りたいフロッピィドライブを選択"
 
-#: ../../install_steps_interactive.pm_.c:1034
+#: ../../install_steps_interactive.pm_.c:1216
 #, c-format
-msgid "Insert a floppy in drive %s"
+msgid "Insert a floppy in %s"
 msgstr "フロッピーをドライブ %s に挿入"
 
-#: ../../install_steps_interactive.pm_.c:1037
+#: ../../install_steps_interactive.pm_.c:1219
 msgid "Creating bootdisk"
 msgstr "ブートディスクの作成"
 
-#: ../../install_steps_interactive.pm_.c:1044
+#: ../../install_steps_interactive.pm_.c:1226
 msgid "Preparing bootloader"
 msgstr "ブートローダの準備"
 
-#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1237
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
@@ -5087,11 +5508,11 @@ msgstr ""
 "インストールは続けますが、マシンの起動には\n"
 "BootX を使ってください"
 
-#: ../../install_steps_interactive.pm_.c:1060
+#: ../../install_steps_interactive.pm_.c:1243
 msgid "Do you want to use aboot?"
 msgstr "aboot を使いますか？"
 
-#: ../../install_steps_interactive.pm_.c:1063
+#: ../../install_steps_interactive.pm_.c:1246
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5099,15 +5520,15 @@ msgstr ""
 "aboot インストール時にエラー発生。\n"
 "無理にインストールしてみますか？　ただし最初のパーティションが破壊されます。"
 
-#: ../../install_steps_interactive.pm_.c:1070
+#: ../../install_steps_interactive.pm_.c:1253
 msgid "Installing bootloader"
 msgstr "ブートローダインストール中"
 
-#: ../../install_steps_interactive.pm_.c:1076
+#: ../../install_steps_interactive.pm_.c:1259
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "ブートローダのインストールに失敗しました。以下のエラーが発生:"
 
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1267
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -5124,34 +5545,18 @@ msgstr ""
 " それからこうタイプします: shut-down\n"
 "次の起動時にはブートローダのプロンプトが出るはずです。"
 
-#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
-msgid "Low"
-msgstr "低い"
-
-#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
-msgid "Medium"
-msgstr "ほどほど"
-
-#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
-msgid "High"
-msgstr "高い"
-
-#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
-msgid "Choose security level"
-msgstr "セキュリティの水準を選んでください"
-
-#: ../../install_steps_interactive.pm_.c:1134
-#: ../../standalone/drakautoinst_.c:80
+#: ../../install_steps_interactive.pm_.c:1311
+#: ../../standalone/drakautoinst_.c:81
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "空のフロッピーをドライブ %s に挿入して下さい"
 
-#: ../../install_steps_interactive.pm_.c:1138
-#: ../../standalone/drakautoinst_.c:82
+#: ../../install_steps_interactive.pm_.c:1315
+#: ../../standalone/drakautoinst_.c:83
 msgid "Creating auto install floppy"
 msgstr "インストールフロッピーの自動作成"
 
-#: ../../install_steps_interactive.pm_.c:1149
+#: ../../install_steps_interactive.pm_.c:1326
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5161,14 +5566,19 @@ msgstr ""
 "\n"
 "本当に終了しますか？"
 
-#: ../../install_steps_interactive.pm_.c:1160
+#: ../../install_steps_interactive.pm_.c:1337
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
+"\n"
 "For information on fixes which are available for this release of Mandrake "
 "Linux,\n"
-"consult the Errata available from http://www.mandrakelinux.com/.\n"
+"consult the Errata available from:\n"
+"\n"
+"\n"
+"http://www.linux-mandrake.com/en/82errata.php3\n"
+"\n"
 "\n"
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Mandrake Linux User's Guide."
@@ -5176,17 +5586,21 @@ msgstr ""
 "おめでとうございます!　インストール完了です。\n"
 "ブート用メディアを抜いて、リターンを押して再起動して下さい。\n"
 "\n"
+"\n"
 "このバージョンの Mandrake Linux のバグ修正情報は、\n"
-"http://www.linux-mandrake/ で調べられます。\n"
+"\n"
+"\n"
+"http://www.linux-mandrake.com/en/82errata.php3 で調べられます。\n"
+"\n"
 "\n"
 "インストール後の設定についてはユーザガイドの「インストールした後」の\n"
 "章を参照して下さい。"
 
-#: ../../install_steps_interactive.pm_.c:1172
+#: ../../install_steps_interactive.pm_.c:1354
 msgid "Generate auto install floppy"
 msgstr "インストールフロッピーの自動作成"
 
-#: ../../install_steps_interactive.pm_.c:1174
+#: ../../install_steps_interactive.pm_.c:1356
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5199,15 +5613,15 @@ msgstr ""
 "(これは別のマシンへのインストール用のものです).\n"
 "\n"
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1361
 msgid "Automated"
 msgstr "全自動"
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1361
 msgid "Replay"
 msgstr "再生"
 
-#: ../../install_steps_interactive.pm_.c:1182
+#: ../../install_steps_interactive.pm_.c:1364
 msgid "Save packages selection"
 msgstr "パッケージ選択の保存"
 
@@ -5221,348 +5635,451 @@ msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr "  <Tab>/<Alt-Tab> 要素間の移動  | <Space> 選択 | <F12> 次の画面 "
 
-#: ../../interactive.pm_.c:73
+#: ../../interactive.pm_.c:87
 msgid "kdesu missing"
 msgstr "kdesu がありません"
 
-#: ../../interactive.pm_.c:132
+#: ../../interactive.pm_.c:89 ../../interactive.pm_.c:100
+msgid "consolehelper missing"
+msgstr "consolehelper がありません"
+
+#: ../../interactive.pm_.c:152
 msgid "Choose a file"
 msgstr "ファイルを選択"
 
-#: ../../interactive.pm_.c:284
+#: ../../interactive.pm_.c:314
 msgid "Advanced"
 msgstr "高度な選択"
 
-#: ../../interactive.pm_.c:345
+#: ../../interactive.pm_.c:315
+msgid "Basic"
+msgstr "基本"
+
+#: ../../interactive.pm_.c:386
 msgid "Please wait"
 msgstr "お待ち下さい"
 
-#: ../../interactive_gtk.pm_.c:681
+#: ../../interactive_gtk.pm_.c:605 ../../services.pm_.c:222
+msgid "Info"
+msgstr "情報"
+
+#: ../../interactive_gtk.pm_.c:715
 msgid "Expand Tree"
 msgstr "ツリーをのばす"
 
-#: ../../interactive_gtk.pm_.c:682
+#: ../../interactive_gtk.pm_.c:716
 msgid "Collapse Tree"
 msgstr "ツリーを縮める"
 
-#: ../../interactive_gtk.pm_.c:683
+#: ../../interactive_gtk.pm_.c:717
 msgid "Toggle between flat and group sorted"
 msgstr "そのままとグループ別を切り替え"
 
-#: ../../interactive_stdio.pm_.c:35
-#, c-format
-msgid "Ambiguity (%s), be more precise\n"
-msgstr "不明 (%s)，もっと正確に\n"
-
-#: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
-#: ../../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:29 ../../interactive_stdio.pm_.c:147
 msgid "Bad choice, try again\n"
 msgstr "不正な選択，もう一度試して下さい\n"
 
-#: ../../interactive_stdio.pm_.c:39
+#: ../../interactive_stdio.pm_.c:30 ../../interactive_stdio.pm_.c:148
 #, c-format
-msgid " ? (default %s) "
-msgstr "? (デフォルトは %s) "
+msgid "Your choice? (default %s) "
+msgstr "どれにしますか？（デフォルトは %s）"
 
 #: ../../interactive_stdio.pm_.c:52
 #, c-format
-msgid "Your choice? (default %s) "
-msgstr "どれにしますか？（デフォルトは %s）"
+msgid ""
+"Entries you'll have to fill:\n"
+"%s"
+msgstr ""
+"以下のエントリも入力してください:\n"
+"%s"
 
-#: ../../interactive_stdio.pm_.c:72
+#: ../../interactive_stdio.pm_.c:68
 #, c-format
-msgid "Your choice? (default %s  enter `none' for none) "
-msgstr "どれにしますか？（デフォルトは %s、選ばないなら「なし」）"
+msgid "Your choice? (0/1, default `%s') "
+msgstr "どれにしますか？（0/1, デフォルトは %s）"
 
-#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
+#: ../../interactive_stdio.pm_.c:93
+#, c-format
+msgid "Button `%s': %s"
+msgstr "ボタン「%s」: %s"
+
+#: ../../interactive_stdio.pm_.c:94
+msgid "Do you want to click on this button? "
+msgstr "このボタンをクリックしますか？"
+
+#: ../../interactive_stdio.pm_.c:103
+#, c-format
+msgid "Your choice? (default `%s'%s) "
+msgstr "どれにしますか？（デフォルトは `%s'%s）"
+
+#: ../../interactive_stdio.pm_.c:121
+#, c-format
+msgid "=> There are many things to choose from (%s).\n"
+msgstr "=> 選択肢はいろいろあります (%s).\n"
+
+#: ../../interactive_stdio.pm_.c:124
+msgid ""
+"Please choose the first number of the 10-range you wish to edit,\n"
+"or just hit Enter to proceed.\n"
+"Your choice? "
+msgstr ""
+"10のなかでどれを編集したいか最初の数字を入れてください。\n"
+"あるいは単に Enter を押せば先に進みます。\n"
+"どれにしますか？"
+
+#: ../../interactive_stdio.pm_.c:137
+#, c-format
+msgid ""
+"=> Notice, a label changed:\n"
+"%s"
+msgstr ""
+"=> 注意、ラベルが変わりました:\n"
+"%s"
+
+#: ../../interactive_stdio.pm_.c:144
+msgid "Re-submit"
+msgstr "登録しなおし"
+
+#: ../../keyboard.pm_.c:174 ../../keyboard.pm_.c:205
 msgid "Czech (QWERTZ)"
 msgstr "チェコ (QWERTZ)"
 
-#: ../../keyboard.pm_.c:141 ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:180
+#: ../../keyboard.pm_.c:175 ../../keyboard.pm_.c:207
 msgid "German"
 msgstr "ドイツ"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:176
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:177 ../../keyboard.pm_.c:214
 msgid "Spanish"
 msgstr "スペイン"
 
-#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:178 ../../keyboard.pm_.c:215
 msgid "Finnish"
 msgstr "フィンランド"
 
-#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:179 ../../keyboard.pm_.c:216
 msgid "French"
 msgstr "フランス"
 
-#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
+#: ../../keyboard.pm_.c:180 ../../keyboard.pm_.c:241
 msgid "Norwegian"
 msgstr "ノルウェー"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:181
 msgid "Polish"
 msgstr "ポーランド"
 
-#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
+#: ../../keyboard.pm_.c:182 ../../keyboard.pm_.c:249
 msgid "Russian"
 msgstr "ロシア"
 
-#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+#: ../../keyboard.pm_.c:184 ../../keyboard.pm_.c:251
 msgid "Swedish"
 msgstr "スウェーデン"
 
-#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
+#: ../../keyboard.pm_.c:185 ../../keyboard.pm_.c:266
 msgid "UK keyboard"
 msgstr "イギリス式キーボード"
 
-#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
+#: ../../keyboard.pm_.c:186 ../../keyboard.pm_.c:267
 msgid "US keyboard"
 msgstr "アメリカ式キーボード"
 
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:188
 msgid "Albanian"
 msgstr "アルバニア"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:189
 msgid "Armenian (old)"
 msgstr "アルメニア（古い）"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:190
 msgid "Armenian (typewriter)"
 msgstr "アルメニア（タイプライター）"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:191
 msgid "Armenian (phonetic)"
 msgstr "アルメニア（発音記号）"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:196
 msgid "Azerbaidjani (latin)"
 msgstr "アゼルバイジャン(ラテン)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:198
 msgid "Belgian"
 msgstr "ベルギー"
 
-#: ../../keyboard.pm_.c:170
-msgid "Bulgarian"
-msgstr "ブルガリア"
+#: ../../keyboard.pm_.c:199
+msgid "Bulgarian (phonetic)"
+msgstr "アルメニア（発音記号）"
+
+#: ../../keyboard.pm_.c:200
+msgid "Bulgarian (BDS)"
+msgstr "ブルガリア (BDS)"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:201
 msgid "Brazilian (ABNT-2)"
 msgstr "ブラジル"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:202
 msgid "Belarusian"
 msgstr "ベラルーシ"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:203
 msgid "Swiss (German layout)"
 msgstr "スイス（ドイツ式配列）"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:204
 msgid "Swiss (French layout)"
 msgstr "スイス（フランス式配列）"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:206
 msgid "Czech (QWERTY)"
 msgstr "チェコ (QWERTY)"
 
-#: ../../keyboard.pm_.c:181
+#: ../../keyboard.pm_.c:208
 msgid "German (no dead keys)"
 msgstr "ドイツ（デッドキーなし）"
 
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:209
 msgid "Danish"
 msgstr "デンマーク"
 
-#: ../../keyboard.pm_.c:183
+#: ../../keyboard.pm_.c:210
 msgid "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:211
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (ノルウェー)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:212
+msgid "Dvorak (Swedish)"
+msgstr "Dvorak (スウェーデン)"
+
+#: ../../keyboard.pm_.c:213
 msgid "Estonian"
 msgstr "エストニア"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:217
 msgid "Georgian (\"Russian\" layout)"
 msgstr "グルジア（「ロシア式」配列）"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:218
 msgid "Georgian (\"Latin\" layout)"
 msgstr "グルジア（「ラテン」配列）"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:219
 msgid "Greek"
 msgstr "ギリシャ"
 
-#: ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:220
 msgid "Hungarian"
 msgstr "ハンガリー"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:221
 msgid "Croatian"
 msgstr "クロアチア"
 
-#: ../../keyboard.pm_.c:194
+#: ../../keyboard.pm_.c:222
 msgid "Israeli"
 msgstr "イスラエル"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:223
 msgid "Israeli (Phonetic)"
 msgstr "イスラエル（発音記号）"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:224
 msgid "Iranian"
 msgstr "イラン"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:225
 msgid "Icelandic"
 msgstr "アイスランド"
 
-#: ../../keyboard.pm_.c:198
+#: ../../keyboard.pm_.c:226
 msgid "Italian"
 msgstr "イタリア"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:228
 msgid "Japanese 106 keys"
 msgstr "日本語106キーボード"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:231
 msgid "Korean keyboard"
 msgstr "朝鮮式キーボード"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:232
 msgid "Latin American"
 msgstr "ラテンアメリカ"
 
-#: ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:233
 msgid "Lithuanian AZERTY (old)"
 msgstr "リトアニア AZERTY (旧)"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:235
 msgid "Lithuanian AZERTY (new)"
 msgstr "リトアニア AZERTY (新)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:236
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "リトアニア 「数字列」 QWERTY"
 
-#: ../../keyboard.pm_.c:207
+#: ../../keyboard.pm_.c:237
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "リトアニア 「発音」 QWERTY"
 
-#: ../../keyboard.pm_.c:208
+#: ../../keyboard.pm_.c:238
 msgid "Latvian"
 msgstr "ラトヴィア"
 
-#: ../../keyboard.pm_.c:209
+#: ../../keyboard.pm_.c:239
 msgid "Macedonian"
 msgstr "マケドニア"
 
-#: ../../keyboard.pm_.c:210
+#: ../../keyboard.pm_.c:240
 msgid "Dutch"
 msgstr "オランダ"
 
-#: ../../keyboard.pm_.c:212
+#: ../../keyboard.pm_.c:242
 msgid "Polish (qwerty layout)"
 msgstr "ポーランド（qwerty 配列）"
 
-#: ../../keyboard.pm_.c:213
+#: ../../keyboard.pm_.c:243
 msgid "Polish (qwertz layout)"
 msgstr "ポーランド（qwertz配列）"
 
-#: ../../keyboard.pm_.c:214
+#: ../../keyboard.pm_.c:244
 msgid "Portuguese"
 msgstr "ポルトガル"
 
-#: ../../keyboard.pm_.c:215
+#: ../../keyboard.pm_.c:245
 msgid "Canadian (Quebec)"
 msgstr "カナダ（ケベック）"
 
-#: ../../keyboard.pm_.c:217
+#: ../../keyboard.pm_.c:247
 msgid "Romanian (qwertz)"
 msgstr "ルーマニア（qwertz）"
 
-#: ../../keyboard.pm_.c:218
+#: ../../keyboard.pm_.c:248
 msgid "Romanian (qwerty)"
 msgstr "ルーマニア（qwerty）"
 
-#: ../../keyboard.pm_.c:220
+#: ../../keyboard.pm_.c:250
 msgid "Russian (Yawerty)"
 msgstr "ロシア（Yawerty）"
 
-#: ../../keyboard.pm_.c:222
+#: ../../keyboard.pm_.c:252
 msgid "Slovenian"
 msgstr "スロベニア"
 
-#: ../../keyboard.pm_.c:226
+#: ../../keyboard.pm_.c:253
 msgid "Slovakian (QWERTZ)"
 msgstr "スロバキア (QWERTZ)"
 
-#: ../../keyboard.pm_.c:227
+#: ../../keyboard.pm_.c:254
 msgid "Slovakian (QWERTY)"
 msgstr "スロバキア (QWERTY)"
 
-#: ../../keyboard.pm_.c:229
+#: ../../keyboard.pm_.c:256
 msgid "Serbian (cyrillic)"
 msgstr "セルビア(cyrillic)"
 
-#: ../../keyboard.pm_.c:230
+#: ../../keyboard.pm_.c:258
+msgid "Tamil"
+msgstr "タミル"
+
+#: ../../keyboard.pm_.c:259
 msgid "Thai keyboard"
 msgstr "タイ　キーボード"
 
-#: ../../keyboard.pm_.c:232
+#: ../../keyboard.pm_.c:261
 msgid "Tajik keyboard"
 msgstr "タジク　キーボード"
 
-#: ../../keyboard.pm_.c:233
+#: ../../keyboard.pm_.c:262
 msgid "Turkish (traditional \"F\" model)"
 msgstr "トルコ（伝統的「Ｆ」モデル）"
 
-#: ../../keyboard.pm_.c:234
+#: ../../keyboard.pm_.c:263
 msgid "Turkish (modern \"Q\" model)"
 msgstr "トルコ（現代「Ｑ」モデル）"
 
-#: ../../keyboard.pm_.c:235
+#: ../../keyboard.pm_.c:265
 msgid "Ukrainian"
 msgstr "ウクライナ"
 
-#: ../../keyboard.pm_.c:238
+#: ../../keyboard.pm_.c:268
 msgid "US keyboard (international)"
 msgstr "アメリカ式キーボード（国際式）"
 
-#: ../../keyboard.pm_.c:239
+#: ../../keyboard.pm_.c:269
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "ベトナム 「数字列」 QWERTY"
 
-#: ../../keyboard.pm_.c:240
+#: ../../keyboard.pm_.c:270
 msgid "Yugoslavian (latin)"
 msgstr "ユーゴスラビア（ラテン）"
 
+#: ../../keyboard.pm_.c:278
+msgid "Right Alt key"
+msgstr "右 Alt キー"
+
+#: ../../keyboard.pm_.c:279
+msgid "Both Shift keys simultaneously"
+msgstr "左右のシフトキーを同時に"
+
+#: ../../keyboard.pm_.c:280
+msgid "Control and Shift keys simultaneously"
+msgstr "Control とシフトを同時に"
+
+#: ../../keyboard.pm_.c:281
+msgid "CapsLock key"
+msgstr "CapsLock キー"
+
+#: ../../keyboard.pm_.c:282
+msgid "Ctrl and Alt keys simultaneously"
+msgstr "Ctrl と Alt キーを同時に"
+
+#: ../../keyboard.pm_.c:283
+msgid "Alt and Shift keys simultaneously"
+msgstr "Alt とシフトキーを同時に"
+
+#: ../../keyboard.pm_.c:284
+msgid "\"Menu\" key"
+msgstr "「メニュー」キー"
+
+#: ../../keyboard.pm_.c:285
+msgid "Left \"Windows\" key"
+msgstr "左「ウィンドウズ」キー"
+
+#: ../../keyboard.pm_.c:286
+msgid "Right \"Windows\" key"
+msgstr "右「ウィンドウズ」キー"
+
 #: ../../loopback.pm_.c:32
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "巡回マウント %s\n"
 
-#: ../../lvm.pm_.c:83
+#: ../../lvm.pm_.c:88
 msgid "Remove the logical volumes first\n"
 msgstr "まず論理ボリュームを削除してください。\n"
 
+#: ../../modules.pm_.c:826
+msgid ""
+"PCMCIA support no longer exist for 2.2 kernels. Please use a 2.4 kernel."
+msgstr ""
+"2.2カーネル用の PCMCIA サポートはもう含まれていません。\n"
+"2.4　カーネルを使ってください。"
+
 #: ../../mouse.pm_.c:25
 msgid "Sun - Mouse"
 msgstr "Sun - マウス"
 
-#: ../../mouse.pm_.c:31
-msgid "Standard"
-msgstr "標準"
-
 #: ../../mouse.pm_.c:32
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
@@ -5575,11 +6092,11 @@ msgstr "汎用 PS/2 ホイールマウス"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:62
+#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:63
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:58
+#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:59
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
@@ -5587,111 +6104,113 @@ msgstr "Genius NetMouse"
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../../mouse.pm_.c:43 ../../mouse.pm_.c:67
+#: ../../mouse.pm_.c:43 ../../mouse.pm_.c:68
 msgid "1 button"
 msgstr "1 ボタン"
 
-#: ../../mouse.pm_.c:44
+#: ../../mouse.pm_.c:44 ../../mouse.pm_.c:51
+msgid "Generic 2 Button Mouse"
+msgstr "汎用の2ボタンマウス"
+
+#: ../../mouse.pm_.c:45
 msgid "Generic"
 msgstr "汎用"
 
-#: ../../mouse.pm_.c:45
+#: ../../mouse.pm_.c:46
 msgid "Wheel"
 msgstr "ホイール"
 
-#: ../../mouse.pm_.c:48
+#: ../../mouse.pm_.c:49
 msgid "serial"
 msgstr "マイクロソフト・インテリマウス（シリアル）"
 
-#: ../../mouse.pm_.c:50
-msgid "Generic 2 Button Mouse"
-msgstr "汎用の2ボタンマウス"
-
-#: ../../mouse.pm_.c:51
+#: ../../mouse.pm_.c:52
 msgid "Generic 3 Button Mouse"
 msgstr "汎用の3ボタンマウス"
 
-#: ../../mouse.pm_.c:52
+#: ../../mouse.pm_.c:53
 msgid "Microsoft IntelliMouse"
 msgstr "マイクロソフト・インテリマウス（PS/2）"
 
-#: ../../mouse.pm_.c:53
+#: ../../mouse.pm_.c:54
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../../mouse.pm_.c:54
+#: ../../mouse.pm_.c:55
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../../mouse.pm_.c:56
+#: ../../mouse.pm_.c:57
 msgid "Logitech CC Series"
 msgstr "Logitech CC シリーズ (シリアル)"
 
-#: ../../mouse.pm_.c:57
+#: ../../mouse.pm_.c:58
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../../mouse.pm_.c:59
+#: ../../mouse.pm_.c:60
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../../mouse.pm_.c:60
+#: ../../mouse.pm_.c:61
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../../mouse.pm_.c:61
+#: ../../mouse.pm_.c:62
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (シリアル, 古い C7 タイプ)"
 
-#: ../../mouse.pm_.c:65
+#: ../../mouse.pm_.c:66
 msgid "busmouse"
 msgstr "バスマウス"
 
-#: ../../mouse.pm_.c:68
+#: ../../mouse.pm_.c:69
 msgid "2 buttons"
 msgstr "2ボタン"
 
-#: ../../mouse.pm_.c:69
+#: ../../mouse.pm_.c:70
 msgid "3 buttons"
 msgstr "3ボタン"
 
-#: ../../mouse.pm_.c:72
+#: ../../mouse.pm_.c:73
 msgid "none"
 msgstr "なし"
 
-#: ../../mouse.pm_.c:74
+#: ../../mouse.pm_.c:75
 msgid "No mouse"
 msgstr "マウスなし"
 
-#: ../../mouse.pm_.c:482
+#: ../../mouse.pm_.c:499
 msgid "Please test the mouse"
 msgstr "マウスをテストしてみてください。"
 
-#: ../../mouse.pm_.c:483
+#: ../../mouse.pm_.c:500
 msgid "To activate the mouse,"
 msgstr "マウスを有効にするには、"
 
-#: ../../mouse.pm_.c:484
+#: ../../mouse.pm_.c:501
 msgid "MOVE YOUR WHEEL!"
 msgstr "ホイールを動かしてください！"
 
-#: ../../my_gtk.pm_.c:380
+#: ../../my_gtk.pm_.c:651
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr "adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+"adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-1,-*-fixed-medium-r-"
+"normal--24-*-100-100-c-*-jisx0208.1983-0,*"
 
-#: ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:686
 msgid "Finish"
 msgstr "完了"
 
-#: ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:686 ../../printerdrake.pm_.c:1588
 msgid "Next ->"
 msgstr "次 ->"
 
-#: ../../my_gtk.pm_.c:416
+#: ../../my_gtk.pm_.c:687 ../../printerdrake.pm_.c:1586
 msgid "<- Previous"
 msgstr "<- もどる"
 
-#: ../../my_gtk.pm_.c:716
+#: ../../my_gtk.pm_.c:1019
 msgid "Is this correct?"
 msgstr "正しく表示出来ましたか？"
 
@@ -5741,7 +6260,7 @@ msgstr ""
 "システム上にイーサネットアダプタが見つかりません。この種類の\n"
 "接続は設定できません。"
 
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:252
 msgid "Choose the network interface"
 msgstr "ネットワークインターフェイスの選択"
 
@@ -5754,7 +6273,7 @@ msgstr "インターネット接続に使うネットワークアダプタを選びましょう"
 msgid "no network card found"
 msgstr "ネットワークカードが見付かりません"
 
-#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:360
 msgid "Configuring network"
 msgstr "ネットワークの設定"
 
@@ -5769,15 +6288,15 @@ msgstr ""
 "いくつかのDHCPサーバは動作するのにホスト名を必要とします。\n"
 "ホスト名は“mybox.mylab.myco.com”のように制限して下さい。"
 
-#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:365
 msgid "Host name"
 msgstr "ホスト名:"
 
 #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:105
-#: ../../network/netconnect.pm_.c:154 ../../network/netconnect.pm_.c:164
-#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:213
-#: ../../network/netconnect.pm_.c:221
+#: ../../network/netconnect.pm_.c:95 ../../network/netconnect.pm_.c:109
+#: ../../network/netconnect.pm_.c:164 ../../network/netconnect.pm_.c:175
+#: ../../network/netconnect.pm_.c:202 ../../network/netconnect.pm_.c:225
+#: ../../network/netconnect.pm_.c:233
 msgid "Network Configuration Wizard"
 msgstr "ネットワーク設定ウィザード"
 
@@ -5823,13 +6342,13 @@ msgstr "新しい設定（isdn-light)"
 msgid "Old configuration (isdn4net)"
 msgstr "古い設定 (isdn4net)"
 
-#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
-#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
-#: ../../network/isdn.pm_.c:214
+#: ../../network/isdn.pm_.c:170 ../../network/isdn.pm_.c:188
+#: ../../network/isdn.pm_.c:198 ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:215
 msgid "ISDN Configuration"
 msgstr "ISDNの設定"
 
-#: ../../network/isdn.pm_.c:169
+#: ../../network/isdn.pm_.c:170
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -5837,19 +6356,19 @@ msgstr ""
 "プロバイダを選んでください。\n"
 "もしリストになければ、Unlistedを選んでください。"
 
-#: ../../network/isdn.pm_.c:182
+#: ../../network/isdn.pm_.c:183
 msgid "Europe protocol"
 msgstr "ヨーロッパのプロトコル"
 
-#: ../../network/isdn.pm_.c:182
+#: ../../network/isdn.pm_.c:183
 msgid "Europe protocol (EDSS1)"
 msgstr "ヨーロッパプロトコル (EDSS1)"
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:185
 msgid "Protocol for the rest of the world"
 msgstr "世界のその他用プロトコル"
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:185
 msgid ""
 "Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
@@ -5857,27 +6376,27 @@ msgstr ""
 "世界のその他用プロトコル \n"
 " D-Channel でない(リースされた回線)"
 
-#: ../../network/isdn.pm_.c:188
+#: ../../network/isdn.pm_.c:189
 msgid "Which protocol do you want to use ?"
 msgstr "どのプロトコルを使いますか？"
 
-#: ../../network/isdn.pm_.c:198
+#: ../../network/isdn.pm_.c:199
 msgid "What kind of card do you have?"
 msgstr "どんなカードを使っていますか？"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:200
 msgid "I don't know"
 msgstr "分からない"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:200
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:200
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:206
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5889,19 +6408,19 @@ msgstr ""
 "\n"
 "もしPCMCIAカードを持っていたら、カードのirqとioを知る必要があります。\n"
 
-#: ../../network/isdn.pm_.c:209
+#: ../../network/isdn.pm_.c:210
 msgid "Abort"
 msgstr "中断"
 
-#: ../../network/isdn.pm_.c:209
+#: ../../network/isdn.pm_.c:210
 msgid "Continue"
 msgstr "続ける"
 
-#: ../../network/isdn.pm_.c:215
+#: ../../network/isdn.pm_.c:216
 msgid "Which is your ISDN card ?"
 msgstr "あなたのISDNカードはどれですか？"
 
-#: ../../network/isdn.pm_.c:234
+#: ../../network/isdn.pm_.c:235
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -5909,59 +6428,59 @@ msgstr ""
 "ISDN カードを検出しましたが、タイプが分かりません。次の画面から PCI カードを"
 "選んでください。"
 
-#: ../../network/isdn.pm_.c:243
+#: ../../network/isdn.pm_.c:244
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "ISDN PCI カードは見付かりませんでした。次の画面から選んでください"
 
-#: ../../network/modem.pm_.c:37
+#: ../../network/modem.pm_.c:39
 msgid "Please choose which serial port your modem is connected to."
 msgstr "モデムはどのシリアルポートにつながっていますか？"
 
-#: ../../network/modem.pm_.c:42
+#: ../../network/modem.pm_.c:44
 msgid "Dialup options"
 msgstr "ダイアルアップオプション"
 
-#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:622
 msgid "Connection name"
 msgstr "接続名"
 
-#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
+#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:623
 msgid "Phone number"
 msgstr "電話番号"
 
-#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:624
 msgid "Login ID"
 msgstr "ログイン ID"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:626
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:626
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:626
 msgid "Script-based"
 msgstr "スクリプトを使う認証"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:626
 msgid "Terminal-based"
 msgstr "ターミナルからの認証"
 
-#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:627
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
+#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:628
 msgid "First DNS Server (optional)"
 msgstr "DNS サーバ（オプション）"
 
-#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
+#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:629
 msgid "Second DNS Server (optional)"
 msgstr "セカンド DNS サーバ（オプション）"
 
-#: ../../network/netconnect.pm_.c:33
+#: ../../network/netconnect.pm_.c:34
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5969,7 +6488,7 @@ msgstr ""
 "\n"
 "接続を切るか、あるいは再設定してください。"
 
-#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
+#: ../../network/netconnect.pm_.c:34 ../../network/netconnect.pm_.c:37
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -5977,11 +6496,11 @@ msgstr ""
 "\n"
 "インターネット接続を再設定できます。"
 
-#: ../../network/netconnect.pm_.c:33
+#: ../../network/netconnect.pm_.c:34
 msgid "You are currently connected to internet."
 msgstr "インターネットに接続されています。"
 
-#: ../../network/netconnect.pm_.c:36
+#: ../../network/netconnect.pm_.c:37
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5989,32 +6508,32 @@ msgstr ""
 "\n"
 "インターネットへ接続するか接続を再設定してください"
 
-#: ../../network/netconnect.pm_.c:36
+#: ../../network/netconnect.pm_.c:37
 msgid "You are not currently connected to Internet."
 msgstr "現在はインターネットに接続していません。"
 
-#: ../../network/netconnect.pm_.c:40
-msgid "Connect to Internet"
-msgstr "インターネットへの接続"
+#: ../../network/netconnect.pm_.c:41
+msgid "Connect"
+msgstr "接続"
 
-#: ../../network/netconnect.pm_.c:42
-msgid "Disconnect from Internet"
-msgstr "インターネットから切断"
+#: ../../network/netconnect.pm_.c:43
+msgid "Disconnect"
+msgstr "切断"
 
-#: ../../network/netconnect.pm_.c:44
-msgid "Configure network connection (LAN or Internet)"
-msgstr "ネットワーク接続 (LAN/インターネット)の設定"
+#: ../../network/netconnect.pm_.c:45
+msgid "Configure the connection"
+msgstr "接続の設定"
 
-#: ../../network/netconnect.pm_.c:47
+#: ../../network/netconnect.pm_.c:50
 msgid "Internet connection & configuration"
 msgstr "インターネット接続と設定"
 
-#: ../../network/netconnect.pm_.c:96
+#: ../../network/netconnect.pm_.c:100
 #, c-format
 msgid "We are now going to configure the %s connection."
 msgstr "では %s 接続を設定しましょう。"
 
-#: ../../network/netconnect.pm_.c:105
+#: ../../network/netconnect.pm_.c:109
 #, c-format
 msgid ""
 "\n"
@@ -6033,12 +6552,12 @@ msgstr ""
 "\n"
 "「OK」を押して始めましょう。"
 
-#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
-#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+#: ../../network/netconnect.pm_.c:138 ../../network/netconnect.pm_.c:252
+#: ../../network/netconnect.pm_.c:271 ../../network/tools.pm_.c:57
 msgid "Network Configuration"
 msgstr "ネットワークの設定"
 
-#: ../../network/netconnect.pm_.c:130
+#: ../../network/netconnect.pm_.c:139
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6049,7 +6568,7 @@ msgstr ""
 "いまの設定をそのまま使うには OK をクリックしてください。ネットワーク/インター"
 "ネットを再設定するにはキャンセルを押します。\n"
 
-#: ../../network/netconnect.pm_.c:155
+#: ../../network/netconnect.pm_.c:165
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6061,66 +6580,66 @@ msgstr ""
 "ここはインターネット/ネットワーク接続を設定するところです。\n"
 "自動検出を使いたくなければ、チェックをはずしてください。\n"
 
-#: ../../network/netconnect.pm_.c:157
+#: ../../network/netconnect.pm_.c:167
 msgid "Choose the profile to configure"
 msgstr "設定するプロフィールの選択"
 
-#: ../../network/netconnect.pm_.c:158
+#: ../../network/netconnect.pm_.c:168
 msgid "Use auto detection"
 msgstr "自動検出を使う"
 
-#: ../../network/netconnect.pm_.c:164
+#: ../../network/netconnect.pm_.c:175
 msgid "Detecting devices..."
 msgstr "デバイスの検出中です……"
 
-#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
+#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
 msgid "Normal modem connection"
 msgstr "ふつうのモデム接続を設定"
 
-#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
+#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
 #, c-format
 msgid "detected on port %s"
 msgstr "ポート %s で検出しました"
 
-#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
+#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
 msgid "ISDN connection"
 msgstr "ISDN 接続"
 
-#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
+#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
 #, c-format
 msgid "detected %s"
 msgstr "%s を検出"
 
-#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
 #, c-format
 msgid "detected on interface %s"
 msgstr "インターフェース %s で検出"
 
-#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
 msgid "Cable connection"
 msgstr "ケーブル接続"
 
-#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
 msgid "cable connection detected"
 msgstr "ケーブル接続が検出されました"
 
-#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:199
 msgid "LAN connection"
 msgstr "LAN 接続"
 
-#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:199
 msgid "ethernet card(s) detected"
 msgstr "イーサネットカードが検出されました"
 
-#: ../../network/netconnect.pm_.c:190
+#: ../../network/netconnect.pm_.c:202
 msgid "Choose the connection you want to configure"
 msgstr "設定したい接続を選んで下さい"
 
-#: ../../network/netconnect.pm_.c:214
+#: ../../network/netconnect.pm_.c:226
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
@@ -6130,23 +6649,23 @@ msgstr ""
 "どれを使うか選んでください。\n"
 "\n"
 
-#: ../../network/netconnect.pm_.c:215
+#: ../../network/netconnect.pm_.c:227
 msgid "Internet connection"
 msgstr "インターネット接続"
 
-#: ../../network/netconnect.pm_.c:221
+#: ../../network/netconnect.pm_.c:233
 msgid "Do you want to start the connection at boot?"
 msgstr "ブート時に接続を開始しますか？"
 
-#: ../../network/netconnect.pm_.c:239
+#: ../../network/netconnect.pm_.c:247
 msgid "Network configuration"
 msgstr "ネットワーク設定"
 
-#: ../../network/netconnect.pm_.c:240
+#: ../../network/netconnect.pm_.c:248
 msgid "The network needs to be restarted"
 msgstr "ネットワークを再起動してください"
 
-#: ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:252
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -6157,25 +6676,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../network/netconnect.pm_.c:247
+#: ../../network/netconnect.pm_.c:261
 msgid ""
-"Congratulations, the network and internet configuration is finished.\n"
-"\n"
+"Congratulations, the network and Internet configuration is finished.\n"
 "The configuration will now be applied to your system.\n"
+"\n"
 msgstr ""
 "おめでとうございます。ネットワークとインターネット接続が完了です。\n"
 "\n"
 "設定をこれからシステムに反映させます。\n"
 
-#: ../../network/netconnect.pm_.c:250
+#: ../../network/netconnect.pm_.c:265
 msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
 msgstr ""
 "これが終わったら、X ウィンドウ環境を再起動させて、ホスト名変更に伴う\n"
 "問題を回避してください。"
 
-#: ../../network/network.pm_.c:283
+#: ../../network/netconnect.pm_.c:266
+msgid ""
+"Problems occured during configuration.\n"
+"Test your connection via net_monitor or mcc. If your connection doesn't "
+"work, you might want to relaunch the configuration"
+msgstr ""
+"設定中に問題が起きました。\n"
+"net_monitor か mccで接続をチェックしてください。接続ができていなければ設定を"
+"再起動したほうがいいかもしれません"
+
+#: ../../network/network.pm_.c:292
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6186,7 +6715,7 @@ msgstr ""
 "もとの設定を残したければ、このまま OK を押してください。\n"
 "以下のフィールドを変更すると、設定が変わってしまいます。"
 
-#: ../../network/network.pm_.c:288
+#: ../../network/network.pm_.c:297
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -6196,38 +6725,38 @@ msgstr ""
 "各々の項目にはドットで区切られた十進数(例，1.2.3.4)がIP アドレスとして入力さ"
 "れます。"
 
-#: ../../network/network.pm_.c:297 ../../network/network.pm_.c:298
+#: ../../network/network.pm_.c:306 ../../network/network.pm_.c:307
 #, c-format
 msgid "Configuring network device %s"
 msgstr "ネットワークデバイス %s の設定"
 
-#: ../../network/network.pm_.c:298
+#: ../../network/network.pm_.c:307
 #, c-format
 msgid " (driver %s)"
 msgstr " (ドライバ %s)"
 
-#: ../../network/network.pm_.c:300 ../../standalone/draknet_.c:255
-#: ../../standalone/draknet_.c:461
+#: ../../network/network.pm_.c:309 ../../standalone/draknet_.c:232
+#: ../../standalone/draknet_.c:468
 msgid "IP address"
 msgstr "IP アドレス:"
 
-#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
+#: ../../network/network.pm_.c:310 ../../standalone/draknet_.c:469
 msgid "Netmask"
 msgstr "ネットマスク:"
 
-#: ../../network/network.pm_.c:302
+#: ../../network/network.pm_.c:311
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network/network.pm_.c:302
+#: ../../network/network.pm_.c:311
 msgid "Automatic IP"
 msgstr "IP の自動設定"
 
-#: ../../network/network.pm_.c:323 ../../printerdrake.pm_.c:406
+#: ../../network/network.pm_.c:332 ../../printerdrake.pm_.c:712
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP アドレスは 1.2.3.4 のように入力して下さい"
 
-#: ../../network/network.pm_.c:351
+#: ../../network/network.pm_.c:361
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -6238,63 +6767,64 @@ msgstr ""
 "ホスト名は“mybox.mylab.myco.com”のようにして下さい。\n"
 "もしゲートウェイがあれば，その IP アドレスも入力して下さい。"
 
-#: ../../network/network.pm_.c:356
+#: ../../network/network.pm_.c:366
 msgid "DNS server"
 msgstr "DNS サーバ"
 
-#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
-msgid "Gateway"
-msgstr "ゲートウェイ"
+#: ../../network/network.pm_.c:367
+#, c-format
+msgid "Gateway (e.g. %s)"
+msgstr "ゲートウェイ (例 %s)"
 
-#: ../../network/network.pm_.c:359
+#: ../../network/network.pm_.c:369
 msgid "Gateway device"
 msgstr "ゲートウェイデバイス"
 
-#: ../../network/network.pm_.c:371
+#: ../../network/network.pm_.c:381
 msgid "Proxies configuration"
 msgstr "プロキシの設定"
 
-#: ../../network/network.pm_.c:372
+#: ../../network/network.pm_.c:382
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: ../../network/network.pm_.c:373
+#: ../../network/network.pm_.c:383
 msgid "FTP proxy"
 msgstr "FTP proxy"
 
-#: ../../network/network.pm_.c:374
+#: ../../network/network.pm_.c:384
 msgid "Track network card id (usefull for laptops)"
 msgstr "ネットワークカードのidを追跡（ラップトップで便利）"
 
-#: ../../network/network.pm_.c:377
+#: ../../network/network.pm_.c:387
 msgid "Proxy should be http://..."
 msgstr "Proxy は http://... です"
 
-#: ../../network/network.pm_.c:378
+#: ../../network/network.pm_.c:388
 msgid "Proxy should be ftp://..."
 msgstr "Proxy は ftp://... です"
 
-#: ../../network/tools.pm_.c:38
+#: ../../network/tools.pm_.c:39
 msgid "Internet configuration"
 msgstr "インターネットの設定"
 
-#: ../../network/tools.pm_.c:39
+#: ../../network/tools.pm_.c:40
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "今インターネットに接続しますか？"
 
-#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:197
 msgid "Testing your connection..."
 msgstr "接続をテストしています..."
 
-#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+#: ../../network/tools.pm_.c:50
 msgid "The system is now connected to Internet."
 msgstr "システムはインターネットに接続しました。"
 
-#: ../../network/tools.pm_.c:50
+#: ../../network/tools.pm_.c:51
 msgid "For Security reason, it will be disconnected now."
 msgstr "セキュリティ上の理由で、接続を切ります。"
 
-#: ../../network/tools.pm_.c:51 ../../standalone/draknet_.c:220
+#: ../../network/tools.pm_.c:52
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -6302,83 +6832,87 @@ msgstr ""
 "このマシンはインターネットへつながっていないようですね。\n"
 "接続の設定をやりなおしてみてください。"
 
-#: ../../network/tools.pm_.c:75
+#: ../../network/tools.pm_.c:76
 msgid "Connection Configuration"
 msgstr "接続の設定"
 
-#: ../../network/tools.pm_.c:76
+#: ../../network/tools.pm_.c:77
 msgid "Please fill or check the field below"
 msgstr "下のフィールドを埋めるかチェックしてください"
 
-#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:608
 msgid "Card IRQ"
 msgstr "カード IRQ"
 
-#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:609
 msgid "Card mem (DMA)"
 msgstr "カード mem (DMA)"
 
-#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:610
 msgid "Card IO"
 msgstr "カード IO"
 
-#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:611
 msgid "Card IO_0"
 msgstr "カード IO_0"
 
-#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:612
 msgid "Card IO_1"
 msgstr "カード IO_1"
 
-#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:613
 msgid "Your personal phone number"
 msgstr "あなたの電話番号"
 
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:614
 msgid "Provider name (ex provider.net)"
 msgstr "プロバイダの名前 (例 provider.net)"
 
-#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:615
 msgid "Provider phone number"
 msgstr "プロバイダの電話番号"
 
-#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:616
 msgid "Provider dns 1 (optional)"
 msgstr "プロバイダの dns 1 (オプション)"
 
-#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+#: ../../network/tools.pm_.c:88 ../../standalone/draknet_.c:617
 msgid "Provider dns 2 (optional)"
 msgstr "プロバイダの dns 2 (オプション)"
 
-#: ../../network/tools.pm_.c:88
+#: ../../network/tools.pm_.c:89
 msgid "Choose your country"
 msgstr "国の選択"
 
-#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:620
 msgid "Dialing mode"
 msgstr "ダイアルモード"
 
-#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:632
 msgid "Connection speed"
 msgstr "接続の速度: "
 
-#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:633
 msgid "Connection timeout (in sec)"
 msgstr "接続のタイムアウト（秒）"
 
-#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:618
 msgid "Account Login (user name)"
 msgstr "アカウントログイン（ユーザ名）"
 
-#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+#: ../../network/tools.pm_.c:94 ../../standalone/draknet_.c:619
 msgid "Account Password"
 msgstr "アカウントパスワード"
 
-#: ../../partition_table.pm_.c:622
+#: ../../partition_table.pm_.c:600
+msgid "mount failed: "
+msgstr "マウントに失敗: "
+
+#: ../../partition_table.pm_.c:664
 msgid "Extended partition not supported on this platform"
 msgstr "このマシンでは、拡張パーティションはサポートされていません"
 
-#: ../../partition_table.pm_.c:640
+#: ../../partition_table.pm_.c:682
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
@@ -6388,21 +6922,21 @@ msgstr ""
 "どうしても使いたければ、プライマリパーティションを移動して、未指定の穴を\n"
 "拡張パーティションの隣にもってきましょう。"
 
-#: ../../partition_table.pm_.c:744
+#: ../../partition_table.pm_.c:770
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "%s ファイルからの復元が失敗しました： %s"
 
-#: ../../partition_table.pm_.c:746
+#: ../../partition_table.pm_.c:772
 msgid "Bad backup file"
 msgstr "バックアップファイルが壊れています"
 
-#: ../../partition_table.pm_.c:768
+#: ../../partition_table.pm_.c:794
 #, c-format
 msgid "Error writing to file %s"
 msgstr "ファイル %s への書き込みエラー"
 
-#: ../../partition_table_raw.pm_.c:154
+#: ../../partition_table_raw.pm_.c:186
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -6448,7 +6982,7 @@ msgstr "LPD - ラインプリンタデーモン"
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue（キューなしで印刷）"
 
-#: ../../printer.pm_.c:32
+#: ../../printer.pm_.c:32 ../../printer.pm_.c:871
 msgid "CUPS"
 msgstr "CUPS"
 
@@ -6464,60 +6998,137 @@ msgstr "LPD"
 msgid "PDQ"
 msgstr "PDQ"
 
-#: ../../printer.pm_.c:40
+#: ../../printer.pm_.c:47
 msgid "Local printer"
 msgstr "ローカルプリンタ"
 
-#: ../../printer.pm_.c:41
+#: ../../printer.pm_.c:48
 msgid "Remote printer"
 msgstr "リモートプリンタ"
 
-#: ../../printer.pm_.c:42
+#: ../../printer.pm_.c:49
 msgid "Printer on remote CUPS server"
 msgstr "リモートCUPS サーバ上のプリンタ"
 
-#: ../../printer.pm_.c:43
+#: ../../printer.pm_.c:50 ../../printerdrake.pm_.c:734
 msgid "Printer on remote lpd server"
 msgstr "リモート lpdサーバ上のプリンタ"
 
-#: ../../printer.pm_.c:44
-msgid "Network printer (socket)"
-msgstr "ネットワークプリンタ（ソケット）"
+#: ../../printer.pm_.c:51
+msgid "Network printer (TCP/Socket)"
+msgstr "ネットワークプリンタ（TCP/ソケット）"
 
-#: ../../printer.pm_.c:45
+#: ../../printer.pm_.c:52
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/ウィンドウズ 95/98/NTサーバ上のプリンタ"
 
-#: ../../printer.pm_.c:46
+#: ../../printer.pm_.c:53
 msgid "Printer on NetWare server"
 msgstr "NetWare サーバ上のプリンタ"
 
-#: ../../printer.pm_.c:47
+#: ../../printer.pm_.c:54 ../../printerdrake.pm_.c:738
 msgid "Enter a printer device URI"
 msgstr "プリンタデバイスのURIを入力"
 
-#: ../../printer.pm_.c:48
+#: ../../printer.pm_.c:55
 msgid "Pipe job into a command"
 msgstr "ジョブをコマンドへパイプ"
 
-#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
-#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+#: ../../printer.pm_.c:504 ../../printer.pm_.c:695 ../../printer.pm_.c:1017
+#: ../../printerdrake.pm_.c:1665 ../../printerdrake.pm_.c:2730
 msgid "Unknown model"
 msgstr "未知のモデル"
 
-#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+#: ../../printer.pm_.c:532
+msgid "Local Printers"
+msgstr "ローカルプリンタ"
+
+#: ../../printer.pm_.c:534 ../../printer.pm_.c:872
+msgid "Remote Printers"
+msgstr "リモートプリンタ"
+
+#: ../../printer.pm_.c:541 ../../printerdrake.pm_.c:248
+#, c-format
+msgid " on parallel port \\/*%s"
+msgstr " 以下のパラレルポート上 \\/*%s"
+
+#: ../../printer.pm_.c:544 ../../printerdrake.pm_.c:250
+#, c-format
+msgid ", USB printer \\/*%s"
+msgstr ", USB プリンタ \\/*%s"
+
+#: ../../printer.pm_.c:549
+#, c-format
+msgid ", multi-function device on parallel port \\/*%s"
+msgstr ", パラレルポート上の多機能デバイス \\/*%s"
+
+#: ../../printer.pm_.c:552
+msgid ", multi-function device on USB"
+msgstr "USB 上の多機能デバイス"
+
+#: ../../printer.pm_.c:554
+msgid ", multi-function device on HP JetDirect"
+msgstr ", HP JetDirect上の多機能デバイス"
+
+#: ../../printer.pm_.c:556
+msgid ", multi-function device"
+msgstr ", 多機能デバイス"
+
+#: ../../printer.pm_.c:559
+#, c-format
+msgid ", printing to %s"
+msgstr "%s へ印刷出力中"
+
+#: ../../printer.pm_.c:561
+#, c-format
+msgid "on LPD server \"%s\", printer \"%s\""
+msgstr "LPD サーバ 「%s」上の, プリンタ「%s」"
+
+#: ../../printer.pm_.c:563
+#, c-format
+msgid ", TCP/IP host \"%s\", port %s"
+msgstr ", TCP/IP ホスト「%s」, ポート %s"
+
+#: ../../printer.pm_.c:567
+#, c-format
+msgid "on Windows server \"%s\", share \"%s\""
+msgstr "ウィンドウズサーバ 「%s」上の, 共有「%s」"
+
+#: ../../printer.pm_.c:571
+#, c-format
+msgid "on Novell server \"%s\", printer \"%s\""
+msgstr "Novell サーバ 「%s」上の, プリンタ「%s」"
+
+#: ../../printer.pm_.c:573
+#, c-format
+msgid ", using command %s"
+msgstr ", コマンド「%s」を使用"
+
+#: ../../printer.pm_.c:692 ../../printerdrake.pm_.c:1136
 msgid "Raw printer (No driver)"
 msgstr "生のプリンタ（ドライバなし）"
 
-#: ../../printer.pm_.c:693
+#: ../../printer.pm_.c:841
 #, c-format
 msgid "(on %s)"
 msgstr "(%s上で)"
 
-#: ../../printer.pm_.c:695
+#: ../../printer.pm_.c:843
 msgid "(on this machine)"
 msgstr "（このマシン上で）"
 
+#: ../../printer.pm_.c:868
+#, c-format
+msgid "On CUPS server \"%s\""
+msgstr "CUPS サーバ「%s」上で"
+
+#: ../../printer.pm_.c:874 ../../printerdrake.pm_.c:2391
+#: ../../printerdrake.pm_.c:2402 ../../printerdrake.pm_.c:2618
+#: ../../printerdrake.pm_.c:2670 ../../printerdrake.pm_.c:2697
+#: ../../printerdrake.pm_.c:2867 ../../printerdrake.pm_.c:2869
+msgid " (Default)"
+msgstr " (デフォルト)"
+
 #: ../../printerdrake.pm_.c:22
 msgid "Select Printer Connection"
 msgstr "プリンタの接続を選んでください"
@@ -6529,59 +7140,50 @@ msgstr "プリンタはどうつながっていますか？"
 #: ../../printerdrake.pm_.c:25
 msgid ""
 "\n"
-"Printers on remote CUPS servers you do not have to configure\n"
-"here; these printers will be automatically detected. Please\n"
-"select \"Printer on remote CUPS server\" in this case."
+"Printers on remote CUPS servers you do not have to configure here; these "
+"printers will be automatically detected."
 msgstr ""
 "\n"
 "リモート CUPS サーバ上のプリンタは、ここでは設定不要です。\n"
-"プリンタは自動検出されます。もし信用できないと思ったら、\n"
-"「リモートCUPS サーバ」を選びましょう。"
+"プリンタは自動検出されます。"
 
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
-#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
-msgid "None"
-msgstr "なし"
+#: ../../printerdrake.pm_.c:69 ../../printerdrake.pm_.c:2454
+msgid "CUPS configuration"
+msgstr "CUPS 設定"
+
+#: ../../printerdrake.pm_.c:70 ../../printerdrake.pm_.c:2455
+msgid "Specify CUPS server"
+msgstr "CUPS サーバを指定"
 
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
-msgid "Choose a default printer!"
-msgstr "デフォルトプリンタを選びましょう！"
-
-#: ../../printerdrake.pm_.c:105
-msgid ""
-"With remote CUPS servers, you do not have to configure any \n"
-"printer here; CUPS servers inform your machine automatically\n"
-"about their printers. All printers known to your machine\n"
-"currently are listed in the \"Default printer\" field. Choose\n"
-"the default printer for your machine there and click the\n"
-"\"Apply/Re-read printers\" button. Click the same button to\n"
-"refresh the list (it can take up to 30 seconds after the start\n"
-"of CUPS until all remote printers are visible).\n"
-"When your CUPS server is in a different network, you have to \n"
-"give the CUPS server IP address and optionally the port number\n"
-"to get the printer information from the server, otherwise leave\n"
-"these fields blank."
-msgstr ""
-"リモートの CUPS サーバなら、ここではプリンタ設定は不要です。\n"
-"CUPS サーバはマシンに自動的にプリンタ情報を渡します。いま、\n"
-"あなたのマシンが知っているプリンタが \"デフォルトプリンタ\"\n"
-"に出ています。マシンのデフォルトプリンタを選んで、\n"
-"\"プリンタを適用/再読込\" ボタンを押してください。一覧の更新\n"
-"にもこのボタンを押します（リモートプリンタが見えるまで、CUPS \n"
-"開始から最大30秒かかります。\n"
-"CUPS サーバが別のネットワークにあるなら、CUPSサーバのIPアドレス\n"
-"と、場合によってはポート番号を指定しないとサーバからプリンタ情\n"
-"報がもらえません。そうでなければ、ここは空欄にします。"
-
-#: ../../printerdrake.pm_.c:117
-msgid ""
-"\n"
-"Normally, CUPS is automatically configured according to your\n"
-"network environment, so that you can access the printers on the\n"
-"CUPS servers in your local network. If this does not work \n"
-"correctly, turn off \"Automatic CUPS configuration\" and edit\n"
-"your file /etc/cups/cupsd.conf manually. Do not forget to restart\n"
-"CUPS afterwards (command: \"service cups restart\")."
+#: ../../printerdrake.pm_.c:71
+msgid ""
+"To get access to printers on remote CUPS servers in your local network you "
+"do not have to configure anything; the CUPS servers inform your machine "
+"automatically about their printers. All printers currently known to your "
+"machine are listed in the \"Remote printers\" section in the main window of "
+"Printerdrake. When your CUPS server is not in your local network, you have "
+"to enter the CUPS server IP address and optionally the port number to get "
+"the printer information from the server, otherwise leave these fields blank."
+msgstr ""
+"ローカルネットワーク上の CUPS サーバ上のプリンタにアクセスするなら、何も\n"
+"設定する必要はありません。CUPS サーバが自動的にプリンタの情報を流してくれま"
+"す。\n"
+"マシンが認識しているプリンタはすべて、Printerdrake の主ウィンドウの「リモー"
+"ト\n"
+"プリンタ」に挙がっています。ローカルネットワーク上に CUPS サーバがなけれ"
+"ば、\n"
+"CUPS サーバの IP アドレスと、場合によってはポート番号を手動で入力して、サー"
+"バ\n"
+"からプリンタ情報をもらうか、あるいはここを空白にしておきます。"
+
+#: ../../printerdrake.pm_.c:72
+msgid ""
+"\n"
+"Normally, CUPS is automatically configured according to your network "
+"environment, so that you can access the printers on the CUPS servers in your "
+"local network. If this does not work correctly, turn off \"Automatic CUPS "
+"configuration\" and edit your file /etc/cups/cupsd.conf manually. Do not "
+"forget to restart CUPS afterwards (command: \"service cups restart\")."
 msgstr ""
 "\n"
 "通常は、CUPS は自動的にネットワーク環境にあわせて設定されて、\n"
@@ -6589,352 +7191,678 @@ msgstr ""
 "ようになります。でも正しく機能しないなら、「自動CUPS設定」を\n"
 "オフにして、/etc/cups/cupsd.conf を手で書き換えてやります。\n"
 "終わったら、CUPS を再起動するのをお忘れなく！\n"
-"（コマンド: \"service cups restart\")."
-
-#: ../../printerdrake.pm_.c:124 ../../printerdrake.pm_.c:1290
-#: ../../printerdrake.pm_.c:1294 ../../printerdrake.pm_.c:1295
-#: ../../printerdrake.pm_.c:1296 ../../printerdrake.pm_.c:2011
-msgid "Close"
-msgstr "閉じる"
-
-#: ../../printerdrake.pm_.c:125
-msgid "Apply/Re-read printers"
-msgstr "プリンタを適用/再読込"
+"（コマンド: 「service cups restart」)."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:76
 msgid "The IP address should look like 192.168.1.20"
 msgstr "IP アドレスは 192.168.1.20 のように入力して下さい"
 
-#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#: ../../printerdrake.pm_.c:80 ../../printerdrake.pm_.c:862
 msgid "The port number should be an integer!"
 msgstr "ポート番号は正数です！"
 
-#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
-msgid "Default printer"
-msgstr "デフォルトプリンタ"
-
-#: ../../printerdrake.pm_.c:146
+#: ../../printerdrake.pm_.c:87
 msgid "CUPS server IP"
 msgstr "CUPS サーバのIP"
 
-#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+#: ../../printerdrake.pm_.c:88 ../../printerdrake.pm_.c:855
 msgid "Port"
 msgstr "ポート"
 
-#: ../../printerdrake.pm_.c:149
+#: ../../printerdrake.pm_.c:90
 msgid "Automatic CUPS configuration"
 msgstr "自動 CUPS 設定"
 
-#: ../../printerdrake.pm_.c:217
+#: ../../printerdrake.pm_.c:145 ../../standalone/scannerdrake_.c:42
 msgid "Detecting devices ..."
 msgstr "デバイスの検出中です……"
 
-#: ../../printerdrake.pm_.c:217
+#: ../../printerdrake.pm_.c:145 ../../standalone/scannerdrake_.c:42
 msgid "Test ports"
 msgstr "ポートのテスト"
 
-#: ../../printerdrake.pm_.c:238
-#, c-format
-msgid "A printer, model \"%s\", has been detected on "
-msgstr "「%s」プリンタが、次のところで見つかりました"
+#: ../../printerdrake.pm_.c:167 ../../printerdrake.pm_.c:2437
+#: ../../printerdrake.pm_.c:2556
+msgid "Add a new printer"
+msgstr "プリンタ追加"
 
-#: ../../printerdrake.pm_.c:255
-msgid "Local Printer Device"
-msgstr "ローカルプリンタデバイス"
+#: ../../printerdrake.pm_.c:168
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard allows you to install local or remote printers to be used from "
+"this machine and also from other machines in the network.\n"
+"\n"
+"It asks you for all necessary information to set up the printer and gives "
+"you access to all available printer drivers, driver options, and printer "
+"connection types."
+msgstr ""
+"\n"
+"プリンタ設定ウィザードへいらっしゃ〜い\n"
+"\n"
+"このウィザードでは、このマシンやネットワーク上の他のマシンで使う\n"
+"ローカルプリンタやリモートプリンタをインストールします。\n"
+"\n"
+"プリンタ設定に必要な各種情報を訪ねて、各種プリンタドライバや\n"
+"そのオプション、プリンタ接続方式を選べるようにします。"
+
+#: ../../printerdrake.pm_.c:176 ../../printerdrake.pm_.c:203
+#: ../../printerdrake.pm_.c:378 ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:403 ../../printerdrake.pm_.c:466
+msgid "Local Printer"
+msgstr "ローカルプリンタ"
+
+#: ../../printerdrake.pm_.c:177
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard will help you to install your printer(s) connected to this "
+"computer.\n"
+"\n"
+"Please plug in your printer(s) on this computer and turn it/them on. Click "
+"on \"Next\" when you are ready, and on \"Cancel\" when you do not want to "
+"set up your printer(s) now.\n"
+"\n"
+"Note that some computers can crash during the printer auto-detection, turn "
+"off \"Auto-detect printers\" to do a printer installation without auto-"
+"detection. Use the \"Expert Mode\" of printerdrake when you want to set up "
+"printing on a remote printer if printerdrake does not list it automatically."
+msgstr ""
+"\n"
+"プリンタ設定ウィザードへいらっしゃ〜い\n"
+"\n"
+"このウィザードは、接続されたプリンタのインストールをお手伝いします。\n"
+"\n"
+"プリンタをコンピュータにつないで電源を入れてください。準備ができたら「次」"
+"を\n"
+"クリックするか、いまは設定したくなければ \"キャンセル\" をクリックします。\n"
+"\n"
+"なお、一部のコンピュータはプリンタ自動検出中にクラッシュします。\n"
+"自動検出なしでプリンタ設定をするには、「プリンタ自動検出」をオフにします。\n"
+"またprinterdrake が自動的にリモートプリンタを検出しなければ、\n"
+"「エキスパートモード」を使って設定してください。"
+
+#: ../../printerdrake.pm_.c:186
+msgid "Auto-detect printers"
+msgstr "プリンタ自動検出"
+
+#: ../../printerdrake.pm_.c:204
+msgid ""
+"\n"
+"Congratulations, your printer is now installed and configured!\n"
+"\n"
+"You can print using the \"Print\" command of your application (usually in "
+"the \"File\" menu).\n"
+"\n"
+"If you want to add, remove, or rename a printer, or if you want to change "
+"the default option settings (paper input tray, printout quality, ...), "
+"select \"Printer\" in the \"Hardware\" section of the Mandrake Control "
+"Center."
+msgstr ""
+"\n"
+"おめでとうございます。プリンタのインストールと設定が完了しました！\n"
+"\n"
+"アプリケーションの「印刷」コマンド（ふつうは「ファイル」メニューの）\n"
+"から印刷できます。\n"
+"\n"
+"プリンタの追加、削除、名称変更、デフォルト設定（用紙トレイ、印字品質など）"
+"が\n"
+"したければ、Mandrake コントロールセンターの「ハードウェア」の中の\n"
+"「プリンタ」を選んでください。"
+
+#: ../../printerdrake.pm_.c:223
+msgid "Auto-Detection of Printers"
+msgstr "プリンタの自動検出"
+
+#: ../../printerdrake.pm_.c:224
+msgid ""
+"Printerdrake is able to auto-detect your locally connected parallel and USB "
+"printers for you, but note that on some systems the auto-detection CAN "
+"FREEZE YOUR SYSTEM AND THIS CAN LEAD TO CORRUPTED FILE SYSTEMS! So do it ON "
+"YOUR OWN RISK!\n"
+"\n"
+"Do you really want to get your printers auto-detected?"
+msgstr ""
+"Printerdrake はローカルプリンタを自動検出できますが、一部のシステムでは\n"
+"システムをフリーズさせて、ファイルシステムを壊します。何が起きても知りません"
+"よ！\n"
+"\n"
+"で、本当にプリンタの自動検出をしますか？"
+
+#: ../../printerdrake.pm_.c:227 ../../printerdrake.pm_.c:229
+#: ../../printerdrake.pm_.c:230
+msgid "Do auto-detection"
+msgstr "自動検出をする"
+
+#: ../../printerdrake.pm_.c:228
+msgid "Set up printer manually"
+msgstr "プリンタを手動で設定"
 
 #: ../../printerdrake.pm_.c:256
+#, c-format
+msgid "Detected %s"
+msgstr "%s を検出"
+
+#: ../../printerdrake.pm_.c:260 ../../printerdrake.pm_.c:287
+#: ../../printerdrake.pm_.c:306
+#, c-format
+msgid "Printer on parallel port \\/*%s"
+msgstr "パラレルポート上のプリンタ \\/*%s"
+
+#: ../../printerdrake.pm_.c:262 ../../printerdrake.pm_.c:289
+#: ../../printerdrake.pm_.c:311
+#, c-format
+msgid "USB printer \\/*%s"
+msgstr "USB プリンタ \\/*%s"
+
+#: ../../printerdrake.pm_.c:379
+msgid ""
+"No local printer found! To manually install a printer enter a device name/"
+"file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
+"equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB "
+"printer: /dev/usb/lp1, ...)."
+msgstr ""
+"ローカルプリンタが見つかりません。手動でインストールするには、デバイス名か\n"
+"ファイル名を入力ラインに入れます (パラレルポートなら: /dev/lp0, /dev/lp1,... "
+"が LPT1:, LPT2:, ..., に対応して、1番目の USB プリンタ: /dev/usb/lp0, 2番目"
+"の USB プリンタ: /dev/usb/lp1, ...)."
+
+#: ../../printerdrake.pm_.c:383
+msgid "You must enter a device or file name!"
+msgstr "デバイスかファイル名を入力してください"
+
+#: ../../printerdrake.pm_.c:394
+msgid ""
+"No local printer found!\n"
+"\n"
+msgstr ""
+"ローカルプリンタが見つかりません！\n"
+"\n"
+
+#: ../../printerdrake.pm_.c:395
 msgid ""
-"What device is your printer connected to \n"
-"(note that /dev/lp0 is equivalent to LPT1:)?\n"
+"Network printers can only be installed after the installation. Choose "
+"\"Hardware\" and then \"Printer\" in the Mandrake Control Center."
 msgstr ""
-"プリンタがつながっているデバイスは何ですか\n"
-"(注意 /dev/lp0 は LPT1: になります)？\n"
+"ネットワークプリンタのインストールは、OS インストール後にしかできません。\n"
+"インストール後にMandrake コントロールセンタで「ハードウェア」の中の\n"
+"「プリンタ」を選んでください。"
 
-#: ../../printerdrake.pm_.c:258
-msgid "Printer Device"
-msgstr "プリンタデバイス"
+#: ../../printerdrake.pm_.c:396
+msgid ""
+"To install network printers, click \"Cancel\", switch to the \"Expert Mode"
+"\", and click \"Add a new printer\" again."
+msgstr ""
+"ネットワークプリンタのインストールには「キャンセル」をクリックして\n"
+"「エキスパートモード」に変更してから「新規プリンタの追加」をクリック\n"
+"しなおしてください。"
 
-#: ../../printerdrake.pm_.c:261
-msgid "Device/file name missing!"
-msgstr "デバイス/ファイル名がありません！"
+#: ../../printerdrake.pm_.c:407
+msgid ""
+"The following printer was auto-detected, if it is not the one you want to "
+"configure, enter a device name/file name in the input line"
+msgstr ""
+"以下のプリンタが自動検出されました。もしこれが設定したいものでなければ、\n"
+"入力行に、デバイス名/ファイル名を入力してください"
 
-#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
-#: ../../printerdrake.pm_.c:786
+#: ../../printerdrake.pm_.c:408
+msgid ""
+"Here is a list of all auto-detected printers. Please choose the printer you "
+"want to set up or enter a device name/file name in the input line"
+msgstr ""
+"以下のプリンタが自動検出されました。もし設定したいものがここになければ、\n"
+"入力行に、デバイス名/ファイル名を入力してください"
+
+#: ../../printerdrake.pm_.c:410
+msgid ""
+"The following printer was auto-detected. The configuration of the printer "
+"will work fully automatically. If your printer was not correctly detected or "
+"if you prefer a customized printer configuration, turn on \"Manual "
+"configuration\"."
+msgstr ""
+"以下のプリンタが自動検出されました。プリンタは完全に自動で設定されます。\n"
+"検出されていなかったり、カスタム設定をしたければ「手動設定」を有効にしてくだ"
+"さい。"
+
+#: ../../printerdrake.pm_.c:411
+msgid ""
+"Here is a list of all auto-detected printers. Please choose the printer you "
+"want to set up. The configuration of the printer will work fully "
+"automatically. If your printer was not correctly detected or if you prefer a "
+"customized printer configuration, turn on \"Manual configuration\"."
+msgstr ""
+"以下のプリンタが自動検出されました。設定したいプリンタを選んでください。\n"
+"プリンタは完全に自動で設定されます。検出されていなかったり、カスタム設定\n"
+"したければ「手動設定」を有効にしてください。"
+
+#: ../../printerdrake.pm_.c:413
+msgid ""
+"Please choose the port where your printer is connected to or enter a device "
+"name/file name in the input line"
+msgstr ""
+"プリンタが接続されているポートを選ぶか、入力行にデバイス名/ファイル名を\n"
+"入力してください"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Please choose the port where your printer is connected to."
+msgstr "モデムはどのシリアルポートにつながっていますか？"
+
+#: ../../printerdrake.pm_.c:416
+msgid ""
+" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
+"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
+msgstr ""
+"(パラレルポートなら: /dev/lp0, /dev/lp1,... が LPT1:, LPT2:, ..., に対応、1番"
+"目の USB プリンタ: /dev/usb/lp0, 2番目の USB プリンタ: /dev/usb/lp1, ...)."
+
+#: ../../printerdrake.pm_.c:421
+msgid "You must choose/enter a printer/device!"
+msgstr "プリンタかデバイスを入力・選択"
+
+#: ../../printerdrake.pm_.c:441
+msgid "Manual configuration"
+msgstr "マニュアル設定"
+
+#: ../../printerdrake.pm_.c:467
+msgid ""
+"Is your printer a multi-function device from HP (OfficeJet, PSC, PhotoSmart, "
+"LaserJet 1100/1200/1220/3200/3300 with scanner)?"
+msgstr ""
+"あなたのプリンタは、HP製多機能デバイス (OfficeJet, PSC, PhotoSmart, LaserJet "
+"1100/1200/1220/3200/3300 のスキャナつき) ですか?"
+
+#: ../../printerdrake.pm_.c:482
+msgid "Installing HPOJ package..."
+msgstr "HPOJ パッケージのインストール中..."
+
+#: ../../printerdrake.pm_.c:487
+msgid "Checking device and configuring HPOJ ..."
+msgstr "デバイスをチェックしてHPOJ をインストール中..."
+
+#: ../../printerdrake.pm_.c:505
+msgid "Installing SANE package..."
+msgstr "SANE パッケージのインストール中..."
+
+#: ../../printerdrake.pm_.c:517
+msgid "Scanning on your HP multi-function device"
+msgstr "HP マルチ機能デバイスでスキャン中"
+
+#: ../../printerdrake.pm_.c:534
+msgid "Making printer port available for CUPS ..."
+msgstr "プリンタポートを CUPS 用に提供中..."
+
+#: ../../printerdrake.pm_.c:544 ../../printerdrake.pm_.c:1018
+#: ../../printerdrake.pm_.c:1132
 msgid "Reading printer database ..."
 msgstr "プリンタデータベースを読んでいます..."
 
-#: ../../printerdrake.pm_.c:312
+#: ../../printerdrake.pm_.c:624
 msgid "Remote lpd Printer Options"
 msgstr "リモートlpdプリンタオプション"
 
-#: ../../printerdrake.pm_.c:313
+#: ../../printerdrake.pm_.c:625
 msgid ""
-"To use a remote lpd printer, you need to supply\n"
-"the hostname of the printer server and the printer name\n"
-"on that server."
+"To use a remote lpd printer, you need to supply the hostname of the printer "
+"server and the printer name on that server."
 msgstr ""
-"リモートの lpd の プリントキューを使うには，プリンタサーバの\n"
+"リモートの lpd の プリンタを使うには，プリンタサーバの\n"
 "ホスト名とサーバ上のプリンタ名が必要になります。."
 
-#: ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:626
 msgid "Remote host name"
 msgstr "リモートホスト名"
 
-#: ../../printerdrake.pm_.c:317
+#: ../../printerdrake.pm_.c:627
 msgid "Remote printer name"
 msgstr "リモートプリンタ名"
 
-#: ../../printerdrake.pm_.c:320
+#: ../../printerdrake.pm_.c:630
 msgid "Remote host name missing!"
 msgstr "リモートホスト名がありません！"
 
-#: ../../printerdrake.pm_.c:324
+#: ../../printerdrake.pm_.c:634
 msgid "Remote printer name missing!"
-msgstr "リモートホスト名がありません！"
+msgstr "リモートプリンタ名がありません！"
 
-#: ../../printerdrake.pm_.c:392
+#: ../../printerdrake.pm_.c:702
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (ウィンドウズ 9x/NT) プリンタのオプション"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:703
 msgid ""
-"To print to a SMB printer, you need to provide the\n"
-"SMB host name (Note! It may be different from its\n"
-"TCP/IP hostname!) and possibly the IP address of the print server, as\n"
-"well as the share name for the printer you wish to access and any\n"
-"applicable user name, password, and workgroup information."
+"To print to a SMB printer, you need to provide the SMB host name (Note! It "
+"may be different from its TCP/IP hostname!) and possibly the IP address of "
+"the print server, as well as the share name for the printer you wish to "
+"access and any applicable user name, password, and workgroup information."
 msgstr ""
 "SMB プリンタを使うには，SMB ホスト名(注！TCP/IP ホスト名とは別！)と，\n"
 "多分プリントサーバの IP アドレス，アクセスしたいプリンタの共有名，\n"
 "適切なユーザ名，パスワードおよびワークグループの情報が必要になります。"
 
-#: ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:704
 msgid "SMB server host"
 msgstr "SMBサーバホスト"
 
-#: ../../printerdrake.pm_.c:399
+#: ../../printerdrake.pm_.c:705
 msgid "SMB server IP"
 msgstr "SMBサーバのIP"
 
-#: ../../printerdrake.pm_.c:400
+#: ../../printerdrake.pm_.c:706
 msgid "Share name"
 msgstr "シェア名"
 
-#: ../../printerdrake.pm_.c:403
+#: ../../printerdrake.pm_.c:709
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: ../../printerdrake.pm_.c:410
+#: ../../printerdrake.pm_.c:716
 msgid "Either the server name or the server's IP must be given!"
 msgstr "サーバ名か、サーバのIPはどうしても要ります！"
 
-#: ../../printerdrake.pm_.c:414
+#: ../../printerdrake.pm_.c:720
 msgid "Samba share name missing!"
 msgstr "Sambaシェア名がありません！"
 
-#: ../../printerdrake.pm_.c:473
+#: ../../printerdrake.pm_.c:725
+msgid "SECURITY WARNING!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:726
+#, c-format
+msgid ""
+"You are about to set up printing to a Windows account with password. Due to "
+"a fault in the architecture of the Samba client software the password is put "
+"in clear text into the command line of the Samba client used to transmit the "
+"print job to the Windows server. So it is possible for every user on this "
+"machine to display the password on the screen by issuing commands as \"ps "
+"auxwww\".\n"
+"\n"
+"We recommend to make use of one of the following alternatives (in all cases "
+"you have to make sure that only machines from your local network have access "
+"to your Windows server, for example by means of a firewall):\n"
+"\n"
+"Use a password-less account on your Windows server, as the \"GUEST\" account "
+"or a special account dedicated for printing. Do not remove the password "
+"protection from a personal account or the administrator account.\n"
+"\n"
+"Set up your Windows server to make the printer available under the LPD "
+"protocol. Then set up printing from this machine with the \"%s\" connection "
+"type in Printerdrake.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:736
+#, c-format
+msgid ""
+"Set up your Windows server to make the printer available under the IPP "
+"protocol and set up printing from this machine with the \"%s\" connection "
+"type in Printerdrake.\n"
+"\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:739
+msgid ""
+"Connect your printer to a Linux server and let your Windows machine(s) "
+"connect to it as a client.\n"
+"\n"
+"Do you really want to continue setting up this printer as you are doing now?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:801
 msgid "NetWare Printer Options"
 msgstr "Netware プリンタのオプション"
 
-#: ../../printerdrake.pm_.c:474
+#: ../../printerdrake.pm_.c:802
 msgid ""
-"To print on a NetWare printer, you need to provide the\n"
-"NetWare print server name (Note! it may be different from its\n"
-"TCP/IP hostname!) as well as the print queue name for the printer you\n"
-"wish to access and any applicable user name and password."
+"To print on a NetWare printer, you need to provide the NetWare print server "
+"name (Note! it may be different from its TCP/IP hostname!) as well as the "
+"print queue name for the printer you wish to access and any applicable user "
+"name and password."
 msgstr ""
-"Netware プリンタを使うには，NetWare ホスト名(注！TCP/IP ホスト名とは違う！)"
-"と，\n"
-"アクセスしたいプリンタのプリントキュー名，適切なユーザ名および\n"
+"Netware プリンタを使うには，NetWare ホスト名(注！TCP/IP ホスト名とは違う！)\n"
+"と，アクセスしたいプリンタのプリントキュー名，適切なユーザ名および\n"
 "パスワードが必要になります。"
 
-#: ../../printerdrake.pm_.c:478
+#: ../../printerdrake.pm_.c:803
 msgid "Printer Server"
 msgstr "プリンタサーバ"
 
-#: ../../printerdrake.pm_.c:479
+#: ../../printerdrake.pm_.c:804
 msgid "Print Queue Name"
 msgstr "印刷キューの名前"
 
-#: ../../printerdrake.pm_.c:484
+#: ../../printerdrake.pm_.c:809
 msgid "NCP server name missing!"
 msgstr "NCP サーバ名がありません！"
 
-#: ../../printerdrake.pm_.c:488
+#: ../../printerdrake.pm_.c:813
 msgid "NCP queue name missing!"
-msgstr " NCP キュー名がありません！"
+msgstr "NCP キュー名がありません！"
 
-#: ../../printerdrake.pm_.c:527
-msgid "Socket Printer Options"
-msgstr "ソケットプリンタのオプション"
+#: ../../printerdrake.pm_.c:852
+msgid "TCP/Socket Printer Options"
+msgstr "TCP/ソケットプリンタのオプション"
 
-#: ../../printerdrake.pm_.c:528
+#: ../../printerdrake.pm_.c:853
 msgid ""
-"To print to a socket printer, you need to provide the\n"
-"host name of the printer and optionally the port number.\n"
-"On HP JetDirect servers the port number is usually 9100,\n"
-"on other servers it can vary. See the manual of your\n"
+"To print to a TCP or socket printer, you need to provide the host name of "
+"the printer and optionally the port number. On HP JetDirect servers the port "
+"number is usually 9100, on other servers it can vary. See the manual of your "
 "hardware."
 msgstr ""
-"ソケットプリンタで印刷するなら、プリンタのホスト名と、場合に\n"
-"よってはポート番号が必要になります。HP JetDirect サーバでは、ポート番号は通常"
-"9100ですが、ほかの\n"
-"サーバだとまちまちです。ハードウェアのマニュアルを見ましょう。"
+"ソケットプリンタで印刷するなら、プリンタのホスト名と、場合によっては\n"
+"ポート番号が必要になります。HP JetDirect サーバでは、ポート番号は\n"
+"通常9100ですが、ほかのサーバだとまちまちです。ハードウェアのマニュアルを\n"
+"見ましょう。"
 
-#: ../../printerdrake.pm_.c:533
+#: ../../printerdrake.pm_.c:854
 msgid "Printer host name"
 msgstr "プリンタホスト名"
 
-#: ../../printerdrake.pm_.c:537
+#: ../../printerdrake.pm_.c:858
 msgid "Printer host name missing!"
 msgstr "プリンタホスト名がありません！"
 
-#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+#: ../../printerdrake.pm_.c:887 ../../printerdrake.pm_.c:889
 msgid "Printer Device URI"
 msgstr "プリンタデバイスのURI"
 
-#: ../../printerdrake.pm_.c:567
+#: ../../printerdrake.pm_.c:888
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
 "either the CUPS or the Foomatic specifications. Note that not all URI types "
 "are supported by all the spoolers."
 msgstr ""
-"プリンタをアクセスするのに直接 URI を指定することもできます。このURIはCUPS仕"
-"様かFoomatic仕様で指定してください。なお、すべてのURIタイプが全スプーラでサ"
-"ポートされているわけじゃないです。"
+"プリンタをアクセスするのに直接 URI を指定することもできます。\n"
+"このURIはCUPS仕様かFoomatic仕様で指定してください。\n"
+"なお、すべてのURIタイプが全スプーラでサポートされているわけじゃないです。"
 
-#: ../../printerdrake.pm_.c:582
+#: ../../printerdrake.pm_.c:903
 msgid "A valid URI must be entered!"
 msgstr "有効なURIを入力してください！"
 
-#: ../../printerdrake.pm_.c:682
+#: ../../printerdrake.pm_.c:1004
 msgid ""
-"Every printer needs a name (for example lp).\n"
-"The Description and Location fields do not need \n"
-"to be filled in. They are comments for the users."
+"Every printer needs a name (for example \"printer\"). The Description and "
+"Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
-"プリンタはそれぞれなまえが必要です（たとえば lp）\n"
-"説明や場所の欄は空欄でもかまいません。これは\n"
-"ユーザにわかりやすくするためのものです。"
+"プリンタはそれぞれ名前が必要です（たとえば「printer」。\n"
+"説明や場所の欄は空欄でもかまいません。\n"
+"これはユーザにわかりやすくするためのものです。"
 
-#: ../../printerdrake.pm_.c:685
+#: ../../printerdrake.pm_.c:1005
 msgid "Name of printer"
 msgstr "プリンタの名前"
 
-#: ../../printerdrake.pm_.c:686
+#: ../../printerdrake.pm_.c:1006
 msgid "Description"
 msgstr "プリンタの説明"
 
-#: ../../printerdrake.pm_.c:687
+#: ../../printerdrake.pm_.c:1007
 msgid "Location"
 msgstr "プリンタの場所"
 
-#: ../../printerdrake.pm_.c:701
+#: ../../printerdrake.pm_.c:1021
 msgid "Preparing printer database ..."
 msgstr "プリンタデータベースを準備中..."
 
-#: ../../printerdrake.pm_.c:793
+#: ../../printerdrake.pm_.c:1112
+msgid "Your printer model"
+msgstr "プリンタの機種"
+
+#: ../../printerdrake.pm_.c:1113
+#, c-format
+msgid ""
+"Printerdrake has compared the model name resulting from the printer auto-"
+"detection with the models listed in its printer database to find the best "
+"match. This choice can be wrong, especially when your printer is not listed "
+"at all in the database. So check whether the choice is correct and click "
+"\"The model is correct\" if so and if not, click \"Select model manually\" "
+"so that you can choose your printer model manually on the next screen.\n"
+"\n"
+"For your printer Printerdrake has found:\n"
+"\n"
+"%s"
+msgstr ""
+"Printerdrake は、プリンタの自動検出で得られた機種名と、プリンタの\n"
+"データベースとを比較して最適なものを選びました。でもこの選択はまちがって\n"
+"いるかもしれません。特にプリンタがデータベース内にまったくない場合には\n"
+"よくまちがいが怒ります。Printerdrake の選択が正しいかを確かめて、\n"
+"正しければ「このモデルを使う」をクリックします。まちがっていたら\n"
+"「手動で選ぶ」を選んで、次画面から手動でプリンタ機種名を選んでください。\n"
+"\n"
+"Printerdrake は以下のプリンタを見つけました:\n"
+"\n"
+"%s"
+
+#: ../../printerdrake.pm_.c:1118 ../../printerdrake.pm_.c:1121
+msgid "The model is correct"
+msgstr "このモデルを使う"
+
+#: ../../printerdrake.pm_.c:1119 ../../printerdrake.pm_.c:1120
+#: ../../printerdrake.pm_.c:1123
+msgid "Select model manually"
+msgstr "手動で選ぶ"
+
+#: ../../printerdrake.pm_.c:1139
 msgid "Printer model selection"
 msgstr "プリンタの機種を選ぶ"
 
-#: ../../printerdrake.pm_.c:794
+#: ../../printerdrake.pm_.c:1140
 msgid "Which printer model do you have?"
 msgstr "どの機種のプリンタを使っていますか？"
 
-#: ../../printerdrake.pm_.c:866
+#: ../../printerdrake.pm_.c:1141
+msgid ""
+"\n"
+"\n"
+"Please check whether Printerdrake did the auto-detection of your printer "
+"model correctly. Search the correct model in the list when the cursor is "
+"standing on a wrong model or on \"Raw printer\"."
+msgstr ""
+"\n"
+"\n"
+"Printerdrake がプリンタの機種を正しく自動検出したか確かめてください。\n"
+"カーソルがまちがったモデル化「ナマのプリンタ（Raw Printer)」を指して\n"
+"いたら、一覧から正しい機種を探してください。"
+
+#: ../../printerdrake.pm_.c:1144
+msgid ""
+"If your printer is not listed, choose a compatible (see printer manual) or a "
+"similar one."
+msgstr ""
+"あなたのプリンタがなければ、互換性のあるプリンタ（プリンタのマニュアルか\n"
+"類似プリンタを選んでください。"
+
+#: ../../printerdrake.pm_.c:1220
 msgid "OKI winprinter configuration"
 msgstr "OKI winプリンタの設定"
 
-#: ../../printerdrake.pm_.c:867
+#: ../../printerdrake.pm_.c:1221
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
-"use a very special communication protocol and therefore they\n"
-"work only when connected to the first parallel port. When\n"
-"your printer is connected to another port or to a print\n"
-"server box please connect the printer to the first parallel\n"
-"port before you print a test page. Otherwise the printer\n"
-"will not work. Your connection type setting will be ignored\n"
-"by the driver."
-msgstr ""
-"OKI のレーザwinプリンタを設定しようとしていますね。この\n"
-"プリンタは非常に特殊なプロトコルを使うので、最初のパラレル\n"
-"ポートにつながないと機能しません。もし別のポートに接続され\n"
-"ていたり、プリンタサーバにつながっていたりする場合には、テ\n"
-"ストページ印刷の前に、最初のパラレルポートにつなぎなおして\n"
-"ください。さもないと使えません。接続種類の設定は無視されま\n"
-"す。"
-
-#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+"use a very special communication protocol and therefore they work only when "
+"connected to the first parallel port. When your printer is connected to "
+"another port or to a print server box please connect the printer to the "
+"first parallel port before you print a test page. Otherwise the printer will "
+"not work. Your connection type setting will be ignored by the driver."
+msgstr ""
+"OKI のレーザwinプリンタを設定しようとしていますね。このプリンタは非常に特殊"
+"な\n"
+"プロトコルを使うので、最初のパラレルポートにつながないと機能しません。\n"
+"もし別のポートに接続されていたり、プリンタサーバにつながっていたりする場合に"
+"は、\n"
+"テストページ印刷の前に、最初のパラレルポートにつなぎなおしてください。\n"
+"さもないと使えません。接続種類の設定は無視されます。"
+
+#: ../../printerdrake.pm_.c:1264 ../../printerdrake.pm_.c:1291
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmarkインクジェットの設定"
 
-#: ../../printerdrake.pm_.c:917
-msgid ""
-"The inkjet printer drivers provided by Lexmark only support\n"
-"local printers, no printers on remote machines or print server\n"
-"boxes. Please connect your printer to a local port or\n"
-"configure it on the machine where it is connected to."
-msgstr ""
-"Lexmarkが提供するインクジェットプリンタドライバは、ローカル\n"
-"プリンタしかサポートしません。リモートマシンやプリンタサーバ\n"
-"上のプリンタは使えません。プリンタをローカルポートにつなぐか\n"
-"接続されているマシンで設定してください。"
-
-#: ../../printerdrake.pm_.c:947
-msgid ""
-"To be able to print with your Lexmark inkjet and this\n"
-"configuration, you need the inkjet printer drivers\n"
-"provided by Lexmark (http://www.lexmark.com/). Go to\n"
-"the US site and click on the \"Drivers\" button. Then\n"
-"choose your model and afterwards \"Linux\" as\n"
-"operating system. The drivers come as RPM packages\n"
-"or shell scripts with interactive graphical installation.\n"
-"You do not need to do this configuration by the\n"
-"graphical frontends. Cancel directly after the license\n"
-"agreement. Then print printhead alignment pages with\n"
-"\"lexmarkmaintain\" and adjust the head alignment\n"
-"settings with this program."
-msgstr ""
-"Lexmark インクジェットとこの設定で印刷するには、Lexmark\n"
-"(http://www.lexmark.com/) の提供するインクジェットプリンタ\n"
-"ドライバが必要です。アメリカサイトに行って、「ドライバ」を\n"
-"クリックしましょう。それから自分の機種を選んで、OSの欄で\n"
-"\"Linux\" を選びます。ドライバは RPM パッケージか、グラ\n"
-"フィックインストール用のシェルスクリプトになっています。\n"
-"この設定はグラフィックフロントエンドを使わなくてもできます。\n"
-"ライセンス同意のあとですぐにキャンセルしてください。それから\n"
-"印刷ヘッドのアラインメントページを\"lexmarkmaintain\" で印刷\n"
-"して、このプログラムでヘッドのアラインメントを調整します。"
-
-#: ../../printerdrake.pm_.c:1079
+#: ../../printerdrake.pm_.c:1265
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support local printers, "
+"no printers on remote machines or print server boxes. Please connect your "
+"printer to a local port or configure it on the machine where it is connected "
+"to."
+msgstr ""
+"Lexmarkが提供するインクジェットプリンタドライバは、ローカルプリンタしか\n"
+"サポートしません。リモートマシンやプリンタサーバ上のプリンタは使えません。\n"
+"プリンタをローカルポートにつなぐか接続されているマシンで設定してください。"
+
+#: ../../printerdrake.pm_.c:1292
+msgid ""
+"To be able to print with your Lexmark inkjet and this configuration, you "
+"need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
+"com/). Go to the US site and click on the \"Drivers\" button. Then choose "
+"your model and afterwards \"Linux\" as operating system. The drivers come as "
+"RPM packages or shell scripts with interactive graphical installation. You "
+"do not need to do this configuration by the graphical frontends. Cancel "
+"directly after the license agreement. Then print printhead alignment pages "
+"with \"lexmarkmaintain\" and adjust the head alignment settings with this "
+"program."
+msgstr ""
+"Lexmark インクジェットとこの設定で印刷するには、Lexmark(http://www.lexmark."
+"com/) の提供するインクジェットプリンタドライバが必要です。アメリカサイトに"
+"行って、「ドライバ」をクリックしましょう。それから自分の機種を選んで、OSの欄"
+"で\"Linux\" を選びます。ドライバは RPM パッケージか、グラフィックインストール"
+"用のシェルスクリプトになっています。この設定はグラフィックフロントエンドを使"
+"わなくてもできます。ライセンス同意のあとですぐにキャンセルしてください。それ"
+"から印刷ヘッドのアラインメントページを\"lexmarkmaintain\" で印刷して、このプ"
+"ログラムでヘッドのアラインメントを調整します。"
+
+#: ../../printerdrake.pm_.c:1508
 msgid ""
 "Printer default settings\n"
-"You should make sure that the page size and the\n"
-"ink type (if available) are set correctly. Note\n"
-"that with a very high printout quality printing\n"
-"can get substantially slower."
+"\n"
+"You should make sure that the page size and the ink type/printing mode (if "
+"available) and also the hardware configuration of laser printers (memory, "
+"duplex unit, extra trays) are set correctly. Note that with a very high "
+"printout quality/resolution printing can get substantially slower."
 msgstr ""
 "プリンタのデフォルト設定\n"
-"ページの大きさとインクの種類（該当する場合のみ）が\n"
-"正しく設定されているかを確認しましょう。なお、超高\n"
-"品質印刷はすごく時間がかかることがあります。"
+"\n"
+"ページの大きさとインクの種類（該当する場合のみ）が正しく設定されているかを確"
+"認しましょう。なお、超高品質印刷はすごく時間がかかることがあります。"
 
-#: ../../printerdrake.pm_.c:1090
+#: ../../printerdrake.pm_.c:1517
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "オプション %s は整数です！"
 
-#: ../../printerdrake.pm_.c:1094
+#: ../../printerdrake.pm_.c:1521
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "オプション %s は数字です！"
 
-#: ../../printerdrake.pm_.c:1099
+#: ../../printerdrake.pm_.c:1526
 #, c-format
 msgid "Option %s out of range!"
 msgstr "オプション %s 範囲外です!"
 
-#: ../../printerdrake.pm_.c:1136
+#: ../../printerdrake.pm_.c:1565
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -6943,51 +7871,55 @@ msgstr ""
 "このプリンタ (\"%s\") を\n"
 "デフォルトプリンタにしますか？"
 
-#: ../../printerdrake.pm_.c:1152
+#: ../../printerdrake.pm_.c:1582
 msgid "Test pages"
 msgstr "テストページ"
 
-#: ../../printerdrake.pm_.c:1153
+#: ../../printerdrake.pm_.c:1583
 msgid ""
 "Please select the test pages you want to print.\n"
-"Note: the photo test page can take a rather long time to get printed\n"
-"and on laser printers with too low memory it can even not come out.\n"
-"In most cases it is enough to print the standard test page."
+"Note: the photo test page can take a rather long time to get printed and on "
+"laser printers with too low memory it can even not come out. In most cases "
+"it is enough to print the standard test page."
 msgstr ""
 "印刷したいテストページを選んでください。\n"
-"注：写真テストページは、印刷にかなり時間がかかることがありますし、\n"
-"メモリの少ないレーザプリンタでは出力できないこともあります。\n"
-"多くの場合は標準ページが印刷できれば大丈夫です。"
+"注：写真テストページは、印刷にかなり時間がかかることがありますし、メモリの少"
+"ないレーザプリンタでは出力できないこともあります。多くの場合は標準ページが印"
+"刷できれば大丈夫です。"
 
-#: ../../printerdrake.pm_.c:1158
+#: ../../printerdrake.pm_.c:1587
 msgid "No test pages"
 msgstr "テストページなし"
 
-#: ../../printerdrake.pm_.c:1159
+#: ../../printerdrake.pm_.c:1588
 msgid "Print"
 msgstr "印刷"
 
-#: ../../printerdrake.pm_.c:1161
+#: ../../printerdrake.pm_.c:1590
 msgid "Standard test page"
 msgstr "標準テストページ"
 
-#: ../../printerdrake.pm_.c:1164
+#: ../../printerdrake.pm_.c:1593
 msgid "Alternative test page (Letter)"
 msgstr "別のテストページ (レター)"
 
-#: ../../printerdrake.pm_.c:1167
+#: ../../printerdrake.pm_.c:1596
 msgid "Alternative test page (A4)"
 msgstr "別のテストページ (A4)"
 
-#: ../../printerdrake.pm_.c:1169
+#: ../../printerdrake.pm_.c:1598
 msgid "Photo test page"
 msgstr "写真テストページ"
 
-#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
+#: ../../printerdrake.pm_.c:1602
+msgid "Do not print any test page"
+msgstr "テストページを印刷しない"
+
+#: ../../printerdrake.pm_.c:1610 ../../printerdrake.pm_.c:1747
 msgid "Printing test page(s)..."
 msgstr "テストページ印刷中……"
 
-#: ../../printerdrake.pm_.c:1200
+#: ../../printerdrake.pm_.c:1635
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -7002,7 +7934,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:1204
+#: ../../printerdrake.pm_.c:1639
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
@@ -7010,28 +7942,28 @@ msgstr ""
 "テストページをプリンタデーモンに送りました。\n"
 "プリンタが動き出すまで、ちょっと時間がかかります。\n"
 
-#: ../../printerdrake.pm_.c:1211
+#: ../../printerdrake.pm_.c:1646
 msgid "Did it work properly?"
 msgstr "うまく動きましたか？"
 
-#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#: ../../printerdrake.pm_.c:1667 ../../printerdrake.pm_.c:2732
 msgid "Raw printer"
 msgstr "生のプリンタ"
 
-#: ../../printerdrake.pm_.c:1237
+#: ../../printerdrake.pm_.c:1685
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
 "the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or "
-"\"qtcups <file>\". The graphical tools allow you to choose the printer and "
+"\"kprinter <file>\". The graphical tools allow you to choose the printer and "
 "to modify the option settings easily.\n"
 msgstr ""
 "コマンドライン（ターミナルウィンドウ）からファイルを印刷するには、\n"
 "コマンド「%s <file>」か、グラフィック印刷ツール: 「xpp <file>」か\n"
-"「qtcups <file>」を使います。グラフィックツールは、\n"
+"「kprinter <file>」を使います。グラフィックツールは、\n"
 "プリンタ選択とオプション設定を簡単にしてくれます。\n"
 
-#: ../../printerdrake.pm_.c:1239
+#: ../../printerdrake.pm_.c:1687
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications, but here do not supply the file name "
@@ -7042,8 +7974,9 @@ msgstr ""
 "ん。\n"
 "印刷するファイルはアプリケーションからくるからです。\n"
 
-#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
-#: ../../printerdrake.pm_.c:1266
+#: ../../printerdrake.pm_.c:1690 ../../printerdrake.pm_.c:1706
+#: ../../printerdrake.pm_.c:1716
+#, c-format
 msgid ""
 "\n"
 "The \"%s\" command also allows to modify the option settings for a "
@@ -7055,17 +7988,26 @@ msgstr ""
 "コマンドラインに希望の設定を追加するだけです。\n"
 "たとえば「%s <file>」という具合です。 "
 
-#: ../../printerdrake.pm_.c:1244 ../../printerdrake.pm_.c:1284
+#: ../../printerdrake.pm_.c:1693 ../../printerdrake.pm_.c:1732
+#, c-format
 msgid ""
-"To get a list of the options available for the current printer read either "
-"the list shown below or click on the \"Print option list\" button.\n"
+"To know about the options available for the current printer read either the "
+"list shown below or click on the \"Print option list\" button.%s\n"
 "\n"
 msgstr ""
 "いまのプリンタで使えるオプション一覧を見るには、下の一覧を読むか、\n"
-"あるいは「オプション一覧を印刷」ボタンをクリックしましょう。\n"
+"あるいは「オプション一覧を印刷」ボタンをクリックしましょう。%s\n"
+"\n"
+
+#: ../../printerdrake.pm_.c:1696
+msgid ""
+"Here is a list of the available printing options for the current printer:\n"
+"\n"
+msgstr ""
+"いまのプリンタで使える印刷オプション一覧は以下の通りです:\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:1249 ../../printerdrake.pm_.c:1261
+#: ../../printerdrake.pm_.c:1701 ../../printerdrake.pm_.c:1711
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -7074,8 +8016,8 @@ msgstr ""
 "コマンドライン（ターミナルウィンドウ）からファイルを印刷するには、\n"
 "コマンド「%s <file>」を使います。\n"
 
-#: ../../printerdrake.pm_.c:1251 ../../printerdrake.pm_.c:1263
-#: ../../printerdrake.pm_.c:1275
+#: ../../printerdrake.pm_.c:1703 ../../printerdrake.pm_.c:1713
+#: ../../printerdrake.pm_.c:1723
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications. But here do not supply the file name "
@@ -7086,16 +8028,15 @@ msgstr ""
 "ん。\n"
 "印刷するファイルはアプリケーションからくるからです。\n"
 
-#: ../../printerdrake.pm_.c:1256 ../../printerdrake.pm_.c:1268
+#: ../../printerdrake.pm_.c:1708 ../../printerdrake.pm_.c:1718
 msgid ""
 "To get a list of the options available for the current printer click on the "
-"\"Print option list\" button.\n"
-"\n"
+"\"Print option list\" button."
 msgstr ""
-"いまのプリンタで使えるオプション一覧を見るには、下の一覧を読むか、\n"
-"あるいは「オプション一覧を印刷」ボタンをクリックしましょう。\n"
+"いまのプリンタで使えるオプション一覧を見るには、「オプション一覧を印刷」ボタ"
+"ンをクリックしましょう。"
 
-#: ../../printerdrake.pm_.c:1273
+#: ../../printerdrake.pm_.c:1721
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -7104,7 +8045,7 @@ msgstr ""
 "コマンドライン（ターミナルウィンドウ）からファイルを印刷するには、\n"
 "コマンド「%s <file>」または「%s <file>」を使います。\n"
 
-#: ../../printerdrake.pm_.c:1277
+#: ../../printerdrake.pm_.c:1725
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
 "handling printing jobs.\n"
@@ -7119,7 +8060,7 @@ msgstr ""
 "あるでしょう。これをクリックすると、印刷ジョブが全部すぐに止まります。\n"
 "これはたとえば紙詰まりのときに便利です。\n"
 
-#: ../../printerdrake.pm_.c:1281
+#: ../../printerdrake.pm_.c:1729
 #, c-format
 msgid ""
 "\n"
@@ -7132,81 +8073,134 @@ msgstr ""
 "変えさせてくれます。コマンドラインに希望の設定を追加するだけです。\n"
 "たとえば「%s <file>」という具合です。\n"
 
-#: ../../printerdrake.pm_.c:1292
+#: ../../printerdrake.pm_.c:1738 ../../printerdrake.pm_.c:1744
+#: ../../printerdrake.pm_.c:1745 ../../printerdrake.pm_.c:1746
+#: ../../printerdrake.pm_.c:2716 ../../standalone/drakbackup_.c:754
+#: ../../standalone/drakbackup_.c:2458 ../../standalone/drakfont_.c:577
+#: ../../standalone/drakfont_.c:791
+msgid "Close"
+msgstr "閉じる"
+
+#: ../../printerdrake.pm_.c:1741 ../../printerdrake.pm_.c:1753
+#, c-format
+msgid "Printing/Scanning on \"%s\""
+msgstr "以下で印刷中/スキャン： \"%s\""
+
+#: ../../printerdrake.pm_.c:1742 ../../printerdrake.pm_.c:1754
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "以下のプリンタで印刷中： \"%s\""
 
-#: ../../printerdrake.pm_.c:1294
+#: ../../printerdrake.pm_.c:1744
 msgid "Print option list"
 msgstr "プリンタオプション一覧"
 
-#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
-#: ../../standalone/printerdrake_.c:48
+#: ../../printerdrake.pm_.c:1766
+#, c-format
+msgid ""
+"Your HP multi-function device was configured automatically to be able to "
+"scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify "
+"the scanner when you have more than one) from the command line or with the "
+"graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, "
+"you can also scan by choosing the appropriate point in the \"File\"/\"Acquire"
+"\" menu. Call also \"man scanimage\" and \"man sane-hp\" on the command line "
+"to get more information.\n"
+"\n"
+"Do not use \"scannerdrake\" for this device!"
+msgstr ""
+"HP 多機能デバイスを自動設定して、スキャナも使えるようにしました。これでコマン"
+"ドラインから\"scanimage\"を入力するか (複数のスキャナがある場合は\"scanimage "
+"-d hp:%s\" でスキャナを指定)、グラフィックインターフェースの\"xscanimage\" "
+"か \"xsane\"を使ってスキャンができます。GIMPを使っているなら、\"ファイル\"/"
+"\"読み込み\"メニューで適切な部分を選んでも可能です。詳しくは、コマンドライン"
+"で \"man scanimage\" と \"man sane-hp\" を参照してください。\n"
+"\n"
+"このデバイスでは\"scannerdrake\" は使わないでください!"
+
+#: ../../printerdrake.pm_.c:1772
+#, c-format
+msgid ""
+"Your HP multi-function device was configured automatically to be able to "
+"scan. Now you can scan from the command line with \"ptal-hp %s scan ...\". "
+"Scanning via a graphical interface or from the GIMP is not supported yet for "
+"your device. More information you will find in the \"/usr/share/doc/hpoj-0.8/"
+"ptal-hp-scan.html\" file on your system. If you have an HP LaserJet 1100 or "
+"1200 you can only scan when you have the scanner option installed.\n"
+"\n"
+"Do not use \"scannerdrake\" for this device!"
+msgstr ""
+"HP 多機能デバイスを自動設定して、スキャナも使えるようにしました。これでコマン"
+"ドラインから\"ptal-hp %s scan ...\"でスキャンができます。グラフィックインター"
+"フェースやGIMPからのスキャンは、このデバイスではまだサポートされていません。"
+"詳しくは\"/usr/share/doc/hpoj-0.8/ptal-hp-scan.html\" を参照してください。HP "
+"LaserJet 1100 か 1200 の場合には、スキャナオプションがインストールしていない"
+"とダメです。\n"
+"\n"
+"このデバイスでは\"scannerdrake\" は使わないでください!"
+
+#: ../../printerdrake.pm_.c:1794 ../../printerdrake.pm_.c:2221
+#: ../../printerdrake.pm_.c:2485 ../../standalone/printerdrake_.c:49
 msgid "Reading printer data ..."
 msgstr "プリンタの情報を読んでいます..."
 
-#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
-#: ../../printerdrake.pm_.c:1411
+#: ../../printerdrake.pm_.c:1814 ../../printerdrake.pm_.c:1842
+#: ../../printerdrake.pm_.c:1877
 msgid "Transfer printer configuration"
 msgstr "プリンタの設定を移動"
 
-#: ../../printerdrake.pm_.c:1339
+#: ../../printerdrake.pm_.c:1815
 #, c-format
 msgid ""
-"You can copy the printer configuration which you have done \n"
-"for the spooler %s to %s, your current spooler. All the\n"
-"configuration data (printer name, description, location, \n"
-"connection type, and default option settings) is overtaken,\n"
-"but jobs will not be transferred.\n"
-"Not all queues can be transferred due to the following \n"
-"reasons:\n"
+"You can copy the printer configuration which you have done for the spooler %"
+"s to %s, your current spooler. All the configuration data (printer name, "
+"description, location, connection type, and default option settings) is "
+"overtaken, but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
-"スプーラ %s からいまのスプーラ %s へ、プリンタの設定を移動できます。\n"
-"設定データすべて（プリンタ名、説明、場所、接続種類、デフォルトの\n"
-"オプション設定）はそちらに取られますが、ジョブは移動しません。\n"
-"以下の理由で、移動できないキューもあります：\n"
+"スプーラ %s からいまのスプーラ %s へ、プリンタの設定をコピーできます。設定"
+"データすべて（プリンタ名、説明、場所、接続種類、デフォルトのオプション設定）"
+"はそちらに取られますが、ジョブは移動しません。以下の理由で、移動できない"
+"キューもあります：\n"
 
-#: ../../printerdrake.pm_.c:1347
+#: ../../printerdrake.pm_.c:1818
 msgid ""
-"CUPS does not support printers on Novell servers or printers\n"
-"sending the data into a free-formed command.\n"
+"CUPS does not support printers on Novell servers or printers sending the "
+"data into a free-formed command.\n"
 msgstr ""
-"CUPS は Novell サーバのプリンタや、自由形式のコマンドにデータ\n"
-"を送るプリンタはサポートしません。\n"
+"CUPS は Novell サーバのプリンタや、自由形式のコマンドにデータを送るプリンタは"
+"サポートしません。\n"
 
-#: ../../printerdrake.pm_.c:1350
+#: ../../printerdrake.pm_.c:1820
 msgid ""
-"PDQ only supports local printers, remote LPD printers, and\n"
-"Socket/TCP printers.\n"
+"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
+"printers.\n"
 msgstr ""
-"PDQ はローカルプリンタとリモートの LPD プリンタ、ソケット/TCP \n"
-"プリンタしかサポートしません。\n"
+"PDQ はローカルプリンタとリモートの LPD プリンタ、ソケット/TCP プリンタしかサ"
+"ポートしません。\n"
 
-#: ../../printerdrake.pm_.c:1353
+#: ../../printerdrake.pm_.c:1822
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD と LPRng はIPP プリンタをサポートしません。\n"
 
-#: ../../printerdrake.pm_.c:1355
+#: ../../printerdrake.pm_.c:1824
 msgid ""
-"In addition, queues not created with this program or\n"
-"\"foomatic-configure\" cannot be transferred."
+"In addition, queues not created with this program or \"foomatic-configure\" "
+"cannot be transferred."
 msgstr ""
-"さらにこのプログラムや\"foomatic-configure\" で作っていない\n"
-"キューは移動できません。"
+"さらにこのプログラムや\"foomatic-configure\" で作っていないキューは移動できま"
+"せん。"
 
-#: ../../printerdrake.pm_.c:1357
+#: ../../printerdrake.pm_.c:1825
 msgid ""
 "\n"
-"Also printers configured with the PPD files provided by\n"
-"their manufacturers or with native CUPS drivers can not be\n"
-"transferred."
+"Also printers configured with the PPD files provided by their manufacturers "
+"or with native CUPS drivers cannot be transferred."
 msgstr ""
 "\n"
-"またメーカー提供の PPD ファイルやネイティブの CUPS ドライバ\n"
-"で設定されたプリンタは移動できません。"
+"またメーカー提供の PPD ファイルやネイティブの CUPS ドライバで設定されたプリン"
+"タは移動できません。"
 
-#: ../../printerdrake.pm_.c:1360
+#: ../../printerdrake.pm_.c:1826
 msgid ""
 "\n"
 "Mark the printers which you want to transfer and click \n"
@@ -7215,15 +8209,15 @@ msgstr ""
 "\n"
 "移動したいプリンタを選んで \"T移動\"をクリックしてください。"
 
-#: ../../printerdrake.pm_.c:1363
+#: ../../printerdrake.pm_.c:1829
 msgid "Do not transfer printers"
 msgstr "プリンタを移動しない"
 
-#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1847
 msgid "Transfer"
 msgstr "移動"
 
-#: ../../printerdrake.pm_.c:1377
+#: ../../printerdrake.pm_.c:1843
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -7234,11 +8228,11 @@ msgstr ""
 "上書きするには \"移動\" を押してください。\n"
 "新しい名前をタイプするか、このプリンタをとばすこともできます。"
 
-#: ../../printerdrake.pm_.c:1385
+#: ../../printerdrake.pm_.c:1851
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "プリンタ名は、文字と数字とアンダースコア (_)しか使えません"
 
-#: ../../printerdrake.pm_.c:1390
+#: ../../printerdrake.pm_.c:1856
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -7247,310 +8241,350 @@ msgstr ""
 "プリンタ \"%s\" はすでに存在します。\n"
 "いまの設定を上書きしてしまいますか？"
 
-#: ../../printerdrake.pm_.c:1398
+#: ../../printerdrake.pm_.c:1864
 msgid "New printer name"
 msgstr "新しいプリンタの名前"
 
-#: ../../printerdrake.pm_.c:1401
+#: ../../printerdrake.pm_.c:1867
 #, c-format
 msgid "Transferring %s ..."
 msgstr "%s 移動中……"
 
-#: ../../printerdrake.pm_.c:1412
+#: ../../printerdrake.pm_.c:1878
 #, c-format
 msgid ""
-"You have transferred your former default printer (\"%s\"),\n"
-"Should it be also the default printer under the\n"
-"new printing system %s?"
+"You have transferred your former default printer (\"%s\"), Should it be also "
+"the default printer under the new printing system %s?"
 msgstr ""
-"前のデフォルトプリンタ (\"%s\")を移動しました。\n"
-"コレは新しい印刷システム%sでもデフォルトのプリンタに\n"
-"しますか？"
+"前のデフォルトプリンタ (\"%s\")を移動しました。新しい印刷システム%sでもこれを"
+"デフォルトのプリンタにしますか？"
 
-#: ../../printerdrake.pm_.c:1423
+#: ../../printerdrake.pm_.c:1887
 msgid "Refreshing printer data ..."
 msgstr "プリンタデータ更新中..."
 
-#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
-#: ../../printerdrake.pm_.c:1515
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1966
+#: ../../printerdrake.pm_.c:1978
 msgid "Configuration of a remote printer"
 msgstr "リモートプリンタの設定"
 
-#: ../../printerdrake.pm_.c:1432
+#: ../../printerdrake.pm_.c:1896
 msgid "Starting network ..."
 msgstr "ネットワーク起動中..."
 
-#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
-#: ../../printerdrake.pm_.c:1464
+#: ../../printerdrake.pm_.c:1930 ../../printerdrake.pm_.c:1934
+#: ../../printerdrake.pm_.c:1936
 msgid "Configure the network now"
 msgstr "今すぐネットワーク設定をする"
 
-#: ../../printerdrake.pm_.c:1455
+#: ../../printerdrake.pm_.c:1931
 msgid "Network functionality not configured"
 msgstr "ネットワーク機能が設定されてません"
 
-#: ../../printerdrake.pm_.c:1456
+#: ../../printerdrake.pm_.c:1932
 msgid ""
-"You are going to configure a remote printer. This needs working\n"
-"network access, but your network is not configured yet. If you\n"
-"go on without network configuration, you will not be able to use\n"
-"the printer which you are configuring now. How do you want \n"
-"to proceed?"
+"You are going to configure a remote printer. This needs working network "
+"access, but your network is not configured yet. If you go on without network "
+"configuration, you will not be able to use the printer which you are "
+"configuring now. How do you want to proceed?"
 msgstr ""
-"リモートプリンタの設定をします。これはネットワークアクセスの稼働\n"
-"が必須ですが、あなたのネットワーク設定はすんでいません。ネット\n"
-"ワーク設定なしで進むと、いま設定中のプリンタは使えません。さて\n"
-"どう進めましょうか？"
+"リモートプリンタの設定をします。これはネットワークアクセスの稼働が必須です"
+"が、あなたのネットワーク設定はすんでいません。ネットワーク設定なしで進むと、"
+"いま設定中のプリンタは使えません。さてどう進めましょうか？"
 
-#: ../../printerdrake.pm_.c:1463
+#: ../../printerdrake.pm_.c:1935
 msgid "Go on without configuring the network"
 msgstr "ネットワークの設定をとばして先に進む"
 
-#: ../../printerdrake.pm_.c:1496
+#: ../../printerdrake.pm_.c:1968
 msgid ""
-"The network configuration done during the installation \n"
-"cannot be started now. Please check whether the network\n"
-"gets accessable after booting your system and correct the\n"
-"configuration using the Mandrake Control Center, section\n"
-"\"Network & Internet\"/\"Connection\", and afterwards set\n"
-"up the printer, also using the Mandrake Control Center,\n"
-"section \"Hardware\"/\"Printer\""
+"The network configuration done during the installation cannot be started "
+"now. Please check whether the network gets accessable after booting your "
+"system and correct the configuration using the Mandrake Control Center, "
+"section \"Network & Internet\"/\"Connection\", and afterwards set up the "
+"printer, also using the Mandrake Control Center, section \"Hardware\"/"
+"\"Printer\""
 msgstr ""
-"インストール中にやったネットワーク設定が起動できません。\n"
-"起動時にネットワークが有効になっているか調べて、必要なら\n"
-"Mandrakeコントロールセンタの「ネットワーク&インターネット/\n"
-"接続」の部分で設定をなおしてください。それが住んでから、\n"
-"同じくMandrakeコントロールセンタの「ハードウェア/プリンタ」\n"
-"の部分でプリンタの設定をしましょう。"
+"インストール中にやったネットワーク設定が起動できません。起動時にネットワーク"
+"が有効になっているか調べて、必要ならMandrakeコントロールセンタの「ネットワー"
+"ク&インターネット/接続」の部分で設定をなおしてください。それが住んでから、同"
+"じくMandrakeコントロールセンタの「ハードウェア/プリンタ」の部分でプリンタの設"
+"定をしましょう。"
 
-#: ../../printerdrake.pm_.c:1503
+#: ../../printerdrake.pm_.c:1969
 msgid ""
-"The network access was not running and could not be \n"
-"started. Please check your configuration and your \n"
-"hardware. Then try to configure your remote printer\n"
-"again."
+"The network access was not running and could not be started. Please check "
+"your configuration and your hardware. Then try to configure your remote "
+"printer again."
 msgstr ""
-"ネットワークアクセスが落ちていて、起動できませんでした。\n"
-"ハードウェアの設定をチェックしてください。それからリモート\n"
-"プリンタの設定をやりなおしてください。"
+"ネットワークアクセスが落ちていて、起動できませんでした。ハードウェアや設定を"
+"チェックしてください。それからリモートプリンタの設定をやりなおしてください。"
 
-#: ../../printerdrake.pm_.c:1516
+#: ../../printerdrake.pm_.c:1979
 msgid "Restarting printing system ..."
 msgstr "プリンタシステム再起動中..."
 
-#: ../../printerdrake.pm_.c:1548
+#: ../../printerdrake.pm_.c:2017
 msgid "high"
 msgstr "高い"
 
-#: ../../printerdrake.pm_.c:1548
+#: ../../printerdrake.pm_.c:2017
 msgid "paranoid"
 msgstr "神経質なほど高水準"
 
-#: ../../printerdrake.pm_.c:1549
+#: ../../printerdrake.pm_.c:2018
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "印刷システムをセキュリティ水準 %s でインストール中"
 
-#: ../../printerdrake.pm_.c:1550
+#: ../../printerdrake.pm_.c:2019
 #, c-format
 msgid ""
-"You are about to install the printing system %s on\n"
-"a system running in the %s security level.\n"
+"You are about to install the printing system %s on a system running in the %"
+"s security level.\n"
 "\n"
-"This printing system runs a daemon (background process)\n"
-"which waits for print jobs and handles them. This daemon\n"
-"is also accessable by remote machines through the network\n"
-"and so it is a possible point for attacks. Therefore only\n"
-"a few selected daemons are started by default in this\n"
+"This printing system runs a daemon (background process) which waits for "
+"print jobs and handles them. This daemon is also accessable by remote "
+"machines through the network and so it is a possible point for attacks. "
+"Therefore only a few selected daemons are started by default in this "
 "security level.\n"
 "\n"
-"Do you really want to configure printing on this\n"
-"machine?"
+"Do you really want to configure printing on this machine?"
 msgstr ""
-"これから、印刷システム %s をセキュリティ水準 %s のマシンに\n"
-"インストールします。\n"
+"これから、印刷システム %s をセキュリティ水準 %s のマシンにインストールしま"
+"す。\n"
 "\n"
-"この印刷システムは、デーモン（バックグラウンドのプロセス）\n"
-"を実行します。これは印刷ジョブを待って、それがきたら処理し\n"
-"ます。このデーモンはネットワーク経由で、リモートマシンから\n"
-"もアクセスできるので、攻撃される可能性があります。ですから\n"
-"このセキュリティ水準では、デフォルトで起動するデーモンはご\n"
-"く少数です。\n"
+"この印刷システムは、デーモン（バックグラウンドのプロセス）を実行します。これ"
+"は印刷ジョブを待って、それがきたら処理します。このデーモンはネットワーク経由"
+"で、リモートマシンからもアクセスできるので、攻撃される可能性があります。です"
+"からこのセキュリティ水準では、デフォルトで起動するデーモンはごく少数です。\n"
 "\n"
 "このマシンで印刷の設定を本当にやっていいですね？"
 
-#: ../../printerdrake.pm_.c:1584
+#: ../../printerdrake.pm_.c:2051
 msgid "Starting the printing system at boot time"
 msgstr "起動時に印刷システムをスタート"
 
-#: ../../printerdrake.pm_.c:1585
+#: ../../printerdrake.pm_.c:2052
 #, c-format
 msgid ""
-"The printing system (%s) will not be started automatically\n"
-"when the machine is booted.\n"
+"The printing system (%s) will not be started automatically when the machine "
+"is booted.\n"
 "\n"
-"It is possible that the automatic starting was turned off \n"
-"by changing to a higher security level, because the printing\n"
-"system is a potential point for attacks.\n"
+"It is possible that the automatic starting was turned off by changing to a "
+"higher security level, because the printing system is a potential point for "
+"attacks.\n"
 "\n"
-"Do you want to have the automatic starting of the printing\n"
-"system turned on again?"
+"Do you want to have the automatic starting of the printing system turned on "
+"again?"
 msgstr ""
 "印刷システム (%s) は、マシン起動時に自動スタートしません。\n"
 "\n"
-"セキュリティ水準を上げたために、自動スタートが無効になった\n"
-"のかもしれません。印刷システムは、攻撃される可能性があるから\n"
-"です。\n"
+"セキュリティ水準を上げたために、自動スタートが無効になったのかもしれません。"
+"印刷システムは、攻撃される可能性があるからです。\n"
 "\n"
 "印刷システムの自動スタートをもう一度有効にしますか？"
 
-#: ../../printerdrake.pm_.c:1612 ../../printerdrake.pm_.c:1644
-#: ../../printerdrake.pm_.c:1671 ../../printerdrake.pm_.c:1701
-#: ../../printerdrake.pm_.c:1778
+#: ../../printerdrake.pm_.c:2075 ../../printerdrake.pm_.c:2113
+#: ../../printerdrake.pm_.c:2143 ../../printerdrake.pm_.c:2176
+#: ../../printerdrake.pm_.c:2281
 msgid "Checking installed software..."
 msgstr "インストール済みソフトをチェック中……"
 
-#: ../../printerdrake.pm_.c:1648
+#: ../../printerdrake.pm_.c:2117
 msgid "Removing LPRng..."
 msgstr "LPRng 削除中……"
 
-#: ../../printerdrake.pm_.c:1675
+#: ../../printerdrake.pm_.c:2147
 msgid "Removing LPD..."
 msgstr "LPD 削除中……"
 
-#: ../../printerdrake.pm_.c:1727
+#: ../../printerdrake.pm_.c:2205
 msgid "Select Printer Spooler"
 msgstr "プリンタのスプーラを選んでください"
 
-#: ../../printerdrake.pm_.c:1728
+#: ../../printerdrake.pm_.c:2206
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "どの印刷システム（スプーラ）を使いますか？"
 
-#: ../../printerdrake.pm_.c:1759
+#: ../../printerdrake.pm_.c:2239
 #, c-format
 msgid "Configuring printer \"%s\" ..."
 msgstr "プリンタ \"%s\" の設定中..."
 
-#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
-#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+#: ../../printerdrake.pm_.c:2252
+msgid "Installing Foomatic ..."
+msgstr "Foomatic のインストール中..."
+
+#: ../../printerdrake.pm_.c:2309 ../../printerdrake.pm_.c:2348
+#: ../../printerdrake.pm_.c:2733 ../../printerdrake.pm_.c:2803
 msgid "Printer options"
 msgstr "プリンタオプション"
 
-#: ../../printerdrake.pm_.c:1815
+#: ../../printerdrake.pm_.c:2318
 msgid "Preparing PrinterDrake ..."
 msgstr "PrinterDrake準備中..."
 
-#: ../../printerdrake.pm_.c:1845
+#: ../../printerdrake.pm_.c:2335 ../../printerdrake.pm_.c:2890
+msgid "Configuring applications..."
+msgstr "アプリケーションの設定中..."
+
+#: ../../printerdrake.pm_.c:2355
 msgid "Would you like to configure printing?"
 msgstr "印刷の設定をしますか？"
 
-#: ../../printerdrake.pm_.c:1857
+#: ../../printerdrake.pm_.c:2367
 msgid "Printing system: "
 msgstr "印刷システム:"
 
-#: ../../printerdrake.pm_.c:1879
+#: ../../printerdrake.pm_.c:2415
+msgid "Printerdrake"
+msgstr "Printerdrake"
+
+#: ../../printerdrake.pm_.c:2419
 msgid ""
-"The following printers are configured.\n"
-"Click on one of them to modify it or\n"
-"to get information about it or on \n"
-"\"Add Printer\" to add a new printer."
+"The following printers are configured. Double-click on a printer to change "
+"its settings; to make it the default printer; to view information about it; "
+"or to make a printer on a remote CUPS server available for Star Office/"
+"OpenOffice.org."
 msgstr ""
-"以下のプリンタが設定されています。\n"
-"変更や情報を参照するには、そのプリンタを\n"
-"クリックします。また、新しいプリンタの\n"
-"追加には「プリンタ追加」をクリックします。"
-
-#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
-msgid "Normal Mode"
-msgstr "ノーマルモード"
+"以下のプリンタが設定されています。設定を変更したいプリンタをダブルクリックし"
+"てください。デフォルトプリンタにしたり、その情報を見たり、リモートのCUPS サー"
+"バ上のプリンタを Star Office/OpenOffice.orgで使えるようにする場合もそうです。"
 
-#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
-msgid " (Default)"
-msgstr " (デフォルト)"
+#: ../../printerdrake.pm_.c:2420
+msgid ""
+"The following printers are configured. Double-click on a printer to change "
+"its settings; to make it the default printer; or to view information about "
+"it."
+msgstr ""
+"以下のプリンタが設定されています。変更、デフォルト化、情報の参照には、\n"
+"そのプリンタをダブルクリックします。"
 
-#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
-msgid "Printer(s) on remote CUPS server(s)"
-msgstr "リモートCUPS サーバ上のプリンタ"
+#: ../../printerdrake.pm_.c:2446
+msgid "Refresh printer list (to display all available remote CUPS printers)"
+msgstr "プリンタ一覧更新（リモート CUPSプリンタをすべて表示)"
 
-#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
-msgid "Printer(s) on remote server(s)"
-msgstr "リモートサーバ上のプリンタ"
+#: ../../printerdrake.pm_.c:2464
+msgid "Change the printing system"
+msgstr "印刷システムを変更"
 
-#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
-#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
-msgid "Add printer"
-msgstr "プリンタ追加"
+#: ../../printerdrake.pm_.c:2469 ../../standalone/draknet_.c:278
+msgid "Normal Mode"
+msgstr "ノーマルモード"
 
-#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
-#: ../../printerdrake.pm_.c:2128
+#: ../../printerdrake.pm_.c:2625 ../../printerdrake.pm_.c:2675
+#: ../../printerdrake.pm_.c:2884
 msgid "Do you want to configure another printer?"
 msgstr "別のプリンタを設定しますか？"
 
-#: ../../printerdrake.pm_.c:2003
+#: ../../printerdrake.pm_.c:2711
 msgid "Modify printer configuration"
 msgstr "プリンタ設定の変更"
 
-#: ../../printerdrake.pm_.c:2004
+#: ../../printerdrake.pm_.c:2713
 #, c-format
 msgid ""
-"Printer %s: %s %s\n"
+"Printer %s\n"
 "What do you want to modify on this printer?"
 msgstr ""
-"Printer %s: %s %s\n"
+"プリンタ %s\n"
 "このプリンタの何を変更しますか？"
 
-#: ../../printerdrake.pm_.c:2012
+#: ../../printerdrake.pm_.c:2717
 msgid "Do it!"
 msgstr "やれ！"
 
-#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#: ../../printerdrake.pm_.c:2722 ../../printerdrake.pm_.c:2777
 msgid "Printer connection type"
 msgstr "プリンタ接続の種類"
 
-#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#: ../../printerdrake.pm_.c:2723 ../../printerdrake.pm_.c:2781
 msgid "Printer name, description, location"
 msgstr "プリンタの名前、説明、場所"
 
-#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+#: ../../printerdrake.pm_.c:2725 ../../printerdrake.pm_.c:2796
 msgid "Printer manufacturer, model, driver"
 msgstr "プリンタのメーカー、機種、ドライバ"
 
-#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+#: ../../printerdrake.pm_.c:2726 ../../printerdrake.pm_.c:2797
 msgid "Printer manufacturer, model"
 msgstr "プリンタのメーカー、機種"
 
-#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+#: ../../printerdrake.pm_.c:2735 ../../printerdrake.pm_.c:2807
 msgid "Set this printer as the default"
 msgstr "このプリンタをデフォルトにする"
 
-#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+#: ../../printerdrake.pm_.c:2737 ../../printerdrake.pm_.c:2812
+msgid "Add this printer to Star Office/OpenOffice.org"
+msgstr "このプリンタを Star Office/OpenOffice.org に追加"
+
+#: ../../printerdrake.pm_.c:2738 ../../printerdrake.pm_.c:2821
+msgid "Remove this printer from Star Office/OpenOffice.org"
+msgstr "このプリンタを Star Office/OpenOffice.org から削除"
+
+#: ../../printerdrake.pm_.c:2739 ../../printerdrake.pm_.c:2830
 msgid "Print test pages"
 msgstr "テストページ印刷"
 
-#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
-msgid "Know how to print with this printer"
-msgstr "このプリンタでの印刷方法を調べる"
+#: ../../printerdrake.pm_.c:2740 ../../printerdrake.pm_.c:2832
+msgid "Know how to use this printer"
+msgstr "このプリンタの使い方を調べる"
 
-#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+#: ../../printerdrake.pm_.c:2742 ../../printerdrake.pm_.c:2834
 msgid "Remove printer"
 msgstr "プリンタ削除"
 
-#: ../../printerdrake.pm_.c:2071
+#: ../../printerdrake.pm_.c:2786
 #, c-format
 msgid "Removing old printer \"%s\" ..."
 msgstr "古いプリンタ \"%s\" を削除中..."
 
-#: ../../printerdrake.pm_.c:2096
+#: ../../printerdrake.pm_.c:2810
+msgid "Default printer"
+msgstr "デフォルトプリンタ"
+
+#: ../../printerdrake.pm_.c:2811
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "プリンタ %s がデフォルトプリンタになりました。"
 
-#: ../../printerdrake.pm_.c:2103
+#: ../../printerdrake.pm_.c:2815 ../../printerdrake.pm_.c:2818
+msgid "Adding printer to Star Office/OpenOffice.org"
+msgstr "プリンタを Star Office/OpenOffice.org に追加中"
+
+#: ../../printerdrake.pm_.c:2816
+#, c-format
+msgid ""
+"The printer \"%s\" was successfully added to Star Office/OpenOffice.org."
+msgstr "プリンタ %s を Star Office/OpenOffice.org に追加しました。"
+
+#: ../../printerdrake.pm_.c:2819
+#, c-format
+msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org."
+msgstr "プリンタ %s を Star Office/OpenOffice.org に追加できませんでした。"
+
+#: ../../printerdrake.pm_.c:2824 ../../printerdrake.pm_.c:2827
+msgid "Removing printer from Star Office/OpenOffice.org"
+msgstr "プリンタを Star Office/OpenOffice.org から削除中"
+
+#: ../../printerdrake.pm_.c:2825
+#, c-format
+msgid ""
+"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org."
+msgstr "プリンタ %s を Star Office/OpenOffice.org から削除しました。"
+
+#: ../../printerdrake.pm_.c:2828
+#, c-format
+msgid "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org."
+msgstr "プリンタ %s を Star Office/OpenOffice.org から削除できませんでした。"
+
+#: ../../printerdrake.pm_.c:2836
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "プリンタ %s を本当に削除しますか？"
 
-#: ../../printerdrake.pm_.c:2105
+#: ../../printerdrake.pm_.c:2838
 #, c-format
 msgid "Removing printer \"%s\" ..."
 msgstr "プリンタ \"%s\" を削除中..."
@@ -7655,15 +8689,15 @@ msgstr "mkraid に失敗 (raidtools が入ってないのかも?)"
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "RAID レベル %d のためにはパーティションが不足です\n"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:14
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr "ALSA (先進Linux サウンドアーキテクチャ) サウンドシステム起動"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron は定期的なコマンドスケジューラです。"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
@@ -7671,7 +8705,7 @@ msgstr ""
 "apmd はバッテリーの状態を調べてそれをsyslog経由で記録します。\n"
 "電池がなくなったときにマシンをシャットダウンするのにも使えます。"
 
-#: ../../services.pm_.c:19
+#: ../../services.pm_.c:18
 msgid ""
 "Runs commands scheduled by the at command at the time specified when\n"
 "at was run, and runs batch commands when the load average is low enough."
@@ -7679,7 +8713,7 @@ msgstr ""
 "atコマンドでスケジュールされたコマンドを、at実行時に指定した時間に\n"
 "実行して、平均負荷が低いときにバッチコマンドを実行します。"
 
-#: ../../services.pm_.c:21
+#: ../../services.pm_.c:20
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
 "at periodic scheduled times. vixie cron adds a number of features to the "
@@ -7690,7 +8724,7 @@ msgstr ""
 "実行します。vixie cronは標準のUNIX cronに高度なセキュリティや\n"
 "強力な設定オプションなどの機能を追加しています。"
 
-#: ../../services.pm_.c:24
+#: ../../services.pm_.c:23
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -7701,7 +8735,7 @@ msgstr ""
 "使えるようにします。マウスによるコンソールでのカット・ペースト\n"
 "や、ポップアップメニューも使えます。"
 
-#: ../../services.pm_.c:27
+#: ../../services.pm_.c:26
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
@@ -7709,13 +8743,12 @@ msgstr ""
 "HardDrake はハードウェアを探して、可能なら新しいハードウェアや変更した\n"
 "ハードウェアの設定をします。"
 
-#: ../../services.pm_.c:29
+#: ../../services.pm_.c:28 ../../standalone/logdrake_.c:412
 msgid ""
-"Apache is a World Wide Web server.  It is used to serve HTML files\n"
-"and CGI."
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr "ApacheはWorld Wide Webサーバで、HTML ファイルやCGIの公開に使います。"
 
-#: ../../services.pm_.c:31
+#: ../../services.pm_.c:29
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -7729,7 +8762,7 @@ msgstr ""
 "rsh、rloginなどのサービス開始を担当します。inetdを無効にすると、\n"
 "こうした各種サービスすべてが無効になります。"
 
-#: ../../services.pm_.c:35
+#: ../../services.pm_.c:33
 msgid ""
 "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 "up a firewall to protect your machine from network attacks."
@@ -7737,7 +8770,7 @@ msgstr ""
 "ネットワーク攻撃からマシンを守るためのファイアーウォールを\n"
 "設定するには、Linux カーネル2.2 のパケットフィルタを起動します。"
 
-#: ../../services.pm_.c:37
+#: ../../services.pm_.c:35
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -7747,7 +8780,7 @@ msgstr ""
 "ロードします。これはkbdconfigユーティリティを使って設定します。通常は\n"
 "有効にしておきましょう。"
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:38
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
@@ -7755,11 +8788,11 @@ msgstr ""
 "/usr/include/linux/{autoconf,version}.h 用に\n"
 "/boot のカーネルヘッダを再生成します"
 
-#: ../../services.pm_.c:42
+#: ../../services.pm_.c:40
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr "起動時にハードウェアの自動検出と設定をする。"
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:41
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
@@ -7767,7 +8800,7 @@ msgstr ""
 "Linuxconf はときどき、システム設定維持のために起動時に\n"
 "各種作業をします。"
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:43
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
@@ -7775,7 +8808,7 @@ msgstr ""
 "lpd はプリンタデーモンで、lprの動作に必要です。基本的に\n"
 "はプリンタに印刷ジョブを振り分けるサーバです。"
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:45
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
@@ -7783,15 +8816,15 @@ msgstr ""
 "Linux バーチャルサーバは、高性能でいつでも使えるサーバの\n"
 "構築に使います。"
 
-#: ../../services.pm_.c:49
+#: ../../services.pm_.c:47 ../../standalone/logdrake_.c:413
 msgid ""
-"named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
-"host names to IP addresses."
+"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
+"names to IP addresses."
 msgstr ""
-"named (BIND) は、IPアドレスとホスト名を結びつけるためのドメイン名\n"
-"サーバ（Domain Name Server, DNS) です。"
+"named (BIND) は、IPアドレスとホスト名を結びつけるためのドメイン名サーバ"
+"（Domain Name Server, DNS) です。"
 
-#: ../../services.pm_.c:51
+#: ../../services.pm_.c:48
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -7799,7 +8832,7 @@ msgstr ""
 "ネットワークファイルシステム (NFS), SMB (LanManager/Windows),\n"
 "NCP (NetWare) マウントポイントをすべてマウント・アンマウントします。"
 
-#: ../../services.pm_.c:53
+#: ../../services.pm_.c:50
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -7807,7 +8840,7 @@ msgstr ""
 "起動時に有効にする設定のネットワークインターフェースをすべて、\n"
 "有効・無効にします。"
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:52
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP networks.\n"
 "This service provides NFS server functionality, which is configured via the\n"
@@ -7817,7 +8850,7 @@ msgstr ""
 "です。このサービスは NFS サーバ機能を提供します。設定には/etc/exports \n"
 "ファイルを使います。"
 
-#: ../../services.pm_.c:58
+#: ../../services.pm_.c:55
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -7825,17 +8858,17 @@ msgstr ""
 "NFS はTCP/IPネットワーク上でファイル共有をするのによく使うプロトコル\n"
 "です。このサービスは NFS ファイルロック機能を提供します。"
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:57
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr "起動時にコンソールと XFree で自動的に numlock を有効にする。"
 
-#: ../../services.pm_.c:62
+#: ../../services.pm_.c:59
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "OKI 4w 互換のwinプリンタをサポート"
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:60
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
 "modems in laptops.  It won't get started unless configured so it is safe to "
@@ -7846,7 +8879,7 @@ msgstr ""
 "などのPCカードを使えるようにするためのものです。設定するまで\n"
 "は起動しないので、必要ないマシンに入れてあっても安全です。"
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:63
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -7857,15 +8890,15 @@ msgstr ""
 "使用されます。RPC機構を使うプロトコルのサーバとなるマシンでは、この\n"
 "portmap サーバが動いている必要があります。"
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:66 ../../standalone/logdrake_.c:415
 msgid ""
-"Postfix is a Mail Transport Agent, which is the program that\n"
-"moves mail from one machine to another."
+"Postfix is a Mail Transport Agent, which is the program that moves mail from "
+"one machine to another."
 msgstr ""
-"Postfix はメール転送エージェントです (MTA) です。これは、マシン間で\n"
-"メールをやりとりするプログラムです。"
+"Postfix はメール転送エージェントです (MTA) です。これは、マシン間でメールをや"
+"りとりするプログラムです。"
 
-#: ../../services.pm_.c:71
+#: ../../services.pm_.c:67
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -7873,7 +8906,7 @@ msgstr ""
 "乱数発生の質を上げるために、システムのエントロピープールを保存・\n"
 "復活させます。"
 
-#: ../../services.pm_.c:73
+#: ../../services.pm_.c:69
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
@@ -7881,7 +8914,7 @@ msgstr ""
 "Oracle などのアプリケーションで使えるように、ブロックデバイス\n"
 "たとえばハードドライブパーティション）を生デバイスに割りつけます。"
 
-#: ../../services.pm_.c:75
+#: ../../services.pm_.c:71
 msgid ""
 "The routed daemon allows for automatic IP router table updated via\n"
 "the RIP protocol. While RIP is widely used on small networks, more complex\n"
@@ -7891,7 +8924,7 @@ msgstr ""
 "可能にします。RIP は小規模ネットワークでは便利でよく使われますが、\n"
 "ネットワークが複雑になってくると、これでは不十分です。"
 
-#: ../../services.pm_.c:78
+#: ../../services.pm_.c:74
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -7899,7 +8932,7 @@ msgstr ""
 "rstatプロトコルを使うと、ネットワーク上のユーザが、そのネットワーク\n"
 "に接続したマシンのすべてについて、性能指標を得られるようになります。"
 
-#: ../../services.pm_.c:80
+#: ../../services.pm_.c:76
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -7907,7 +8940,7 @@ msgstr ""
 "rusersプロトコルでは、ネットワーク上のユーザが、応答するほかのマシン\n"
 "にログインしている人たちを見ることができます。"
 
-#: ../../services.pm_.c:82
+#: ../../services.pm_.c:78
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
 "logged into a machine running the rwho daemon (similiar to finger)."
@@ -7915,11 +8948,11 @@ msgstr ""
 "rwho デーモンが走っているマシンでは、そのマシンにログイン中の\n"
 "ユーザ一覧をrwhoプロトコル経由で見られます (fingerに似ています)。"
 
-#: ../../services.pm_.c:84
+#: ../../services.pm_.c:80
 msgid "Launch the sound system on your machine"
 msgstr "サウンドシステムを起動"
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:81
 msgid ""
 "Syslog is the facility by which many daemons use to log messages\n"
 "to various system log files.  It is a good idea to always run syslog."
@@ -7927,43 +8960,43 @@ msgstr ""
 "Syslog は、各種のデーモンがいろんなログファイルにメッセージを記録\n"
 "するときに使います。ずっと起動しておくほうがいいでしょう。"
 
-#: ../../services.pm_.c:87
+#: ../../services.pm_.c:83
 msgid "Load the drivers for your usb devices."
 msgstr "usb デバイス用のドライバを読み込みましょう。"
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:84
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "Xフォントサーバを開始します（XFree 使用には必須）。"
 
-#: ../../services.pm_.c:114 ../../services.pm_.c:156
+#: ../../services.pm_.c:110 ../../services.pm_.c:152
 msgid "Choose which services should be automatically started at boot time"
 msgstr "起動時に自動的にたちあげるサービスを選んでください"
 
-#: ../../services.pm_.c:126
+#: ../../services.pm_.c:122
 msgid "Printing"
 msgstr "印刷"
 
-#: ../../services.pm_.c:127
+#: ../../services.pm_.c:123
 msgid "Internet"
 msgstr "インターネット"
 
-#: ../../services.pm_.c:130
+#: ../../services.pm_.c:126
 msgid "File sharing"
 msgstr "ファイル共有"
 
-#: ../../services.pm_.c:132
+#: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:934
 msgid "System"
 msgstr "システム"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:133
 msgid "Remote Administration"
 msgstr "リモート管理"
 
-#: ../../services.pm_.c:145
+#: ../../services.pm_.c:141
 msgid "Database Server"
 msgstr "データベースサーバ"
 
-#: ../../services.pm_.c:174
+#: ../../services.pm_.c:170
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "サービス: %d が %d 用に起動したのを登録"
@@ -7986,7 +9019,7 @@ msgstr "サービスとデーモン"
 
 #: ../../services.pm_.c:217
 msgid ""
-"No additionnal information\n"
+"No additional information\n"
 "about this service, sorry."
 msgstr ""
 "このサービスについては、追加の\n"
@@ -7996,11 +9029,214 @@ msgstr ""
 msgid "On boot"
 msgstr "起動時の動作"
 
+#: ../../services.pm_.c:236
+msgid "Start"
+msgstr "開始"
+
+#: ../../services.pm_.c:236
+msgid "Stop"
+msgstr "停止"
+
+#: ../../share/advertising/00-thanks.pl_.c:9
+msgid "Thank you for choosing Mandrake Linux 8.2"
+msgstr "Mandrake Linux 8.2をお選びいただきましてありがとうございます"
+
+#: ../../share/advertising/00-thanks.pl_.c:10
+msgid "Welcome to the Open Source world"
+msgstr "オープンソースの世界へようこそ"
+
+#: ../../share/advertising/00-thanks.pl_.c:11
+msgid ""
+"The success of MandrakeSoft is based upon the principle of Free Software. "
+"Your new operating system is the result of collaborative work on the part of "
+"the worldwide Linux Community"
+msgstr ""
+"MandrakeSoft の成功は、フリーソフトの原理に根ざしたものです。"
+"あなたの新オペレーティングシステムは、全世界の Linux コミュニティに"
+"よる共同作業の成果なのです。"
+
+#: ../../share/advertising/01-gnu.pl_.c:9
+msgid "Join the Free Software world"
+msgstr "フリーソフトの世界に参加しましょう"
+
+#: ../../share/advertising/01-gnu.pl_.c:10
+msgid ""
+"Get to know the Open Source community and become a member. Learn, teach, and "
+"help others by joining the many discussion forums that you will find in our "
+"\"Community\" webpages"
+msgstr ""
+"オープンソースコミュニティのことをもっと知って、その一員になりましょう。"
+"「コミュニティ」ウェブページにある各種フォーラムに参加して、学び、教え、"
+"ほかの人々を助けましょう。"
+
+#: ../../share/advertising/02-internet.pl_.c:9
+msgid "Internet and Messaging"
+msgstr "インターネットとメッセージ"
+
+#: ../../share/advertising/02-internet.pl_.c:10
+msgid ""
+"Mandrake Linux 8.2 provides the best software to access everything the "
+"Internet has to offer: Surf the web & view animations with Mozilla and "
+"Konqueror, exchange email & organize your personal information with "
+"Evolution and Kmail, and much more"
+msgstr ""
+"Mandrake Linux 8.2 はインターネットの提供するものすべてにアクセスできる"
+"最高のソフトを取りそろえています。ウェブをサーフィンして、動画を見るなら"
+"Mozilla と Konqueror があるし、メールの送受信と個人情報管理は"
+"Evolution と Kmail, その他なんでもあります。"
+
+#: ../../share/advertising/03-graphic.pl_.c:9
+msgid "Multimedia and Graphics"
+msgstr "マルチメディアと画像"
+
+#: ../../share/advertising/03-graphic.pl_.c:10
+msgid ""
+"Mandrake Linux 8.2 lets you push your multimedia computer to its limits! Use "
+"the latest software to play music and audio files, edit and organize your "
+"images and photos, watch TV and videos, and much more"
+msgstr ""
+"Mandrake Linux 8.2 は、マルチメディア機能を極限まで使い倒します！"
+"最新ソフトで音楽や音声ファイルの再生をしたり、画像や写真を管理したり、"
+"テレビを見たり、その他なんでもできます。"
+
+#: ../../share/advertising/04-develop.pl_.c:9
+msgid "Development"
+msgstr "開発用"
+
+#: ../../share/advertising/04-develop.pl_.c:10
+msgid ""
+"Mandrake Linux 8.2 is the ultimate development platform. Discover the power "
+"of the GNU gcc compiler as well as the best Open Source development "
+"environments"
+msgstr ""
+"Mandrake Linux 8.2 は究極の開発プラットホームです。"
+"GNU gcc コンパイラをはじめ、最高のオープンソース"
+"開発環境の威力を発見しましょう。"
+
+#: ../../share/advertising/05-contcenter.pl_.c:9
+msgid "Mandrake Control Center"
+msgstr "Mandrake コントロールセンター"
+
+#: ../../share/advertising/05-contcenter.pl_.c:10
+msgid ""
+"The Mandrake Linux 8.2 Control Center is a one-stop location for fully "
+"customizing and configuring your Mandrake system"
+msgstr ""
+"Mandrake Linux 8.2 コントロールセンターは、Mandrake システムの"
+"カスタマイズと設定のためのワンストップパネル集です。"
+
+#: ../../share/advertising/06-user.pl_.c:9
+msgid "User interfaces"
+msgstr "ユーザインターフェイス"
+
+#: ../../share/advertising/06-user.pl_.c:10
+msgid ""
+"Mandrake Linux 8.2 provides 11 different graphical desktop environments and "
+"window managers to choose from including GNOME 1.4, KDE 2.2.2, Window Maker "
+"0.8, and the rest"
+msgstr ""
+"Mandrake Linux 8.2 には11種類のグラフィックデスクトップ環境と"
+"ウィンドウマネージャが入っています。GNOME 1.4, KDE 2.2.2,"
+" Window Maker 0.8 などです。"
+
+#: ../../share/advertising/07-server.pl_.c:9
+msgid "Server Software"
+msgstr "サーバソフト"
+
+#: ../../share/advertising/07-server.pl_.c:10
+msgid ""
+"Transform your machine into a powerful server with just a few clicks of the "
+"mouse: Web server, email, firewall, router, file and print server, ..."
+msgstr ""
+"マウスをほんの数クリックするだけで、あなたのマシンは"
+"強力なサーバに早変わり！ウェブサーバ、メール、ファイアーウォール、"
+"ルータ、ファイルサーバに印刷サーバなどもろもろです。"
+
+#: ../../share/advertising/08-games.pl_.c:9
+msgid "Games"
+msgstr "ゲーム"
+
+#: ../../share/advertising/08-games.pl_.c:10
+msgid ""
+"Mandrake Linux 8.2 provides the best Open Source games - arcade, action, "
+"cards, sports, strategy, ..."
+msgstr ""
+"Mandrake Linux 8.2 には、最高のオープンソースゲームがついてきます。"
+"アーケード型、アクション型、カードゲーム、スポーツ、戦略ゲーム..."
+
+#: ../../share/advertising/09-MDKcampus.pl_.c:9
+msgid "MandrakeCampus"
+msgstr "MandrakeCampus"
+
+#: ../../share/advertising/09-MDKcampus.pl_.c:10
+msgid ""
+"Would you like to learn Linux simply, quickly, and for free? MandrakeSoft "
+"provides free Linux training, as well as a way to test your progress, at "
+"MandrakeCampus -- our online training center"
+msgstr ""
+"Linux を手軽にすばやく、無料で勉強したいですか？ MandrakeSoft は"
+"無料のLinux トレーニングや、すすみ具合をチェックする方法を提供しています。"
+"それがMandrakeCampus -- 弊社のオンライン研修センターです。"
+
+#: ../../share/advertising/10-MDKexpert.pl_.c:9
+msgid "MandrakeExpert"
+msgstr "Mandrakeエキスパート"
+
+#: ../../share/advertising/10-MDKexpert.pl_.c:10
+msgid ""
+"Quality support from the Linux Community, and from MandrakeSoft, is just "
+"around the corner. And if you're already a Linux veteran, become an \"Expert"
+"\" and share your knowledge at our support website"
+msgstr ""
+"Linux コミュニティと MandrakeSoft からの高質なサポートがすぐに得られます。"
+"そしてあなたが筋金入りの Linux 人なら、「エキスパート」になってサポート用"
+"ウェブサイトで知識を共有してください。"
+
+#: ../../share/advertising/11-consul.pl_.c:9
+msgid "MandrakeConsulting"
+msgstr "Mandrake コンサルティング"
+
+#: ../../share/advertising/11-consul.pl_.c:10
+msgid ""
+"For all of your IT projects, our consultants are ready to analyze your "
+"requirements and offer a customized solution. Benefit from MandrakeSoft's "
+"vast experience as a Linux producer to provide a true IT alternative for "
+"your business organization"
+msgstr ""
+"あらゆる IT プロジェクトについて、弊社のコンサルタントたちが要件を分析し、"
+"カスタム化したソリューションを提案いたします。Linux ベンダーとしての"
+" MandrakeSoft の莫大な経験を生かして、あなたのビジネス組織向けに"
+"真の IT代替案を提供いたします。"
+
+#: ../../share/advertising/12-MDKstore.pl_.c:9
+msgid "MandrakeStore"
+msgstr "MandrakeStore"
+
+#: ../../share/advertising/12-MDKstore.pl_.c:10
+msgid ""
+"A full range of Linux solutions, as well as special offers on products and "
+"'goodies', are available online at our e-store"
+msgstr ""
+"フルレンジのLinux ソリューションや、製品や各種アイテムの特価販売が、"
+"弊社のオンライン商店で手に入ります。"
+
+#: ../../share/advertising/13-Nvert.pl_.c:9
+msgid ""
+"For more information on MandrakeSoft's Professional Services and commercial "
+"offerings, please see the following web page:"
+msgstr ""
+"MandrakeSoft の専門サービスや販売商品について詳しくは以下の"
+"ウェブページを参照してください:"
+
+#: ../../share/advertising/13-Nvert.pl_.c:11
+msgid "http://www.mandrakesoft.com/sales/contact"
+msgstr "http://www.mandrakesoft.com/sales/contact"
+
 #: ../../standalone.pm_.c:25
 msgid "Installing packages..."
 msgstr "パッケージのインストール中..."
 
-#: ../../standalone/diskdrake_.c:63
+#: ../../standalone/diskdrake_.c:85
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -8008,20 +9244,20 @@ msgstr ""
 "パーティションテーブルが読めません，壊れているようです:(\n"
 "不正なパーティションを空白で埋めようとします"
 
-#: ../../standalone/drakautoinst_.c:44
+#: ../../standalone/drakautoinst_.c:45
 msgid "Error!"
 msgstr "エラー！"
 
-#: ../../standalone/drakautoinst_.c:45
+#: ../../standalone/drakautoinst_.c:46
 #, c-format
 msgid "I can't find needed image file `%s'."
 msgstr "必要な画像ファイル %s が見つかりません。"
 
-#: ../../standalone/drakautoinst_.c:47
+#: ../../standalone/drakautoinst_.c:48
 msgid "Auto Install Configurator"
 msgstr "自動インストール設定"
 
-#: ../../standalone/drakautoinst_.c:48
+#: ../../standalone/drakautoinst_.c:49
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
 "dangerous and must be used circumspectly.\n"
@@ -8046,22 +9282,35 @@ msgstr ""
 "\n"
 "続けますか？"
 
-#: ../../standalone/drakautoinst_.c:70
+#: ../../standalone/drakautoinst_.c:71
 msgid "Automatic Steps Configuration"
 msgstr "起動ステップ設定"
 
-#: ../../standalone/drakautoinst_.c:71
+#: ../../standalone/drakautoinst_.c:72
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
 "will be manual"
 msgstr ""
 "各ステップで、あなたのインストールと同じにするか、手動設定するかを選びます。"
 
-#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+#: ../../standalone/drakautoinst_.c:145
+msgid ""
+"\n"
+"Welcome.\n"
+"\n"
+"The parameters of the auto-install are available in the sections on the left"
+msgstr ""
+"\n"
+"いらっしゃいませ〜\n"
+"\n"
+"自動インストールのパラメータが左に表示されています"
+
+#: ../../standalone/drakautoinst_.c:243 ../../standalone/drakgw_.c:671
+#: ../../standalone/scannerdrake_.c:106
 msgid "Congratulations!"
 msgstr "おめでとうございます！"
 
-#: ../../standalone/drakautoinst_.c:113
+#: ../../standalone/drakautoinst_.c:244
 msgid ""
 "The floppy has been successfully generated.\n"
 "You may now replay your installation."
@@ -8069,15 +9318,1396 @@ msgstr ""
 "フロッピーが正しく作られました。\n"
 "これでインストールが再現できます。"
 
-#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
+#: ../../standalone/drakautoinst_.c:282
+msgid "Auto Install"
+msgstr "自動インストール"
+
+#: ../../standalone/drakautoinst_.c:352
+msgid "Add an item"
+msgstr "アイテム追加"
+
+#: ../../standalone/drakautoinst_.c:359
+msgid "Remove the last item"
+msgstr "最後のアイテムを削除"
+
+#: ../../standalone/drakbackup_.c:448 ../../standalone/drakbackup_.c:451
+#: ../../standalone/drakbackup_.c:455
+msgid ""
+"***********************************************************************\n"
+"\n"
+msgstr ""
+"***********************************************************************\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:449
+msgid ""
+"\n"
+"                      DrakBackup Report \n"
+"\n"
+msgstr ""
+"\n"
+"                      DrakBackup 報告 \n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:450
+msgid ""
+"\n"
+"                      DrakBackup Daemon Report\n"
+"\n"
+"\n"
+msgstr ""
+"\n"
+"                      DrakBackup デーモン報告\n"
+"\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:453
+msgid ""
+"\n"
+"\n"
+"***********************************************************************\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"***********************************************************************\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:454
+msgid ""
+"\n"
+"                    DrakBackup Report Details\n"
+"\n"
+"\n"
+msgstr ""
+"\n"
+"                    DrakBackup 詳細報告\n"
+"\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:476
+msgid "total progess"
+msgstr "進行状況"
+
+#: ../../standalone/drakbackup_.c:555 ../../standalone/drakbackup_.c:602
+msgid "Backup system files..."
+msgstr "システムファイルのバックアップ..."
+
+#: ../../standalone/drakbackup_.c:603 ../../standalone/drakbackup_.c:667
+msgid "Hard Disk Backup files..."
+msgstr "ハードディスクのバックアップファイル..."
+
+#: ../../standalone/drakbackup_.c:615
+msgid "Backup User files..."
+msgstr "ユーザファイルのバックアップ..."
+
+#: ../../standalone/drakbackup_.c:616
+msgid "Hard Disk Backup Progress..."
+msgstr "ハードディスクバックアップの進行..."
+
+#: ../../standalone/drakbackup_.c:666
+msgid "Backup Other files..."
+msgstr "他のファイルをバックアップ..."
+
+#: ../../standalone/drakbackup_.c:674
+#, c-format
+msgid ""
+"file list send by FTP : %s\n"
+" "
+msgstr ""
+"FTP で送るファイルのリスト: %s\n"
+" "
+
+#: ../../standalone/drakbackup_.c:677
+msgid ""
+"\n"
+"(!) FTP connexion problem: It was not possible to send your backup files by "
+"FTP.\n"
+msgstr ""
+"\n"
+"(!) FTP 接続のトラブル: FTPでバックアップファイルを送れませんでした。\n"
+
+#: ../../standalone/drakbackup_.c:687
+msgid "(!) Error during mail sending. \n"
+msgstr "(!) メール送信中にエラー。\n"
+
+#: ../../standalone/drakbackup_.c:728 ../../standalone/drakbackup_.c:739
+#: ../../standalone/drakbackup_.c:750 ../../standalone/drakfont_.c:787
+msgid "File Selection"
+msgstr "ファイルを選択"
+
+#: ../../standalone/drakbackup_.c:755
+msgid "Select the files or directories and click on 'Add'"
+msgstr "ファイルやディレクトリを選んで「追加」をクリックします"
+
+#: ../../standalone/drakbackup_.c:790
+msgid ""
+"\n"
+"Please check all options that you need.\n"
+msgstr ""
+"\n"
+"必要なオプションにチェックをつけてください。\n"
+
+#: ../../standalone/drakbackup_.c:791
+msgid ""
+"These options can backup and restore all files in your /etc directory.\n"
+msgstr ""
+"このオプションは /etc ディレクトリのファイルをすべてバックアップ・復元できま"
+"す。\n"
+
+#: ../../standalone/drakbackup_.c:792
+msgid "Backup your System files. ( /etc directory )"
+msgstr "システムファイルのバックアップ（/etcディレクトリ)"
+
+#: ../../standalone/drakbackup_.c:793
+msgid "Use incremental backup  (do not replace old backups)"
+msgstr "インクリメンタルバックアップ（古いバックアップは残す)"
+
+#: ../../standalone/drakbackup_.c:794
+msgid "Do not include critical files (passwd, group, fstab)"
+msgstr "重要ファイル (passwd, group, fstab) は含めない"
+
+#: ../../standalone/drakbackup_.c:795
+msgid ""
+"With this option you will be able to restore any version\n"
+" of your /etc directory."
+msgstr ""
+"このオプションでは、好きなバージョンの /etc ディレクトリを\n"
+"復元できます。"
+
+#: ../../standalone/drakbackup_.c:812
+msgid "Please check all users that you want to include in your backup."
+msgstr "バックアップに含めたいユーザを全員選んで下さい"
+
+#: ../../standalone/drakbackup_.c:839
+msgid "Do not include the browser cache"
+msgstr "ブラウザのキャッシュは含めない"
+
+#: ../../standalone/drakbackup_.c:840 ../../standalone/drakbackup_.c:864
+msgid "Use Incremental Backups  (do not replace old backups)"
+msgstr "インクリメンタルバックアップ（古いバックアップは残す)"
+
+#: ../../standalone/drakbackup_.c:862 ../../standalone/drakfont_.c:827
+msgid "Remove Selected"
+msgstr "選んだものを削除"
+
+#: ../../standalone/drakbackup_.c:900
+msgid "Windows (FAT32)"
+msgstr "Windows (FAT32)"
+
+#: ../../standalone/drakbackup_.c:939
+msgid "Users"
+msgstr "ユーザ名"
+
+#: ../../standalone/drakbackup_.c:964
+msgid "Use FTP connection to backup"
+msgstr "バックアップに FTP 接続を使用"
+
+#: ../../standalone/drakbackup_.c:967
+msgid "Please enter the host name or IP."
+msgstr "ホスト名か IP を入力してください。"
+
+#: ../../standalone/drakbackup_.c:972
+msgid ""
+"Please enter the directory to\n"
+" put the backup on this host."
+msgstr ""
+"このホスト上でそのディレクトリに\n"
+"バックアップを保存しますか？"
+
+#: ../../standalone/drakbackup_.c:977
+msgid "Please enter your login"
+msgstr "ログイン名を入力してください"
+
+#: ../../standalone/drakbackup_.c:982
+msgid "Please enter your password"
+msgstr "パスワードを入力してください"
+
+#: ../../standalone/drakbackup_.c:988
+msgid "Remember this password"
+msgstr "このパスワードを記憶する"
+
+#: ../../standalone/drakbackup_.c:1052 ../../standalone/drakbackup_.c:2048
+msgid "FTP Connection"
+msgstr "FTP 接続"
+
+#: ../../standalone/drakbackup_.c:1059 ../../standalone/drakbackup_.c:2056
+msgid "Secure Connection"
+msgstr "セキュア接続"
+
+#: ../../standalone/drakbackup_.c:1085 ../../standalone/drakbackup_.c:2889
+msgid "Use CD/DVDROM to backup"
+msgstr "CD/DVDROM にバックアップ"
+
+#: ../../standalone/drakbackup_.c:1088 ../../standalone/drakbackup_.c:2893
+msgid "Please choose your CD space"
+msgstr "CD スペースを選んでください"
+
+#: ../../standalone/drakbackup_.c:1094 ../../standalone/drakbackup_.c:2905
+msgid "Please check if you are using CDRW media"
+msgstr "CDRWを使っている場合はチェックしてください"
+
+#: ../../standalone/drakbackup_.c:1100 ../../standalone/drakbackup_.c:2911
+msgid "Please check if you want to erase your CDRW before"
+msgstr "まず CDRW を消去する場合にはここをクリック"
+
+#: ../../standalone/drakbackup_.c:1106
+msgid ""
+"Please check if you want to include\n"
+" install boot on your CD."
+msgstr ""
+"CD に起動用のbootを含めるなら\n"
+"チェックしてください。"
+
+#: ../../standalone/drakbackup_.c:1112
+msgid ""
+"Please enter your CD Writer device name\n"
+" ex: 0,1,0"
+msgstr ""
+"CD ライターのデバイス名を入力してください\n"
+"例: 0,1,0"
+
+#: ../../standalone/drakbackup_.c:1153
+msgid "Use tape to backup"
+msgstr "テープにバックアップ"
+
+#: ../../standalone/drakbackup_.c:1156
+msgid "Please enter the device name to use for backup"
+msgstr "バックアップ用デバイス名を入力してください"
+
+#: ../../standalone/drakbackup_.c:1162 ../../standalone/drakbackup_.c:1203
+#: ../../standalone/drakbackup_.c:2013
+msgid ""
+"Please enter the maximum size\n"
+" allowed for Drakbackup"
+msgstr ""
+"Drakbackupに許される最大サイズを\n"
+"入力してください"
+
+#: ../../standalone/drakbackup_.c:1195 ../../standalone/drakbackup_.c:2005
+msgid "Please enter the directory to save:"
+msgstr "保存するディレクトリを入力してください:"
+
+#: ../../standalone/drakbackup_.c:1209 ../../standalone/drakbackup_.c:2019
+msgid "Use quota for backup files."
+msgstr "バックアップファイルのクォータを使う"
+
+#: ../../standalone/drakbackup_.c:1267
+msgid "Network"
+msgstr "ネットワーク"
+
+#: ../../standalone/drakbackup_.c:1272
+msgid "CDROM / DVDROM"
+msgstr "CDROM / DVDROM"
+
+#: ../../standalone/drakbackup_.c:1277
+msgid "HardDrive / NFS"
+msgstr "ハードドライブ / NFS"
+
+#: ../../standalone/drakbackup_.c:1297 ../../standalone/drakbackup_.c:1301
+#: ../../standalone/drakbackup_.c:1305
+msgid "hourly"
+msgstr "毎時間"
+
+#: ../../standalone/drakbackup_.c:1298 ../../standalone/drakbackup_.c:1302
+#: ../../standalone/drakbackup_.c:1305
+msgid "daily"
+msgstr "毎日"
+
+#: ../../standalone/drakbackup_.c:1299 ../../standalone/drakbackup_.c:1303
+#: ../../standalone/drakbackup_.c:1305
+msgid "weekly"
+msgstr "毎週"
+
+#: ../../standalone/drakbackup_.c:1300 ../../standalone/drakbackup_.c:1304
+#: ../../standalone/drakbackup_.c:1305
+msgid "monthly"
+msgstr "毎月"
+
+#: ../../standalone/drakbackup_.c:1312
+msgid "Use daemon"
+msgstr "デーモンを使う"
+
+#: ../../standalone/drakbackup_.c:1317
+msgid ""
+"Please choose the time \n"
+"interval between each backup"
+msgstr "バックアップの間隔を選んでください"
+
+#: ../../standalone/drakbackup_.c:1323
+msgid ""
+"Please choose the\n"
+"media for backup."
+msgstr ""
+"バックアップのメディアを\n"
+"選んでくださいね。"
+
+#: ../../standalone/drakbackup_.c:1327
+msgid "Use Hard Drive with daemon"
+msgstr "デーモンでハードドライブを使う"
+
+#: ../../standalone/drakbackup_.c:1329
+msgid "Use FTP with daemon"
+msgstr "デーモンで FTP を使う"
+
+#: ../../standalone/drakbackup_.c:1333
+msgid "Please be sure that the cron daemon is included in your services."
+msgstr "サービスに cron デーモンが含まれていることを確認してください"
+
+#: ../../standalone/drakbackup_.c:1369
+msgid "Send mail report after each backup to :"
+msgstr "バックアップ毎の報告メール送り先: "
+
+#: ../../standalone/drakbackup_.c:1411
+msgid "What"
+msgstr "何を"
+
+#: ../../standalone/drakbackup_.c:1416
+msgid "Where"
+msgstr "そこに"
+
+#: ../../standalone/drakbackup_.c:1421
+msgid "When"
+msgstr "いつ"
+
+#: ../../standalone/drakbackup_.c:1426
+msgid "More Options"
+msgstr "その他オプション"
+
+#: ../../standalone/drakbackup_.c:1445 ../../standalone/drakbackup_.c:2801
+msgid "Drakbackup Configuration"
+msgstr "Drakbackup 設定"
+
+#: ../../standalone/drakbackup_.c:1463
+msgid "Please choose where you want to backup"
+msgstr "バックアップ先を選んで下さい"
+
+#: ../../standalone/drakbackup_.c:1465
+msgid "on Hard Drive"
+msgstr "ハードドライブへ"
+
+#: ../../standalone/drakbackup_.c:1476
+msgid "across Network"
+msgstr "ネットワーク経由で"
+
+#: ../../standalone/drakbackup_.c:1540
+msgid "Please choose what you want to backup"
+msgstr "バックアップしたいものを選んで下さい"
+
+#: ../../standalone/drakbackup_.c:1541
+msgid "Backup system"
+msgstr "システムをバックアップ"
+
+#: ../../standalone/drakbackup_.c:1542
+msgid "Backup Users"
+msgstr "ユーザをバックアップ"
+
+#: ../../standalone/drakbackup_.c:1545
+msgid "Select user manually"
+msgstr "ユーザを手動で選ぶ"
+
+#: ../../standalone/drakbackup_.c:1627
+msgid ""
+"\n"
+"Backup Sources: \n"
+msgstr ""
+"\n"
+"バックアップ元: \n"
+
+#: ../../standalone/drakbackup_.c:1628
+msgid ""
+"\n"
+"- System Files:\n"
+msgstr ""
+"\n"
+"- システムファイル:\n"
+
+#: ../../standalone/drakbackup_.c:1630
+msgid ""
+"\n"
+"- User Files:\n"
+msgstr ""
+"\n"
+"- ユーザファイル:\n"
+
+#: ../../standalone/drakbackup_.c:1632
+msgid ""
+"\n"
+"- Other Files:\n"
+msgstr ""
+"\n"
+"- その他ファイル:\n"
+
+#: ../../standalone/drakbackup_.c:1634
+#, c-format
+msgid ""
+"\n"
+"- Save on Hard drive on path : %s\n"
+msgstr ""
+"\n"
+"- ハードドライブ上の保存パス : %s\n"
+
+#: ../../standalone/drakbackup_.c:1635
+#, c-format
+msgid ""
+"\n"
+"- Save on FTP on host : %s\n"
+msgstr ""
+"\n"
+"- FTP での保存先ホスト : %s\n"
+
+#: ../../standalone/drakbackup_.c:1636
+#, c-format
+msgid ""
+"\t\t user name: %s\n"
+"\t\t on path: %s \n"
+msgstr ""
+"\t\t ユーザ名: %s\n"
+"\t\t パス: %s \n"
+
+#: ../../standalone/drakbackup_.c:1637
+msgid ""
+"\n"
+"- Options:\n"
+msgstr ""
+"\n"
+"- オプション:\n"
+
+#: ../../standalone/drakbackup_.c:1638
+msgid "\tDo not include System Files\n"
+msgstr "\tシステムファイルは含めない\n"
+
+#: ../../standalone/drakbackup_.c:1639
+msgid "\tBackups use tar and bzip2\n"
+msgstr "\tバックアップで tar と bzip2を使用\n"
+
+#: ../../standalone/drakbackup_.c:1640
+msgid "\tBackups use tar and gzip\n"
+msgstr "\tバックアップで tar と gzipを使用\n"
+
+#: ../../standalone/drakbackup_.c:1641
+#, c-format
+msgid ""
+"\n"
+"- Daemon (%s) include :\n"
+msgstr ""
+"\n"
+"- デーモン (%s) が含むもの :\n"
+
+#: ../../standalone/drakbackup_.c:1642
+msgid "\t-Hard drive.\n"
+msgstr "\t-ハードドライブ。\n"
+
+#: ../../standalone/drakbackup_.c:1643
+msgid "\t-CDROM.\n"
+msgstr "\t-CDROM.\n"
+
+#: ../../standalone/drakbackup_.c:1644
+msgid "\t-Network by FTP.\n"
+msgstr "\t-ネットワークで FTP.\n"
+
+#: ../../standalone/drakbackup_.c:1645
+msgid "\t-Network by SSH.\n"
+msgstr "\t-ネットワークで SSH.\n"
+
+#: ../../standalone/drakbackup_.c:1647
+msgid "No configuration, please click Wizard or Advanced.\n"
+msgstr "設定がありません。ウィザードか上級をクリックしてください\n"
+
+#: ../../standalone/drakbackup_.c:1652
+msgid ""
+"List of data to restore:\n"
+"\n"
+msgstr ""
+"復元するデータの一覧:\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:1753
+msgid ""
+"List of data corrupted:\n"
+"\n"
+msgstr ""
+"壊れているデータ一覧:\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:1755
+msgid "Please uncheck or remove it on next time."
+msgstr "次回にチェックをはずすか削除してください。"
+
+#: ../../standalone/drakbackup_.c:1765
+msgid "Backup files are corrupted"
+msgstr "バックアップファイルが壊れています"
+
+#: ../../standalone/drakbackup_.c:1786
+msgid "          All your selectionned data have been          "
+msgstr "          選択したデータはすべて          "
+
+#: ../../standalone/drakbackup_.c:1787
+#, c-format
+msgid "          Successfuly Restored on %s       "
+msgstr "          %s 上に復元されました      "
+
+#: ../../standalone/drakbackup_.c:1886
+msgid "         Restore Configuration       "
+msgstr "         設定復元       "
+
+#: ../../standalone/drakbackup_.c:1904
+msgid "OK to restore the other files."
+msgstr "他のファイル復元にはOKを"
+
+#: ../../standalone/drakbackup_.c:1922
+msgid "User list to restore (only the most recent date per user is important)"
+msgstr "復元するユーザの一覧（各ユーザの最新の日付だけが重要です）"
+
+#: ../../standalone/drakbackup_.c:1972
+msgid "Backup the system files before:"
+msgstr "システムファイルのバックアップ期限:"
+
+#: ../../standalone/drakbackup_.c:1974
+msgid "please choose the date to restore"
+msgstr "復元する日付を選択してください"
+
+#: ../../standalone/drakbackup_.c:2002
+msgid "Use Hard Disk to backup"
+msgstr "バックアップにハードディスクを使用"
+
+#: ../../standalone/drakbackup_.c:2083
+msgid "Restore from Hard Disk."
+msgstr "ハードディスクから復元する"
+
+#: ../../standalone/drakbackup_.c:2085
+msgid "Please enter the directory where backups are stored"
+msgstr "バックアップの保存ディレクトリを入力してください"
+
+#: ../../standalone/drakbackup_.c:2143
+msgid "Select another media to restore from"
+msgstr "復元元のメディアを選びなおしてください"
+
+#: ../../standalone/drakbackup_.c:2145
+msgid "Other Media"
+msgstr "その他メディア"
+
+#: ../../standalone/drakbackup_.c:2151
+msgid "Restore system"
+msgstr "システム復元"
+
+#: ../../standalone/drakbackup_.c:2152
+msgid "Restore Users"
+msgstr "ユーザ復元"
+
+#: ../../standalone/drakbackup_.c:2153
+msgid "Restore Other"
+msgstr "その他ファイルを復元"
+
+#: ../../standalone/drakbackup_.c:2155
+msgid "select path to restore (instead of / )"
+msgstr "復元パスを選ぶ（/以外)"
+
+#: ../../standalone/drakbackup_.c:2159
+msgid "Do new backup before restore (only for incremental backups.)"
+msgstr "復元前に新規バックアップ（インクリメンタルバックアップのみ）"
+
+#: ../../standalone/drakbackup_.c:2160
+msgid "Remove user directories before restore."
+msgstr "復元前にユーザディレクトリを削除"
+
+#: ../../standalone/drakbackup_.c:2217
+msgid "Restore all backups"
+msgstr "全バックアップの復元"
+
+#: ../../standalone/drakbackup_.c:2225
+msgid "Custom Restore"
+msgstr "カスタム復元"
+
+#: ../../standalone/drakbackup_.c:2266 ../../standalone/drakbackup_.c:2291
+#: ../../standalone/drakbackup_.c:2312 ../../standalone/drakbackup_.c:2333
+#: ../../standalone/drakbackup_.c:2351 ../../standalone/drakbackup_.c:2383
+#: ../../standalone/drakbackup_.c:2399 ../../standalone/drakbackup_.c:2419
+#: ../../standalone/drakbackup_.c:2438 ../../standalone/drakbackup_.c:2460
+#: ../../standalone/drakfont_.c:575
+msgid "Help"
+msgstr "ヘルプ"
+
+#: ../../standalone/drakbackup_.c:2269 ../../standalone/drakbackup_.c:2296
+#: ../../standalone/drakbackup_.c:2315 ../../standalone/drakbackup_.c:2336
+#: ../../standalone/drakbackup_.c:2354 ../../standalone/drakbackup_.c:2402
+#: ../../standalone/drakbackup_.c:2422 ../../standalone/drakbackup_.c:2441
+msgid "Previous"
+msgstr "もどる"
+
+#: ../../standalone/drakbackup_.c:2271 ../../standalone/drakbackup_.c:2338
+#: ../../standalone/logdrake_.c:224
+msgid "Save"
+msgstr "保存"
+
+#: ../../standalone/drakbackup_.c:2317
+msgid "Build Backup"
+msgstr "バックアップ構築"
+
+#: ../../standalone/drakbackup_.c:2356 ../../standalone/drakbackup_.c:3033
+msgid "Restore"
+msgstr "復元"
+
+#: ../../standalone/drakbackup_.c:2404 ../../standalone/drakbackup_.c:2424
+#: ../../standalone/drakbackup_.c:2445
+msgid "Next"
+msgstr "次"
+
+#: ../../standalone/drakbackup_.c:2478
+msgid ""
+"Please Build backup before to restore it...\n"
+" or verify that your path to save is correct."
+msgstr ""
+"復元するにはバックアップをまず構築してください...\n"
+"あるいは保存先パスは正しいですか？"
+
+#: ../../standalone/drakbackup_.c:2499
+msgid ""
+"Error durind sendmail\n"
+"  your report mail was not sent\n"
+"  Please configure sendmail"
+msgstr ""
+"メール送信エラー\n"
+"  報告メールは送信できません\n"
+"  sendmailを設定してください"
+
+#: ../../standalone/drakbackup_.c:2522
+msgid "Package List to Install"
+msgstr "インストールするパッケージ一覧"
+
+#: ../../standalone/drakbackup_.c:2550
+msgid ""
+"Error durind sending file via FTP.\n"
+" Please correct your FTP configuration."
+msgstr ""
+"FTPでのファイル転送中にエラー.\n"
+"FTP 設定をなおしてください."
+
+#: ../../standalone/drakbackup_.c:2573
+msgid "Please select data to restore..."
+msgstr "復元データを選んでくださいね。"
+
+#: ../../standalone/drakbackup_.c:2594
+msgid "Please select media for backup..."
+msgstr "バックアップ用メディアを選んでくださいね。"
+
+#: ../../standalone/drakbackup_.c:2616
+msgid "Please select data to backup..."
+msgstr "バックアップするデータを選んでください..."
+
+#: ../../standalone/drakbackup_.c:2638
+msgid ""
+"No configuration file found \n"
+"please click Wizard or Advanced."
+msgstr ""
+"設定ファイルが見つかりません\n"
+"ウィザードか上級をクリックしてください。"
+
+#: ../../standalone/drakbackup_.c:2659
+msgid "Under Devel ... please wait."
+msgstr "まだ開発中...待っててください。"
+
+#: ../../standalone/drakbackup_.c:2739
+msgid "Backup system files"
+msgstr "システムファイルをバックアップ"
+
+#: ../../standalone/drakbackup_.c:2741
+msgid "Backup user files"
+msgstr "ユーザファイルをバックアップ"
+
+#: ../../standalone/drakbackup_.c:2743
+msgid "Backup other files"
+msgstr "その他ファイルをバックアップ"
+
+#: ../../standalone/drakbackup_.c:2745 ../../standalone/drakbackup_.c:2776
+msgid "Total Progress"
+msgstr "全体の進行状況"
+
+#: ../../standalone/drakbackup_.c:2767
+msgid "files sending by FTP"
+msgstr "FTPでファイル送信中"
+
+#: ../../standalone/drakbackup_.c:2771
+msgid "Sending files..."
+msgstr "ファイル送信中..."
+
+#: ../../standalone/drakbackup_.c:2841
+msgid "Data list to include on CDROM."
+msgstr "CDROMに含めるデータ一覧"
+
+#: ../../standalone/drakbackup_.c:2899
+msgid "Please enter the cd writer speed"
+msgstr "CDライターの速度を入力してください"
+
+#: ../../standalone/drakbackup_.c:2917
+msgid "Please enter your CD Writer device name (ex: 0,1,0)"
+msgstr "CDライタのデバイス名を入力（例: 0,1,0)"
+
+#: ../../standalone/drakbackup_.c:2923
+msgid "Please check if you want to include install boot on your CD."
+msgstr "インストールしたいパッケージを選んで下さい"
+
+#: ../../standalone/drakbackup_.c:2989
+msgid "Backup Now from configuration file"
+msgstr "設定ファイルから今すぐバックアップ"
+
+#: ../../standalone/drakbackup_.c:2999
+msgid "View Backup Configuration."
+msgstr "バックアップ設定を見る"
+
+#: ../../standalone/drakbackup_.c:3020
+msgid "Wizard Configuration"
+msgstr "ウィザード設定"
+
+#: ../../standalone/drakbackup_.c:3024
+msgid "Advanced Configuration"
+msgstr "上級設定"
+
+#: ../../standalone/drakbackup_.c:3028
+msgid "Backup Now"
+msgstr "今すぐパックアップ"
+
+#: ../../standalone/drakbackup_.c:3053
+msgid "Drakbackup"
+msgstr "Drakbackup"
+
+#: ../../standalone/drakbackup_.c:3104
+msgid ""
+"options description:\n"
+"\n"
+" In this step Drakbackup allow you to change:\n"
+"\n"
+" - The compression mode:\n"
+"    \n"
+"      If you check bzip2 compression, you will compress\n"
+"      your data better than gzip (about 2-10 %).\n"
+"      This option is not checked by default because\n"
+"      this compression mode needs more time ( about 1000% more).\n"
+" \n"
+" - The update mode:\n"
+"\n"
+"      This option will update your backup, but this\n"
+"      option is not really useful because you need to\n"
+"      decompress your backup before you can update it.\n"
+"      \n"
+" - the .backupignore mode:\n"
+"\n"
+"      Like with cvs, Drakbackup will ignore all references\n"
+"      included in .backupignore files in each directories.\n"
+"      ex: \n"
+"         /*> cat .backupignore*/\n"
+"         *.o\n"
+"         *~\n"
+"         ...\n"
+"      \n"
+"\n"
+msgstr ""
+"オプションの説明:\n"
+"\n"
+" このステップでは、Drakbackup で以下が変更できます:\n"
+"\n"
+" - 圧縮モード:\n"
+"    \n"
+"      bzip2 圧縮を選べば、圧縮率は gzip より高く\n"
+"      なります ( 2-10 %ほど改善).\n"
+"      デフォルトでは無効にしてあります。圧縮にかかる\n"
+"      時間が増えるからです ( 10倍程度).\n"
+" \n"
+" - 更新モード:\n"
+"\n"
+"      このオプションはバックアップを更新してくれますが、\n"
+"      実はあまり役にたちません。更新するときバックアップを\n"
+"      わざわざ展開しないとダメだからです。\n"
+"      \n"
+" - .backupignore （バックアップ無視）モード:\n"
+"\n"
+"      cvs と同じように、Drakbackup は 各ディレクトリの\n"
+"      .backupignore ファイルに記述されたものを無視します。\n"
+"      例: \n"
+"         /*> cat .backupignore*/\n"
+"         *.o\n"
+"         *~\n"
+"         ...\n"
+"      \n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:3134
+msgid ""
+"\n"
+" Some errors during sendmail are caused by \n"
+" a bad configuration of postfix. To solve it you have to\n"
+" set myhostname or mydomain in /etc/postfix/main.cf\n"
+"\n"
+msgstr ""
+"\n"
+" メール送信中の一部のエラーは、postfixの設定が\n"
+" まちがっているせいです。これを直すには、\n"
+" /etc/postfix/main.cfの myhostname か mydomain を設定します。\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:3142
+msgid ""
+"options description:\n"
+"\n"
+" - Backup system files:\n"
+"       \n"
+"\tThis option allows you to backup your /etc directory,\n"
+"\twhich contains all configuration files. Please be\n"
+"\tcareful during the restore step to not overwrite:\n"
+"\t\t/etc/passwd \n"
+"\t\t/etc/group \n"
+"\t\t/etc/fstab\n"
+"\n"
+" - Backup User files: \n"
+"\n"
+"\tThis option allows you select all users that you want \n"
+"\tto backup.\n"
+"\tTo preserve disk space, it is recommended that you \n"
+"\tdo not include web browser's cache.\n"
+"\n"
+" - Backup Other files: \n"
+"\n"
+"\tThis option allows you to add more data to save.\n"
+"\tWith the other backup it's not possible at the \n"
+"\tmoment to select select incremental backup.\t\t\n"
+" \n"
+" - Incremental Backups:\n"
+"\n"
+"\tThe incremental backup is the most powerful \n"
+"\toption for backup. This option allows you \n"
+"\tto backup all your data the first time, and \n"
+"\tonly the changed afterward.\n"
+"\tThen you will be able, during the restore\n"
+"\tstep, to restore your data from a specified\n"
+"\tdate.\n"
+"\tIf you have not selected this option all\n"
+"\told backups are deleted before each backup.    \n"
+"\n"
+"\n"
+msgstr ""
+"オプションの説明:\n"
+"\n"
+" - システムファイルのバックアップ:\n"
+"       \n"
+"\tこのオプションは、設定ファイルが保存されている\n"
+"\t /etc ディレクトリをバックアップします。復元時には\n"
+"\t以下のファイルを上書きしないように注意してください:\n"
+"\t\t/etc/passwd \n"
+"\t\t/etc/group \n"
+"\t\t/etc/fstab\n"
+"\n"
+" - ユーザファイルのバックアップ: \n"
+"\n"
+"\tこのオプションは、バックアップしたいユーザを選びます。\n"
+"\tディスク節約のため、ウェブブラウザのキャッシュは含めない\n"
+"\tようにしましょう。\n"
+"\n"
+" - その他ファイルをバックアップ: \n"
+"\n"
+"\t保存したいデータをさらに追加するオプションです。\n"
+"\tこれを選ぶと、インクリメンタルバックアップは\n"
+"\t選べません。\t\t\n"
+" \n"
+" - インクリメンタルバックアップ:\n"
+"\n"
+"\tこれはバックアップ最強のオプションです。\n"
+"\t最初のバックアップでは全データがバックアップされ、\n"
+"\tその後のバックアップでは変更されたものだけが\n"
+"\t保存されます。\n"
+"\tそして復元するときには、指定日時のデータが復元\n"
+"\tできます。\n"
+"\tこのオプションを選ばないと、古いバックアップは\n"
+"\t毎回削除されます。    \n"
+"\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:3181
+msgid ""
+"restore description:\n"
+" \n"
+"Only the most recent date will be used ,because with incremental \n"
+"backups it is necesarry to restore one by one each older backups.\n"
+"\n"
+"So if you don't like to restore an user please unselect all his\n"
+"check box.\n"
+"\n"
+"Otherwise, you are able to select only one of this\n"
+"\n"
+" - Incremental Backups:\n"
+"\n"
+"\tThe incremental backup is the most powerfull \n"
+"\toption to use backup, this option allow you \n"
+"\tto backup all your data the first time, and \n"
+"\tonly the changed after.\n"
+"\tSo you will be able during the restore\n"
+"\tstep, to restore your data from a specified\n"
+"\tdate.\n"
+"\tIf you have not selected this options all\n"
+"\told backups are deleted before each backup.    \n"
+"\n"
+"\n"
+"\n"
+msgstr ""
+"復元の説明:\n"
+" \n"
+"使われるのは最新データだけです。インクリメンタルバックアップでは\n"
+"新しいものから順に一つづつ復元しなければならないからです。\n"
+"\n"
+"したがって、特定ユーザを復元したくなければ、その人のチェック\n"
+"ボックスをすべてはずしてください。\n"
+"\n"
+"さもないとこの中の一つしかえらべません\n"
+"\n"
+" - インクリメンタルバックアップ:\n"
+"\n"
+"\tこれはバックアップ最強のオプションです。\n"
+"\t最初のバックアップでは全データがバックアップされ、\n"
+"\tその後のバックアップでは変更されたものだけが\n"
+"\t保存されます。\n"
+"\tそして復元するときには、指定日時のデータが復元\n"
+"\tできます。\n"
+"\tこのオプションを選ばないと、古いバックアップは\n"
+"\t毎回削除されます。    \n"
+"\n"
+"\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:3207 ../../standalone/drakbackup_.c:3282
+msgid ""
+" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
+msgstr ""
+" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
+
+#: ../../standalone/drakbackup_.c:3209 ../../standalone/drakbackup_.c:3284
+msgid ""
+" This program is free software; you can redistribute it and/or modify\n"
+" it under the terms of the GNU General Public License as published by\n"
+" the Free Software Foundation; either version 2, or (at your option)\n"
+" any later version.\n"
+"\n"
+" This program is distributed in the hope that it will be useful,\n"
+" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+" GNU General Public License for more details.\n"
+"\n"
+" You should have received a copy of the GNU General Public License\n"
+" along with this program; if not, write to the Free Software\n"
+" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
+msgstr ""
+" このプログラムはフリーソフトウェアです。Free Software Foundationの\n"
+" 発行する GNU 一般共有ライセンスのバージョン2以降の条件に従って\n"
+" 再配布・改変ができます。\n"
+"\n"
+" このプログラムは、役に立つべく配布されてはいますが、\n"
+" まったくの無保証です。商業性や、ある目的への適合性について\n"
+" 明示的、暗示的を問わず一切の保証を行いません。詳細は\n"
+" GNU 一般共有ライセンスを参照してください。\n"
+"\n"
+" GNU 一般共有ライセンスがこのプログラムには付属してきたはず\n"
+" です。付属していない場合には、以下に連絡して入手してください：\n"
+" Free Software Foundation, Inc., 59 Temple Place - Suite 330, \n"
+" Boston, MA 02111-1307, USA."
+
+#: ../../standalone/drakbackup_.c:3223
+msgid ""
+"Description:\n"
+"\n"
+"  Drakbackup is used to backup your system.\n"
+"  During the configuration you can select: \n"
+"\t- System files, \n"
+"\t- Users files, \n"
+"\t- Other files.\n"
+"\tor All your system ...  and Other (like Windows Partitions)\n"
+"\n"
+"  Drakbackup allows you to backup your system on:\n"
+"\t- Harddrive.\n"
+"\t- NFS.\n"
+"\t- CDROM (CDRW), DVDROM (with autoboot, rescue and autoinstall.).\n"
+"\t- FTP.\n"
+"\t- Rsync.\n"
+"\t- Webdav.\n"
+"\t- Tape.\n"
+"\n"
+"  Drakbackup allows you to restore your system to\n"
+"  a user selected directory.\n"
+"\n"
+"  Per default all backup will be stored on your\n"
+"  /var/lib/drakbackup directory\n"
+"\n"
+"  Configuration file:\n"
+"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"\n"
+"\n"
+"Restore Step:\n"
+"  \n"
+"  During the restore step, DrakBackup will remove \n"
+"  your original directory and verify that all \n"
+"  backup files are not corrupted. It is recommended \n"
+"  you do a last backup before restoring.\n"
+"\n"
+"\n"
+msgstr ""
+"説明:\n"
+"\n"
+"  Drakbackup はシステムのバックアップに使います。\n"
+"  設定に応じて、バックアップファイルが選べます: \n"
+"\t- システムファイル\n"
+"\t- ユーザファイル\n"
+"\t- その他ファイル\n"
+"\tあるいは全システムや、その他システム（ウィンドウズ\n"
+"\tパーティション）もバックアップできます。\n"
+"\n"
+"  Drakbackup では、以下のメディアにバックアップができます:\n"
+"\t- ハードドライブ.\n"
+"\t- NFS.\n"
+"\t- CDROM (CDRW), DVDROM (autoboot, レスキュー、自動インストールも可).\n"
+"\t- FTP.\n"
+"\t- Rsync.\n"
+"\t- Webdav.\n"
+"\t- テープ\n"
+"\n"
+"  Drakbackup では、他のディレクトリを選んでそこに\n"
+"  システムを復元できます。\n"
+"\n"
+"  デフォルトではすべてのバックアップは\n"
+"  /var/lib/drakbackup ディレクトリに保存されます。\n"
+"\n"
+"  設定ファイル:\n"
+"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"\n"
+"\n"
+"復元のやり方:\n"
+"  \n"
+"  復元ステップでは DrakBackup はもとのディレクトリを\n"
+"  削除して、すべてのバックアップファイルが完全かどうか\n"
+"  確かめます。復元する前に、その時点のシステムをバック\n"
+"  アップしておきましょう。\n"
+"\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:3261
+msgid ""
+"options description:\n"
+"\n"
+"Please be careful when you are using ftp backup, because only \n"
+"backups that are already built are sent to the server.\n"
+"So at the moment, you need to build the backup on your hard \n"
+"drive before sending it to the server.\n"
+"\n"
+msgstr ""
+"オプション説明:\n"
+"\n"
+"ftp バックアップを使うときは注意しましょう。サーバに送られる\n"
+"のは構築済みのバックアップだけです。したがって、サーバに送る\n"
+"前に、まずハードドライブ上にバックアップ構築が必要になります。\n"
+"\n"
+
+#: ../../standalone/drakbackup_.c:3270
+msgid ""
+"\n"
+"Restore Backup Problems:\n"
+"\n"
+"During the restore step, Drakbackup will verify all your\n"
+"backup files before restoring them.\n"
+"Before the restore, Drakbackup will remove \n"
+"your original directory, and you will loose all your \n"
+"data. It is important to be careful and not modify the \n"
+"backup data files by hand.\n"
+msgstr ""
+"\n"
+"バックアップ復元の問題:\n"
+"\n"
+"復元ステップ中に、Drakbackup は復元に先立ってすべての\n"
+"バックアップファイルをチェックします。\n"
+"復元を始める前に、Drakbackup は今のディレクトリを削除\n"
+"するので、いまのデータは全部消えます。ですから、バック\n"
+"アップデータのファイルは手で改変しないほうが賢明です。\n"
+
+#: ../../standalone/drakbackup_.c:3298
+msgid ""
+"Description:\n"
+"\n"
+"  Drakbackup is used to backup your system.\n"
+"  During the configuration you can select \n"
+"\t- System files, \n"
+"\t- Users files, \n"
+"\t- Other files.\n"
+"\tor All your system ...  and Other (like Windows Partitions)\n"
+"\n"
+"  Drakbackup allows you to backup your system on:\n"
+"\t- Harddrive.\n"
+"\t- NFS.\n"
+"\t- CDROM (CDRW), DVDROM (with autoboot, rescue and autoinstall.).\n"
+"\t- FTP.\n"
+"\t- Rsync.\n"
+"\t- Webdav.\n"
+"\t- Tape.\n"
+"\n"
+"  Drakbackup allows you to restore your system to\n"
+"  a user selected directory.\n"
+"\n"
+"  Per default all backup will be stored on your\n"
+"  /var/lib/drakbackup directory\n"
+"\n"
+"  Configuration file:\n"
+"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"\n"
+"Restore Step:\n"
+"  \n"
+"  During the restore step, Drakbackup will remove\n"
+"  your original directory and verify that all\n"
+"  backup files are not corrupted. It is recommended\n"
+"  you do a last backup before restoring.\n"
+" \n"
+"\n"
+msgstr ""
+"  Drakbackup はシステムのバックアップに使います。\n"
+"  設定に応じて、バックアップファイルが選べます: \n"
+"\t- システムファイル\n"
+"\t- ユーザファイル\n"
+"\t- その他ファイル\n"
+"\tあるいは全システムや、その他システム（ウィンドウズ\n"
+"\tパーティション）もバックアップできます。\n"
+"\n"
+"  Drakbackup では、以下のメディアにバックアップができます:\n"
+"\t- ハードドライブ.\n"
+"\t- NFS.\n"
+"\t- CDROM (CDRW), DVDROM (autoboot, レスキュー、自動インストールも可).\n"
+"\t- FTP.\n"
+"\t- Rsync.\n"
+"\t- Webdav.\n"
+"\t- テープ\n"
+"\n"
+"  Drakbackup では、他のディレクトリを選んでそこに\n"
+"  システムを復元できます。\n"
+"\n"
+"  デフォルトではすべてのバックアップは\n"
+"  /var/lib/drakbackup ディレクトリに保存されます。\n"
+"\n"
+"  設定ファイル:\n"
+"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"\n"
+"復元のやり方:\n"
+"  \n"
+"  復元ステップでは DrakBackup はもとのディレクトリを\n"
+"  削除して、すべてのバックアップファイルが完全かどうか\n"
+"  確かめます。復元する前に、その時点のシステムをバック\n"
+"  アップしておきましょう。\n"
+"\n"
+"\n"
+
+#: ../../standalone/drakboot_.c:58
+#, c-format
+msgid "Installation of %s failed. The following error occured:"
+msgstr "%s のインストールに失敗しました。以下のエラーが発生:"
+
+#: ../../standalone/drakfont_.c:229
+msgid "Search installed fonts"
+msgstr "インストール済みフォントを検索"
+
+#: ../../standalone/drakfont_.c:231
+msgid "Unselect fonts installed"
+msgstr "インストール済みフォントを選択しない"
+
+#: ../../standalone/drakfont_.c:252
+msgid "parse all fonts"
+msgstr "すべてのフォントをチェック"
+
+#: ../../standalone/drakfont_.c:253
+msgid "no fonts found"
+msgstr "フォントが見つかりません"
+
+#: ../../standalone/drakfont_.c:261 ../../standalone/drakfont_.c:303
+#: ../../standalone/drakfont_.c:352 ../../standalone/drakfont_.c:410
+#: ../../standalone/drakfont_.c:417 ../../standalone/drakfont_.c:443
+#: ../../standalone/drakfont_.c:455 ../../standalone/drakfont_.c:468
+msgid "done"
+msgstr "完了"
+
+#: ../../standalone/drakfont_.c:265
+msgid "could not find any font in your mounted partitions"
+msgstr "マウントされたパーティションにはフォントが見つかりません"
+
+#: ../../standalone/drakfont_.c:301
+msgid "Reselect correct fonts"
+msgstr "正しいフォントを選び直す"
+
+#: ../../standalone/drakfont_.c:304
+msgid "could not find any font.\n"
+msgstr "フォントが見つかりません。\n"
+
+#: ../../standalone/drakfont_.c:327
+msgid "Search fonts in installed list"
+msgstr "インストール済み一覧からフォントを探す"
+
+#: ../../standalone/drakfont_.c:350
+msgid "Fonts copy"
+msgstr "フォントをコピー"
+
+#: ../../standalone/drakfont_.c:353
+msgid "True Type fonts installation"
+msgstr "True Type フォントのインストール"
+
+#: ../../standalone/drakfont_.c:357
+msgid "please wait during ttmkfdir..."
+msgstr "ttmkfdir 中なので少々お待ちを..."
+
+#: ../../standalone/drakfont_.c:359
+msgid "True Type install done"
+msgstr "True Type インストール完了"
+
+#: ../../standalone/drakfont_.c:366 ../../standalone/drakfont_.c:382
+msgid "Fonts conversion"
+msgstr "フォント変換"
+
+#: ../../standalone/drakfont_.c:370 ../../standalone/drakfont_.c:386
+#: ../../standalone/drakfont_.c:406
+msgid "type1inst building"
+msgstr "type1inst 構築中"
+
+#: ../../standalone/drakfont_.c:375 ../../standalone/drakfont_.c:390
+msgid "Ghostscript referencing"
+msgstr "Ghostscript 参照中"
+
+#: ../../standalone/drakfont_.c:397
+msgid "ttf fonts conversion"
+msgstr "ttf フォント変換"
+
+#: ../../standalone/drakfont_.c:401
+msgid "pfm fonts conversion"
+msgstr "pfm フォント変換"
+
+#: ../../standalone/drakfont_.c:411
+msgid "Suppress temporary Files"
+msgstr "一時ファイルを作らない"
+
+#: ../../standalone/drakfont_.c:414
+msgid "Restart XFS"
+msgstr "XFS 再起動"
+
+#: ../../standalone/drakfont_.c:453 ../../standalone/drakfont_.c:463
+msgid "Suppress Fonts Files"
+msgstr "フォントファイルを作らない"
+
+#: ../../standalone/drakfont_.c:465
+msgid "xfs restart"
+msgstr "xfs 再起動"
+
+#: ../../standalone/drakfont_.c:472 ../../standalone/drakfont_.c:760
+msgid ""
+"Before installing any fonts, be sure that you have the right to use and "
+"install them on your system.\n"
+"\n"
+"-You can install the fonts using the normal way. In rare cases, bogus fonts "
+"may hang up your X Server."
+msgstr ""
+"フォントインストールに先立って、それらのフォントを使う権利やインストールする"
+"権利があることを確認してください。\n"
+"\n"
+"-フォントを通常のやり方でインストールできます。ときどき、おかしなフォントで "
+"X サーバがハングする場合があります。"
+
+#: ../../standalone/drakfont_.c:547
+msgid "Fonts Importation"
+msgstr "フォント読み込み"
+
+#: ../../standalone/drakfont_.c:562
+msgid "Get Windows Fonts"
+msgstr "ウィンドウズのフォントを取ってくる"
+
+#: ../../standalone/drakfont_.c:564
+msgid "Uninstall Fonts"
+msgstr "フォントのアンインストール"
+
+#: ../../standalone/drakfont_.c:568
+msgid "Advanced Options"
+msgstr "上級オプション"
+
+#: ../../standalone/drakfont_.c:570
+msgid "Font List"
+msgstr "フォント一覧"
+
+#: ../../standalone/drakfont_.c:739
+msgid "Choose the applications that will support the fonts :"
+msgstr "このフォントをサポートするアプリケーションを選んでください:"
+
+#: ../../standalone/drakfont_.c:743
+msgid "Ghostscript"
+msgstr "Ghostscript"
+
+#: ../../standalone/drakfont_.c:747
+msgid "StarOffice"
+msgstr "StarOffice"
+
+#: ../../standalone/drakfont_.c:751
+msgid "Abiword"
+msgstr "Abiword"
+
+#: ../../standalone/drakfont_.c:755
+msgid "Generic Printers"
+msgstr "一般プリンタ"
+
+#: ../../standalone/drakfont_.c:792
+msgid "Select the font file or directory and click on 'Add'"
+msgstr "フォントファイルかディレクトリを選んで「追加」をクリック"
+
+#: ../../standalone/drakfont_.c:828
+msgid "Install List"
+msgstr "一覧のインストール"
+
+#: ../../standalone/drakfont_.c:858
+msgid "click here if you are sure."
+msgstr "まちがいなければクリックしてください"
+
+#: ../../standalone/drakfont_.c:860
+msgid "here if no."
+msgstr "ダメならこちらを"
+
+#: ../../standalone/drakfont_.c:897
+msgid "Unselected All"
+msgstr "すべてを非選択に"
+
+#: ../../standalone/drakfont_.c:899
+msgid "Selected All"
+msgstr "すべてを選択"
+
+#: ../../standalone/drakfont_.c:901
+msgid "Remove List"
+msgstr "一覧を削除"
+
+#: ../../standalone/drakfont_.c:919 ../../standalone/drakfont_.c:939
+msgid "Initials tests"
+msgstr "イニシャルテスト"
+
+#: ../../standalone/drakfont_.c:920
+msgid "Copy fonts on your system"
+msgstr "システム上のフォントをコピー"
+
+#: ../../standalone/drakfont_.c:921
+msgid "Install & convert Fonts"
+msgstr "フォントのインストールと変換"
+
+#: ../../standalone/drakfont_.c:922
+msgid "Post Install"
+msgstr "インストール後の作業"
+
+#: ../../standalone/drakfont_.c:940
+msgid "Remove fonts on your system"
+msgstr "システムからフォントを削除"
+
+#: ../../standalone/drakfont_.c:941
+msgid "Post Uninstall"
+msgstr "アンインストール後の作業"
+
+#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:200
 msgid "Internet Connection Sharing"
-msgstr "プリンタの共有接続"
+msgstr "インターネット接続の共有"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:138
 msgid "Internet Connection Sharing currently enabled"
 msgstr "インターネット接続共有は現在有効"
 
-#: ../../standalone/drakgw_.c:120
+#: ../../standalone/drakgw_.c:139
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -8089,31 +10719,31 @@ msgstr ""
 "\n"
 "どうしますか？"
 
-#: ../../standalone/drakgw_.c:124
+#: ../../standalone/drakgw_.c:143
 msgid "disable"
 msgstr "無効に"
 
-#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:143 ../../standalone/drakgw_.c:168
 msgid "dismiss"
 msgstr "無視"
 
-#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:143 ../../standalone/drakgw_.c:168
 msgid "reconfigure"
 msgstr "再設定"
 
-#: ../../standalone/drakgw_.c:127
+#: ../../standalone/drakgw_.c:146
 msgid "Disabling servers..."
 msgstr "サーバを無効にしています……"
 
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:154
 msgid "Internet connection sharing is now disabled."
 msgstr "インターネット接続共有は無効になりました。"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:163
 msgid "Internet Connection Sharing currently disabled"
 msgstr "インターネット接続共有は現在無効です"
 
-#: ../../standalone/drakgw_.c:145
+#: ../../standalone/drakgw_.c:164
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -8125,19 +10755,19 @@ msgstr ""
 "\n"
 "どうしますか？"
 
-#: ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:168
 msgid "enable"
 msgstr "有効に"
 
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:175
 msgid "Enabling servers..."
 msgstr "サーバを有効にしています……"
 
-#: ../../standalone/drakgw_.c:161
+#: ../../standalone/drakgw_.c:180
 msgid "Internet connection sharing is now enabled."
 msgstr "インターネット接続共有が有効です。"
 
-#: ../../standalone/drakgw_.c:182
+#: ../../standalone/drakgw_.c:201
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -8152,21 +10782,21 @@ msgstr ""
 "注：ローカルエリアネットワーク (LAN) をつくるには、専用のネットワークアダプタ"
 "が要ります。"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:227
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "インターフェース %s (モジュール %s を使用)"
 
-#: ../../standalone/drakgw_.c:209
+#: ../../standalone/drakgw_.c:228
 #, c-format
 msgid "Interface %s"
 msgstr "インターフェース %s"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:236
 msgid "No network adapter on your system!"
 msgstr "ネットワークアダプタがありません！"
 
-#: ../../standalone/drakgw_.c:218
+#: ../../standalone/drakgw_.c:237
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -8174,11 +10804,11 @@ msgstr ""
 "システム上にイーサネットアダプタが見つかりません。 ハードウェア設定ツールを実"
 "行してください。"
 
-#: ../../standalone/drakgw_.c:224
+#: ../../standalone/drakgw_.c:243
 msgid "Network interface"
 msgstr "ネットワークインターフェイス"
 
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:244
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -8193,7 +10823,7 @@ msgstr ""
 "\n"
 "このアダプタで LAN に接続しますね。"
 
-#: ../../standalone/drakgw_.c:234
+#: ../../standalone/drakgw_.c:253
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -8201,23 +10831,94 @@ msgstr ""
 "ローカルエリアネットワークにつながるネットワークアダプタを\n"
 "選んでください。"
 
-#: ../../standalone/drakgw_.c:243
+#: ../../standalone/drakgw_.c:271
+msgid "Network interface already configured"
+msgstr "ネットワークインターフェースは設定済みです設定されてません"
+
+#: ../../standalone/drakgw_.c:272
+#, c-format
 msgid ""
-"Warning, the network adapter is already configured. I will reconfigure it."
+"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 ""
-"警告、ネットワークアダプタはもう設定がすんでいます。\n"
-"設定をやりなおしますよ。"
+"警告、ネットワークアダプタ (%s) は設定済みです。\n"
+"\n"
+"自動再設定をしますか？\n"
+"\n"
+"手動でやることもできますが、それなりの知識が必要ですよ。"
+
+#: ../../standalone/drakgw_.c:277
+msgid "Automatic reconfiguration"
+msgstr "自動再設定"
 
-#: ../../standalone/drakgw_.c:254
+#: ../../standalone/drakgw_.c:278
+msgid "Show current interface configuration"
+msgstr "現在のインターフェース設定を表示"
+
+#: ../../standalone/drakgw_.c:280
+#, c-format
+msgid ""
+"Current configuration of `%s':\n"
+"\n"
+"Network: %s\n"
+"IP address: %s\n"
+"IP attribution: %s\n"
+"Driver: %s"
+msgstr ""
+"C「%s」の現状の設定:\n"
+"\n"
+"ネットワーク: %s\n"
+"IP アドレス: %s\n"
+"IP 属性: %s\n"
+"ドライバ: %s"
+
+#: ../../standalone/drakgw_.c:292
+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 C-Class Network that "
+"you use for your local network; I will not reconfigure it and I will not "
+"touch your DHCP server configuration.\n"
+"\n"
+"Else, I can reconfigure your interface and (re)configure a DHCP server for "
+"you.\n"
+"\n"
+msgstr ""
+"現状の設定を維持して、すでに DHCP サーバを設置したものと想定することもできま"
+"す。その場合には、ローカルネットワークのCクラスアドレスを正しく読んでいるか確"
+"認してください。自動設定はしませんし、DHCP サーバの設定も変えませんので。\n"
+"\n"
+"あるいは、こちらでインターフェースとDHCPサーバの設定をやることもできます。\n"
+"\n"
+
+#: ../../standalone/drakgw_.c:297
+msgid "C-Class Local Network"
+msgstr "Cクラスローカルネットワーク"
+
+#: ../../standalone/drakgw_.c:298
+msgid "(This) DHCP Server IP"
+msgstr "（この）DHCP サーバの IP"
+
+#: ../../standalone/drakgw_.c:299
+msgid "Re-configure interface and DHCP server"
+msgstr "インターフェースとDHCPサーバの再設定"
+
+#: ../../standalone/drakgw_.c:306
+msgid "The Local Network did not finish with `.0', bailing out."
+msgstr "ローカルネットワークが「.0」で終わっていません。中断します。"
+
+#: ../../standalone/drakgw_.c:317
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "現在の %s の設定ではLANアドレスが衝突するかもしれません！\n"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:325 ../../standalone/drakgw_.c:331
 msgid "Firewalling configuration detected!"
 msgstr "ファイアウォールの設定を検出！"
 
-#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
+#: ../../standalone/drakgw_.c:326 ../../standalone/drakgw_.c:332
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -8225,20 +10926,20 @@ msgstr ""
 "警告！既存ファイヤウォールの設定を検出。\n"
 "インストール後に、手動で修正が要るか鞨しれません。"
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:340
 msgid "Configuring..."
 msgstr "設定中..."
 
-#: ../../standalone/drakgw_.c:278
+#: ../../standalone/drakgw_.c:341
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "スクリプトの設定、ソフトウェアのインストール、サーバの起動..."
 
-#: ../../standalone/drakgw_.c:311
+#: ../../standalone/drakgw_.c:378
 #, c-format
 msgid "Problems installing package %s"
 msgstr "パッケージ %s のインストールで問題発生"
 
-#: ../../standalone/drakgw_.c:600
+#: ../../standalone/drakgw_.c:672
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -8248,23 +10949,23 @@ msgstr ""
 "これで自動ネットワーク設定（dhcp) を使って、LAN 上の他のマシンとインターネッ"
 "ト接続を共有できます。"
 
-#: ../../standalone/drakgw_.c:617
+#: ../../standalone/drakgw_.c:689
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "設定はすんでいますが、いまは無効になっています。"
 
-#: ../../standalone/drakgw_.c:618
+#: ../../standalone/drakgw_.c:690
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "設定はすんでいて、いまは有効になっています。"
 
-#: ../../standalone/drakgw_.c:619
+#: ../../standalone/drakgw_.c:691
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "インターネット接続共有はまったく設定されていません。"
 
-#: ../../standalone/drakgw_.c:624
+#: ../../standalone/drakgw_.c:696
 msgid "Internet connection sharing configuration"
 msgstr "インターネット接続の設定"
 
-#: ../../standalone/drakgw_.c:631
+#: ../../standalone/drakgw_.c:703
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -8279,137 +10980,130 @@ msgstr ""
 "\n"
 "設定ウィザードを起動するには「設定」をクリックしましょう。"
 
-#: ../../standalone/draknet_.c:79
+#: ../../standalone/draknet_.c:80
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "ネットワーク設定 (%d アダプタ)"
 
-#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
+#: ../../standalone/draknet_.c:87 ../../standalone/draknet_.c:595
 msgid "Profile: "
 msgstr "プロフィール: "
 
-#: ../../standalone/draknet_.c:94
+#: ../../standalone/draknet_.c:95
 msgid "Del profile..."
 msgstr "プロフィール削除……"
 
-#: ../../standalone/draknet_.c:100
+#: ../../standalone/draknet_.c:101
 msgid "Profile to delete:"
 msgstr "削除したいプロフィール："
 
-#: ../../standalone/draknet_.c:128
+#: ../../standalone/draknet_.c:129
 msgid "New profile..."
 msgstr "新規プロフィール……"
 
-#: ../../standalone/draknet_.c:134
+#: ../../standalone/draknet_.c:135
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one) :"
 msgstr "作成するプロフィールの名前（新プロファイルは現在のもののコピーです）："
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:161
 msgid "Hostname: "
 msgstr "ホスト名:"
 
-#: ../../standalone/draknet_.c:167
+#: ../../standalone/draknet_.c:168
 msgid "Internet access"
 msgstr "インターネット"
 
-#: ../../standalone/draknet_.c:180
+#: ../../standalone/draknet_.c:181
 msgid "Type:"
 msgstr "タイプ: "
 
-#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
+#: ../../standalone/draknet_.c:184 ../../standalone/draknet_.c:376
 msgid "Gateway:"
 msgstr "ゲートウェイ:"
 
-#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
+#: ../../standalone/draknet_.c:184 ../../standalone/draknet_.c:376
 msgid "Interface:"
 msgstr "インターフェース:"
 
-#: ../../standalone/draknet_.c:192
+#: ../../standalone/draknet_.c:195
 msgid "Status:"
 msgstr "ステータス: "
 
-#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
-msgid "Connected"
-msgstr "接続完了"
-
-#: ../../standalone/draknet_.c:194 ../../standalone/draknet_.c:410
-msgid "Not connected"
-msgstr "接続されていません"
-
-#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
-msgid "Connect..."
-msgstr "接続……"
-
-#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
-msgid "Disconnect..."
-msgstr "接続を切断……"
+#: ../../standalone/draknet_.c:202
+msgid "Wait please"
+msgstr "少々お待ちを"
 
-#: ../../standalone/draknet_.c:215
-msgid "Starting your connection..."
-msgstr "接続しています..."
-
-#: ../../standalone/draknet_.c:223
-msgid "Closing your connection..."
-msgstr "接続を閉じています..."
-
-#: ../../standalone/draknet_.c:228
-msgid ""
-"The connection is not closed.\n"
-"Try to do it manually by running\n"
-"/etc/sysconfig/network-scripts/net_cnx_down\n"
-"in root."
-msgstr ""
-"接続が閉じていません。\n"
-"root になって、以下を実行してみてください：\n"
-"/etc/sysconfig/network-scripts/net_cnx_down"
-
-#: ../../standalone/draknet_.c:231
-msgid "The system is now disconnected."
-msgstr "システムの接続は切断されました。"
-
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:220
 msgid "Configure Internet Access..."
 msgstr "インターネットアクセスの設定"
 
-#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
+#: ../../standalone/draknet_.c:227 ../../standalone/draknet_.c:449
 msgid "LAN configuration"
 msgstr "LANの設定"
 
-#: ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:232
 msgid "Driver"
 msgstr "ドライバ"
 
-#: ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:232
 msgid "Interface"
 msgstr "インターフェース"
 
-#: ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:232
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../../standalone/draknet_.c:255
+#: ../../standalone/draknet_.c:232
 msgid "State"
 msgstr "状態"
 
-#: ../../standalone/draknet_.c:267
+#: ../../standalone/draknet_.c:244
 msgid "Configure Local Area Network..."
 msgstr "LAN 設定……"
 
-#: ../../standalone/draknet_.c:279
+#: ../../standalone/draknet_.c:256
 msgid "Click here to launch the wizard ->"
 msgstr "ウィザードの起動にはこちらをクリック -->"
 
-#: ../../standalone/draknet_.c:306
+#: ../../standalone/draknet_.c:257
+msgid "Wizard..."
+msgstr "ウィザード..."
+
+#: ../../standalone/draknet_.c:283
 msgid "Apply"
 msgstr "適用"
 
-#: ../../standalone/draknet_.c:325
+#: ../../standalone/draknet_.c:302
 msgid "Please Wait... Applying the configuration"
 msgstr "少々お待ちを……設定を適用しています"
 
-#: ../../standalone/draknet_.c:428
+#: ../../standalone/draknet_.c:384 ../../standalone/draknet_.c:407
+msgid "Connected"
+msgstr "接続完了"
+
+#: ../../standalone/draknet_.c:384 ../../standalone/draknet_.c:407
+msgid "Not connected"
+msgstr "接続されていません"
+
+#: ../../standalone/draknet_.c:385 ../../standalone/draknet_.c:408
+msgid "Connect..."
+msgstr "接続……"
+
+#: ../../standalone/draknet_.c:385 ../../standalone/draknet_.c:408
+msgid "Disconnect..."
+msgstr "接続を切断……"
+
+#: ../../standalone/draknet_.c:404
+msgid ""
+"Warning, another Internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"警告、別のインターネット接続が検出されました。ネットワークは使用中かもしれま"
+"せん"
+
+#: ../../standalone/draknet_.c:431
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
@@ -8417,36 +11111,44 @@ msgstr ""
 "設定済みのインターフェースがありません。\n"
 "「設定」をクリックしてまずそれらを設定してください。"
 
-#: ../../standalone/draknet_.c:450
+#: ../../standalone/draknet_.c:453
 msgid "LAN Configuration"
 msgstr "LANの設定"
 
-#: ../../standalone/draknet_.c:457
+#: ../../standalone/draknet_.c:464
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "アダプタ %s: %s"
 
-#: ../../standalone/draknet_.c:463
+#: ../../standalone/draknet_.c:470
 msgid "Boot Protocol"
 msgstr "ブートプロトコル"
 
-#: ../../standalone/draknet_.c:464
+#: ../../standalone/draknet_.c:471
 msgid "Started on boot"
 msgstr "起動時に開始"
 
-#: ../../standalone/draknet_.c:465
+#: ../../standalone/draknet_.c:472
 msgid "DHCP client"
 msgstr "DHCP クライアント"
 
-#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#: ../../standalone/draknet_.c:497 ../../standalone/draknet_.c:500
 msgid "activate now"
 msgstr "いますぐ有効に"
 
-#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
-msgid "desactivate now"
+#: ../../standalone/draknet_.c:497 ../../standalone/draknet_.c:500
+msgid "deactivate now"
 msgstr "いますぐ無効に"
 
-#: ../../standalone/draknet_.c:538
+#: ../../standalone/draknet_.c:503
+msgid ""
+"This interface has not been configured yet.\n"
+"Launch the configuration wizard in the main window"
+msgstr ""
+"このインターフェースはまだ設定されていません。\n"
+"主ウィンドウで設定ウィザードを起動してください"
+
+#: ../../standalone/draknet_.c:560
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
@@ -8454,134 +11156,159 @@ msgstr ""
 "インターネット接続がありません。\n"
 "「設定」をクリックして作成してください"
 
-#: ../../standalone/draknet_.c:562
+#: ../../standalone/draknet_.c:584
 msgid "Internet connection configuration"
 msgstr "インターネット接続設定"
 
-#: ../../standalone/draknet_.c:566
+#: ../../standalone/draknet_.c:588
 msgid "Internet Connection Configuration"
 msgstr "インターネット接続設定"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:597
 msgid "Connection type: "
 msgstr "接続の種類: "
 
-#: ../../standalone/draknet_.c:581
+#: ../../standalone/draknet_.c:603
 msgid "Parameters"
 msgstr "パラメータ"
 
-#: ../../standalone/draknet_.c:608
+#: ../../standalone/draknet_.c:621
+msgid "Gateway"
+msgstr "ゲートウェイ"
+
+#: ../../standalone/draknet_.c:630
 msgid "Ethernet Card"
 msgstr "イーサネットカード"
 
-#: ../../standalone/draknet_.c:609
+#: ../../standalone/draknet_.c:631
 msgid "DHCP Client"
 msgstr "DHCP クライアント"
 
-#: ../../standalone/draksec_.c:21
-msgid "Welcome To Crackers"
-msgstr "悪質なクラッカー様も侵入しほうだい"
+#: ../../standalone/draksec_.c:31
+msgid "Setting security level"
+msgstr "セキュリティレベルの設定中"
 
-#: ../../standalone/draksec_.c:22
-msgid "Poor"
-msgstr "きわめて低い"
+#: ../../standalone/drakxconf_.c:47
+msgid "Control Center"
+msgstr "コントロールセンター"
 
-#: ../../standalone/draksec_.c:26
-msgid "Paranoid"
-msgstr "神経質なほど高水準"
+#: ../../standalone/drakxconf_.c:48
+msgid "Choose the tool you want to use"
+msgstr "使用するツールを選んで下さい"
 
-#: ../../standalone/draksec_.c:29
-msgid ""
-"This level is to be used with care. It makes your system more easy to use,\n"
-"but very sensitive: it must not be used for a machine connected to others\n"
-"or to the Internet. There is no password access."
-msgstr ""
-"このレベルを使うなら注意が必要です。システムを使うのは簡単になりますが、\n"
-"だれにでもアクセスできてしまいます。他のマシンやインターネット\n"
-"につながったマシンでは使わないでください。パスワード制限もありません。"
+#: ../../standalone/drakxtv_.c:48
+msgid "Canada (cable)"
+msgstr "カナダ（ケーブル）"
 
-#: ../../standalone/draksec_.c:32
-msgid ""
-"Password are now enabled, but use as a networked computer is still not "
-"recommended."
-msgstr ""
-"パスワードが有効になりましたが、ネットワークにつなぐのはまだ\n"
-"お奨めできません。"
+#: ../../standalone/drakxtv_.c:48
+msgid "USA (bcast)"
+msgstr "USA (bcast)"
 
-#: ../../standalone/draksec_.c:33
-msgid ""
-"Few improvements for this security level, the main one is that there are\n"
-"more security warnings and checks."
-msgstr ""
-"このセキュリティレベルはちょっとよくなっていて、警告やチェックが\n"
-"増えています。"
+#: ../../standalone/drakxtv_.c:48
+msgid "USA (cable)"
+msgstr "USA (ケーブル)"
 
-#: ../../standalone/draksec_.c:35
-msgid ""
-"This is the standard security recommended for a computer that will be used\n"
-"to connect to the Internet as a client. There are now security checks. "
-msgstr ""
-"これは標準のセキュリティで、クライアントとしてインターネット接続する\n"
-"マシンでの推奨レベルです。セキュリティチェックが行われます。"
+#: ../../standalone/drakxtv_.c:48
+msgid "USA (cable-hrc)"
+msgstr "USA (ケーブル-hrc)"
 
-#: ../../standalone/draksec_.c:37
-msgid ""
-"With this security level, the use of this system as a server becomes "
-"possible.\n"
-"The security is now high enough to use the system as a server which accept\n"
-"connections from many clients. "
-msgstr ""
-"このセキュリティレベルだと、システムをサーバとして使えるようになります。\n"
-"多数のクライアントから接続を受けるサーバとしても使えるだけのセキュリティ\n"
-"水準になっています。"
+#: ../../standalone/drakxtv_.c:49
+msgid "China (bcast)"
+msgstr "中国 (bcast)"
 
-#: ../../standalone/draksec_.c:40
-msgid ""
-"We take level 4 features, but now the system is entirely closed.\n"
-"Security features are at their maximum."
-msgstr ""
-"レベル4 のセキュリティ機能にしましたが、これでシステムは完全にとじた状態\n"
-"になっています。セキュリティは最大です。"
+#: ../../standalone/drakxtv_.c:49
+msgid "Japan (bcast)"
+msgstr "日本 (bcast)"
 
-#: ../../standalone/draksec_.c:65
-msgid "Security level"
-msgstr "セキュリティ水準"
+#: ../../standalone/drakxtv_.c:49
+msgid "Japan (cable)"
+msgstr "日本 (ケーブル)"
 
-#: ../../standalone/draksec_.c:67
-msgid "Use libsafe for servers"
-msgstr "サーバにlibsafeを使う"
+#: ../../standalone/drakxtv_.c:50
+msgid "East Europe"
+msgstr "東ヨーロッパ"
+
+#: ../../standalone/drakxtv_.c:50
+msgid "Ireland"
+msgstr "アイルランド"
+
+#: ../../standalone/drakxtv_.c:50
+msgid "West Europe"
+msgstr "西ヨーロッパ"
+
+#: ../../standalone/drakxtv_.c:51
+msgid "Australia"
+msgstr "オーストラリア"
 
-#: ../../standalone/draksec_.c:68
+#: ../../standalone/drakxtv_.c:51
+msgid "Newzealand"
+msgstr "ニュージーランド"
+
+#: ../../standalone/drakxtv_.c:52
+msgid "South Africa"
+msgstr "南アフリカ"
+
+#: ../../standalone/drakxtv_.c:53
+msgid "Argentina"
+msgstr "アルゼンチン"
+
+#: ../../standalone/drakxtv_.c:58
 msgid ""
-"A library which defends against buffer overflow and format string attacks."
+"Please,\n"
+"type in your tv norm and country"
 msgstr ""
-"バッファオーバーフローやフォーマットストリング攻撃を防御するライブラリ。"
+"では\n"
+"テレビ方式と国を入力してください"
 
-#: ../../standalone/draksec_.c:72
-msgid "Setting security level"
-msgstr "セキュリティレベルの設定中"
+#: ../../standalone/drakxtv_.c:60
+msgid "TV norm :"
+msgstr "テレビ方式："
 
-#: ../../standalone/drakxconf_.c:47
-msgid "Control Center"
-msgstr "コントロールセンター"
+#: ../../standalone/drakxtv_.c:61
+msgid "Area :"
+msgstr "地域："
 
-#: ../../standalone/drakxconf_.c:48
-msgid "Choose the tool you want to use"
-msgstr "使用するツールを選んで下さい"
+#: ../../standalone/drakxtv_.c:65
+msgid "Scanning for TV channels in progress ..."
+msgstr "テレビチャンネルを探しています..."
+
+#: ../../standalone/drakxtv_.c:72
+msgid "Scanning for TV channels"
+msgstr "テレビチャンネルを探しています"
+
+#: ../../standalone/drakxtv_.c:83
+msgid "No TV Card detected!"
+msgstr ""
+
+#: ../../standalone/drakxtv_.c:84
+msgid ""
+"No TV Card has been detected on your machine. Please verify that a Linux-"
+"supported Video/TV Card is correctly plugged in.\n"
+"\n"
+"\n"
+"You can visit our hardware database at:\n"
+"\n"
+"\n"
+"http://www.linux-mandrake.com/en/hardware.php3"
+msgstr ""
 
 #: ../../standalone/keyboarddrake_.c:16
 msgid "usage: keyboarddrake [--expert] [keyboard]\n"
 msgstr "使い方: keyboarddrake [--expert] [キーボード]\n"
 
+#: ../../standalone/keyboarddrake_.c:29
+msgid "Please, choose your keyboard layout."
+msgstr "キーボードレイアウトは何ですか？"
+
 #: ../../standalone/keyboarddrake_.c:36
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "BackSpaceキーがコンソールで消去をするようにしますか？"
 
-#: ../../standalone/livedrake_.c:23
+#: ../../standalone/livedrake_.c:24
 msgid "Change Cd-Rom"
 msgstr "CD-ROMを入れ替えてください"
 
-#: ../../standalone/livedrake_.c:24
+#: ../../standalone/livedrake_.c:25
 msgid ""
 "Please insert the Installation Cd-Rom in your drive and press Ok when done.\n"
 "If you don't have it, press Cancel to avoid live upgrade."
@@ -8589,27 +11316,263 @@ msgstr ""
 "インストールCD をドライブにいれて、 Ok を押してください。\n"
 "CDがなければ、Cancel を押してライブアップグレードを回避して下さい。"
 
-#: ../../standalone/livedrake_.c:34
+#: ../../standalone/livedrake_.c:35
 msgid "Unable to start live upgrade !!!\n"
 msgstr "ライブアップグレードを開始できません!!!\n"
 
-#: ../../standalone/mousedrake_.c:58
+#: ../../standalone/localedrake_.c:32
+msgid "The change is done, but to be effective you must logout"
+msgstr "変更が完了しましたが、有効にするにはいったんログアウトしてください。"
+
+#: ../../standalone/logdrake_.c:85 ../../standalone/logdrake_.c:501
+msgid "logdrake"
+msgstr "logdrake"
+
+#: ../../standalone/logdrake_.c:95
+msgid "Show only for the selected day"
+msgstr "選んだ日の分だけを表示"
+
+#: ../../standalone/logdrake_.c:102
+msgid "/File/_New"
+msgstr "/ファイル(F)/新規(N)"
+
+#: ../../standalone/logdrake_.c:102
+msgid "<control>N"
+msgstr "<control>N"
+
+#: ../../standalone/logdrake_.c:103
+msgid "/File/_Open"
+msgstr "/ファイル(F)/開く(O)"
+
+#: ../../standalone/logdrake_.c:103
+msgid "<control>O"
+msgstr "<control>O"
+
+#: ../../standalone/logdrake_.c:104
+msgid "/File/_Save"
+msgstr "/ファイル(F)/保存(S)"
+
+#: ../../standalone/logdrake_.c:104
+msgid "<control>S"
+msgstr "<control>S"
+
+#: ../../standalone/logdrake_.c:105
+msgid "/File/Save _As"
+msgstr "/ファイル(F)/別の名前で保存(A)"
+
+#: ../../standalone/logdrake_.c:106
+msgid "/File/-"
+msgstr "/ファイル(F)/-"
+
+#: ../../standalone/logdrake_.c:108
+msgid "/_Options"
+msgstr "/オプション(_O)"
+
+#: ../../standalone/logdrake_.c:109
+msgid "/Options/Test"
+msgstr "/オプション(O)/テスト"
+
+#: ../../standalone/logdrake_.c:110
+msgid "/_Help"
+msgstr "/ヘルプ(_H)"
+
+#: ../../standalone/logdrake_.c:111
+msgid "/Help/_About..."
+msgstr "/ヘルプ(H)/このソフトについて(A)"
+
+#: ../../standalone/logdrake_.c:118
+msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
+msgstr ""
+"-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--"
+"24-*-100-100-c-*-jisx0208.1983-0,*"
+
+#: ../../standalone/logdrake_.c:119
+msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
+msgstr ""
+"-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-iso8859-1,-*-fixed-medium-r-normal--"
+"24-*-100-100-c-*-jisx0208.1983-0,*"
+
+#: ../../standalone/logdrake_.c:173
+msgid "User"
+msgstr "ユーザ名"
+
+#: ../../standalone/logdrake_.c:174
+msgid "Messages"
+msgstr "メッセージ"
+
+#: ../../standalone/logdrake_.c:175
+msgid "Syslog"
+msgstr "シスログ"
+
+#: ../../standalone/logdrake_.c:176
+msgid "Mandrake Tools Explanations"
+msgstr "Mandrake ツールの説明"
+
+#: ../../standalone/logdrake_.c:179
+msgid "search"
+msgstr "検索"
+
+#: ../../standalone/logdrake_.c:185
+msgid "A tool to monitor your logs"
+msgstr "ログをモニタするためのツール"
+
+#: ../../standalone/logdrake_.c:186
+msgid "Settings"
+msgstr "設定"
+
+#: ../../standalone/logdrake_.c:191
+msgid "matching"
+msgstr "一致するもの"
+
+#: ../../standalone/logdrake_.c:192
+msgid "but not matching"
+msgstr "以下には一致しない"
+
+#: ../../standalone/logdrake_.c:196
+msgid "Choose file"
+msgstr "ファイルを選択"
+
+#: ../../standalone/logdrake_.c:201
+msgid "Calendar"
+msgstr "カレンダ"
+
+#: ../../standalone/logdrake_.c:211
+msgid "Content of the file"
+msgstr "ファイルの内容"
+
+#: ../../standalone/logdrake_.c:215 ../../standalone/logdrake_.c:390
+msgid "Mail/SMS alert"
+msgstr "Mail/SMS 警告"
+
+#: ../../standalone/logdrake_.c:268
+#, c-format
+msgid "please wait, parsing file: %s"
+msgstr "少々お待ちを、ファイル %s を探しています。"
+
+#: ../../standalone/logdrake_.c:405
+msgid "Mail/SMS alert configuration"
+msgstr "Mail/SMS 警告の設定"
+
+#: ../../standalone/logdrake_.c:406
+msgid ""
+"Welcome to the mail/SMS configuration utility.\n"
+"\n"
+"Here, you'll be able to set up the alert system.\n"
+msgstr ""
+"Mail/SMS 設定ユーティリティへいらっしゃいませ〜。\n"
+"\n"
+"ここでは警告システムを設定します。\n"
+
+#: ../../standalone/logdrake_.c:414
+msgid "proftpd"
+msgstr "proftpd"
+
+#: ../../standalone/logdrake_.c:417
+msgid "sshd"
+msgstr "sshd"
+
+#: ../../standalone/logdrake_.c:418
+msgid "webmin"
+msgstr "webmin"
+
+#: ../../standalone/logdrake_.c:419
+msgid "xinetd"
+msgstr "xinetd"
+
+#: ../../standalone/logdrake_.c:422
+msgid "service setting"
+msgstr "サービス設定"
+
+#: ../../standalone/logdrake_.c:423
+msgid ""
+"You will receive an alert if one of the selected service is no more running"
+msgstr "以下で選んだサービスが止まったら警報が出ます。"
+
+#: ../../standalone/logdrake_.c:433
+msgid "load setting"
+msgstr "設定の読み込み中"
+
+#: ../../standalone/logdrake_.c:434
+msgid "You will receive an alert if the load is higher than this value"
+msgstr "負荷がこの値を上回ったら警報が出ます"
+
+#: ../../standalone/logdrake_.c:447
+msgid "alert configuration"
+msgstr "警告の設定"
+
+#: ../../standalone/logdrake_.c:448
+msgid "Configure the way the system will alert you"
+msgstr "システムの警告方法を設定"
+
+#: ../../standalone/logdrake_.c:478
+msgid "Save as.."
+msgstr "名前をつけて保存..."
+
+#: ../../standalone/mousedrake_.c:49
+msgid "Please, choose the type of your mouse."
+msgstr "マウスの型はなんですか？"
+
+#: ../../standalone/mousedrake_.c:59
 msgid "no serial_usb found\n"
 msgstr "serial_usbが見つかりません\n"
 
-#: ../../standalone/mousedrake_.c:62
+#: ../../standalone/mousedrake_.c:63
 msgid "Emulate third button?"
 msgstr "真中ボタンをエミュレートしますか？"
 
-#: ../../standalone/tinyfirewall_.c:29
+#: ../../standalone/scannerdrake_.c:53
+#, c-format
+msgid "%s found on %s, configure it ?"
+msgstr "%s が %s で見つかりました。設定しますか?"
+
+#: ../../standalone/scannerdrake_.c:60
+msgid "Select a scanner"
+msgstr "スキャナを選択して下さい"
+
+#: ../../standalone/scannerdrake_.c:80
+#, c-format
+msgid "This %s scanner is unsupported"
+msgstr "この %s スキャナはサポートされていません"
+
+#: ../../standalone/scannerdrake_.c:94
+#, c-format
+msgid ""
+"Scannerdrake was not able to detect your %s scanner.\n"
+"Please select the device where your scanner is plugged"
+msgstr ""
+
+#: ../../standalone/scannerdrake_.c:96
+#, fuzzy
+msgid "choose device"
+msgstr "ブートデバイス"
+
+#: ../../standalone/scannerdrake_.c:102
+#, fuzzy, c-format
+msgid ""
+"This %s scanner must be configured by printerdrake.\n"
+"You can launch printerdrake from the Mandrake Control Center in Hardware "
+"section."
+msgstr ""
+"printerdrake の起動は、Mandrake コントロールセンターのハードウェアの項で行っ"
+"てください。"
+
+#: ../../standalone/scannerdrake_.c:107
+#, c-format
+msgid ""
+"Your %s scanner has been configured.\n"
+"You may now scan documents using ``XSane'' from Multimedia/Graphics in the "
+"applications menu."
+msgstr ""
+
+#: ../../standalone/tinyfirewall_.c:31
 msgid "Firewalling Configuration"
 msgstr "ファイアウォールの設定"
 
-#: ../../standalone/tinyfirewall_.c:42
+#: ../../standalone/tinyfirewall_.c:44
 msgid "Firewalling configuration"
 msgstr "ファイアウォールの設定"
 
-#: ../../standalone/tinyfirewall_.c:77
+#: ../../standalone/tinyfirewall_.c:79
 msgid ""
 "Firewalling\n"
 "\n"
@@ -8621,7 +11584,7 @@ msgstr ""
 "すでにファイアーウォールは設定済みです。\n"
 "それを変更・削除するには「設定」をクリックしてください"
 
-#: ../../standalone/tinyfirewall_.c:81
+#: ../../standalone/tinyfirewall_.c:83
 msgid ""
 "Firewalling\n"
 "\n"
@@ -8683,19 +11646,23 @@ msgstr "ネットワーク設定"
 msgid "Configure services"
 msgstr "サービスの設定"
 
-#: ../../steps.pm_.c:30
-msgid "Create a bootdisk"
-msgstr "起動ディスク作成"
-
-#: ../../steps.pm_.c:32
+#: ../../steps.pm_.c:29
 msgid "Install bootloader"
 msgstr "ブートローダ設定"
 
+#: ../../steps.pm_.c:31
+msgid "Create a bootdisk"
+msgstr "起動ディスク作成"
+
 #: ../../steps.pm_.c:33
 msgid "Configure X"
 msgstr "X の設定"
 
 #: ../../steps.pm_.c:34
+msgid "Install system updates"
+msgstr "システム更新をインストール"
+
+#: ../../steps.pm_.c:35
 msgid "Exit install"
 msgstr "導入作業を終了"
 
@@ -8863,6 +11830,56 @@ msgstr "%s が開けません: %s\n"
 msgid "Can't open %s for writing: %s\n"
 msgstr "書き込み用に %s が開けません: %s\n"
 
+#: ../../tinyfirewall.pm_.c:180
+msgid "No I don't need DHCP"
+msgstr "DHCP は使わない"
+
+#: ../../tinyfirewall.pm_.c:180
+msgid "Yes I need DHCP"
+msgstr "DHCP を使う"
+
+#: ../../tinyfirewall.pm_.c:181
+msgid "No I don't need NTP"
+msgstr "NTP はいらない"
+
+#: ../../tinyfirewall.pm_.c:181
+msgid "Yes I need NTP"
+msgstr "NTPを使う"
+
+#: ../../tinyfirewall.pm_.c:182 ../../tinyfirewall.pm_.c:186
+msgid "Don't Save"
+msgstr "保存しない"
+
+#: ../../tinyfirewall.pm_.c:182 ../../tinyfirewall.pm_.c:186
+#: ../../tinyfirewall.pm_.c:206
+msgid "Save & Quit"
+msgstr "保存して終了"
+
+#: ../../tinyfirewall.pm_.c:197 ../../tinyfirewall.pm_.c:201
+msgid "Firewall Configuration Wizard"
+msgstr "ファイアーウォール設定ウィザード"
+
+#: ../../tinyfirewall.pm_.c:199
+msgid "No (firewall this off from the internet)"
+msgstr "いいえ（これをインターネットから防御）"
+
+#: ../../tinyfirewall.pm_.c:200
+msgid "Yes (allow this through the firewall)"
+msgstr "はい（ファイアーウォールを通す）"
+
+#: ../../tinyfirewall.pm_.c:232
+msgid "Please Wait... Verifying installed packages"
+msgstr "少々お待ちを...インストール済みバッケージを確認中"
+
+#: ../../tinyfirewall.pm_.c:238
+#, c-format
+msgid ""
+"Failure installing the needed packages : %s and Bastille.\n"
+" Try to install them manually."
+msgstr ""
+"必要パッケージのインストールに失敗しました : %s と Bastille.\n"
+"手動でインストールしてみてください。"
+
 #: ../../share/compssUsers:999
 msgid "Web/FTP"
 msgstr "サーバ、Web/FTP"
@@ -8990,10 +12007,6 @@ msgid "Graphical Environment"
 msgstr "グラフィック環境"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "開発用"
-
-#: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
 msgstr "Apache と Pro-ftpd"
 
@@ -9006,6 +12019,10 @@ msgid "Office Workstation"
 msgstr "オフィスワークステーション"
 
 #: ../../share/compssUsers:999
+msgid "Server"
+msgstr "サーバ"
+
+#: ../../share/compssUsers:999
 msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm など"
 
@@ -9091,10 +12108,6 @@ msgid "Programs to manage your finance, such as gnucash"
 msgstr "gnucashなどの家計管理ソフト"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "ゲーム"
-
-#: ../../share/compssUsers:999
 msgid "Personal Information Management"
 msgstr "個人情報管理"
 
@@ -9106,6 +12119,275 @@ msgstr "マルチメディア　CD を焼く"
 msgid "Scientific Workstation"
 msgstr "科学ワークステーション"
 
+#~ msgid "About"
+#~ msgstr "情報"
+
+#~ msgid "             Help           "
+#~ msgstr "             ヘルプ           "
+
+#~ msgid ""
+#~ "Can't access kernel modules corresponding to your kernel (file %s is "
+#~ "missing)"
+#~ msgstr ""
+#~ "カーネルに対応したカーネルモジュールをアクセスできません（ファイル%sがあり"
+#~ "ません)"
+
+#~ msgid "$f-$g %s)"
+#~ msgstr "$f-$g %s)"
+
+#~ msgid "-adobe-utopia-medium-r-normal-*-12-*-*-*-p-*-iso8859-*,*-r-*"
+#~ msgstr ""
+#~ "-adobe-utopia-medium-r-normal-*-12-*-*-*-p-*-iso8859-*,-*-fixed-medium-r-"
+#~ "normal--24-*-100-100-c-*-jisx0208.1983-0,*"
+
+#~ msgid "None"
+#~ msgstr "なし"
+
+#~ msgid "Choose a default printer!"
+#~ msgstr "デフォルトプリンタを選びましょう！"
+
+#~ msgid ""
+#~ "With remote CUPS servers, you do not have to configure any printer here; "
+#~ "CUPS servers inform your machine automatically about their printers. All "
+#~ "printers known to your machine currently are listed in the \"Default "
+#~ "printer\" field. Choose the default printer for your machine there and "
+#~ "click the \"Apply/Re-read printers\" button. Click the same button to "
+#~ "refresh the list (it can take up to 30 seconds after the start of CUPS "
+#~ "until all remote printers are visible). When your CUPS server is in a "
+#~ "different network, you have to give the CUPS server IP address and "
+#~ "optionally the port number to get the printer information from the "
+#~ "server, otherwise leave these fields blank."
+#~ msgstr ""
+#~ "リモートの CUPS サーバなら、ここではプリンタ設定は不要です。\n"
+#~ "CUPS サーバはマシンに自動的にプリンタ情報を渡します。いま、\n"
+#~ "あなたのマシンが知っているプリンタが \"デフォルトプリンタ\"\n"
+#~ "に出ています。マシンのデフォルトプリンタを選んで、\n"
+#~ "\"プリンタを適用/再読込\" ボタンを押してください。一覧の更新\n"
+#~ "にもこのボタンを押します（リモートプリンタが見えるまで、CUPS \n"
+#~ "開始から最大30秒かかります。\n"
+#~ "CUPS サーバが別のネットワークにあるなら、CUPSサーバのIPアドレス\n"
+#~ "と、場合によってはポート番号を指定しないとサーバからプリンタ情\n"
+#~ "報がもらえません。そうでなければ、ここは空欄にします。"
+
+#~ msgid "Apply/Re-read printers"
+#~ msgstr "プリンタを適用/再読込"
+
+#~ msgid "Configure printing system"
+#~ msgstr "印刷システム設定"
+
+#~ msgid "You may now provide its options to module %s."
+#~ msgstr "モジュール %s のオプションを指定してください。"
+
+#~ msgid "Low"
+#~ msgstr "低い"
+
+#~ msgid "Medium"
+#~ msgstr "ほどほど"
+
+#~ msgid ""
+#~ "Few improvements for this security level, the main one is that there are\n"
+#~ "more security warnings and checks."
+#~ msgstr ""
+#~ "このセキュリティレベルはちょっとよくなっていて、警告やチェックが\n"
+#~ "増えています。"
+
+#~ msgid "Boot mode"
+#~ msgstr "ブートモード"
+
+#~ msgid "Export"
+#~ msgstr "エキスポート"
+
+#~ msgid "click here"
+#~ msgstr "ここをクリック"
+
+#~ msgid "mount failed"
+#~ msgstr "マウントに失敗"
+
+#~ msgid ""
+#~ "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
+#~ "local time according to the time zone you selected."
+#~ msgstr ""
+#~ "Linux は時間をGMT、つまり「グリニッジ標準時」で管理していて、それを\n"
+#~ "あなたの選んだ時間帯にあわせて変換します。"
+
+#~ msgid ""
+#~ "You may choose to upload updated packages that have been released after "
+#~ "the\n"
+#~ "distribution has been made available. You will get security fixes or bug\n"
+#~ "fixes, but you need to have an Internet connection configured to "
+#~ "proceed.\n"
+#~ "Answer \"Yes\" to the dialog to choose an available mirror. After "
+#~ "choosing\n"
+#~ "a mirror, a packages selection tree appears to allow you to choose "
+#~ "packages\n"
+#~ "individually, package that need to be updated are already selected, but "
+#~ "you\n"
+#~ "may choose to install other package or deselect packages. Press \"Install"
+#~ "\"\n"
+#~ "to install the updated package or \"Cancel\" not to upgrade them. (this\n"
+#~ "*REALLY* need to be modified according to real DrakX, if you need other\n"
+#~ "help section, let us (DrakX team developer) known)."
+#~ msgstr ""
+#~ "ディストリビューション公開時以降に更新されたパッケージをアップロード\n"
+#~ "するように指定できます。セキュリティフィックスやバグフィックスができ\n"
+#~ "ますが、これにはインターネット接続が必要です。\n"
+#~ "使えるミラーサイトを選ぶには、ダイアログで \"はい\" を選んでください。\n"
+#~ "パッケージ選択ツリーが出てきて、個別にパッケージを選べるようになります。\n"
+#~ "更新が必要なパッケージは選択済みですが、他のパッケージを選んだり、まはた\n"
+#~ "一部を選択解除できます。更新パッケージのインストールには \"インストール"
+#~ "\"\n"
+#~ "を押し、更新しないなら \"キャンセル\" を押します (これは本物の DrakX的\n"
+#~ "には絶対に変更すべきで、もし他のヘルプが必要なら、DrakX開発チームまで\n"
+#~ "ご一報を。"
+
+#~ msgid ""
+#~ "To know about the options available for the current printer read either "
+#~ "the list shown below or click on the \"Print option list\" button. %s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "いまのプリンタで使えるオプション一覧を見るには、下の一覧を読むか、あるいは"
+#~ "「オプション一覧を印刷」ボタンをクリックしましょう。%s\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "This %s scanner uses parallel port, which is unsupported for the moment"
+#~ msgstr ""
+#~ "この %s スキャナはパラレルポートを使うので、いまはサポートされていません"
+
+#~ msgid "Connect to Internet"
+#~ msgstr "インターネットへの接続"
+
+#~ msgid "Disconnect from Internet"
+#~ msgstr "インターネットから切断"
+
+#~ msgid "Configure network connection (LAN or Internet)"
+#~ msgstr "ネットワーク接続 (LAN/インターネット)の設定"
+
+#~ msgid "authentification"
+#~ msgstr "認証"
+
+#~ msgid "user"
+#~ msgstr "ユーザ"
+
+#~ msgid "Scanning available nfs shared resource"
+#~ msgstr "nfs 共有リソースで使えるものをスキャン中"
+
+#~ msgid "Scanning available nfs shared resource of server %s"
+#~ msgstr "サーバ %s の nfs 共有リソースで使えるものをスキャン中"
+
+#~ msgid "Scanning available samba shared resource"
+#~ msgstr "samba 共有リソースで使えるものをスキャン中"
+
+#~ msgid "Scanning available samba shared resource of server %s"
+#~ msgstr "サーバ %s の samba 共有リソースで使えるものをスキャン中"
+
+#~ msgid "Removable media"
+#~ msgstr "リムーバブルメディア"
+
+#~ msgid "Active"
+#~ msgstr "アクティブ"
+
+#~ msgid "A printer, model \"%s\", has been detected on "
+#~ msgstr "「%s」プリンタが、次のところで見つかりました"
+
+#~ msgid "Local Printer Device"
+#~ msgstr "ローカルプリンタデバイス"
+
+#~ msgid "Printer Device"
+#~ msgstr "プリンタデバイス"
+
+#~ msgid "Device/file name missing!"
+#~ msgstr "デバイス/ファイル名がありません！"
+
+#~ msgid "Printer(s) on remote CUPS server(s)"
+#~ msgstr "リモートCUPS サーバ上のプリンタ"
+
+#~ msgid "Printer(s) on remote server(s)"
+#~ msgstr "リモートサーバ上のプリンタ"
+
+#~ msgid "Starting your connection..."
+#~ msgstr "接続しています..."
+
+#~ msgid "Closing your connection..."
+#~ msgstr "接続を閉じています..."
+
+#~ msgid ""
+#~ "The connection is not closed.\n"
+#~ "Try to do it manually by running\n"
+#~ "/etc/sysconfig/network-scripts/net_cnx_down\n"
+#~ "in root."
+#~ msgstr ""
+#~ "接続が閉じていません。\n"
+#~ "root になって、以下を実行してみてください：\n"
+#~ "/etc/sysconfig/network-scripts/net_cnx_down"
+
+#~ msgid "The system is now disconnected."
+#~ msgstr "システムの接続は切断されました。"
+
+#~ msgid "Choose the size you want to install"
+#~ msgstr "インストールするサイズを選んで下さい"
+
+#~ msgid "Total size: "
+#~ msgstr "合計サイズ: "
+
+#~ msgid "Please wait, "
+#~ msgstr "しばらくお待ち下さい，"
+
+#~ msgid "Total time "
+#~ msgstr "合計時間 "
+
+#~ msgid "Use existing configuration for X11?"
+#~ msgstr "すでにある X11 の設定を使いますか？"
+
+#~ msgid ""
+#~ "What device is your printer connected to \n"
+#~ "(note that /dev/lp0 is equivalent to LPT1:)?\n"
+#~ msgstr ""
+#~ "プリンタがつながっているデバイスは何ですか\n"
+#~ "(注意 /dev/lp0 は LPT1: になります)？\n"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "Warning, the network adapter is already configured. I will reconfigure it."
+#~ msgstr ""
+#~ "警告、ネットワークアダプタはもう設定がすんでいます。\n"
+#~ "設定をやりなおしますよ。"
+
+#~ msgid "New"
+#~ msgstr "新規"
+
+#~ msgid "Remote"
+#~ msgstr "リモート"
+
+#~ msgid ""
+#~ "Please click on a button above\n"
+#~ "\n"
+#~ "Or use \"New\""
+#~ msgstr ""
+#~ "上のボタンをクリックするか\n"
+#~ "\n"
+#~ "\"New\"を使います"
+
+#~ msgid "Use \"New\""
+#~ msgstr "\"New\"を使います"
+
+#~ msgid "If the list above doesn't contain the wanted entry, enter it here:"
+#~ msgstr "上の一覧に希望のエントリがなければここに入力しましょう:"
+
+#~ msgid "Shared resource"
+#~ msgstr "共有リソース"
+
+#~ msgid "Ambiguity (%s), be more precise\n"
+#~ msgstr "不明 (%s)，もっと正確に\n"
+
+#~ msgid " ? (default %s) "
+#~ msgstr "? (デフォルトは %s) "
+
+#~ msgid "Your choice? (default %s  enter `none' for none) "
+#~ msgstr "どれにしますか？（デフォルトは %s、選ばないなら「なし」）"
+
 #~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
 #~ msgstr "/etc/sysconfig/autologin が読みとり用に開けません: %s"
 
@@ -9194,54 +12476,12 @@ msgstr "科学ワークステーション"
 #~ msgid "Press next to continue."
 #~ msgstr "「次」を押して先に進みましょう。"
 
-#~ msgid "/File/_New"
-#~ msgstr "/ファイル(F)/新規(N)"
-
-#~ msgid "<control>N"
-#~ msgstr "<control>N"
-
-#~ msgid "/File/_Open"
-#~ msgstr "/ファイル(F)/開く(O)"
-
-#~ msgid "<control>O"
-#~ msgstr "<control>O"
-
-#~ msgid "/File/_Save"
-#~ msgstr "/ファイル(F)/保存(S)"
-
-#~ msgid "<control>S"
-#~ msgstr "<control>S"
-
-#~ msgid "/File/Save _As"
-#~ msgstr "/ファイル(F)/別の名前で保存(A)"
-
-#~ msgid "/File/-"
-#~ msgstr "/ファイル(F)/-"
-
-#~ msgid "/Options/Test"
-#~ msgstr "/オプション(O)/テスト"
-
-#~ msgid "/_Help"
-#~ msgstr "/ヘルプ(H)"
-
-#~ msgid "/Help/_About..."
-#~ msgstr "/ヘルプ(H)/このソフトについて(A)"
-
 #~ msgid "Default Runlevel"
 #~ msgstr "デフォルトのランレベル"
 
 #~ msgid "Write /etc/fstab"
 #~ msgstr "/etc/fstab を更新"
 
-#~ msgid "Restore from file"
-#~ msgstr "ファイルからリストアする"
-
-#~ msgid "Save in file"
-#~ msgstr "ファイルにセーブする"
-
-#~ msgid "Restore from floppy"
-#~ msgstr "フロッピーからリストアする"
-
 #~ msgid "Format all"
 #~ msgstr "全てをフォーマット"
 
@@ -9478,7 +12718,7 @@ msgstr "科学ワークステーション"
 #~ "\"Disable networking\".\n"
 #~ "\n"
 #~ "\n"
-#~ "If you wish to configure the network later after installation or if you "
+#~ "If you wish to configure the network later after installation, or if you "
 #~ "have\n"
 #~ "finished to configure your network connection, choose \"Done\"."
 #~ msgstr ""
@@ -9902,7 +13142,8 @@ msgstr "科学ワークステーション"
 #~ "楽に思いだせる必要があります。"
 
 #~ msgid ""
-#~ "If your network uses LDAP (or NIS) protocol for authentication, select\n"
+#~ "If your network uses the LDAP (or NIS) protocol for authentication, "
+#~ "select\n"
 #~ "\"LDAP\" (or \"NIS\") as authentication. If you don't know, ask your "
 #~ "network\n"
 #~ "administrator.\n"
@@ -10155,9 +13396,6 @@ msgstr "科学ワークステーション"
 #~ msgid "ADSL configuration"
 #~ msgstr "ADSLの設定"
 
-#~ msgid "Europe"
-#~ msgstr "ヨーロッパ"
-
 #~ msgid "NetWare"
 #~ msgstr "NetWare"
 
@@ -10180,14 +13418,14 @@ msgstr "科学ワークステーション"
 #~ msgid "A command line must be entered!"
 #~ msgstr "コマンドラインを入力してください！"
 
-#~ msgid "Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"
-#~ msgstr "Option $printer->{ARGS}[$i]{'comment'} は正数にしてください!"
+#~ msgid "Option %s->{ARGS}[%s]{'comment'} must be an integer number!"
+#~ msgstr "Option %s->{ARGS}[%s]{'comment'} は正数にしてください!"
 
-#~ msgid "Option $printer->{ARGS}[$i]{'comment'} must be a number!"
-#~ msgstr "Option $printer->{ARGS}[$i]{'comment'} は数字にしてください!"
+#~ msgid "Option %s->{ARGS}[%s]{'comment'} must be a number!"
+#~ msgstr "Option %s->{ARGS}[%s]{'comment'} は数字にしてください!"
 
-#~ msgid "Option $printer->{ARGS}[$i]{'comment'} out of range!"
-#~ msgstr "Option $printer->{ARGS}[$i]{'comment'} が範囲外です!"
+#~ msgid "Option %s->{ARGS}[%s]{'comment'} out of range!"
+#~ msgstr "Option %s->{ARGS}[%s]{'comment'} が範囲外です!"
 
 #~ msgid ""
 #~ "With a remote CUPS server, you do not have to configure\n"
@@ -10204,9 +13442,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Enter Printer Name and Comments"
 #~ msgstr "プリンタの名前とコメントを入力してください"
 
-#~ msgid "Remove queue"
-#~ msgstr "キューの削除"
-
 #~ msgid "Config file content could not be interpreted."
 #~ msgstr "設定ファイルの内容が解釈できません。"
 
@@ -10228,9 +13463,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Network Monitoring"
 #~ msgstr "ネットワークの監視"
 
-#~ msgid "Settings"
-#~ msgstr "設定"
-
 #~ msgid "Profile "
 #~ msgstr "プロイール "
 
@@ -10268,9 +13500,6 @@ msgstr "科学ワークステーション"
 #~ "接続失敗。\n"
 #~ "Mandrake コントロールセンターで設定を確認してください。"
 
-#~ msgid "Color configuration"
-#~ msgstr "カラーの設定"
-
 #~ msgid "sent: "
 #~ msgstr "送信済み："
 
@@ -10280,12 +13509,6 @@ msgstr "科学ワークステーション"
 #~ msgid "average"
 #~ msgstr "平均"
 
-#~ msgid "Connect"
-#~ msgstr "接続"
-
-#~ msgid "Disconnect"
-#~ msgstr "切断"
-
 #~ msgid ""
 #~ "You can now test your mouse. Use buttons and wheel to verify\n"
 #~ "if settings are good. If not, you can click on \"Cancel\" to choose "
@@ -10460,9 +13683,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Create a boot floppy"
 #~ msgstr "起動ディスク作成"
 
-#~ msgid "Format floppy"
-#~ msgstr "フロッピーをフォーマット"
-
 #~ msgid "Choice"
 #~ msgstr "選択"
 
@@ -10563,9 +13783,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Internet/Network access"
 #~ msgstr "インターネット/ネットワークへのアクセス"
 
-#~ msgid "Firewall Configuration Wizard"
-#~ msgstr "ファイアーウォール設定ウィザード"
-
 #~ msgid "Miscellaneous"
 #~ msgstr "その他もろもろ"
 
@@ -10604,9 +13821,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Scientific applications"
 #~ msgstr "科学アプリケーション"
 
-#~ msgid "toot"
-#~ msgstr "toot"
-
 #~ msgid "File/Print/Samba"
 #~ msgstr "サーバ、ファイル/印刷/Samba"
 
@@ -10647,8 +13861,8 @@ msgstr "科学ワークステーション"
 #~ "\n"
 #~ "続けるなら、%s 環境をシャットダウンします"
 
-#~ msgid "eth$_"
-#~ msgstr "eth$_"
+#~ msgid "eth%s"
+#~ msgstr "eth%s"
 
 #~ msgid "loopback"
 #~ msgstr "ループバック"
@@ -10665,9 +13879,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Configure an ISDN connection"
 #~ msgstr "ISDN 接続の設定"
 
-#~ msgid "Configure a cable connection"
-#~ msgstr "ケーブルテレビ接続の設定"
-
 #~ msgid "Disable Internet Connection"
 #~ msgstr "インターネット接続を無効にする"
 
@@ -10730,9 +13941,6 @@ msgstr "科学ワークステーション"
 #~ msgid "(may cause data corruption)"
 #~ msgstr "（データが壊れるおそれがあります）"
 
-#~ msgid "Use hard drive optimisations?"
-#~ msgstr "ハードディスクを最適化しますか？"
-
 #~ msgid "Enable num lock at startup"
 #~ msgstr "起動時にnum lockをオンにする"
 
@@ -10775,9 +13983,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Use shadow file"
 #~ msgstr "シャドウファイルを使う"
 
-#~ msgid "shadow"
-#~ msgstr "シャドウ"
-
 #~ msgid "MD5"
 #~ msgstr "MD5"
 
@@ -10790,9 +13995,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Package"
 #~ msgstr "パッケージ"
 
-#~ msgid "Text"
-#~ msgstr "テキスト"
-
 #~ msgid "Tree"
 #~ msgstr "ツリー"
 
@@ -10802,9 +14004,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Category"
 #~ msgstr "種類"
 
-#~ msgid "See"
-#~ msgstr "以下を参照："
-
 #~ msgid "Installed packages"
 #~ msgstr "インストール済みのパッケージ"
 
@@ -10835,30 +14034,18 @@ msgstr "科学ワークステーション"
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "インストール済みと未インストールを切り替え"
 
-#~ msgid "Choose package to install"
-#~ msgstr "インストールしたいパッケージの選択"
-
 #~ msgid "Checking dependencies"
 #~ msgstr "パッケージの依存関係を調べています"
 
-#~ msgid "Wait"
-#~ msgstr "少々お待ちを"
-
 #~ msgid "The following packages are going to be uninstalled"
 #~ msgstr "以下のパッケージはアンインストールできません"
 
-#~ msgid "Uninstalling the RPMs"
-#~ msgstr "パッケージをのアンインストールしています"
-
 #~ msgid "Regexp"
 #~ msgstr "正規表現"
 
 #~ msgid "Which package are looking for"
 #~ msgstr "どのパッケージをさがしていますか"
 
-#~ msgid "%s not found"
-#~ msgstr "%s が見つかりません"
-
 #~ msgid "No match"
 #~ msgstr "一致するものがありません"
 
@@ -10918,9 +14105,6 @@ msgstr "科学ワークステーション"
 #~ msgid "I have found an ISDN Card:\n"
 #~ msgstr "ISDNカードをみつけました:\n"
 
-#~ msgid "France"
-#~ msgstr "フランス"
-
 #~ msgid "Other countries"
 #~ msgstr "他の国"
 
@@ -10942,12 +14126,6 @@ msgstr "科学ワークステーション"
 #~ msgid "don't use pppoe"
 #~ msgstr "pppoeを使わない"
 
-#~ msgid "mandatory"
-#~ msgstr "強制"
-
-#~ msgid "interesting"
-#~ msgstr "面白い"
-
 #~ msgid "i18n (important)"
 #~ msgstr "i18n (重要)"
 
@@ -11353,9 +14531,6 @@ msgstr "科学ワークステーション"
 #~ "一定時間（秒）活動がないと、自動的に電話を切ります。\n"
 #~ "秒数を指定しましょう (自動切断したくなければ空白のまま）"
 
-#~ msgid "Germany"
-#~ msgstr "ドイツ"
-
 #~ msgid "Germany (1TR6)"
 #~ msgstr "ドイツ (1TR6)"
 
@@ -11809,9 +14984,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Configure LAN"
 #~ msgstr "LAN の設定"
 
-#~ msgid "End configuration"
-#~ msgstr "設定を終える"
-
 #~ msgid "Do not set up networking"
 #~ msgstr "ネットワーク設定をしない"
 
@@ -11870,21 +15042,18 @@ msgstr "科学ワークステーション"
 #~ msgid "You may now decide which class C network to use.\n"
 #~ msgstr "どのクラスCネットワークを使うか決めてください。\n"
 
-#~ msgid "Network:"
-#~ msgstr "ネットワーク:"
-
-#~ msgid "Internet Connection Sharing - setup of $device"
-#~ msgstr "インターネット共有接続 - $device の設定"
+#~ msgid "Internet Connection Sharing - setup of %s"
+#~ msgstr "インターネット共有接続 - %s の設定"
 
 #~ msgid ""
 #~ "The following interface is about to be configured:\n"
 #~ "\n"
-#~ "$interface\n"
+#~ "%s\n"
 #~ "\n"
 #~ msgstr ""
 #~ "次のインターフェースを設定しようとしてます：\n"
 #~ "\n"
-#~ "$interface\n"
+#~ "%s\n"
 #~ "\n"
 
 #~ msgid "Everything configured!"
@@ -12171,9 +15340,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Which language do you want?"
 #~ msgstr "どの言語を使いますか？"
 
-#~ msgid "Which packages do you want to install"
-#~ msgstr "どのパッケージをインストールしますか"
-
 #~ msgid "What usage do you want?"
 #~ msgstr "どの使用法を選びますか？"
 
@@ -12209,9 +15375,6 @@ msgstr "科学ワークステーション"
 #~ msgid "Password:"
 #~ msgstr "パスワード:"
 
-#~ msgid "expert"
-#~ msgstr "エキスパート"
-
 #~ msgid "developer"
 #~ msgstr "開発者"
 
@@ -12230,9 +15393,6 @@ msgstr "科学ワークステーション"
 #~ msgid "changing type of"
 #~ msgstr "タイプの変更"
 
-#~ msgid "formatting"
-#~ msgstr "フォーマット中"
-
 #~ msgid "resizing"
 #~ msgstr "リサイズ中"