Update pot files and Japanese Translation (based r66154).

1 files changed, 245 insertions, 230 deletions

diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index d96b93ba1..3713c3642 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
-"PO-Revision-Date: 2010-07-26 10:11+0900\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
+"PO-Revision-Date: 2010-12-29 23:36+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "Language: ja\n"
@@ -319,7 +319,7 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:252
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "For the other preseeding methods you need to tell the installer what file "
 #| "to use when you boot it. This is normally done by passing the kernel a "
@@ -340,9 +340,13 @@ msgid ""
 msgstr ""
 "他の preseed 方法では、起動時にどのファイルを読み込むか、インストーラに指定す"
 "る必要があります。通常、カーネルのブートパラメータで渡して行います。これは起"
-"動時に手動で与えるか、ブートローダ設定ファイル (例: <filename>syslinux.cfg</"
-"filename>) を編集し、カーネルへの append 行の最後にパラメータを追加して与えま"
-"す。"
+"動時に手動で与えるか、ブートローダ設定ファイル <phrase arch=\"linux-any\">"
+"(例: <filename>syslinux.cfg</filename>) を編集し、カーネルへの append 行の最"
+"後にパラメータを追加します。</phrase><phrase arch=\"kfreebsd-any\">(例: "
+"<filename>grub.cfg</filename>) を編集し、カーネルへの 新しい <literal>set</"
+"literal> 行としてパラメータを追加します。</phrase><phrase arch=\"hurd-any\">"
+"(例: <filename>grub.cfg</filename>) を編集し、<filename>gnumach.gz</"
+"filename> 行の最後にパラメータを追加します。</phrase>"
 
 #. Tag: para
 #: preseed.xml:265
@@ -1249,14 +1253,22 @@ msgstr ""
 "(キーボードの選択やブートローダの選択など) は適切でないかもしれませんので、そ"
 "のアーキテクチャ用に適切な debconf 設定で置き換える必要があるでしょう。"
 
+#. Tag: para
+#: preseed.xml:689
+#, no-c-format
+msgid ""
+"Details on how the different Debian Installer components actually work can "
+"be found in <xref linkend=\"module-details\"/>."
+msgstr ""
+
 #. Tag: title
-#: preseed.xml:692
+#: preseed.xml:697
 #, no-c-format
 msgid "Localization"
 msgstr "地域化"
 
 #. Tag: para
-#: preseed.xml:693
+#: preseed.xml:698
 #, no-c-format
 msgid ""
 "Setting localization values will only work if you are using initrd "
@@ -1267,7 +1279,7 @@ msgstr ""
 "の方法では、この質問をされた後にしか事前設定ファイルを読み込めません。"
 
 #. Tag: para
-#: preseed.xml:699
+#: preseed.xml:704
 #, no-c-format
 msgid ""
 "The locale can be used to specify both language and country and can be any "
@@ -1284,7 +1296,7 @@ msgstr ""
 "replaceable></userinput> としてください。"
 
 #. Tag: para
-#: preseed.xml:708
+#: preseed.xml:713
 #, no-c-format
 msgid ""
 "Although this method is very easy to use, it does not allow preseeding of "
@@ -1305,7 +1317,7 @@ msgstr ""
 "ブートパラメータで指定できます。"
 
 #. Tag: screen
-#: preseed.xml:723
+#: preseed.xml:728
 #, no-c-format
 msgid ""
 "# Preseeding only locale sets language, country and locale.\n"
@@ -1329,7 +1341,7 @@ msgstr ""
 "#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
 
 #. Tag: para
-#: preseed.xml:725
+#: preseed.xml:730
 #, no-c-format
 msgid ""
 "Keyboard configuration consists of selecting a keyboard architecture and a "
@@ -1343,7 +1355,7 @@ msgstr ""
 "キーボードアーキテクチャ向けに、&d-i; で有効でなくてはなりません。"
 
 #. Tag: screen
-#: preseed.xml:732
+#: preseed.xml:737
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
@@ -1359,7 +1371,7 @@ msgstr ""
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
 #. Tag: para
-#: preseed.xml:734
+#: preseed.xml:739
 #, no-c-format
 msgid ""
 "To skip keyboard configuration, preseed <classname>console-tools/archs</"
@@ -1371,7 +1383,7 @@ msgstr ""
 "カーネルのキーマップが有効になったままとなります。"
 
 #. Tag: para
-#: preseed.xml:743
+#: preseed.xml:748
 #, no-c-format
 msgid ""
 "The changes in the input layer for 2.6 kernels have made the keyboard "
@@ -1383,13 +1395,13 @@ msgstr ""
 "キーマップが既に選択されています。"
 
 #. Tag: title
-#: preseed.xml:753
+#: preseed.xml:758
 #, no-c-format
 msgid "Network configuration"
 msgstr "ネットワーク設定"
 
 #. Tag: para
-#: preseed.xml:754
+#: preseed.xml:759
 #, no-c-format
 msgid ""
 "Of course, preseeding the network configuration won't work if you're loading "
@@ -1404,7 +1416,7 @@ msgstr ""
 "タは、カーネルブートパラメータで渡すことになります。"
 
 #. Tag: para
-#: preseed.xml:762
+#: preseed.xml:767
 #, no-c-format
 msgid ""
 "If you need to pick a particular interface when netbooting before loading a "
@@ -1416,7 +1428,7 @@ msgstr ""
 "replaceable></userinput> のようにブートパラメータを使用してください。"
 
 #. Tag: para
-#: preseed.xml:768
+#: preseed.xml:773
 #, no-c-format
 msgid ""
 "Although preseeding the network configuration is normally not possible when "
@@ -1435,19 +1447,19 @@ msgstr ""
 "というものです。"
 
 #. Tag: screen
-#: preseed.xml:778
+#: preseed.xml:783
 #, no-c-format
 msgid "killall.sh; netcfg"
 msgstr "killall.sh; netcfg"
 
 #. Tag: para
-#: preseed.xml:780
+#: preseed.xml:785
 #, no-c-format
 msgid "The following debconf variables are relevant for network configuration."
 msgstr "以下の debconf 変数は、ネットワークの設定と関係があります。"
 
 #. Tag: screen
-#: preseed.xml:786
+#: preseed.xml:791
 #, no-c-format
 msgid ""
 "# Disable network configuration entirely. This is useful for cdrom\n"
@@ -1549,7 +1561,7 @@ msgstr ""
 "#d-i hw-detect/load_firmware boolean true"
 
 #. Tag: para
-#: preseed.xml:788
+#: preseed.xml:793
 #, no-c-format
 msgid ""
 "Please note that <command>netcfg</command> will automatically determine the "
@@ -1570,13 +1582,13 @@ msgstr ""
 "できます。"
 
 #. Tag: title
-#: preseed.xml:804
+#: preseed.xml:809
 #, no-c-format
 msgid "Network console"
 msgstr "ネットワークコンソール"
 
 #. Tag: screen
-#: preseed.xml:806
+#: preseed.xml:811
 #, no-c-format
 msgid ""
 "# Use the following settings if you wish to make use of the network-console\n"
@@ -1594,13 +1606,13 @@ msgstr ""
 "#d-i network-console/password-again password r00tme"
 
 #. Tag: title
-#: preseed.xml:811
+#: preseed.xml:816
 #, no-c-format
 msgid "Mirror settings"
 msgstr "ミラーサイト設定"
 
 #. Tag: para
-#: preseed.xml:812
+#: preseed.xml:817
 #, no-c-format
 msgid ""
 "Depending on the installation method you use, a mirror may be used to "
@@ -1614,7 +1626,7 @@ msgstr ""
 "できます。"
 
 #. Tag: para
-#: preseed.xml:819
+#: preseed.xml:824
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1624,7 +1636,7 @@ msgstr ""
 "用の組を設定します。"
 
 #. Tag: para
-#: preseed.xml:824
+#: preseed.xml:829
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1641,7 +1653,7 @@ msgstr ""
 "トーラは、自動的に正しい値を設定しますので、設定する必要はありません。"
 
 #. Tag: screen
-#: preseed.xml:835
+#: preseed.xml:840
 #, no-c-format
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1669,13 +1681,138 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:840
+#: preseed.xml:845
+#, no-c-format
+msgid "Account setup"
+msgstr "アカウント設定"
+
+#. Tag: para
+#: preseed.xml:846
+#, no-c-format
+msgid ""
+"The password for the root account and name and password for a first regular "
+"user's account can be preseeded. For the passwords you can use either clear "
+"text values or MD5 <emphasis>hashes</emphasis>."
+msgstr ""
+"root アカウント用のパスワードや、最初のユーザアカウントの名前・パスワードは "
+"preseed できます。パスワードには、平文か MD5 <emphasis>ハッシュ</emphasis>の"
+"どちらかを使用できます。"
+
+#. Tag: para
+#: preseed.xml:853
+#, no-c-format
+msgid ""
+"Be aware that preseeding passwords is not completely secure as everyone with "
+"access to the preconfiguration file will have the knowledge of these "
+"passwords. Using MD5 hashes is considered slightly better in terms of "
+"security but it might also give a false sense of security as access to a MD5 "
+"hash allows for brute force attacks."
+msgstr ""
+"preseed のパスワードは、パスワードを知っている事前設定ファイルが誰でもアクセ"
+"スできるために、完全に安全というわけではないことを知っておいてください。MD5 "
+"ハッシュを使えば、セキュリティ的には多少ましと言えますが、MD5 ハッシュは総当"
+"たり攻撃にかけられることを考えると、セキュリティ的に誤解を与えるかもしれませ"
+"ん。"
+
+#. Tag: screen
+#: preseed.xml:863
+#, no-c-format
+msgid ""
+"# Skip creation of a root account (normal user account will be able to\n"
+"# use sudo).\n"
+"#d-i passwd/root-login boolean false\n"
+"# Alternatively, to skip creation of a normal user account.\n"
+"#d-i passwd/make-user boolean false\n"
+"\n"
+"# Root password, either in clear text\n"
+"#d-i passwd/root-password password r00tme\n"
+"#d-i passwd/root-password-again password r00tme\n"
+"# or encrypted using an MD5 hash.\n"
+"#d-i passwd/root-password-crypted password [MD5 hash]\n"
+"\n"
+"# To create a normal user account.\n"
+"#d-i passwd/user-fullname string Debian User\n"
+"#d-i passwd/username string debian\n"
+"# Normal user's password, either in clear text\n"
+"#d-i passwd/user-password password insecure\n"
+"#d-i passwd/user-password-again password insecure\n"
+"# or encrypted using an MD5 hash.\n"
+"#d-i passwd/user-password-crypted password [MD5 hash]\n"
+"# Create the first user with the specified UID instead of the default.\n"
+"#d-i passwd/user-uid string 1010\n"
+"\n"
+"# The user account will be added to some standard initial groups. To\n"
+"# override that, use this.\n"
+"#d-i passwd/user-default-groups string audio cdrom video"
+msgstr ""
+"# Skip creation of a root account (normal user account will be able to\n"
+"# use sudo).\n"
+"#d-i passwd/root-login boolean false\n"
+"# Alternatively, to skip creation of a normal user account.\n"
+"#d-i passwd/make-user boolean false\n"
+"\n"
+"# Root password, either in clear text\n"
+"#d-i passwd/root-password password r00tme\n"
+"#d-i passwd/root-password-again password r00tme\n"
+"# or encrypted using an MD5 hash.\n"
+"#d-i passwd/root-password-crypted password [MD5 hash]\n"
+"\n"
+"# To create a normal user account.\n"
+"#d-i passwd/user-fullname string Debian User\n"
+"#d-i passwd/username string debian\n"
+"# Normal user's password, either in clear text\n"
+"#d-i passwd/user-password password insecure\n"
+"#d-i passwd/user-password-again password insecure\n"
+"# or encrypted using an MD5 hash.\n"
+"#d-i passwd/user-password-crypted password [MD5 hash]\n"
+"# Create the first user with the specified UID instead of the default.\n"
+"#d-i passwd/user-uid string 1010\n"
+"\n"
+"# The user account will be added to some standard initial groups. To\n"
+"# override that, use this.\n"
+"#d-i passwd/user-default-groups string audio cdrom video"
+
+#. Tag: para
+#: preseed.xml:865
+#, no-c-format
+msgid ""
+"The <classname>passwd/root-password-crypted</classname> and "
+"<classname>passwd/user-password-crypted</classname> variables can also be "
+"preseeded with <quote>!</quote> as their value. In that case, the "
+"corresponding account is disabled. This may be convenient for the root "
+"account, provided of course that an alternative method is set up to allow "
+"administrative activities or root login (for instance by using SSH key "
+"authentication or <command>sudo</command>)."
+msgstr ""
+"<classname>passwd/root-password-crypted</classname> 変数や <classname>passwd/"
+"user-password-crypted</classname> 変数では、preseed で <quote>!</quote> とい"
+"う値を取れます。この場合、そのアカウントは無効となります。もちろん管理権限で"
+"の実行や root ログインを許可する代替手段 (例えば SSH キー認証や "
+"<command>sudo</command>) を用意しておいた上で、root アカウントに設定すると便"
+"利です。"
+
+#. Tag: para
+#: preseed.xml:875
+#, no-c-format
+msgid ""
+"The following command can be used to generate an MD5 hash for a password:"
+msgstr ""
+"以下のコマンドを、パスワードの MD5 ハッシュを生成するのに利用できます。"
+
+#. Tag: screen
+#: preseed.xml:879
+#, no-c-format
+msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
+msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
+
+#. Tag: title
+#: preseed.xml:885
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "時計と時間帯の設定"
 
 #. Tag: screen
-#: preseed.xml:842
+#: preseed.xml:887
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1703,13 +1840,13 @@ msgstr ""
 "#d-i clock-setup/ntp-server string ntp.example.com"
 
 #. Tag: title
-#: preseed.xml:847
+#: preseed.xml:892
 #, no-c-format
 msgid "Partitioning"
 msgstr "パーティション分割"
 
 #. Tag: para
-#: preseed.xml:848
+#: preseed.xml:893
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is limited to what is supported "
@@ -1725,7 +1862,7 @@ msgstr ""
 "スタムレシピ、事前設定ファイルに書いたレシピから選択できます。"
 
 #. Tag: para
-#: preseed.xml:856
+#: preseed.xml:901
 #, no-c-format
 msgid ""
 "Preseeding of advanced partition setups using RAID, LVM and encryption is "
@@ -1737,7 +1874,7 @@ msgstr ""
 "な、完全な柔軟性があるわけではありません。"
 
 #. Tag: para
-#: preseed.xml:862
+#: preseed.xml:907
 #, no-c-format
 msgid ""
 "The examples below only provide basic information on the use of recipes. For "
@@ -1757,7 +1894,7 @@ msgstr ""
 "してください。"
 
 #. Tag: para
-#: preseed.xml:876
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1769,13 +1906,13 @@ msgstr ""
 "なければなりません。"
 
 #. Tag: title
-#: preseed.xml:885
+#: preseed.xml:930
 #, no-c-format
 msgid "Partitioning example"
 msgstr "パーティション分割の例"
 
 #. Tag: screen
-#: preseed.xml:887
+#: preseed.xml:932
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1925,14 +2062,14 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:891
+#: preseed.xml:936
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "RAID を用いたパーティション分割"
 
 #. Tag: para
-#: preseed.xml:892
-#, fuzzy, no-c-format
+#: preseed.xml:937
+#, no-c-format
 #| msgid ""
 #| "You can also use preseeding to set up partitions on software RAID arrays. "
 #| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
@@ -1946,13 +2083,11 @@ msgid ""
 msgstr ""
 "ソフトウェア RAID アレイにパーティションをセットアップすることも、preseed を"
 "使用してできます。サポートしているのは、RAID 0, 1, 5, 6, 10、や縮退アレイの作"
-"成、スペアデバイスの指定です。RAID 1 を使用する際には、アレイで使用する全デバ"
-"イスへインストールするよう、preseed で探せます。<xref linkend=\"preseed-"
-"bootloader\"/> をご覧ください。"
+"成、スペアデバイスの指定です。"
 
 #. Tag: para
-#: preseed.xml:898
-#, fuzzy, no-c-format
+#: preseed.xml:943
+#, no-c-format
 #| msgid ""
 #| "You can also use preseeding to set up partitions on software RAID arrays. "
 #| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
@@ -1963,14 +2098,11 @@ msgid ""
 "If you are using RAID 1, you can preseed grub to install to all devices used "
 "in the array; see <xref linkend=\"preseed-bootloader\"/>."
 msgstr ""
-"ソフトウェア RAID アレイにパーティションをセットアップすることも、preseed を"
-"使用してできます。サポートしているのは、RAID 0, 1, 5, 6, 10、や縮退アレイの作"
-"成、スペアデバイスの指定です。RAID 1 を使用する際には、アレイで使用する全デバ"
-"イスへインストールするよう、preseed で探せます。<xref linkend=\"preseed-"
-"bootloader\"/> をご覧ください。"
+"RAID 1 を使用する際には、アレイで使用する全デバイスへインストールするよう、"
+"preseed で探せます。<xref linkend=\"preseed-bootloader\"/> をご覧ください。"
 
 #. Tag: para
-#: preseed.xml:905
+#: preseed.xml:950
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -1986,7 +2118,7 @@ msgstr ""
 "い。"
 
 #. Tag: screen
-#: preseed.xml:915
+#: preseed.xml:960
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -2090,13 +2222,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:920
+#: preseed.xml:965
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "パーティションマウント法の制御"
 
 #. Tag: para
-#: preseed.xml:921
+#: preseed.xml:966
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2114,7 +2246,7 @@ msgstr ""
 "マウントされます。"
 
 #. Tag: para
-#: preseed.xml:930
+#: preseed.xml:975
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2124,7 +2256,7 @@ msgstr ""
 "され続けます。"
 
 #. Tag: para
-#: preseed.xml:937
+#: preseed.xml:982
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2139,7 +2271,7 @@ msgstr ""
 "す。こうなってしまうと、起動時の挙動が不定になってしまいます。"
 
 #. Tag: screen
-#: preseed.xml:947
+#: preseed.xml:992
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2157,13 +2289,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:953
+#: preseed.xml:998
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本システムのインストール"
 
 #. Tag: para
-#: preseed.xml:954
+#: preseed.xml:999
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2174,7 +2306,7 @@ msgstr ""
 "カーネルのインストールに関するものだけです。"
 
 #. Tag: screen
-#: preseed.xml:961
+#: preseed.xml:1006
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2184,7 +2316,8 @@ msgid ""
 "\n"
 "# Select the initramfs generator used to generate the initrd for 2.6 "
 "kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-tools\n"
+"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
+"tools\n"
 "\n"
 "# The kernel image (meta) package to be installed; \"none\" can be used if "
 "no\n"
@@ -2198,7 +2331,8 @@ msgstr ""
 "\n"
 "# Select the initramfs generator used to generate the initrd for 2.6 "
 "kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-tools\n"
+"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
+"tools\n"
 "\n"
 "# The kernel image (meta) package to be installed; \"none\" can be used if "
 "no\n"
@@ -2206,138 +2340,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:966
-#, no-c-format
-msgid "Account setup"
-msgstr "アカウント設定"
-
-#. Tag: para
-#: preseed.xml:967
-#, no-c-format
-msgid ""
-"The password for the root account and name and password for a first regular "
-"user's account can be preseeded. For the passwords you can use either clear "
-"text values or MD5 <emphasis>hashes</emphasis>."
-msgstr ""
-"root アカウント用のパスワードや、最初のユーザアカウントの名前・パスワードは "
-"preseed できます。パスワードには、平文か MD5 <emphasis>ハッシュ</emphasis>の"
-"どちらかを使用できます。"
-
-#. Tag: para
-#: preseed.xml:974
-#, no-c-format
-msgid ""
-"Be aware that preseeding passwords is not completely secure as everyone with "
-"access to the preconfiguration file will have the knowledge of these "
-"passwords. Using MD5 hashes is considered slightly better in terms of "
-"security but it might also give a false sense of security as access to a MD5 "
-"hash allows for brute force attacks."
-msgstr ""
-"preseed のパスワードは、パスワードを知っている事前設定ファイルが誰でもアクセ"
-"スできるために、完全に安全というわけではないことを知っておいてください。MD5 "
-"ハッシュを使えば、セキュリティ的には多少ましと言えますが、MD5 ハッシュは総当"
-"たり攻撃にかけられることを考えると、セキュリティ的に誤解を与えるかもしれませ"
-"ん。"
-
-#. Tag: screen
-#: preseed.xml:984
-#, no-c-format
-msgid ""
-"# Skip creation of a root account (normal user account will be able to\n"
-"# use sudo).\n"
-"#d-i passwd/root-login boolean false\n"
-"# Alternatively, to skip creation of a normal user account.\n"
-"#d-i passwd/make-user boolean false\n"
-"\n"
-"# Root password, either in clear text\n"
-"#d-i passwd/root-password password r00tme\n"
-"#d-i passwd/root-password-again password r00tme\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/root-password-crypted password [MD5 hash]\n"
-"\n"
-"# To create a normal user account.\n"
-"#d-i passwd/user-fullname string Debian User\n"
-"#d-i passwd/username string debian\n"
-"# Normal user's password, either in clear text\n"
-"#d-i passwd/user-password password insecure\n"
-"#d-i passwd/user-password-again password insecure\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/user-password-crypted password [MD5 hash]\n"
-"# Create the first user with the specified UID instead of the default.\n"
-"#d-i passwd/user-uid string 1010\n"
-"\n"
-"# The user account will be added to some standard initial groups. To\n"
-"# override that, use this.\n"
-"#d-i passwd/user-default-groups string audio cdrom video"
-msgstr ""
-"# Skip creation of a root account (normal user account will be able to\n"
-"# use sudo).\n"
-"#d-i passwd/root-login boolean false\n"
-"# Alternatively, to skip creation of a normal user account.\n"
-"#d-i passwd/make-user boolean false\n"
-"\n"
-"# Root password, either in clear text\n"
-"#d-i passwd/root-password password r00tme\n"
-"#d-i passwd/root-password-again password r00tme\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/root-password-crypted password [MD5 hash]\n"
-"\n"
-"# To create a normal user account.\n"
-"#d-i passwd/user-fullname string Debian User\n"
-"#d-i passwd/username string debian\n"
-"# Normal user's password, either in clear text\n"
-"#d-i passwd/user-password password insecure\n"
-"#d-i passwd/user-password-again password insecure\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/user-password-crypted password [MD5 hash]\n"
-"# Create the first user with the specified UID instead of the default.\n"
-"#d-i passwd/user-uid string 1010\n"
-"\n"
-"# The user account will be added to some standard initial groups. To\n"
-"# override that, use this.\n"
-"#d-i passwd/user-default-groups string audio cdrom video"
-
-#. Tag: para
-#: preseed.xml:986
-#, no-c-format
-msgid ""
-"The <classname>passwd/root-password-crypted</classname> and "
-"<classname>passwd/user-password-crypted</classname> variables can also be "
-"preseeded with <quote>!</quote> as their value. In that case, the "
-"corresponding account is disabled. This may be convenient for the root "
-"account, provided of course that an alternative method is set up to allow "
-"administrative activities or root login (for instance by using SSH key "
-"authentication or <command>sudo</command>)."
-msgstr ""
-"<classname>passwd/root-password-crypted</classname> 変数や <classname>passwd/"
-"user-password-crypted</classname> 変数では、preseed で <quote>!</quote> とい"
-"う値を取れます。この場合、そのアカウントは無効となります。もちろん管理権限で"
-"の実行や root ログインを許可する代替手段 (例えば SSH キー認証や "
-"<command>sudo</command>) を用意しておいた上で、root アカウントに設定すると便"
-"利です。"
-
-#. Tag: para
-#: preseed.xml:996
-#, no-c-format
-msgid ""
-"The following command can be used to generate an MD5 hash for a password:"
-msgstr ""
-"以下のコマンドを、パスワードの MD5 ハッシュを生成するのに利用できます。"
-
-#. Tag: screen
-#: preseed.xml:1000
-#, no-c-format
-msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
-msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
-
-#. Tag: title
-#: preseed.xml:1006
+#: preseed.xml:1011
 #, no-c-format
 msgid "Apt setup"
 msgstr "apt 設定"
 
 #. Tag: para
-#: preseed.xml:1007
+#: preseed.xml:1012
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2350,7 +2359,7 @@ msgstr ""
 "に、他の (ローカルな) リポジトリを追加できます。"
 
 #. Tag: screen
-#: preseed.xml:1015
+#: preseed.xml:1020
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2408,13 +2417,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1020
+#: preseed.xml:1025
 #, no-c-format
 msgid "Package selection"
 msgstr "パッケージ選択"
 
 #. Tag: para
-#: preseed.xml:1021
+#: preseed.xml:1026
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2424,73 +2433,73 @@ msgstr ""
 "スクを以下に書き出します。"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1035
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1038
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1041
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1044
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1047
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1050
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1053
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1056
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1059
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1062
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:1060
+#: preseed.xml:1065
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1064
+#: preseed.xml:1069
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2502,7 +2511,7 @@ msgstr ""
 "クは常に含めるのをお勧めします。"
 
 #. Tag: para
-#: preseed.xml:1070
+#: preseed.xml:1075
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2517,7 +2526,7 @@ msgstr ""
 "で区切ったパッケージのリストを取れます。"
 
 #. Tag: screen
-#: preseed.xml:1080
+#: preseed.xml:1085
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2555,14 +2564,14 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1090
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "ブートローダのインストール"
 
 #. Tag: screen
-#: preseed.xml:1087
-#, fuzzy, no-c-format
+#: preseed.xml:1092
+#, no-c-format
 #| msgid ""
 #| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 #| "# instead, uncomment this:\n"
@@ -2655,12 +2664,16 @@ msgid ""
 "# Note: options passed to the installer will be added automatically.\n"
 "#d-i debian-installer/add-kernel-opts string nousb"
 msgstr ""
-"# Grub is the default boot loader (for x86). If you want lilo installed\n"
+"<phrase arch=\"linux-any\"># 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"
+"#d-i lilo-installer/skip boolean true</phrase>\n"
+"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment "
+"this\n"
+"#d-i grub-installer/skip boolean true</phrase>\n"
 "\n"
 "# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
 "# default. If you need GRUB Legacy for some particular reason, then\n"
@@ -2684,6 +2697,8 @@ msgstr ""
 "#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)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2697,7 +2712,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1094
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2709,13 +2724,13 @@ msgstr ""
 "\"preseed-account\"/> にあるコマンドを使用して生成します。"
 
 #. Tag: title
-#: preseed.xml:1099
+#: preseed.xml:1104
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "インストールの仕上げ"
 
 #. Tag: screen
-#: preseed.xml:1101
+#: preseed.xml:1106
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2755,13 +2770,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1106
+#: preseed.xml:1111
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "他パッケージの preseed"
 
 #. Tag: screen
-#: preseed.xml:1108
+#: preseed.xml:1113
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2781,19 +2796,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1120
 #, no-c-format
 msgid "Advanced options"
 msgstr "高度なオプション"
 
 #. Tag: title
-#: preseed.xml:1118
+#: preseed.xml:1123
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "インストール中のカスタムコマンド実行"
 
 #. Tag: para
-#: preseed.xml:1119
+#: preseed.xml:1124
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2803,7 +2818,7 @@ msgstr ""
 "るといった、とても強力で柔軟なオプションが存在します。"
 
 #. Tag: screen
-#: preseed.xml:1127
+#: preseed.xml:1132
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2851,13 +2866,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1132
+#: preseed.xml:1137
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "preseed を用いたデフォルト値変更"
 
 #. Tag: para
-#: preseed.xml:1133
+#: preseed.xml:1138
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2883,7 +2898,7 @@ msgstr ""
 "やデバッグにも便利です。"
 
 #. Tag: para
-#: preseed.xml:1147
+#: preseed.xml:1152
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2897,7 +2912,7 @@ msgstr ""
 "linkend=\"preseed-bootparms\"/> の脚注をご覧ください。"
 
 #. Tag: para
-#: preseed.xml:1154
+#: preseed.xml:1159
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2920,13 +2935,13 @@ msgstr ""
 "果を及ぼしません。"
 
 #. Tag: title
-#: preseed.xml:1168
+#: preseed.xml:1173
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "事前設定ファイルのチェーンロード"
 
 #. Tag: para
-#: preseed.xml:1169
+#: preseed.xml:1174
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2941,7 +2956,7 @@ msgstr ""
 "確かな設定を指定するという使い方ができます。"
 
 #. Tag: screen
-#: preseed.xml:1179
+#: preseed.xml:1184
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2991,7 +3006,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1181
+#: preseed.xml:1186
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "