鍋太郎です。
ずいぶんご無沙汰でした。
インストールガイドの翻訳を更新しました。
チェックしていただけるとありがたいです。
よろしくお願いいたします。
--
+--------------------------------------------------------+
倉澤 望(鍋太郎)
KURASAWA Nozomu (nabetaro) <nabetaro @ caldron.jp>
GnuPG FingerPrint:
C4E5 7063 FD75 02EB E71D 559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+
Attachment:
d-i-update070919.tar.gz
Description: Binary data
Index: ja/partitioning/partition/powerpc.xml
===================================================================
--- ja/partitioning/partition/powerpc.xml (ӥ 49379)
+++ ja/partitioning/partition/powerpc.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 23146 -->
+<!-- original version: 48741 -->
<sect2 arch="powerpc"><title>Ƕ PowerMac ǤΥѡƥʬ</title>
@@ -9,7 +9,7 @@
<!--
If you are installing onto a NewWorld PowerMac you must create a
special bootstrap partition to hold the boot loader. The size of this
-partition must be 800KB and its partition type must be
+partition must have at least 819200 bytes and its partition type must be
<emphasis>Apple_Bootstrap</emphasis>. If the bootstrap partition is
not created with the <emphasis>Apple_Bootstrap</emphasis> type your
machine cannot be made bootable from the hard disk. This partition
@@ -21,7 +21,7 @@
NewWorld PowerMac ˥ȡ뤹ˤϡ
֡ȥѤüʥ֡ȥȥåץѡƥ
ʤФʤޤ
-ΥѡƥΥ 800KB Ȥ
+ΥѡƥΥϾʤȤ 819200 ХȰʾȤ
ѡƥפ <emphasis>Apple_Bootstrap</emphasis>
ˤʤФޤ
֡ȥȥåץѡƥ
Index: ja/preparing/minimum-hardware-reqts.xml
===================================================================
--- ja/preparing/minimum-hardware-reqts.xml (ӥ 49379)
+++ ja/preparing/minimum-hardware-reqts.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43790 -->
+<!-- original version: 48637 -->
<sect1 id="minimum-hardware-reqts">
<title>ɬפʺ¤Υϡɥ</title>
@@ -31,7 +31,7 @@
<!--
A Pentium 4, 1GHz system is the minimum recommended for a desktop
-systems.
+system.
-->
ǥȥåץƥˤϺ Pentium 4, 1GHz ᤷޤ
@@ -93,7 +93,7 @@
<entry>With Desktop</entry>
<entry>64 megabytes</entry>
<entry>512 megabytes</entry>
- <entry>5 gigabyte</entry>
+ <entry>5 gigabytes</entry>
-->
<entry>ǥȥåפ</entry>
<entry>64 ᥬХ</entry>
Index: ja/preparing/bios-setup/powerpc.xml
===================================================================
--- ja/preparing/bios-setup/powerpc.xml (ӥ 49379)
+++ ja/preparing/bios-setup/powerpc.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 36732 -->
+<!-- original version: 46722 -->
<sect2 arch="powerpc" id="invoking-openfirmware">
@@ -77,8 +77,8 @@
utility, available from Apple at
<ulink url="ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi.bin";></ulink>.
After unpacking the utility in MacOS, and launching it, select the
-<guibutton>Save button</guibutton> to have the firmware patches
-installed to nvram.
+<guibutton>Save</guibutton> button to have the firmware patches
+ installed to nvram.
-->
OldWorld Beige G3 ޥǤϡOpenFirmware 2.0f1 2.4
Ȥʪˤʤޤե०˥ѥåƤʤȡ
@@ -87,7 +87,7 @@
桼ƥƥ˴ޤޤƤꡢApple
<ulink url="ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi.bin";></ulink> Ǥޤ
Υ桼ƥƥ MacOS Ÿ
-¹Ԥ <guibutton>Save ܥ</guibutton>ȡ
+¹Ԥ <guibutton>Save</guibutton> ܥȡ
ե०Υѥå nvram ˥ȡ뤵ޤ
</para>
Index: ja/appendix/files.xml
===================================================================
--- ja/appendix/files.xml (ӥ 49379)
+++ ja/appendix/files.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 44436 -->
+<!-- original version: 46461 -->
<sect1 id="linuxdevices"><title>Linux ΥǥХ</title>
@@ -373,7 +373,7 @@
<entry>Laptop<footnote>
<para>
- There is a large overlap of the Laptop task with the Destop environment task.
+ There is some overlap of the Laptop task with the Destop environment task.
If you install both, the Laptop task will only require a few MB additional
disk space.
</para>
@@ -381,7 +381,7 @@
<entry>åץȥå<footnote>
<para>
- åץȥåץȥǥȥåץϤʤʣƤޤ
+ åץȥåץȥǥȥåץϤĤʣƤޤ
ξȡ뤷硢åץȥåץϥǥΰ
MB ɲäɬפȤǤ礦
</para>
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml (ӥ 49379)
+++ ja/appendix/preseed.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 45612 -->
+<!-- original version: 49321 -->
<!--
Be careful with the format of this file as it is parsed to generate
@@ -532,19 +532,31 @@
</para><para>
<!--
+Normally, preseeding a question in this way will mean that the question will
+not be asked. To set a specific default value for a question, but still have
+the question asked, use <quote>?=</quote> instead of <quote>=</quote> as
+operator. See also <xref linkend="preseed-seenflag"/>.
+-->
+̾ˡ餫ꤷƤȡ䤷Ƥޤ
+ΥǥեͤꤷƤΤˡޤ䤷Ƥˤϡ
+<quote>=</quote> 黻Ҥˡ<quote>?=</quote> ѤƤ
+<xref linkend="preseed-seenflag"/> ⤴
+
+</para><para>
+
+<!--
Note that some variables that are frequently set at the boot prompt
have a shorter alias. If an alias is available, it is used in the
-examples in this appendix instead of the full variable. In
-particular, the <literal>preseed/url</literal> variable has been
-aliased as <literal>url</literal> and has some extra magic to allow
-shortened urls to be used. Another example is the <literal>tasks</literal>
+examples in this appendix instead of the full variable. The
+<literal>preseed/url</literal> variable for example has been aliased as
+<literal>url</literal>. Another example is the <literal>tasks</literal>
alias, which translates to <literal>tasksel:tasksel/first</literal>.
-->
֡ȥץץȤˤ褯Ѥѿˤϡ
ûꥢ뤳ȤդƤ
ͭʥꥢϡܥץǴѿ̾˻ѤƤޤ
-äˡ<literal>preseed/url</literal> ѿˤ <literal>url</literal>
-Ȥꥢꡢû URL Ȥ뤳Ȥˤ뵻Ĥޤ
+㤨 <literal>preseed/url</literal> ѿˤ <literal>url</literal>
+Ȥꥢޤ
⤦ġ<literal>tasks</literal> Ȥꥢꡢ
<literal>tasksel:tasksel/first</literal> Ѵޤ
@@ -1380,8 +1392,9 @@
<informalexample role="example"><screen>
# If you select ftp, the mirror/country string does not need to be set.
-#d-i mirror/protocol string ftp
-d-i mirror/country string enter information manually
+#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/http/hostname string &archive-mirror;
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string
@@ -1439,10 +1452,18 @@
#d-i partman-auto/init_automatically_partition \
# select Guided - use the largest continuous free space
-# Alternatively, you can specify a disk to partition. The device name
+<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>
# 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
@@ -1613,55 +1634,13 @@
# 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
-</screen></informalexample>
+d-i time/zone string US/Eastern<phrase condition="lenny">
- </sect2>
-
- <sect2 id="preseed-apt">
-<!--
- <title>Apt setup</title>
--->
- <title>apt </title>
-<para>
-
-<!--
-Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration
-options is fully automated based on your installation method and answers to
-earlier questions. You can optionally add other (local) repositories.
--->
-<filename>/etc/apt/sources.list</filename>
-Υåȥåפȴꥪץϡ
-ȡˡȽμؤβ顢˼ưŪ˹Ԥޤ
-ˡ¾ () ݥȥɲäǤޤ
-
-</para>
-
-<informalexample role="example"><screen>
-# You can choose to install non-free and contrib software.
-#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
-# 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
-
-# Additional repositories, local[0-9] available
-#d-i apt-setup/local0/repository string \
-# http://local.server/debian stable main
-#d-i apt-setup/local0/comment string local server
-# Enable deb-src lines
-#d-i apt-setup/local0/source boolean true
-# URL to the public key of the local repository; you must provide a key or
-# apt will complain about the unauthenticated repository and so the
-# sources.list line will be left commented out
-#d-i apt-setup/local0/key string http://local.server/key
-
-# By default the installer requires that repositories be authenticated
-# using a known gpg key. This setting can be used to disable that
-# authentication. Warning: Insecure, not recommended.
-#d-i debian-installer/allow_unauthenticated string true
+# 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>
</screen></informalexample>
</sect2>
@@ -1723,6 +1702,12 @@
#d-i passwd/user-password-again password insecure
# 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">
+
+# 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>
</screen></informalexample>
<para>
@@ -1776,37 +1761,64 @@
<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
+#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-bootloader">
+ <sect2 id="preseed-apt">
<!--
- <title>Boot loader installation</title>
+ <title>Apt setup</title>
-->
- <title>֡ȥΥȡ</title>
+ <title>apt </title>
+<para>
+<!--
+Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration
+options is fully automated based on your installation method and answers to
+earlier questions. You can optionally add other (local) repositories.
+-->
+<filename>/etc/apt/sources.list</filename>
+Υåȥåפȴꥪץϡ
+ȡˡȽμؤβ顢˼ưŪ˹Ԥޤ
+ˡ¾ () ݥȥɲäǤޤ
+
+</para>
+
<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
+# You can choose to install non-free and contrib software.
+#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">
+# 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>
-# This is fairly safe to set, it makes grub install automatically to the MBR
-# if no other operating system is detected on the machine.
-d-i grub-installer/only_debian boolean true
+# Additional repositories, local[0-9] available
+#d-i apt-setup/local0/repository string \
+# http://local.server/debian stable main
+#d-i apt-setup/local0/comment string local server
+# Enable deb-src lines
+#d-i apt-setup/local0/source boolean true
+# URL to the public key of the local repository; you must provide a key or
+# apt will complain about the unauthenticated repository and so the
+# sources.list line will be left commented out
+#d-i apt-setup/local0/key string http://local.server/key
-# This one makes grub-installer install to the MBR if it also finds some other
-# OS, which is less safe as it might not be able to boot that other OS.
-d-i grub-installer/with_other_os boolean true
-
-# Alternatively, if you want to install to a location other than the mbr,
-# uncomment and edit these lines:
-#d-i grub-installer/only_debian boolean false
-#d-i grub-installer/with_other_os boolean false
-#d-i grub-installer/bootdev string (hd0,0)
-# To install grub to multiple disks:
-#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)
+# By default the installer requires that repositories be authenticated
+# using a known gpg key. This setting can be used to disable that
+# authentication. Warning: Insecure, not recommended.
+#d-i debian-installer/allow_unauthenticated string true
</screen></informalexample>
</sect2>
@@ -1892,9 +1904,11 @@
</para>
<informalexample role="example"><screen>
-tasksel tasksel/first multiselect standard, desktop
-#tasksel tasksel/first multiselect standard, web-server
-#tasksel tasksel/first multiselect standard, kde-desktop
+#tasksel tasksel/first multiselect standard, web-server<phrase condition="lenny">
+# 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>
# Individual additional packages to install
#d-i pkgsel/include string openssh-server build-essential
@@ -1908,6 +1922,39 @@
</sect2>
+ <sect2 id="preseed-bootloader">
+<!--
+ <title>Boot loader installation</title>
+-->
+ <title>֡ȥΥȡ</title>
+
+<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">
+# To also skip installing lilo, and install no bootloader, uncomment this
+# too:
+#d-i lilo-installer/skip boolean true</phrase>
+
+# This is fairly safe to set, it makes grub install automatically to the MBR
+# if no other operating system is detected on the machine.
+d-i grub-installer/only_debian boolean true
+
+# This one makes grub-installer install to the MBR if it also finds some other
+# OS, which is less safe as it might not be able to boot that other OS.
+d-i grub-installer/with_other_os boolean true
+
+# Alternatively, if you want to install to a location other than the mbr,
+# uncomment and edit these lines:
+#d-i grub-installer/only_debian boolean false
+#d-i grub-installer/with_other_os boolean false
+#d-i grub-installer/bootdev string (hd0,0)
+# To install grub to multiple disks:
+#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)
+</screen></informalexample>
+
+ </sect2>
+
<sect2 id="preseed-finish">
<!--
<title>Finishing up the first stage install</title>
@@ -2069,20 +2116,19 @@
μФƱ̤ڤܤȤǤޤ
ϻեΥƥȤǥХåˤǤ
+</para><para>
+
<!--
If you are preseeding using boot parameters, you can make the installer ask
the corresponding question by using the <quote>?=</quote> operator, i.e.
<userinput><replaceable>foo</replaceable>/<replaceable>bar</replaceable>?=<replaceable>value</replaceable></userinput>.
+This will of course only have effect for parameters that correspond to
+questions that are actually displayed during an installation and not for
+<quote>internal</quote> parameters.
-->
֡ȥѥѤ preseed Ԥ硢
Ф <quote>?=</quote> 黻ҤѤƲǤޤ
: <userinput><replaceable>foo</replaceable>/<replaceable>bar</replaceable>?=<replaceable>value</replaceable></userinput>
-
-<!--
-This will of course only have effect for parameters that correspond to
-questions that are actually displayed during an installation and not for
-<quote>internal</quote> parameters.
--->
Ϥ
ȡ˼ºݤɽбѥˤΤ߸̤ڤܤ
<quote></quote>ѥˤϸ̤ڤܤޤ
@@ -2129,7 +2175,7 @@
# More flexibly, this runs a shell command and if it outputs the names of
# preconfiguration files, includes those files.
#d-i preseed/include_command \
-# string echo if [ "`hostname`" = bob ]; then echo bob.cfg; fi
+# string if [ "`hostname`" = bob ]; then echo bob.cfg; fi
# Most flexibly of all, this downloads a program and runs it. The program
# can use commands such as debconf-set to manipulate the debconf database.
Index: ja/appendix/graphical.xml
===================================================================
--- ja/appendix/graphical.xml (ӥ 49379)
+++ ja/appendix/graphical.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 44580 -->
+<!-- original version: 48015 -->
<sect1 condition="gtk" id="graphical">
<!--
@@ -67,7 +67,9 @@
<para>
The mini ISO image can be downloaded from a Debian mirror as described
-in <xref linkend="downloading-files"/>. Look for <quote>gtk-miniiso</quote>.
+in <xref linkend="downloading-files"/>. Look for
+<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
+<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>.
</para>
</footnote>, which is mainly useful for testing; in this case the image is
@@ -81,7 +83,9 @@
ߥ ISO ϡ
<xref linkend="downloading-files"/>
Debian ߥ顼ȤɤǤޤ
-<quote>gtk-miniiso</quote> õƤ
+<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
+<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>
+õƤ
</para>
</footnote>
@@ -96,7 +100,9 @@
<para>
The mini ISO image can be downloaded from a Debian mirror as described
-in <xref linkend="downloading-files"/>. Look for <quote>gtk-miniiso</quote>.
+in <xref linkend="downloading-files"/>. Look for
+<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
+<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>.
</para>
</footnote>. It should work on almost all PowerPC systems that have
@@ -108,7 +114,9 @@
ߥ ISO ϡ
<xref linkend="downloading-files"/>
Debian ߥ顼ȤɤǤޤ
-<quote>gtk-miniiso</quote> õƤ
+<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
+<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>
+õƤ
</para>
</footnote>ATI եåɤ롢
@@ -167,8 +175,8 @@
of countries within continents), you can use the <keycap>+</keycap> and
<keycap>-</keycap> keys. For questions where more than one item can be
selected (e.g. task selection), you first need to tab to the
-<guibutton>Continue</guibutton> button after making your selections; hitting
-enter will toggle a selection, not activate <guibutton>Continue</guibutton>.
+&BTN-CONT; button after making your selections; hitting
+enter will toggle a selection, not activate &BTN-CONT;.
-->
ޥ⥭ܡɤȤߤʤ顢
餫 2 ĤΤȤΤäƤɬפޤ
@@ -176,9 +184,9 @@
<keycap>+</keycap> <keycap>-</keycap> ѤǤޤ
ʣιܤ褦ʼ (: ) Ǥϡ
ä顢
-ޤ֤ <guibutton>³</guibutton> ܥ˰ưɬפޤ
+ޤ֤ &BTN-CONT; ܥ˰ưɬפޤ
Enter Ƥڤؤǡ
-<guibutton>³</guibutton> ͭˤϤʤޤ
+&BTN-CONT; ͭˤϤʤޤ
</para><para>
Index: ja/welcome/doc-organization.xml
===================================================================
--- ja/welcome/doc-organization.xml (ӥ 49379)
+++ ja/welcome/doc-organization.xml (ȥԡ)
@@ -94,16 +94,6 @@
<listitem><para>
<!--
-Setting up the Linux partitions for your Debian system is explained in
-<xref linkend="partitioning"/>.
--->
-<xref linkend="partitioning"/> ǤϡDebian ƥΤ
-Linux ѡƥޤ
-
-</para></listitem>
-<listitem><para>
-
-<!--
Perform the actual installation according to
<xref linkend="d-i-intro"/>. This involves choosing your language,
configuring peripheral driver modules, configuring your network
Index: ja/using-d-i/modules/netcfg.xml
===================================================================
--- ja/using-d-i/modules/netcfg.xml (ӥ 49379)
+++ ja/using-d-i/modules/netcfg.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46074 -->
+<!-- original version: 46101 -->
<sect3 id="netcfg">
<title>ͥåȥ</title>
@@ -82,25 +82,24 @@
</para><note><para>
<!--
-Some technical details you might, or might not, find handy: the
-program assumes the network IP address is the bitwise-AND of your
-system's IP address and your netmask. It will guess the broadcast
-address is the bitwise OR of your system's IP address with the bitwise
-negation of the netmask. It will also guess your gateway. If you
-can't find any of these answers, use the system's guesses — you
-can change them once the system has been installed, if necessary, by
-editing <filename>/etc/network/interfaces</filename>.
+Some technical details you might, or might not, find handy: the program
+assumes the network IP address is the bitwise-AND of your system's IP
+address and your netmask. The default broadcast address is calculated as
+the bitwise OR of your system's IP address with the bitwise negation of
+the netmask. It will also guess your gateway. If you can't find any of
+these answers, use the offered defaults — if necessary, you can
+change them by editing <filename>/etc/network/interfaces</filename> once
+the system has been installed.
-->
Ĥ뤫ĤʤϤȤ⤫Ūܺ٤ϼڤ˸Ĥޤ
ץǤϡͥåȥ IP ɥ쥹
ƥ IP ɥ쥹ȥͥåȥޥΥӥåѤǤȲꤷޤ
-֥ɥ㥹ȥɥ쥹ϡƥ IP ɥ쥹ȡ
-ͥåȥޥΥӥåȤΥӥå¤Ǥȿ¬ޤ
+ǥեȤΥ֥ɥ㥹ȥɥ쥹ϡƥ IP ɥ쥹ȡ
+ͥåȥޥΥӥåȤΥӥå¤ޤ
˥ȥ¬ޤ
-Τɤ줫狼ʤСƥο¬ѤƤ
+Τɤ줫狼ʤСǥեͤѤƤ
١ƥȡ뤷ǡ
-ɬפʤ <filename>/etc/network/interfaces</filename> Խơ
-ѹ뤳ȤǤޤ
+ɬפʤ <filename>/etc/network/interfaces</filename> ԽѹǤޤ
</para></note>
</sect3>
Index: ja/using-d-i/modules/pkgsel.xml
===================================================================
--- ja/using-d-i/modules/pkgsel.xml (ӥ 49379)
+++ ja/using-d-i/modules/pkgsel.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43734 -->
+<!-- original version: 46722 -->
<sect3 id="pkgsel">
<!--
@@ -108,7 +108,16 @@
It is possible to get the installer to install KDE by using preseeding
(see <xref linkend="preseed-pkgsel"/>) or by adding
<literal>tasks="standard, kde-desktop"</literal> at the boot prompt
-when starting the installer. However, this will only work if the packages
+when starting the installer<footnote>
+
+<para>
+A more lightweight Xfce desktop environment can be selected by using
+<literal>xfce-desktop</literal> instead of <literal>kde-desktop</literal>.
+If you are installing on a laptop, you could also add
+<literal>laptop</literal> to the tasks to be installed.
+</para>
+
+</footnote>. However, this will only work if the packages
needed for KDE are actually available. If you are installing using a full
CD image, they will need to be downloaded from a mirror as KDE packages are
not included on the first full CD; installing KDE this way should work fine
@@ -117,7 +126,17 @@
preseed (<xref linkend="preseed-pkgsel"/> ) Ѥꡢ
ȡεư˥֡ȥץץȤ
<literal>tasks="standard, kde-desktop"</literal> Ȼꤷơ
-ȡ餬 KDE ȡ뤹褦ˤǤޤ
+ȡ餬 KDE ȡ뤹褦ˤǤޤ
+<footnote>
+
+<para>
+̤ Xfce ǥȥå״Ķ⡢<literal>kde-desktop</literal>
+<literal>xfce-desktop</literal> Ȥ뤳ȤǤޤ
+åץȥåפ˥ȡ뤹硢
+<literal>laptop</literal> ɲäƤȥȡ뤵ޤ
+</para>
+
+</footnote>
KDE ɬפʥѥåͭʾΤưޤ
ե CD ǥȡ뤷Ƥ硢
KDE Υѥåե CD 1 ܤäƤʤΤǡ
@@ -150,11 +169,11 @@
<para>
<!--
-Once you've selected your tasks, select <guibutton>OK</guibutton>. At this
+Once you've selected your tasks, select &BTN-CONT;. At this
point, <command>aptitude</command> will install the packages that are part
of the tasks you've selected.
-->
-顢<guibutton>OK</guibutton> Ƥ
+顢&BTN-CONT; Ƥ
<command>aptitude</command> ѥåΰȡ뤷Ϥޤ
</para>
Index: ja/using-d-i/modules/x86/grub-installer.xml
===================================================================
--- ja/using-d-i/modules/x86/grub-installer.xml (ӥ 49379)
+++ ja/using-d-i/modules/x86/grub-installer.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 -->
+<!-- original version: 46722 -->
<sect3 arch="x86">
<title>ϡɥǥؤ <command>Grub</command>
@@ -10,11 +10,11 @@
<!--
The main &architecture; boot loader is called <quote>grub</quote>.
Grub is a flexible and robust boot loader and a good default choice for
-newbies and old hands alike.
+new users and old hands alike.
-->
&architecture; Υᥤ֡ȥ <quote>grub</quote> ȸƤФƤޤ
grub ϽǴʥ֡ȥǡ
-鿴ԡԤ鷺ȤꤢǤФ褤Ǥ礦
+桼ų鷺ȤꤢǤФ褤Ǥ礦
</para><para>
@@ -31,12 +31,11 @@
</para><para>
<!--
-If you do not want to install grub at all, use the Back button to get to
-the main menu, and from there select whatever bootloader you would like to
-use.
+If you do not want to install grub, use the &BTN-GOBACK; button to get to the
+main menu, and from there select whatever bootloader you would like to use.
-->
-grub ȡ뤷ʤ硢
-Back ܥǥᥤ˥塼äƤ
+grub ȡ뤷ʤ硢
+&BTN-GOBACK; ܥǥᥤ˥塼äƤ
Ƥ顢Ѥ֡ȥƤ
</para>
Index: ja/using-d-i/modules/x86/lilo-installer.xml
===================================================================
--- ja/using-d-i/modules/x86/lilo-installer.xml (ӥ 49379)
+++ ja/using-d-i/modules/x86/lilo-installer.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43573 -->
+<!-- original version: 48599 -->
<sect3 arch="x86">
<title>ϡɥǥؤ <command>LILO</command>
@@ -79,17 +79,20 @@
<!--
Useful for advanced users who want to install <command>LILO</command>
somewhere else. In this case you will be asked for desired
-location. You can use devfs style names, such as those that start with
+location. You can use
+<phrase condition="etch">devfs style names, such as those that start with
<filename>/dev/ide</filename>, <filename>/dev/scsi</filename>, and
-<filename>/dev/discs</filename>, as well as traditional names, such as
+<filename>/dev/discs</filename>, as well as traditional names,</phrase>
+<phrase condition="lenny">traditional device names</phrase> such as
<filename>/dev/hda</filename> or <filename>/dev/sda</filename>.
-->
<command>LILO</command> ¾ξ˥ȡ뤷桼Ωޤ
ξ硢˾ΰ֤ޤ
<filename>/dev/hda</filename> <filename>/dev/sda</filename>
-Ȥä̾Ʊͤˡ
+Ȥä<phrase condition="etch">̾Ʊͤˡ
<filename>/dev/ide</filename>, <filename>/dev/scsi</filename>,
-<filename>/dev/discs</filename> ǻϤޤ褦 devfs ̾ѤǤޤ
+<filename>/dev/discs</filename> ǻϤޤ褦 devfs ̾</phrase>
+<phrase condition="lenny">̾</phrase>ѤǤޤ
</para></listitem></varlistentry>
</variablelist>
Index: ja/using-d-i/modules/lowmem.xml
===================================================================
--- ja/using-d-i/modules/lowmem.xml (ӥ 49379)
+++ ja/using-d-i/modules/lowmem.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43603 -->
+<!-- original version: 47209 -->
<sect3 id="lowmem">
<!--
@@ -98,5 +98,16 @@
ǺƤ
ext2 ѡƥȡ ext3 ѹǤޤ
+</para><para condition="lenny">
+
+<!--
+It is possible to force the installer to use a higher lowmem level than
+the one based on available memory by using the boot parameter
+<quote>lowmem</quote> as described in <xref linkend="installer-args"/>.
+-->
+ȡ <xref linkend="installer-args"/> Ƥ
+<quote>lowmem</quote> ֡ȥѥѤȡ
+ͭˤ lowmem ٥⤤٥ˤǤޤ
+
</para>
</sect3>
Index: ja/using-d-i/modules/shell.xml
===================================================================
--- ja/using-d-i/modules/shell.xml (ӥ 49379)
+++ ja/using-d-i/modules/shell.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43573 -->
+<!-- original version: 46722 -->
<sect3 id="shell">
<title>λѤȥλ</title>
@@ -47,11 +47,17 @@
a Shell</guimenuitem> item on the main menu that can be used to start
a shell. To get back to the installer itself, type
<userinput>exit</userinput> to close the shell.
+
+a shell. You can get to the main menu from most dialogs by using the
+&BTN-GOBACK; button one or more times. Type <userinput>exit</userinput>
+to close the shell and return to the installer.
-->
ڤؤʤ硢ᥤ˥塼ˤ
<guimenuitem>μ¹</guimenuitem> Ǥ⥷ưǤޤ
-ȡ鼫Τϡ<userinput>exit</userinput> Ϥ
-λƤ
+ۤȤɤΥ顢&BTN-GOBACK; ܥ٤ơ
+ᥤ˥塼ޤ
+<userinput>exit</userinput> Ϥȡ
+λƥȡޤ
</para><para>
Index: ja/using-d-i/using-d-i.xml
===================================================================
--- ja/using-d-i/using-d-i.xml (ӥ 49379)
+++ ja/using-d-i/using-d-i.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 44026 -->
+<!-- original version: 46722 -->
<chapter id="d-i-intro"><title>Debian Installer λˡ</title>
@@ -231,11 +231,11 @@
</para><para>
<!--
-You can get to the main menu by selecting the <quote>Back</quote> button
+You can get to the main menu by selecting the &BTN-GOBACK; button
repeatedly to back all the way out of the currently running component.
-->
¹ԤƤ륳ݡͥȤȴ뤿ˡ
-<quote>Back</quote> ܥ֤ƥᥤ˥塼ޤ
+&BTN-GOBACK; ܥ֤ƥᥤ˥塼ޤ
</para></listitem>
Index: ja/hardware/hardware-supported.xml
===================================================================
--- ja/hardware/hardware-supported.xml (ӥ 49379)
+++ ja/hardware/hardware-supported.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46426 -->
+<!-- original version: 48719 -->
<sect1 id="hardware-supported">
<!--
@@ -210,12 +210,14 @@
<entry>prep</entry>
</row>
-<row>
+<row condition="etch">
<entry morerows="2">Sun SPARC</entry>
<entry morerows="2">sparc</entry>
<entry>sun4m</entry>
<entry>sparc32</entry>
</row><row>
+ <entry morerows="1" condition="lenny">Sun SPARC</entry>
+ <entry morerows="1" condition="lenny">sparc</entry>
<entry>sun4u</entry>
<entry morerows="1">sparc64</entry>
</row><row>
Index: ja/hardware/network-cards.xml
===================================================================
--- ja/hardware/network-cards.xml (ӥ 49379)
+++ ja/hardware/network-cards.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43693 -->
+<!-- original version: 48981 -->
<sect1 id="network-cards">
<!--
@@ -308,22 +308,33 @@
This is a common problem on Netra systems with a Davicom (DEC-Tulip
compatible) NIC. In that case the <literal>tulip</literal> driver is
probably the correct one.
+You can prevent this issue by blacklisting the wrong driver module as
+described in <xref linkend="module-blacklist"/>.
+-->
+ϡDavicom (DEC-Tulip ߴ) NIC Ѥ Netra ƥඦ̤Ǥ
+ξ硢餯 <literal>tulip</literal> ɥ饤ФʪǤ
+ϡ<xref linkend="module-blacklist"/> Ƥ롢
+ä⥸塼֥åꥹȤ뤳Ȥɤޤ
-During the installation the solution is to switch to a shell and unload the
-wrong driver module using
+</para><para>
+
+<!--
+An alternative solution during the installation is to switch to a shell
+and unload the wrong driver module using
<userinput>modprobe -r <replaceable>module</replaceable></userinput> (or
both, if they are both loaded). After that you can load the correct module
using <userinput>modprobe <replaceable>module</replaceable></userinput>.
+Note that the wrong module may then still be loaded when the system is
+rebooted.
-->
-ϡDavicom (DEC-Tulip ߴ) NIC Ѥ Netra ƥඦ̤Ǥ
-ξ硢餯 <literal>tulip</literal> ɥ饤ФʪǤ
-
-ȡβȤƤϡ
+¾ȡβȤƤϡ
<userinput>modprobe -r <replaceable>module</replaceable></userinput> Ȥơ
ְäɥ饤Х⥸塼 (ξɤ߹ޤƤξ)
곰Ƥ
θ塢<userinput>modprobe <replaceable>module</replaceable></userinput> ǡ
ʪɤ߹Ǥ
+ƥ֡Ȥޤǡ
+ä⥸塼뤬ɤ߹ޤ줿ޤޤˤʤǽ뤳ȤդƤ
</para>
</sect3>
Index: ja/hardware/supported/sparc.xml
===================================================================
--- ja/hardware/supported/sparc.xml (ӥ 49379)
+++ ja/hardware/supported/sparc.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43528 -->
+<!-- original version: 48719 -->
<sect2 arch="sparc" id="sparc-cpus">
<!--
@@ -23,7 +23,7 @@
</para>
<variablelist>
-<varlistentry>
+<varlistentry condition="etch">
<term>sun4, sun4c, sun4d</term>
<listitem><para>
@@ -43,7 +43,7 @@
</para></listitem>
</varlistentry>
-<varlistentry>
+<varlistentry condition="etch">
<term>sun4m</term>
<listitem><para>
@@ -75,6 +75,38 @@
</para></listitem>
</varlistentry>
+<varlistentry condition="lenny">
+<term>sun4, sun4c, sun4d, sun4m</term>
+
+<listitem><para>
+
+<!--
+None of these 32-bit sparc subarchitectures (sparc32) is supported. For a
+complete list of machines belonging to these subarchitectures, please consult
+the <ulink url="http://en.wikipedia.org/wiki/SPARCstation";>Wikipedia
+SPARCstation page</ulink>.
+-->
+32 ӥåȤ sparc ֥ƥ (sparc32) ǡ
+ݡȤƤΤϤޤ
+Υƥ°ޥδʥꥹȤϡ
+<ulink url="http://en.wikipedia.org/wiki/SPARCstation";>Wikipedia
+SPARCstation Υڡ</ulink>
+
+</para><para>
+
+<!--
+The last Debian release to support sparc32 was Etch, but even then only
+for sun4m systems. Support for the other 32-bits subarchitectures had
+already been discontinued after earlier releases.
+-->
+sparc32 ݡȤǸ Debian Etch Ǥ
+Ǥ sun4m ƥषݡȤƤޤ
+¾ 32 ӥåȥ֥ƥΥݡȤϡ
+³Ƥޤ
+
+</para></listitem>
+</varlistentry>
+
<varlistentry>
<term>sun4u</term>
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml (ӥ 49379)
+++ ja/boot-installer/parameters.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 45239 -->
+<!-- original version: 48421 -->
<sect1 id="boot-parms"><title>֡ȥѥ</title>
<para>
@@ -339,6 +339,22 @@
</para></listitem>
</varlistentry>
+<varlistentry condition="lenny">
+<term>lowmem</term>
+<listitem><para>
+
+<!--
+Can be used to force the installer to a lowmem level higher than the one
+the installer sets by default based on available memory. Possible values
+are 1 and 2. See also <xref linkend="lowmem"/>.
+-->
+ȡ餬Ѳǽʥ˻Фǥեͤ⡢
+٥ (lowmem) ٥˶Τ˻ѤǤޤ
+ͭͤϡ1 2 Ǥ<xref linkend="lowmem"/> ⤴
+
+</para></listitem>
+</varlistentry>
+
<varlistentry>
<term>debian-installer/framebuffer (fb)</term>
<listitem><para>
@@ -427,20 +443,6 @@
</varlistentry>
<varlistentry>
-<term>debian-installer/probe/usb</term>
-<listitem><para>
-
-<!--
-Set to <userinput>false</userinput> to prevent probing for USB on
-boot, if that causes problems.
--->
-ư USB θФ꤬ϡ
- <userinput>false</userinput> ꤷƤ
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
<term>netcfg/disable_dhcp</term>
<listitem><para>
@@ -488,6 +490,24 @@
</para></listitem>
</varlistentry>
+<varlistentry condition="lenny">
+<term>disk-detect/dmraid/enable (dmraid)</term>
+<listitem><para>
+
+<!--
+Set to <userinput>true</userinput> to enable support for Serial ATA RAID
+(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer.
+Note that this support is currently experimental. Additional information
+can be found on the <ulink url="&url-d-i-wiki;">Debian Installer Wiki</ulink>.
+-->
+ȡǡSerial ATA RAID (ATA RAID, BIOS RAID, fake RAID ȤƤФ)
+ݡȤͭˤ <userinput>true</userinput> ˥åȤޤ
+ΥݡȤϸ¸Ǥ뤳ȤդƤ
+ɲþ <ulink url="&url-d-i-wiki;">Debian Installer Wiki</ulink> ˤޤ
+
+</para></listitem>
+</varlistentry>
+
<varlistentry>
<term>preseed/url (url)</term>
<listitem><para>
@@ -645,13 +665,12 @@
<!--
For the gtk frontend (graphical installer), hardware acceleration in directfb
-is disabled by default. To enable it, set this parameter to
-<userinput>true</userinput> when booting the installer.
+is disabled by default. Set this parameter to <userinput>true</userinput> to
+enable it.
-->
gtk եȥ (ե륤ȡ) Ѥˡ
directfb Υϡɥ졼ϡǥեȤ̵ȤʤäƤޤ
-ͭˤˤϡȡεưκݡ
-Υѥ <userinput>true</userinput> ꤷƤ
+ͭˤˤϡΥѥ <userinput>true</userinput> ꤷƤ
</para></listitem>
</varlistentry>
Index: ja/boot-installer/sparc.xml
===================================================================
--- ja/boot-installer/sparc.xml (ӥ 49379)
+++ ja/boot-installer/sparc.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43841 -->
+<!-- original version: 48719 -->
<sect2 arch="sparc" id="boot-tftp"><title>TFTP Ǥεư</title>
@@ -50,100 +50,6 @@
</para>
</sect2>
-
- <sect2 arch="sparc" condition="supports-floppy-boot">
-<!--
- <title>Booting from Floppies</title>
--->
- <title>եåԡεư</title>
-<para>
-
-<!--
-Floppy images are currently only available for sparc32, but, for technical
-reasons, not for official releases. (The reason is that they can only be
-built as root, which is not supported by our build daemons.)
-Look under <quote>daily built images</quote> on the
-<ulink url="&url-d-i;">Debian Installer project website</ulink> for links
-to floppy images for sparc32.
--->
-եåԡϡ sparc32 ǤѤǤޤ
-ޤŪǸ˴ޤޤƤޤ
-(ϥեåԡ root ǤӥɤǤ
-䤿ΥӥɥǡǤϥݡȤƤʤǤ)
-sparc32 ѤΥեåԡؤΥϡ
-<ulink url="&url-d-i;">Debian Installer project website</ulink>
-<quote>daily built images</quote> ˤޤ
-
-</para><para>
-
-<!--
-To boot from floppy on a Sparc, use
-
-<informalexample><screen>
-Stop-A -> OpenBoot: "boot floppy"
-</screen></informalexample>
--->
-Sparc ǥեåԡ鵯ưˤϡ
-
-<informalexample><screen>
-Stop-A -> OpenBoot: "boot floppy"
-</screen></informalexample>
-
-ȤƤ
-
-<!--
-Be warned that the newer Sun4u (ultra) architecture does not support
-floppy booting. A typical error message is <computeroutput>Bad magic
-number in disk label - Can't open disk label package</computeroutput>.
--->
-դƤۤΤǤ
- Sun4u (ultra) ƥ
-եåԡεưݡȤƤޤ
-Ūʥ顼åϡ<computeroutput>Bad magic
-number in disk label - Can't open disk label package</computeroutput>
-Ȥʤޤ
-
-</para><para>
-
-<!--
-Several Sparcs (e.g. Ultra 10) have an OBP bug that prevents them from
-booting (instead of not supporting booting at all). The appropriate
-OBP update can be downloaded as product ID 106121 from
-<ulink url="http://sunsolve.sun.com";></ulink>.
--->
-Ĥ Sparc (Ultra 10 ʤ) ˤ OBP Хꡢ
-ưǤޤ (ưݡȤƤʤ櫓ǤϤޤ)
-Ŭڤ OBP åץǡȤ
-<ulink url="http://sunsolve.sun.com";></ulink>
-ɤǤޤ ID 106121 Ǥ
-
-</para><para>
-
-<!--
-If you are booting from the floppy, and you see messages such as
-
-<informalexample><screen>
-Fatal error: Cannot read partition
-Illegal or malformed device name
-</screen></informalexample>
-
-then it is possible that floppy booting is simply not supported on
-your machine.
--->
-եåԡεưˡ
-
-<informalexample><screen>
-Fatal error: Cannot read partition
-Illegal or malformed device name
-</screen></informalexample>
-
-Ȥäåɽ줿顢
-եåԡǤεưΥޥñ˥ݡȤƤʤ
-Ȥǽޤ
-
-</para>
- </sect2>
-
<sect2 arch="sparc"><title>IDPROM å</title>
<para>
Index: ja/boot-installer/trouble.xml
===================================================================
--- ja/boot-installer/trouble.xml (ӥ 49379)
+++ ja/boot-installer/trouble.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 44560 -->
+<!-- original version: 46505 -->
<sect1 id="boot-troubleshooting">
<title>ȡץΥȥ֥륷塼ƥ</title>
@@ -631,8 +631,7 @@
in order to support some non-standard USB keyboards. However, there are some
broken USB systems where the driver hangs on loading. A possible workaround
may be disabling the USB controller in your mainboard BIOS setup. Another option
-is passing the <userinput>debian-installer/probe/usb=false</userinput> parameter
-at the boot prompt, which will prevent the modules from being loaded.
+is passing the <userinput>nousb</userinput> parameter at the boot prompt.
-->
ͥϡɸ USB ܡɤݡȤ褦ˡ
̾ USB ⥸塼 USB ܡɥɥ饤Фȡ뤷褦Ȥޤ
@@ -641,10 +640,8 @@
ϥޥܡɤ BIOS åȥåפǡ
USB ȥ̵ˤǤ뤫⤷ޤ
̤ˡϡ
-֡ȥץץȤ <userinput>debian-installer/probe/usb=false</userinput>
+֡ȥץץȤ <userinput>nousb</userinput>
ѥϤȤǤ
-ˤ USB ϡɥΤƤ⡢
-⥸塼뤬ɤΤɤȤǤޤ
</para>
</sect3>