sync with code

1 files changed, 259 insertions, 199 deletions

diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index ad8309a6f..3c2aa7c07 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: 2012-12-14 15:17+0100\n"
+"POT-Creation-Date: 2013-04-06 03:21+0200\n"
 "PO-Revision-Date: 2009-02-22 19:41+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: any.pm:261 any.pm:971 diskdrake/interactive.pm:645
+#: any.pm:255 any.pm:964 diskdrake/interactive.pm:645
 #: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931
 #: diskdrake/interactive.pm:1036 diskdrake/interactive.pm:1266
 #: diskdrake/interactive.pm:1324 do_pkgs.pm:242 do_pkgs.pm:287
@@ -28,12 +28,12 @@ msgstr ""
 msgid "Please wait"
 msgstr "お待ちください"
 
-#: any.pm:261
+#: any.pm:255
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "ブートローダをインストール中"
 
-#: any.pm:272
+#: any.pm:266
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -50,12 +50,12 @@ msgstr ""
 "\n"
 "新しいボリューム ID を割り当てますか？"
 
-#: any.pm:283
+#: any.pm:277
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "ブートローダのインストールに失敗しました。以下のエラーが発生:"
 
-#: any.pm:289
+#: any.pm:283
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -73,7 +73,7 @@ msgstr ""
 "と入力してください。\n"
 "次回の起動時にはブートローダのプロンプトが表示されるはずです。"
 
-#: any.pm:329
+#: any.pm:323
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -88,268 +88,268 @@ msgstr ""
 "\n"
 "どのドライブから起動しますか？"
 
-#: any.pm:340
+#: any.pm:334
 #, c-format
 msgid "Bootloader Installation"
 msgstr "ブートローダのインストール"
 
-#: any.pm:344
+#: any.pm:338
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "ブートローダをどこにインストールしますか？"
 
-#: any.pm:368
+#: any.pm:362
 #, c-format
 msgid "First sector (MBR) of drive %s"
 msgstr "ドライブ %s の最初のセクタ (MBR)"
 
-#: any.pm:370
+#: any.pm:364
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "ドライブの最初のセクタ (MBR)"
 
-#: any.pm:372
+#: any.pm:366
 #, c-format
 msgid "First sector of the root partition"
 msgstr "root パーティションの最初のセクタ"
 
-#: any.pm:374
+#: any.pm:368
 #, c-format
 msgid "On Floppy"
 msgstr "フロッピー"
 
-#: any.pm:376 pkgs.pm:283 ugtk2.pm:526
+#: any.pm:370 pkgs.pm:283 ugtk2.pm:526
 #, c-format
 msgid "Skip"
 msgstr "スキップ"
 
-#: any.pm:411
+#: any.pm:405
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "起動方式の設定"
 
-#: any.pm:427 any.pm:460 any.pm:461
+#: any.pm:420 any.pm:453 any.pm:454
 #, c-format
 msgid "Bootloader main options"
 msgstr "ブートローダのメインオプション"
 
-#: any.pm:431
+#: any.pm:424
 #, c-format
 msgid "Bootloader"
 msgstr "ブートローダ"
 
-#: any.pm:432 any.pm:464
+#: any.pm:425 any.pm:457
 #, c-format
 msgid "Bootloader to use"
 msgstr "使用するブートローダ"
 
-#: any.pm:435 any.pm:467
+#: any.pm:428 any.pm:460
 #, c-format
 msgid "Boot device"
 msgstr "起動デバイス"
 
-#: any.pm:438
+#: any.pm:431
 #, c-format
 msgid "Main options"
 msgstr "メインオプション"
 
-#: any.pm:439
+#: any.pm:432
 #, c-format
 msgid "Delay before booting default image"
 msgstr "デフォルトが起動するまでの秒数"
 
-#: any.pm:440
+#: any.pm:433
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI を有効にする"
 
-#: any.pm:441
+#: any.pm:434
 #, c-format
 msgid "Enable SMP"
 msgstr "SMP を有効にする"
 
-#: any.pm:442
+#: any.pm:435
 #, c-format
 msgid "Enable APIC"
 msgstr "APIC を有効にする"
 
-#: any.pm:444
+#: any.pm:437
 #, c-format
 msgid "Enable Local APIC"
 msgstr "ローカル APIC を有効にする"
 
-#: any.pm:445 security/level.pm:63
+#: any.pm:438 security/level.pm:63
 #, c-format
 msgid "Security"
 msgstr "セキュリティ"
 
-#: any.pm:446 any.pm:906 any.pm:925 authentication.pm:249
+#: any.pm:439 any.pm:899 any.pm:918 authentication.pm:249
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "パスワード"
 
-#: any.pm:449 authentication.pm:260
+#: any.pm:442 authentication.pm:260
 #, c-format
 msgid "The passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: any.pm:449 authentication.pm:260 diskdrake/interactive.pm:1499
+#: any.pm:442 authentication.pm:260 diskdrake/interactive.pm:1499
 #, c-format
 msgid "Please try again"
 msgstr "やり直してください"
 
-#: any.pm:451
+#: any.pm:444
 #, c-format
 msgid "You cannot use a password with %s"
 msgstr "%s にはパスワードは使えません"
 
-#: any.pm:455 any.pm:909 any.pm:927 authentication.pm:250
+#: any.pm:448 any.pm:902 any.pm:920 authentication.pm:250
 #, c-format
 msgid "Password (again)"
 msgstr "パスワード (再入力)"
 
-#: any.pm:456
+#: any.pm:449
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "起動するたびに /tmp 以下を消す"
 
-#: any.pm:466
+#: any.pm:459
 #, c-format
 msgid "Init Message"
 msgstr "Init メッセージ"
 
-#: any.pm:468
+#: any.pm:461
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "オープンファームウェアの遅延"
 
-#: any.pm:469
+#: any.pm:462
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "カーネルブートのタイムアウト"
 
-#: any.pm:470
+#: any.pm:463
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "CD からの起動を有効にしますか？"
 
-#: any.pm:471
+#: any.pm:464
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "OF からの起動を有効にしますか？"
 
-#: any.pm:472
+#: any.pm:465
 #, c-format
 msgid "Default OS?"
 msgstr "デフォルトの OS"
 
-#: any.pm:546
+#: any.pm:539
 #, c-format
 msgid "Image"
 msgstr "イメージ"
 
-#: any.pm:547 any.pm:561
+#: any.pm:540 any.pm:554
 #, c-format
 msgid "Root"
 msgstr "root"
 
-#: any.pm:548 any.pm:574
+#: any.pm:541 any.pm:567
 #, c-format
 msgid "Append"
 msgstr "追加"
 
-#: any.pm:550
+#: any.pm:543
 #, c-format
 msgid "Xen append"
 msgstr "Xen 追加"
 
-#: any.pm:552
+#: any.pm:545
 #, c-format
 msgid "Requires password to boot"
 msgstr ""
 
-#: any.pm:554
+#: any.pm:547
 #, c-format
 msgid "Video mode"
 msgstr "ビデオモード"
 
-#: any.pm:556
+#: any.pm:549
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:557
+#: any.pm:550
 #, c-format
 msgid "Network profile"
 msgstr "ネットワークプロファイル"
 
-#: any.pm:566 any.pm:571 any.pm:573 diskdrake/interactive.pm:411
+#: any.pm:559 any.pm:564 any.pm:566 diskdrake/interactive.pm:411
 #, c-format
 msgid "Label"
 msgstr "ラベル"
 
-#: any.pm:568 any.pm:576 harddrake/v4l.pm:438
+#: any.pm:561 any.pm:569 harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "デフォルト"
 
-#: any.pm:575
+#: any.pm:568
 #, c-format
 msgid "NoVideo"
 msgstr "ビデオなし"
 
-#: any.pm:586
+#: any.pm:579
 #, c-format
 msgid "Empty label not allowed"
 msgstr "空白のラベルは使えません"
 
-#: any.pm:587
+#: any.pm:580
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "カーネルイメージを指定してください"
 
-#: any.pm:587
+#: any.pm:580
 #, c-format
 msgid "You must specify a root partition"
 msgstr "root パーティションは必ず指定してください"
 
-#: any.pm:588
+#: any.pm:581
 #, c-format
 msgid "This label is already used"
 msgstr "このラベルは既に使われています"
 
-#: any.pm:606
+#: any.pm:599
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "どの種類のエントリを追加しますか？"
 
-#: any.pm:607
+#: any.pm:600
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:607
+#: any.pm:600
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "他の OS (SunOS...)"
 
-#: any.pm:608
+#: any.pm:601
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "他の OS (MacOS...)"
 
-#: any.pm:608
+#: any.pm:601
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "他の OS (Windows...)"
 
-#: any.pm:655
+#: any.pm:648
 #, c-format
 msgid "Bootloader Configuration"
 msgstr "ブートローダの設定"
 
-#: any.pm:656
+#: any.pm:649
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -358,47 +358,47 @@ msgstr ""
 "起動メニューのエントリは以下のとおりです。\n"
 "エントリは追加/変更できます。"
 
-#: any.pm:867
+#: any.pm:860
 #, c-format
 msgid "access to X programs"
 msgstr "X プログラムへのアクセス"
 
-#: any.pm:868
+#: any.pm:861
 #, c-format
 msgid "access to rpm tools"
 msgstr "RPM ツールへのアクセス"
 
-#: any.pm:869
+#: any.pm:862
 #, c-format
 msgid "allow \"su\""
 msgstr "su を許可する"
 
-#: any.pm:870
+#: any.pm:863
 #, c-format
 msgid "access to administrative files"
 msgstr "管理ファイルへのアクセス"
 
-#: any.pm:871
+#: any.pm:864
 #, c-format
 msgid "access to network tools"
 msgstr "ネットワークツールへのアクセス"
 
-#: any.pm:872
+#: any.pm:865
 #, c-format
 msgid "access to compilation tools"
 msgstr "コンパイルツールへのアクセス"
 
-#: any.pm:878
+#: any.pm:871
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s は追加済み)"
 
-#: any.pm:884
+#: any.pm:877
 #, c-format
 msgid "Please give a user name"
 msgstr "ユーザ名を入力してください"
 
-#: any.pm:885
+#: any.pm:878
 #, fuzzy, c-format
 msgid ""
 "The user name must start with a lower case letter followed by only lower "
@@ -407,147 +407,147 @@ msgstr ""
 "ユーザ名には英語の小文字、数字、ハイフン (-)、アンダースコア (_) しか使えませ"
 "ん"
 
-#: any.pm:886
+#: any.pm:879
 #, c-format
 msgid "The user name is too long"
 msgstr "ユーザ名が長すぎます"
 
-#: any.pm:887
+#: any.pm:880
 #, c-format
 msgid "This user name has already been added"
 msgstr "このユーザ名は既に存在します"
 
-#: any.pm:893 any.pm:929
+#: any.pm:886 any.pm:922
 #, c-format
 msgid "User ID"
 msgstr "ユーザ ID"
 
-#: any.pm:893 any.pm:930
+#: any.pm:886 any.pm:923
 #, c-format
 msgid "Group ID"
 msgstr "グループ ID"
 
-#: any.pm:894
+#: any.pm:887
 #, c-format
 msgid "%s must be a number"
 msgstr "%s は数字でなければいけません"
 
-#: any.pm:895
+#: any.pm:888
 #, c-format
 msgid "%s should be above 500. Accept anyway?"
 msgstr "%s は 500 より上でなければいけません。このまま受け入れますか？"
 
-#: any.pm:899
+#: any.pm:892
 #, c-format
 msgid "User management"
 msgstr "ユーザの管理"
 
-#: any.pm:904
+#: any.pm:897
 #, c-format
 msgid "Enable guest account"
 msgstr ""
 
-#: any.pm:905 authentication.pm:236
+#: any.pm:898 authentication.pm:236
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "管理者 (root) のパスワードを設定"
 
-#: any.pm:911
+#: any.pm:904
 #, c-format
 msgid "Enter a user"
 msgstr "ユーザ名を入力"
 
-#: any.pm:913
+#: any.pm:906
 #, c-format
 msgid "Icon"
 msgstr "アイコン"
 
-#: any.pm:916
+#: any.pm:909
 #, c-format
 msgid "Real name"
 msgstr "本名"
 
-#: any.pm:923
+#: any.pm:916
 #, c-format
 msgid "Login name"
 msgstr "ログイン名"
 
-#: any.pm:928
+#: any.pm:921
 #, c-format
 msgid "Shell"
 msgstr "シェル"
 
-#: any.pm:971
+#: any.pm:964
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "メディアを追加しています。お待ちください..."
 
-#: any.pm:1003 security/l10n.pm:14
+#: any.pm:996 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自動ログイン"
 
-#: any.pm:1004
+#: any.pm:997
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "自動的に特定のユーザでログオンするように設定できます。"
 
-#: any.pm:1005
+#: any.pm:998
 #, c-format
 msgid "Use this feature"
 msgstr "この機能を使います"
 
-#: any.pm:1006
+#: any.pm:999
 #, c-format
 msgid "Choose the default user:"
 msgstr "デフォルトのユーザを選択:"
 
-#: any.pm:1007
+#: any.pm:1000
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "ウィンドウマネージャを選択:"
 
-#: any.pm:1018 any.pm:1032 any.pm:1100
+#: any.pm:1011 any.pm:1025 any.pm:1093
 #, c-format
 msgid "Release Notes"
 msgstr "リリースノート"
 
-#: any.pm:1039 any.pm:1389 interactive/gtk.pm:817
+#: any.pm:1032 any.pm:1382 interactive/gtk.pm:821
 #, c-format
 msgid "Close"
 msgstr "閉じる"
 
-#: any.pm:1086
+#: any.pm:1079
 #, c-format
 msgid "License agreement"
 msgstr "ライセンスへの同意"
 
-#: any.pm:1088 diskdrake/dav.pm:26
+#: any.pm:1081 diskdrake/dav.pm:26 mygtk2.pm:1222
 #, c-format
 msgid "Quit"
 msgstr "終了"
 
-#: any.pm:1095
+#: any.pm:1088
 #, c-format
 msgid "Do you accept this license ?"
 msgstr "このライセンスに同意しますか？"
 
-#: any.pm:1096
+#: any.pm:1089
 #, c-format
 msgid "Accept"
 msgstr "承諾する"
 
-#: any.pm:1096
+#: any.pm:1089
 #, c-format
 msgid "Refuse"
 msgstr "拒否する"
 
-#: any.pm:1122 any.pm:1185
+#: any.pm:1115 any.pm:1178
 #, c-format
 msgid "Please choose a language to use"
 msgstr "使用する言語を選んでください。"
 
-#: any.pm:1150
+#: any.pm:1143
 #, fuzzy, c-format
 msgid ""
 "%s can support multiple languages. Select\n"
@@ -558,87 +558,87 @@ msgstr ""
 "お使いになりたい言語を選んでください。\n"
 "インストール後に再選択することも可能です。"
 
-#: any.pm:1152 fs/partitioning_wizard.pm:174
+#: any.pm:1145 fs/partitioning_wizard.pm:174
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: any.pm:1153
+#: any.pm:1146
 #, fuzzy, c-format
 msgid "Multiple languages"
 msgstr "多言語"
 
-#: any.pm:1154
+#: any.pm:1147
 #, c-format
 msgid "Select Additional Languages"
 msgstr ""
 
-#: any.pm:1163 any.pm:1194
+#: any.pm:1156 any.pm:1187
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "UTF-8 ではないエンコーディング (後方互換性のため)"
 
-#: any.pm:1164
+#: any.pm:1157
 #, c-format
 msgid "All languages"
 msgstr "すべての言語"
 
-#: any.pm:1186
+#: any.pm:1179
 #, c-format
 msgid "Language choice"
 msgstr "言語の選択"
 
-#: any.pm:1240
+#: any.pm:1233
 #, c-format
 msgid "Country / Region"
 msgstr "国名/地域"
 
-#: any.pm:1241
+#: any.pm:1234
 #, c-format
 msgid "Please choose your country"
 msgstr "お住いの国を選んでください"
 
-#: any.pm:1243
+#: any.pm:1236
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "利用可能なすべての国名のリスト"
 
-#: any.pm:1244
+#: any.pm:1237
 #, c-format
 msgid "Other Countries"
 msgstr "他の国"
 
-#: any.pm:1244 interactive.pm:489 interactive/gtk.pm:445
+#: any.pm:1237 interactive.pm:489 interactive/gtk.pm:445
 #, c-format
 msgid "Advanced"
 msgstr "詳細"
 
-#: any.pm:1250
+#: any.pm:1243
 #, c-format
 msgid "Input method:"
 msgstr "入力メソッド:"
 
-#: any.pm:1253
+#: any.pm:1246
 #, c-format
 msgid "None"
 msgstr "なし"
 
-#: any.pm:1334
+#: any.pm:1327
 #, c-format
 msgid "No sharing"
 msgstr "共有しない"
 
-#: any.pm:1334
+#: any.pm:1327
 #, c-format
 msgid "Allow all users"
 msgstr "すべてのユーザに許可"
 
-#: any.pm:1334
+#: any.pm:1327
 #, c-format
 msgid "Custom"
 msgstr "カスタム"
 
-#: any.pm:1338
+#: any.pm:1331
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -652,14 +652,14 @@ msgstr ""
 "クリックするだけで共有することができます。\n"
 "「カスタム」を選ぶとユーザごとに細かく設定できます。\n"
 
-#: any.pm:1350
+#: any.pm:1343
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr "NFS: 伝統的な Unix ファイル共有システム"
 
-#: any.pm:1353
+#: any.pm:1346
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -667,18 +667,18 @@ msgid ""
 msgstr ""
 "SMB: Windows/Mac OS X や新しい Linux システムで使われるファイル共有システム"
 
-#: any.pm:1361
+#: any.pm:1354
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "エクスポートには NFS と SMB を使用できます。どちらを使いますか？"
 
-#: any.pm:1389
+#: any.pm:1382
 #, c-format
 msgid "Launch userdrake"
 msgstr "userdrake を起動"
 
-#: any.pm:1391
+#: any.pm:1384
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -687,54 +687,54 @@ msgstr ""
 "ユーザ別に共有する場合は \"fileshare\" グループを使います。\n"
 "userdrake を使ってこのグループにユーザを追加してください。"
 
-#: any.pm:1498
+#: any.pm:1491
 #, fuzzy, c-format
 msgid ""
 "You need to logout and back in again for changes to take effect. Press OK to "
 "logout now."
 msgstr "変更を有効にするには再ログインしてください。"
 
-#: any.pm:1502
+#: any.pm:1495
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "変更を有効にするには再ログインしてください。"
 
-#: any.pm:1537
+#: any.pm:1530
 #, c-format
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: any.pm:1537
+#: any.pm:1530
 #, c-format
 msgid "Which is your timezone?"
 msgstr "タイムゾーンを選んでください。"
 
-#: any.pm:1560 any.pm:1562
+#: any.pm:1553 any.pm:1555
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日付、時刻とタイムゾーンの設定"
 
-#: any.pm:1563
+#: any.pm:1556
 #, c-format
 msgid "What is the best time?"
 msgstr "どの時刻を使いますか？"
 
-#: any.pm:1567
+#: any.pm:1560
 #, c-format
 msgid "%s (hardware clock set to UTC)"
 msgstr "%s (ハードウェアクロックを UTC に設定)"
 
-#: any.pm:1568
+#: any.pm:1561
 #, c-format
 msgid "%s (hardware clock set to local time)"
 msgstr "%s (ハードウェアクロックをローカルタイムに設定)"
 
-#: any.pm:1570
+#: any.pm:1563
 #, c-format
 msgid "NTP Server"
 msgstr "NTP サーバ"
 
-#: any.pm:1571
+#: any.pm:1564
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "自動的に時間を合わせる (NTP を使用)"
@@ -1066,7 +1066,7 @@ msgstr "ドメイン管理者のパスワード"
 # only the ascii charset will be available
 # so use only 7bit for this message
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:998
+#: bootloader.pm:1014
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1080,47 +1080,47 @@ msgstr ""
 "Ichiran kara OS wo erabu ka Default no OS no kidou wo\n"
 "Matte kudasai.\n"
 
-#: bootloader.pm:1190
+#: bootloader.pm:1206
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO (テキスト表示)"
 
-#: bootloader.pm:1191
+#: bootloader.pm:1207
 #, fuzzy, c-format
 msgid "GRUB2 with graphical menu"
 msgstr "GRUB (グラフィカル表示)"
 
-#: bootloader.pm:1192
+#: bootloader.pm:1208
 #, c-format
 msgid "GRUB with graphical menu"
 msgstr "GRUB (グラフィカル表示)"
 
-#: bootloader.pm:1193
+#: bootloader.pm:1209
 #, c-format
 msgid "GRUB with text menu"
 msgstr "GRUB (テキスト表示)"
 
-#: bootloader.pm:1194
+#: bootloader.pm:1210
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1195
+#: bootloader.pm:1211
 #, c-format
 msgid "SILO"
 msgstr "SILO"
 
-#: bootloader.pm:1281
+#: bootloader.pm:1297
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot の容量が足りません"
 
-#: bootloader.pm:2030
+#: bootloader.pm:2079
 #, c-format
 msgid "You cannot install the bootloader on a %s partition\n"
 msgstr "ブートローダは %s パーティションにはインストールできません\n"
 
-#: bootloader.pm:2197
+#: bootloader.pm:2248
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1128,7 +1128,7 @@ msgid ""
 msgstr ""
 "パーティション番号が変更されたので、ブートローダの設定を更新してください"
 
-#: bootloader.pm:2210
+#: bootloader.pm:2261
 #, c-format
 msgid ""
 "The bootloader cannot be installed correctly. You have to boot rescue and "
@@ -1137,7 +1137,7 @@ msgstr ""
 "ブートローダを正しくインストールできません。レスキューをブートして %s を選ん"
 "でください。"
 
-#: bootloader.pm:2211
+#: bootloader.pm:2262
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "ブートローダを再インストール"
@@ -1235,7 +1235,7 @@ msgstr "マウントポイント"
 msgid "Options"
 msgstr "オプション"
 
-#: diskdrake/dav.pm:68 interactive.pm:388 interactive/gtk.pm:453
+#: diskdrake/dav.pm:68 interactive.pm:388 interactive/gtk.pm:457
 #, c-format
 msgid "Remove"
 msgstr "削除"
@@ -1343,7 +1343,7 @@ msgid "Continue"
 msgstr "続ける"
 
 #: diskdrake/hd_gtk.pm:188 fs/partitioning_wizard.pm:555 interactive.pm:654
-#: interactive/gtk.pm:809 interactive/gtk.pm:827 interactive/gtk.pm:848
+#: interactive/gtk.pm:813 interactive/gtk.pm:831 interactive/gtk.pm:862
 #: ugtk2.pm:936
 #, c-format
 msgid "Help"
@@ -1466,7 +1466,7 @@ msgid "More"
 msgstr "詳細"
 
 #: diskdrake/interactive.pm:281 diskdrake/interactive.pm:294
-#: diskdrake/interactive.pm:1293
+#: diskdrake/interactive.pm:1293 mygtk2.pm:1221
 #, c-format
 msgid "Confirmation"
 msgstr "確認"
@@ -2267,8 +2267,8 @@ msgstr "種類を変更"
 
 #: diskdrake/smbnfs_gtk.pm:81 interactive.pm:130 interactive.pm:551
 #: interactive/curses.pm:267 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:846 ugtk2.pm:415
-#: ugtk2.pm:517 ugtk2.pm:526 ugtk2.pm:812
+#: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:846
+#: mygtk2.pm:1222 ugtk2.pm:415 ugtk2.pm:517 ugtk2.pm:526 ugtk2.pm:812
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
@@ -2775,12 +2775,12 @@ msgstr ""
 msgid "Partitioning failed: %s"
 msgstr "パーティション設定に失敗: %s"
 
-#: fs/type.pm:389
+#: fs/type.pm:390
 #, c-format
 msgid "You cannot use JFS for partitions smaller than 16MB"
 msgstr "16 MB 未満のパーティションに JFS は使えません"
 
-#: fs/type.pm:390
+#: fs/type.pm:391
 #, c-format
 msgid "You cannot use ReiserFS for partitions smaller than 32MB"
 msgstr "32 MB 未満のパーティションに ReiserFS は使えません"
@@ -3276,7 +3276,7 @@ msgstr ""
 "- 古い OSS API との互換性\n"
 "- 新しい ALSA API (多くの拡張機能を提供しますが ALSA ライブラリが必要)\n"
 
-#: harddrake/sound.pm:385 harddrake/sound.pm:468
+#: harddrake/sound.pm:385 harddrake/sound.pm:487
 #, c-format
 msgid "Driver:"
 msgstr "ドライバ:"
@@ -3329,59 +3329,74 @@ msgstr "サウンドのトラブルシューティング"
 #: harddrake/sound.pm:430
 #, c-format
 msgid ""
-"The classic bug sound tester is to run the following commands:\n"
+"Below are some basic tips to help debug audio problems, but for accurate and "
+"up-to-date tips and tricks, please see:\n"
 "\n"
+"https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n"
 "\n"
-"- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card "
-"uses\n"
-"by default\n"
 "\n"
-"- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n"
-"currently uses\n"
 "\n"
-"- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n"
-"loaded or not\n"
+"- General Recommendation: Enable PulseAudio. If you have opted to not to use "
+"PulseAudio, we would strongly advise you enable it. For the vast majority of "
+"desktop use cases, PulseAudio is the recommended and best supported option.\n"
 "\n"
-"- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" will\n"
-"tell you if sound and alsa services are configured to be run on\n"
-"initlevel 3\n"
 "\n"
-"- \"aumix -q\" will tell you if the sound volume is muted or not\n"
 "\n"
-"- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
-msgstr ""
-"サウンドのバグを調べるには以下のコマンドを実行してください:\n"
+"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pauvucontrol"
+"\" (generic) will launch graphical applications to allow you to view your "
+"sound devices and adjust volume levels\n"
+"\n"
 "\n"
+"- \"ps aux | grep pulseaudio\" will check that PulseAudio is running.\n"
 "\n"
-"- \"lspcidrake -v | fgrep -i AUDIO\" はお使いのカードのデフォルトドライバを\n"
-"表示\n"
 "\n"
-"- \"grep sound-slot /etc/modprobe.conf\" は現在使用されているドライバを\n"
-"表示\n"
+"- \"pactl stat\" will check that you can connect to the PulseAudio daemon "
+"correctly.\n"
 "\n"
-"- \"/sbin/lsmod\" はドライバのモジュールがロードされているかどうかを\n"
-"表示\n"
 "\n"
-"- \"/sbin/chkconfig --list sound\" と \"/sbin/chkconfig --list alsa\" は\n"
-"サウンドと ALSA サービスが 'initlevel 3' で有効になっているかどうかを\n"
-"表示\n"
+"- \"pactl list sink-inputs\" will tell you which programs are currently "
+"playing sound via PulseAudio.\n"
 "\n"
-"- \"aumix -q\" はボリュームがミュートになっているかどうかを表示\n"
 "\n"
-"- \"/sbin/fuser -v /dev/dsp\" は現在カードを使用しているプログラムを表示\n"
+"- \"systemctl status osspd.service\" will tell you the current state of the "
+"OSS Proxy Daemon. This is used to enable sound from legacy applications "
+"which use the OSS sound API. You should install the \"ossp\" package if you "
+"need this functionality.\n"
+"\n"
+"\n"
+"- \"pacmd ls\" will give you a LOT of debug information about the current "
+"state of your audio.\n"
+"\n"
+"\n"
+"- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver "
+"your card uses by default.\n"
+"\n"
+"\n"
+"- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound "
+"related kernel modules (drivers) are loaded.\n"
+"\n"
+"\n"
+"- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA "
+"mixer controls for first sound card\n"
+"\n"
+"\n"
+"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are "
+"currently using the sound card directly (normally this should only show "
+"PulseAudio)\n"
+msgstr ""
 
-#: harddrake/sound.pm:457
+#: harddrake/sound.pm:476
 #, c-format
 msgid "Let me pick any driver"
 msgstr "手動でドライバを選択"
 
-#: harddrake/sound.pm:460
+#: harddrake/sound.pm:479
 #, 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:463
+#: harddrake/sound.pm:482
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3461,12 +3476,12 @@ msgstr "いいえ"
 msgid "Choose a file"
 msgstr "ファイルを選択"
 
-#: interactive.pm:388 interactive/gtk.pm:453
+#: interactive.pm:388 interactive/gtk.pm:457
 #, c-format
 msgid "Add"
 msgstr "追加"
 
-#: interactive.pm:388 interactive/gtk.pm:453
+#: interactive.pm:388 interactive/gtk.pm:457
 #, c-format
 msgid "Modify"
 msgstr "変更"
@@ -3501,7 +3516,7 @@ msgstr "指定されたディレクトリは存在しません"
 msgid "No such file"
 msgstr "指定されたファイルは存在しません"
 
-#: interactive/gtk.pm:592
+#: interactive/gtk.pm:596
 #, c-format
 msgid "Beware, Caps Lock is enabled"
 msgstr "Caps Lock がオンになっています"
@@ -4788,17 +4803,17 @@ msgstr "%s へようこそ"
 msgid "Moving used physical extents to other physical volumes failed"
 msgstr "使用中の物理エクステントを他の物理ボリュームに移動できませんでした"
 
-#: lvm.pm:149
+#: lvm.pm:152
 #, c-format
 msgid "Physical volume %s is still in use"
 msgstr "物理ボリューム %s は使用中です"
 
-#: lvm.pm:159
+#: lvm.pm:162
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "まず論理ボリュームを削除してください\n"
 
-#: lvm.pm:202
+#: lvm.pm:205
 #, c-format
 msgid "The bootloader can't handle /boot on multiple physical volumes"
 msgstr "ブートローダは複数の物理ボリューム上の /boot を扱えません"
@@ -5214,12 +5229,12 @@ msgstr "このボタンをクリックしますか？"
 msgid "Password is trivial to guess"
 msgstr ""
 
-#: mygtk2.pm:1542
+#: mygtk2.pm:1565
 #, c-format
 msgid "Password should be resistant to basic attacks"
 msgstr ""
 
-#: mygtk2.pm:1543 mygtk2.pm:1544
+#: mygtk2.pm:1566 mygtk2.pm:1567
 #, fuzzy, c-format
 msgid "Password seems secure"
 msgstr "パスワード"
@@ -5451,8 +5466,8 @@ msgid ""
 "\n"
 "- none if set to \"None\".\n"
 "\n"
-"To authorize the services you need, use /etc/hosts.allow (see hosts.allow"
-"(5))."
+"To authorize the services you need, use /etc/hosts.allow (see hosts."
+"allow(5))."
 msgstr ""
 "Authorize:\n"
 "\n"
@@ -6594,7 +6609,7 @@ msgstr "リモート管理"
 msgid "Database Server"
 msgstr "データベースサーバ"
 
-#: services.pm:188 services.pm:227
+#: services.pm:188 services.pm:225
 #, c-format
 msgid "Services"
 msgstr "サービス"
@@ -6609,22 +6624,22 @@ msgstr "起動時に自動的に開始するサービスを選んでください
 msgid "%d activated for %d registered"
 msgstr "%d 個を起動 (登録数は %d 個)"
 
-#: services.pm:243
+#: services.pm:241
 #, c-format
 msgid "running"
 msgstr "実行中"
 
-#: services.pm:243
+#: services.pm:241
 #, c-format
 msgid "stopped"
 msgstr "停止中"
 
-#: services.pm:248
+#: services.pm:246
 #, c-format
 msgid "Services and daemons"
 msgstr "サービスとデーモン"
 
-#: services.pm:254
+#: services.pm:252
 #, c-format
 msgid ""
 "No additional information\n"
@@ -6633,27 +6648,27 @@ msgstr ""
 "このサービスについての\n"
 "追加情報はありません。"
 
-#: services.pm:259 ugtk2.pm:924
+#: services.pm:257 ugtk2.pm:924
 #, c-format
 msgid "Info"
 msgstr "情報"
 
-#: services.pm:262
+#: services.pm:260
 #, c-format
 msgid "Start when requested"
 msgstr "リクエストがあったときに開始"
 
-#: services.pm:262
+#: services.pm:260
 #, c-format
 msgid "On boot"
 msgstr "起動時に開始"
 
-#: services.pm:280
+#: services.pm:278
 #, c-format
 msgid "Start"
 msgstr "開始"
 
-#: services.pm:280
+#: services.pm:278
 #, c-format
 msgid "Stop"
 msgstr "停止"
@@ -6988,6 +7003,51 @@ msgid "Installation failed"
 msgstr "インストール失敗"
 
 #~ msgid ""
+#~ "The classic bug sound tester is to run the following commands:\n"
+#~ "\n"
+#~ "\n"
+#~ "- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card "
+#~ "uses\n"
+#~ "by default\n"
+#~ "\n"
+#~ "- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n"
+#~ "currently uses\n"
+#~ "\n"
+#~ "- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n"
+#~ "loaded or not\n"
+#~ "\n"
+#~ "- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" "
+#~ "will\n"
+#~ "tell you if sound and alsa services are configured to be run on\n"
+#~ "initlevel 3\n"
+#~ "\n"
+#~ "- \"aumix -q\" will tell you if the sound volume is muted or not\n"
+#~ "\n"
+#~ "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound "
+#~ "card.\n"
+#~ msgstr ""
+#~ "サウンドのバグを調べるには以下のコマンドを実行してください:\n"
+#~ "\n"
+#~ "\n"
+#~ "- \"lspcidrake -v | fgrep -i AUDIO\" はお使いのカードのデフォルトドライバ"
+#~ "を\n"
+#~ "表示\n"
+#~ "\n"
+#~ "- \"grep sound-slot /etc/modprobe.conf\" は現在使用されているドライバを\n"
+#~ "表示\n"
+#~ "\n"
+#~ "- \"/sbin/lsmod\" はドライバのモジュールがロードされているかどうかを\n"
+#~ "表示\n"
+#~ "\n"
+#~ "- \"/sbin/chkconfig --list sound\" と \"/sbin/chkconfig --list alsa\" は\n"
+#~ "サウンドと ALSA サービスが 'initlevel 3' で有効になっているかどうかを\n"
+#~ "表示\n"
+#~ "\n"
+#~ "- \"aumix -q\" はボリュームがミュートになっているかどうかを表示\n"
+#~ "\n"
+#~ "- \"/sbin/fuser -v /dev/dsp\" は現在カードを使用しているプログラムを表示\n"
+
+#~ msgid ""
 #~ "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 #~ "up a firewall to protect your machine from network attacks."
 #~ msgstr ""