usync with code

1 files changed, 232 insertions, 227 deletions

diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index bc0e88bcf..68020e7b5 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX-ja\n"
-"POT-Creation-Date: 2008-08-18 18:01+0200\n"
+"POT-Creation-Date: 2008-08-29 18:51+0200\n"
 "PO-Revision-Date: 2008-08-29 23:26+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: any.pm:245 diskdrake/interactive.pm:554 diskdrake/interactive.pm:741
-#: diskdrake/interactive.pm:785 diskdrake/interactive.pm:843
-#: diskdrake/interactive.pm:1133 do_pkgs.pm:221 do_pkgs.pm:267
-#: harddrake/sound.pm:285 interactive.pm:580
+#: any.pm:252 any.pm:848 diskdrake/interactive.pm:554
+#: diskdrake/interactive.pm:741 diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:843 diskdrake/interactive.pm:1133 do_pkgs.pm:221
+#: do_pkgs.pm:267 harddrake/sound.pm:285 interactive.pm:583
 #, c-format
 msgid "Please wait"
 msgstr "お待ちください"
 
-#: any.pm:245
+#: any.pm:252
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "ブートローダをインストール中"
 
-#: any.pm:256
+#: any.pm:263
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -48,12 +48,12 @@ msgstr ""
 "\n"
 "新しいボリューム ID を割り当てますか？"
 
-#: any.pm:267
+#: any.pm:274
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "ブートローダのインストールに失敗しました。以下のエラーが発生:"
 
-#: any.pm:273
+#: any.pm:280
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -71,7 +71,7 @@ msgstr ""
 "と入力してください。\n"
 "次回の起動時にはブートローダのプロンプトが表示されるはずです。"
 
-#: any.pm:313
+#: any.pm:320
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -86,278 +86,278 @@ msgstr ""
 "\n"
 "どのドライブから起動しますか？"
 
-#: any.pm:339
+#: any.pm:346
 #, c-format
 msgid "First sector (MBR) of drive %s"
 msgstr "ドライブ %s の最初のセクタ (MBR)"
 
-#: any.pm:341
+#: any.pm:348
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "ドライブの最初のセクタ (MBR)"
 
-#: any.pm:343
+#: any.pm:350
 #, c-format
 msgid "First sector of the root partition"
 msgstr "root パーティションの最初のセクタ"
 
-#: any.pm:345
+#: any.pm:352
 #, c-format
 msgid "On Floppy"
 msgstr "フロッピー"
 
-#: any.pm:347
+#: any.pm:354
 #, c-format
 msgid "Skip"
 msgstr "スキップ"
 
-#: any.pm:351
+#: any.pm:358
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/GRUB のインストール"
 
-#: any.pm:352
+#: any.pm:359
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "ブートローダをどこにインストールしますか？"
 
-#: any.pm:379
+#: any.pm:386
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "起動方式の設定"
 
-#: any.pm:389 any.pm:420 any.pm:421
+#: any.pm:396 any.pm:427 any.pm:428
 #, c-format
 msgid "Bootloader main options"
 msgstr "ブートローダのメインオプション"
 
-#: any.pm:393
+#: any.pm:400
 #, c-format
 msgid "Bootloader"
 msgstr "ブートローダ"
 
-#: any.pm:394 any.pm:424
+#: any.pm:401 any.pm:431
 #, c-format
 msgid "Bootloader to use"
 msgstr "使用するブートローダ"
 
-#: any.pm:396 any.pm:426
+#: any.pm:403 any.pm:433
 #, c-format
 msgid "Boot device"
 msgstr "起動デバイス"
 
-#: any.pm:398
+#: any.pm:405
 #, c-format
 msgid "Main options"
 msgstr "メインオプション"
 
-#: any.pm:399
+#: any.pm:406
 #, c-format
 msgid "Delay before booting default image"
 msgstr "デフォルトが起動するまでの秒数"
 
-#: any.pm:400
+#: any.pm:407
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI を有効にする"
 
-#: any.pm:401
+#: any.pm:408
 #, c-format
 msgid "Enable APIC"
 msgstr "APIC を有効にする"
 
-#: any.pm:402
+#: any.pm:409
 #, c-format
 msgid "Enable Local APIC"
 msgstr "ローカル APIC を有効にする"
 
-#: any.pm:404 any.pm:790 any.pm:799 authentication.pm:239
+#: any.pm:411 any.pm:797 any.pm:812 authentication.pm:239
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "パスワード"
 
-#: any.pm:406 authentication.pm:250
+#: any.pm:413 authentication.pm:250
 #, c-format
 msgid "The passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: any.pm:406 authentication.pm:250 diskdrake/interactive.pm:1300
+#: any.pm:413 authentication.pm:250 diskdrake/interactive.pm:1300
 #, c-format
 msgid "Please try again"
 msgstr "やり直してください"
 
-#: any.pm:407
+#: any.pm:414
 #, c-format
 msgid "You can not use a password with %s"
 msgstr "%s にはパスワードは使えません"
 
-#: any.pm:410 any.pm:792 any.pm:801 authentication.pm:240
+#: any.pm:417 any.pm:799 any.pm:814 authentication.pm:240
 #, c-format
 msgid "Password (again)"
 msgstr "パスワード (再入力)"
 
-#: any.pm:411
+#: any.pm:418
 #, c-format
 msgid "Restrict command line options"
 msgstr "コマンドラインオプションの制限"
 
-#: any.pm:411
+#: any.pm:418
 #, c-format
 msgid "restrict"
 msgstr "制限"
 
-#: any.pm:412
+#: any.pm:419
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "コマンドラインオプションを制限するにはパスワードが必要です"
 
-#: any.pm:414
+#: any.pm:421
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "起動するたびに /tmp 以下を消す"
 
 # added a \n to the translation to avoid that the dialog window
 # in which it appears to be tooooo laaaaarge
-#: any.pm:415
+#: any.pm:422
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 "必要なら正確な RAM サイズを入力してください\n"
 "(検出したサイズ: %dMB)"
 
-#: any.pm:416
+#: any.pm:423
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "RAM のサイズを MB で入力"
 
-#: any.pm:425
+#: any.pm:432
 #, c-format
 msgid "Init Message"
 msgstr "Init メッセージ"
 
-#: any.pm:427
+#: any.pm:434
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "オープンファームウェアの遅延"
 
-#: any.pm:428
+#: any.pm:435
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "カーネルブートのタイムアウト"
 
-#: any.pm:429
+#: any.pm:436
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "CD からの起動を有効にしますか？"
 
-#: any.pm:430
+#: any.pm:437
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "OF からの起動を有効にしますか？"
 
-#: any.pm:431
+#: any.pm:438
 #, c-format
 msgid "Default OS?"
 msgstr "デフォルトの OS"
 
-#: any.pm:498
+#: any.pm:505
 #, c-format
 msgid "Image"
 msgstr "イメージ"
 
-#: any.pm:499 any.pm:512
+#: any.pm:506 any.pm:519
 #, c-format
 msgid "Root"
 msgstr "root"
 
-#: any.pm:500 any.pm:525
+#: any.pm:507 any.pm:532
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:502
+#: any.pm:509
 #, c-format
 msgid "Xen append"
 msgstr "Xen 追加"
 
-#: any.pm:505
+#: any.pm:512
 #, c-format
 msgid "Video mode"
 msgstr "ビデオモード"
 
-#: any.pm:507
+#: any.pm:514
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:508
+#: any.pm:515
 #, c-format
 msgid "Network profile"
 msgstr "ネットワークプロファイル"
 
-#: any.pm:517 any.pm:522 any.pm:524 diskdrake/interactive.pm:376
+#: any.pm:524 any.pm:529 any.pm:531 diskdrake/interactive.pm:376
 #, c-format
 msgid "Label"
 msgstr "ラベル"
 
-#: any.pm:519 any.pm:527 harddrake/v4l.pm:438
+#: any.pm:526 any.pm:534 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "デフォルト"
 
-#: any.pm:526
+#: any.pm:533
 #, c-format
 msgid "NoVideo"
 msgstr "ビデオなし"
 
-#: any.pm:537
+#: any.pm:544
 #, c-format
 msgid "Empty label not allowed"
 msgstr "空白のラベルは使えません"
 
-#: any.pm:538
+#: any.pm:545
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "カーネルイメージを指定してください"
 
-#: any.pm:538
+#: any.pm:545
 #, c-format
 msgid "You must specify a root partition"
 msgstr "root パーティションは必ず指定してください"
 
-#: any.pm:539
+#: any.pm:546
 #, c-format
 msgid "This label is already used"
 msgstr "このラベルは既に使われています"
 
-#: any.pm:557
+#: any.pm:564
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "どの種類のエントリを追加しますか？"
 
-#: any.pm:558
+#: any.pm:565
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:558
+#: any.pm:565
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "他の OS (SunOS...)"
 
-#: any.pm:559
+#: any.pm:566
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "他の OS (MacOS...)"
 
-#: any.pm:559
+#: any.pm:566
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "他の OS (Windows...)"
 
-#: any.pm:587
+#: any.pm:594
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -366,47 +366,47 @@ msgstr ""
 "起動メニューのエントリは以下のとおりです。\n"
 "エントリは追加/変更できます。"
 
-#: any.pm:751
+#: any.pm:758
 #, c-format
 msgid "access to X programs"
 msgstr "X プログラムへのアクセス"
 
-#: any.pm:752
+#: any.pm:759
 #, c-format
 msgid "access to rpm tools"
 msgstr "RPM ツールへのアクセス"
 
-#: any.pm:753
+#: any.pm:760
 #, c-format
 msgid "allow \"su\""
 msgstr "su を許可する"
 
-#: any.pm:754
+#: any.pm:761
 #, c-format
 msgid "access to administrative files"
 msgstr "管理ファイルへのアクセス"
 
-#: any.pm:755
+#: any.pm:762
 #, c-format
 msgid "access to network tools"
 msgstr "ネットワークツールへのアクセス"
 
-#: any.pm:756
+#: any.pm:763
 #, c-format
 msgid "access to compilation tools"
 msgstr "コンパイルツールへのアクセス"
 
-#: any.pm:762
+#: any.pm:769
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s は追加済み)"
 
-#: any.pm:768
+#: any.pm:775
 #, c-format
 msgid "Please give a user name"
 msgstr "ユーザ名を入力してください"
 
-#: any.pm:769
+#: any.pm:776
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -414,137 +414,142 @@ msgstr ""
 "ユーザ名には英語の小文字、数字、ハイフン (-)、アンダースコア (_) しか使えませ"
 "ん"
 
-#: any.pm:770
+#: any.pm:777
 #, c-format
 msgid "The user name is too long"
 msgstr "ユーザ名が長すぎます"
 
-#: any.pm:771
+#: any.pm:778
 #, c-format
 msgid "This user name has already been added"
 msgstr "このユーザ名は既に存在します"
 
-#: any.pm:777 any.pm:803
+#: any.pm:784 any.pm:816
 #, c-format
 msgid "User ID"
 msgstr "ユーザ ID"
 
-#: any.pm:777 any.pm:804
+#: any.pm:784 any.pm:817
 #, c-format
 msgid "Group ID"
 msgstr "グループ ID"
 
-#: any.pm:778
+#: any.pm:785
 #, c-format
 msgid "%s must be a number"
 msgstr "%s は数字でなければいけません"
 
-#: any.pm:779
+#: any.pm:786
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s は 500 より上でなければいけません。このまま受け入れますか？"
 
-#: any.pm:783
+#: any.pm:790
 #, c-format
 msgid "User management"
 msgstr "ユーザの管理"
 
-#: any.pm:789 authentication.pm:226
+#: any.pm:796 authentication.pm:226
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "管理者 (root) のパスワードを設定"
 
-#: any.pm:794
+#: any.pm:801
 #, c-format
 msgid "Enter a user"
 msgstr "ユーザ名を入力"
 
-#: any.pm:795
+#: any.pm:803
+#, c-format
+msgid "Icon"
+msgstr "アイコン"
+
+#: any.pm:806
 #, c-format
 msgid "Real name"
 msgstr "本名"
 
-#: any.pm:798
+#: any.pm:810
 #, c-format
 msgid "Login name"
 msgstr "ログイン名"
 
-#: any.pm:802
+#: any.pm:815
 #, c-format
 msgid "Shell"
 msgstr "シェル"
 
-#: any.pm:806
+#: any.pm:848
 #, c-format
-msgid "Icon"
-msgstr "アイコン"
+msgid "Please wait, adding media..."
+msgstr ""
 
-#: any.pm:844 security/l10n.pm:14
+#: any.pm:866 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自動ログイン"
 
-#: any.pm:845
+#: any.pm:867
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "自動的に特定のユーザでログオンするように設定できます。"
 
-#: any.pm:846
+#: any.pm:868
 #, c-format
 msgid "Use this feature"
 msgstr "この機能を使います"
 
-#: any.pm:847
+#: any.pm:869
 #, c-format
 msgid "Choose the default user:"
 msgstr "デフォルトのユーザを選択:"
 
-#: any.pm:848
+#: any.pm:870
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "ウィンドウマネージャを選択:"
 
-#: any.pm:871 any.pm:920
+#: any.pm:881 any.pm:899 any.pm:957
 #, c-format
 msgid "Release Notes"
 msgstr "リリースノート"
 
-#: any.pm:878 any.pm:1217 interactive/gtk.pm:774
+#: any.pm:906 any.pm:1250 interactive/gtk.pm:804
 #, c-format
 msgid "Close"
 msgstr "閉じる"
 
-#: any.pm:914
+#: any.pm:943
 #, c-format
 msgid "License agreement"
 msgstr "ライセンスへの同意"
 
-#: any.pm:916 diskdrake/dav.pm:26
+#: any.pm:945 diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "終了"
 
-#: any.pm:925
+#: any.pm:952
 #, c-format
 msgid "Do you accept this license ?"
 msgstr "このライセンスに同意しますか？"
 
-#: any.pm:926
+#: any.pm:953
 #, c-format
 msgid "Accept"
 msgstr "承諾する"
 
-#: any.pm:926
+#: any.pm:953
 #, c-format
 msgid "Refuse"
 msgstr "拒否する"
 
-#: any.pm:947 any.pm:1012
+#: any.pm:980 any.pm:1045
 #, c-format
 msgid "Please choose a language to use"
 msgstr "使用する言語を選んでください。"
 
-#: any.pm:976
+#: any.pm:1009
 #, c-format
 msgid ""
 "Mandriva Linux can support multiple languages. Select\n"
@@ -555,77 +560,77 @@ msgstr ""
 "お使いになりたい言語を選んでください。\n"
 "インストール後に再選択することも可能です。"
 
-#: any.pm:979
+#: any.pm:1012
 #, c-format
 msgid "Multi languages"
 msgstr "多言語"
 
-#: any.pm:990 any.pm:1021
+#: any.pm:1023 any.pm:1054
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "UTF-8 ではないエンコーディング (後方互換性のため)"
 
-#: any.pm:992
+#: any.pm:1025
 #, c-format
 msgid "All languages"
 msgstr "すべての言語"
 
-#: any.pm:1013
+#: any.pm:1046
 #, c-format
 msgid "Language choice"
 msgstr "言語の選択"
 
-#: any.pm:1068
+#: any.pm:1101
 #, c-format
 msgid "Country / Region"
 msgstr "国名/地域"
 
-#: any.pm:1069
+#: any.pm:1102
 #, c-format
 msgid "Please choose your country."
 msgstr "お住いの国を選んでください"
 
-#: any.pm:1071
+#: any.pm:1104
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "利用可能なすべての国名のリスト"
 
-#: any.pm:1072
+#: any.pm:1105
 #, c-format
 msgid "Other Countries"
 msgstr "他の国"
 
-#: any.pm:1072 interactive.pm:481
+#: any.pm:1105 interactive.pm:484 interactive/gtk.pm:426
 #, c-format
 msgid "Advanced"
 msgstr "詳細"
 
-#: any.pm:1078
+#: any.pm:1111
 #, c-format
 msgid "Input method:"
 msgstr "入力メソッド:"
 
-#: any.pm:1081
+#: any.pm:1114
 #, c-format
 msgid "None"
 msgstr "なし"
 
-#: any.pm:1162
+#: any.pm:1195
 #, c-format
 msgid "No sharing"
 msgstr "共有しない"
 
-#: any.pm:1162
+#: any.pm:1195
 #, c-format
 msgid "Allow all users"
 msgstr "すべてのユーザに許可"
 
-#: any.pm:1162
+#: any.pm:1195
 #, c-format
 msgid "Custom"
 msgstr "カスタム"
 
-#: any.pm:1166
+#: any.pm:1199
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -639,14 +644,14 @@ msgstr ""
 "クリックするだけで共有することができます。\n"
 "「カスタム」を選ぶとユーザごとに細かく設定できます。\n"
 
-#: any.pm:1178
+#: any.pm:1211
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 伝統的な Unix ファイル共有システム"
 
-#: any.pm:1181
+#: any.pm:1214
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -654,18 +659,18 @@ msgid ""
 msgstr ""
 "SMB: Windows/Mac OS X や新しい Linux システムで使われるファイル共有システム"
 
-#: any.pm:1189
+#: any.pm:1222
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "エクスポートには NFS と SMB を使用できます。どちらを使いますか？"
 
-#: any.pm:1217
+#: any.pm:1250
 #, c-format
 msgid "Launch userdrake"
 msgstr "userdrake を起動"
 
-#: any.pm:1219
+#: any.pm:1252
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -674,52 +679,52 @@ msgstr ""
 "ユーザ別に共有する場合は \"fileshare\" グループを使います。\n"
 "userdrake を使ってこのグループにユーザを追加してください。"
 
-#: any.pm:1311
+#: any.pm:1344
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "ログアウトして Ctrl-Alt-BackSpace を押してください"
 
-#: any.pm:1315
+#: any.pm:1348
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "変更を有効にするには再ログインしてください。"
 
-#: any.pm:1350
+#: any.pm:1383
 #, c-format
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: any.pm:1350
+#: any.pm:1383
 #, c-format
 msgid "Which is your timezone?"
 msgstr "タイムゾーンを選んでください。"
 
-#: any.pm:1373 any.pm:1375
+#: any.pm:1406 any.pm:1408
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日付、時刻とタイムゾーンの設定"
 
-#: any.pm:1376
+#: any.pm:1409
 #, c-format
 msgid "What is the best time?"
 msgstr "どの時刻を使いますか？"
 
-#: any.pm:1380
+#: any.pm:1413
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (ハードウェアクロックを UTC に設定)"
 
-#: any.pm:1381
+#: any.pm:1414
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (ハードウェアクロックをローカルタイムに設定)"
 
-#: any.pm:1383
+#: any.pm:1416
 #, c-format
 msgid "NTP Server"
 msgstr "NTP サーバ"
 
-#: any.pm:1384
+#: any.pm:1417
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自動的に時間を合わせる (NTP を使用)"
@@ -817,7 +822,7 @@ msgstr "アクティブディレクトリサーバでの認証に Kerberos と L
 
 #: authentication.pm:96 authentication.pm:130 authentication.pm:149
 #: authentication.pm:150 authentication.pm:176 authentication.pm:200
-#: authentication.pm:871
+#: authentication.pm:878
 #, c-format
 msgid " "
 msgstr " "
@@ -1012,27 +1017,27 @@ msgstr "パスワードなし"
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "このパスワードは短すぎます (最低でも %d 文字以上にしてください)"
 
-#: authentication.pm:353
+#: authentication.pm:358
 #, c-format
 msgid "Can not use broadcast with no NIS domain"
 msgstr "NIS ドメインがないのでブロードキャストを使えません"
 
-#: authentication.pm:866
+#: authentication.pm:873
 #, c-format
 msgid "Select file"
 msgstr "ファイルを選択"
 
-#: authentication.pm:872
+#: authentication.pm:879
 #, c-format
 msgid "Domain Windows for authentication : "
 msgstr "認証に使う Windows ドメイン: "
 
-#: authentication.pm:874
+#: authentication.pm:881
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "ドメイン管理者の名前"
 
-#: authentication.pm:875
+#: authentication.pm:882
 #, c-format
 msgid "Domain Admin Password"
 msgstr "ドメイン管理者のパスワード"
@@ -1205,13 +1210,13 @@ msgstr "マウントポイント"
 msgid "Options"
 msgstr "オプション"
 
-#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:167 diskdrake/removable.pm:26
+#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:174 diskdrake/removable.pm:26
 #: diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151
 #, c-format
 msgid "Done"
 msgstr "完了"
 
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/hd_gtk.pm:265
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:120 diskdrake/hd_gtk.pm:272
 #: diskdrake/interactive.pm:233 diskdrake/interactive.pm:246
 #: diskdrake/interactive.pm:480 diskdrake/interactive.pm:485
 #: diskdrake/interactive.pm:603 diskdrake/interactive.pm:861
@@ -1252,7 +1257,7 @@ msgstr "マウントポイント: "
 msgid "Options: %s"
 msgstr "オプション: %s"
 
-#: diskdrake/hd_gtk.pm:53 diskdrake/interactive.pm:284
+#: diskdrake/hd_gtk.pm:54 diskdrake/interactive.pm:284
 #: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:106
 #: fs/partitioning_wizard.pm:51 fs/partitioning_wizard.pm:206
 #: fs/partitioning_wizard.pm:211 fs/partitioning_wizard.pm:250
@@ -1261,51 +1266,41 @@ msgstr "オプション: %s"
 msgid "Partitioning"
 msgstr "パーティションの設定"
 
-#: diskdrake/hd_gtk.pm:66
+#: diskdrake/hd_gtk.pm:68
 #, c-format
 msgid "Click on a partition, choose a filesystem type then choose an action"
 msgstr ""
 "先にパーティションをクリックしてファイルシステムの種類を選択してから実行する"
 "アクションを選択します"
 
-#: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1010
+#: diskdrake/hd_gtk.pm:102 diskdrake/interactive.pm:1010
 #: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1073
 #, c-format
 msgid "Read carefully!"
 msgstr "よくお読みください"
 
-#: diskdrake/hd_gtk.pm:93
+#: diskdrake/hd_gtk.pm:102
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "まずデータをバックアップしてください"
 
-#: diskdrake/hd_gtk.pm:94 diskdrake/interactive.pm:226
+#: diskdrake/hd_gtk.pm:103 diskdrake/interactive.pm:226
 #, c-format
 msgid "Exit"
 msgstr "終了"
 
-#: diskdrake/hd_gtk.pm:94
+#: diskdrake/hd_gtk.pm:103
 #, c-format
 msgid "Continue"
 msgstr "続ける"
 
-#: diskdrake/hd_gtk.pm:97
-#, c-format
-msgid ""
-"If you plan to use aboot, be careful to leave a free space (2048 sectors is "
-"enough)\n"
-"at the beginning of the disk"
-msgstr ""
-"aboot を使う場合はディスクの先頭に空き領域 (2048 セクタほど)\n"
-"を残してください"
-
-#: diskdrake/hd_gtk.pm:163 interactive.pm:644 interactive/gtk.pm:752
-#: interactive/gtk.pm:767 interactive/gtk.pm:787 ugtk2.pm:942 ugtk2.pm:943
+#: diskdrake/hd_gtk.pm:170 interactive.pm:649 interactive/gtk.pm:781
+#: interactive/gtk.pm:797 interactive/gtk.pm:815 ugtk2.pm:933 ugtk2.pm:934
 #, c-format
 msgid "Help"
 msgstr "ヘルプ"
 
-#: diskdrake/hd_gtk.pm:201
+#: diskdrake/hd_gtk.pm:208
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1316,73 +1311,73 @@ msgstr ""
 "このパーティションをリサイズすることをおすすめします。\n"
 "(パーティションをクリックして「リサイズ」をクリック)"
 
-#: diskdrake/hd_gtk.pm:203
+#: diskdrake/hd_gtk.pm:210
 #, c-format
 msgid "Please click on a partition"
 msgstr "パーティションをクリックしてください"
 
-#: diskdrake/hd_gtk.pm:217 diskdrake/smbnfs_gtk.pm:63
+#: diskdrake/hd_gtk.pm:224 diskdrake/smbnfs_gtk.pm:63
 #, c-format
 msgid "Details"
 msgstr "詳細"
 
-#: diskdrake/hd_gtk.pm:265
+#: diskdrake/hd_gtk.pm:272
 #, c-format
 msgid "No hard drives found"
 msgstr "ハードドライブが見つかりません"
 
-#: diskdrake/hd_gtk.pm:292
+#: diskdrake/hd_gtk.pm:299
 #, c-format
 msgid "Unknown"
 msgstr "不明"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "Ext3"
 msgstr "Ext3"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "XFS"
 msgstr "XFS"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "Swap"
 msgstr "Swap"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:354
+#: diskdrake/hd_gtk.pm:361
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:355 services.pm:158
+#: diskdrake/hd_gtk.pm:362 services.pm:158
 #, c-format
 msgid "Other"
 msgstr "その他"
 
-#: diskdrake/hd_gtk.pm:355 diskdrake/interactive.pm:1195
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:1195
 #, c-format
 msgid "Empty"
 msgstr "空"
 
 # "FS" instead  of "fairuistemu" because we must keep label narrow
-#: diskdrake/hd_gtk.pm:362
+#: diskdrake/hd_gtk.pm:369
 #, c-format
 msgid "Filesystem types:"
 msgstr "ファイルシステムの種類:"
 
-#: diskdrake/hd_gtk.pm:383 diskdrake/interactive.pm:289
+#: diskdrake/hd_gtk.pm:390 diskdrake/interactive.pm:289
 #: diskdrake/interactive.pm:361 diskdrake/interactive.pm:510
 #: diskdrake/interactive.pm:694 diskdrake/interactive.pm:752
 #: diskdrake/interactive.pm:841 diskdrake/interactive.pm:883
@@ -1393,22 +1388,22 @@ msgstr "ファイルシステムの種類:"
 msgid "Warning"
 msgstr "警告"
 
-#: diskdrake/hd_gtk.pm:383
+#: diskdrake/hd_gtk.pm:390
 #, c-format
 msgid "This partition is already empty"
 msgstr "このパーティションは既に空です"
 
-#: diskdrake/hd_gtk.pm:392
+#: diskdrake/hd_gtk.pm:399
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "まず「アンマウント」を使ってください"
 
-#: diskdrake/hd_gtk.pm:392
+#: diskdrake/hd_gtk.pm:399
 #, c-format
 msgid "Use ``%s'' instead (in expert mode)"
 msgstr "代わりにエキスパートモードで %s を使ってください"
 
-#: diskdrake/hd_gtk.pm:392 diskdrake/interactive.pm:374
+#: diskdrake/hd_gtk.pm:399 diskdrake/interactive.pm:374
 #: diskdrake/interactive.pm:548 diskdrake/interactive.pm:1026
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
 #, c-format
@@ -2131,10 +2126,10 @@ msgstr "暗号化アルゴリズム"
 msgid "Change type"
 msgstr "種類を変更"
 
-#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:126 interactive.pm:543
+#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:129 interactive.pm:546
 #: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:411 ugtk2.pm:513
-#: ugtk2.pm:522 ugtk2.pm:807
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:415 ugtk2.pm:517
+#: ugtk2.pm:526 ugtk2.pm:813
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
@@ -2573,8 +2568,8 @@ msgstr ""
 "よろしければ「%s」を押してください。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:165 interactive.pm:542 interactive/curses.pm:263
-#: ugtk2.pm:515
+#: fs/partitioning_wizard.pm:165 interactive.pm:545 interactive/curses.pm:263
+#: ugtk2.pm:519
 #, c-format
 msgid "Next"
 msgstr "次へ"
@@ -2655,12 +2650,12 @@ msgstr ""
 msgid "I can not find any room for installing"
 msgstr "インストール用の空き容量がありません"
 
-#: fs/partitioning_wizard.pm:273
+#: fs/partitioning_wizard.pm:278
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "以下の解決法があります:"
 
-#: fs/partitioning_wizard.pm:284
+#: fs/partitioning_wizard.pm:287
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "パーティション設定に失敗: %s"
@@ -3302,55 +3297,55 @@ msgstr "カードのモデル:"
 msgid "Tuner type:"
 msgstr "チューナの種類:"
 
-#: interactive.pm:125 interactive.pm:542 interactive/curses.pm:263
+#: interactive.pm:128 interactive.pm:545 interactive/curses.pm:263
 #: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
-#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:417 ugtk2.pm:515
-#: ugtk2.pm:807 ugtk2.pm:830
+#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:421 ugtk2.pm:519
+#: ugtk2.pm:813 ugtk2.pm:836
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:806 wizards.pm:156
+#: interactive.pm:227 modules/interactive.pm:71 ugtk2.pm:812 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "はい"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:806 wizards.pm:156
+#: interactive.pm:227 modules/interactive.pm:71 ugtk2.pm:812 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "いいえ"
 
-#: interactive.pm:258
+#: interactive.pm:261
 #, c-format
 msgid "Choose a file"
 msgstr "ファイルを選択"
 
-#: interactive.pm:383 interactive/gtk.pm:428
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Add"
 msgstr "追加"
 
-#: interactive.pm:383 interactive/gtk.pm:428
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Modify"
 msgstr "変更"
 
-#: interactive.pm:383 interactive/gtk.pm:428
+#: interactive.pm:386 interactive/gtk.pm:436
 #, c-format
 msgid "Remove"
 msgstr "削除"
 
-#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:515
+#: interactive.pm:545 interactive/curses.pm:263 ugtk2.pm:519
 #, c-format
 msgid "Finish"
 msgstr "完了"
 
-#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:513
+#: interactive.pm:546 interactive/curses.pm:260 ugtk2.pm:517
 #, c-format
 msgid "Previous"
 msgstr "戻る"
 
-#: interactive/gtk.pm:556
+#: interactive/gtk.pm:564
 #, c-format
 msgid "Beware, Caps Lock is enabled"
 msgstr "Caps Lock がオンになっています"
@@ -4627,7 +4622,7 @@ msgstr "ザンビア"
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: lang.pm:1201
+#: lang.pm:1208
 #, c-format
 msgid "Welcome to %s"
 msgstr "%s へようこそ"
@@ -5905,32 +5900,37 @@ msgstr "セキュリティ"
 msgid "DrakSec Basic Options"
 msgstr "DrakSec の基本的なオプション"
 
-#: security/level.pm:56
+#: security/level.pm:58
 #, c-format
 msgid "Please choose the desired security level"
 msgstr "セキュリティレベルを選んでください"
 
 #: security/level.pm:60
 #, c-format
-msgid "Security level"
-msgstr "セキュリティレベル"
+msgid "%s: %s"
+msgstr ""
 
-#: security/level.pm:62
+#: security/level.pm:63
 #, c-format
 msgid "Use libsafe for servers"
 msgstr "サーバに libsafe を使う"
 
-#: security/level.pm:63
+#: security/level.pm:64
 #, c-format
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
 msgstr "バッファオーバーフローやフォーマットストリング攻撃を防御するライブラリ"
 
-#: security/level.pm:64
-#, c-format
-msgid "Security Administrator (login or email)"
+#: security/level.pm:65
+#, fuzzy, c-format
+msgid "Security Administrator:"
 msgstr "セキュリティ管理者 (ログイン名かメールアドレス)"
 
+#: security/level.pm:66
+#, c-format
+msgid "Login or email:"
+msgstr ""
+
 #: services.pm:19
 #, c-format
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
@@ -6395,7 +6395,7 @@ msgstr ""
 "このサービスについての\n"
 "追加情報はありません。"
 
-#: services.pm:221 ugtk2.pm:917
+#: services.pm:221 ugtk2.pm:923
 #, c-format
 msgid "Info"
 msgstr "情報"
@@ -6726,51 +6726,36 @@ msgstr "ロシア"
 msgid "Yugoslavia"
 msgstr "ユーゴスラビア"
 
-#: ugtk2.pm:807
+#: ugtk2.pm:813
 #, c-format
 msgid "Is this correct?"
 msgstr "正しいですか？"
 
-#: ugtk2.pm:867
+#: ugtk2.pm:873
 #, c-format
 msgid "No file chosen"
 msgstr "ファイルが選択されていません"
 
-#: ugtk2.pm:869
+#: ugtk2.pm:875
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr "ファイルではなくディレクトリを選んでください"
 
-#: ugtk2.pm:871
+#: ugtk2.pm:877
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr "ディレクトリではなくファイルを選んでください"
 
-#: ugtk2.pm:873
+#: ugtk2.pm:879
 #, c-format
 msgid "No such directory"
 msgstr "指定されたディレクトリは存在しません"
 
-#: ugtk2.pm:873
+#: ugtk2.pm:879
 #, c-format
 msgid "No such file"
 msgstr "指定されたファイルは存在しません"
 
-#: ugtk2.pm:952
-#, c-format
-msgid "Expand Tree"
-msgstr "ツリーを展開する"
-
-#: ugtk2.pm:953
-#, c-format
-msgid "Collapse Tree"
-msgstr "ツリーを折りたたむ"
-
-#: ugtk2.pm:954
-#, c-format
-msgid "Toggle between flat and group sorted"
-msgstr "フラット表示/グループ別表示を切り替える"
-
 #: wizards.pm:95
 #, c-format
 msgid ""
@@ -6786,6 +6771,26 @@ msgstr ""
 msgid "Installation failed"
 msgstr "インストール失敗"
 
+#~ msgid ""
+#~ "If you plan to use aboot, be careful to leave a free space (2048 sectors "
+#~ "is enough)\n"
+#~ "at the beginning of the disk"
+#~ msgstr ""
+#~ "aboot を使う場合はディスクの先頭に空き領域 (2048 セクタほど)\n"
+#~ "を残してください"
+
+#~ msgid "Security level"
+#~ msgstr "セキュリティレベル"
+
+#~ msgid "Expand Tree"
+#~ msgstr "ツリーを展開する"
+
+#~ msgid "Collapse Tree"
+#~ msgstr "ツリーを折りたたむ"
+
+#~ msgid "Toggle between flat and group sorted"
+#~ msgstr "フラット表示/グループ別表示を切り替える"
+
 #~ msgid "Choose action"
 #~ msgstr "動作を選択"