[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[d-i doc] 翻訳更新

鍋太郎です。

etch リリース直前で大量に更新されているみたいです。
とりあえず、できたところまで添付してお送りします。

#またdebian-doc@jp:05112で喜瀬さんに指摘いただいたところも修正してあります。

よろしければチェックをお願いします。

tar ztf d-i-update0101.tar.gz
ja/bookinfo.xml 
ja/install-methods/install-tftp.xml 
ja/install-methods/tftp/bootp.xml 
ja/install-methods/tftp/dhcp.xml 
ja/preparing/pre-install-bios-setup.xml 
ja/preparing/nondeb-part/alpha.xml 
ja/preparing/nondeb-part/m68k.xml
ja/preparing/nondeb-part/x86.xml
ja/preparing/nondeb-part/sparc.xml
ja/preparing/bios-setup/sparc.xml
ja/preparing/bios-setup/s390.xml
ja/preparing/needed-info.xml
ja/using-d-i/components.xml
ja/using-d-i/modules/partman-crypto.xml
ja/using-d-i/modules/alpha/aboot-installer.xml
ja/using-d-i/modules/partman.xml
ja/using-d-i/modules/ia64/elilo-installer.xml
ja/using-d-i/modules/base-installer.xml
ja/using-d-i/modules/mdcfg.xml
ja/using-d-i/modules/apt-setup.xml
ja/using-d-i/modules/pkgsel.xml
ja/using-d-i/modules/x86/lilo-installer.xml
ja/using-d-i/modules/choose-mirror.xml
ja/using-d-i/modules/partman-lvm.xml
ja/using-d-i/modules/lowmem.xml
ja/using-d-i/modules/shell.xml
ja/hardware/hardware-supported.xml
ja/hardware/supported-peripherals.xml
ja/hardware/supported/sparc.xml
ja/boot-installer/x86.xml
ja/boot-installer/parameters.xml
ja/boot-installer/trouble.xml


-- 
+--------------------------------------------------------+
 倉澤 望(鍋太郎) 
 KURASAWA Nozomu (nabetaro)  <nabetaro @ caldron.jp>
 GnuPG FingerPrint:
    C4E5 7063 FD75 02EB E71D  559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+

Attachment: d-i-update0101.tar.gz
Description: Binary data

Index: ja/bookinfo.xml
===================================================================
--- ja/bookinfo.xml	(ӥ 43707)
+++ ja/bookinfo.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 38900 -->
+<!-- original version: 43611 -->
 
 <bookinfo id="debian_installation_guide">
 <title>&debian; 󥹥ȡ륬</title>
@@ -22,6 +22,39 @@
 </para>
 
 <para>
+<note arch="m68k"><para>
+<!--
+Because the &arch-title; port is not a release architecture for
+&releasename;, there is no official version of this manual for
+&arch-title; for &releasename;. However, because the port is still
+active and there is hope that &arch-title; may be included again
+in future official releases, this development version of the
+Installation Guide is still available.
+-->
+&arch-title; ΰܿǤ &releasename; Υ꡼ƥǤϤʤᡢ
+ &arch-title;  &releasename; Υޥ˥奢Ϥޤ
+ܿǤޤѤǤޤ
+&arch-title; θ꡼褹˾ߤ⤢ޤΤǡ
+ȯǤΥ󥹥ȡ륬ɤϤޤѤǤޤ
+
+</para><para>
+
+<!--
+Because &arch-title; is not an official architecture, some of the
+information, and especially some links, in this manual may be
+incorrect. For additional information, please check the
+<ulink url="&url-ports;">webpages</ulink> of the port or contact the
+<ulink url="&url-list-subscribe;">debian-&arch-listname; mailing
+list</ulink>.
+-->
+&arch-title; ϸƥǤϤޤ󤫤顢
+ܥޥ˥奢ξ䡢ä˥󥯤ϸäƤǽޤ
+ʤϡܿǤ <ulink url="&url-ports;">web ڡ</ulink> 
+åꡢ<ulink url="&url-list-subscribe;">debian-&arch-listname; 
+᡼󥰥ꥹ</ulink> Ǥ䤤碌
+
+</para></note>
+
 <warning condition="not-checked"><para>
 <!--
 This installation guide is based on an earlier manual written for
Index: ja/install-methods/install-tftp.xml
===================================================================
--- ja/install-methods/install-tftp.xml	(ӥ 43707)
+++ ja/install-methods/install-tftp.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43696 -->
 
  <sect1 condition="supports-tftp" id="install-tftp">
  <title>TFTP ͥåȥ֡ѥեν</title>
@@ -23,22 +23,22 @@
 </para><para>
 
 <!--
-You need to setup a TFTP server, and for many machines, a BOOTP server
-<phrase condition="supports-rarp">, or RARP server</phrase>
-<phrase condition="supports-dhcp">, or DHCP server</phrase>.
+You need to setup a TFTP server, and for many machines a DHCP
+server<phrase condition="supports-rarp">, or RARP
+server</phrase><phrase condition="supports-bootp">, or BOOTP
+server</phrase>.
 -->
-꤬ɬפʤΤ TFTP ФǤ
-ޤ¿ΥޥǤ BOOTP 
-<phrase condition="supports-rarp">RARP </phrase>
-<phrase condition="supports-dhcp">DHCP </phrase>
-Τ줫꤬ɬפǤ
+TFTP Ф򥻥åȥåפɬפޤ
+ޤ¿ΥޥǤ DHCP <phrase condition="supports-rarp">䡢
+RARP </phrase><phrase condition="supports-bootp">
+BOOTP </phrase>ΥåȥåפɬפǤ
 
 </para><para>
 
 <!--
 <phrase condition="supports-rarp">The Reverse Address Resolution Protocol (RARP) is
 one way to tell your client what IP address to use for itself. Another
-way is to use the BOOTP protocol. </phrase>
+way is to use the BOOTP protocol.</phrase>
 -->
 <phrase condition="supports-rarp">Reverse Address Resolution Protocol (RARP) ϡ
 ɤ IP Ѥ٤򥯥饤ȤˡΤҤȤĤǤ
@@ -47,28 +47,27 @@
 <!--
 <phrase condition="supports-bootp">BOOTP is an IP protocol that
 informs a computer of its IP address and where on the network to obtain
-a boot image. </phrase>
+a boot image.</phrase>
 -->
 <phrase condition="supports-bootp">BOOTP  IP ץȥΤҤȤĤǤ
 饤ȤФơȤ٤ IP ɥ쥹ȡ
 ֡ȥ᡼ͥåȥΤɤ뤫ޤ</phrase>
 
 <!--
-<phrase arch="m68k"> Yet another alternative exists on VMEbus
-systems: the IP address can be manually configured in boot ROM. </phrase>
+<phrase arch="m68k">Yet another alternative exists on VMEbus
+systems: the IP address can be manually configured in boot ROM.</phrase>
 -->
 <phrase arch="m68k">VMEbus ƥǤϤޤä¸ߤޤ
 IP ɥ쥹ϥ֡ ROM ưǤޤ</phrase>
 
 <!--
-<phrase condition="supports-dhcp">The DHCP (Dynamic Host Configuration
-Protocol) is a more flexible, backwards-compatible extension of BOOTP.
-Some systems can only be configured via DHCP. </phrase>
+The DHCP (Dynamic Host Configuration Protocol) is a more flexible,
+backwards-compatible extension of BOOTP.
+Some systems can only be configured via DHCP.
 -->
-<phrase condition="supports-dhcp">
 DHCP (Dynamic Host Configuration Protocol) ϡ
 BOOTP ȤθߴݤĤġ˳ĥΤǤ
-ƥˤäƤ DHCP ǤǤʤȤ⤢ޤ</phrase>
+ƥˤäƤ DHCP ǤǤʤȤ⤢ޤ
 
 </para><para arch="powerpc">
 
@@ -188,34 +187,64 @@
 Debian ѥåϰŪ˥󥹥ȡ뤹ݡ
 ǥեȤåȥåפǤޤ
 
-</para><para>
+</para>
+<note><para>
 
 <!--
-Look in that file and remember the directory which is used as the
-argument of <command>in.tftpd</command>; you'll need that below.  The
-<userinput>-l</userinput> argument enables some versions of
+Historically TFTP servers used <filename>/tftpboot</filename> as directory
+to serve images from. However, &debian; packages may use other directories
+to comply with the <ulink url="&url-fhs-home;">Filesystem Hierarchy
+Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default
+uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the
+configuration examples in this section accordingly.
+-->
+Ū TFTP Фϡ
+᡼󶡤ǥ쥯ȥ <filename>/tftpboot</filename> Ѥޤ
+ &debian; ΥѥåǤϡ
+<ulink url="&url-fhs-home;">Filesystem Hierarchy Standard</ulink> 
+̤Υǥ쥯ȥѤǽޤ
+㤨С<classname>tftpd-hpa</classname> Ǥ 
+<filename>/var/lib/tftpboot</filename> ǥեȤǻѤޤ
+ɬפ˱ơĴƤ
+
+</para></note>
+<para>
+
+<!--
+Look in <filename>/etc/inetd.conf</filename> and remember the directory which
+is used as the argument of <command>in.tftpd</command><footnote>
+-->
+<filename>/etc/inetd.conf</filename> 򸫤ơ<command>in.tftpd</command> 
+ΰͿƤǥ쥯ȥФƤƤ<footnote>
+
+<para>
+<!--
+The <userinput>-l</userinput> argument enables some versions of
 <command>in.tftpd</command> to log all requests to the system logs;
-this is useful for diagnosing boot errors.  If you've had to change
-<filename>/etc/inetd.conf</filename>, you'll have to notify the
-running <command>inetd</command> process that the file has changed.
-On a Debian machine, run <userinput>/etc/init.d/inetd
-reload</userinput>; on other machines,
-find out the process ID for <command>inetd</command>, and run
-<userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>.
+this is useful for diagnosing boot errors.
 -->
-<filename>/etc/inetd.conf</filename> 򸫤ơ<command>in.tftpd</command> 
-ΰͿƤǥ쥯ȥФƤ
-ǤΥǥ쥯ȥȤޤ
 <command>in.tftpd</command> ΥСˤäƤϡ
 <userinput>-l</userinput> Ĥȡ
 ٤Ƥ׵򥷥ƥ˵ϿǤޤ
 ϵư顼οǤͭѤǤ
+</para>
+
+<!--
+</footnote>; you'll need that below.
+If you've had to change <filename>/etc/inetd.conf</filename>, you'll have to
+notify the running <command>inetd</command> process that the file has changed.
+On a Debian machine, run <userinput>/etc/init.d/inetd reload</userinput>; on
+other machines, find out the process ID for <command>inetd</command>, and run
+<userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>.
+-->
+</footnote>ǤΥǥ쥯ȥȤޤ
 <filename>/etc/inetd.conf</filename> ѹ顢
 ѹȤ <command>inetd</command> ʤФʤޤ
 Debian ޥǤ <userinput>/etc/init.d/inetd reload</userinput>
 ¹Ԥޤ
 ¾ΥޥǤϡ<command>inetd</command> Υץ ID 򸫤Ĥơ
-<userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput> ¹Ԥޤ
+<userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput> 
+¹Ԥޤ
 
 </para><para arch="mips">
 
@@ -264,8 +293,7 @@
 <!--
 Next, place the TFTP boot image you need, as found in
 <xref linkend="where-files"/>, in the <command>tftpd</command>
-boot image directory.  Generally, this directory will be
-<filename>/tftpboot</filename>.  You'll have to make a link from that
+boot image directory.  You may have to make a link from that
 file to the file which <command>tftpd</command> will use for booting a
 particular client.  Unfortunately, the file name is determined by the
 TFTP client, and there are no strong standards.
@@ -273,9 +301,8 @@
 ˹ԤȤϡ
 <xref linkend="where-files"/> εҤˤ롢ɬפ TFTP ֡ȥ᡼
 <command>tftpd</command> Υ֡ȥ᡼ǥ쥯ȥ֤ȤǤ
-Υǥ쥯ȥ <filename>/tftpboot</filename> Ǥ
 <command>tftpd</command> Υ饤ȤεưѤեؤΥ󥯤
-˺ʤФʤޤ
+˺Ƥ
 ǰʤ顢ե̾ TFTP 饤ȤˤäƷޤꡢ
 ϤΤɸ¸ߤޤ
 
@@ -303,14 +330,14 @@
 For PXE booting, everything you should need is set up in the
 <filename>netboot/netboot.tar.gz</filename> tarball. Simply extract this
 tarball into the <command>tftpd</command> boot image directory. Make sure
-your dhcp server is configured to pass <filename>/pxelinux.0</filename>
+your dhcp server is configured to pass <filename>pxelinux.0</filename>
 to <command>tftpd</command> as the filename to boot.
 -->
 PXE ưǤϡɬפʤȤ٤ <filename>netboot/netboot.tar.gz</filename> 
 tarball ˥åȥåפƤޤ
 ñˤ tarball 
 <command>tftpd</command> ֡ȥ᡼ǥ쥯ȥŸƤ
-<filename>/pxelinux.0</filename> 
+<filename>pxelinux.0</filename> 
 ưե̾Ȥ <command>tftpd</command> Ϥ褦
 dhcp ФꤵƤ뤳ȤǧƤ
 
@@ -513,6 +540,20 @@
 </para><para>
 
 <!--
+If you've done all this correctly, giving the command <userinput>boot
+net</userinput> from the OpenPROM should load the image. If the image
+cannot be found, try checking the logs on your tftp server to see which
+image name is being requested.
+-->
+٤Ԥȡ
+OpenPROM  <userinput>boot net</userinput> ޥɤͿơ
+᡼ɤǤޤ
+᡼Ĥʤ硢tftp ФΥå
+ɤΤ褦̾Υ᡼׵ᤵƤ뤫ǧƤ
+
+</para><para>
+
+<!--
 You can also force some sparc systems to look for a specific file name
 by adding it to the end of the OpenPROM boot command, such as
 <userinput>boot net my-sparc.image</userinput>. This must still reside
Index: ja/install-methods/tftp/bootp.xml
===================================================================
--- ja/install-methods/tftp/bootp.xml	(ӥ 43707)
+++ ja/install-methods/tftp/bootp.xml	(ȥԡ)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36841 -->
+<!-- original version: 43558 -->
 
 
   <sect2 condition="supports-bootp" id="tftp-bootp">
 <!--
-  <title>Setting up BOOTP server</title>
+  <title>Setting up a BOOTP server</title>
 -->
   <title>BOOTP Ф</title>
 <para>
@@ -14,14 +14,14 @@
 There are two BOOTP servers available for GNU/Linux. The first is CMU
 <command>bootpd</command>. The other is actually a DHCP server: ISC
 <command>dhcpd</command>. In &debian; these are contained in the
-<classname>bootp</classname> and <classname>dhcp</classname> packages
-respectively.
+<classname>bootp</classname> and <classname>dhcp3-server</classname>
+packages respectively.
 -->
 GNU/Linux ǻȤ BOOTP Ф 2 Ĥޤ
 ҤȤĤ CMU  <command>bootpd</command> Ǥ
 ⤦ 1 Ĥϼºݤ DHCP ФǤISC  <command>dhcpd</command> Ǥ
 &debian; Ǥϡ
-<classname>bootp</classname> ѥå <classname>dhcp</classname> 
+<classname>bootp</classname> ѥå <classname>dhcp3-server</classname>
 ѥåˤ줾äƤޤ
 
 </para><para>
@@ -103,11 +103,11 @@
 really easy, because it treats BOOTP clients as a moderately special
 case of DHCP clients.  Some architectures require a complex
 configuration for booting clients via BOOTP.  If yours is one of
-those, read the section <xref linkend="dhcpd"/>.  Otherwise, you
+those, read the section <xref linkend="dhcpd"/>.  In that case, you
 will probably be able to get away with simply adding the
 <userinput>allow bootp</userinput> directive to the configuration
 block for the subnet containing the client, and restart
-<command>dhcpd</command> with <userinput>/etc/init.d/dhcpd
+<command>dhcpd</command> with <userinput>/etc/init.d/dhcpd3-server
 restart</userinput>.
 -->
 оŪˡISC <command>dhcpd</command> ȤäƤ BOOTP ϼ¤˴ñǤ
@@ -116,10 +116,9 @@
 ƥˤäƤϡBOOTP ˤ륯饤Ȥεưˤ
 ʣ꤬ɬפˤʤޤ
 ˳Ƥޤä顢<xref linkend="dhcpd"/> ɤǤ
-ʤƥǤϡ
-饤Ȥδޤޤ륵֥ͥåȤ֥å
+ξ硢饤Ȥδޤޤ륵֥ͥåȤ֥å
 <userinput>allow bootp</userinput> Ȥǥ쥯ƥ֤ɲä
-<userinput>/etc/init.d/dhcpd restart</userinput> 
+<userinput>/etc/init.d/dhcpd3-server restart</userinput> 
 <command>dhcpd</command> ƵưǤ
 
 </para>
Index: ja/install-methods/tftp/dhcp.xml
===================================================================
--- ja/install-methods/tftp/dhcp.xml	(ӥ 43707)
+++ ja/install-methods/tftp/dhcp.xml	(ȥԡ)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43558 -->
 
-  <sect2 condition="supports-dhcp" id="dhcpd">
+  <sect2 id="dhcpd">
    <title>DHCP Ф</title>
 <para>
 
 <!--
 One free software DHCP server is ISC <command>dhcpd</command>.
-In &debian;, this is available in the <classname>dhcp</classname> package.
-Here is a sample configuration file for it (usually
-<filename>/etc/dhcpd.conf</filename>):
+For &debian;, the <classname>dhcp3-server</classname> package is
+recommended.  Here is a sample configuration file for it (see
+<filename>/etc/dhcp3/dhcpd.conf</filename>):
 -->
-ե꡼եȥ DHCP ФΤҤȤĤϡ
-ISC  <command>dhcpd</command> Ǥ
-&debian; Ǥϡ <classname>dhcp</classname> ѥåäƤޤ
-˼Τϡ<classname>dhcp</classname> ե
-(̤ <filename>/etc/dhcpd.conf</filename>) Ǥ
+ե꡼եȥ DHCP ФΤҤȤĤˡ
+ISC  <command>dhcpd</command> ޤ
+&debian; Ǥϡ<classname>dhcp3-server</classname> ѥå򤪾ᤷޤ
+ʲˡե򼨤ޤ
+(<filename>/etc/dhcpd.conf</filename> 򻲾)
 
 <informalexample><screen>
 option domain-name "example.com";
@@ -40,13 +40,6 @@
 }
 </screen></informalexample>
 
-<!--
-Note: the new (and preferred) <classname>dhcp3</classname> package uses
-<filename>/etc/dhcp3/dhcpd.conf</filename>.
--->
-: (ƹޤ) <classname>dhcp3</classname> ѥå
-<filename>/etc/dhcp3/dhcpd.conf</filename> Ѥޤ
-
 </para><para>
 
 <!--
@@ -68,10 +61,10 @@
 
 <!--
 After you have edited the <command>dhcpd</command> configuration file,
-restart it with <userinput>/etc/init.d/dhcpd restart</userinput>.
+restart it with <userinput>/etc/init.d/dhcpd3-server restart</userinput>.
 -->
 <command>dhcpd</command> եԽ򽪤顢
-<userinput>/etc/init.d/dhcpd restart</userinput> ˤä
+<userinput>/etc/init.d/dhcpd3-server restart</userinput> 
 <command>dhcpd</command> ƵưƤ
 
 </para>
@@ -107,11 +100,11 @@
 }
 
 group {
- next-server 192.168.1.3;
- host tftpclient {
+  next-server 192.168.1.3;
+  host tftpclient {
 # tftp client hardware address
   hardware ethernet  00:10:DC:27:6C:15;
-  filename "/tftpboot/pxelinux.0";
+  filename "pxelinux.0";
  }
 }
 </screen></informalexample>
Index: ja/preparing/pre-install-bios-setup.xml
===================================================================
--- ja/preparing/pre-install-bios-setup.xml	(ӥ 43707)
+++ ja/preparing/pre-install-bios-setup.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43696 -->
 
  <sect1 id="pre-install-bios-setup">
  <title>󥹥ȡ˹ԤϡɥOS </title>
@@ -32,49 +32,15 @@
 &bios-setup-sparc.xml;
 &bios-setup-s390.xml;
 
-  <sect2><title>Ĥ٤ϡɥ</title>
-<para arch="not-s390">
-
+  <sect2 arch="m68k;x86;powerpc" id="hardware-issues">
 <!--
-Many people have tried operating their 90 MHz CPU at 100 MHz, etc.  It
-sometimes works, but is sensitive to temperature and other factors and
-can actually damage your system. One of the authors of this document
-over-clocked his own system for a year, and then the system started
-aborting the <command>gcc</command> program with an unexpected signal
-while it was compiling the operating system kernel. Turning the CPU
-speed back down to its rated value solved the problem.
+  <title>Hardware Issues to Watch Out For</title>
 -->
-¿οͤ㤨 90 MHz  CPU  100 MHz
-ư褦ʤȤĩ路Ƥޤ
-Ϥޤ⤢ޤ٤ʤɤװҴǡ
-ºݤ˥ƥ»Ϳ뤳Ȥ⤢ޤ
-ʸԤϡʬΥƥ 1 ǯ֥СåưȤ
-ޤθ奫ͥΥѥ <command>gcc</command> 
-ͽʤʥ (unexpected signal) Ǥ褦ˤʤäƤޤޤ
- CPU ®٤̤᤹ȤDz褷ޤ
+  <title>Ĥ٤ϡɥ</title>
 
-</para><para arch="not-s390">
+<para arch="m68k">
 
 <!--
-The <command>gcc</command> compiler is often the first thing to die
-from bad memory modules (or other hardware problems that change data
-unpredictably) because it builds huge data structures that it
-traverses repeatedly.  An error in these data structures will cause it
-to execute an illegal instruction or access a non-existent
-address. The symptom of this will be <command>gcc</command> dying from
-an unexpected signal.
--->
-⥸塼 (뤤ϥǡѤƤޤ¾Υϡɥ㳲)
-硢ǽˤΤ <command>gcc</command> ѥǤ뤳Ȥ
-¿褦Ǥ
-<command>gcc</command> ʥǡ¤ۤ򷫤֤ȤǤ
-Τ褦ʥǡ¤˥顼ȡ̿᤬¹ԤƤޤäꡢ
-¸ߤʤɥ쥹ؤΥȯꤷޤ
-η̤Ȥơ<command>gcc</command> ͽʤʥǤΤǤ
-
-</para><para arch="m68k">
-
-<!--
 Atari TT RAM boards are notorious for RAM problems under Linux; if you
 encounter any strange problems, try running at least the kernel in
 ST-RAM.  Amiga users may need to exclude RAM using a booter memfile.
@@ -90,136 +56,9 @@
 
 </emphasis></phrase>
 
-</para><para arch="x86">
-
-<!--
-The very best motherboards support parity RAM and will actually tell
-you if your system has a single-bit error in RAM. Unfortunately, they
-don't have a way to fix the error, thus they generally crash
-immediately after they tell you about the bad RAM. Still, it's better
-to be told you have bad memory than to have it silently insert errors
-in your data. Thus, the best systems have motherboards that support
-parity and true-parity memory modules; see
-<xref linkend="Parity-RAM"/>.
--->
-ͥ줿ޥܡɤǤϡѥƥդ RAM ݡȤƤꡢ
-ƥब顼򸡽ФȤ˶Ƥޤ
-ǰʤȤˡ⥨顼뵡ǽޤǤϻäƤޤ
-äơŪ RAM ɤΤ餻ǥå夷Ƥޤޤ
-Ǥ⡢ۤäƥǡ˥顼򺮤Ǥޤϡ
-Τ餻Ƥ줿褤Ǥ礦
-ɺǤɤƥϡѥƥ򥵥ݡȤޥܡɤ
-ʪΥѥƥդ⥸塼ȹ礻ȤȤˤʤޤ
-<xref linkend="Parity-RAM"/> 
-
-</para><para arch="x86">
-
-<!--
-If you do have true-parity RAM and your motherboard can handle it, be
-sure to enable any BIOS settings that cause the motherboard to
-interrupt on memory parity errors.
--->
-ʪΥѥƥդ RAM äƤơޥܡɤбƤΤʤ顢
-꤬ѥƥ顼򵯤Ȥγȯ BIOS 
-ͭˤƤ
-
 </para>
 
-   <sect3 arch="x86"><title>ܥå</title>
-<para>
-
-<!--
-Many systems have a <emphasis>turbo</emphasis> switch that controls
-the speed of the CPU.  Select the high-speed setting. If your BIOS
-allows you to disable software control of the turbo switch (or
-software control of CPU speed), do so and lock the system in
-high-speed mode. We have one report that on a particular system, while
-Linux is auto-probing (looking for hardware devices) it can
-accidentally touch the software control for the turbo switch.
--->
-¿Υƥˤ <emphasis></emphasis> åĤƤꡢ
-Ѥ CPU ®٤Ǥޤ®Ǥ
-ܥå (ޤ CPU ®٤Υեȥ)  
-BIOS Ǥ褦ʤ顢
-̵ˤơ˥ƥ®⡼ɤư褦ˤƤ
-ΥƥǤϡLinux ϡɥμưФ򤷤Ƥ֤ˡ
-ܥåΥեȥְäѹƤޤ
-ȤƤޤ
-
-</para>
-   </sect3>
-
-   <sect3 arch="x86"><title>Cyrix CPU ȥեåԡǥΥ顼</title>
-<para>
-
-<!--
-Many users of Cyrix CPUs have had to disable the cache in their
-systems during installation, because the floppy disk has errors if
-they do not.  If you have to do this, be sure to re-enable your cache
-when you are finished with installation, as the system runs
-<emphasis>much</emphasis> slower with the cache disabled.
--->
-Cyrix  CPU ȤäƤ桼ϡ
-󥹥ȡδ֤ϥå̵ˤʤФʤޤ
-åͭˤƤȥեåԡǥΥ顼ޤ
-å夬̵ˤʤäƤȥƥब
-<emphasis>ʤ</emphasis> ٤ʤΤǡ
-ξ祤󥹥ȡ뤬λ顢
-˺줺˺ƤӥåͭˤƤ
-
-</para><para>
-
-<!--
-We don't think this is necessarily the fault of the Cyrix CPU. It may
-be something that Linux can work around. We'll continue to look into
-the problem.  For the technically curious, we suspect a problem with
-the cache being invalid after a switch from 16-bit to 32-bit code.
--->
-䤿ϡ
-꤬ɬ Cyrix  CPU η٤ˤΤȤϹͤƤޤ
-⤷顢Linux ¦DzǽʤȤʤΤ⤷ޤ
-ϰ³ĴƤޤ
-ʲϵŪʹ񿴤Ŀ͸:
-餯 16 ӥåȤ 32 ӥåȥɤڤؤäˡ
-å夬ˤʤǤϤʤƤޤ
-
-</para>
-   </sect3>
-
-   <sect3 arch="x86"><title>յ</title>
-<para>
-
-<!--
-You may have to change some settings or jumpers on your computer's
-peripheral cards.  Some cards have setup menus, while others rely on
-jumpers.  This document cannot hope to provide complete information on
-every hardware device; what it hopes to provide is useful tips.
--->
-ԥ塼ܤƤĥɤ䥸Ѥ
-ѹɬפ⤢뤫⤷ޤ
-ɤˤäƤ˥塼ĤΤ⤢ޤ
-ѤꤹΤ⤢ޤ
-ʸǤϤ٤ƤΥϡɥǥХФ
-ʾ󶡤뤳ȤϤǤޤ󤬡
-ͭפʾ󶡤ǤФ˾Ǥޤ
-
-</para><para>
-
-<!--
-If any cards provide <quote>mapped memory</quote>, the memory should be
-mapped somewhere between 0xA0000 and 0xFFFFF (from 640K to just below 1
-megabyte) or at an address at least 1 megabyte greater than the total
-amount of RAM in your system.
--->
-<quote>mapped memory</quote> ΤĤɤξ硢Υޥåפϡ
-0xA0000 - 0xFFFFF (640KB  1MB δ) Τɤ
-뤤ϥƥ RAM ̤
- 1MB Υɥ쥹ˤʤФʤޤ
-
-</para>
-   </sect3>
-
-   <sect3 arch="x86" id="usb-keyboard-config">
+   <formalpara arch="x86">
    <title>USB BIOS ݡȤȥܡ</title>
 <para>
 
@@ -243,42 +82,26 @@
 <quote>USB keyboard support</quote> Ȥä BIOS äƤ
 
 </para>
-   </sect3>
+   </formalpara>
 
-   <sect3><title>64 MB ʾ RAM</title>
-<para>
-
+   <formalpara arch="powerpc">
 <!--
-The Linux Kernel cannot always detect what amount of RAM you have.  If
-this is the case please look at <xref linkend="boot-parms"/>.
+   <title>Display-visibility on OldWorld Powermacs</title>
 -->
-Linux ͥ뤬ܤƤ RAM ̤θФ˼Ԥ뤳Ȥޤ
-ξнˤĤƤ <xref linkend="boot-parms"/> 
-
-</para>
-   </sect3>
-
-   <sect3 arch="powerpc">
-<!--
-   <title>Display visibility on OldWorld Powermacs</title>
--->
    <title>OldWorld PowerMAC ǤΥǥץ쥤ɽ</title>
 
 <para>
-
 <!--
 Some OldWorld Powermacs, most notably those with the <quote>control</quote>
-display driver but possibly others as well, may not produce a colormap with
-reliably results in visible output under Linux when the display is
-configured for more than 256 colors. If you are experiencing such issues
-with your display after rebooting (you can sometimes see data on
+display driver, may not reliably produce a colormap under Linux when the
+display is configured for more than 256 colors. If you are experiencing such
+issues with your display after rebooting (you can sometimes see data on
 the monitor, but on other occasions cannot see anything) or, if the screen
 turns black after booting the installer instead of showing you the user
 interface, try changing your display settings under MacOS to use 256
 colors instead of <quote>thousands</quote> or <quote>millions</quote>.
 -->
-ǥץ쥤ɥ饤Ф䡢ҤäȤȤ¾ΤΤƱͤ 
-<quote></quote>  OldWorld PowerMAC Ǥϡ
+ǥץ쥤ɥ饤Ф <quote></quote>  OldWorld PowerMAC Ǥϡ
 ɽ 256 礭ꤷƤ硢
 Linux ǽϤΤŬڤʥ顼ޥåפʤǽޤ
 ƵưˤΤ褦ʾ֤ˤʤä (˥ɽ뤳Ȥ⤢ޤ
@@ -288,6 +111,6 @@
 256 ȤƤߤƤ
 
 </para>
-   </sect3>
+   </formalpara>
   </sect2>
  </sect1>
Index: ja/preparing/nondeb-part/alpha.xml
===================================================================
--- ja/preparing/nondeb-part/alpha.xml	(ӥ 43707)
+++ ja/preparing/nondeb-part/alpha.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 43576 -->
 
 
   <sect2 arch="alpha"><title>Tru64 UNIX ǤΥѡƥʬ</title>
@@ -123,7 +123,7 @@
 repartition your disk from the AlphaBIOS setup menu).  Otherwise, it
 is not really necessary to partition from Windows; the Linux
 partitioning tools will generally do a better job.  Note that when you
-run NT, the Disk Administrator may offer you to write a <quote>harmless
+run NT, the Disk Administrator may offer to write a <quote>harmless
 signature</quote> on non-Windows disks if you have any.
 <emphasis>Never</emphasis> let it do that, as this signature will destroy
 the partition information.
@@ -140,7 +140,7 @@
 NT Ȥȡǥġ뤬
 Windows ʳΥǥ
 <quote>̵ʰ</quote> 񤭹褦¥Ƥޤ
-<emphasis></emphasis>ˤʤȤ򤵤ƤϤޤ
+<emphasis>Ф</emphasis>ʤȤ򤵤ƤϤޤ
  <quote></quote> ϥѡƥ˲Ƥޤޤ
  
 </para><para>
Index: ja/preparing/nondeb-part/m68k.xml
===================================================================
--- ja/preparing/nondeb-part/m68k.xml	(ӥ 43707)
+++ ja/preparing/nondeb-part/m68k.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 43576 -->
 
 
   <sect2 arch="m68k"><title>AmigaOS ǤΥѡƥʬ</title>
@@ -219,13 +219,14 @@
 <!--
 For IDE based Macs, you need to use <command>Apple Drive Setup</command> to create
 empty space for the Linux partitions, and complete the partitioning under
-Linux, or use the MacOS version of pdisk available from the MkLinux FTP
-server.
+Linux, or use the MacOS version of pdisk available for download from
+<ulink url="http://homepage.mac.com/alk/downloads/pdisk.sit.hqx";>Alsoft</ulink>.
 -->
 IDE ١ Mac Ǥϡޤ <command>Apple Drive Setup</command> Ѥ
 Linux ѡƥ˻Ȥΰ
 ǽŪʥѡƥʬ Linux ǹԤ褦ˤ뤫
-뤤 MkLinux FTP ФǤ MacOS Ǥ pdisk Ѥޤ
+<ulink url="http://homepage.mac.com/alk/downloads/pdisk.sit.hqx";>Alsoft</ulink>
+ǥɤǤ MacOS Ǥ pdisk Ѥޤ
 
 </para>
 </sect2>
Index: ja/preparing/nondeb-part/x86.xml
===================================================================
--- ja/preparing/nondeb-part/x86.xml	(ӥ 43707)
+++ ja/preparing/nondeb-part/x86.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42250 -->
+<!-- original version: 43576 -->
 
 
   <sect2 arch="x86"><title>DOS  Windows Υѡƥʬ</title>
@@ -24,12 +24,12 @@
 </para><para>
 
 <!--
-But if you have a large IDE disk, and are using neither LBA addressing,
-overlay drivers (sometimes provided by hard disk manufacturers), nor a
+But if you have a large IDE disk, and are not using LBA addressing,
+overlay drivers (sometimes provided by hard disk manufacturers), or a
 new (post 1998) BIOS that supports large disk access extensions, then
 you must locate your Debian boot partition carefully. In this case,
 you will have to put the boot partition into the first 1024 cylinders
-of your hard drive (usually around 524 megabytes, without BIOS
+of your hard disk (usually around 524 megabytes, without BIOS
 translation). This may require that you move an existing FAT or NTFS
 partition.
 -->
@@ -38,7 +38,7 @@
 (HDD Υ᡼󶡤뤳Ȥޤ) ⡢
 顼ǥĥ򥵥ݡȤ (1998 ǯʹߤ) BIOS 
 ʤȤˤϡDebian Υ֡ȥѡƥդ֤ʤФʤޤ
-Τ褦ʾ硢֡ȥѡƥϡɥɥ饤֤
+Τ褦ʾ硢֡ȥѡƥϡɥǥ
 Ƭ 1024 ˼ʤФʤޤ
 ( BIOS ѴʤС̾ 524 ᥬХȤˤʤޤ)
 Ϥʤ¸ FAT ѡƥ NTFS
Index: ja/preparing/nondeb-part/sparc.xml
===================================================================
--- ja/preparing/nondeb-part/sparc.xml	(ӥ 43707)
+++ ja/preparing/nondeb-part/sparc.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 43576 -->
 
 
   <sect2 arch="sparc"><title>SunOS Υѡƥʬ</title>
@@ -15,8 +15,8 @@
 Just make sure you leave room for the Debian root partition within the
 first 1GB area of the boot disk. You can also place the kernel image on a
 UFS partition if that is easier than putting the root partition there.
-SILO supports booting Linux and SunOS from either EXT2 (Linux), UFS
-(SunOS), romfs and iso9660 (CDROM) partitions.
+SILO supports booting Linux and SunOS from any of EXT2 (Linux), UFS
+(SunOS), romfs or iso9660 (CDROM) partitions.
 -->
 SunOS ǹԤСѡƥϤޤäʤԤޤ
 ƱΥޥ SunOS  Debian Ѥϡ
@@ -29,7 +29,7 @@
 Τ褦ʥ롼ȥѡƥݤ뤳Ȥ񤷤С
 ͥ륤᡼ UFS ѡƥ֤ˡޤ
 SILO ϡEXT2 (Linux), UFS (SunOS), romfs, iso9660 (CDROM) 
-Ȥäѡƥ󤫤 Linux  SunOS ưǤޤ
+Τ줫Υѡƥ󤫤 Linux  SunOS ưǤޤ
 
 </para>
   </sect2>
Index: ja/preparing/bios-setup/sparc.xml
===================================================================
--- ja/preparing/bios-setup/sparc.xml	(ӥ 43707)
+++ ja/preparing/bios-setup/sparc.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36732 -->
+<!-- original version: 43641 -->
 
 
   <sect2 arch="sparc" id="invoking-openboot"><title>OpenBoot εư</title>
@@ -97,7 +97,7 @@
 meanings; the <quote>net</quote> device is for booting from the network.
 Additionally, the device name can specify a particular partition of a disk,
 such as <quote>disk2:a</quote> to boot disk2, first partition.  Full
-OpenBoot device names have the form
+OpenBoot device names have the form:
 -->
 ǤǤϡƤξ 
 <quote>floppy</quote>, <quote>cdrom</quote>, <quote>net</quote>,
@@ -109,7 +109,7 @@
 ꤹ뤳ȤǤޤ
 㤨 2 ǥ 1 ѡƥ󤫤鵯ưˤ 
 <quote>disk2:a</quote> Τ褦˻ꤷޤ
-OpenBoot δʥǥХ̾ϡ
+OpenBoot δʥǥХ̾ϰʲΤ褦ˤʤޤ
 
 <informalexample>
 <screen>
@@ -117,8 +117,8 @@
 <replaceable>unit-address</replaceable>:
 <replaceable>device-arguments</replaceable>
 </screen></informalexample>
-ȤǤ
 
+
 <!--
 In older revisions of OpenBoot, device naming is a bit different: the
 floppy device is called <quote>/fd</quote>, and SCSI disk devices are of
Index: ja/preparing/bios-setup/s390.xml
===================================================================
--- ja/preparing/bios-setup/s390.xml	(ӥ 43707)
+++ ja/preparing/bios-setup/s390.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36732 -->
+<!-- original version: 43655 -->
 
 
   <sect2 arch="s390"><title>BIOS </title>
@@ -55,13 +55,13 @@
 Before you actually perform an installation, you have to go over some
 design and preparation steps.  IBM has made documentation available
 about the whole process, e.g. how to prepare an installation medium
-and how actually boot from that medium.  Duplicating that information
+and how actually to boot from that medium.  Duplicating that information
 here is neither possible nor necessary.  However, we will describe
-here which kind of Debian-specific data is needed and where do you
-find them.  Based on both sources of information you have to prepare
-your machine and the installation medium and to perform a boot from
-it.  When you see the welcome message in your client session join this
-document again for the Debian-specific installation steps.
+here which kind of Debian-specific data is needed and where to find it.
+Using both sources of information, you have to prepare your machine
+and the installation medium before you can perform a boot from it.
+When you see the welcome message in your client session, return to this
+document to go through the Debian-specific installation steps.
 -->
 ºݤ˥󥹥ȡԤޤˡ
 ߷פꤹʳ򤤤ĤƧޤʤФʤޤ
@@ -69,8 +69,8 @@
 ΥǥμºݤεưʤɤϡIBM ʸƤޤ
 Ǥξ򷫤֤ΤԲǽǤɬפǤ礦
 ɬפȤʤ Debian ͭξ䡢μˤĤƤϡ
-ǽҤ٤Ȼפޤ 2 Ĥξ󸻤򸵤ˡ
-ޥȵưѥ󥹥ȡǥƤ
+ǽҤ٤Ȼפޤξξ󸻤򸵤ˡ
+ޥȵưѥ󥹥ȡǥư˽Ƥ
 饤ȥå welcome å򸫤顢
 ޤʸꡢDebian Υ󥹥ȡԤäƤäƤ
 
Index: ja/preparing/needed-info.xml
===================================================================
--- ja/preparing/needed-info.xml	(ӥ 43707)
+++ ja/preparing/needed-info.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43558 -->
 
  <sect1 id="needed-info">
 <!--
@@ -639,7 +639,7 @@
 </para></listitem>
 </itemizedlist>
 
-</para><para condition="supports-dhcp">
+</para><para>
 
 <!--
 On the other hand, if your administrator tells you that a DHCP server
Index: ja/post-install/mail-setup.xml
===================================================================
--- ja/post-install/mail-setup.xml	(ӥ 43707)
+++ ja/post-install/mail-setup.xml	(ȥԡ)
@@ -243,7 +243,7 @@
 
 <!--
 To correctly set up <command>reportbug</command> to use an external mail
-server, please run the command <command>reportbug --configure</command>
+server, please run the command <command>reportbug -\-configure</command>
 and answer <quote>no</quote> to the question if an MTA is available. You
 will then be asked for the SMTP server to be used for submitting bug reports.
 -->
Index: ja/using-d-i/components.xml
===================================================================
--- ja/using-d-i/components.xml	(ӥ 43707)
+++ ja/using-d-i/components.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 -->
+<!-- original version: 43573 -->
 
  <sect1 id="module-details">
 <!--
@@ -184,8 +184,8 @@
 
 <!--
 After the base system is installed, you have a usable but limited system.
-Most users will want to add additional software to the system to tune it to
-their needs, and the installer lets you do so. This step can take even
+Most users will want to install additional software to the system to tune it to
+their needs, and the installer allows you do so. This step can take even
 longer than installing the base system if you have a slow computer or
 network.
 -->
@@ -213,7 +213,7 @@
 <!--
 If you are installing a diskless workstation, obviously, booting off
 the local disk isn't a meaningful option, and this step will be
-skipped. <phrase arch="sparc">You may wish to set the OpenBoot to boot
+skipped. <phrase arch="sparc">You may wish to set OpenBoot to boot
 from the network by default; see <xref
 linkend="boot-dev-select-sun"/>.</phrase>
 -->
@@ -224,20 +224,6 @@
 OpenBoot ꤹΤǤ顢
 <xref linkend="boot-dev-select-sun"/> </phrase>
 
-</para><para>
-
-<!--
-Note that multiple operating systems booting on a single machine is
-still something of a black art.  This document does not even attempt
-to document the various boot managers, which vary by architecture and
-even by subarchitecture.  You should see your boot manager's
-documentation for more information.
--->
-Ʊޥʣ OS ưΤϡޤˤʤŪǤ
-Ǥϡ͡ʥ֡ȥޥ͡˸ڤޤ
-ƥˤäơ˥֥ƥˤäƤѤ뤫Ǥ
-ܤϡ֡ȥޥ͡ΥɥȤ
-
 </para>
 
 &module-os-prober.xml;
Index: ja/using-d-i/modules/partman-crypto.xml
===================================================================
--- ja/using-d-i/modules/partman-crypto.xml	(ӥ 43707)
+++ ja/using-d-i/modules/partman-crypto.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 41817 -->
+<!-- original version: 43576 -->
 
    <sect3 id="partman-crypto">
 <!--
@@ -80,7 +80,7 @@
 To use encryption, you have to create a new partition by selecting
 some free space in the main partitioning menu. Another option is to
 choose an existing partition (e.g. a regular partition, an LVM logical
-volume or a RAID volume). In the <guimenu>Partition setting</guimenu>
+volume or a RAID volume). In the <guimenu>Partition settings</guimenu>
 menu, you need to select <guimenuitem>physical volume for
 encryption</guimenuitem> at the <menuchoice> <guimenu>Use
 as:</guimenu> </menuchoice> option. The menu will then change to
Index: ja/using-d-i/modules/alpha/aboot-installer.xml
===================================================================
--- ja/using-d-i/modules/alpha/aboot-installer.xml	(ӥ 43707)
+++ ja/using-d-i/modules/alpha/aboot-installer.xml	(ȥԡ)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 25496 -->
+<!-- original version: 43573 -->
 
   <sect3 arch="alpha">
   <title>ϡɥǥؤ <command>aboot</command> Υ󥹥ȡ</title>
 <para>
 
 <!--
-If you have booted from SRM, if you select this option, the installer
+If you have booted from SRM and you select this option, the installer
 will write <command>aboot</command> to the first sector of the disk on
 which you installed Debian.  Be <emphasis>very</emphasis> careful &mdash; it
 is <emphasis>not</emphasis> possible to boot multiple operating
@@ -17,7 +17,7 @@
 installed Debian, you will have to boot GNU/Linux from a floppy
 instead.
 -->
-ʤ SRM 鵯ưΤʤ顢Υץ򤹤С
+ʤ SRM 鵯ưΥץ򤹤硢
 󥹥ȡ Debian 򥤥󥹥ȡ뤷ǥκǽΥ 
 <command>aboot</command> 񤭤ߤޤ
 Ʊǥʣ OS (㤨 GNU/Linux, Free/Open/NetBSD, 
Index: ja/using-d-i/modules/partman.xml
===================================================================
--- ja/using-d-i/modules/partman.xml	(ӥ 43707)
+++ ja/using-d-i/modules/partman.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43254 -->
+<!-- original version: 43655 -->
 
    <sect3 id="partman">
    <title>ǥΥѡƥʬ</title>
@@ -16,9 +16,36 @@
 ѡƥʬ԰¤äꡢܺ٤ΤꤿС 
 <xref linkend="partitioning"/>
 
-</para><para>
+</para>
+<warning arch="sparc"><para>
+<!-- BTS: #384653 -->
 
 <!--
+If a hard disk has previously used under Solaris, the partitioner may not
+detect the size of the drive correctly. Creating a new partition table
+does not fix this issue. What does help, is to <quote>zero</quote> the
+first few sectors of the drive:
+-->
+ϡɥǥ Solaris ǻѤƤ硢
+ѡƥʡɥ饤֤ΥФʤ礬ޤ
+ѡƥơ֥Ƥ⡢ϲ褷ޤ
+ˤϡʲΤ褦˥ɥ饤֤Ƭˡ
+<quote></quote> 񤭹ߤޤ
+
+<informalexample><screen>
+# dd if=/dev/zero of=/dev/hd<replaceable>X</replaceable> bs=512 count=2; sync
+</screen></informalexample>
+
+<!--
+Note that this will make any existing data on that disk inaccessible.
+-->
+ˤꡢǥδ¸ǡˤϡ
+Ǥʤʤ뤳ȤդƤ
+
+</para></warning>
+<para>
+
+<!--
 First you will be given the opportunity to automatically partition
 either an entire drive, or available free space on a drive. This is
 also called <quote>guided</quote> partitioning. If you do not want to
@@ -337,49 +364,56 @@
 </para><para>
 
 <!--
-If you select a pristine disk which has neither partitions
-nor free space on it, you will be offered to create a new partition
-table (this is needed so you can create new partitions). After this
-a new line entitled <quote>FREE SPACE</quote> should appear under the
-selected disk.
+If you select a pristine disk which has neither partitions nor free
+space on it, you will be asked if a new partition table should be
+created (this is needed so you can create new partitions). After this,
+a new line entitled <quote>FREE SPACE</quote> should appear in the table
+under the selected disk.
 -->
 ѡƥΰʤǤΥϡɥǥ򤹤ȡ
-ѡƥơ֥褦¥ޤ 
+ѡƥơ֥뤫ǧޤ
 (ѡƥΤɬ)
-򤷤ǥβˡ
+򤷤ǥΥѡƥơ֥ˡ
 <quote>FREE SPACE</quote> (ΰ) ȤԤޤ 
 
 </para><para>
 <!--
-If you select some free space, you will be offered to create new
-partition. You will have to answer a quick series of questions about
+If you select some free space, you will have the opportunity to create a
+new partition. You will have to answer a quick series of questions about
 its size, type (primary or logical), and location (beginning or end of
-the free space). After this, you will be presented with detailed
-overview of your new partition. There are options like mountpoint,
-mount options, bootable flag, or way of usage. If you don't like the
+the free space). After this, you will be presented with a detailed
+overview of your new partition. The main setting is <guimenuitem>Use
+as:</guimenuitem>, which determines if the partition will have a file
+system on it, or be used for swap, software RAID, LVM, an encrypted
+file system, or not be used at all. Other settings include
+mountpoint, mount options, and bootable flag; which settings are shown
+depends on how the partition is to be used. If you don't like the
 preselected defaults, feel free to change them to your liking. E.g. by
 selecting the option <guimenuitem>Use as:</guimenuitem>, you can
-choose different filesystem for this partition including the
-possibility to use the partition for swap, software RAID, LVM, or not
-use it at all. Other nice feature is the possibility to copy data from
-existing partition onto this one.
+choose a different filesystem for this partition, including options
+to use the partition for swap, software RAID, LVM, or not
+use it at all. Another nice feature is the ability to copy data from
+an existing partition onto this one.
 When you are satisfied with your new partition, select
-<guimenuitem>Done setting up the partition</guimenuitem> and you will be
-thrown back to <command>partman</command>'s main screen.
+<guimenuitem>Done setting up the partition</guimenuitem> and you will
+return to <command>partman</command>'s main screen.
 -->
-ΰ򤹤ȡѡƥ褦¥ޤ
+ΰ򤹤ȡѡƥǤ褦ˤʤޤ
 䥿 (ܤ)  (ΰƬ餫Ǹ夫餫) 
 ȤäδñʼʤФʤޤ
 θ塢ѡƥξܺ٤ʳפޤ
-ˤϡޥȥݥȤޥȥץ󡢵ưե饰
-ӤȤäץ󤬤ޤ
+ϡե륷ƥबѡƥˤ硢
+swapեȥ RAIDLVMŹ沽ե륷ƥȤƻȤ
+Ȥʤꤹ <guimenuitem>Use as:</guimenuitem> Ǥ
+¾ˤϡޥȥݥȤޥȥץ
+ưե饰Ȥäѡƥλˡ˰¸꤬ޤ
 餫򤵤줿ǥեͤʤС
 ͳˤߤΤΤؤѹƤ
 㤨Сץ <guimenuitem>Use as:</guimenuitem> 򤹤ȡ
 åס եȥ RAIDLVMޤʳΥե륷ƥˡ
 ΥѡƥѹǤޤ
-¾ʵǽȤơ¸Υѡƥ󤫤餳Υѡƥˡ
-ǡ򥳥ԡ뤳ȤǤǽȤȤǤ
+¾ˤϡ¸Υѡƥ󤫤餳Υѡƥˡ
+ǡ򥳥ԡǤȤʵǽޤ
 ѡƥ­顢
 <guimenuitem>Done setting up the partition</guimenuitem> 򤷤ơ
 <command>partman</command> Υᥤ̤äƤ
@@ -389,8 +423,8 @@
 <!--
 If you decide you want to change something about your partition,
 simply select the partition, which will bring you to the partition
-configuration menu. Because this is the same screen like when creating
-a new partition, you can change the same set of options. One thing
+configuration menu. This is the same screen like when creating
+a new partition, so you can change the same settings. One thing
 which might not be very obvious at a first glance is that you can
 resize the partition by selecting the item displaying the size of the
 partition. Filesystems known to work are at least fat16, fat32, ext2,
@@ -400,7 +434,7 @@
 ñˤΥѡƥ򤷤Ʋ
 ѡƥ˥塼ޤ
 ѡƥΤƱ̤ǤΤǡ
-ƱͤѹǹԤޤ
+ƱͤѹǤޤ
 츫Ƥ褯狼ʤ⤷ʤΤϡ
 ɽƤѡƥΥ򤷤ơѹǤ뤳ȤǤ
 ư뤳Ȥ狼äƤե륷ƥϡ
Index: ja/using-d-i/modules/ia64/elilo-installer.xml
===================================================================
--- ja/using-d-i/modules/ia64/elilo-installer.xml	(ӥ 43707)
+++ ja/using-d-i/modules/ia64/elilo-installer.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 24321 -->
+<!-- original version: 43573 -->
 
   <sect3 arch="ia64">
   <title>ϡɥǥؤ <command>ELILO</command> 
@@ -17,10 +17,10 @@
 menu in the firmware to point to the files in the EFI partition.
 The <command>elilo</command> boot loader is really in two parts.
 The <filename>/usr/sbin/elilo</filename> command manages the partition and
-copies file into it.
+copies files into it.
 The <filename>elilo.efi</filename> program is copied into the EFI
-partition and then run by the <quote>EFI Boot Manager</quote> to actually
-do the work of loading and starting the Linux kernel.
+partition and then run by the <quote>EFI Boot Manager</quote> to
+do the actual work of loading and starting the Linux kernel.
 -->
 &architecture; Υ֡ȥ <quote>elilo</quote> ȸƤФƤޤ
  x86 ƥѤ <quote>lilo</quote> ֡ȥ˺졢
@@ -33,8 +33,8 @@
 <filename>/usr/sbin/elilo</filename> ޥɤϡ
 ѡƥδ򤷡إե򥳥ԡޤ
 <filename>elilo.efi</filename> ץ EFI ѡƥ˥ԡ졢
-ºݤ Linux ͥɡư褦 <quote>EFI Boot Manager</quote>
-˼¹Ԥޤ
+Linux ͥɡư褦 <quote>EFI Boot Manager</quote>
+˼ºݤ˼¹Ԥޤ
 
 </para><para>
 
@@ -68,7 +68,7 @@
 &d-i; may show multiple choices depending on what it finds from scanning
 all of the disks of the system including EFI partitions of other system
 disks and EFI diagnostic partitions.
-Remember, the <command>elilo</command> may format the partition during
+Remember, <command>elilo</command> may format the partition during
 the installation, erasing any previous contents!
 -->
 ѡƥ򤹤ϡ
Index: ja/using-d-i/modules/base-installer.xml
===================================================================
--- ja/using-d-i/modules/base-installer.xml	(ӥ 43707)
+++ ja/using-d-i/modules/base-installer.xml	(ȥԡ)
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33720 -->
+<!-- original version: 43573 -->
 
-   <sect3 id="base-installer">
-   <title>ܥƥΥ󥹥ȡ</title>
-
 <para>
 
 <!--
-During the Base installation, package unpacking and setup messages are
-redirected to <userinput>tty4</userinput>.  You can access this
-terminal by pressing
+During installation of the base system, package unpacking and setup
+messages are redirected to <userinput>tty4</userinput>.
+You can access this terminal by pressing
 <keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo>;
 get back to the main installer process with
 <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>.
 -->
-ܤΥ󥹥ȡϡѥåŸåϡ
+ܥƥΥ󥹥ȡ桢ѥåŸåȥåץåϡ
 <userinput>tty4</userinput> ˥쥯Ȥޤ
 <keycombo><keycap> Alt</keycap><keycap>F4</keycap></keycombo>
 򲡤ȡü (terminal) ˥Ǥޤ
@@ -26,13 +23,13 @@
 </para><para>
 
 <!--
-The unpack/setup messages generated by the base installation are saved in
-<filename>/var/log/syslog</filename> when the installation is
-performed over a serial console.
+The unpack/setup messages generated during this phase are also saved in
+<filename>/var/log/syslog</filename>. You can check them there if the
+installation is performed over a serial console.
 -->
-ꥢ륳󥽡ǤΥ󥹥ȡˡ
-ܥ󥹥ȡ뤬ϤŸåϡ
+ΥեǤŸåϡ
 <filename>/var/log/syslog</filename> ¸ޤ
+ꥢ륳󥽡ǥ󥹥ȡ뤹硢åǤޤ
 
 </para><para>
 
@@ -48,4 +45,3 @@
 㤤ͥ٥⡼ɤǤϡѲǽʥͥΥꥹȤ֤ȤǤޤ
 
 </para>
-   </sect3>
Index: ja/using-d-i/modules/mdcfg.xml
===================================================================
--- ja/using-d-i/modules/mdcfg.xml	(ӥ 43707)
+++ ja/using-d-i/modules/mdcfg.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42251 -->
+<!-- original version: 43573 -->
 
    <sect3 id="mdcfg">
    <title>ޥǥǥХ (եȥ RAID) </title>
@@ -48,10 +48,10 @@
 </para><para>
 
 <!--
-The benefit you gain depends on a type of a MD device you are
+What benefits this brings depends on the type of MD device you are
 creating. Currently supported are:
 -->
-벸äϡ MD ǥХμ˰¸ޤ
+ɤʲä뤫ϡ MD ǥХμ˰¸ޤ
 ߡʲ򥵥ݡȤƤޤ
 
 <variablelist>
@@ -63,7 +63,7 @@
 Is mainly aimed at performance.  RAID0 splits all incoming data into
 <firstterm>stripes</firstterm> and distributes them equally over each
 disk in the array. This can increase the speed of read/write
-operations, but when one of the disks fails, you will loose
+operations, but when one of the disks fails, you will lose
 <emphasis>everything</emphasis> (part of the information is still on
 the healthy disk(s), the other part <emphasis>was</emphasis> on the
 failed disk).
@@ -92,12 +92,12 @@
 
 <!--
 Is suitable for setups where reliability is the first concern.  It
-consists of several (usually two) equally sized partitions where every
+consists of several (usually two) equally-sized partitions where every
 partition contains exactly the same data. This essentially means three
 things.  First, if one of your disks fails, you still have the data
 mirrored on the remaining disks. Second, you can use only a fraction
 of the available capacity (more precisely, it is the size of the
-smallest partition in the RAID). Third, file reads are load balanced among
+smallest partition in the RAID). Third, file-reads are load-balanced among
 the disks, which can improve performance on a server, such as a file
 server, that tends to be loaded with more disk reads than writes.
 -->
@@ -129,8 +129,8 @@
 
 <!--
 Is a good compromise between speed, reliability and data redundancy.
-RAID5 splits all incomming data into stripes and distributes them
-equally on all but one disks (similar to RAID0). Unlike RAID0, RAID5
+RAID5 splits all incoming data into stripes and distributes them
+equally on all but one disk (similar to RAID0). Unlike RAID0, RAID5
 also computes <firstterm>parity</firstterm> information, which gets
 written on the remaining disk. The parity disk is not static (that
 would be called RAID4), but is changing periodically, so the parity
@@ -156,13 +156,13 @@
 </para><para>
 
 <!--
-As you can see, RAID5 has similar degree of reliability like RAID1
-while achieving less redundancy. On the other hand it might be a bit
-slower on write operation than RAID0 due to computation of parity
+As you can see, RAID5 has a similar degree of reliability to RAID1
+while achieving less redundancy. On the other hand, it might be a bit
+slower on write operations than RAID0 due to computation of parity
 information.
 -->
 狼Τ褦ˡRAID5  RAID1 ĹʤƱ٤οޤ
-ѥƥ׻뤳ȤǡRAID0 ٤⤷ޤ
+ѥƥ׻뤿ᡢRAID0 ٤⤷ޤ
 
 </para></listitem>
 </varlistentry>
@@ -216,10 +216,10 @@
 </para><para>
 
 <!--
-If you want to know the whole truth about Software RAID, have a look
+If you want to know more about Software RAID, have a look
 at <ulink url="&url-software-raid-howto;">Software RAID HOWTO</ulink>.
 -->
-եȥ RAID ˴ؤơΤ̤ȤΤꤿС
+եȥ RAID ˴ؤơäΤꤿ
 <ulink url="&url-software-raid-howto;">Software RAID HOWTO</ulink> 
 
 
Index: ja/using-d-i/modules/apt-setup.xml
===================================================================
--- ja/using-d-i/modules/apt-setup.xml	(ӥ 43707)
+++ ja/using-d-i/modules/apt-setup.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33820 -->
+<!-- original version: 43573 -->
 
    <sect3 id="apt-setup">
 <!--
@@ -11,47 +11,52 @@
 <para>
 
 <!--
-The main means that people use to install packages on their system is
-via a program called <command>apt-get</command>, from the
-<classname>apt</classname> package.<footnote>
+One of the tools used to install packages on a &debian; system is
+a program called <command>apt-get</command>, from the
+<classname>apt</classname> package<footnote>
 -->
-ƥ˥ѥå򥤥󥹥ȡ뤹ˤϡ
- <classname>apt</classname> ѥå <command>apt-get</command>
-ȤץȤˡޤ<footnote>
+&debian; ƥ˥ѥå򥤥󥹥ȡ뤹ġ 1 Ĥ
+<classname>apt</classname> ѥå
+<command>apt-get</command> ץबޤ<footnote>
 
 <para>
 
 <!--
-Note that the actual program that installs packages is called
+Note that the program which actually installs the packages is called
 <command>dpkg</command>.  However, this program is more of a low-level
-tool.  <command>apt-get</command> is a higher-level tool as it will
-invoke <command>dpkg</command> as appropriate and also because it knows
-to install other packages which are required for the package you're
-trying to install, as well as how to retrieve the package from your
-CD, the network, or wherever.
+tool.  <command>apt-get</command> is a higher-level tool, which will
+invoke <command>dpkg</command> as appropriate. It knows how to retrieve
+packages from your CD, the network, or wherever. It is also able to
+automatically install other packages which are required to make the
+package you're trying to install work correctly.
 -->
-ѥåΥ󥹥ȡԤºݤΥץϡ
+ѥåºݤ˥󥹥ȡ뤹ץϡ
 <command>dpkg</command> Ǥ뤳ȤդƤ
 ǤΥץϡɤ餫ȤȲ̤ΥġǤ
 <command>apt-get</command> ϤäȾ̤Υġǡ
-Ŭڤ <command>dpkg</command> ư
-󥹥ȡ뤷褦ȤƤѥåɬפ¾ΥѥåΤäƤޤ
-ޤCD ͥåȥ¾ѥåˡΤäƤޤ
+Ŭڤ <command>dpkg</command> ưޤ
+ޤCD ͥåȥ¾顢
+ѥåɤΤ褦˼뤫ΤäƤޤ
+ˡ󥹥ȡȤԤ褦ˡ
+ѥåɬפȤ¾Υѥå⼫ưŪ˥󥹥ȡǤޤ
 
 </para>
-</footnote>
+
+</footnote>
 <!--
 Other front-ends for package management, like <command>aptitude</command>
-and <command>synaptic</command> are also in use and depend on
-<command>apt-get</command>. These front-ends are recommended for new users,
-since they integrate some additional features (package searching and status checks)
-in a nice user interface.
+and <command>synaptic</command>, are also in use.
+These front-ends are recommended for new users, since they integrate
+some additional features (package searching and status checks)
+in a nice user interface. In fact, <command>aptitude</command> is now the
+recommended utility for package management.
 -->
 ѥåΤ¾Υեȥɤˤϡ<command>aptitude</command>  
-<command>synaptic</command> Τ褦 <command>apt-get</command> ˰¸
-ѤΤ⤢ޤ
-Υեȥɤɲõǽ (ѥåθ֥å) 礹Τǡ
-桼ˤᤷޤ
+<command>synaptic</command> Ȥޤ
+Υեȥɤɲõǽ (ѥåθ֥å) 
+Ф餷桼󥿥ե礷ƤΤǡ桼ˤᤷޤ
+ºݡ<command>aptitude</command> ϡߤΤȤ
+ѥåο侩桼ƥƥǤ
 
 </para><para>
 
Index: ja/using-d-i/modules/pkgsel.xml
===================================================================
--- ja/using-d-i/modules/pkgsel.xml	(ӥ 43707)
+++ 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: 42985 -->
+<!-- original version: 43675 -->
 
    <sect3 id="pkgsel">
 <!--
@@ -46,7 +46,7 @@
 <!--
 You should know that to present this list, the installer is merely
 invoking the <command>tasksel</command> program. It can be run at any
-time after installation to install more packages or remove them), or
+time after installation to install more packages (or remove them), or
 you can use a more fine-grained tool such as <command>aptitude</command>.
 If you are looking for a specific single package, after
 installation is complete, simply run <userinput>aptitude install
@@ -57,7 +57,7 @@
 ɽꥹȤϡ
 󥹥ȡ餬ñ <command>tasksel</command> ץưƤ
 ȤȤΤäƤƤ󥹥ȡθǡ
-¾Υѥå򥤥󥹥ȡ롦ΤˤĤǤ¹ԤǤޤ
+¾Υѥå򥤥󥹥ȡ (ޤϺ) ΤˤĤǤ¹ԤǤޤ
 ޤ <command>aptitude</command> Τ褦ʡ꤭٤ġѤǤޤ
 󥹥ȡ봰λ塢 1 ѥåõΤʤ顢ñ 
 <userinput>aptitude install <replaceable>ѥå̾</replaceable></userinput>
@@ -130,7 +130,7 @@
 Mail server: <classname>exim4</classname>, <classname>spamassassin</classname>,
 <classname>uw-imap</classname>;
 Print server: <classname>cups</classname>;
-SQL server: <classname>postgresql</classname>;
+SQL database: <classname>postgresql</classname>;
 Web server: <classname>apache</classname>.
 -->
 ƥХǤϡޤ˰ʲΥեȥ򥤥󥹥ȡ뤷ޤ
@@ -139,18 +139,18 @@
 ᡼륵: <classname>exim4</classname>, 
 <classname>spamassassin</classname>, <classname>uw-imap</classname>
 : <classname>cups</classname>
-SQL : <classname>postgresql</classname>
+SQL ǡ١: <classname>postgresql</classname>
 Web : <classname>apache</classname>
 
 </para></note>
 <para>
 
 <!--
-Once you've selected your tasks, select <guibutton>Ok</guibutton>. At this
+Once you've selected your tasks, select <guibutton>OK</guibutton>. At this
 point, <command>aptitude</command> will install the packages that are part
 of the tasks you've selected.
 -->
-򤷤顢<guibutton>Ok</guibutton> 򤷤Ƥ
+򤷤顢<guibutton>OK</guibutton> 򤷤Ƥ
 <command>aptitude</command> 򤷤ѥåΰ򥤥󥹥ȡ뤷Ϥޤ
 
 </para>
@@ -166,8 +166,39 @@
 </para></note>
 <para>
 
+<!--
+You should be aware that especially the Desktop task is very large.
+Especially when installing from a normal CD-ROM in combination with a
+mirror for packages not on the CD-ROM, the installer may want to retrieve
+a lot of packages over the network. If you have a relatively slow
+Internet connection, this can take a long time. There is no option to
+cancel the installation of packages once it has started.
+-->
+ǥȥåץ礭ȤռƤƤ
+äˡ̾ CD-ROM ȡ
+ߥ顼ȤˤCD-ROM ΥѥåȤ߹碌硢󥹥ȡ餬
+ͥåȥ̤Υѥå褦Ȥ뤫⤷ޤ
+󥿡ͥå³®ʾ硢Ĺ֤Ǥ礦
+١ѥåΥ󥹥ȡϤ᤿顢
+󥻥뤹륪ץϤޤ
 
+</para><para>
 
+<!--
+Even when packages are included on the CD-ROM, the installer may still
+retrieve them from the mirror if the version available on the mirror is
+more recent than the one included on the CD-ROM. If you are installing
+the stable distribution, this can happen after a point release (an update
+of the original stable release); if you are installing the testing
+distribution this will happen if you are using an older image.
+-->
+ѥå CD-ROM ˴ޤޤƤǤ⡢
+CD-ROM ˤѥåߥ顼ȤˤѥåС
+󥹥ȡϥߥ顼Ȥ褦Ȥޤ
+Ǥ򥤥󥹥ȡ뤷Ƥ硢ݥȥ꡼ 
+(ꥸʥΰǥ꡼ι) ˡƥǤ򥤥󥹥ȡ뤷Ƥϡ
+Ť᡼ѤƤȡäȤޤ
+
 </para><para>
 
 <!--
@@ -185,164 +216,3 @@
 
 </para>
    </sect3>
-
-   <sect3 id="config-mta">
-<!--
-   <title>Configuring Your Mail Transport Agent</title>
--->
-   <title>᡼ (MTA) </title>
-
-<para>
-
-<!--
-Today, email is a very important part of many people's life, so it's
-no surprise Debian lets you configure your mail system right as a part
-of the installation process. The standard mail transport agent in
-Debian is <command>exim4</command>, which is relatively small,
-flexible, and easy to learn.
--->
-email ¿ο͡˽פʰ֤Ƥޤ
-Ǥ饤󥹥ȡǡ
-Debian ᡼륷ƥꤵΤ϶ä٤ȤǤϤޤ
-Debian ɸ᡼Ȥ <command>exim4</command> Ǥ
-ϡŪdzؽưפǤ
-
-</para><para>
-
-<!--
-You may ask if this is needed even if your computer is not connected
-to any network. The short answer is: Yes. The longer explanation: Some
-system utilities (like <command>cron</command>,
-<command>quota</command>, <command>aide</command>, &hellip;) may send
-you important notices via email.
--->
-ͥåȥ˷ҤäƤʤԥ塼Ǥ⡢ɬפʤΤʹǤ͡
-ñ˸ Yes Ǥ⤦Ĺȡ
-(<command>cron</command>, <command>quota</command>, <command>aide</command>,
-&hellip; Ȥä) ƥ桼ƥƥˤϡ
-פΤ email ΤΤǤ
-
-</para><para>
-
-<!--
-So on the first screen you will be presented with several common mail
-scenarios. Choose the one that most closely resembles your needs:
--->
-Τᡢǽβ̤ǤϡĤŪʥ᡼Υʥꥪ󼨤ޤ
-ˡ˺ǤᤤΤ򤷤Ƥ
-
-</para>
-
-<variablelist>
-<varlistentry>
-<!--
-<term>internet site</term>
--->
-<term>󥿡ͥåȥ</term>
-<listitem><para>
-
-<!--
-Your system is connected to a network and your mail is sent and
-received directly using SMTP. On the following screens you will be
-asked a few basic questions, like your machine's mail name, or a list of
-domains for which you accept or relay mail.
--->
-ƥबͥåȥ˷ҤäƤꡢ᡼ľ SMTP ޤ
-ޥΥ᡼̾᡼դ졼ɥᥤΥꥹȤȤä
-Ūʼ䤬³ޤ
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<!--
-<term>mail sent by smarthost</term>
--->
-<term>ޡȥۥȤǥ᡼</term>
-<listitem><para>
-
-<!--
-In this scenario is your outgoing mail forwarded to another machine,
-called a <quote>smarthost</quote>, which does the actual job for
-you. Smarthost also usually stores incoming mail addressed to your
-computer, so you don't need to be permanently online. That also means
-you have to download your mail from the smarthost via programs like
-fetchmail. This option is suitable for dial-up users.
--->
-Υʥꥪϡ
-ºݤԤ<quote>ޡȥۥ</quote>ȸƤФ̤Υޥˡ
-ФƤ᡼եɤƤ餤ޤ
-ޤޡȥۥȤϡ
-̾濫ʤΥԥ塼äƤ᡼Ǽ뤿ᡢ
-äȥ饤ǤɬפϤޤ
-ޤϡޡȥۥȤ fetchmail Τ褦ʥץѤơ
-᡼ɤʤФʤʤȸȤǤ⤢ޤ
-Υץϡ륢åץ桼˺ŬǤ
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<!--
-<term>local delivery only</term>
--->
-<term>ۿΤ</term>
-<listitem><para>
-
-<!--
-Your system is not on a network and mail is sent or received only
-between local users. Even if you don't plan to send any messages, this
-option is highly recommended, because some system utilities may send
-you various alerts from time to time (e.g. beloved <quote>Disk quota
-exceeded</quote>). This option is also convenient for new users,
-because it doesn't ask any further questions.
--->
-ƥबͥåȥˤʤ᡼桼ȤΤ߹Ԥޤ
-Υåͽ꤬ʤȤ⡢Υץ򶯤ᤷޤ
-ƥ桼ƥƥˤϡ͡ʷٹ 
-( <quote>Disk quota exceeded</quote> ʤ) 󤲤Τ뤫Ǥ
-Υץ¾˼ȯʤΤǡ桼ˤȤäǤ
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<!--
-<term>no configuration at this time</term>
--->
-<term>ꤷʤ</term>
-<listitem><para>
-
-<!--
-Choose this if you are absolutely convinced you know what you are
-doing. This will leave you with an unconfigured mail system &mdash;
-until you configure it, you won't be able to send or receive any mail
-and you may miss some important messages from your system utilities.
--->
-򤷤褦ȤƤ뤫Ф˳οƤʤ顢򤷤Ƥ
-ˤꡢꤵƤʤ᡼륷ƥबĤޤ&mdash;
-ꤹޤǡɤʥ᡼Ǥޤ󤷡
-ƥ桼ƥƥνפʥåƨƤޤȤǤ礦
-
-
-</para></listitem>
-</varlistentry>
-</variablelist>
-
-<para>
-
-<!--
-If none of these scenarios suits your needs, or if you need a finer
-setup, you will need to edit configuration files under the
-<filename>/etc/exim4</filename> directory after the installation is
-complete. More information about <command>exim4</command> may be found
-under <filename>/usr/share/doc/exim4</filename>.
--->
-ˡ˹äʥꥪʤäꡢäȤ褤åȥåפɬפʤ顢
-<filename>/etc/exim4</filename> ǥ쥯ȥʲˤե
-󥹥ȡ봰λԽƤ
-<command>exim4</command> ˤĤƤΤʤϡ
-<filename>/usr/share/doc/exim4</filename> ʲˤޤ
-
-</para>
-   </sect3>
Index: ja/using-d-i/modules/x86/lilo-installer.xml
===================================================================
--- ja/using-d-i/modules/x86/lilo-installer.xml	(ӥ 43707)
+++ 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: 39622 -->
+<!-- original version: 43573 -->
 
   <sect3 arch="x86">
   <title>ϡɥǥؤ <command>LILO</command>
@@ -41,11 +41,11 @@
 <para>
 
 <!--
-&d-i; presents you three choices where to install the
+&d-i; offers you three choices on where to install the
 <command>LILO</command> boot loader:
 -->
 &d-i;  <command>LILO</command> ֡ȥ󥹥ȡˡ
-3 Ĥ򼨤ޤ
+ 3 󼨤ޤ
 
 <variablelist>
 <varlistentry>
@@ -101,8 +101,7 @@
 you'll need to use a Windows 9x (MS-DOS) boot disk and use the
 <userinput>fdisk /mbr</userinput> command to reinstall the MS-DOS
 master boot record &mdash; however, this means that you'll need to use
-some other way to get back into Debian! For more information on this
-please read <xref linkend="reactivating-win"/>.
+some other way to get back into Debian!
 -->
 Υƥåפθ Windows 9x (ޤ DOS) ưǤʤʤäƤС
 Windows 9x (MS-DOS) Υ֡ȥǥѤ
@@ -110,7 +109,6 @@
 MS-DOS ޥ֡ȥ쥳ɤƥ󥹥ȡ뤹ɬפޤ&mdash; 
 ϡDebian ᤹ˤ¾ˡȤɬפ롢
 ȤȤ̣ޤ!
-ˤĤƤξܺ٤ϡ<xref linkend="reactivating-win"/> ɤߤ
 
 </para>
   </sect3>
Index: ja/using-d-i/modules/choose-mirror.xml
===================================================================
--- ja/using-d-i/modules/choose-mirror.xml	(ӥ 43707)
+++ ja/using-d-i/modules/choose-mirror.xml	(ȥԡ)
@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 16990 -->
+<!-- original version: 43658 -->
 
 <!--
+Hmm. This really does need documenting :-/
+
 - Component is only selected and executed if the installer needs to load
   installer components or the base system from the network
   (either local or the internet).
 - This means you first have to configure a network interface.
+- Mirror selection is delayed until apt-setup for CD-based installs (except
+  businesscard)
 - A list of countries is displayed with the default based on the country you
   selected earlier.
-- Note that not all mirrors are equal (see http://www.nl.debian.org/mirror/list)
 - Selection of a local mirror (at top of the list: manual selection).
 - After selecting a country, a list of mirrors in the country will be shown.
+  (not for ftp)
+- Forcing to ftp can be done using "protocol=ftp"
+- Note that not all mirrors are equal (see http://www.nl.debian.org/mirror/list)
 
 - The selected mirror will be tested.
 - How to handle problems with mirrors.
 -->
 
-<!--nabetaro ʾ ʸȤʤΤ̤ -->
\ ե˲Ԥޤ
+<!--nabetaro ʾ ʸȤʤΤ̤ -->
Index: ja/using-d-i/modules/partman-lvm.xml
===================================================================
--- ja/using-d-i/modules/partman-lvm.xml	(ӥ 43707)
+++ ja/using-d-i/modules/partman-lvm.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39531 -->
+<!-- original version: 43577 -->
 
    <sect3 id="partman-lvm">
 <!--
@@ -169,25 +169,9 @@
 Ϥ˥ܥ塼॰롼פܥ塼Τˡ
 Υ˥塼ΥץѤƤ
 
-</para>
-<note><para>
+</para><para>
 
 <!--
-You can also use this menu to delete an existing LVM configuration from
-your hard disk before choosing <quote>Guided partitioning using LVM</quote>.
-Guided partitioning using LVM is not possible if there already are volume
-groups defined, but by removing them you can get a clean start.
--->
-ޤ <quote>LVM Ѥɥѡƥʬ</quote> 
-򤷤ϡɥǥˤ롢¸ LVM ˥塼Ǥޤ
-LVM Ѥɥѡƥʬϡ
-ܥ塼॰롼פƤȼ¹ԤǤޤ󤬡
-뤳ȤǤޤäʾ֤ǻϤޤ
-
-</para></note>
-<para>
-
-<!--
 After you return to the main <command>partman</command> screen, any created
 logical volumes will be displayed in the same way as ordinary partitions
 (and you should treat them as such).
Index: ja/using-d-i/modules/lowmem.xml
===================================================================
--- ja/using-d-i/modules/lowmem.xml	(ӥ 43707)
+++ ja/using-d-i/modules/lowmem.xml	(ȥԡ)
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 16990 -->
+<!-- original version: 43603 -->
 
   <sect3 id="lowmem">
-  <title>ͭʥΥå</title>
+<!--
+  <title>Check available memory / low memory mode</title>
+-->
+  <title>ͭʥΥå / ⡼</title>
 
 <para>
 
@@ -21,13 +24,79 @@
 </para><para>
 
 <!--
-During a low memory install, not all components will be available.
-One of the limitations is that you won't be able to choose a
-language for the installation.
+The first measure taken to reduce memory consumption by the installer
+is to disable translations, which means that the installation can
+only be done in English. Of course, you can still localize the installed
+system after the installation has completed.
 -->
-ʤǤΥ󥹥ȡϡ٤ƤΥݡͥȤͭȤϤʤޤ
-¤Τ 1 Ĥϡ
-󥹥ȡѤ˸֤ȤǤʤȤȤǤ
+󥹥ȡǾޤˤϡ̵ˤ뤳ȤǤ
+ϡѸǤ󥹥ȡǤʤȸȤǤ⤢ޤ
+󡢥󥹥ȡ봰λˡ
+󥹥ȡ뤷ƥϰ貽뤳ȤǤޤ
 
+</para><para>
+
+<!--
+If that is not sufficient, the installer will further reduce memory
+consumption by loading only those components essential to complete a basic
+installation. This reduces the functionality of the installation system.
+You will be given the opportunity to load additional components manually,
+but you should be aware that each component you select will use
+additional memory and thus may cause the installation to fail.
+-->
+ǽʬǤʤС󥹥ȡϡ
+Ūʥ󥹥ȡλΤɬܤʥݡͥȤΤߤɤ߹ߡ
+򤵤ޤ褦Ȥޤ
+ϥ󥹥ȡ륷ƥεǽ¤ޤ
+ưǵǽɲäʤ󶡤Ƥޤˤꤵ˥񤷡
+̥󥹥ȡ˼Ԥǽθɬפޤ
+
+</para><para>
+
+<!--
+If the installer runs in low memory mode, it is recommended to create
+a relatively large swap partition (64&ndash;128MB). The swap partition
+will be used as virtual memory and thus increases the amount of memory
+available to the system. The installer will activate the swap partition
+as early as possible in the installation process. Note that heavy use
+of swap will reduce performance of your system and may lead to high
+disk activity.
+-->
+󥹥ȡ餬⡼ɤư硢
+Ū礭 swap ѡƥ (64&ndash;128MB) Τ򤪾ᤷޤ
+swap ѡƥϲۥȤƻѤ졢
+ƥѤǤ̤䤷ޤ
+󥹥ȡϡ󥹥ȡץDzǽʸ¤᤯ swap ͭˤޤ
+swap Ѥȡǥ٤ä
+ƥΥѥեޥ󥹤㲼դƤ
+
+</para><para>
+
+<!--
+Despite these measures, it is still possible that your system freezes,
+that unexpected errors occur or that processes are killed by the kernel
+because the system runs out of memory (which will result in <quote>Out
+of memory</quote> messages on VT4 and in the syslog).
+-->
+ä֤ˤؤ餺ޤƥबե꡼ꡢ
+ͽʤ顼ȯꡢ
+ƥबϰϳư (VT4  syslog  <quote>Out of memory</quote>
+åϤ) ץͥ˶λǽޤ
+
+</para><para>
+
+<!--
+For example, it has been reported that creating a big ext3 file system
+fails in low memory mode when there is insufficient swap space. If a
+larger swap doesn't help, try creating the file system as ext2 (which
+is an essential component of the installer) instead. It is possible to
+change an ext2 partition to ext3 after the installation.
+-->
+㤨Сswap ڡԽʬʾ硢
+⡼ɤ礭 ext3 ե륷ƥȡ顼𤷤ޤ
+swap ä礭Ƥʾ硢ext2 (󥹥ȡɬܥݡͥ) 
+ǺƤ
+ext2 ѡƥ򥤥󥹥ȡ ext3 ѹǤޤ
+
 </para>
-   </sect3>
\ ե˲Ԥޤ
+   </sect3>
Index: ja/using-d-i/modules/shell.xml
===================================================================
--- ja/using-d-i/modules/shell.xml	(ӥ 43707)
+++ ja/using-d-i/modules/shell.xml	(ȥԡ)
@@ -1,74 +1,111 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 21579 -->
+<!-- original version: 43573 -->
 
    <sect3 id="shell">
    <title>λѤȥλ</title>
-   <!-- TODO: There is nothing about logs in this section! -->
 
 <para>
 
 <!--
-There is an <guimenuitem>Execute a Shell</guimenuitem> item on the
-menu. If the menu is not available when you need to use the shell,
-press <keycombo><keycap>Left Alt</keycap> <keycap>F2</keycap></keycombo>
-(on a Mac keyboard, <keycombo><keycap>Option</keycap> <keycap>F2</keycap>
-</keycombo>) to switch to the second <emphasis>virtual
-console</emphasis>. That's the <keycap>Alt</keycap> key on the
-left-hand side of the <keycap>space bar</keycap>, and the
-<keycap>F2</keycap> function key, at the same time. This is a separate
-window running a Bourne shell clone called <command>ash</command>.
+There are several methods you can use to get a shell while running an
+installation. On most systems, and if you are not installing over
+serial console, the easiest method is to switch to the second
+<emphasis>virtual console</emphasis> by pressing <keycombo><keycap>Left
+Alt</keycap> <keycap>F2</keycap></keycombo><footnote>
 -->
-˥塼ˤϡ<guimenuitem>Execute a Shell</guimenuitem> Ȥܤޤ
-ѤƤ˥塼ѤǤʤȤϡ
-<keycombo><keycap>Left Alt</keycap> <keycap>F2</keycap></keycombo> 
-(Mac ΥܡɤǤϡ<keycombo><keycap>Option</keycap> <keycap>F2</keycap>
-</keycombo>) 򲡤ơ
- 2 <emphasis>ۥ󥽡</emphasis> ڤؤƲ
-ϡ<keycap>space bar</keycap> κ¦ <keycap>Alt</keycap> ȡ
-<keycap>F2</keycap> ե󥯥󥭡Ʊ˲ȤǤ
-ϡ<command>ash</command> ȸƤФ Bourne Υ¹Ԥ
-̥ɥǤ
+󥹥ȡ˥ưˡϤĤޤ
+ۤȤɤΥƥǤϡ˥ꥢ륳󥽡ǥ󥹥ȡ뤷Ƥʤ硢
+<keycombo><keycap> Alt</keycap> <keycap>F2</keycap></keycombo> <footnote>
 
+<para>
+<!--
+That is: press the <keycap>Alt</keycap> key on the left-hand side of the
+<keycap>space bar</keycap> and the <keycap>F2</keycap> function key
+at the same time.
+-->
+<keycap>ڡС</keycap> κ¦ˤ <keycap>Alt</keycap> ȡ
+<keycap>F2</keycap> ե󥯥󥭡Ʊ˲Ƥ
+</para>
+
+<!--
+</footnote> (on a Mac keyboard, <keycombo><keycap>Option</keycap>
+<keycap>F2</keycap></keycombo>). Use <keycombo><keycap>Left Alt</keycap>
+<keycap>F1</keycap></keycombo> to switch back to installer itself.
+-->
+
+</footnote> 򲡤 (Mac ΥܡɤǤϡ<keycombo><keycap>Option</keycap>
+<keycap>F2</keycap></keycombo>)
+ 2 <emphasis>ۥ󥽡</emphasis> ڤؤΤñǤ
+<keycombo><keycap>Left Alt</keycap>
+<keycap>F1</keycap></keycombo> ǥ󥹥ȡ鼫ΤäƤ
+
 </para><para>
 
 <!--
+If you cannot switch consoles, there is also an <guimenuitem>Execute
+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.
+-->
+󥽡ڤؤʤ硢ᥤ˥塼ˤ 
+<guimenuitem>μ¹</guimenuitem> Ǥ⥷ưǤޤ
+󥹥ȡ鼫Τϡ<userinput>exit</userinput> Ϥ
+λƤ
+
+</para><para>
+
+<!--
 At this point you are booted from the RAM disk, and there is a limited
 set of Unix utilities available for your use. You can see what
 programs are available with the command <command>ls /bin /sbin /usr/bin
-/usr/sbin</command> and by typing <command>help</command>. The
-text editor is <command>nano</command>. The shell has some nice features
-like autocompletion and history.
+/usr/sbin</command> and by typing <command>help</command>.
+The shell is a Bourne shell clone called <command>ash</command> and has
+some nice features like autocompletion and history.
 -->
 ʳǤ RAM ǥ鵯ưƤޤ
 ޤѤˤ¤ޤ Unix 桼ƥƥѲǽǤ
 ɤΥץबѤǤ뤫ϥޥ <command>ls /bin /sbin /usr/bin
 /usr/sbin</command>  <command>help</command> ȥפȤ狼ޤ
-ƥȥǥ <command>nano</command> Ǥ
-ˤϼư䴰Τ褦ʡǽƤޤ
+ <command>ash</command> Ȥ Bourne shell Υǡ
+ư䴰Τ褦ʡǽƤޤ
 
 </para><para>
 
 <!--
-Use the menus to perform any task that they are able to do &mdash; the
-shell and commands are only there in case something goes wrong.  In
-particular, you should always use the menus, not the shell, to
-activate your swap partition, because the menu software can't detect
-that you've done this from the shell. Press <keycombo><keycap>Left
-Alt</keycap> <keycap>F1</keycap></keycombo> to get back to menus, or
-type <command>exit</command> if you used a menu item to open the
-shell.
+To edit and view files, use the text editor <command>nano</command>.
+Log files for the installation system can be found in the
+<filename>/var/log</filename> directory.
 -->
-¹ԤǤ륿Τ٤Ƥ¹Ԥˤϡ˥塼ѤƤ
-ޤԤʤΤˡ䥳ޥɤѰդƤޤ
-äˡǥåץѡƥͭˤƤޤȡ
-˥塼եȥ򸡽ФǤޤ
-ΤᡢåץѡƥͭˤΤϡ
-ǤϤʤɬ˥塼Ѥ٤Ǥ
-˥塼ˤ 
-<keycombo><keycap> Alt</keycap> <keycap>F1</keycap></keycombo> 򲡤
-˥塼ιܤ饷򳫤Τʤ顢<command>exit</command> 
-פƤ
+եԽɽ򤹤ˤϡ
+<command>nano</command> ȤƥȥǥѤƤ
+󥹥ȡ륷ƥΥեϡ
+<filename>/var/log</filename> ǥ쥯ȥˤޤ
 
 </para>
+<note><para>
+
+<!--
+Although you can do basically anything in a shell that the available
+commands allow you to do, the option to use a shell is really only there
+in case something goes wrong and for debugging.
+-->
+ǤϡͭʥޥɤĤƤ¤ꡢ
+ŪˤʤǤǤޤ꤬ȯȤΥǥХåѤˡ
+Ѥ륪ץϤˤޤ
+
+</para><para>
+
+<!--
+Doing things manually from the shell may interfere with the installation
+process and result in errors or an incomplete installation.
+In particular, you should always use let the installer activate your swap
+partition and not do this yourself from a shell.
+-->
+뤫ưDzԤȡ󥹥ȡץ̤˥顼ȯꡢ
+󥹥ȡ뤬λʤäȤä줬ޤ
+äˡ󥹥ȡ餬 swap ͭˤ褦ˤ
+뤫ưǹԤʤ褦ˤ٤Ǥ
+
+</para></note>
    </sect3>
Index: ja/hardware/hardware-supported.xml
===================================================================
--- ja/hardware/hardware-supported.xml	(ӥ 43707)
+++ 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: 43254 -->
+<!-- original version: 43529 -->
 
  <sect1 id="hardware-supported">
 <!--
@@ -190,8 +190,8 @@
 </row>
 
 <row>
-  <entry morerows="3">IBM/Motorola PowerPC</entry>
-  <entry morerows="3">powerpc</entry>
+  <entry morerows="2">IBM/Motorola PowerPC</entry>
+  <entry morerows="2">powerpc</entry>
   <entry>CHRP</entry>
   <entry>chrp</entry>
 </row><row>
@@ -200,9 +200,6 @@
 </row><row>
   <entry>PReP</entry>
   <entry>prep</entry>
-</row><row>
-  <entry>APUS</entry>
-  <entry>apus</entry>
 </row>
 
 <row>
@@ -286,9 +283,9 @@
 &supported-sparc.xml;
 
 <!--
-  <sect2 id="gfx" arch="not-s390"><title>Graphics Card</title>
+  <sect2 id="gfx" arch="not-s390"><title>Graphics Card Support</title>
 -->
-  <sect2 id="gfx" arch="not-s390"><title>եå</title>
+  <sect2 id="gfx" arch="not-s390"><title>եåɤΥݡ</title>
 <para arch="x86">
 
 <!--
@@ -353,6 +350,58 @@
 Linux ե졼Хåե򥵥ݡȤƤޤ
 Broadcom ɾܡѤ<ulink url="&url-bcm91250a-hardware;">ߴꥹ</ulink>ѤǤޤ
 
+</para><para arch="sparc">
+
+<!--
+Most graphics options commonly found on Sparc-based machines are supported.
+X.org graphics drivers are available for sunbw2, suncg14, suncg3, suncg6,
+sunleo and suntcx framebuffers, Creator3D and Elite3D cards (sunffb driver),
+PGX24/PGX64 ATI-based video cards (ati driver), and PermediaII-based cards
+(glint driver). To use an Elite3D card with X.org you additionally need to
+install the <classname>afbinit</classname> package, and read the documentation
+included with it on how to activate the card.
+-->
+Sparc ١ޥǶ̤¸ߤ롢
+ۤȤɤΥեåץ򥵥ݡȤƤޤ
+X.org եåɥ饤ФǤϡ
+sunbw2, suncg14, suncg3, suncg6, sunleo, suntcx γƥե졼Хåե䡢
+Creator3D  Elite3D Υ (sunffb ɥ饤)
+PGX24/PGX64 ATI ١ӥǥ (ati ɥ饤)
+PermediaII ١ (glint ɥ饤) ѤǤޤ
+Elite3D ɤ X.org ǻѤˤϡ
+<classname>afbinit</classname> ѥåɲå󥹥ȡ뤹ɬפޤ
+ޤɤͭˤ뤿ˡ
+Υѥå°ɥȤɤߤ
+
+</para><para arch="sparc">
+
+<!--
+It is not uncommon for a Sparc machine to have two graphics cards in a
+default configuration. In such a case there is a possibility that the
+Linux kernel will not direct its output to the card initially used by the
+firmware. The lack of output on the graphical console may then be mistaken
+for a hang (usually the last message seen on console is 'Booting Linux...').
+One possible solution is to physically remove one of the video cards;
+another option is to disable one of the cards using a kernel boot parameter.
+Also, if graphical output is not required or desired, serial console may be
+used as an alternative. On some systems use of serial console can be
+activated automatically by disconnecting the keyboard before booting the
+system.
+-->
+Sparc ޥΥǥեȹǡեåɤ 2 ĻäƤΤϡ
+ȤǤϤޤ
+Τ褦ʾ硢ե०ǤϤ˻Ѥɤˡ
+Linux ͥ뤬Ϥʤǽޤ
+եå󥽡˽Ϥ­ʤȡϥ󥰤˴ְ뤫⤷ޤ
+(̾󥽡ɽǸΥåϡ'Booting Linux...' Ǥ)
+ˡ 1 Ĥ˥ӥǥɤʪŪ˼ƤޤȤʪޤ
+ޤͥΥ֡ȥѥ᡼ǡ
+ɤ 1 ̵ˤƤޤȤˡ⤢ޤ
+եåϤɬܤǤʤɬפʤʤ顢
+ꥢ륳󥽡˻Ѥˡ⤢ޤ
+ΥƥǤϡƥबư˥ܡɤ³ʤȡ
+ưŪ˥ꥢ륳󥽡Ѥʪޤ
+
 </para>
   </sect2>
 
@@ -384,7 +433,7 @@
 <para>
 
 <!--
-Multi-processor support &mdash; also called <quote>symmetric multi-processing</quote>
+Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote>
 or SMP &mdash; is available for this architecture.  The standard Debian
 &release; kernel image was compiled with SMP support.  This should not
 prevent installation, since the SMP kernel should boot on non-SMP systems;
@@ -428,8 +477,8 @@
 <para>
 
 <!--
-Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is available for this architecture.
+Multiprocessor support &mdash; also called <quote>symmetric
+multiprocessing</quote> or SMP &mdash; is available for this architecture.
 The standard Debian &release; kernel image was compiled with
 <firstterm>SMP-alternatives</firstterm> support. This means that the kernel
 will detect the number of processors (or processor cores) and will
@@ -461,8 +510,8 @@
 <para>
 
 <!--
-Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is available for this architecture.
+Multiprocessor support &mdash; also called <quote>symmetric
+multiprocessing</quote> or SMP &mdash; is available for this architecture.
 However, the standard Debian &release; kernel image does not support
 SMP.  This should not prevent installation, since the standard,
 non-SMP kernel should boot on SMP systems; the kernel will simply use
@@ -500,8 +549,8 @@
 <para>
 
 <!--
-Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is available for this architecture,
+Multiprocessor support &mdash; also called <quote>symmetric
+multiprocessing</quote> or SMP &mdash; is available for this architecture,
 and is supported by a precompiled Debian kernel image. Depending on your
 install media, this SMP-capable kernel may or may not be installed by
 default. This should not prevent installation, since the standard,
@@ -529,6 +578,8 @@
 SMP 򥵥ݡȤ륫ͥѥå󥹥ȡ뤵뤳Ȥå뤫
 ǤʤСŬڤʥͥѥåɬפޤ
 
+</para><para>
+
 <!--
 You can also build your own customized kernel to support SMP. You can find
 a discussion of how to do this in <xref linkend="kernel-baking"/>.  At this
Index: ja/hardware/supported-peripherals.xml
===================================================================
--- ja/hardware/supported-peripherals.xml	(ӥ 43707)
+++ ja/hardware/supported-peripherals.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43696 -->
 
  <sect1 id="supported-peripherals">
  <title>յ䤽¾Υϡɥ</title>
@@ -20,7 +20,7 @@
 <!--
 USB hardware generally works fine, only some
 USB keyboards may require additional configuration
-(see <xref linkend="usb-keyboard-config"/>).
+(see <xref linkend="hardware-issues"/>).
 -->
 USB ϡɥϤƤޤưޤ
 USB ܡɤɲ꤬ɬפ⤷ޤ
@@ -288,61 +288,4 @@
 
 </para>
 </sect2>
-
-
-  <sect2 id="Parity-RAM">
-  <title>ʤ<quote></quote>ѥƥ RAM</title>
-<para>
-
-<!--
-If you ask for Parity RAM in a computer store, you'll probably get
-<emphasis>virtual parity</emphasis> memory modules instead of
-<emphasis>true parity</emphasis> ones. Virtual parity SIMMs can often
-(but not always) be distinguished because they only have one more chip
-than an equivalent non-parity SIMM, and that one extra chip is smaller
-than all the others. Virtual-parity SIMMs work exactly like non-parity
-memory.  They can't tell you when you have a single-bit RAM error the
-way true-parity SIMMs do in a motherboard that implements
-parity. Don't ever pay more for a virtual-parity SIMM than a
-non-parity one. Do expect to pay a little more for true-parity SIMMs,
-because you are actually buying one extra bit of memory for every 8
-bits.
--->
-ԥ塼갷äƤ뤪Źǥѥƥդ RAM Ȥ
-⤷<emphasis>Υѥƥ</emphasis>դΤΤǤϤʤ
-<emphasis>ۥѥƥ</emphasis>ΤΤ뤳Ȥˤʤ뤫⤷ޤ
-ۥѥƥ SIMM ʬˤϡ
-ѥƥʤƱ SIMM åפҤȤĤ¿
-Ĥ;ʬΥåפ¾Υåפ⾮ȤǤ狼ޤ
-(ˤμ̤ǽȤϸ¤ޤ)
-ۥѥƥ SIMM ϥѥƥʤΥƱͤΤΤǤ
-1 ӥåȤ RAM 顼򡢥ѥƥ򥵥ݡȤޥܡɾ
-Υѥƥդ SIMM Τ褦ˤΤ餻Ƥޤ
-⤦ʾ塢ۥѥƥ SIMM  ѥƥʤ SIMM ⤤
-ʧäƤϤޤ
-⤦ʧäΥѥƥդ SIMM 㤤ޤ礦
-ϡ 8 ӥåȤˤĤ 1 ӥåȤΥ㤦Ȥˤʤޤ顣
-
-</para><para>
-
-<!--
-If you want complete information on &arch-title; RAM issues, and what
-is the best RAM to buy, see the
-<ulink url="&url-pc-hw-faq;">PC Hardware FAQ</ulink>.
--->
-&arch-title; ƥ RAM ˴ؤ
-ɤ RAM 㤦٤ˤĤƤδʾɬפʤС
-<ulink url="&url-pc-hw-faq;">PC ϡɥ FAQ</ulink> 
-
-</para><para arch="alpha">
-
-<!--
-Most, if not all, Alpha systems require true-parity RAM.
--->
-٤ƤǤϤޤ󤬡ۤȤɤ Alpha ƥǤϡ
-Υѥƥդ RAM ɬפǤ
-</para>
-
-  </sect2>
-
  </sect1>
Index: ja/hardware/supported/sparc.xml
===================================================================
--- ja/hardware/supported/sparc.xml	(ӥ 43707)
+++ ja/hardware/supported/sparc.xml	(ȥԡ)
@@ -1,150 +1,134 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 43528 -->
 
-
-  <sect2 arch="sparc" id="sparc-cpus"><title>CPUޥܡɡӥǥΥݡ</title>
+  <sect2 arch="sparc" id="sparc-cpus">
+<!--
+  <title>CPU and Main Boards Support</title>
+-->
+  <title>CPUޥܡɤΥݡ</title>
 <para>
 
 <!--
-Currently the <emphasis>&architecture;</emphasis> port supports
-several types of Sparc systems. The most common identifiers for Sparc
-systems are sun4, sun4c, sun4m, sun4d and sun4u. Currently we do not
-support very old sun4 hardware. However, the other systems are
-supported. Sun4d has been tested the least of these, so expect
-possible problems with regard to the kernel stability. Sun4c and
-Sun4m, the most common of the older Sparc hardware, includes such
-systems as SparcStation 1, 1+, IPC, IPX and the SparcStation LX, 5,
-10, and 20, respectively. The UltraSPARC class systems fall under the
-sun4u identifier, and are supported using the sun4u set of install
-images. Some systems that fall under these supported identifiers are
-known to not be supported. Known unsupported systems are the AP1000
-multicomputer and the Tadpole Sparcbook 1. See the
-<ulink url="&url-sparc-linux-faq;">Linux for SPARCProcessors FAQ</ulink>
-for complete information.
+Sparc-based hardware is divided into a number of different subarchitectures,
+identified by one of the following names: sun4, sun4c, sun4d, sun4m, sun4u
+or sun4v. The following list describes what machines they include and what
+level of support may be expected for each of them.
 -->
- <emphasis>&architecture;</emphasis> ܿǤϡफ Sparc
-ƥ򥵥ݡȤƤޤ
-äȤŪ Sparc ƥ sun4 䡢sun4csun4msun4dsun4u
-Ȥä̻ҤɽΤǤ
-ʤ켰Ǥ sun4 ϡɥϸߥݡȤƤޤ
-¾ΥƥϥݡȤƤޤ
-ĤΥƥǤϡSun4d ϤäȤƥȤԽʬʤΤʤΤǡ
-ͥΰ˴ؤƤʤˤ꤬ȯǽ뤫⤷ޤ
-Sun4c  Sun4m ϡSparcStation 1, 1+, IPC, IPX 䡢SparcStation LX, 5,
-10, 20 ȤäƥƥΤ褦ʵ켰 Sparc ϡɥǤϡ
-äȤŪʤΤǤ
-UltraSPARC Υƥϡsun4u Ȥ̻ҤʬवΤǤ
- sun4u åѤΥ󥹥ȡ륤᡼Ѥ뤳ȤǥݡȤޤ
-ݡȤ뼱̻Ҥ˴ޤޤƤ륷ƥǤ⡢
-ݡȤƤʤȤƤΤ⤢ޤ
-ݡȤʤȤʬäƤΤȤƤϡ
-AP1000 ޥԥ塼
-Tadpole Sparcbook 1 ʤɤޤ
-ʾ
-<ulink url="&url-sparc-linux-faq;">SPARC ץå Linux FAQ</ulink>
-
+Sparc ١Υϡɥϡΰۤʤ륵֥ƥʬƤꡢ
+sun4, sun4c, sun4d, sun4m, sun4u, sun4v Ȥä̾ǧƤޤ
+ʲˡƥ֥ƥˤɤΤ褦ʥޥ󤬴ޤޤ졢
+ɤ٥ݡȤȤäȤޤ
 
 </para>
 
-   <sect3><title></title>
-<para>
+<variablelist>
+<varlistentry>
+<term>sun4, sun4c, sun4d</term>
 
+<listitem><para>
+
 <!--
-Some older Sun workstations, notably the Sun IPX and Sun IPC have
-memory banks located at fixed locations in physical memory.  Thus if
-the banks are not filled gaps will exist in the physical memory space.
-The Linux installation requires a contiguous memory block into which
-to load the kernel and the initial RAMdisk.  If this is not available a
-<quote>Data Access Exception</quote> will result.
+These subarchitectures include some very old 32-bit machines, which are
+no longer supported. For a complete list please consult the
+<ulink url="http://en.wikipedia.org/wiki/SPARCstation";>Wikipedia
+SPARCstation page</ulink>.
 -->
-Ť Sun Υơä Sun IPX  Sun IPC ϡʪ
-ꤵ줿˥Х󥯤äƤޤ
-ΥХ󥯤դˤʤʤȡʪꥹڡ˥åפȯޤ
-Linux Υ󥹥ȡϡͥ䥤˥ RAM ǥɤΤ
-Ϣ³֥åɬפȤޤ
-줬ʤ <quote>Data Access Exception</quote> ȯޤ
+Υ֥ƥˤϡ켰 32 ӥåȥޥ󤬴ޤޤƤꡢ
+⤦ݡȤƤޤ
+ʥꥹȤϡ
+<ulink url="http://en.wikipedia.org/wiki/SPARCstation";>Wikipedia 
+SPARCstation ڡ</ulink> 
 
-</para><para>
+</para></listitem>
+</varlistentry>
 
+<varlistentry>
+<term>sun4m</term>
+
+<listitem><para>
+
 <!--
-Thus you must configure the memory so that the lowest memory block is
-contiguous for at least 8Mb.  In the IPX and IPC cited above, memory banks
-are mapped in at 16Mb boundaries.  In effect this means that you must have
-a sufficiently large SIMM in bank zero to hold the kernel and RAMdisk.
-In this case 4Mb is <emphasis>not</emphasis> sufficient.
+sun4m is the only 32-bit subarchitecture (sparc32) that is currently
+supported. The most popular machines belonging to this class are
+Sparcstation 4, 5, 10 and 20.
 -->
-ΤƬ 8Mb Ϣ³֥åݤʤФʤޤ
-IPX  IPC ʾǤϡХ󥯤 16Mb ֤Ƥޤ
-Ĥޤꡢͥ RAM ǥݻΤ˽ʬ礭̤ SIMM 
-Х 0 ޤʤФʤȸȤǤ
-ξ 4Mb Ǥ<emphasis>ʬǤϤޤ</emphasis>
+sun4m ϸߥݡȤƤ롢
+ͣ 32 ӥåȥ֥ƥ (sparc32) Ǥ
+Υ饹ΤäȤݥԥ顼ʥޥϡSparcstation 4, 5, 10, 20 Ǥ
 
 </para><para>
 
 <!--
-Example:
-In a Sun IPX you have a 16Mb SIMM and a 4Mb SIMM.  There are four
-SIMM banks (0,1,2,3). [Bank zero is that furthest away from the SBUS
-connectors]. You must therefore install the 16Mb SIMM in bank 0; it is
-then recommended to install the 4Mb SIMM in bank 2.
+Note that symmetric multiprocessing (SMP) &mdash; the ability to run
+processes on multiple processors &mdash; is not supported on this hardware,
+due to stability problems with such configurations. The available
+uniprocessor (UP) sparc32 kernel will boot fine on multiprocessor
+machines, although it will activate and use only the first CPU.
 -->
-:
-Sun IPX  16Mb SIMM  4Mb SIMM ꡢ
-4 Ĥ SIMM Х (0,1,2,3) Ȥޤ
-[Х 0  SBUS ͥäȤΥ줿Ȥ]
-Х 0  16Mb SIMM 򥤥󥹥ȡ뤹ɬפޤ
-ʤξ 4Mb  SIMMϥХ 2 ˥󥹥ȡ뤹Τ򤪴ᤷޤ
+ʣΥץåǥץ¹Ԥоηޥץå (SMP) 
+꤬뤿ᡢΥϡɥǤϡ
+ݡȤƤʤȤդƤ
+ñץå (UP) sparc32 ͥϥޥץåޥǤ⡢
+(ǽ CPU ͭˤʤޤ) ʤưޤ
 
-</para>
-   </sect3>
+</para></listitem>
+</varlistentry>
 
-   <sect3><title>եå</title>
-<para>
+<varlistentry>
+<term>sun4u</term>
 
+<listitem><para>
+
 <!--
-Especially in the case of older Sun workstations, it is very common
-for there to be an onboard framebuffer which has been superseded (for
-example the bwtwo on a sun IPC), and an SBUS card containing a later
-probably accelerated buffer is then plugged in to an SBUS slot.
-Under Solaris/SunOS this causes no problems because both cards are
-initialized.
+This subarchitecture includes all 64-bit machines (sparc64) based on
+the UltraSparc processor and its clones. Most of the machines are well
+supported, even though for some you may experience problems booting from
+CD due to firmware or bootloader bugs (this problem may be worked around
+by using netbooting). Use the sparc64 or sparc64-smp kernel in UP and SMP
+configurations respectively.
 -->
-ä˸Ť Sun ơξ硢˵Ȥʤäե졼Хåե
-(㤨 sun IPC  bwtwo ʤ) ܡɤܤƤơ
-夫 SBUS ΥåȤ (֤󥢥졼դ)
-ե졼Хåե SBUS ɤޤƤ뤳Ȥɤޤ
-Solaris/SunOS Ǥ ɤΥɤ뤿ꤢޤ
+Υ֥ƥˤϡUltraSparc ץåȤθߴ CPU ܤ
+ 64 ӥåȥޥ (sparc64) ޤޤޤ
+ե०֡ȥΥХǡ
+CD 鵯ưݤ꤬ǽ⤢ޤ 
+(netboot ǤнǤޤ)
+ۤȤɤΥޥ󤬤ȥݡȤƤޤ
+UP  SMP ιˤ碌ơ
+sparc64  sparc64-smp ΥͥѤƤ
 
-</para><para>
+</para></listitem>
+</varlistentry>
 
+<varlistentry>
+<term>sun4v</term>
+
+<listitem><para>
+
 <!--
-However with Linux this can cause a problem, in that the boot PROM
-monitor may display its output on this additional card; however the
-linux kernel boot messages may then be directed to the original on
-board framebuffer, leaving <emphasis>no</emphasis> error messages on
-the screen, with the machine apparently stuck loading the RAMdisk.
+This is the newest addition to the Sparc family, which includes machines
+based on the Niagara multi-core CPUs. At the moment such CPUs are only
+available in T1000 and T2000 servers by Sun, and are well supported. Use
+the sparc64-smp kernel.
 -->
- Linux ǤϤ줬ˤʤ뤳Ȥޤ
-ư PROM ˥ ɲåɤ˽ϤɽΤˡ
-Linux ͥΥ֡ȥåꥸʥ
-ܡɥե졼Хåե˽Ϥ褦ʾǤ
-顼å<emphasis>ɽʤ</emphasis>
-RAM ǥɤ߹ߤκ˰츫ޥ󤬸Ǥޤä褦˸ޤ
+Sparc եߥ˿ɲä졢
+Niagara ޥ CPU ܤޥޤǤޤ
+ߡä CPU  Sun  T1000 Ф T2000 ФǤΤѤǤ
+ȥݡȤƤޤsparc64-smp ͥѤƤ
 
-</para><para>
+</para></listitem>
+</varlistentry>
+</variablelist>
 
+<para>
+
 <!--
-To avoid this problem, connect the monitor (if required) to the video
-card in the lowest numbered SBUS slot (on motherboard card counts
-as below external slots).  Alternatively it is possible to use a serial
-console.
+Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are not
+supported due to lack of support in the Linux kernel.
 -->
-򤹤ˤϡӥǥɤ SBUS åȤΤäȤ㤤ֹ
-å (ޥܡɾǤϳåȤβ) ޤ
-(ɬפʤ) ˥³뤳ȤǤ
-뤤ϥꥢ륳󥽡Ѥ뤳ȤǤޤ
+Ф PRIMEPOWER եߥǻѤƤٻ̤ SPARC64 CPU ϡ
+Linux ͥΥݡȤԽʬʤᡢ
+ݡȤƤʤȤˤդ
 
 </para>
-   </sect3>
   </sect2>
Index: ja/boot-installer/x86.xml
===================================================================
--- ja/boot-installer/x86.xml	(ӥ 43707)
+++ ja/boot-installer/x86.xml	(ȥԡ)
@@ -155,7 +155,7 @@
 <filename>netboot/debian-installer/i386/initrd.gz</filename> 
 եȤб륫ͥ 
 <filename>netboot/debian-installer/i386/linux</filename> 
-ɤȤǤ礦
+ɤȤ褤Ǥ礦
 ϥ󥹥ȡưϡɥǥΥѡƥ
 ڤľȤǤޤ(դƹԤäƤ)
 
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml	(ӥ 43707)
+++ 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: 42982 -->
+<!-- original version: 43675 -->
 
  <sect1 id="boot-parms"><title>֡ȥѥ᡼</title>
 <para>
@@ -146,19 +146,32 @@
 </footnote> which may be useful.
 -->
 </footnote>򤤤Ĥǧޤ
+
+</para><para>
+
+<!--
+A number of parameters have a <quote>short form</quote> that helps avoid
+the limitations of the kernel command line options and makes entering the
+parameters easier. If a parameter has a short form, it will be listed in
+brackets behind the (normal) long form. Examples in this manual will
+normally use the short form too.
+-->
+¿Υѥ᡼ϡͥ륳ޥɥ饤󥪥ץ¤򤱤ꡢ
+ѥ᡼Ϥñˤ뤿ᡢ<quote>û̷</quote> äƤޤ
+ѥ᡼û̷硢(̾)ĹθˤäǰϤäƤޤ
+ܥޥ˥奢ϡ̾û̷ѤƤޤ
+
 </para>
 
 <variablelist>
 <varlistentry>
-<term>debconf/priority</term>
+<term>debconf/priority (priority)</term>
 <listitem><para>
 
 <!--
 This parameter sets the lowest priority of messages to be displayed.
-Short form: <userinput>priority</userinput>
 -->
 Υѥ᡼ˤϡɽåΤäȤ㤤ͥ٤ꤷޤ
-û̷: <userinput>priority</userinput>
 
 </para><para>
 
@@ -327,23 +340,20 @@
 </varlistentry>
 
 <varlistentry>
-<term>debian-installer/framebuffer</term>
+<term>debian-installer/framebuffer (fb)</term>
 <listitem><para>
 <!--
 Some architectures use the kernel framebuffer to offer installation in
 a number of languages. If framebuffer causes a problem on your system
 you can disable the feature by the parameter
-<userinput>debian-installer/framebuffer=false</userinput>, or
-<userinput>fb=false</userinput> for short. Problem symptoms are error messages
+<userinput>fb=false</userinput>. Problem symptoms are error messages
 about bterm or bogl, a blank screen, or a freeze within a few minutes after
 starting the install.
 -->
 ĤΥƥǤϡ¿θǥ󥹥ȡԤˡ
 ͥե졼ХåեѤޤ
 ե졼ХåեȤʤ륷ƥξ硢
-<userinput>debian-installer/framebuffer=false</userinput> 
-ά <userinput>fb=false</userinput>
-ѥ᡼ˤäƤεǽ̵ˤǤޤ
+<userinput>fb=false</userinput> ѥ᡼ˤäƤεǽ̵ˤǤޤ
 bterm  bogl ˴ؤ륨顼å䡢ðŤʲ̡
 󥹥ȡ뤬Ϥޤäƿʬ˥ե꡼Ǥ
 
@@ -395,24 +405,22 @@
 </para></note></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>debian-installer/theme</term>
+<varlistentry arch="not-s390">
+<term>debian-installer/theme (theme)</term>
 <listitem><para>
 
 <!--
 A theme determines how the user interface of the installer looks (colors,
 icons, etc.). What themes are available differs per frontend.  Currently
 both the newt and gtk frontends only have a <quote>dark</quote> theme that was
-designed for visually impaired users. Set the theme by booting with parameter
-<userinput>debian-installer/theme=<replaceable>dark</replaceable></userinput>
-or <userinput>theme=<replaceable>dark</replaceable></userinput>.
+designed for visually impaired users. Set the theme by booting with
+<userinput>theme=<replaceable>dark</replaceable></userinput>.
 -->
 ơ (theme) ϥ󥹥ȡΥ桼󥿡եɤΤ褦˸뤫 
 (ʤ) ꤷޤߡnewt  gtk ΥեȥɤˤΤߡ
 ܤԼͳ˥ǥ󤵤줿 <quote>dark</quote> ơޤޤ
 ưΥѥ᡼ˡ
-<userinput>debian-installer/theme=<replaceable>dark</replaceable></userinput>
-ά <userinput>theme=<replaceable>dark</replaceable></userinput> 
+<userinput>theme=<replaceable>dark</replaceable></userinput> 
 ȻꤷƥơޤꤷƤ
 
 </para></listitem>
@@ -481,50 +489,45 @@
 </varlistentry>
 
 <varlistentry>
-<term>preseed/url</term>
+<term>preseed/url (url)</term>
 <listitem><para>
 
 <!--
 Specify the url to a preconfiguration file to download and use in
 automating the install. See <xref linkend="automatic-install"/>.
-Short form: <userinput>url</userinput>.
 -->
 preconfiguration եɤ URL ꤷޤ
 ϼư󥹥ȡǻѤޤ
 <xref linkend="automatic-install"/> 򻲾ȤƤ
-û̷ <userinput>url</userinput> Ǥ
 
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term>preseed/file</term>
+<term>preseed/file (file)</term>
 <listitem><para>
 
 <!--
 Specify the path to a preconfiguration file to load to
 automating the install. See <xref linkend="automatic-install"/>.
-Short form: <userinput>file</userinput>.
 -->
 ư󥹥ȡɤ߹ preconfiguration ե PATH ꤷޤ
 <xref linkend="automatic-install"/> 򻲾ȤƤ
-û̷ <userinput>file</userinput> Ǥ
 
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term>auto-install/enabled</term>
+<term>auto-install/enabled (auto)</term>
 <listitem><para>
 
 <!--
 Delay questions that are normally asked before preseeding is possible until
-after the network is configured. Short form: <userinput>auto=true</userinput>
+after the network is configured.
 See <xref linkend="preseed-auto"/> for details about using this to
 automate installs.
 -->
 ̾ preseed ˹Ԥ򡢥ͥåȥ꤬ޤ٤餻ޤ
-û̷ <userinput>auto=true</userinput> Ǥ
 ư󥹥ȡǤΥѥ᡼Ѥݤˤϡ
 <xref linkend="preseed-auto"/> 
 
@@ -652,19 +655,18 @@
 <variablelist>
 
 <varlistentry>
-<term>debian-installer/locale</term>
+<term>debian-installer/locale (locale)</term>
 <listitem><para>
 
 <!--
 Can be used to set both the language and country for the installation.
 This will only work if the locale is supported in Debian.
-Short form: <userinput>locale</userinput>.
 For example, use <userinput>locale=de_CH</userinput> to select German as
-language and Switserland as country.
+language and Switzerland as country.
+
 -->
 󥹥ȡ뤹ݤθξꤹΤ˻Ѥޤ
  Debian ǥ򥵥ݡȤƤΤͭǤ
-û̷ <userinput>locale</userinput> Ǥ
 㤨С˥ɥĸ졢˥ꤹˤϡ
 <userinput>locale=de_CH</userinput> Ȼꤷޤ
 
@@ -672,6 +674,27 @@
 </varlistentry>
 
 <varlistentry>
+<term>anna/choose_modules (modules)</term>
+<listitem><para>
+
+<!--
+Can be used to automatically load installer components that are not loaded
+by default.
+Examples of optional components that may be useful are
+<classname>openssh-client-udeb</classname> (so you can use
+<command>scp</command> during the installation) and
+<classname>ppp-udeb</classname> (which supports PPPoE configuration).
+-->
+ǥեȤǤϥɤʤ󥹥ȡ饳ݡͥȤ
+ưŪɤ߹Τ˻Ѥޤ
+ɲåݡͥȤȤơ<classname>openssh-client-udeb</classname> 
+(󥹥ȡ <command>scp</command> ޥɤѤǤ) 䡢
+<classname>ppp-udeb</classname> (PPPoE 򥵥ݡȤ) Ǥ
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
 <term>netcfg/disable_dhcp</term>
 <listitem><para>
 
@@ -686,21 +709,41 @@
 </varlistentry>
 
 <varlistentry>
-<term>tasksel:tasksel/first</term>
+<term>mirror/protocol (protocol)</term>
 <listitem><para>
 
 <!--
+By default the installer will use the http protocol to download files from
+Debian mirrors and changing that to ftp is not possible during installations
+at normal priority. By setting this parameter to <userinput>ftp</userinput>,
+you can force the installer to use that protocol instead. Note that you
+cannot select an ftp mirror from a list, you have to enter the hostname
+manually.
+-->
+ǥեȤǥ󥹥ȡϡ
+Debian Υߥ顼ȤեɤΤ http 
+ץȥѤ̾ͥ٤Ǥϥ󥹥ȡ ftp ѹǤޤ
+Υѥ᡼ <userinput>ftp</userinput> ꤹȡ
+󥹥ȡ ftp Ѥ褦˶Ǥޤ
+ ftp ߥ顼Ǥ
+ۥ̾ϤʤФʤʤȤդƤ
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>tasksel:tasksel/first (tasks)</term>
+<listitem><para>
+
+<!--
 Can be used to select tasks that are not available from the interactive task
 list, such as the <literal>kde-desktop</literal> task.
 See <xref linkend="pkgsel"/> for additional information.
-Short form: <userinput>tasks</userinput>.
 -->
 <literal>kde-desktop</literal> Τ褦ʡ
 ɽʤ򤹤Τ˻Ѥޤ
 ʤ <xref linkend="pkgsel"/> 
-û̷ <userinput>tasks</userinput> Ǥ
 
-
 </para></listitem>
 </varlistentry>
 
Index: ja/boot-installer/trouble.xml
===================================================================
--- ja/boot-installer/trouble.xml	(ӥ 43707)
+++ 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: 43259 -->
+<!-- original version: 43514 -->
 
  <sect1 id="boot-troubleshooting">
  <title>󥹥ȡץΥȥ֥륷塼ƥ</title>
@@ -713,17 +713,21 @@
 
 
   <sect2 id="problem-report">
-  <title>Хݡ</title>
+<!--
+  <title>Reporting Installation Problems</title>
+-->
+  <title>󥹥ȡȯ</title>
 <para>
 
 <!--
-If you get through the initial boot phase but cannot complete the
-install, the bug reporter menu choice may be helpful.
+If you get through the initial boot phase but cannot complete the install,
+the menu option <guimenuitem>Save debug logs</guimenuitem> may be helpful.
 It lets you store system error logs and configuration information from the
-installer to a floppy, or download them in a web browser.
+installer to a floppy, or download them using a web browser.
 -->
 ǽεưʳ̲ᤷΤˡ󥹥ȡ뤬λǤʤäϡ
-Хݡ˥塼򤹤Ȥ⤷ޤ
+˥塼 <guimenuitem>ǥХå¸</guimenuitem> 
+򤹤Ȥ⤷ޤ
 󥹥ȡ餫ΥƥΥ顼եåԡ˳Ǽꡢ
 web ֥饦ǥɤǤ褦ˤʤޤ
 
@@ -769,6 +773,17 @@
 </para><para>
 
 <!--
+Note that your installation report will be published in the Debian Bug
+Tracking System (BTS) and forwarded to a public mailing list. Make sure that
+you use an E-Mail address that you do not mind being made public.
+-->
+ʤΥ󥹥ȡݡȤϡDebian Хץƥ (BTS) Ǹ졢
+᡼󥰥ꥹȤž뤳ȤαդƤ
+ɬƤʤ E-mail ɥ쥹ѤƤ
+
+</para><para>
+
+<!--
 If you have a working Debian system, the easiest way to send an installation
 report is to install the installation-report and reportbug packages
 (<command>apt-get install installation-report reportbug</command>) and run
@@ -783,13 +798,15 @@
 </para><para>
 
 <!--
-Please use this template when filling out
+Alternatively you can use this template when filling out
 installation reports, and file the report as a bug report against the
 <classname>installation-reports</classname> pseudo package, by sending it to
 <email>submit@bugs.debian.org</email>.
 -->
-󥹥ȡݡȤݤˤϡʲΥƥץ졼Ȥ򤪻Ȥ
-Υե<classname>installation-reports</classname> ѥåΥХȤơ
+¾󥹥ȡݡȤݤˤϡ
+ʲΥƥץ졼ȤѤǤޤ
+Υե<classname>installation-reports</classname> 
+ѥåΥХȤơ
 <email>submit@bugs.debian.org</email> ˤ꤯
 
 <informalexample><screen>