Update Japanese translations for the manual.

1 files changed, 60 insertions, 66 deletions

diff --git a/ja/appendix/preseed.xml b/ja/appendix/preseed.xml
index 978715a4c..8d6b127fa 100644
--- a/ja/appendix/preseed.xml
+++ b/ja/appendix/preseed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 49321 -->
+<!-- original version: 50744 -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -1392,9 +1392,8 @@ same as <classname>mirror/suite</classname>.
 
 <informalexample role="example"><screen>
 # If you select ftp, the mirror/country string does not need to be set.
-#d-i mirror/protocol string ftp<phrase condition="etch">
-d-i mirror/country string enter information manually</phrase><phrase condition="lenny">
-d-i mirror/country string manual</phrase>
+#d-i mirror/protocol string ftp
+d-i mirror/country string manual
 d-i mirror/http/hostname string &archive-mirror;
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
@@ -1407,6 +1406,28 @@ d-i mirror/http/proxy string
 
   </sect2>
 
+  <sect2 id="preseed-time">
+<!--
+  <title>Clock and time zone setup</title>
+-->
+  <title>時計と時間帯の設定</title>
+
+<informalexample role="example"><screen>
+# Controls whether or not the hardware clock is set to UTC.
+d-i clock-setup/utc boolean true
+
+# You may set this to any valid setting for $TZ; see the contents of
+# /usr/share/zoneinfo/ for valid values.
+d-i time/zone string US/Eastern
+
+# Controls whether to use NTP to set the clock during the install
+d-i clock-setup/ntp boolean true
+# NTP server to use. The default is almost always fine here.
+#d-i clock-setup/ntp-server ntp.example.com
+</screen></informalexample>
+
+  </sect2>
+
   <sect2 id="preseed-partman">
 <!--
   <title>Partitioning</title>
@@ -1452,18 +1473,13 @@ correct one will be selected before using preseeding.
 #d-i partman-auto/init_automatically_partition \
 #      select Guided - use the largest continuous free space
 
-<phrase condition="etch"># Alternatively, you can specify a disk to partition. The device name
-# can be given in either devfs or traditional non-devfs format.
-# For example, to use the first disk:
-d-i partman-auto/disk string /dev/discs/disc0/disc
-d-i partman-auto/disk string /dev/discs/disc0/disc</phrase><phrase condition="lenny">
 # Alternatively, you can specify a disk to partition. The device name must
 # be given in traditional non-devfs format.
 # For example, to use the first SCSI/SATA hard disk:
 d-i partman-auto/disk string /dev/sda
 # Note: If you want to use whatever disk is available, no matter
 # what its device name, comment the line above out. This will only work if
-# the system only has one disk.</phrase>
+# the system only has one disk.
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -1510,7 +1526,8 @@ d-i partman-auto/choose_recipe \
 #                      method{ swap } format{ }                \
 #              .
 
-# This makes partman automatically partition without confirmation.
+# This makes partman automatically partition without confirmation, provided
+# that you told it what to do using one of the methods above.
 d-i partman/confirm_write_new_label boolean true
 d-i partman/choose_partition \
        select Finish partitioning and write changes to disk
@@ -1622,25 +1639,29 @@ d-i partman/confirm boolean true
 
   </sect2>
 
-  <sect2 id="preseed-time">
+  <sect2 id="preseed-base-installer">
 <!--
-  <title>Clock and time zone setup</title>
+  <title>Base system installation</title>
 -->
-  <title>時計・タイムゾーン設定</title>
+  <title>ベースシステムのインストール</title>
+<para>
 
-<informalexample role="example"><screen>
-# Controls whether or not the hardware clock is set to UTC.
-d-i clock-setup/utc boolean true
+<!--
+There is actually not very much that can be preseeded for this stage of the
+installation. The only questions asked concern the installation of the kernel.
+-->
+インストールのこの段階で、実際に preseed できる項目は多くありません。
+質問はカーネルのインストールに関するものだけです。
 
-# You may set this to any valid setting for $TZ; see the contents of
-# /usr/share/zoneinfo/ for valid values.
-d-i time/zone string US/Eastern<phrase condition="lenny">
+</para>
 
-# Controls whether to use NTP to set the clock during the install
-d-i clock-setup/ntp boolean true
-# NTP server to use. The default is almost always fine here.
-#d-i clock-setup/ntp-server ntp.example.com
-</phrase>
+<informalexample role="example"><screen>
+# Select the initramfs generator used to generate the initrd for 2.6 kernels.
+#d-i base-installer/kernel/linux/initramfs-generators string yaird
+
+# The kernel image (meta) package to be installed; "none" can be used if no
+# kernel is to be installed.
+#d-i base-installer/kernel/image linux-image-2.6-486
 </screen></informalexample>
 
   </sect2>
@@ -1703,11 +1724,11 @@ MD5 ハッシュは総当たり攻撃にかけられることを考えると、
 # or encrypted using an MD5 hash.
 #d-i passwd/user-password-crypted password [MD5 hash]
 # Create the first user with the specified UID instead of the default.
-#d-i passwd/user-uid string 1010<phrase condition="lenny">
+#d-i passwd/user-uid string 1010
 
 # The user account will be added to some standard initial groups. To
 # override that, use this.
-#d-i passwd/user-default-groups string audio cdrom video</phrase>
+#d-i passwd/user-default-groups string audio cdrom video
 </screen></informalexample>
 
 <para>
@@ -1743,33 +1764,6 @@ $ echo "r00tme" | mkpasswd -s -H MD5
 </para>
   </sect2>
 
-  <sect2 id="preseed-base-installer">
-<!--
-  <title>Base system installation</title>
--->
-  <title>基本システムのインストール</title>
-<para>
-
-<!--
-There is actually not very much that can be preseeded for this stage of the
-installation. The only questions asked concern the installation of the kernel.
--->
-インストールのこの段階では、実際にはうまく preseed できないことがあります。
-その唯一のものが、カーネルのインストールについての質問です。
-
-</para>
-
-<informalexample role="example"><screen>
-# Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird<phrase condition="lenny">
-
-# The kernel image (meta) package to be installed; "none" can be used if no
-# kernel is to be installed.
-#d-i base-installer/kernel/image linux-image-2.6-486</phrase>
-</screen></informalexample>
-
-  </sect2>
-
   <sect2 id="preseed-apt">
 <!--
   <title>Apt setup</title>
@@ -1794,15 +1788,12 @@ earlier questions. You can optionally add other (local) repositories.
 #d-i apt-setup/non-free boolean true
 #d-i apt-setup/contrib boolean true
 # Uncomment this if you don't want to use a network mirror.
-#d-i apt-setup/use_mirror boolean false<phrase condition="etch">
-# Uncomment this to avoid adding security sources, or
-# add a hostname to use a different server than security.debian.org.
-#d-i apt-setup/security_host string</phrase><phrase condition="lenny">
+#d-i apt-setup/use_mirror boolean false
 # Select which update services to use; define the mirrors to be used.
 # Values shown below are the normal defaults.
 #d-i apt-setup/services-select multi-select security, volatile
 #d-i apt-setup/security_host string security.debian.org
-#d-i apt-setup/volatile_host string volatile.debian.org</phrase>
+#d-i apt-setup/volatile_host string volatile.debian.org
 
 # Additional repositories, local[0-9] available
 #d-i apt-setup/local0/repository string \
@@ -1904,11 +1895,10 @@ to be used easily on the kernel command line as well.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server<phrase condition="lenny">
+#tasksel tasksel/first multiselect standard, web-server
 # If the desktop task is selected, install the kde and xfce desktops
 # instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce</phrase><phrase condition="etch">
-#tasksel tasksel/first multiselect standard, kde-desktop</phrase>
+#tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
@@ -1931,10 +1921,10 @@ to be used easily on the kernel command line as well.
 <informalexample role="example"><screen>
 # Grub is the default boot loader (for x86). If you want lilo installed
 # instead, uncomment this:
-#d-i grub-installer/skip boolean true<phrase condition="lenny">
+#d-i grub-installer/skip boolean true
 # To also skip installing lilo, and install no bootloader, uncomment this
 # too:
-#d-i lilo-installer/skip boolean true</phrase>
+#d-i lilo-installer/skip boolean true
 
 # This is fairly safe to set, it makes grub install automatically to the MBR
 # if no other operating system is detected on the machine.
@@ -1957,9 +1947,9 @@ d-i grub-installer/with_other_os boolean true
 
   <sect2 id="preseed-finish">
 <!--
-  <title>Finishing up the first stage install</title>
+  <title>Finishing up the installation</title>
 -->
-  <title>インストール第 1 段階の仕上げ</title>
+  <title>インストールの仕上げ</title>
 
 <informalexample role="example"><screen>
 # Avoid that last message about the install being complete.
@@ -1968,6 +1958,10 @@ d-i finish-install/reboot_in_progress note
 # This will prevent the installer from ejecting the CD during the reboot,
 # which is useful in some situations.
 #d-i cdrom-detect/eject boolean false
+
+# This is how to make the installer shutdown when finished, but not
+# reboot into the installed system.
+#d-i debian-installer/exit/halt boolean true
 </screen></informalexample>
 
   </sect2>