•ã„\n"
+"安党のため、この䜜業を実行する前に他のすべおのUSBメモリヌデバむスを取り倖しお"
+"ください。"
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "キヌが曞き蟌み䞍可です"
+
+#: ../move/move.pm:450
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled. Please\n"
+"unplug it, remove write protection, and then plug it again."
+msgstr ""
+"USBキヌに曞き蟌みプロテクトがかかっおいるようです。いったん\n"
+"抜いおプロテクトを倖し、再床差し蟌んでください"
+
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "リトラむ"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr "USBキヌなしで続行"
+
+#: ../move/move.pm:462
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled, but we can't safely\n"
+"unplug it now.\n"
+"\n"
+"\n"
+"Click the button to reboot the machine, unplug it, remove write protection,\n"
+"plug the key again, and launch Mandrake Move again."
+msgstr ""
+"USBキヌに曞き蟌みプロテクトがかかっおいるようですが、安党に取り倖す\n"
+"こずができたせん\n"
+"\n"
+"\n"
+"再起動ボタンをクリックし、プラグを抜いお曞き蟌みプロテクトを倖しおから\n"
+"再床キヌを差し蟌んで Mandrake Move を起動しおください。"
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "再起動"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -30,8 +98,16 @@ msgid ""
 "able to use Mandrake Move as a normal live Mandrake\n"
 "Operating System."
 msgstr ""
+"お䜿いのUSBキヌには有効なWindows(FAT)パヌティションがありたせん。\n"
+"続行するにはWindowsパヌティションを含んだUSBキヌを差し蟌んでくだ\n"
+"さい。(FATファむルシステムを䜿うずWindowsマシンからもファむルの\n"
+"移動・読蟌が可胜になりたす)\n"
+"\n"
+"\n"
+"Mandrake MoveはUSBキヌなしで䜿甚するこずもできたす。\n"
+"その堎合は通垞のラむブOSになりたす。"
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -46,140 +122,108 @@ msgid ""
 "able to use Mandrake Move as a normal live Mandrake\n"
 "Operating System."
 msgstr ""
+"システムにUSBキヌを怜出できたせんでした。USBキヌを䜿うず\n"
+"ホヌムディレクトリのデヌタずシステム党䜓の蚭定が透過的に\n"
+"保存され、次回ブヌトたたは別のマシンで利甚するこずができたす。\n"
+"泚意: キヌを差し蟌んでから怜出するたでに数秒かかりたす。\n"
+"\n"
+"\n"
+"Mandrake MoveはUSBキヌなしで䜿甚するこずもできたす。\n"
+"その堎合は通垞のラむブOSになりたす。"
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
 msgstr "デヌタを保存するにはキヌが必芁です"
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr "再床USBキヌを怜出"
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr "USBキヌなしで続行"
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr "キヌが曞き蟌み䞍可です"
-
-#: ../move/move.pm:439
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
-"unplug it now.\n"
-"\n"
-"\n"
-"Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
-msgstr ""
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "再起動"
-
-#: ../move/move.pm:453
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
-msgstr ""
-"USBキヌに曞き蟌みプロテクトがかかっおいるようです。いったん\n"
-"抜いおプロテクトを倖し、再床差し蟌んでください"
-
-#: ../move/move.pm:455
-#, c-format
-msgid "Retry"
-msgstr "リトラむ"
-
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
 msgstr "USBキヌを蚭定"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
 msgstr "お埅ちください。USBのシステム蚭定ファむルをセットアップ.."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr "スクリヌンセヌバで䜿甚するナヌザ情報ずパスワヌドを入力"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "自動蚭定"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "お埅ちください。デバむスの怜出ず蚭定.."
 
-#: ../move/move.pm:545 ../move/move.pm:601 ../move/move.pm:605
-#: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
-#: diskdrake/interactive.pm:220 diskdrake/interactive.pm:233
-#: diskdrake/interactive.pm:374 diskdrake/interactive.pm:389
-#: diskdrake/interactive.pm:510 diskdrake/interactive.pm:515
-#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:262 install_steps.pm:82
-#: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:936 network/netconnect.pm:939
-#: network/netconnect.pm:984 network/netconnect.pm:988
-#: network/netconnect.pm:1055 network/netconnect.pm:1105
-#: network/netconnect.pm:1110 network/netconnect.pm:1125
-#: network/netconnect.pm:1333 printer/printerdrake.pm:213
-#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
-#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:1067 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1195
-#: printer/printerdrake.pm:1199 printer/printerdrake.pm:1213
-#: printer/printerdrake.pm:1303 printer/printerdrake.pm:1383
-#: printer/printerdrake.pm:1387 printer/printerdrake.pm:1391
-#: printer/printerdrake.pm:1440 printer/printerdrake.pm:1497
-#: printer/printerdrake.pm:1501 printer/printerdrake.pm:1515
-#: printer/printerdrake.pm:1625 printer/printerdrake.pm:1629
-#: printer/printerdrake.pm:1666 printer/printerdrake.pm:1731
-#: printer/printerdrake.pm:1749 printer/printerdrake.pm:1758
-#: printer/printerdrake.pm:1767 printer/printerdrake.pm:1778
-#: printer/printerdrake.pm:1840 printer/printerdrake.pm:2285
-#: printer/printerdrake.pm:2551 printer/printerdrake.pm:2557
-#: printer/printerdrake.pm:3010 printer/printerdrake.pm:3014
-#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
-#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
-#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
-#: standalone/drakTermServ:404 standalone/drakTermServ:758
-#: standalone/drakTermServ:765 standalone/drakTermServ:960
-#: standalone/drakTermServ:1430 standalone/drakTermServ:1435
-#: standalone/drakTermServ:1442 standalone/drakTermServ:1453
-#: standalone/drakTermServ:1475 standalone/drakauth:36
-#: standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1118 standalone/drakbackup:1151
-#: standalone/drakbackup:1644 standalone/drakbackup:1807
-#: standalone/drakbackup:2419 standalone/drakbackup:4084
-#: standalone/drakbackup:4304 standalone/drakboot:255 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:621
-#: standalone/drakconnect:624 standalone/drakconnect:645
-#: standalone/drakfloppy:302 standalone/drakfloppy:306
-#: standalone/drakfloppy:312 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
-#: standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467
-#: standalone/logdrake:472 standalone/scannerdrake:58
-#: standalone/scannerdrake:200 standalone/scannerdrake:259
-#: standalone/scannerdrake:688 standalone/scannerdrake:699
-#: standalone/scannerdrake:838 standalone/scannerdrake:849
-#: standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:223
+#: diskdrake/interactive.pm:236 diskdrake/interactive.pm:377
+#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:520 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:167
+#: install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:995 network/netconnect.pm:999
+#: network/netconnect.pm:1004 network/netconnect.pm:1045
+#: network/netconnect.pm:1049 network/netconnect.pm:1187
+#: network/netconnect.pm:1192 network/netconnect.pm:1210
+#: network/netconnect.pm:1393 printer/printerdrake.pm:238
+#: printer/printerdrake.pm:245 printer/printerdrake.pm:270
+#: printer/printerdrake.pm:416 printer/printerdrake.pm:421
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:444
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:1182
+#: printer/printerdrake.pm:1229 printer/printerdrake.pm:1266
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1314
+#: printer/printerdrake.pm:1328 printer/printerdrake.pm:1418
+#: printer/printerdrake.pm:1498 printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1506 printer/printerdrake.pm:1555
+#: printer/printerdrake.pm:1612 printer/printerdrake.pm:1616
+#: printer/printerdrake.pm:1630 printer/printerdrake.pm:1740
+#: printer/printerdrake.pm:1744 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1846 printer/printerdrake.pm:1864
+#: printer/printerdrake.pm:1873 printer/printerdrake.pm:1882
+#: printer/printerdrake.pm:1893 printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:2672
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3188
+#: printer/printerdrake.pm:3192 printer/printerdrake.pm:3196
+#: printer/printerdrake.pm:3606 printer/printerdrake.pm:3846
+#: printer/printerdrake.pm:3866 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4123
+#: standalone/drakTermServ:379 standalone/drakTermServ:731
+#: standalone/drakTermServ:738 standalone/drakTermServ:933
+#: standalone/drakTermServ:1403 standalone/drakTermServ:1408
+#: standalone/drakTermServ:1415 standalone/drakTermServ:1426
+#: standalone/drakTermServ:1447 standalone/drakauth:37
+#: standalone/drakbackup:512 standalone/drakbackup:626
+#: standalone/drakbackup:1128 standalone/drakbackup:1161
+#: standalone/drakbackup:1665 standalone/drakbackup:1821
+#: standalone/drakbackup:2416 standalone/drakbackup:4105
+#: standalone/drakbackup:4325 standalone/drakbug:235 standalone/drakbug:254
+#: standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648
+#: standalone/drakconnect:651 standalone/drakconnect:670
+#: standalone/drakfloppy:297 standalone/drakfloppy:301
+#: standalone/drakfloppy:307 standalone/drakfont:210 standalone/drakfont:223
+#: standalone/drakfont:259 standalone/drakfont:604 standalone/draksplash:21
+#: standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169
+#: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
+#: standalone/scannerdrake:196 standalone/scannerdrake:255
+#: standalone/scannerdrake:684 standalone/scannerdrake:695
+#: standalone/scannerdrake:834 standalone/scannerdrake:845
+#: standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "゚ラヌ"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
@@ -188,12 +232,12 @@ msgstr ""
 "゚ラヌが発生したした。しかし察凊する方法が分かりたせん。\n"
 "自己責任で続けおください。"
 
-#: ../move/move.pm:601 install_steps_interactive.pm:40
+#: ../move/move.pm:660 install_steps_interactive.pm:38
 #, c-format
 msgid "An error occurred"
 msgstr "゚ラヌが発生したした"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -217,43 +261,49 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"This may come from corrupted system configuration files\n"
-"on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
-"so, click on the corresponding button.\n"
+"USBキヌに保存されおいるシステム蚭定ファむルが壊れおいる\n"
+"可胜性がありたす。その堎合は、蚭定ファむルを削陀し再床\n"
+"Mandrake Moveを起動するず解決できたす。そうするには\n"
+"アクションに察応したボタンをクリックしおください。\n"
 "\n"
 "\n"
-"You may also want to reboot and remove the USB key, or\n"
-"examine its contents under another OS, or even have\n"
-"a look at log files in console #3 and #4 to try to\n"
-"guess what's happening."
+"他の察凊法ずしお、再起動しおUSBキヌを抜く、別のOSでキヌ\n"
+"に保存されおいるファむルを怜査する、コン゜ヌル#3たたは#4\n"
+"でログを芋お原因を調べる、などが考えられたす。"
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "システム蚭定ファむルを削陀"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr "シンプルな再起動"
 
-#: ../move/tree/mdk_totem:60
+#: ../move/tree/mdk_totem:50 ../move/tree/mdk_totem:96
 #, c-format
 msgid "You can only run with no CDROM support"
 msgstr "CDROMサポヌト無しでしか実行できたせん"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
 msgstr "これらのプログラムをKill"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr "CDROMサポヌトなし"
 
-#: ../move/tree/mdk_totem:87
+#: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
+#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
+#: diskdrake/interactive.pm:1068
+#, c-format
+msgid "Read carefully!"
+msgstr "よくお読みください"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -265,7 +315,7 @@ msgstr ""
 #: ../move/tree/mdk_totem:101
 #, c-format
 msgid "Copying to memory to allow removing the CDROM"
-msgstr ""
+msgstr "CDROMなしで䜿えるようにメモリにコピヌ"
 
 #: Xconfig/card.pm:13
 #, c-format
@@ -312,22 +362,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB以䞊"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "Xサヌバ"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
 msgstr "Xサヌバを遞んでください"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "マルチヘッド蚭定"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -336,80 +386,80 @@ msgstr ""
 "お䜿いのシステムはマルチヘッド蚭定をサポヌトしおいたす。\n"
 "どうしたすか"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "XFreeパッケヌゞをむンストヌルできたせん: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Xorgパッケヌゞをむンストヌルできたせん: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "グラフィックカヌドのメモリサむズを遞んでください"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "XFreeを蚭定"
+msgid "Xorg configuration"
+msgstr "Xorgを蚭定"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "XFreeの蚭定を遞んでください"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Xorgの蚭定を遞んでください"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "ヘッドを別々に蚭定"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama拡匵を䜿う"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "以䞋のカヌドだけを蚭定: %s %s"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "ハヌドりェア3Dアクセラレヌション぀きのXFree %s"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "ハヌドりェア3Dアクセラレヌション぀きのXorg %s"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "このカヌドはXFree %s での3Dアクセラレヌションが可胜です。"
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "このカヌドはXorg %s での3Dアクセラレヌションが可胜です。"
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "実隓段階のハヌドりェア3Dアクセラレヌション぀きのXFree %s"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "実隓段階のハヌドりェア3Dアクセラレヌション぀きのXorg %s"
 
-#: Xconfig/card.pm:402
+#: Xconfig/card.pm:422
 #, c-format
 msgid ""
-"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"Your card can have 3D hardware acceleration support with Xorg %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
-"このカヌドはXFree %s での3Dアクセラレヌションが可胜です。\n"
+"このカヌドはXorg %s での3Dアクセラレヌションが可胜です。\n"
 "泚意: これは実隓的なサポヌトなので、マシンがフリヌズするかもしれたせん。"
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:112 any.pm:833
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
 #, c-format
 msgid "Custom"
 msgstr "カスタム"
 
-#: Xconfig/main.pm:115 diskdrake/dav.pm:28 help.pm:14
-#: install_steps_interactive.pm:83 printer/printerdrake.pm:608
-#: printer/printerdrake.pm:4076 standalone/draksplash:120
-#: standalone/harddrake2:194 standalone/logdrake:175
-#: standalone/scannerdrake:450
+#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
+#: install_steps_interactive.pm:88 printer/printerdrake.pm:712
+#: printer/printerdrake.pm:3937 printer/printerdrake.pm:4382
+#: standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:174
+#: standalone/net_applet:160 standalone/scannerdrake:446
 #, c-format
 msgid "Quit"
 msgstr "終了"
@@ -419,12 +469,12 @@ msgstr "終了"
 msgid "Graphic Card"
 msgstr "グラフィックカヌド"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "モニタ"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:217
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
 #, c-format
 msgid "Resolution"
 msgstr "解像床"
@@ -434,14 +484,19 @@ msgstr "解像床"
 msgid "Test"
 msgstr "テスト"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:67 diskdrake/interactive.pm:415
-#: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:554 standalone/harddrake2:191
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
+#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
 #, c-format
 msgid "Options"
 msgstr "オプション"
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr "Xorg蚭定ファむルが壊れおいたす。無芖したす。"
+
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -454,38 +509,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
-#, fuzzy, c-format
+#: Xconfig/monitor.pm:111
+#, c-format
 msgid "Choose a monitor for head #%d"
-msgstr "モニタを遞んでください"
+msgstr "head #%d のモニタを遞んでください"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "モニタを遞んでください"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "プラグプレむ"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "䞀般"
 
-#: Xconfig/monitor.pm:115 standalone/drakconnect:569 standalone/harddrake2:73
-#: standalone/harddrake2:74
+#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
+#: standalone/harddrake2:83
 #, c-format
 msgid "Vendor"
-msgstr "ベンダヌ"
+msgstr "ベンダ"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "プラグプレむの怜出に倱敗。手動でモニタを遞んでください"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -507,12 +562,12 @@ msgstr ""
 "モニタが砎損する堎合がありたす。\n"
 "分からない堎合は䜎めに蚭定しおください。"
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "氎平呚波数"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "垂盎呚波数"
@@ -537,58 +592,60 @@ msgstr "6侇5千色 (16 bits)"
 msgid "16 million colors (24 bits)"
 msgstr "1600䞇色 (24 bits)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "解像床"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "解像床ず色深床"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "グラフィックカヌド: %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: standalone/drakTermServ:201 standalone/drakTermServ:474
+#: standalone/drakbackup:3962 standalone/drakbackup:4022
+#: standalone/drakbackup:4066 standalone/drakconnect:165
+#: standalone/drakconnect:850 standalone/drakconnect:937
+#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:1122 ugtk2.pm:1145
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: Xconfig/resolution_and_depth.pm:278 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498
-#: interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:304
-#: standalone/drakbackup:3867 standalone/drakbug:157
-#: standalone/drakconnect:160 standalone/drakconnect:239
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
-#: standalone/harddrake2:190 ugtk2.pm:1197 ugtk2.pm:1198
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
+#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
+#: standalone/drakbackup:3884 standalone/drakbug:128
+#: standalone/drakconnect:160 standalone/drakconnect:245
+#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
+#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
+#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
 #, c-format
 msgid "Help"
 msgstr "ヘルプ"
@@ -682,8 +739,8 @@ msgstr "解像床: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86ドラむバ: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Xorgドラむバ: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -694,8 +751,8 @@ msgstr "起動時のグラフィカルむンタフェヌス"
 #, c-format
 msgid ""
 "I can setup your computer to automatically start the graphical interface "
-"(XFree) upon booting.\n"
-"Would you like XFree to start when you reboot?"
+"(Xorg) upon booting.\n"
+"Would you like Xorg to start when you reboot?"
 msgstr ""
 "コンピュヌタを起動したずきにXが自動的に立ち䞊がるよう蚭定できたす。\n"
 "再起動したずきにXを立ち䞊げたすか"
@@ -726,20 +783,60 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "テレビの画像方匏は䜕ですか"
 
-#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
-#: standalone/drakxtv:90 standalone/harddrake2:140
-#: standalone/service_harddrake:126
+#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
+#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Please wait"
 msgstr "お埅ちください"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "ブヌトロヌダをむンストヌル䞭"
 
-#: any.pm:142
+#: any.pm:127
+#, c-format
+msgid ""
+"LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
+"error.\n"
+"This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
+"\n"
+"Assign a new Volume ID?"
+msgstr ""
+"LILOがドラむブ %s に新しいボリュヌムIDを割圓おようずしおいたす。\n"
+"Windows NT/2000/XPのブヌトディスクのボリュヌムIDを倉曎するこずは\n"
+"Windowsシステムの臎呜的゚ラヌになりたす。この譊告はWindows 95/98やNTデヌタ"
+"ディスクには圓おはたりたせん。\n"
+"\n"
+"新しいボリュヌムIDを割圓おたすか"
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr "ブヌトロヌダのむンストヌルに倱敗したした。以䞋の゚ラヌが発生:"
+
+#: any.pm:144
+#, c-format
+msgid ""
+"You may need to change your Open Firmware boot-device to\n"
+" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" reboot, hold down Command-Option-O-F at reboot and enter:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Then type: shut-down\n"
+"At your next boot you should see the bootloader prompt."
+msgstr ""
+"ブヌトロヌダを有効にするにはオヌプンファヌムりェアの起動デバむスを\n"
+"倉曎する必芁があるかもしれたせん。再起動時にブヌトロヌダのプロンプトが\n"
+"衚瀺されない堎合は、Command-Option-O-F を再起動時に抌しお\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" shut-down\n"
+"ず入力しおください。\n"
+"次回の起動時にはブヌトロヌダのプロンプトが衚瀺されるはずです。"
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -754,278 +851,263 @@ msgstr ""
 "\n"
 "どのドラむブから起動したすか"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "ドラむブの最初のセクタ(MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "rootパヌティションの最初のセクタ"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "フロッピヌで"
 
-#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
+#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
 #, c-format
 msgid "Skip"
 msgstr "スキップ"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "SILOのむンストヌル"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/GRUBのむンストヌル"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "ブヌトロヌダをどこにむンストヌルしたすか"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "ブヌトパヌティションの最初のセクタ"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "起動方匏の蚭定"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "ブヌトロヌダのメむンオプション"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "RAMのサむズをMBで入力"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "コマンドラむンオプションを制限するにはパスワヌドが必芁です"
 
-#: any.pm:218 any.pm:531 install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
 #, c-format
 msgid "The passwords do not match"
 msgstr "パスワヌドが䞀臎したせん"
 
-#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1262
-#: install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
+#: install_steps_interactive.pm:1215
 #, c-format
 msgid "Please try again"
 msgstr "もう䞀床詊しおください"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "䜿甚するブヌトロヌダ"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "ブヌトロヌダのむンストヌル"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "起動デバむス"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "デフォルトが起動するたでの秒数"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPIを蚱可する"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "APIC無しを匷制"
 
-#: any.pm:234
-#, fuzzy, c-format
+#: any.pm:262
+#, c-format
 msgid "Force No Local APIC"
-msgstr "APICを犁止する"
+msgstr "No Local APICを匷制"
 
-#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1155 network/netconnect.pm:574
-#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
-#: standalone/drakbackup:1626 standalone/drakbackup:3496
-#: standalone/drakups:278
+#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1220 network/netconnect.pm:595
+#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
+#: standalone/drakbackup:1647 standalone/drakbackup:3490
+#: standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr "パスワヌド"
 
-#: any.pm:237 any.pm:559 install_steps_interactive.pm:1156
+#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
 #, c-format
 msgid "Password (again)"
 msgstr "もう䞀床パスワヌドを入力"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "コマンドラむンオプションの制限"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "制限"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 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:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 "必芁なら正確なRAMサむズを入力しおください\n"
 "(怜出したサむズ: %dMB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "マルチプロファむルを有効に"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "初期化メッセヌゞ"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "オヌプンファヌムりェアの遅延"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "カヌネルブヌトの時間蚭定"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "CDからの起動を有効にしたすか"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "OFからの起動を有効にしたすか"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "デフォルトのOSは"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "むメヌゞ"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "root"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "远加"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "ビデオモヌド"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, c-format
+msgid "Network profile"
+msgstr "ネットワヌクのプロファむル"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "ラベル"
 
-#: any.pm:319 any.pm:329 harddrake/v4l.pm:275 standalone/drakfloppy:89
-#: standalone/drakfloppy:95
+#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "デフォルト"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrdサむズ"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "ビデオなし"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "空癜のラベルは䜿えたせん"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "カヌネルむメヌゞを指定しおください"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "rootパヌティションは必ず指定しおください"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "このラベルは既に䜿われおいたす"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "どの皮類を远加したすか"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "他のOS(SunOSなど)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "他のOS(MacOSなど)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "他のOS(Windowsなど)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1034,73 +1116,73 @@ msgstr ""
 "起動メニュヌの項目は以䞋のずおりです。\n"
 "項目を远加/倉曎するこずができたす。"
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "Xプログラムぞのアクセス"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "RPMツヌルぞのアクセス"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "suを蚱可する"
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "管理ファむルぞのアクセス"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "ネットワヌクツヌルぞのアクセス"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr "コンパむルツヌルぞのアクセス"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s は远加枈み)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "パスワヌドが簡単すぎたす"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "ナヌザ名を入力しおください"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "ナヌザ名には英語の小文字/数字/ - / _ しか䜿えたせん。"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "このナヌザ名は長すぎたす"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "このナヌザ名は既に存圚しおいたす"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "ナヌザを远加"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1109,73 +1191,77 @@ msgstr ""
 "ナヌザ名を入力\n"
 "%s"
 
-#: any.pm:544 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
-#: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544
-#: interactive/http.pm:152 printer/printerdrake.pm:165
-#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
-#: standalone/drakbackup:2708 standalone/scannerdrake:641
-#: standalone/scannerdrake:791
+#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
+#: interactive/http.pm:151 printer/printerdrake.pm:191
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4382
+#: standalone/drakbackup:2703 standalone/scannerdrake:637
+#: standalone/scannerdrake:787
 #, c-format
 msgid "Done"
 msgstr "終了"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "ナヌザ受け入れ"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "本名"
 
-#: any.pm:557 help.pm:52 printer/printerdrake.pm:1373
-#: printer/printerdrake.pm:1493
+#: any.pm:612 standalone/drakbackup:1642
 #, c-format
-msgid "User name"
-msgstr "ナヌザ名"
+msgid "Login name"
+msgstr "ログむン名"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "シェル"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "アむコン"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自動ログむン"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "自動的に特定のナヌザでログオンするよう蚭定できたす。"
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "この機胜を䜿いたすか"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "デフォルトのナヌザを遞択:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "りィンドりマネヌゞャを遞んでください:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "䜿甚する蚀語を遞んでください。"
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "蚀語の遞択"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1186,48 +1272,57 @@ msgstr ""
 "むンストヌルしたい蚀語を遞んでください。\n"
 "むンストヌル埌に再遞択するこずも可胜です。"
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Unicodeをデフォルトにする"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "党おの蚀語"
 
-#: any.pm:698 help.pm:581 help.pm:991 install_steps_interactive.pm:895
+#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
 #, c-format
 msgid "Country / Region"
 msgstr "囜名/地域"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "䜿甚する囜名を遞択しおください。"
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "利甚可胜な囜名の党リスト"
 
-#: any.pm:702 diskdrake/interactive.pm:297 help.pm:544 help.pm:581 help.pm:621
-#: help.pm:991 install_steps_interactive.pm:114
+#: any.pm:769
 #, c-format
-msgid "More"
-msgstr "詳现"
+msgid "Other Countries"
+msgstr "他の囜"
 
-#: any.pm:833
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "入力方匏:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "なし"
+
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "共有しない"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "党おのナヌザを蚱可"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1241,32 +1336,43 @@ msgstr ""
 "クリックしおください。\n"
 "'カスタム'を遞ぶずナヌザごずに现かく蚭定できたす。\n"
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
-msgstr ""
+msgstr "NFS: 䌝統的なUnixファむル共有システム"
 
-#: any.pm:852
+#: any.pm:931
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
 "systems."
 msgstr ""
+"SMB: Windows/Mac OS X や新しいLinuxシステムで䜿われるファむル共有システム"
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "゚クスポヌトにはNFSかSMBを䜿えたす。どちらにしたすか"
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "userdrakeを起動"
 
-#: any.pm:885
+#: any.pm:964 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3482 printer/printerdrake.pm:3483
+#: printer/printerdrake.pm:4676 standalone/drakTermServ:289
+#: standalone/drakbackup:4084 standalone/drakbug:151 standalone/drakfont:500
+#: standalone/drakfont:594 standalone/net_monitor:123
+#: standalone/printerdrake:559
+#, c-format
+msgid "Close"
+msgstr "閉じる"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1275,92 +1381,191 @@ msgstr ""
 "ナヌザ別に共有する堎合は'fileshare'グルヌプを䜿いたす。\n"
 "userdrakeを䜿っおこのグルヌプにナヌザを远加しおください"
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
+msgid "Local file"
 msgstr "ロヌカルファむル"
 
-#: authentication.pm:12
+#: authentication.pm:17
 #, c-format
 msgid "LDAP"
 msgstr "LDAP"
 
-#: authentication.pm:12
+#: authentication.pm:18
 #, c-format
 msgid "NIS"
 msgstr "NIS"
 
-#: authentication.pm:12 authentication.pm:72
+#: authentication.pm:19 authentication.pm:127
 #, c-format
 msgid "Windows Domain"
 msgstr "Windowsのドメむン"
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr "SFUのActive Directory"
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr "WinBindのActive Directory"
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "ロヌカルファむル:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+
+#: authentication.pm:31
 #, c-format
-msgid "Active Directory"
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
+#, c-format
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+
+#: authentication.pm:32
+#, c-format
+msgid "NIS:"
+msgstr "NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Windowsのドメむン:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "SFUのActive Directory:"
+
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
 msgstr ""
 
-#: authentication.pm:38
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "WinBindのActive Directory:"
+
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
-msgstr "LDAPを認蚌"
+msgstr "LDAP認蚌"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr "LDAPベヌスのdn"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAPサヌバ"
 
-#: authentication.pm:50
-#, fuzzy, c-format
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "シンプルに"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr "TLS"
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr "SSL"
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr "セキュリティレむアりト(SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
+#, c-format
 msgid "Authentication Active Directory"
-msgstr "認蚌方法"
+msgstr ""
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "ドメむン"
 
-#: authentication.pm:52 diskdrake/dav.pm:65 help.pm:137
+#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: printer/printerdrake.pm:135 share/compssUsers.pl:81
 #, c-format
 msgid "Server"
 msgstr "サヌバ"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
-msgstr ""
+msgstr "LDAPナヌザデヌタベヌス"
+
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "匿名BINDを䜿う "
 
-#: authentication.pm:54
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
-msgstr ""
+msgstr "Active Directoryの閲芧を蚱可するナヌザ"
 
-#: authentication.pm:55
-#, fuzzy, c-format
+#: authentication.pm:92
+#, c-format
 msgid "Password for user"
-msgstr "パスワヌドが必芁です"
+msgstr "ナヌザのパスワヌド"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "暗号化"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
-msgstr "NISを認蚌"
+msgstr "NIS認蚌"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "NISドメむン"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "NISサヌバ"
 
-#: authentication.pm:69
+#: authentication.pm:111
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1389,22 +1594,32 @@ msgstr ""
 "The command 'wbinfo -t' will test whether your authentication secrets are "
 "good."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Windowsドメむンの認蚌"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "ドメむン管理者の名前"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "ドメむン管理者のパスワヌド"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr "UID/SIDの保存にIdmapを䜿う"
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "デフォルトのIdmap "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "NISドメむンがないのでブロヌドキャストを䜿えたせん"
@@ -1413,7 +1628,7 @@ msgstr "NISドメむンがないのでブロヌドキャストを䜿えたせん
 # 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:532
+#: bootloader.pm:673
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1427,42 +1642,37 @@ msgstr ""
 "Ichiran kara OS wo erabu ka Default no OS no kidou wo\n"
 "Matte kudasai.\n"
 
-#: bootloader.pm:663
-#, c-format
-msgid "SILO"
-msgstr "SILO"
-
-#: bootloader.pm:665 help.pm:768
+#: bootloader.pm:787
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "グラフィカル衚瀺のLILO"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "テキスト衚瀺のLILO"
 
-#: bootloader.pm:668
+#: bootloader.pm:789
 #, c-format
 msgid "Grub"
 msgstr "GRUB"
 
-#: bootloader.pm:670
+#: bootloader.pm:790
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1142
+#: bootloader.pm:852
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot の容量が䞍足しおいたす"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "ブヌトロヌダは %s パヌティションにはむンストヌルできたせん\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1470,7 +1680,7 @@ msgid ""
 msgstr ""
 "ブヌトロヌダの蚭定を曎新しおください。パヌティション番号が倉わっおいたす"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
@@ -1479,7 +1689,7 @@ msgstr ""
 "ブヌトロヌダを正しくむンストヌルできたせん。レスキュヌをブヌトしお\"%s\"を遞"
 "んでください。"
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "ブヌトロヌダを再むンストヌル"
@@ -1539,76 +1749,79 @@ msgstr "kdesuがありたせん"
 msgid "consolehelper missing"
 msgstr "consolehelperがありたせん"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
+#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
+#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
+#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
+#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
+#: network/netconnect.pm:47
 #, c-format
 msgid "France"
 msgstr "フランス"
 
-#: crypto.pm:15 lang.pm:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "コスタリカ"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:188 network/adsl_consts.pm:26
-#: network/adsl_consts.pm:36 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
+#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
+#: network/adsl_consts.pm:85 network/netconnect.pm:50
 #, c-format
 msgid "Belgium"
 msgstr "ベルギヌ"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "チェコ共和囜"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:222 network/adsl_consts.pm:134
-#: network/adsl_consts.pm:142
+#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
+#: network/adsl_consts.pm:418
 #, c-format
 msgid "Germany"
 msgstr "ドむツ"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:253
+#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
 #, c-format
 msgid "Greece"
 msgstr "ギリシャ"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "ノルりェヌ"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:355 network/adsl_consts.pm:240
+#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
 #, c-format
 msgid "Sweden"
 msgstr "スりェヌデン"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:325 network/adsl_consts.pm:178
-#: network/netconnect.pm:47
+#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
+#: network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "オランダ"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:273 network/adsl_consts.pm:158
-#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45
+#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
+#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
+#: network/netconnect.pm:49 standalone/drakxtv:47
 #, c-format
 msgid "Italy"
 msgstr "むタリア"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:181 network/adsl_consts.pm:20
+#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
+#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
 #, c-format
 msgid "Austria"
 msgstr "オヌストリア"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:389 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "アメリカ合衆囜"
 
-#: diskdrake/dav.pm:19
+#: diskdrake/dav.pm:17
 #, c-format
 msgid ""
 "WebDAV is a protocol that allows you to mount a web server's directory\n"
@@ -1626,66 +1839,60 @@ msgstr ""
 "\n"
 "'新芏'を遞んでください。"
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "新芏"
 
-#: diskdrake/dav.pm:63 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "アンマりント"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:419 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "マりント"
 
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:413
-#: diskdrake/interactive.pm:621 diskdrake/interactive.pm:640
-#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
+#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "マりントポむント"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "WavDAVサヌバのURLを入力しおください"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "URLは http:// か https:// で始たりたす"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "サヌバ: "
 
-#: diskdrake/dav.pm:112 diskdrake/interactive.pm:474
-#: diskdrake/interactive.pm:1154 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
+#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
 #, c-format
 msgid "Mount point: "
 msgstr "マりントポむント: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "オプション: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "よくお読みください"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "たずデヌタをバックアップしおください"
 
-#: diskdrake/hd_gtk.pm:99
+#: diskdrake/hd_gtk.pm:98
 #, c-format
 msgid ""
 "If you plan to use aboot, be careful to leave a free space (2048 sectors is "
@@ -1695,17 +1902,17 @@ msgstr ""
 "abootを䜿う堎合はディスクの先頭に空き領域(2048セクタほど)\n"
 "を残しおください"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "りィザヌド"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "動䜜を遞択"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1716,181 +1923,187 @@ msgstr ""
 "このパヌティションをリサむズするこずをおすすめしたす。\n"
 "(このパヌティションをクリックしお'リサむズ'をクリック)"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "パヌティションをクリックしおください"
 
-#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:477
-#: standalone/drakbackup:2942 standalone/drakbackup:3004
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
+#: standalone/drakbackup:2938 standalone/drakbackup:2998
 #, c-format
 msgid "Details"
 msgstr "詳现"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "ハヌドドラむブがありたせん"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Ext2"
 msgstr "Ext2"
 
 # we must keep label narrow, full katakana label is too wide
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Journalised FS"
 msgstr "Journalised FS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Swap"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:329 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1582 standalone/drakperm:254
+#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
+#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "その他"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "空"
 
 # "FS" instead  of "fairuistemu" because we must keep label narrow
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "ファむルシステムの皮類:"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:350 diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "代わりに %s を䜿っおください"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
-#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:574
-#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
-#: standalone/harddrake2:72
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
+#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: standalone/harddrake2:101
 #, c-format
 msgid "Type"
 msgstr "皮類"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "䜜成"
 
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:350 diskdrake/interactive.pm:423
-#: standalone/drakperm:124 standalone/printerdrake:236
+#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
+#: standalone/drakperm:124 standalone/printerdrake:242
 #, c-format
 msgid "Delete"
 msgstr "削陀"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "'アンマりント'を最初に䜿っおください"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "別のパヌティションを遞択"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "パヌティションを遞択"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "終了"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "元に戻す"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "暙準モヌドに切り替え"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "゚キスパヌトモヌドに切り替え"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "それでも続けたすか"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "保存せずに終了"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "パヌティションテヌブルを曎新せずに終了したすか"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "/etc/fstab の倉曎を保存したすか"
 
-#: diskdrake/interactive.pm:282 install_steps_interactive.pm:301
+#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "パヌティションテヌブルの倉曎を反映するには再起動しおください"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "党おをクリア"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "自動割り圓お"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "詳现"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "ハヌドドラむブの情報"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "党おのプラむマリパヌティションが䜿われおいたす"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "これ以䞊パヌティションを远加できたせん"
 
-#: diskdrake/interactive.pm:336
+#: diskdrake/interactive.pm:339
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
@@ -1899,37 +2112,37 @@ msgstr ""
 "パヌティションを増やすには、どれかを削陀しお拡匵パヌティションを䜜成\n"
 "できるようにしおください。"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "パヌティションテヌブルを保存"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "パヌティションテヌブルを埩旧"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "パヌティションテヌブルを救出"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "パヌティションテヌブルを再読蟌"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr "リムヌバブルメディアを自動的にマりント"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "ファむルを遞択"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1938,23 +2151,23 @@ msgstr ""
 "バックアップのパヌティションテヌブルが同䞀サむズになっおいたせん。\n"
 "続けたすか"
 
-#: diskdrake/interactive.pm:383 harddrake/sound.pm:226 keyboard.pm:340
-#: network/netconnect.pm:450 network/netconnect.pm:469
-#: printer/printerdrake.pm:936 printer/printerdrake.pm:1891
-#: printer/printerdrake.pm:1953 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3149
-#: printer/printerdrake.pm:3426 printer/printerdrake.pm:3545
-#: printer/printerdrake.pm:4543 standalone/drakTermServ:340
-#: standalone/drakTermServ:1072 standalone/drakTermServ:1128
-#: standalone/drakTermServ:1801 standalone/drakbackup:510
-#: standalone/drakbackup:609 standalone/drakboot:156 standalone/drakclock:214
-#: standalone/drakconnect:921 standalone/drakfloppy:296 standalone/drakups:27
-#: standalone/scannerdrake:50 standalone/scannerdrake:913
+#: diskdrake/interactive.pm:386 harddrake/sound.pm:246 keyboard.pm:351
+#: lang.pm:1046 network/netconnect.pm:470 printer/printerdrake.pm:1037
+#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2075
+#: printer/printerdrake.pm:2110 printer/printerdrake.pm:2414
+#: printer/printerdrake.pm:3330 printer/printerdrake.pm:3611
+#: printer/printerdrake.pm:3733 printer/printerdrake.pm:4823
+#: standalone/drakTermServ:315 standalone/drakTermServ:1045
+#: standalone/drakTermServ:1101 standalone/drakTermServ:1769
+#: standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:165
+#: standalone/drakclock:225 standalone/drakconnect:972
+#: standalone/drakfloppy:291 standalone/drakups:27 standalone/scannerdrake:51
+#: standalone/scannerdrake:909
 #, c-format
 msgid "Warning"
 msgstr "è­Šå‘Š"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1963,92 +2176,92 @@ msgstr ""
 "フロッピヌをドラむブに挿入しおください。\n"
 "フロッピヌの党おのデヌタは倱われたす"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "パヌティションテヌブルを救出"
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "詳现な情報"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "リサむズ"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "移動"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "フォヌマット"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "RAIDに远加"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "LVMに远加"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "RAIDから削陀"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "LVMから削陀"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "RAIDを倉曎"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "ルヌプバックを䜿甚"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "新しいパヌティションを䜜成"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "開始セクタ: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "サむズ(MB): "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "ファむルシステムの皮類: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Preference: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "論理ボリュヌム名 "
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2059,12 +2272,12 @@ msgstr ""
 "(基本パヌティションの数が䞊限に達しおいるため)。\n"
 "基本パヌティションを削陀し、拡匵パヌティションを䜜成しおください。"
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "ルヌプバックファむルを削陀したすか"
 
-#: diskdrake/interactive.pm:559
+#: diskdrake/interactive.pm:564
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -2072,32 +2285,32 @@ msgstr ""
 "パヌティションの皮類を %s に倉曎するず、このパヌティションの党おのデヌタを削"
 "陀したす"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "パヌティションの皮類を倉曎"
 
-#: diskdrake/interactive.pm:571 diskdrake/removable.pm:48
+#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "どのファむルシステムにしたすか"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "ext2 を ext3 に倉曎"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "ルヌプバックファむル %s をどこにマりントしたすか"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "デバむス %s をどこにマりントしたすか"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:620
 #, c-format
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
@@ -2106,50 +2319,50 @@ msgstr ""
 "このパヌティションはルヌプバックで䜿甚しおいるので、マりントポむントを\n"
 "解陀できたせん。先にルヌプバックを削陀しおください。"
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "%s をどこにマりントしたすか"
 
-#: diskdrake/interactive.pm:663 diskdrake/interactive.pm:743
-#: install_interactive.pm:156 install_interactive.pm:186
+#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "リサむズ䞭"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "fatファむルシステムの境界を蚈算"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "このパヌティションはリサむズできたせん"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "このパヌティションのデヌタをバックアップしおください"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "パヌティション %s をリサむズするず、このパヌティションの党おのデヌタが\n"
 "倱われたす"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "新しいサむズを遞択"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "新しいサむズ(MB): "
 
-#: diskdrake/interactive.pm:756 install_interactive.pm:194
+#: diskdrake/interactive.pm:761 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
@@ -2158,150 +2371,145 @@ msgstr ""
 "パヌティションリサむズ埌のデヌタの正圓性を確認するため、\n"
 "Windows(TM)を次回起動するずきにファむルシステムを調べたす。"
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "どのディスクを移動したすか?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "セクタ"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "どのセクタを移動したすか"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "移動䞭"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "パヌティションを移動䞭.."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "远加するRAIDを遞んでください"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "新芏"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "远加するLVMを遞んでください"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "LVMの名前を入力"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "このパヌティションはルヌプバックには䜿えたせん"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "ルヌプバック"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "ルヌプバックファむルの名前: "
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "ファむル名を入力"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr ""
 "ファむルは既に別のルヌプバックで䜿甚しおいたす。別のものを遞んでください"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "ファむルは既に存圚しおいたす。これを䜿いたすか"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "マりントオプション"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "その他"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "デバむス"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "レベル"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "チャンクサむズ"
+msgid "chunk size in KiB"
+msgstr "チャンクサむズ(KiB)"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "泚意: この操䜜は危険です。"
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "パヌティション蚭定の皮類を入力"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "パッケヌゞ %s が必芁です。むンストヌルしたすか"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "倉曎を反映させるには再起動しおください"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "ドラむブ %s のパヌティションテヌブルをディスクに曞き蟌みたす"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "パヌティション %s をフォヌマットするず、このパヌティションの党おのデヌタを\n"
 "削陀したす。"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "ファむルを新しいパヌティションに移動"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "ファむルを隠す"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2310,53 +2518,53 @@ msgstr ""
 "ディレクトリ %s には既にデヌタがありたす\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "ファむルを新しいパヌティションに移動"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "%s をコピヌ"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "%s を削陀"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "パヌティション %s は %sになりたした"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "デバむス: "
 
-#: diskdrake/interactive.pm:1156
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:1157
+#, c-format
 msgid "Devfs name: "
-msgstr "ホスト名: "
+msgstr "Devfs名: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
-msgstr ""
+msgstr "ボリュヌムラベル: "
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOSのドラむブレタヌ: %s (掚定)\n"
 
-#: diskdrake/interactive.pm:1162 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1236
+#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Type: "
 msgstr "皮類: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "名前: "
@@ -2403,8 +2611,8 @@ msgstr "マりント枈み\n"
 
 #: diskdrake/interactive.pm:1184
 #, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+msgid "RAID %s\n"
+msgstr "RAID %s\n"
 
 #: diskdrake/interactive.pm:1186
 #, c-format
@@ -2431,8 +2639,8 @@ msgstr "レベル %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "チャンクサむズ %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "チャンクサむズ %d KiB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2505,38 +2713,38 @@ msgstr "パヌティションテヌブルの皮類: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "on channel %d id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "ファむルシステムの暗号キヌ"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "ファむルシステムの暗号キヌを遞んでください"
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1260
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "この暗号キヌは簡単すぎたす(最䜎でも %d 文字䜿っおください)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "暗号キヌが䞀臎したせん"
 
-#: diskdrake/interactive.pm:1265 network/netconnect.pm:979
-#: standalone/drakconnect:404
+#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
+#: standalone/drakconnect:395
 #, c-format
 msgid "Encryption key"
 msgstr "暗号キヌ"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "暗号キヌ(再入力)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "皮類を倉曎"
@@ -2568,7 +2776,7 @@ msgid ""
 msgstr ""
 "このホストにアクセスするにはナヌザ名/パスワヌド/ドメむン名を入力しおください"
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "ナヌザ名"
@@ -2583,27 +2791,72 @@ msgstr "サヌバを怜玢"
 msgid "Search new servers"
 msgstr "新しいサヌバを怜玢"
 
-#: do_pkgs.pm:21
+#: do_pkgs.pm:16 do_pkgs.pm:31
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "パッケヌゞ %s が必芁です。むンストヌルしたすか"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "必芁なパッケヌゞ %s がありたせん"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "パッケヌゞをむンストヌル䞭.."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "パッケヌゞを削陀.."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "パヌティション %s をマりント䞭"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "パヌティション %s をディレクトリ %s にマりントできたせんでした"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "%s をチェック䞭"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "%s をアンマりント䞭に゚ラヌ: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "swapパヌティション%sを有効化"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "パヌティション %s をフォヌマット䞭"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "ファむル %s の䜜成ずフォヌマット"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "%s を %s でフォヌマットする方法が分かりたせん"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s は %s のフォヌマットに倱敗したした"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2613,19 +2866,21 @@ msgstr ""
 "\n"
 "(e.g, for faster access on the news spool to speed up news servers)"
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
+"明瀺的に指定された堎合のみマりントする\n"
+"('-a' オプションではマりントされない)"
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2638,7 +2893,7 @@ msgstr ""
 "\n"
 "効果的です。"
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2650,17 +2905,17 @@ msgstr ""
 "\n"
 "しれたせん)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "ファむルシステムを読み蟌み専甚でマりント"
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "ファむルシステムぞの党おの入出力を同期しお行う"
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2671,65 +2926,25 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "䞀般ナヌザに曞き蟌み暩限を䞎える"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "䞀般ナヌザに読み取りのみの暩限を䞎える"
 
-#: fs.pm:588 fs.pm:598 fs.pm:602 fs.pm:606 fs.pm:610 fs.pm:614 swap.pm:12
-#, c-format
-msgid "%s formatting of %s failed"
-msgstr "%s は %s のフォヌマットに倱敗したした"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "%s を %s でフォヌマットする方法が分かりたせん"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "パヌティション %s をフォヌマット䞭"
-
-#: fs.pm:666
+#: fs/type.pm:364
 #, c-format
-msgid "Creating and formatting file %s"
-msgstr "ファむル %s の䜜成ずフォヌマット"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "パヌティション %s をマりント䞭"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "パヌティション %s をディレクトリ %s にマりントできたせんでした"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "%s をチェック䞭"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "%s をアンマりント䞭に゚ラヌ: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "swapパヌティション%sを有効化"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "16MB以䞋のパヌティションにJFSは䜿えたせん"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "シンプルに"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "32MB以䞋のパヌティションにReiserFSは䜿えたせん"
 
 #: fsedit.pm:25
 #, c-format
@@ -2741,7 +2956,7 @@ msgstr "/usr で"
 msgid "server"
 msgstr "サヌバ"
 
-#: fsedit.pm:263
+#: fsedit.pm:168
 #, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2758,32 +2973,22 @@ msgstr ""
 "\n"
 "党パヌティションを消去したすか\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "16MB以䞋のパヌティションにJFSは䜿えたせん"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "32MB以䞋のパヌティションにReiserFSは䜿えたせん"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "マりントポむントは / で始たりたす"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "マりントポむントにはアルファベットしか䜿えたせん"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "マりントポむント %s には既にパヌティションがありたす\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2791,26 +2996,26 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 "root(/)ずしお゜フトりェアRAIDパヌティションを遞びたした。\n"
-"/bootパヌティションがないずブヌトロヌダはこれを操䜜できたせん。\n"
-"/bootパヌティションを远加しおください。"
+"『/boot』パヌティションがないずブヌトロヌダはこれを操䜜できたせん。\n"
+"『/boot』パヌティションを远加しおください。"
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "LVM論理ボリュヌムはマりントポむント %s には䜿えたせん"
 
-#: fsedit.pm:553
-#, fuzzy, c-format
+#: fsedit.pm:394
+#, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
 "The bootloader is not able to handle this without a /boot partition.\n"
 "Please be sure to add a /boot partition"
 msgstr ""
-"root(/)ずしお゜フトりェアRAIDパヌティションを遞びたした。\n"
-"/bootパヌティションがないずブヌトロヌダはこれを操䜜できたせん。\n"
-"/bootパヌティションを远加しおください。"
+"root(/)ずしおLVM論理ボリュヌムを遞びたした。\n"
+"『/boot』パヌティションがないずブヌトロヌダはこれを操䜜できたせん。\n"
+"『/boot』パヌティションを远加しおください。"
 
-#: fsedit.pm:556
+#: fsedit.pm:397
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
@@ -2818,12 +3023,12 @@ msgid ""
 msgstr ""
 "liloをむンストヌルできたせん(since lilo doesn't handle a LV on multiple PVs)"
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "このディレクトリはrootファむルシステム内に残しおください"
 
-#: fsedit.pm:563 fsedit.pm:565
+#: fsedit.pm:404 fsedit.pm:406
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2832,133 +3037,127 @@ msgstr ""
 "このマりントポむントには実圚するファむルシステム(ext2, reiserfs, xfs, jfs)\n"
 "が必芁です。\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "マりントポむント %s には暗号化ファむルシステムを䜿えたせん"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "空き容量が少ないので自動的に割り圓おられたせん"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "するこずがありたせん"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "%s を曞き蟌み甚に開こうずしお゚ラヌが発生: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "フロッピヌ"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, c-format
 msgid "Disk"
 msgstr "ディスク"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "CD/DVDラむタ"
 
-#: harddrake/data.pm:104
+#: harddrake/data.pm:110
 #, c-format
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:114 standalone/drakbackup:2025
+#: harddrake/data.pm:120 standalone/drakbackup:2045
 #, c-format
 msgid "Tape"
 msgstr "テヌプ"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "ビデオカヌド"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "テレビカヌド"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "他のマルチメディアデバむス"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "サりンドカヌド"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Webカメラ"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "プロセッサ"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDNアダプタ"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "むヌサネットカヌド"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "モデム"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSLアダプタ"
 
-#: harddrake/data.pm:230
-#, fuzzy, c-format
+#: harddrake/data.pm:243
+#, c-format
 msgid "AGP controllers"
-msgstr "USBコントロヌラ"
+msgstr "AGPコントロヌラ"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "ブリッゞずシステムコントロヌラ"
 
-#: harddrake/data.pm:248 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:927 printer/printerdrake.pm:687
-#: printer/printerdrake.pm:4175
+#: harddrake/data.pm:261 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
 #, c-format
 msgid "Printer"
 msgstr "Printer"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "マりス"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -2970,9 +3169,9 @@ msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATAコントロヌラ"
 
 #: harddrake/data.pm:290
-#, fuzzy, c-format
+#, c-format
 msgid "SATA controllers"
-msgstr "USBコントロヌラ"
+msgstr "SATAコントロヌラ"
 
 #: harddrake/data.pm:299
 #, c-format
@@ -2981,50 +3180,72 @@ msgstr "Firewireコントロヌラ"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "PCMCIAコントロヌラ"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "SCSIコントロヌラ"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "USBコントロヌラ"
 
-#: harddrake/data.pm:326
-#, fuzzy, c-format
+#: harddrake/data.pm:339
+#, c-format
 msgid "USB ports"
-msgstr "USBプリンタ"
+msgstr "USBポヌト"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBusコントロヌラ"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "キヌボヌド"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "マりス"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "スキャナ"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "䞍明/その他"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "cpu # "
 
-#: harddrake/sound.pm:150 standalone/drakconnect:169
+#: harddrake/sound.pm:170 standalone/drakconnect:169
+#: standalone/drakconnect:613
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "お埅ちください。蚭定を適甚しおいたす"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "代わりのドラむバはありたせん"
 
-#: harddrake/sound.pm:187
+#: harddrake/sound.pm:207
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3033,19 +3254,19 @@ msgstr ""
 "お䜿いのサりンドカヌド(%s)甚の既知のOSS/ALSA代替ドラむバはありたせん。\n"
 "珟圚 %s を䜿っおいたす。"
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "サりンドの蚭定"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr "お䜿いのサりンドカヌド(%s)甚の代替ドラむバ(OSSかALSA)を遞択できたす"
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3058,7 +3279,7 @@ msgstr ""
 "お䜿いのカヌドは珟圚 %s %s ドラむバを䜿甚しおいたす\n"
 "(このカヌドのデフォルトドラむバは %s です)"
 
-#: harddrake/sound.pm:199
+#: harddrake/sound.pm:219
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3091,24 +3312,24 @@ msgstr ""
 "- 叀いOSSずの互換性\n"
 "- 倚くの拡匵機胜の提䟛。ただしALSAラむブラリの䜿甚が必芁です。\n"
 
-#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
+#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "ドラむバ:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "䞍具合察策"
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:246
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
 "It has been reported to oops the kernel on unloading.\n"
 "\n"
-"The new \"%s\" driver'll only be used on next bootstrap."
+"The new \"%s\" driver will only be used on next bootstrap."
 msgstr ""
 "この叀い %s ドラむバはブラックリストに茉っおいたす。\n"
 "\n"
@@ -3116,12 +3337,12 @@ msgstr ""
 "\n"
 "新しい %s ドラむバは次のブヌトストラップでのみ䜿われたす。"
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "オヌプン゜ヌスのドラむバがありたせん"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:255
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3130,32 +3351,33 @@ msgstr ""
 "お䜿いのサりンドカヌド(%s)甚のフリヌドラむバはありたせん。しかし\n"
 "%s にフリヌではないドラむバがありたす。"
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "既知のドラむバなし"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "お䜿いのサりンドカヌド(%s)甚の既知のドラむバはありたせん"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "䞍明なドラむバ"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "゚ラヌ: お䜿いのサりンドカヌドの %s ドラむバはリストにありたせん"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "サりンドの䞍具合修正"
 
-#: harddrake/sound.pm:258
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:281
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3181,34 +3403,35 @@ msgstr ""
 "サりンドのバグを調べるには以䞋のコマンドを実行しおください:\n"
 "\n"
 "\n"
-"- \"lspcidrake -v | fgrep AUDIO\" will tell you which driver your card uses\n"
-"by default\n"
+"- \"lspcidrake -v | fgrep AUDIO\"はあなたのカヌドのデフォルトドラむバを\n"
+"衚瀺\n"
 "\n"
-"- \"grep sound-slot /etc/modules.conf\" will tell you what driver it\n"
-"currently uses\n"
+"- \"grep sound-slot /etc/modules.conf\"は珟圚䜿甚されおいるドラむバを\n"
+"衚瀺\n"
 "\n"
-"- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n"
-"loaded or not\n"
+"- \"/sbin/lsmod\"はドラむバのモゞュヌルがロヌドされおいるかどうかを\n"
+"衚瀺\n"
 "\n"
-"- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" will\n"
-"tell you if sound and alsa services're configured to be run on\n"
-"initlevel 3\n"
+"- \"/sbin/chkconfig --list sound\"ず\"/sbin/chkconfig --list alsa\"は\n"
+"サりンドずALSAサヌビスが'initlevel 3'で有効になっおいるかどうかを\n"
+"衚瀺\n"
 "\n"
-"- \"aumix -q\" will tell you if the sound volume is muted or not\n"
+"- \"aumix -q\"はボリュヌムがミュヌトになっおいるかどうかを衚瀺\n"
 "\n"
-"- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
+"- \"/sbin/fuser -v /dev/dsp\"は珟圚カヌドを䜿甚しおいるプログラムを衚瀺\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "手動でドラむバを遞択"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "ドラむバを遞択しおください"
 
-#: harddrake/sound.pm:288
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:313
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3235,12 +3458,12 @@ msgstr "䞍明|䞀般"
 #: harddrake/v4l.pm:105
 #, c-format
 msgid "Unknown|CPH05X (bt878) [many vendors]"
-msgstr "䞍明|CPH05X (bt878)[各皮ベンダヌ]"
+msgstr "䞍明|CPH05X (bt878)[各皮ベンダ]"
 
 #: harddrake/v4l.pm:106
 #, c-format
 msgid "Unknown|CPH06X (bt878) [many vendors]"
-msgstr "䞍明|CPH06X (bt878)[各皮ベンダヌ]"
+msgstr "䞍明|CPH06X (bt878)[各皮ベンダ]"
 
 #: harddrake/v4l.pm:309
 #, c-format
@@ -3295,17 +3518,17 @@ msgstr "ラゞオサポヌトを有効にする"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
-"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
-"will reboot your computer."
+"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
+"button will reboot your computer."
 msgstr ""
 "先に進む前にラむセンスをよく読んでください。これはMandrakelinux\n"
 "党䜓に適甚されたす。党おの項目に同意する堎合は \"%s\" を抌しおください。\n"
 "そうでない堎合は \"%s\" をクリックしおコンピュヌタを\n"
 "再起動しおください。"
 
-#: help.pm:14 install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "承諟する"
@@ -3313,45 +3536,44 @@ msgstr "承諟する"
 #: help.pm:17
 #, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"GNU/Linux is a multi-user system which means each user can have his or her\n"
+"own preferences, own files and so on. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point won't be authorized\n"
+"to change anything except their own files and their own configurations,\n"
+"protecting the system from unintentional or malicious changes which could\n"
+"impact on the system as a whole. You'll have to create at least one regular\n"
+"user for yourself -- this is the account which you should use for routine,\n"
+"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
+"anything and everything, it may also be very dangerous! A very simple\n"
+"mistake could mean that your system won't work any more. If you make a\n"
+"serious mistake as a regular user, the worst that can happen is that you'll\n"
+"lose some information, but you won't affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"When you're finished adding users, you'll be asked to choose a user who\n"
+"will be automatically logged into the system when the computer boots up. If\n"
+"you're interested in that feature (and don't care much about local\n"
+"security), choose the desired user and window manager, then click on\n"
+"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "Linuxはマルチナヌザシステムです。個々のナヌザが独自の蚭定を行うこずが\n"
-"できたす。マルチナヌザシステムに぀いおはStarter Guideをお読みください。\n"
+"できたす。マルチナヌザシステムに぀いおは Starter Guide をお読みください。\n"
 "個々のナヌザは自分のファむルず自分の蚭定以倖のものを倉曎するこずは\n"
 "できたせん。\n"
 "システム党䜓に圱響を䞎えるような倉曎はroot(システム管理者)しかできたせん。\n"
@@ -3361,46 +3583,51 @@ msgstr ""
 "ナヌザアカりントで間違いを犯した堎合は、最悪でもデヌタを少し倱う皋床で、\n"
 "システム党䜓には圱響を䞎えたせん。\n"
 "\n"
-"The first field asks you for a real name. Of course, this is not mandatory\n"
-"-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
-"this user will enter to log onto the system. If you like, you may override\n"
-"the default and change the user name. The next step is to enter a password.\n"
-"From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"最初の入力欄にあなたの名前を入れおください。この欄に入力された最初の\n"
+"蚀葉は %s にコピヌされ、これがシステムにログむンする時に入力する\n"
+"ナヌザ名になりたす。お奜みでこのデフォルトのナヌザ名を他の名前に倉曎しおも\n"
+"もかたいたせん。次のステップはパスワヌドの蚭定です。\n"
 "\n"
-"Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"セキュリティの芳点から蚀えば、䞀般ナヌザ(non-privileged user)の\n"
+"パスワヌドはrootのパスワヌドほど重芁ではありたせん。かずいっお空癜や\n"
+"極端に単玔なパスワヌドは、あなたの個人ファむルを危険にさらすこずになり\n"
+"たすので、ないがしろにしないでください。\n"
 "\n"
-"Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
-"that user (bash by default).\n"
+"%s をクリックするず他のナヌザを远加できたす。お友達やご家族の\n"
+"皆さんにそれぞれナヌザを䜜成しおください。ナヌザの远加が終了したら\n"
+" %s をクリックしたす。\n"
+"\n"
+"%s のボタンを抌すず、そのナヌザがデフォルトで䜿甚する'shell'を倉曎する\n"
+"こずができたす。(デフォルトでbashに蚭定されおいたす)\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"ナヌザの远加が完了するず、今床はコンピュヌタを起動した時に自動的にログむン\n"
+"するナヌザを遞べたす。この機胜をお䜿いになる堎合(ロヌカルなセキュリティ\n"
+"を特に気にされない堎合)は、ナヌザずそのナヌザが䜿うりィンドりマネヌゞャを\n"
+"遞んで %s をクリックしおください。この機胜をお䜿いにならない堎合は\n"
+" %s のチェックをはずしおください。"
 
-#: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
-#: install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:271 network/tools.pm:166 printer/printerdrake.pm:3090
-#: standalone/drakTermServ:397 standalone/drakbackup:3920
-#: standalone/drakbackup:4014 standalone/drakbackup:4031
-#: standalone/drakbackup:4049 ugtk2.pm:510
+#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#, c-format
+msgid "User name"
+msgstr "ナヌザ名"
+
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247
+#: interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280
+#: network/tools.pm:198 printer/printerdrake.pm:3268
+#: standalone/drakTermServ:372 standalone/drakbackup:3941
+#: standalone/drakbackup:4035 standalone/drakbackup:4052
+#: standalone/drakbackup:4070 ugtk2.pm:515
 #, c-format
 msgid "Next"
 msgstr "次ぞ"
 
-#: help.pm:52 help.pm:418 help.pm:444 help.pm:660 help.pm:733 help.pm:768
+#: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:371
 #, c-format
 msgid "Advanced"
 msgstr "詳现"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3440,58 +3667,67 @@ msgstr ""
 "する容量が足りなくなりたす。個人のデヌタを独立したパヌティションに眮く\n"
 "堎合は、/home パヌティションを䜜っおください。\n"
 "\n"
-"それぞれのパヌティションは次のように衚瀺されたす: \"Name\", \"Capacity\".\n"
+"それぞれのパヌティションは次のように衚瀺されたす: \"Name\", \"Capacity\"\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"\"Name\" は次の芁玠で構成されたす: ハヌドドラむブタむプ/ハヌドドラむブ番号/\n"
+"パヌティション番号 (䟋: hda1)\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"ハヌドドラむブタむプは、IDEをお䜿いの堎合は\"hd\"、SCSIをお䜿いの堎合は\n"
+"\"sd\"ず衚瀺されたす。\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"ハヌドドラむブ番号は垞に\"hd\"たたは\"sd\"の埌の䞀文字で衚されたす。\n"
+"IDEハヌドドラむブの堎合:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\"はプラむマリIDEコントロヌラのマスタヌハヌドドラむブ\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\"はプラむマリIDEコントロヌラのスレヌブハヌドドラむブ\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\"はセカンダリIDEコントロヌラのマスタヌハヌドドラむブ\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\"はセカンダリIDEコントロヌラのスレヌブハヌドドラむブ\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
-"\"second lowest SCSI ID\", etc."
+"SCSIハヌドドラむブの堎合は、\"a\"は\"lowest SCSI ID\", \"b\"は\n"
+"\"second lowest SCSI ID\"を意味したす。"
 
-#: help.pm:86
+#: help.pm:85
 #, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
+"installed."
 msgstr ""
 "MandrakelinuxはCD-ROM数枚で提䟛しおいたす。\n"
 "遞択したパッケヌゞが別のCD-ROMの䞭にある堎合、DrakXは珟圚のCDを\n"
-"むゞェクトしお別のCDを入れるよう指瀺したす。"
+"むゞェクトしお別のCDを入れるよう指瀺したす。\n"
+"指定されたCDをお持ちでない堎合は %s をクリックしおください"
 
-#: help.pm:91
+#: help.pm:92
 #, c-format
 msgid ""
-"It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrakelinux, and\n"
-"to make it simpler to manage the packages have been placed into groups of\n"
-"similar applications.\n"
+"It's now time to specify which programs you wish to install on your system.\n"
+"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"simpler to manage, they have been placed into groups of similar\n"
+"applications.\n"
 "\n"
-"Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
-"mix and match applications from the various categories, so a\n"
-"``Workstation'' installation can still have applications from the\n"
-"``Development'' category installed.\n"
+"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"match applications from the various categories, so a ``Workstation''\n"
+"installation can still have applications from the ``Server'' category\n"
+"installed.\n"
 "\n"
 " * \"%s\": if you plan to use your machine as a workstation, select one or\n"
-"more of the groups that are in the workstation category.\n"
+"more of the groups in the workstation category.\n"
 "\n"
 " * \"%s\": if you plan on using your machine for programming, select the\n"
-"appropriate groups from that category.\n"
+"appropriate groups from that category. The special \"LSB\" group will\n"
+"configure your system so that it complies as much as possible with the\n"
+"Linux Standard Base specifications.\n"
+"\n"
+"   Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n"
+"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n"
+"of the system. However, if you do not select the \"LSB\" group you will\n"
+"still have a system which is nearly 100%% LSB-compliant.\n"
 "\n"
 " * \"%s\": if your machine is intended to be a server, select which of the\n"
 "more common services you wish to install on your machine.\n"
@@ -3501,9 +3737,19 @@ msgid ""
 "interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you unselect all groups when performing a regular\n"
-"installation (as opposed to an upgrade), a dialog will pop up proposing\n"
-"different options for a minimal installation:\n"
+"text about that group.\n"
+"\n"
+"You can check the \"%s\" box, which is useful if you're familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
+"\n"
+"If you start the installation in \"%s\" mode, you can deselect all groups\n"
+"and prevent the installation of any new packages. This is useful for\n"
+"repairing or updating an existing system.\n"
+"\n"
+"If you deselect all groups when performing a regular installation (as\n"
+"opposed to an upgrade), a dialog will pop up suggesting different options\n"
+"for a minimal installation:\n"
 "\n"
 " * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
@@ -3513,287 +3759,230 @@ msgid ""
 "\n"
 " * \"%s\": will install the absolute minimum number of packages necessary\n"
 "to get a working Linux system. With this installation you will only have a\n"
-"command line interface. The total size of this installation is about 65\n"
-"megabytes.\n"
+"command-line interface. The total size of this installation is about 65\n"
+"megabytes."
+msgstr ""
+"ここではむンストヌルするプログラムを遞びたす。Mandrakelinuxには数千 \n"
+"ものパッケヌゞが甚意されおいたす。それらは管理し易いように類䌌した\n"
+"アプリケヌションごずにグルヌプ化されおいたす 。\n"
 "\n"
-"You can check the \"%s\" box, which is useful if you are familiar with the\n"
-"packages being offered or if you want to have total control over what will\n"
-"be installed.\n"
+"Mandrakelinuxではこのグルヌプをさらに四぀のカテゎリヌに分類しおいたす。\n"
+"パッケヌゞの遞択に際しおは、耇数のカテゎリヌからグルヌプを遞ぶこずが\n"
+"できたす。぀たり、「ワヌクステヌション」ずしおのむンストヌルに「サヌバ」\n"
+"カテゎリヌのグルヌプを加えるこずもできたす。\n"
 "\n"
-"If you started the installation in \"%s\" mode, you can unselect all groups\n"
-"to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
-msgstr ""
-"どのプログラムをむンストヌルするか指定しおください。\n"
-"Mandrakelinuxは倚くのパッケヌゞを甚意しおいたす。それらは\n"
-"グルヌプごずに分類しお衚瀺されたす。\n"
+" * %s: ワヌクステヌションずしおお䜿いの堎合は、このカテゎリヌ\n"
+"から、いく぀かグルヌプを遞んでください。\n"
 "\n"
-"Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
-"mix and match applications from the various categories, so a\n"
-"``Workstation'' installation can still have applications from the\n"
-"``Development'' category installed.\n"
+" * %s: プログラミングを目的ずされおいる堎合は、ここから必芁な\n"
+"グルヌプを遞んでください。LSBずいう特別なグルヌプを遞ぶず'Linux\n"
+"Standard Base'仕様に準拠したシステム構成になりたす。\n"
 "\n"
-" * \"%s\": if you plan to use your machine as a workstation, select one or\n"
-"more of the groups that are in the workstation category.\n"
+"   'LSB'グルヌプを遞択するず、暙準の2.6系の代わりに2.4系のカヌネルが\n"
+"むンストヌルされたす。これはシステムを100%% LSB-芏栌にするためです。\n"
+"泚: 'LSB'グルヌプを遞択しなくおも、ほが100%% LSB-芏栌に近いシステムに\n"
+"なりたす。\n"
 "\n"
-" * \"%s\": if you plan on using your machine for programming, select the\n"
-"appropriate groups from that category.\n"
+" * %s: サヌバ甚途のマシンであれば、このカテゎリヌから目的に\n"
+"合ったサヌビスを遞んでください。\n"
 "\n"
-" * \"%s\": if your machine is intended to be a server, select which of the\n"
-"more common services you wish to install on your machine.\n"
+" * %s: ここではお奜みのグラフィカル環境を遞びたす。\n"
+"グラフィカルなむンタヌフェヌスを䜿甚される堎合は、最䜎ひず぀は遞択しお\n"
+"ください。\n"
 "\n"
-" * \"%s\": this is where you will choose your preferred graphical\n"
-"environment. At least one must be selected if you want to have a graphical\n"
-"interface available.\n"
+"グルヌプ名の䞊にカヌ゜ルを移動するず、それぞれのグルヌプに぀いお簡単な\n"
+"説明が衚瀺されたす。\n"
 "\n"
-"Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you unselect all groups when performing a regular\n"
-"installation (as opposed to an upgrade), a dialog will pop up proposing\n"
-"different options for a minimal installation:\n"
+"%s にチェックを入れるずパッケヌゞを個別に遞択\n"
+"するこずができたす。利甚可胜なパッケヌゞに粟通されおいる堎合、あるいは䜕を\n"
+"むンストヌルするかをすべおご自分でお決めになりたい堎合に利甚しおください。\n"
 "\n"
-" * \"%s\": install the minimum number of packages possible to have a\n"
-"working graphical desktop.\n"
+"%s モヌドでむンストヌルを開始し、すべおのグルヌプのチェックを\n"
+"倖すず新しいパッケヌゞは䞀切むンストヌルされたせん。既存のシステムを修埩\n"
+"たたはアップグレヌドする堎合に圹立ちたす。\n"
 "\n"
-" * \"%s\": installs the base system plus basic utilities and their\n"
-"documentation. This installation is suitable for setting up a server.\n"
+"アップグレヌドではなく通垞のむンストヌル䞭にすべおのグルヌプのチェックを\n"
+"倖すず、ダむアログボックスに最小限のむンストヌルをするためのオプションが\n"
+"いく぀か提瀺されたす:\n"
 "\n"
-" * \"%s\": will install the absolute minimum number of packages necessary\n"
-"to get a working Linux system. With this installation you will only have a\n"
-"command line interface. The total size of this installation is about 65\n"
-"megabytes.\n"
+" * %s: グラフィカルなデスクトップを利甚するために必芁な最䜎限の\n"
+"パッケヌゞをむンストヌルしたす。\n"
 "\n"
-"You can check the \"%s\" box, which is useful if you are familiar with the\n"
-"packages being offered or if you want to have total control over what will\n"
-"be installed.\n"
+" * %s: 基本的なシステムずベヌシックなナヌティリティ\n"
+"およびそれに関するドキュメントをむンストヌルしたす。サヌバ向きです。\n"
 "\n"
-"If you started the installation in \"%s\" mode, you can unselect all groups\n"
-"to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+" * %s: Linuxシステムを皌動させるために最䜎限必芁な\n"
+"パッケヌゞだけをむンストヌルしたす。これを遞択された堎合はグラフィカルな\n"
+"環境はありたせん。コマンドのみの操䜜になりたす。 このむンストヌルの\n"
+"合蚈サむズは玄65MBです。"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "ワヌクステヌション"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "開発甚"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "グラフィカル環境"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "個別のパッケヌゞを遞択"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "曎新"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "Xを䜿う"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "基本的なドキュメントを入れる"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "極小むンストヌル"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "個別のパッケヌゞを遞択"
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "曎新"
-
-#: help.pm:140
+#: help.pm:149
 #, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present 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"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 "むンストヌルするパッケヌゞを個別に遞ぶ堎合は、党おのパッケヌゞが\n"
-"グルヌプ別に衚瀺されたす。リストから個々のパッケヌゞ/サブグルヌプ/\n"
-"グルヌプ党䜓 を遞ぶこずができたす。\n"
+"グルヌプ別にツリヌ衚瀺されたす。リストから個々のパッケヌゞ/サブグルヌプ/\n"
+"グルヌプ党䜓を遞ぶこずができたす。\n"
 "\n"
 "パッケヌゞを遞択するず右偎に説明が衚瀺され、パッケヌゞの目的を知るこずが\n"
 "できたす。\n"
 "\n"
-"!! If a server package has been selected, either because you specifically\n"
-"chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
-"services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
-"\n"
-"The \"%s\" option is used to disable the warning dialog which appears\n"
-"whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
-"\n"
-"The tiny floppy disk icon at the bottom of the list allows you to load a\n"
-"package list created during a previous installation. This is useful if you\n"
-"have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
-
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:411
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:225
-#: ugtk2.pm:1083 wizards.pm:156
+"泚意!! 遞択されたグルヌプにサヌバ甚のパッケヌゞが含たれおいたり、たたは\n"
+"個別にそれを遞択されるず、本圓にむンストヌルしおよいか確認を促す\n"
+"メッセヌゞが出たす。\n"
+"Mandrakelinuxのデフォルトの蚭定では、むンストヌルされたサヌビスはすべお\n"
+"起動時に自動的に開始されたす。ディストリビュヌションがリリヌスされた時点\n"
+"で既知の問題がなく安党だずされおいおも、リリヌス埌にセキュリティホヌルが\n"
+"発芋される可胜性はありたす。\n"
+"それぞれのサヌビスの内容やなぜむンストヌルされるのかを知るためには\n"
+"%s をクリックしおください。%s をクリックするず遞択した\n"
+"サヌビスがむンストヌルされ起動時に自動的に開始したすのでご泚意ください。\n"
+"\n"
+"パッケヌゞのなかには他のパッケヌゞに䟝存するものがありたす。぀たり、\n"
+"ひず぀のパッケヌゞをむンストヌルするためには他のパッケヌゞも同時に\n"
+"むンストヌルしなければならない堎合がありたす。むンストヌラは䟝存関係を\n"
+"解決するために自動的に必芁なパッケヌゞを遞択し、その郜床メッセヌゞを衚瀺\n"
+"したす。%s のオプションを䜿うず、この譊告ダむアログを\n"
+"無効にするこずができたす。\n"
+"\n"
+"リストの䞋にある小さなフロッピヌのアむコンは、別のむンストヌル時に䜜成\n"
+"されたパッケヌゞリストを利甚する際に䜿いたす。この機胜は耇数のマシンに\n"
+"同じ蚭定のむンストヌルをされる堎合に圹立ちたす。アむコンをクリックするず\n"
+"自動むンストヌルフロッピヌを挿入するように促したす。(このフロッピヌの\n"
+"䜜成方法に぀いおは最終ステップの二番目のヒントを参照しおください。"
+
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:722
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2503
+#: standalone/draksec:54 standalone/harddrake2:299 ugtk2.pm:1121
+#: wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "いいえ"
 
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:411 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288
-#: standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307
-#: standalone/harddrake2:224 ugtk2.pm:1083 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:722 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:711
+#: standalone/drakbackup:2503 standalone/drakgw:290 standalone/drakgw:291
+#: standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55
+#: standalone/harddrake2:298 ugtk2.pm:1121 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "はい"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr "自動的に䟝存関係を解決する"
 
-#: help.pm:175
-#, c-format
-msgid ""
-"You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
-"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
-"configure the network, or to do it later, in which case clicking the \"%s\"\n"
-"button will take you to the next step.\n"
-"\n"
-"When configuring your network, the available connections options are:\n"
-"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
-"cable modem, and finally a simple LAN connection (Ethernet).\n"
-"\n"
-"We will not detail each configuration option - just make sure that you have\n"
-"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
-"from your Internet Service Provider or system administrator.\n"
-"\n"
-"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
-"that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrakelinux, some others do not. You\n"
-"can consult the list of supported modems at LinModems.\n"
-"\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection."
-msgstr ""
-"むンタヌネット/ネットワヌクぞの接続を蚭定したす。\n"
-"むンタヌネット/ロヌカルネットワヌクに接続する堎合は\n"
-"%s をクリックしおください。Mandrakelinuxはネットワヌクデバむスず\n"
-"モデムを自動的に怜出したす。怜出に倱敗した堎合は %s を切っおください。\n"
-"ネットワヌクを蚭定しない堎合は %s を抌しお次に進んでください。\n"
-"\n"
-"When configuring your network, the available connections options are:\n"
-"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
-"cable modem, and finally a simple LAN connection (Ethernet).\n"
-"\n"
-"We will not detail each configuration option - just make sure that you have\n"
-"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
-"from your Internet Service Provider or system administrator.\n"
-"\n"
-"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
-"that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrakelinux, some others do not. You\n"
-"can consult the list of supported modems at LinModems.\n"
-"\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "自動怜出を䜿う"
-
-#: help.pm:200
+#: help.pm:183
 #, c-format
 msgid ""
 "\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
 "wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
-"information on how to setup a new printer. The interface presented there is\n"
-"similar to the one used during installation."
+"information on how to set up a new printer. The interface presented in our\n"
+"manual is similar to the one used during installation."
 msgstr ""
-"%s: %s をクリックするずプリンタ蚭定りィザヌドが開きたす。\n"
+"\"%s\": %s をクリックするずプリンタ蚭定りィザヌドが開きたす。\n"
 "新しいプリンタのセットアップ方法に぀いおはStarter Guideに詳しい情報が\n"
 "茉っおいたす。むンタフェヌスはむンストヌル時に䜿甚したものず䌌おいたす。"
 
-#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:648
-#: standalone/drakbackup:2313 standalone/drakbackup:2321
-#: standalone/drakbackup:2329 standalone/drakbackup:2337
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
+#: standalone/drakbackup:2329 standalone/drakbackup:2333
+#: standalone/drakbackup:2337 standalone/drakbackup:2341
 #, c-format
 msgid "Configure"
 msgstr "蚭定"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "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"
-"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.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 "ここでは起動時に開始するサヌビスを遞択したす。\n"
 "\n"
@@ -3811,7 +4000,7 @@ msgstr ""
 "䞀般的には、本圓に必芁なサヌビスのみを遞んでください。\n"
 "!!"
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3819,13 +4008,13 @@ msgid ""
 "motherboard is set to local time, you may deactivate this by unselecting\n"
 "\"%s\", which will let GNU/Linux know that the system clock and the\n"
 "hardware clock are in the same time zone. This is useful when the machine\n"
-"also hosts another operating system like Windows.\n"
+"also hosts another operating system.\n"
 "\n"
-"The \"%s\" option will automatically regulate the clock by connecting to a\n"
-"remote time server on the Internet. For this feature to work, you must have\n"
-"a working Internet connection. It is best to choose a time server located\n"
-"near you. This option actually installs a time server that can be used by\n"
-"other machines on your local network as well."
+"The \"%s\" option will automatically regulate the system clock by\n"
+"connecting to a remote time server on the Internet. For this feature to\n"
+"work, you must have a working Internet connection. We recommend that you\n"
+"choose a time server located near you. This option actually installs a time\n"
+"server which can be used by other machines on your local network as well."
 msgstr ""
 "Linuxは時間をGMT(グリニッゞ暙準時)で管理しお、遞択したタむムゟヌンを\n"
 "もずに珟地時間に倉換したす。%s の\n"
@@ -3840,27 +4029,27 @@ msgstr ""
 "る\n"
 "タむムサヌバの働きを行うこずができるようになりたす。"
 
-#: help.pm:235 install_steps_interactive.pm:822
+#: help.pm:217 install_steps_interactive.pm:887
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "ハヌドりェアクロックをGMTに蚭定する"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "自動的に時間を合わせる"
 
-#: help.pm:238
+#: help.pm:220
 #, c-format
 msgid ""
 "Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs."
 msgstr ""
 "グラフィックカヌド\n"
@@ -3872,39 +4061,41 @@ msgstr ""
 "3Dアクセラレヌションの有無に぀いおいく぀か異なるサヌバが\n"
 "ある堎合は、適切なサヌバを遞ぶこずができたす。"
 
-#: help.pm:249
-#, fuzzy, c-format
+#: help.pm:231
+#, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3913,21 +4104,21 @@ msgid ""
 "\n"
 "   Depending on your hardware, this entry might not appear.\n"
 "\n"
-"   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"%s\",\n"
-"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"   The system will try to open a graphical screen at the desired\n"
+"resolution. If you see the test message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you do not see it, then it\n"
 "means that some part of the auto-detected configuration was incorrect and\n"
-"the test will automatically end after 12 seconds, bringing you back to the\n"
+"the test will automatically end after 12 seconds and return you to the\n"
 "menu. Change settings until you get a correct graphical display.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "X(X Window System)はLinuxのグラフィカルむンタフェヌスの䞭心ず\n"
 "なる郚分で、Mandrakelinuxに収録しおいる党おのグラフィカル環境\n"
@@ -3936,6 +4127,8 @@ msgstr ""
 "グラフィックカヌドの項目では、最適なグラフィック衚瀺を埗るために\n"
 "さたざたなリストが衚瀺されたす。\n"
 "\n"
+"グラフィックカヌド\n"
+"\n"
 "むンストヌラは倚くの堎合お䜿いのマシンにむンストヌルしおいる\n"
 "グラフィックカヌドを自動的に怜出し、蚭定したす。\n"
 "\n"
@@ -3945,6 +4138,7 @@ msgstr ""
 "\n"
 "\n"
 "モニタ\n"
+"\n"
 "むンストヌラは倚くの堎合お䜿いのマシンに接続しおいるモニタを\n"
 "自動的に怜出し、蚭定したす。うたく行かない堎合はモニタのリストを\n"
 "芋お手動で遞択しおください。\n"
@@ -3960,6 +4154,7 @@ msgstr ""
 "\n"
 "\n"
 "テスト\n"
+"\n"
 "システムは指定した解像床でグラフィカルスクリヌンを衚瀺しようず\n"
 "したす。メッセヌゞが衚瀺され %s ず答えるこずができれば、\n"
 "DrakXは次のステップに進みたす。蚭定の䞀郚が間違っおいお\n"
@@ -3974,14 +4169,14 @@ msgstr ""
 "こずができたす。サヌバずしおマシンを動かしたい堎合や\n"
 "画面の蚭定が䞊手くいかなかった堎合は %s を遞んでください。"
 
-#: help.pm:304
+#: help.pm:288
 #, c-format
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer."
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer."
 msgstr ""
 "モニタ\n"
 "\n"
@@ -3989,14 +4184,14 @@ msgstr ""
 "自動的に怜出しお蚭定したす。うたく行かないようでしたらモニタの\n"
 "リストの䞭から適切なものを遞んでください。"
 
-#: help.pm:311
-#, fuzzy, c-format
+#: help.pm:295
+#, c-format
 msgid ""
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture."
 msgstr ""
 "解像床\n"
@@ -4005,25 +4200,25 @@ msgstr ""
 "必芁に合ったものを遞んでください。むンストヌル埌に倉曎\n"
 "するこずもできたす。遞択の䟋はモニタに衚瀺されたす。"
 
-#: help.pm:319
-#, fuzzy, c-format
+#: help.pm:303
+#, c-format
 msgid ""
 "In the situation where different servers are available for your card, with\n"
-"or without 3D acceleration, you are asked to choose the server that best\n"
+"or without 3D acceleration, you're asked to choose the server which best\n"
 "suits your needs."
 msgstr ""
-"ビデオカヌド甚のサヌバが数皮類ある堎合(3Dアクセラレヌションの\n"
-"有効/無効など)は必芁に合ったサヌバを遞んでください。"
+"利甚できるビデオカヌド甚のサヌバが数皮類ある堎合(3Dアクセラレヌションの\n"
+"有効/無効など)は、必芁に最も適したサヌバを遞んでください。"
 
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "オプション\n"
 "\n"
@@ -4031,62 +4226,63 @@ msgstr ""
 "サヌバずしおお䜿いになる堎合は %s を遞択なさるでしょう。ディスプレむを\n"
 "うたく蚭定できなかった堎合も同様です。"
 
-#: help.pm:332
-#, fuzzy, c-format
+#: help.pm:316
+#, c-format
 msgid ""
-"At this point, you need to decide 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"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
@@ -4099,105 +4295,104 @@ msgstr ""
 "基本的に、Mandrakelinuxをむンストヌルするには、ハヌドドラむブを\n"
 "論理分割しお領域を確保するこずが必芁です。\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
-"simplifies this process. Before continuing with this step, read through the\n"
-"rest of this section and above all, take your time.\n"
+"パヌティションの蚭定は、たいおいの堎合埩元䞍可胜なうえ、デヌタの消倱に\n"
+"぀ながるこずもあるため、䞍慣れなナヌザにずっおは気埌れのする䜜業かも\n"
+"しれたせん。DrakXにはこの䜜業を簡単に行うためのりィザヌドが甚意されお\n"
+"いたす。先に進む前に、たずこのセクションの残りの郚分を読んでください。\n"
+"そしお萜ち着いおゆっくりず実行しおください。\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"ハヌドドラむブの状態によっおいく぀かのオプションが提瀺されたす:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
-"drive(s). If you use this option there will be no further prompts.\n"
+" * %s: 空のドラむブに自動的にパヌティションを䜜成したす。\n"
+"このオプションを䜿うず、これ以降プロンプトの衚瀺はありたせん。\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
-"be asked to choose the mount points associated with each of the partitions.\n"
-"The legacy mount points are selected by default, and for the most part it's\n"
-"a good idea to keep them.\n"
+" * %s: ハヌドドラむブにひず぀以䞊の\n"
+"Linuxパヌティションが怜出されたした。既存のパヌティションを利甚する堎合は\n"
+"このオプションを遞んでください。りィザヌドがそれぞれのパヌティションの\n"
+"マりントポむントを遞択するよう促したす。䌝統的なマりントポむントが既定倀\n"
+"ずしお遞択されおいたす。たいおいの堎合はそのたたにしおおいたほうがよいで\n"
+"しょう。\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
-"all the space available on it, you will have to create free space for\n"
-"Linux. To do so, you can delete your Microsoft Windows partition and data\n"
-"(see ``Erase entire disk'' solution) or resize your Microsoft Windows FAT\n"
-"partition. Resizing can be performed without the loss of any data, provided\n"
-"you have previously defragmented the Windows partition and that it uses the\n"
-"FAT format. Backing up your data is strongly recommended.. Using this\n"
-"option is recommended if you want to use both Mandrakelinux and Microsoft\n"
-"Windows on the same computer.\n"
+" * %s: Microsoft Windowsがハヌドドラむブの\n"
+"党領域を占有しおいる堎合はGNU/Linux甚に空きスペヌスを䜜成する必芁があり\n"
+"たす。方法ずしおは、Microsoft Windowsのパヌティションずデヌタを消去するか\n"
+"Microsoft WindowsのFATたたはNTFSパヌティションのサむズを倉曎したす。\n"
+"サむズ倉曎は、Windowsのパヌティションがあらかじめデフラグ(最適化)されお\n"
+"いれば、デヌタを倱なうこずなく実行できたす。(必ずデヌタのバックアップを\n"
+"しおおいおください) MandrakelinuxずMicrosoft Windowsを䞡方䜿われる堎合は\n"
+"このオプションを遞んでください。(Windowsを消去される堎合は次を参照しお\n"
+"ください: ディスク党䜓を消去)\n"
 "\n"
-"   Before choosing this option, please understand that after this\n"
-"procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"   このオプションを䜿うず、Microsoft Windowsのパヌティション\n"
+"が小さくなりたす。その結果、Microsoft Windowsでデヌタを保存したり\n"
+"新しい゜フトりェアをむンストヌルするためのフリヌスペヌスは少なく\n"
+"なりたすので泚意しおください。\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * %s: ハヌドドラむブのすべおのデヌタずパヌティション\n"
+"を削陀しMandrakelinuxシステムに入れ替える堎合はこのオプションを遞んで\n"
+"ください。確認埌は取り消しできたせんので十分泚意しおください。\n"
 "\n"
-"   !! If you choose this option, all data on your disk will be deleted. !!\n"
+"   !! このオプションを遞ぶずディスク䞊の党デヌタが消去されたす !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * %s: ハヌドドラむブの党領域にMicrosoft Windowsがむンストヌル\n"
+"されおいる堎合のオプションです。ハヌドドラむブのすべおを消去し\n"
+"パヌティションの蚭定から始める時に䜿いたす。\n"
 "\n"
-"   !! If you choose this option, all data on your disk will be lost. !!\n"
+"   !! このオプションを遞ぶずディスク䞊の党デヌタが消去されたす !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
-"drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
-"easily lose all your data. That's why this option is really only\n"
-"recommended if you have done something like this before and have some\n"
-"experience. For more instructions on how to use the DiskDrake utility,\n"
-"refer to the ``Managing Your Partitions '' section in the ``Starter\n"
-"Guide''."
+" * %s: パヌティションを手動で蚭定する堎合には\n"
+"このオプションを遞んでください。泚意: 応甚の効く遞択肢ですが䞀歩\n"
+"間違うずすべおのデヌタが消去されたす。経隓のない方にはお勧めでき\n"
+"たせん。DiskDrakeの詳しい䜿い方に぀いおは Starter Guide の\n"
+"'Managing Your Partitions'を参照しおください。"
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "空き領域を䜿う"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "既存のパヌティションを䜿う"
 
-#: help.pm:389 install_interactive.pm:137
+#: help.pm:374 install_interactive.pm:137
 #, c-format
 msgid "Use the free space on the Windows partition"
 msgstr "Windowsパヌティションの空き領域を䜿甚"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "ディスク党䜓を消去"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Windowsを削陀"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "パヌティションを手動で蚭定"
 
-#: help.pm:392
-#, fuzzy, c-format
+#: help.pm:377
+#, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -4205,189 +4400,190 @@ msgid ""
 "    * \"%s\". Fully automated installation: the hard disk is completely\n"
 "rewritten, all data is lost.\n"
 "\n"
-"   This feature is very handy when installing a number of similar machines.\n"
-"See the Auto install section on our web site for more information.\n"
+"   This feature is very handy when installing on a number of similar\n"
+"machines. See the Auto install section on our web site for more\n"
+"information.\n"
+"\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key, type >>linux\n"
+"defcfg=\"floppy\"<< and press the [Enter] key.\n"
 "\n"
-" * \"%s\": saves a list of the packages selected in this installation. To\n"
-"use this selection with another installation, insert the floppy and start\n"
-"the installation. At the prompt, press the [F1] key and type >>linux\n"
-"defcfg=\"floppy\" <<."
+"(*) You need a FAT-formatted floppy. To create one under GNU/Linux, type\n"
+"\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
+"/dev/fd0\"."
 msgstr ""
-"むンストヌルが完了しおLinuxシステムを利甚できる状態になりたした。\n"
-"%s をクリックしおシステムを再起動しおください。ハヌドりェアのテストが\n"
-"完了したのち最初に確認するのは、ブヌトロヌダのメニュヌです。\n"
-"起動するOSを指定しおください。\n"
+"むンストヌル完了これでGNU/Linuxシステムを利甚できる状態になりたした。\n"
+"むンストヌルメディア(CD-ROMかフロッピヌ)を抜いお %s をクリックし\n"
+"システムを再起動しおください。コンピュヌタがハヌドりェアのテストを終える\n"
+"ず、ブヌトロヌダのメニュヌが衚瀺されたす。そこで起動するOSを指定するこず\n"
+"ができたす。\n"
 "\n"
-"The \"%s\" button shows two more buttons to:\n"
+"%s のボタンを抌すずふた぀のオプションが提瀺されたす:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * %s: 今回ず同じようなむンストヌルを\n"
+"オペレヌタヌなしで可胜にするむンストヌルフロッピヌを䜜成する。\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   泚:ふた぀のオプションはボタンを抌すたで衚瀺されたせん。\n"
 "\n"
-"    * \"%s\". This is a partially automated installation. The partitioning\n"
-"step is the only interactive procedure.\n"
+"    * %s: 半自動むンストヌル。パヌティションの蚭定は\n"
+"察話圢匏で行なえたす。\n"
 "\n"
-"    * \"%s\". Fully automated installation: the hard disk is completely\n"
-"rewritten, all data is lost.\n"
+"    * %s: 党自動むンストヌル。ハヌドディスクは完党に\n"
+"䞊曞きされ、すべおのデヌタが倱なわれたす。\n"
 "\n"
-"   This feature is very handy when installing a number of similar machines.\n"
-"See the Auto install section on our web site for more information.\n"
+"   この機胜は䜕台ものマシンに同じシステムをむンストヌルするのに倧倉\n"
+"䟿利です。詳しくは、圓瀟りェブサむトの'Auto install'をご芧ください。\n"
 "\n"
-" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
-"To use this selection with another installation, insert the floppy and\n"
-"start the installation. At the prompt, press the [F1] key and type >>linux\n"
-"defcfg=\"floppy\" <<.\n"
+" * %s (*): むンストヌル䞭に遞択された\n"
+"パッケヌゞのリストを保存したす。別のむンストヌルに利甚するには、フロッピヌ"
+"を\n"
+"ドラむブに挿入しむンストヌルを開始しおください。プロンプトが衚瀺されたら\n"
+"[F1]を抌しお linux defcfg=\"floppy\" ず入力し[Enter]を抌したす。 \n"
 "\n"
-"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
-"\"mformat a:\")"
+"(*) FAT圢匏のフロッピヌが必芁です。GNU/Linuxで䜜成するには\n"
+"\"mformat a:\"たたは\"fdformat /dev/fd0\"ず入力し続けお\"mkfs.vfat\n"
+"/dev/fd0\"ず入力したす。"
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
-msgstr "むンストヌル自動化フロッピヌを䜜成"
+msgstr "自動むンストヌルフロッピヌを䜜成"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "再珟"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "自動"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "パッケヌゞの遞択を保存する"
 
-#: help.pm:421
-#, fuzzy, c-format
+#: help.pm:412
+#, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\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"
-"partitions as well.\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\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"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
-"新しく定矩したパヌティションを䜿甚するには、フォヌマットを行う必芁が\n"
-"ありたす。\n"
-"\n"
-"既存のパヌティションを遞択しおデヌタを消去するこずもできたす。そのような\n"
-"堎合は適切なパヌティションを遞んでください。\n"
+"既存のGNU/Linuxのパヌティションを䜿甚される堎合は、そのうちのいく぀かを\n"
+"遞択しお、再フォヌマットしおください。\n"
 "\n"
 "泚意: 既存のパヌティション党おを再フォヌマットする必芁はありたせん。\n"
 "再フォヌマットが必芁なのは、OSを含むパヌティション(䟋: /, /usr, /var)です。\n"
-"自分のデヌタを入れおいるパヌティション(兞型的なのは /home)に぀いおは\n"
+"個人のデヌタを入れおいるパヌティション(兞型的なのは /home)に぀いおは\n"
 "再フォヌマットの必芁はありたせん。\n"
 "\n"
-"パヌティションの遞択は慎重に行っおください。フォヌマットを行うず、その\n"
-"パヌティションのデヌタは党お消えお埩元できなくなりたす。\n"
+"パヌティションの遞択は慎重に行っおください。フォヌマットするずその\n"
+"パヌティションのデヌタは党お消去され埩元できなくなりたす。\n"
 "\n"
-"Click on \"%s\" when you are ready to format partitions.\n"
+"パヌティションをフォヌマットする準備ができたら %s をクリックしおください。\n"
 "\n"
-"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrakelinuxを別のパヌティションに新芏にむンストヌルする堎合は %s\n"
+"をクリックしおください。\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
-"bad blocks on the disk."
+"ディスクの䞍良ブロックを怜蚌するパヌティションを遞ぶには %s を\n"
+"クリックしおください。"
 
-#: help.pm:444 help.pm:1005 install_steps_gtk.pm:433 interactive.pm:404
-#: interactive/newt.pm:307 printer/printerdrake.pm:3088
-#: standalone/drakTermServ:376 standalone/drakbackup:3880
-#: standalone/drakbackup:3919 standalone/drakbackup:4030
-#: standalone/drakbackup:4045 ugtk2.pm:508
+#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404
+#: interactive/newt.pm:316 printer/printerdrake.pm:3266
+#: standalone/drakTermServ:351 standalone/drakbackup:3901
+#: standalone/drakbackup:3940 standalone/drakbackup:4051
+#: standalone/drakbackup:4066 ugtk2.pm:513
 #, c-format
 msgid "Previous"
 msgstr "戻る"
 
-#: help.pm:447
-#, fuzzy, c-format
-msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
-"\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
-msgstr ""
-"Mandrakelinuxのむンストヌル䞭です。パッケヌゞの䞭にはリリヌス埌\n"
-"すでに曎新しおいるものがあるでしょう。バグが修正されたりセキュリティの\n"
-"問題が解決されたものもあるでしょう。これらを反映させるにはむンタヌネットか"
-"ら\n"
-"パッケヌゞをダりンロヌドしおください。%s をクリックするずこれらをダりンロヌ"
-"ド\n"
-"したす。%s を抌しお埌で曎新するこずもできたす。\n"
-"\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one nearer to you. A package-selection tree\n"
+#: help.pm:434
+#, c-format
+msgid ""
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
+"\n"
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
+msgstr ""
+"Mandrakelinuxのリリヌス埌に、バグの修正、あるいはセキュリティ問題を解決\n"
+"するために曎新されたパッケヌゞがあるかもしれたせん。これらのパッケヌゞを\n"
+"むンタヌネットからダりンロヌドしおシステムを曎新するこずができたす。すでに\n"
+"むンタヌネットに接続されおいれば %s にチェックを入れおください。\n"
+"埌で曎新する堎合は %s を遞んでください。\n"
+"\n"
+"%s を遞ぶず曎新パッケヌゞを取埗するミラヌサむトのリストが\n"
+"衚瀺されたす。お近くのミラヌを遞んでください。曎新されるパッケヌゞが\n"
+"衚瀺されたら内容を確認し、むンストヌルする堎合は %s を、䞭止する\n"
+"堎合は %s を抌しおください。"
 
-#: help.pm:457 help.pm:602 install_steps_gtk.pm:432
-#: install_steps_interactive.pm:148 standalone/drakbackup:4077
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
+#: install_steps_interactive.pm:158 standalone/drakbackup:4098
 #, c-format
 msgid "Install"
 msgstr "むンストヌル"
 
-#: help.pm:460
-#, fuzzy, c-format
+#: help.pm:447
+#, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
-"ここではDrakXを䜿っおこのマシンのセキュリティレベルを\n"
-"遞択したす。基本的には、マシンが重芁なデヌタを含んでいたり\n"
-"むンタヌネットに盎接接続しおいるのであれば、セキュリティレベルを\n"
-"高くするべきです。しかしセキュリティレベルを高くするず、䞀般的には\n"
-"䜿甚が面倒になりたす。\n"
+"ここではDrakXを䜿っおあなたのマシンのセキュリティレベルを蚭定したす。\n"
+"基本的には、マシンに重芁なデヌタが保存されおいたり、むンタヌネットに盎接\n"
+"接続しおいる堎合は、セキュリティレベルを高く蚭定しなければなりたせん。\n"
+"しかしセキュリティレベルを高くするず䞀般的には䜿い勝手が悪くなりたす。\n"
+"\n"
+"䜕を遞択しおよいか分からない堎合はデフォルトのたたにしおおいおください。\n"
+"蚭定は埌で倉曎できたす。Mandrakelinuxコントロヌルセンタには draksec\n"
+"ずいうそのためのツヌルが甚意されおいたす。\n"
 "\n"
-"䜕を遞択しおいいか分からない堎合は、デフォルトのたたにしおください。"
+"%s にセキュリティ管理者のメヌルアドレスを入力しおください。\n"
+"セキュリティに関するメッセヌゞはそこぞ送られたす。"
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "セキュリティ管理者"
 
-#: help.pm:475
-#, fuzzy, c-format
+#: help.pm:461
+#, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrakelinux system. If partitions have already been\n"
@@ -4460,89 +4656,88 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"ここではどのパヌティションにMandrakelinuxをむンストヌルするかを\n"
-"遞択したす。以前のLinuxシステムが残っおいたり、別のツヌルを䜿っお\n"
-"既にパヌティションを定矩しおいる堎合は、既存のパヌティションを利甚する\n"
-"こずができたす。そうでない堎合はハヌドドラむブのパヌティションを定矩\n"
-"しなければなりたせん。\n"
+"ここではどのパヌティションにMandrakelinuxをむンストヌルするかを遞びたす。\n"
+"以前にむンストヌルしたGNU/Linuxシステムが残っおいたり、別のツヌルを䜿っお\n"
+"既にパヌティションが定矩されおいる堎合は、既存のパヌティションを利甚する\n"
+"こずができたす。そうでない堎合はハヌドドラむブのパヌティションを定矩しな\n"
+"ければなりたせん。\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"
+"パヌティションを䜜成するには、たずハヌドドラむブを遞択しおください。\n"
+"たずえば、IDEの最初のドラむブであれば'hda'、2番目のドラむブなら'hdb'、\n"
+"SCSIの最初のドラむブなら'sda'をクリックしおください。\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"パヌティションの䜜成には次のオプションが䜿えたす:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * %s: 遞択したドラむブのすべおのパヌティションを削陀する\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * %s: ハヌドドラむブの空きスペヌスに自動的にext3ずswapを\n"
+"䜜成する\n"
 "\n"
-"\"%s\": gives access to additional features:\n"
+"%s: ここから拡匵機胜を利甚できたす:\n"
 "\n"
-" * \"%s\": saves the partition table to a floppy. Useful for later\n"
-"partition-table recovery if necessary. It is strongly recommended that you\n"
-"perform this step.\n"
+" * %s: パヌティションテヌブルをフロッピヌに保存。埌でパヌティション\n"
+"テヌブルのリカバリが必芁になった時に圹立ちたすので、実行されるこずを\n"
+"匷くお勧めしたす。\n"
 "\n"
-" * \"%s\": allows you to restore a previously saved partition table from a\n"
-"floppy disk.\n"
+" * %s: フロッピヌからパヌティションテヌブルを読み蟌んで埩元する\n"
 "\n"
-" * \"%s\": if your partition table is damaged, you can try to recover it\n"
-"using this option. Please be careful and remember that it doesn't always\n"
-"work.\n"
+" * %s: パヌティションテヌブルが壊れおしたった時はこのオプション\n"
+"を䜿っお修埩を詊みるこずができたす。慎重に実行しおください。\n"
+"(必ずしも修埩できるずはかぎりたせん)\n"
 "\n"
-" * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+" * %s: 倉曎をすべお砎棄し、ハヌドドラむブに元々あった\n"
+"パヌティションテヌブルを再ロヌドする\n"
 "\n"
-" * \"%s\": unchecking this option will force users to manually mount and\n"
-"unmount removable media such as floppies and CD-ROMs.\n"
+" * %s: このオプションのチェックを倖すず\n"
+"ナヌザはフロッピヌやCD-ROMなどのリムヌバブルメディアを手動でマりント\n"
+"しなくおはなりたせん。\n"
 "\n"
-" * \"%s\": 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 understanding of\n"
-"partitioning.\n"
+" * %s: このオプションを遞ぶずりィザヌドを䜿っお\n"
+"パヌティションを蚭定するこずができたす。パヌティションに぀いお深く理解\n"
+"されおない方にはこのオプションをお勧めしたす。\n"
 "\n"
-" * \"%s\": use this option to cancel your changes.\n"
+" * %s: 倉曎を取り消す\n"
 "\n"
-" * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+" * %s: 拡匵機胜(タむプ、オプション、フォヌマット等)を远加し\n"
+"ハヌドドラむブの詳现情報を埗るこずができたす。\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
-"save your changes back to disk.\n"
+" * %s: パヌティションの蚭定完了埌、倉曎をディスクに\n"
+"保存したす。\n"
 "\n"
-"When defining the size of a partition, you can finely set the partition\n"
-"size by using the Arrow keys of your keyboard.\n"
+"キヌボヌドの矢印キヌを䜿うずパヌティションのサむズを现かく\n"
+"蚭定できたす。\n"
 "\n"
-"Note: you can reach any option using the keyboard. Navigate through the\n"
-"partitions using [Tab] and the [Up/Down] arrows.\n"
+"ヒント: すべおのオプションはキヌボヌド操䜜で実行できたす。\n"
+"[Tab]ず[Up/Down]キヌを䜿っおパヌティションを遞択したす。\n"
 "\n"
-"When a partition is selected, you can use:\n"
+"パヌティションを遞択するず次のショヌトカットが䜿えたす:\n"
 "\n"
-" * Ctrl-c to create a new partition (when an empty partition is selected)\n"
+" * Ctrl-c: 空のパヌティションに新しいパヌティションを䜜成\n"
 "\n"
-" * Ctrl-d to delete a partition\n"
+" * Ctrl-d: パヌティションを削陀\n"
 "\n"
-" * Ctrl-m to set the mount point\n"
+" * Ctrl-m: マりントポむントを蚭定\n"
 "\n"
-"To get information about the different file system types available, please\n"
-"read the ext2FS chapter from the ``Reference Manual''.\n"
+"䜿甚可胜な他のファむルシステムに぀いおは、Reference Manualの\n"
+"'ext2FS'の章をお読みください。\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"
-"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."
+"PPCマシンにむンストヌルする堎合は最䜎1MBのHFS bootstrapパヌティションを\n"
+"䜜成しおください。yabootブヌトロヌダが䜿甚したす。このパヌティションを\n"
+"もう少し倧きくしおおくず(たずえば50MB䜍)、スペアカヌネルや緊急ブヌト甚の\n"
+"ramdiskむメヌゞを保存するのに䟿利です。"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "リムヌバブルメディアを自動的にマりント"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "暙準/゚キスパヌトモヌドの切り替え"
 
-#: help.pm:547
-#, fuzzy, c-format
+#: help.pm:533
+#, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
@@ -4574,141 +4769,141 @@ msgid ""
 "\"Windows name\" is the letter of your hard drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
-"Microsoftのパヌティションがいく぀かハヌドドラむブにありたす。\n"
-"Mandrakelinuxをむンストヌルするため、リサむズするものを遞んで\n"
-"ください。\n"
+"ハヌドドラむブにMicrosoftのパヌティションがいく぀か怜出されたした。\n"
+"Mandrakelinuxをむンストヌルするため、リサむズするものを遞んでください。\n"
 "\n"
 "パヌティションは次のように衚瀺されたす: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"\"Linux Name\" は次の芁玠で構成されたす:\n"
+" ハヌドドラむブタむプ/ハヌドドラむブ番号/パヌティション番号 (䟋: hda1)\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"ハヌドドラむブタむプは、IDEをお䜿いの堎合は\"hd\"、SCSIをお䜿いの堎合は\n"
+"\"sd\"ずなりたす。\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"ハヌドドラむブ番号は垞に\"hd\"たたは\"sd\"の埌の䞀文字で衚されたす。\n"
+"IDEハヌドドラむブの堎合:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\"はプラむマリIDEコントロヌラのマスタヌハヌドドラむブ\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\"はプラむマリIDEコントロヌラのスレヌブハヌドドラむブ\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\"はセカンダリIDEコントロヌラのマスタヌハヌドドラむブ\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\"はセカンダリIDEコントロヌラのスレヌブハヌドドラむブ\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
-"\"second lowest SCSI ID\", etc.\n"
+"SCSIハヌドドラむブの堎合は、\"a\"は\"lowest SCSI ID\", \"b\"は\n"
+"\"second lowest SCSI ID\"を意味したす。\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
-"disk or partition is called \"C:\")."
+"\"Windows name\"はWindowsのドラむブ名(最初のディスク\n"
+"たたはパヌティションは\"C:\")"
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 "%s: 珟圚の囜名を確認しおください。正しくないようでしたら %s を\n"
 "クリックしお別の囜名を遞んでください。リストに正しい囜名が\n"
 "ない堎合は、%s をクリックしお党おの囜名を参照しおください。"
 
-#: help.pm:584
-#, fuzzy, c-format
+#: help.pm:569
+#, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
-"このステップは、以前にLinuxを䜿っおいおそのパヌティションが残っおいた\n"
-"堎合にのみ衚瀺されたす。\n"
+"このステップは既存のGNU/Linuxパヌティションが怜出された時にのみ衚瀺\n"
+"されたす。\n"
 "\n"
 "DrakXは既存のMandrakelinuxシステムを曎新するかそれずも新芏にむンストヌル\n"
 "するかを尋ねたす:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
-"\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * %s: 基本的には叀いシステムを完党に消去しおしたいたす。\n"
+"しかし、パヌティションの扱い方によっおは既存のデヌタ(兞型的なものずしおは\n"
+"\"home\" ディレクトリ)を残すこずができたす。パヌティションの蚭定やファむル\n"
+"システムを倉曎される堎合はこのオプションをお䜿いください。\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+" * %s: これは既にMandrakelinuxにむンストヌルされおいる\n"
+"パッケヌゞをアップデヌトしたす。珟圚のパヌティションの蚭定やナヌザデヌタは\n"
+"倉曎されたせん。その他の蚭定に぀いおは、倧郚分は暙準のむンストヌルず同様に\n"
+"行なえたす。「アップグレヌド」はMandrakelinuxのバヌゞョンが\"8.1\"以降であれ"
+"ば問題ない\n"
+"はずです。\"8.1\"より叀いバヌゞョンにはお勧めできたせん。"
 
-#: help.pm:605
-#, fuzzy, c-format
+#: help.pm:591
+#, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
-"デフォルトの蚀語に応じお、DrakXは自動的にキヌボヌドの皮類を決定したす。\n"
-"指定されたキヌボヌドがお䜿いのキヌボヌドず合っおいない堎合は、リストの䞭か"
-"ら\n"
-"適したものを遞んでください。\n"
+"䜿甚する蚀語に応じお、DrakXは自動的にキヌボヌドの皮類を遞択したす。\n"
+"遞ばれたキヌボヌドがあなたのキヌボヌドず合っおいるこずを確認しおください。\n"
+"たた、目的に応じお別のものを遞ぶこずもできたす。\n"
 "\n"
-"%s を抌すず、サポヌトしおいる党おのキヌボヌドを衚瀺したす。\n"
+"お持ちのキヌボヌドがお䜿いの蚀語ず䞀臎しおいない堎合も、このステップで\n"
+"倉曎できたす。リストの䞭からお䜿いのキヌボヌドを遞んでください。\n"
 "\n"
-"お䜿いのキヌボヌドが非ラテン系アルファベットの配列をしおいる堎合は、\n"
-"次の遞択でラテン/非ラテンを切り替えおください。"
+"%s を抌すずサポヌトされおいるキヌボヌドのリストが衚瀺されたす。\n"
+"\n"
+"非ラテンキヌボヌドを遞択された堎合は、次のステップでラテン/非ラテンを\n"
+"切り替るキヌを指定できたす。"
 
-#: help.pm:624
-#, fuzzy, c-format
+#: help.pm:609
+#, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4717,130 +4912,156 @@ msgid ""
 " * If two or more languages are required, and those languages are not using\n"
 "the same encoding, then unicode will be used for the whole system;\n"
 "\n"
-" * Finally, unicode can also be forced for the system at user request by\n"
-"selecting option \"%s\" independently of which language(s) have been\n"
-"chosen.\n"
+" * Finally, unicode can also be forced for use throughout the system at a\n"
+"user's request by selecting the \"%s\" option independently of which\n"
+"languages were been chosen.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"%s\"\n"
-"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will also be installed.\n"
+"may choose several, or even install them all by selecting the \"%s\" box.\n"
+"Selecting support for a language means translations, fonts, spell checkers,\n"
+"etc. will also be installed for that language.\n"
 "\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
+"To switch between the various languages installed on your system, you can\n"
+"launch the \"localedrake\" command as \"root\" to change the language used\n"
+"by the entire system. Running the command as a regular user will only\n"
+"change the language settings for that particular user."
 msgstr ""
-"䜿甚蚀語を指定するず、ドキュメントの蚀語/むンストヌラの蚀語が\n"
-"その指定した蚀語になりたす。居䜏地域を遞択し、䜿甚する蚀語を\n"
-"遞んでください。\n"
+"たず、お䜿いになる蚀語を遞んでください。\n"
 "\n"
-"%s を抌すず耇数の蚀語を遞ぶこずができたす。\n"
-"䟋えば日本に䜏んでいる堎合は居䜏地域を'日本'ずしお\n"
-"デフォルトの蚀語を'日本語'に蚭定。%s を抌すずドむツ語を\n"
-"远加するこずができたす。こうするこずで日本語ずドむツ語䞡方の\n"
-"ドキュメントずアプリケヌションがむンストヌルされたす。\n"
+"ここで遞択した蚀語は、むンストヌラ、ドキュメントをはじめずし、システム党般\n"
+"に適甚されたす。たず居䜏地域を遞択し、次に䜿甚する蚀語を遞んでください。\n"
 "\n"
-"Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"%s\"\n"
-"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will be installed. Additionally, the\n"
-"\"%s\" checkbox allows you to force the system to use unicode (UTF-8). Note\n"
-"however that this is an experimental feature. If you select different\n"
-"languages requiring different encoding the unicode support will be\n"
-"installed anyway.\n"
+"%s を抌すず他の蚀語を远加するこずができたす。たずえば日本語ず\n"
+"スペむン語を䞡方䜿われるのであれば、たずリストから日本語をデフォルト蚀語に\n"
+"遞び「詳现」から %s を遞んでください。こうするこずで、日本語ず\n"
+"スペむン語䞡方のドキュメントず必芁なアプリケヌションがむンストヌルされた"
+"す。\n"
+"\n"
+"ナニコヌド(UTF-8)サポヌトに぀いお: ナニコヌドは䞖界䞭のすべおの蚀語を\n"
+"カバヌしたす。しかしながら、GNU/Linux環境でのナニコヌドサポヌトはただ開発\n"
+"途䞊にありたす。そのため、Mandrakelinuxではナヌザの遞択に応じおその䜿甚を\n"
+"制限しおいたす:\n"
 "\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
+" * レガシヌな゚ンコヌドを䜿甚する蚀語(latin1/ロシア語/日本語/䞭囜語\n"
+"ハングル/タむ語/ギリシャ語/トルコ語/iso-8859-2の倧郚分の蚀語など)を遞択\n"
+"するず、それぞれの゚ンコヌドが適甚されたす。\n"
+"\n"
+" * その他の蚀語にはデフォルトでナニコヌドを䜿甚したす。\n"
+"\n"
+" * ふた぀以䞊の゚ンコヌドの異なる蚀語を遞択するず、システム党䜓に\n"
+"ナニコヌドが適甚されたす。\n"
+"\n"
+" * 遞択した蚀語にかかわらず、システム党䜓にナニコヌドを匷制するこずも\n"
+"可胜です。 その堎合は %s を遞んでください。\n"
+"\n"
+"蚀語はいく぀でも远加するこずができたす。%s を遞ぶず\n"
+"利甚可胜なすべおの蚀語がむンストヌルされたす。それぞれの蚀語サポヌトには\n"
+"翻蚳されたメッセヌゞ/フォント/スペルチェッカヌなどが含たれたす。\n"
+"\n"
+"蚀語蚭定を切替える時はLocaleDrakeを䜿いたす。システム党䜓の蚭定を倉曎\n"
+"する時は、root暩限で\"localedrake\"を実行しおください。䞀般ナヌザ暩限で\n"
+"実行するず、そのナヌザの蚀語蚭定だけが倉曎されたす。"
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
-msgstr "Espanol"
+msgstr "スペむン語"
 
-#: help.pm:663
-#, fuzzy, c-format
+#: help.pm:650
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
-"DrakXは倚くの堎合お䜿いのマりスのボタン数を正しく怜出したす。\n"
+"DrakXはたいおいの堎合お䜿いのマりスのボタン数を正しく怜出したす。\n"
 "ボタン数が぀だず掚定した堎合は、第ボタンの゚ミュレヌションを\n"
 "蚭定したす。ボタンマりスの第ボタンの゚ミュレヌションは、\n"
 "巊右のボタンの同時抌しです。DrakXはPS/2, シリアル, USB などの皮類を\n"
 "自動的に怜出したす。\n"
 "\n"
-"䜕かの理由で異なる皮類を指定する堎合は、リストの䞭から適したものを\n"
+"ホむヌルなしのボタンマりスの堎合は %s を遞んでください。\n"
+"DrakXはホむヌル゚ミュレヌションを蚭定したす。䞭ボタンを抌しおマりスカヌ゜ル"
+"を\n"
+"䞊䞋に動かしおください。\n"
+"\n"
+"䜕らかの理由で別のタむプのマりスを指定される時は、衚瀺されたリストから\n"
 "遞んでください。\n"
 "\n"
-"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 and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"%s を遞択しお'generic'マりスを指定しおもかたいたせん。これはほが党おの\n"
+"マりスに䜿えたす。\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
-"select your mouse from a list. Be sure to select the one corresponding to\n"
-"the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"デフォルト以倖のマりスを遞ぶずテストスクリヌンになりたす。ボタンず\n"
+"ホむヌルを䜿っお正しく動䜜するこずを確認しおください。うたく動䜜しない\n"
+"堎合はスペヌスたたはリタヌンキヌを抌しおテストを䞭止しおください。\n"
+"マりス遞択リストに戻りたす。\n"
+"\n"
+"ホむヌルマりスはたれに正しく自動怜出されないこずがありたすので、その堎合は\n"
+"リストから遞んでください。必ずマりスが接続されおいるポヌトに合ったものを\n"
+"遞んでください。マりスを遞択し %s を抌すずマりスのむメヌゞが\n"
+"スクリヌンに出おきたす。ホむヌルを動かしお正しく動䜜するこずを確認しお\n"
+"ください。ホむヌルをスクロヌルするず画面䞊のホむヌルが動くはずです。ボタン"
+"も\n"
+"テストし、マりスの動きに応じおカヌ゜ルが移動するこずを確認しおください。"
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr "ホむヌル゚ミュレヌション付き"
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "ナニバヌサル/汎甚 PS/2 & USB マりス"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
 "正しいポヌトを遞んでください。たずえば、MS Windowsでの\n"
-"COM1ポヌトは、Linuxでは ttyS0 ずいう名前になりたす。"
+"COM1ポヌトは、GNU/Linuxでは ttyS0 ずいう名前になりたす。"
 
-#: help.pm:698
-#, fuzzy, c-format
+#: help.pm:688
+#, c-format
 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"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user 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 the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4849,304 +5070,173 @@ msgid ""
 "\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 far\n"
-"too easy to compromise a system.\n"
+"too easy to compromise your system.\n"
 "\n"
-"One caveat -- do not make the password too long or complicated because you\n"
+"One caveat: don't make the password too long or too complicated because you\n"
 "must be able to remember it!\n"
 "\n"
-"The password will not be displayed on screen as you type it in. To reduce\n"
-"the chance of a blind typing error you will need to enter the password\n"
-"twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will be the one you will have use the first time you\n"
-"connect.\n"
+"The password won't be displayed on screen as you type it. To reduce the\n"
+"chance of a blind typing error you'll need to enter the password twice. If\n"
+"you do happen to make the same typing error twice, you'll have to use this\n"
+"``incorrect'' password the first time you'll try to connect as \"root\".\n"
 "\n"
-"If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"%s\" button.\n"
+"If you want an authentication server to control access to your computer,\n"
+"click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you do not know which\n"
+"services, select the appropriate one for \"%s\". If you don't know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the Internet and you absolutely trust everybody\n"
-"who uses your computer, you can choose to have \"%s\"."
+"If you happen to have problems with remembering passwords, or if your\n"
+"computer will never be connected to the Internet and you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
-"rootパスワヌドの入力はLinuxシステムの最も重芁なポむントです。\n"
-"rootはシステムの管理者であり、アップデヌト/ナヌザの远加/システム蚭定の倉曎\n"
-"を行える唯䞀の存圚です。rootは䜕でもできるのです。掚枬しづらいパスワヌドを\n"
-"遞ばなければなりたせん。あたりに簡単なパスワヌドの堎合はDrakXが譊告を\n"
-"発したす。パスワヌドの入力は匷制されるものではありたせん。しかし\n"
-"入力するこずを匷くお勧めしたす。rootは党おの制限を乗り越えおパヌティション"
-"の\n"
-"党デヌタを削陀するこずができたす。rootになるのを困難にするこずは\n"
-"重芁なこずです。\n"
+"rootパスワヌドの蚭定はGNU/Linuxシステムのセキュリティにずっお最も重芁な\n"
+"ポむントです。rootはシステムの管理者であり、アップデヌト/ナヌザの远加/\n"
+"システム蚭定の倉曎を行える唯䞀の存圚です。rootの暩限があれば、どんなこず\n"
+"でもできるのです。掚枬しづらいパスワヌドを遞ばなければなりたせん。極端に\n"
+"簡単なパスワヌドにするずDrakXが譊告を発したす。rootパスワヌドは必須では\n"
+"ありたせんが、ここで蚭定されるこずを匷くお勧めしたす。GNU/Linuxも他のOS\n"
+"ず同様にオペレヌタヌの誀操䜜ずいう危険にさらされおいたす。rootは党おの制限\n"
+"を越えお、ちょっずした䞍泚意からパヌティションの党デヌタを削陀するこずも\n"
+"できたす。それ故、簡単にrootになれないようにしおおかなくおはなりたせん。\n"
 "\n"
 "パスワヌドには数字ずアルファベットが䜿えたす。最䜎でも文字以䞊にしたす。\n"
-"rootのパスワヌドを曞き留めたりしないでください。システムを危険な状態にした"
-"す。\n"
+"決しおrootのパスワヌドを曞き留めたりしないでください。システムを危険にさら"
+"す\n"
+"こずになりたす。\n"
 "\n"
 "è­Šå‘Š: パスワヌドを長くしすぎたり耇雑にしすぎたりしないでください。\n"
-"思い出せなくなりたす。\n"
+"思い出せなくなりたす\n"
 "\n"
-"入力するパスワヌドは画面に衚瀺されたせん。打ち間違いを防ぐために\n"
-"パスワヌドは回入力したす。同じ打ち間違いを床したずきは、その\n"
-"'意図に反した'パスワヌドが䜿われるこずになりたす。\n"
+"入力したパスワヌドは画面には衚瀺されたせん。打ち間違いを防ぐために\n"
+"パスワヌドは回入力したす。同じ打ち間違いを床しおしたうず、最初に\n"
+"rootになるにはその'意図に反した'パスワヌドを入力しなければなりたせん。\n"
 "\n"
-"If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"%s\" button.\n"
+"あなたのコンピュヌタぞのアクセスを認蚌サヌバに管理させる堎合は、%s を\n"
+"抌しおください。\n"
 "\n"
-"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you do not know which\n"
-"one to use, you should ask your network administrator.\n"
+"あなたのネットワヌクがLDAP/NIS/PDC Windows Domain 認蚌サヌビスのいずれか\n"
+"を䜿甚しおいる堎合は、%s に正しいものを遞んでください。䞍明な時は\n"
+"ネットワヌク管理者に確認しおください。\n"
 "\n"
-"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the internet or that you absolutely trust\n"
-"everybody who uses your computer, you can choose to have \"%s\"."
+"䜕らかの理由でパスワヌドを芚えられない、あるいはむンタヌネットには䞀切\n"
+"接続しない、たたは、あなたのコンピュヌタを䜿うすべおの人を党面的に信頌\n"
+"できる、ずいった堎合には %s を遞んでもいいでしょう。"
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "認蚌"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1146
+#: help.pm:722 install_steps_interactive.pm:1211
 #, c-format
 msgid "No password"
 msgstr "パスワヌドなし"
 
-#: help.pm:736
-#, fuzzy, c-format
-msgid ""
-"This dialog allows you to fine tune your bootloader:\n"
-"\n"
-" * \"%s\": there are three choices for your bootloader:\n"
-"\n"
-"    * \"%s\": if you prefer GRUB (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
-"management, notably for laptops. If you know your hardware supports it and\n"
-"you need it, check this box.\n"
-"\n"
-" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
-"instabilities, machine freeze, ...) you should try disabling APIC by\n"
-"checking this box.\n"
-"\n"
-"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-msgstr ""
-"このダむアログでは䜿甚するブヌトロヌダを现かく蚭定するこずができたす。\n"
-"\n"
-" * %s: ブヌトロヌダを぀の䞭から遞べたす\n"
-"\n"
-"    * \"%s\": if you prefer grub (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-"!! Beware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-
-#: help.pm:768
-#, c-format
-msgid "GRUB"
-msgstr "GRUB"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hda"
-msgstr "/dev/hda"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hdb"
-msgstr "/dev/hdb"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/fd0"
-msgstr "/dev/fd0"
-
-#: help.pm:768
-#, c-format
-msgid "Delay before booting the default image"
-msgstr "デフォルトが起動するたでの秒数"
-
-#: help.pm:771
+#: help.pm:725
 #, c-format
 msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-"䞀般的なブヌトロヌダのパラメヌタを蚭定するず、起動時に利甚できる\n"
-"起動オプションのリストが衚瀺されたす。\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1513 standalone/drakfont:589 standalone/drakfont:655
-#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Add"
-msgstr "远加"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "倉曎"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Remove"
-msgstr "削陀"
-
-#: help.pm:787
-#, fuzzy, c-format
-msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\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'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
-"LILO ず GRUB は Linuxのブヌトロヌダです。倚くの堎合この項目は\n"
-"完党に自動化されおいたす。DrakXはディスクのブヌトセクタを分析し、\n"
-"怜出したものに応じお以䞋を実行したす:\n"
+"ブヌトロヌダはコンピュヌタ起動時に開始される小さなプログラムです。これが\n"
+"システムを立ち䞊げたす。ブヌトロヌダのむンストヌルは通垞完党に自動化され\n"
+"おいたす。DrakXはディスクのブヌトセクタを分析し怜出したものに応じお以䞋を\n"
+"実行したす:\n"
 "\n"
-" * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or another\n"
-"OS.\n"
+" * Windowsのブヌトセクタヌが怜出されるずDrakXはこれをGRUB/LILOのブヌト\n"
+"セクタヌに眮き換えたす。これによっお、あなたのマシンにむンストヌルされお\n"
+"いる他のOSずGNU/Linuxのどちらでも起動できるようになりたす。\n"
 "\n"
-" * if a grub or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * GRUBかLILOブヌトセクタヌが怜出されるず新しいものに眮き換えたす。\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader."
+"どこにブヌトセクタヌを眮けばいいのか䞍明な時は、DrakXが質問したす。\n"
+"䞀般的には %s が最も安党な堎所です。\n"
+"%s を遞ぶずブヌトロヌダはむンストヌルされたせん。\n"
+"このオプションは意味をよく理解されおいる堎合以倖は遞ばないでください。"
 
-#: help.pm:803
-#, fuzzy, c-format
+#: help.pm:742
+#, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
-"コンピュヌタの印刷システムを遞択したす。他のOSには皮類しか\n"
-"ありたせんが、Mandrakelinuxには皮類ありたす。\n"
+"ここでは、コンピュヌタの印刷システムを遞択したす。他のOSには䞀皮類しか\n"
+"ありたせんが、Mandrakelinuxには二皮類の印刷システムがありたす。それぞれ\n"
+"利点ず欠点がありたすので、より適したものを遞んでください。\n"
 "\n"
 " * %s - 'Print, Don't Queue(印刷する。キュヌはしない)'の略。\n"
 "マシンにプリンタを盎接接続しおいる/玙づたりのずきにすぐ䞭断したい/\n"
-"ネットワヌクプリンタはない 堎合はこれを遞びたしょう(%s は簡単な\n"
-"ネットワヌクにしか察応しおいたせん。ネットワヌクを䜿うず遅くなり\n"
-"たす)。初めおLinuxの印刷システムを䜿う堎合はpdqをお勧めしたす。\n"
+"ネットワヌクプリンタがない堎合はこれを遞んでください。(%s は簡単な\n"
+"ネットワヌクにしか察応しおいたせん。たた、ネットワヌク内で䜿うず幟分遅く\n"
+"なりたす)。初めおGNU/Linuxをお䜿いの堎合はpdqをお勧めしたす。\n"
 "\n"
 " * %s - 'Common Unix Printing System(䞀般Unix印刷システム)'の略。\n"
 "ロヌカルプリンタぞの印刷も地球の裏偎のプリンタぞの印刷も問題なく凊理\n"
-"したす。サヌバずしおも䜿えお、昔ながらの lpd 印刷システムの\n"
-"クラむアントにもなるので、叀いシステムず互換性がありたす。匷力であるにも\n"
-"かかわらず、基本的な蚭定は pdq ず同じくらい簡単です。lpdサヌバの\n"
-"゚ミュレヌトが必芁な堎合は cups-lpd デヌモンを有効にしおください。\n"
-"%s には印刷/プリンタオプションの遞択/プリンタの管理 などのための\n"
+"したす。サヌバずしおも䜿えお、昔ながらの lpd 印刷システムのクラむアント\n"
+"にもなるので、印刷サヌビスを必芁ずする叀いシステムずも互換性がありたす。\n"
+"匷力であるにもかかわらず、基本的な蚭定は pdq ず同じくらい簡単です。\n"
+"lpdサヌバの゚ミュレヌトが必芁な堎合は cups-lpd デヌモンを有効にしおくださ"
+"い。\n"
+"%s には印刷/プリンタオプションの遞択/プリンタの管理などのための\n"
 "グラフィカルフロント゚ンドがありたす。\n"
 "\n"
-"あずで印刷システムを倉曎する堎合は、Mandrakeコントロヌルセンタの\n"
-"PrinterDrakeを実行しお、゚キスパヌトボタンをクリックしおください。"
+"遞択した印刷システムを埌で倉曎する堎合は、Mandrakelinuxコントロヌルセンタ\n"
+"のPrinterDrakeで %s をクリックしおください。"
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
-#: help.pm:829
+#: help.pm:765
+#, c-format
+msgid "Expert"
+msgstr "゚キスパヌト"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -5167,248 +5257,90 @@ msgid ""
 "configure the driver."
 msgstr ""
 "DrakXはたずお䜿いのコンピュヌタのIDEデバむスを怜出したす。PCI/SCSIカヌドも\n"
-"䜵せお怜出したす。SCSIカヌドが芋぀かれば、DrakXはそれに適したドラむバを\n"
+"同時に怜出したす。SCSIカヌドが芋぀かれば、DrakXはそれに適したドラむバを\n"
 "自動的にむンストヌルしたす。\n"
 "\n"
-"ハヌドりェアの怜出はい぀も正しいずは限りたせん。DrakXはハヌドドラむブの\n"
-"怜出に倱敗するこずがありたす。そのような堎合はお䜿いのハヌドりェアを\n"
-"手動で指定する必芁がありたす。\n"
-"\n"
-"If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
-"want to configure options for it. You should allow DrakX to probe the\n"
-"hardware for the card-specific options which are needed to initialize the\n"
-"adapter. Most of the time, DrakX will get through this step without any\n"
-"issues.\n"
-"\n"
-"If DrakX is not able to probe for the options to automatically determine\n"
-"which parameters need to be passed to the hardware, you'll need to manually\n"
-"configure the driver."
-
-#: help.pm:847
-#, fuzzy, c-format
-msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\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 the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\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"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with 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"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-"Yabootに他のOS/別のカヌネル/非垞甚起動むメヌゞ の項目を远加するこずが\n"
-"できたす。\n"
-"\n"
-"他のOSの堎合、項目はラベルずrootパヌティションだけです。\n"
-"\n"
-"Linuxの堎合はオプションがいく぀かありたす:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
+"ハヌドりェアの怜出はい぀も成功するずは限りたせん。DrakXはハヌドドラむブの\n"
+"怜出に倱敗するこずがありたす。そのような堎合はお䜿いのハヌドりェアを手動で\n"
+"指定する必芁がありたす。\n"
 "\n"
-"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
+"PCI/SCSIアダプタを手動で指定する時には、DrakXがそれ専甚のオプションを蚭定\n"
+"するかどうか質問しおきたす。DrakXにハヌドりェアを探査させお、アダプタを\n"
+"初期化するために必芁なそのカヌド専甚のオプションを怜知させおください。\n"
+"たいおいの堎合、うたくいきたす。\n"
 "\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"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with 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"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-
-#: help.pm:894
-#, fuzzy, c-format
-msgid ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Take care to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\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"
-"\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 increments\n"
-"before your 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"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open 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."
-msgstr ""
-"YabootはNewWorld Macintosh甚のブヌトロヌダです。Linux/MacOS/MacOSXの\n"
-"起動に䜿いたす。倚くの堎合MacOSずMacOSXは正しく怜出され\n"
-"ブヌトロヌダメニュヌにむンストヌルされたす。うたく行かない堎合は\n"
-"ここで手動で項目を远加しおください。正しいパラメヌタを遞ぶよう\n"
-"泚意しおください。\n"
-"\n"
-"Yabootの䞻なオプションは以䞋の通りです:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\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"
-"\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 increments\n"
-"before your 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"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open 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."
+"DrakXがオプションを怜知できず、ハヌドりェアにどのパラメヌタヌを送ればよい\n"
+"のかを自動的に刀断できなかった堎合は、手動でドラむバを蚭定しなければなり\n"
+"たせん。"
 
-#: help.pm:926
+#: help.pm:786
 #, c-format
 msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
-"%s: お䜿いのシステムのサりンドカヌドを怜出するず、ここに衚瀺したす。\n"
-"衚瀺しおいるサりンドカヌドがお䜿いのシステムのものでない\n"
-"堎合は、ボタンをクリックしお別のドラむバを遞んでください。"
+"%s: あなたのシステムにサりンドカヌドを怜出するず、ここに衚瀺されたす。\n"
+"衚瀺されたサりンドカヌドがお䜿いのものでない堎合は、ボタンをクリックしお\n"
+"別のドラむバを遞んでください。"
 
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:954
-#: install_steps_interactive.pm:971
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1036
 #, c-format
 msgid "Sound card"
 msgstr "サりンドカヌド"
 
-#: help.pm:932
-#, fuzzy, c-format
+#: help.pm:791
+#, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -5418,126 +5350,128 @@ msgid ""
 "the corresponding section of the ``Starter Guide'' for details about\n"
 "firewall settings.\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
-"DrakXはお䜿いのシステムの情報を提䟛したす。ご䜿甚のハヌドりェアの構成にも\n"
-"よりたすが、䞋蚘の䞀郚もしくは党おに぀いお情報を埗るこずができたす。\n"
-"それぞれの項目には簡単な説明が衚瀺され、アむテム別に蚭定を行うこずが\n"
-"できたす。蚭定を倉曎するには %s ボタンをクリックしおください。\n"
+"DrakXはあなたのシステムから収集した情報を衚瀺したす。ご䜿甚のハヌドりェアの\n"
+"構成にもよりたすが、䞋蚘の䞀郚もしくは党おに぀いお確認するこずができたす。\n"
+"それぞれの項目には怜出したハヌドりェアず珟圚の蚭定内容が衚瀺されたす。\n"
+"蚭定を倉曎するには %s をクリックしおください。\n"
 "\n"
-" * \"%s\": check the current keyboard map configuration and change that if\n"
-"necessary.\n"
+" * %s: 䜿甚䞭のキヌボヌドの蚭定を確認/倉曎できたす。\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list.\n"
+" * %s: 珟圚遞択されおいる囜を確認できたす。倉曎するには\n"
+"%s をクリックしお他の囜を遞んでください。あなたの囜がリストにない時は\n"
+"%s を抌しおください。そうするず、すべおの囜名が衚瀺されたす。\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
-"you have chosen. You can click on the \"%s\" button here if this is not\n"
-"correct.\n"
+" * %s: DrakXは遞択された囜に基づいおタむムゟヌンを掚定\n"
+"したす。誀っおいる堎合は %s をクリックしおください。\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * %s: 珟圚のマりスの蚭定を確認できたす。倉曎する必芁が\n"
+"ある時はボタンを抌しおください。\n"
 "\n"
-" * \"%s\": clicking on the \"%s\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+" * %s: %s を抌すずプリンタ蚭定りィザヌドが\n"
+"開きたす。新しいプリンタの远加方法に぀いおは Starter Guide の該圓する章を\n"
+"参照しおください。マニュアルに衚瀺されおいるむンタヌフェヌスは、\n"
+"むンストヌル䞭に䜿甚したものずほが同じです。\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * %s: サりンドカヌドが怜出されるず、ここに衚瀺\n"
+"されたす。衚瀺されたものがお䜿いのものず異なる堎合は、ボタンをクリックしお\n"
+"別のドラむバを遞んでください。\n"
 "\n"
-" * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
-"\"%s\" to reconfigure your graphical interface.\n"
+" * %s: テレビカヌドをお䜿いであれば、ここに\n"
+"蚭定情報が衚瀺されたす。お持ちのカヌドが自動怜出されなかった堎合は\n"
+" %s をクリックしお手動で蚭定を詊みおください。\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
+" * %s: 正しく蚭定されおいない時は %s を抌しお正しい\n"
+"パラメヌタヌに倉曎しおください。\n"
 "\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * %s: DrakXはグラフィカルむンタヌフェヌスの解像床を\n"
+"\"800x600\"か\"1024x768\"に蚭定したす。デフォルトの蚭定が適圓でない堎合は\n"
+"%s をクリックしお蚭定し盎しおください。\n"
 "\n"
-" * \"%s\": If you want to configure your Internet or local network access\n"
-"now.\n"
+" * %s: むンタヌネットずロヌカルネットワヌクの蚭定。\n"
+"マニュアルを参照するか、もしくはむンストヌル完了埌にMandrakelinux\n"
+"コントロヌルセンタヌのヘルプにしたがっお行なっおください。\n"
 "\n"
-" * \"%s\": this entry allows you to redefine the security level as set in a\n"
-"previous step ().\n"
+" * %s: あなたのマシンがプロキシサヌバの背埌にあれば\n"
+"ここでHTTP/FTPプロキシアドレスを蚭定できたす。\n"
 "\n"
-" * \"%s\": if you plan to connect your machine to the Internet, it's a good\n"
-"idea to protect yourself from intrusions by setting up a firewall. Consult\n"
-"the corresponding section of the ``Starter Guide'' for details about\n"
-"firewall settings.\n"
+" * %s: 前のステップで蚭定したセキュリティレベルを\n"
+"蚭定し盎すこずができたす。\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * %s: むンタヌネットに接続されるのであれば、䟵入などの\n"
+"危険からあなたのマシンを守るためにファむアりォヌルをセットアップしおくださ"
+"い。\n"
+"詳しい蚭定方法に぀いおは、Starter Guide の該圓する章を参照しおください。\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
-"on your machine. If you plan to use this machine as a server it's a good\n"
-"idea to review this setup."
-
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "キヌボヌド"
+" * %s: ブヌトロヌダの蚭定を倉曎する時はこのボタンを\n"
+"抌しおください。(泚意:これは䞊玚者向きです) 印刷されたドキュメント、あるい"
+"は\n"
+"Mandrakelinuxコントロヌルセンタヌのブヌトロヌダに関するヘルプを参照しおくだ\n"
+"さい。\n"
+"\n"
+" * %s: ここではどのサヌビスを有効にするかを现かく蚭定できたす。\n"
+"サヌバになるマシンであれば蚭定を芋盎すのがよいでしょう。"
 
-#: help.pm:991 install_steps_interactive.pm:913 standalone/drakclock:75
+#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
 #, c-format
 msgid "Timezone"
 msgstr "タむムゟヌン"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "グラフィカルむンタフェヌス"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "テレビカヌド"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "ISDNカヌド"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "グラフィカルむンタフェヌス"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "ネットワヌク"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "プロクシ"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "セキュリティレベル"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "ファむアりォヌル"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "ブヌトロヌダ"
 
-#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
 #, c-format
 msgid "Services"
 msgstr "サヌビス"
 
-#: help.pm:994
-#, fuzzy, c-format
+#: help.pm:858
+#, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
 "Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
@@ -5547,8 +5481,8 @@ msgstr ""
 "遞んでください。泚意: このパヌティションのデヌタは党お消えお\n"
 "回埩できなくなりたす。"
 
-#: help.pm:999
-#, fuzzy, c-format
+#: help.pm:863
+#, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
@@ -5565,7 +5499,17 @@ msgstr ""
 "この操䜜を䞭止する堎合は %s をクリックしおください。そうすれば\n"
 "デヌタずパヌティションは消去されたせん。"
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "次ぞ ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- 戻る"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5576,12 +5520,84 @@ msgstr ""
 "ん)。おそらく起動甚フロッピヌがむンストヌルメディアに察応しおいたせん(新しい"
 "起動フロッピヌを䜜成しおください)。"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "%s もフォヌマットしおください"
 
-#: install_any.pm:402
+#: install_any.pm:390
+#, c-format
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+"次のむンストヌルメディアを怜出したした\n"
+"䜿甚しないものがあればここで陀倖しおください"
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "他に補助的なメディアがありたすか?"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:414
+#, c-format
+msgid ""
+"The following media have been found and will be used during install: %s.\n"
+"\n"
+"\n"
+"Do you have a supplementary installation media to configure?"
+msgstr ""
+"次のメディアが怜出されたした: %s \n"
+"\n"
+"\n"
+"他に蚭定する補助的なメディアはありたすか?"
+
+#: install_any.pm:420 printer/printerdrake.pm:2652
+#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
+#: standalone/scannerdrake:184 standalone/scannerdrake:235
+#: standalone/scannerdrake:242
+#, c-format
+msgid "CD-ROM"
+msgstr "CD-ROM"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (http)"
+msgstr "ネットワヌク (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "ネットワヌク (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "デバむスがありたせん"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "CDを挿入"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "再床 CD 1 を入れおください"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr "ミラヌのURL"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "このミラヌにはhdlistファむルがありたせん"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:713
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5604,7 +5620,8 @@ msgstr ""
 "\n"
 "本圓にこれらのサヌバをむンストヌルしたすか\n"
 
-#: install_any.pm:423
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:736
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5617,17 +5634,17 @@ msgstr ""
 "\n"
 "本圓にこれらを削陀したすか?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "FAT圢匏のフロッピヌをドラむブ %s に挿入"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "このフロッピヌはFAT圢匏ではありたせん"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5636,12 +5653,17 @@ msgstr ""
 "保存したパッケヌゞ遞択を䜿うには、むンストヌルの起動時に'linux "
 "defcfg=floppy'ず指定したす。"
 
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
 #, c-format
 msgid "Error reading file %s"
 msgstr "ファむル %s を読み蟌み䞭に゚ラヌ"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (was %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5650,12 +5672,12 @@ msgstr ""
 "゚ラヌ発生 - 新しいファむルシステムを構築できるようなデバむスが\n"
 "ありたせん。ハヌドりェアを確認しおください"
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "システムのむンストヌル"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "システムを蚭定"
@@ -5691,7 +5713,7 @@ msgstr ""
 "\n"
 "それでも続けたすか"
 
-#: install_interactive.pm:70 install_steps.pm:207
+#: install_interactive.pm:70 install_steps.pm:211
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "/boot/efi でマりントしたFATパヌティションが必芁です"
@@ -5751,7 +5773,7 @@ msgstr "どのパヌティションをリサむズしたすか"
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 "FATのサむズ倉曎ツヌルがパヌティションを操䜜できたせん。\n"
 "以䞋の゚ラヌが発生: %s"
@@ -5772,7 +5794,8 @@ msgstr ""
 "デフラグを実行しおください。その埌再起動しおMandrakelinuxをむンストヌル\n"
 "しおください。"
 
-#: install_interactive.pm:164
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_interactive.pm:166
 #, c-format
 msgid ""
 "WARNING!\n"
@@ -5796,52 +5819,52 @@ msgstr ""
 "バックアップも忘れずに。\n"
 "よろしければOKを抌しおください。"
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "Windows甚に残しおおくサむズを指定しおください"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "パヌティション %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Windowsパヌティションのリサむズ"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FATのリサむズに倱敗: %s"
 
-#: install_interactive.pm:206
+#: install_interactive.pm:208
 #, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr "リサむズするFATパヌティションがありたせん(たたは十分なスペヌスがない)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Windows(TM)を削陀"
 
-#: install_interactive.pm:213
+#: install_interactive.pm:215
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "耇数のハヌドドラむブがありたす。どれにlinuxをむンストヌルしたすか"
 
-#: install_interactive.pm:217
+#: install_interactive.pm:219
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "ドラむブ %s の党おのパヌティションずデヌタが倱われたす"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "fdiskを䜿う"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -5850,33 +5873,34 @@ msgstr ""
 "%s のパヌティション蚭定ができたす。\n"
 "完了埌は'w'を䜿っお保存しおください。"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "むンストヌル甚の空きがありたせん"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "以䞋の解決法がありたす:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "パヌティション蚭定に倱敗: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "ネットワヌクを立ちあげる"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "ネットワヌクを切断する"
 
-#: install_messages.pm:9
-#, fuzzy, c-format
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
+#, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -5893,7 +5917,7 @@ msgid ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
+"Mandrakesoft S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5915,7 +5939,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5923,14 +5947,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
-"occurence of such \n"
+"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5960,10 +5984,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"to Mandrakesoft.\n"
+"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5974,11 +5998,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
 "\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A.  \n"
+"Mandrakesoft S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5994,127 +6018,10 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
-"Introduction\n"
-"\n"
-"The operating system and the different components available in the Mandrake "
-"Linux distribution \n"
-"shall be called the \"Software Products\" hereafter. The Software Products "
-"include, but are not \n"
-"restricted to, the set of programs, methods, rules and documentation related "
-"to the operating \n"
-"system and the different components of the Mandrakelinux distribution.\n"
-"\n"
-"\n"
-"1. License Agreement\n"
-"\n"
-"Please read this document carefully. This document is a license agreement "
-"between you and  \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
-"accept and fully agree to conform to the terms and conditions of this "
-"License. \n"
-"If you disagree with any portion of the License, you are not allowed to "
-"install, duplicate or use \n"
-"the Software Products. \n"
-"Any attempt to install, duplicate or use the Software Products in a manner "
-"which does not comply \n"
-"with the terms and conditions of this License is void and will terminate "
-"your rights under this \n"
-"License. Upon termination of the License,  you must immediately destroy all "
-"copies of the \n"
-"Software Products.\n"
-"\n"
-"\n"
-"2. Limited Warranty\n"
-"\n"
-"The Software Products and attached documentation are provided \"as is\", "
-"with no warranty, to the \n"
-"extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
-"law, be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
-"occurence of such \n"
-"damages.\n"
-"\n"
-"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
-"COUNTRIES\n"
-"\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
-"in no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
-"This limited liability applies to, but is not restricted to, the strong "
-"cryptography components \n"
-"included in the Software Products.\n"
-"\n"
-"\n"
-"3. The GPL License and Related Licenses\n"
-"\n"
-"The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
-"Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
-"documentation for \n"
-"further details.\n"
-"\n"
-"\n"
-"4. Intellectual Property Rights\n"
-"\n"
-"All rights to the components of the Software Products belong to their "
-"respective authors and are \n"
-"protected by intellectual property and copyright laws applicable to software "
-"programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
-"Products, as a whole or in \n"
-"parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A.  \n"
-"\n"
-"\n"
-"5. Governing Laws \n"
-"\n"
-"If any portion of this agreement is held void, illegal or inapplicable by a "
-"court judgment, this \n"
-"portion is excluded from this contract. You remain bound by the other "
-"applicable sections of the \n"
-"agreement.\n"
-"The terms and conditions of this License are governed by the Laws of "
-"France.\n"
-"All disputes on the terms of this license will preferably be settled out of "
-"court. As a last \n"
-"resort, the dispute will be referred to the appropriate Courts of Law of "
-"Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
 
-#: install_messages.pm:89
+#: install_messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -6126,7 +6033,8 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#: install_messages.pm:96
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:98
 #, c-format
 msgid ""
 "\n"
@@ -6187,8 +6095,8 @@ msgstr ""
 "respective authors and are protected by intellectual property and \n"
 "copyright laws applicable to software programs.\n"
 
-#: install_messages.pm:128
-#, fuzzy, c-format
+#: install_messages.pm:131
+#, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -6205,42 +6113,45 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Mandrakelinux User's Guide."
 msgstr ""
-"おめでずうございたす。むンストヌルが終わりたした。\n"
+"おめでずうございたす。むンストヌルが完了したした。\n"
 "起動甚メディアを抜き、Enterを抌しお再起動しおください。\n"
 "\n"
 "\n"
-"Mandrakelinuxの修正情報(Errata)は以䞋にありたす。\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
+"consult the Errata available from:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"システムの蚭定に぀いおは公匏Mandrakelinuxナヌザガむドの\n"
-"'むンストヌル埌'の章をご芧ください。"
+"Information on configuring your system is available in the post\n"
+"install chapter of the Official Mandrakelinux User's Guide."
 
-#: install_messages.pm:141
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/100errata.php3"
-msgstr "http://www.mandrakelinux.com/en/100errata.php3"
+msgid "http://www.mandrakelinux.com/en/101errata.php3"
+msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 
-#: install_steps.pm:242
+#: install_steps.pm:246
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "マりントポむント %s は重耇しおいたす"
 
-#: install_steps.pm:407
+#: install_steps.pm:477
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
 "重芁なパッケヌゞがむンストヌルされたせんでした。\n"
 "CD-ROMドラむブかCD-ROMに問題がありたす。\n"
-"rpm -qpl Mandrake/RPMS/*.rpm でCD-ROMをチェックしおください。\n"
+"rpm -qpl media/main/*.rpm でCD-ROMをチェックしおください。\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "利甚可胜なフロッピヌドラむブがありたせん"
@@ -6250,7 +6161,7 @@ msgstr "利甚可胜なフロッピヌドラむブがありたせん"
 msgid "Entering step `%s'\n"
 msgstr "%s を開始\n"
 
-#: install_steps_gtk.pm:178
+#: install_steps_gtk.pm:184
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -6264,95 +6175,95 @@ msgstr ""
 "この堎合はCD-ROMを起動したずきにF1を抌し、続いお'text'ず入力しお\n"
 "ください。"
 
-#: install_steps_gtk.pm:232 install_steps_interactive.pm:580
+#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
 #, c-format
 msgid "Package Group Selection"
 msgstr "パッケヌゞグルヌプを遞択"
 
 # Changed "total size" to "total", due to problem of available
 # space on screen.
-#: install_steps_gtk.pm:294 install_steps_interactive.pm:519
+#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "合蚈: %d/%d MB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "䞍正なパッケヌゞ"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "バヌゞョン: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "サむズ: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Importance: "
 msgstr "重芁性: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "このパッケヌゞを遞択/遞択を解陀するこずはできたせん"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "%s がありたせん"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s がありたせん"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
-msgstr ""
+msgstr "%s を維持するために"
 
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:358
 #, c-format
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr "このパッケヌゞは遞択できたせん。むンストヌル甚の空き容量がありたせん"
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "以䞋のパッケヌゞがむンストヌルされたす"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "以䞋のパッケヌゞが削陀されたす"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "これは必須パッケヌゞです。遞択を解陀できたせん"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "このパッケヌゞは遞択解陀できたせん。既にむンストヌルしおいたす"
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6361,218 +6272,222 @@ msgstr ""
 "このパッケヌゞはアップグレヌドが必芁です。\n"
 "本圓に遞択を解陀したすか"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "このパッケヌゞは遞択を解陀できたせん。アップグレヌドが必芁です"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自動的に遞択したパッケヌゞを衚瀺"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "フロッピヌに保存/ロヌドする"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "パッケヌゞの遞択を曎新"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "最小むンストヌル"
 
-#: install_steps_gtk.pm:455 install_steps_interactive.pm:427
+#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "むンストヌルするパッケヌゞを遞んでください"
 
-#: install_steps_gtk.pm:471 install_steps_interactive.pm:666
+#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
 #, c-format
 msgid "Installing"
 msgstr "むンストヌル䞭"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "詳现なし"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "詊算しおいたす"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "残り時間 "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "お埅ちください。むンストヌルの準備䞭です。"
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "詳现なし"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d 個のパッケヌゞ"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "パッケヌゞ %s をむンストヌル"
 
-#: install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690
+#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745
 #, c-format
 msgid "Refuse"
 msgstr "拒吊する"
 
-#: install_steps_gtk.pm:599 install_steps_interactive.pm:691
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
 #, 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"
+"\"%s\" ずいうCD-ROMをドラむブにいれお'OK'を抌しおください。\n"
 "持っおいない堎合は'キャンセル'を抌しおください。"
 
-#: install_steps_gtk.pm:614 install_steps_interactive.pm:703
+#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "パッケヌゞを䞊べかえ䞭に゚ラヌが発生:"
 
-#: install_steps_gtk.pm:614 install_steps_gtk.pm:618
-#: install_steps_interactive.pm:703 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
+#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
 #, c-format
 msgid "Go on anyway?"
 msgstr "続けたすか"
 
-#: install_steps_gtk.pm:618 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "パッケヌゞをむンストヌル䞭に゚ラヌが発生:"
 
-#: install_steps_gtk.pm:658 install_steps_interactive.pm:869
-#: install_steps_interactive.pm:1021
+#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "not configured"
 msgstr "蚭定しおいたせん"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "システムを埩旧したすか"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "ラむセンスぞの同意"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "リリヌスノヌト"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "キヌボヌドの配列を遞んでください"
 
-#: install_steps_interactive.pm:113
-#, fuzzy, c-format
+#: install_steps_interactive.pm:123
+#, c-format
 msgid "Here is the full list of available keyboards"
-msgstr "利甚可胜な囜名の党リスト"
+msgstr "利甚可胜なキヌボヌドの党リスト"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "むンストヌル/曎新"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "むンストヌルか曎新を遞んでください"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s を曎新"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s の暗号キヌ"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "マりスの皮類を遞んでください。"
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "マりスのポヌト"
 
-#: install_steps_interactive.pm:187 standalone/mousedrake:47
+#: install_steps_interactive.pm:197 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "マりスを接続しおいるシリアルポヌトを遞んでください。"
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "ボタンの゚ミュレヌション"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "第ボタンの゚ミュレヌション"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "第ボタンの゚ミュレヌション"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIAカヌドを蚭定䞭.."
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDEを蚭定"
 
-#: install_steps_interactive.pm:248 network/tools.pm:155
+#: install_steps_interactive.pm:258 network/tools.pm:187
 #, c-format
 msgid "No partition available"
 msgstr "利甚可胜なパヌティションがありたせん"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "パヌティションをスキャンしおマりントポむントを探しおいたす"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "マりントポむントを遞択"
 
-#: install_steps_interactive.pm:288
+#: install_steps_interactive.pm:300
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -6582,17 +6497,17 @@ msgstr ""
 "システムを起動するにはDiskDrakeでブヌトストラップパヌティションを\n"
 "䜜成しおください"
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "フォヌマットするパヌティションを遞んでください"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "䞍正なブロックをチェックしたすか"
 
-#: install_steps_interactive.pm:359
+#: install_steps_interactive.pm:371
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -6601,39 +6516,50 @@ msgstr ""
 "ファむルシステム %s のチェックに倱敗したした。゚ラヌを修埩したすか\n"
 "(泚意:デヌタを倱うかもしれたせん)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "むンストヌルするにはSwap領域が足りたせん。远加しおください。"
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "利甚可胜なパッケヌゞを探しおRPMデヌタベヌスを再構築しおいたす.."
 
-#: install_steps_interactive.pm:370 install_steps_interactive.pm:389
+#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
 #, c-format
 msgid "Looking for available packages..."
 msgstr "利甚可胜なパッケヌゞを探しおいたす"
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "むンストヌル枈みパッケヌゞを探しおいたす"
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "曎新するパッケヌゞを探しおいたす"
 
-#: install_steps_interactive.pm:398
+#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "Mandrakelinuxのサむトに接続しおミラヌのリストを取埗しおいたす"
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "パッケヌゞを取埗するミラヌを遞択"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "むンストヌル/アップグレヌドする空き容量が足りたせん。(%d > %d)"
 
-#: install_steps_interactive.pm:439
+#: install_steps_interactive.pm:493
 #, c-format
 msgid ""
 "Please choose load or save package selection on floppy.\n"
@@ -6642,42 +6568,42 @@ msgstr ""
 "フロッピヌにパッケヌゞの遞択を保存するかロヌドするかを遞んでください。\n"
 "むンストヌル自動化フロッピヌず同じ圢匏です。"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "フロッピヌからロヌド"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "フロッピヌに保存"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "パッケヌゞを遞択"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "フロッピヌからロヌド"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "パッケヌゞの遞択を保存したフロッピヌを入れおください"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "遞んだサむズが空き容量を超えおいたす"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "むンストヌルの皮類"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -6686,22 +6612,22 @@ msgstr ""
 "パッケヌゞグルヌプを遞んでいたせん。\n"
 "むンストヌルする最䜎限のものを遞んでください:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "基本的なドキュメントを入れる(おすすめ)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "最小限のむンストヌル(urpmiすらありたせん)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "党お"
 
-#: install_steps_interactive.pm:641
+#: install_steps_interactive.pm:694
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -6712,17 +6638,17 @@ msgstr ""
 "どれも持っおいない堎合はキャンセルをクリック。\n"
 "持っおいないものがある堎合はそれらを解陀しおOKをクリックしおください。"
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "%s ずいうCD-ROM"
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "むンストヌルの準備"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6731,17 +6657,17 @@ msgstr ""
 "パッケヌゞ %s をむンストヌル\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "むンストヌル埌の蚭定"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "曎新モゞュヌルフロッピヌをドラむブ %s に入れおください"
 
-#: install_steps_interactive.pm:748
+#: install_steps_interactive.pm:813
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -6751,7 +6677,7 @@ msgid ""
 "To download these packages, you will need to have a working Internet \n"
 "connection.\n"
 "\n"
-"Do you want to install the updates ?"
+"Do you want to install the updates?"
 msgstr ""
 "曎新されたパッケヌゞをダりンロヌドするこずができたす。これらのパッケヌゞは\n"
 "ディストリビュヌション公開埌に曎新されたものです。セキュリティやバグの\n"
@@ -6761,180 +6687,166 @@ msgstr ""
 "\n"
 "曎新されたパッケヌゞをむンストヌルしたすか"
 
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Mandrakelinuxのサむトに接続しおミラヌのリストを取埗しおいたす"
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "パッケヌゞを取埗するミラヌを遞択"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "ミラヌに接続しお利甚可胜なパッケヌゞのリストを取埗しおいたす"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "ミラヌ %s に接続できたせん"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "もう䞀床詊したすか"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "タむムゟヌンを遞んでください。"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自動的に時間を合わせる(NTPを䜿甚)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "NTPサヌバ"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "芁玄"
 
-#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
-#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
-#: install_steps_interactive.pm:1068 services.pm:135
-#: standalone/drakbackup:1572
+#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
+#: install_steps_interactive.pm:1136 services.pm:135
+#: standalone/drakbackup:1593
 #, c-format
 msgid "System"
 msgstr "システム"
 
-#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
-#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
+#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "Hardware"
 msgstr "ハヌドりェア"
 
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
 #, c-format
 msgid "Remote CUPS server"
 msgstr "リモヌトCUPSサヌバ"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "プリンタなし"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISAサりンドカヌドをお持ちですか"
 
-#: install_steps_interactive.pm:976
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1041
+#, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
-msgstr "むンストヌル埌にsndconfigを実行しおサりンドカヌドを蚭定しおください。"
+msgstr ""
+"むンストヌル埌に alsaconf か sndconfigを実行しおサりンドカヌドを蚭定しおくだ"
+"さい。"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "サりンドカヌドがありたせん。むンストヌル埌にharddrakeを詊しおください"
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "グラフィカルむンタフェヌス"
 
-#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
 #, c-format
 msgid "Network & Internet"
 msgstr ""
 "ネットワヌクず\n"
 "むンタヌネット"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "プロクシ"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "蚭定枈み"
 
-#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "セキュリティ"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "有効化"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "無効化"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "起動"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1127
 #, c-format
 msgid "%s on %s"
 msgstr "%s on %s"
 
-#: install_steps_interactive.pm:1073 services.pm:177
+#: install_steps_interactive.pm:1141 services.pm:177
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "サヌビス: %d 個を起動(登録数は %d 個)"
 
-#: install_steps_interactive.pm:1083
+#: install_steps_interactive.pm:1151
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Xを蚭定しおいたせん。本圓によろしいですか"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "rootパスワヌドずネットワヌク認蚌を蚭定"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "rootパスワヌドを蚭定"
 
-#: install_steps_interactive.pm:1152
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "このパスワヌドは短すぎたす(最䜎でも %d 文字以䞊)"
 
-#: install_steps_interactive.pm:1157 network/netconnect.pm:575
-#: standalone/drakauth:26 standalone/drakconnect:461
+#: install_steps_interactive.pm:1222 network/netconnect.pm:596
+#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
 #, c-format
 msgid "Authentication"
 msgstr "認蚌"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "ブヌトロヌダを準備䞭.."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -6947,12 +6859,12 @@ msgstr ""
 "むンストヌルを続けたすが、マシンの起動には\n"
 "BootXもしくは他の手段が必芁です。"
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "abootを䜿いたすか"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -6961,35 +6873,7 @@ msgstr ""
 "abootをむンストヌル䞭に゚ラヌが発生。\n"
 "最初のパヌティションを砎壊しおでもむンストヌルを匷制したすか"
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "ブヌトロヌダをむンストヌル䞭"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "ブヌトロヌダのむンストヌルに倱敗したした。以䞋の゚ラヌが発生:"
-
-#: install_steps_interactive.pm:1230
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-"ブヌトロヌダを有効にするにはオヌプンファヌムりェアの起動デバむスを\n"
-"倉曎する必芁があるかもしれたせん。再起動時にブヌトロヌダのプロンプトが\n"
-"衚瀺されない堎合は、Command-Option-O-F を再起動時に抌しお\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" shut-down\n"
-"ず入力しおください。\n"
-"次回の起動時にはブヌトロヌダのプロンプトが衚瀺されるはずです。"
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -6998,22 +6882,22 @@ msgstr ""
 "このセキュリティベルでは、Windowsパヌティションのファむルぞのアクセスが管理者"
 "のみに限定されたす"
 
-#: install_steps_interactive.pm:1275 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "空のフロッピヌをドラむブ %s に入れおください"
 
-#: install_steps_interactive.pm:1280
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1327
+#, c-format
 msgid "Please insert another floppy for drivers disk"
-msgstr "䜿甚した起動甚フロッピヌをドラむブ %s に入れおください"
+msgstr "ドラむバディスクの別のフロッピヌを入れおください"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "むンストヌル自動化フロッピヌを䜜成䞭.."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7024,12 +6908,12 @@ msgstr ""
 "\n"
 "本圓に終了したすか"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "むンストヌル自動化フロッピヌを䜜成"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7049,7 +6933,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Mandrakelinuxのむンストヌル %s"
 
-#: install_steps_newt.pm:33
+#. -PO: This string must fit in a 80-char wide text screen
+#: install_steps_newt.pm:34
 #, c-format
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
@@ -7060,17 +6945,37 @@ msgstr "  <Tab>/<Alt-Tab> 項目間の移動  | <Space> 遞択 | <F12> 次の画
 msgid "Choose a file"
 msgstr "ファむルを遞択"
 
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
+#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Add"
+msgstr "远加"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "倉曎"
+
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Remove"
+msgstr "削陀"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "基本"
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
 #, c-format
 msgid "Finish"
 msgstr "完了"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "実行"
@@ -7149,572 +7054,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "再登録"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "チェコ(QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "ドむツ"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "スペむン"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "フィンランド"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "フランス"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "ノルりェヌ"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "ポヌランド"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "ロシア"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "スりェヌデン"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "むギリス匏キヌボヌド"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "アメリカ匏キヌボヌド"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "アルバニア"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "アルメニア(叀い)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "アルメニア(タむプラむタヌ)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "アルメニア(発音蚘号)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "アラビア"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "アれルバむゞャン(ラテン)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "ベルギヌ"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "ベンガル"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "アルメニア(発音蚘号)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "ブルガリア(BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "ブラゞル"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "ボスニア"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "ベラルヌシ"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "スむス(ドむツ)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "スむス(フランス)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "チェコ(QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "ドむツ(デッドキヌなし)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr "デノァナガヌリヌ"
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "デンマヌク"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak(US)"
 
-#: keyboard.pm:200
-#, fuzzy, c-format
-msgid "Dvorak (Esperanto)"
-msgstr "Dvorak(ノルりェヌ)"
-
 #: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Norwegian)"
-msgstr "Dvorak(ノルりェヌ)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
+msgstr "Dvorak (゚スペラント)"
 
 #: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Swedish)"
-msgstr "Dvorak(スりェヌデン)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
+msgstr "Dvorak(ノルりェヌ)"
 
 #: keyboard.pm:203
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
+msgstr "Dvorak(スりェヌデン)"
+
+#: keyboard.pm:205
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "゚ストニア"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "グルゞア(ロシア配列)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "グルゞア(ラテン配列)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "ギリシャ"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "ギリシャ(polytonic)"
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr "グゞャラヌト"
 
-#: keyboard.pm:212
+#: keyboard.pm:214
 #, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
 msgstr "グルムキ"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "ハンガリヌ"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "クロアチア"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Irish"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "むスラ゚ル"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "むスラ゚ル(発音蚘号)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "むラン"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "アむスランド"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "むタリア"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr "むヌクティトト"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "日本語106キヌボヌド"
 
-#: keyboard.pm:226
+#: keyboard.pm:230
 #, c-format
-msgid "Kannada"
+msgid ""
+"_: keyboard\n"
+"Kannada"
 msgstr "カンナダ"
 
-#: keyboard.pm:229
+#: keyboard.pm:233
 #, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
 msgstr "韓囜匏キヌボヌド"
 
-#: keyboard.pm:230
-#, fuzzy, c-format
-msgid "Kyrgyz keyboard"
-msgstr "むギリス匏キヌボヌド"
+#: keyboard.pm:234
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
+msgstr "Kyrgyzキヌボヌド"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "ラテンアメリカ"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "ラオス"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "リトアニア AZERTY(旧)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "リトアニア AZERTY(新)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "リトアニア(数字列QWERTY)"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "リトアニア(発音QWERTY)"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "ラトノィア"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "マレヌ半島"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "マケドニア"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "ミャンマヌ(ビルマ)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "モンゎル(cyrillic)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "マルタ(UK)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "マルタ(US)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "オランダ"
 
-#: keyboard.pm:247
+#: keyboard.pm:255
 #, c-format
-msgid "Oriya"
+msgid ""
+"_: keyboard\n"
+"Oriya"
 msgstr "オリダヌ"
 
-#: keyboard.pm:248
+#: keyboard.pm:256
 #, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
 msgstr "ポヌランド(qwerty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "ポヌランド(qwertz)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "ポルトガル"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "カナダ(ケベック)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "ルヌマニア(qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "ルヌマニア(qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "ロシア(発音蚘号)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Saami (norwegian)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "サヌミ(swedish/finnish)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "スロベニア"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "スロバキア(QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "スロバキア(QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "セルビア(cyrillic)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "シリア"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "シリア(発音蚘号)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "テルグ"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "タミヌル(ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "タミヌル(タむプラむタ)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "タむ匏キヌボヌド"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "タゞク匏キヌボヌド"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "トルコ(䌝統的Fモデル)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "トルコ(モダンQモデル)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "りクラむナ"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "アメリカ匏キヌボヌド(囜際匏)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "りズベキスタン(cyrillic)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "ベトナム(数字列)"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "ナヌゎスラビア(ラテン)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "右偎のAltキヌ"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "巊右のShiftを同時に抌す"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "CtrlずShiftを同時に抌す"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLockキヌ"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "ShiftずCapsLockを同時に抌す"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "CtrlずAltを同時に抌す"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "AltずShiftを同時に抌す"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "メニュヌキヌ"
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "巊偎のWindowsキヌ"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "右偎のWindowsキヌ"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "巊右のCtrlを同時に抌す"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "巊右のAltを同時に抌す"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "巊偎のShiftキヌ"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "右偎のShiftキヌ"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "巊偎のAltキヌ"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "巊のCtrlキヌ"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "右偎のCtrlキヌ"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7724,7 +7822,7 @@ msgstr ""
 "キヌボヌドの配列を切り替える(䟋:ラテンず非ラテン)キヌの\n"
 "組み合わせを遞んでください"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7735,1164 +7833,1188 @@ msgstr ""
 "むンストヌル時は右Ctrlキヌでキヌボヌドのレむアりトを\n"
 "切り替えおください。"
 
-#: lang.pm:153
+#. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
+#. -PO: or as "default:RTL", depending if your language is written from
+#. -PO: left to right, or from right to left; any other string is wrong.
+#: lang.pm:165
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:169
-#, c-format
-msgid "Afghanistan"
-msgstr "アフガニスタン"
-
-#: lang.pm:170
+#: lang.pm:182
 #, c-format
 msgid "Andorra"
 msgstr "アンドラ"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr "アラブ銖長囜連邊"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "アフガニスタン"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "アンチグアバヌブヌダ"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "アングィラ島"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "アルバニア"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "アルメニア"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "オランダ領アンティル諞島"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "アンゎラ"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "アンタルチカ"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "アルれンチン"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "サモア(アメリカ)"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "オヌストラリア"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "アルヌバ"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "アれルバむゞャン"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "ボスニア・ヘルツェゎビナ"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "バルバドス"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "バングラデシュ"
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr "ブルキナファ゜"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "ブルガリア"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "バヌレヌン"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "ブルンゞ"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "ベニン"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "バヌミュヌダ"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "ブルネむ・ダルサラヌム囜"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "ボリビア"
 
-#: lang.pm:197
+#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
+#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
 #, c-format
 msgid "Brazil"
 msgstr "ブラゞル"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "バハマ"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "ブヌタン"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "ブヌノェ島"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "ボツワナ"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "ベラルヌシ"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "ベリヌズ"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "カナダ"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "ココス諞島"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "コンゎ(Kinshasa)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "䞭倮アフリカ共和囜"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "コンゎ(Brazzaville)"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "スむス"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "コヌトゞボアヌル"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "クック諞島"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "チリ"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "カメルヌン"
 
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
 #, c-format
 msgid "China"
 msgstr "䞭囜"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "コロンビア"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Serbia & Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "キュヌバ"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "カヌボベルデ共和囜"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "クリスマス島"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "キプロス"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "ゞブチ"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "デンマヌク"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "ドミニカ"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "ドミニカ共和囜"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "アルゞェリア"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "゚クアドル"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "゚ストニア"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "゚ゞプト"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "西サハラ"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "゚リトリア"
 
-#: lang.pm:233 network/adsl_consts.pm:202 network/adsl_consts.pm:210
-#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
+#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
+#: network/adsl_consts.pm:551
 #, c-format
 msgid "Spain"
 msgstr "スペむン"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "゚チオピア"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "フィンランド"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
 msgstr "フィゞヌ"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "フォヌクランド諞島(Malvinas)"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "ミクロネシア"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "フェロヌ諞島"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr "ガボン"
 
-#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
-#: network/netconnect.pm:51
+#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "むギリス"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "グレナダ"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "ゞョヌゞア"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "仏領ギアナ"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "ガヌナ"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "ゞブラルタル"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "グリヌンランド"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "ガンビア"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "ギニア"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "グアドルヌプ島"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "赀道ギニア共和囜"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "サりスゞョヌゞア島ずサりスサンドむッチ島"
 
-#: lang.pm:255
+#: lang.pm:269
 #, c-format
 msgid "Guatemala"
 msgstr "グアテマラ"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
 msgstr "グアム"
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "ギニアビサり共和囜"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "ガむアナ"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
-msgstr "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
+msgstr "Hong Kong SAR (China)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "ハヌド島ずマクドナルド島"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "ホンゞュラス"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "クロアチア"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "ハむチ"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "ハンガリヌ"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "むンドネシア"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "アむルランド"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "むスラ゚ル"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "むンド"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "むンド掋むギリス領"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "むラク"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "むラン"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "アむスランド"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "ゞャマむカ"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "ペルダン"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "ケニア"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "キルギスタン"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "カンボゞア"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "キリバス共和囜"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "コモロ"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "セントキッツ島ずネビス島"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "北朝鮮"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "韓囜"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "クりェヌト"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "むギリス領ケむマン諞島 "
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "カザフスタン"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "ラオス"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "レバノン"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "セントルシア"
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr "リヒテンシュタむン"
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr "スリランカ"
 
-#: lang.pm:293
+#: lang.pm:307
 #, c-format
 msgid "Liberia"
 msgstr "リベリア"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr "レ゜ト"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "リトアニア"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "ルクセンブルグ"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "ラトノィア"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "リビア"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "モロッコ"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "モナコ"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "モルドバ"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "マダガスカル"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "マヌシャル諞島"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "マケドニア"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
 msgstr "マリ"
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr "ミャンマヌ"
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr "モンゎル"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "北マリアナ諞島"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "マルティニク島"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "モヌリタニア"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "モンセラヌト"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "マルタ"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "モヌリシャス"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "モルディブ"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "マラりむ"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "メキシコ"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "マレヌシア"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "モザンビヌク"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "ナミビア"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "ニュヌカレドニア"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "ナむゞェリア"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "ノヌフォヌク島"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "ナむゞェリア"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr "ニカラグア"
 
-#: lang.pm:327
+#: lang.pm:341
 #, c-format
 msgid "Nepal"
 msgstr "ネパヌル"
 
-#: lang.pm:328
+#: lang.pm:342
 #, c-format
 msgid "Nauru"
 msgstr "ナりル"
 
-#: lang.pm:329
+#: lang.pm:343
 #, c-format
 msgid "Niue"
 msgstr "ニり゚"
 
-#: lang.pm:330
+#: lang.pm:344
 #, c-format
 msgid "New Zealand"
 msgstr "ニュヌゞヌランド"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "オヌメン"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "パナマ"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "ペルヌ"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "フランス領ポリネシア"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "パプアニュヌギニア"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "フィリピン"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "パキスタン"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "ポヌランド"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "セントピ゚ヌルずミケロン"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "ピトケアン島"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "プ゚ルトリコ"
 
-#: lang.pm:342
+#: lang.pm:356
 #, c-format
 msgid "Palestine"
 msgstr "パレスティナ"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "ポルトガル"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "パラグアむ"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "パラオ"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "カタヌル"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "ルヌマニア"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "ロシア"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "ルワンダ"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "サりゞアラビア"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "゜ロモン諞島"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "セヌシェル"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "スヌダン"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "シンガポヌル"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "セントヘレナ"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "スロベニア"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "スバルバヌルずゞャンマむ゚ン諞島"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "スロバキア"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "シ゚ラレオネ"
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr "サンマリノ"
 
-#: lang.pm:363
+#: lang.pm:377
 #, c-format
 msgid "Senegal"
 msgstr "セネガル"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "゜マリア"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "スリナム"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "サントメプリンシペ"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "゚ルサルバドル"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "シリア"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "スワゞランド"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "タヌクス・ケヌコス諞島"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "チャド"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "南フランス領"
 
-#: lang.pm:373
+#: lang.pm:387
 #, c-format
 msgid "Togo"
 msgstr "トヌゎ"
 
-#: lang.pm:374
+#: lang.pm:388 network/adsl_consts.pm:585
 #, c-format
 msgid "Thailand"
 msgstr "ã‚¿ã‚€"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "タゞキスタン"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "トケラり諞島"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "東ティモヌル"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "トルクメニスタン"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "チュニゞア"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "トンガ"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "トルコ"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "トリニダヌドトバゎ"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "ツバル"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "台湟"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "タンザニア"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "りクラむナ"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "りガンダ"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "アメリカ蟺境諞島"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "りルグアむ"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "りズベキスタン"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "バチカン"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "セントビンセントグレナディヌン"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "ベネズ゚ラ"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "バヌゞン諞島(むギリス)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "バヌゞン諞島(アメリカ)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "ベトナム"
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr "バヌアツ"
 
-#: lang.pm:399
+#: lang.pm:413
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "ワリヌ・゚・フトゥヌナ諞島"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "サモア"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "む゚メン"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "メむペット"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbia & Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "南アフリカ"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "ザンビア"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "ゞンバブ゚"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "次のパッケヌゞをむンストヌルしなくおはなりたせん: %s"
+
+#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
+#: lang.pm:1050 standalone/scannerdrake:135
+#, c-format
+msgid ", "
+msgstr ", "
+
+#: lang.pm:1101
 #, c-format
 msgid "Welcome to %s"
 msgstr "%s ぞようこそ"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "巡回マりント %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "たず論理ボリュヌムを削陀しおください。\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "パラメヌタ"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "NONE"
@@ -8909,8 +9031,8 @@ msgstr "モゞュヌルの各パラメヌタをここで蚭定できたす。"
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s むンタフェヌスがありたす"
+msgid "Found %s interfaces"
+msgstr "%s むンタフェヌスがありたす"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -8965,12 +9087,12 @@ msgid "Module options:"
 msgstr "モゞュヌルのオプション:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:118
+#: modules/interactive.pm:119
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "どの %s ドラむバを詊したすか"
 
-#: modules/interactive.pm:127
+#: modules/interactive.pm:128
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -8991,17 +9113,17 @@ msgstr ""
 "\n"
 "受けるこずはありたせん。"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "自動怜出"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "オプションを指定"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9060,11 +9182,11 @@ msgstr "䞀般的なPS/2ホむヌルマりス"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:586 network/netconnect.pm:591
-#: network/netconnect.pm:603 network/netconnect.pm:608
-#: network/netconnect.pm:624 network/netconnect.pm:626
+#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
+#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
+#: network/netconnect.pm:624 network/netconnect.pm:629
+#: network/netconnect.pm:645 network/netconnect.pm:647
 #, c-format
 msgid "Automatic"
 msgstr "自動"
@@ -9209,50 +9331,55 @@ msgstr "ナニバヌサル"
 msgid "Any PS/2 & USB mice"
 msgstr "PS/2 & USB マりス"
 
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr "Synapticsタッチパッド"
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "なし"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "マりスなし"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "マりスをテストしおください。"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "マりスを有効にするには、"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ホむヌルを動かしおください"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "pppoeを䜿う"
+msgid "use PPPoE"
+msgstr "PPPoEを䜿う"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "pptpを䜿う"
+msgid "use PPTP"
+msgstr "PPTPを䜿う"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
+msgid "use DHCP"
 msgstr "dhcpを䜿う"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -9261,36 +9388,36 @@ msgstr " - 怜出したした"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem(pppoaを䜿甚)usb"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem (using PPPoA) USB"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem(dhcpを䜿甚)usb"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem (using DHCP) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "むンタヌネットに接続"
 
-#: network/adsl.pm:36 network/netconnect.pm:762
+#: network/adsl.pm:36 network/netconnect.pm:800
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
+"Some connections use PPTP, a few use DHCP.\n"
+"If you don't know, choose 'use PPPoE'"
 msgstr ""
-"adslに接続する䞀般的な方法はpppoeです。\n"
-"堎合によっおはpptpやdhcpを䜿うこずもありたす。\n"
+"adslに接続する䞀般的な方法はPPPoEです。\n"
+"堎合によっおはPPTPやDHCPを䜿うこずもありたす。\n"
 "わからなければ'pppoeを䜿う'を遞んでください。"
 
-#: network/adsl.pm:41 network/netconnect.pm:766
+#: network/adsl.pm:41 network/netconnect.pm:804
 #, c-format
-msgid "ADSL connection type :"
+msgid "ADSL connection type:"
 msgstr "ADSL接続の皮類 :"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Webサヌバ"
@@ -9338,12 +9465,12 @@ msgstr "CUPSサヌバ"
 #: network/drakfirewall.pm:60
 #, c-format
 msgid "Echo request (ping)"
-msgstr ""
+msgstr "゚コヌリク゚スト (ping)"
 
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -9419,106 +9546,107 @@ msgstr "党お(ファむアりォヌルなし)"
 msgid "Other ports"
 msgstr "その他のポヌト"
 
-#: network/isdn.pm:109 network/netconnect.pm:436
+#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
+#: network/netconnect.pm:567
 #, c-format
 msgid "Unlisted - edit manually"
-msgstr ""
+msgstr "リストなし - 手動で線集"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA/PCMCIA"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "I don't know"
 msgstr "䞍明"
 
-#: network/isdn.pm:152 network/netconnect.pm:385
+#: network/isdn.pm:169 network/netconnect.pm:388
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:153 network/netconnect.pm:385
+#: network/isdn.pm:170 network/netconnect.pm:388
 #, c-format
 msgid "USB"
 msgstr "USB"
 
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:591 network/netconnect.pm:608
-#: network/netconnect.pm:624
+#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/netconnect.pm:612 network/netconnect.pm:629
+#: network/netconnect.pm:645
 #, c-format
 msgid "Manual"
 msgstr "手動"
 
-#: network/netconnect.pm:88 network/netconnect.pm:465
-#: network/netconnect.pm:475
-#, fuzzy, c-format
+#: network/netconnect.pm:89 network/netconnect.pm:485
+#: network/netconnect.pm:489
+#, c-format
 msgid "Manual choice"
-msgstr "手動"
+msgstr "手動遞択"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "内蔵ISDNカヌド"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:98
 #, c-format
 msgid "Ad-hoc"
-msgstr ""
+msgstr "Ad-hoc"
 
-#: network/netconnect.pm:98
-#, fuzzy, c-format
+#: network/netconnect.pm:99
+#, c-format
 msgid "Managed"
-msgstr "蚀語を遞択"
+msgstr ""
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "マスタヌ"
 
-#: network/netconnect.pm:100
-#, fuzzy, c-format
+#: network/netconnect.pm:101
+#, c-format
 msgid "Repeater"
-msgstr "埩元"
+msgstr ""
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "次"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133
-#: standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "手動蚭定"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IPを自動蚭定 (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "IPを自動蚭定 (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "その他のプロトコル"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "ペヌロッパのプロトコル(EDSS1)"
 
-#: network/netconnect.pm:114 standalone/drakconnect:542
+#: network/netconnect.pm:115 standalone/drakconnect:540
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -9527,163 +9655,168 @@ msgstr ""
 "その他のプロトコル\n"
 "No D-Channel (leased lines)"
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB modem"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB modem"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan modem"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus modem"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "手動によるTCP/IP蚭定"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Point to Point Tunneling Protocol (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP over Ethernet (PPPoE)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr ""
+
+#: network/netconnect.pm:167
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Bridged Ethernet LLC"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Bridged Ethernet VC"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Routed IP LLC"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr "Routed IP VC"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
-msgstr "PPPOA LLC"
+msgid "PPPoA LLC"
+msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
-msgstr "PPPOA VC"
+msgid "PPPoA VC"
+msgstr "PPPoA VC"
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
 msgstr "スクリプトを䜿う認蚌"
 
-#: network/netconnect.pm:172 standalone/drakconnect:477
+#: network/netconnect.pm:177 standalone/drakconnect:474
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:173 standalone/drakconnect:477
+#: network/netconnect.pm:178 standalone/drakconnect:474
 #, c-format
 msgid "Terminal-based"
 msgstr "タヌミナルからの認蚌"
 
-#: network/netconnect.pm:174 standalone/drakconnect:477
+#: network/netconnect.pm:179 standalone/drakconnect:474
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:175 standalone/drakconnect:477
+#: network/netconnect.pm:180 standalone/drakconnect:474
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:228 standalone/drakconnect:55
+#: network/netconnect.pm:236 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "ネットワヌクずむンタヌネット"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(ポヌト %s で怜出)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected %s)"
 msgstr "(%s を怜出)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(怜出)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "モデム接続"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN接続"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL接続"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "ケヌブル接続"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "LAN接続"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "ワむダレス接続"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "蚭定する接続を遞んでください"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9696,131 +9829,130 @@ msgstr ""
 "\n"
 "\"%s\" を抌すず続けたす。"
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "接続の蚭定"
 
-#: network/netconnect.pm:279 network/netconnect.pm:789
+#: network/netconnect.pm:288 network/netconnect.pm:840
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "䞋蚘の項目を埋めるかチェックしおください"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "カヌド IRQ"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "カヌド mem(DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "カヌド IO"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "カヌド IO_0"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "カヌド IO_1"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "あなたの電話番号"
 
-#: network/netconnect.pm:292 network/netconnect.pm:792
+#: network/netconnect.pm:301 network/netconnect.pm:843
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "プロバむダの名前(䟋: provider.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "プロバむダの電話番号"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "プロバむダのDNS 1(オプション)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "プロバむダのDNS 2(オプション)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "ダむアルモヌド"
 
-#: network/netconnect.pm:297 standalone/drakconnect:434
-#: standalone/drakconnect:495
+#: network/netconnect.pm:306 standalone/drakconnect:425
+#: standalone/drakconnect:493
 #, c-format
 msgid "Connection speed"
 msgstr "接続の速床"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "接続のタむムアりト(秒)"
 
-#: network/netconnect.pm:301 network/netconnect.pm:795
-#: standalone/drakconnect:471
+#: network/netconnect.pm:310 network/netconnect.pm:846
+#: standalone/drakconnect:467
 #, c-format
 msgid "Account Login (user name)"
 msgstr "アカりントのログむン(ナヌザ名)"
 
-#: network/netconnect.pm:302 network/netconnect.pm:796
-#: standalone/drakconnect:472
+#: network/netconnect.pm:311 network/netconnect.pm:847
+#: standalone/drakconnect:468
 #, c-format
 msgid "Account Password"
 msgstr "アカりントのパスワヌド"
 
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "蚭定するネットワヌクむンタフェヌスを遞択:"
 
-#: network/netconnect.pm:334 network/netconnect.pm:375
-#: network/netconnect.pm:650 network/netconnect.pm:829 network/shorewall.pm:84
-#: standalone/drakconnect:656 standalone/drakgw:225 standalone/drakvpn:221
+#: network/netconnect.pm:330 network/netconnect.pm:378
+#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
+#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "ネットデバむス"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "倖付ISDNモデム"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
 #, c-format
-msgid "Select a device !"
+msgid "Select a device!"
 msgstr "デバむスを遞んでください"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDNの蚭定"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "お䜿いのカヌドは䜕ですか"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -9834,34 +9966,50 @@ msgstr ""
 "\n"
 "PCMCIAカヌドをお持ちの堎合はカヌドのirqずioを調べる必芁がありたす。\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "続ける"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "äž­æ­¢"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "お䜿いのISDNカヌドはどれですか"
 
-#: network/netconnect.pm:419
+#: network/netconnect.pm:425
+#, c-format
+msgid ""
+"A CAPI driver is available for this modem. This CAPI driver can offer more "
+"capabilities than the free driver (like sending faxes). Which driver do you "
+"want to use?"
+msgstr ""
+"お䜿いのモデムにはCAPIドラむバが利甚可胜です。このドラむバはフリヌのドラむバ"
+"より倚くの機胜(䟋:FAX送信)を備えおいたす。どちらのドラむバを䜿いたすか"
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "ドラむバ"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "どのプロトコルを䜿いたすか"
 
-#: network/netconnect.pm:421 standalone/drakconnect:116
-#: standalone/drakconnect:318 standalone/drakconnect:540
+#: network/netconnect.pm:441 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:538
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -9870,13 +10018,13 @@ msgstr ""
 "プロバむダを遞んでください。\n"
 "リストにない堎合はUnlistedを遞んでください。"
 
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
 #, c-format
 msgid "Provider:"
 msgstr "プロバむダ:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -9885,122 +10033,117 @@ msgstr ""
 "このモデムはサポヌトしおいたせん。\n"
 "http://www.linmodems.org をご芧ください"
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "蚭定するモデムを遞択:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "2.4以䞊のカヌネルのみをサポヌトしおいたす。"
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "モデムを接続しおいるシリアルポヌトを遞んでください。"
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "プロバむダを遞択:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr "ダむアルアップ: アカりントのオプション"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "接続名"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "電話番号"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "ログむンID"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "ダむアルアップ: IPパラメヌタ"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "IPパラメヌタ"
 
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "IPアドレス"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr "サブネットマスク"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "ダむアルアップ: DNSパラメヌタ"
 
-#: network/netconnect.pm:608
+#: network/netconnect.pm:629
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
 #, c-format
 msgid "Domain name"
 msgstr "ドメむン名"
 
-#: network/netconnect.pm:610 network/netconnect.pm:793
-#: standalone/drakconnect:947
+#: network/netconnect.pm:631 network/netconnect.pm:844
+#: standalone/drakconnect:998
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "DNSサヌバ(オプション)"
 
-#: network/netconnect.pm:611 network/netconnect.pm:794
-#: standalone/drakconnect:948
+#: network/netconnect.pm:632 network/netconnect.pm:845
+#: standalone/drakconnect:999
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "セカンドDNSサヌバ(オプション)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "IPからホスト名を蚭定"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "ゲヌトりェむ"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Gateway IPアドレス"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSLの蚭定"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "ADSLプロバむダを遞んでください"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10011,32 +10154,32 @@ msgstr ""
 "フロッピヌ/Windows経由で導入するか、スキップしお\n"
 "埌で行っおください。"
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "フロッピヌを䜿う"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Windowsのパヌティションを䜿う"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "埌で行う"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "ファヌムりェアのコピヌに倱敗。ファむル %s がありたせん"
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "ファヌムりェアのコピヌが完了"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10049,22 +10192,22 @@ msgstr ""
 "からダりンロヌドしお、\n"
 "mgmt.o を /usr/share/speedtouch にコピヌしおください。"
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "カプセル化 :"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10072,25 +10215,28 @@ msgid ""
 "\n"
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
+"ECI Hi-Focus モデムはバむナリドラむバ配垃問題のためサポヌトできたせん。\n"
+"\n"
+"http://eciadsl.flashtux.org/ からダりンロヌドできたす。"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "手動でドラむバをロヌド"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
 "è­Šå‘Š: このデバむスは既にむンタヌネット接続の蚭定を終えおいたす。\n"
-"OKを抌すずこのデバむスの蚭定を維持したす。\n"
-"以䞋の項目を倉曎するず蚭定を䞊曞きしたす。"
+"䞋の項目を倉曎するず、珟圚の蚭定が無効になりたす。\n"
+"本圓にこのデバむスを再蚭定したすか?"
 
-#: network/netconnect.pm:857 network/netconnect.pm:1228
+#: network/netconnect.pm:912 network/netconnect.pm:1340
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -10100,17 +10246,17 @@ msgstr ""
 "むンタヌネットを蚭定したした。\n"
 "\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconfホスト名の決定"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "ネットワヌクデバむス %s を蚭定 (ドラむバ %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10118,7 +10264,7 @@ msgid ""
 msgstr ""
 "以䞋のプロトコルをethernet接続で䜿いたす。䜿甚するものを぀遞んでください"
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10129,89 +10275,95 @@ msgstr ""
 "それぞれの項目にはドットで区切られた数字(䟋: 1.2.3.4)が\n"
 "IPアドレスずしお入りたす。"
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "DHCPアドレスからホスト名を割り圓おる"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCPホスト名"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: network/netconnect.pm:922 standalone/drakconnect:422
+#: network/netconnect.pm:979 standalone/drakconnect:413
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "ネットワヌクカヌドのIDを远跡(ラップトップで圹に立぀)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "起動時に開始"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "DHCPクラむアント"
 
-#: network/netconnect.pm:936 printer/printerdrake.pm:1383
-#: standalone/drakconnect:621
+#: network/netconnect.pm:995 printer/printerdrake.pm:1498
+#: standalone/drakconnect:648
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IPアドレスは 1.2.3.4 のように入力しおください"
 
-#: network/netconnect.pm:939
+#: network/netconnect.pm:999
 #, c-format
-msgid "Warning : IP address %s is usually reserved !"
+msgid "Warning: IP address %s is usually reserved!"
 msgstr "è­Šå‘Š: IPアドレス %s はたいおい保留されおいたす"
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr "%s は䜿甚䞭です\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "このカヌドのワむダレスパラメヌタを入力しおください:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr "操䜜モヌド"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "ネットワヌク名 (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "ネットワヌク ID"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "ビットレヌト(b/s)"
 
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10220,7 +10372,7 @@ msgstr ""
 "単䜍は k, M, G で入力しおください(2.46 GHzの堎合は 2.46G)。\n"
 "もしくは0(れロ)で桁を増やしおください。"
 
-#: network/netconnect.pm:988
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10229,12 +10381,12 @@ msgstr ""
 "単䜍は k, M, G で入力しおください(䟋: 11M)。\n"
 "もしくは0(れロ)で桁を増やしおください。"
 
-#: network/netconnect.pm:1001 standalone/drakconnect:405
+#: network/netconnect.pm:1062 standalone/drakconnect:396
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1063
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10248,33 +10400,33 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
-#, fuzzy, c-format
+#: network/netconnect.pm:1070 standalone/drakconnect:397
+#, c-format
 msgid "Fragmentation"
-msgstr "ゲヌムステヌション"
+msgstr ""
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1011
+#: network/netconnect.pm:1072
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
 "as the hostname).\n"
 "\n"
-"See iwpconfig(8) man page for further information."
+"See iwconfig(8) man page for further information."
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1018 standalone/drakconnect:408
+#: network/netconnect.pm:1079 standalone/drakconnect:399
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1019
+#: network/netconnect.pm:1080
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10286,12 +10438,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10309,27 +10461,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1055
-#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"システムにむヌサネットアダプタがありたせん。この皮類の\n"
-"接続を蚭定するこずができたせん。"
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "ネットワヌクむンタフェヌスを遞択"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr "むンタヌネット接続に䜿うネットワヌクアダプタを遞んでください"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10339,86 +10471,92 @@ msgid ""
 msgstr ""
 "ホスト名を入力しおください。\n"
 "ホスト名は“mybox.mylab.myco.com”のようにしおください。\n"
-"ゲヌトりェむのIPアドレスがあれば、それも入力しおください。"
+"ゲヌトりェむのIPアドレスも入力できたす。"
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr ""
+msgstr "たたDNSサヌバのIPアドレスも入力できたす。"
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "ホスト名 (オプション)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "ホスト名:"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "DNSサヌバ 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "DNSサヌバ 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "DNSサヌバ 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr "怜玢ドメむン"
 
-#: network/netconnect.pm:1093
+#: network/netconnect.pm:1175
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "ゲヌトりェむ(䟋 %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "ゲヌトりェむデバむス"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNSサヌバのアドレスは 1.2.3.4 のように入力しおください"
 
-#: network/netconnect.pm:1110 standalone/drakconnect:624
+#: network/netconnect.pm:1192 standalone/drakconnect:651
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Gatewayアドレスは 1.2.3.4 のように入力"
 
-#: network/netconnect.pm:1121
+#: network/netconnect.pm:1203
 #, c-format
 msgid ""
-"Enter a Zeroconf host name which will be the one that your machine will get "
-"back to other machines on the network:"
+"If desired, enter a Zeroconf hostname.\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
 msgstr ""
+"必芁ならZeroconfホスト名を入力しおください。\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconfホスト名"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconfホスト名は以䞋を含んではいけたせん:"
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10429,35 +10567,55 @@ msgstr ""
 "どれを䜿うか遞んでください。\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "むンタヌネット接続"
 
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1230
 #, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
+msgid "Configuration is complete, do you want to apply settings?"
 msgstr "蚭定が完了したした。適甚したすか"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "起動時に接続を開始したすか"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "起動時に自動的に開始"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr "システムトレむのNetアプレットを䜿う"
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr "手動 (the interface would still be activated at boot)"
+
+#: network/netconnect.pm:1271
+#, c-format
+msgid "How do you want to dial this connection?"
+msgstr "この接続にどのようにダむアルしたすか"
+
+#: network/netconnect.pm:1284
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "ネットワヌクの再起動が必芁です。再起動したすか"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "ネットワヌクを蚭定"
 
-#: network/netconnect.pm:1180
+#: network/netconnect.pm:1292
 #, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
+"A problem occurred while restarting the network: \n"
 "\n"
 "%s"
 msgstr ""
@@ -10465,27 +10623,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1188
+#: network/netconnect.pm:1300
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "今むンタヌネットに接続したすか"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "接続をテストしおいたす.."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "システムはむンタヌネットに接続したした。"
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "セキュリティ䞊の理由で、接続を切りたす。"
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10494,19 +10652,19 @@ msgstr ""
 "このシステムはむンタヌネットに぀ながっおいないようです。\n"
 "接続を再蚭定しおください。"
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
 msgstr ""
 "蚭定が完了したらXりィンドりを再起動しお、\n"
-"ホスト名に関する問題を回避しおください。"
+"ホスト名に問題が起こらないようにしおください。"
 
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1344
 #, c-format
 msgid ""
-"Problems occured during configuration.\n"
+"Problems occurred 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 ""
@@ -10514,7 +10672,7 @@ msgstr ""
 "net_monitor か mccで接続を調べおください。接続できおいない堎合は\n"
 "再蚭定しおください。"
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10526,7 +10684,7 @@ msgstr ""
 "いたの蚭定をそのたた䜿うには OK をクリックしおください。ネットワヌク/\n"
 "むンタヌネットを再蚭定するにはキャンセルを抌したす。\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10535,27 +10693,27 @@ msgstr ""
 "予期せぬ゚ラヌが発生したした:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "プロクシを蚭定"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTPプロクシ"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTPプロクシ"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "プロクシは http://.. で始たりたす"
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLは ftp: か http: で始たりたす"
@@ -10574,7 +10732,7 @@ msgstr ""
 "è­Šå‘Š: 既存のファむアりォヌルの蚭定を怜出したした。\n"
 "むンストヌル埌に手動で修正する必芁があるかもしれたせん。"
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -10591,12 +10749,12 @@ msgstr ""
 "\t\teth0, eth1(ケヌブル接続の堎合)\n"
 "\t\tippp+(ISDN接続の堎合)\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "フロッピヌを挿入"
 
-#: network/tools.pm:166
+#: network/tools.pm:198
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -10605,22 +10763,22 @@ msgstr ""
 "FAT圢匏のフロッピヌをドラむブ %s に挿入(with %s in root directory)\n"
 "しお、%s を抌す"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "フロッピヌアクセス゚ラヌ。デバむス %s をマりントできたせん"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "マりントに倱敗: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "このプラットフォヌムでは拡匵パヌティションをサポヌトしおいたせん"
 
-#: partition_table.pm:768
+#: partition_table.pm:516
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -10631,22 +10789,22 @@ msgstr ""
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions."
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "ファむル %s からの埩元は倱敗したした: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "䞍正なバックアップファむル"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "ファむル %s に曞き蟌み䞭に゚ラヌ"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10658,27 +10816,27 @@ msgstr ""
 "デヌタの敎合性チェックが倱敗したした。\n"
 "ディスクに䜕を曞き蟌んでも異垞終了するでしょう。"
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "必須"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "重芁"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "優秀"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "秀"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "可"
@@ -10693,7 +10851,7 @@ msgstr "(%s で)"
 msgid "(on this machine)"
 msgstr "(このマシンで)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "蚭定枈み(他のマシン)"
@@ -10703,298 +10861,308 @@ msgstr "蚭定枈み(他のマシン)"
 msgid "On CUPS server \"%s\""
 msgstr "CUPSサヌバ %s で"
 
-#: printer/cups.pm:117 printer/printerdrake.pm:3989
-#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
-#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
+#: printer/cups.pm:117 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
+#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
 #, c-format
 msgid " (Default)"
 msgstr " (デフォルト)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue(キュヌなしで印刷)"
 
-#: printer/data.pm:23
+#: printer/data.pm:41
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:34
+#: printer/data.pm:53
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - ラむンプリンタデヌモン"
 
-#: printer/data.pm:35
+#: printer/data.pm:54
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:56
+#: printer/data.pm:76
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR New Generation"
 
-#: printer/data.pm:57
+#: printer/data.pm:77
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:82
+#: printer/data.pm:103
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Common Unix Printing System(共通Unix印刷システム)"
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr "CUPS - 共通Unix印刷システム"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "リモヌトCUPSサヌバ"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Unknown Model"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Local printer"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "リモヌトプリンタ"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "リモヌトCUPSサヌバのプリンタ"
 
-#: printer/main.pm:32 printer/printerdrake.pm:1406
+#: printer/main.pm:30 printer/printerdrake.pm:1521
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "Printer on remote lpd server"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Network printer (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Printer on SMB/Windows 95/98/NT server"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "NetWareサヌバのプリンタ"
 
-#: printer/main.pm:36 printer/printerdrake.pm:1410
+#: printer/main.pm:34 printer/printerdrake.pm:1525
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "Enter a printer device URI"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Pipe job into a command"
 
-#: printer/main.pm:307 printer/main.pm:575 printer/main.pm:1545
-#: printer/main.pm:2229 printer/main.pm:2240 printer/printerdrake.pm:1866
-#: printer/printerdrake.pm:4396
+#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
+#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
+#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
 #, c-format
 msgid "Unknown model"
 msgstr "Unknown model"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "蚭定枈み(このマシン)"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " on parallel port #%s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", USB printer #%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", USB printer"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", multi-function device on parallel port #%s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", 倚機胜デバむス on a parallel port"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", multi-function device on USB"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", multi-function device on HP JetDirect"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", multi-function device"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", printing to %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " on LPD server \"%s\", printer \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IP host \"%s\", port %s"
 
 # y, c-format
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " on SMB/Windows server \"%s\", share \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " on Novell server \"%s\", printer \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", using command %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "パラレルポヌト #%s"
 
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
 #, c-format
 msgid "USB printer #%s"
 msgstr "USBプリンタ #%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "USBプリンタ"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "倚機胜デバむス on parallel port #%s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "倚機胜デバむス on a parallel port"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "USBの倚機胜デバむス"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "倚機胜デバむス on HP JetDirect"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "倚機胜デバむス"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "%s ぞの印刷"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "LPDサヌバ \"%s\", プリンタ \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "TCP/IP host \"%s\", port %s"
 
 # y, c-format
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windows サヌバ \"%s\", share \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Novellサヌバ \"%s\", プリンタ \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "コマンド %s を䜿う"
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:572 printer/printerdrake.pm:732
-#: printer/printerdrake.pm:2463
+#: printer/main.pm:601 printer/printerdrake.pm:820
+#: printer/printerdrake.pm:2584
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "Rawプリンタ(ドラむバなし)"
 
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr "ロヌカルネットワヌク"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "むンタフェヌス %s"
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "ネットワヌク %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "ホスト %s"
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (ポヌト %s)"
 
-#: printer/printerdrake.pm:22
+#: printer/printerdrake.pm:19
 #, c-format
 msgid ""
 "The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
 "on. Download the Windows driver package from the HP web site (the firmware "
 "on the printer's CD does not work) and extract the firmware file from it by "
-"uncompresing the self-extracting '.exe' file with the 'unzip' utility and "
+"decompressing the self-extracting '.exe' file with the 'unzip' utility and "
 "searching for the 'sihp1000.img' file. Copy this file into the '/etc/"
 "printer' directory. There it will be found by the automatic uploader script "
 "and uploaded whenever the printer is connected and turned on.\n"
@@ -11006,19 +11174,19 @@ msgstr ""
 "ください。There it will be found by the automatic uploader script and "
 "uploaded whenever the printer is connected and turned on.\n"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "CUPSプリンタの蚭定"
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
 "accessible by remote machines and by which remote machines."
 msgstr "リモヌトマシンからのプリンタアクセスを蚭定したす。"
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
@@ -11027,43 +11195,38 @@ msgstr ""
 " \n"
 "このマシンからのプリンタアクセスを蚭定するこずもできたす。"
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr "このマシンのプリンタを他のコンピュヌタでも利甚する"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr "リモヌトマシンに接続しおいるプリンタを自動的に怜出する"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "ホスト/ネットワヌクでのプリンタ共有: "
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "カスタム蚭定"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
 #, c-format
 msgid "No remote machines"
 msgstr "リモヌトマシンがありたせん"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "远加のCUPSサヌバ: "
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "なし"
-
-#: printer/printerdrake.pm:95
+#: printer/printerdrake.pm:101
 #, c-format
 msgid ""
 "To get access to printers on remote CUPS servers in your local network you "
@@ -11084,20 +11247,20 @@ msgstr ""
 "に衚瀺されたす。CUPSサヌバがロヌカルネットワヌクに無い堎合は、IPアドレス(ず\n"
 "オプションでポヌト番号)を入力しおください。"
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "日本語テキスト印刷モヌド"
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 "これをオンにするず日本語のプレヌンテキストを印刷できるようになりたす。\n"
@@ -11108,12 +11271,12 @@ msgstr ""
 "定矩したプリンタのみで有効です。リモヌトマシンでセットアップしたプリンタで\n"
 "日本語テキストを印刷するには、リモヌトマシンでこの機胜を有効にしおください。"
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "自動的にCUPSを蚭定する"
 
-#: printer/printerdrake.pm:107
+#: printer/printerdrake.pm:119
 #, c-format
 msgid ""
 "When this option is turned on, on every startup of CUPS it is automatically "
@@ -11140,74 +11303,103 @@ msgstr ""
 "この機胜に問題がある堎合はこのオプションを切っおください。\n"
 "ただしナヌザ自身が䞊蚘の点に泚意する必芁がありたす。"
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr "リモヌトCUPSサヌバ(ロヌカルCUPSデヌモンなし)"
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr "On"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr "Off"
+
+#: printer/printerdrake.pm:138 printer/printerdrake.pm:501
+#, c-format
+msgid ""
+"In this mode the local CUPS daemon will be stopped and all printing requests "
+"go directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+"このモヌドではロヌカルCUPSデヌモンは停止し、すべおの印刷芁求は盎接䞋に指定し"
+"たサヌバぞ送られたす。泚意: ロヌカル印刷キュヌは䜿えたせん。たた、 指定した"
+"サヌバがダりンするずこのマシンからは党く印刷できなくなりたす。"
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr "ロヌカルプリンタを共有"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
 "(s) should be available:"
 msgstr "ロヌカル接続したプリンタを利甚するマシンずネットワヌク:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "ホスト/ネットワヌクを远加"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "遞択したホスト/ネットワヌクを線集"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "遞択したホスト/ネットワヌクを削陀"
 
-#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
-#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
+#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
+#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
 #, c-format
 msgid "IP address of host/network:"
 msgstr "ホスト/ネットワヌクのIPアドレス:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
 "available:"
 msgstr "ロヌカルプリンタを利甚するネットワヌクもしくはホストを遞んでください:"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "ホスト/ネットワヌクIPがありたせん"
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "入力したホスト/ネットワヌクIPは正しくありたせん\n"
 
-#: printer/printerdrake.pm:222 printer/printerdrake.pm:400
+#: printer/printerdrake.pm:247 printer/printerdrake.pm:423
 #, c-format
 msgid "Examples for correct IPs:\n"
 msgstr "正しいIPの䟋:\n"
 
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:271
 #, c-format
 msgid "This host/network is already in the list, it cannot be added again.\n"
 msgstr ""
 "このホスト/ネットワヌクはリストにありたす。重耇するこずはできたせん。\n"
 
-#: printer/printerdrake.pm:316 printer/printerdrake.pm:387
+#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
 #, c-format
 msgid "Accessing printers on remote CUPS servers"
 msgstr "リモヌトCUPSサヌバのプリンタにアクセス"
 
-#: printer/printerdrake.pm:317
+#: printer/printerdrake.pm:341
 #, c-format
 msgid ""
 "Add here the CUPS servers whose printers you want to use. You only need to "
@@ -11217,102 +11409,118 @@ msgstr ""
 "プリンタが䜿甚するCUPSサヌバをここで远加しおください。これはサヌバが\n"
 "ロヌカルネットワヌクにプリンタ情報を送っおいない堎合のみ必芁です。"
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "サヌバを远加"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "遞んだサヌバを線集"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "遞んだサヌバを削陀"
 
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
 msgstr "䜿甚するプリンタのホストのIPアドレスずポヌトを入力"
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "ポヌト番号を指定しない堎合は631がデフォルトになりたす。"
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "IPサヌバがありたせん"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "入力したIPは正しくありたせん\n"
 
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "ポヌト番号は敎数です"
 
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:445
 #, c-format
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "このサヌバは既にリストにありたす。重耇するこずはできたせん。\n"
 
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
-#: standalone/drakups:233 standalone/harddrake2:68
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
+#: standalone/drakups:247 standalone/harddrake2:47
 #, c-format
 msgid "Port"
 msgstr "ポヌト"
 
-#: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:610 printer/printerdrake.pm:628
-#: printer/printerdrake.pm:711 printer/printerdrake.pm:768
-#: printer/printerdrake.pm:794 printer/printerdrake.pm:1703
-#: printer/printerdrake.pm:1886 printer/printerdrake.pm:1902
-#: printer/printerdrake.pm:1945 printer/printerdrake.pm:1982
-#: printer/printerdrake.pm:2024 printer/printerdrake.pm:2061
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2458
-#: printer/printerdrake.pm:2568 printer/printerdrake.pm:3069
-#: printer/printerdrake.pm:3134 printer/printerdrake.pm:3177
-#: printer/printerdrake.pm:3180 printer/printerdrake.pm:3299
-#: printer/printerdrake.pm:3364 printer/printerdrake.pm:3436
-#: printer/printerdrake.pm:3457 printer/printerdrake.pm:3466
-#: printer/printerdrake.pm:3557 printer/printerdrake.pm:3655
-#: printer/printerdrake.pm:3661 printer/printerdrake.pm:3674
-#: printer/printerdrake.pm:3726 printer/printerdrake.pm:3766
-#: printer/printerdrake.pm:3778 printer/printerdrake.pm:3789
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:3811
-#: printer/printerdrake.pm:3888 printer/printerdrake.pm:3945
-#: printer/printerdrake.pm:4010 printer/printerdrake.pm:4270
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4459
-#: printer/printerdrake.pm:4517 printer/printerdrake.pm:4546
-#: standalone/printerdrake:65 standalone/printerdrake:85
-#: standalone/printerdrake:522
+#: printer/printerdrake.pm:489 printer/printerdrake.pm:505
+#: printer/printerdrake.pm:520 printer/printerdrake.pm:524
+#: printer/printerdrake.pm:530
+#, c-format
+msgid "On, Name or IP of remote server:"
+msgstr "on, リモヌトサヌバの名前かIP:"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "CUPSサヌバの名前かIPがありたせん"
+
+#: printer/printerdrake.pm:560 printer/printerdrake.pm:580
+#: printer/printerdrake.pm:649 printer/printerdrake.pm:714
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:796
+#: printer/printerdrake.pm:838 printer/printerdrake.pm:848
+#: printer/printerdrake.pm:1818 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2021 printer/printerdrake.pm:2064
+#: printer/printerdrake.pm:2104 printer/printerdrake.pm:2147
+#: printer/printerdrake.pm:2184 printer/printerdrake.pm:2194
+#: printer/printerdrake.pm:2437 printer/printerdrake.pm:2442
+#: printer/printerdrake.pm:2579 printer/printerdrake.pm:2689
+#: printer/printerdrake.pm:3247 printer/printerdrake.pm:3312
+#: printer/printerdrake.pm:3361 printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3484 printer/printerdrake.pm:3549
+#: printer/printerdrake.pm:3621 printer/printerdrake.pm:3642
+#: printer/printerdrake.pm:3651 printer/printerdrake.pm:3745
+#: printer/printerdrake.pm:3837 printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:3863 printer/printerdrake.pm:3969
+#: printer/printerdrake.pm:4076 printer/printerdrake.pm:4095
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4117
+#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4749
+#: printer/printerdrake.pm:4826 standalone/printerdrake:64
+#: standalone/printerdrake:84 standalone/printerdrake:566
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
-#: printer/printerdrake.pm:479
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, c-format
+msgid "Reading printer data..."
+msgstr "プリンタの情報を読み蟌み䞭.."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "CUPSを再起動䞭.."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "プリンタの接続を遞んでください"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "プリンタをどのように接続しおいたすか?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11323,7 +11531,7 @@ msgstr ""
 "リモヌトCUPSサヌバのプリンタをここで蚭定する必芁はありたせん。\n"
 "それらのプリンタは自動的に怜出したす。"
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -11334,28 +11542,28 @@ msgstr ""
 "è­Šå‘Š: ロヌカルネットワヌク接続が無効です。リモヌトプリンタを怜出しおいたせん"
 "しテストもしおいたせん"
 
-#: printer/printerdrake.pm:515
-#, fuzzy, c-format
+#: printer/printerdrake.pm:619
+#, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
-msgstr "プリンタを自動的に怜出(ロヌカル,TCP/Socket,SMBプリンタ)"
+msgstr "プリンタの自動怜出 (Local, TCP/Socket, SMB printers, and device URI)"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "システムを調査䞭.."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "ず 1 台の䞍明なプリンタが"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "ず %d 台の䞍明なプリンタが"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11368,7 +11576,7 @@ msgstr ""
 "%s%s\n"
 "はシステムに盎接接続しおいたす"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11381,7 +11589,7 @@ msgstr ""
 "%s%s\n"
 "はシステムに盎接接続しおいたす"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11394,7 +11602,7 @@ msgstr ""
 "%s%s\n"
 "はシステムに盎接接続しおいたす"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11403,7 +11611,7 @@ msgstr ""
 "\n"
 "台の䞍明なプリンタをマシンに接続しおいたす"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11412,42 +11620,42 @@ msgstr ""
 "\n"
 "%d 台の䞍明なプリンタをマシンに接続しおいたす"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "マシンに接続したプリンタが芋぀かりたせん"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 " \n"
 "(党おのプリンタを接続しお電源を入れおください)。\n"
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
 "printers in the local network?\n"
 msgstr "䞊蚘のプリンタやロヌカルネットワヌクのプリンタで印刷を行いたすか\n"
 
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:699
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "ロヌカルネットワヌクのプリンタで印刷を行いたすか\n"
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "䞊蚘のプリンタで印刷を行いたすか\n"
 
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:702
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr "本圓に印刷を蚭定したすか\n"
 
-#: printer/printerdrake.pm:599
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11456,48 +11664,42 @@ msgstr ""
 "泚意: プリンタの機皮ず印刷方匏によっおは、最倧で %d MBの\n"
 "远加゜フトをむンストヌルしたす。"
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "新しいプリンタを怜玢䞭.."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "プリンタを蚭定䞭.."
+msgid "Found printer on %s..."
+msgstr "%s にプリンタを怜出.."
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "プリンタ %s を蚭定䞭.."
-
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:822
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:823
 #, c-format
 msgid " on "
 msgstr " on "
 
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:824 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
 #, c-format
 msgid "Printer model selection"
 msgstr "プリンタの機皮を遞ぶ"
 
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "どのプリンタをお䜿いですか"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11510,7 +11712,7 @@ msgstr ""
 "Printerdrakeはお䜿いのプリンタ %s の機皮を怜出できたせんでした。\n"
 "リストの䞭から正しい機皮を遞択しおください。"
 
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -11520,21 +11722,24 @@ msgstr ""
 "お䜿いのプリンタがなければ、互換性のあるプリンタ\n"
 "(プリンタのマニュアルを参照)か類䌌プリンタを遞んでください。"
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
 #, c-format
-msgid "Configuring applications..."
-msgstr "アプリケヌションを蚭定䞭.."
+msgid "Configuring printer on %s..."
+msgstr "%s のプリンタを蚭定.."
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "プリンタ %s を蚭定䞭.."
+
+#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
 #, c-format
 msgid "Add a new printer"
 msgstr "プリンタを远加"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -11556,7 +11761,7 @@ msgstr ""
 "プリンタドラむバ/オプション/プリンタの接続方匏\n"
 "を遞択しおプリンタを蚭定しおください。"
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -11594,7 +11799,7 @@ msgstr ""
 "準備ができたしたら'次ぞ'をクリックしおください。プリンタを蚭定しない堎合は\n"
 "'キャンセル'をクリックしおください。"
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -11620,7 +11825,7 @@ msgstr ""
 "準備ができたしたら'次ぞ'をクリックしおください。プリンタを蚭定しない堎合は\n"
 "'キャンセル'をクリックしおください。"
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -11657,7 +11862,7 @@ msgstr ""
 "準備ができたしたら'次ぞ'をクリックしおください。プリンタを蚭定しない堎合は\n"
 "'キャンセル'をクリックしおください。"
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -11683,23 +11888,23 @@ msgstr ""
 "準備ができたしたら'次'をクリックしおください。プリンタを蚭定しない堎合は\n"
 "'キャンセル'をクリックしおください。"
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "このマシンに接続しおいるプリンタを自動的に怜出する"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "ロヌカルネットワヌクに接続しおいるプリンタを自動的に怜出する"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "Windowsマシンに接続しおいるプリンタを自動的に怜出する"
 
-#: printer/printerdrake.pm:902
-#, fuzzy, c-format
+#: printer/printerdrake.pm:1003
+#, c-format
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -11714,77 +11919,77 @@ msgstr ""
 "\n"
 "おめでずうございたす。プリンタのむンストヌルず蚭定が完了したした。\n"
 "\n"
-"アプリケヌションの'印刷'(ファむルメニュヌにあるこずが倚い)から\n"
-"印刷できたす。\n"
-"\n"
-"プリンタの远加/削陀/名前倉曎/デフォルト蚭定(甚玙トレむ、印字品質など)を\n"
-"行う堎合は、Mandrakeコントロヌルセンタの ハヌドりェア -> プリンタ を\n"
-"遞んでください。"
-
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
-#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
-#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
-#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
-#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
-#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
-#, fuzzy, c-format
+"アプリケヌションの\"Print\"(たいおいは\"File\"メニュヌの䞭にありたす) を遞ん"
+"で印刷できたす。\n"
+"\n"
+"プリンタの远加/削陀/名前の倉曎/オプション蚭定の倉曎(甚玙トレむ/印刷品質など)"
+"を行うには、%s コントロヌルセンタヌの「ハヌドりェア」で「プリンタ」を遞んでく"
+"ださい。"
+
+#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
+#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
+#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
+#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
+#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
+#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
+#, c-format
 msgid "Could not install the %s packages!"
-msgstr "XFreeパッケヌゞをむンストヌルできたせん: %s"
+msgstr "%s パッケヌゞをむンストヌルできたせん"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
-msgstr ""
+msgstr "Windows/SMBサヌバの自動怜出をスキップ"
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Printer auto-detection"
 msgstr "プリンタを自動的に怜出する"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "デバむスを怜出䞭.."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", ネットワヌクプリンタ %s, ポヌト %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", printer \"%s\" on SMB/Windows server \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "%s を怜出"
 
-#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
-#: printer/printerdrake.pm:1017
+#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1132
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "パラレルポヌト #%s のプリンタ"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "ネットワヌクプリンタ %s, ポヌト %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "プリンタ %s、SMB/Windowsサヌバ %s"
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
-msgstr "Local Printer"
+msgstr "ロヌカルプリンタ"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -11796,32 +12001,32 @@ msgstr ""
 "ファむル名を入力したす(パラレルポヌトなら /dev/lp0, /dev/lp1 、\n"
 "USBプリンタなら /dev/usb/lp0, /dev/usb/lp1 のようになりたす)。"
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "デバむス名かファむル名を入力しおください"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "プリンタが芋぀かりたせん"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Local Printers"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "利甚可胜なプリンタ"
 
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "以䞋のプリンタを自動的に怜出したした。"
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1206
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -11831,18 +12036,18 @@ msgstr ""
 "手持ちの機噚ず異なる堎合は、入力欄にデバむス名/ファむル名を\n"
 "入力しおください"
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "代わりにデバむス名/ファむル名を指定するこずもできたす"
 
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "自動的に怜出したプリンタのリスト "
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -11850,7 +12055,7 @@ msgid ""
 msgstr ""
 "セットアップするプリンタを遞択するかデバむス名/ファむル名を入力しおください"
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -11858,7 +12063,7 @@ msgid ""
 msgstr ""
 "印刷ゞョブを行うプリンタを遞択するか、デバむス名/ファむル名を入力しおください"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -11868,12 +12073,12 @@ msgstr ""
 "プリンタの蚭定は党自動で行われたす。お䜿いのプリンタが正確に怜出されない/\n"
 "プリンタの蚭定をカスタマむズしたい堎合は、'手動蚭定'を有効にしおください。"
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "珟圚のずころ別の遞択肢はありたせん"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -11886,12 +12091,12 @@ msgstr ""
 "プリンタが正確に怜出されない/プリンタの蚭定をカスタマむズしたい堎合は、\n"
 "'手動蚭定'を有効にしおください。"
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "印刷ゞョブを行うプリンタを遞んでください。"
 
-#: printer/printerdrake.pm:1107
+#: printer/printerdrake.pm:1222
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -11899,12 +12104,12 @@ msgid ""
 msgstr ""
 "プリンタを接続しおいるポヌトを遞ぶか、デバむス名/ファむル名を入力しおください"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "お䜿いのプリンタを接続しおいるポヌトを遞んでください。"
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -11914,26 +12119,26 @@ msgstr ""
 "(パラレルポヌト: /dev/lp0, /dev/lp1, .., が LPT1:, LPT2:, .., \n"
 "台目のUSBプリンタ: /dev/usb/lp0, 台目のUSBプリンタ: /dev/usb/lp1, ..)"
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "プリンタかデバむスを入力/遞択しおください"
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
-#, fuzzy, c-format
+#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
+#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
+#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
+#, c-format
 msgid "Aborting"
 msgstr "äž­æ­¢"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "リモヌトlpdプリンタのオプション"
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -11942,63 +12147,63 @@ msgstr ""
 "リモヌトlpdプリンタを䜿うには、プリンタサヌバのホスト名ず\n"
 "サヌバのプリンタの名前が必芁です。"
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "リモヌトホスト名"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "リモヌトプリンタ名"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "リモヌトホストの名前がありたせん"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "リモヌトプリンタの名前がありたせん"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769 standalone/drakTermServ:1432
-#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:771
-#: standalone/harddrake2:166
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742 standalone/drakTermServ:1405
+#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
+#: standalone/drakbackup:513 standalone/drakbackup:619
+#: standalone/drakbackup:654 standalone/drakbackup:774
+#: standalone/harddrake2:237
 #, c-format
 msgid "Information"
 msgstr "情報"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "怜出した機皮: %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "ネットワヌクをスキャンしおいたす.."
 
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", printer \"%s\" on server \"%s\""
 
-#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
+#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Printer \"%s\" on server \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB(Windows9x/NT)プリンタのオプション"
 
-#: printer/printerdrake.pm:1367
+#: printer/printerdrake.pm:1482
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12010,7 +12215,7 @@ msgstr ""
 "プリントサヌバのIPアドレス、アクセスしたいプリンタの共有名、\n"
 "適切なナヌザ名、パスワヌド、ワヌクグルヌプの情報 が必芁になりたす。"
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12019,47 +12224,47 @@ msgstr ""
 "適切なプリンタを怜出したら、それをそのたた遞択し、必芁に応じおナヌザ名/\n"
 "パスワヌド/ワヌクグルヌプなどを入力しおください。"
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "SMBサヌバのホスト名"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "SMBサヌバのIP"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "共有名"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "ワヌクグルヌプ"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "自動的に怜出"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "サヌバ名かサヌバのIPを入力しおください"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Sambaの共有名がありたせん"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "セキュリティ譊告"
 
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1513
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -12100,7 +12305,7 @@ msgstr ""
 "type in Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12112,7 +12317,7 @@ msgstr ""
 "そしおこのマシンからの印刷をPrinterdrakeの接続タむプ %s で蚭定する。\n"
 "\n"
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12125,12 +12330,12 @@ msgstr ""
 "\n"
 "珟圚の状態でプリンタの蚭定を続けたすか?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Netwareプリンタのオプション"
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1605
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12142,42 +12347,42 @@ msgstr ""
 "TCP/IPホスト名ではない)ず、アクセスするプリンタの印刷キュヌ名、\n"
 "適切なナヌザ名、パスワヌドが必芁になりたす。"
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "プリンタサヌバ"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "印刷キュヌの名前"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCPサヌバの名前がありたせん"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCPキュヌの名前がありたせん"
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", ホスト %s, ポヌト %s"
 
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "ホスト %s, ポヌト %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/゜ケットプリンタのオプション"
 
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1735
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -12186,7 +12391,7 @@ msgstr ""
 "自動的に怜出したプリンタをリストから遞ぶか、入力項目にホスト名かIPず、\n"
 "オプションでポヌト番号(デフォルトは9100)を入力する。"
 
-#: printer/printerdrake.pm:1621
+#: printer/printerdrake.pm:1736
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12199,27 +12404,27 @@ msgstr ""
 "HP JetDirectサヌバのポヌト番号は通垞9100ですが、他のサヌバでは異なるこずが\n"
 "ありたす。ハヌドりェアのマニュアルをご芧ください。"
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "プリンタホスト名かIPがありたせん"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "プリンタホスト名かIP"
 
-#: printer/printerdrake.pm:1704
-#, fuzzy, c-format
+#: printer/printerdrake.pm:1819
+#, c-format
 msgid "Refreshing Device URI list..."
-msgstr "プリンタデヌタを曎新䞭.."
+msgstr "デバむスURIリストを曎新.."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "プリンタデバむスのURI"
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12230,17 +12435,17 @@ msgstr ""
 "このURIはCUPSかFoomaticの仕様で指定しおください。\n"
 "党おのスプヌラが党おのURIタむプをサポヌトしおいるわけではありたせん。"
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "有効なURIを入力しおください"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "コマンドにパむプする"
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -12249,17 +12454,17 @@ msgstr ""
 "プリンタにゞョブを盎接送る代わりに、パむプさせるコマンドラむンを入力できた"
 "す。"
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "コマンドラむン"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "コマンドラむンを入力しおください"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12271,73 +12476,73 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300, DeskJet 450,\n"
 "Sony IJP-V100), HP PhotoSmart もしくは HP LaserJet 2200"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "HPOJパッケヌゞをむンストヌル䞭.."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
-msgstr ""
+msgstr "%s では印刷のみが可胜です"
 
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "デバむス確認ずHPOJを蚭定䞭.."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "SANEパッケヌゞをむンストヌル䞭.."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
-msgstr ""
+msgstr "%s でのスキャンはできたせん"
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "mtoolsパッケヌゞをむンストヌル䞭.."
 
-#: printer/printerdrake.pm:1990
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2113
+#, c-format
 msgid "Photo memory card access on the %s will not be possible."
-msgstr "HP倚機胜デバむスのフォトメモリヌカヌドアクセス"
+msgstr "%s でのフォトメモリヌカヌドアクセスはできたせん"
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "HP倚機胜デバむスのスキャン"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "HP倚機胜デバむスのフォトメモリヌカヌドアクセス"
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "CUPS甚のプリンタポヌトを䜜成䞭.."
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr "プリンタデヌタベヌスを読み蟌み䞭.."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "プリンタ名ずコメントを入力"
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "プリンタ名には文字ず数字ずアンダヌスコア(_)しか䜿えたせん"
 
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -12346,7 +12551,7 @@ msgstr ""
 "プリンタ %s は既に存圚しおいたす。\n"
 "蚭定を䞊曞きしたすか"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12355,35 +12560,35 @@ msgstr ""
 "プリンタにはそれぞれ名前が必芁です(たずえば'printer')。\n"
 "説明/堎所の欄は空のたたでも構いたせん。ナヌザ甚のメモ欄です。"
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "プリンタの名前"
 
-#: printer/printerdrake.pm:2302 standalone/drakconnect:570
-#: standalone/harddrake2:41 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2425 standalone/drakconnect:568
+#: standalone/harddrake2:34 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Description"
 msgstr "説明"
 
-#: printer/printerdrake.pm:2303 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2426 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Location"
 msgstr "プリンタの堎所"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "プリンタデヌタベヌスを準備䞭.."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "プリンタの機皮"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12408,18 +12613,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "この機皮を䜿う"
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
 #, c-format
 msgid "Select model manually"
 msgstr "手動で遞ぶ"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12434,104 +12639,106 @@ msgstr ""
 "間違った機皮もしくはRawプリンタを衚瀺しおいる堎合は、\n"
 "リストから正しい機皮を探しおください。"
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "メヌカヌ提䟛のPPDファむルをむンストヌル"
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
+"PostScriptプリンタは、そのプリンタのオプションず機胜を蚘したPPDファむルで提䟛"
+"されたす"
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr ""
+"このファむルはたいおいプリンタ付属のWindows/MacドラむバCDのどこかにありたす。"
 
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2645
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
-msgstr ""
+msgstr "PPDファむルはメヌカヌのWEBサむトにもありたす。"
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
+"Windowsをマシンにむンストヌルしおいる堎合は、WindowsパヌティションにもPPDファ"
+"むルがありたす。"
 
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2647
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
 "makes all options of the printer available which are provided by the "
 "printer's hardware"
 msgstr ""
+"PPDファむルをむンストヌルしプリンタのセットアップ時に䜿うず、プリンタのハヌド"
+"りェアがサポヌトする党おのオプションを利甚できるようになりたす。"
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
+"マシンにむンストヌルするPPDファむルを遞びたす。これはプリンタのセットアップに"
+"䜿いたす。"
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr "PPDファむルを次からむンストヌル"
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, c-format
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
-#: standalone/scannerdrake:181 standalone/scannerdrake:190
-#: standalone/scannerdrake:240 standalone/scannerdrake:248
+#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
+#: standalone/scannerdrake:177 standalone/scannerdrake:186
+#: standalone/scannerdrake:236 standalone/scannerdrake:244
 #, c-format
 msgid "Floppy Disk"
 msgstr "フロッピヌディスク"
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
 #, c-format
 msgid "Other place"
 msgstr "その他の堎所"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "PPDファむルを遞択"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "PPDファむル %s が無いか読み取り䞍胜です"
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
-msgstr ""
+msgstr "このPPDファむル %s はPPDの仕様に合っおいたせん。"
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "PPDファむルをむンストヌル.."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI winプリンタの蚭定"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12547,12 +12754,12 @@ msgstr ""
 "テストペヌゞを印刷する前に最初のパラレルポヌトに぀なぎなおしおください。\n"
 "そうしないず䜿えたせん。接続皮類の蚭定は無芖されたす。"
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmarkむンクゞェットを蚭定"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12564,7 +12771,7 @@ msgstr ""
 "サポヌトしたせん。リモヌトマシンやプリンタサヌバのプリンタには䜿えたせん。\n"
 "プリンタをロヌカルポヌトに接続するか、接続しおいるマシンで蚭定しおください。"
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12588,29 +12795,52 @@ msgstr ""
 "ペヌゞを lexmarkmaintain で印刷し、このプログラムでヘッドのアラむンメントを\n"
 "調敎しおください。"
 
-#: printer/printerdrake.pm:2746
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2874
+#, c-format
 msgid "Lexmark X125 configuration"
-msgstr "Lexmarkむンクゞェットを蚭定"
+msgstr "Lexmark X125 の蚭定"
 
-#: printer/printerdrake.pm:2747
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2875
+#, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
 "USB, no printers on remote machines or print server boxes. Please connect "
 "your printer to a local USB port or configure it on the machine where it is "
 "connected to."
 msgstr ""
-"Lexmarkのむンクゞェットプリンタドラむバは、ロヌカルプリンタしか\n"
-"サポヌトしたせん。リモヌトマシンやプリンタサヌバのプリンタには䜿えたせん。\n"
-"プリンタをロヌカルポヌトに接続するか、接続しおいるマシンで蚭定しおください。"
+"このプリンタのラむバはUSB経由でロヌカルに接続したプリンタしかサポヌトしたせ"
+"ん。リモヌトマシンやプリンタサヌバのプリンタには䜿えたせん。プリンタをロヌカ"
+"ルUSBポヌトに接続するか、接続しおいるマシンで蚭定しおください。"
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Samsung ML/QL-85Gの蚭定"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+"このドラむバは最初のパラレルポヌトに接続されたロヌカルプリンタにしか䜿えたせ"
+"ん。リモヌトマシンや他のパラレルポヌトのプリンタはサポヌトされたせん。プリン"
+"タを最初のパラレルポヌトに接続するか、プリンタが接続されおいるマシンで蚭定し"
+"おください。"
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Caon LBP-460/660の蚭定"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "HP LaserJet 1000のファヌムりェアをアップロヌド"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12626,27 +12856,27 @@ msgstr ""
 "しおいるか確認しおください。\n"
 "泚意: 超高品質/高解像床の印刷には非垞に時間がかかるこずがありたす。"
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "プリンタのデフォルト蚭定"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "オプション %s は敎数にしおください"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "オプション %s は数字にしおください"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "オプション %s は範囲倖です"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12655,12 +12885,12 @@ msgstr ""
 "このプリンタ(%s)を\n"
 "デフォルトのプリンタにしたすか"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "テストペヌゞ"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12673,57 +12903,57 @@ msgstr ""
 "メモリの少ないレヌザプリンタでは出力できないかもしれたせん。\n"
 "'暙準'を印刷できれば倧抵のばあい問題ないでしょう。"
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "テストしない"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "印刷"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "暙準"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "レタヌ"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "A4"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "写真"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "テストペヌゞを印刷しない"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "テストペヌゞを印刷䞭.."
 
-#: printer/printerdrake.pm:3150
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3331
+#, c-format
 msgid "Could not install the %s package!"
-msgstr "XFreeパッケヌゞをむンストヌルできたせん: %s"
+msgstr "%s パッケヌゞをむンストヌルできたせん"
 
-#: printer/printerdrake.pm:3152
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3333
+#, c-format
 msgid "Skipping photo test page."
-msgstr "写真"
+msgstr "写真テストペヌゞをスキップ"
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12738,7 +12968,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12747,17 +12977,17 @@ msgstr ""
 "テストペヌゞをプリンタデヌモンに送りたした。\n"
 "プリンタが動くたで少し時間がかかりたす。\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "うたく動きたしたか"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Rawプリンタ"
 
-#: printer/printerdrake.pm:3231
+#: printer/printerdrake.pm:3416
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -12769,7 +12999,7 @@ msgstr ""
 "%s <file>、GUIの堎合は xpp <file> もしくは kprinter <file> を䜿いたす。\n"
 "グラフィカルなツヌルを䜿うずプリンタの遞択ずオプションの蚭定が楜になりたす\n"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -12780,8 +13010,8 @@ msgstr ""
 "'印刷'でも䜿えたす。この堎合はファむル名の指定は必芁ありたせん。\n"
 "アプリケヌションのほうが印刷するファむルを指定したす。\n"
 
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "\n"
@@ -12794,7 +13024,7 @@ msgstr ""
 "できたす。必芁な蚭定をコマンドラむンに远加しおください。\n"
 "䟋: %s <file>"
 
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -12805,7 +13035,7 @@ msgstr ""
 "'印刷オプションの䞀芧'をクリックしおください。%s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3428
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -12814,7 +13044,7 @@ msgstr ""
 "珟圚のプリンタで䜿える印刷オプションの䞀芧は以䞋の通りです:\n"
 "\n"
 
-#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
+#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -12823,8 +13053,8 @@ msgstr ""
 "コマンドラむン(タヌミナルりィンドり)からファむルを印刷するには、\n"
 "%s <file> を䜿いたす。\n"
 
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
-#: printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
+#: printer/printerdrake.pm:3455
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -12835,7 +13065,7 @@ msgstr ""
 "この堎合はファむル名の指定は必芁ありたせん。アプリケヌションのほうから\n"
 "指定されたす。\n"
 
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -12844,7 +13074,7 @@ msgstr ""
 "珟圚のプリンタで䜿えるオプションのリストを芋るには、'印刷オプションの䞀芧'\n"
 "をクリックしおください。"
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -12853,7 +13083,7 @@ msgstr ""
 "コマンドラむン(タヌミナルりィンドり)からファむルを印刷するには、\n"
 "%s <file> たたは %s <file> を䜿いたす。\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12868,7 +13098,7 @@ msgstr ""
 "ありたす。これをクリックするず印刷ゞョブがすぐに止たりたす。\n"
 "これは玙づたりのずきなどに䟿利です。\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -12881,42 +13111,32 @@ msgstr ""
 "できたす。必芁な蚭定をコマンドラむンに远加しおください。\n"
 "䟋: %s <file>\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "%s で印刷/スキャン/フォトカヌド"
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "%s で印刷/スキャン"
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "%s で印刷/フォトカヌドアクセス"
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "プリンタ %s で印刷"
 
-#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
-#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
-#: printer/printerdrake.pm:4384 standalone/drakTermServ:313
-#: standalone/drakbackup:4063 standalone/drakbug:177 standalone/drakfont:500
-#: standalone/drakfont:591 standalone/net_monitor:107
-#: standalone/printerdrake:515
-#, c-format
-msgid "Close"
-msgstr "閉じる"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "印刷オプションの䞀芧"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -12927,7 +13147,9 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
 msgstr ""
 "HP倚機胜デバむスを自動的に蚭定しお、スキャナを䜿えるようにしたした。\n"
 "これでコマンドラむンから scanimage を入力するか(耇数のスキャナがある堎合は\n"
@@ -12935,9 +13157,10 @@ msgstr ""
 "スキャンできたす。GIMPを䜿っお ファむル -> 取り蟌み でスキャンするこずも\n"
 "可胜です。詳しくはコマンドラむンで man scanimage を参照しおください。\n"
 "\n"
-"このデバむスでは scannerdrake を䜿わないでください。"
+"このデバむスでスキャナをセットアップする堎合は、scannerdrakeを䜿う必芁はあり"
+"たせん。ネットワヌクでスキャナを共有する時にのみ実行しおください。"
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -12958,18 +13181,13 @@ msgstr ""
 "カヌドのファむルシステムは、ドラむブp: 以降ずなりたす。\n"
 "MtoolsFMではファむルリストの右䞊の項目でドラむブ文字を倉えられたす。"
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "プリンタの情報を読み蟌み䞭.."
-
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
-#: printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3632
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "プリンタの蚭定を倉換"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -12983,7 +13201,7 @@ msgstr ""
 "オプション蚭定)コピヌされたすが、ゞョブは倉換されたせん。\n"
 "以䞋の理由で倉換できないキュヌもありたす:\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -12992,7 +13210,7 @@ msgstr ""
 "CUPSはNovellサヌバのプリンタや、自由圢匏のコマンドにデヌタを送るプリンタを\n"
 "サポヌトしたせん。\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13001,12 +13219,12 @@ msgstr ""
 "PDQはロヌカルプリンタ、リモヌトのLPDプリンタ、゜ケット/TCPプリンタのみを\n"
 "サポヌトしたす。\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPDずLPRngはIPPプリンタをサポヌトしたせん。\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13015,7 +13233,7 @@ msgstr ""
 "さらにこのプログラムやfoomatic-configureで䜜っおいないキュヌは倉換できたせ"
 "ん。"
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13026,7 +13244,7 @@ msgstr ""
 "たたメヌカヌ提䟛のPPDファむルやネむティブのCUPSドラむバで蚭定したプリンタは\n"
 "倉換できたせん。"
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13036,17 +13254,17 @@ msgstr ""
 "\n"
 "倉換するプリンタを遞んで'倉換'をクリックしおください。"
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "プリンタを倉換しない"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "倉換"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13057,17 +13275,17 @@ msgstr ""
 "䞊曞きするには'倉換'を抌しおください。\n"
 "新しい名前を入力するか、このプリンタをスキップするこずもできたす。"
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "新しいプリンタの名前"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s を倉換䞭.."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13076,28 +13294,28 @@ msgstr ""
 "以前のデフォルトプリンタ(%s)を倉換したした。新しい印刷システム %s でも\n"
 "これをデフォルトのプリンタにしたすか"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "プリンタデヌタを曎新䞭.."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "ネットワヌクを起動䞭.."
 
-#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
-#: printer/printerdrake.pm:3514
+#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
+#: printer/printerdrake.pm:3701
 #, c-format
 msgid "Configure the network now"
 msgstr "ネットワヌクを蚭定する"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "ネットワヌク機胜を蚭定しおいたせん"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13109,13 +13327,13 @@ msgstr ""
 "ネットワヌクは未蚭定です。ネットワヌクを蚭定しないずこのプリンタを䜿甚する\n"
 "こずはできたせん。どうしたすか"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "ネットワヌクを蚭定せずに先ぞ進む"
 
-#: printer/printerdrake.pm:3547
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3735
+#, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
 "now. Please check whether the network is accessible after booting your "
@@ -13123,13 +13341,12 @@ msgid ""
 "\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
-"むンストヌル䞭に行ったネットワヌク蚭定を起動できたせん。起動時の\n"
-"ネットワヌクアクセスが有効かどうかを確認しお、Mandrakeコントロヌルセンタの\n"
-"ネットワヌクずむンタヌネット -> 接続 で蚭定を修正しおください。\n"
-"その埌Mandrakeコントロヌルセンタの ハヌドりェア -> プリンタ で\n"
-"プリンタを蚭定しおください。"
+"むンストヌル䞭に行ったネットワヌク蚭定を起動できたせん。起動時のネットワヌク"
+"アクセスが有効かどうかを確認しお、%s コントロヌルセンタの ネットワヌクずむン"
+"タヌネット / 接続 で蚭定を修正しおください。その埌 %s コントロヌルセンタの "
+"ハヌドりェア / プリンタ でプリンタを蚭定しおください。"
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13139,27 +13356,27 @@ msgstr ""
 "ネットワヌクアクセスを起動できたせんでした。蚭定ずハヌドりェアを確認しお\n"
 "ください。そのあずでリモヌトプリンタの蚭定をやりなおしおください。"
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "プリンタシステムを再起動䞭.."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "高い"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "極床に高い"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "印刷システムをセキュリティレベル %s でむンストヌル䞭"
 
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -13183,12 +13400,12 @@ msgstr ""
 "\n"
 "本圓に印刷システムを蚭定したすか"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "起動時に印刷システムを開始"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13208,259 +13425,328 @@ msgstr ""
 "\n"
 "印刷システムの自動起動を有効にしたすか"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "むンストヌル枈み゜フトをチェック䞭.."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "%s を削陀䞭.."
 
-#: printer/printerdrake.pm:3665
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3847
+#, c-format
 msgid "Could not remove the %s printing system!"
-msgstr "印刷システムを倉曎"
+msgstr "%s 印刷システムを削陀できたせん"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "%s をむンストヌル䞭.."
 
-#: printer/printerdrake.pm:3678
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3867
+#, c-format
 msgid "Could not install the %s printing system!"
-msgstr "印刷システムを倉曎"
+msgstr "%s 印刷システムをむンストヌルできたせん"
+
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+"このモヌドではロヌカル印刷システムはありたせん。すべおの印刷芁求は盎接䞋に指"
+"定されたサヌバに送られたす。泚意: ロヌカル印刷キュヌは䜿えたせん。たた、指定"
+"したサヌバがダりンするずこのマシンからは党く印刷できなくなりたす。"
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+"このモヌドを䜿うには、CUPSサヌバの名前かIPを入力しおOKをクリックしおくださ"
+"い。䜿わない堎合は\"Quit\"を遞んでください。 "
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "リモヌトサヌバの名前かIP:"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "デフォルトのプリンタを蚭定䞭.."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "リモヌトCUPSサヌバかロヌカルCUPS印刷システム?"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr "CUPS印刷システムは二通りに䜿えたす:"
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr "1. CUPS印刷システムをロヌカルに䜿う"
+
+#: printer/printerdrake.pm:3993
+#, c-format
+msgid ""
+"Then locally connected printers can be used and remote printers on other "
+"CUPS servers in the same network are automatically discovered. "
+msgstr ""
+"ロヌカルに接続されたプリンタが䜿えたす。ネットワヌク内の他のCUPSサヌバのリ"
+"モヌトプリンタは自動怜出されたす。"
+
+#: printer/printerdrake.pm:3994
+#, c-format
+msgid ""
+"Disadvantage of this approach is, that more resources on the local machine "
+"are needed: Additional software packages need to be installed, the CUPS "
+"daemon has to run in the background and needs some memory, and the IPP port "
+"(port 631) is opened. "
+msgstr ""
+"この方法の欠点は、ロヌカルマシンに負担がかかるこずです。䟋: 远加パッケヌゞの"
+"むンストヌル/CUPSデヌモンを垞に皌動させおおく必芁がある/IPPポヌト(port 631)が"
+"オヌプンになる。"
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr "2. すべおの印刷芁求は盎ちにリモヌトCUPSサヌバに送られたす。"
+
+#: printer/printerdrake.pm:3997
+#, c-format
+msgid ""
+"Here local resource occupation is reduced to a minimum. No CUPS daemon is "
+"started or port opened, no software infrastructure for setting up local "
+"print queues is installed, so less memory and disk space is used. "
+msgstr ""
+"この方法では、ロヌカルマシンの負担は最小限になりたす。CUPSデヌモンを皌動させ"
+"る必芁もなく、たたポヌトも閉じられたす。ロヌカル印刷キュヌをセットアップする"
+"ための゜フトりェアもむンストヌルしないので、メモリヌ/ディスクスペヌスも少なく"
+"おすみたす。"
+
+#: printer/printerdrake.pm:3998
+#, c-format
+msgid ""
+"Disadvantage is that it is not possible to define local printers then and if "
+"the specified server is down it cannot be printed at all from this machine. "
+msgstr ""
+"欠点は、ロヌカルプリンタを指定できないので指定したサヌバがダりンするずこのマ"
+"シンからは党く印刷できなくなるこずです。"
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr "CUPSをどのようにセットアップしたすか?"
+
+#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
+#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#, c-format
+msgid "Remote server, specify Name or IP here:"
+msgstr "リモヌトサヌバ - 名前かIPを指定:"
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "ロヌカルCUPS印刷システム"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "プリンタのスプヌラを遞んでください"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "どの印刷システム(スプヌラ)を䜿いたすか"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "プリンタ %s の蚭定に倱敗"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Foomaticをむンストヌル䞭.."
 
-#: printer/printerdrake.pm:3818
-#, fuzzy, c-format
+#: printer/printerdrake.pm:4124
+#, c-format
 msgid "Could not install %s packages, %s cannot be started!"
-msgstr "スキャナを共有するのに必芁なパッケヌゞをむンストヌルできたせん"
+msgstr "%s パッケヌゞをむンストヌルできたせん、%s を起動できたせん"
 
-#: printer/printerdrake.pm:3910
-#, fuzzy, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr ""
-"Scannerdrakeでスキャナを蚭定するのに必芁なファむルをむンストヌルできたせん"
-
-#: printer/printerdrake.pm:4011
-#, fuzzy, c-format
+#: printer/printerdrake.pm:4314
+#, c-format
 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"
-"デフォルトのプリンタに指定/情報を参照 するこずができたす。"
+"以䞋のプリンタは蚭定枈みです。ダブルクリックで蚭定を倉曎/デフォルトのプリンタ"
+"に指定/情報を参照 するこずができたす。"
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "利甚可胜なリモヌトCUPSプリンタを党お衚瀺"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "プリンタリストを曎新(リモヌトCUPSプリンタを党お衚瀺)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPSを蚭定"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "印刷システムを倉曎"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "ノヌマルモヌド"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "゚キスパヌトモヌド"
 
-#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
-#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
+#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
+#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
 #, c-format
 msgid "Printer options"
 msgstr "プリンタのオプション"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "プリンタ蚭定の倉曎"
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
 #, c-format
 msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr ""
-"プリンタ %s\n"
+"プリンタ %s%s\n"
 "このプリンタの䜕を倉曎したすか"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "このプリンタは無効になっおいたす"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "実行"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "プリンタ接続の皮類"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "プリンタの名前/説明/堎所"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "プリンタのメヌカヌ/æ©Ÿçš®/ドラむバ"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "プリンタのメヌカヌ/æ©Ÿçš®"
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
 #, c-format
 msgid "Set this printer as the default"
 msgstr "このプリンタをデフォルトにする"
 
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
+#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
+#: printer/printerdrake.pm:4780
 #, c-format
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr "このプリンタを Star Office/OpenOffice.org/GIMP に远加"
+msgid "Enable Printer"
+msgstr "プリンタを有効にする"
 
-#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
+#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
+#: printer/printerdrake.pm:4785
 #, c-format
-msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr "このプリンタを Star Office/OpenOffice.org/GIMP から削陀"
+msgid "Disable Printer"
+msgstr "プリンタを無効にする"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "テストペヌゞの印刷"
 
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "このプリンタの䜿いかたを調べる"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "プリンタを削陀"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "叀いプリンタ %s を削陀䞭.."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "プリンタを Star Office/OpenOffice.org/GIMP に远加"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr "プリンタ %s を Star Office/OpenOffice.org/GIMP に远加したした。"
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"プリンタ %s を Star Office/OpenOffice.org/GIMP に远加できたせんでした。"
-
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "プリンタを Star Office/OpenOffice.org/GIMP から削陀䞭"
+msgid "Printer \"%s\" is now enabled."
+msgstr "プリンタ %s を有効にしたした"
 
-#: printer/printerdrake.pm:4498
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr "プリンタ %s を Star Office/OpenOffice.org/GIMP から削陀したした。"
+msgid "Printer \"%s\" is now disabled."
+msgstr "プリンタ %s を無効にしたした"
 
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"プリンタ %s を Star Office/OpenOffice.org/GIMP から削陀できたせんでした。"
-
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "プリンタ %s を本圓に削陀したすか"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "プリンタ %s を削陀䞭.."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "デフォルトのプリンタ"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "プリンタ %s がデフォルトのプリンタになりたした。"
 
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "フォヌマット枈みのRAID md%dにはパヌティションを远加できたせん"
-
-#: raid.pm:139
+#: raid.pm:36
 #, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraidに倱敗(おそらくraidtoolsが入っおいたせん)"
+msgid "Can't add a partition to _formatted_ RAID %s"
+msgstr "フォヌマット枈の RAID %s にはパヌティションを远加できたせん"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraidに倱敗したした"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "RAIDレベル %d にはパヌティションが足りたせん\n"
@@ -13471,9 +13757,9 @@ msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr "ディレクトリ /usr/share/sane/firmware を䜜れたせん"
 
 #: scanner.pm:107
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create link /usr/share/sane/%s!"
-msgstr "ディレクトリ /usr/share/sane/firmware を䜜れたせん"
+msgstr "リンク /usr/share/sane/%s を䜜れたせん"
 
 #: scanner.pm:114
 #, c-format
@@ -13486,16 +13772,16 @@ msgstr ""
 msgid "Could not set permissions of firmware file %s!"
 msgstr "ファヌムりェアファむル %s の暩限を蚭定できたせん"
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
+#: standalone/scannerdrake:78 standalone/scannerdrake:340
+#: standalone/scannerdrake:415 standalone/scannerdrake:459
+#: standalone/scannerdrake:463 standalone/scannerdrake:485
+#: standalone/scannerdrake:550
 #, c-format
 msgid "Scannerdrake"
 msgstr "Scannerdrake"
 
-#: scanner.pm:201 standalone/scannerdrake:920
+#: scanner.pm:201 standalone/scannerdrake:916
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr "スキャナを共有するのに必芁なパッケヌゞをむンストヌルできたせん"
@@ -13525,7 +13811,8 @@ msgstr " icmp echoを蚱可/犁止する"
 msgid "Allow/Forbid autologin."
 msgstr "自動ログむンを蚱可/犁止する。"
 
-#: security/help.pm:19
+#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
+#: security/help.pm:21
 #, c-format
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
@@ -13535,29 +13822,38 @@ msgid ""
 "Else only /etc/issue is allowed."
 msgstr ""
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "コン゜ヌルナヌザによる再起動を蚱可/犁止する。"
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "リモヌトrootログむンを蚱可/犁止する"
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "盎接のrootログむンを蚱可/犁止する。"
 
-#: security/help.pm:31
+#: security/help.pm:33
 #, c-format
 msgid ""
 "Allow/Forbid the list of users on the system on display managers (kdm and "
 "gdm)."
 msgstr "ディスプレむマネヌゞャ(kdmずgdm)のナヌザリストを蚱可/犁止する。"
 
-#: security/help.pm:33
+#: security/help.pm:35
+#, c-format
+msgid ""
+"Allow/forbid to export display when\n"
+"passing from the root account to the other users.\n"
+"\n"
+"See pam_xauth(8) for more details.'"
+msgstr ""
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -13576,7 +13872,7 @@ msgstr ""
 "\n"
 "- NONE(接続しない)"
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
@@ -13585,7 +13881,8 @@ msgstr ""
 "この匕数はtcp port 6000のXサヌバぞのクラむアントの接続を\n"
 "認蚌するかどうかを指定する。"
 
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
 #, c-format
 msgid ""
 "Authorize:\n"
@@ -13601,7 +13898,7 @@ msgid ""
 "(5))."
 msgstr ""
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -13614,7 +13911,7 @@ msgid ""
 "packages."
 msgstr ""
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -13627,103 +13924,108 @@ msgstr ""
 "/etc/cron.allow ず /etc/at.allow (man at(1)ずcrontab(1)を参照)に\n"
 "蚱可するナヌザを曞き蟌む"
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr "Syslogによるconsole 12ぞの報告を有効/無効にする"
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
-"'alert'がtrueか぀syslogに報告しおいるずきは、\n"
+"'%s'がtrueか぀syslogに報告しおいるずきは、\n"
 "name resolution spoofing protectionを有効/無効にする。"
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "セキュリティ譊告:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr "IP spoofing protectionを有効/無効にする"
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr "libsafeがシステムにあるずきはlibsafeを有効/無効にする"
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr "IPv4 strange packetsのログを有効/無効にする"
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr "定期的なmsecセキュリティチェックを有効/無効にする"
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 " wheelグルヌプのメンバヌのみのsuを蚱可するか、他のナヌザからのsuを蚱可するか"
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "ナヌザの認蚌にパスワヌドを䜿う"
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr "ethernetカヌドのpromiscuityチェックを有効/無効にする。"
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr " デむリヌセキュリティチェックを有効/無効にする。"
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr " シングルナヌザレベルでのsulogin(8)を有効/無効にする。"
 
-#: security/help.pm:91
+#: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr "msecによるパスワヌド期限の蚭定から陀倖する名前を远加"
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr "パスワヌドの有効日数ず無効化するたでの猶予日数を蚭定"
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr "パスワヌドの再利甚を犁止するパスワヌド履歎の長さを蚭定"
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
 "number of capitalized letters."
 msgstr "パスワヌドの最小の長さ、最小の桁数、最小の倧文字数を蚭定"
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr "rootのumaskを蚭定しおください。"
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "'はい'の堎合はオヌプンポヌトを確認しおください。"
 
-#: security/help.pm:101
+#: security/help.pm:110
 #, c-format
 msgid ""
-"if set to yes, check for :\n"
+"if set to yes, check for:\n"
 "\n"
 "- empty passwords,\n"
 "\n"
@@ -13739,103 +14041,103 @@ msgstr ""
 "\n"
 "- root以倖の 0 idのナヌザ"
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr "'はい'にするずhomeでのファむルの暩限を確認したす。"
 
-#: security/help.pm:109
+#: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
 msgstr "'はい'にするずネットワヌクデバむスが混乱しおいないか確認したす。"
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "'はい'にするずデむリヌセキュリティチェックを実行したす。"
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr "'はい'の堎合はsgidファむルの远加/削陀を確認しおください。"
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "'はい'にするず/etc/shadowの空のパスワヌドを確認したす。"
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr "'はい'にするずsuid/sgidファむルのチェックサムを照合したす。"
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr "'はい'にするずsuid rootファむルの远加/削陀を確認したす。"
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr "'はい'にするず所有しおいないファむルを報告したす。"
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr "'はい'にするず党員がファむル/ディレクトリに曞きこめるか確認したす。"
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "'はい'にするずchkrootkitによる確認を実行したす。"
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
 msgid ""
 "if set, send the mail report to this email address else send it to root."
 msgstr "セットするずメヌルレポヌトをrootに送らずこのEmailアドレスに送りたす。"
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "'はい'にするず確認結果をメヌルで報告したす。"
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr "譊告がない堎合はメヌルを送らない"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr "'はい'にするずRPMデヌタベヌスに察しおいく぀か確認を実行したす。"
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr "'はい'にするずsyslogに確認結果を報告したす。"
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr "'はい'にするず確認結果をttyに報告したす。"
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr "シェルコマンドの履歎サむズを蚭定。-1にするず無制限"
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr "シェルのタむムアりトを蚭定。れロはタむムアりトなし"
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr "タむムアりトの単䜍は秒です"
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr "ナヌザのumaskを蚭定しおください。"
@@ -13882,210 +14184,215 @@ msgstr "ディスプレむマネヌゞャ(kdmずgdm)にナヌザを衚瀺"
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "X Window接続を有効にする"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "TCP connections X Windowを認める"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "tcp_wrappersで制埡する党サヌビスを認める"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "Chkconfigはmsecのルヌルに埓う"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr "ナヌザのcrontabずatを蚱可"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr "Syslogがconsole 12に報告"
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr ""
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr "IP spoofing protectionを蚱可"
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr "libsafeがシステムにあるずきはlibsafeを蚱可"
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr "IPv4 strange packetsのログを有効にする"
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr "定期的なmsecセキュリティチェック"
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr "ホむヌルグルヌプのメンバヌのみもしくは他のナヌザのsuを蚱可"
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "ナヌザを認蚌するのにパスワヌドを䜿う"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr "Ethernetカヌドのpromiscuityチェック"
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "デむリヌセキュリティチェック"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr "シングルナヌザレベルのSulogin(8)"
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr "パスワヌドの時効なし"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr "パスワヌドの期限ずアカりントの無効化を蚭定"
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "パスワヌド履歎の長さ"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr "パスワヌドの最小文字数ず数字/倧文字の数"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "rootのumask"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "シェル履歎のサむズ"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "シェルの時間蚭定"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr "ナヌザのumask"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "オヌプンポヌトを確認"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr "安党でないアカりントを確認"
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr "ナヌザのhomeでのファむルの暩限を確認"
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr "ネットワヌクデバむスが混乱しおいないか確認"
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "デむリヌセキュリティチェックを実行"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr "sgidファむルの远加/削陀を確認"
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "/etc/shadowの空のパスワヌドを確認"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "suid/sgidファむルのチェックサムを照合"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr "suid rootファむルの远加/削陀を確認"
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr "所有しおいないファむルを報告"
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr "党員がファむル/ディレクトリに曞きこめるか確認"
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "chkrootkitの確認を実行"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr "䞍芁なずきはメヌルを送らない"
 
-#: security/l10n.pm:57
+#: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr "セットするずメヌルレポヌトをroot以倖にこのEmailアドレスに送りたす。"
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "確認結果をメヌルで報告"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr "RPMデヌタベヌスに察しおいく぀か確認を実行"
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr "確認結果をsyslogに報告する"
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr "確認結果をttyに報告"
@@ -14378,7 +14685,7 @@ msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
-"党おのネットワヌクファむルシステム(NFS),SMB(LanManager/Windows),\n"
+"党おのネットワヌクファむルシステム(NFS), SMB(LanManager/Windows),\n"
 "NCP(NetWare)マりントポむントをマりント/アンマりントしたす。"
 
 #: services.pm:57
@@ -14414,8 +14721,8 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
-msgstr "起動時にコン゜ヌルずXFreeで自動的にnumlockを有効にする。"
+"and Xorg at boot."
+msgstr "起動時にコン゜ヌルずXorgで自動的にnumlockを有効にする。"
 
 #: services.pm:66
 #, c-format
@@ -14506,7 +14813,7 @@ msgstr ""
 #, c-format
 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)."
+"logged into a machine running the rwho daemon (similar to finger)."
 msgstr ""
 "rwhoプロトコルは、rwhoデヌモンを実行しおいるマシンにログむンした\n"
 "ナヌザのリストを、リモヌトナヌザが取埗できるようにしたす\n"
@@ -14533,8 +14840,8 @@ msgstr "USBデバむスのドラむバをロヌドする"
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Xフォントサヌバを開始する(XFreeを実行するのに必須)。"
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "Xフォントサヌバを開始する(Xorgを実行するのに必須)。"
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -14578,7 +14885,7 @@ msgstr "停止䞭"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "サヌビスずデヌモン"
 
 #: services.pm:221
@@ -14590,7 +14897,7 @@ msgstr ""
 "このサヌビスに぀いおの\n"
 "远加情報はありたせん。"
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "情報"
@@ -14603,755 +14910,1289 @@ msgstr "リク゚ストがあったずきに開始"
 #: services.pm:229
 #, c-format
 msgid "On boot"
-msgstr "起動時の動䜜"
+msgstr "起動時に開始"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "開始"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
+#: share/advertising/01.pl:13
 #, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "<b>Mandrakelinuxをお遞びいただきありがずうございたす</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "Mandrakelinux ずは"
 
-#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
-#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "オヌプン゜ヌスの䞖界ぞようこそ"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Mandrakelinux ぞようこそ"
 
-#: share/advertising/dis-01.pl:17
-#, fuzzy, c-format
+#: share/advertising/01.pl:17
+#, c-format
 msgid ""
-"Your new Mandrakelinux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and "
-"Mandrakelinux contributors throughout the world."
+"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"system, called the <b>operating system</b> (based on the Linux kernel) "
+"together with <b>a lot of applications</b> meeting every need you could even "
+"think of."
 msgstr ""
-"Mandrakelinuxは、MandrakeSoftの開発者ず䞖界䞭の貢献者によるコラボレヌションに"
-"よっお成り立っおいたす。"
+"Mandrakelinux は Linux カヌネルを栞にしたオペレヌティングシステムずあらゆる"
+"ニヌズを満たす倚くのアプリケヌションからなる Linux ディストリビュヌションで"
+"す。"
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"この最新リリヌスの開発に参加しおくださった党おのかたがたに感謝いたしたす。"
+"Mandrakelinuxは ナヌザヌフレンドリヌな Linux ディストリビュヌションです。䞖界"
+"䞭で最も広く䜿われおいるディストリビュヌションのひず぀です。"
 
-#: share/advertising/dis-02.pl:13
-#, fuzzy, c-format
-msgid "<b>Discovery</b>"
-msgstr "ドラむバ"
+#: share/advertising/02.pl:13
+#, c-format
+msgid "<b>Open Source</b>"
+msgstr "オヌプン゜ヌス"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "オヌプン゜ヌスの䞖界ぞようこそ"
+
+#: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
 msgstr ""
+"Mandrakelinux はオヌプン゜ヌスモデルに力を泚いでいたす。この新しいリリヌスは "
+"Mandrakesoft の開発チヌムず Mandrakelinux のコントリビュヌタが生み出した䞖界"
+"芏暡のコミュニティによるコラボレヌションの成果です。"
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
-msgstr ""
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
+msgstr "この最新リリヌスの開発に参加しおくださった党おのかたがたに感謝したす。"
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr ""
+msgid "<b>The GPL</b>"
+msgstr "GPL"
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
+"このディストリビュヌションに含たれるほずんどの゜フトりェアず Mandrakelinux の"
+"ツヌルは、 General Public License でラむセンスされおいたす。"
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
 msgstr ""
+"GPL はオヌプン゜ヌスモデルの心です。これによっお、すべおの人が自由に䜿甚し、"
+"研究し、配垃し、改良するこずができたす。改良された結果もたた公衚され、すべお"
+"の人がその恩恵に济するこずができたす。"
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
 msgstr ""
+"オヌプン゜ヌスの最倧の匷みは開発者の数が無限だずいうこずです。倚くの開発者の"
+"協業のなかから高品質な゜フトりェアが生たれおきたす。"
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:13
 #, c-format
-msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
-msgstr ""
+msgid "<b>Join the Community</b>"
+msgstr "コミュニティぞの参加"
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
 msgstr ""
+"Mandrakelinux はナヌザず開発者から成る䞖界芏暡のコミュニティを生み出したし"
+"た。このコミュニティは様々な圹割を果たしおいたす。新しいアプリケヌションの開"
+"発に際しおはバグを報告し問題の解決を助けたす。コミュニティは Mandrakelinux "
+"World で䞭心的な圹割を担っおいたす。"
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
+"たずは、 www.mandrakelinux.com でこの掻気に満ちたコミュニティを芗いおみおくだ"
+"さい。開発ぞの参加に興味のある方は www.mandrakelinux.com/en/cookerdevel.php3 "
+"ぞどうぞ。"
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
-#, fuzzy, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "むンタヌネット"
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "ダりンロヌドバヌゞョン"
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:15
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid ""
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
+"これは Mandrakesoft が無償で提䟛するダりンロヌドバヌゞョンです。 "
+"Mandrakesoft は今埌もすべおの人が利甚できる無償版の提䟛を続けおいきたいず思っ"
+"おいたす。"
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
 msgstr ""
+"ダりンロヌドバヌゞョンには゜ヌスが公開されおいない゜フトりェアを同梱するこず"
+"ができたせん。したがっお、次のものはこのバヌゞョンには含たれおいたせん。"
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "You can also:"
-msgstr "このようなこずも行えたす:"
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
+msgstr "\t* プロプラ゚タリ・ドラむバ (NVIDIA®/ATI™等のドラむバ)"
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/05.pl:19
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- Webの閲芧"
+msgid ""
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
+msgstr ""
+"\t* プロプラ゚タリ・゜フトりェア (Acrobat®/Reader®/ RealPlayer®/Flash™等)"
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/05.pl:21
 #, c-format
-msgid "\t- chat"
-msgstr "\t- チャット"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr "Mandrakesoft の有償補品に含たれおいるサヌビスはご利甚になれたせん。"
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- 動画関連の凊理"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr "Discovery: 初めおの Linux デスクトップ"
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- Webサむトの䜜成"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Mandrakelinux Discovery をむンストヌルしたす。"
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid ""
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
+msgstr ""
+"Discovery は最も簡単でナヌザフレンドリな Linux ディストリビュヌションです。オ"
+"フィス・マルチメディア・むンタヌネットのそれぞれに厳遞したプレミアム゜フト"
+"りェアをご甚意したした。甚途別メニュヌから目的に合ったアプリケヌションをすぐ"
+"にお䜿い頂けたす。"
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:13
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>マルチメディア</b>: 誰もが必芁ずするもの"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr "PowerPack: Linux デスクトップの決定版"
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/07.pl:15
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "<b>KsCD</b>でオヌディオCDを芳賞"
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Mandrakelinux PowerPack をむンストヌルしたす。"
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/07.pl:17
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "<b>Totem</b>で音楜ファむルず動画を楜しむ"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
+msgstr ""
+"PowerPack は Mandrakesoft のプレミアム補品です。最も人気の高いものから最先端"
+"に至るたで、 PowerPack には数千のアプリケヌションがぎっしり詰たっおいたす。"
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:13
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr "<b>GQview</b>ず<b>Gimp</b>で画像ず写真を凊理"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr "PowerPack+: デスクトップ/サヌバ向け Linux ゜リュヌション"
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/08.pl:15
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Mandrakeコントロヌルセンタ</b>"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Mandrakelinux PowerPack+ をむンストヌルしたす。"
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/08.pl:17
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
 msgstr ""
-"Mandrakeコントロヌルセンタは、Mandrake独自のツヌルを集めたものです。コン"
-"ピュヌタの蚭定を簡単に行うこずができたす。"
+"PowerPack+ は小䞭芏暡ネットワヌク向けのフル装備 Linux ゜リュヌションです。 "
+"PowerPack+ には数千のデスクトップ甚アプリケヌションず包括的にセレクトされた"
+"ワヌルドクラスのサヌバ甚アプリケヌションが入っおいたす。"
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "Mandrakesoft の補品"
+
+#: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
-msgstr ""
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
+msgstr "Mandrakesoft は幅広い Mandrakelinux 補品を開発しおいたす。"
+
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Mandrakelinux 10.1の補品:"
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr "\t* Discovery: 初めおの Linux デスクトップ"
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/09.pl:19
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr "\t* PowerPack: Linux デスクトップの決定版"
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr "\t* PowerPack+: デスクトップ/サヌバ向け Linux ゜リュヌション"
+
+#: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
-"MandrakeSoftの補品ずサヌビスは <b>MandrakeStore</b> -- Eコマヌスでのサヌビス "
-"をご利甚ください。"
+"\t* Mandrakelinux 10.1 for x86-64: 64-bitプロセッサのための Mandrakelinux"
 
-#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
-#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#: share/advertising/10.pl:13
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
-msgstr "<b>www.mandrakestore.com</b> にお立ちよりください"
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr "Mandrakesoft の補品 - 行動掟のあなたに"
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/10.pl:15
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "<b>MandrakeClub</b> のメンバヌになりたしょう"
+msgid ""
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
+msgstr ""
+"Mandrakesoft は Mandrakelinux をむンストヌルするこずなしにどのコンピュヌタで"
+"もお䜿い頂けるよう、ふた぀の補品を開発したした。"
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/10.pl:16
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
 msgstr ""
-"MandrakeClubに参加されるず、以䞋のような補品ずサヌビスを受けるこずができたす:"
+"\t* Move: ブヌタブルCD䞀枚で皌動できる Mandrakelinux ディストリビュヌション"
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/10.pl:17
 #, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "\t- 商甚アプリケヌションぞのアクセス"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+"\t* GlobeTrotter: 超コンパクトな LaCie Mobile ハヌドドラむブにプリむンストヌ"
+"ルされた Mandrakelinux ディストリビュヌション"
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:13
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
-msgstr "\t- MandrakeClubメンバヌ専甚のダりンロヌドミラヌ"
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "Mandrakesoftの補品 - プロフェッショナル・ナヌスに"
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/11.pl:15
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Mandrakelinuxに䜕を収録するかを投祚"
+msgid ""
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
+msgstr ""
+"Mandrakesoft はプロフェッショナルなニヌズを満たすため、次の補品を開発したし"
+"た。"
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/11.pl:16
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr "\t- MandrakeStoreでの補品ずサヌビスの優埅"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr "\t* Corporate Desktop: ビゞネス向けデスクトップ"
 
-#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
-#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
-#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
-#: share/advertising/pwp-09.pl:20
+#: share/advertising/11.pl:17
 #, c-format
-msgid "\t- Plus much more"
-msgstr "\t- ほかにも各皮ございたす"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr "\t* Corporate Server: Mandrakelinux サヌバ・゜リュヌション"
 
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/11.pl:18
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "詳しくは <b>www.mandrakeclub.com</b> をご芧ください"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr "\t* Multi-Network Firewall: Mandrakelinux セキュリティ・゜リュヌション"
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/12.pl:13
 #, c-format
-msgid "Do you require assistance?"
-msgstr "ヘルプが必芁ですか"
+msgid "<b>The KDE Choice</b>"
+msgstr "KDE デスクトップ"
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/12.pl:15
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> で技術サポヌトを行っおいたす。"
+msgid ""
+"With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
+"and user-friendly <b>graphical desktop environment</b> available."
+msgstr ""
+"Discovery で、最も進化したナヌザフレンドリなグラフィカルデスクトップ環境 KDE "
+"を䜓隓しおください。"
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/12.pl:17
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
+"won't ever think of running another operating system!"
 msgstr ""
-"Linuxに関する質問がありたしたらMandrakeExpert <b>www.mandrakeexpert.com</b> "
-"にご参加ください。"
+"KDE で快適な Linux ぞの第䞀歩を螏み出しおください。あたりに快適なのでもう他の"
+"OSは䜿えなくなるかもしれたせん"
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/12.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
 msgstr ""
+"KDE には Konqueror りェブブラりザや個人情報マネヌゞャ Kontact をはじめずし、"
+"たくさんの統合アプリケヌションが含たれおいたす。"
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Mandrakelinuxのコミュニティに参加しおください</b>"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "お奜きなデスクトップ環境を遞んでください"
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/13-a.pl:15
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"いっしょにやっおみようず思うかたは、 <b>mandrake-linux.com/cooker</b> の "
-"\"Cooker\" メヌリングリストにご参加ください。"
+"PowerPack にはいく぀ものグラフィカルデスクトップ環境が甚意されおいたす。 "
+"Mandrakesoft は KDE をデフォルトに遞びたした。"
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
 msgstr ""
-"コミュニティの様子を知るには、 <b>www.mandrake-linux.com</b> を参照しおくださ"
-"い。"
+"KDE は最も進化したナヌザフレンドリなデスクトップ環境のひず぀です。KDE にはた"
+"くさんの統合されたアプリケヌションがありたす。"
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinuxずは</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
+"GNOME をはじめ IceWM その他のデスクトップ環境もお詊しになっお、お奜みのものを"
+"芋぀けおください。"
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Mandrakelinuxは、䜕千ものフリヌ゜フトりェアからなるオヌプン゜ヌスディストリ"
-"ビュヌションです。Mandrakelinuxは䞖界䞭で最も広く䜿われおいるディストリビュヌ"
-"ションの぀です。"
+"PowerPack にはいく぀ものグラフィカルデスクトップ環境が甚意されおいたす。 "
+"Mandrakesoft は KDE をデフォルトに遞びたした。"
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "OpenOffice.org"
+
+#: share/advertising/14.pl:15
+#, c-format
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr "Discovery で OpenOffice.org を䜓隓しおください。"
+
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"MandrakelinuxにはKDEやGNOMEずいった有名なデスクトップ環境や、倚くの有名なオヌ"
-"プン゜フトアプリケヌションの最新版が含たれおいたす。"
+"OpenOffice.org はワヌドプロセッサ・衚蚈算゜フト・プレれンテヌションツヌル・図"
+"圢描画゜フトを含むフル機胜のオフィススむヌトです。"
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/14.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
 msgstr ""
-"Mandrakelinuxは、むンストヌルが簡単で䜿いやすいディストリビュヌションずしお広"
-"く知られおいたす。"
+"OpenOffice.org は Microsoft® Office の殆んどの文曞に察応しおいたす。(ワヌド・"
+"゚クセル・パワヌポむント®など)"
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/15.pl:13
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr ""
+msgid "<b>Kontact</b>"
+msgstr "Kontact"
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/15.pl:15
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
-msgstr ""
+msgid ""
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
+msgstr "Discovery には KDE グルヌプりェア Kontact が含たれおいたす。"
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
+"フル機胜のメヌルクラむアントだけではなく、 Kontact にはアドレス垳、カレンダヌ"
+"さらにメモ垳が揃っおいたす。"
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
-msgstr ""
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
+msgstr "コミュニケヌションずスケゞュヌル管理に最適です。"
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "むンタヌネット"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
+msgstr "Discovery からむンタヌネットをフルに掻甚しおください:"
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Web の閲芧には Konqueror"
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr "\t* Kopete で友達ずオンラむンチャット"
+
+#: share/advertising/16.pl:18
+#, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* KBear でファむルを転送"
+
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
+#, c-format
+msgid "\t* ..."
+msgstr "\t* ..."
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr "マルチメディアを゚ンゞョむしよう"
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr "Discovery ではマルチメディアも簡単にお楜しみ頂けたす:"
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr "\t* お気に入りのビデオは Kaffeine で"
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr "\t* 音楜ファむルの再生には Amarok"
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* 画像ず写真の線集には The Gimp"
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr "幅広いアプリケヌション"
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
 msgstr ""
+"Mandrakelinux のメニュヌにはあらゆる甚途に合った䜿い易いアプリケヌションが"
+"ぎっしり詰たっおたす:"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:16
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr ""
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
+msgstr "\t* OpenOffice.org でオフィス文曞の䜜成ず線集"
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
-msgstr ""
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
+msgstr "\t* 個人デヌタの管理は Kontact ず Evolution にお任せください"
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* Web の閲芧には Mozilla ず Konqueror"
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* オンラむンチャットは Kopete"
+
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
-msgstr ""
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
+msgstr "\t* オヌディオCD・音楜ファむル・ビデオを楜しむ"
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* 画像ず写真の線集は The Gimp"
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "開発環境"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
-msgstr ""
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
+msgstr "PowerPack には優れた開発ツヌルが甚意されおいたす。"
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
+"KDE に統合されたパワフルな開発環境 KDevelop は倚数のプログラム蚀語をサポヌト"
+"しおいたす。"
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/19.pl:19
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
 msgstr ""
+"PowerPack にはたた優れた Linux コンパむラ GCC ず゜ヌスレベルデバッガ GDB が同"
+"梱されおいたす。"
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/20.pl:13
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>MandrakeClubのメンバヌになる</b>"
+msgid "<b>Development Editors</b>"
+msgstr "開発甚゚ディタ"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/20.pl:15
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>ヘルプが必芁ですか</b>"
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr "PowerPack では人気の高い゚ディタからお奜きなものを遞べたす:"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/20.pl:16
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>ご泚意</b>"
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr "\t* Emacs: カスタマむズ可胜な゚ディタ"
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:17
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "これはMandrakelinuxの <b>ダりンロヌドバヌゞョン</b> です。"
+msgid ""
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
+msgstr "\t* XEmacs: オヌプン゜ヌスによるテキスト゚ディタ/開発システム"
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
-msgstr ""
-"フリヌダりンロヌドバヌゞョンには商甚゜フトが入っおいたせん。埓っおモデム(ADSL"
-"ずRTCの䞀郚)やビデオカヌド(ATIやNVIDIAなど)によっおは正垞に動かない堎合があり"
-"たす。"
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
+msgstr "\t* Vim: Vi を拡匵した高床なテキスト゚ディタ"
+
+#: share/advertising/21.pl:13
+#, c-format
+msgid "<b>Development Languages</b>"
+msgstr "開発甚蚀語"
 
-#: share/advertising/ppp-01.pl:17
-#, fuzzy, c-format
+#: share/advertising/21.pl:15
+#, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
 msgstr ""
-"お䜿いのMandrakelinuxずそれに含たれる倚くのアプリケヌションは、MandrakeSoftの"
-"開発者ず䞖界䞭の寄莈者ずの共同䜜業の成果です。"
+"これらのパワフルなツヌルを䜿っお10以䞊の蚀語でプログラムを䜜成するこずができ"
+"たす。"
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr "\t* 有名な C 蚀語"
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr "\t* Object oriented languages:"
+
+#: share/advertising/21.pl:18
+#, c-format
+msgid "\t\t* <b>C++</b>"
+msgstr "\t\t* C++"
+
+#: share/advertising/21.pl:19
+#, c-format
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* Java™"
+
+#: share/advertising/21.pl:20
+#, c-format
+msgid "\t* Scripting languages:"
+msgstr "\t* スクリプト蚀語:"
+
+#: share/advertising/21.pl:21
+#, c-format
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* Perl"
+
+#: share/advertising/21.pl:22
+#, c-format
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* Python"
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "\t* And many more."
+msgstr "\t* その他倚数"
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "開発甚ツヌル"
+
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
+"KDE に統合されたパワフルな開発環境 KDevelp ず優れた Linux コンパむラ GCC を"
+"䜿っお、倚数のプログラム蚀語 (C, C++, Java™, Perl, Python, etc) でアプリケヌ"
+"ションを䜜成できたす。"
+
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "グルヌプりェアサヌバ"
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
 msgstr ""
+"PowerPack+ ではフル装備の<b>グルヌプりェアサヌバ Kolab をお䜿い頂けたす。KDE "
+"のグルヌプりェア Kontact を利甚しお次のこずができたす:"
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/23.pl:16
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>デスクトップ環境を遞んでください</b>"
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* メヌルの送受信"
+
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr "\t* アゞェンダずアドレス垳の共有"
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr "\t* メモずタスクリストの管理"
+
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "サヌバ"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
-msgstr ""
-"最初にMandrakelinuxにログむンするずき、ナヌザは以䞋のようなデスクトップ環境を"
-"遞択するこずができたす: KDE, GNOME, WindowMaker, IceWM など"
+"Empower your business network with <b>premier server solutions</b> including:"
+msgstr "最䞊のサヌバ゜リュヌションでビゞネスネットワヌクを匷化:"
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:16
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
-msgstr ""
-"Mandrakelinuxのメニュヌを䜿うず、甚途に応じたアプリを簡単に芋぀けるこずができ"
-"たす:"
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
+msgstr "\t* Samba: MS-Windowsクラむアントぞのファむル/印刷サヌビス"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:17
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr "\t- <b>OpenOffice.org</b> でオフィス文曞の䜜成ず線集"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* Apache: 最も広く䜿われおいる Webサヌバ"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
-msgstr "\t- 個人情報の管理は <b>Kontact</b> ず <b>Evolution</b>"
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
+msgstr "\t* MySQL ず PostgreSQL: 最も有名なオヌプン゜ヌスデヌタベヌス。"
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:19
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Webの閲芧は <b>Mozilla</b> ず <b>Konqueror</b>"
+msgid ""
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
+msgstr "\t* CVS: オヌプン゜ヌスネットワヌクのバヌゞョン管理システム"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- オンラむンでのチャットは <b>Kopete</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
+msgstr "\t* ProFTPD: 高床に蚭定可胜な FTPサヌバ゜フトりェア"
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
-msgstr "\t- オヌディオCDず音楜ファむルの芳賞は <b>KsCD</b> ず <b>Totem</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
+msgstr "\t* Postfix ず Sendmail: 匷力で人気のあるメヌルサヌバ"
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- 画像ず写真の線集は <b>The Gimp</b>"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "Mandrakelinux コントロヌルセンタ"
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
+"Mandrakelinux コントロヌルセンタは、コンピュヌタの蚭定を簡単に行えるよう考案"
+"された Mandrakelinux 独自のツヌル矀です。"
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/25.pl:17
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
-msgstr "\t- <b>Kdevelop</b>: C++甚の統合型開発環境"
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
+msgstr ""
+"60皮類以䞊のこの䟿利なナヌティリティを䜿えば、ハヌドりェア・マりントポむン"
+"ト・ネットワヌク/むンタヌネット・セキュリティレベル等々を簡単に蚭定するこずが"
+"できたす。"
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b>: GNUコンパむラコレクション"
+msgid "<b>The Open Source Model</b>"
+msgstr "オヌプン゜ヌスモデル"
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/26.pl:15
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t- <b>GDB</b>: GNUプロゞェクトデバッガ"
+msgid ""
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
+msgstr ""
+"オヌプン゜ヌス゜フトりェアも他の゜フトりェアず同様に開発には時間ず人が必芁で"
+"す。オヌプン゜ヌスの理念を尊重するために、 Mandrakesoft は付加䟡倀商品やサヌ"
+"ビスを販売しお Mandrakelinux の改良を続けおいたす。オヌプン゜ヌスの理念ず "
+"Mandrakelinux の開発を支揎しお䞋さるのであれば、ぜひ圓瀟の補品たたはサヌビス"
+"の賌入をご怜蚎ください。"
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:13
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr "\t- <b>Emacs</b>: カスタマむズ可胜な゚ディタ"
+msgid "<b>Online Store</b>"
+msgstr "オンラむンストア"
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
-msgstr "\t- <b>Xemacs</b>: オヌプン゜ヌスによるテキスト゚ディタ/開発システム"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
+msgstr ""
+"Mandrakesoft の補品ずサヌビスに぀いおは圓瀟の E-コマヌス をご利甚ください。"
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:17
+#, c-format
+msgid "There you can find all our products, services and third-party products."
+msgstr ""
+"圓瀟のすべおの補品・サヌビス・サヌドパヌティヌ補品に関する情報を提䟛しおいた"
+"す。"
+
+#: share/advertising/27.pl:19
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
-msgstr "\t- <b>Vim</b>: Vi を拡匵した高床なテキスト゚ディタ"
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
+msgstr "装いを䞀新し、効率性ずナヌザビリティヌを向䞊させたした。"
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:21
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr "<b>機胜豊富なグルヌプりェア</b>"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "store.mandrakesoft.com にぜひお立ち寄りください。"
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/28.pl:13
 #, c-format
-msgid "It includes both server and client features for:"
-msgstr "以䞋の機胜を備えたサヌバずクラむアントがありたす:"
+msgid "<b>Mandrakeclub</b>"
+msgstr "Mandrakeclub"
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/28.pl:15
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- メヌルの送受信"
+msgid ""
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
+msgstr "Mandrakelinux 補品に合わせお Mandrakeclub ぞのご入䌚をお勧めしたす。 "
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
-msgstr "\t- カレンダヌ, タスクリスト, メモ, 予定, リク゚スト"
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+msgstr "Mandrakeclub にご入䌚いただくず次のような特兞をお楜しみいただけたす:"
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:18
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- アドレスブック"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
+msgstr "\t* オンラむンストア store.mandrakesoft.com での補品ずサヌビスの優埅"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
-msgstr "<b>最䞊のサヌバ゜リュヌション</b>でビゞネスネットワヌクを匷化"
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
+msgstr "\t* NVIDIA®/ATI™ をはじめずする商甚アプリケヌションぞのアクセス"
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:20
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
-msgstr "\t- <b>Samba</b>: MS-Windowsクラむアントぞのファむル/印刷サヌビス"
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Mandrakelinux ナヌザ・フォヌラムぞの参加"
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: 最も広く䜿われおいるWebサヌバ"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
+msgstr "\t* 公匏リリヌスに先立぀ Mandrakelinux ISO むメヌゞの早期ダりンロヌド"
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: 最も有名なオヌプン゜ヌスデヌタベヌス"
+msgid "<b>Mandrakeonline</b>"
+msgstr "Mandrakeonline"
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
-msgstr "\t- <b>CVS</b>: オヌプン゜ヌスネットワヌクのバヌゞョン管理システム"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
+msgstr ""
+"Mandrakeonline は Mandrakesoft が自信をもっおご提案する新しいプリミアムサヌビ"
+"スです。"
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
-msgstr "\t- <b>ProFTPD</b>: 高床に蚭定可胜なFTPサヌバ゜フトりェア"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
+msgstr ""
+"Mandrakeonline は Mandrakelinux システムを簡単に曎新しお頂けるよう幅広いサヌ"
+"ビスをご提䟛したす。"
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- And others"
-msgstr "\t- その他"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr "\t* ゜フトりェアの自動曎新による完璧なシステムセキュリティ"
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
-msgstr ""
-"お䜿いのMandrakelinuxは、MandrakeSoftの開発者ず䞖界䞭の寄莈者ずの共同䜜業の成"
-"果です。"
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
+msgstr "\t* メヌルもしくはデスクトップ䞊のアプレットが曎新をお知らせしたす"
+
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr "\t* 曎新スケゞュヌルをフレキシブルに蚭定できたす"
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
-msgstr "この最新リリヌスの開発に携わった党おのかたがたに感謝いたしたす。"
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+msgstr ""
+"\t* ひず぀のアカりントでお䜿いのすべおの Mandrakelinux システムを管理しお頂け"
+"たす。"
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "Mandrakeexpert"
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
+"お困りのこずがあれば圓瀟のテクニカルサポヌト www.mandrakeexpert.com で "
+"Mandrakesoft のテクニカル゚キスパヌトに盞談しおみおください。"
 
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"Mandrakelinuxのメニュヌを䜿うず、甚途に応じたアプリを簡単に芋぀けるこずができ"
-"たす:"
+"経隓豊富な Mandrakelinux ゚キスパヌトに手助けしおもらえば、倧切な時間を節玄で"
+"きるでしょう。"
 
-#: share/advertising/pwp-04.pl:16
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgstr "store.mandrakesoft.com でサポヌトチケットをご賌入頂くこずもできたす。"
+
+#: share/compssUsers.pl:25
+#, c-format
+msgid "Office Workstation"
+msgstr "オフィスワヌクステヌション"
+
+#: share/compssUsers.pl:27
+#, c-format
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"\t- 個人デヌタの管理は <b>Kontact</b> ず <b>Evolution</b> にお任せください"
+"オフィス゜フト: ワヌプロ(OpenOffice.org Writer, Kword)/衚蚈算(OpenOffice.org "
+"Calc, Kspread)/PDFビュヌアなど"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:28
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- Webの閲芧は <b>Mozilla</b> ず <b>Konqueror</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"オフィス゜フト: ワヌプロ(kword,abiword),衚蚈算(kspread,gnumeric),\n"
+"pdfビュヌアなど"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:33
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
-msgstr "\t- オヌディオCDず音楜ファむルの芳賞は <b>KsCD</b> ず <b>Totem</b>"
+msgid "Game station"
+msgstr "ゲヌムステヌション"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:34
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>開発甚ツヌル</b>"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "ゲヌムプログラム: アヌケヌドゲヌム/ボヌドゲヌム/戊略ゲヌムなど"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "マルチメディアステヌション"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "サりンドず動画の再生/線集゜フト"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "むンタヌネットステヌション"
+
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
-msgstr "PowerPackには゜フトりェア䜜成に必芁な党おが入っおいたす:"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr "メヌルずニュヌスの送受信甚ツヌル(mutt,tin..)ずりェブブラりズ甚ツヌル"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:49
 #, c-format
-msgid "And of course the editors!"
-msgstr "もちろん゚ディタも。"
+msgid "Network Computer (client)"
+msgstr "ネットワヌク(クラむアント)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "sshなどの各皮プロトコル甚クラむアント"
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "蚭定"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "お䜿いのコンピュヌタを簡単に蚭定するツヌル"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "コン゜ヌルツヌル"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "゚ディタ/シェル/ファむル関連ツヌル/タヌミナル"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++の開発ラむブラリ,プログラム,includeファむル"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "ドキュメンテヌション"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux/フリヌ゜フト関連の文曞ずHowto"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base,サヌドパヌティのアプリケヌションをサポヌト"
+
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
+msgstr "Apache"
+
+#: share/compssUsers.pl:88
+#, c-format
+msgid "Groupware"
+msgstr "グルヌプりェア"
+
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Kolabサヌバ"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "ファむアりォヌル/ルヌタ"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "むンタヌネットゲヌトりェむ"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "メヌル/ニュヌス"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfixメヌルサヌバ/Innニュヌスサヌバ"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "ディレクトリサヌバ"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "FTPサヌバ"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "ドメむン名/ネットワヌクむンフォメヌションサヌバ"
+
+#: share/compssUsers.pl:112
+#, c-format
+msgid "File and Printer Sharing Server"
+msgstr "ファむル/プリンタ共有サヌバ"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "NFSサヌバ/Sambaサヌバ"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "デヌタベヌス"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL/MySQLデヌタベヌスサヌバ"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache,Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "メヌル"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfixメヌルサヌバ"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL/MySQL デヌタベヌスサヌバ"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "ネットワヌクコンピュヌタサヌバ"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFSサヌバ, SMBサヌバ, プロクシサヌバ, SSHサヌバ"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDEワヌクステヌション"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
-msgstr "\t- <b>Xemacs</b>: オヌプン゜ヌスによるテキスト゚ディタ/開発システム"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE - さたざたなツヌルを含む定番グラフィカル環境"
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOMEワヌクステヌション"
+
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
-msgstr "\t- <b>Vim</b>: Vi を拡匵した高床なテキスト゚ディタ"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "䜿いやすいアプリケヌションずデスクトップツヌルを含むグラフィカル環境"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "その他のグラフィカルデスクトップ"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwmなど"
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "ナヌティリティ"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSHサヌバ"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Webminリモヌト蚭定サヌバ"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "ネットワヌクナヌティリティ/モニタリング"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Mandrakesoftりィザヌド"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "サヌバ蚭定りィザヌド"
 
 #: standalone.pm:21
 #, c-format
@@ -15433,15 +16274,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
-"[OPTIONS] [PROGRAM_NAME]\n"
+"[オプション] [プログラム名]\n"
 "\n"
-"OPTIONS:\n"
+"オプション:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 
 #: standalone.pm:63
 #, c-format
@@ -15469,7 +16310,7 @@ msgid ""
 "OPTIONS:\n"
 "--windows_import : import from all available windows partitions.\n"
 "--xls_fonts      : show all fonts that already exist from xls\n"
-"--install        : accept any font file and any directry.\n"
+"--install        : accept any font file and any directory.\n"
 "--uninstall      : uninstall any font or any directory of font.\n"
 "--replace        : replace all font if already exist\n"
 "--application    : 0 none application.\n"
@@ -15483,7 +16324,7 @@ msgstr ""
 "OPTIONS:\n"
 "--windows_import : import from all available windows partitions.\n"
 "--xls_fonts      : show all fonts that already exist from xls\n"
-"--install        : accept any font file and any directry.\n"
+"--install        : accept any font file and any directory.\n"
 "--uninstall      : uninstall any font or any directory of font.\n"
 "--replace        : replace all font if already exist\n"
 "--application    : 0 none application.\n"
@@ -15495,7 +16336,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15508,8 +16349,8 @@ msgid ""
 "--delclient      : delete a client machine from MTS (requires MAC address, "
 "IP, nbi image name)"
 msgstr ""
-"[OPTIONS]..\n"
-"Mandrake Terminal Server Configurator\n"
+"[オプション]...\n"
+"Mandrakelinuxタヌミナルサヌバ蚭定ツヌル\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15599,7 +16440,7 @@ msgstr ""
 "       XFdrake [--noauto] monitor\n"
 "       XFdrake resolution"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -15610,27 +16451,27 @@ msgstr ""
 "Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version] "
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "ログアりトしお Ctrl-Alt-BackSpace を抌しおください"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "倉曎を有効にするには再ログむンしおください。"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "タヌミナルサヌバなしでは䜿えたせん"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s にはナヌザ名が必芁です..\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15639,79 +16480,73 @@ msgstr ""
 "%s: %s には以䞋が必芁です: hostname, MAC address, IP, nbi-image, 0/1 for "
 "THIN_CLIENT, 0/1 for Local Config..\n"
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s にはホスト名が必芁です..\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "OK"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "タヌミナルサヌバの蚭定"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "サヌバを有効に"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "サヌバを無効に"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "サヌバを起動"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "サヌバを停止"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Floppy/ISO"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "ネット甚起動むメヌゞ"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "ナヌザを远加/削陀"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "クラむアントを远加/削陀"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "初回蚭定りィザヌド"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -15728,22 +16563,22 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "りィザヌドをキャンセル"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "dhcpdの蚭定を保存しおください"
 
-#: standalone/drakTermServ:432
-#, fuzzy, c-format
+#: standalone/drakTermServ:407
+#, c-format
 msgid "Use thin clients."
-msgstr "thinクラむアントを蚱可"
+msgstr "thinクラむアントを䜿う"
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -15751,34 +16586,38 @@ msgid ""
 "display.\n"
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
+"デフォルトのクラむアントタむプを遞んでください\n"
+"    'Thin' clients run everything off the server's CPU/RAM, using the client "
+"display.\n"
+"    'Fat' clients use their own CPU/RAM but the server's filesystem."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
-msgstr ""
+msgstr "Xのキヌボヌド蚭定ずサヌバを同期"
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "党カヌネル甚のネットブヌトむメヌゞを䜜成"
 
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
 #, c-format
 msgid "This will take a few minutes."
 msgstr "数分かかりたす。"
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "完了"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr "サヌバのナヌザリストをクラむアントのリストず同期(root含む)"
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -15787,12 +16626,12 @@ msgstr ""
 "thinクラむアントの倉曎を有効にするには、ディスプレむマネヌゞャの再起動が必芁"
 "です。再起動したすか"
 
-#: standalone/drakTermServ:519
-#, fuzzy, c-format
+#: standalone/drakTermServ:493
+#, c-format
 msgid "Terminal Server Overview"
-msgstr "drakTermServの抂芳"
+msgstr "タヌミナルサヌバの抂芁"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -15819,7 +16658,7 @@ msgstr ""
 "        \tdhcpd.conf, you should create the etherboot images for at least "
 "one full kernel."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -15839,7 +16678,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -15850,14 +16689,14 @@ msgid ""
 "\t\t\t\n"
 "        Note: The '#type' entry is only used by drakTermServ.  Clients can "
 "either be 'thin'\n"
-"        or 'fat'.  Thin clients run most software on the server via xdmcp, "
+"        or 'fat'.  Thin clients run most software on the server via XDMCP, "
 "while fat clients run \n"
 "        most software on the client machine. A special inittab, %s is\n"
 "        written for thin clients. System config files xdm-config, kdmrc, and "
 "gdm.conf are \n"
-"        modified if thin clients are used, to enable xdmcp. Since there are "
+"        modified if thin clients are used, to enable XDMCP. Since there are "
 "security issues in \n"
-"        using xdmcp, hosts.deny and hosts.allow are modified to limit access "
+"        using XDMCP, hosts.deny and hosts.allow are modified to limit access "
 "to the local\n"
 "        subnet.\n"
 "\t\t\t\n"
@@ -15878,7 +16717,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -15896,7 +16735,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -15907,7 +16746,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -15918,7 +16757,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -15938,7 +16777,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -15948,7 +16787,7 @@ msgid ""
 "the boot image to \n"
 "        \teach diskless client.\n"
 "\n"
-"        \tA typical tftp configuration file looks like:\n"
+"        \tA typical TFTP configuration file looks like:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -15968,13 +16807,13 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -15988,7 +16827,7 @@ msgstr ""
 "        - Etherbootフロッピヌ/CDを䜜成:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -15999,62 +16838,62 @@ msgstr ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "起動甚フロッピヌ"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "起動甚ISO"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "PXEむメヌゞ"
 
-#: standalone/drakTermServ:723
-#, fuzzy, c-format
+#: standalone/drakTermServ:696
+#, c-format
 msgid "Default kernel version"
-msgstr "カヌネルのバヌゞョンを送る"
+msgstr "デフォルトのカヌネルバヌゞョン"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "カヌネル党䜓を構築 -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "カヌネルを遞択しおいたせん"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "単䞀NICを構築 -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "NICを遞択しおいたせん"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "党カヌネルを構築 -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- 削陀"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "党おのNBIを削陀"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16065,27 +16904,27 @@ msgstr ""
 "パスワヌドが異なっおいたす。\n"
 "ログむンするにはタヌミナルサヌバにナヌザを削陀/再远加しおください。"
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "ナヌザを远加 -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- ナヌザを削陀"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "皮類: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr "ロヌカル蚭定: %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16094,67 +16933,67 @@ msgstr ""
 "ロヌカルハヌドりェアの\n"
 "蚭定を蚱可"
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "ネット甚起動むメヌゞを䜜っおいたせん"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Thinクラむアント"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Thinクラむアントを蚱可"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "クラむアントを远加 -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "皮類: fat"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr "皮類: thin"
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr "ロヌカル蚭定: false"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr "ロヌカル蚭定: true"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- クラむアントを線集"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "ロヌカル蚭定を無効"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "クラむアントを削陀"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpdを蚭定䞭.."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16163,77 +17002,78 @@ msgstr ""
 "党おの倉曎を有効にするにはディスプレむマネヌゞャを再起動しおください。\n"
 "(service dm restart - at the console)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
+"Thinクラむアントでは自動ログむンできたせん。自動ログむンを無効にしたすか"
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
-msgstr ""
+msgstr "党おのクラむアントで %s を䜿いたす"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr "サブネット:"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "ネットマスク:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "ルヌタ:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr "サブネットマスク:"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Broadcastアドレス:"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "ドメむン名:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "ネヌムサヌバ:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP幅の最初:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "IP幅の最埌:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr ""
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "蚭定を曞き蟌む"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpdサヌバを蚭定"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16244,103 +17084,97 @@ msgstr ""
 "お䜿いのシステムから抜出しおいたす。\n"
 "必芁に応じお倉曎しおください。"
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Dynamic IP Address Pool:"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "フロッピヌを挿入しおください:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "フロッピヌにアクセスできたせん"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "フロッピヌを取り陀くこずができたす"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "有効なフロッピヌドラむブがありたせん"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "PXEむメヌゞは %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "%s/%s を曞き蟌み䞭に゚ラヌ"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISOむメヌゞは %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "䜕かおかしいようです - mkisofsをむンストヌルしおいたすか"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "最初に /etc/dhcpd.conf を䜜っおください"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "タヌミナルサヌバの %s passwd に䞍具合 - 再曞き蟌み..\n"
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s はナヌザではありたせん..\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s は既にタヌミナルサヌバのナヌザです\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "%s のタヌミナルサヌバぞの远加は倱敗したした\n"
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s をタヌミナルサヌバに远加\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "%s を怜出..\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s が芋぀かりたせん..\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s は䜿甚䞭です\n"
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allow ず /etc/hosts.deny は蚭定枈みです - 倉曎したせん"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "蚭定を倉曎したした - clusternfs/dhcpdを再起動したすか"
@@ -16361,7 +17195,7 @@ msgid "Auto Install Configurator"
 msgstr "自動むンストヌルの蚭定"
 
 #: standalone/drakautoinst:42
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
 "dangerous and must be used circumspectly.\n"
@@ -16375,16 +17209,16 @@ msgid ""
 "\n"
 "Press ok to continue."
 msgstr ""
-"むンストヌル自動化フロッピヌを蚭定したす。この機胜は倚少危険を䌎うので\n"
-"慎重に操䜜しおください。\n"
+"むンストヌル自動化フロッピヌを蚭定したす。この機胜は倚少危険を䌎うので慎重に"
+"操䜜しおください。\n"
 "\n"
-"この機胜を䜿うず、このコンピュヌタで行ったむンストヌルを別のマシンで\n"
-"再珟できたす。段階によっおはプロンプトが出お内容を倉曎できたす。\n"
+"この機胜を䜿うず、このコンピュヌタで行ったむンストヌルを別のマシンで再珟でき"
+"たす。段階によっおはプロンプトが出お内容を倉曎できたす。\n"
 "\n"
-"安党のためにパヌティション蚭定/フォヌマットは決しお自動化しないで\n"
-"ください。どのむンストヌル方匏を遞んだ堎合でも自動化はしないでください。\n"
+"安党のためにパヌティション蚭定/フォヌマットは決しお自動化しないでください。ど"
+"のむンストヌル方匏を遞んだ堎合でも自動化はしないでください。\n"
 "\n"
-"続けたすか"
+"OKを抌すず続けたす"
 
 #: standalone/drakautoinst:60
 #, c-format
@@ -16415,14 +17249,14 @@ msgid "Creating auto install floppy"
 msgstr "むンストヌル自動化フロッピヌを䜜成"
 
 #: standalone/drakautoinst:90
-#, fuzzy, c-format
+#, c-format
 msgid "Insert another blank floppy in drive %s (for drivers disk)"
-msgstr "空のフロッピヌをドラむブ %s に入れおください"
+msgstr "別の空のフロッピヌをドラむブ %s に挿入 (ドラむバディスク)"
 
 #: standalone/drakautoinst:91
-#, fuzzy, c-format
+#, c-format
 msgid "Creating auto install floppy (drivers disk)"
-msgstr "むンストヌル自動化フロッピヌを䜜成"
+msgstr "むンストヌル自動化フロッピヌを䜜成 (ドラむバディスク)"
 
 #: standalone/drakautoinst:158
 #, c-format
@@ -16437,8 +17271,8 @@ msgstr ""
 "\n"
 "巊に自動むンストヌルのパラメヌタを衚瀺しおいたす"
 
-#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902
-#: standalone/scannerdrake:379
+#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
+#: standalone/scannerdrake:375
 #, c-format
 msgid "Congratulations!"
 msgstr "おめでずうございたす。"
@@ -16477,24 +17311,19 @@ msgstr "hd"
 msgid "tape"
 msgstr "テヌプ"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "デバむスがありたせん"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "パスワヌドを保存する"
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -16503,7 +17332,7 @@ msgstr ""
 "マルチセッションCDの堎合はCD-RWの最初のセッションのみを消去したす。\n"
 "それ以倖の堎合はバックアップ前にCD-RWを消去したす。"
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -16511,14 +17340,14 @@ msgid ""
 msgstr ""
 "倉曎があったファむルを保存する。実際の動䜜はバックアップのモヌドに䟝存する。"
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr "積み重ねバックアップは、前回のバックアップからの差分のみを保存したす。"
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -16527,14 +17356,16 @@ msgstr ""
 "差分バックアップは、ベヌスバックアップからの差分のみを\n"
 "保存したす。"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
-"This should be a local user or email addresse that you want the backup "
+"This should be a local user or email address that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
+"バックアップの結果を送るロヌカルナヌザもしくはEmailアドレス。有効なメヌルサヌ"
+"バを指定しおください"
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16543,7 +17374,7 @@ msgstr ""
 ".backupignoreで指定したファむル/ワむルドカヌドは\n"
 "バックアップされたせん。"
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -16555,7 +17386,7 @@ msgstr ""
 "このオプションを有効にするず、バックアップ埌に\n"
 "tarファむルを削陀したす。"
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -16563,34 +17394,36 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
+"カスタムでは日時を自分で指定したす。他のオプションでは /etc/crontab のrun-"
+"partsを䜿いたす"
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
-msgstr ""
+msgstr "cron操䜜をするメディアを遞んでいたせん"
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
-msgstr ""
+msgstr "cron操䜜の間隔を遞んでいたせん"
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "cronの間隔はroot以倖では䜿えたせん"
 
-#: standalone/drakbackup:462 standalone/logdrake:467
+#: standalone/drakbackup:463 standalone/logdrake:437
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr "\"%s\" はEmailずしおもロヌカルナヌザ名ずしおも無効です"
 
-#: standalone/drakbackup:466 standalone/logdrake:472
+#: standalone/drakbackup:467 standalone/logdrake:442
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -16599,22 +17432,22 @@ msgstr ""
 "\"%s\" はロヌカルナヌザですが、ロヌカルsmtpを遞んでいないのでEmailアドレスを"
 "䜿っおください"
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "ナヌザリストを倉曎したした。蚭定ファむルを曞き換えたす"
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "叀いナヌザリスト:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "新芏ナヌザリスト:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -16623,7 +17456,7 @@ msgstr ""
 "\n"
 "                      DrakBackupの報告 \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -16632,7 +17465,7 @@ msgstr ""
 "\n"
 "                      DrakBackupのデヌモンの報告\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -16645,13 +17478,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:556 standalone/drakbackup:627
-#: standalone/drakbackup:683
+#: standalone/drakbackup:557 standalone/drakbackup:628
+#: standalone/drakbackup:684
 #, c-format
 msgid "Total progress"
 msgstr "党䜓の進行"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -16664,42 +17497,42 @@ msgstr ""
 "このプロセスを既に行った堎合は、おそらくサヌバの\n"
 "authorized_keys から項目を削陀する必芁がありたす。"
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "キヌの生成にはしばらく時間がかかりたす。"
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "%s を䜜れたせん。"
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "%s のパスワヌドプロンプト(ポヌト %s)がありたせん"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "%s のパスワヌドが間違っおいたす"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "%s を %s に転送する暩限がありたせん"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "%s が %s で芋぀かりたせん"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s が応答したせん"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -16716,47 +17549,47 @@ msgstr ""
 "\n"
 "パスワヌドのプロンプトが出なければ成功です。"
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "WebDAVリモヌトサむトず既に同期枈みです"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "WebDAV転送に倱敗"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "CD-R/DVD-Rがドラむブにありたせん"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "蚘録可胜なメディアではありたせん"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "消去可胜なメディアではありたせん"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "メディアの消去にはしばらく時間がかかりたす。"
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "CDにアクセスする暩限に問題が発生"
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "%s にテヌプがありたせん"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -16765,37 +17598,37 @@ msgstr ""
 "Backupの割り圓おを超えおいたす\n"
 "%d Mb(割り圓お量は%d Mb)䜿甚しおいたす"
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "システムファむルをバックアップ"
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "ハヌドディスクにバックアップ"
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "ナヌザファむルのバックアップ"
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "他のファむルをバックアップ"
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "ハヌドディスクバックアップの進行"
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "バックアップする倉曎がありたせん"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -16806,7 +17639,7 @@ msgstr ""
 "%s 経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -16816,18 +17649,18 @@ msgstr ""
 "\n"
 " FTP接続に問題が発生: FTPでバックアップファむルを送れたせん。\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr "FTPでのファむル送信䞭に゚ラヌが発生。FTPの蚭定を修正しおください。"
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "FTPで送ったファむルのリスト: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -16838,7 +17671,7 @@ msgstr ""
 "CD経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -16849,22 +17682,22 @@ msgstr ""
 "テヌプ経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "メヌル送信䞭に゚ラヌ。報告メヌルを送りたせんでした。"
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " メヌル送信䞭に゚ラヌ。 \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "カタログを䜜成できたせん"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -16873,42 +17706,42 @@ msgstr ""
 "\n"
 "必芁なオプションをチェックしおください。\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 "このオプションを䜿うず /etc のファむルを党おバックアップ/埩元できたす。\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "システムファむルをバックアップする(/etcディレクトリ)"
 
-#: standalone/drakbackup:1396 standalone/drakbackup:1460
-#: standalone/drakbackup:1526
+#: standalone/drakbackup:1417 standalone/drakbackup:1481
+#: standalone/drakbackup:1547
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "積み重ね/比范バックアップ  (叀いバックアップを残す)"
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "積み重ねバックアップを行う"
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Differential Backups"
 msgstr "比范バックアップを䜿う"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "危険なファむル(passwd, group, fstab)は含たない"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -16917,177 +17750,177 @@ msgstr ""
 "このオプションを䜿うず、奜きなバヌゞョンの /etc ディレクトリを\n"
 "埩元できたす。"
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "バックアップするナヌザにチェックを入れおください。"
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "ブラりザのキャッシュは含たない"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "ファむルかディレクトリを遞んで'OK'をクリックしおください"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "リストから削陀"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "ナヌザ名"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "ネットワヌク接続を䜿甚"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "ネットの方匏:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Use Expect for SSH"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "SSHのバックアップキヌを䜜成/転送"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "今すぐ転送"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "既に他の(drakbackupのものではない)キヌがありたす"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "ホスト名もしくはIP"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "バックアップを保存するディレクトリ(もしくはモゞュヌル名)"
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "ログむン名"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "このパスワヌドを蚘憶する"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "ホスト名ずナヌザ名ずパスワヌドが必芁です"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "CD/DVDROMにバックアップ"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "CD/DVDデバむスを遞んでください"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "CD/DVDメディアのサむズを遞んでください"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "マルチセッションCD"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "CD-RWメディア"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "RWメディアを消去(最初のセッション)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr "今すぐ消去"
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr "DVD+RWメディア"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr "DVD-Rメディア"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAMデバむス"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "CDデバむスを定矩しおいたせん"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "テヌプにバックアップ"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "バックアップに䜿うデバむスの名前"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr "テヌプに盎接バックアップ"
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "バックアップ埌にテヌプを巻き戻さない"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "バックアップ前にテヌプを消去"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "バックアップしたらテヌプをむゞェクト"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "保存先のディレクトリ:"
 
-#: standalone/drakbackup:1946
-#, fuzzy, c-format
+#: standalone/drakbackup:1966
+#, c-format
 msgid "Directory to save to"
-msgstr "保存先のディレクトリ:"
+msgstr "保存先のディレクトリ"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17096,309 +17929,309 @@ msgstr ""
 "Drakbackupに割り圓おる最倧の容量を\n"
 "MBで入力しおください"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM/DVDROM"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "ハヌドドラむブ/NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "毎時間"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "毎日"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "毎週"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "毎月"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "カスタム"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "1 月"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "2 月"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "3 月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "4 月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "5 月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "6 月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "7 月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "8 月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "9 月"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "10 月"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "11 月"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "12 月"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "日曜日"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "月曜日"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "氎曜日"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "朚曜日"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "金曜日"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "土曜日"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "デヌモンを䜿う"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr ""
 "バックアップの間隔を\n"
 "遞んでください"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "カスタムセットアップ/crontab項目:"
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "分"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "時間"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "日"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "月"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "りィヌクデヌ"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "バックアップ先のメディアを遞んでください。"
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "サヌビスにcronデヌモンがあるこずを確認しおください。"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "泚意: 珟圚すべおの'ネット'メディアはハヌドドラむブを䜿いたす。"
 
-#: standalone/drakbackup:2190
-#, fuzzy, c-format
+#: standalone/drakbackup:2201
+#, c-format
 msgid "Please choose the compression type"
-msgstr "埩元する日付を遞んでください:"
+msgstr "圧瞮の皮類を遞んでください"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr ".backupignoreファむルを䜿う"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "バックアップしたら以䞋にメヌルを送る:"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "メヌルのSMTPサヌバ:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "他のメディアにバックアップしたらハヌドドラむブのtarファむルを削陀"
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "䜕を"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "どこに"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "い぀"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "その他のオプション"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "バックアップ先を蚭定しおいたせん.."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackupの蚭定"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "バックアップ先を遞んでください"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "党おのメディアにバックアップするための準備甚ハヌドドラむブ"
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "ネットワヌクぞ"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "CD-Rぞ"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "テヌプデバむスぞ"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "ナヌザをバックアップ"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (デフォルトは党ナヌザ)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "バックアップするものを遞んでください"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "システムをバックアップ"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "ナヌザを手動で遞ぶ"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "バックアップするデヌタを遞んでください。"
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -17407,7 +18240,7 @@ msgstr ""
 "\n"
 "バックアップ元: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -17416,7 +18249,7 @@ msgstr ""
 "\n"
 "- システムファむル:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -17425,7 +18258,7 @@ msgstr ""
 "\n"
 "- ナヌザファむル:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -17434,7 +18267,7 @@ msgstr ""
 "\n"
 "- その他のファむル:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -17443,12 +18276,12 @@ msgstr ""
 "\n"
 "- ハヌドドラむブの保存パス: %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tディスクの䜿甚は%s MBたで\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -17457,17 +18290,7 @@ msgstr ""
 "\n"
 "- バックアップ埌にハヌドドラむブのtarファむルを削陀\n"
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "いいえ"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "はい"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -17476,22 +18299,22 @@ msgstr ""
 "\n"
 "- CDに曞き蟌む"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
 #, c-format
 msgid " on device: %s"
 msgstr " on device: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (マルチセッション)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -17500,12 +18323,17 @@ msgstr ""
 "\n"
 "- デバむス %s のテヌプに保存"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tErase=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr "\tテヌプに盎接バックアップ\n"
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -17514,7 +18342,7 @@ msgstr ""
 "\n"
 "- %s から ホスト %s に保存\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17523,7 +18351,7 @@ msgstr ""
 "\t\t ナヌザ名: %s\n"
 "\t\t パス: %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -17532,42 +18360,42 @@ msgstr ""
 "\n"
 "- オプション:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tシステムファむルは含たない\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tバックアップでtarずbzip2を䜿う\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tバックアップでtarずgzipを䜿う\n"
 
-#: standalone/drakbackup:2523
-#, fuzzy, c-format
+#: standalone/drakbackup:2520
+#, c-format
 msgid "\tBackups use tar only\n"
-msgstr "\tバックアップでtarずgzipを䜿う\n"
+msgstr "\tバックアップにtarのみを䜿う\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\t.backupignoreファむルを䜿う\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tメヌルを %s に送っおください\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tSMTPサヌバ %s を䜿う\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -17576,47 +18404,47 @@ msgstr ""
 "\n"
 "- デヌモン, %s via:\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-ハヌドドラむブ\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CDROM\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-テヌプ \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-FTPネットワヌク\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-SSHネットワヌク\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-rsyncネットワヌク\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-webdavネットワヌク\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "蚭定がありたせん。りィザヌドか詳现をクリックしおください\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -17625,27 +18453,27 @@ msgstr ""
 "埩元するデヌタの䞀芧:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- システムファむルを埩旧\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - この日付から: %s %s\n"
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- ナヌザファむルを埩旧: \n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- その他のファむルを埩旧: \n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -17654,127 +18482,127 @@ msgstr ""
 "壊れおいるデヌタの䞀芧:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "次回にチェックを倖すか削陀しおください。"
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "バックアップファむルが壊れおいたす"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          遞択したデヌタは党お          "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          %s に埩元したした      "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         埩元の蚭定       "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "OK で他のファむルを埩元したす"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "埩元するナヌザのリスト(各ナヌザの最新の日付だけが重芁です)"
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "埩元する日付を遞んでください:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "ハヌドディスクから埩元する"
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "バックアップを保存するディレクトリを入力"
 
-#: standalone/drakbackup:3043
-#, fuzzy, c-format
+#: standalone/drakbackup:3037
+#, c-format
 msgid "Directory with backups"
-msgstr "党バックアップを埩元"
+msgstr ""
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "別の埩元するメディアを遞んでください"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "その他のメディア"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "システムを埩元"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "ナヌザを埩元"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "その他を埩元"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "埩元するパスを遞択( / の代わり)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
-#, fuzzy, c-format
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#, c-format
 msgid "Path To Restore To"
-msgstr "カスタム埩元"
+msgstr "埩元先のパス"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "埩元前にバックアップを行う(積み重ねバックアップの堎合のみ)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "埩元前にナヌザディレクトリを削陀"
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "怜玢するファむル名(空にするず党おに合臎):"
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr "Backupを怜玢"
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "合うものがありたせん"
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "遞択したものを埩元"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -17783,7 +18611,7 @@ msgstr ""
 "バックアップファむルを芋るには 日付/時刻 をクリック\n"
 "耇数ファむルの遞択はCtrlを抌しながらクリック"
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -17792,7 +18620,7 @@ msgstr ""
 "遞んだカタログ項目を\n"
 "埩元"
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -17801,17 +18629,17 @@ msgstr ""
 "遞んだファむルを\n"
 "埩元"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "%s にバックアップファむルがありたせん"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "CDから埩元する"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -17820,17 +18648,17 @@ msgstr ""
 "ボリュヌムラベル %s のCDを\n"
 "/mnt/cdrom のCDドラむブに入れおください"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "CDのラベルが間違っおいたす。このディスクは %s です。"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "テヌプから埩元"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -17839,219 +18667,219 @@ msgstr ""
 "ボリュヌムラベル %s のテヌプを\n"
 "テヌプドラむブ %s に入れおください"
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "テヌプのラベルが間違っおいたす。このテヌプは %s です。"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "ネットワヌクから埩元"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "ネットワヌクプロトコル %s から埩元"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "ホスト名"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "ホストのパスかモゞュヌル"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "パスワヌドが必芁です"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "ナヌザ名が必芁です"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "ホスト名が必芁です"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "パスかモゞュヌルが必芁です"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "ファむルを埩元.."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "埩元に倱敗したした"
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s が芋぀かりたせん.."
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "埩元するファむルを怜玢"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "党バックアップを埩元"
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "カスタム埩元"
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "カタログから埩元"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "埩元するバックアップがありたせん..\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "%s が正しいパスなのか確認"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr "/CDがドラむブに入っおいるか"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "マりント䞍胜なメディア䞊のバックアップ - 埩旧にはCatalogを䜿っおください"
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "CDを入れる - 継続"
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "新しい埩元レポゞトリを芋る"
 
-#: standalone/drakbackup:3811
-#, fuzzy, c-format
+#: standalone/drakbackup:3828
+#, c-format
 msgid "Directory To Restore From"
-msgstr "CDから埩元する"
+msgstr "埩元もずのディレクトリ"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "埩元の進行"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "保存"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "バックアップを䜜成"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "埩元"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "以䞋のパッケヌゞをむンストヌルしたす:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "埩元するデヌタを遞んでください。"
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "システムファむルをバックアップ"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "ナヌザファむルをバックアップ"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "その他のファむルをバックアップ"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "党䜓の進行状況"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "FTPでファむルを送信䞭.."
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "ファむルを送信䞭.."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "蚭定ファむルから今すぐバックアップ"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "バックアップの蚭定を芋る"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "りィザヌド蚭定"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "高床な蚭定"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "蚭定を芋る"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr "最埌のログを芋る"
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "今すぐパックアップ"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18060,56 +18888,56 @@ msgstr ""
 "蚭定ファむルが芋぀かりたせん。\n"
 "りィザヌドか詳现をクリックしおください。"
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "グラフィカルな起動テヌマを遞択"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "システムモヌド"
 
-#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:103
-#: standalone/harddrake2:104 standalone/logdrake:71
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:152
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
+#: standalone/harddrake2:172 standalone/logdrake:70
+#: standalone/printerdrake:156 standalone/printerdrake:157
+#: standalone/printerdrake:158
 #, c-format
 msgid "/_File"
 msgstr "/ファむル(_F)"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/ファむル(F)/終了(_Q)"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:104
-#: standalone/logdrake:77 standalone/printerdrake:152
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
+#: standalone/logdrake:76 standalone/printerdrake:158
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, c-format
 msgid "Install themes"
 msgstr "テヌマをむンストヌル"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "新しいテヌマを䜜成"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr "グラフィカルブヌトを䜿う"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -18118,12 +18946,17 @@ msgstr ""
 "ブヌトロヌダがフレヌムバッファモヌドではありたせん。グラフィカルブヌトを有効"
 "にするには、ブヌトロヌダ蚭定ツヌルでビデオモヌドを遞んでください。"
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "蚭定したすか"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "テヌマ"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18132,154 +18965,134 @@ msgstr ""
 "コン゜ヌルで\n"
 "テヌマを衚瀺"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "起動時にXりィンドりを実行"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "自動ログむンを䜿わない"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "以䞋のナヌザずデスクトップで自動的にログむンする"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "デフォルトのナヌザ"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "デフォルトのデスクトップ"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "%s のむンストヌルに倱敗したした。以䞋の゚ラヌが発生:"
-
-#: standalone/drakbug:40
+#: standalone/drakboot:310
 #, c-format
 msgid ""
-"To submit a bug report, click on the button report.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
 msgstr ""
-"バグを報告する際は'報告'をクリックしおください。\n"
-"りェブブラりザが開いお %s が衚瀺されたす。\n"
-"そこに報告フォヌムがあるので蚘入しおください。䞊に衚瀺しおいる情報は\n"
-"そのサヌバに転送されたす"
+"ビデオモヌドを遞んでください。it will be applied to each of the boot entries "
+"selected below.\n"
+"お䜿いのビデオカヌドが指定したモヌドをサポヌトしおいるか泚意しおください"
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Mandrakeバグ報告ツヌル"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Mandrakelinuxバグ報告ツヌル"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Mandrakeコントロヌルセンタ"
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinuxコントロヌルセンタ"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "同期ツヌル"
 
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
 #, c-format
 msgid "Standalone Tools"
 msgstr "スタンドアロヌンツヌル"
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "HardDrake"
 
-#: standalone/drakbug:58
+#: standalone/drakbug:51
 #, c-format
-msgid "Mandrake Online"
+msgid "Mandrakeonline"
 msgstr "Mandrakeオンラむン"
 
-#: standalone/drakbug:59
+#: standalone/drakbug:52
 #, c-format
 msgid "Menudrake"
 msgstr "Menudrake"
 
-#: standalone/drakbug:60
+#: standalone/drakbug:53
 #, c-format
 msgid "Msec"
 msgstr "Msec"
 
-#: standalone/drakbug:61
+#: standalone/drakbug:54
 #, c-format
 msgid "Remote Control"
 msgstr "リモヌトコントロヌル"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "RPMマネヌゞャ"
 
-#: standalone/drakbug:63
+#: standalone/drakbug:56
 #, c-format
 msgid "Urpmi"
 msgstr "Urpmi"
 
-#: standalone/drakbug:64
+#: standalone/drakbug:57
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Windows移行ツヌル"
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "蚭定りィザヌド"
 
-#: standalone/drakbug:84
-#, c-format
-msgid ""
-"To submit a bug report, click the report button, which will open your "
-"default browser\n"
-"to Anthill where you will be able to upload the above information as a bug "
-"report."
-msgstr ""
-"バグを報告する際は報告ボタンをクリックしおください。\n"
-"デフォルトブラりザが開いお䞊蚘の情報をアップロヌド\n"
-"できるようになりたす。"
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "アプリケヌション: "
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "パッケヌゞ: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "カヌネル: "
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "リリヌス: "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -18288,117 +19101,131 @@ msgstr ""
 "アプリケヌション名か\n"
 "フルパス:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "パッケヌゞを怜玢"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "抂芁: "
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "テキストをここに"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "バグの説明/システム情報"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "テキストをここに"
+
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr "カヌネルのバヌゞョンを送る"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr "cpuinfoを送る"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr "lspciを送る"
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+"バグを報告する際は'報告'をクリックしおください。\n"
+"りェブブラりザが開いお %s が衚瀺されたす。\n"
+"そこに報告フォヌムがあるので蚘入しおください。䞊に衚瀺しおいる情報は\n"
+"そのサヌバに転送されたす"
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "報告"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "むンストヌルしおいたせん"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "むンストヌルしおいたせん"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "ありたせん"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "%s に接続䞭.."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "ブラりザがありたせん。぀はむンストヌルしおください"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "パッケヌゞ名を入力しおください"
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "summary textを入力しおください"
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
-#, fuzzy, c-format
+#: standalone/drakclock:40
+#, c-format
 msgid "not defined"
 msgstr "蚭定しおいたせん"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "タむムゟヌンを倉曎"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "タむムゟヌン - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "ハヌドりェアクロックをGMTに蚭定したすか"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr "ネットワヌクタむムプロトコル"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -18407,50 +19234,55 @@ msgstr ""
 "NTPを䜿ったリモヌトタむムサヌバで、\n"
 "マシンの時蚈を同期させるこずができたす"
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "ネットワヌクタむムプロトコルを有効に"
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "サヌバ:"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr "%s ず同期化できたせんでした"
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "リセット"
 
-#: standalone/drakclock:214
+#: standalone/drakclock:225
 #, c-format
 msgid ""
 "We need to install ntp package\n"
 " to enable Network Time Protocol\n"
 "\n"
-"Do you want to install ntp ?"
+"Do you want to install ntp?"
 msgstr ""
 "ネットワヌクタむムプロトコルを有効にするには、\n"
 "ntpパッケヌゞが必芁です。\n"
 "\n"
 "ntpをむンストヌルしたすか"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "ネットワヌクの蚭定(%d アダプタ)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "ゲヌトりェむ:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "むンタフェヌス:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "お埅ちください"
@@ -18460,12 +19292,8 @@ msgstr "お埅ちください"
 msgid "Interface"
 msgstr "むンタフェヌス"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "ドラむバ"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "状態"
@@ -18480,7 +19308,7 @@ msgstr "ホスト名: "
 msgid "Configure hostname..."
 msgstr "ホスト名を蚭定.."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "LANの蚭定"
@@ -18490,118 +19318,124 @@ msgstr "LANの蚭定"
 msgid "Configure Local Area Network..."
 msgstr "LANを蚭定"
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "適甚"
 
 #: standalone/drakconnect:197
-#, fuzzy, c-format
+#, c-format
 msgid "Manage connections"
-msgstr "ケヌブル接続"
+msgstr "接続を管理"
 
-#: standalone/drakconnect:218
-#, fuzzy, c-format
+#: standalone/drakconnect:224
+#, c-format
 msgid "Device selected"
-msgstr "リストから削陀"
+msgstr "遞択したデバむス"
 
-#: standalone/drakconnect:314
-#, fuzzy, c-format
+#: standalone/drakconnect:305
+#, c-format
 msgid "IP configuration"
-msgstr "CUPSを蚭定"
+msgstr "IP蚭定"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "DNSサヌバ"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "ドメむン怜玢"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "スタティック"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
+msgstr "DHCP"
+
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
 msgstr ""
 
-#: standalone/drakconnect:493
-#, fuzzy, c-format
+#: standalone/drakconnect:491
+#, c-format
 msgid "Flow control"
-msgstr "<control>S"
+msgstr "フロヌ制埡"
 
-#: standalone/drakconnect:494
-#, fuzzy, c-format
+#: standalone/drakconnect:492
+#, c-format
 msgid "Line termination"
-msgstr "むンタヌネットステヌション"
+msgstr ""
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "モデムのタむムアりト"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr "ロックファむルを䜿う"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "ダむアル前にトヌンを埅぀"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr "ビゞヌ埅ち"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "モデムの音"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "有効"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "無効"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "メディアクラス"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "モゞュヌル名"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Macアドレス"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr "バス"
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "バスの䜍眮"
 
-#: standalone/drakconnect:645 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -18610,20 +19444,20 @@ msgstr ""
 "システムにむヌサネットアダプタがありたせん。\n"
 "ハヌドりェア蚭定ツヌルを実行しおください。"
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "リモヌトネットワヌクむンタフェヌス"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "削陀するネットワヌクむンタフェヌスを遞択:"
 
-#: standalone/drakconnect:679
+#: standalone/drakconnect:713
 #, c-format
 msgid ""
-"An error occured while deleting the \"%s\" network interface:\n"
+"An error occurred while deleting the \"%s\" network interface:\n"
 "\n"
 "%s"
 msgstr ""
@@ -18631,53 +19465,53 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
-"Congratulations, the \"%s\" network interface has been succesfully deleted"
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "\"%s\" ネットワヌクむンタフェヌスを削陀したした"
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
-msgstr "Ipなし"
+msgid "No IP"
+msgstr "IPなし"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "マスクなし"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "侊"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "例"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "接続完了"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "接続しおいたせん"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "切断.."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "接続.."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -18686,17 +19520,17 @@ msgstr ""
 "è­Šå‘Š: 別のむンタヌネット接続を怜出したした。ネットワヌクは䜿甚䞭かもしれたせ"
 "ん"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "いたすぐ無効に"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "いたすぐ有効に"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -18705,81 +19539,101 @@ msgstr ""
 "蚭定枈みのむンタフェヌスがありたせん。\n"
 "'蚭定'をクリックしおたず蚭定しおください。"
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "LANを蚭定"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "アダプタ %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "起動プロトコル"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "起動時に開始"
 
-#: standalone/drakconnect:868
+#: standalone/drakconnect:919
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrake Control Center"
+"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
 msgstr ""
 "このむンタフェヌスはただ蚭定しおいたせん。\n"
-"Mandrakeコントロヌルセンタの \"むンタフェヌスを远加\" を実行しおください"
+"Mandrakelinuxコントロヌルセンタの \"むンタフェヌスを远加\" を実行しおください"
 
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:974 standalone/net_applet:46
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
-"Please run \"Internet access\" in control center."
+"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
 msgstr ""
-"むンタヌネット接続を蚭定しおいたせん。\n"
-"コントロヌルセンタの'むンタヌネットアクセス'を実行しおください"
+"むンタヌネットの接続が蚭定されおいたせん。\n"
+"Mandrakelinuxコントロヌルセンタの \"接続の远加\" を実行しおください"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "むンタヌネット接続の蚭定"
 
-#: standalone/drakconnect:949
-#, fuzzy, c-format
+#: standalone/drakconnect:1000
+#, c-format
 msgid "Third DNS server (optional)"
-msgstr "DNSサヌバ(オプション)"
+msgstr "サヌドDNSサヌバ(オプション)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "むンタヌネット接続を蚭定"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "むンタヌネット"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "接続の皮類: "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "状態:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr "GDM (GNOMEディスプレむマネヌゞャ)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "KDM (KDEディスプレむマネヌゞャ)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "MdkKDM (Mandrakelinuxディスプレむマネヌゞャ)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (Xディスプレむマネヌゞャ)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "ディスプレむマネヌゞャを遞んでください"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -18787,93 +19641,102 @@ msgid ""
 "several different X sessions on your local machine at the same time."
 msgstr "ログむンマネヌゞャを遞んでください。"
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
 #, c-format
-msgid "The change is done, do you want to restart the dm service ?"
+msgid "The change is done, do you want to restart the dm service?"
 msgstr "倉曎したした。dmサヌビスを再起動したすか"
 
-#: standalone/drakfloppy:40
+#: standalone/drakedm:80
+#, c-format
+msgid ""
+"You are going to close all running programs and lose your current session. "
+"Are you really sure that you want to restart the dm service?"
+msgstr ""
+"動䜜䞭のプログラムを党お終了しお珟圚のセッションを閉じたす。本圓にdmサヌビス"
+"を再起動したすか"
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "起動甚ディスクを䜜成"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "䞀般"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "デバむス"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "カヌネルのバヌゞョン"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "蚭定"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "高床な蚭定"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "サむズ"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Mkinitrdのオプション匕数"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "匷制"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "raidモゞュヌルを省略する"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "必芁な堎合のみ"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "scsiモゞュヌルを省略する"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "モゞュヌルを远加"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "モゞュヌルを削陀"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "デバむス %s にメディアが入っおいるか確認しおください"
 
 # ../../standalone/drakfloppy_.c:426, c-format
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -18882,22 +19745,23 @@ msgstr ""
 "デバむス %s のメディアがないか曞き蟌み犁止になっおいたす。\n"
 "メディアを入れおください。"
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "%s をフォヌクできたせん"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "フロッピヌの䜜成が完了"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "起動甚フロッピヌを䜜成したした。\n"
 
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
 #, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -19038,9 +19902,9 @@ msgstr "フォントのリスト"
 #: standalone/drakfont:493
 #, c-format
 msgid "About"
-msgstr "About"
+msgstr "情報"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "アンむンストヌル"
@@ -19050,10 +19914,11 @@ msgstr "アンむンストヌル"
 msgid "Import"
 msgstr "むンポヌト"
 
-#: standalone/drakfont:512
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakfont:514
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19062,7 +19927,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19071,7 +19936,7 @@ msgstr ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -19106,7 +19971,7 @@ msgstr ""
 " along with this program; if not, write to the Free Software\n"
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19137,12 +20002,12 @@ msgstr ""
 "\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Convert ttf font files to afm and pfb fonts\n"
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "このフォントを䜿甚するアプリケヌションを遞んでください:"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19157,122 +20022,127 @@ msgstr ""
 "フォントはたいおいむンストヌルできるはずですが、たれに䞍適切なフォントでXサヌ"
 "バが固たる堎合がありたす。"
 
-#: standalone/drakfont:567
+#: standalone/drakfont:569
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:568
+#: standalone/drakfont:570
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:569
+#: standalone/drakfont:571
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:572
 #, c-format
 msgid "Generic Printers"
 msgstr "䞀般プリンタ"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "フォントファむルかディレクトリを遞んで'远加'をクリック"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "ファむルを遞択"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "フォントを遞んでいたせん"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "フォントをむンポヌト"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "フォントをむンストヌル"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "よろしければクリックしおください"
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "here if no."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "遞択を解陀"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "党お遞択"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "フォントを削陀"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "フォントをむンポヌト"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "初期テスト"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "お䜿いのシステムのフォントをコピヌ"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "フォントのむンストヌルず倉換"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "むンストヌル埌の凊理"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "システムからフォントを削陀"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "アンむンストヌル埌の凊理"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "むンタヌネット接続を共有"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "2.4以䞊のカヌネルのみをサポヌトしおいたす。"
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "むンタヌネット接続の共有は珟圚停止しおいたす"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -19285,39 +20155,39 @@ msgstr ""
 "\n"
 "どうしたすか"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "有効に"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "再蚭定"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "無芖"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "サヌバを有効にしおいたす.."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "むンタヌネット接続の共有が有効になりたした。"
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "むンタヌネット接続の共有は珟圚有効です"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -19330,22 +20200,22 @@ msgstr ""
 "\n"
 "どうしたすか"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "無効に"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "サヌバを停止しおいたす.."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "むンタヌネット接続の共有を停止したした。"
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19364,27 +20234,27 @@ msgstr ""
 "泚意: ロヌカル゚リアネットワヌク(LAN)を構築するには\n"
 "専甚のネットワヌクアダプタが必芁です。"
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "むンタフェヌス %s(モゞュヌル %s を䜿甚)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "むンタフェヌス %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "ネットワヌクアダプタがありたせん"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "ネットワヌクむンタフェヌス"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19399,19 +20269,24 @@ msgstr ""
 "\n"
 "このアダプタでLANを蚭定したす。"
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "ネットワヌクむンタフェヌスを遞択"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "LANに接続するネットワヌクアダプタを遞んでください。"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "ネットワヌクむンタフェヌスは蚭定枈みです"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19426,27 +20301,27 @@ msgstr ""
 "\n"
 "手動で行うこずもできたすが、蚭定には知識が必芁です。"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "自動的に再蚭定"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "いいえ(䞊玚者甚)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "珟圚のむンタフェヌスの蚭定を衚瀺"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "珟圚のむンタフェヌスの蚭定"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19463,7 +20338,7 @@ msgstr ""
 "IP属性: %s\n"
 "ドラむバ: %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19489,12 +20364,12 @@ msgstr ""
 "for you.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "ロヌカルネットワヌクのアドレス"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -19507,72 +20382,72 @@ msgstr ""
 "ここでDHCPサヌバのオプションを蚭定できたす。\n"
 "オプションの意味が分からない堎合はそのたたにしおください。"
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(この)DHCPサヌバのIP"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DHCPサヌバのIP"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "内郚ドメむン名"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCPのスタヌトレンゞ"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCPの゚ンドレンゞ"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "暙準lease(秒単䜍)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "最倧lease(単䜍: 秒)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "むンタフェヌスずDHCPサヌバを再蚭定"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "ロヌカルネットワヌクが'.0'で終わっおいたせん。䞭断したす。"
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "珟圚の %s の蚭定ではLANアドレスが競合するかもしれたせん。\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "蚭定.."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "スクリプトを蚭定、゜フトりェアをむンストヌル、サヌバを起動"
 
-#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "パッケヌゞ %s のむンストヌルで問題が発生"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -19588,14 +20463,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19622,7 +20497,12 @@ msgstr ""
 " --doc <link>          - link to another web page ( for WM welcome "
 "frontend)\n"
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrakelinuxヘルプセンタ"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
@@ -19631,7 +20511,7 @@ msgstr ""
 "%sを衚瀺できたせん。\n"
 " このヘルプ項目はありたせん\n"
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -19640,42 +20520,42 @@ msgstr ""
 "システムにブラりザをむンストヌルしおいたせん。ヘルプシステムを芋る堎合は\n"
 "むンストヌルしおください。"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "システム蚭定"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "カスタム蚭定"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr "カスタムシステム蚭定"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "線集可"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "パス"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "ナヌザ名"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "グルヌプ"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "暩限"
@@ -19735,9 +20615,9 @@ msgid "Delete selected rule"
 msgstr "遞んだルヌルを削陀"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit"
 msgstr "線集"
@@ -19747,47 +20627,65 @@ msgstr "線集"
 msgid "Edit current rule"
 msgstr "珟圚のルヌルを線集"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "ブラりズ"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "ナヌザ"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "グルヌプ"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "その他"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "読み取り"
 
-#: standalone/drakperm:257
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:255
 #, c-format
 msgid "Enable \"%s\" to read the file"
 msgstr "ファむルを読み蟌むため%sを有効にする"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "曞き蟌み"
 
-#: standalone/drakperm:261
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:262
 #, c-format
 msgid "Enable \"%s\" to write the file"
 msgstr "ファむルを曞き蟌むため%sを有効にする"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "実行"
 
-#: standalone/drakperm:265
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:269
 #, c-format
 msgid "Enable \"%s\" to execute the file"
 msgstr "ファむルを実行するため%sを有効にする"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr "Sticky-bit"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -19796,52 +20694,52 @@ msgstr ""
 "ディレクトリ甚:\n"
 " ディレクトリやファむルの所有者だけが削陀できたす"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "UID蚭定"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr "実行に所有者のIDを䜿う"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "GID蚭定"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr "実行にグルヌプのIDを䜿う"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "ナヌザ :"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "グルヌプ :"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "珟圚のナヌザ"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "チェックするず、所有者ずグルヌプを倉曎したせん"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "パスを遞択"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "プロパティ"
@@ -19967,54 +20865,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "auto_install.cfg ファむルの堎所"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "党お"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "ロヌカル"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "デフォルト"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "ignore"
+msgid "Ignore"
 msgstr "無芖"
 
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "いいえ"
-
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "はい"
-
-#. -PO: Do not alter the <span ..> and </span> tags
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words
-#: standalone/draksec:81
+#. -PO: Do not alter the <span ..> and </span> tags.
+#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
+#: standalone/draksec:101
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
 "\n"
 "\n"
-"The Security Administrator is the one who will receive security alerts if "
-"the\n"
-"'Security Alerts' option is set. It can be a username or an email.\n"
+"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+"will receive security alerts if the\n"
+"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+"username or an email.\n"
 "\n"
 "\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
@@ -20048,43 +20934,42 @@ msgid ""
 "level, but the system is entirely closed and security features are at their\n"
 "maximum"
 msgstr ""
-"ここではお䜿いのマシンのセキュリティレベルずセキュリティ\n"
-"\n"
-"管理者を蚭定したす。\n"
-"\n"
-"\n"
-"セキュリティ管理者ずはオプション蚭定時にセキュリティ譊告を\n"
+"ここではお䜿いのマシンのセキュリティレベルずセキュリティ管理者を蚭定した"
+"す。\n"
 "\n"
-"受け取るひずのこずを蚀いたす。ナヌザ名でもEmailアドレスでも\n"
 "\n"
-"構いたせん。\n"
+"<span weight=\"bold\">セキュリティ管理者</span>ずは<span weight=\"bold\">セ"
+"キュリティ譊告オプション</span>を蚭定したずきにセキュリティ譊告を受け取るひず"
+"のこずを蚀いたす。ナヌザ名でもEmailアドレスでも構いたせん。\n"
 "\n"
 "\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">䜎い</span>: This is a totally unsafe but "
+"<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
 "very\n"
 "easy to use security level. It should only be used for machines not "
 "connected to\n"
 "any network and that are not accessible to everybody.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">暙準</span>: This is the standard security\n"
+"<span foreground=\"royalblue3\">Standard</span>: This is the standard "
+"security\n"
 "recommended for a computer that will be used to connect to the Internet as "
 "a\n"
 "client.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">高い</span>: There are already some\n"
+"<span foreground=\"royalblue3\">High</span>: There are already some\n"
 "restrictions, and more automatic checks are run every night.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">かなり高い</span>: The security is now high "
+"<span foreground=\"royalblue3\">Higher</span>: The security is now high "
 "enough\n"
 "to use the system as a server which can accept connections from many "
 "clients. If\n"
@@ -20092,66 +20977,61 @@ msgstr ""
 "level.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">極床に高い</span>: This is similar to the "
+"<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the "
 "previous\n"
 "level, but the system is entirely closed and security features are at their\n"
 "maximum"
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"項目の説明:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(デフォルトの蚭定: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "セキュリティレベル:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "セキュリティ譊告:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "セキュリティ管理者:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "基本"
 
-#: standalone/draksec:192
-#, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
-msgstr ""
-"以䞋のオプションでシステムのセキュリティをカスタマむズしたす。\n"
-"説明が必芁でしたらヘルプツヌルチップをご芧ください。\n"
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "ネットワヌク"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "システム"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "定期的な確認"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "お埅ちください。セキュリティレベルを蚭定䞭.."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "お埅ちください。セキュリティのオプションを蚭定䞭.."
@@ -20161,7 +21041,8 @@ msgstr "お埅ちください。セキュリティのオプションを蚭定䞭
 msgid "No Sound Card detected!"
 msgstr "サりンドカヌドが怜出されたせんでした"
 
-#: standalone/draksound:48
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/draksound:50
 #, c-format
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
@@ -20182,7 +21063,7 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -20314,15 +21195,15 @@ msgstr "コン゜ヌルにロゎを衚瀺"
 msgid "Make kernel message quiet by default"
 msgstr "カヌネルメッセヌゞをデフォルトでは少なくする"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "泚意"
 
-#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:161 standalone/draksplash:309
 #, c-format
-msgid "This theme does not yet have a bootsplash in %s !"
+msgid "This theme does not yet have a bootsplash in %s!"
 msgstr "このテヌマはただ %s に起動スプラッシュがありたせん"
 
 #: standalone/draksplash:167
@@ -20335,189 +21216,207 @@ msgstr "画像を遞択"
 msgid "saving Bootsplash theme..."
 msgstr "起動スプラッシュのテヌマを保存䞭.."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "進行バヌの色を遞ぶ"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "たず画像ファむルを遞んでください"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "プレビュヌを生成䞭.."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s 起動スプラッシュ(%s)のプレビュヌ"
 
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
 #, c-format
-msgid "Connected through a serial port or an usb cable"
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
 msgstr ""
+"次の理由で画像 \"%s\" をロヌドできたせん:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
 
-#: standalone/drakups:69
-#, fuzzy, c-format
+#: standalone/drakups:74
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr "シリアルポヌトもしくはUSBケヌブル経由で接続"
+
+#: standalone/drakups:80
+#, c-format
 msgid "Add an UPS device"
-msgstr "アむテムを远加"
+msgstr "UPSデバむスを远加"
 
-#: standalone/drakups:72
-#, fuzzy, c-format
+#: standalone/drakups:83
+#, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
-"メヌル蚭定ナヌティリティぞようこそ\n"
+"UPS蚭定ナヌティリティぞようこそ\n"
 "\n"
-"ここでは譊告システムを蚭定したす。\n"
+"ここではあなたのシステムにUPSを远加したす。\n"
 
-#: standalone/drakups:79
+#: standalone/drakups:90
 #, c-format
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you prefer autodetect UPS devices connected to this machine or  ?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
 msgstr ""
+"UPSデバむスを远加したす。\n"
+"\n"
+"UPSデバむスを自動怜出するか手動で遞択しおください"
 
-#: standalone/drakups:82
-#, fuzzy, c-format
+#: standalone/drakups:93
+#, c-format
 msgid "Autodetection"
 msgstr "自動怜出"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "怜出䞭です"
 
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
 #, c-format
 msgid "Congratulations"
 msgstr "おめでずうございたす"
 
-#: standalone/drakups:109
-#, fuzzy, c-format
+#: standalone/drakups:121
+#, c-format
 msgid "The wizard successfully added the following UPS devices:"
-msgstr "メヌル譊告を無効にしたした。"
+msgstr "以䞋のUPSデバむスを远加したした:"
 
-#: standalone/drakups:111
-#, fuzzy, c-format
+#: standalone/drakups:123
+#, c-format
 msgid "No new UPS devices was found"
-msgstr "デバむスがありたせん"
+msgstr "新しいUPSデバむスがありたせん"
 
-#: standalone/drakups:116 standalone/drakups:128
-#, fuzzy, c-format
+#: standalone/drakups:128 standalone/drakups:140
+#, c-format
 msgid "UPS driver configuration"
-msgstr "CUPSプリンタの蚭定"
+msgstr "UPSドラむバの蚭定"
 
-#: standalone/drakups:116
-#, fuzzy, c-format
+#: standalone/drakups:128
+#, c-format
 msgid "Please select your UPS model."
-msgstr "マりスをテストしおください:"
+msgstr "UPSモデルを遞んでください"
 
-#: standalone/drakups:117
-#, fuzzy, c-format
+#: standalone/drakups:129
+#, c-format
 msgid "Manufacturer / Model:"
-msgstr "プリンタのメヌカヌ/æ©Ÿçš®"
+msgstr "メヌカヌ/モデル:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
+"\"%s\" の \"%s\" UPSを蚭定しおいたす。\n"
+"名前/ドラむバ/ポヌトを入力しおください"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "名前:"
 
-#: standalone/drakups:133
-#, fuzzy, c-format
+#: standalone/drakups:145
+#, c-format
 msgid "The name of your ups"
-msgstr "CPUの名前"
+msgstr "UPSの名前"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
-msgstr ""
+msgid "The driver that manages your ups"
+msgstr "UPSのドラむバ"
 
-#: standalone/drakups:135
-#, fuzzy, c-format
+#: standalone/drakups:147
+#, c-format
 msgid "Port:"
-msgstr "ポヌト"
+msgstr "ポヌト:"
 
-#: standalone/drakups:137
-#, fuzzy, c-format
+#: standalone/drakups:149
+#, c-format
 msgid "The port on which is connected your ups"
-msgstr "マりスを接続しおいるバスの皮類"
+msgstr "UPSを接続しおいるポヌト"
 
-#: standalone/drakups:144
-#, fuzzy, c-format
+#: standalone/drakups:156
+#, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
-msgstr "メヌル譊告を蚭定したした。"
+msgstr "新しい \"%s\" UPSデバむスを蚭定したした"
 
-#: standalone/drakups:232
-#, fuzzy, c-format
+#: standalone/drakups:246
+#, c-format
 msgid "UPS devices"
-msgstr "サヌビス"
+msgstr "UPSデバむス"
 
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:67
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
+#: standalone/harddrake2:80 standalone/harddrake2:102
 #, c-format
 msgid "Name"
 msgstr "名前"
 
-#: standalone/drakups:250
-#, fuzzy, c-format
+#: standalone/drakups:265
+#, c-format
 msgid "UPS users"
-msgstr "ナヌザ名"
+msgstr "UPSナヌザ"
 
-#: standalone/drakups:265
-#, fuzzy, c-format
+#: standalone/drakups:281
+#, c-format
 msgid "Access Control Lists"
-msgstr "ネットワヌクツヌルぞのアクセス"
+msgstr "アクセスコントロヌルリスト"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
-msgstr ""
+msgstr "IPマスク"
 
-#: standalone/drakups:277
-#, fuzzy, c-format
+#: standalone/drakups:294
+#, c-format
 msgid "Rules"
-msgstr "ルヌタ:"
+msgstr "ルヌル"
 
-#: standalone/drakups:278
-#, fuzzy, c-format
+#: standalone/drakups:295
+#, c-format
 msgid "Action"
-msgstr "/アクション(_A)"
+msgstr "アクション"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "レベル"
 
-#: standalone/drakups:278
-#, fuzzy, c-format
+#: standalone/drakups:295
+#, c-format
 msgid "ACL name"
-msgstr "LVMの名前を入力"
+msgstr "ACLの名前"
 
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
-#, fuzzy, c-format
+#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
+#, c-format
 msgid "DrakUPS"
-msgstr "DrakVPN"
+msgstr "DrakUPS"
 
-#: standalone/drakups:307
-#, fuzzy, c-format
+#: standalone/drakups:335
+#, c-format
 msgid "Welcome to the UPS configuration tools"
-msgstr "蚭定をテストする"
+msgstr "UPS蚭定ツヌルぞようこそ"
 
 #: standalone/drakvpn:73
 #, c-format
@@ -20536,7 +21435,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "VPN接続のセットアップは完了しおいたす。\n"
 "\n"
@@ -20566,7 +21465,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "VPN接続のセットアップは完了しおいたす。\n"
 "\n"
@@ -20651,7 +21550,7 @@ msgstr "カヌネルモゞュヌル"
 #: standalone/drakvpn:197
 #, c-format
 msgid ""
-"The kernel need to have ipsec support.\n"
+"The kernel needs to have ipsec support.\n"
 "\n"
 "You're running a %s kernel version.\n"
 "\n"
@@ -20681,13 +21580,13 @@ msgstr "ファむルを蚭定"
 #: standalone/drakvpn:296
 #, c-format
 msgid ""
-"Configuration step !\n"
+"Configuration step!\n"
 "\n"
 "You need to define the Security Policies and then to \n"
 "configure the automatic key exchange (IKE) daemon. \n"
 "The KAME IKE daemon we're using is called 'racoon'.\n"
 "\n"
-"What would you like to configure ?\n"
+"What would you like to configure?\n"
 msgstr ""
 "蚭定\n"
 "\n"
@@ -20721,12 +21620,12 @@ msgid ""
 "The %s file contents\n"
 "is divided into sections.\n"
 "\n"
-"You can now :\n"
+"You can now:\n"
 "\n"
 "  - display, add, edit, or remove sections, then\n"
 "  - commit the changes\n"
 "\n"
-"What would you like to do ?\n"
+"What would you like to do?\n"
 msgstr ""
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
@@ -20774,7 +21673,7 @@ msgstr "ipsec.conf の項目"
 msgid ""
 "The %s file contains different sections.\n"
 "\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
 "\t\t\t\t\t'conn default' \n"
 "\t\t\t\t\t'normal1'\n"
 "\t\t\t\t\t'normal2' \n"
@@ -20801,7 +21700,7 @@ msgstr "ノヌマル conn"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "存圚したす"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -21020,7 +21919,7 @@ msgstr "セクション名"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "線集できたせん"
 
 #: standalone/drakvpn:591
@@ -21028,17 +21927,17 @@ msgstr "線集できたせん"
 msgid ""
 "You cannot edit this section.\n"
 "\n"
-"This section is mandatory for Freswan 2.X.\n"
+"This section is mandatory for Freeswan 2.X.\n"
 "One has to specify version 2.0 on the top\n"
 "of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the opportunistic encryption.\n"
 msgstr ""
 "このセッションを線集できたせん。\n"
 "\n"
-"This section is mandatory for Freswan 2.X.\n"
+"This section is mandatory for Freeswan 2.X.\n"
 "One has to specify version 2.0 on the top\n"
 "of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the opportunistic encryption.\n"
 
 #: standalone/drakvpn:600
 #, c-format
@@ -21073,7 +21972,7 @@ msgstr ""
 msgid ""
 "Edit a Security Policy.\n"
 "\n"
-"You can now add a Security Policy.\n"
+"You can now edit a Security Policy.\n"
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
@@ -21103,7 +22002,7 @@ msgid ""
 "The racoon.conf file configuration.\n"
 "\n"
 "The contents of this file is divided into sections.\n"
-"You can now :\n"
+"You can now:\n"
 "  - display \t\t (display the file contents)\n"
 "  - add\t\t\t (add one section)\n"
 "  - edit \t\t\t (modify parameters of an existing section)\n"
@@ -21131,7 +22030,7 @@ msgstr "racoonf.conf の項目"
 msgid ""
 "The 'add' sections step.\n"
 "\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
 "\t'path'\n"
 "\t'remote'\n"
 "\t'sainfo' \n"
@@ -21172,31 +22071,31 @@ msgstr "パスの皮類"
 #: standalone/drakvpn:750
 #, c-format
 msgid ""
-"path include path : specifies a path to include\n"
+"path include path: specifies a path to include\n"
 "a file. See File Inclusion.\n"
 "\tExample: path include '/etc/racoon'\n"
 "\n"
-"path pre_shared_key file : specifies a file containing\n"
+"path pre_shared_key file: specifies a file containing\n"
 "pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
 "\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"path certificate path : racoon(8) will search this directory\n"
+"path certificate path: racoon(8) will search this directory\n"
 "if a certificate or certificate request is received.\n"
 "\tExample: path certificate '/etc/cert' ;\n"
 "\n"
-"File Inclusion : include file \n"
+"File Inclusion: include file \n"
 "other configuration files can be included.\n"
 "\tExample: include \"remote.conf\" ;\n"
 "\n"
-"Pre-shared key File : Pre-shared key file defines a pair\n"
+"Pre-shared key File: Pre-shared key file defines a pair\n"
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
 
 #: standalone/drakvpn:770 standalone/drakvpn:863
-#, fuzzy, c-format
+#, c-format
 msgid "real file"
-msgstr "ファむルを遞択"
+msgstr "実際のファむル"
 
 #: standalone/drakvpn:793
 #, c-format
@@ -21301,7 +22200,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -21329,7 +22228,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -21354,7 +22253,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -21382,7 +22281,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -21402,25 +22301,25 @@ msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
 "If you do not require PFS then you can omit this directive.\n"
 "Any proposal will be accepted if you do not specify one.\n"
-"group is one of following: modp768, modp1024, modp1536.\n"
+"group is one of the following: modp768, modp1024, modp1536.\n"
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
 
 #: standalone/drakvpn:996
-#, fuzzy, c-format
+#, c-format
 msgid "Lifetime number"
-msgstr "番号"
+msgstr ""
 
 #: standalone/drakvpn:997
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
@@ -21442,18 +22341,18 @@ msgstr ""
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 60 sec;\n"
-"\tlifetime time 12 hour ;\n"
+"\tlifetime time 12 hour;\n"
 "\n"
 "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
 "'hour'.\n"
@@ -21475,9 +22374,9 @@ msgid "Compression algorithm"
 msgstr "圧瞮アルゎリズム"
 
 #: standalone/drakvpn:1036
-#, fuzzy, c-format
+#, c-format
 msgid "deflate"
-msgstr "デフォルト"
+msgstr ""
 
 #: standalone/drakvpn:1043
 #, c-format
@@ -21493,7 +22392,7 @@ msgid ""
 "ments apply to all peers which do not match any other remote\n"
 "directive.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "remote anonymous\n"
 "remote ::1 [8000]"
@@ -21523,12 +22422,12 @@ msgstr "ポリシヌを生成"
 #: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
 #, c-format
 msgid "off"
-msgstr ""
+msgstr "off"
 
 #: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
-#, fuzzy, c-format
+#, c-format
 msgid "on"
-msgstr "䞋ぞ"
+msgstr "on"
 
 #: standalone/drakvpn:1062
 #, c-format
@@ -21565,17 +22464,17 @@ msgstr ""
 #: standalone/drakvpn:1081
 #, c-format
 msgid "Certificate type"
-msgstr ""
+msgstr "蚌明の皮類"
 
 #: standalone/drakvpn:1083
-#, fuzzy, c-format
+#, c-format
 msgid "My certfile"
-msgstr "ファむルを遞択"
+msgstr ""
 
 #: standalone/drakvpn:1084
-#, fuzzy, c-format
+#, c-format
 msgid "Name of the certificate"
-msgstr "プリンタの名前"
+msgstr "蚌明の名前"
 
 #: standalone/drakvpn:1085
 #, c-format
@@ -21588,9 +22487,9 @@ msgid "Name of the private key"
 msgstr "プラむベヌトキヌの名前"
 
 #: standalone/drakvpn:1087
-#, fuzzy, c-format
+#, c-format
 msgid "Peers certfile"
-msgstr "ファむルを遞択"
+msgstr ""
 
 #: standalone/drakvpn:1088
 #, c-format
@@ -21598,9 +22497,9 @@ msgid "Name of the peers certificate"
 msgstr ""
 
 #: standalone/drakvpn:1089
-#, fuzzy, c-format
+#, c-format
 msgid "Verify cert"
-msgstr "優秀"
+msgstr ""
 
 #: standalone/drakvpn:1091
 #, c-format
@@ -21618,7 +22517,7 @@ msgstr "自分のID"
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation.  address, fqdn,\n"
+"type to use in the phase 1 negotiation.  address, FQDN,\n"
 "user_fqdn, keyid and asn1dn can be used as an idtype.\n"
 "they are used like:\n"
 "\tmy_identifier address [address];\n"
@@ -21627,7 +22526,7 @@ msgid ""
 "\tmy_identifier user_fqdn string;\n"
 "\t\tthe type is a USER_FQDN (user fully-qualified\n"
 "\t\tdomain name).\n"
-"\tmy_identifier fqdn string;\n"
+"\tmy_identifier FQDN string;\n"
 "\t\tthe type is a FQDN (fully-qualified domain name).\n"
 "\tmy_identifier keyid file;\n"
 "\t\tthe type is a KEY_ID.\n"
@@ -21636,29 +22535,29 @@ msgid ""
 "\t\tstring is omitted, racoon(8) will get DN from\n"
 "\t\tSubject field in the certificate.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
 
 #: standalone/drakvpn:1114
-#, fuzzy, c-format
+#, c-format
 msgid "Peers identifier"
-msgstr "Printer"
+msgstr ""
 
 #: standalone/drakvpn:1115
-#, fuzzy, c-format
+#, c-format
 msgid "Proposal"
-msgstr "プロトコル"
+msgstr ""
 
 #: standalone/drakvpn:1117
 #, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
 "phase 1 negotiation. This directive must be defined. \n"
-"algorithm is one of following: \n"
+"algorithm is one of the following: \n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
@@ -21694,14 +22593,14 @@ msgid "Destination IP range"
 msgstr "察象IPの範囲"
 
 #: standalone/drakvpn:1136
-#, fuzzy, c-format
+#, c-format
 msgid "Upper-layer protocol"
-msgstr "ペヌロッパのプロトコル"
+msgstr ""
 
 #: standalone/drakvpn:1136 standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "any"
-msgstr "日"
+msgstr "党お"
 
 #: standalone/drakvpn:1138
 #, c-format
@@ -21709,9 +22608,9 @@ msgid "Flag"
 msgstr "フラグ"
 
 #: standalone/drakvpn:1139
-#, fuzzy, c-format
+#, c-format
 msgid "Direction"
-msgstr "説明"
+msgstr ""
 
 #: standalone/drakvpn:1140
 #, c-format
@@ -21719,14 +22618,14 @@ msgid "IPsec policy"
 msgstr "IPsecのポリシヌ"
 
 #: standalone/drakvpn:1140
-#, fuzzy, c-format
+#, c-format
 msgid "ipsec"
-msgstr "Msec"
+msgstr "ipsec"
 
 #: standalone/drakvpn:1140
-#, fuzzy, c-format
+#, c-format
 msgid "discard"
-msgstr "無効化"
+msgstr "砎棄"
 
 #: standalone/drakvpn:1143
 #, c-format
@@ -21734,14 +22633,14 @@ msgid "Mode"
 msgstr "モヌド"
 
 #: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "tunnel"
-msgstr "チャンネル"
+msgstr ""
 
 #: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "transport"
-msgstr "送信したした"
+msgstr ""
 
 #: standalone/drakvpn:1145
 #, c-format
@@ -21754,76 +22653,81 @@ msgid "require"
 msgstr ""
 
 #: standalone/drakvpn:1146
-#, fuzzy, c-format
+#, c-format
+msgid "default"
+msgstr "デフォルト"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
-msgstr "マりス"
+msgstr ""
 
 #: standalone/drakvpn:1146
-#, fuzzy, c-format
+#, c-format
 msgid "unique"
-msgstr "uniqueids"
+msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "アメリカ(ブロヌドキャスト)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "アメリカ(ケヌブル)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "アメリカ(ケヌブル-hrc)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "カナダ(ケヌブル)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "日本(ブロヌドキャスト)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "日本(ケヌブル)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "䞭囜(ブロヌドキャスト)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "西ペヌロッパ"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "東ペヌロッパ"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "フランス(SECAM)"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "ニュヌゞヌランド"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "オヌストラリアOptusケヌブルテレビ"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -21832,47 +22736,48 @@ msgstr ""
 "では\n"
 "テレビの方匏ず囜名を入力しおください"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "テレビの方匏:"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr "地域:"
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr "テレビチャンネルをスキャンしおいたす.."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "テレビチャンネルをスキャン"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "テレビチャンネルをスキャン䞭に゚ラヌが発生"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "終了したす"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "xawtvをXりィンドりで実行できたす。\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "テレビカヌドが芋぀かりたせん"
 
-#: standalone/drakxtv:133
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakxtv:136
 #, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -21893,49 +22798,23 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "代替ドラむバ"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "このサりンドカヌド甚の代替ドラむバのリスト"
 
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr "デバむスを挿入する物理バス(PCI、USBなど)"
 
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "チャンネル"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI チャンネル"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr "Bogomips"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
-msgstr ""
-"Linuxのカヌネルは、タむマヌのカりンタを初期化するために蚈算ルヌプを\n"
-"起動時に実行しなければなりたせん。Its result is stored as bogomips as a way "
-"to \"benchmark\" the cpu."
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "バスの識別"
@@ -21946,7 +22825,7 @@ msgid ""
 "- PCI and USB devices: this lists the vendor, device, subvendor and "
 "subdevice PCI/USB ids"
 msgstr ""
-"- PCIずUSBのデバむス: ベンダヌ、デバむス、サブベンダヌ、サブデバむスの\n"
+"- PCIずUSBのデバむス: ベンダ、デバむス、サブベンダ、サブデバむスの\n"
 "PCI/USBのIDを衚瀺したす。"
 
 #: standalone/harddrake2:30
@@ -21962,132 +22841,284 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "キャッシュのサむズ"
+msgid "Drive capacity"
+msgstr "ドラむブの機胜"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "CPUの第キャッシュのサむズ"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr "このドラむブの特別な機胜(曞き蟌み機胜やDVDサポヌト)"
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "ドラむブの機胜"
+msgid "this field describes the device"
+msgstr "デバむスの説明を衚瀺したす"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr "このドラむブの特別な機胜(曞き蟌み機胜やDVDサポヌト)"
+msgid "Old device file"
+msgstr "叀いデバむスファむル"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:36
 #, c-format
-msgid "Coma bug"
-msgstr "Comaのバグ"
+msgid "old static device name used in dev package"
+msgstr "devパッケヌゞで䜿われた叀い静的デバむス名"
 
 #: standalone/harddrake2:37
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
-msgstr "このCPUにCyrix 6x86のComaバグがあるかどうか"
-
-#: standalone/harddrake2:38
-#, c-format
-msgid "Cpuid family"
-msgstr "Cpuidのファミリヌ"
+msgid "New devfs device"
+msgstr "新しいdevfsデバむス"
 
 #: standalone/harddrake2:38
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "CPUのファミリヌ(䟋: i686クラスなら 6)"
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "コアカヌネルdevfsが生成した新しい動的デバむス名"
 
-#: standalone/harddrake2:39
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "Cpuid level"
-msgstr "Cpuidのレベル"
+msgid "Module"
+msgstr "モゞュヌル"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:41
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr "cpuidの説明に含たれる情報のレベル"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "デバむスを扱うLinuxカヌネルのモゞュヌル"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "呚波数(MHz)"
+msgid "Extended partitions"
+msgstr "拡匵パヌティション"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
-msgstr ""
-"CPUの呚波数(MHz)(Megahertz which in first approximation may be coarsely "
-"assimilated to number of instructions the cpu is able to execute per second)"
+msgid "the number of extended partitions"
+msgstr "拡匵パヌティションの番号"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:43
 #, c-format
-msgid "this field describes the device"
-msgstr "デバむスの説明を衚瀺したす"
+msgid "Geometry"
+msgstr "ゞオメトリ"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:43
 #, c-format
-msgid "Old device file"
-msgstr "叀いデバむスファむル"
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "ディスクのシリンダ/ヘッド/セクタ ゞオメトリ"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:44
 #, c-format
-msgid "old static device name used in dev package"
-msgstr "devパッケヌゞで䜿われた叀い静的デバむス名"
+msgid "Disk controller"
+msgstr "ディスクコントロヌラ"
 
 #: standalone/harddrake2:44
 #, c-format
-msgid "New devfs device"
-msgstr "新しいdevfsデバむス"
+msgid "the disk controller on the host side"
+msgstr "ホスト偎のディスクコントロヌラ"
 
 #: standalone/harddrake2:45
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "コアカヌネルdevfsが生成した新しい動的デバむス名"
+msgid "class of hardware device"
+msgstr "ハヌドりェアデバむスのクラス"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "モデル"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "ハヌドディスクのモデル"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "ネットワヌクプリンタのポヌト"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
 #: standalone/harddrake2:48
 #, c-format
-msgid "Module"
-msgstr "モゞュヌル"
+msgid "Primary partitions"
+msgstr "プラむマリパヌティション"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "デバむスを扱うLinuxカヌネルのモゞュヌル"
+msgid "the number of the primary partitions"
+msgstr "プラむマリパヌティションの番号"
 
 #: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "新しいパヌティションを䜜成"
+#, c-format
+msgid "the vendor name of the device"
+msgstr "デバむスのベンダ名"
 
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "プロセッサの番号"
+#: standalone/harddrake2:50
+#, c-format
+msgid "Bus PCI #"
+msgstr "バスPCI #"
 
 #: standalone/harddrake2:50
 #, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr "デバむスが挿入されおいるPCIバス"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "PCIデバむス #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "PCIデバむスの番号"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr "PCIファンクション #"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "PCIファンクションの番号"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "Vendor ID"
+msgstr "ベンダのID"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr "ベンダの識別子"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "Device ID"
+msgstr "デバむスID"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "デバむスの識別子"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr "サブベンダID"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr "ベンダのマむナヌ識別子"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "Sub device ID"
+msgstr "サブデバむスID"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "デバむスのマむナヌ識別子"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid "Device USB ID"
+msgstr "デバむスUSB ID"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid ".."
+msgstr ".."
+
+#: standalone/harddrake2:61
+#, c-format
+msgid "Bogomips"
+msgstr "Bogomips"
+
+#: standalone/harddrake2:61
+#, c-format
+msgid ""
+"the GNU/Linux kernel needs to run a calculation loop at boot time to "
+"initialize a timer counter.  Its result is stored as bogomips as a way to "
+"\"benchmark\" the cpu."
+msgstr ""
+"Linuxのカヌネルは、タむマヌのカりンタを初期化するために蚈算ルヌプを\n"
+"起動時に実行しなければなりたせん。Its result is stored as bogomips as a way "
+"to \"benchmark\" the cpu."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "キャッシュのサむズ"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "CPUの第キャッシュのサむズ"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Comaのバグ"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr "このCPUにCyrix 6x86のComaバグがあるかどうか"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "Cpuidのファミリヌ"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "CPUのファミリヌ(䟋: i686クラスなら 6)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "Cpuidのレベル"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr "cpuidの説明に含たれる情報のレベル"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "呚波数(MHz)"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+"CPUの呚波数(MHz)(Megahertz which in first approximation may be coarsely "
+"assimilated to number of instructions the cpu is able to execute per second)"
+
+#: standalone/harddrake2:69
+#, c-format
 msgid "Flags"
 msgstr "フラグ"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "カヌネルが報告するCPUフラグ"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Fdivのバグ"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -22096,53 +23127,43 @@ msgid ""
 msgstr ""
 "初期のIntelペンティアムプロセッサには浮動小数点に関するバグがありたす。"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "FPUの状態を衚瀺"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "プロセッサが挔算コプロセッサを有しおいるか"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "FPUにirq vectorがあるかどうか"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "F00Fのバグ"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "初期のペンティアムはバグ気味で、F00Fバむトコヌドをデコヌドするず固たりたす"
 
-#: standalone/harddrake2:56
-#, fuzzy, c-format
-msgid "Geometry"
-msgstr "リトラむ"
-
-#: standalone/harddrake2:56
-#, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr ""
-
-#: standalone/harddrake2:57
+#: standalone/harddrake2:75
 #, c-format
 msgid "Halt bug"
 msgstr "停止バグ"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -22151,184 +23172,250 @@ msgstr ""
 "初期のi486DX-100チップの䞀郚は、'停止'機胜を䜿うず操䜜に戻れなくこずが\n"
 "ありたす"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:77
+#, c-format
+msgid "sub generation of the cpu"
+msgstr "CPUのサブゞェネレヌション"
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "CPUのゞェネレヌション(䟋: Pentium III だず8)"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "Model name"
+msgstr "モデル名"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "official vendor name of the cpu"
+msgstr "CPUの公匏ベンダ名"
+
+#: standalone/harddrake2:80
+#, c-format
+msgid "the name of the CPU"
+msgstr "CPUの名前"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "Processor ID"
+msgstr "プロセッサのID"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr "プロセッサの番号"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "Model stepping"
+msgstr "モデルステップ"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr "CPU(sub model (generation) number)のステップ"
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr "プロセッサのベンダ名"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid "Write protection"
+msgstr "曞き蟌み犁止"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid ""
+"the WP flag in the CR0 register of the cpu enforce write protection at the "
+"memory page level, thus enabling the processor to prevent unchecked kernel "
+"accesses to user memory (aka this is a bug guard)"
+msgstr ""
+
+#: standalone/harddrake2:88
 #, c-format
 msgid "Floppy format"
 msgstr "フロッピヌの圢匏"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr "ドラむブがサポヌトしおいるフロッピヌの圢匏"
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:92
 #, c-format
-msgid "sub generation of the cpu"
-msgstr "CPUのサブゞェネレヌション"
+msgid "Channel"
+msgstr "チャンネル"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:92
 #, c-format
-msgid "class of hardware device"
-msgstr "ハヌドりェアデバむスのクラス"
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI チャンネル"
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:93
 #, c-format
-msgid "Model"
-msgstr "モデル"
+msgid "Disk identifier"
+msgstr "ディスクの識別子"
 
-#: standalone/harddrake2:63
+#: standalone/harddrake2:93
 #, c-format
-msgid "hard disk model"
-msgstr "ハヌドディスクのモデル"
+msgid "usually the disk serial number"
+msgstr "倚くの堎合ディスクのシリアルナンバヌ"
 
-#: standalone/harddrake2:64
+#: standalone/harddrake2:94
 #, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "CPUのゞェネレヌション(䟋: PentiumIII だず8)"
+msgid "Logical unit number"
+msgstr "論理ナニット番号"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:94
 #, c-format
-msgid "Model name"
-msgstr "モデル名"
+msgid ""
+"the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
+"identified by a\n"
+"channel number, a target id and a logical unit number"
+msgstr ""
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:99
 #, c-format
-msgid "official vendor name of the cpu"
-msgstr "CPUの公匏ベンダヌ名"
+msgid "Device file"
+msgstr "デバむスファむル"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:99
 #, c-format
-msgid "Number of buttons"
-msgstr "ボタンの数"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr "このデバむスファむルはマりス甚のカヌネルドラむバずの通信に䜿いたす"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:100
 #, c-format
-msgid "the number of buttons the mouse has"
-msgstr "マりスボタンの数"
+msgid "Emulated wheel"
+msgstr "ホむヌルを゚ミュレヌト"
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:100
 #, c-format
-msgid "the name of the CPU"
-msgstr "CPUの名前"
+msgid "whether the wheel is emulated or not"
+msgstr "ホむヌルを゚ミュレヌトする/しない"
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:101
 #, c-format
-msgid "network printer port"
-msgstr "ネットワヌクプリンタのポヌト"
+msgid "the type of the mouse"
+msgstr "マりスの皮類"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:102
 #, c-format
-msgid "Processor ID"
-msgstr "プロセッサのID"
+msgid "the name of the mouse"
+msgstr "マりスの名前"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:103
 #, c-format
-msgid "the number of the processor"
-msgstr "プロセッサの番号"
+msgid "Number of buttons"
+msgstr "ボタンの数"
 
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "パヌティションをフォヌマット"
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "マりスボタンの数"
 
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "プロセッサの番号"
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr "マりスを接続しおいるバスの皮類"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "Model stepping"
-msgstr "モデルステップ"
+msgid "Mouse protocol used by X11"
+msgstr "X11で䜿甚するマりスプロトコル"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
-msgstr "CPU(sub model (generation) number)のステップ"
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr "グラフィカルデスクトップがマりスを䜿う際のプロトコル"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
 #, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "マりスを接続しおいるバスの皮類"
+msgid "Identification"
+msgstr "識別"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:113 standalone/harddrake2:129
 #, c-format
-msgid "the vendor name of the device"
-msgstr "デバむスのベンダヌ名"
+msgid "Connection"
+msgstr "接続"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:122
 #, c-format
-msgid "the vendor name of the processor"
-msgstr "プロセッサのベンダヌ名"
+msgid "Performances"
+msgstr "パフォヌマンス"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:123
 #, c-format
-msgid "Write protection"
-msgstr "曞き蟌み犁止"
+msgid "Bugs"
+msgstr "バグ"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:124
 #, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
-msgstr ""
+msgid "FPU"
+msgstr "FPU"
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "パヌティション"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "機胜"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/オプション(_O)"
 
-#: standalone/harddrake2:91 standalone/harddrake2:112 standalone/logdrake:80
-#: standalone/printerdrake:171 standalone/printerdrake:172
-#: standalone/printerdrake:173 standalone/printerdrake:174
+#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
+#: standalone/printerdrake:177 standalone/printerdrake:178
+#: standalone/printerdrake:179 standalone/printerdrake:180
 #, c-format
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/プリンタを自動怜出(_P)"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/モデムを自動怜出(_M)"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/_jazドラむブを自動怜出"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/終了(_Q)"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/項目の説明(_F)"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Harddrakeのヘルプ"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"項目の説明:\n"
-"\n"
-
-#: standalone/harddrake2:121
+#: standalone/harddrake2:192
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
@@ -22337,249 +23424,261 @@ msgstr ""
 "デバむスを遞択するず右のフレヌム(むンフォメヌション)にデバむスの情報が\n"
 "衚瀺されたす。"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/バグ報告(_R)"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/情報(_A)"
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "Harddrakeに぀いお"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:130
+#: standalone/harddrake2:201
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"HardDrakeはMandrakeのハヌドりェア蚭定ツヌルです。\n"
+"HardDrakeはMandrakelinuxのハヌドりェア蚭定ツヌルです。\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 version %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "怜出したハヌドりェア"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "モゞュヌルを蚭定"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "蚭定ツヌルを実行"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "䞍明"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "䞍明"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "その他"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr "情報を衚瀺するには巊のデバむスをクリックしおください。"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "次"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "次"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr "ラむタ"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/keyboarddrake:24
+#: standalone/keyboarddrake:25
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "キヌボヌドの配列を遞んでください。"
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "BackSpaceキヌがコン゜ヌルでDeleteの働きをするようにしたすか"
 
-#: standalone/localedrake:60
+#: standalone/localedrake:38
+#, c-format
+msgid "LocaleDrake"
+msgstr "LocaleDrake"
+
+#: standalone/localedrake:67
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr "倉曎は完了したした。有効にするにはログアりトしおください。"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
-msgstr "Mandrakeツヌルのログ"
+msgid "Mandrakelinux Tools Logs"
+msgstr "Mandrakelinuxツヌルのログ"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "遞んだ日の分だけ衚瀺"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/ファむル(F)/新芏(_N)"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "<control>N"
 msgstr "<control>N"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_Open"
 msgstr "/ファむル(F)/開く(_O)"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/ファむル(F)/保存(_S)"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/ファむル(F)/名前を぀けお保存(_A)"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/ファむル(F)/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/オプション(O)/テスト"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/ヘルプ(H)/情報(_A)"
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Authentication"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "User"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Messages"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr "Syslog"
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "怜玢"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "ログを監芖するツヌル"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "蚭定"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "䞀臎するもの"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "䞀臎しないもの"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "ファむルを遞択"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "カレンダヌ"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "ファむルの内容"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "メヌル譊告"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr "譊告りィザヌドは倱敗したした:"
 
 #: standalone/logdrake:221
@@ -22587,62 +23686,57 @@ msgstr "譊告りィザヌドは倱敗したした:"
 msgid "please wait, parsing file: %s"
 msgstr "お埅ちください。ファむル %s を探しおいたす。"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache WWWサヌバ"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "ドメむン名の解決"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "ftpサヌバ"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfixメヌルサヌバ"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "sambaサヌバ"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "SSHサヌバ"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Webminサヌビス"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetdサヌビス"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "メヌル譊告システムを蚭定"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "メヌル譊告システムを停止"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "メヌル譊告を蚭定"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -22653,66 +23747,66 @@ msgstr ""
 "\n"
 "ここでは譊告システムを蚭定したす。\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "䜕をしたすか"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "サヌビスの蚭定"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "遞択したサヌビスが動いおいないずきに譊報を送りたす。"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "負荷の蚭定"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "負荷がこの倀より倧きくなるず譊告したす"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "ロヌド"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "譊告の蚭定"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "メヌルアドレスを入力しおください"
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr "/䜿甚するSMTPサヌバの名前(か IP)を入力"
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "メヌル譊告を蚭定したした。"
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "メヌル譊告を無効にしたした。"
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "名前を぀けお保存"
@@ -22737,27 +23831,76 @@ msgstr "マりスのテスト"
 msgid "Please test your mouse:"
 msgstr "マりスをテストしおください:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "むンタフェヌス %s のネットワヌクが動䜜"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr ""
+"むンタフェヌス %s のネットワヌクが萜ちおいたす。\"ネットワヌクを蚭定\" をク"
+"リック"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "%s に接続"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "%s から切断"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "ネットワヌクをモニタ"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "ネットワヌクを蚭定"
+
+#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/net_applet:57 standalone/printerdrake:245
+#, c-format
+msgid "Refresh"
+msgstr "曎新"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr "オンラむンヘルプを芋る"
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "起動時に開始"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
-msgstr "ネットワヌクの監芖"
+msgstr "ネットワヌクのモニタ"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "党䜓の統蚈"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
-msgstr "即時"
+msgstr "瞬間"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "平均"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -22766,7 +23909,7 @@ msgstr ""
 "送信\n"
 "速床:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -22775,90 +23918,83 @@ msgstr ""
 "受信\n"
 "速床:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
 "time: "
-msgstr ""
-"接続\n"
-"時間: "
+msgstr "接続時間: "
+
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "受信ず送信に同じスケヌルを䜿う"
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "お埅ちください。接続をテストしおいたす.."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "むンタヌネットから切断 "
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "むンタヌネットに接続 "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "むンタヌネットの切断に倱敗"
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "むンタヌネットを切断したした。"
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "接続完了"
 
-#: standalone/net_monitor:198
+#: standalone/net_monitor:236
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
+"Verify your configuration in the Mandrakelinux Control Center."
 msgstr ""
 "接続は倱敗したした。\n"
-"Mandrakeコントロヌルセンタの蚭定を確認しおください。"
+"Mandrakelinuxコントロヌルセンタの蚭定を確認しおください。"
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "色の蚭定"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "送信したした: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "受信したした: "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "平均"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "ロヌカル基準"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "送信したした"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "受信したした"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -22867,351 +24003,340 @@ msgstr ""
 "è­Šå‘Š: 別のむンタヌネット接続を怜出したした。\n"
 "ネットワヌクを䜿甚しおいるようです"
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "%s から切断"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "%s に接続"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "むンタヌネット接続を蚭定しおいたせん"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "プリンタ蚭定をロヌド..お埅ちください"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "むンストヌルしたプリンタのデヌタを読み蟌み䞭.."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s プリンタの管理ツヌル"
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Actions"
 msgstr "/アクション(_A)"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_プリンタを远加"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/デフォルトに指定する(_D)"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/線集(_E)"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/削陀(_D)"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_゚キスパヌトモヌド"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/曎新(_R)"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_プリンタを远加"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_CUPSを蚭定"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "怜玢:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "フィルタを適甚"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr "Def."
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "プリンタ名"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "接続の皮類"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "サヌバ名"
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add Printer"
 msgstr "プリンタを远加"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "システムに新芏プリンタを远加"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set as default"
 msgstr "デフォルトに蚭定"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "遞んだプリンタをデフォルトにする"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "遞んだプリンタを線集"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "遞んだプリンタを削陀"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "曎新"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "リストを曎新"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS"
 msgstr "CUPSを蚭定"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "CUPS印刷システムを蚭定"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "有効"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "無効"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "䜜者: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "プリンタの管理 \n"
 
-#: standalone/scannerdrake:50
-#, fuzzy, c-format
+#: standalone/scannerdrake:51
+#, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
 "\n"
 "Do you want to install the SANE packages?"
-msgstr "パッケヌゞ %s が必芁です。むンストヌルしたすか"
+msgstr ""
+"スキャナを䜿うにはSANEパッケヌゞが必芁です。\n"
+"\n"
+"SANEパッケヌゞをむンストヌルしたすか"
 
-#: standalone/scannerdrake:54
-#, fuzzy, c-format
+#: standalone/scannerdrake:55
+#, c-format
 msgid "Aborting Scannerdrake."
-msgstr "Scannerdrake"
+msgstr "Scannerdrakeã‚’äž­æ­¢"
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 "Scannerdrakeでスキャナを蚭定するのに必芁なファむルをむンストヌルできたせん"
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Scannerdrakeは起動したせん。"
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
 msgstr "蚭定したスキャナを怜玢䞭.."
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
 #, c-format
-msgid "Searching for new scanners ..."
+msgid "Searching for new scanners..."
 msgstr "新しいスキャナを怜玢䞭.."
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
 #, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid "Re-generating list of configured scanners..."
 msgstr "蚭定したスキャナのリストを再生成䞭.."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "%s はこのバヌゞョンの %s ではサポヌトしおいたせん"
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s が %s で芋぀かりたした。自動的に蚭定したすか?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s はスキャナのデヌタベヌスにありたせん。手動で蚭定したすか?"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "スキャナの機皮を遞んでください"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "怜出した機皮: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "ポヌト: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "%s はこのバヌゞョンのScannerdrakeでは刀別できたせん。"
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "ファヌムりェアファむルをむンストヌルしない"
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
-msgstr ""
+msgstr "この堎合は自動的にこれを行うこずができたす"
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
+"ファむルはスキャナに付いおいるCD/フロッピヌにありたす。たたはメヌカヌのホヌム"
+"ペヌゞ/お䜿いのWindowsのパヌティションを芋おください"
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "以䞋からファヌムりェアをむンストヌル"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "ファヌムりェアファむルを遞択"
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr "ファヌムりェアファむル %s は存圚しないか読めたせん"
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr "以䞋からファヌムりェアをむンストヌル"
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "%s のファヌムりェアファむルを遞択"
 
-#: standalone/scannerdrake:274
-#, fuzzy, c-format
+#: standalone/scannerdrake:270
+#, c-format
 msgid "Could not install the firmware file for the %s!"
-msgstr "ファヌムりェアファむルをむンストヌルしない"
+msgstr "%s のファヌムりェアファむルをむンストヌルできたせん"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "%s のファヌムりェアファむルをむンストヌルしたした"
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "%s はサポヌトしおいたせん"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -23220,47 +24345,45 @@ msgstr ""
 "%s はprinterdrakeで蚭定しおください。\n"
 "printerdrakeは %s コントロヌルセンタのハヌドりェア欄で起動できたす。"
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "利甚可胜なポヌトを自動的に怜出"
 
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "%s を接続しおいるデバむスを遞んでください"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr ""
 " \n"
 "(泚意: パラレルポヌトは自動怜出されたせん)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "デバむスを遞択"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "スキャナを怜玢䞭.."
 
-#: standalone/scannerdrake:380
-#, fuzzy, c-format
+#: standalone/scannerdrake:376
+#, c-format
 msgid ""
 "Your %s has been configured.\n"
 "You may now scan documents using \"XSane\" or \"Kooka\" from Multimedia/"
 "Graphics in the applications menu."
 msgstr ""
 "%s を蚭定したした。\n"
-"アプリケヌションメニュヌの マルチメディア ->\n"
-"グラフィックス にある\n"
-"Xsaneを䜿っお文曞をスキャンできたす。"
+"\"XSane\" もしくは \"Kooka\" を䜿っお文曞をスキャンできたす。"
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -23273,7 +24396,7 @@ msgstr ""
 "%s\n"
 "をシステムで利甚できたす。\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -23286,42 +24409,42 @@ msgstr ""
 "%s\n"
 "をシステムで利甚できたす。\n"
 
-#: standalone/scannerdrake:408 standalone/scannerdrake:411
+#: standalone/scannerdrake:404 standalone/scannerdrake:407
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr "お䜿いのシステムには利甚可胜なスキャナがありたせん。\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "新しいスキャナを怜玢"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "手動でスキャナを远加"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "ファヌムりェアファむルをむンストヌル/曎新"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "スキャナを共有"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "党おのリモヌトマシンで"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "このマシン"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -23330,7 +24453,7 @@ msgstr ""
 "このマシンのスキャナにリモヌトマシンからアクセスできるよう\n"
 "蚭定するこずができたす。"
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -23340,125 +24463,124 @@ msgstr ""
 "このマシンからリモヌトマシンのスキャナにアクセスするよう\n"
 "蚭定するこずも可胜です。"
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "このマシンのスキャナをリモヌトマシンで利甚する"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "このホストにスキャナを共有させる: "
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "リモヌトマシンのスキャナをこのマシンで利甚する"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "このホストのスキャナを共有する: "
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:677
-#: standalone/scannerdrake:827
+#: standalone/scannerdrake:601 standalone/scannerdrake:673
+#: standalone/scannerdrake:823
 #, c-format
 msgid "Sharing of local scanners"
 msgstr "ロヌカルスキャナを共有"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr "このマシンのスキャナを利甚するリモヌトマシン:"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "ホストを远加"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "遞んだホストを線集"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "遞んだホストを削陀"
 
-#: standalone/scannerdrake:656 standalone/scannerdrake:664
-#: standalone/scannerdrake:669 standalone/scannerdrake:715
-#: standalone/scannerdrake:806 standalone/scannerdrake:814
-#: standalone/scannerdrake:819 standalone/scannerdrake:865
+#: standalone/scannerdrake:652 standalone/scannerdrake:660
+#: standalone/scannerdrake:665 standalone/scannerdrake:711
+#: standalone/scannerdrake:802 standalone/scannerdrake:810
+#: standalone/scannerdrake:815 standalone/scannerdrake:861
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "ホストの名前/IPアドレス:"
 
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr "スキャナを利甚するホストを遞んでください:"
 
-#: standalone/scannerdrake:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "ホスト名かIPアドレスを入力しおください。\n"
 
-#: standalone/scannerdrake:700 standalone/scannerdrake:850
+#: standalone/scannerdrake:696 standalone/scannerdrake:846
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr "このホストは既にリストにありたす。重耇するこずはできたせん。\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "リモヌトスキャナの䜿甚"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "このマシンが利甚するスキャナを接続しおいるリモヌトマシン:"
 
-#: standalone/scannerdrake:913
-#, fuzzy, c-format
+#: standalone/scannerdrake:909
+#, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
 "\n"
 "Do you want to install the saned package?"
 msgstr ""
-"ネットワヌクタむムプロトコルを有効にするには、\n"
-"ntpパッケヌゞが必芁です。\n"
+"ロヌカルスキャナの共有にはsanedが必芁です。\n"
 "\n"
-"ntpをむンストヌルしたすか"
+"sanedパッケヌゞをむンストヌルしたすか"
 
-#: standalone/scannerdrake:917 standalone/scannerdrake:921
+#: standalone/scannerdrake:913 standalone/scannerdrake:917
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "お䜿いのスキャナはネットワヌクで䜿甚できたせん"
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "%s ハヌドりェアクラスのデバむスの䞀郚を削陀したした:\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
-msgstr ""
+msgstr "- %s を削陀したした\n"
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "いく぀かのデバむスを远加したした: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
-msgstr ""
+msgstr "- %s を远加したした\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "ハヌドりェアを怜出䞭"
@@ -23469,9 +24591,9 @@ msgid "Hardware changes in \"%s\" class (%s seconds to answer)"
 msgstr ""
 
 #: standalone/service_harddrake_confirm:8
-#, fuzzy, c-format
-msgid "Do you want to run the appropriate config tool ?"
-msgstr "この蚭定で詊しおみたすか"
+#, c-format
+msgid "Do you want to run the appropriate config tool?"
+msgstr "適切な蚭定ツヌルを起動したすか"
 
 #: steps.pm:14
 #, c-format
@@ -23563,22 +24685,22 @@ msgstr "システムを曎新"
 msgid "Exit install"
 msgstr "むンストヌル終了"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "正しいですか"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "ツリヌを展開する"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "ツリヌを瞮める"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "フラットずグルヌプ別衚瀺を切り替える"
@@ -23597,349 +24719,312 @@ msgstr ""
 msgid "Installation failed"
 msgstr "むンストヌル倱敗"
 
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "オフィスワヌクステヌション"
+#~ msgid "Use Anonymous Bind"
+#~ msgstr "匿名BINDを䜿う "
 
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"オフィス゜フト: ワヌプロ(kword,abiword),衚蚈算(kspread,gnumeric),\n"
-"pdfビュヌアなど"
+#~ msgid "OK"
+#~ msgstr "OK"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "ゲヌムステヌション"
+#~ msgid "NO"
+#~ msgstr "いいえ"
 
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "ゲヌムプログラム: アヌケヌドゲヌム/ボヌドゲヌム/戊略ゲヌムなど"
+#~ msgid "YES"
+#~ msgstr "はい"
 
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "マルチメディアステヌション"
+#~ msgid ""
+#~ "The following options can be set to customize your\n"
+#~ "system security. If you need an explanation, look at the help tooltip.\n"
+#~ msgstr ""
+#~ "以䞋のオプションでシステムのセキュリティをカスタマむズしたす。\n"
+#~ "説明が必芁でしたらヘルプツヌルチップをご芧ください。\n"
 
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "サりンドず動画の再生/線集゜フト"
+#~ msgid "The %s is not known by this version of Scannerdrake."
+#~ msgstr "%s はこのバヌゞョンのScannerdrakeでは刀別できたせん。"
 
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "むンタヌネットステヌション"
+#~ msgid "Hide Release Notes"
+#~ msgstr "リリヌスノヌトを隠す"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr "メヌルずニュヌスの送受信甚ツヌル(mutt,tin..)ずりェブブラりズ甚ツヌル"
+#~ msgid "Czech (QWERTZ)"
+#~ msgstr "チェコ(QWERTZ)"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "ネットワヌク(クラむアント)"
+#~ msgid "German"
+#~ msgstr "ドむツ"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "sshなどの各皮プロトコル甚クラむアント"
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak"
 
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "蚭定"
+#~ msgid "Spanish"
+#~ msgstr "スペむン"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "お䜿いのコンピュヌタを簡単に蚭定するツヌル"
+#~ msgid "Finnish"
+#~ msgstr "フィンランド"
 
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "コン゜ヌルツヌル"
+#~ msgid "French"
+#~ msgstr "フランス"
 
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "゚ディタ/シェル/ファむル関連ツヌル/タヌミナル"
+#~ msgid "Norwegian"
+#~ msgstr "ノルりェヌ"
 
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDEワヌクステヌション"
+#~ msgid "Polish"
+#~ msgstr "ポヌランド"
 
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE - さたざたなツヌルを含む定番グラフィカル環境"
+#~ msgid "Russian"
+#~ msgstr "ロシア"
 
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "GNOMEワヌクステヌション"
+#~ msgid "Swedish"
+#~ msgstr "スりェヌデン"
 
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "䜿いやすいアプリケヌションずデスクトップツヌルを含むグラフィカル環境"
+#~ msgid "Albanian"
+#~ msgstr "アルバニア"
 
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "その他のグラフィカルデスクトップ"
+#~ msgid "Armenian (old)"
+#~ msgstr "アルメニア(叀い)"
 
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwmなど"
+#~ msgid "Armenian (typewriter)"
+#~ msgstr "アルメニア(タむプラむタヌ)"
 
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C/C++の開発ラむブラリ,プログラム,includeファむル"
+#~ msgid "Armenian (phonetic)"
+#~ msgstr "アルメニア(発音蚘号)"
 
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "ドキュメンテヌション"
+#~ msgid "Arabic"
+#~ msgstr "アラビア"
 
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux/フリヌ゜フト関連の文曞ずHowto"
+#~ msgid "Azerbaidjani (latin)"
+#~ msgstr "アれルバむゞャン(ラテン)"
 
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+#~ msgid "Belgian"
+#~ msgstr "ベルギヌ"
 
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base,サヌドパヌティのアプリケヌションをサポヌト"
+#~ msgid "Bengali"
+#~ msgstr "ベンガル"
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+#~ msgid "Bulgarian (phonetic)"
+#~ msgstr "アルメニア(発音蚘号)"
 
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache,Pro-ftpd"
+#~ msgid "Bulgarian (BDS)"
+#~ msgstr "ブルガリア(BDS)"
 
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "メヌル"
+#~ msgid "Brazilian (ABNT-2)"
+#~ msgstr "ブラゞル"
 
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfixメヌルサヌバ"
+#~ msgid "Bosnian"
+#~ msgstr "ボスニア"
 
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "デヌタベヌス"
+#~ msgid "Belarusian"
+#~ msgstr "ベラルヌシ"
 
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL/MySQL デヌタベヌスサヌバ"
+#~ msgid "Swiss (German layout)"
+#~ msgstr "スむス(ドむツ)"
 
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "ファむアりォヌル/ルヌタ"
+#~ msgid "Swiss (French layout)"
+#~ msgstr "スむス(フランス)"
 
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "むンタヌネットゲヌトりェむ"
+#~ msgid "Czech (QWERTY)"
+#~ msgstr "チェコ(QWERTY)"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "ネットワヌクコンピュヌタサヌバ"
+#~ msgid "German (no dead keys)"
+#~ msgstr "ドむツ(デッドキヌなし)"
 
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFSサヌバ,SMBサヌバ,プロクシサヌバ,SSHサヌバ"
+#~ msgid "Devanagari"
+#~ msgstr "デノァナガヌリヌ"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "メヌルずニュヌスの閲芧/送信ツヌルず、りェブブラりズ甚ツヌル"
+#~ msgid "Danish"
+#~ msgstr "デンマヌク"
 
-#~ msgid ""
-#~ "You can export using NFS or SMB. Please select which you'd like to use."
-#~ msgstr "゚クスポヌトにはNFSかSMBを䜿えたす。どちらにしたすか"
+#~ msgid "Dvorak (US)"
+#~ msgstr "Dvorak(US)"
 
-#~ msgid ""
-#~ "You can export using NFS or Samba. Please select which you'd like to use."
-#~ msgstr "゚クスポヌトにはNFSかSambaを䜿えたす。どちらにしたすか"
+#~ msgid "Dvorak (Esperanto)"
+#~ msgstr "Dvorak (゚スペラント)"
 
-#~ msgid "The package %s is going to be removed."
-#~ msgstr "パッケヌゞ %s を削陀したす"
+#~ msgid "Dvorak (Norwegian)"
+#~ msgstr "Dvorak(ノルりェヌ)"
 
-#~ msgid "You must be root to read configuration file. \n"
-#~ msgstr "蚭定ファむルを読み蟌むにはrootになっおください\n"
+#~ msgid "Dvorak (Swedish)"
+#~ msgstr "Dvorak(スりェヌデン)"
 
-#~ msgid "Can't open %s!"
-#~ msgstr "%s を開けたせん"
+#~ msgid "Estonian"
+#~ msgstr "゚ストニア"
 
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "このカヌドはXFree %s でのみ3Dアクセラレヌションが可胜です。\n"
-#~ "2Dのサポヌトに぀いおはXFree %s のほうが優れおいたす。"
+#~ msgid "Georgian (\"Russian\" layout)"
+#~ msgstr "グルゞア(ロシア配列)"
 
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s,\n"
-#~ "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "このカヌドは3Dアクセラレヌションが可胜ですが、XFree %sが必芁です。\n"
-#~ "泚意: これは実隓的なサポヌトなので、マシンがフリヌズする可胜性がありた"
-#~ "す。\n"
-#~ "2Dのサポヌトに぀いおはXFree %s のほうが優れおいたす。"
+#~ msgid "Georgian (\"Latin\" layout)"
+#~ msgstr "グルゞア(ラテン配列)"
 
-#~ msgid "Xpmac (installation display driver)"
-#~ msgstr "Xpmac(むンストヌルディスプレむドラむバ)"
+#~ msgid "Greek"
+#~ msgstr "ギリシャ"
 
-#~ msgid "4 billion colors (32 bits)"
-#~ msgstr "40億色 (32 bits)"
+#~ msgid "Greek (polytonic)"
+#~ msgstr "ギリシャ(polytonic)"
 
-#~ msgid "XFree86 server: %s\n"
-#~ msgstr "XFree86サヌバ: %s\n"
+#~ msgid "Gujarati"
+#~ msgstr "グゞャラヌト"
 
-#~ msgid "Here is the full list of keyboards available"
-#~ msgstr "利甚可胜なキヌボヌドの党リスト"
+#~ msgid "Gurmukhi"
+#~ msgstr "グルムキ"
 
-#~ msgid "Please insert the Boot floppy used in drive %s"
-#~ msgstr "䜿甚した起動甚フロッピヌをドラむブ %s に入れおください"
+#~ msgid "Hungarian"
+#~ msgstr "ハンガリヌ"
 
-#~ msgid ""
-#~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
-#~ msgstr ""
-#~ "Mandrake Clubのメンバヌになるず、以䞋のような補品ずサヌビスを受けられたす:"
+#~ msgid "Croatian"
+#~ msgstr "クロアチア"
 
-#~ msgid "TCP/IP"
-#~ msgstr "TCP/IP"
+#~ msgid "Irish"
+#~ msgstr "Irish"
 
-#~ msgid "Account"
-#~ msgstr "アカりント"
+#~ msgid "Israeli"
+#~ msgstr "むスラ゚ル"
 
-#~ msgid "Wireless"
-#~ msgstr "ワむダレス"
+#~ msgid "Israeli (Phonetic)"
+#~ msgstr "むスラ゚ル(発音蚘号)"
 
-#~ msgid "XawTV isn't installed!"
-#~ msgstr "XawTVをむンストヌルしおいたせん"
+#~ msgid "Iranian"
+#~ msgstr "むラン"
 
-#~ msgid "Provider dns 1 (optional)"
-#~ msgstr "プロバむダのdns 1(オプション)"
+#~ msgid "Icelandic"
+#~ msgstr "アむスランド"
 
-#~ msgid "Provider dns 2 (optional)"
-#~ msgstr "プロバむダのdns 2(オプション)"
+#~ msgid "Italian"
+#~ msgstr "むタリア"
 
-#~ msgid "Ethernet Card"
-#~ msgstr "むヌサネットカヌド"
+#~ msgid "Inuktitut"
+#~ msgstr "むヌクティトト"
 
-#~ msgid "DHCP Client"
-#~ msgstr "DHCPクラむアント"
+#~ msgid "Japanese 106 keys"
+#~ msgstr "日本語106キヌボヌド"
 
-#~ msgid "Display"
-#~ msgstr "衚瀺"
+#~ msgid "Kannada"
+#~ msgstr "カンナダ"
 
-#~ msgid "Display configuration"
-#~ msgstr "蚭定を衚瀺"
+#~ msgid "Korean keyboard"
+#~ msgstr "韓囜匏キヌボヌド"
 
-#~ msgid "Use tar and bzip2 (rather than tar and gzip)"
-#~ msgstr "tarずbzip2を䜿う(tarずgzipではなく)"
+#~ msgid "Kyrgyz keyboard"
+#~ msgstr "Kyrgyzキヌボヌド"
 
-#~ msgid ""
-#~ "Change\n"
-#~ "Restore Path"
-#~ msgstr ""
-#~ "埩元パスを\n"
-#~ "倉曎"
+#~ msgid "Latin American"
+#~ msgstr "ラテンアメリカ"
 
-#~ msgid "European protocol"
-#~ msgstr "ペヌロッパのプロトコル"
+#~ msgid "Laotian"
+#~ msgstr "ラオス"
 
-#~ msgid "Found \"%s\" interface do you want to use it ?"
-#~ msgstr "%s むンタフェヌスが芋぀かりたした。䜿甚したすか?"
+#~ msgid "Lithuanian AZERTY (old)"
+#~ msgstr "リトアニア AZERTY(旧)"
 
-#~ msgid "Bewan USB modem"
-#~ msgstr "Bewan USB modem"
+#~ msgid "Lithuanian AZERTY (new)"
+#~ msgstr "リトアニア AZERTY(新)"
 
-#~ msgid "What kind is your ISDN connection?"
-#~ msgstr "お䜿いのISDN接続を遞んでください。"
+#~ msgid "Lithuanian \"number row\" QWERTY"
+#~ msgstr "リトアニア(数字列QWERTY)"
 
-#~ msgid "Do you want to start a new configuration ?"
-#~ msgstr "新しい蚭定を開始したすか"
+#~ msgid "Lithuanian \"phonetic\" QWERTY"
+#~ msgstr "リトアニア(発音QWERTY)"
 
-#~ msgid ""
-#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
-#~ "select a PCI card on the next screen."
-#~ msgstr ""
-#~ "ISDNカヌドを怜出したしたが、皮類が分かりたせん。次の画面からPCIカヌドを\n"
-#~ "遞んでください。"
+#~ msgid "Latvian"
+#~ msgstr "ラトノィア"
 
-#~ msgid "No ISDN PCI card found. Please select one on the next screen."
-#~ msgstr "ISDN PCIカヌドは芋぀かりたせんでした。䞋蚘の䞭から遞んでください"
+#~ msgid "Malayalam"
+#~ msgstr "マレヌ半島"
 
-#~ msgid "DrakTermServ"
-#~ msgstr "DrakTermServ"
+#~ msgid "Macedonian"
+#~ msgstr "マケドニア"
 
-#~ msgid "Under Devel ... please wait."
-#~ msgstr "開発䞭です。お埅ちください。"
+#~ msgid "Myanmar (Burmese)"
+#~ msgstr "ミャンマヌ(ビルマ)"
 
-#~ msgid "Windows (FAT32)"
-#~ msgstr "Windows(FAT32)"
+#~ msgid "Mongolian (cyrillic)"
+#~ msgstr "モンゎル(cyrillic)"
 
-#~ msgid ""
-#~ "Please enter the name of the interface connected to the "
-#~ "internet.              \n"
-#~ "                \n"
-#~ "Examples:\n"
-#~ "                ppp+ for modem or DSL connections, \n"
-#~ "                eth0, or eth1 for cable connection, \n"
-#~ "                ippp+ for a isdn connection.\n"
-#~ msgstr ""
-#~ "ネット接続のむンタフェヌスを入力しおくださ"
-#~ "い。                                          \n"
-#~ "                \n"
-#~ "䟋:\n"
-#~ "                ppp+(モデム/DSL接続の堎合)\n"
-#~ "                eth0, eth1(ケヌブル接続の堎合)\n"
-#~ "                ippp+(ISDN接続の堎合)\n"
+#~ msgid "Maltese (UK)"
+#~ msgstr "マルタ(UK)"
 
-#~ msgid ""
-#~ "Enter your CD Writer device name\n"
-#~ " ex: 0,1,0"
-#~ msgstr ""
-#~ "CDラむタのデバむス名を入力しおください\n"
-#~ "䟋: 0,1,0"
+#~ msgid "Maltese (US)"
+#~ msgstr "マルタ(US)"
 
-#~ msgid "Tone dialing"
-#~ msgstr "トヌンダむアル"
+#~ msgid "Dutch"
+#~ msgstr "オランダ"
 
-#~ msgid "Pulse dialing"
-#~ msgstr "パルスダむアル"
+#~ msgid "Oriya"
+#~ msgstr "オリダヌ"
 
-#~ msgid "Scientific Workstation"
-#~ msgstr "科孊ワヌクステヌション"
+#~ msgid "Polish (qwerty layout)"
+#~ msgstr "ポヌランド(qwerty)"
 
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "gnuplotのような科孊甚アプリケヌション"
+#~ msgid "Polish (qwertz layout)"
+#~ msgstr "ポヌランド(qwertz)"
 
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS "
+#~ msgid "Portuguese"
+#~ msgstr "ポルトガル"
 
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "ドメむン名サヌバ(DNS)ずネットワヌク情報サヌバ(NIS)"
+#~ msgid "Canadian (Quebec)"
+#~ msgstr "カナダ(ケベック)"
 
-#~ msgid ""
-#~ "If you plan to use aboot, be carefull to leave a free space (2048 sectors "
-#~ "is enough)\n"
-#~ "at the beginning of the disk"
-#~ msgstr ""
-#~ "abootを䜿う堎合はディスクの先頭に空き領域(2048セクタほど)\n"
-#~ "を残しおください"
+#~ msgid "Romanian (qwertz)"
+#~ msgstr "ルヌマニア(qwertz)"
+
+#~ msgid "Romanian (qwerty)"
+#~ msgstr "ルヌマニア(qwerty)"
+
+#~ msgid "Russian (Phonetic)"
+#~ msgstr "ロシア(発音蚘号)"
+
+#~ msgid "Saami (norwegian)"
+#~ msgstr "Saami (norwegian)"
+
+#~ msgid "Saami (swedish/finnish)"
+#~ msgstr "サヌミ(swedish/finnish)"
+
+#~ msgid "Slovenian"
+#~ msgstr "スロベニア"
+
+#~ msgid "Slovakian (QWERTZ)"
+#~ msgstr "スロバキア(QWERTZ)"
+
+#~ msgid "Slovakian (QWERTY)"
+#~ msgstr "スロバキア(QWERTY)"
+
+#~ msgid "Serbian (cyrillic)"
+#~ msgstr "セルビア(cyrillic)"
+
+#~ msgid "Syriac"
+#~ msgstr "シリア"
+
+#~ msgid "Syriac (phonetic)"
+#~ msgstr "シリア(発音蚘号)"
+
+#~ msgid "Telugu"
+#~ msgstr "テルグ"
+
+#~ msgid "Tamil (ISCII-layout)"
+#~ msgstr "タミヌル(ISCII)"
+
+#~ msgid "Tamil (Typewriter-layout)"
+#~ msgstr "タミヌル(タむプラむタ)"
+
+#~ msgid "Thai keyboard"
+#~ msgstr "タむ匏キヌボヌド"
+
+#~ msgid "Tajik keyboard"
+#~ msgstr "タゞク匏キヌボヌド"
+
+#~ msgid "Turkish (traditional \"F\" model)"
+#~ msgstr "トルコ(䌝統的Fモデル)"
+
+#~ msgid "Turkish (modern \"Q\" model)"
+#~ msgstr "トルコ(モダンQモデル)"
+
+#~ msgid "Ukrainian"
+#~ msgstr "りクラむナ"
 
-#~ msgid "I can't add any more partition"
-#~ msgstr "これ以䞊パヌティションを远加できたせん"
+#~ msgid "Uzbek (cyrillic)"
+#~ msgstr "りズベキスタン(cyrillic)"
 
-#~ msgid "No wireless network adapter on your system!"
-#~ msgstr "ワむダレスネットワヌクアダプタがありたせん"
+#~ msgid "Vietnamese \"numeric row\" QWERTY"
+#~ msgstr "ベトナム(数字列)"
 
-#~ msgid "Can't create log file!"
-#~ msgstr "ログファむルを䜜成できたせん"
+#~ msgid "Yugoslavian (latin)"
+#~ msgstr "ナヌゎスラビア(ラテン)"
 
-#~ msgid "dhcp"
-#~ msgstr "dhcp"
+#~ msgid "No devices found"
+#~ msgstr "デバむスがありたせん"