sync with copyright bumping

1 files changed, 2464 insertions, 1910 deletions

diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index d3c501c5c..5dca54bfd 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ja\n"
-"POT-Creation-Date: 2005-07-27 17:26+0200\n"
+"POT-Creation-Date: 2005-08-25 15:00+0200\n"
 "PO-Revision-Date: 2005-08-02 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -79,7 +79,7 @@ msgstr ""
 "再起動ボタンをクリックし、プラグを抜いて書き込みプロテクトを外してから\n"
 "再度キーを差し込んで Mandriva Move を起動してください。"
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1319
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
 msgid "Reboot"
 msgstr "再起動"
@@ -170,70 +170,73 @@ msgstr "デバイスの検出と設定を行っています。お待ちくださ
 #: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/interactive.pm:230
 #: diskdrake/interactive.pm:243 diskdrake/interactive.pm:404
 #: diskdrake/interactive.pm:422 diskdrake/interactive.pm:558
-#: diskdrake/interactive.pm:563 diskdrake/smbnfs_gtk.pm:41 fsedit.pm:209
-#: install_any.pm:1730 install_any.pm:1782 install_steps.pm:81
-#: install_steps_interactive.pm:37 interactive/http.pm:117
+#: diskdrake/interactive.pm:563 diskdrake/smbnfs_gtk.pm:41 do_pkgs.pm:19
+#: do_pkgs.pm:37 fsedit.pm:209 install_any.pm:1730 install_any.pm:1782
+#: install_steps.pm:81 install_steps_interactive.pm:37 interactive/http.pm:117
 #: interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:42
 #: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101
-#: network/netconnect.pm:819 network/netconnect.pm:923
-#: network/netconnect.pm:927 network/netconnect.pm:931
-#: network/netconnect.pm:936 network/netconnect.pm:1066
-#: network/netconnect.pm:1070 network/netconnect.pm:1074
-#: network/netconnect.pm:1078 network/netconnect.pm:1186
-#: network/netconnect.pm:1191 network/netconnect.pm:1211
-#: network/netconnect.pm:1364 network/thirdparty.pm:266
-#: network/thirdparty.pm:273 network/thirdparty.pm:309
-#: network/thirdparty.pm:311 network/thirdparty.pm:332
-#: network/thirdparty.pm:356 printer/printerdrake.pm:244
-#: printer/printerdrake.pm:251 printer/printerdrake.pm:276
-#: printer/printerdrake.pm:422 printer/printerdrake.pm:427
-#: printer/printerdrake.pm:440 printer/printerdrake.pm:450
-#: printer/printerdrake.pm:514 printer/printerdrake.pm:641
-#: printer/printerdrake.pm:1352 printer/printerdrake.pm:1399
-#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1481
-#: printer/printerdrake.pm:1485 printer/printerdrake.pm:1499
-#: printer/printerdrake.pm:1591 printer/printerdrake.pm:1672
-#: printer/printerdrake.pm:1676 printer/printerdrake.pm:1680
-#: printer/printerdrake.pm:1729 printer/printerdrake.pm:1787
-#: printer/printerdrake.pm:1791 printer/printerdrake.pm:1805
-#: printer/printerdrake.pm:1920 printer/printerdrake.pm:1924
-#: printer/printerdrake.pm:1967 printer/printerdrake.pm:2042
-#: printer/printerdrake.pm:2060 printer/printerdrake.pm:2069
-#: printer/printerdrake.pm:2078 printer/printerdrake.pm:2089
-#: printer/printerdrake.pm:2153 printer/printerdrake.pm:2247
-#: printer/printerdrake.pm:2767 printer/printerdrake.pm:3042
-#: printer/printerdrake.pm:3048 printer/printerdrake.pm:3596
-#: printer/printerdrake.pm:3600 printer/printerdrake.pm:3604
-#: printer/printerdrake.pm:4064 printer/printerdrake.pm:4305
-#: printer/printerdrake.pm:4329 printer/printerdrake.pm:4406
-#: printer/printerdrake.pm:4472 printer/printerdrake.pm:4592
-#: standalone/drakTermServ:393 standalone/drakTermServ:467
-#: standalone/drakTermServ:476 standalone/drakTermServ:771
-#: standalone/drakTermServ:778 standalone/drakTermServ:801
-#: standalone/drakTermServ:848 standalone/drakTermServ:1056
-#: standalone/drakTermServ:1536 standalone/drakTermServ:1552
-#: standalone/drakTermServ:1557 standalone/drakTermServ:1565
-#: standalone/drakTermServ:1577 standalone/drakTermServ:1598
-#: standalone/drakauth:36 standalone/drakbackup:498 standalone/drakbackup:612
-#: standalone/drakbackup:1090 standalone/drakbackup:1122
-#: standalone/drakbackup:1645 standalone/drakbackup:1801
-#: standalone/drakbackup:2415 standalone/drakbackup:4104
-#: standalone/drakbackup:4324 standalone/drakclock:124
-#: standalone/drakconnect:672 standalone/drakconnect:676
-#: standalone/drakconnect:681 standalone/drakconnect:696
+#: network/netconnect.pm:918 network/netconnect.pm:922
+#: network/netconnect.pm:926 network/netconnect.pm:931
+#: network/netconnect.pm:1074 network/netconnect.pm:1078
+#: network/netconnect.pm:1196 network/netconnect.pm:1201
+#: network/netconnect.pm:1221 network/netconnect.pm:1374
+#: network/thirdparty.pm:266 network/thirdparty.pm:273
+#: network/thirdparty.pm:309 network/thirdparty.pm:311
+#: network/thirdparty.pm:332 network/thirdparty.pm:356
+#: printer/printerdrake.pm:244 printer/printerdrake.pm:251
+#: printer/printerdrake.pm:276 printer/printerdrake.pm:422
+#: printer/printerdrake.pm:427 printer/printerdrake.pm:440
+#: printer/printerdrake.pm:450 printer/printerdrake.pm:514
+#: printer/printerdrake.pm:686 printer/printerdrake.pm:690
+#: printer/printerdrake.pm:772 printer/printerdrake.pm:1575
+#: printer/printerdrake.pm:1622 printer/printerdrake.pm:1659
+#: printer/printerdrake.pm:1704 printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1722 printer/printerdrake.pm:1814
+#: printer/printerdrake.pm:1895 printer/printerdrake.pm:1899
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:1952
+#: printer/printerdrake.pm:2010 printer/printerdrake.pm:2014
+#: printer/printerdrake.pm:2028 printer/printerdrake.pm:2148
+#: printer/printerdrake.pm:2152 printer/printerdrake.pm:2195
+#: printer/printerdrake.pm:2270 printer/printerdrake.pm:2288
+#: printer/printerdrake.pm:2297 printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2317 printer/printerdrake.pm:2381
+#: printer/printerdrake.pm:2476 printer/printerdrake.pm:3025
+#: printer/printerdrake.pm:3309 printer/printerdrake.pm:3315
+#: printer/printerdrake.pm:3879 printer/printerdrake.pm:3883
+#: printer/printerdrake.pm:3887 printer/printerdrake.pm:4348
+#: printer/printerdrake.pm:4589 printer/printerdrake.pm:4613
+#: printer/printerdrake.pm:4690 printer/printerdrake.pm:4756
+#: printer/printerdrake.pm:4876 standalone/drakTermServ:394
+#: standalone/drakTermServ:464 standalone/drakTermServ:473
+#: standalone/drakTermServ:774 standalone/drakTermServ:781
+#: standalone/drakTermServ:802 standalone/drakTermServ:849
+#: standalone/drakTermServ:1095 standalone/drakTermServ:1572
+#: standalone/drakTermServ:1588 standalone/drakTermServ:1593
+#: standalone/drakTermServ:1601 standalone/drakTermServ:1613
+#: standalone/drakTermServ:1634 standalone/drakauth:36
+#: standalone/drakbackup:498 standalone/drakbackup:612
+#: standalone/drakbackup:1093 standalone/drakbackup:1125
+#: standalone/drakbackup:1648 standalone/drakbackup:1804
+#: standalone/drakbackup:2429 standalone/drakbackup:4118
+#: standalone/drakbackup:4338 standalone/drakclock:124
+#: standalone/drakconnect:676 standalone/drakconnect:680
+#: standalone/drakconnect:685 standalone/drakconnect:700
 #: standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:261
-#: standalone/drakgw:50 standalone/drakgw:188 standalone/drakgw:217
-#: standalone/drakgw:258 standalone/drakgw:292 standalone/drakgw:394
-#: standalone/drakhosts:246 standalone/drakhosts:253 standalone/drakhosts:260
-#: standalone/draknfs:597 standalone/draknfs:604 standalone/draknfs:611
-#: standalone/drakroam:41 standalone/draksplash:15 standalone/draksplash:159
-#: standalone/drakxtv:107 standalone/finish-install:49 standalone/logdrake:168
-#: standalone/logdrake:437 standalone/logdrake:442 standalone/net_applet:160
-#: standalone/scannerdrake:59 standalone/scannerdrake:202
-#: standalone/scannerdrake:261 standalone/scannerdrake:715
-#: standalone/scannerdrake:726 standalone/scannerdrake:865
-#: standalone/scannerdrake:876 standalone/scannerdrake:946 wizards.pm:95
-#: wizards.pm:99 wizards.pm:121
+#: standalone/drakgw:50 standalone/drakgw:188 standalone/drakhosts:98
+#: standalone/drakhosts:248 standalone/drakhosts:255 standalone/drakhosts:262
+#: standalone/draknfs:306 standalone/draknfs:598 standalone/draknfs:605
+#: standalone/draknfs:612 standalone/drakroam:41 standalone/draksambashare:251
+#: standalone/draksambashare:255 standalone/draksambashare:258
+#: standalone/draksambashare:261 standalone/draksambashare:325
+#: standalone/draksambashare:430 standalone/draksambashare:601
+#: standalone/draksambashare:609 standalone/draksambashare:616
+#: standalone/draksplash:150 standalone/drakxtv:107
+#: standalone/finish-install:49 standalone/logdrake:168
+#: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
+#: standalone/scannerdrake:202 standalone/scannerdrake:261
+#: standalone/scannerdrake:715 standalone/scannerdrake:726
+#: standalone/scannerdrake:865 standalone/scannerdrake:876
+#: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "エラー"
@@ -312,8 +315,8 @@ msgid "No CDROM support"
 msgstr "CDROMサポートなし"
 
 #: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:92
-#: diskdrake/interactive.pm:1046 diskdrake/interactive.pm:1056
-#: diskdrake/interactive.pm:1109
+#: diskdrake/interactive.pm:1052 diskdrake/interactive.pm:1062
+#: diskdrake/interactive.pm:1115
 #, c-format
 msgid "Read carefully!"
 msgstr "よくお読みください"
@@ -465,17 +468,18 @@ msgstr ""
 "このカードはXorg %s での3Dアクセラレーションが可能です。\n"
 "注意: これは実験的なサポートなので、マシンがフリーズするかもしれません。"
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:963
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:964
 #, c-format
 msgid "Custom"
 msgstr "カスタム"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:85 install_steps_interactive.pm:1319
-#: printer/printerdrake.pm:744 printer/printerdrake.pm:4401
-#: printer/printerdrake.pm:4853 standalone/drakhosts:263 standalone/drakids:69
-#: standalone/drakids:77 standalone/draksplash:85 standalone/logdrake:173
-#: standalone/net_applet:81 standalone/scannerdrake:477
+#: install_steps_interactive.pm:85 install_steps_interactive.pm:1320
+#: printer/printerdrake.pm:882 printer/printerdrake.pm:899
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:5140
+#: standalone/drakhosts:265 standalone/drakids:62 standalone/drakids:71
+#: standalone/drakids:79 standalone/draksplash:81 standalone/logdrake:173
+#: standalone/net_applet:84 standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
 msgstr "終了"
@@ -490,7 +494,7 @@ msgstr "グラフィックカード"
 msgid "Monitor"
 msgstr "モニタ"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:286
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:287
 #, c-format
 msgid "Resolution"
 msgstr "解像度"
@@ -502,7 +506,8 @@ msgstr "テスト"
 
 #: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:448
 #: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
-#: standalone/drakfont:491 standalone/drakfont:553
+#: printer/printerdrake.pm:1125 standalone/drakfont:491
+#: standalone/drakfont:553
 #, c-format
 msgid "Options"
 msgstr "オプション"
@@ -613,65 +618,65 @@ msgstr "1600万色 (24 bits)"
 msgid "Resolutions"
 msgstr "解像度"
 
-#: Xconfig/resolution_and_depth.pm:308 diskdrake/hd_gtk.pm:336
-#: install_steps_gtk.pm:284 mouse.pm:168 services.pm:162
-#: standalone/drakbackup:1583 standalone/drakperm:250
+#: Xconfig/resolution_and_depth.pm:309 diskdrake/hd_gtk.pm:336
+#: install_steps_gtk.pm:288 mouse.pm:168 services.pm:162
+#: standalone/drakbackup:1586 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "その他"
 
-#: Xconfig/resolution_and_depth.pm:357
+#: Xconfig/resolution_and_depth.pm:358
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "解像度と色深度"
 
-#: Xconfig/resolution_and_depth.pm:358
+#: Xconfig/resolution_and_depth.pm:359
 #, c-format
 msgid "Graphics card: %s"
 msgstr "グラフィックカード: %s"
 
-#: Xconfig/resolution_and_depth.pm:372 interactive.pm:432
-#: interactive/gtk.pm:807 interactive/http.pm:103 interactive/http.pm:156
+#: Xconfig/resolution_and_depth.pm:373 interactive.pm:432
+#: interactive/gtk.pm:811 interactive/http.pm:103 interactive/http.pm:156
 #: interactive/newt.pm:321 interactive/newt.pm:424 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakTermServ:200 standalone/drakTermServ:518
-#: standalone/drakbackup:1347 standalone/drakbackup:3961
-#: standalone/drakbackup:4021 standalone/drakbackup:4065
-#: standalone/drakconnect:158 standalone/drakconnect:848
-#: standalone/drakconnect:935 standalone/drakconnect:1031
-#: standalone/drakfont:574 standalone/drakfont:586 standalone/drakroam:392
-#: standalone/draksplash:169 standalone/drakups:212 standalone/net_monitor:340
+#: standalone/drakTermServ:195 standalone/drakTermServ:515
+#: standalone/drakbackup:1350 standalone/drakbackup:3975
+#: standalone/drakbackup:4035 standalone/drakbackup:4079
+#: standalone/drakconnect:158 standalone/drakconnect:852
+#: standalone/drakconnect:939 standalone/drakconnect:1030
+#: standalone/drakfont:574 standalone/drakfont:584 standalone/drakroam:392
+#: standalone/draksplash:161 standalone/drakups:212 standalone/net_monitor:340
 #: ugtk2.pm:412 ugtk2.pm:510 ugtk2.pm:916 ugtk2.pm:939
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: Xconfig/resolution_and_depth.pm:372 diskdrake/smbnfs_gtk.pm:80 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
-#: install_steps_interactive.pm:831 interactive.pm:433 interactive/gtk.pm:811
+#: Xconfig/resolution_and_depth.pm:373 diskdrake/smbnfs_gtk.pm:80 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:485 install_steps_interactive.pm:423
+#: install_steps_interactive.pm:832 interactive.pm:433 interactive/gtk.pm:815
 #: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318
 #: interactive/newt.pm:428 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3676
-#: standalone/drakautoinst:215 standalone/drakbackup:1347
-#: standalone/drakbackup:3887 standalone/drakbackup:3891
-#: standalone/drakbackup:3949 standalone/drakconnect:157
-#: standalone/drakconnect:933 standalone/drakconnect:1030
-#: standalone/drakfont:586 standalone/drakfont:664 standalone/drakfont:741
-#: standalone/draksplash:169 standalone/drakups:219 standalone/logdrake:173
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3959
+#: standalone/drakautoinst:215 standalone/drakbackup:1350
+#: standalone/drakbackup:3901 standalone/drakbackup:3905
+#: standalone/drakbackup:3963 standalone/drakconnect:157
+#: standalone/drakconnect:937 standalone/drakconnect:1029
+#: standalone/drakfont:584 standalone/drakfont:662 standalone/drakfont:739
+#: standalone/draksplash:161 standalone/drakups:219 standalone/logdrake:173
 #: standalone/net_monitor:339 ugtk2.pm:406 ugtk2.pm:508 ugtk2.pm:517
 #: ugtk2.pm:916
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: Xconfig/resolution_and_depth.pm:372 diskdrake/hd_gtk.pm:150
-#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:527
-#: interactive/gtk.pm:677 interactive/gtk.pm:679 standalone/drakTermServ:285
-#: standalone/drakbackup:3883 standalone/drakbug:105
+#: Xconfig/resolution_and_depth.pm:373 diskdrake/hd_gtk.pm:150
+#: install_steps_gtk.pm:232 install_steps_gtk.pm:634 interactive.pm:527
+#: interactive/gtk.pm:681 interactive/gtk.pm:683 standalone/drakTermServ:284
+#: standalone/drakbackup:3897 standalone/drakbug:105
 #: standalone/drakconnect:153 standalone/drakconnect:236
 #: standalone/drakfont:509 standalone/draknfs:208 standalone/drakperm:133
-#: standalone/draksec:336 standalone/draksec:338 standalone/draksec:356
-#: standalone/draksec:358 ugtk2.pm:1048 ugtk2.pm:1049
+#: standalone/draksambashare:213 standalone/draksec:336 standalone/draksec:338
+#: standalone/draksec:356 standalone/draksec:358 ugtk2.pm:1048 ugtk2.pm:1049
 #, c-format
 msgid "Help"
 msgstr "ヘルプ"
@@ -809,17 +814,17 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "テレビの画像方式は何ですか？"
 
-#: Xconfig/xfree.pm:646
+#: Xconfig/xfree.pm:647
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "その他"
 
-#: any.pm:142 harddrake/sound.pm:190 interactive.pm:470 pkgs.pm:458
+#: any.pm:142 harddrake/sound.pm:192 interactive.pm:470 pkgs.pm:460
 #: standalone/drakconnect:160 standalone/drakconnect:635 standalone/draksec:68
 #: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:246
-#: standalone/service_harddrake:206
+#: standalone/service_harddrake:207
 #, c-format
 msgid "Please wait"
 msgstr "お待ちください"
@@ -899,7 +904,7 @@ msgstr "rootパーティションの最初のセクタ"
 msgid "On Floppy"
 msgstr "フロッピー"
 
-#: any.pm:236 help.pm:739 printer/printerdrake.pm:4061
+#: any.pm:236 help.pm:739 printer/printerdrake.pm:4345
 #, c-format
 msgid "Skip"
 msgstr "スキップ"
@@ -940,7 +945,7 @@ msgstr "コマンドラインオプションを制限するにはパスワード
 msgid "The passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: any.pm:276 any.pm:609 authentication.pm:181 diskdrake/interactive.pm:1306
+#: any.pm:276 any.pm:609 authentication.pm:181 diskdrake/interactive.pm:1326
 #, c-format
 msgid "Please try again"
 msgstr "やり直してください"
@@ -975,10 +980,10 @@ msgstr "APIC無しを強制"
 msgid "Force No Local APIC"
 msgstr "ローカルAPIC無しを強制"
 
-#: any.pm:292 any.pm:643 authentication.pm:186 diskdrake/smbnfs_gtk.pm:179
-#: network/netconnect.pm:573 printer/printerdrake.pm:1663
-#: printer/printerdrake.pm:1784 standalone/drakbackup:1627
-#: standalone/drakbackup:3490 standalone/drakups:299
+#: any.pm:292 any.pm:643 authentication.pm:186 diskdrake/smbnfs_gtk.pm:180
+#: network/netconnect.pm:571 printer/printerdrake.pm:1886
+#: printer/printerdrake.pm:2007 standalone/drakbackup:1630
+#: standalone/drakbackup:3504 standalone/drakups:299
 #, c-format
 msgid "Password"
 msgstr "パスワード"
@@ -1244,8 +1249,8 @@ msgstr ""
 #: any.pm:629 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:154
 #: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:81 help.pm:530
 #: interactive/http.pm:151 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:382 printer/printerdrake.pm:4853
-#: standalone/drakbackup:2703 standalone/scannerdrake:668
+#: printer/printerdrake.pm:382 printer/printerdrake.pm:5140
+#: standalone/drakbackup:2717 standalone/scannerdrake:668
 #: standalone/scannerdrake:818
 #, c-format
 msgid "Done"
@@ -1261,7 +1266,7 @@ msgstr "ユーザ受け入れ"
 msgid "Real name"
 msgstr "本名"
 
-#: any.pm:642 standalone/drakbackup:1622
+#: any.pm:642 standalone/drakbackup:1625
 #, c-format
 msgid "Login name"
 msgstr "ログイン名"
@@ -1332,56 +1337,56 @@ msgstr "Unicodeをデフォルトにする"
 msgid "All languages"
 msgstr "全ての言語"
 
-#: any.pm:835 help.pm:566 help.pm:855 install_steps_interactive.pm:952
+#: any.pm:832 help.pm:566 help.pm:855 install_steps_interactive.pm:953
 #, c-format
 msgid "Country / Region"
 msgstr "国名/地域"
 
-#: any.pm:836
+#: any.pm:833
 #, c-format
 msgid "Please choose your country."
 msgstr "お住いの国を選んでください"
 
-#: any.pm:838
+#: any.pm:835
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "利用可能なすべての国名のリスト"
 
-#: any.pm:839
+#: any.pm:836
 #, c-format
 msgid "Other Countries"
 msgstr "他の国"
 
-#: any.pm:839 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
+#: any.pm:836 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:393
 #, c-format
 msgid "Advanced"
 msgstr "詳細"
 
-#: any.pm:847
+#: any.pm:844
 #, c-format
 msgid "Input method:"
 msgstr "入力メソッド:"
 
-#: any.pm:848 install_any.pm:421 network/netconnect.pm:154
-#: network/netconnect.pm:314 network/netconnect.pm:319
-#: network/netconnect.pm:1177 printer/printerdrake.pm:105
-#: printer/printerdrake.pm:2199
+#: any.pm:847 install_any.pm:421 network/netconnect.pm:153
+#: network/netconnect.pm:309 network/netconnect.pm:314
+#: network/netconnect.pm:1187 printer/printerdrake.pm:105
+#: printer/printerdrake.pm:2428
 #, c-format
 msgid "None"
 msgstr "なし"
 
-#: any.pm:963
+#: any.pm:964
 #, c-format
 msgid "No sharing"
 msgstr "共有しない"
 
-#: any.pm:963
+#: any.pm:964
 #, c-format
 msgid "Allow all users"
 msgstr "全てのユーザに許可"
 
-#: any.pm:967
+#: any.pm:968
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1395,14 +1400,14 @@ msgstr ""
 "クリックするだけで共有することができます。\n"
 "[カスタム]を選ぶとユーザごとに細かく設定できます。\n"
 
-#: any.pm:979
+#: any.pm:980
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 伝統的なUnixファイル共有システム"
 
-#: any.pm:982
+#: any.pm:983
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -1410,28 +1415,28 @@ msgid ""
 msgstr ""
 "SMB: Windows/Mac OS X や新しいLinuxシステムで使われるファイル共有システム"
 
-#: any.pm:990
+#: any.pm:991
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "エクスポートにはNFSとSMBを使用できます。どちらを使いますか？"
 
-#: any.pm:1015
+#: any.pm:1016
 #, c-format
 msgid "Launch userdrake"
 msgstr "userdrakeを起動"
 
-#: any.pm:1015 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903
-#: printer/printerdrake.pm:3904 printer/printerdrake.pm:3905
-#: printer/printerdrake.pm:5162 standalone/drakTermServ:295
-#: standalone/drakbackup:4083 standalone/drakbug:126 standalone/drakfont:497
+#: any.pm:1016 printer/printerdrake.pm:4184 printer/printerdrake.pm:4187
+#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4189
+#: printer/printerdrake.pm:5452 standalone/drakTermServ:294
+#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:497
 #: standalone/drakroam:242 standalone/net_monitor:118
-#: standalone/printerdrake:548
+#: standalone/printerdrake:565
 #, c-format
 msgid "Close"
 msgstr "閉じる"
 
-#: any.pm:1017
+#: any.pm:1018
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1584,14 +1589,14 @@ msgstr "セキュリティレイアウト(SASL/Kerberos)"
 msgid "Authentication Active Directory"
 msgstr "認証のActive Directory"
 
-#: authentication.pm:111 authentication.pm:150 diskdrake/smbnfs_gtk.pm:180
+#: authentication.pm:111 authentication.pm:150 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "ドメイン"
 
 #: authentication.pm:113 diskdrake/dav.pm:63 help.pm:146
 #: printer/printerdrake.pm:141 share/compssUsers.pl:82
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Server"
 msgstr "サーバ"
@@ -1715,7 +1720,7 @@ msgstr "パスワードなし"
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "このパスワードは短すぎます(最低でも %d 文字以上にしてください)"
 
-#: authentication.pm:188 network/netconnect.pm:319 network/netconnect.pm:574
+#: authentication.pm:188 network/netconnect.pm:314 network/netconnect.pm:572
 #: standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:481
 #, c-format
 msgid "Authentication"
@@ -1779,7 +1784,7 @@ msgstr "/boot の容量が足りません"
 msgid "You can not install the bootloader on a %s partition\n"
 msgstr "ブートローダは %s パーティションにはインストールできません\n"
 
-#: bootloader.pm:1448
+#: bootloader.pm:1454
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1787,7 +1792,7 @@ msgid ""
 msgstr ""
 "パーティション番号が変更されたので、ブートローダの設定を更新してください"
 
-#: bootloader.pm:1461
+#: bootloader.pm:1467
 #, c-format
 msgid ""
 "The bootloader can not be installed correctly. You have to boot rescue and "
@@ -1796,7 +1801,7 @@ msgstr ""
 "ブートローダを正しくインストールできません。レスキューをブートして %s を選ん"
 "でください。"
 
-#: bootloader.pm:1462
+#: bootloader.pm:1468
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "ブートローダを再インストール"
@@ -2084,12 +2089,12 @@ msgid "Server: "
 msgstr "サーバ: "
 
 #: diskdrake/dav.pm:110 diskdrake/interactive.pm:521
-#: diskdrake/interactive.pm:1188 diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1208 diskdrake/interactive.pm:1286
 #, c-format
 msgid "Mount point: "
 msgstr "マウントポイント: "
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1273
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1293
 #, c-format
 msgid "Options: %s"
 msgstr "オプション: %s"
@@ -2135,8 +2140,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "パーティションをクリックしてください"
 
-#: diskdrake/hd_gtk.pm:205 diskdrake/smbnfs_gtk.pm:62 install_steps_gtk.pm:482
-#: standalone/drakbackup:2938 standalone/drakbackup:2998
+#: diskdrake/hd_gtk.pm:205 diskdrake/smbnfs_gtk.pm:62 install_steps_gtk.pm:487
+#: standalone/drakbackup:2952 standalone/drakbackup:3012
 #, c-format
 msgid "Details"
 msgstr "詳細"
@@ -2177,7 +2182,7 @@ msgstr "HFS"
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:336 diskdrake/interactive.pm:1203
+#: diskdrake/hd_gtk.pm:336 diskdrake/interactive.pm:1223
 #, c-format
 msgid "Empty"
 msgstr "空"
@@ -2208,7 +2213,7 @@ msgstr "種類"
 
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:236
+#: standalone/drakperm:123 standalone/printerdrake:246
 #, c-format
 msgid "Delete"
 msgstr "削除"
@@ -2268,7 +2273,7 @@ msgstr "パーティションテーブルを更新せずに終了しますか？
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "/etc/fstab の変更を保存しますか？"
 
-#: diskdrake/interactive.pm:292 install_steps_interactive.pm:329
+#: diskdrake/interactive.pm:292 install_steps_interactive.pm:330
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "パーティションテーブルの変更を反映するには再起動してください"
@@ -2295,7 +2300,7 @@ msgid "Auto allocate"
 msgstr "自動割り当て"
 
 #: diskdrake/interactive.pm:312 help.pm:530 help.pm:566 help.pm:606
-#: help.pm:855 install_steps_interactive.pm:121
+#: help.pm:855 install_steps_interactive.pm:122
 #, c-format
 msgid "More"
 msgstr "詳細"
@@ -2438,12 +2443,12 @@ msgstr "新しいパーティションを作成"
 msgid "Start sector: "
 msgstr "開始セクタ: "
 
-#: diskdrake/interactive.pm:519 diskdrake/interactive.pm:926
+#: diskdrake/interactive.pm:519 diskdrake/interactive.pm:929
 #, c-format
 msgid "Size in MB: "
 msgstr "サイズ(MB): "
 
-#: diskdrake/interactive.pm:520 diskdrake/interactive.pm:927
+#: diskdrake/interactive.pm:520 diskdrake/interactive.pm:930
 #, c-format
 msgid "Filesystem type: "
 msgstr "ファイルシステムの種類: "
@@ -2568,27 +2573,27 @@ msgstr ""
 "パーティションリサイズ後のデータの完全性を確認するため、\n"
 "次回のWindows(TM)起動時にファイルシステムチェックが実行されます。"
 
-#: diskdrake/interactive.pm:840
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "追加するRAIDを選んでください"
 
-#: diskdrake/interactive.pm:842 diskdrake/interactive.pm:859
+#: diskdrake/interactive.pm:845 diskdrake/interactive.pm:862
 #, c-format
 msgid "new"
 msgstr "新規"
 
-#: diskdrake/interactive.pm:857
+#: diskdrake/interactive.pm:860
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "追加するLVMを選んでください"
 
-#: diskdrake/interactive.pm:863
+#: diskdrake/interactive.pm:866
 #, c-format
 msgid "LVM name?"
 msgstr "LVMの名前を入力"
 
-#: diskdrake/interactive.pm:891
+#: diskdrake/interactive.pm:894
 #, c-format
 msgid ""
 "Physical volume %s is still in use.\n"
@@ -2597,105 +2602,106 @@ msgstr ""
 "物理ボリューム %s は使用中です。\n"
 "このボリュームの使用中の物理エクステントを他のボリュームに移動しますか？"
 
-#: diskdrake/interactive.pm:893
+#: diskdrake/interactive.pm:896
 #, c-format
 msgid "Moving physical extents"
 msgstr "物理エクステントを移動"
 
-#: diskdrake/interactive.pm:911
+#: diskdrake/interactive.pm:914
 #, c-format
 msgid "This partition can not be used for loopback"
 msgstr "このパーティションはループバックには使えません"
 
-#: diskdrake/interactive.pm:924
+#: diskdrake/interactive.pm:927
 #, c-format
 msgid "Loopback"
 msgstr "ループバック"
 
-#: diskdrake/interactive.pm:925
+#: diskdrake/interactive.pm:928
 #, c-format
 msgid "Loopback file name: "
 msgstr "ループバックファイルの名前: "
 
-#: diskdrake/interactive.pm:930
+#: diskdrake/interactive.pm:933
 #, c-format
 msgid "Give a file name"
 msgstr "ファイル名を入力"
 
-#: diskdrake/interactive.pm:933
+#: diskdrake/interactive.pm:936
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr ""
 "ファイルは既に別のループバックに使用されています。別のものを選んでください。"
 
-#: diskdrake/interactive.pm:934
+#: diskdrake/interactive.pm:937
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "ファイルは既に存在します。これを使いますか？"
 
-#: diskdrake/interactive.pm:957
+#: diskdrake/interactive.pm:960
 #, c-format
 msgid "Mount options"
 msgstr "マウントオプション"
 
-#: diskdrake/interactive.pm:964
+#: diskdrake/interactive.pm:967
 #, c-format
 msgid "Various"
 msgstr "その他"
 
-#: diskdrake/interactive.pm:1028
+#: diskdrake/interactive.pm:1034
 #, c-format
 msgid "device"
 msgstr "デバイス"
 
-#: diskdrake/interactive.pm:1029
+#: diskdrake/interactive.pm:1035
 #, c-format
 msgid "level"
 msgstr "レベル"
 
-#: diskdrake/interactive.pm:1030
+#: diskdrake/interactive.pm:1036
 #, c-format
 msgid "chunk size in KiB"
 msgstr "チャンクサイズ(KiB)"
 
-#: diskdrake/interactive.pm:1047
+#: diskdrake/interactive.pm:1053
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "注意: この操作は危険です。"
 
-#: diskdrake/interactive.pm:1062
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "What type of partitioning?"
 msgstr "パーティション設定の種類"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1106
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "変更を反映させるには再起動してください"
 
-#: diskdrake/interactive.pm:1109
+#: diskdrake/interactive.pm:1115
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "ドライブ %s のパーティションテーブルをディスクに書き込みます"
 
-#: diskdrake/interactive.pm:1118
+#: diskdrake/interactive.pm:1138
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "パーティション %s をフォーマットすると、このパーティションの全データが\n"
 "失われます"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1154
 #, c-format
 msgid "Move files to the new partition"
 msgstr "ファイルを新しいパーティションに移動"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1154 standalone/draksambashare:69
+#: standalone/draksambashare:543
 #, c-format
 msgid "Hide files"
 msgstr "ファイルを隠す"
 
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1155
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2704,108 +2710,108 @@ msgstr ""
 "ディレクトリ %s には既にデータがあります\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1146
+#: diskdrake/interactive.pm:1166
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "ファイルを新しいパーティションに移動"
 
-#: diskdrake/interactive.pm:1150
+#: diskdrake/interactive.pm:1170
 #, c-format
 msgid "Copying %s"
 msgstr "%s をコピー"
 
-#: diskdrake/interactive.pm:1154
+#: diskdrake/interactive.pm:1174
 #, c-format
 msgid "Removing %s"
 msgstr "%s を削除"
 
-#: diskdrake/interactive.pm:1168
+#: diskdrake/interactive.pm:1188
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "パーティション %s は %s になりました"
 
-#: diskdrake/interactive.pm:1169
+#: diskdrake/interactive.pm:1189
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "パーティションの番号が変わりました: "
 
-#: diskdrake/interactive.pm:1189 diskdrake/interactive.pm:1251
+#: diskdrake/interactive.pm:1209 diskdrake/interactive.pm:1271
 #, c-format
 msgid "Device: "
 msgstr "デバイス: "
 
-#: diskdrake/interactive.pm:1190
+#: diskdrake/interactive.pm:1210
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs名: "
 
-#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1211
 #, c-format
 msgid "Volume label: "
 msgstr "ボリュームラベル: "
 
-#: diskdrake/interactive.pm:1192
+#: diskdrake/interactive.pm:1212
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOSのドライブレター: %s (推定)\n"
 
-#: diskdrake/interactive.pm:1196 diskdrake/interactive.pm:1205
-#: diskdrake/interactive.pm:1269
+#: diskdrake/interactive.pm:1216 diskdrake/interactive.pm:1225
+#: diskdrake/interactive.pm:1289
 #, c-format
 msgid "Type: "
 msgstr "種類: "
 
-#: diskdrake/interactive.pm:1200 install_steps_gtk.pm:296
+#: diskdrake/interactive.pm:1220 install_steps_gtk.pm:300
 #, c-format
 msgid "Name: "
 msgstr "名前: "
 
-#: diskdrake/interactive.pm:1207
+#: diskdrake/interactive.pm:1227
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "開始: セクタ %s\n"
 
-#: diskdrake/interactive.pm:1208
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid "Size: %s"
 msgstr "サイズ: %s"
 
-#: diskdrake/interactive.pm:1210
+#: diskdrake/interactive.pm:1230
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s セクタ"
 
-#: diskdrake/interactive.pm:1212
+#: diskdrake/interactive.pm:1232
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "シリンダ %d から %d まで\n"
 
-#: diskdrake/interactive.pm:1213
+#: diskdrake/interactive.pm:1233
 #, c-format
 msgid "Number of logical extents: %d\n"
 msgstr "論理エクステントの数: %d\n"
 
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1234
 #, c-format
 msgid "Formatted\n"
 msgstr "フォーマット済み\n"
 
-#: diskdrake/interactive.pm:1215
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Not formatted\n"
 msgstr "未フォーマット\n"
 
-#: diskdrake/interactive.pm:1216
+#: diskdrake/interactive.pm:1236
 #, c-format
 msgid "Mounted\n"
 msgstr "マウント済み\n"
 
-#: diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1237
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1222
+#: diskdrake/interactive.pm:1242
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2814,7 +2820,7 @@ msgstr ""
 "ループバックファイル:\n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1223
+#: diskdrake/interactive.pm:1243
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2823,27 +2829,27 @@ msgstr ""
 "デフォルトで起動するパーティション\n"
 "    (MS-DOS用 - LILO用ではありません)\n"
 
-#: diskdrake/interactive.pm:1225
+#: diskdrake/interactive.pm:1245
 #, c-format
 msgid "Level %s\n"
 msgstr "レベル %s\n"
 
-#: diskdrake/interactive.pm:1226
+#: diskdrake/interactive.pm:1246
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "チャンクサイズ %d KiB\n"
 
-#: diskdrake/interactive.pm:1227
+#: diskdrake/interactive.pm:1247
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAIDディスク %s\n"
 
-#: diskdrake/interactive.pm:1229
+#: diskdrake/interactive.pm:1249
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "ループバックファイル名: %s"
 
-#: diskdrake/interactive.pm:1232
+#: diskdrake/interactive.pm:1252
 #, c-format
 msgid ""
 "\n"
@@ -2856,7 +2862,7 @@ msgstr ""
 "ドライバパーティションのようです。\n"
 "そのままにしておいてください。\n"
 
-#: diskdrake/interactive.pm:1235
+#: diskdrake/interactive.pm:1255
 #, c-format
 msgid ""
 "\n"
@@ -2869,73 +2875,73 @@ msgstr ""
 "パーティションは\n"
 "デュアルブート用です。\n"
 
-#: diskdrake/interactive.pm:1252
+#: diskdrake/interactive.pm:1272
 #, c-format
 msgid "Read-only"
 msgstr "読み取り専用"
 
-#: diskdrake/interactive.pm:1253
+#: diskdrake/interactive.pm:1273
 #, c-format
 msgid "Size: %s\n"
 msgstr "サイズ: %s\n"
 
-#: diskdrake/interactive.pm:1254
+#: diskdrake/interactive.pm:1274
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "ジオメトリ: %s シリンダ, %s ヘッド, %s セクタ\n"
 
-#: diskdrake/interactive.pm:1255
+#: diskdrake/interactive.pm:1275
 #, c-format
 msgid "Info: "
 msgstr "情報: "
 
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1276
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVMディスク %s\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1277
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "パーティションテーブルの種類: %s\n"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1278
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "on channel %d ID %d\n"
 
-#: diskdrake/interactive.pm:1301
+#: diskdrake/interactive.pm:1321
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "ファイルシステムの暗号キー"
 
-#: diskdrake/interactive.pm:1302
+#: diskdrake/interactive.pm:1322
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "ファイルシステムの暗号キーを選んでください"
 
-#: diskdrake/interactive.pm:1305
+#: diskdrake/interactive.pm:1325
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "この暗号キーは簡単すぎます(最低でも %d 文字以上にしてください)"
 
-#: diskdrake/interactive.pm:1306
+#: diskdrake/interactive.pm:1326
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "暗号キーが一致しません"
 
-#: diskdrake/interactive.pm:1309 network/netconnect.pm:1022
+#: diskdrake/interactive.pm:1329 network/netconnect.pm:1025
 #: standalone/drakconnect:419
 #, c-format
 msgid "Encryption key"
 msgstr "暗号キー"
 
-#: diskdrake/interactive.pm:1310
+#: diskdrake/interactive.pm:1330
 #, c-format
 msgid "Encryption key (again)"
 msgstr "暗号キー(再入力)"
 
-#: diskdrake/interactive.pm:1311 standalone/drakvpn:1017
+#: diskdrake/interactive.pm:1332 standalone/drakvpn:1017
 #: standalone/drakvpn:1102
 #, c-format
 msgid "Encryption algorithm"
@@ -2946,84 +2952,89 @@ msgstr "暗号化アルゴリズム"
 msgid "Change type"
 msgstr "種類を変更"
 
-#: diskdrake/smbnfs_gtk.pm:162
+#: diskdrake/smbnfs_gtk.pm:163
 #, c-format
 msgid "Can not login using username %s (bad password?)"
 msgstr "ユーザ名 %s でログインできません(不正なパスワード？)"
 
-#: diskdrake/smbnfs_gtk.pm:166 diskdrake/smbnfs_gtk.pm:175
+#: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
 #, c-format
 msgid "Domain Authentication Required"
 msgstr "ドメイン認証が必要です"
 
-#: diskdrake/smbnfs_gtk.pm:167
+#: diskdrake/smbnfs_gtk.pm:168
 #, c-format
 msgid "Which username"
 msgstr "どのユーザ名"
 
-#: diskdrake/smbnfs_gtk.pm:167
+#: diskdrake/smbnfs_gtk.pm:168
 #, c-format
 msgid "Another one"
 msgstr "別のもの"
 
-#: diskdrake/smbnfs_gtk.pm:176
+#: diskdrake/smbnfs_gtk.pm:177
 #, c-format
 msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr ""
 "このホストにアクセスするにはユーザ名/パスワード/ドメイン名を入力してください"
 
-#: diskdrake/smbnfs_gtk.pm:178 standalone/drakbackup:3489
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3503
 #, c-format
 msgid "Username"
 msgstr "ユーザ名"
 
-#: diskdrake/smbnfs_gtk.pm:204
+#: diskdrake/smbnfs_gtk.pm:205
 #, c-format
 msgid "Search servers"
 msgstr "サーバを検索"
 
-#: diskdrake/smbnfs_gtk.pm:209
+#: diskdrake/smbnfs_gtk.pm:210
 #, c-format
 msgid "Search new servers"
 msgstr "新しいサーバを検索"
 
-#: do_pkgs.pm:16 do_pkgs.pm:31
+#: do_pkgs.pm:16 do_pkgs.pm:34
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "パッケージ %s が必要です。インストールしますか？"
 
-#: do_pkgs.pm:21 do_pkgs.pm:36
+#: do_pkgs.pm:19 do_pkgs.pm:37 printer/printerdrake.pm:4025
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "%s パッケージをインストールできません"
+
+#: do_pkgs.pm:24 do_pkgs.pm:42
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "必要なパッケージ %s がありません"
 
-#: do_pkgs.pm:182
+#: do_pkgs.pm:187
 #, c-format
 msgid "Installing packages..."
 msgstr "パッケージをインストール中.."
 
-#: do_pkgs.pm:227
+#: do_pkgs.pm:232
 #, c-format
 msgid "Removing packages..."
 msgstr "パッケージを削除.."
 
-#: fs/format.pm:57 fs/format.pm:64
+#: fs/format.pm:58 fs/format.pm:65
 #, c-format
 msgid "Formatting partition %s"
 msgstr "パーティション %s をフォーマット中"
 
-#: fs/format.pm:61
+#: fs/format.pm:62
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "ファイル %s の作成とフォーマット"
 
-#: fs/format.pm:114
+#: fs/format.pm:115
 #, c-format
 msgid "I do not know how to format %s in type %s"
 msgstr "%s を %s でフォーマットする方法が分かりません"
 
-#: fs/format.pm:119 fs/format.pm:121
+#: fs/format.pm:120 fs/format.pm:122
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%2$s を %1$s にフォーマットできませんでした"
@@ -3033,37 +3044,42 @@ msgstr "%2$s を %1$s にフォーマットできませんでした"
 msgid "Circular mounts %s\n"
 msgstr "巡回マウント %s\n"
 
-#: fs/mount.pm:72
+#: fs/mount.pm:74
 #, c-format
 msgid "Mounting partition %s"
 msgstr "パーティション %s をマウント中"
 
-#: fs/mount.pm:73
+#: fs/mount.pm:75
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "パーティション %s をディレクトリ %s にマウントできませんでした"
 
-#: fs/mount.pm:78 fs/mount.pm:95
+#: fs/mount.pm:80 fs/mount.pm:97
 #, c-format
 msgid "Checking %s"
 msgstr "%s をチェック中"
 
-#: fs/mount.pm:111 partition_table.pm:385
+#: fs/mount.pm:113 partition_table.pm:385
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "%s をアンマウント中にエラー: %s"
 
-#: fs/mount.pm:140
+#: fs/mount.pm:142
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "swapパーティション %s を有効にしています"
 
 #: fs/mount_options.pm:111
+#, fuzzy, c-format
+msgid "Use an encrypted file system"
+msgstr "マウントポイント %s には暗号化ファイルシステムは使えません"
+
+#: fs/mount_options.pm:113
 #, c-format
 msgid "Enable group disk quota accounting and optionally enforce limits"
 msgstr "グループディスク割当てを有効にしオプションで制限を強制する"
 
-#: fs/mount_options.pm:113
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -3072,7 +3088,7 @@ msgstr ""
 "このファイルシステムのinodeのアクセス時間を更新しない。\n"
 "(用途例: ニューススプールへのアクセス速度を向上させる)"
 
-#: fs/mount_options.pm:116
+#: fs/mount_options.pm:118
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -3081,14 +3097,14 @@ msgstr ""
 "明示的に指定された場合のみマウントする。\n"
 "('-a' オプションではマウントしない)"
 
-#: fs/mount_options.pm:119
+#: fs/mount_options.pm:121
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 "このファイルシステム上にあるキャラクタ・スペシャル・デバイスやブロック・スペ"
 "シャル・デバイスを解釈しない。"
 
-#: fs/mount_options.pm:121
+#: fs/mount_options.pm:123
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -3098,7 +3114,7 @@ msgstr ""
 "マウントしたファイルシステムでバイナリの実行を禁止する。このオプションは他の"
 "アーキテクチャのバイナリを含むサーバで有用です。"
 
-#: fs/mount_options.pm:125
+#: fs/mount_options.pm:127
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -3108,17 +3124,17 @@ msgstr ""
 "set-user-identifierやset-group-identifierを無効にする。(安全に見えますが"
 "suidperl(1)がインストールされている場合はかえって危険です)"
 
-#: fs/mount_options.pm:129
+#: fs/mount_options.pm:131
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "ファイルシステムを読み込み専用でマウントする"
 
-#: fs/mount_options.pm:131
+#: fs/mount_options.pm:133
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "ファイルシステムへの全てのI/Oを同期的に行う"
 
-#: fs/mount_options.pm:135
+#: fs/mount_options.pm:137
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -3133,28 +3149,27 @@ msgstr ""
 "このオプションを有効にするとnoexec, nosuid, nodevを同時に指定したことになりま"
 "す。ただし、user, exec, dev, suidなどの行で別に指定すれば変更できます。"
 
-#: fs/mount_options.pm:141
-#, c-format
-msgid ""
-"Enable user disk quota accounting enabled, and optionally enforce limits"
+#: fs/mount_options.pm:143
+#, fuzzy, c-format
+msgid "Enable user disk quota accounting, and optionally enforce limits"
 msgstr "ユーザディスク割当てを有効にしオプションで制限を強制する"
 
-#: fs/mount_options.pm:143
+#: fs/mount_options.pm:145
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "一般ユーザに書き込み権限を与える"
 
-#: fs/mount_options.pm:145
+#: fs/mount_options.pm:147
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "一般ユーザに読み取りのみの権限を与える"
 
-#: fs/type.pm:375
+#: fs/type.pm:376
 #, c-format
 msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "16MB以下のパーティションにJFSは使えません"
 
-#: fs/type.pm:376
+#: fs/type.pm:377
 #, c-format
 msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "32MB以下のパーティションにReiserFSは使えません"
@@ -3293,7 +3308,7 @@ msgstr "CD/DVDライタ"
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:127 standalone/drakbackup:2036
+#: harddrake/data.pm:127 standalone/drakbackup:2050
 #, c-format
 msgid "Tape"
 msgstr "テープ"
@@ -3368,7 +3383,7 @@ msgstr "Bluetoothデバイス"
 msgid "Ethernetcard"
 msgstr "Ethernetカード"
 
-#: harddrake/data.pm:282 network/netconnect.pm:488
+#: harddrake/data.pm:282 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "モデム"
@@ -3389,7 +3404,7 @@ msgid "AGP controllers"
 msgstr "AGPコントローラ"
 
 #: harddrake/data.pm:324 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:985
 #, c-format
 msgid "Printer"
 msgstr "プリンタ"
@@ -3455,8 +3470,8 @@ msgstr "SMBusコントローラ"
 msgid "Bridges and system controllers"
 msgstr "ブリッジとシステムコントローラ"
 
-#: harddrake/data.pm:447 help.pm:855 install_steps_interactive.pm:117
-#: install_steps_interactive.pm:944 standalone/keyboarddrake:29
+#: harddrake/data.pm:447 help.pm:855 install_steps_interactive.pm:118
+#: install_steps_interactive.pm:945 standalone/keyboarddrake:29
 #, c-format
 msgid "Keyboard"
 msgstr "キーボード"
@@ -3466,7 +3481,7 @@ msgstr "キーボード"
 msgid "Tablet and touchscreen"
 msgstr "タブレットとタッチスクリーン"
 
-#: harddrake/data.pm:469 help.pm:855 install_steps_interactive.pm:977
+#: harddrake/data.pm:469 help.pm:855 install_steps_interactive.pm:978
 #, c-format
 msgid "Mouse"
 msgstr "マウス"
@@ -3491,18 +3506,18 @@ msgstr "不明/その他"
 msgid "cpu # "
 msgstr "CPU # "
 
-#: harddrake/sound.pm:190 standalone/drakconnect:162
+#: harddrake/sound.pm:192 standalone/drakconnect:162
 #: standalone/drakconnect:637
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "設定を適用しています。お待ちください..."
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:228
 #, c-format
 msgid "No alternative driver"
 msgstr "代替ドライバはありません"
 
-#: harddrake/sound.pm:227
+#: harddrake/sound.pm:229
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3511,12 +3526,12 @@ msgstr ""
 "お使いのサウンドカード(%s)にはOSS/ALSA代替ドライバがありません。\n"
 "現在 %s を使っています。"
 
-#: harddrake/sound.pm:233
+#: harddrake/sound.pm:235
 #, c-format
 msgid "Sound configuration"
 msgstr "サウンドの設定"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:237
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3526,7 +3541,7 @@ msgstr "お使いのサウンドカード(%s)に代替ドライバ(OSSかALSA)�
 #. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:242
 #, c-format
 msgid ""
 "\n"
@@ -3539,7 +3554,7 @@ msgstr ""
 "お使いのカードは現在 %s %s ドライバを使用しています\n"
 "(このカードのデフォルトドライバは %s です)"
 
-#: harddrake/sound.pm:242
+#: harddrake/sound.pm:244
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3572,35 +3587,35 @@ msgstr ""
 "- 古いOSS APIとの互換性\n"
 "- 新しいALSA API(多くの拡張機能を提供しますがALSAライブラリが必要)\n"
 
-#: harddrake/sound.pm:256 harddrake/sound.pm:341 standalone/drakups:146
+#: harddrake/sound.pm:258 harddrake/sound.pm:343 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "ドライバ:"
 
-#: harddrake/sound.pm:261
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Trouble shooting"
 msgstr "不具合対策"
 
-#: harddrake/sound.pm:269 keyboard.pm:391 lang.pm:1078
-#: network/ndiswrapper.pm:95 network/netconnect.pm:467
-#: printer/printerdrake.pm:1206 printer/printerdrake.pm:2230
-#: printer/printerdrake.pm:2316 printer/printerdrake.pm:2362
-#: printer/printerdrake.pm:2429 printer/printerdrake.pm:2464
-#: printer/printerdrake.pm:2773 printer/printerdrake.pm:2780
-#: printer/printerdrake.pm:3740 printer/printerdrake.pm:4069
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:5310
-#: standalone/drakTermServ:326 standalone/drakTermServ:1169
-#: standalone/drakTermServ:1230 standalone/drakTermServ:1895
-#: standalone/drakbackup:497 standalone/drakbackup:596 standalone/drakboot:125
-#: standalone/drakclock:224 standalone/drakconnect:969 standalone/drakups:27
-#: standalone/harddrake2:480 standalone/scannerdrake:51
+#: harddrake/sound.pm:271 keyboard.pm:391 network/ndiswrapper.pm:95
+#: network/netconnect.pm:463 printer/printerdrake.pm:1429
+#: printer/printerdrake.pm:2459 printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2604 printer/printerdrake.pm:2671
+#: printer/printerdrake.pm:2706 printer/printerdrake.pm:3031
+#: printer/printerdrake.pm:3038 printer/printerdrake.pm:4024
+#: printer/printerdrake.pm:4353 printer/printerdrake.pm:4473
+#: printer/printerdrake.pm:5613 standalone/drakTermServ:326
+#: standalone/drakTermServ:1205 standalone/drakTermServ:1266
+#: standalone/drakTermServ:1931 standalone/drakbackup:497
+#: standalone/drakbackup:596 standalone/drakboot:125 standalone/drakclock:224
+#: standalone/drakconnect:973 standalone/drakups:27 standalone/harddrake2:479
+#: standalone/localedrake:43 standalone/scannerdrake:51
 #: standalone/scannerdrake:940
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: harddrake/sound.pm:269
+#: harddrake/sound.pm:271
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3615,12 +3630,12 @@ msgstr ""
 "\n"
 "新しい %s ドライバは次のブートストラップから使用されます。"
 
-#: harddrake/sound.pm:277
+#: harddrake/sound.pm:279
 #, c-format
 msgid "No open source driver"
 msgstr "オープンソースのドライバがありません"
 
-#: harddrake/sound.pm:278
+#: harddrake/sound.pm:280
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3629,33 +3644,33 @@ msgstr ""
 "お使いのサウンドカード(%s)用のフリードライバはありませが、\n"
 "%s にプロプラエタリ・ドライバがあります。"
 
-#: harddrake/sound.pm:281
+#: harddrake/sound.pm:283
 #, c-format
 msgid "No known driver"
 msgstr "既知のドライバがありません"
 
-#: harddrake/sound.pm:282
+#: harddrake/sound.pm:284
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "お使いのサウンドカード(%s)用の既知のドライバはありません"
 
-#: harddrake/sound.pm:286
+#: harddrake/sound.pm:288
 #, c-format
 msgid "Unknown driver"
 msgstr "不明なドライバ"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:289
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "エラー: お使いのサウンドカードの %s ドライバはリストにありません"
 
-#: harddrake/sound.pm:301
+#: harddrake/sound.pm:303
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "サウンドの不具合修正"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:304
+#: harddrake/sound.pm:306
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3698,18 +3713,18 @@ msgstr ""
 "\n"
 "- \"/sbin/fuser -v /dev/dsp\"は現在カードを使用しているプログラムを表示\n"
 
-#: harddrake/sound.pm:330
+#: harddrake/sound.pm:332
 #, c-format
 msgid "Let me pick any driver"
 msgstr "手動でドライバを選択"
 
-#: harddrake/sound.pm:333
+#: harddrake/sound.pm:335
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "任意のドライバを選択"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:336
+#: harddrake/sound.pm:338
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3723,8 +3738,8 @@ msgstr ""
 "\n"
 "現在のドライバは %s で、お使いのサウンドカードは %s です。"
 
-#: harddrake/v4l.pm:12 standalone/net_applet:63 standalone/net_applet:64
-#: standalone/net_applet:66
+#: harddrake/v4l.pm:12 standalone/net_applet:66 standalone/net_applet:67
+#: standalone/net_applet:69
 #, c-format
 msgid "Auto-detect"
 msgstr "自動検出"
@@ -3744,7 +3759,7 @@ msgstr "不明|CPH05X (bt878)[各種ベンダ]"
 msgid "Unknown|CPH06X (bt878) [many vendors]"
 msgstr "不明|CPH06X (bt878)[各種ベンダ]"
 
-#: harddrake/v4l.pm:392
+#: harddrake/v4l.pm:394
 #, c-format
 msgid ""
 "For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
@@ -3757,37 +3772,37 @@ msgstr ""
 "検出されたカードが間違っている場合は、正しいチューナとカードの種類を指定して"
 "ください。必要に応じてテレビカードのパラメータを選んでください。"
 
-#: harddrake/v4l.pm:395
+#: harddrake/v4l.pm:397
 #, c-format
 msgid "Card model:"
 msgstr "カードのモデル:"
 
-#: harddrake/v4l.pm:396
+#: harddrake/v4l.pm:398
 #, c-format
 msgid "Tuner type:"
 msgstr "チューナの種類:"
 
-#: harddrake/v4l.pm:397
+#: harddrake/v4l.pm:399
 #, c-format
 msgid "Number of capture buffers:"
 msgstr "キャプチャバッファの量:"
 
-#: harddrake/v4l.pm:397
+#: harddrake/v4l.pm:399
 #, c-format
 msgid "number of capture buffers for mmap'ed capture"
 msgstr "mmapキャプチャのバッファ量"
 
-#: harddrake/v4l.pm:399
+#: harddrake/v4l.pm:401
 #, c-format
 msgid "PLL setting:"
 msgstr "PLLの設定:"
 
-#: harddrake/v4l.pm:400
+#: harddrake/v4l.pm:402
 #, c-format
 msgid "Radio support:"
 msgstr "ラジオサポート:"
 
-#: harddrake/v4l.pm:400
+#: harddrake/v4l.pm:402
 #, c-format
 msgid "enable radio support"
 msgstr "ラジオサポートを有効にする"
@@ -3804,8 +3819,8 @@ msgstr ""
 "全体に適用されます。全ての項目に同意する場合は \"%s\" を押してください。\n"
 "そうでない場合は \"%s\" をクリックしてコンピュータを再起動してください。"
 
-#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:91
-#: install_steps_interactive.pm:735 standalone/drakautoinst:214
+#: help.pm:14 install_steps_gtk.pm:557 install_steps_interactive.pm:91
+#: install_steps_interactive.pm:736 standalone/drakautoinst:214
 #, c-format
 msgid "Accept"
 msgstr "承諾する"
@@ -3884,17 +3899,17 @@ msgstr ""
 "選んで %s をクリックしてください。この機能をお使いにならない場合は\n"
 " %s のチェックをはずしてください。"
 
-#: help.pm:51 printer/printerdrake.pm:1662 printer/printerdrake.pm:1783
+#: help.pm:51 printer/printerdrake.pm:1885 printer/printerdrake.pm:2006
 #, c-format
 msgid "User name"
 msgstr "ユーザ名"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
-#: install_steps_gtk.pm:694 interactive.pm:432 interactive/newt.pm:321
-#: network/thirdparty.pm:322 printer/printerdrake.pm:3678
-#: standalone/drakTermServ:383 standalone/drakbackup:3940
-#: standalone/drakbackup:4034 standalone/drakbackup:4051
-#: standalone/drakbackup:4069 ugtk2.pm:510
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237
+#: install_steps_gtk.pm:699 interactive.pm:432 interactive/newt.pm:321
+#: network/thirdparty.pm:322 printer/printerdrake.pm:3961
+#: standalone/drakTermServ:384 standalone/drakbackup:3954
+#: standalone/drakbackup:4048 standalone/drakbackup:4065
+#: standalone/drakbackup:4083 ugtk2.pm:510
 #, c-format
 msgid "Next"
 msgstr "次へ"
@@ -4110,7 +4125,7 @@ msgstr "開発用"
 msgid "Graphical Environment"
 msgstr "グラフィカル環境"
 
-#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
+#: help.pm:146 install_steps_gtk.pm:235 install_steps_interactive.pm:643
 #, c-format
 msgid "Individual package selection"
 msgstr "パッケージを個別に選択"
@@ -4120,7 +4135,7 @@ msgstr "パッケージを個別に選択"
 msgid "Upgrade"
 msgstr "更新"
 
-#: help.pm:146 install_steps_interactive.pm:600
+#: help.pm:146 install_steps_interactive.pm:601
 #, c-format
 msgid "With X"
 msgstr "Xを使う"
@@ -4204,17 +4219,16 @@ msgstr ""
 "作成方法については最終ステップの二番目のヒントを参照してください。"
 
 #: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:904
-#: interactive.pm:157 modules/interactive.pm:71 standalone/drakbackup:2503
-#: standalone/draksec:54 standalone/harddrake2:309 standalone/net_applet:374
-#: ugtk2.pm:915 wizards.pm:156
+#: interactive.pm:157 modules/interactive.pm:71 standalone/drakbackup:2517
+#: standalone/draksec:54 standalone/harddrake2:309 ugtk2.pm:915 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "いいえ"
 
 #: help.pm:180 help.pm:285 help.pm:444 install_any.pm:904 interactive.pm:157
-#: modules/interactive.pm:71 printer/printerdrake.pm:743
-#: standalone/drakbackup:2503 standalone/draksec:55 standalone/harddrake2:308
-#: standalone/net_applet:378 ugtk2.pm:915 wizards.pm:156
+#: modules/interactive.pm:71 printer/printerdrake.pm:883
+#: printer/printerdrake.pm:898 standalone/drakbackup:2517
+#: standalone/draksec:55 standalone/harddrake2:308 ugtk2.pm:915 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "はい"
@@ -4237,9 +4251,9 @@ msgstr ""
 "マニュアルに掲載されているインターフェースはインストール中に使用したもの\n"
 "とほぼ同じです。"
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
-#: standalone/drakbackup:2327 standalone/drakbackup:2331
-#: standalone/drakbackup:2335 standalone/drakbackup:2339
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:612
+#: standalone/drakbackup:2341 standalone/drakbackup:2345
+#: standalone/drakbackup:2349 standalone/drakbackup:2353
 #, c-format
 msgid "Configure"
 msgstr "設定"
@@ -4309,7 +4323,7 @@ msgstr ""
 "です。このオプションを使うと、このマシンをローカルネットワーク内の他の\n"
 "マシンのタイムサーバとして機能させることができます。"
 
-#: help.pm:217 install_steps_interactive.pm:879
+#: help.pm:217 install_steps_interactive.pm:880
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "ハードウェアクロックをGMTに設定する"
@@ -4733,17 +4747,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "自動インストールフロッピーを作成"
 
-#: help.pm:409 install_steps_interactive.pm:1330
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Replay"
 msgstr "再現"
 
-#: help.pm:409 install_steps_interactive.pm:1330
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Automated"
 msgstr "自動"
 
-#: help.pm:409 install_steps_interactive.pm:1333
+#: help.pm:409 install_steps_interactive.pm:1334
 #, c-format
 msgid "Save packages selection"
 msgstr "パッケージの選択を保存する"
@@ -4792,11 +4806,11 @@ msgstr ""
 "ディスクの不良ブロックを検証するパーティションを選ぶには %s を\n"
 "クリックしてください。"
 
-#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:433
-#: interactive/newt.pm:318 printer/printerdrake.pm:3676
-#: standalone/drakTermServ:362 standalone/drakbackup:3900
-#: standalone/drakbackup:3939 standalone/drakbackup:4050
-#: standalone/drakbackup:4065 ugtk2.pm:508
+#: help.pm:431 install_steps_gtk.pm:392 interactive.pm:433
+#: interactive/newt.pm:318 printer/printerdrake.pm:3959
+#: standalone/drakTermServ:363 standalone/drakbackup:3914
+#: standalone/drakbackup:3953 standalone/drakbackup:4064
+#: standalone/drakbackup:4079 ugtk2.pm:508
 #, c-format
 msgid "Previous"
 msgstr "戻る"
@@ -4827,8 +4841,8 @@ msgstr ""
 "表示されたら内容を確認し、インストールする場合は %s を、中止する\n"
 "場合は %s を押してください。"
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
-#: install_steps_interactive.pm:155 standalone/drakbackup:4097
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:391
+#: install_steps_interactive.pm:156 standalone/drakbackup:4111
 #, c-format
 msgid "Install"
 msgstr "インストール"
@@ -5505,7 +5519,7 @@ msgstr ""
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:765 printer/cups.pm:115 printer/data.pm:122
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:121
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
@@ -5563,8 +5577,8 @@ msgstr ""
 "表示されたサウンドカードがお使いのものでない場合は、ボタンをクリックして\n"
 "別のドライバを選んでください。"
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1011
-#: install_steps_interactive.pm:1028
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1012
+#: install_steps_interactive.pm:1029
 #, c-format
 msgid "Sound card"
 msgstr "サウンドカード"
@@ -5698,12 +5712,12 @@ msgstr ""
 " * %s: ここではどのサービスを有効にするかを細かく設定できます。\n"
 "サーバになるマシンであれば設定を見直すことをお勧めします。"
 
-#: help.pm:855 install_steps_interactive.pm:970 standalone/drakclock:100
+#: help.pm:855 install_steps_interactive.pm:971 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: help.pm:855 install_steps_interactive.pm:1044
+#: help.pm:855 install_steps_interactive.pm:1045
 #, c-format
 msgid "TV card"
 msgstr "テレビカード"
@@ -5718,33 +5732,33 @@ msgstr "ISDNカード"
 msgid "Graphical Interface"
 msgstr "グラフィカルインターフェース"
 
-#: help.pm:855 install_any.pm:1688 install_steps_interactive.pm:1062
-#: standalone/drakbackup:2021
+#: help.pm:855 install_any.pm:1688 install_steps_interactive.pm:1063
+#: standalone/drakbackup:2035
 #, c-format
 msgid "Network"
 msgstr "ネットワーク"
 
-#: help.pm:855 install_steps_interactive.pm:1074
+#: help.pm:855 install_steps_interactive.pm:1075
 #, c-format
 msgid "Proxies"
 msgstr "プロクシ"
 
-#: help.pm:855 install_steps_interactive.pm:1085
+#: help.pm:855 install_steps_interactive.pm:1086
 #, c-format
 msgid "Security Level"
 msgstr "セキュリティレベル"
 
-#: help.pm:855 install_steps_interactive.pm:1099
+#: help.pm:855 install_steps_interactive.pm:1100
 #, c-format
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: help.pm:855 install_steps_interactive.pm:1115
+#: help.pm:855 install_steps_interactive.pm:1116
 #, c-format
 msgid "Bootloader"
 msgstr "ブートローダ"
 
-#: help.pm:855 install_steps_interactive.pm:1128 services.pm:193
+#: help.pm:855 install_steps_interactive.pm:1129 services.pm:193
 #, c-format
 msgid "Services"
 msgstr "サービス"
@@ -5824,8 +5838,8 @@ msgstr ""
 "\n"
 "この他に設定する補助的なインストールメディアはありますか？"
 
-#: install_any.pm:421 printer/printerdrake.pm:3022
-#: printer/printerdrake.pm:3029 standalone/scannerdrake:182
+#: install_any.pm:421 printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3296 standalone/scannerdrake:182
 #: standalone/scannerdrake:190 standalone/scannerdrake:241
 #: standalone/scannerdrake:248
 #, c-format
@@ -6589,7 +6603,7 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr "%s を開始\n"
 
-#: install_steps_gtk.pm:177
+#: install_steps_gtk.pm:181
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -6602,69 +6616,69 @@ msgstr ""
 "インストールを試してみてください。\n"
 "CD-ROMから起動 -> [F1]を押す -> 'text'と入力"
 
-#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
+#: install_steps_gtk.pm:228 install_steps_interactive.pm:625
 #, c-format
 msgid "Package Group Selection"
 msgstr "パッケージグループを選択"
 
 # Changed "total size" to "total", due to problem of available
 # space on screen.
-#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:254 install_steps_interactive.pm:568
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "合計: %d/%d MB"
 
-#: install_steps_gtk.pm:295
+#: install_steps_gtk.pm:299
 #, c-format
 msgid "Bad package"
 msgstr "不正なパッケージ"
 
-#: install_steps_gtk.pm:297
+#: install_steps_gtk.pm:301
 #, c-format
 msgid "Version: "
 msgstr "バージョン: "
 
-#: install_steps_gtk.pm:298
+#: install_steps_gtk.pm:302
 #, c-format
 msgid "Size: "
 msgstr "サイズ: "
 
-#: install_steps_gtk.pm:298
+#: install_steps_gtk.pm:302
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:299
+#: install_steps_gtk.pm:303
 #, c-format
 msgid "Importance: "
 msgstr "重要性: "
 
-#: install_steps_gtk.pm:332
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "このパッケージの選択/非選択は変更できません"
 
-#: install_steps_gtk.pm:336
+#: install_steps_gtk.pm:340
 #, c-format
 msgid "due to missing %s"
 msgstr "%s がないために"
 
-#: install_steps_gtk.pm:337
+#: install_steps_gtk.pm:341
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s が依存を満たしていないために"
 
-#: install_steps_gtk.pm:338
+#: install_steps_gtk.pm:342
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s をアップグレードするために"
 
-#: install_steps_gtk.pm:339
+#: install_steps_gtk.pm:343
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s を維持するために"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:348
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
@@ -6672,27 +6686,27 @@ msgid ""
 msgstr ""
 "このパッケージは選択できません。インストールに必要な空き容量がありません。"
 
-#: install_steps_gtk.pm:347
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "以下のパッケージをインストールします"
 
-#: install_steps_gtk.pm:348
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "以下のパッケージを削除します"
 
-#: install_steps_gtk.pm:372
+#: install_steps_gtk.pm:376
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "これは必須パッケージです。選択を解除することはできません。"
 
-#: install_steps_gtk.pm:374
+#: install_steps_gtk.pm:378
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "このパッケージの選択は解除できません。既にインストールされています。"
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:381
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6701,78 +6715,78 @@ msgstr ""
 "このパッケージはアップグレードが必要です。\n"
 "本当に選択を解除しますか？"
 
-#: install_steps_gtk.pm:380
+#: install_steps_gtk.pm:384
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
 msgstr "このパッケージの選択は解除できません。アップグレードが必要です。"
 
-#: install_steps_gtk.pm:385
+#: install_steps_gtk.pm:389
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自動的に選択されたパッケージを表示"
 
-#: install_steps_gtk.pm:390
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "Load/Save selection"
 msgstr "選択を読み込む/保存する"
 
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:395
 #, c-format
 msgid "Updating package selection"
 msgstr "パッケージの選択を更新"
 
-#: install_steps_gtk.pm:396
+#: install_steps_gtk.pm:400
 #, c-format
 msgid "Minimal install"
 msgstr "最小インストール"
 
-#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
+#: install_steps_gtk.pm:414 install_steps_interactive.pm:484
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "インストールするパッケージを選んでください"
 
-#: install_steps_gtk.pm:426 install_steps_interactive.pm:710
+#: install_steps_gtk.pm:430 install_steps_interactive.pm:711
 #, c-format
 msgid "Installing"
 msgstr "インストール中"
 
-#: install_steps_gtk.pm:433
+#: install_steps_gtk.pm:437
 #, c-format
 msgid "Estimating"
 msgstr "試算しています"
 
-#: install_steps_gtk.pm:482
+#: install_steps_gtk.pm:487
 #, c-format
 msgid "No details"
 msgstr "詳細なし"
 
-#: install_steps_gtk.pm:490
+#: install_steps_gtk.pm:495
 #, c-format
 msgid "Time remaining "
 msgstr "残り時間 "
 
-#: install_steps_gtk.pm:497
+#: install_steps_gtk.pm:502
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "インストールを準備中。お待ちください.."
 
-#: install_steps_gtk.pm:512
+#: install_steps_gtk.pm:517
 #, c-format
 msgid "%d packages"
 msgstr "%d 個のパッケージ"
 
-#: install_steps_gtk.pm:517
+#: install_steps_gtk.pm:522
 #, c-format
 msgid "Installing package %s"
 msgstr "パッケージ %s をインストール"
 
-#: install_steps_gtk.pm:552 install_steps_interactive.pm:91
-#: install_steps_interactive.pm:735
+#: install_steps_gtk.pm:557 install_steps_interactive.pm:91
+#: install_steps_interactive.pm:736
 #, c-format
 msgid "Refuse"
 msgstr "拒否する"
 
-#: install_steps_gtk.pm:556 install_steps_interactive.pm:739
+#: install_steps_gtk.pm:561 install_steps_interactive.pm:740
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -6784,29 +6798,29 @@ msgstr ""
 "\"%s\" というCD-ROMをドライブにいれて[OK]を押してください。\n"
 "お持ちでない場合は[キャンセル]を押してください。"
 
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:750
+#: install_steps_gtk.pm:576 install_steps_interactive.pm:751
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "パッケージを並べかえ中にエラーが発生:"
 
-#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
-#: install_steps_interactive.pm:750 install_steps_interactive.pm:754
+#: install_steps_gtk.pm:576 install_steps_gtk.pm:580
+#: install_steps_interactive.pm:751 install_steps_interactive.pm:755
 #, c-format
 msgid "Go on anyway?"
 msgstr "続けますか？"
 
-#: install_steps_gtk.pm:575 install_steps_interactive.pm:754
+#: install_steps_gtk.pm:580 install_steps_interactive.pm:755
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "パッケージをインストール中にエラーが発生:"
 
-#: install_steps_gtk.pm:617 install_steps_interactive.pm:926
-#: install_steps_interactive.pm:1075
+#: install_steps_gtk.pm:622 install_steps_interactive.pm:927
+#: install_steps_interactive.pm:1076
 #, c-format
 msgid "not configured"
 msgstr "設定されていません"
 
-#: install_steps_gtk.pm:680
+#: install_steps_gtk.pm:685
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -6815,7 +6829,7 @@ msgstr ""
 "次のインストールメディアを検出しました。\n"
 "使用しないものがあればここで選択を解除してください。"
 
-#: install_steps_gtk.pm:689
+#: install_steps_gtk.pm:694
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -6827,7 +6841,7 @@ msgstr ""
 "そうするとインストーラはハードドライブからインストールを続けます。コピーされ"
 "たパッケージはインストール完了後も利用できます。"
 
-#: install_steps_gtk.pm:691
+#: install_steps_gtk.pm:696
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD全体をコピー"
@@ -6842,102 +6856,102 @@ msgstr "ライセンスへの同意"
 msgid "Release Notes"
 msgstr "リリースノート"
 
-#: install_steps_interactive.pm:118
+#: install_steps_interactive.pm:119
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "キーボードの配列を選んでください"
 
-#: install_steps_interactive.pm:120
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "利用可能な全てのキーボードのリスト"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:151
 #, c-format
 msgid "Install/Upgrade"
 msgstr "インストール/更新"
 
-#: install_steps_interactive.pm:151
+#: install_steps_interactive.pm:152
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "インストールか更新を選んでください"
 
-#: install_steps_interactive.pm:157
+#: install_steps_interactive.pm:158
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s を更新"
 
-#: install_steps_interactive.pm:168
+#: install_steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s の暗号キー"
 
-#: install_steps_interactive.pm:185
+#: install_steps_interactive.pm:186
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "マウスの種類を選んでください。"
 
-#: install_steps_interactive.pm:194 standalone/mousedrake:46
+#: install_steps_interactive.pm:195 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "マウスのポート"
 
-#: install_steps_interactive.pm:195 standalone/mousedrake:47
+#: install_steps_interactive.pm:196 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "マウスが接続されているシリアルポートを選んでください。"
 
-#: install_steps_interactive.pm:205
+#: install_steps_interactive.pm:206
 #, c-format
 msgid "Buttons emulation"
 msgstr "ボタンのエミュレーション"
 
-#: install_steps_interactive.pm:207
+#: install_steps_interactive.pm:208
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "第２ボタンのエミュレーション"
 
-#: install_steps_interactive.pm:208
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "第３ボタンのエミュレーション"
 
-#: install_steps_interactive.pm:229
+#: install_steps_interactive.pm:230
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:229
+#: install_steps_interactive.pm:230
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIAカードを設定中.."
 
-#: install_steps_interactive.pm:236
+#: install_steps_interactive.pm:237
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:236
+#: install_steps_interactive.pm:237
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDEを設定"
 
-#: install_steps_interactive.pm:256
+#: install_steps_interactive.pm:257
 #, c-format
 msgid "No partition available"
 msgstr "利用可能なパーティションがありません"
 
-#: install_steps_interactive.pm:259
+#: install_steps_interactive.pm:260
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "パーティションをスキャンしてマウントポイントを探しています"
 
-#: install_steps_interactive.pm:266
+#: install_steps_interactive.pm:267
 #, c-format
 msgid "Choose the mount points"
 msgstr "マウントポイントを選択"
 
-#: install_steps_interactive.pm:312
+#: install_steps_interactive.pm:313
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -6947,7 +6961,7 @@ msgstr ""
 "テムを起動するには、DiskDrakeでブートストラップパーティションを作成する必要が"
 "あります。"
 
-#: install_steps_interactive.pm:317
+#: install_steps_interactive.pm:318
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -6958,17 +6972,17 @@ msgstr ""
 "システムを起動するには、DiskDrakeでブートストラップパーティションを作成する必"
 "要があります。"
 
-#: install_steps_interactive.pm:353
+#: install_steps_interactive.pm:354
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "フォーマットするパーティションを選んでください"
 
-#: install_steps_interactive.pm:355
+#: install_steps_interactive.pm:356
 #, c-format
 msgid "Check bad blocks?"
 msgstr "不正なブロックをチェックしますか？"
 
-#: install_steps_interactive.pm:383
+#: install_steps_interactive.pm:384
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -6977,37 +6991,37 @@ msgstr ""
 "ファイルシステム %s のチェックに失敗しました。エラーを修復しますか？\n"
 "(注意:データが失われる可能性があります)"
 
-#: install_steps_interactive.pm:386
+#: install_steps_interactive.pm:387
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "インストールするにはSwap領域が足りません。追加してください。"
 
-#: install_steps_interactive.pm:393
+#: install_steps_interactive.pm:394
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "利用可能なパッケージを探してRPMデータベースを作り直しています.."
 
-#: install_steps_interactive.pm:394 install_steps_interactive.pm:452
+#: install_steps_interactive.pm:395 install_steps_interactive.pm:453
 #, c-format
 msgid "Looking for available packages..."
 msgstr "利用可能なパッケージを探しています"
 
-#: install_steps_interactive.pm:397
+#: install_steps_interactive.pm:398
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "インストール済みパッケージを探しています"
 
-#: install_steps_interactive.pm:401
+#: install_steps_interactive.pm:402
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "更新するパッケージを探しています"
 
-#: install_steps_interactive.pm:421 install_steps_interactive.pm:830
+#: install_steps_interactive.pm:422 install_steps_interactive.pm:831
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "パッケージを取得するミラーを選択"
 
-#: install_steps_interactive.pm:461
+#: install_steps_interactive.pm:462
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -7015,7 +7029,7 @@ msgid ""
 msgstr ""
 "インストール/アップグレードするために必要な空き容量がありません(%d > %d)"
 
-#: install_steps_interactive.pm:495
+#: install_steps_interactive.pm:496
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -7024,33 +7038,33 @@ msgstr ""
 "パッケージの選択を読み込むか保存するかを選んでください。\n"
 "形式はauto_installで生成されたファイルと同じです。"
 
-#: install_steps_interactive.pm:497
+#: install_steps_interactive.pm:498
 #, c-format
 msgid "Load"
 msgstr "読み込む"
 
-#: install_steps_interactive.pm:497 standalone/drakbackup:3918
-#: standalone/drakbackup:3991 standalone/drakroam:210 standalone/logdrake:172
+#: install_steps_interactive.pm:498 standalone/drakbackup:3932
+#: standalone/drakbackup:4005 standalone/drakroam:210 standalone/logdrake:172
 #, c-format
 msgid "Save"
 msgstr "保存する"
 
-#: install_steps_interactive.pm:505
+#: install_steps_interactive.pm:506
 #, c-format
 msgid "Bad file"
 msgstr "不正なファイル"
 
-#: install_steps_interactive.pm:581
+#: install_steps_interactive.pm:582
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "指定されたサイズが空き容量を超えています"
 
-#: install_steps_interactive.pm:596
+#: install_steps_interactive.pm:597
 #, c-format
 msgid "Type of install"
 msgstr "インストールの種類"
 
-#: install_steps_interactive.pm:597
+#: install_steps_interactive.pm:598
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -7059,22 +7073,22 @@ msgstr ""
 "パッケージグループが選択されていません。\n"
 "インストールする最低限のものを選んでください:"
 
-#: install_steps_interactive.pm:601
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "基本的なドキュメントを入れる(推奨)"
 
-#: install_steps_interactive.pm:602
+#: install_steps_interactive.pm:603
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "最小限のインストール(urpmiも含まれません)"
 
-#: install_steps_interactive.pm:641 standalone/drakxtv:52
+#: install_steps_interactive.pm:642 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "全て"
 
-#: install_steps_interactive.pm:680
+#: install_steps_interactive.pm:681
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -7085,17 +7099,17 @@ msgstr ""
 "ない場合はキャンセルをクリックしてください。一部のCDがない\n"
 "場合はそれらの選択を解除してOKをクリックしてください。"
 
-#: install_steps_interactive.pm:685
+#: install_steps_interactive.pm:686
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "%s というCD-ROM"
 
-#: install_steps_interactive.pm:710
+#: install_steps_interactive.pm:711
 #, c-format
 msgid "Preparing installation"
 msgstr "インストールの準備"
 
-#: install_steps_interactive.pm:719
+#: install_steps_interactive.pm:720
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -7104,17 +7118,17 @@ msgstr ""
 "パッケージ %s をインストール\n"
 "%d%%"
 
-#: install_steps_interactive.pm:768
+#: install_steps_interactive.pm:769
 #, c-format
 msgid "Post-install configuration"
 msgstr "インストール後の設定"
 
-#: install_steps_interactive.pm:775
+#: install_steps_interactive.pm:776
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "更新モジュールメディアがドライブ %s に入っていることを確認してください"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -7134,78 +7148,78 @@ msgstr ""
 "\n"
 "更新されたパッケージをインストールしますか？"
 
-#: install_steps_interactive.pm:825
+#: install_steps_interactive.pm:826
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Mandriva Linuxのサイトに接続してミラーのリストを取得しています"
 
-#: install_steps_interactive.pm:844
+#: install_steps_interactive.pm:845
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "ミラーに接続して利用可能なパッケージのリストを取得しています"
 
-#: install_steps_interactive.pm:848
+#: install_steps_interactive.pm:849
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "ミラー %s に接続できません"
 
-#: install_steps_interactive.pm:848
+#: install_steps_interactive.pm:849
 #, c-format
 msgid "Would you like to try again?"
 msgstr "もう一度試みますか？"
 
-#: install_steps_interactive.pm:875 standalone/drakclock:45
+#: install_steps_interactive.pm:876 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "タイムゾーンを選んでください。"
 
-#: install_steps_interactive.pm:880
+#: install_steps_interactive.pm:881
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自動的に時間を合わせる(NTPを使用)"
 
-#: install_steps_interactive.pm:888
+#: install_steps_interactive.pm:889
 #, c-format
 msgid "NTP Server"
 msgstr "NTPサーバ"
 
-#: install_steps_interactive.pm:930 steps.pm:30
+#: install_steps_interactive.pm:931 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "まとめ"
 
-#: install_steps_interactive.pm:943 install_steps_interactive.pm:951
-#: install_steps_interactive.pm:969 install_steps_interactive.pm:976
-#: install_steps_interactive.pm:1127 services.pm:133
-#: standalone/drakbackup:1573
+#: install_steps_interactive.pm:944 install_steps_interactive.pm:952
+#: install_steps_interactive.pm:970 install_steps_interactive.pm:977
+#: install_steps_interactive.pm:1128 services.pm:133
+#: standalone/drakbackup:1576
 #, c-format
 msgid "System"
 msgstr "システム"
 
-#: install_steps_interactive.pm:983 install_steps_interactive.pm:1010
-#: install_steps_interactive.pm:1027 install_steps_interactive.pm:1043
-#: install_steps_interactive.pm:1054
+#: install_steps_interactive.pm:984 install_steps_interactive.pm:1011
+#: install_steps_interactive.pm:1028 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1055
 #, c-format
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: install_steps_interactive.pm:989 install_steps_interactive.pm:998
+#: install_steps_interactive.pm:990 install_steps_interactive.pm:999
 #, c-format
 msgid "Remote CUPS server"
 msgstr "リモートCUPSサーバ"
 
-#: install_steps_interactive.pm:989
+#: install_steps_interactive.pm:990
 #, c-format
 msgid "No printer"
 msgstr "プリンタなし"
 
-#: install_steps_interactive.pm:1031
+#: install_steps_interactive.pm:1032
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISAサウンドカードをお使いですか？"
 
-#: install_steps_interactive.pm:1033
+#: install_steps_interactive.pm:1034
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -7214,71 +7228,71 @@ msgstr ""
 "インストール後にalsaconfかsndconfigを実行してサウンドカードを設定してくださ"
 "い。"
 
-#: install_steps_interactive.pm:1035
+#: install_steps_interactive.pm:1036
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "サウンドカードが見つかりません。インストール後にharddrakeで再度設定を試みてく"
 "ださい。"
 
-#: install_steps_interactive.pm:1055
+#: install_steps_interactive.pm:1056
 #, c-format
 msgid "Graphical interface"
 msgstr "グラフィカルインターフェース"
 
-#: install_steps_interactive.pm:1061 install_steps_interactive.pm:1073
+#: install_steps_interactive.pm:1062 install_steps_interactive.pm:1074
 #, c-format
 msgid "Network & Internet"
 msgstr "ネットワークとインターネット"
 
-#: install_steps_interactive.pm:1075
+#: install_steps_interactive.pm:1076
 #, c-format
 msgid "configured"
 msgstr "設定済み"
 
-#: install_steps_interactive.pm:1084 install_steps_interactive.pm:1098
+#: install_steps_interactive.pm:1085 install_steps_interactive.pm:1099
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "セキュリティ"
 
-#: install_steps_interactive.pm:1103
+#: install_steps_interactive.pm:1104
 #, c-format
 msgid "activated"
 msgstr "有効"
 
-#: install_steps_interactive.pm:1103
+#: install_steps_interactive.pm:1104
 #, c-format
 msgid "disabled"
 msgstr "無効"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1115
 #, c-format
 msgid "Boot"
 msgstr "起動"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1118
+#: install_steps_interactive.pm:1119 printer/printerdrake.pm:974
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s の %1$s"
 
-#: install_steps_interactive.pm:1132 services.pm:175
+#: install_steps_interactive.pm:1133 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "サービス: %d 個を起動(登録数は %d 個)"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1143
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Xが設定されていません。本当によろしいですか？"
 
-#: install_steps_interactive.pm:1223
+#: install_steps_interactive.pm:1224
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "ブートローダを準備中.."
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1234
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -7290,12 +7304,12 @@ msgstr ""
 "ではyabootは動きません。インストールを続けますが、マシンを起動するには、BootX"
 "もしくは他の方法が必要です。'root fs'のカーネル引数は'root=%s'です。"
 
-#: install_steps_interactive.pm:1239
+#: install_steps_interactive.pm:1240
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "abootを使いますか？"
 
-#: install_steps_interactive.pm:1242
+#: install_steps_interactive.pm:1243
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7304,7 +7318,7 @@ msgstr ""
 "abootをインストール中にエラーが発生しました。\n"
 "最初のパーティションを破壊しますが、強制的にインストールしますか？"
 
-#: install_steps_interactive.pm:1259
+#: install_steps_interactive.pm:1260
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -7313,22 +7327,22 @@ msgstr ""
 "このセキュリティレベルでは、Windowsパーティションのファイルへのアクセスが管理"
 "者のみに限定されます"
 
-#: install_steps_interactive.pm:1288 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1289 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "空のフロッピーをドライブ %s に入れてください"
 
-#: install_steps_interactive.pm:1293
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "ドライバディスク用に別のフロッピーを入れてください"
 
-#: install_steps_interactive.pm:1295
+#: install_steps_interactive.pm:1296
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "インストール自動化フロッピーを作成中.."
 
-#: install_steps_interactive.pm:1307
+#: install_steps_interactive.pm:1308
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7339,12 +7353,12 @@ msgstr ""
 "\n"
 "本当に終了しますか？"
 
-#: install_steps_interactive.pm:1323
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "インストール自動化フロッピーを作成"
 
-#: install_steps_interactive.pm:1325
+#: install_steps_interactive.pm:1326
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7376,24 +7390,25 @@ msgstr "  <Tab>/<Alt-Tab> 項目間の移動  | <Space> 選択 | <F12> 次の画
 msgid "Choose a file"
 msgstr "ファイルを選択"
 
-#: interactive.pm:317 interactive/gtk.pm:505 standalone/drakbackup:1514
-#: standalone/drakfont:656 standalone/drakhosts:242 standalone/draknfs:593
-#: standalone/drakroam:218 standalone/drakups:301 standalone/drakups:361
-#: standalone/drakups:381 standalone/drakvpn:319 standalone/drakvpn:680
+#: interactive.pm:317 interactive/gtk.pm:507 standalone/drakbackup:1517
+#: standalone/drakfont:654 standalone/drakhosts:244 standalone/draknfs:594
+#: standalone/drakroam:218 standalone/draksambashare:595
+#: standalone/drakups:301 standalone/drakups:361 standalone/drakups:381
+#: standalone/drakvpn:319 standalone/drakvpn:680
 #, c-format
 msgid "Add"
 msgstr "追加"
 
-#: interactive.pm:317 interactive/gtk.pm:505 standalone/drakhosts:249
-#: standalone/draknfs:600
+#: interactive.pm:317 interactive/gtk.pm:507 standalone/drakhosts:251
+#: standalone/draknfs:601 standalone/draksambashare:605
 #, c-format
 msgid "Modify"
 msgstr "変更"
 
-#: interactive.pm:317 interactive/gtk.pm:505 standalone/drakhosts:256
-#: standalone/draknfs:607 standalone/drakroam:202 standalone/drakups:303
-#: standalone/drakups:363 standalone/drakups:383 standalone/drakvpn:319
-#: standalone/drakvpn:680
+#: interactive.pm:317 interactive/gtk.pm:507 standalone/drakhosts:258
+#: standalone/draknfs:608 standalone/drakroam:202
+#: standalone/draksambashare:612 standalone/drakups:303 standalone/drakups:363
+#: standalone/drakups:383 standalone/drakvpn:319 standalone/drakvpn:680
 #, c-format
 msgid "Remove"
 msgstr "削除"
@@ -9433,18 +9448,7 @@ msgstr "ザンビア"
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: lang.pm:1079
-#, 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:1082 standalone/scannerdrake:135
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: lang.pm:1135
+#: lang.pm:1122
 #, c-format
 msgid "Welcome to %s"
 msgstr "%s へようこそ"
@@ -9469,7 +9473,7 @@ msgstr "まず論理ボリュームを削除してください\n"
 msgid "The bootloader can't handle /boot on multiple physicals volumes"
 msgstr "ブートローダは複数の物理ボリューム上の /boot を扱えません"
 
-#: modules/interactive.pm:21 standalone/drakconnect:1028
+#: modules/interactive.pm:21 standalone/drakconnect:1027
 #, c-format
 msgid "Parameters"
 msgstr "パラメータ"
@@ -9659,10 +9663,10 @@ msgid "GlidePoint"
 msgstr "GlidePoint"
 
 #: mouse.pm:36 network/modem.pm:47 network/modem.pm:48 network/modem.pm:49
-#: network/modem.pm:73 network/modem.pm:87 network/modem.pm:92
-#: network/modem.pm:125 network/netconnect.pm:585 network/netconnect.pm:590
-#: network/netconnect.pm:602 network/netconnect.pm:607
-#: network/netconnect.pm:623 network/netconnect.pm:625
+#: network/modem.pm:68 network/modem.pm:82 network/modem.pm:87
+#: network/modem.pm:120 network/netconnect.pm:583 network/netconnect.pm:588
+#: network/netconnect.pm:600 network/netconnect.pm:605
+#: network/netconnect.pm:621 network/netconnect.pm:623
 #, c-format
 msgid "Automatic"
 msgstr "自動"
@@ -9966,36 +9970,76 @@ msgstr "全て(ファイアウォールなし)"
 msgid "Other ports"
 msgstr "その他のポート"
 
-#: network/isdn.pm:117 network/netconnect.pm:459 network/netconnect.pm:546
-#: network/netconnect.pm:549 network/netconnect.pm:692
-#: network/netconnect.pm:696
+#: network/ifw.pm:136
+#, c-format
+msgid "Port scanning"
+msgstr "ポートスキャン"
+
+#: network/ifw.pm:137
+#, c-format
+msgid "Service attack"
+msgstr "サービスの攻撃"
+
+#: network/ifw.pm:138
+#, c-format
+msgid "Password cracking"
+msgstr "パスワード破り"
+
+#: network/ifw.pm:139
+#, c-format
+msgid "\"%s\" attack"
+msgstr ""
+
+#: network/ifw.pm:141
+#, c-format
+msgid "A port scanning attack has been attempted by %s."
+msgstr "%s がポートスキャン攻撃を試みました"
+
+#: network/ifw.pm:142
+#, c-format
+msgid "The %s service has been attacked by %s."
+msgstr "サービス %s が %s によって攻撃されました"
+
+#: network/ifw.pm:143
+#, c-format
+msgid "A password cracking attack has been attempted by %s."
+msgstr "%s がパスワードクラック攻撃を試みました"
+
+#: network/ifw.pm:144
+#, fuzzy, c-format
+msgid "A \"%s\" attack has been attempted by %s"
+msgstr "%s がポートスキャン攻撃を試みました"
+
+#: network/isdn.pm:117 network/netconnect.pm:455 network/netconnect.pm:544
+#: network/netconnect.pm:547 network/netconnect.pm:690
+#: network/netconnect.pm:694
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "該当なし - 手動で編集"
 
-#: network/isdn.pm:160 network/netconnect.pm:391
+#: network/isdn.pm:160 network/netconnect.pm:387
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA/PCMCIA"
 
-#: network/isdn.pm:160 network/netconnect.pm:391
+#: network/isdn.pm:160 network/netconnect.pm:387
 #, c-format
 msgid "I do not know"
 msgstr "不明"
 
-#: network/isdn.pm:161 network/netconnect.pm:391
+#: network/isdn.pm:161 network/netconnect.pm:387
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:162 network/netconnect.pm:391
+#: network/isdn.pm:162 network/netconnect.pm:387
 #, c-format
 msgid "USB"
 msgstr "USB"
 
 #: network/modem.pm:47 network/modem.pm:48 network/modem.pm:49
-#: network/netconnect.pm:590 network/netconnect.pm:607
-#: network/netconnect.pm:623
+#: network/netconnect.pm:588 network/netconnect.pm:605
+#: network/netconnect.pm:621
 #, c-format
 msgid "Manual"
 msgstr "手動"
@@ -10034,8 +10078,8 @@ msgstr ""
 msgid "Unable to find the ndiswrapper interface!"
 msgstr "ndiswrapperインターフェースがみつかりません"
 
-#: network/netconnect.pm:69 network/netconnect.pm:489
-#: network/netconnect.pm:496
+#: network/netconnect.pm:69 network/netconnect.pm:485
+#: network/netconnect.pm:492
 #, c-format
 msgid "Manual choice"
 msgstr "手動選択"
@@ -10045,7 +10089,7 @@ msgstr "手動選択"
 msgid "Internal ISDN card"
 msgstr "内蔵ISDNカード"
 
-#: network/netconnect.pm:80 printer/printerdrake.pm:1418 standalone/drakups:75
+#: network/netconnect.pm:80 printer/printerdrake.pm:1641 standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "手動設定"
@@ -10079,305 +10123,305 @@ msgstr ""
 "その他のプロトコル\n"
 "No D-Channel (leased lines)"
 
-#: network/netconnect.pm:121 network/thirdparty.pm:184
+#: network/netconnect.pm:120 network/thirdparty.pm:184
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB モデム"
 
-#: network/netconnect.pm:122
+#: network/netconnect.pm:121
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB モデム"
 
-#: network/netconnect.pm:123
+#: network/netconnect.pm:122
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan モデム"
 
-#: network/netconnect.pm:124
+#: network/netconnect.pm:123
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus モデム"
 
-#: network/netconnect.pm:128
+#: network/netconnect.pm:127
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:129
+#: network/netconnect.pm:128
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "手動によるTCP/IP設定"
 
-#: network/netconnect.pm:130
+#: network/netconnect.pm:129
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Point to Point Tunneling Protocol (PPTP)"
 
-#: network/netconnect.pm:131
+#: network/netconnect.pm:130
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP over Ethernet (PPPoE)"
 
-#: network/netconnect.pm:132
+#: network/netconnect.pm:131
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: network/netconnect.pm:133
+#: network/netconnect.pm:132
 #, c-format
 msgid "DSL over CAPI"
 msgstr "DSL over CAPI"
 
-#: network/netconnect.pm:137
+#: network/netconnect.pm:136
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Bridged Ethernet LLC"
 
-#: network/netconnect.pm:138
+#: network/netconnect.pm:137
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Bridged Ethernet VC"
 
-#: network/netconnect.pm:139
+#: network/netconnect.pm:138
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Routed IP LLC"
 
-#: network/netconnect.pm:140
+#: network/netconnect.pm:139
 #, c-format
 msgid "Routed IP VC"
 msgstr "Routed IP VC"
 
-#: network/netconnect.pm:141
+#: network/netconnect.pm:140
 #, c-format
 msgid "PPPoA LLC"
 msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:142
+#: network/netconnect.pm:141
 #, c-format
 msgid "PPPoA VC"
 msgstr "PPPoA VC"
 
-#: network/netconnect.pm:146 standalone/drakconnect:498
+#: network/netconnect.pm:145 standalone/drakconnect:498
 #, c-format
 msgid "Script-based"
 msgstr "スクリプトを使う認証"
 
-#: network/netconnect.pm:147 standalone/drakconnect:498
+#: network/netconnect.pm:146 standalone/drakconnect:498
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:148 standalone/drakconnect:498
+#: network/netconnect.pm:147 standalone/drakconnect:498
 #, c-format
 msgid "Terminal-based"
 msgstr "ターミナルからの認証"
 
-#: network/netconnect.pm:149 standalone/drakconnect:498
+#: network/netconnect.pm:148 standalone/drakconnect:498
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:150 standalone/drakconnect:498
+#: network/netconnect.pm:149 standalone/drakconnect:498
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:154
 #, c-format
 msgid "Open WEP"
 msgstr "openモードWEP"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:155
 #, c-format
 msgid "Restricted WEP"
 msgstr "restrictedモードWEP"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:156
 #, c-format
 msgid "WPA Pre-Shared Key"
 msgstr "WPA事前共有鍵(PSK)"
 
-#: network/netconnect.pm:247 standalone/drakconnect:56
+#: network/netconnect.pm:242 standalone/drakconnect:56
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "ネットワークとインターネットの設定"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:248
 #, c-format
 msgid "LAN connection"
 msgstr "LAN接続"
 
-#: network/netconnect.pm:254 network/netconnect.pm:273
+#: network/netconnect.pm:249 network/netconnect.pm:268
 #, c-format
 msgid "Wireless connection"
 msgstr "ワイヤレス接続"
 
-#: network/netconnect.pm:255
+#: network/netconnect.pm:250
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL接続"
 
-#: network/netconnect.pm:256
+#: network/netconnect.pm:251
 #, c-format
 msgid "Cable connection"
 msgstr "ケーブル接続"
 
-#: network/netconnect.pm:257
+#: network/netconnect.pm:252
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN接続"
 
-#: network/netconnect.pm:258
+#: network/netconnect.pm:253
 #, c-format
 msgid "Modem connection"
 msgstr "モデム接続"
 
-#: network/netconnect.pm:259
+#: network/netconnect.pm:254
 #, c-format
 msgid "DVB connection"
 msgstr "DVB接続"
 
-#: network/netconnect.pm:269
+#: network/netconnect.pm:264
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "設定する接続を選んでください"
 
-#: network/netconnect.pm:284 network/netconnect.pm:771
+#: network/netconnect.pm:279 network/netconnect.pm:769
 #, c-format
 msgid "Connection Configuration"
 msgstr "接続の設定"
 
-#: network/netconnect.pm:284 network/netconnect.pm:772
+#: network/netconnect.pm:279 network/netconnect.pm:770
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "下記の項目を埋めるかチェックを入れてください"
 
-#: network/netconnect.pm:287
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "あなたの電話番号"
 
-#: network/netconnect.pm:288 network/netconnect.pm:775
+#: network/netconnect.pm:283 network/netconnect.pm:773
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "プロバイダの名前(例: provider.net)"
 
-#: network/netconnect.pm:289 standalone/drakconnect:493
+#: network/netconnect.pm:284 standalone/drakconnect:493
 #, c-format
 msgid "Provider phone number"
 msgstr "プロバイダの電話番号"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:285
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "プロバイダのDNS 1 (オプション)"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:286
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "プロバイダのDNS 2 (オプション)"
 
-#: network/netconnect.pm:292 standalone/drakconnect:444
+#: network/netconnect.pm:287 standalone/drakconnect:444
 #, c-format
 msgid "Dialing mode"
 msgstr "ダイアルモード"
 
-#: network/netconnect.pm:293 standalone/drakconnect:449
+#: network/netconnect.pm:288 standalone/drakconnect:449
 #: standalone/drakconnect:517
 #, c-format
 msgid "Connection speed"
 msgstr "接続の速度"
 
-#: network/netconnect.pm:294 standalone/drakconnect:454
+#: network/netconnect.pm:289 standalone/drakconnect:454
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "接続のタイムアウト(秒)"
 
-#: network/netconnect.pm:295 network/netconnect.pm:320
-#: network/netconnect.pm:778 standalone/drakconnect:491
+#: network/netconnect.pm:290 network/netconnect.pm:315
+#: network/netconnect.pm:776 standalone/drakconnect:491
 #, c-format
 msgid "Account Login (user name)"
 msgstr "アカウントのログイン(ユーザ名)"
 
-#: network/netconnect.pm:296 network/netconnect.pm:321
-#: network/netconnect.pm:779 standalone/drakconnect:492
+#: network/netconnect.pm:291 network/netconnect.pm:316
+#: network/netconnect.pm:777 standalone/drakconnect:492
 #, c-format
 msgid "Account Password"
 msgstr "アカウントのパスワード"
 
-#: network/netconnect.pm:297 standalone/drakconnect:554
+#: network/netconnect.pm:292 standalone/drakconnect:554
 #, c-format
 msgid "Card IRQ"
 msgstr "カード IRQ"
 
-#: network/netconnect.pm:298 standalone/drakconnect:555
+#: network/netconnect.pm:293 standalone/drakconnect:555
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "カード mem (DMA)"
 
-#: network/netconnect.pm:299 standalone/drakconnect:556
+#: network/netconnect.pm:294 standalone/drakconnect:556
 #, c-format
 msgid "Card IO"
 msgstr "カード IO"
 
-#: network/netconnect.pm:300 standalone/drakconnect:557
+#: network/netconnect.pm:295 standalone/drakconnect:557
 #, c-format
 msgid "Card IO_0"
 msgstr "カード IO_0"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:296
 #, c-format
 msgid "Card IO_1"
 msgstr "カード IO_1"
 
-#: network/netconnect.pm:316
+#: network/netconnect.pm:311
 #, c-format
 msgid "Cable: account options"
 msgstr "ケーブル: アカウントのオプション"
 
-#: network/netconnect.pm:319
+#: network/netconnect.pm:314
 #, c-format
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALoginを使う(Telstraに必要)"
 
-#: network/netconnect.pm:344 network/netconnect.pm:659
-#: network/netconnect.pm:810 network/netconnect.pm:1110
+#: network/netconnect.pm:340 network/netconnect.pm:657
+#: network/netconnect.pm:808 network/netconnect.pm:1120
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "設定するネットワークインターフェースを選択:"
 
-#: network/netconnect.pm:346 network/netconnect.pm:381
-#: network/netconnect.pm:660 network/netconnect.pm:812 network/shorewall.pm:69
-#: standalone/drakconnect:709
+#: network/netconnect.pm:342 network/netconnect.pm:377
+#: network/netconnect.pm:658 network/netconnect.pm:810 network/shorewall.pm:69
+#: standalone/drakconnect:713
 #, c-format
 msgid "Net Device"
 msgstr "ネットデバイス"
 
-#: network/netconnect.pm:347 network/netconnect.pm:352
+#: network/netconnect.pm:343 network/netconnect.pm:348
 #, c-format
 msgid "External ISDN modem"
 msgstr "外付ISDNモデム"
 
-#: network/netconnect.pm:380 standalone/harddrake2:216
+#: network/netconnect.pm:376 standalone/harddrake2:216
 #, c-format
 msgid "Select a device!"
 msgstr "デバイスを選んでください"
 
-#: network/netconnect.pm:389 network/netconnect.pm:399
-#: network/netconnect.pm:409 network/netconnect.pm:442
-#: network/netconnect.pm:456
+#: network/netconnect.pm:385 network/netconnect.pm:395
+#: network/netconnect.pm:405 network/netconnect.pm:438
+#: network/netconnect.pm:452
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDNの設定"
 
-#: network/netconnect.pm:390
+#: network/netconnect.pm:386
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "お使いのカードの種類を指定してください"
 
-#: network/netconnect.pm:400
+#: network/netconnect.pm:396
 #, c-format
 msgid ""
 "\n"
@@ -10391,22 +10435,22 @@ msgstr ""
 "\n"
 "PCMCIAカードをお持ちの場合はカードのirqとioを調べる必要があります。\n"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:400
 #, c-format
 msgid "Continue"
 msgstr "続ける"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:400
 #, c-format
 msgid "Abort"
 msgstr "中止"
 
-#: network/netconnect.pm:410
+#: network/netconnect.pm:406
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "お使いのISDNカードを選んでください"
 
-#: network/netconnect.pm:428
+#: network/netconnect.pm:424
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -10416,25 +10460,25 @@ msgstr ""
 "お使いのモデムにはCAPIドライバが利用可能です。このドライバはフリーのドライバ"
 "より多くの機能(例:FAX送信)を備えています。どちらのドライバを使いますか？"
 
-#: network/netconnect.pm:430 standalone/drakconnect:109 standalone/drakups:251
+#: network/netconnect.pm:426 standalone/drakconnect:109 standalone/drakups:251
 #: standalone/harddrake2:133
 #, c-format
 msgid "Driver"
 msgstr "ドライバ"
 
-#: network/netconnect.pm:442
+#: network/netconnect.pm:438
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "どのプロトコルを使いますか？"
 
-#: network/netconnect.pm:444 standalone/drakconnect:109
-#: standalone/drakconnect:300 standalone/drakconnect:562 standalone/drakids:25
-#: standalone/drakvpn:1128
+#: network/netconnect.pm:440 standalone/drakconnect:109
+#: standalone/drakconnect:300 standalone/drakconnect:562
+#: standalone/drakids:196 standalone/drakvpn:1128
 #, c-format
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: network/netconnect.pm:456
+#: network/netconnect.pm:452
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10443,13 +10487,13 @@ msgstr ""
 "プロバイダを選んでください。\n"
 "リストにない場合は'該当なし'を選んでください。"
 
-#: network/netconnect.pm:458 network/netconnect.pm:545
-#: network/netconnect.pm:691
+#: network/netconnect.pm:454 network/netconnect.pm:543
+#: network/netconnect.pm:689
 #, c-format
 msgid "Provider:"
 msgstr "プロバイダ:"
 
-#: network/netconnect.pm:467
+#: network/netconnect.pm:463
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -10458,122 +10502,122 @@ msgstr ""
 "このモデムはサポートしていません。\n"
 "http://www.linmodems.org をご覧ください"
 
-#: network/netconnect.pm:486
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "設定するモデムを選択:"
 
-#: network/netconnect.pm:514
+#: network/netconnect.pm:512
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "モデムが接続されているシリアルポートを選んでください。"
 
-#: network/netconnect.pm:543
+#: network/netconnect.pm:541
 #, c-format
 msgid "Select your provider:"
 msgstr "プロバイダを選択:"
 
-#: network/netconnect.pm:567
+#: network/netconnect.pm:565
 #, c-format
 msgid "Dialup: account options"
 msgstr "ダイアルアップ: アカウントのオプション"
 
-#: network/netconnect.pm:570
+#: network/netconnect.pm:568
 #, c-format
 msgid "Connection name"
 msgstr "接続名"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:569
 #, c-format
 msgid "Phone number"
 msgstr "電話番号"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:570
 #, c-format
 msgid "Login ID"
 msgstr "ログインID"
 
-#: network/netconnect.pm:587 network/netconnect.pm:620
+#: network/netconnect.pm:585 network/netconnect.pm:618
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "ダイアルアップ: IPパラメータ"
 
-#: network/netconnect.pm:590
+#: network/netconnect.pm:588
 #, c-format
 msgid "IP parameters"
 msgstr "IPパラメータ"
 
-#: network/netconnect.pm:591 network/netconnect.pm:899
+#: network/netconnect.pm:589 network/netconnect.pm:894
 #: printer/printerdrake.pm:460 standalone/drakconnect:109
-#: standalone/drakconnect:316 standalone/drakconnect:878
-#: standalone/drakhosts:194 standalone/drakups:286
+#: standalone/drakconnect:316 standalone/drakconnect:882
+#: standalone/drakhosts:198 standalone/drakups:286
 #, c-format
 msgid "IP address"
 msgstr "IPアドレス"
 
-#: network/netconnect.pm:592
+#: network/netconnect.pm:590
 #, c-format
 msgid "Subnet mask"
 msgstr "サブネットマスク"
 
-#: network/netconnect.pm:604
+#: network/netconnect.pm:602
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "ダイアルアップ: DNSパラメータ"
 
-#: network/netconnect.pm:607
+#: network/netconnect.pm:605
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:608
+#: network/netconnect.pm:606
 #, c-format
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: network/netconnect.pm:609 network/netconnect.pm:776
-#: standalone/drakconnect:993
+#: network/netconnect.pm:607 network/netconnect.pm:774
+#: standalone/drakconnect:992
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "プライマリDNSサーバ(オプション)"
 
-#: network/netconnect.pm:610 network/netconnect.pm:777
-#: standalone/drakconnect:994
+#: network/netconnect.pm:608 network/netconnect.pm:775
+#: standalone/drakconnect:993
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "セカンドDNSサーバ(オプション)"
 
-#: network/netconnect.pm:611
+#: network/netconnect.pm:609
 #, c-format
 msgid "Set hostname from IP"
 msgstr "IPからホスト名を設定"
 
-#: network/netconnect.pm:623 standalone/drakconnect:327
+#: network/netconnect.pm:621 standalone/drakconnect:327
 #, c-format
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: network/netconnect.pm:624
+#: network/netconnect.pm:622
 #, c-format
 msgid "Gateway IP address"
 msgstr "ゲートウェイ IPアドレス"
 
-#: network/netconnect.pm:659
+#: network/netconnect.pm:657
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSLの設定"
 
-#: network/netconnect.pm:689
+#: network/netconnect.pm:687
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "ADSLプロバイダを選んでください"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:717
 #, c-format
 msgid "Connect to the Internet"
 msgstr "インターネットに接続"
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:718
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -10584,55 +10628,47 @@ msgstr ""
 "PPTPやDHCPを使う接続方法もあります。\n"
 "わからなければ'PPPoEを使う'を選んでください。"
 
-#: network/netconnect.pm:724
+#: network/netconnect.pm:722
 #, c-format
 msgid "ADSL connection type:"
 msgstr "ADSL接続の種類:"
 
-#: network/netconnect.pm:781
+#: network/netconnect.pm:779
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:782
+#: network/netconnect.pm:780
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:785
+#: network/netconnect.pm:783
 #, c-format
 msgid "Encapsulation:"
 msgstr "カプセル化 :"
 
-#: network/netconnect.pm:812
+#: network/netconnect.pm:810
 #, c-format
 msgid "Manually load a driver"
 msgstr "手動でドライバをロード"
 
-#: network/netconnect.pm:812
+#: network/netconnect.pm:810
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "Windowsのドライバを使う(ndiswrapperと共に)"
 
-#: network/netconnect.pm:819 network/netconnect.pm:1074
-#: network/netconnect.pm:1078 printer/printerdrake.pm:3741
-#: standalone/drakgw:217 standalone/drakgw:258 standalone/drakgw:292
-#: standalone/drakgw:394
-#, c-format
-msgid "Could not install the %s package!"
-msgstr "%s パッケージをインストールできません"
-
-#: network/netconnect.pm:855
+#: network/netconnect.pm:850
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconfホスト名の解決"
 
-#: network/netconnect.pm:856 network/netconnect.pm:886
+#: network/netconnect.pm:851 network/netconnect.pm:881
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "ネットワークデバイス %s を設定 (ドライバ %s)"
 
-#: network/netconnect.pm:857
+#: network/netconnect.pm:852
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
@@ -10641,7 +10677,7 @@ msgstr ""
 "LAN接続には以下のプロトコルが利用できます。使用するものをひとつ選んでくださ"
 "い。"
 
-#: network/netconnect.pm:887
+#: network/netconnect.pm:882
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10652,186 +10688,196 @@ msgstr ""
 "それぞれの項目にはドット区切の形式でIPアドレスを入れてください。\n"
 "(例: 1.2.3.4)"
 
-#: network/netconnect.pm:894 standalone/drakconnect:373
+#: network/netconnect.pm:889 standalone/drakconnect:373
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "DHCPアドレスからホスト名を割り当てる"
 
-#: network/netconnect.pm:895 standalone/drakconnect:375
+#: network/netconnect.pm:890 standalone/drakconnect:375
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCPホスト名"
 
-#: network/netconnect.pm:900 standalone/drakconnect:321
-#: standalone/drakconnect:879 standalone/drakgw:181
+#: network/netconnect.pm:895 standalone/drakconnect:321
+#: standalone/drakconnect:883 standalone/drakgw:181
 #, c-format
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: network/netconnect.pm:902 standalone/drakconnect:437
+#: network/netconnect.pm:897 standalone/drakconnect:437
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "ネットワークカードのIDを追跡(ラップトップに有用)"
 
-#: network/netconnect.pm:904 standalone/drakconnect:438
+#: network/netconnect.pm:898 standalone/drakconnect:438
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
 
-#: network/netconnect.pm:906 standalone/drakconnect:432
+#: network/netconnect.pm:900 standalone/drakconnect:432
 #, c-format
 msgid "Start at boot"
 msgstr "起動時に開始"
 
-#: network/netconnect.pm:908 standalone/drakconnect:460
+#: network/netconnect.pm:902 standalone/drakconnect:460
 #, c-format
 msgid "Metric"
 msgstr "Metric"
 
-#: network/netconnect.pm:910 standalone/drakconnect:369
-#: standalone/drakconnect:882
+#: network/netconnect.pm:903
+#, c-format
+msgid "Enable IPv6 to IPv4 tunnel"
+msgstr ""
+
+#: network/netconnect.pm:905 standalone/drakconnect:369
+#: standalone/drakconnect:886
 #, c-format
 msgid "DHCP client"
 msgstr "DHCPクライアント"
 
-#: network/netconnect.pm:912 standalone/drakconnect:379
+#: network/netconnect.pm:907 standalone/drakconnect:379
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCPのタイムアウト(秒)"
 
-#: network/netconnect.pm:913 standalone/drakconnect:382
+#: network/netconnect.pm:908 standalone/drakconnect:382
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNSサーバをDHCPから取得"
 
-#: network/netconnect.pm:914 standalone/drakconnect:383
+#: network/netconnect.pm:909 standalone/drakconnect:383
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YPサーバをDHCPから取得"
 
-#: network/netconnect.pm:915 standalone/drakconnect:384
+#: network/netconnect.pm:910 standalone/drakconnect:384
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPDサーバをDHCPから取得"
 
-#: network/netconnect.pm:923 printer/printerdrake.pm:1672
-#: standalone/drakconnect:672
+#: network/netconnect.pm:918 printer/printerdrake.pm:1895
+#: standalone/drakconnect:676
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IPアドレスは 1.2.3.4 のように入力してください"
 
-#: network/netconnect.pm:927 standalone/drakconnect:676
+#: network/netconnect.pm:922 standalone/drakconnect:680
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ネットマスクは 255.255.224.0 のように入力してください"
 
-#: network/netconnect.pm:931
+#: network/netconnect.pm:926
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "警告: IPアドレス %s は通常保留されています"
 
-#: network/netconnect.pm:936 standalone/drakTermServ:1816
-#: standalone/drakTermServ:1817 standalone/drakTermServ:1818
+#: network/netconnect.pm:931 standalone/drakTermServ:1852
+#: standalone/drakTermServ:1853 standalone/drakTermServ:1854
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s はすでに使用されています\n"
 
-#: network/netconnect.pm:969
+#: network/netconnect.pm:971
 #, c-format
 msgid "Choose an ndiswrapper driver"
 msgstr "ndiswrapperドライバを選択"
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:973
 #, c-format
 msgid "Use the ndiswrapper driver %s"
 msgstr "ndiswrapperドライバ %s を使用"
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:973
 #, c-format
 msgid "Install a new driver"
 msgstr "新しいドライバをインストール"
 
-#: network/netconnect.pm:983
+#: network/netconnect.pm:985
 #, c-format
 msgid "Select a device:"
 msgstr "デバイスを選択:"
 
-#: network/netconnect.pm:1008
+#: network/netconnect.pm:1014
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "このカードのワイヤレスパラメータを入力してください:"
 
-#: network/netconnect.pm:1011 standalone/drakconnect:404
+#: network/netconnect.pm:1017 standalone/drakconnect:404
 #, c-format
 msgid "Operating Mode"
 msgstr "操作モード"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Master"
 msgstr "マスター"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Repeater"
 msgstr "リピータ"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Secondary"
 msgstr "２次"
 
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1018
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: network/netconnect.pm:1014 standalone/drakconnect:405
+#: network/netconnect.pm:1021 standalone/drakconnect:405
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "ネットワーク名(ESSID)"
 
-#: network/netconnect.pm:1015 standalone/drakconnect:406
+#: network/netconnect.pm:1022
+#, c-format
+msgid "Encryption mode"
+msgstr "暗号化方式"
+
+#: network/netconnect.pm:1026
+#, c-format
+msgid "Allow access point roaming"
+msgstr ""
+
+#: network/netconnect.pm:1027 standalone/drakconnect:406
 #, c-format
 msgid "Network ID"
 msgstr "ネットワークID"
 
-#: network/netconnect.pm:1016 standalone/drakconnect:407
+#: network/netconnect.pm:1028 standalone/drakconnect:407
 #, c-format
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: network/netconnect.pm:1017 standalone/drakconnect:408
+#: network/netconnect.pm:1029 standalone/drakconnect:408
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "感度のしきい値"
 
-#: network/netconnect.pm:1018 standalone/drakconnect:409
+#: network/netconnect.pm:1030 standalone/drakconnect:409
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "ビットレート(b/s)"
 
-#: network/netconnect.pm:1019
-#, c-format
-msgid "Encryption mode"
-msgstr "暗号化方式"
-
-#: network/netconnect.pm:1023 standalone/drakconnect:420
+#: network/netconnect.pm:1031 standalone/drakconnect:420
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1024
+#: network/netconnect.pm:1032
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10851,17 +10897,17 @@ msgstr ""
 "メカニズムを無効にする最大パケットサイズと同じです。\n"
 "このパラメータをauto/fixed/offに設定することもできます。"
 
-#: network/netconnect.pm:1031 standalone/drakconnect:421
+#: network/netconnect.pm:1039 standalone/drakconnect:421
 #, c-format
 msgid "Fragmentation"
 msgstr "フラグメンテーション"
 
-#: network/netconnect.pm:1032 standalone/drakconnect:422
+#: network/netconnect.pm:1040 standalone/drakconnect:422
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "iwconfigコマンドの補助引数"
 
-#: network/netconnect.pm:1033
+#: network/netconnect.pm:1041
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10877,12 +10923,12 @@ msgstr ""
 "詳しくは'man iwconfig(8)'を参照してください。"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1040 standalone/drakconnect:423
+#: network/netconnect.pm:1048 standalone/drakconnect:423
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "iwspyコマンドの補助引数"
 
-#: network/netconnect.pm:1041
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10901,12 +10947,12 @@ msgstr ""
 "\n"
 "詳しくは'man iwspy(8)'を参照してください。"
 
-#: network/netconnect.pm:1050 standalone/drakconnect:424
+#: network/netconnect.pm:1058 standalone/drakconnect:424
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "iwprivコマンドの補助引数"
 
-#: network/netconnect.pm:1051
+#: network/netconnect.pm:1059
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10930,7 +10976,7 @@ msgstr ""
 "明されています。\n"
 "詳しくは'man iwpriv(8)'を参照してください。"
 
-#: network/netconnect.pm:1066
+#: network/netconnect.pm:1074
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10939,7 +10985,7 @@ msgstr ""
 "単位は k, M, G で入力してください(2.46 GHzの場合は 2.46G)。\n"
 "もしくは0(ゼロ)で桁を増やしてください。"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1078
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10948,37 +10994,37 @@ msgstr ""
 "単位は k, M, G で入力してください(例: 11M)。\n"
 "もしくは0(ゼロ)で桁を増やしてください。"
 
-#: network/netconnect.pm:1110
+#: network/netconnect.pm:1120
 #, c-format
 msgid "DVB configuration"
 msgstr "DVBの設定"
 
-#: network/netconnect.pm:1111
+#: network/netconnect.pm:1121
 #, c-format
 msgid "DVB Adapter"
 msgstr "DVBアダプタ"
 
-#: network/netconnect.pm:1128
+#: network/netconnect.pm:1138
 #, c-format
 msgid "DVB adapter settings"
 msgstr "DVBアダプタの設定"
 
-#: network/netconnect.pm:1131
+#: network/netconnect.pm:1141
 #, c-format
 msgid "Adapter card"
 msgstr "アダプタカード"
 
-#: network/netconnect.pm:1132
+#: network/netconnect.pm:1142
 #, c-format
 msgid "Net demux"
 msgstr "Net demux"
 
-#: network/netconnect.pm:1133
+#: network/netconnect.pm:1143
 #, c-format
 msgid "PID"
 msgstr "PID"
 
-#: network/netconnect.pm:1161
+#: network/netconnect.pm:1171
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10990,67 +11036,67 @@ msgstr ""
 "'mybox.mylab.myco.com'のように完全修飾ホスト名を\n"
 "入れてください。ゲートウェイのIPアドレスも入力できます。"
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "DNSサーバのIPアドレスも入力できます。"
 
-#: network/netconnect.pm:1168 standalone/drakconnect:992
+#: network/netconnect.pm:1178 standalone/drakconnect:991
 #, c-format
 msgid "Host name (optional)"
 msgstr "ホスト名(オプション)"
 
-#: network/netconnect.pm:1168 standalone/drakhosts:194
+#: network/netconnect.pm:1178 standalone/drakhosts:198
 #, c-format
 msgid "Host name"
 msgstr "ホスト名:"
 
-#: network/netconnect.pm:1170
+#: network/netconnect.pm:1180
 #, c-format
 msgid "DNS server 1"
 msgstr "DNSサーバ 1"
 
-#: network/netconnect.pm:1171
+#: network/netconnect.pm:1181
 #, c-format
 msgid "DNS server 2"
 msgstr "DNSサーバ 2"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1182
 #, c-format
 msgid "DNS server 3"
 msgstr "DNSサーバ 3"
 
-#: network/netconnect.pm:1173
+#: network/netconnect.pm:1183
 #, c-format
 msgid "Search domain"
 msgstr "検索ドメイン"
 
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1184
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "検索ドメインはデフォルトで完全修飾ホスト名から設定されます。"
 
-#: network/netconnect.pm:1175
+#: network/netconnect.pm:1185
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "ゲートウェイ(例 %s)"
 
-#: network/netconnect.pm:1177
+#: network/netconnect.pm:1187
 #, c-format
 msgid "Gateway device"
 msgstr "ゲートウェイデバイス"
 
-#: network/netconnect.pm:1186
+#: network/netconnect.pm:1196
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNSサーバのアドレスは 1.2.3.4 のように入力してください"
 
-#: network/netconnect.pm:1191 standalone/drakconnect:681
+#: network/netconnect.pm:1201 standalone/drakconnect:685
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "ゲートウェイのアドレスは 1.2.3.4 のように入力してください"
 
-#: network/netconnect.pm:1204
+#: network/netconnect.pm:1214
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -11063,67 +11109,67 @@ msgstr ""
 "共有リソースを提示する時に使用する名前です。\n"
 "たいていのネットワークでは必要ありません。"
 
-#: network/netconnect.pm:1208
+#: network/netconnect.pm:1218
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconfホスト名"
 
-#: network/netconnect.pm:1211
+#: network/netconnect.pm:1221
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconfホスト名は以下を含んではいけません:"
 
-#: network/netconnect.pm:1221
+#: network/netconnect.pm:1231
 #, c-format
 msgid "Do you want to allow users to start the connection?"
 msgstr "ユーザに接続の開始を許可しますか？"
 
-#: network/netconnect.pm:1234
+#: network/netconnect.pm:1244
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "起動時に接続を開始しますか？"
 
-#: network/netconnect.pm:1249
+#: network/netconnect.pm:1259
 #, c-format
 msgid "Automatically at boot"
 msgstr "起動時に自動的に開始"
 
-#: network/netconnect.pm:1251
+#: network/netconnect.pm:1261
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "システムトレイのNetアプレットを使う"
 
-#: network/netconnect.pm:1253
+#: network/netconnect.pm:1263
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "手動(インターフェースは起動時に自動的に始動します)"
 
-#: network/netconnect.pm:1262
+#: network/netconnect.pm:1272
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "この接続にどのようにダイアルしますか？"
 
-#: network/netconnect.pm:1275
+#: network/netconnect.pm:1285
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "すぐにインターネットに接続しますか？"
 
-#: network/netconnect.pm:1283 standalone/drakconnect:1024
+#: network/netconnect.pm:1293 standalone/drakconnect:1023
 #, c-format
 msgid "Testing your connection..."
 msgstr "接続をテストしています.."
 
-#: network/netconnect.pm:1303
+#: network/netconnect.pm:1313
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "インターネットに接続しました。"
 
-#: network/netconnect.pm:1304
+#: network/netconnect.pm:1314
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "セキュリティ上の理由で、接続を切ります。"
 
-#: network/netconnect.pm:1305
+#: network/netconnect.pm:1315
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -11132,7 +11178,7 @@ msgstr ""
 "このシステムはインターネットにつながっていないようです。\n"
 "接続を再設定してください。"
 
-#: network/netconnect.pm:1320
+#: network/netconnect.pm:1330
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -11142,7 +11188,7 @@ msgstr ""
 "インターネットの設定が完了しました。\n"
 "\n"
 
-#: network/netconnect.pm:1323
+#: network/netconnect.pm:1333
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -11151,7 +11197,7 @@ msgstr ""
 "設定が完了したら、ホスト名に関連した問題を避けるために、Xを再起動することをお"
 "勧めします。"
 
-#: network/netconnect.pm:1324
+#: network/netconnect.pm:1334
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -11162,28 +11208,28 @@ msgstr ""
 "net_monitorかMCCで接続をテストしてください。接続できない場合は\n"
 "再設定してください。"
 
-#: network/netconnect.pm:1335
+#: network/netconnect.pm:1345
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(ポート %s で検出)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:1337
+#: network/netconnect.pm:1347
 #, c-format
 msgid "(detected %s)"
 msgstr "(%s を検出)"
 
-#: network/netconnect.pm:1337
+#: network/netconnect.pm:1347
 #, c-format
 msgid "(detected)"
 msgstr "(検出)"
 
-#: network/netconnect.pm:1338
+#: network/netconnect.pm:1348
 #, c-format
 msgid "Network Configuration"
 msgstr "ネットワークを設定"
 
-#: network/netconnect.pm:1339
+#: network/netconnect.pm:1349
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -11195,12 +11241,12 @@ msgstr ""
 "現在の設定をそのまま使うには OK をクリックしてください。ネットワーク/\n"
 "インターネットを再設定する場合はキャンセルを押します。\n"
 
-#: network/netconnect.pm:1342
+#: network/netconnect.pm:1352
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "ネットワークの再起動が必要です。再起動しますか？"
 
-#: network/netconnect.pm:1343
+#: network/netconnect.pm:1353
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -11211,7 +11257,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1344
+#: network/netconnect.pm:1354
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -11224,12 +11270,12 @@ msgstr ""
 "\n"
 "続けるには %s を押してください。"
 
-#: network/netconnect.pm:1345
+#: network/netconnect.pm:1355
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "設定が完了しました。適用しますか？"
 
-#: network/netconnect.pm:1346
+#: network/netconnect.pm:1356
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -11240,12 +11286,12 @@ msgstr ""
 "お使いになるものを選んでください。\n"
 "\n"
 
-#: network/netconnect.pm:1347
+#: network/netconnect.pm:1357
 #, c-format
 msgid "Internet connection"
 msgstr "インターネット接続"
 
-#: network/netconnect.pm:1364
+#: network/netconnect.pm:1374
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -11254,27 +11300,27 @@ msgstr ""
 "予期せぬエラーが発生しました:\n"
 "%s"
 
-#: network/network.pm:390
+#: network/network.pm:397
 #, c-format
 msgid "Proxies configuration"
 msgstr "プロクシの設定"
 
-#: network/network.pm:391
+#: network/network.pm:398
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTPプロクシ"
 
-#: network/network.pm:392
+#: network/network.pm:399
 #, c-format
 msgid "FTP proxy"
 msgstr "FTPプロクシ"
 
-#: network/network.pm:395
+#: network/network.pm:402
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "プロクシは http://.. で始まります"
 
-#: network/network.pm:396
+#: network/network.pm:403
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLは ftp: か http: で始まります"
@@ -11453,7 +11499,7 @@ msgstr "不正なバックアップファイル"
 msgid "Error writing to file %s"
 msgstr "ファイル %s に書き込み中にエラー"
 
-#: partition_table/raw.pm:252
+#: partition_table/raw.pm:253
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11490,7 +11536,7 @@ msgstr "秀"
 msgid "maybe"
 msgstr "可"
 
-#: pkgs.pm:458
+#: pkgs.pm:460
 #, c-format
 msgid "Downloading file %s..."
 msgstr "ファイル %s をダウンロード中.."
@@ -11505,7 +11551,7 @@ msgstr "(%s で)"
 msgid "(on this machine)"
 msgstr "(このマシンで)"
 
-#: printer/cups.pm:115 standalone/printerdrake:188
+#: printer/cups.pm:115 standalone/printerdrake:198
 #, c-format
 msgid "Configured on other machines"
 msgstr "設定済み(他のマシンで)"
@@ -11515,44 +11561,44 @@ msgstr "設定済み(他のマシンで)"
 msgid "On CUPS server \"%s\""
 msgstr "CUPSサーバ %s で"
 
-#: printer/cups.pm:117 printer/printerdrake.pm:4761
-#: printer/printerdrake.pm:4771 printer/printerdrake.pm:4916
-#: printer/printerdrake.pm:4927 printer/printerdrake.pm:5137
+#: printer/cups.pm:117 printer/printerdrake.pm:5048
+#: printer/printerdrake.pm:5058 printer/printerdrake.pm:5203
+#: printer/printerdrake.pm:5214 printer/printerdrake.pm:5427
 #, c-format
 msgid " (Default)"
 msgstr " (デフォルト)"
 
-#: printer/data.pm:60
+#: printer/data.pm:59
 #, c-format
 msgid "PDQ - Print, Do not Queue"
 msgstr "PDQ - キューなしで印刷"
 
-#: printer/data.pm:61
+#: printer/data.pm:60
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:73
+#: printer/data.pm:72
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - ラインプリンタデーモン"
 
-#: printer/data.pm:74
+#: printer/data.pm:73
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:95
+#: printer/data.pm:94
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR New Generation"
 
-#: printer/data.pm:96
+#: printer/data.pm:95
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:121
+#: printer/data.pm:120
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - 共通Unix印刷システム"
@@ -11588,8 +11634,8 @@ msgstr "リモートプリンタ"
 msgid "Printer on remote CUPS server"
 msgstr "リモートCUPSサーバのプリンタ"
 
-#: printer/main.pm:30 printer/printerdrake.pm:1150
-#: printer/printerdrake.pm:1695
+#: printer/main.pm:30 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1918
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "リモートLPDサーバのプリンタ"
@@ -11600,8 +11646,8 @@ msgid "Network printer (TCP/Socket)"
 msgstr "ネットワークプリンタ(TCP/Socket)"
 
 #: printer/main.pm:32
-#, c-format
-msgid "Printer on SMB/Windows 95/98/NT server"
+#, fuzzy, c-format
+msgid "Printer on SMB/Windows server"
 msgstr "SMB/Windows 95/98/NT サーバのプリンタ"
 
 #: printer/main.pm:33
@@ -11609,7 +11655,7 @@ msgstr "SMB/Windows 95/98/NT サーバのプリンタ"
 msgid "Printer on NetWare server"
 msgstr "NetWareサーバのプリンタ"
 
-#: printer/main.pm:34 printer/printerdrake.pm:1699
+#: printer/main.pm:34 printer/printerdrake.pm:1922
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "プリンタデバイスのURIを入力"
@@ -11619,239 +11665,240 @@ msgstr "プリンタデバイスのURIを入力"
 msgid "Pipe job into a command"
 msgstr "パイプでジョブをコマンドへ渡す"
 
-#: printer/main.pm:45
+#: printer/main.pm:46
 #, c-format
 msgid "recommended"
 msgstr "推奨"
 
-#: printer/main.pm:329 printer/main.pm:634 printer/main.pm:1671
-#: printer/main.pm:2706 printer/main.pm:2715 printer/printerdrake.pm:910
-#: printer/printerdrake.pm:2182 printer/printerdrake.pm:5174
+#: printer/main.pm:330 printer/main.pm:686 printer/main.pm:1776
+#: printer/main.pm:2917 printer/main.pm:2926 printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1133 printer/printerdrake.pm:2410
+#: printer/printerdrake.pm:5464
 #, c-format
 msgid "Unknown model"
 msgstr "不明なモデル"
 
-#: printer/main.pm:354 standalone/printerdrake:187
+#: printer/main.pm:355 standalone/printerdrake:197
 #, c-format
 msgid "Configured on this machine"
 msgstr "設定済み(このマシンで)"
 
-#: printer/main.pm:360 printer/printerdrake.pm:1239
+#: printer/main.pm:361 printer/printerdrake.pm:1462
 #, c-format
 msgid " on parallel port #%s"
 msgstr " パラレルポートの #%s"
 
-#: printer/main.pm:363 printer/printerdrake.pm:1242
+#: printer/main.pm:364 printer/printerdrake.pm:1465
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", USBプリンタ #%s"
 
-#: printer/main.pm:365
+#: printer/main.pm:366
 #, c-format
 msgid ", USB printer"
 msgstr ", USBプリンタ"
 
-#: printer/main.pm:369
+#: printer/main.pm:370
 #, c-format
 msgid ", HP printer on a parallel port"
 msgstr ", パラレルポートのHPプリンタ"
 
-#: printer/main.pm:371
+#: printer/main.pm:372
 #, c-format
 msgid ", HP printer on USB"
 msgstr ", USBのHPプリンタ"
 
-#: printer/main.pm:373
+#: printer/main.pm:374
 #, c-format
 msgid ", HP printer on HP JetDirect"
 msgstr ", HP JetDirectのHPプリンタ"
 
-#: printer/main.pm:375
+#: printer/main.pm:376
 #, c-format
 msgid ", HP printer"
 msgstr ", HPプリンタ"
 
-#: printer/main.pm:381
+#: printer/main.pm:382
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", パラレルポートの多機能デバイス #%s"
 
-#: printer/main.pm:384
+#: printer/main.pm:385
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", パラレルポートの多機能デバイス"
 
-#: printer/main.pm:386
+#: printer/main.pm:387
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", USBの多機能デバイス"
 
-#: printer/main.pm:388
+#: printer/main.pm:389
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", HP JetDirectの多機能デバイス"
 
-#: printer/main.pm:390
+#: printer/main.pm:391
 #, c-format
 msgid ", multi-function device"
 msgstr ", 多機能デバイス"
 
-#: printer/main.pm:394
+#: printer/main.pm:395
 #, c-format
 msgid ", printing to %s"
 msgstr ", %s へ印刷"
 
-#: printer/main.pm:397
+#: printer/main.pm:398
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " on LPD サーバ \"%s\", プリンタ \"%s\""
 
-#: printer/main.pm:400
+#: printer/main.pm:401
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IPホスト \"%s\", ポート %s"
 
 # y, c-format
-#: printer/main.pm:405
+#: printer/main.pm:406
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " on SMB/Windows サーバ \"%s\", 共有 \"%s\""
 
-#: printer/main.pm:410
+#: printer/main.pm:411
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " on Novellサーバ \"%s\", プリンタ \"%s\""
 
-#: printer/main.pm:413
+#: printer/main.pm:414
 #, c-format
 msgid ", using command %s"
 msgstr ", コマンド %s を使用"
 
-#: printer/main.pm:428
+#: printer/main.pm:429
 #, c-format
 msgid "Parallel port #%s"
 msgstr "パラレルポート #%s"
 
-#: printer/main.pm:431 printer/printerdrake.pm:1260
-#: printer/printerdrake.pm:1287 printer/printerdrake.pm:1305
+#: printer/main.pm:432 printer/printerdrake.pm:1483
+#: printer/printerdrake.pm:1510 printer/printerdrake.pm:1528
 #, c-format
 msgid "USB printer #%s"
 msgstr "USBプリンタ #%s"
 
-#: printer/main.pm:433
+#: printer/main.pm:434
 #, c-format
 msgid "USB printer"
 msgstr "USBプリンタ"
 
-#: printer/main.pm:437
+#: printer/main.pm:438
 #, c-format
 msgid "HP printer on a parallel port"
 msgstr "パラレルポートのHPプリンタ"
 
-#: printer/main.pm:439
+#: printer/main.pm:440
 #, c-format
 msgid "HP printer on USB"
 msgstr "USBのHPプリンタ"
 
-#: printer/main.pm:441
+#: printer/main.pm:442
 #, c-format
 msgid "HP printer on HP JetDirect"
 msgstr "HP JetDirectのHPプリンタ"
 
-#: printer/main.pm:443
+#: printer/main.pm:444
 #, c-format
 msgid "HP printer"
 msgstr "HPプリンタ"
 
-#: printer/main.pm:449
+#: printer/main.pm:450
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "パラレルポートの多機能デバイス #%s"
 
-#: printer/main.pm:452
+#: printer/main.pm:453
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "パラレルポートの多機能デバイス"
 
-#: printer/main.pm:454
+#: printer/main.pm:455
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "USBの多機能デバイス"
 
-#: printer/main.pm:456
+#: printer/main.pm:457
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "HP JetDirectの多機能デバイス"
 
-#: printer/main.pm:458
+#: printer/main.pm:459
 #, c-format
 msgid "Multi-function device"
 msgstr "多機能デバイス"
 
-#: printer/main.pm:462
+#: printer/main.pm:463
 #, c-format
 msgid "Prints into %s"
 msgstr "%s へ印刷"
 
-#: printer/main.pm:465
+#: printer/main.pm:466
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "LPDサーバ \"%s\", プリンタ \"%s\""
 
-#: printer/main.pm:468
+#: printer/main.pm:469
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "TCP/IPホスト \"%s\", ポート %s"
 
 # y, c-format
-#: printer/main.pm:473
+#: printer/main.pm:474
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windowsサーバ \"%s\", 共有 \"%s\""
 
-#: printer/main.pm:478
+#: printer/main.pm:479
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Novellサーバ \"%s\", プリンタ \"%s\""
 
-#: printer/main.pm:481
+#: printer/main.pm:482
 #, c-format
 msgid "Uses command %s"
 msgstr "コマンド %s を使う"
 
-#: printer/main.pm:483
+#: printer/main.pm:484
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:631 printer/printerdrake.pm:856
-#: printer/printerdrake.pm:2953
+#: printer/main.pm:683 printer/printerdrake.pm:1060
+#: printer/printerdrake.pm:3220
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "Rawプリンタ(ドライバなし)"
 
-#: printer/main.pm:1181 printer/printerdrake.pm:211
+#: printer/main.pm:1274 printer/printerdrake.pm:211
 #: printer/printerdrake.pm:223
 #, c-format
 msgid "Local network(s)"
 msgstr "ローカルネットワーク"
 
-#: printer/main.pm:1183 printer/printerdrake.pm:227
+#: printer/main.pm:1276 printer/printerdrake.pm:227
 #, c-format
 msgid "Interface \"%s\""
 msgstr "インターフェース %s"
 
-#: printer/main.pm:1185
+#: printer/main.pm:1278
 #, c-format
 msgid "Network %s"
 msgstr "ネットワーク %s"
 
-#: printer/main.pm:1187
+#: printer/main.pm:1280
 #, c-format
 msgid "Host %s"
 msgstr "ホスト %s"
 
-#: printer/main.pm:1216
+#: printer/main.pm:1309
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (ポート %s)"
@@ -12006,7 +12053,7 @@ msgstr ""
 "す。"
 
 #: printer/printerdrake.pm:138 printer/printerdrake.pm:506
-#: printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:4681
 #, c-format
 msgid "Remote CUPS server and no local CUPS daemon"
 msgstr "リモートCUPSサーバ(ローカルCUPSデーモンなし)"
@@ -12146,7 +12193,7 @@ msgstr "サーバのIPがありません"
 msgid "The entered IP is not correct.\n"
 msgstr "入力されたIPが不正です\n"
 
-#: printer/printerdrake.pm:440 printer/printerdrake.pm:1924
+#: printer/printerdrake.pm:440 printer/printerdrake.pm:2152
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "ポート番号は整数でなければいけません"
@@ -12156,7 +12203,7 @@ msgstr "ポート番号は整数でなければいけません"
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "このサーバは既にリストにあります。追加できません。\n"
 
-#: printer/printerdrake.pm:462 printer/printerdrake.pm:1951
+#: printer/printerdrake.pm:462 printer/printerdrake.pm:2179
 #: standalone/drakups:251 standalone/harddrake2:52
 #, c-format
 msgid "Port"
@@ -12169,41 +12216,42 @@ msgstr "ポート"
 msgid "On, Name or IP of remote server:"
 msgstr "On, リモートサーバの名前またはIP:"
 
-#: printer/printerdrake.pm:514 printer/printerdrake.pm:4406
-#: printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:514 printer/printerdrake.pm:4690
+#: printer/printerdrake.pm:4756
 #, c-format
 msgid "CUPS server name or IP address missing."
 msgstr "CUPSサーバの名前またはIPがありません"
 
 #: printer/printerdrake.pm:566 printer/printerdrake.pm:586
-#: printer/printerdrake.pm:680 printer/printerdrake.pm:746
-#: printer/printerdrake.pm:773 printer/printerdrake.pm:832
-#: printer/printerdrake.pm:874 printer/printerdrake.pm:884
-#: printer/printerdrake.pm:2011 printer/printerdrake.pm:2225
-#: printer/printerdrake.pm:2257 printer/printerdrake.pm:2305
-#: printer/printerdrake.pm:2357 printer/printerdrake.pm:2374
-#: printer/printerdrake.pm:2418 printer/printerdrake.pm:2458
-#: printer/printerdrake.pm:2508 printer/printerdrake.pm:2542
-#: printer/printerdrake.pm:2552 printer/printerdrake.pm:2804
-#: printer/printerdrake.pm:2809 printer/printerdrake.pm:2948
-#: printer/printerdrake.pm:3059 printer/printerdrake.pm:3656
-#: printer/printerdrake.pm:3722 printer/printerdrake.pm:3771
-#: printer/printerdrake.pm:3774 printer/printerdrake.pm:3906
-#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4079
-#: printer/printerdrake.pm:4100 printer/printerdrake.pm:4110
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4296
-#: printer/printerdrake.pm:4302 printer/printerdrake.pm:4326
-#: printer/printerdrake.pm:4433 printer/printerdrake.pm:4542
-#: printer/printerdrake.pm:4562 printer/printerdrake.pm:4571
-#: printer/printerdrake.pm:4586 printer/printerdrake.pm:4784
-#: printer/printerdrake.pm:5236 printer/printerdrake.pm:5313
-#: standalone/printerdrake:67 standalone/printerdrake:555
+#: printer/printerdrake.pm:811 printer/printerdrake.pm:880
+#: printer/printerdrake.pm:901 printer/printerdrake.pm:927
+#: printer/printerdrake.pm:1036 printer/printerdrake.pm:1078
+#: printer/printerdrake.pm:1088 printer/printerdrake.pm:1123
+#: printer/printerdrake.pm:2239 printer/printerdrake.pm:2454
+#: printer/printerdrake.pm:2486 printer/printerdrake.pm:2547
+#: printer/printerdrake.pm:2599 printer/printerdrake.pm:2616
+#: printer/printerdrake.pm:2660 printer/printerdrake.pm:2700
+#: printer/printerdrake.pm:2750 printer/printerdrake.pm:2784
+#: printer/printerdrake.pm:2794 printer/printerdrake.pm:3062
+#: printer/printerdrake.pm:3067 printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3326 printer/printerdrake.pm:3939
+#: printer/printerdrake.pm:4006 printer/printerdrake.pm:4055
+#: printer/printerdrake.pm:4058 printer/printerdrake.pm:4190
+#: printer/printerdrake.pm:4291 printer/printerdrake.pm:4363
+#: printer/printerdrake.pm:4384 printer/printerdrake.pm:4394
+#: printer/printerdrake.pm:4485 printer/printerdrake.pm:4580
+#: printer/printerdrake.pm:4586 printer/printerdrake.pm:4610
+#: printer/printerdrake.pm:4717 printer/printerdrake.pm:4826
+#: printer/printerdrake.pm:4846 printer/printerdrake.pm:4855
+#: printer/printerdrake.pm:4870 printer/printerdrake.pm:5071
+#: printer/printerdrake.pm:5533 printer/printerdrake.pm:5616
+#: standalone/printerdrake:73 standalone/printerdrake:572
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
-#: printer/printerdrake.pm:567 printer/printerdrake.pm:4008
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:567 printer/printerdrake.pm:4292
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Reading printer data..."
 msgstr "プリンタの情報を読み込み中.."
@@ -12213,17 +12261,113 @@ msgstr "プリンタの情報を読み込み中.."
 msgid "Restarting CUPS..."
 msgstr "CUPSを再起動中.."
 
-#: printer/printerdrake.pm:614 printer/printerdrake.pm:634
+#: printer/printerdrake.pm:614
+#, c-format
+msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgstr ""
+
+#: printer/printerdrake.pm:616
+#, c-format
+msgid ""
+"No pop-up windows, canceling setup and package installation not possible"
+msgstr ""
+
+#: printer/printerdrake.pm:622
+#, fuzzy, c-format
+msgid "Printer auto administration"
+msgstr "プリンタを自動的に検出する"
+
+#: printer/printerdrake.pm:623
+#, c-format
+msgid ""
+"Here you can configure printer administration tasks which should be done "
+"automatically."
+msgstr ""
+
+#: printer/printerdrake.pm:626
+#, fuzzy, c-format
+msgid "Do automatic configuration of new printers"
+msgstr "自動設定(DHCP)を使用"
+
+#: printer/printerdrake.pm:627 printer/printerdrake.pm:641
+#, fuzzy, c-format
+msgid "when a USB printer is connected and turned on"
+msgstr " (全てのプリンタを接続して電源を入れてください)\n"
+
+#: printer/printerdrake.pm:630
+#, fuzzy, c-format
+msgid "when Printerdrake is started"
+msgstr "このプリンタは無効になっています"
+
+#: printer/printerdrake.pm:634
+#, c-format
+msgid "Mode for automatic printer setup:"
+msgstr ""
+
+#: printer/printerdrake.pm:640
+#, fuzzy, c-format
+msgid "Re-enable disabled printers"
+msgstr "利用可能なプリンタ"
+
+#: printer/printerdrake.pm:644
+#, fuzzy, c-format
+msgid "when the printing system is started"
+msgstr "印刷システムを変更"
+
+#: printer/printerdrake.pm:680
+#, fuzzy, c-format
+msgid "Communication error handling for the printer \"%s\""
+msgstr "プリンタ %s を使用/維持"
+
+#: printer/printerdrake.pm:682
+#, c-format
+msgid ""
+"Here you can configure how errors during the communication between your "
+"computer and the printer \"%s\" should be handled (for example if the "
+"printer is not turned on)."
+msgstr ""
+
+#: printer/printerdrake.pm:686
+#, fuzzy, c-format
+msgid "The number of retries should be an integer number of at least 1!"
+msgstr "ポート番号は整数でなければいけません"
+
+#: printer/printerdrake.pm:690
+#, fuzzy, c-format
+msgid "The delay between retries should be a positive integer number!"
+msgstr "タイムアウトの値は正の整数でなければなりません"
+
+#: printer/printerdrake.pm:701
+#, fuzzy, c-format
+msgid "Do not disable the printer"
+msgstr "プリンタを無効にする"
+
+#: printer/printerdrake.pm:704
+#, c-format
+msgid "Retry infinitely often"
+msgstr ""
+
+#: printer/printerdrake.pm:707
+#, fuzzy, c-format
+msgid "Number of retries"
+msgstr "ボタンの数"
+
+#: printer/printerdrake.pm:712
+#, c-format
+msgid "Delay between retries (in sec)"
+msgstr ""
+
+#: printer/printerdrake.pm:745 printer/printerdrake.pm:765
 #, c-format
 msgid "Select Printer Connection"
 msgstr "プリンタの接続を選択"
 
-#: printer/printerdrake.pm:615
+#: printer/printerdrake.pm:746
 #, c-format
 msgid "How is the printer connected?"
 msgstr "プリンタはどのように接続されていますか？"
 
-#: printer/printerdrake.pm:617
+#: printer/printerdrake.pm:748
 #, c-format
 msgid ""
 "\n"
@@ -12234,7 +12378,7 @@ msgstr ""
 "リモートCUPSサーバのプリンタはここで設定する必要はありません。\n"
 "それらのプリンタは自動的に検出されます。"
 
-#: printer/printerdrake.pm:620 printer/printerdrake.pm:4786
+#: printer/printerdrake.pm:751 printer/printerdrake.pm:5073
 #, c-format
 msgid ""
 "\n"
@@ -12245,23 +12389,23 @@ msgstr ""
 "警告: 有効なローカルネットワーク接続がありません。リモートプリンタを検出/テス"
 "トできません。"
 
-#: printer/printerdrake.pm:627
+#: printer/printerdrake.pm:758
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr "プリンタの自動検出(ローカル, TCP/Socket, SMBプリンタ, デバイスURI)"
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:760
 #, c-format
 msgid "Modify timeout for network printer auto-detection"
 msgstr "ネットワークプリンタ自動検出のタイムアウトを変更"
 
-#: printer/printerdrake.pm:635
+#: printer/printerdrake.pm:766
 #, c-format
 msgid "Enter the timeout for network printer auto-detection (in msec) here. "
 msgstr "ネットワークプリンタ自動検出のタイムアウトをミリ秒で入力してください"
 
-#: printer/printerdrake.pm:637
+#: printer/printerdrake.pm:768
 #, c-format
 msgid ""
 "The longer you choose the timeout, the more reliable the detections of "
@@ -12272,27 +12416,27 @@ msgstr ""
 "スキャンに時間がかかります。ネットワーク内にローカルファイアウォールで保護さ"
 "れたマシンが多数ある場合は特に注意してください。"
 
-#: printer/printerdrake.pm:641
+#: printer/printerdrake.pm:772
 #, c-format
 msgid "The timeout must be a positive integer number!"
 msgstr "タイムアウトの値は正の整数でなければなりません"
 
-#: printer/printerdrake.pm:680
+#: printer/printerdrake.pm:811
 #, c-format
 msgid "Checking your system..."
 msgstr "システムを調査中.."
 
-#: printer/printerdrake.pm:697
+#: printer/printerdrake.pm:829
 #, c-format
 msgid "and one unknown printer"
 msgstr "と 1 台の不明なプリンタ"
 
-#: printer/printerdrake.pm:699
+#: printer/printerdrake.pm:831
 #, c-format
 msgid "and %d unknown printers"
 msgstr "と %d 台の不明なプリンタ"
 
-#: printer/printerdrake.pm:703
+#: printer/printerdrake.pm:835
 #, c-format
 msgid ""
 "The following printers\n"
@@ -12305,7 +12449,7 @@ msgstr ""
 "%s%s\n"
 "がシステムに直接接続されています"
 
-#: printer/printerdrake.pm:705
+#: printer/printerdrake.pm:837
 #, c-format
 msgid ""
 "The following printer\n"
@@ -12318,7 +12462,7 @@ msgstr ""
 "%s%s\n"
 "がシステムに直接接続されています"
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:838
 #, c-format
 msgid ""
 "The following printer\n"
@@ -12331,7 +12475,7 @@ msgstr ""
 "%s%s\n"
 "がシステムに直接接続されています"
 
-#: printer/printerdrake.pm:710
+#: printer/printerdrake.pm:842
 #, c-format
 msgid ""
 "\n"
@@ -12340,7 +12484,7 @@ msgstr ""
 "\n"
 "１台の不明なプリンタがマシンに直接接続されています"
 
-#: printer/printerdrake.pm:711
+#: printer/printerdrake.pm:843
 #, c-format
 msgid ""
 "\n"
@@ -12349,18 +12493,18 @@ msgstr ""
 "\n"
 "%d 台の不明なプリンタがマシンに直接接続されています"
 
-#: printer/printerdrake.pm:714
+#: printer/printerdrake.pm:846
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "このマシンに直接接続されたプリンタが見つかりません"
 
-#: printer/printerdrake.pm:717
+#: printer/printerdrake.pm:849
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr " (全てのプリンタを接続して電源を入れてください)\n"
 
-#: printer/printerdrake.pm:730
+#: printer/printerdrake.pm:862
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -12368,22 +12512,22 @@ msgid ""
 msgstr ""
 "上記のプリンタまたはローカルネットワークのプリンタで印刷を行いますか？\n"
 
-#: printer/printerdrake.pm:731
+#: printer/printerdrake.pm:863
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "ローカルネットワークのプリンタで印刷を行いますか？\n"
 
-#: printer/printerdrake.pm:733
+#: printer/printerdrake.pm:865
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "上記のプリンタで印刷を行いますか？\n"
 
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:866
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr "このマシンでの印刷を設定しますか？\n"
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:867
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -12392,42 +12536,85 @@ msgstr ""
 "注意: プリンタの機種と印刷方式によっては、最大で %d MBの\n"
 "追加ソフトをインストールします。"
 
-#: printer/printerdrake.pm:774
+#: printer/printerdrake.pm:884
+#, c-format
+msgid "Do not do automatic printer setup and do not do it again"
+msgstr ""
+
+#: printer/printerdrake.pm:928
 #, c-format
 msgid "Searching for new printers..."
 msgstr "新しいプリンタを検索中.."
 
-#: printer/printerdrake.pm:833
+#: printer/printerdrake.pm:989
+#, c-format
+msgid "Do not do automatic printer setup again"
+msgstr ""
+
+#: printer/printerdrake.pm:996
+#, fuzzy, c-format
+msgid "New printers found"
+msgstr "プリンタが見つかりません"
+
+#: printer/printerdrake.pm:997
+#, fuzzy, c-format
+msgid "New printer found"
+msgstr "プリンタが見つかりません"
+
+#: printer/printerdrake.pm:999
 #, c-format
-msgid "Found printer on %s..."
-msgstr "%s にプリンタを検出.."
+msgid ""
+"The following new printers were found and Printerdrake can automatically set "
+"them up for you. If you do not want to have all of them set up, unselect the "
+"ones which should be skipped, or click \"Cancel\" to set up none of them.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1000
+#, c-format
+msgid ""
+"The following new printer was found and printerdrake can automatically set "
+"it up for you. If you do not want to have it set up, unselect it, or click "
+"\"Cancel\".\n"
+msgstr ""
 
-#: printer/printerdrake.pm:858
+#: printer/printerdrake.pm:1001
+#, c-format
+msgid ""
+"Note that for certain printer models additional packages need to be "
+"installed. So keep your installation media handy.\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1037 printer/printerdrake.pm:1079
+#, c-format
+msgid "Configuring printer on %s..."
+msgstr "%s のプリンタを設定.."
+
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:859
+#: printer/printerdrake.pm:1063
 #, c-format
 msgid " on "
 msgstr " on "
 
-#: printer/printerdrake.pm:860 standalone/scannerdrake:137
+#: printer/printerdrake.pm:1064 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:865 printer/printerdrake.pm:2960
+#: printer/printerdrake.pm:1069 printer/printerdrake.pm:3227
 #, c-format
 msgid "Printer model selection"
 msgstr "プリンタ機種の選択"
 
-#: printer/printerdrake.pm:866 printer/printerdrake.pm:2961
+#: printer/printerdrake.pm:1070 printer/printerdrake.pm:3228
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "プリンタの機種を選んでください"
 
-#: printer/printerdrake.pm:867
+#: printer/printerdrake.pm:1071
 #, c-format
 msgid ""
 "\n"
@@ -12440,7 +12627,7 @@ msgstr ""
 "Printerdrakeはお使いのプリンタ %s の機種を検出できませんでした。\n"
 "リストの中から正しい機種を選んでください。"
 
-#: printer/printerdrake.pm:870 printer/printerdrake.pm:2966
+#: printer/printerdrake.pm:1074 printer/printerdrake.pm:3233
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -12450,25 +12637,47 @@ msgstr ""
 "お使いのプリンタがリストにない場合は、互換性のあるプリンタ\n"
 "(プリンタのマニュアルを参照)か類似したプリンタを選んでください。"
 
-#: printer/printerdrake.pm:875
-#, c-format
-msgid "Configuring printer on %s..."
-msgstr "%s のプリンタを設定.."
-
-#: printer/printerdrake.pm:885 printer/printerdrake.pm:4563
+#: printer/printerdrake.pm:1089 printer/printerdrake.pm:4847
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "プリンタ %s を設定中.."
 
-#: printer/printerdrake.pm:1051 printer/printerdrake.pm:1063
-#: printer/printerdrake.pm:1170 printer/printerdrake.pm:2191
-#: printer/printerdrake.pm:2206 printer/printerdrake.pm:2276
-#: printer/printerdrake.pm:4803 printer/printerdrake.pm:4973
+#: printer/printerdrake.pm:1124
+#, c-format
+msgid ""
+"Now you have turned off automatic printer setup.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:1125
+#, c-format
+msgid ""
+"You can turn it back on again by choosing \"%s\" -> \"%s\" in Printerdrake's "
+"main menu. "
+msgstr ""
+
+#: printer/printerdrake.pm:1125
+#, fuzzy, c-format
+msgid "Configure Auto Administration"
+msgstr "リモート管理"
+
+#: printer/printerdrake.pm:1126
+#, c-format
+msgid ""
+"There you can also choose in which situation automatic printer setup is done "
+"(On Printerdrake startup, on printing system startup, when connecting a new "
+"USB printer)."
+msgstr ""
+
+#: printer/printerdrake.pm:1274 printer/printerdrake.pm:1286
+#: printer/printerdrake.pm:1393 printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2435 printer/printerdrake.pm:2507
+#: printer/printerdrake.pm:5090 printer/printerdrake.pm:5263
 #, c-format
 msgid "Add a new printer"
 msgstr "プリンタを追加"
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1275
 #, c-format
 msgid ""
 "\n"
@@ -12490,7 +12699,7 @@ msgstr ""
 "プリンタドライバ/オプション/プリンタの接続方式\n"
 "を選択してプリンタを設定してください。"
 
-#: printer/printerdrake.pm:1065
+#: printer/printerdrake.pm:1288
 #, c-format
 msgid ""
 "\n"
@@ -12528,7 +12737,7 @@ msgstr ""
 "準備ができたら[次へ]をクリックしてください。プリンタを設定しない場合は\n"
 "[キャンセル]をクリックしてください。"
 
-#: printer/printerdrake.pm:1074
+#: printer/printerdrake.pm:1297
 #, c-format
 msgid ""
 "\n"
@@ -12554,7 +12763,7 @@ msgstr ""
 "準備ができたら[次へ]をクリックしてください。プリンタを設定しない\n"
 "場合は[キャンセル]をクリックしてください。"
 
-#: printer/printerdrake.pm:1082
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "\n"
@@ -12591,7 +12800,7 @@ msgstr ""
 "準備ができたら[次へ]をクリックしてください。プリンタを設定しない場合は\n"
 "[キャンセル]をクリックしてください。"
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid ""
 "\n"
@@ -12617,27 +12826,27 @@ msgstr ""
 "準備ができたら[次へ]をクリックしてください。プリンタを設定しない場合は\n"
 "[キャンセル]をクリックしてください。"
 
-#: printer/printerdrake.pm:1142
+#: printer/printerdrake.pm:1365
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "このマシンに接続されているプリンタを自動的に検出する"
 
-#: printer/printerdrake.pm:1145
+#: printer/printerdrake.pm:1368
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "ローカルネットワークに接続されているプリンタを自動的に検出する"
 
-#: printer/printerdrake.pm:1148
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "Windowsマシンに接続されているプリンタを自動的に検出する"
 
-#: printer/printerdrake.pm:1151
+#: printer/printerdrake.pm:1374
 #, c-format
 msgid "No auto-detection"
 msgstr "自動検出なし"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1394
 #, c-format
 msgid ""
 "\n"
@@ -12660,71 +12869,71 @@ msgstr ""
 "を行うには、%s コントロールセンターの'ハードウェア'で'プリンタ'を選んでくださ"
 "い。"
 
-#: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
-#: printer/printerdrake.pm:1500 printer/printerdrake.pm:1592
-#: printer/printerdrake.pm:1730 printer/printerdrake.pm:1806
-#: printer/printerdrake.pm:1968 printer/printerdrake.pm:2061
-#: printer/printerdrake.pm:2070 printer/printerdrake.pm:2079
-#: printer/printerdrake.pm:2090 printer/printerdrake.pm:2231
-#: printer/printerdrake.pm:2317 printer/printerdrake.pm:2363
-#: printer/printerdrake.pm:2430 printer/printerdrake.pm:2465
+#: printer/printerdrake.pm:1430 printer/printerdrake.pm:1660
+#: printer/printerdrake.pm:1723 printer/printerdrake.pm:1815
+#: printer/printerdrake.pm:1953 printer/printerdrake.pm:2029
+#: printer/printerdrake.pm:2196 printer/printerdrake.pm:2289
+#: printer/printerdrake.pm:2298 printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2318 printer/printerdrake.pm:2460
+#: printer/printerdrake.pm:2559 printer/printerdrake.pm:2605
+#: printer/printerdrake.pm:2672 printer/printerdrake.pm:2707
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "%s パッケージをインストールできません"
 
-#: printer/printerdrake.pm:1209
+#: printer/printerdrake.pm:1432
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Windows/SMBサーバの自動検出をスキップ"
 
-#: printer/printerdrake.pm:1215 printer/printerdrake.pm:1360
-#: printer/printerdrake.pm:1598 printer/printerdrake.pm:1855
+#: printer/printerdrake.pm:1438 printer/printerdrake.pm:1583
+#: printer/printerdrake.pm:1821 printer/printerdrake.pm:2083
 #, c-format
 msgid "Printer auto-detection"
 msgstr "プリンタを自動的に検出する"
 
-#: printer/printerdrake.pm:1215
+#: printer/printerdrake.pm:1438
 #, c-format
 msgid "Detecting devices..."
 msgstr "デバイスを検出中.."
 
-#: printer/printerdrake.pm:1245
+#: printer/printerdrake.pm:1468
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", ネットワークプリンタ %s, ポート %s"
 
-#: printer/printerdrake.pm:1248
+#: printer/printerdrake.pm:1471
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", プリンタ \"%s\" on SMB/Windows サーバ \"%s\""
 
-#: printer/printerdrake.pm:1252
+#: printer/printerdrake.pm:1475
 #, c-format
 msgid "Detected %s"
 msgstr "%s を検出"
 
-#: printer/printerdrake.pm:1257 printer/printerdrake.pm:1284
-#: printer/printerdrake.pm:1302
+#: printer/printerdrake.pm:1480 printer/printerdrake.pm:1507
+#: printer/printerdrake.pm:1525
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "パラレルポート #%s のプリンタ"
 
-#: printer/printerdrake.pm:1263
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "ネットワークプリンタ %s, ポート %s"
 
-#: printer/printerdrake.pm:1266
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "プリンタ %s、SMB/Windowsサーバ %s"
 
-#: printer/printerdrake.pm:1347
+#: printer/printerdrake.pm:1570
 #, c-format
 msgid "Local Printer"
 msgstr "ローカルプリンタ"
 
-#: printer/printerdrake.pm:1348
+#: printer/printerdrake.pm:1571
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12737,57 +12946,57 @@ msgstr ""
 "パラレルポート: /dev/lp0, /dev/lp1, ...\n"
 "USBプリンタ: /dev/usb/lp0, /dev/usb/lp1, ..."
 
-#: printer/printerdrake.pm:1352
+#: printer/printerdrake.pm:1575
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "デバイス名かファイル名を入力してください"
 
-#: printer/printerdrake.pm:1361
+#: printer/printerdrake.pm:1584
 #, c-format
 msgid "No printer found!"
 msgstr "プリンタが見つかりません"
 
-#: printer/printerdrake.pm:1369
+#: printer/printerdrake.pm:1592
 #, c-format
 msgid "Local Printers"
 msgstr "ローカルプリンタ"
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1593
 #, c-format
 msgid "Available printers"
 msgstr "利用可能なプリンタ"
 
-#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1383
+#: printer/printerdrake.pm:1597 printer/printerdrake.pm:1606
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "以下のプリンタを検出しました"
 
-#: printer/printerdrake.pm:1376
+#: printer/printerdrake.pm:1599
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
 "the input line"
 msgstr "間違っている場合は、デバイス名/ファイル名を入力してください"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1600
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "代わりに、デバイス名/ファイル名を指定することもできます"
 
-#: printer/printerdrake.pm:1378 printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1601 printer/printerdrake.pm:1610
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "自動的に検出したプリンタのリスト "
 
-#: printer/printerdrake.pm:1380
+#: printer/printerdrake.pm:1603
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
 "name in the input line"
 msgstr "設定するプリンタを選択するかデバイス名/ファイル名を入力してください"
 
-#: printer/printerdrake.pm:1381
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -12795,7 +13004,7 @@ msgid ""
 msgstr ""
 "印刷ジョブを送るプリンタを選択するか、デバイス名/ファイル名を入力してください"
 
-#: printer/printerdrake.pm:1385
+#: printer/printerdrake.pm:1608
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12806,12 +13015,12 @@ msgstr ""
 "たはプリンタの設定をカスタマイズされる場合は、'手動設定'を有効にしてくださ"
 "い。"
 
-#: printer/printerdrake.pm:1386
+#: printer/printerdrake.pm:1609
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "現在のところ別の選択肢はありません"
 
-#: printer/printerdrake.pm:1389
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12823,12 +13032,12 @@ msgstr ""
 "タが正確に検出されない、またはプリンタの設定をカスタマイズされる場合は、'手動"
 "設定'を有効にしてください。"
 
-#: printer/printerdrake.pm:1390
+#: printer/printerdrake.pm:1613
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "印刷ジョブを送るプリンタを選んでください"
 
-#: printer/printerdrake.pm:1392
+#: printer/printerdrake.pm:1615
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -12837,12 +13046,12 @@ msgstr ""
 "プリンタが接続されているポートを選ぶか、デバイス名/ファイル名を入力してくださ"
 "い"
 
-#: printer/printerdrake.pm:1393
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "プリンタが接続されているポートを選んでください"
 
-#: printer/printerdrake.pm:1395
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12852,26 +13061,26 @@ msgstr ""
 "パラレルポート: /dev/lp0, /dev/lp1, ... (LPT1:, LPT2:, ...に相当)\n"
 "１台目のUSBプリンタ: /dev/usb/lp0, ２台目のUSBプリンタ: /dev/usb/lp1, ..."
 
-#: printer/printerdrake.pm:1399
+#: printer/printerdrake.pm:1622
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "プリンタまたはデバイスを入力/選択してください"
 
-#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1502
-#: printer/printerdrake.pm:1594 printer/printerdrake.pm:1732
-#: printer/printerdrake.pm:1808 printer/printerdrake.pm:1970
-#: printer/printerdrake.pm:2063 printer/printerdrake.pm:2072
-#: printer/printerdrake.pm:2081 printer/printerdrake.pm:2092
+#: printer/printerdrake.pm:1662 printer/printerdrake.pm:1725
+#: printer/printerdrake.pm:1817 printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2031 printer/printerdrake.pm:2198
+#: printer/printerdrake.pm:2291 printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2309 printer/printerdrake.pm:2320
 #, c-format
 msgid "Aborting"
 msgstr "中止"
 
-#: printer/printerdrake.pm:1475
+#: printer/printerdrake.pm:1698
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "リモートlpdプリンタのオプション"
 
-#: printer/printerdrake.pm:1476
+#: printer/printerdrake.pm:1699
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -12880,64 +13089,65 @@ msgstr ""
 "リモートlpdプリンタを使うには、プリンタサーバのホスト名とサーバのプリンタ名が"
 "必要です。"
 
-#: printer/printerdrake.pm:1477
+#: printer/printerdrake.pm:1700
 #, c-format
 msgid "Remote host name"
 msgstr "リモートホスト名"
 
-#: printer/printerdrake.pm:1478
+#: printer/printerdrake.pm:1701
 #, c-format
 msgid "Remote printer name"
 msgstr "リモートプリンタ名"
 
-#: printer/printerdrake.pm:1481
+#: printer/printerdrake.pm:1704
 #, c-format
 msgid "Remote host name missing!"
 msgstr "リモートホスト名がありません"
 
-#: printer/printerdrake.pm:1485
+#: printer/printerdrake.pm:1708
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "リモートプリンタ名がありません"
 
-#: printer/printerdrake.pm:1515 printer/printerdrake.pm:1986
-#: printer/printerdrake.pm:2111 standalone/drakTermServ:446
-#: standalone/drakTermServ:766 standalone/drakTermServ:782
-#: standalone/drakTermServ:1554 standalone/drakTermServ:1563
-#: standalone/drakTermServ:1575 standalone/drakbackup:499
+#: printer/printerdrake.pm:1738 printer/printerdrake.pm:2214
+#: printer/printerdrake.pm:2339 standalone/drakTermServ:447
+#: standalone/drakTermServ:769 standalone/drakTermServ:785
+#: standalone/drakTermServ:1590 standalone/drakTermServ:1599
+#: standalone/drakTermServ:1611 standalone/drakbackup:499
 #: standalone/drakbackup:605 standalone/drakbackup:640
-#: standalone/drakbackup:741 standalone/drakroam:390 standalone/harddrake2:259
+#: standalone/drakbackup:741 standalone/drakroam:390
+#: standalone/draksambashare:424 standalone/harddrake2:259
 #, c-format
 msgid "Information"
 msgstr "情報"
 
-#: printer/printerdrake.pm:1515 printer/printerdrake.pm:1986
-#: printer/printerdrake.pm:2111
+#: printer/printerdrake.pm:1738 printer/printerdrake.pm:2214
+#: printer/printerdrake.pm:2339
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "検出した機種: %s %s"
 
-#: printer/printerdrake.pm:1598 printer/printerdrake.pm:1855
+#: printer/printerdrake.pm:1821 printer/printerdrake.pm:2083
 #, c-format
 msgid "Scanning network..."
 msgstr "ネットワークをスキャンしています.."
 
-#: printer/printerdrake.pm:1610 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1833 printer/printerdrake.pm:1854
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", プリンタ \"%s\" on サーバ \"%s\""
 
-#: printer/printerdrake.pm:1613 printer/printerdrake.pm:1634
+#: printer/printerdrake.pm:1836 printer/printerdrake.pm:1857
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "プリンタ \"%s\" on サーバ \"%s\""
 
-#: printer/printerdrake.pm:1655
+#: printer/printerdrake.pm:1878
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB(Windows9x/NT)プリンタのオプション"
 
-#: printer/printerdrake.pm:1656
+#: printer/printerdrake.pm:1879
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12949,7 +13159,7 @@ msgstr ""
 "す)、プリントサーバのIPアドレス、アクセスしたいプリンタの共有名、適切なユーザ"
 "名、パスワード、ワークグループの情報が必要です。"
 
-#: printer/printerdrake.pm:1657
+#: printer/printerdrake.pm:1880
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12958,47 +13168,47 @@ msgstr ""
 "正しいプリンタが自動検出された場合は、それをリストから選択し、必要に応じて"
 "ユーザ名/パスワード/ワークグループなどを入力してください。"
 
-#: printer/printerdrake.pm:1659
+#: printer/printerdrake.pm:1882
 #, c-format
 msgid "SMB server host"
 msgstr "SMBサーバのホスト名"
 
-#: printer/printerdrake.pm:1660
+#: printer/printerdrake.pm:1883
 #, c-format
 msgid "SMB server IP"
 msgstr "SMBサーバのIP"
 
-#: printer/printerdrake.pm:1661
+#: printer/printerdrake.pm:1884 standalone/draksambashare:543
 #, c-format
 msgid "Share name"
 msgstr "共有名"
 
-#: printer/printerdrake.pm:1664
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: printer/printerdrake.pm:1666
+#: printer/printerdrake.pm:1889
 #, c-format
 msgid "Auto-detected"
 msgstr "自動的に検出"
 
-#: printer/printerdrake.pm:1676
+#: printer/printerdrake.pm:1899
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "サーバ名またはサーバのIPを入力してください"
 
-#: printer/printerdrake.pm:1680
+#: printer/printerdrake.pm:1903
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Sambaの共有名がありません"
 
-#: printer/printerdrake.pm:1686
+#: printer/printerdrake.pm:1909
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "セキュリティ警告"
 
-#: printer/printerdrake.pm:1687
+#: printer/printerdrake.pm:1910
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -13040,7 +13250,7 @@ msgstr ""
 "ください。\n"
 "\n"
 
-#: printer/printerdrake.pm:1697
+#: printer/printerdrake.pm:1920
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -13053,7 +13263,7 @@ msgstr ""
 "ください。\n"
 "\n"
 
-#: printer/printerdrake.pm:1700
+#: printer/printerdrake.pm:1923
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -13066,12 +13276,12 @@ msgstr ""
 "\n"
 "このままプリンタの設定を続けますか？"
 
-#: printer/printerdrake.pm:1779
+#: printer/printerdrake.pm:2002
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Netwareプリンタのオプション"
 
-#: printer/printerdrake.pm:1780
+#: printer/printerdrake.pm:2003
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -13083,42 +13293,42 @@ msgstr ""
 "る場合があります)と、アクセスするプリンタの印刷キュー名、適切なユーザ名、パス"
 "ワードが必要です。"
 
-#: printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:2004
 #, c-format
 msgid "Printer Server"
 msgstr "プリンタサーバ"
 
-#: printer/printerdrake.pm:1782
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Print Queue Name"
 msgstr "印刷キューの名前"
 
-#: printer/printerdrake.pm:1787
+#: printer/printerdrake.pm:2010
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCPサーバの名前がありません"
 
-#: printer/printerdrake.pm:1791
+#: printer/printerdrake.pm:2014
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCPキューの名前がありません"
 
-#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1888
+#: printer/printerdrake.pm:2095 printer/printerdrake.pm:2116
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", ホスト %s, ポート %s"
 
-#: printer/printerdrake.pm:1870 printer/printerdrake.pm:1891
+#: printer/printerdrake.pm:2098 printer/printerdrake.pm:2119
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "ホスト %s, ポート %s"
 
-#: printer/printerdrake.pm:1913
+#: printer/printerdrake.pm:2141
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/ソケットプリンタのオプション"
 
-#: printer/printerdrake.pm:1915
+#: printer/printerdrake.pm:2143
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -13127,7 +13337,7 @@ msgstr ""
 "自動的に検出されたプリンタをリストから選ぶか、ホスト名/IPと任意のポート番号"
 "(デフォルトは9100)を入力してください。"
 
-#: printer/printerdrake.pm:1916
+#: printer/printerdrake.pm:2144
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -13139,27 +13349,27 @@ msgstr ""
 "ト番号(デフォルトは9100)が必要です。HP JetDirectサーバのポート番号は通常9100"
 "ですが、サーバによって異なります。ハードウェアのマニュアルをご覧ください。"
 
-#: printer/printerdrake.pm:1920
+#: printer/printerdrake.pm:2148
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "プリンタのホスト名/IPがありません"
 
-#: printer/printerdrake.pm:1949
+#: printer/printerdrake.pm:2177
 #, c-format
 msgid "Printer host name or IP"
 msgstr "プリンタのホスト名/IP"
 
-#: printer/printerdrake.pm:2012
+#: printer/printerdrake.pm:2240
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "デバイスURIリストを更新.."
 
-#: printer/printerdrake.pm:2015 printer/printerdrake.pm:2017
+#: printer/printerdrake.pm:2243 printer/printerdrake.pm:2245
 #, c-format
 msgid "Printer Device URI"
 msgstr "プリンタデバイスのURI"
 
-#: printer/printerdrake.pm:2016
+#: printer/printerdrake.pm:2244
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -13170,17 +13380,17 @@ msgstr ""
 "このURIはCUPSかFoomaticの仕様で指定してください。\n"
 "全てのスプーラが全てのURIタイプをサポートしているわけではありません。"
 
-#: printer/printerdrake.pm:2042
+#: printer/printerdrake.pm:2270
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "有効なURIを入力してください"
 
-#: printer/printerdrake.pm:2147
+#: printer/printerdrake.pm:2375
 #, c-format
 msgid "Pipe into command"
 msgstr "コマンドにパイプする"
 
-#: printer/printerdrake.pm:2148
+#: printer/printerdrake.pm:2376
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -13189,17 +13399,17 @@ msgstr ""
 "ジョブを直接プリンタに送る代わりに、ここで任意のコマンドラインを指定して、こ"
 "れにパイプすることもできます。"
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2377
 #, c-format
 msgid "Command line"
 msgstr "コマンドライン"
 
-#: printer/printerdrake.pm:2153
+#: printer/printerdrake.pm:2381
 #, c-format
 msgid "A command line must be entered!"
 msgstr "コマンドラインを入力してください"
 
-#: printer/printerdrake.pm:2192
+#: printer/printerdrake.pm:2421
 #, c-format
 msgid ""
 "On many HP printers there are special functions available, maintenance (ink "
@@ -13211,7 +13421,7 @@ msgstr ""
 "ンテナンス(インクレベルチェック/ノズルクリーニング/ヘッド位置合わせ);多機能デ"
 "バイスでのスキャン; メモリーカードへのアクセス"
 
-#: printer/printerdrake.pm:2194
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "To access these extra functions on your HP printer, it must be set up with "
@@ -13220,7 +13430,7 @@ msgstr ""
 "HPプリンタのこれらの追加機能を利用するためには、プリンタを適切なソフトウェア"
 "を使って設定する必要があります。"
 
-#: printer/printerdrake.pm:2195
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid ""
 "Either with the newer HPLIP which allows printer maintenance through the "
@@ -13231,7 +13441,7 @@ msgstr ""
 "ができます。また、最新のPhotoSmardモデルでは'four-edge full-bleed'印刷が可能"
 "になります。"
 
-#: printer/printerdrake.pm:2196
+#: printer/printerdrake.pm:2425
 #, c-format
 msgid ""
 "or with the older HPOJ which allows only scanner and memory card access, but "
@@ -13240,26 +13450,26 @@ msgstr ""
 "HPOJを使うとスキャンとメモリーカードへのアクセスのみが可能になります。HPLIPが"
 "使用できない場合はこちらを選んでください。"
 
-#: printer/printerdrake.pm:2198
+#: printer/printerdrake.pm:2427
 #, c-format
 msgid "What is your choice (choose \"None\" for non-HP printers)? "
 msgstr "どちらを選択しますか？(HP以外のプリンタには'なし'を選んでください)"
 
-#: printer/printerdrake.pm:2199 printer/printerdrake.pm:2200
-#: printer/printerdrake.pm:2226 printer/printerdrake.pm:2232
-#: printer/printerdrake.pm:2258
+#: printer/printerdrake.pm:2428 printer/printerdrake.pm:2429
+#: printer/printerdrake.pm:2455 printer/printerdrake.pm:2461
+#: printer/printerdrake.pm:2487
 #, c-format
 msgid "HPLIP"
 msgstr "HPLIP"
 
-#: printer/printerdrake.pm:2199 printer/printerdrake.pm:2202
-#: printer/printerdrake.pm:2358 printer/printerdrake.pm:2364
-#: printer/printerdrake.pm:2375
+#: printer/printerdrake.pm:2428 printer/printerdrake.pm:2431
+#: printer/printerdrake.pm:2600 printer/printerdrake.pm:2606
+#: printer/printerdrake.pm:2617
 #, c-format
 msgid "HPOJ"
 msgstr "HPOJ"
 
-#: printer/printerdrake.pm:2207
+#: printer/printerdrake.pm:2436
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -13272,98 +13482,98 @@ msgstr ""
 "- HP PhotoSmart\n"
 "- HP LaserJet 2200"
 
-#: printer/printerdrake.pm:2226 printer/printerdrake.pm:2358
+#: printer/printerdrake.pm:2455 printer/printerdrake.pm:2600
 #, c-format
 msgid "Installing %s package..."
 msgstr "%sパッケージをインストール中.."
 
-#: printer/printerdrake.pm:2233 printer/printerdrake.pm:2365
+#: printer/printerdrake.pm:2462 printer/printerdrake.pm:2607
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "%s では印刷のみが可能です"
 
-#: printer/printerdrake.pm:2248
+#: printer/printerdrake.pm:2477
 #, c-format
 msgid "Could not remove your old HPOJ configuration file %s for your %s! "
 msgstr "お使いの %1$s の古いHPOJ設定ファイル %2$s を削除できませんでした"
 
-#: printer/printerdrake.pm:2250
+#: printer/printerdrake.pm:2479
 #, c-format
 msgid "Please remove the file manually and restart HPOJ."
 msgstr "ファイルを手動で削除しHPOJを再スタートしてください"
 
-#: printer/printerdrake.pm:2258 printer/printerdrake.pm:2375
+#: printer/printerdrake.pm:2487 printer/printerdrake.pm:2617
 #, c-format
 msgid "Checking device and configuring %s..."
 msgstr "デバイスの確認と%sの設定.."
 
-#: printer/printerdrake.pm:2277
+#: printer/printerdrake.pm:2508
 #, c-format
 msgid "Which printer do you want to set up with HPLIP?"
 msgstr "どのプリンタをHPLIPで設定しますか？"
 
-#: printer/printerdrake.pm:2306 printer/printerdrake.pm:2419
+#: printer/printerdrake.pm:2548 printer/printerdrake.pm:2661
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "SANEパッケージをインストール中.."
 
-#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2432
+#: printer/printerdrake.pm:2561 printer/printerdrake.pm:2674
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "%s ではスキャンはできません"
 
-#: printer/printerdrake.pm:2334
+#: printer/printerdrake.pm:2576
 #, c-format
 msgid "Using and Maintaining your %s"
 msgstr "%s を使用/維持"
 
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2701
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "mtoolsパッケージをインストール中.."
 
-#: printer/printerdrake.pm:2467
+#: printer/printerdrake.pm:2709
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "%s ではフォトメモリーカードアクセスはできません"
 
-#: printer/printerdrake.pm:2483
+#: printer/printerdrake.pm:2725
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "HP多機能デバイスのスキャン"
 
-#: printer/printerdrake.pm:2492
+#: printer/printerdrake.pm:2734
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "HP多機能デバイスのフォトメモリーカードアクセス"
 
-#: printer/printerdrake.pm:2509
+#: printer/printerdrake.pm:2751
 #, c-format
 msgid "Configuring device..."
 msgstr "デバイスを設定.."
 
-#: printer/printerdrake.pm:2543
+#: printer/printerdrake.pm:2785
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "CUPS用のプリンタポートを作成中.."
 
-#: printer/printerdrake.pm:2552 printer/printerdrake.pm:2805
-#: printer/printerdrake.pm:2949
+#: printer/printerdrake.pm:2794 printer/printerdrake.pm:3063
+#: printer/printerdrake.pm:3216
 #, c-format
 msgid "Reading printer database..."
 msgstr "プリンタデータベースを読み込み中.."
 
-#: printer/printerdrake.pm:2763
+#: printer/printerdrake.pm:3021
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "プリンタ名とコメントを入力してください"
 
-#: printer/printerdrake.pm:2767 printer/printerdrake.pm:4064
+#: printer/printerdrake.pm:3025 printer/printerdrake.pm:4348
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "プリンタ名には文字と数字とアンダースコア(_)しか使えません"
 
-#: printer/printerdrake.pm:2773 printer/printerdrake.pm:4069
+#: printer/printerdrake.pm:3031 printer/printerdrake.pm:4353
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -13372,7 +13582,7 @@ msgstr ""
 "プリンタ %s は既に存在します\n"
 "設定を上書きしますか？"
 
-#: printer/printerdrake.pm:2780
+#: printer/printerdrake.pm:3038
 #, c-format
 msgid ""
 "The printer name \"%s\" has more than 12 characters which can make the "
@@ -13382,7 +13592,7 @@ msgstr ""
 "プリンタ名 %s が12文字以内でないため、このプリンタはWindowsのクライアントから"
 "は使用できなくなります。本当にこの名前でよろしいですか？"
 
-#: printer/printerdrake.pm:2789
+#: printer/printerdrake.pm:3047
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -13391,35 +13601,35 @@ msgstr ""
 "プリンタにはそれぞれ名前が必要です(たとえば'printer')。\n"
 "説明/場所の欄は空白のままでも構いません。ユーザ用のメモ欄です。"
 
-#: printer/printerdrake.pm:2790
+#: printer/printerdrake.pm:3048
 #, c-format
 msgid "Name of printer"
 msgstr "プリンタの名前"
 
-#: printer/printerdrake.pm:2791 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:3049 standalone/drakconnect:592
+#: standalone/harddrake2:39 standalone/printerdrake:222
+#: standalone/printerdrake:229
 #, c-format
 msgid "Description"
 msgstr "説明"
 
-#: printer/printerdrake.pm:2792 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:3050 standalone/printerdrake:222
+#: standalone/printerdrake:229
 #, c-format
 msgid "Location"
 msgstr "プリンタの場所"
 
-#: printer/printerdrake.pm:2810
+#: printer/printerdrake.pm:3068
 #, c-format
 msgid "Preparing printer database..."
 msgstr "プリンタデータベースを準備中.."
 
-#: printer/printerdrake.pm:2927
+#: printer/printerdrake.pm:3194
 #, c-format
 msgid "Your printer model"
 msgstr "プリンタの機種"
 
-#: printer/printerdrake.pm:2928
+#: printer/printerdrake.pm:3195
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -13443,18 +13653,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2933 printer/printerdrake.pm:2936
+#: printer/printerdrake.pm:3200 printer/printerdrake.pm:3203
 #, c-format
 msgid "The model is correct"
 msgstr "この機種を使う"
 
-#: printer/printerdrake.pm:2934 printer/printerdrake.pm:2935
-#: printer/printerdrake.pm:2938
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:3202
+#: printer/printerdrake.pm:3205
 #, c-format
 msgid "Select model manually"
 msgstr "手動でモデルを選ぶ"
 
-#: printer/printerdrake.pm:2962
+#: printer/printerdrake.pm:3229
 #, c-format
 msgid ""
 "\n"
@@ -13468,12 +13678,12 @@ msgstr ""
 "自動検出されたプリンタの機種が正しいことを確認してください。間違った機種また"
 "はRawプリンタが選択された場合は、リストから正しい機種を探してください。"
 
-#: printer/printerdrake.pm:2981
+#: printer/printerdrake.pm:3248
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "メーカー提供のPPDファイルをインストール"
 
-#: printer/printerdrake.pm:3013
+#: printer/printerdrake.pm:3280
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -13482,7 +13692,7 @@ msgstr ""
 "PostScriptプリンタには、プリンタのオプションと機能を説明するPPDファイルが付属"
 "しています。"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3281
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
@@ -13490,12 +13700,12 @@ msgid ""
 msgstr ""
 "このファイルはたいていプリンタ付属のWindows/MacドライバCDのどこかにあります。"
 
-#: printer/printerdrake.pm:3015
+#: printer/printerdrake.pm:3282
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr "PPDファイルはメーカーのWEBサイトにもあります。"
 
-#: printer/printerdrake.pm:3016
+#: printer/printerdrake.pm:3283
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
@@ -13504,7 +13714,7 @@ msgstr ""
 "このマシンにWindowsをインストールされている場合は、Windowsパーティションにも"
 "PPDファイルがあります。"
 
-#: printer/printerdrake.pm:3017
+#: printer/printerdrake.pm:3284
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -13514,7 +13724,7 @@ msgstr ""
 "PPDファイルをインストールしプリンタのセットアップ時に使うと、プリンタのハード"
 "ウェアがサポートする全てのオプションを利用できるようになります。"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3285
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
@@ -13523,51 +13733,51 @@ msgstr ""
 "マシンにインストールするPPDファイルを選びます。これはプリンタのセットアップに"
 "使います。"
 
-#: printer/printerdrake.pm:3020
+#: printer/printerdrake.pm:3287
 #, c-format
 msgid "Install PPD file from"
 msgstr "PPDファイルを次からインストール"
 
-#: printer/printerdrake.pm:3023 printer/printerdrake.pm:3031
+#: printer/printerdrake.pm:3290 printer/printerdrake.pm:3298
 #: standalone/scannerdrake:183 standalone/scannerdrake:192
 #: standalone/scannerdrake:242 standalone/scannerdrake:250
 #, c-format
 msgid "Floppy Disk"
 msgstr "フロッピーディスク"
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:3033
+#: printer/printerdrake.pm:3291 printer/printerdrake.pm:3300
 #: standalone/scannerdrake:184 standalone/scannerdrake:194
 #: standalone/scannerdrake:243 standalone/scannerdrake:252
 #, c-format
 msgid "Other place"
 msgstr "その他の場所"
 
-#: printer/printerdrake.pm:3039
+#: printer/printerdrake.pm:3306
 #, c-format
 msgid "Select PPD file"
 msgstr "PPDファイルを選択"
 
-#: printer/printerdrake.pm:3043
+#: printer/printerdrake.pm:3310
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "PPDファイル %s が無いか読めません"
 
-#: printer/printerdrake.pm:3049
+#: printer/printerdrake.pm:3316
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "PPDファイル %s はPPDの仕様に合っていません"
 
-#: printer/printerdrake.pm:3060
+#: printer/printerdrake.pm:3327
 #, c-format
 msgid "Installing PPD file..."
 msgstr "PPDファイルをインストール.."
 
-#: printer/printerdrake.pm:3178
+#: printer/printerdrake.pm:3445
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI winプリンタの設定"
 
-#: printer/printerdrake.pm:3179
+#: printer/printerdrake.pm:3446
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -13583,12 +13793,12 @@ msgstr ""
 "レルポートに接続し直してください。そうしないとプリンタは機能しません。ドライ"
 "バは接続種類の設定を無視します。"
 
-#: printer/printerdrake.pm:3204 printer/printerdrake.pm:3234
+#: printer/printerdrake.pm:3471 printer/printerdrake.pm:3501
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmarkインクジェットを設定"
 
-#: printer/printerdrake.pm:3205
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -13600,7 +13810,7 @@ msgstr ""
 "リモートマシンやプリンタサーバのプリンタはサポートされません。プリンタをロー"
 "カルポートに接続するか、接続されているマシンで設定してください。"
 
-#: printer/printerdrake.pm:3235
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -13621,12 +13831,12 @@ msgstr ""
 "ページをlexmarkmaintainで印刷し、このプログラムでヘッドのアラインメントを調整"
 "してください。"
 
-#: printer/printerdrake.pm:3245
+#: printer/printerdrake.pm:3512
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Lexmark X125 の設定"
 
-#: printer/printerdrake.pm:3246
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -13638,12 +13848,12 @@ msgstr ""
 "ん。リモートマシンやプリンタサーバのプリンタはサポートされません。プリンタを"
 "ローカルUSBポートに接続するか、接続されているマシンで設定してください。"
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3535
 #, c-format
 msgid "Samsung ML/QL-85G configuration"
 msgstr "Samsung ML/QL-85Gの設定"
 
-#: printer/printerdrake.pm:3269 printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3536 printer/printerdrake.pm:3563
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected on the "
@@ -13656,17 +13866,34 @@ msgstr ""
 "タを最初のパラレルポートに接続するか、プリンタが接続されているマシンで設定し"
 "てください。"
 
-#: printer/printerdrake.pm:3295
+#: printer/printerdrake.pm:3562
 #, c-format
 msgid "Canon LBP-460/660 configuration"
 msgstr "Caon LBP-460/660の設定"
 
-#: printer/printerdrake.pm:3314
+#: printer/printerdrake.pm:3589
+#, fuzzy, c-format
+msgid "Canon LBP-810/1120 (CAPT) configuration"
+msgstr "Caon LBP-460/660の設定"
+
+#: printer/printerdrake.pm:3590
+#, fuzzy, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected via "
+"USB, no printers on remote machines or print server boxes or on the parallel "
+"port. Please connect your printer to the USB or configure it on the machine "
+"where it is directly connected to."
+msgstr ""
+"このプリンタのドライバはUSB経由でローカルに接続されたプリンタにしか使えませ"
+"ん。リモートマシンやプリンタサーバのプリンタはサポートされません。プリンタを"
+"ローカルUSBポートに接続するか、接続されているマシンで設定してください。"
+
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "HP LaserJet 1000のファームウェアをアップロード"
 
-#: printer/printerdrake.pm:3464
+#: printer/printerdrake.pm:3747
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13683,27 +13910,27 @@ msgstr ""
 "してください。注意: 超高品質/高解像度の印刷には非常に時間がかかることがありま"
 "す。"
 
-#: printer/printerdrake.pm:3589
+#: printer/printerdrake.pm:3872
 #, c-format
 msgid "Printer default settings"
 msgstr "プリンタのデフォルト設定"
 
-#: printer/printerdrake.pm:3596
+#: printer/printerdrake.pm:3879
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "オプション %s は整数にしてください"
 
-#: printer/printerdrake.pm:3600
+#: printer/printerdrake.pm:3883
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "オプション %s は数字にしてください"
 
-#: printer/printerdrake.pm:3604
+#: printer/printerdrake.pm:3887
 #, c-format
 msgid "Option %s out of range!"
 msgstr "オプション %s は範囲外です"
 
-#: printer/printerdrake.pm:3656
+#: printer/printerdrake.pm:3939
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13712,12 +13939,12 @@ msgstr ""
 "このプリンタ(%s)を\n"
 "デフォルトのプリンタにしますか？"
 
-#: printer/printerdrake.pm:3672
+#: printer/printerdrake.pm:3955
 #, c-format
 msgid "Test pages"
 msgstr "テストページ"
 
-#: printer/printerdrake.pm:3673
+#: printer/printerdrake.pm:3956
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13730,52 +13957,52 @@ msgstr ""
 "ないレーザプリンタでは出力できないかもしれません。たいていの場合、'標準テスト"
 "ページ'で十分です。"
 
-#: printer/printerdrake.pm:3677
+#: printer/printerdrake.pm:3960
 #, c-format
 msgid "No test pages"
 msgstr "テストしない"
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3961
 #, c-format
 msgid "Print"
 msgstr "印刷"
 
-#: printer/printerdrake.pm:3703
+#: printer/printerdrake.pm:3986
 #, c-format
 msgid "Standard test page"
 msgstr "標準テストページ"
 
-#: printer/printerdrake.pm:3706
+#: printer/printerdrake.pm:3989
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "テストページ(レター)"
 
-#: printer/printerdrake.pm:3709
+#: printer/printerdrake.pm:3992
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "テストページ(A4)"
 
-#: printer/printerdrake.pm:3711
+#: printer/printerdrake.pm:3994
 #, c-format
 msgid "Photo test page"
 msgstr "写真テストページ"
 
-#: printer/printerdrake.pm:3715
+#: printer/printerdrake.pm:3999
 #, c-format
 msgid "Do not print any test page"
 msgstr "テストページを印刷しない"
 
-#: printer/printerdrake.pm:3723 printer/printerdrake.pm:3907
+#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4191
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "テストページを印刷中.."
 
-#: printer/printerdrake.pm:3743
+#: printer/printerdrake.pm:4027
 #, c-format
 msgid "Skipping photo test page."
 msgstr "写真テストページをスキップ"
 
-#: printer/printerdrake.pm:3760
+#: printer/printerdrake.pm:4044
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13790,7 +14017,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3764
+#: printer/printerdrake.pm:4048
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13799,17 +14026,17 @@ msgstr ""
 "テストページをプリンタデーモンに送りました。\n"
 "プリンタが動くまでに少し時間がかかります。\n"
 
-#: printer/printerdrake.pm:3774
+#: printer/printerdrake.pm:4058
 #, c-format
 msgid "Did it work properly?"
 msgstr "正常に動きましたか？"
 
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:5175
+#: printer/printerdrake.pm:4082 printer/printerdrake.pm:5465
 #, c-format
 msgid "Raw printer"
 msgstr "Rawプリンタ"
 
-#: printer/printerdrake.pm:3836
+#: printer/printerdrake.pm:4120
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -13821,7 +14048,7 @@ msgstr ""
 "の場合は xpp <file> もしくは kprinter <file> を使います。グラフィカルなツール"
 "を使うと簡単にプリンタの選択とオプションの設定ができます。\n"
 
-#: printer/printerdrake.pm:3838
+#: printer/printerdrake.pm:4122
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -13832,8 +14059,8 @@ msgstr ""
 "'印刷コマンド'入力欄でも使用できます。その場合は印刷するファイル名を\n"
 "指定する必要はありません。(アプリケーションが必要な情報を供給します)\n"
 
-#: printer/printerdrake.pm:3841 printer/printerdrake.pm:3858
-#: printer/printerdrake.pm:3868
+#: printer/printerdrake.pm:4125 printer/printerdrake.pm:4142
+#: printer/printerdrake.pm:4152
 #, c-format
 msgid ""
 "\n"
@@ -13846,7 +14073,7 @@ msgstr ""
 "必要な設定をコマンドラインに追加してください。\n"
 "例: %s <file>"
 
-#: printer/printerdrake.pm:3844 printer/printerdrake.pm:3884
+#: printer/printerdrake.pm:4128 printer/printerdrake.pm:4168
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -13857,7 +14084,7 @@ msgstr ""
 "または、'印刷オプションの一覧'をクリックしてください。%s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3848
+#: printer/printerdrake.pm:4132
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -13866,7 +14093,7 @@ msgstr ""
 "現在のプリンタで利用できる印刷オプションは次の通りです:\n"
 "\n"
 
-#: printer/printerdrake.pm:3853 printer/printerdrake.pm:3863
+#: printer/printerdrake.pm:4137 printer/printerdrake.pm:4147
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13875,8 +14102,8 @@ msgstr ""
 "コマンドライン(ターミナルウィンドウ)からファイルを印刷するには、\n"
 "%s <file> を使います。\n"
 
-#: printer/printerdrake.pm:3855 printer/printerdrake.pm:3865
-#: printer/printerdrake.pm:3875
+#: printer/printerdrake.pm:4139 printer/printerdrake.pm:4149
+#: printer/printerdrake.pm:4159
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -13887,7 +14114,7 @@ msgstr ""
 "'印刷コマンド'入力欄でも使用できます。その場合は印刷するファイル名を\n"
 "指定する必要はありません。(アプリケーションが必要な情報を供給します)\n"
 
-#: printer/printerdrake.pm:3860 printer/printerdrake.pm:3870
+#: printer/printerdrake.pm:4144 printer/printerdrake.pm:4154
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -13896,7 +14123,7 @@ msgstr ""
 "現在のプリンタで利用可能なオプションを見るには、'印刷オプションの一覧'\n"
 "をクリックしてください。"
 
-#: printer/printerdrake.pm:3873
+#: printer/printerdrake.pm:4157
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13905,7 +14132,7 @@ msgstr ""
 "コマンドライン(ターミナルウィンドウ)からファイルを印刷するには、\n"
 "%s <file> または %s <file> を使います。\n"
 
-#: printer/printerdrake.pm:3877
+#: printer/printerdrake.pm:4161
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13920,7 +14147,7 @@ msgstr ""
 "これをクリックすると印刷ジョブがすぐに中止されます。\n"
 "紙づまりのときなどに便利です。\n"
 
-#: printer/printerdrake.pm:3881
+#: printer/printerdrake.pm:4165
 #, c-format
 msgid ""
 "\n"
@@ -13933,37 +14160,37 @@ msgstr ""
 "要な設定をコマンドラインに追加してください。\n"
 "例: %s <file>\n"
 
-#: printer/printerdrake.pm:3891
+#: printer/printerdrake.pm:4175
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "%s で印刷/スキャン/フォトカード"
 
-#: printer/printerdrake.pm:3892
+#: printer/printerdrake.pm:4176
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "%s で印刷/スキャン"
 
-#: printer/printerdrake.pm:3894
+#: printer/printerdrake.pm:4178
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "%s で印刷/フォトカードアクセス"
 
-#: printer/printerdrake.pm:3896
+#: printer/printerdrake.pm:4180
 #, c-format
 msgid "Using/Maintaining the printer \"%s\""
 msgstr "プリンタ %s を使用/維持"
 
-#: printer/printerdrake.pm:3897
+#: printer/printerdrake.pm:4181
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "プリンタ %s で印刷"
 
-#: printer/printerdrake.pm:3903
+#: printer/printerdrake.pm:4187
 #, c-format
 msgid "Print option list"
 msgstr "印刷オプションの一覧"
 
-#: printer/printerdrake.pm:3925
+#: printer/printerdrake.pm:4209
 #, c-format
 msgid ""
 "Your %s is set up with HP's HPLIP driver software. This way many special "
@@ -13973,7 +14200,7 @@ msgstr ""
 "お使いの %s はHPのHPLIPドライバ・ソフトウェアで設定されています。したがってプ"
 "リンタに装備されている多くの特殊機能が利用できます。\n"
 
-#: printer/printerdrake.pm:3928
+#: printer/printerdrake.pm:4212
 #, c-format
 msgid ""
 "The scanner in your printer can be used with the usual SANE software, for "
@@ -13982,7 +14209,7 @@ msgstr ""
 "お使いのプリンタのスキャナは通常のSANEソフトウェアで使用できます。\n"
 "例: Kooka, XSane (メニューのマルチメディア->グラフィックスから選択)"
 
-#: printer/printerdrake.pm:3929
+#: printer/printerdrake.pm:4213
 #, c-format
 msgid ""
 "Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
@@ -13993,7 +14220,7 @@ msgstr ""
 "い。\n"
 "(Mandriva Linuxコントロールセンターのハードウェア->スキャナを選択)\n"
 
-#: printer/printerdrake.pm:3933
+#: printer/printerdrake.pm:4217
 #, c-format
 msgid ""
 "The memory card readers in your printer can be accessed like a usual USB "
@@ -14002,7 +14229,7 @@ msgstr ""
 "お使いのプリンタのメモリーカード・リーダーは通常のUSBストーレジデバイスと同様"
 "にアクセスすることができます。"
 
-#: printer/printerdrake.pm:3934
+#: printer/printerdrake.pm:4218
 #, c-format
 msgid ""
 "After inserting a card a hard disk icon to access the card should appear on "
@@ -14013,7 +14240,7 @@ msgstr ""
 "カードにアクセスできるようになります。\n"
 "\n"
 
-#: printer/printerdrake.pm:3936
+#: printer/printerdrake.pm:4220
 #, c-format
 msgid ""
 "The memory card readers in your printer can be accessed using HP's Printer "
@@ -14024,7 +14251,7 @@ msgstr ""
 "ニタ->HP Printer Toolboxを選択し、Functionsタブの[Access Photo Cards...]をク"
 "リックしてください。"
 
-#: printer/printerdrake.pm:3937
+#: printer/printerdrake.pm:4221
 #, c-format
 msgid ""
 "Note that this is very slow, reading the pictures from the camera or a USB "
@@ -14034,7 +14261,7 @@ msgstr ""
 "注意: この方法は大変時間がかかります。普通はカメラまたはUSBカードリーダーから"
 "画像を読み込むほうが時間がかかりません。\n"
 
-#: printer/printerdrake.pm:3940
+#: printer/printerdrake.pm:4224
 #, c-format
 msgid ""
 "HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a "
@@ -14045,27 +14272,27 @@ msgstr ""
 "はお使いの %s に様々なモニタリングやメンテナンス機能を提供します:\n"
 "\n"
 
-#: printer/printerdrake.pm:3941
+#: printer/printerdrake.pm:4225
 #, c-format
 msgid " - Ink level/status info\n"
 msgstr " - インクレベル/ステータス情報\n"
 
-#: printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4226
 #, c-format
 msgid " - Ink nozzle cleaning\n"
 msgstr " - インクノズルクリーニング\n"
 
-#: printer/printerdrake.pm:3943
+#: printer/printerdrake.pm:4227
 #, c-format
 msgid " - Print head alignment\n"
 msgstr " - プリントヘッド位置合わせ\n"
 
-#: printer/printerdrake.pm:3944
+#: printer/printerdrake.pm:4228
 #, c-format
 msgid " - Color calibration\n"
 msgstr " - 色補正\n"
 
-#: printer/printerdrake.pm:3959
+#: printer/printerdrake.pm:4243
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -14089,7 +14316,7 @@ msgstr ""
 "このデバイスでスキャナをセットアップする場合は、scannerdrakeを使う必要はあり"
 "ません。ネットワークでスキャナを共有する時にのみ実行してください。"
 
-#: printer/printerdrake.pm:3985
+#: printer/printerdrake.pm:4269
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -14109,13 +14336,13 @@ msgstr ""
 "ブ'p:'(フォトカードドライブ付きHPプリンタが複数ある場合はそれ以降)になりま"
 "す。MtoolsFMではファイルリストの右上の項目でドライブ文字を切り替えられます。"
 
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4055
-#: printer/printerdrake.pm:4090
+#: printer/printerdrake.pm:4312 printer/printerdrake.pm:4339
+#: printer/printerdrake.pm:4374
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "プリンタの設定を変換"
 
-#: printer/printerdrake.pm:4029
+#: printer/printerdrake.pm:4313
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -14129,7 +14356,7 @@ msgstr ""
 "設定)は全てコピーされますが、ジョブは変換されません。\n"
 "また、以下の理由で変換できないキューもあります:\n"
 
-#: printer/printerdrake.pm:4032
+#: printer/printerdrake.pm:4316
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -14138,7 +14365,7 @@ msgstr ""
 "CUPSはNovellサーバのプリンタや、自由形式のコマンドにデータを送るプリンタを\n"
 "サポートしません。\n"
 
-#: printer/printerdrake.pm:4034
+#: printer/printerdrake.pm:4318
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -14147,12 +14374,12 @@ msgstr ""
 "PDQはローカルプリンタ、リモートのLPDプリンタ、ソケット/TCPプリンタのみを\n"
 "サポートします。\n"
 
-#: printer/printerdrake.pm:4036
+#: printer/printerdrake.pm:4320
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPDとLPRngはIPPプリンタをサポートしません。\n"
 
-#: printer/printerdrake.pm:4038
+#: printer/printerdrake.pm:4322
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -14161,7 +14388,7 @@ msgstr ""
 "また、このプログラムやfoomatic-configure以外で作成されたキューは変換できませ"
 "ん。"
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4323
 #, c-format
 msgid ""
 "\n"
@@ -14172,7 +14399,7 @@ msgstr ""
 "また、メーカー提供のPPDファイルやネイティブなCUPSドライバで設定したプリンタは"
 "変換できません。"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4324
 #, c-format
 msgid ""
 "\n"
@@ -14182,17 +14409,17 @@ msgstr ""
 "\n"
 "変換するプリンタを選んで[変換]をクリックしてください。"
 
-#: printer/printerdrake.pm:4043
+#: printer/printerdrake.pm:4327
 #, c-format
 msgid "Do not transfer printers"
 msgstr "プリンタを変換しない"
 
-#: printer/printerdrake.pm:4044 printer/printerdrake.pm:4060
+#: printer/printerdrake.pm:4328 printer/printerdrake.pm:4344
 #, c-format
 msgid "Transfer"
 msgstr "変換"
 
-#: printer/printerdrake.pm:4056
+#: printer/printerdrake.pm:4340
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -14203,17 +14430,17 @@ msgstr ""
 "上書きするには[変換]を押してください。\n"
 "または、新しい名前を入力/このプリンタをスキップすることもできます。"
 
-#: printer/printerdrake.pm:4077
+#: printer/printerdrake.pm:4361
 #, c-format
 msgid "New printer name"
 msgstr "新しいプリンタの名前"
 
-#: printer/printerdrake.pm:4080
+#: printer/printerdrake.pm:4364
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s を変換中.."
 
-#: printer/printerdrake.pm:4091
+#: printer/printerdrake.pm:4375
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -14222,28 +14449,28 @@ msgstr ""
 "以前のデフォルトプリンタ(%s)を変換しました。新しい印刷システム %s でも\n"
 "これをデフォルトのプリンタにしますか？"
 
-#: printer/printerdrake.pm:4101
+#: printer/printerdrake.pm:4385
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "プリンタデータを更新中.."
 
-#: printer/printerdrake.pm:4111
+#: printer/printerdrake.pm:4395
 #, c-format
 msgid "Starting network..."
 msgstr "ネットワークを起動中.."
 
-#: printer/printerdrake.pm:4155 printer/printerdrake.pm:4159
-#: printer/printerdrake.pm:4161
+#: printer/printerdrake.pm:4439 printer/printerdrake.pm:4443
+#: printer/printerdrake.pm:4445
 #, c-format
 msgid "Configure the network now"
 msgstr "ネットワークを設定"
 
-#: printer/printerdrake.pm:4156
+#: printer/printerdrake.pm:4440
 #, c-format
 msgid "Network functionality not configured"
 msgstr "ネットワーク機能が設定されていません"
 
-#: printer/printerdrake.pm:4157
+#: printer/printerdrake.pm:4441
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -14255,12 +14482,12 @@ msgstr ""
 "ですが、まだ設定されていません。このまま続けても、このプリンタを使用すること"
 "はできません。どうしますか？"
 
-#: printer/printerdrake.pm:4160
+#: printer/printerdrake.pm:4444
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "ネットワークを設定せずに先へ進む"
 
-#: printer/printerdrake.pm:4191
+#: printer/printerdrake.pm:4475
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -14274,7 +14501,7 @@ msgstr ""
 "ワークとインターネット/接続'で設定を修正してください。その後 %s コントロール"
 "センタの'ハードウェア'でプリンタを設定してください。"
 
-#: printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:4476
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -14284,27 +14511,27 @@ msgstr ""
 "ネットワークアクセスを起動できませんでした。設定とハードウェアを確認し、\n"
 "リモートプリンタの設定をやり直してください。"
 
-#: printer/printerdrake.pm:4202
+#: printer/printerdrake.pm:4486
 #, c-format
 msgid "Restarting printing system..."
 msgstr "プリンタシステムを再起動中.."
 
-#: printer/printerdrake.pm:4233
+#: printer/printerdrake.pm:4517
 #, c-format
 msgid "high"
 msgstr "高い"
 
-#: printer/printerdrake.pm:4233
+#: printer/printerdrake.pm:4517
 #, c-format
 msgid "paranoid"
 msgstr "極度に高い"
 
-#: printer/printerdrake.pm:4235
+#: printer/printerdrake.pm:4519
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "印刷システムをセキュリティレベル %s でインストール中"
 
-#: printer/printerdrake.pm:4236
+#: printer/printerdrake.pm:4520
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -14328,12 +14555,12 @@ msgstr ""
 "\n"
 "本当にこのマシンでの印刷を設定しますか？"
 
-#: printer/printerdrake.pm:4272
+#: printer/printerdrake.pm:4556
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "起動時に印刷システムを開始"
 
-#: printer/printerdrake.pm:4273
+#: printer/printerdrake.pm:4557
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -14353,32 +14580,32 @@ msgstr ""
 "\n"
 "印刷システムの自動起動を再び有効にしますか？"
 
-#: printer/printerdrake.pm:4296
+#: printer/printerdrake.pm:4580
 #, c-format
 msgid "Checking installed software..."
 msgstr "インストール済みのソフトをチェック中.."
 
-#: printer/printerdrake.pm:4302
+#: printer/printerdrake.pm:4586
 #, c-format
 msgid "Removing %s..."
 msgstr "%s を削除中.."
 
-#: printer/printerdrake.pm:4306
+#: printer/printerdrake.pm:4590
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "%s 印刷システムを削除できません"
 
-#: printer/printerdrake.pm:4326
+#: printer/printerdrake.pm:4610
 #, c-format
 msgid "Installing %s..."
 msgstr "%s をインストール中.."
 
-#: printer/printerdrake.pm:4330
+#: printer/printerdrake.pm:4614
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "%s 印刷システムをインストールできません"
 
-#: printer/printerdrake.pm:4398
+#: printer/printerdrake.pm:4682
 #, c-format
 msgid ""
 "In this mode there is no local printing system, all printing requests go "
@@ -14390,7 +14617,7 @@ msgstr ""
 "定されたサーバに送られます。注意: ローカル印刷キューは使えません。また、指定"
 "したサーバがダウンするとこのマシンからは全く印刷できなくなります。"
 
-#: printer/printerdrake.pm:4400
+#: printer/printerdrake.pm:4684
 #, c-format
 msgid ""
 "Enter the host name or IP of your CUPS server and click OK if you want to "
@@ -14399,32 +14626,32 @@ msgstr ""
 "このモードを使うには、CUPSサーバの名前かIPを入力してOKをクリックしてくださ"
 "い。使わない場合は[終了]を選んでください。 "
 
-#: printer/printerdrake.pm:4414
+#: printer/printerdrake.pm:4698
 #, c-format
 msgid "Name or IP of remote server:"
 msgstr "リモートサーバの名前かIP:"
 
-#: printer/printerdrake.pm:4434
+#: printer/printerdrake.pm:4718
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "デフォルトのプリンタを設定中.."
 
-#: printer/printerdrake.pm:4454
+#: printer/printerdrake.pm:4738
 #, c-format
 msgid "Local CUPS printing system or remote CUPS server?"
 msgstr "リモートCUPSサーバまたはローカルCUPS印刷システム？"
 
-#: printer/printerdrake.pm:4455
+#: printer/printerdrake.pm:4739
 #, c-format
 msgid "The CUPS printing system can be used in two ways: "
 msgstr "CUPS印刷システムは二通りに使えます:"
 
-#: printer/printerdrake.pm:4457
+#: printer/printerdrake.pm:4741
 #, c-format
 msgid "1. The CUPS printing system can run locally. "
 msgstr "1. CUPS印刷システムをローカルに使う"
 
-#: printer/printerdrake.pm:4458
+#: printer/printerdrake.pm:4742
 #, c-format
 msgid ""
 "Then locally connected printers can be used and remote printers on other "
@@ -14433,7 +14660,7 @@ msgstr ""
 "ローカルに接続されたプリンタが使えます。ネットワーク内の他のCUPSサーバのリ"
 "モートプリンタは自動検出されます。"
 
-#: printer/printerdrake.pm:4459
+#: printer/printerdrake.pm:4743
 #, c-format
 msgid ""
 "Disadvantage of this approach is, that more resources on the local machine "
@@ -14445,12 +14672,12 @@ msgstr ""
 "インストール/CUPSデーモンを常に稼動させておく必要がある/IPPポート(port 631)が"
 "オープンになる。"
 
-#: printer/printerdrake.pm:4461
+#: printer/printerdrake.pm:4745
 #, c-format
 msgid "2. All printing requests are immediately sent to a remote CUPS server. "
 msgstr "2. すべての印刷要求は直ちにリモートCUPSサーバに送られます。"
 
-#: printer/printerdrake.pm:4462
+#: printer/printerdrake.pm:4746
 #, c-format
 msgid ""
 "Here local resource occupation is reduced to a minimum. No CUPS daemon is "
@@ -14462,7 +14689,7 @@ msgstr ""
 "ためのソフトウェアもインストールされないので、メモリー/ディスクスペースの使用"
 "が少なくなります。"
 
-#: printer/printerdrake.pm:4463
+#: printer/printerdrake.pm:4747
 #, c-format
 msgid ""
 "Disadvantage is that it is not possible to define local printers then and if "
@@ -14471,48 +14698,48 @@ msgstr ""
 "欠点は、ローカルプリンタを指定できないので指定したサーバがダウンするとこのマ"
 "シンからは全く印刷できなくなることです。"
 
-#: printer/printerdrake.pm:4465
+#: printer/printerdrake.pm:4749
 #, c-format
 msgid "How should CUPS be set up on your machine?"
 msgstr "CUPSをどのようにセットアップしますか？"
 
-#: printer/printerdrake.pm:4469 printer/printerdrake.pm:4484
-#: printer/printerdrake.pm:4488 printer/printerdrake.pm:4494
+#: printer/printerdrake.pm:4753 printer/printerdrake.pm:4768
+#: printer/printerdrake.pm:4772 printer/printerdrake.pm:4778
 #, c-format
 msgid "Remote server, specify Name or IP here:"
 msgstr "リモートサーバ - 名前かIPを指定:"
 
-#: printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4767
 #, c-format
 msgid "Local CUPS printing system"
 msgstr "ローカルCUPS印刷システム"
 
-#: printer/printerdrake.pm:4522
+#: printer/printerdrake.pm:4806
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "プリンタのスプーラを選択"
 
-#: printer/printerdrake.pm:4523
+#: printer/printerdrake.pm:4807
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "どの印刷システム(スプーラ)を使いますか？"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4856
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "プリンタ %s の設定に失敗"
 
-#: printer/printerdrake.pm:4587
+#: printer/printerdrake.pm:4871
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Foomaticをインストール中.."
 
-#: printer/printerdrake.pm:4593
+#: printer/printerdrake.pm:4877
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "%s パッケージをインストールできません、%s を起動できません"
 
-#: printer/printerdrake.pm:4785
+#: printer/printerdrake.pm:5072
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -14522,48 +14749,48 @@ msgstr ""
 "以下のプリンタが既に設定されています。ダブルクリックで設定を変更、デフォルト"
 "のプリンタに指定、情報を参照することができます。"
 
-#: printer/printerdrake.pm:4815
+#: printer/printerdrake.pm:5102
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "利用可能なリモートCUPSプリンタを全て表示"
 
-#: printer/printerdrake.pm:4816
+#: printer/printerdrake.pm:5103
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "プリンタリストを更新(リモートCUPSプリンタを全て表示)"
 
-#: printer/printerdrake.pm:4827
+#: printer/printerdrake.pm:5114
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPSを設定"
 
-#: printer/printerdrake.pm:4839
+#: printer/printerdrake.pm:5126
 #, c-format
 msgid "Change the printing system"
 msgstr "印刷システムを変更"
 
-#: printer/printerdrake.pm:4848
+#: printer/printerdrake.pm:5135
 #, c-format
 msgid "Normal Mode"
 msgstr "標準モード"
 
-#: printer/printerdrake.pm:4849
+#: printer/printerdrake.pm:5136
 #, c-format
 msgid "Expert Mode"
 msgstr "エキスパートモード"
 
-#: printer/printerdrake.pm:5118 printer/printerdrake.pm:5176
-#: printer/printerdrake.pm:5255 printer/printerdrake.pm:5264
+#: printer/printerdrake.pm:5408 printer/printerdrake.pm:5466
+#: printer/printerdrake.pm:5552 printer/printerdrake.pm:5561
 #, c-format
 msgid "Printer options"
 msgstr "プリンタのオプション"
 
-#: printer/printerdrake.pm:5154
+#: printer/printerdrake.pm:5444
 #, c-format
 msgid "Modify printer configuration"
 msgstr "プリンタの設定を変更"
 
-#: printer/printerdrake.pm:5156
+#: printer/printerdrake.pm:5446
 #, c-format
 msgid ""
 "Printer %s%s\n"
@@ -14572,99 +14799,104 @@ msgstr ""
 "プリンタ %s%s\n"
 "このプリンタの何を変更しますか？"
 
-#: printer/printerdrake.pm:5161
+#: printer/printerdrake.pm:5451
 #, c-format
 msgid "This printer is disabled"
 msgstr "このプリンタは無効になっています"
 
-#: printer/printerdrake.pm:5163
+#: printer/printerdrake.pm:5453
 #, c-format
 msgid "Do it!"
 msgstr "実行"
 
-#: printer/printerdrake.pm:5168 printer/printerdrake.pm:5223
+#: printer/printerdrake.pm:5458 printer/printerdrake.pm:5520
 #, c-format
 msgid "Printer connection type"
 msgstr "プリンタ接続の種類"
 
-#: printer/printerdrake.pm:5169 printer/printerdrake.pm:5229
+#: printer/printerdrake.pm:5459 printer/printerdrake.pm:5526
 #, c-format
 msgid "Printer name, description, location"
 msgstr "プリンタの名前/説明/場所"
 
-#: printer/printerdrake.pm:5171 printer/printerdrake.pm:5248
+#: printer/printerdrake.pm:5461 printer/printerdrake.pm:5545
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "プリンタのメーカー/機種/ドライバ"
 
-#: printer/printerdrake.pm:5172 printer/printerdrake.pm:5249
+#: printer/printerdrake.pm:5462 printer/printerdrake.pm:5546
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "プリンタのメーカー/機種"
 
-#: printer/printerdrake.pm:5178 printer/printerdrake.pm:5259
+#: printer/printerdrake.pm:5468 printer/printerdrake.pm:5556
 #, c-format
 msgid "Set this printer as the default"
 msgstr "このプリンタをデフォルトにする"
 
-#: printer/printerdrake.pm:5183 printer/printerdrake.pm:5265
-#: printer/printerdrake.pm:5267
+#: printer/printerdrake.pm:5473 printer/printerdrake.pm:5562
+#: printer/printerdrake.pm:5564 printer/printerdrake.pm:5573
 #, c-format
 msgid "Enable Printer"
 msgstr "プリンタを有効にする"
 
-#: printer/printerdrake.pm:5186 printer/printerdrake.pm:5270
-#: printer/printerdrake.pm:5272
+#: printer/printerdrake.pm:5476 printer/printerdrake.pm:5567
+#: printer/printerdrake.pm:5568 printer/printerdrake.pm:5570
 #, c-format
 msgid "Disable Printer"
 msgstr "プリンタを無効にする"
 
-#: printer/printerdrake.pm:5187 printer/printerdrake.pm:5275
+#: printer/printerdrake.pm:5480 printer/printerdrake.pm:5574
+#, fuzzy, c-format
+msgid "Printer communication error handling"
+msgstr "プリンタ接続の種類"
+
+#: printer/printerdrake.pm:5481 printer/printerdrake.pm:5578
 #, c-format
 msgid "Print test pages"
 msgstr "テストページを印刷"
 
-#: printer/printerdrake.pm:5188 printer/printerdrake.pm:5277
+#: printer/printerdrake.pm:5482 printer/printerdrake.pm:5580
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "このプリンタの使い方を調べる"
 
-#: printer/printerdrake.pm:5189 printer/printerdrake.pm:5279
+#: printer/printerdrake.pm:5483 printer/printerdrake.pm:5582
 #, c-format
 msgid "Remove printer"
 msgstr "プリンタを削除"
 
-#: printer/printerdrake.pm:5237
+#: printer/printerdrake.pm:5534
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "古いプリンタ %s を削除中.."
 
-#: printer/printerdrake.pm:5268
+#: printer/printerdrake.pm:5565
 #, c-format
 msgid "Printer \"%s\" is now enabled."
 msgstr "プリンタ %s を有効にしました"
 
-#: printer/printerdrake.pm:5273
+#: printer/printerdrake.pm:5571
 #, c-format
 msgid "Printer \"%s\" is now disabled."
 msgstr "プリンタ %s を無効にしました"
 
-#: printer/printerdrake.pm:5310
+#: printer/printerdrake.pm:5613
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "プリンタ %s を本当に削除しますか？"
 
-#: printer/printerdrake.pm:5314
+#: printer/printerdrake.pm:5617
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "プリンタ %s を削除中.."
 
-#: printer/printerdrake.pm:5338
+#: printer/printerdrake.pm:5641
 #, c-format
 msgid "Default printer"
 msgstr "デフォルトのプリンタ"
 
-#: printer/printerdrake.pm:5339
+#: printer/printerdrake.pm:5642
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "プリンタ %s をデフォルトのプリンタにしました。"
@@ -14674,7 +14906,7 @@ msgstr "プリンタ %s をデフォルトのプリンタにしました。"
 msgid "Can not add a partition to _formatted_ RAID %s"
 msgstr "フォーマット済の RAID %s にはパーティションを追加できません"
 
-#: raid.pm:144
+#: raid.pm:145
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "RAIDレベル %d にはパーティションが足りません\n"
@@ -17422,17 +17654,12 @@ msgstr "ログアウトして Ctrl-Alt-BackSpace を押してください"
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "変更を有効にするには再ログインしてください。"
 
-#: standalone/drakTermServ:75
-#, c-format
-msgid "Useless without Terminal Server"
-msgstr "ターミナルサーバなしでは使えません"
-
-#: standalone/drakTermServ:107 standalone/drakTermServ:113
+#: standalone/drakTermServ:102 standalone/drakTermServ:108
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s にはユーザ名が必要です..\n"
 
-#: standalone/drakTermServ:124
+#: standalone/drakTermServ:119
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -17441,67 +17668,72 @@ msgstr ""
 "%s: %s には以下が必要です: hostname, MAC address, IP, nbi-image, 0/1 for "
 "THIN_CLIENT, 0/1 for Local Config..\n"
 
-#: standalone/drakTermServ:130
+#: standalone/drakTermServ:125
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s にはホスト名が必要です..\n"
 
-#: standalone/drakTermServ:212 standalone/drakTermServ:215
+#: standalone/drakTermServ:207 standalone/drakTermServ:210
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "ターミナルサーバの設定"
 
-#: standalone/drakTermServ:221
+#: standalone/drakTermServ:216
+#, fuzzy, c-format
+msgid "dhcpd Config"
+msgstr "DHCPDを設定中.."
+
+#: standalone/drakTermServ:220
 #, c-format
 msgid "Enable Server"
 msgstr "サーバを有効にする"
 
-#: standalone/drakTermServ:227
+#: standalone/drakTermServ:226
 #, c-format
 msgid "Disable Server"
 msgstr "サーバを無効にする"
 
-#: standalone/drakTermServ:233
+#: standalone/drakTermServ:232
 #, c-format
 msgid "Start Server"
 msgstr "サーバを起動"
 
-#: standalone/drakTermServ:239
+#: standalone/drakTermServ:238
 #, c-format
 msgid "Stop Server"
 msgstr "サーバを停止"
 
-#: standalone/drakTermServ:248
+#: standalone/drakTermServ:247
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherbootフロッピー/ISO"
 
-#: standalone/drakTermServ:252
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Net Boot Images"
 msgstr "ネットブートイメージ"
 
-#: standalone/drakTermServ:259
+#: standalone/drakTermServ:258
 #, c-format
 msgid "Add/Del Users"
 msgstr "ユーザを追加/削除"
 
-#: standalone/drakTermServ:263
+#: standalone/drakTermServ:262
 #, c-format
 msgid "Add/Del Clients"
 msgstr "クライアントを追加/削除"
 
-#: standalone/drakTermServ:271
+#: standalone/drakTermServ:270
 #, c-format
 msgid "Images"
 msgstr "イメージ"
 
-#: standalone/drakTermServ:272
+#: standalone/drakTermServ:271
 #, c-format
 msgid "Clients/Users"
 msgstr "クライアント/ユーザ"
 
-#: standalone/drakTermServ:290 standalone/drakbug:47
+#: standalone/drakTermServ:289 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "初回設定ウィザード"
@@ -17551,30 +17783,31 @@ msgstr ""
 "    e) 起動フロッピィの作成を促す\n"
 "    f) thinクライアントの場合は、KDMを再起動するか尋ねる\n"
 
-#: standalone/drakTermServ:378
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Cancel Wizard"
 msgstr "ウィザードをキャンセル"
 
-#: standalone/drakTermServ:393
+#: standalone/drakTermServ:394
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "DHCPDの設定を保存してください"
 
-#: standalone/drakTermServ:421
+#: standalone/drakTermServ:422
 #, c-format
 msgid "Use thin clients."
 msgstr "thinクライアントを使う"
 
-#: standalone/drakTermServ:423
+#: standalone/drakTermServ:424
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr "クライアントのXキーボード設定をサーバと同期"
 
-#: standalone/drakTermServ:425
-#, c-format
+#: standalone/drakTermServ:426
+#, fuzzy, c-format
 msgid ""
-"Please select default client type.\n"
+"Please select default client type (Fat is the default type if 'Use thin' is "
+"unchecked).\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."
@@ -17584,28 +17817,28 @@ msgstr ""
 "ものを使います。\n"
 "    fatクライアントは自分のCPU/RAMとサーバのファイルシステムを使用します。"
 
-#: standalone/drakTermServ:445
+#: standalone/drakTermServ:446
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "全カーネル用のネットブートイメージを作成"
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:766
-#: standalone/drakTermServ:782
+#: standalone/drakTermServ:447 standalone/drakTermServ:769
+#: standalone/drakTermServ:785
 #, c-format
 msgid "This will take a few minutes."
 msgstr "数分かかります"
 
-#: standalone/drakTermServ:455 standalone/drakTermServ:496
+#: standalone/drakTermServ:453 standalone/drakTermServ:493
 #, c-format
 msgid "Done!"
 msgstr "完了"
 
-#: standalone/drakTermServ:467 standalone/drakTermServ:848
+#: standalone/drakTermServ:464 standalone/drakTermServ:849
 #, c-format
 msgid "%s failed"
 msgstr "%s 失敗"
 
-#: standalone/drakTermServ:476
+#: standalone/drakTermServ:473
 #, c-format
 msgid ""
 "Not enough space to create\n"
@@ -17616,12 +17849,12 @@ msgstr ""
 "十分なスペースがありません\n"
 "%d MB 必要(空きスペース: %d MD)"
 
-#: standalone/drakTermServ:482
+#: standalone/drakTermServ:479
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr "サーバのユーザリストをクライアントのリストと同期(root含む)"
 
-#: standalone/drakTermServ:502
+#: standalone/drakTermServ:499
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -17630,12 +17863,12 @@ msgstr ""
 "thinクライアントの変更を有効にするには、ディスプレイマネージャの再起動が必要"
 "です。再起動しますか？"
 
-#: standalone/drakTermServ:537
+#: standalone/drakTermServ:534
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "ターミナルサーバの概要"
 
-#: standalone/drakTermServ:538
+#: standalone/drakTermServ:535
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -17662,7 +17895,7 @@ msgstr ""
 "        \tを作成するには、少なくともひとつの完全なカーネル用のetherbootイメー"
 "ジを作成する必要があります。"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:541
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -17696,7 +17929,7 @@ msgstr ""
 "\t\t\t \n"
 "        \tdisklessクライアントをサポートするdhcpd.confの典型例:"
 
-#: standalone/drakTermServ:562
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -17768,7 +18001,7 @@ msgstr ""
 "\t\t\t\n"
 "        注意: クライアントの追加/変更後は、サーバを再起動する必要があります。"
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:579
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -17799,7 +18032,7 @@ msgstr ""
 "\t\t\t\n"
 "        \tSUBNET/MASKはネットワークに合わせて定義します。"
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -17816,7 +18049,7 @@ msgstr ""
 "        \tこのファイルのユーザを追加/削除することによって、ユーザ管理の手助け"
 "をします。"
 
-#: standalone/drakTermServ:598
+#: standalone/drakTermServ:595
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -17834,7 +18067,7 @@ msgstr ""
 "        \tすることによって、drakTermServはこれらのファイル作成の手助けをしま"
 "す。"
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:600
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -17869,7 +18102,7 @@ msgstr ""
 "        クライアントマシンの設定が完了したら、ローカル設定を無効に戻してもか"
 "まいません。設定ファイルは維持されます。"
 
-#: standalone/drakTermServ:612
+#: standalone/drakTermServ:609
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -17924,7 +18157,7 @@ msgstr ""
 "作成する場所)\n"
 "        \tになっている点です。"
 
-#: standalone/drakTermServ:633
+#: standalone/drakTermServ:630
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -17950,72 +18183,82 @@ msgstr ""
 "です:        \t\t\n"
 "        \tcat /usr/share/etherboot/zdsk/3c509.zdsk > /dev/fd0"
 
-#: standalone/drakTermServ:666
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot Floppy"
 msgstr "ブートフロッピー"
 
-#: standalone/drakTermServ:668
+#: standalone/drakTermServ:665
 #, c-format
 msgid "Boot ISO"
 msgstr "起動用ISO"
 
-#: standalone/drakTermServ:670
+#: standalone/drakTermServ:667
 #, c-format
 msgid "PXE Image"
 msgstr "PXEイメージ"
 
-#: standalone/drakTermServ:731
+#: standalone/drakTermServ:728
 #, c-format
 msgid "Default kernel version"
 msgstr "デフォルトのカーネルバージョン"
 
-#: standalone/drakTermServ:734
+#: standalone/drakTermServ:731
 #, c-format
 msgid "Create PXE images."
 msgstr "PXEイメージを作成"
 
-#: standalone/drakTermServ:764
+#: standalone/drakTermServ:757
+#, c-format
+msgid "Install i586 kernel for older clients"
+msgstr ""
+
+#: standalone/drakTermServ:767
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "カーネル全体を構築 -->"
 
-#: standalone/drakTermServ:771
+#: standalone/drakTermServ:774
 #, c-format
 msgid "No kernel selected!"
 msgstr "カーネルが選択されていません"
 
-#: standalone/drakTermServ:774
+#: standalone/drakTermServ:777
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "単一NICを構築 -->"
 
-#: standalone/drakTermServ:778
+#: standalone/drakTermServ:781
 #, c-format
 msgid "No NIC selected!"
 msgstr "NICが選択されていません"
 
-#: standalone/drakTermServ:781
+#: standalone/drakTermServ:784
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "全カーネルを構築 -->"
 
-#: standalone/drakTermServ:796
+#: standalone/drakTermServ:797
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- 削除"
 
-#: standalone/drakTermServ:801
+#: standalone/drakTermServ:802
 #, c-format
 msgid "No image selected!"
 msgstr "イメージが選択されていません"
 
-#: standalone/drakTermServ:804
+#: standalone/drakTermServ:805
 #, c-format
 msgid "Delete All NBIs"
 msgstr "全てのNBIを削除"
 
-#: standalone/drakTermServ:966
+#: standalone/drakTermServ:880
+#, fuzzy, c-format
+msgid "Building images for kernel:"
+msgstr "全カーネル用のネットブートイメージを作成"
+
+#: standalone/drakTermServ:1004
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -18026,27 +18269,27 @@ msgstr ""
 "パスワードが一致していません。\n"
 "ログインするにはターミナルサーバにユーザを削除/再追加してください。"
 
-#: standalone/drakTermServ:971
+#: standalone/drakTermServ:1009
 #, c-format
 msgid "Add User -->"
 msgstr "ユーザを追加 -->"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- ユーザを削除"
 
-#: standalone/drakTermServ:1013
+#: standalone/drakTermServ:1051
 #, c-format
 msgid "type: %s"
 msgstr "種類: %s"
 
-#: standalone/drakTermServ:1017
+#: standalone/drakTermServ:1055
 #, c-format
 msgid "local config: %s"
 msgstr "ローカル設定: %s"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1086
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -18055,22 +18298,22 @@ msgstr ""
 "ローカルハードウェアの\n"
 "設定を許可"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1095
 #, c-format
 msgid "No net boot images created!"
 msgstr "ネットブートイメージが作成されていません"
 
-#: standalone/drakTermServ:1075
+#: standalone/drakTermServ:1114
 #, c-format
 msgid "Thin Client"
 msgstr "Thinクライアント"
 
-#: standalone/drakTermServ:1079
+#: standalone/drakTermServ:1118
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Thinクライアントを許可"
 
-#: standalone/drakTermServ:1080
+#: standalone/drakTermServ:1119
 #, c-format
 msgid ""
 "Sync client X keyboard\n"
@@ -18079,52 +18322,47 @@ msgstr ""
 "クライアントのXキーボード\n"
 "設定をサーバと同期"
 
-#: standalone/drakTermServ:1081
+#: standalone/drakTermServ:1120
 #, c-format
 msgid "Add Client -->"
 msgstr "クライアントを追加 -->"
 
-#: standalone/drakTermServ:1095
+#: standalone/drakTermServ:1134
 #, c-format
 msgid "type: fat"
 msgstr "種類: fat"
 
-#: standalone/drakTermServ:1096
+#: standalone/drakTermServ:1135
 #, c-format
 msgid "type: thin"
 msgstr "種類: thin"
 
-#: standalone/drakTermServ:1103
+#: standalone/drakTermServ:1142
 #, c-format
 msgid "local config: false"
 msgstr "ローカル設定: false"
 
-#: standalone/drakTermServ:1104
+#: standalone/drakTermServ:1143
 #, c-format
 msgid "local config: true"
 msgstr "ローカル設定: true"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1151
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- クライアントを編集"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Disable Local Config"
 msgstr "ローカル設定を無効にする"
 
-#: standalone/drakTermServ:1145
+#: standalone/drakTermServ:1183
 #, c-format
 msgid "Delete Client"
 msgstr "クライアントを削除"
 
-#: standalone/drakTermServ:1154
-#, c-format
-msgid "dhcpd Config..."
-msgstr "DHCPDを設定中.."
-
-#: standalone/drakTermServ:1169
+#: standalone/drakTermServ:1205
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -18133,78 +18371,78 @@ msgstr ""
 "全ての変更を有効にするにはディスプレイマネージャを再起動してください。\n"
 "(コンソールで'service dm restart'と入力)"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1250
 #, c-format
 msgid "Thin clients will not work with autologin. Disable autologin?"
 msgstr ""
 "Thinクライアントでは自動ログインできません。自動ログインを無効にしますか？"
 
-#: standalone/drakTermServ:1230
+#: standalone/drakTermServ:1266
 #, c-format
 msgid "All clients will use %s"
 msgstr "全てのクライアントで %s を使用"
 
-#: standalone/drakTermServ:1264
+#: standalone/drakTermServ:1300
 #, c-format
 msgid "Subnet:"
 msgstr "サブネット:"
 
-#: standalone/drakTermServ:1271
+#: standalone/drakTermServ:1307
 #, c-format
 msgid "Netmask:"
 msgstr "ネットマスク:"
 
-#: standalone/drakTermServ:1278
+#: standalone/drakTermServ:1314
 #, c-format
 msgid "Routers:"
 msgstr "ルータ:"
 
-#: standalone/drakTermServ:1285
+#: standalone/drakTermServ:1321
 #, c-format
 msgid "Subnet Mask:"
 msgstr "サブネットマスク:"
 
-#: standalone/drakTermServ:1292
+#: standalone/drakTermServ:1328
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Broadcastアドレス:"
 
-#: standalone/drakTermServ:1299
+#: standalone/drakTermServ:1335
 #, c-format
 msgid "Domain Name:"
 msgstr "ドメイン名:"
 
-#: standalone/drakTermServ:1307
+#: standalone/drakTermServ:1343
 #, c-format
 msgid "Name Servers:"
 msgstr "ネームサーバ:"
 
-#: standalone/drakTermServ:1318
+#: standalone/drakTermServ:1354
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP幅の最初:"
 
-#: standalone/drakTermServ:1319
+#: standalone/drakTermServ:1355
 #, c-format
 msgid "IP Range End:"
 msgstr "IP幅の最後:"
 
-#: standalone/drakTermServ:1361
+#: standalone/drakTermServ:1397
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "TS Includesを既存の設定に追加"
 
-#: standalone/drakTermServ:1363
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Write Config"
 msgstr "設定を書き込む"
 
-#: standalone/drakTermServ:1379
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "DHCPDサーバを設定"
 
-#: standalone/drakTermServ:1380
+#: standalone/drakTermServ:1416
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -18215,7 +18453,7 @@ msgstr ""
 "お使いのシステムから取得しました。\n"
 "必要に応じて変更してください。"
 
-#: standalone/drakTermServ:1383
+#: standalone/drakTermServ:1419
 #, c-format
 msgid ""
 "Dynamic IP Address Pool\n"
@@ -18224,105 +18462,106 @@ msgstr ""
 "ダイナミックIPアドレスプール\n"
 "(PXEクライアントに必要):"
 
-#: standalone/drakTermServ:1536
+#: standalone/drakTermServ:1572
 #, c-format
 msgid "Write to %s failed!"
 msgstr "%s への書き込みに失敗"
 
-#: standalone/drakTermServ:1548
+#: standalone/drakTermServ:1584
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "フロッピーを挿入してください:"
 
-#: standalone/drakTermServ:1552
+#: standalone/drakTermServ:1588
 #, c-format
 msgid "Could not access the floppy!"
 msgstr "フロッピーにアクセスできません"
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1590
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "フロッピーを取り除くことができます"
 
-#: standalone/drakTermServ:1557
+#: standalone/drakTermServ:1593
 #, c-format
 msgid "No floppy drive available!"
 msgstr "有効なフロッピードライブがありません"
 
-#: standalone/drakTermServ:1563
+#: standalone/drakTermServ:1599
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "PXEイメージは %s/%s"
 
-#: standalone/drakTermServ:1565
+#: standalone/drakTermServ:1601
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "%s/%s を書き込み中にエラー"
 
-#: standalone/drakTermServ:1575
+#: standalone/drakTermServ:1611
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISOイメージは %s"
 
-#: standalone/drakTermServ:1577
+#: standalone/drakTermServ:1613
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "異常が発生 - mkisofsはインストールされていますか？"
 
-#: standalone/drakTermServ:1598
+#: standalone/drakTermServ:1634
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "まず /etc/dhcpd.conf を作成してください"
 
-#: standalone/drakTermServ:1757
+#: standalone/drakTermServ:1793
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "ターミナルサーバの %s passwd に不具合 - 再書き込み..\n"
 
-#: standalone/drakTermServ:1770
+#: standalone/drakTermServ:1806
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s はユーザではありません..\n"
 
-#: standalone/drakTermServ:1771
+#: standalone/drakTermServ:1807
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s は既にターミナルサーバのユーザです\n"
 
-#: standalone/drakTermServ:1773
+#: standalone/drakTermServ:1809
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "%s をターミナルサーバに追加できませんでした\n"
 
-#: standalone/drakTermServ:1775
+#: standalone/drakTermServ:1811
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s をターミナルサーバに追加\n"
 
-#: standalone/drakTermServ:1792
+#: standalone/drakTermServ:1828
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "%s を検出..\n"
 
-#: standalone/drakTermServ:1794 standalone/drakTermServ:1867
+#: standalone/drakTermServ:1830 standalone/drakTermServ:1903
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s が見つかりません..\n"
 
-#: standalone/drakTermServ:1895
+#: standalone/drakTermServ:1931
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allowと/etc/hosts.denyは設定済みです - 変更していません"
 
-#: standalone/drakTermServ:2035
+#: standalone/drakTermServ:2071
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "設定を変更しました - clusternfs/dhcpdを再起動しますか？"
 
-#: standalone/drakautoinst:38 standalone/drakhosts:118
-#: standalone/drakhosts:125 standalone/draknfs:86 standalone/draknfs:107
-#: standalone/draknfs:434 standalone/draknfs:436 standalone/draknfs:526
-#: standalone/draknfs:533
+#: standalone/drakautoinst:38 standalone/drakhosts:123
+#: standalone/drakhosts:129 standalone/draknfs:86 standalone/draknfs:107
+#: standalone/draknfs:435 standalone/draknfs:437 standalone/draknfs:527
+#: standalone/draknfs:534 standalone/draksambashare:107
+#: standalone/draksambashare:128 standalone/draksambashare:426
 #, c-format
 msgid "Error!"
 msgstr "エラー"
@@ -18720,7 +18959,7 @@ msgstr "CDにアクセスする権限がありません"
 msgid "No tape in %s!"
 msgstr "%s にテープがありません"
 
-#: standalone/drakbackup:932
+#: standalone/drakbackup:935
 #, c-format
 msgid ""
 "Backup destination quota exceeded!\n"
@@ -18729,37 +18968,37 @@ msgstr ""
 "バックアップ先の割り当てを越えました\n"
 "使用: %d MB - 割り当て: %d MD"
 
-#: standalone/drakbackup:951 standalone/drakbackup:983
+#: standalone/drakbackup:954 standalone/drakbackup:986
 #, c-format
 msgid "Backup system files..."
 msgstr "システムファイルをバックアップ"
 
-#: standalone/drakbackup:984 standalone/drakbackup:1024
+#: standalone/drakbackup:987 standalone/drakbackup:1027
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "ハードディスクにバックアップ"
 
-#: standalone/drakbackup:1023
+#: standalone/drakbackup:1026
 #, c-format
 msgid "Backup User files..."
 msgstr "ユーザファイルをバックアップ"
 
-#: standalone/drakbackup:1057
+#: standalone/drakbackup:1060
 #, c-format
 msgid "Backup Other files..."
 msgstr "他のファイルをバックアップ"
 
-#: standalone/drakbackup:1058
+#: standalone/drakbackup:1061
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "ハードディスクバックアップの進行"
 
-#: standalone/drakbackup:1063
+#: standalone/drakbackup:1066
 #, c-format
 msgid "No changes to backup!"
 msgstr "バックアップする変更がありません"
 
-#: standalone/drakbackup:1080 standalone/drakbackup:1103
+#: standalone/drakbackup:1083 standalone/drakbackup:1106
 #, c-format
 msgid ""
 "\n"
@@ -18770,7 +19009,7 @@ msgstr ""
 "%s 経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1089
+#: standalone/drakbackup:1092
 #, c-format
 msgid ""
 "\n"
@@ -18780,18 +19019,18 @@ msgstr ""
 "\n"
 " FTP接続に問題が発生: FTPでバックアップファイルを送れません。\n"
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1093
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr "FTPでのファイル送信中にエラーが発生。FTPの設定を修正してください。"
 
-#: standalone/drakbackup:1092
+#: standalone/drakbackup:1095
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "FTPで送ったファイルのリスト: %s\n"
 
-#: standalone/drakbackup:1108
+#: standalone/drakbackup:1111
 #, c-format
 msgid ""
 "\n"
@@ -18802,7 +19041,7 @@ msgstr ""
 "CD経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1113
+#: standalone/drakbackup:1116
 #, c-format
 msgid ""
 "\n"
@@ -18813,22 +19052,22 @@ msgstr ""
 "テープ経由のDrakbackup:\n"
 "\n"
 
-#: standalone/drakbackup:1122
+#: standalone/drakbackup:1125
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "メール送信中にエラー。報告メールを送れませんでした。"
 
-#: standalone/drakbackup:1123
+#: standalone/drakbackup:1126
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " メール送信中にエラー \n"
 
-#: standalone/drakbackup:1153
+#: standalone/drakbackup:1156
 #, c-format
 msgid "Can not create catalog!"
 msgstr "カタログを作成できません"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1397
 #, c-format
 msgid ""
 "\n"
@@ -18837,42 +19076,42 @@ msgstr ""
 "\n"
 "必要なオプションにチェックを入れてください\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1398
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 "このオプションを使うと /etc のファイルを全てバックアップ/復元できます。\n"
 
-#: standalone/drakbackup:1396
+#: standalone/drakbackup:1399
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "システムファイルをバックアップする(/etcディレクトリ)"
 
-#: standalone/drakbackup:1397 standalone/drakbackup:1461
-#: standalone/drakbackup:1527
+#: standalone/drakbackup:1400 standalone/drakbackup:1464
+#: standalone/drakbackup:1530
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "積み重ね/比較バックアップ(古いバックアップを残す)"
 
-#: standalone/drakbackup:1399 standalone/drakbackup:1463
-#: standalone/drakbackup:1529
+#: standalone/drakbackup:1402 standalone/drakbackup:1466
+#: standalone/drakbackup:1532
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "積み重ねバックアップを使う"
 
-#: standalone/drakbackup:1399 standalone/drakbackup:1463
-#: standalone/drakbackup:1529
+#: standalone/drakbackup:1402 standalone/drakbackup:1466
+#: standalone/drakbackup:1532
 #, c-format
 msgid "Use Differential Backups"
 msgstr "比較バックアップを使う"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1404
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "危険なファイル(passwd, group, fstab)は含めない"
 
-#: standalone/drakbackup:1402
+#: standalone/drakbackup:1405
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -18881,177 +19120,182 @@ msgstr ""
 "このオプションを使うと、好きなバージョンの /etc ディレクトリを\n"
 "復元できます。"
 
-#: standalone/drakbackup:1433
+#: standalone/drakbackup:1436
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "バックアップするユーザにチェックを入れてください。"
 
-#: standalone/drakbackup:1460
+#: standalone/drakbackup:1463
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "ブラウザのキャッシュは含めない"
 
-#: standalone/drakbackup:1514
+#: standalone/drakbackup:1517
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "ファイルかディレクトリを選んで[OK]をクリックしてください"
 
-#: standalone/drakbackup:1515 standalone/drakfont:657
+#: standalone/drakbackup:1518 standalone/drakfont:655
 #, c-format
 msgid "Remove Selected"
 msgstr "リストから削除"
 
-#: standalone/drakbackup:1578
+#: standalone/drakbackup:1581
 #, c-format
 msgid "Users"
 msgstr "ユーザ名"
 
-#: standalone/drakbackup:1598
+#: standalone/drakbackup:1601
 #, c-format
 msgid "Use network connection to backup"
 msgstr "ネットワーク接続を使用"
 
-#: standalone/drakbackup:1600
+#: standalone/drakbackup:1603
 #, c-format
 msgid "Net Method:"
 msgstr "ネットの方式:"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1607
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "SSHにExpectを使う"
 
-#: standalone/drakbackup:1605
+#: standalone/drakbackup:1608
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "SSHのバックアップキーを作成/転送"
 
-#: standalone/drakbackup:1607
+#: standalone/drakbackup:1610
 #, c-format
 msgid "Transfer Now"
 msgstr "今すぐ転送"
 
-#: standalone/drakbackup:1609
+#: standalone/drakbackup:1612
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "既に他の(drakbackupのものではない)キーがあります"
 
-#: standalone/drakbackup:1612
+#: standalone/drakbackup:1615
 #, c-format
 msgid "Host name or IP."
 msgstr "ホスト名もしくはIP"
 
-#: standalone/drakbackup:1617
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "バックアップを保存するディレクトリ(もしくはモジュール名)"
 
-#: standalone/drakbackup:1629
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Remember this password"
 msgstr "このパスワードを記憶する"
 
-#: standalone/drakbackup:1645
+#: standalone/drakbackup:1648
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "ホスト名とユーザ名とパスワードが必要です"
 
-#: standalone/drakbackup:1736
+#: standalone/drakbackup:1739
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "CD/DVDROMにバックアップ"
 
-#: standalone/drakbackup:1739
+#: standalone/drakbackup:1742
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "CD/DVDデバイスを選んでください"
 
-#: standalone/drakbackup:1744
+#: standalone/drakbackup:1747
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "CD/DVDメディアのサイズを選んでください"
 
-#: standalone/drakbackup:1751
+#: standalone/drakbackup:1754
 #, c-format
 msgid "Multisession CD"
 msgstr "マルチセッションCD"
 
-#: standalone/drakbackup:1753
+#: standalone/drakbackup:1756
 #, c-format
 msgid "CDRW media"
 msgstr "CD-RWメディア"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1762
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "RWメディアを消去(最初のセッション)"
 
-#: standalone/drakbackup:1760
+#: standalone/drakbackup:1763
 #, c-format
 msgid " Erase Now "
 msgstr "今すぐ消去"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1769
 #, c-format
 msgid "DVD+RW media"
 msgstr "DVD+RWメディア"
 
-#: standalone/drakbackup:1768
+#: standalone/drakbackup:1771
 #, c-format
 msgid "DVD-R media"
 msgstr "DVD-Rメディア"
 
-#: standalone/drakbackup:1770
+#: standalone/drakbackup:1773
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAMデバイス"
 
-#: standalone/drakbackup:1801
+#: standalone/drakbackup:1804
 #, c-format
 msgid "No CD device defined!"
 msgstr "CDデバイスが定義されていません"
 
-#: standalone/drakbackup:1843
+#: standalone/drakbackup:1846
 #, c-format
 msgid "Use tape to backup"
 msgstr "テープにバックアップ"
 
-#: standalone/drakbackup:1846
+#: standalone/drakbackup:1849
 #, c-format
 msgid "Device name to use for backup"
 msgstr "バックアップに使うデバイスの名前"
 
-#: standalone/drakbackup:1852
+#: standalone/drakbackup:1855
 #, c-format
 msgid "Backup directly to tape"
 msgstr "テープに直接バックアップ"
 
-#: standalone/drakbackup:1858
+#: standalone/drakbackup:1861
+#, c-format
+msgid "Use tape hardware compression (EXPERIMENTAL)"
+msgstr ""
+
+#: standalone/drakbackup:1867
 #, c-format
 msgid "Do not rewind tape after backup"
 msgstr "バックアップ後にテープを巻き戻さない"
 
-#: standalone/drakbackup:1864
+#: standalone/drakbackup:1873
 #, c-format
 msgid "Erase tape before backup"
 msgstr "バックアップ前にテープを消去"
 
-#: standalone/drakbackup:1870
+#: standalone/drakbackup:1879
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "バックアップしたらテープをイジェクト"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "保存先のディレクトリ:"
 
-#: standalone/drakbackup:1950
+#: standalone/drakbackup:1964
 #, c-format
 msgid "Directory to save to"
 msgstr "保存先のディレクトリ"
 
-#: standalone/drakbackup:1955
+#: standalone/drakbackup:1969
 #, c-format
 msgid ""
 "Maximum disk space\n"
@@ -19060,7 +19304,7 @@ msgstr ""
 "バックアップに割り当てる\n"
 "最大ディスクスペース(MB)"
 
-#: standalone/drakbackup:1959
+#: standalone/drakbackup:1973
 #, c-format
 msgid ""
 "Delete incremental or differential\n"
@@ -19071,319 +19315,319 @@ msgstr ""
 "より古い増分/差分バックアップを削除\n"
 "(0 の場合は全てのバックアップを残す)"
 
-#: standalone/drakbackup:2026
+#: standalone/drakbackup:2040
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM/DVDROM"
 
-#: standalone/drakbackup:2031
+#: standalone/drakbackup:2045
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "ハードドライブ/NFS"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2047
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2060 standalone/drakbackup:2061
+#: standalone/drakbackup:2066
 #, c-format
 msgid "hourly"
 msgstr "毎時間"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2048
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2060 standalone/drakbackup:2062
+#: standalone/drakbackup:2067
 #, c-format
 msgid "daily"
 msgstr "毎日"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2049
-#: standalone/drakbackup:2054
+#: standalone/drakbackup:2060 standalone/drakbackup:2063
+#: standalone/drakbackup:2068
 #, c-format
 msgid "weekly"
 msgstr "毎週"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2050
-#: standalone/drakbackup:2055
+#: standalone/drakbackup:2060 standalone/drakbackup:2064
+#: standalone/drakbackup:2069
 #, c-format
 msgid "monthly"
 msgstr "毎月"
 
-#: standalone/drakbackup:2046 standalone/drakbackup:2051
-#: standalone/drakbackup:2056
+#: standalone/drakbackup:2060 standalone/drakbackup:2065
+#: standalone/drakbackup:2070
 #, c-format
 msgid "custom"
 msgstr "カスタム"
 
-#: standalone/drakbackup:2060
+#: standalone/drakbackup:2074
 #, c-format
 msgid "January"
 msgstr "1 月"
 
-#: standalone/drakbackup:2060
+#: standalone/drakbackup:2074
 #, c-format
 msgid "February"
 msgstr "2 月"
 
-#: standalone/drakbackup:2060
+#: standalone/drakbackup:2074
 #, c-format
 msgid "March"
 msgstr "3 月"
 
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "April"
 msgstr "4 月"
 
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "May"
 msgstr "5 月"
 
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "June"
 msgstr "6 月"
 
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "July"
 msgstr "7 月"
 
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "August"
 msgstr "8 月"
 
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2075
 #, c-format
 msgid "September"
 msgstr "9 月"
 
-#: standalone/drakbackup:2062
+#: standalone/drakbackup:2076
 #, c-format
 msgid "October"
 msgstr "10 月"
 
-#: standalone/drakbackup:2062
+#: standalone/drakbackup:2076
 #, c-format
 msgid "November"
 msgstr "11 月"
 
-#: standalone/drakbackup:2062
+#: standalone/drakbackup:2076
 #, c-format
 msgid "December"
 msgstr "12 月"
 
-#: standalone/drakbackup:2065
+#: standalone/drakbackup:2079
 #, c-format
 msgid "Sunday"
 msgstr "日曜日"
 
-#: standalone/drakbackup:2065
+#: standalone/drakbackup:2079
 #, c-format
 msgid "Monday"
 msgstr "月曜日"
 
-#: standalone/drakbackup:2065
+#: standalone/drakbackup:2079
 #, c-format
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: standalone/drakbackup:2066
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: standalone/drakbackup:2066
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Thursday"
 msgstr "木曜日"
 
-#: standalone/drakbackup:2066
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Friday"
 msgstr "金曜日"
 
-#: standalone/drakbackup:2066
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Saturday"
 msgstr "土曜日"
 
-#: standalone/drakbackup:2098
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Use daemon"
 msgstr "デーモンを使う"
 
-#: standalone/drakbackup:2102
+#: standalone/drakbackup:2116
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "バックアップの間隔を選んでください"
 
-#: standalone/drakbackup:2108
+#: standalone/drakbackup:2122
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "カスタムセットアップ/crontab項目:"
 
-#: standalone/drakbackup:2113
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Minute"
 msgstr "分"
 
-#: standalone/drakbackup:2117
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Hour"
 msgstr "時間"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Day"
 msgstr "日"
 
-#: standalone/drakbackup:2125
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Month"
 msgstr "月"
 
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:2143
 #, c-format
 msgid "Weekday"
 msgstr "ウィークデー"
 
-#: standalone/drakbackup:2135
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "バックアップ先のメディアを選んでください。"
 
-#: standalone/drakbackup:2141
+#: standalone/drakbackup:2155
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "サービスにcronデーモンがあることを確認してください。"
 
-#: standalone/drakbackup:2142
+#: standalone/drakbackup:2156
 #, c-format
 msgid ""
 "If your machine is not on all the time, you might want to install anacron."
 msgstr ""
 "常時稼動していないマシンには、anacronをインストールされるといいでしょう。"
 
-#: standalone/drakbackup:2143
+#: standalone/drakbackup:2157
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "注意: 現在すべての'ネット'メディアもハードドライブを使用しています"
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2204
 #, c-format
 msgid "Please choose the compression type"
 msgstr "圧縮の種類を選んでください"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2208
 #, c-format
 msgid "Use .backupignore files"
 msgstr ".backupignoreファイルを使う"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2210
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "バックアップしたら以下にメールを送る:"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2216
 #, c-format
 msgid "Return address for sent mail:"
 msgstr "送信メールの返信アドレス:"
 
-#: standalone/drakbackup:2208
+#: standalone/drakbackup:2222
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "メールのSMTPサーバ:"
 
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2227
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "他のメディアにバックアップしたらハードドライブのtarファイルを削除"
 
-#: standalone/drakbackup:2256
+#: standalone/drakbackup:2270
 #, c-format
 msgid "What"
 msgstr "何を"
 
-#: standalone/drakbackup:2261
+#: standalone/drakbackup:2275
 #, c-format
 msgid "Where"
 msgstr "どこに"
 
-#: standalone/drakbackup:2266
+#: standalone/drakbackup:2280
 #, c-format
 msgid "When"
 msgstr "いつ"
 
-#: standalone/drakbackup:2271
+#: standalone/drakbackup:2285
 #, c-format
 msgid "More Options"
 msgstr "その他のオプション"
 
-#: standalone/drakbackup:2284
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "バックアップ先が設定されていません.."
 
-#: standalone/drakbackup:2304 standalone/drakbackup:4228
+#: standalone/drakbackup:2318 standalone/drakbackup:4242
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackupの設定"
 
-#: standalone/drakbackup:2320
+#: standalone/drakbackup:2334
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "バックアップ先を選んでください"
 
-#: standalone/drakbackup:2323
+#: standalone/drakbackup:2337
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "全てのメディア用にバックアップファイルを準備するハードドライブ"
 
-#: standalone/drakbackup:2323
+#: standalone/drakbackup:2337
 #, c-format
 msgid "Across Network"
 msgstr "ネットワーク経由"
 
-#: standalone/drakbackup:2323
+#: standalone/drakbackup:2337
 #, c-format
 msgid "On CD-R"
 msgstr "CD-Rへ"
 
-#: standalone/drakbackup:2323
+#: standalone/drakbackup:2337
 #, c-format
 msgid "On Tape Device"
 msgstr "テープデバイスへ"
 
-#: standalone/drakbackup:2369
+#: standalone/drakbackup:2383
 #, c-format
 msgid "Backup Users"
 msgstr "ユーザをバックアップ"
 
-#: standalone/drakbackup:2370
+#: standalone/drakbackup:2384
 #, c-format
 msgid " (Default is all users)"
 msgstr " (デフォルトは全ユーザ)"
 
-#: standalone/drakbackup:2383
+#: standalone/drakbackup:2397
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "バックアップするものを選んでください"
 
-#: standalone/drakbackup:2384
+#: standalone/drakbackup:2398
 #, c-format
 msgid "Backup System"
 msgstr "システムをバックアップ"
 
-#: standalone/drakbackup:2386
+#: standalone/drakbackup:2400
 #, c-format
 msgid "Select user manually"
 msgstr "ユーザを手動で選ぶ"
 
-#: standalone/drakbackup:2415
+#: standalone/drakbackup:2429
 #, c-format
 msgid "Please select data to backup..."
 msgstr "バックアップするデータを選んでください。"
 
-#: standalone/drakbackup:2487
+#: standalone/drakbackup:2501
 #, c-format
 msgid ""
 "\n"
@@ -19392,7 +19636,7 @@ msgstr ""
 "\n"
 "バックアップ元: \n"
 
-#: standalone/drakbackup:2488
+#: standalone/drakbackup:2502
 #, c-format
 msgid ""
 "\n"
@@ -19401,7 +19645,7 @@ msgstr ""
 "\n"
 "- システムファイル:\n"
 
-#: standalone/drakbackup:2490
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -19410,7 +19654,7 @@ msgstr ""
 "\n"
 "- ユーザファイル:\n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2506
 #, c-format
 msgid ""
 "\n"
@@ -19419,7 +19663,7 @@ msgstr ""
 "\n"
 "- その他のファイル:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -19428,17 +19672,17 @@ msgstr ""
 "\n"
 "- ハードドライブの保存パス: %s\n"
 
-#: standalone/drakbackup:2495
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tディスクの使用を %s MBに制限\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2510
 #, c-format
 msgid "\tDelete backups older than %s day(s)\n"
 msgstr "\t%s 日前より古いバックアップを削除\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -19447,7 +19691,7 @@ msgstr ""
 "\n"
 "- バックアップ後にハードドライブのtarファイルを削除\n"
 
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2518
 #, c-format
 msgid ""
 "\n"
@@ -19456,22 +19700,22 @@ msgstr ""
 "\n"
 "- CDに書き込む"
 
-#: standalone/drakbackup:2505
+#: standalone/drakbackup:2519
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2520
 #, c-format
 msgid " on device: %s"
 msgstr " デバイス: %s"
 
-#: standalone/drakbackup:2507
+#: standalone/drakbackup:2521
 #, c-format
 msgid " (multi-session)"
 msgstr " (マルチセッション)"
 
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2522
 #, c-format
 msgid ""
 "\n"
@@ -19480,17 +19724,17 @@ msgstr ""
 "\n"
 "- デバイス %s のテープに保存"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\t消去=%s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2525
 #, c-format
 msgid "\tBackup directly to Tape\n"
 msgstr "\tテープに直接バックアップ\n"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2527
 #, c-format
 msgid ""
 "\n"
@@ -19499,7 +19743,7 @@ msgstr ""
 "\n"
 "- %s からホスト %s に保存\n"
 
-#: standalone/drakbackup:2514
+#: standalone/drakbackup:2528
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -19508,7 +19752,7 @@ msgstr ""
 "\t\t ユーザ名: %s\n"
 "\t\t パス: %s \n"
 
-#: standalone/drakbackup:2515
+#: standalone/drakbackup:2529
 #, c-format
 msgid ""
 "\n"
@@ -19517,47 +19761,47 @@ msgstr ""
 "\n"
 "- オプション:\n"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tシステムファイルは含めない\n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tバックアップにtarとbzip2を使う\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tバックアップにtarとgzipを使う\n"
 
-#: standalone/drakbackup:2520
+#: standalone/drakbackup:2534
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tバックアップにtarのみを使う\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2536
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\t.backupignoreファイルを使う\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2537
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tメールを %s に送る\n"
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2538
 #, c-format
 msgid "\tSend mail from %s\n"
 msgstr "\t%s からメールを送る\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2539
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tSMTPサーバ %s を使う\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2541
 #, c-format
 msgid ""
 "\n"
@@ -19566,42 +19810,42 @@ msgstr ""
 "\n"
 "- デーモン, %s 経由:\n"
 
-#: standalone/drakbackup:2528
+#: standalone/drakbackup:2542
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-ハードドライブ\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2543
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CDROM\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2544
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-テープ \n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2545
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-FTPネットワーク\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2546
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-SSHネットワーク\n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2547
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-rsyncネットワーク\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2549
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "設定がありません。ウィザードか詳細をクリックしてください。\n"
 
-#: standalone/drakbackup:2540
+#: standalone/drakbackup:2554
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -19610,27 +19854,27 @@ msgstr ""
 "復元するデータのリスト:\n"
 "\n"
 
-#: standalone/drakbackup:2542
+#: standalone/drakbackup:2556
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- システムファイルを復元\n"
 
-#: standalone/drakbackup:2544 standalone/drakbackup:2554
+#: standalone/drakbackup:2558 standalone/drakbackup:2568
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - この日付から: %s %s\n"
 
-#: standalone/drakbackup:2547
+#: standalone/drakbackup:2561
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- ユーザファイルを復元: \n"
 
-#: standalone/drakbackup:2552
+#: standalone/drakbackup:2566
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- その他のファイルを復元: \n"
 
-#: standalone/drakbackup:2731
+#: standalone/drakbackup:2745
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -19639,127 +19883,127 @@ msgstr ""
 "壊れているデータのリスト:\n"
 "\n"
 
-#: standalone/drakbackup:2733
+#: standalone/drakbackup:2747
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "次回にチェックを外すか削除してください。"
 
-#: standalone/drakbackup:2743
+#: standalone/drakbackup:2757
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "バックアップファイルが壊れています"
 
-#: standalone/drakbackup:2764
+#: standalone/drakbackup:2778
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          選択したデータは全て          "
 
-#: standalone/drakbackup:2765
+#: standalone/drakbackup:2779
 #, c-format
 msgid "          Successfully Restored on %s       "
 msgstr "          %s に復元しました      "
 
-#: standalone/drakbackup:2885
+#: standalone/drakbackup:2899
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         復元の設定       "
 
-#: standalone/drakbackup:2913
+#: standalone/drakbackup:2927
 #, c-format
 msgid "OK to restore the other files."
 msgstr "OK で他のファイルを復元します"
 
-#: standalone/drakbackup:2929
+#: standalone/drakbackup:2943
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "復元するユーザのリスト(各ユーザの最新の日付だけが重要です)"
 
-#: standalone/drakbackup:2994
+#: standalone/drakbackup:3008
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "復元する日付を選んでください:"
 
-#: standalone/drakbackup:3031
+#: standalone/drakbackup:3045
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "ハードディスクから復元する"
 
-#: standalone/drakbackup:3033
+#: standalone/drakbackup:3047
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "バックアップが保存されているディレクトリを入力"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3051
 #, c-format
 msgid "Directory with backups"
 msgstr "バックアップのあるディレクトリ"
 
-#: standalone/drakbackup:3091
+#: standalone/drakbackup:3105
 #, c-format
 msgid "Select another media to restore from"
 msgstr "復元する別のメディアを選んでください"
 
-#: standalone/drakbackup:3093
+#: standalone/drakbackup:3107
 #, c-format
 msgid "Other Media"
 msgstr "その他のメディア"
 
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3112
 #, c-format
 msgid "Restore system"
 msgstr "システムを復元"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3113
 #, c-format
 msgid "Restore Users"
 msgstr "ユーザを復元"
 
-#: standalone/drakbackup:3100
+#: standalone/drakbackup:3114
 #, c-format
 msgid "Restore Other"
 msgstr "その他を復元"
 
-#: standalone/drakbackup:3102
+#: standalone/drakbackup:3116
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "復元するパスを選択( / ではなく)"
 
-#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#: standalone/drakbackup:3120 standalone/drakbackup:3402
 #, c-format
 msgid "Path To Restore To"
 msgstr "復元先のパス"
 
-#: standalone/drakbackup:3109
+#: standalone/drakbackup:3123
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "復元前にバックアップを行う(積み重ねバックアップの場合のみ)"
 
-#: standalone/drakbackup:3111
+#: standalone/drakbackup:3125
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "復元前にユーザディレクトリを削除"
 
-#: standalone/drakbackup:3196
+#: standalone/drakbackup:3210
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "検索するファイル名の文字部分列(空白にすると全てに合致):"
 
-#: standalone/drakbackup:3199
+#: standalone/drakbackup:3213
 #, c-format
 msgid "Search Backups"
 msgstr "Backupを検索"
 
-#: standalone/drakbackup:3217
+#: standalone/drakbackup:3231
 #, c-format
 msgid "No matches found..."
 msgstr "合致するものがありません"
 
-#: standalone/drakbackup:3221
+#: standalone/drakbackup:3235
 #, c-format
 msgid "Restore Selected"
 msgstr "選択したものを復元"
 
-#: standalone/drakbackup:3356
+#: standalone/drakbackup:3370
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -19768,7 +20012,7 @@ msgstr ""
 "バックアップファイルを見るには 日付/時刻 をクリック\n"
 "複数ファイルを選択するにはCtrlを押しながらクリック"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3376
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19777,7 +20021,7 @@ msgstr ""
 "選んだカタログ項目を\n"
 "復元"
 
-#: standalone/drakbackup:3371
+#: standalone/drakbackup:3385
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19786,17 +20030,17 @@ msgstr ""
 "選んだファイルを\n"
 "復元"
 
-#: standalone/drakbackup:3448
+#: standalone/drakbackup:3462
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "%s にバックアップファイルがありません"
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Restore From CD"
 msgstr "CDから復元する"
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3475
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -19805,17 +20049,17 @@ msgstr ""
 "ボリュームラベル %s のCDを\n"
 "/mnt/cdrom のCDドライブに入れてください"
 
-#: standalone/drakbackup:3463
+#: standalone/drakbackup:3477
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "CDのラベルが間違っています。このディスクは %s です。"
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Restore From Tape"
 msgstr "テープから復元"
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3487
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -19824,214 +20068,214 @@ msgstr ""
 "ボリュームラベル %s のテープを\n"
 "テープドライブ %s に入れてください"
 
-#: standalone/drakbackup:3475
+#: standalone/drakbackup:3489
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "テープのラベルが間違っています。このテープは %s です。"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3500
 #, c-format
 msgid "Restore Via Network"
 msgstr "ネットワークから復元"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3500
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "ネットワークプロトコル %s から復元"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Host Name"
 msgstr "ホスト名"
 
-#: standalone/drakbackup:3488
+#: standalone/drakbackup:3502
 #, c-format
 msgid "Host Path or Module"
 msgstr "ホストのパスかモジュール"
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Password required"
 msgstr "パスワードが必要です"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3515
 #, c-format
 msgid "Username required"
 msgstr "ユーザ名が必要です"
 
-#: standalone/drakbackup:3504
+#: standalone/drakbackup:3518
 #, c-format
 msgid "Hostname required"
 msgstr "ホスト名が必要です"
 
-#: standalone/drakbackup:3509
+#: standalone/drakbackup:3523
 #, c-format
 msgid "Path or Module required"
 msgstr "パスかモジュールが必要です"
 
-#: standalone/drakbackup:3522
+#: standalone/drakbackup:3536
 #, c-format
 msgid "Files Restored..."
 msgstr "ファイルを復元.."
 
-#: standalone/drakbackup:3525
+#: standalone/drakbackup:3539
 #, c-format
 msgid "Restore Failed..."
 msgstr "復元に失敗しました"
 
-#: standalone/drakbackup:3543
+#: standalone/drakbackup:3557
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s が見つかりません.."
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3833
+#: standalone/drakbackup:3778 standalone/drakbackup:3847
 #, c-format
 msgid "Search for files to restore"
 msgstr "復元するファイルを検索"
 
-#: standalone/drakbackup:3768
+#: standalone/drakbackup:3782
 #, c-format
 msgid "Restore all backups"
 msgstr "全バックアップを復元"
 
-#: standalone/drakbackup:3776
+#: standalone/drakbackup:3790
 #, c-format
 msgid "Custom Restore"
 msgstr "カスタム復元"
 
-#: standalone/drakbackup:3780 standalone/drakbackup:3829
+#: standalone/drakbackup:3794 standalone/drakbackup:3843
 #, c-format
 msgid "Restore From Catalog"
 msgstr "カタログから復元"
 
-#: standalone/drakbackup:3801
+#: standalone/drakbackup:3815
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "復元するバックアップがありません..\n"
 
-#: standalone/drakbackup:3802
+#: standalone/drakbackup:3816
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "%s のパスが正しいか確認、"
 
-#: standalone/drakbackup:3803
+#: standalone/drakbackup:3817
 #, c-format
 msgid " and the CD is in the drive"
 msgstr "/CDがドライブに入っているか確認"
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3819
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "マウントできないメディア上のバックアップ - 復元するにはカタログを使ってくださ"
 "い"
 
-#: standalone/drakbackup:3821
+#: standalone/drakbackup:3835
 #, c-format
 msgid "CD in place - continue."
 msgstr "CDが入っています - 続ける"
 
-#: standalone/drakbackup:3826
+#: standalone/drakbackup:3840
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "新しい復元レポジトリを見る"
 
-#: standalone/drakbackup:3827
+#: standalone/drakbackup:3841
 #, c-format
 msgid "Directory To Restore From"
 msgstr "復元もとのディレクトリ"
 
-#: standalone/drakbackup:3863
+#: standalone/drakbackup:3877
 #, c-format
 msgid "Restore Progress"
 msgstr "復元の進行状況"
 
-#: standalone/drakbackup:3974
+#: standalone/drakbackup:3988
 #, c-format
 msgid "Build Backup"
 msgstr "バックアップを作成"
 
-#: standalone/drakbackup:4007 standalone/drakbackup:4327
+#: standalone/drakbackup:4021 standalone/drakbackup:4341
 #, c-format
 msgid "Restore"
 msgstr "復元"
 
-#: standalone/drakbackup:4095 standalone/harddrake2:480
+#: standalone/drakbackup:4109 standalone/harddrake2:479
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "以下のパッケージをインストールします:\n"
 
-#: standalone/drakbackup:4122
+#: standalone/drakbackup:4136
 #, c-format
 msgid "Please select data to restore..."
 msgstr "復元するデータを選んでください。"
 
-#: standalone/drakbackup:4162
+#: standalone/drakbackup:4176
 #, c-format
 msgid "Backup system files"
 msgstr "システムファイルをバックアップ"
 
-#: standalone/drakbackup:4165
+#: standalone/drakbackup:4179
 #, c-format
 msgid "Backup user files"
 msgstr "ユーザファイルをバックアップ"
 
-#: standalone/drakbackup:4168
+#: standalone/drakbackup:4182
 #, c-format
 msgid "Backup other files"
 msgstr "その他のファイルをバックアップ"
 
-#: standalone/drakbackup:4171 standalone/drakbackup:4205
+#: standalone/drakbackup:4185 standalone/drakbackup:4219
 #, c-format
 msgid "Total Progress"
 msgstr "全体の進行状況"
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:4211
 #, c-format
 msgid "Sending files by FTP"
 msgstr "FTPでファイルを送信中.."
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:4214
 #, c-format
 msgid "Sending files..."
 msgstr "ファイルを送信中.."
 
-#: standalone/drakbackup:4270
+#: standalone/drakbackup:4284
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "設定ファイルから今すぐバックアップ"
 
-#: standalone/drakbackup:4275
+#: standalone/drakbackup:4289
 #, c-format
 msgid "View Backup Configuration."
 msgstr "バックアップの設定を見る"
 
-#: standalone/drakbackup:4301
+#: standalone/drakbackup:4315
 #, c-format
 msgid "Wizard Configuration"
 msgstr "ウィザード設定"
 
-#: standalone/drakbackup:4306
+#: standalone/drakbackup:4320
 #, c-format
 msgid "Advanced Configuration"
 msgstr "詳細設定"
 
-#: standalone/drakbackup:4311
+#: standalone/drakbackup:4325
 #, c-format
 msgid "View Configuration"
 msgstr "設定を見る"
 
-#: standalone/drakbackup:4315
+#: standalone/drakbackup:4329
 #, c-format
 msgid "View Last Log"
 msgstr "最後のログを見る"
 
-#: standalone/drakbackup:4320
+#: standalone/drakbackup:4334
 #, c-format
 msgid "Backup Now"
 msgstr "今すぐパックアップ"
 
-#: standalone/drakbackup:4324
+#: standalone/drakbackup:4338
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -20040,15 +20284,15 @@ msgstr ""
 "設定ファイルが見つかりません。\n"
 "ウィザードか詳細をクリックしてください。"
 
-#: standalone/drakbackup:4344 standalone/drakbackup:4347
+#: standalone/drakbackup:4358 standalone/drakbackup:4361
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
 #: standalone/drakboot:76 standalone/harddrake2:190 standalone/harddrake2:191
 #: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:139 standalone/printerdrake:140
-#: standalone/printerdrake:141
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_File"
 msgstr "/ファイル(_F)"
@@ -20059,7 +20303,7 @@ msgid "/File/_Quit"
 msgstr "/ファイル(F)/終了(_Q)"
 
 #: standalone/drakboot:77 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:141
+#: standalone/printerdrake:150
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -20103,6 +20347,11 @@ msgstr "テーマをインストール"
 msgid "Graphical boot theme selection"
 msgstr "グラフィカルな起動テーマを選択"
 
+#: standalone/drakboot:141
+#, fuzzy, c-format
+msgid "Graphical boot mode:"
+msgstr "グラフィカルブートを使う"
+
 #: standalone/drakboot:143
 #, c-format
 msgid "Theme"
@@ -20374,13 +20623,13 @@ msgstr ""
 msgid "Network configuration (%d adapters)"
 msgstr "ネットワークの設定(%d アダプタ)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:803
+#: standalone/drakconnect:89 standalone/drakconnect:807
 #: standalone/drakroam:163
 #, c-format
 msgid "Gateway:"
 msgstr "ゲートウェイ:"
 
-#: standalone/drakconnect:89 standalone/drakconnect:803
+#: standalone/drakconnect:89 standalone/drakconnect:807
 #, c-format
 msgid "Interface:"
 msgstr "インターフェース:"
@@ -20395,8 +20644,8 @@ msgstr "お待ちください"
 msgid "Interface"
 msgstr "インターフェース"
 
-#: standalone/drakconnect:109 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: standalone/drakconnect:109 standalone/printerdrake:222
+#: standalone/printerdrake:229
 #, c-format
 msgid "State"
 msgstr "状態"
@@ -20411,7 +20660,7 @@ msgstr "ホスト名: "
 msgid "Configure hostname..."
 msgstr "ホスト名を設定.."
 
-#: standalone/drakconnect:142 standalone/drakconnect:841
+#: standalone/drakconnect:142 standalone/drakconnect:845
 #, c-format
 msgid "LAN configuration"
 msgstr "LANの設定"
@@ -20533,7 +20782,7 @@ msgstr "バス"
 msgid "Location on the bus"
 msgstr "バスの位置"
 
-#: standalone/drakconnect:696 standalone/drakgw:322
+#: standalone/drakconnect:700 standalone/drakgw:313
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -20542,17 +20791,17 @@ msgstr ""
 "イーサネットアダプタを検出できませんでした。\n"
 "ハードウェア設定ツールを実行してください。"
 
-#: standalone/drakconnect:704
+#: standalone/drakconnect:708
 #, c-format
 msgid "Remove a network interface"
 msgstr "リモートネットワークインターフェース"
 
-#: standalone/drakconnect:708
+#: standalone/drakconnect:712
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "削除するネットワークインターフェースを選択:"
 
-#: standalone/drakconnect:740
+#: standalone/drakconnect:744
 #, c-format
 msgid ""
 "An error occurred while deleting the \"%s\" network interface:\n"
@@ -20563,63 +20812,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:741
+#: standalone/drakconnect:745
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "\"%s\" ネットワークインターフェースを削除しました"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:761
 #, c-format
 msgid "No IP"
 msgstr "IPなし"
 
-#: standalone/drakconnect:758
+#: standalone/drakconnect:762
 #, c-format
 msgid "No Mask"
 msgstr "マスクなし"
 
-#: standalone/drakconnect:759 standalone/drakconnect:912
+#: standalone/drakconnect:763 standalone/drakconnect:916
 #, c-format
 msgid "up"
 msgstr "接続中"
 
-#: standalone/drakconnect:759 standalone/drakconnect:912
+#: standalone/drakconnect:763 standalone/drakconnect:916
 #, c-format
 msgid "down"
 msgstr "未接続"
 
-#: standalone/drakconnect:794 standalone/net_monitor:466
+#: standalone/drakconnect:798 standalone/net_monitor:466
 #, c-format
 msgid "Connected"
 msgstr "接続完了"
 
-#: standalone/drakconnect:794 standalone/net_monitor:466
+#: standalone/drakconnect:798 standalone/net_monitor:466
 #, c-format
 msgid "Not connected"
 msgstr "接続していません"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:800
 #, c-format
 msgid "Disconnect..."
 msgstr "切断.."
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:800
 #, c-format
 msgid "Connect..."
 msgstr "接続.."
 
-#: standalone/drakconnect:837
+#: standalone/drakconnect:841
 #, c-format
 msgid "Deactivate now"
 msgstr "いますぐ無効にする"
 
-#: standalone/drakconnect:837
+#: standalone/drakconnect:841
 #, c-format
 msgid "Activate now"
 msgstr "いますぐ有効にする"
 
-#: standalone/drakconnect:845
+#: standalone/drakconnect:849
 #, c-format
 msgid ""
 "You do not have any configured interface.\n"
@@ -20628,27 +20877,27 @@ msgstr ""
 "設定済みのインターフェースがありません。\n"
 "[設定]をクリックしてまず設定してください。"
 
-#: standalone/drakconnect:859
+#: standalone/drakconnect:863
 #, c-format
 msgid "LAN Configuration"
 msgstr "LANを設定"
 
-#: standalone/drakconnect:871
+#: standalone/drakconnect:875
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "アダプタ %s: %s"
 
-#: standalone/drakconnect:880
+#: standalone/drakconnect:884
 #, c-format
 msgid "Boot Protocol"
 msgstr "起動プロトコル"
 
-#: standalone/drakconnect:881
+#: standalone/drakconnect:885
 #, c-format
 msgid "Started on boot"
 msgstr "起動時に開始"
 
-#: standalone/drakconnect:917
+#: standalone/drakconnect:921
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -20658,7 +20907,7 @@ msgstr ""
 "Mandriva Linuxコントロールセンタの \"インターフェースを追加\" を実行してくだ"
 "さい"
 
-#: standalone/drakconnect:971 standalone/net_applet:51
+#: standalone/drakconnect:975 standalone/net_applet:53
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -20668,37 +20917,37 @@ msgstr ""
 "Mandriva Linuxコントロールセンタの \"%s\" を実行してください。"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:972 standalone/drakroam:42 standalone/net_applet:52
+#: standalone/drakconnect:976 standalone/drakroam:42 standalone/net_applet:54
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "新しいネットワーク・インターフェースを設定 (LAN/ISDN/ADSL等)"
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:981
 #, c-format
 msgid "Internet connection configuration"
 msgstr "インターネット接続の設定"
 
-#: standalone/drakconnect:995
+#: standalone/drakconnect:994
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "サードDNSサーバ(オプション)"
 
-#: standalone/drakconnect:1017
+#: standalone/drakconnect:1016
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "インターネット接続の設定"
 
-#: standalone/drakconnect:1018
+#: standalone/drakconnect:1017
 #, c-format
 msgid "Internet access"
 msgstr "インターネット"
 
-#: standalone/drakconnect:1020 standalone/net_monitor:96
+#: standalone/drakconnect:1019 standalone/net_monitor:96
 #, c-format
 msgid "Connection type: "
 msgstr "接続の種類: "
 
-#: standalone/drakconnect:1023
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Status:"
 msgstr "状態:"
@@ -20881,7 +21130,7 @@ msgstr "フォントのリスト"
 msgid "About"
 msgstr "情報"
 
-#: standalone/drakfont:492 standalone/drakfont:688 standalone/drakfont:726
+#: standalone/drakfont:492 standalone/drakfont:686 standalone/drakfont:724
 #, c-format
 msgid "Uninstall"
 msgstr "アンインストール"
@@ -21019,87 +21268,87 @@ msgstr "Abiword"
 msgid "Generic Printers"
 msgstr "一般プリンタ"
 
-#: standalone/drakfont:585
+#: standalone/drakfont:583
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "フォントファイルかディレクトリを選んで[追加]をクリック"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:584
 #, c-format
 msgid "File Selection"
 msgstr "ファイルを選択"
 
-#: standalone/drakfont:590
+#: standalone/drakfont:588
 #, c-format
 msgid "Fonts"
 msgstr "フォント"
 
-#: standalone/drakfont:653
+#: standalone/drakfont:651
 #, c-format
 msgid "Import fonts"
 msgstr "フォントをインポート"
 
-#: standalone/drakfont:658
+#: standalone/drakfont:656
 #, c-format
 msgid "Install fonts"
 msgstr "フォントをインストール"
 
-#: standalone/drakfont:693
+#: standalone/drakfont:691
 #, c-format
 msgid "click here if you are sure."
 msgstr "よろしければここをクリックしてください"
 
-#: standalone/drakfont:695
+#: standalone/drakfont:693
 #, c-format
 msgid "here if no."
 msgstr "中止するにはここをクリックしてください"
 
-#: standalone/drakfont:734
+#: standalone/drakfont:732
 #, c-format
 msgid "Unselected All"
 msgstr "選択をすべて解除"
 
-#: standalone/drakfont:737
+#: standalone/drakfont:735
 #, c-format
 msgid "Selected All"
 msgstr "全て選択"
 
-#: standalone/drakfont:740
+#: standalone/drakfont:738
 #, c-format
 msgid "Remove List"
 msgstr "リストを削除"
 
-#: standalone/drakfont:751 standalone/drakfont:770
+#: standalone/drakfont:749 standalone/drakfont:768
 #, c-format
 msgid "Importing fonts"
 msgstr "フォントをインポート"
 
-#: standalone/drakfont:755 standalone/drakfont:775
+#: standalone/drakfont:753 standalone/drakfont:773
 #, c-format
 msgid "Initial tests"
 msgstr "初期テスト"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:754
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "システム上のフォントをコピー"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:755
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "フォントのインストールと変換"
 
-#: standalone/drakfont:758
+#: standalone/drakfont:756
 #, c-format
 msgid "Post Install"
 msgstr "インストール後の処理"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:774
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "システムからフォントを削除"
 
-#: standalone/drakfont:777
+#: standalone/drakfont:775
 #, c-format
 msgid "Post Uninstall"
 msgstr "アンインストール後の処理"
@@ -21221,7 +21470,7 @@ msgstr "このゲートウェイをDNSに使用"
 msgid "The DNS Server IP"
 msgstr "DNSサーバのIP"
 
-#: standalone/drakgw:241
+#: standalone/drakgw:238
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -21234,77 +21483,77 @@ msgstr ""
 "ここでは、DHCPサーバの設定オプションを変更できます。\n"
 "オプションの意味が分からない場合は、そのままにしておいてください。"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:245
 #, c-format
 msgid "Use automatic configuration (DHCP)"
 msgstr "自動設定(DHCP)を使用"
 
-#: standalone/drakgw:249
+#: standalone/drakgw:246
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCPのスタートレンジ"
 
-#: standalone/drakgw:250
+#: standalone/drakgw:247
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCPのエンドレンジ"
 
-#: standalone/drakgw:251
+#: standalone/drakgw:248
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "標準lease(秒)"
 
-#: standalone/drakgw:252
+#: standalone/drakgw:249
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "最大lease(秒)"
 
-#: standalone/drakgw:278
+#: standalone/drakgw:272
 #, c-format
 msgid "Proxy caching server (SQUID)"
 msgstr "プロキシキャッシュサーバ(Squid)"
 
-#: standalone/drakgw:282
+#: standalone/drakgw:276
 #, c-format
 msgid "Use this gateway as proxy caching server"
 msgstr "このゲートウェイをプロキシキャッシュサーバに使用"
 
-#: standalone/drakgw:283
+#: standalone/drakgw:277
 #, c-format
 msgid "Admin mail"
 msgstr "管理者のメール"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:278
 #, c-format
 msgid "Visible hostname"
 msgstr "可視ホスト名"
 
-#: standalone/drakgw:285
+#: standalone/drakgw:279
 #, c-format
 msgid "Proxy port"
 msgstr "プロキシポート"
 
-#: standalone/drakgw:286
+#: standalone/drakgw:280
 #, c-format
 msgid "Cache size (MB)"
 msgstr "キャッシュサイズ(MB)"
 
-#: standalone/drakgw:311
+#: standalone/drakgw:302
 #, c-format
 msgid "Broadcast printer information"
 msgstr "プリンタ情報をブロードキャスト"
 
-#: standalone/drakgw:328
+#: standalone/drakgw:319
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "インターネット接続の共有を有効にしました"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:325
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "インターネット接続の共有を無効にしました"
 
-#: standalone/drakgw:340
+#: standalone/drakgw:331
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -21316,17 +21565,17 @@ msgstr ""
 "DHCP(自動ネットワーク設定)とSQUID(Transparent Proxy Cache server)を\n"
 "使って、LANの他のマシンとインターネット接続を共有できます。"
 
-#: standalone/drakgw:375
+#: standalone/drakgw:366
 #, c-format
 msgid "Disabling servers..."
 msgstr "サーバを停止しています.."
 
-#: standalone/drakgw:389
+#: standalone/drakgw:380
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "ファイアウォールの設定を検出しました"
 
-#: standalone/drakgw:390
+#: standalone/drakgw:381
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -21335,12 +21584,12 @@ msgstr ""
 "警告: 既存のファイアウォールの設定を検出しました。\n"
 "インストール後に手動で修正する必要があるかもしれません。"
 
-#: standalone/drakgw:398
+#: standalone/drakgw:386
 #, c-format
 msgid "Configuring..."
 msgstr "設定中.."
 
-#: standalone/drakgw:399
+#: standalone/drakgw:387
 #, c-format
 msgid "Configuring firewall..."
 msgstr "ファイアウォールを設定.."
@@ -21396,130 +21645,155 @@ msgstr ""
 "%sを表示できません。\n"
 " このヘルプ項目はありません\n"
 
-#: standalone/drakhosts:108
+#: standalone/drakhosts:98
 #, c-format
-msgid "Please %s information"
+msgid "Please add an host to be able to modify it."
+msgstr ""
+
+#: standalone/drakhosts:108
+#, fuzzy, c-format
+msgid "Please modify information"
+msgstr "%s の情報をお願いします"
+
+#: standalone/drakhosts:109
+#, fuzzy, c-format
+msgid "Please delete information"
 msgstr "%s の情報をお願いします"
 
 #: standalone/drakhosts:110
+#, fuzzy, c-format
+msgid "Please add information"
+msgstr "%s の情報をお願いします"
+
+#: standalone/drakhosts:115
 #, c-format
 msgid "IP address:"
 msgstr "IPアドレス:"
 
-#: standalone/drakhosts:111
+#: standalone/drakhosts:116
 #, c-format
 msgid "Host name:"
 msgstr "ホスト名:"
 
-#: standalone/drakhosts:112
+#: standalone/drakhosts:117
 #, c-format
 msgid "Host Aliases:"
 msgstr "ホストエイリアス:"
 
-#: standalone/drakhosts:118
+#: standalone/drakhosts:123
 #, c-format
 msgid "Please enter a valid IP address."
 msgstr "有効なIPアドレスを入力してください"
 
-#: standalone/drakhosts:125
+#: standalone/drakhosts:129
 #, c-format
 msgid "Same IP is already in %s file."
 msgstr "同じIPが既に %s ファイルにあります"
 
-#: standalone/drakhosts:194
+#: standalone/drakhosts:198
 #, c-format
 msgid "Host Aliases"
 msgstr "ホストエイリアス"
 
-#: standalone/drakhosts:237
+#: standalone/drakhosts:239
 #, c-format
 msgid "DrakHOSTS manage hosts definitions"
 msgstr "DrakHOSTSはホストの定義を管理します"
 
-#: standalone/drakhosts:246
+#: standalone/drakhosts:248
 #, c-format
 msgid "Failed to add host."
 msgstr "ホストの追加に失敗しました"
 
-#: standalone/drakhosts:253
+#: standalone/drakhosts:255
 #, c-format
 msgid "Failed to Modify host."
 msgstr "ホストの変更に失敗しました"
 
-#: standalone/drakhosts:260
+#: standalone/drakhosts:262
 #, c-format
 msgid "Failed to remove host."
 msgstr "ホストの削除に失敗しました"
 
-#: standalone/drakids:20
-#, c-format
-msgid "Date"
-msgstr "日付"
-
-#: standalone/drakids:21 standalone/drakids:37
-#, c-format
-msgid "Attacker"
-msgstr "攻撃者"
-
-#: standalone/drakids:22
-#, c-format
-msgid "Attack type"
-msgstr "攻撃のタイプ"
+#: standalone/drakids:26
+#, fuzzy, c-format
+msgid "Allowed addresses"
+msgstr "全てのユーザに許可"
 
-#: standalone/drakids:23
-#, c-format
-msgid "Service"
-msgstr "サービス"
+#: standalone/drakids:33 standalone/drakids:134 standalone/drakids:160
+#: standalone/drakids:169 standalone/drakids:179 standalone/drakids:246
+#: standalone/net_applet:61 standalone/net_applet:183
+#: standalone/net_applet:353 standalone/net_applet:390
+#, fuzzy, c-format
+msgid "Interactive Firewall"
+msgstr "有効なファイアウォール"
 
-#: standalone/drakids:24
+#: standalone/drakids:57
 #, c-format
-msgid "Network interface"
-msgstr "ネットワークインターフェース"
+msgid "Log"
+msgstr ""
 
-#: standalone/drakids:60 standalone/net_applet:330
-#, c-format
-msgid "Active Firewall"
-msgstr "有効なファイアウォール"
+#: standalone/drakids:61
+#, fuzzy, c-format
+msgid "Clear logs"
+msgstr "全てをクリア"
 
-#: standalone/drakids:63
+#: standalone/drakids:65 standalone/net_applet:439
 #, c-format
 msgid "Blacklist"
 msgstr "ブラックリスト"
 
-#: standalone/drakids:67
+#: standalone/drakids:69
 #, c-format
 msgid "Remove from blacklist"
 msgstr "ブラックリストから削除"
 
-#: standalone/drakids:68
+#: standalone/drakids:70
 #, c-format
 msgid "Move to whitelist"
 msgstr "ホワイトリストに移動"
 
-#: standalone/drakids:72
+#: standalone/drakids:74 standalone/net_applet:444
 #, c-format
 msgid "Whitelist"
 msgstr "ホワイトリスト"
 
-#: standalone/drakids:76
+#: standalone/drakids:78
 #, c-format
 msgid "Remove from whitelist"
 msgstr "ホワイトリストから削除"
 
-#: standalone/drakids:125
+#: standalone/drakids:134 standalone/drakids:160 standalone/drakids:169
+#: standalone/drakids:179 standalone/drakids:246 standalone/net_applet:183
+#: standalone/net_applet:353
 #, c-format
-msgid "Port scanning"
-msgstr "ポートスキャン"
+msgid "Unable to contact daemon"
+msgstr "デーモンに接続できません"
 
-#: standalone/drakids:126
+#: standalone/drakids:191
 #, c-format
-msgid "Service attack"
-msgstr "サービスの攻撃"
+msgid "Date"
+msgstr "日付"
 
-#: standalone/drakids:127
+#: standalone/drakids:192
 #, c-format
-msgid "Password cracking"
-msgstr "パスワード破り"
+msgid "Attacker"
+msgstr "攻撃者"
+
+#: standalone/drakids:193
+#, c-format
+msgid "Attack type"
+msgstr "攻撃のタイプ"
+
+#: standalone/drakids:194
+#, c-format
+msgid "Service"
+msgstr "サービス"
+
+#: standalone/drakids:195
+#, c-format
+msgid "Network interface"
+msgstr "ネットワークインターフェース"
 
 #: standalone/draknfs:43
 #, c-format
@@ -21556,12 +21830,12 @@ msgstr "NFSサーバを再スタート/リロード.."
 msgid "Error Restarting/Reloading NFS server"
 msgstr "NFSサーバの再スタート/リロードのエラー"
 
-#: standalone/draknfs:102
+#: standalone/draknfs:102 standalone/draksambashare:123
 #, c-format
 msgid "Directory Selection"
 msgstr "ディレクトリの選択"
 
-#: standalone/draknfs:107
+#: standalone/draknfs:107 standalone/draksambashare:128
 #, c-format
 msgid "Should be a directory."
 msgstr "ディレクトリを指定してください"
@@ -21615,26 +21889,28 @@ msgstr ""
 "result.\n"
 
 #: standalone/draknfs:153
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">User ID options</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">root_squash:</span> map requests from uid/"
-"gid 0 to the anonymous uid/gid.\n"
+"<span foreground=\"royalblue3\">map root user as anonymou:</span> map "
+"requests from uid/gid 0 to the anonymous uid/gid (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">no_root_squash:</span> turn off root "
-"squashing. This option is mainly useful for diskless clients.\n"
+"<span foreground=\"royalblue3\">allow real remote root access:</span> turn "
+"off root squashing. This option is mainly useful for diskless clients "
+"(no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">all_squash:</span> map all uids and gids to "
-"the anonymous  user. Useful  for  NFS-exported public FTP directories, news "
-"spool directories, etc. The opposite option is no_all_squash, which is the "
-"default  setting.\n"
+"<span foreground=\"royalblue3\">map all users to anonymous user:</span> map "
+"all uids and gids to the anonymous  user (all_squash). Useful for NFS-"
+"exported public FTP directories, news spool directories, etc. The opposite "
+"option is no user UID mapping (no_all_squash), which is the default "
+"setting.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid and anongid:</span> explicitly  set "
+"<span foreground=\"royalblue3\">anonuid and anongid:</span> explicitly set "
 "the uid and gid of the anonymous account.\n"
 msgstr ""
 "<span weight=\"bold\">ユーザIDのオプション</span>\n"
@@ -21712,112 +21988,117 @@ msgstr ""
 "要求によって生じる変更が安定記憶(例: ディスクドライブ)にコミットされる前にこ"
 "れらの要求に応答することを禁止します。"
 
-#: standalone/draknfs:372
+#: standalone/draknfs:306
+#, c-format
+msgid "Please add an NFS share to be able to modify it."
+msgstr ""
+
+#: standalone/draknfs:373
 #, c-format
 msgid "Advanced Options Help"
 msgstr "上級オプションのヘルプ"
 
-#: standalone/draknfs:383
+#: standalone/draknfs:384
 #, c-format
 msgid "NFS directory"
 msgstr "NFSディレクトリ"
 
-#: standalone/draknfs:385
+#: standalone/draknfs:386 standalone/draksambashare:401
 #, c-format
 msgid "Directory:"
 msgstr "ディレクトリ:"
 
-#: standalone/draknfs:388
+#: standalone/draknfs:389
 #, c-format
 msgid "Host access"
 msgstr "ホストアクセス"
 
-#: standalone/draknfs:390
+#: standalone/draknfs:391
 #, c-format
 msgid "Access:"
 msgstr "アクセス:"
 
-#: standalone/draknfs:390
+#: standalone/draknfs:391
 #, c-format
 msgid "Hosts Access"
 msgstr "ホストアクセス"
 
-#: standalone/draknfs:393
+#: standalone/draknfs:394
 #, c-format
 msgid "User ID Mapping"
 msgstr "ユーザIDマッピング"
 
-#: standalone/draknfs:395
+#: standalone/draknfs:396
 #, c-format
 msgid "User ID:"
 msgstr "ユーザID:"
 
-#: standalone/draknfs:395
+#: standalone/draknfs:396
 #, c-format
 msgid "Help User ID"
 msgstr "ユーザIDのヘルプ"
 
-#: standalone/draknfs:396
+#: standalone/draknfs:397
 #, c-format
 msgid "Anonymous user ID:"
 msgstr "匿名ユーザID:"
 
-#: standalone/draknfs:397
+#: standalone/draknfs:398
 #, c-format
 msgid "Anonymous Group ID:"
 msgstr "匿名グループID:"
 
-#: standalone/draknfs:434 standalone/draknfs:526
+#: standalone/draknfs:435 standalone/draknfs:527 standalone/draksambashare:426
 #, c-format
 msgid "Please enter a directory to share."
 msgstr "共有するディレクトリを入力してください"
 
-#: standalone/draknfs:436
+#: standalone/draknfs:437
 #, c-format
 msgid "You must specify hosts access."
 msgstr "ホストアクセスを指定してください"
 
-#: standalone/draknfs:514
+#: standalone/draknfs:515
 #, c-format
 msgid "Share Directory"
 msgstr "ディレクトリを共有"
 
-#: standalone/draknfs:514
+#: standalone/draknfs:515
 #, c-format
 msgid "Hosts Wildcard"
 msgstr "ホストワイルドカード"
 
-#: standalone/draknfs:514
+#: standalone/draknfs:515
 #, c-format
 msgid "General Options"
 msgstr "全般オプション"
 
-#: standalone/draknfs:514
+#: standalone/draknfs:515
 #, c-format
 msgid "Custom Options"
 msgstr "カスタムオプション"
 
-#: standalone/draknfs:533
+#: standalone/draknfs:534
 #, c-format
 msgid "Please use the modify button to set right access."
 msgstr "正しいアクセスを設定するには変更ボタンを使用してください"
 
-#: standalone/draknfs:588
+#: standalone/draknfs:589
 #, c-format
 msgid "DrakNFS manage NFS shares"
 msgstr "DrakNFSはNFS共有を管理します"
 
-#: standalone/draknfs:597
+#: standalone/draknfs:598
 #, c-format
 msgid "Failed to add NFS share."
 msgstr "NFS共有の追加に失敗しました"
 
-#: standalone/draknfs:604
+#: standalone/draknfs:605
 #, c-format
 msgid "Failed to Modify NFS share."
 msgstr "NFS共有の変更に失敗しました"
 
-#: standalone/draknfs:611
+#: standalone/draknfs:612
 #, c-format
 msgid "Failed to remove an NFS share."
 msgstr "NFS共有の削除に失敗しました"
@@ -21930,7 +22211,7 @@ msgstr "選んだルールを削除"
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
 #: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:233
+#: standalone/printerdrake:243
 #, c-format
 msgid "Edit"
 msgstr "編集"
@@ -22163,7 +22444,7 @@ msgid "Disconnect"
 msgstr "切断"
 
 #. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:241 standalone/printerdrake:239
+#: standalone/drakroam:241 standalone/printerdrake:249
 #, c-format
 msgid "Refresh"
 msgstr "更新"
@@ -22174,6 +22455,262 @@ msgstr "更新"
 msgid "on"
 msgstr "on"
 
+#: standalone/draksambashare:64
+#, fuzzy, c-format
+msgid "Read List"
+msgstr "リストを削除"
+
+#: standalone/draksambashare:65
+#, fuzzy, c-format
+msgid "Write List"
+msgstr "ホワイトリスト"
+
+#: standalone/draksambashare:66 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Admin users"
+msgstr "ユーザを追加"
+
+#: standalone/draksambashare:67 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Valid users"
+msgstr "ユーザを追加"
+
+#: standalone/draksambashare:68 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Hide dot files"
+msgstr "ファイルを隠す"
+
+#: standalone/draksambashare:70
+#, fuzzy, c-format
+msgid "Force Group"
+msgstr "グループ"
+
+#: standalone/draksambashare:71
+#, c-format
+msgid "Force create group"
+msgstr ""
+
+#: standalone/draksambashare:72 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Default case"
+msgstr "デフォルトのユーザ"
+
+#: standalone/draksambashare:73 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Preserve case"
+msgstr "設定"
+
+#: standalone/draksambashare:74 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Create mask"
+msgstr "作成"
+
+#: standalone/draksambashare:75 standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Directory mask"
+msgstr "ディレクトリ"
+
+#: standalone/draksambashare:76
+#, fuzzy, c-format
+msgid "Inherit permissions"
+msgstr "権限"
+
+#: standalone/draksambashare:106
+#, c-format
+msgid "Samba server"
+msgstr "Sambaサーバ"
+
+#: standalone/draksambashare:106
+#, fuzzy, c-format
+msgid "Restarting/Reloading Samba server..."
+msgstr "NFSサーバを再スタート/リロード.."
+
+#: standalone/draksambashare:107
+#, fuzzy, c-format
+msgid "Error Restarting/Reloading Samba server"
+msgstr "NFSサーバの再スタート/リロードのエラー"
+
+#: standalone/draksambashare:234 standalone/draksambashare:242
+#, fuzzy, c-format
+msgid "Add a Samba share"
+msgstr "Sambaサーバ"
+
+#: standalone/draksambashare:237
+#, c-format
+msgid "Goal of this wizard is to easily create a new Samba share."
+msgstr ""
+
+#: standalone/draksambashare:244
+#, fuzzy, c-format
+msgid "Name of the share:"
+msgstr "証明書の名前"
+
+#: standalone/draksambashare:245 standalone/draksambashare:402
+#, fuzzy, c-format
+msgid "Comment:"
+msgstr "コミット"
+
+#: standalone/draksambashare:246
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "パス"
+
+#: standalone/draksambashare:251
+#, c-format
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+
+#: standalone/draksambashare:255 standalone/draksambashare:261
+#, c-format
+msgid "Can\\'t create the directory, please enter a correct path."
+msgstr ""
+
+#: standalone/draksambashare:258 standalone/draksambashare:424
+#, fuzzy, c-format
+msgid "Please enter a Comment for this share."
+msgstr "共有するディレクトリを入力してください"
+
+#: standalone/draksambashare:288 standalone/drakups:120 standalone/drakups:159
+#: standalone/logdrake:449 standalone/logdrake:455
+#, c-format
+msgid "Congratulations"
+msgstr "おめでとうございます"
+
+#: standalone/draksambashare:289
+#, c-format
+msgid ""
+"The wizard successfully added the Samba share. Now just double click on it "
+"in treeview to modify it"
+msgstr ""
+
+#: standalone/draksambashare:321
+#, c-format
+msgid "DrakSamba entry"
+msgstr ""
+
+#: standalone/draksambashare:325
+#, c-format
+msgid "Please add a Samba share to be able to modify it."
+msgstr ""
+
+#: standalone/draksambashare:352
+#, fuzzy, c-format
+msgid "Samba user access"
+msgstr "Sambaサーバ"
+
+#: standalone/draksambashare:360
+#, fuzzy, c-format
+msgid "Mask options"
+msgstr "基本"
+
+#: standalone/draksambashare:374
+#, fuzzy, c-format
+msgid "Display options"
+msgstr "オプションを指定"
+
+#: standalone/draksambashare:397
+#, fuzzy, c-format
+msgid "Samba share directory"
+msgstr "ディレクトリを共有"
+
+#: standalone/draksambashare:400
+#, fuzzy, c-format
+msgid "Share name:"
+msgstr "共有名"
+
+#: standalone/draksambashare:406
+#, c-format
+msgid "Public:"
+msgstr ""
+
+#: standalone/draksambashare:407
+#, fuzzy, c-format
+msgid "Writable:"
+msgstr "書き込み"
+
+#: standalone/draksambashare:408
+#, fuzzy, c-format
+msgid "Browseable:"
+msgstr "ブラウズ"
+
+#: standalone/draksambashare:430
+#, c-format
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Share directory"
+msgstr "ディレクトリを共有"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Comment"
+msgstr "コミット"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Browseable"
+msgstr "ブラウズ"
+
+#: standalone/draksambashare:543
+#, c-format
+msgid "Public"
+msgstr ""
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Writable"
+msgstr "書き込み"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Read list"
+msgstr "読み取り"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Write list"
+msgstr "ホワイトリスト"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Force create mode"
+msgstr "プリンタの機種"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Force group"
+msgstr "PFSグループ"
+
+#: standalone/draksambashare:543
+#, fuzzy, c-format
+msgid "Inherit Permissions"
+msgstr "権限"
+
+#: standalone/draksambashare:590
+#, fuzzy, c-format
+msgid "DrakSamba manage Samba shares"
+msgstr "DrakNFSはNFS共有を管理します"
+
+#: standalone/draksambashare:601
+#, fuzzy, c-format
+msgid "Failed to add Samba share."
+msgstr "NFS共有の追加に失敗しました"
+
+#: standalone/draksambashare:609
+#, fuzzy, c-format
+msgid "Failed to Modify Samba share."
+msgstr "NFS共有の変更に失敗しました"
+
+#: standalone/draksambashare:616
+#, fuzzy, c-format
+msgid "Failed to remove a Samba share."
+msgstr "NFS共有の削除に失敗しました"
+
 #: standalone/draksec:49
 #, c-format
 msgid "ALL"
@@ -22184,7 +22721,7 @@ msgstr "全て"
 msgid "LOCAL"
 msgstr "ローカル"
 
-#: standalone/draksec:53
+#: standalone/draksec:53 standalone/net_applet:449
 #, c-format
 msgid "Ignore"
 msgstr "無視"
@@ -22378,124 +22915,115 @@ msgstr ""
 "注意: ISA PnPサウンドカードをお使いの場合は、alsaconfかsndconfigを使ってくだ"
 "さい。コンソールで'alsaconf'または'sndconfig'と入力します。"
 
-#: standalone/draksplash:15
-#, c-format
-msgid ""
-"package 'ImageMagick' is required to be able to complete configuration.\n"
-"Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
-msgstr ""
-"設定を完了するにはImageMagickが必要です。\n"
-"[OK]を押すとImageMagickをインストールします。[キャンセル]で中止します。"
-
-#: standalone/draksplash:34
+#: standalone/draksplash:30
 #, c-format
 msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr "テキストボックスのx座標を文字数で"
 
-#: standalone/draksplash:35
+#: standalone/draksplash:31
 #, c-format
 msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr "テキストボックスのy座標を文字数で"
 
-#: standalone/draksplash:36
+#: standalone/draksplash:32
 #, c-format
 msgid "text width"
 msgstr "テキストの幅"
 
-#: standalone/draksplash:37
+#: standalone/draksplash:33
 #, c-format
 msgid "text box height"
 msgstr "テキストボックスの高さ"
 
-#: standalone/draksplash:38
+#: standalone/draksplash:34
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr "進行バー左上隅のx座標"
 
-#: standalone/draksplash:39
+#: standalone/draksplash:35
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr "進行バー左上隅のy座標"
 
-#: standalone/draksplash:40
+#: standalone/draksplash:36
 #, c-format
 msgid "the width of the progress bar"
 msgstr "進行バーの幅"
 
-#: standalone/draksplash:41
+#: standalone/draksplash:37
 #, c-format
 msgid "the height of the progress bar"
 msgstr "進行バーの高さ"
 
-#: standalone/draksplash:58 standalone/draksplash:63
+#: standalone/draksplash:54 standalone/draksplash:59
 #, c-format
 msgid "Choose progress bar color"
 msgstr "進行バーの色を選択"
 
-#: standalone/draksplash:59 standalone/draksplash:64
+#: standalone/draksplash:55 standalone/draksplash:60
 #, c-format
 msgid "Choose picture"
 msgstr "画像を選択"
 
-#: standalone/draksplash:60
+#: standalone/draksplash:56
 #, c-format
 msgid "Silent bootsplash"
 msgstr "サイレント起動スプラッシュ"
 
-#: standalone/draksplash:65
+#: standalone/draksplash:61
 #, c-format
 msgid "Verbose bootsplash"
 msgstr "詳細起動スプラッシュ"
 
-#: standalone/draksplash:67
+#: standalone/draksplash:63
 #, c-format
 msgid "Display logo on Console"
 msgstr "コンソールにロゴを表示"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:66
 #, c-format
 msgid "Console bootsplash"
 msgstr "コンソール起動スプラッシュ"
 
-#: standalone/draksplash:76
+#: standalone/draksplash:72
 #, c-format
 msgid "Theme name"
 msgstr "テーマ名"
 
-#: standalone/draksplash:79
+#: standalone/draksplash:75
 #, c-format
 msgid "final resolution"
 msgstr "最終的な解像度"
 
-#: standalone/draksplash:84
+#: standalone/draksplash:80
 #, c-format
 msgid "Save theme"
 msgstr "テーマを保存"
 
-#: standalone/draksplash:145
+#: standalone/draksplash:141
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "起動スプラッシュのテーマを保存中.."
 
-#: standalone/draksplash:159
+#: standalone/draksplash:150
 #, c-format
 msgid "Unable to load image file %s"
 msgstr "イメージファイル %s をロードできません"
 
-#: standalone/draksplash:169
+#: standalone/draksplash:161
 #, c-format
 msgid "choose image"
 msgstr "画像を選択"
 
-#: standalone/draksplash:186
+#: standalone/draksplash:175
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "進行バーの色を選択"
@@ -22543,12 +23071,6 @@ msgstr "自動検出"
 msgid "Detection in progress"
 msgstr "検出中です"
 
-#: standalone/drakups:120 standalone/drakups:159 standalone/logdrake:449
-#: standalone/logdrake:455
-#, c-format
-msgid "Congratulations"
-msgstr "おめでとうございます"
-
 #: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
@@ -24478,7 +25000,7 @@ msgid "class of hardware device"
 msgstr "ハードウェアデバイスのクラス"
 
 #: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:212
+#: standalone/printerdrake:222
 #, c-format
 msgid "Model"
 msgstr "モデル"
@@ -24982,14 +25504,15 @@ msgstr "機能"
 
 #. -PO: please keep all "/" characters !!!
 #: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:135 standalone/printerdrake:148
+#: standalone/printerdrake:144 standalone/printerdrake:157
+#: standalone/printerdrake:169
 #, c-format
 msgid "/_Options"
 msgstr "/オプション(_O)"
 
 #: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:160 standalone/printerdrake:162
-#: standalone/printerdrake:165 standalone/printerdrake:167
+#: standalone/printerdrake:170 standalone/printerdrake:172
+#: standalone/printerdrake:175 standalone/printerdrake:177
 #, c-format
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
@@ -25019,7 +25542,7 @@ msgstr "/パラレルZipドライブを自動検出(_Z)"
 msgid "/_Upload the hardware list"
 msgstr "/ハードウェアのリストを送信(_U)"
 
-#: standalone/harddrake2:192 standalone/printerdrake:141
+#: standalone/harddrake2:192 standalone/printerdrake:150
 #, c-format
 msgid "/_Quit"
 msgstr "/終了(_Q)"
@@ -25041,12 +25564,12 @@ msgid ""
 "in fields displayed on the right frame (\"Information\")"
 msgstr "デバイスを選択すると右のフレームにデバイスの情報が表示されます。"
 
-#: standalone/harddrake2:222 standalone/printerdrake:165
+#: standalone/harddrake2:222 standalone/printerdrake:175
 #, c-format
 msgid "/_Report Bug"
 msgstr "/バグ報告(_R)"
 
-#: standalone/harddrake2:224 standalone/printerdrake:167
+#: standalone/harddrake2:224 standalone/printerdrake:177
 #, c-format
 msgid "/_About..."
 msgstr "/情報(_A)"
@@ -25098,8 +25621,8 @@ msgstr "設定ツールを実行"
 msgid "unknown"
 msgstr "不明"
 
-#: standalone/harddrake2:307 standalone/printerdrake:299
-#: standalone/printerdrake:337
+#: standalone/harddrake2:307 standalone/printerdrake:309
+#: standalone/printerdrake:347
 #, c-format
 msgid "Unknown"
 msgstr "不明"
@@ -25135,22 +25658,22 @@ msgstr "ライタ"
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/harddrake2:546 standalone/harddrake2:549
+#: standalone/harddrake2:545 standalone/harddrake2:548
 #, c-format
 msgid "Upload the hardware list"
 msgstr "ハードウェアのリストを送信"
 
-#: standalone/harddrake2:551
+#: standalone/harddrake2:550
 #, c-format
 msgid "Account:"
 msgstr "アカウント:"
 
-#: standalone/harddrake2:552
+#: standalone/harddrake2:551
 #, c-format
 msgid "Password:"
 msgstr "パスワード:"
 
-#: standalone/harddrake2:553
+#: standalone/harddrake2:552
 #, c-format
 msgid "Hostname:"
 msgstr "ホスト名:"
@@ -25170,7 +25693,18 @@ msgstr "BackSpaceキーがコンソールでDeleteの働きをするようにし
 msgid "LocaleDrake"
 msgstr "LocaleDrake"
 
-#: standalone/localedrake:43
+#: standalone/localedrake:44
+#, 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"
+#: standalone/localedrake:47 standalone/scannerdrake:135
+#, c-format
+msgid ", "
+msgstr ", "
+
+#: standalone/localedrake:55
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr "設定を変更しました。有効にするにはログアウトしてください。"
@@ -25278,7 +25812,7 @@ msgstr "検索"
 msgid "A tool to monitor your logs"
 msgstr "ログを監視するツール"
 
-#: standalone/logdrake:128 standalone/net_applet:293 standalone/net_monitor:94
+#: standalone/logdrake:128 standalone/net_applet:315 standalone/net_monitor:94
 #, c-format
 msgid "Settings"
 msgstr "設定"
@@ -25468,164 +26002,139 @@ msgstr "マウスのテスト"
 msgid "Please test your mouse:"
 msgstr "マウスをテストしてください:"
 
-#: standalone/net_applet:47
+#: standalone/net_applet:49
 #, 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:50
+#: standalone/net_applet:52
 #, c-format
 msgid "Network is down on interface %s. Click on \"Configure Network\""
 msgstr ""
 "インターフェース %s のネットワークが落ちています。'ネットワークを設定'をク"
 "リックしてください"
 
-#: standalone/net_applet:56 standalone/net_monitor:469
+#: standalone/net_applet:58 standalone/net_monitor:469
 #, c-format
 msgid "Connect %s"
 msgstr "%s に接続"
 
-#: standalone/net_applet:57 standalone/net_monitor:469
+#: standalone/net_applet:59 standalone/net_monitor:469
 #, c-format
 msgid "Disconnect %s"
 msgstr "%s を切断"
 
-#: standalone/net_applet:58
+#: standalone/net_applet:60
 #, c-format
 msgid "Monitor Network"
 msgstr "ネットワークをモニタ"
 
-#: standalone/net_applet:59
+#: standalone/net_applet:62
 #, c-format
 msgid "Manage wireless networks"
 msgstr "ワイヤレスネットワークを管理"
 
-#: standalone/net_applet:60
+#: standalone/net_applet:63
 #, c-format
 msgid "Configure Network"
 msgstr "ネットワークを設定"
 
-#: standalone/net_applet:62
+#: standalone/net_applet:65
 #, c-format
 msgid "Watched interface"
 msgstr "監視中のインターフェース"
 
-#: standalone/net_applet:71
+#: standalone/net_applet:74
 #, c-format
 msgid "Profiles"
 msgstr "プロファイル"
 
-#: standalone/net_applet:80
+#: standalone/net_applet:83
 #, c-format
 msgid "Get Online Help"
 msgstr "オンラインヘルプを見る"
 
-#: standalone/net_applet:160
+#: standalone/net_applet:304
 #, c-format
-msgid "Unable to select wireless network: %s"
-msgstr "ワイヤレスネットワークを選択できません: %s"
-
-#: standalone/net_applet:279
-#, c-format
-msgid "Interactive intrusion detection"
-msgstr "インタラクティブ侵入検知"
+msgid "Interactive Firewall automatic mode"
+msgstr ""
 
-#: standalone/net_applet:284
+#: standalone/net_applet:309
 #, c-format
 msgid "Always launch on startup"
 msgstr "起動時に開始"
 
-#: standalone/net_applet:288
-#, c-format
-msgid "Actions"
-msgstr "動作"
-
-#: standalone/net_applet:330
-#, c-format
-msgid "Unable to contact daemon"
-msgstr "デーモンに接続できません"
-
-#: standalone/net_applet:349
-#, c-format
-msgid "A port scanning attack has been attempted by %s."
-msgstr "%s がポートスキャン攻撃を試みました"
-
-#: standalone/net_applet:350
-#, c-format
-msgid "The %s service has been attacked by %s."
-msgstr "サービス %s が %s によって攻撃されました"
-
-#: standalone/net_applet:351
-#, c-format
-msgid "A password cracking attack has been attempted by %s."
-msgstr "%s がパスワードクラック攻撃を試みました"
+#: standalone/net_applet:313
+#, fuzzy, c-format
+msgid "Wireless networks"
+msgstr "ワイヤレスネットワークを管理"
 
-#: standalone/net_applet:359
-#, c-format
-msgid "Active Firewall: intrusion detected"
+#: standalone/net_applet:398
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
 msgstr "アクティブなファイアウォール: 侵入を検知しました "
 
-#: standalone/net_applet:370
-#, c-format
-msgid "Do you want to blacklist the attacker?"
+#: standalone/net_applet:411
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
 msgstr "この攻撃者をブラックリストに載せますか？"
 
-#: standalone/net_applet:384
-#, c-format
-msgid "Always blacklist (do not ask again)"
-msgstr "常にブラックリストに載せる(今後は確認しない)"
-
-#: standalone/net_applet:387
+#: standalone/net_applet:414
 #, c-format
 msgid "Attack details"
 msgstr "攻撃の詳細"
 
-#: standalone/net_applet:391
+#: standalone/net_applet:418
 #, c-format
 msgid "Attack time: %s"
 msgstr "攻撃の時間: %s"
 
-#: standalone/net_applet:392
+#: standalone/net_applet:419
 #, c-format
 msgid "Network interface: %s"
 msgstr "ネットワークインターフェース: %s"
 
-#: standalone/net_applet:393
+#: standalone/net_applet:420
 #, c-format
 msgid "Attack type: %s"
 msgstr "攻撃のタイプ: %s"
 
-#: standalone/net_applet:394
+#: standalone/net_applet:421
 #, c-format
 msgid "Protocol: %s"
 msgstr "プロトコル: %s"
 
-#: standalone/net_applet:395
+#: standalone/net_applet:422
 #, c-format
 msgid "Attacker IP address: %s"
 msgstr "攻撃者のIPアドレス: %s"
 
-#: standalone/net_applet:396
+#: standalone/net_applet:423
 #, c-format
 msgid "Attacker hostname: %s"
 msgstr "攻撃者のhostname: %s"
 
-#: standalone/net_applet:397
+#: standalone/net_applet:426
 #, c-format
 msgid "Service attacked: %s"
 msgstr "攻撃されたサービス: %s"
 
-#: standalone/net_applet:398
+#: standalone/net_applet:427
 #, c-format
 msgid "Port attacked: %s"
 msgstr "攻撃されたポート: %s"
 
-#: standalone/net_applet:399
+#: standalone/net_applet:429
 #, c-format
 msgid "Type of ICMP attack: %s"
 msgstr "ICMP攻撃のタイプ: %s"
 
+#: standalone/net_applet:434
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "常にブラックリストに載せる(今後は確認しない)"
+
 #: standalone/net_monitor:58 standalone/net_monitor:63
 #, c-format
 msgid "Network Monitoring"
@@ -25754,154 +26263,159 @@ msgstr ""
 msgid "No internet connection configured"
 msgstr "インターネット接続が設定されていません"
 
-#: standalone/printerdrake:68
+#: standalone/printerdrake:74
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "インストールしたプリンタのデータを読み込み中.."
 
-#: standalone/printerdrake:117
+#: standalone/printerdrake:126
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s プリンタの管理ツール"
 
-#: standalone/printerdrake:131 standalone/printerdrake:132
-#: standalone/printerdrake:133 standalone/printerdrake:134
+#: standalone/printerdrake:140 standalone/printerdrake:141
 #: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:147
+#: standalone/printerdrake:151 standalone/printerdrake:152
+#: standalone/printerdrake:156
 #, c-format
 msgid "/_Actions"
 msgstr "/アクション(_A)"
 
-#: standalone/printerdrake:131 standalone/printerdrake:143
+#: standalone/printerdrake:140 standalone/printerdrake:152
 #, c-format
 msgid "/_Add Printer"
 msgstr "/プリンタを追加(_A)"
 
-#: standalone/printerdrake:132
+#: standalone/printerdrake:141
 #, c-format
 msgid "/Set as _Default"
 msgstr "/デフォルトに指定(_D)"
 
-#: standalone/printerdrake:133
+#: standalone/printerdrake:142
 #, c-format
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: standalone/printerdrake:134
+#: standalone/printerdrake:143
 #, c-format
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: standalone/printerdrake:135
+#: standalone/printerdrake:144
 #, c-format
 msgid "/_Expert mode"
 msgstr "/エキスパートモード(_E)"
 
-#: standalone/printerdrake:140
+#: standalone/printerdrake:149
 #, c-format
 msgid "/_Refresh"
 msgstr "/更新(_R)"
 
-#: standalone/printerdrake:147
+#: standalone/printerdrake:156
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/CUPSを設定(_C)"
 
-#: standalone/printerdrake:182
+#: standalone/printerdrake:169
+#, fuzzy, c-format
+msgid "/Configure _Auto Administration"
+msgstr "リモート管理"
+
+#: standalone/printerdrake:192
 #, c-format
 msgid "Search:"
 msgstr "検索:"
 
-#: standalone/printerdrake:185
+#: standalone/printerdrake:195
 #, c-format
 msgid "Apply filter"
 msgstr "フィルタを適用"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:222 standalone/printerdrake:229
 #, c-format
 msgid "Def."
 msgstr "Def."
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:222 standalone/printerdrake:229
 #, c-format
 msgid "Printer Name"
 msgstr "プリンタ名"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:222
 #, c-format
 msgid "Connection Type"
 msgstr "接続の種類"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:229
 #, 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:237
 #, c-format
 msgid "Add Printer"
 msgstr "プリンタを追加"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:237
 #, 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:240
 #, c-format
 msgid "Set as default"
 msgstr "デフォルトに設定"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:240
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "選んだプリンタをデフォルトにする"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:243
 #, c-format
 msgid "Edit selected printer"
 msgstr "選んだプリンタを編集"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:246
 #, c-format
 msgid "Delete selected printer"
 msgstr "選んだプリンタを削除"
 
-#: standalone/printerdrake:239
+#: standalone/printerdrake:249
 #, 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:252
 #, c-format
 msgid "Configure CUPS"
 msgstr "CUPSを設定"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:252
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "CUPS印刷システムを設定"
 
-#: standalone/printerdrake:300 standalone/printerdrake:338
+#: standalone/printerdrake:310 standalone/printerdrake:348
 #, c-format
 msgid "Enabled"
 msgstr "有効"
 
-#: standalone/printerdrake:301 standalone/printerdrake:339
+#: standalone/printerdrake:311 standalone/printerdrake:349
 #, c-format
 msgid "Disabled"
 msgstr "無効"
 
-#: standalone/printerdrake:561
+#: standalone/printerdrake:578
 #, c-format
 msgid "Authors: "
 msgstr "作者: "
 
 #. -PO: here %s is the version number
-#: standalone/printerdrake:571
+#: standalone/printerdrake:588
 #, c-format
 msgid "Printer Management %s"
 msgstr "プリンタの管理 (%s)"
@@ -26386,27 +26900,27 @@ msgstr ""
 msgid "Your scanner(s) will not be available on the network."
 msgstr "お使いのスキャナはネットワークで使用できません"
 
-#: standalone/service_harddrake:104
+#: standalone/service_harddrake:105
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "%s ハードウェアクラスのデバイスの一部を削除しました:\n"
 
-#: standalone/service_harddrake:105
+#: standalone/service_harddrake:106
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- %s を削除しました\n"
 
-#: standalone/service_harddrake:108
+#: standalone/service_harddrake:109
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "いくつかのデバイスを追加しました: %s\n"
 
-#: standalone/service_harddrake:109
+#: standalone/service_harddrake:110
 #, c-format
 msgid "- %s was added\n"
 msgstr "- %s を追加しました\n"
 
-#: standalone/service_harddrake:206
+#: standalone/service_harddrake:207
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "ハードウェアを検出中"
@@ -26571,6 +27085,55 @@ msgstr ""
 msgid "Installation failed"
 msgstr "インストール失敗"
 
+#~ msgid ""
+#~ "Enable user disk quota accounting enabled, and optionally enforce limits"
+#~ msgstr "ユーザディスク割当てを有効にしオプションで制限を強制する"
+
+#~ msgid "Printer on SMB/Windows 95/98/NT server"
+#~ msgstr "SMB/Windows 95/98/NT サーバのプリンタ"
+
+#~ msgid "Found printer on %s..."
+#~ msgstr "%s にプリンタを検出.."
+
+#~ msgid "Useless without Terminal Server"
+#~ msgstr "ターミナルサーバなしでは使えません"
+
+#~ msgid ""
+#~ "Please select default client type.\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."
+#~ msgstr ""
+#~ "デフォルトのクライアントの種類を選んでください。\n"
+#~ "    thinクライアントは全てにサーバのCPU/RAMを使用します。ディスプレーは自"
+#~ "分のものを使います。\n"
+#~ "    fatクライアントは自分のCPU/RAMとサーバのファイルシステムを使用します。"
+
+#~ msgid "dhcpd Config..."
+#~ msgstr "DHCPDを設定中.."
+
+#~ msgid ""
+#~ "package 'ImageMagick' is required to be able to complete configuration.\n"
+#~ "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
+#~ msgstr ""
+#~ "設定を完了するにはImageMagickが必要です。\n"
+#~ "[OK]を押すとImageMagickをインストールします。[キャンセル]で中止します。"
+
+#~ msgid "Unable to select wireless network: %s"
+#~ msgstr "ワイヤレスネットワークを選択できません: %s"
+
+#~ msgid "Interactive intrusion detection"
+#~ msgstr "インタラクティブ侵入検知"
+
+#~ msgid "Actions"
+#~ msgstr "動作"
+
+#~ msgid "Active Firewall: intrusion detected"
+#~ msgstr "アクティブなファイアウォール: 侵入を検知しました "
+
+#~ msgid "Do you want to blacklist the attacker?"
+#~ msgstr "この攻撃者をブラックリストに載せますか？"
+
 #~ msgid "allow real remote user access"
 #~ msgstr "実リモートユーザアクセスを許可"
 
@@ -27122,18 +27685,12 @@ msgstr "インストール失敗"
 #~ msgid "\t-Network by webdav.\n"
 #~ msgstr "\t-webdavネットワーク\n"
 
-#~ msgid "Use graphical boot"
-#~ msgstr "グラフィカルブートを使う"
-
 #~ msgid "first step creation"
 #~ msgstr "first stepの作成"
 
 #~ msgid "choose image file"
 #~ msgstr "画像ファイルを選択"
 
-#~ msgid "Browse"
-#~ msgstr "ブラウズ"
-
 #~ msgid "Configure bootsplash picture"
 #~ msgstr "起動スプラッシュの画像を設定"
 
@@ -27308,9 +27865,6 @@ msgstr "インストール失敗"
 #~ msgid "Do you want to recover your system?"
 #~ msgstr "システムを復旧しますか？"
 
-#~ msgid "Samba server"
-#~ msgstr "Sambaサーバ"
-
 #~ msgid "Move"
 #~ msgstr "移動"