[SILENT_COMMIT] Update of POT and PO files for the manual

1 files changed, 182 insertions, 123 deletions

diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 7e02970cb..9f6a47af3 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-04-25 00:10+0000\n"
+"POT-Creation-Date: 2008-04-30 00:09+0000\n"
 "PO-Revision-Date: 2008-04-06 07:11+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: \n"
@@ -27,7 +27,7 @@ msgstr ""
 "トールを自動化するものです。"
 
 #. Tag: para
-#: preseed.xml:23 preseed.xml:654
+#: preseed.xml:23 preseed.xml:662
 #, no-c-format
 msgid ""
 "The configuration fragments used in this appendix are also available as an "
@@ -582,42 +582,43 @@ msgstr ""
 "前解決ができ (おそらく DHCP でローカルドメイン追加後)、 そのマシンが DHCP "
 "サーバであることを前提にしています。 <literal>example.com</literal> というド"
 "メインのサイトが、 普通のまともな DHCP を設定していれば、 <literal>http://"
-"autoserver.example.com/d-i/&releasename;/./preseed.cfg</literal> から、preseed ファイ"
-"ルを取得するようになります。"
+"autoserver.example.com/d-i/&releasename;/./preseed.cfg</literal> から、"
+"preseed ファイルを取得するようになります。"
 
 #. Tag: para
 #: preseed.xml:391
 #, no-c-format
 msgid ""
-"The last part of that url (<literal>d-i/&releasename;/./preseed.cfg</literal>) is "
-"taken from <literal>auto-install/defaultroot</literal>. By default this "
-"includes the directory <literal>&releasename;</literal> to allow future versions to "
-"specify their own codename and let people migrate forwards in a controlled "
-"manner. The <literal>/./</literal> bit is used to indicate a root, relative "
-"to which subsequent paths can be anchored (for use in preseed/include and "
-"preseed/run). This allows files to be specified either as full URLs, paths "
-"starting with / that are thus anchored, or even paths relative to the "
-"location where the last preseed file was found. This can be used to "
-"construct more portable scripts where an entire hierarchy of scripts can be "
-"moved to a new location without breaking it, for example copying the files "
-"onto a USB stick when they started out on a web server. In this example, if "
-"the preseed file sets <literal>preseed/run</literal> to <literal>/scripts/"
-"late_command.sh</literal> then the file will be fetched from <literal>http://"
-"autoserver.example.com/d-i/&releasename;/./scripts/late_command.sh</literal>."
+"The last part of that url (<literal>d-i/&releasename;/./preseed.cfg</"
+"literal>) is taken from <literal>auto-install/defaultroot</literal>. By "
+"default this includes the directory <literal>&releasename;</literal> to "
+"allow future versions to specify their own codename and let people migrate "
+"forwards in a controlled manner. The <literal>/./</literal> bit is used to "
+"indicate a root, relative to which subsequent paths can be anchored (for use "
+"in preseed/include and preseed/run). This allows files to be specified "
+"either as full URLs, paths starting with / that are thus anchored, or even "
+"paths relative to the location where the last preseed file was found. This "
+"can be used to construct more portable scripts where an entire hierarchy of "
+"scripts can be moved to a new location without breaking it, for example "
+"copying the files onto a USB stick when they started out on a web server. In "
+"this example, if the preseed file sets <literal>preseed/run</literal> to "
+"<literal>/scripts/late_command.sh</literal> then the file will be fetched "
+"from <literal>http://autoserver.example.com/d-i/&releasename;/./scripts/"
+"late_command.sh</literal>."
 msgstr ""
 "URL (<literal>d-i/&releasename;/./preseed.cfg</literal>) の最後の部分は、 "
 "<literal>auto-install/defaultroot</literal> から取られています。 デフォルトで"
 "は、将来のバージョンでコードネームを指定して移行していけるように、 "
-"<literal>&releasename;</literal> ディレクトリが含まれています。 <literal>/./</"
-"literal> は、その後に続くパスが確定するように、 ルートからの相対パスを示しま"
-"す (preseed/include や preseed/run で使用)。 これにより、完全な URLや / で始"
-"まるパス、 前回 preseed が見つかった場所からの相対パスでファイルを指定できま"
-"す。 スクリプトの階層構造を壊さずに新しい場所に移動できる (例えば ウェブサー"
-"バで開始し、USB メモリにコピーする)、 よりポータブルなスクリプトを構成するの"
-"に便利です。 このサンプルでは、preseed ファイルの <literal>preseed/run</"
+"<literal>&releasename;</literal> ディレクトリが含まれています。 <literal>/./"
+"</literal> は、その後に続くパスが確定するように、 ルートからの相対パスを示し"
+"ます (preseed/include や preseed/run で使用)。 これにより、完全な URLや / で"
+"始まるパス、 前回 preseed が見つかった場所からの相対パスでファイルを指定でき"
+"ます。 スクリプトの階層構造を壊さずに新しい場所に移動できる (例えば ウェブ"
+"サーバで開始し、USB メモリにコピーする)、 よりポータブルなスクリプトを構成す"
+"るのに便利です。 このサンプルでは、preseed ファイルの <literal>preseed/run</"
 "literal> に <literal>/scripts/late_command.sh</literal> が設定されている場"
-"合、 <literal>http://autoserver.example.com/d-i/&releasename;/./scripts/late_command."
-"sh</literal> からファイルを取得します。"
+"合、 <literal>http://autoserver.example.com/d-i/&releasename;/./scripts/"
+"late_command.sh</literal> からファイルを取得します。"
 
 #. Tag: para
 #: preseed.xml:411
@@ -1039,6 +1040,18 @@ msgstr ""
 #: preseed.xml:584
 #, no-c-format
 msgid ""
+"For debconf variables (templates) used in the installer itself, the owner "
+"should be set to <quote>d-i</quote>; to preseed variables used in the "
+"installed system, the name of the package that contains the corresponding "
+"debconf template should be used. Only variables that have their owner set to "
+"something other than <quote>d-i</quote> will be propagated to the debconf "
+"database for the installed system."
+msgstr ""
+
+#. Tag: para
+#: preseed.xml:592
+#, no-c-format
+msgid ""
 "Most questions need to be preseeded using the values valid in English and "
 "not the translated values. However, there are some questions (for example in "
 "<classname>partman</classname>) where the translated values need to be used."
@@ -1047,7 +1060,7 @@ msgstr ""
 "(<classname>partman</classname> など) 訳した値を使用できる質問もあります。"
 
 #. Tag: para
-#: preseed.xml:590
+#: preseed.xml:598
 #, no-c-format
 msgid ""
 "Some questions take a code as value instead of the English text that is "
@@ -1057,7 +1070,7 @@ msgstr ""
 "るものがあります。"
 
 #. Tag: para
-#: preseed.xml:596
+#: preseed.xml:604
 #, no-c-format
 msgid ""
 "The easiest way to create a preconfiguration file is to use the example file "
@@ -1067,7 +1080,7 @@ msgstr ""
 "にあるサンプルファイルを元にして作業することです。"
 
 #. Tag: para
-#: preseed.xml:601
+#: preseed.xml:609
 #, no-c-format
 msgid ""
 "An alternative method is to do a manual installation and then, after "
@@ -1081,7 +1094,7 @@ msgstr ""
 "を 1 ファイルに出力してください。"
 
 #. Tag: screen
-#: preseed.xml:608
+#: preseed.xml:616
 #, no-c-format
 msgid ""
 "$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
@@ -1091,7 +1104,7 @@ msgstr ""
 "$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
 
 #. Tag: para
-#: preseed.xml:610
+#: preseed.xml:618
 #, no-c-format
 msgid ""
 "However, a file generated in this manner will have some items that should "
@@ -1102,7 +1115,7 @@ msgstr ""
 "んどのユーザはサンプルファイルから始めるのがよいでしょう。"
 
 #. Tag: para
-#: preseed.xml:618
+#: preseed.xml:626
 #, no-c-format
 msgid ""
 "This method relies on the fact that, at the end of the installation, the "
@@ -1117,7 +1130,7 @@ msgstr ""
 "で、 デフォルトでは root にのみ読み込みが許可されています。"
 
 #. Tag: para
-#: preseed.xml:626
+#: preseed.xml:634
 #, no-c-format
 msgid ""
 "The directory <filename>/var/log/installer</filename> and all files in it "
@@ -1129,7 +1142,7 @@ msgstr ""
 "削除されます。"
 
 #. Tag: para
-#: preseed.xml:634
+#: preseed.xml:642
 #, no-c-format
 msgid ""
 "To check possible values for questions, you can use <command>nano</command> "
@@ -1145,7 +1158,7 @@ msgstr ""
 "い。"
 
 #. Tag: para
-#: preseed.xml:642
+#: preseed.xml:650
 #, no-c-format
 msgid ""
 "To check if the format of your preconfiguration file is valid before "
@@ -1157,14 +1170,14 @@ msgstr ""
 "replaceable></command> が使えます。"
 
 #. Tag: title
-#: preseed.xml:653
+#: preseed.xml:661
 #, fuzzy, no-c-format
 #| msgid "Contents of the preconfiguration file"
 msgid "Contents of the preconfiguration file (for &releasename;)"
 msgstr "事前設定ファイルの内容"
 
 #. Tag: para
-#: preseed.xml:659
+#: preseed.xml:667
 #, no-c-format
 msgid ""
 "Note that this example is based on an installation for the Intel x86 "
@@ -1179,13 +1192,13 @@ msgstr ""
 "そのアーキテクチャ用に適切な debconf 設定で置き換える必要があるでしょう。"
 
 #. Tag: title
-#: preseed.xml:670
+#: preseed.xml:678
 #, no-c-format
 msgid "Localization"
 msgstr "地域化"
 
 #. Tag: para
-#: preseed.xml:671
+#: preseed.xml:679
 #, no-c-format
 msgid ""
 "Setting localization values will only work if you are using initrd "
@@ -1196,7 +1209,7 @@ msgstr ""
 "の方法では、 この質問をされた後にしか事前設定ファイルを読み込めません。"
 
 #. Tag: para
-#: preseed.xml:677
+#: preseed.xml:685
 #, no-c-format
 msgid ""
 "The locale can be used to specify both language and country. To specify the "
@@ -1208,7 +1221,7 @@ msgstr ""
 "ださい。"
 
 #. Tag: screen
-#: preseed.xml:683
+#: preseed.xml:691
 #, no-c-format
 msgid ""
 "# Locale sets language and country.\n"
@@ -1218,7 +1231,7 @@ msgstr ""
 "d-i debian-installer/locale string en_US"
 
 #. Tag: para
-#: preseed.xml:685
+#: preseed.xml:693
 #, no-c-format
 msgid ""
 "Keyboard configuration consists of selecting a keyboard architecture and a "
@@ -1232,7 +1245,7 @@ msgstr ""
 "たキーボードアーキテクチャで、有効でなくてはなりません。"
 
 #. Tag: screen
-#: preseed.xml:692
+#: preseed.xml:700
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
@@ -1248,7 +1261,7 @@ msgstr ""
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
 #. Tag: para
-#: preseed.xml:694
+#: preseed.xml:702
 #, no-c-format
 msgid ""
 "To skip keyboard configuration, preseed <classname>console-tools/archs</"
@@ -1260,7 +1273,7 @@ msgstr ""
 "れにより、カーネルのキーマップが有効になったままとなります。"
 
 #. Tag: para
-#: preseed.xml:703
+#: preseed.xml:711
 #, no-c-format
 msgid ""
 "The changes in the input layer for 2.6 kernels have made the keyboard "
@@ -1272,13 +1285,13 @@ msgstr ""
 "userinput>) キーマップが既に選択されています。"
 
 #. Tag: title
-#: preseed.xml:713
+#: preseed.xml:721
 #, no-c-format
 msgid "Network configuration"
 msgstr "ネットワーク設定"
 
 #. Tag: para
-#: preseed.xml:714
+#: preseed.xml:722
 #, no-c-format
 msgid ""
 "Of course, preseeding the network configuration won't work if you're loading "
@@ -1293,7 +1306,7 @@ msgstr ""
 "メータは、カーネルブートパラメータで渡すことになります。"
 
 #. Tag: para
-#: preseed.xml:722
+#: preseed.xml:730
 #, no-c-format
 msgid ""
 "If you need to pick a particular interface when netbooting before loading a "
@@ -1305,7 +1318,7 @@ msgstr ""
 "replaceable></userinput> のようにブートパラメータを使用してください。"
 
 #. Tag: para
-#: preseed.xml:728
+#: preseed.xml:736
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Although preseeding the network configuration is normally not possible "
@@ -1332,19 +1345,19 @@ msgstr ""
 "というものです。"
 
 #. Tag: screen
-#: preseed.xml:738
+#: preseed.xml:746
 #, no-c-format
 msgid "killall.sh; netcfg"
 msgstr "killall.sh; netcfg"
 
 #. Tag: para
-#: preseed.xml:740
+#: preseed.xml:748
 #, no-c-format
 msgid "The following debconf variables are relevant for network configuration."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:746
+#: preseed.xml:754
 #, no-c-format
 msgid ""
 "# netcfg will choose an interface that has link if possible. This makes it\n"
@@ -1426,13 +1439,13 @@ msgstr ""
 "#d-i netcfg/dhcp_hostname string radish"
 
 #. Tag: title
-#: preseed.xml:751
+#: preseed.xml:759
 #, no-c-format
 msgid "Mirror settings"
 msgstr "ミラーサイト設定"
 
 #. Tag: para
-#: preseed.xml:752
+#: preseed.xml:760
 #, no-c-format
 msgid ""
 "Depending on the installation method you use, a mirror may be used to "
@@ -1446,7 +1459,7 @@ msgstr ""
 "用できます。"
 
 #. Tag: para
-#: preseed.xml:759
+#: preseed.xml:767
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1456,7 +1469,7 @@ msgstr ""
 "用の組を設定します。"
 
 #. Tag: para
-#: preseed.xml:764
+#: preseed.xml:772
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1474,7 +1487,7 @@ msgstr ""
 "<classname>mirror/suite</classname> と同じです。"
 
 #. Tag: screen
-#: preseed.xml:776
+#: preseed.xml:784
 #, no-c-format
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1502,13 +1515,13 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:781
+#: preseed.xml:789
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "時計と時間帯の設定"
 
 #. Tag: screen
-#: preseed.xml:783
+#: preseed.xml:791
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1536,13 +1549,13 @@ msgstr ""
 "#d-i clock-setup/ntp-server ntp.example.com"
 
 #. Tag: title
-#: preseed.xml:788
+#: preseed.xml:796
 #, no-c-format
 msgid "Partitioning"
 msgstr "パーティション分割"
 
 #. Tag: para
-#: preseed.xml:789
+#: preseed.xml:797
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
@@ -1561,7 +1574,7 @@ msgstr ""
 "ん。"
 
 #. Tag: para
-#: preseed.xml:800
+#: preseed.xml:808
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1573,7 +1586,7 @@ msgstr ""
 "なければなりません。"
 
 #. Tag: screen
-#: preseed.xml:808
+#: preseed.xml:816
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1711,13 +1724,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:813
+#: preseed.xml:821
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "RAID を用いたパーティション分割"
 
 #. Tag: para
-#: preseed.xml:814
+#: preseed.xml:822
 #, no-c-format
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1733,7 +1746,7 @@ msgstr ""
 "bootloader\"/> をご覧ください。"
 
 #. Tag: para
-#: preseed.xml:824
+#: preseed.xml:832
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also a very "
@@ -1748,7 +1761,7 @@ msgstr ""
 "が発生したら、<filename>/var/log/syslog</filename> をチェックしてください。"
 
 #. Tag: para
-#: preseed.xml:832
+#: preseed.xml:840
 #, no-c-format
 msgid ""
 "Note that only RAID 0 and RAID 1 have been tested by the developers of the "
@@ -1760,7 +1773,7 @@ msgstr ""
 "アデバイスを使用した、 拡張 RAID セットアップは軽くテストしただけです。"
 
 #. Tag: screen
-#: preseed.xml:840
+#: preseed.xml:848
 #, no-c-format
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1858,13 +1871,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:845
+#: preseed.xml:853
 #, no-c-format
 msgid "Base system installation"
 msgstr "ベースシステムのインストール"
 
 #. Tag: para
-#: preseed.xml:846
+#: preseed.xml:854
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1875,7 +1888,7 @@ msgstr ""
 "カーネルのインストールに関するものだけです。"
 
 #. Tag: screen
-#: preseed.xml:853
+#: preseed.xml:861
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1897,13 +1910,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string linux-image-2.6-486"
 
 #. Tag: title
-#: preseed.xml:858
+#: preseed.xml:866
 #, no-c-format
 msgid "Account setup"
 msgstr "アカウント設定"
 
 #. Tag: para
-#: preseed.xml:859
+#: preseed.xml:867
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1915,7 +1928,7 @@ msgstr ""
 "emphasis>のどちらかを 使用できます。"
 
 #. Tag: para
-#: preseed.xml:866
+#: preseed.xml:874
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1931,7 +1944,7 @@ msgstr ""
 "ません。"
 
 #. Tag: screen
-#: preseed.xml:876
+#: preseed.xml:884
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1989,7 +2002,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:878
+#: preseed.xml:886
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2008,26 +2021,26 @@ msgstr ""
 "利です。"
 
 #. Tag: para
-#: preseed.xml:888
+#: preseed.xml:896
 #, no-c-format
 msgid ""
-"An MD5 hash for a password can be generated using the following command."
-msgstr "パスワードの MD5 ハッシュは以下のコマンドで生成できます。"
+"The following command can be used to generate an MD5 hash for a password:"
+msgstr ""
 
 #. Tag: screen
-#: preseed.xml:892
+#: preseed.xml:900
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:898
+#: preseed.xml:906
 #, no-c-format
 msgid "Apt setup"
 msgstr "apt 設定"
 
 #. Tag: para
-#: preseed.xml:899
+#: preseed.xml:907
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2040,7 +2053,7 @@ msgstr ""
 "らに、他の (ローカルな) リポジトリを追加できます。"
 
 #. Tag: screen
-#: preseed.xml:907
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2098,13 +2111,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:912
+#: preseed.xml:920
 #, no-c-format
 msgid "Package selection"
 msgstr "パッケージ選択"
 
 #. Tag: para
-#: preseed.xml:913
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2114,73 +2127,73 @@ msgstr ""
 "スクを以下に書き出します。"
 
 #. Tag: userinput
-#: preseed.xml:922
+#: preseed.xml:930
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:925
+#: preseed.xml:933
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:928
+#: preseed.xml:936
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:931
+#: preseed.xml:939
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:934
+#: preseed.xml:942
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:937
+#: preseed.xml:945
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:940
+#: preseed.xml:948
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:943
+#: preseed.xml:951
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:946
+#: preseed.xml:954
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:949
+#: preseed.xml:957
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:952
+#: preseed.xml:960
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:956
+#: preseed.xml:964
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2192,7 +2205,7 @@ msgstr ""
 "クは常に含めるのをお奨めします。"
 
 #. Tag: para
-#: preseed.xml:962
+#: preseed.xml:970
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2207,7 +2220,7 @@ msgstr ""
 "白で区切ったパッケージのリストを取れます。"
 
 #. Tag: screen
-#: preseed.xml:972
+#: preseed.xml:980
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2239,14 +2252,41 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:977
+#: preseed.xml:985
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "ブートローダのインストール"
 
 #. Tag: screen
-#: preseed.xml:979
-#, no-c-format
+#: preseed.xml:987
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
+#| "# instead, uncomment this:\n"
+#| "#d-i grub-installer/skip boolean true\n"
+#| "# To also skip installing lilo, and install no bootloader, uncomment "
+#| "this\n"
+#| "# too:\n"
+#| "#d-i lilo-installer/skip boolean true\n"
+#| "\n"
+#| "# This is fairly safe to set, it makes grub install automatically to the "
+#| "MBR\n"
+#| "# if no other operating system is detected on the machine.\n"
+#| "d-i grub-installer/only_debian boolean true\n"
+#| "\n"
+#| "# This one makes grub-installer install to the MBR if it also finds some "
+#| "other\n"
+#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
+#| "d-i grub-installer/with_other_os boolean true\n"
+#| "\n"
+#| "# Alternatively, if you want to install to a location other than the "
+#| "mbr,\n"
+#| "# uncomment and edit these lines:\n"
+#| "#d-i grub-installer/only_debian boolean false\n"
+#| "#d-i grub-installer/with_other_os boolean false\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
+#| "# To install grub to multiple disks:\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2271,7 +2311,13 @@ msgid ""
 "#d-i grub-installer/with_other_os boolean false\n"
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
-"#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
+"#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"\n"
+"# Optional password for grub, either in clear text\n"
+"#d-i grub-installer/password password r00tme\n"
+"#d-i grub-installer/password-again password r00tme\n"
+"# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
+"#d-i grub-installer/password-crypted password [MD5 hash]"
 msgstr ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2298,14 +2344,23 @@ msgstr ""
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
 
+#. Tag: para
+#: preseed.xml:989
+#, no-c-format
+msgid ""
+"An MD5 hash for a password for <classname>grub</classname> can be generated "
+"using <command>grub-md5-crypt</command>, or using the command from the "
+"example in <xref linkend=\"preseed-account\"/>."
+msgstr ""
+
 #. Tag: title
-#: preseed.xml:984
+#: preseed.xml:999
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "インストールの仕上げ"
 
 #. Tag: screen
-#: preseed.xml:986
+#: preseed.xml:1001
 #, no-c-format
 msgid ""
 "# Avoid that last message about the install being complete.\n"
@@ -2331,13 +2386,13 @@ msgstr ""
 "#d-i debian-installer/exit/halt boolean true"
 
 #. Tag: title
-#: preseed.xml:991
+#: preseed.xml:1006
 #, no-c-format
 msgid "X configuration"
 msgstr "X の設定"
 
 #. Tag: para
-#: preseed.xml:992
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Preseeding Debian's X config is possible, but you probably need to know some "
@@ -2349,7 +2404,7 @@ msgstr ""
 "タはすべてを自動設定するわけには行かないのです。"
 
 #. Tag: screen
-#: preseed.xml:1000
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -2397,13 +2452,13 @@ msgstr ""
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
-#: preseed.xml:1005
+#: preseed.xml:1020
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "他パッケージの preseed"
 
 #. Tag: screen
-#: preseed.xml:1007
+#: preseed.xml:1022
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2423,19 +2478,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1014
+#: preseed.xml:1029
 #, no-c-format
 msgid "Advanced options"
 msgstr "高度なオプション"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1032
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "インストール中のカスタムコマンド実行"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1033
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2445,7 +2500,7 @@ msgstr ""
 "るといった、 とても強力で柔軟なオプションが存在します。"
 
 #. Tag: screen
-#: preseed.xml:1026
+#: preseed.xml:1041
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2483,13 +2538,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1031
+#: preseed.xml:1046
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "preseed を用いたデフォルト値変更"
 
 #. Tag: para
-#: preseed.xml:1032
+#: preseed.xml:1047
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2515,7 +2570,7 @@ msgstr ""
 "やデバッグにも便利です。"
 
 #. Tag: para
-#: preseed.xml:1046
+#: preseed.xml:1061
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2534,13 +2589,13 @@ msgstr ""
 "効果を及ぼしません。"
 
 #. Tag: title
-#: preseed.xml:1061
+#: preseed.xml:1076
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "事前設定ファイルの多重読み込み"
 
 #. Tag: para
-#: preseed.xml:1062
+#: preseed.xml:1077
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2555,7 +2610,7 @@ msgstr ""
 "り確かな設定を指定するという使い方ができます。"
 
 #. Tag: screen
-#: preseed.xml:1072
+#: preseed.xml:1087
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2605,7 +2660,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1074
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
@@ -2621,3 +2676,7 @@ msgstr ""
 "す。 この場合、2 種類の異なる preseed が実行されることに注意してください。 例"
 "えば、preseed/early コマンドを実行する機会が 2 度あり、 2 回目はネットワーク"
 "に接続した時に発生するということです。"
+
+#~ msgid ""
+#~ "An MD5 hash for a password can be generated using the following command."
+#~ msgstr "パスワードの MD5 ハッシュは以下のコマンドで生成できます。"