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

[d-i doc] 翻訳更新



鍋太郎です。
遅くなりましたが、本年もよろしくお願いします。

インストールガイドの訳をここまで追随しました。
よろしければチェックをお願いします。

また、先のメールでja/hardware/hardware-supported.xmlの
Sparcのグラフィカルコンソールについて微妙に修正しました。
同様の内容がja/boot-installer/trouble.xmlにも(こちらの方が多少詳しく)ありますので、
参考になればと思います。

$ tar ztf d-i-update0105.tar.gz
ja/bookinfo.xml
ja/install-methods/usb-setup/x86.xml
ja/preparing/minimum-hardware-reqts.xml
ja/preparing/backup.xml
ja/preparing/nondeb-part/sparc.xml
ja/preparing/install-overview.xml
ja/appendix/random-bits.xml
ja/using-d-i/modules/user-setup.xml
ja/using-d-i/modules/pkgsel.xml
ja/hardware/hardware-supported.xml
ja/hardware/memory-disk-requirements.xml
ja/hardware/supported-peripherals.xml
ja/hardware/network-cards.xml
ja/hardware/supported/i386.xml
ja/hardware/supported/arm.xml
ja/hardware/installation-media.xml
ja/boot-installer/alpha.xml
ja/boot-installer/x86.xml
ja/boot-installer/s390.xml
ja/boot-installer/boot-installer.xml
ja/boot-installer/parameters.xml
ja/boot-installer/ia64.xml
ja/boot-installer/sparc.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-update0105.tar.gz
Description: Binary data

Index: ja/bookinfo.xml
===================================================================
--- ja/bookinfo.xml	(ӥ 43857)
+++ ja/bookinfo.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43611 -->
+<!-- original version: 43744 -->
 
 <bookinfo id="debian_installation_guide">
 <title>&debian; 󥹥ȡ륬</title>
@@ -124,6 +124,7 @@
  <year>2004</year>
  <year>2005</year>
  <year>2006</year>
+ <year>2007</year>
  <holder>the Debian Installer team</holder>
 </copyright>
 
Index: ja/install-methods/usb-setup/x86.xml
===================================================================
--- ja/install-methods/usb-setup/x86.xml	(ӥ 43857)
+++ ja/install-methods/usb-setup/x86.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622-->
+<!-- original version: 43730 -->
 
    <sect3 arch="x86">
    <title>&arch-title; Ǥ USB ƥåΥѡƥʬ</title>
@@ -145,15 +145,8 @@
 
 <informalexample><screen>
 default vmlinuz
-append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw
+append initrd=initrd.gz
 </screen></informalexample>
 
-<!--
-Please note that the <userinput>ramdisk_size</userinput> parameter
-may need to be increased, depending on the image you are booting.
--->
-ư륤᡼˱ơ<userinput>ramdisk_size</userinput> ѥ᡼
-䤹ɬפ뤳ȤդƤ
-
 </para>
    </sect3>
Index: ja/preparing/minimum-hardware-reqts.xml
===================================================================
--- ja/preparing/minimum-hardware-reqts.xml	(ӥ 43857)
+++ ja/preparing/minimum-hardware-reqts.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43790 -->
 
  <sect1 id="minimum-hardware-reqts">
 <title>ɬפʺ¤Υϡɥ</title>
@@ -30,11 +30,10 @@
 </para><para arch="x86">
 
 <!--
-A Pentium 100 is the minimum recommended for desktop
-systems, and a Pentium II-300 for a Server.
+A Pentium 4, 1GHz system is the minimum recommended for a desktop
+systems.
 -->
-ǥȥåץƥˤϺ Pentium 100
-Фˤ Pentium II-300 ɬפǤ礦
+ǥȥåץƥˤϺ Pentium 4, 1GHz 򤪾ᤷޤ
 
 </para><para arch="m68k">
 
@@ -49,38 +48,57 @@
 </para><para arch="powerpc">
 
 <!--
-Any OldWorld or NewWorld PowerPC can serve well
-as a Desktop System. For servers, a minimum 132-Mhz machine is
-recommended.
+Any OldWorld or NewWorld PowerPC can serve well as a desktop system.
 -->
 ǥȥåץƥˤ OldWorld PowerPC, NewWorld PowerPC
 ΤΥǥǤ⽼ʬǤ礦
-ФˤϺ 132 MHz Υޥ򤪴ᤷޤ
 
 </para>
 
 <table>
+<!--
+<title>Recommended Minimum System Requirements</title>
+-->
 <title>ɬפʥƥ (侩)</title>
-<tgroup cols="3">
+<tgroup cols="4">
 <thead>
 <row>
-  <entry>Ȥ</entry><entry>RAM</entry><entry>ϡɥǥ</entry>
+<!--
+  <entry>Install Type</entry>
+  <entry>RAM (minimal)</entry>
+  <entry>RAM (recommended)</entry>
+  <entry>Hard Drive</entry>
+-->
+  <entry>󥹥ȡ륿</entry>
+  <entry>RAM (Ǿ)</entry>
+  <entry>RAM (侩)</entry>
+  <entry>ϡɥǥ</entry>
 </row>
 </thead>
 
 <tbody>
 <row>
+<!--
+  <entry>No desktop</entry>
+  <entry>64 megabytes</entry>
+  <entry>256 megabytes</entry>
+  <entry>1 gigabyte</entry>
+-->
   <entry>ǥȥåפʤ</entry>
-  <entry>24 ᥬХ</entry>
-  <entry>450 ᥬХ</entry>
-</row><row>
-  <entry>ǥȥåפ</entry>
   <entry>64 ᥬХ</entry>
+  <entry>256 ᥬХ</entry>
   <entry>1 Х</entry>
-</row><row>
-  <entry></entry>
-  <entry>128 ᥬХ</entry>
-  <entry>4 Х</entry>
+</row><row arch="not-s390">
+<!--
+  <entry>With Desktop</entry>
+  <entry>64 megabytes</entry>
+  <entry>512 megabytes</entry>
+  <entry>5 gigabyte</entry>
+-->
+  <entry>ǥȥåפ</entry>
+  <entry>64 ᥬХ</entry>
+  <entry>512 ᥬХ</entry>
+  <entry>5 Х</entry>
 </row>
 
 </tbody></tgroup></table>
@@ -88,118 +106,85 @@
 <para>
 
 <!--
-Here is a sampling of some common Debian system configurations.
-You can also get an idea of the disk space used by related groups
-of programs by referring to <xref linkend="tasksel-size-list"/>.
+The actual minimum memory requirements are a lot less then the numbers
+listed in this table. Depending on the architecture, it is possible to
+install Debian with as little as 20MB (for s390) to 48MB (for i386 and
+amd64). The same goes for the disk space requirements, especially if you
+pick and choose which applications to install; see
+<xref linkend="tasksel-size-list"/> for additional information on disk
+space requirements.
 -->
-ʲˤϡ褯 Debian ƥλȤҲ𤷤ޤ
-ϢץෲȤǥ̤ˤĤƤϡ
-<xref linkend="tasksel-size-list"/> ޤ
+ºݤɬפʺǾϤɽ˵󤲤ʪ⾯ʤʤޤ
+ƥ˰¸ޤǾ 20MB (s390)  48MB (i386, amd64) 
+Debian 򥤥󥹥ȡǤޤ
+ɬפʥǥڡˤƱȤ
+ä˥󥹥ȡ뤹륢ץꥱ򤹤硢
+ɬפʥǥڡˤĤƤɲþϡ
+<xref linkend="tasksel-size-list"/> 
 
-</para>
-<variablelist>
+</para><para arch="not-s390">
 
-<varlistentry>
- <term>ɸŪʥ</term>
- <listitem><para>
-
 <!--
-This is a small server profile, useful for a stripped down server
-which does not have a lot of niceties for shell users.  It includes an
-FTP server, a web server, DNS, NIS, and POP. For these 100MB of disk
-space would suffice, and then you would need to add space
-for any data you serve up.
+It is possible to run a graphical desktop environment on older or
+low-end systems, but in that case it is recommended to install
+a window manager that is less resource-hungry than those of the
+GNOME or KDE desktop environments; alternatives include
+<classname>xfce4</classname>, <classname>icewm</classname> and
+<classname>wmaker</classname>, but there are others to choose from.
 -->
-ϤĴǤʥФǡ񤷤桼򤢤ޤꤿ
-ƤʤͤǤ
-FTP С֥СDNSNISPOP 餻Ȥ顢
-ǥΰ 100MB ­Ǥ礦
-󶡤ǡ˱̤ɲäɬפǤ礦
+켰ʤɥƥǤ⡢
+եǥȥå״Ķ¹ԤǤޤ
+GNOME  KDE Ȥäǥȥå״Ķ⡢
+꥽񤷤ʤɥޥ͡򥤥󥹥ȡ뤹Τ򤪾ᤷޤ
+ʤˤϡ<classname>xfce4</classname>, <classname>icewm</classname>, 
+<classname>wmaker</classname> ޤޤޤ¾ˤǤޤ
 
-</para></listitem>
-</varlistentry>
+</para><para>
 
-<varlistentry arch="not-s390">
- <term>ǥȥå</term>
- <listitem><para>
+It is practically impossible to give general memory or disk space
+requirements for server installations as those very much depend on
+what the server is to be used for.
 
-<!--
-A standard desktop box, including the X window system, graphics
-applications, sound, editors, etc.  Size of the packages will be
-around 500MB.
-A standard desktop box, including the X window system, full desktop
-environments, sound, editors, etc.  You'll need about 2GB using the
-standard desktop task, though it can be done in far less.
--->
-ɸŪʥǥȥåץޥǡX Window System
-ǥȥå״Ķɡǥʤɤޤ
-ɸǥȥåץѤС 2GB ɬפǤ
-꾯ʤƤ¹ԤǤޤ
+</para><para>
 
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry arch="not-s390">
- <term>ȥ󥽡</term>
- <listitem><para>
-
 <!--
-A more stripped-down user machine, without the X window system or X
-applications.  Possibly suitable for a laptop or mobile computer.  The
-size is around 140MB.
+Remember that these sizes don't include all the other materials which
+are usually to be found, such as user files, mail, and data.  It is
+always best to be generous when considering the space for your own
+files and data.
 -->
-ʤޥǡX Window System  X ץꥱ
-åȤΤǤåץȥåסХ륳ԥ塼ˤ⤷ޤ
-Ϥ 140MB 餤Ǥ
+Υˤϡ̾¸ߤ桼ե롢᡼롢
+ǡʤɤϴޤޤƤʤȤˤդ
+ʬΥեǡɬפ̤ϡ
+ɤݤƤ˱ۤȤϤޤ
 
-</para></listitem>
-</varlistentry>
+</para><para>
 
-<varlistentry>
- <term>ȯ</term>
- <listitem><para>
-
 <!--
-A desktop setup with all the development packages, such as Perl, C,
-C++, etc.  Size is around 475MB.  Assuming you are adding X11 and some
-additional packages for other uses, you should plan around 800MB for
-this type of machine.
--->
-Perl, C, C++ ȤäȯѤΥѥå򤹤٤ƴޤǥȥåפǤ
-X11 ¾Ӥˤ⤤ʥѥåɲäȤȡ
-褽 800MB 餤ͽꤷƤ٤Ǥ礦
-
-</para></listitem>
-</varlistentry>
-
-</variablelist><para>
-
-<!--
-Remember that these sizes don't include all the other materials which
-are usually to be found, such as user files, mail, and data.  It is
-always best to be generous when considering the space for your own
-files and data.  Notably, the <filename>/var</filename> partition contains
+Disk space required for the smooth operation of the &debian; system
+itself is taken into account in these recommended system requirements.
+Notably, the <filename>/var</filename> partition contains
 a lot of state information specific to Debian in addition to its regular
-contents like logfiles.  The
+contents, like logfiles.  The
 <command>dpkg</command> files (with information on all installed
-packages) can easily consume 20MB. Also,
+packages) can easily consume 40MB. Also,
 <command>apt-get</command> puts downloaded packages here before they are
 installed. You should
-usually allocate at least 100MB for <filename>/var</filename>.
+usually allocate at least 200MB for <filename>/var</filename>, and a lot
+more if you install a graphical desktop environment.
 -->
-Υˤϡ̾¸ߤ桼ե롢᡼롢
-ǡʤɤϴޤޤƤʤȤˤդ
-ʬΥեǡɬפ̤ϡ
-ɤݤƤ˱ۤȤϤޤ
+&debian; ƥ߳ΤɬפʥǥڡˤĤƤϡ
+᤹륷ƥ׷ǹθƤޤ
 äˡ<filename>/var</filename> ѡƥˤϡ
 եΤ褦ʰŪƤ˲äDebian ͭξ־¿֤ޤ
 <command>dpkg</command> Υե 
 (󥹥ȡ뤵줿ѥå٤Ƥ˴ؤ)
-ϡñ 20MB 񤷤ޤ
+ϡñ 40MB 񤷤ޤ
 ޤ <command>apt-get</command> ϡ
 󥹥ȡ뤹˥ɤѥå򤳤֤ޤ
-<filename>/var</filename> ˤϺ 100MB ϳƤƤ٤Ǥ礦
+<filename>/var</filename> ˤϺ 200MB ϳƤƤ٤Ǥ
+եǥȥå״Ķ򥤥󥹥ȡ뤹ˤϡ
+äȳƤ٤Ǥ礦
 
 </para>
 
Index: ja/preparing/backup.xml
===================================================================
--- ja/preparing/backup.xml	(ӥ 43857)
+++ ja/preparing/backup.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 43730 -->
 
  <sect1 id="backup">
  <title>¸ǡХååפƤ!</title>
@@ -11,11 +11,11 @@
 system. If this is the first time a non-native operating system has
 been installed on your computer, it's quite likely you will need to
 re-partition your disk to make room for &debian;. Anytime you
-partition your disk, you should count on losing everything on the
+partition your disk, you run a risk of losing everything on the
 disk, no matter what program you use to do it. The programs used in
 installation are quite reliable and most have seen years of use; but
 they are also quite powerful and a false move can cost you. Even after
-backing up be careful and think about your answers and actions. Two
+backing up, be careful and think about your answers and actions. Two
 minutes of thinking can save hours of unnecessary work.
 -->
 󥹥ȡϤˡ
@@ -24,7 +24,7 @@
 ǽλߤǤ顢餯ǥΥѡƥʬľ 
 &debian; ѤΰɬפǤ礦
 ǥΥѡƥʬȤǤϡɤʥץȤäȤƤ⡢
-ǥΤ٤ƤΥǡäƤޤǽϥǤϤޤ
+ǥΤ٤ƤΥǡäƤޤȤˤʤޤ
 󥹥ȡѤץෲϡˤƿ⤯
 ǯѤƤΤǤ
 ϶ϤʵǽĤȤˤʤΤǡ
Index: ja/preparing/nondeb-part/sparc.xml
===================================================================
--- ja/preparing/nondeb-part/sparc.xml	(ӥ 43857)
+++ 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: 43576 -->
+<!-- original version: 43732 -->
 
 
   <sect2 arch="sparc"><title>SunOS Υѡƥʬ</title>
@@ -12,9 +12,6 @@
 run both SunOS and Debian on the same machine, it is recommended that
 you partition using SunOS prior to installing Debian.  The Linux
 kernel understands Sun disk labels, so there are no problems there.
-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 any of EXT2 (Linux), UFS
 (SunOS), romfs or iso9660 (CDROM) partitions.
 -->
@@ -24,10 +21,6 @@
 SunOS ѤƥѡƥƤȤ򤪴ᤷޤ
 Linux ͥ Sun Υǥ٥ǧǤޤΤǡ
 ˡꤢޤ
-Debian Υ롼ȥѡƥˤΰ褬
-֡ȥǥƬ 1GB ˼ޤ褦դƤ
-Τ褦ʥ롼ȥѡƥݤ뤳Ȥ񤷤С
-ͥ륤᡼ UFS ѡƥ֤ˡޤ
 SILO ϡEXT2 (Linux), UFS (SunOS), romfs, iso9660 (CDROM) 
 Τ줫Υѡƥ󤫤 Linux  SunOS ưǤޤ
 
Index: ja/preparing/install-overview.xml
===================================================================
--- ja/preparing/install-overview.xml	(ӥ 43857)
+++ ja/preparing/install-overview.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 40811 -->
+<!-- original version: 43782 -->
 
  <sect1 id="install-overview">
 <!--
@@ -207,9 +207,24 @@
 </para></listitem>
 </orderedlist>
 
-<para>
+<para condition="gtk">
 
 <!--
+For &arch-title; you have the option of using
+<phrase arch="x86">a</phrase>
+<phrase arch="powerpc">an experimental</phrase>
+graphical version of the installation system. For more information about
+this graphical installer, see <xref linkend="graphical"/>.
+-->
+&arch-title; Ǥϡ
+ե<phrase arch="powerpc">¸</phrase>
+󥹥ȡ륷ƥѤȤ褬ޤ
+ե륤󥹥ȡˤĤƤϡ
+<xref linkend="graphical"/> 
+
+</para><para>
+
+<!--
 If you have problems during the installation, it helps to know which
 packages are involved in which steps. Introducing the leading software
 actors in this installation drama:
@@ -224,8 +239,10 @@
 The installer software, <classname>debian-installer</classname>, is
 the primary concern of this manual. It detects hardware and loads
 appropriate drivers, uses <classname>dhcp-client</classname> to set up the
-network connection, and runs <classname>debootstrap</classname> to install
-the base system packages. Many more actors play smaller parts in this process,
+network connection, runs <classname>debootstrap</classname> to install
+the base system packages, and runs <classname>tasksel</classname> to allow
+you to install certain additional software.
+Many more actors play smaller parts in this process,
 but <classname>debian-installer</classname> has completed its task when
 you load the new system for the first time.
 -->
@@ -234,7 +251,9 @@
 ϡɥ򸡽ФŬڤʥɥ饤Фɤ
 <classname>dhcp-client</classname> Ѥƥͥåȥ³ꤷ
 ܥƥѥå򥤥󥹥ȡ뤹Τ 
-<classname>debootstrap</classname> ¹Ԥޤ
+<classname>debootstrap</classname> ¹Ԥ
+ɲåեȥ򥤥󥹥ȡ뤹 
+<classname>tasksel</classname> ¹Ԥޤ
 Υץ¿ͥ꾮餸ޤ
 ƿƥưˡ<classname>debian-installer</classname> 
 ϤΥ򽪤뤳Ȥˤʤޤ
@@ -253,35 +272,37 @@
 </para><para>
 
 <!--
-When <classname>debian-installer</classname> finishes, before the
-first system load, you have only a very basic command line driven
-system. The graphical interface which displays windows on your monitor
-will not be installed unless you select it with <classname>tasksel</classname>.
-It's optional because many &debian; systems are servers which don't really
-have any need for a graphical user interface to do their job.
+One important option during the installation is whether or not to install
+a graphical desktop environment, consisting of the X11 window system and
+one of the available graphical desktop environments.
+If you choose not to select the <quote>Desktop environment</quote> task,
+you will only have a relatively basic, command line driven system.
+Installing the Desktop environment task is optional because it requires a
+fairly large amount of disk space, and because many &debian; systems are
+servers which don't really have any need for a graphical user interface
+to do their job.
 -->
-ƥƥưǡ<classname>debian-installer</classname> 
-λˤϡƥΤˡ˴Ūʥޥɥ饤󤷤
-ޤ󡣥˥˥ɥɽ褦ʥե륤󥿡եϡ
-ǽƥåפ <classname>tasksel</classname> Ȥä򤷤ʤ
-󥹥ȡ뤵ޤ
-¿ &debian; ƥϡԤʤ
-ե桼󥿡եäɬפȤʤ褦ʥФǤ뤿ᡢ
-ϥץȤʤäƤޤ
+󥹥ȡνפˡX11 window system 
+ȥեǥȥå״Ķ 1 Ĥʤ롢
+եǥȥå״Ķ򥤥󥹥ȡ뤹뤫ɤޤ
+<quote>ǥȥå״Ķ</quote> 򤷤ʤ硢
+ŪŪʡޥɥ饤ưƥˤʤޤ
+ʤ礭ʥǥΰɬפȤޤ¿ &debian; ƥϡ
+ե桼󥿡եäɬפȤʤФǤ뤿ᡢ
+ǥȥå״ĶϥץȤʤäƤޤ
 
 </para><para arch="not-s390">
 
 <!--
-Just be aware that the X system is completely separate from
+Just be aware that the X11 window system is completely separate from
 <classname>debian-installer</classname>, and in fact is much more
 complicated. Installation and trouble shooting of the X window
-installation is not within the scope of this manual.
+system is not within the scope of this manual.
 -->
-X Υƥϡ <classname>debian-installer</classname> Ȥϴ
+X11 window system ϡ <classname>debian-installer</classname> Ȥϴ
 ʬƤơºݤˤʣʤȤդƤ
-X ɥƥΥ󥹥ȡȥȥ֥륷塼Ȥϡ
-Υޥ˥奢곰Ǥ
+X11 window system Υ󥹥ȡȥȥ֥륷塼Ȥϡ
+Υޥ˥奢Ǥϰޤ
 
 </para>
  </sect1>
-
Index: ja/appendix/random-bits.xml
===================================================================
--- ja/appendix/random-bits.xml	(ӥ 43857)
+++ ja/appendix/random-bits.xml	(ȥԡ)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33719 -->
+<!-- original version: 43782 -->
 
 <appendix id="appendix"><title>ӥå</title>
 
 &files.xml;
 &chroot-install.xml;
 &plip.xml;
+&graphical.xml;
 
 </appendix>
Index: ja/using-d-i/modules/user-setup.xml
===================================================================
--- ja/using-d-i/modules/user-setup.xml	(ӥ 43857)
+++ ja/using-d-i/modules/user-setup.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35518 -->
+<!-- original version: 43741 -->
 
    <sect3 id="user-setup">
 <!--
@@ -14,6 +14,8 @@
 -->
     <title>root ѥɤ</title>
 
+<!-- TODO: Document sudo setup (no root password); medium/low prio only -->
+
 <para>
 
 <!--
@@ -78,6 +80,8 @@
 root ȤŪ˻Ѥꡢ
 ĿŪӤǥ󤹤٤Ǥ<emphasis>ޤ</emphasis>
 
+<!-- Note: it only _asks_ at medium/low priority -->
+
 </para><para>
 
 <!--
Index: ja/using-d-i/modules/pkgsel.xml
===================================================================
--- ja/using-d-i/modules/pkgsel.xml	(ӥ 43857)
+++ 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: 43675 -->
+<!-- original version: 43734 -->
 
    <sect3 id="pkgsel">
 <!--
@@ -27,6 +27,8 @@
 
 </para><para>
 
+<!-- TODO: Should explain popcon first -->
+
 <!--
 So, you have the ability to choose <emphasis>tasks</emphasis> first,
 and then add on more individual packages later.  These tasks loosely
@@ -88,6 +90,8 @@
 </para>
 <note><para>
 
+<!-- TODO: Explain the "Standard system" task first -->
+
 <!--
 The <quote>Desktop environment</quote> task will install the GNOME desktop
 environment. The options offered by the installer currently do not allow to
Index: ja/hardware/hardware-supported.xml
===================================================================
--- ja/hardware/hardware-supported.xml	(ӥ 43857)
+++ ja/hardware/hardware-supported.xml	(ȥԡ)
@@ -395,7 +395,7 @@
 ȤǤϤޤ
 Τ褦ʾ硢ե०ǤϤ˻Ѥɤˡ
 Linux ͥ뤬Ϥʤǽޤ
-եå󥽡˽Ϥ­ʤȡϥ󥰤˴ְ뤫⤷ޤ
+ե륳󥽡ؤνϤ礱ȡϥ󥰤˴ְ뤫⤷ޤ
 (̾󥽡ɽǸΥåϡ'Booting Linux...' Ǥ)
 ˡ 1 Ĥ˥ӥǥɤʪŪ˼ƤޤȤʪޤ
 ޤͥΥ֡ȥѥ᡼ǡ
Index: ja/hardware/memory-disk-requirements.xml
===================================================================
--- ja/hardware/memory-disk-requirements.xml	(ӥ 43857)
+++ ja/hardware/memory-disk-requirements.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 -->
+<!-- original version: 43735 -->
 
  <sect1 id="memory-disk-requirements">
  <title>ɬפʥȥǥڡ</title>
@@ -9,19 +9,13 @@
 
 <!--
 You must have at least &minimum-memory; of memory and &minimum-fs-size; of hard disk
-space. For a minimal console-based system (all standard packages),
-250MB is required. If you want to install a reasonable amount of
-software, including the X Window System, and some development programs
-and libraries, you'll need at least 400MB. For a more or less complete
-desktop system, you'll need a few gigabytes.
+space. Note that these are really bare-minimum numbers. For more realistic
+figures, see <xref linkend="minimum-hardware-reqts"/>.
 -->
-Ǥ &minimum-memory;  RAM  &minimum-fs-size; Υϡɥǥ
-ɬפǤ
-Ǿ¤Υ󥽡١ƥ (ɸѥå) ˤ 250MB ɬפǤ
-X Window System 䡢ȯץࡢ饤֥ʤɤΥեȥ
-٥󥹥ȡ뤹ˤϡʤȤ 400MB ɬפˤʤǤ礦
-¿쾯ʤ촰ʥǥȥåץƥˤˤϡ
-ХȤɬפˤʤǤ礦
+Ǥ &minimum-memory;  RAM  &minimum-fs-size; 
+ΥϡɥǥɬפǤ
+ϡޤäʺǾ¤ͤȤȤդƤ
+Ūͤϡ<xref linkend="minimum-hardware-reqts"/> 
 
 </para><para arch="m68k">
 
Index: ja/hardware/supported-peripherals.xml
===================================================================
--- ja/hardware/supported-peripherals.xml	(ӥ 43857)
+++ ja/hardware/supported-peripherals.xml	(ȥԡ)
@@ -24,7 +24,7 @@
 -->
 USB ϡɥϤƤޤưޤ
 USB ܡɤɲ꤬ɬפ⤷ޤ
-(<xref linkend="usb-keyboard-config"/> )
+(<xref linkend="hardware-issues"/> )
 
 </para><para arch="x86">
 
Index: ja/hardware/network-cards.xml
===================================================================
--- ja/hardware/network-cards.xml	(ӥ 43857)
+++ ja/hardware/network-cards.xml	(ȥԡ)
@@ -1,193 +1,76 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43693 -->
 
  <sect1 id="network-cards">
+<!--
+ <title>Network Connectivity Hardware</title>
+-->
  <title>ͥåȥ³</title>
+<para>
 
-<para arch="x86">
-
-<!-- last updated for kernel-image_2.0.36-2 -->
-
 <!--
-Most PCI and many older ISA network cards are supported.
-Some network interface cards are not supported by most Debian
-installation disks, such as AX.25 cards and protocols;
-NI16510 EtherBlaster cards; Schneider &amp; Koch G16 cards;
-and the Zenith Z-Note built-in network card. Microchannel (MCA) network
-cards are not supported by the standard installation system, but see
-<ulink url="&url-linux-mca;">Linux on MCA</ulink> for some (old)
-instructions.
-FDDI networks are also not supported by the installation disks, both
-cards and protocols.
+Almost any network interface card (NIC) supported by the Linux kernel
+should also be supported by the installation system; modular drivers
+should normally be loaded automatically.
 -->
-ۤȤɤ PCI ͥåȥɤȡθŤ ISA ͥåȥɤ
-ݡȤƤޤ
-ۤȤɤ Debian 󥹥ȡǥǤϡ
-ʲΥͥåȥ󥿡եɤݡȤƤޤ
-AX.25 ɤץȥΤΡ
-NI16510 EtherBlaster ɡ
-Schneider &amp; Koch G16 ɡ
-Zenith Z-Note ӥȥͥåȥɤǤ
-ޥͥ (MCA) ͥåȥɤϡ
-ɸΥ󥹥ȡǤϥݡȤƤޤ󤬡
-Τ <ulink url="&url-linux-mca;">Linux on MCA</ulink>
-Ǥˤʤޤ (ŤǤ)
-FDDI ͥåȥ⡢ɡץȥȤ˥󥹥ȡǥǤ
-ݡȤƤޤ
+Linux ͥ뤬ݡȤƤ ͥåȥ󥿡ե (NIC) ϡ
+ۤȤɥ󥹥ȡ륷ƥǥݡȤƤޤ
+ɥ饤Х⥸塼ϡ̾KưŪɤ߹ޤޤ
 
-<!-- missing-doc FIXME You can create a custom kernel which supports an
-otherwise unsupported card and then substitute in the installer (see
-<xref linkend="rescue-replace-kernel"/>). -->
-<!-- missing-doc FIXME 
-ݡȤƤʤɤ򥵥ݡȤ̤Υͥ
-󥹥ȡ֤뤳ȤϲǽǤ
-(<xref linkend="rescue-replace-kernel"/> )-->
-
-</para><para arch="x86">
-
 <!--
-As for ISDN, the D-channel protocol for the (old) German 1TR6 is not
-supported; Spellcaster BRI ISDN boards are also not supported by the
-&d-i;.
+<phrase arch="x86">This includes most PCI and PCMCIA cards.</phrase>
+<phrase arch="i386">Many older ISA cards are supported as well.</phrase>
 -->
-ISDN ˴ؤƤϡ(Ť) German 1TR6 Ѥ D ͥץȥ
-ϥݡȤƤ餺Spellcaster BRI ISDN ܡɤ &d-i; Ǥ
-ݡȤƤޤ
+<phrase arch="x86">ˤϡ
+ۤȤɤ PCI ɤ PCMCIA ɤޤޤޤ</phrase>
+<phrase arch="i386">¿θŤ ISA ɤ
+ȥݡȤƤޤ</phrase>
 
-</para>
-
-<para arch="m68k">
-
 <!--
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module. Again, see
-<ulink url="&url-m68k-faq;"></ulink> for complete details.
+<phrase arch="m68k">Again, see <ulink url="&url-m68k-faq;"></ulink>
+for complete details.</phrase>
 -->
-Linux ͥ뤬ݡȤƤ뤹٤ƤΥͥåȥ󥿡ե
-(NIC) ưǥˤƤ⥵ݡȤƤޤ
-ȤΥͥåȥɥ饤Ф⥸塼ȤƥɤɬפǤ礦
-ܺ٤ˤĤƤϡ<ulink url="&url-m68k-faq;"></ulink> ⤦٤
+<phrase arch="m68k">ʾܺ٤ϡ⤦ <ulink url="&url-m68k-faq;"></ulink>
+</phrase>
 
-</para>
+</para><para arch="sparc">
 
-<para arch="sparc">
-
 <!--
-The following network interface cards (NICs) are supported from the bootable
-kernel directly:
+This includes a lot of generic PCI cards (for systems that have PCI) and
+the following NICs from Sun:
 -->
-ʲΥͥåȥ󥿡ե (NIC) ϡ
-ưѥͥľܥݡȤƤޤ
+ΰŪ PCI  (PCI ĥƥ) 䡢
+ʲΤ褦 Sun  NIC ޤޤޤ
 
 <itemizedlist>
- <listitem><para>
+<listitem><para>
 
 Sun LANCE
 
-
 </para></listitem>
- <listitem><para>
+<listitem><para>
 
 Sun Happy Meal
 
-
 </para></listitem>
-</itemizedlist>
+<listitem><para>
 
-</para><para arch="sparc">
-
-<!--
-The following network interface cards are supported as modules.  They
-can be enabled once the drivers are installed during the setup.
-However, due to the magic of OpenPROM, you still should be able to
-boot from these devices:
--->
-ʲΥͥåȥ󥿡եɤϡ
-⥸塼ȤƥݡȤƤޤ
-ΥǥХϡåȥå˥ɥ饤Ф򥤥󥹥ȡ뤹뤳Ȥ
-ѤǤ褦ˤʤޤ
-OpenPROM ˡȤС
-ΥǥХ鵯ư뤳ȤǤϤǤ
-
-<itemizedlist>
- <listitem><para>
-
 Sun BigMAC
 
-
 </para></listitem>
- <listitem><para>
+<listitem><para>
 
 Sun QuadEthernet
 
 </para></listitem>
- <listitem><para>
+<listitem><para>
 
 MyriCOM Gigabit Ethernet
 
 </para></listitem>
 </itemizedlist>
 
-</para><para arch="alpha">
-
-<!--
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
--->
-Linux ͥ뤬ݡȤƤ뤹٤ƤΥͥåȥ󥿡ե
-(NIC) ưǥˤƤ⥵ݡȤƤޤ
-ͥåȥɥ饤Ф⥸塼ȤƥɤɬפǤ礦
-
-</para><para arch="powerpc">
-
-<!--
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
--->
-Linux ͥ뤬ݡȤƤ뤹٤ƤΥͥåȥ󥿡ե
-(NIC) ưǥˤƤ⥵ݡȤƤޤ
-Ȥˤʤͥåȥɥ饤Ф⥸塼Ȥƥɤɬפ
-Ǥ礦
-
-</para><para arch="hppa">
-<!--
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
--->
-Linux ͥ뤬ݡȤƤ뤹٤ƤΥͥåȥ󥿡ե
-(NIC) ưǥˤƤ⥵ݡȤƤޤ
-Ȥˤʤͥåȥɥ饤Ф
-⥸塼ȤƥɤɬפǤ礦
-
-</para><para arch="ia64">
-
-<!--
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
--->
-Linux ͥ뤬ݡȤƤ뤹٤ƤΥͥåȥ󥿡ե
-(NIC) ưǥˤƤ⥵ݡȤƤޤ
-Ȥˤʤͥåȥɥ饤Ф
-⥸塼ȤƥɤɬפǤ礦
-
-</para><para arch="mips">
-
-<!--
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
--->
-Linux ͥ뤬ݡȤƤ뤹٤ƤΥͥåȥ󥿡ե
-(NIC) ưǥˤƤ⥵ݡȤƤޤ
-Ȥˤʤͥåȥɥ饤Ф
-⥸塼ȤƥɤɬפǤ礦
-
 </para><para arch="mipsel">
 
 <!--
@@ -202,16 +85,9 @@
 </para><para arch="s390">
 
 <!--
-Any network interface card (NIC) supported by the Linux kernel is
-also be supported by the boot disks.  All network drivers are compiled
-as modules so you need to load one first during the initial network
-setup. The list of supported network devices is:
+The list of supported network devices is:
 -->
-Linux ͥ뤬ݡȤƤ뤹٤ƤΥͥåȥ󥿡ե
-(NIC) ưǥˤƤ⥵ݡȤƤޤ
-ƤΥͥåȥɥ饤Фϡ⥸塼Ȥƥѥ뤵ƤޤΤǡ
-ǽΥͥåȥåȥåפɬפʤΤɤǤޤ
-ʲݡȤͥåȥǥХΥꥹȤǤ
+ʲ˥ݡȤƤͥåȥǥХ󤲤ޤ
 
 <itemizedlist>
  <listitem><para>
@@ -233,14 +109,6 @@
 <listitem><para>
 
 <!--
-Inter-User Communication Vehicle (IUCV) &mdash; available for VM guests only
--->
-Inter-User Communication Vehicle (IUCV) &mdash; VM ȤΤͭ
-
-</para></listitem>
-<listitem><para>
-
-<!--
 OSA-Express in QDIO mode, HiperSockets and Guest-LANs
 -->
 QDIO ⡼ɤ OSA-Express, HiperSockets, Guest-LAN
@@ -253,77 +121,225 @@
 <para arch="arm">
 
 <!--
-The following network interface cards are supported directly by the
-boot disks on Netwinder and CATS machines:
+On &arch-title;, most built-in Ethernet devices are supported and modules
+for additional PCI and USB devices are provided.  The major exception is
+the IXP4xx platform (featuring devices such as the Linksys NSLU2) which
+needs a proprietary microcode for the operation of its built-in Ethernet
+device.  Unofficial images for Linksys NSLU2 with this proprietary
+microcode can be obtained from the <ulink
+url="&url-slug-firmware;">Slug-Firmware site</ulink>.
 -->
-ʲΥͥåȥ󥿡եɤ Netwinder  CATS ޥѤ
-ưǥľܥݡȤƤޤ
+&arch-title; ǤϡۤȤɤ¢ͥåȥǥХ򥵥ݡȤƤꡢ
+ɲä PCIUSB ǥХΥ⥸塼󶡤Ƥޤ
+㳰ϡ¢ͥåȥǥХΤˡ
+ץץ饨ޥɤɬפʡ
+(Linksys NSLU2 ʤɤΥǥХħ) IXP4xx ץåȥեǤ
+ ץץ饨ޥɤ Linksys NSLU2 Ѥ᡼ϡ
+<ulink url="&url-slug-firmware;">Slug-Firmware site</ulink> Ǽޤ
 
-<itemizedlist>
- <listitem><para>
+</para><para arch="x86">
 
-    PCI ١ NE2000
+<!--
+As for ISDN, the D-channel protocol for the (old) German 1TR6 is not
+supported; Spellcaster BRI ISDN boards are also not supported by the
+&d-i;. Using ISDN during the installation is not supported.
+-->
+ISDN Ǥϡ(Ť) ɥĤ 1TR6  D ͥϥݡȤƤޤ
+Spellcaster BRI ISDN ܡɤ &d-i; ǤϥݡȤƤޤ
+ISDN  󥹥ȡ˻ѤΤϥݡȤƤޤ
 
+</para>
 
-</para></listitem>
- <listitem><para>
+  <sect2 arch="not-s390" id="nics-firmware">
+<!--
+  <title>Drivers Requiring Firmware</title>
+-->
+  <title>ե०ɬפʥɥ饤</title>
+<para>
 
-    DECchip Tulip
+<!--
+The installation system currently does not support retrieving firmware.
+This means that any network cards that use a driver that requires firmware
+to be loaded, is not supported by default.
+-->
+󥹥ȡ륷ƥϡߥե०μ򥵥ݡȤƤޤ
+Τᡢ
+ե०ɤ߹ɬפɥ饤ФѤͥåȥɤϡ
+ǥեȤǤϥݡȤƤޤ
 
-</para></listitem>
-</itemizedlist>
+</para><para>
 
-</para><para arch="arm">
+<!--
+If there is no other NIC you can use during the installation, it is still
+possible to install &debian; using a full CD-ROM or DVD image. Select the
+option to not configure a network and install using only the packages
+available from the CD/DVD. You can then install the driver and firmware you
+need after the installation is completed (after the reboot) and configure
+your network manually. Note that the firmware may be packaged separately
+from the driver and may not be available in the <quote>main</quote> section
+of the &debian; archive.
+-->
+󥹥ȡδ֤˻ѤǤ롢¾ NIC ʤǤ⡢
+ե륵 CD-ROMDVD ᡼Ѥơ&debian; 򥤥󥹥ȡǤޤ
+ͥåȥꤻ
+CD/DVD ͭʥѥåǥ󥹥ȡԤץ򤷤Ƥ
+ɬפǤС󥹥ȡ뤬λ (Ƶư) ˡ
+ɥ饤Фե०Υ󥹥ȡԤȤǤ
+ͥåȥưǹԤäƤ
+ե०ϡɥ饤Фʬ䤵Ƥꡢ&debian; ֤ 
+<quote>main</quote> ˤʤ⤷ʤȤդƤ
 
+</para><para>
+
 <!--
-The following network interface cards are supported directly by the
-boot disks on RiscPCs:
+If the driver itself <emphasis>is</emphasis> supported, you may also be
+able to use the NIC during installation by copying the firmware from some
+medium to <filename>/usr/lib/hotplug/firmware</filename>. Don't forget to
+also copy the firmware to that location for the installed system before
+the reboot at the end of the installation.
 -->
-ʲΥͥåȥ󥿡եɤ RiscPC Ѥεưǥ
-ľܥݡȤƤޤ
+ɥ饤м<emphasis></emphasis>ݡȤƤ硢
+ե०򤤤줫Υǥ 
+<filename>/usr/lib/hotplug/firmware</filename> ˥ԡơ
+󥹥ȡ NIC ѤǤ褦ˤǤǤ礦
+ե०Υԡ򡢥󥹥ȡκǸǺƵưˡ
+󥹥ȡԤäƥƱؤԤΤ˺ʤǤ
 
-<itemizedlist>
- <listitem><para>
+</para>
+  </sect2>
 
-    Ether1
+  <sect2 condition="supports-wireless" id="nics-wireless">
+<!--
+  <title>Wireless Network Cards</title>
+-->
+  <title>磻쥹ͥåȥ</title>
+<para>
 
-</para></listitem>
- <listitem><para>
+<!--
+Wireless NICs are in general supported as well, with one big proviso.
+A lot of wireless adapters require drivers that are either non-free or have
+not been accepted into the official Linux kernel. These NICs can generally
+be made to work under &debian;, but are not supported during the installation.
+-->
+̾磻쥹 NIC ϡ礭âդǡ褯ݡȤƤޤ
+¿Υ磻쥹ץϡnon-free ʥɥ饤Фɬפ
+ Linux ͥ˼ʤɥ饤ФɬפǤ
+Τ褦 NIC  &debian; ưޤ
+󥹥ȡδ֤ϥݡȤƤޤ
 
-    Ether3
+</para><para>
 
-</para></listitem>
- <listitem><para>
+<!--
+If there is no other NIC you can use during the installation, it is still
+possible to install &debian; using a full CD-ROM or DVD image. Use the same
+procedure as described above for NICs that require firmware.
+-->
+󥹥ȡδ֤˻ѤǤ롢¾ NIC ʤǤ⡢
+ե륵 CD-ROMDVD ᡼Ѥơ&debian; 򥤥󥹥ȡǤޤ
+ҤΥե०ɬפ NIC ƤΤȡ
+ƱǹԤäƤ
 
-    EtherH
+</para><para>
 
-</para></listitem>
-</itemizedlist>
+<!--
+In some cases the driver you need may not be available as a Debian package.
+You will then have to look if there is source code available in the internet
+and compile the driver yourself. How to do this is outside the scope of this
+manual.
+<phrase arch="x86">If no Linux driver is available, your last resort is to
+use the <classname>ndiswrapper</classname> package, which allows you to use
+a Windows driver.</phrase>
+-->
+Ĥξ硢ɬפʥɥ饤Ф 
+Debian ѥåȤѤǤʤȤޤ
+ξ硢󥿡ͥåȤѤǤ륽ɤ뤫ɤõ
+ʬǥɥ饤Ф򥳥ѥ뤹ɬפǤ礦
+ɤΤ褦˹ԤϤΥޥ˥奢Ǥϰޤ
+<phrase arch="x86">ѤǤ Linux Υɥ饤Фʤ硢
+ǸγڱϡWindows Υɥ饤ФѤǤ 
+<classname>ndiswrapper</classname> ѥåǤ</phrase>
 
-</para><para arch="arm">
+</para>
+  </sect2>
 
+  <sect2 arch="sparc" id="nics-sparc-trouble">
 <!--
-If your card is mentioned in the lists above, the complete installation
-can be carried out from the network with no need for CD-ROMs or floppy
-disks.
+  <title>Known Issues for &arch-title;</title>
 -->
-嵭ΥꥹȤˤʤΥɤϡͥåȥ
-󥹥ȡԤޤCD-ROM եåԡǥɬפޤ
+  <title>&arch-title; ФΤ</title>
+<para>
 
-</para><para arch="arm">
+<!--
+There are a couple of issues with specific network cards that are worth
+mentioning here.
+-->
+ʲˤƸڤΥͥåȥɤˤϡ
+2, 3 ꤬ޤ
 
+</para>
+
 <!--
-Any other network interface card (NIC) supported by the Linux kernel
-should also be supported by the boot disks.  You may need to load your
-network driver as a module; this means that you will have to install
-the operating system kernel and modules using some other media.
+   <sect3><title>Conflict between tulip and dfme drivers</title>
 -->
-Linux ͥ뤬ݡȤƤ뤹٤ƤΥͥåȥ󥿡ե
-(NIC) ưǥˤƤ⥵ݡȤƤޤ
-ͥåȥɥ饤Ф⥸塼Ȥƥɤɬפ뤫⤷ޤ
-̤ΥǥȤäƴܥƥΥͥȥ⥸塼
-󥹥ȡ뤹ɬפ뤫⤷ʤȤȤǤ
+   <sect3><title>tulip ɥ饤Ф dfme ɥ饤Фζ</title>
+<!-- BTS: #334104; may also affect other arches, but most common on sparc -->
+<para>
 
+<!-- BTS: #334104; may also affect other arches, but most common on sparc -->
+<!--
+There are various PCI network cards that have the same PCI identification,
+but are supported by related, but different drivers. Some cards work with
+the <literal>tulip</literal> driver, others with the <literal>dfme</literal>
+driver. Because they have the same identification, the kernel cannot
+distinguish between them and it is not certain which driver will be loaded.
+If this happens to be the wrong one, the NIC may not work, or work badly.
+-->
+ϢƥݡȤ뤱ɤ⡢ۤʤɥ饤ФȤ褦ʡ
+Ʊ PCI ̻Ҥ͡ PCI ͥåȥɤޤ
+륫ɤ <literal>tulip</literal> ɥ饤Фưޤ
+̤Υɤ <literal>dfme</literal> ɥ饤ФưȤޤ
+ξԤƱ̻ҤäƤȡͥˤϸʬĤ
+ɤΥɥ饤Фɤ߹फǤޤ
+ְäʪɤ߹硢NIC ưʤưޤ
+
+</para><para>
+
+<!--
+This is a common problem on Netra systems with a Davicom (DEC-Tulip
+compatible) NIC. In that case the <literal>tulip</literal> driver is
+probably the correct one.
+
+During the installation the solution is to switch to a shell and unload the
+wrong driver module using
+<userinput>modprobe -r <replaceable>module</replaceable></userinput> (or
+both, if they are both loaded). After that you can load the correct module
+using <userinput>modprobe <replaceable>module</replaceable></userinput>.
+-->
+ϡDavicom (DEC-Tulip ߴ) NIC Ѥ Netra ƥඦ̤Ǥ
+ξ硢餯 <literal>tulip</literal> ɥ饤ФʪǤ
+
+󥹥ȡβȤƤϡ
+<userinput>modprobe -r <replaceable>module</replaceable></userinput> Ȥơ
+ְäɥ饤Х⥸塼 (ξɤ߹ޤƤξ) 
+곰Ƥ
+θ塢<userinput>modprobe <replaceable>module</replaceable></userinput> ǡ
+ʪɤ߹Ǥ
+
 </para>
+   </sect3>
 
+   <sect3><title>Sun B100 blade</title>
+<!-- BTS: #384549; should be checked for kernels >2.6.18 -->
+<para>
+
+<!--
+The <literal>cassini</literal> network driver does not work with Sun B100
+blade systems.
+-->
+Sun B100 blade ƥǤ <literal>cassini</literal> 
+ͥåȥɥ饤Фưޤ
+
+</para>
+   </sect3>
+  </sect2>
  </sect1>
Index: ja/hardware/supported/i386.xml
===================================================================
--- ja/hardware/supported/i386.xml	(ӥ 43857)
+++ ja/hardware/supported/i386.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43254 -->
+<!-- original version: 43730 -->
 
 
   <sect2 arch="i386"><title>CPUޥܡɡӥǥΥݡ</title>
@@ -23,26 +23,26 @@
 <!--
 Nearly all x86-based (IA-32) processors still in use in personal computers
 are supported, including all varieties of Intel's "Pentium" series.
-This also includes 32-bit AMD and VIA (former Cyrix) processors, and new
+This also includes 32-bit AMD and VIA (former Cyrix) processors, and
 processors like the Athlon XP and Intel P4 Xeon.
 -->
 ޤѡʥ륳ԥ塼ǻȤƤ x86 ١ (IA-32) ץå
 Intel "Pentium" ꡼Τ٤ƤѼޤᡢ
 ۤȤɤ٤Ƥ򥵥ݡȤƤޤ
-ޤAMD  VIA ( Cyrix)  32-bit ץå䡢
-Athlon XP Intel P4 Xeon Ȥäץå⥵ݡȤޤ
+ޤAMD  VIA ( Cyrix)  32 ӥå ץå䡢
+Athlon XP Intel P4 Xeon Ȥäץå⥵ݡȤƤޤ
 
 </para>
 <note><para>
 
 <!--
-If your system has a 64-bit AMD64, Intel EM64T or Intel Core 2 Duo processor,
+If your system has a 64-bit processor from the AMD64 or Intel EM64T families,
 you will probably want to use the installer for the amd64 architecture instead
 of the installer for the (32-bit) i386 architecture.
 -->
-ƥ 64-bit AMD64, Intel EM64T, Intel Core 2 Duo ץå
-ȤƤʤ顢
-餯 (32-bit) i386 ƥѥ󥹥ȡǤϤʤ
+ƥ AMD64,  Intel EM64T եߥȤä
+64 ӥåȥץåȤƤʤ顢
+餯 (32 ӥå) i386 ƥѥ󥹥ȡǤϤʤ
 amd64 ƥѥ󥹥ȡѤǤ礦
 
 </para></note>
@@ -50,15 +50,15 @@
 
 <!--
 However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
-on 386 or earlier processors.  Despite the architecture name "i386", Debian
-Sarge has <emphasis>dropped support</emphasis> for actual 80386 processors
-(and their clones), which were supported by earlier releases<footnote>
+on 386 or earlier processors.  Despite the architecture name "i386", support
+for actual 80386 processors (and their clones) was dropped with the Sarge
+(r3.1) release of Debian<footnote>
 -->
  Debian GNU/Linux &releasename; ϡ
 386 ΥץåǤ<emphasis>ưޤ</emphasis>
-ƥ̾ "i386" Ǥˤؤ餺Sarge ϡ
-Υ꡼ǤϥݡȤƤ 80386 ץå (ȤΥ) 
-<emphasis>ݡȤǤڤޤ</emphasis><footnote>
+ƥ̾ "i386" Ǥˤؤ餺
+ºݤ 80386 ץå (ȤΥ) ΥݡȤϡ
+Debian  Sarge (r3.1) ꡼Ǥڤޤ<footnote>
 
 <para>
 <!--
Index: ja/hardware/supported/arm.xml
===================================================================
--- ja/hardware/supported/arm.xml	(ӥ 43857)
+++ ja/hardware/supported/arm.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43031 -->
+<!-- original version: 43693 -->
 
 
   <sect2 arch="arm"><title>CPUޥܡɡӥǥΥݡ</title>
@@ -75,13 +75,16 @@
 to data storage and processing.  Debian currently supports the IOP32x
 platform, featuring the IOP 80219 and 32x chips commonly found in Network
 Attached Storage (NAS) devices.  Debian explicitly supports two such
-devices: the GLAN Tank from IO-Data and the Thecus N2100.
+devices: the <ulink url="&url-arm-cyrius-glantank;">GLAN Tank</ulink> from
+IO-Data and the <ulink url="&url-arm-cyrius-n2100;">Thecus N2100</ulink>.
 -->
 Intel  I/O ץå (IOP) 饤ϡ
 ǡΥȥ졼ץå󥰤˴طʤο¸ߤޤ
 Debian Ǥϸߡͥåȥ³ȥ졼 (NAS) ǥХˤ褯ȤƤ롢
 IOP 80219  32x åפȤä IOP32x ץåȥե򥵥ݡȤƤޤ
-Debian μ¤˥ݡȤƤΤϡIO-Data  GLAN Tank  Thecus N2100 
+Debian μ¤˥ݡȤƤΤϡ
+IO-Data  <ulink url="&url-arm-cyrius-glantank;">GLAN Tank</ulink>  
+<ulink url="&url-arm-cyrius-n2100;">Thecus N2100</ulink> 
  2 ĤΥǥХǤ
 
 
@@ -98,13 +101,16 @@
 The Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives) is a small
 device which allows you to easily provide storage via the network.  It
 comes with an Ethernet connection and two USB ports to which hard drives
-can be connected.
+can be connected.  There is an external site with <ulink
+url="&url-arm-cyrius-nslu2;">installation instructions</ulink>.
 -->
 IXP4xx ץåȥեϡIntel  XScale ARM 򸵤ˤƤޤ
 ߡLinksys NSLU2 Ȥ IXP4xx ١ƥΤߥݡȤƤޤ
 Linksys NSLU2 (Network Storage Link for USB 2.0 ǥɥ饤) ϡ
 ͥåȥȥ졼ñ󶡤뾮ǥХǤͥå³ȡ
 ϡɥǥɥ饤֤³ USB ݡȤ 2 Ƥޤ
+<ulink url="&url-arm-cyrius-nslu2;">installation instructions</ulink> 
+ȤȤޤ
 
 </para></listitem>
 </varlistentry>
Index: ja/hardware/installation-media.xml
===================================================================
--- ja/hardware/installation-media.xml	(ӥ 43857)
+++ ja/hardware/installation-media.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 41881 -->
+<!-- original version: 43773 -->
 
  <sect1 id="installation-media">
  <title>󥹥ȡѤǤǥ</title>
@@ -291,18 +291,42 @@
 </para>
   </sect2>
 
+<!--
+  <sect2><title>Network</title>
+-->
   <sect2><title>ͥåȥ</title>
 
-<para condition="supports-tftp">
+<para>
 
 <!--
-You can also <emphasis>boot</emphasis> your system over the network.
-<phrase arch="mips">This is the preferred installation technique for
-Mips.</phrase>
+The network can be used during the installation to retrieve files needed
+for the installation. Whether the network is used or not depends on the
+installation method you choose and your answers to certain questions that
+will be asked during the installation. The installation system supports
+most types of network connections (including PPPoE, but not ISDN or PPP),
+via either HTTP or FTP. After the installation is completed, you can also
+configure your system to use ISDN and PPP.
 -->
-ޤͥåȥۤ˥ƥ<emphasis>ư</emphasis>뤳ȤǤޤ
-<phrase arch="mips">Mips ǤϤ줬ޤǤ礦</phrase>
+󥹥ȡɬפʥե򥤥󥹥ȡ˼Τˡ
+ͥåȥѤǤޤ
+ͥåȥѤ뤫ɤϡʤ򤷤󥹥ȡˡȡ
+󥹥ȡμؤ˰¸ޤ
+󥹥ȡ륷ƥϡHTTP  FTP Τɤ餫Ǥ⡢
+ͥåȥؤΤۤȤɤ³ˡ (ISDN  PPP ǤϤʤ PPPoE ޤ) 
+򥵥ݡȤƤޤ
+󥹥ȡ봰λˡISDN  PPP Ѥ褦˥ƥǤޤ
 
+</para><para condition="supports-tftp">
+
+<!--
+You can also <emphasis>boot</emphasis> the installation system over the
+network. <phrase arch="mips">This is the preferred installation technique
+for &arch-title;.</phrase>
+-->
+ޤ󥹥ȡ륷ƥ
+ͥåȥۤ<emphasis>ư</emphasis>뤳ȤǤޤ
+<phrase arch="mips">&arch-title; ǤϤ줬ޤǤ礦</phrase>
+
 </para><para condition="supports-nfsroot">
 
 <!--
@@ -313,17 +337,6 @@
 ٤ƤΥե륷ƥ NFS ǥޥȤơ
 ǥ쥹󥹥ȡ򤹤뤳ȤĤǤ
 
-</para><para>
-
-<!--
-After the operating system kernel is installed, you can install the
-rest of your system via any sort of network connection (including
-PPP after installation of the base system), via FTP or HTTP.
--->
-ڥ졼ƥ󥰥ƥΥͥ򥤥󥹥ȡ뤷 
-(ܥƥ।󥹥ȡ PPP ޤ)
-ĤΥƥ FTPHTTP ͳǥͥåȥ󥹥ȡǤޤ
-
 </para>
   </sect2>
 
@@ -333,13 +346,13 @@
 
 <!--
 If you are running another Unix-like system, you could use it to install
-&debian; without using the &d-i; described in the rest of the
+&debian; without using the &d-i; described in the rest of this
 manual. This kind of install may be useful for users with otherwise
 unsupported hardware or on hosts which can't afford downtime.  If you
 are interested in this technique, skip to the <xref
 linkend="linux-upgrade"/>.
 -->
-¾ Unix 饤ƥबƯƤСΥޥ˥奢λĤƤ 
+¾ Unix 饤ƥबƯƤСܥޥ˥奢λĤƤ 
 &d-i; Ѥʤǡ &debian; 򥤥󥹥ȡǤޤ
 Υ󥹥ȡˡʤ顢¾ˡǤϥݡȤʤϡɥ䡢
 󥿥ѰդǤʤ桼ˤȤäǤ
Index: ja/boot-installer/alpha.xml
===================================================================
--- ja/boot-installer/alpha.xml	(ӥ 43857)
+++ ja/boot-installer/alpha.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 40542 -->
+<!-- original version: 43789 -->
 
  <sect2 arch="alpha" id="alpha-firmware">
  <title>Alpha 󥽡ե०</title>
@@ -518,20 +518,41 @@
 <para>
 
 <!--
-Type
+The &debian; install CDs include several preconfigured boot options for
+VGA and serial consoles.  Type
 -->
-ʲΤ褦ϤƤ
+&debian; 󥹥ȡCDˤϡ
+VGA 󥽡䥷ꥢ륳󥽡Ѥ
+Ѥߥ֡ȥץ󤬴ޤޤƤޤ
+VGA 󥽡ǵưˤϡΤ褦ϤƤ
 
 <informalexample><screen>
 &gt;&gt;&gt; boot xxxx -flags 0
 </screen></informalexample>
 
 <!--
-where <replaceable>xxxx</replaceable> is your CD-ROM drive in SRM notation.
+to boot using VGA console, where <replaceable>xxxx</replaceable> is your
+CD-ROM drive in SRM notation.  To use serial console on the first
+serial device, type
 -->
  <replaceable>xxxx</replaceable> ˤϡ
 SRM ˤ CD-ROM ɥ饤֤θƤ̾ޤ
+ 1 ꥢǥХΥꥢ륳󥽡Ѥˤϡ
+Τ褦ϤƤ
 
+<informalexample><screen>
+&gt;&gt;&gt; boot xxxx -flags 1
+</screen></informalexample>
+
+<!--
+and for console on the second serial port, type
+-->
+ 2 ꥢݡȤξϡΤ褦ˤʤޤ
+
+<informalexample><screen>
+&gt;&gt;&gt; boot xxxx -flags 2
+</screen></informalexample>
+
 </para>
   </sect2>
 
Index: ja/boot-installer/x86.xml
===================================================================
--- ja/boot-installer/x86.xml	(ӥ 43857)
+++ ja/boot-installer/x86.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42929 -->
+<!-- original version: 43730 -->
 
   <sect2 arch="x86"><title>CD-ROM εư</title>
 
@@ -144,17 +144,17 @@
 <!--
 If you intend to use the hard drive only for booting and then
 download everything over the network, you should download the
-<filename>netboot/debian-installer/i386/initrd.gz</filename> file and its
+<filename>netboot/debian-installer/&architecture;/initrd.gz</filename> file and its
 corresponding kernel
-<filename>netboot/debian-installer/i386/linux</filename>. This will allow you
+<filename>netboot/debian-installer/&architecture;/linux</filename>. This will allow you
 to repartition the hard disk from which you boot the installer, although you
 should do so with care.
 -->
 ưΤ˥ϡɥǥѤͽǡ
 ͥåȥ餹٤ƥɤΤʤ顢
-<filename>netboot/debian-installer/i386/initrd.gz</filename> 
+<filename>netboot/debian-installer/&architecture;/initrd.gz</filename> 
 եȤб륫ͥ 
-<filename>netboot/debian-installer/i386/linux</filename> 
+<filename>netboot/debian-installer/&architecture;/linux</filename> 
 ɤȤ褤Ǥ礦
 ϥ󥹥ȡưϡɥǥΥѡƥ
 ڤľȤǤޤ(դƹԤäƤ)
@@ -222,8 +222,6 @@
 image=/boot/newinstall/vmlinuz
        label=newinstall
        initrd=/boot/newinstall/initrd.gz
-       root=/dev/ram0
-       append="ramdisk_size=12000"
 </screen></informalexample>
 
 <!--
@@ -256,7 +254,7 @@
 
 <informalexample><screen>
 title  New Install
-kernel (hd0,0)/boot/newinstall/vmlinuz root=/dev/ram0 ramdisk_size=12000
+kernel (hd0,0)/boot/newinstall/vmlinuz
 initrd (hd0,0)/boot/newinstall/initrd.gz
 </screen></informalexample>
 
@@ -340,7 +338,7 @@
 argument, giving the device that the ide-floppy driver maps the device
 to. For example, if your LS-120 drive is connected as the first IDE
 device (master) on the second cable, you enter
-<userinput>linux root=/dev/hdc</userinput> at the boot prompt.
+<userinput>install root=/dev/hdc</userinput> at the boot prompt.
 -->
 եåԡΥåȤ LS-120 ɥ饤 (ATAPI ) 饤󥹥ȡ뤹ˤϡ
 եåԡǥХβ۰֤ꤹɬפޤ
@@ -348,7 +346,7 @@
 ide-floppy ɥ饤ФƤǥХꤹǹԤޤ
 㤨 LS-120 ɥ饤  2 ܤΥ֥ˡ
 ǽ IDE ǥХ (ޥ) Ȥ³ƤС
-֡ȥץץȤ <userinput>linux.bin root=/dev/hdc</userinput> Ϥޤ
+֡ȥץץȤ <userinput>install root=/dev/hdc</userinput> Ϥޤ
 
 </para><para>
 
@@ -514,15 +512,15 @@
 be useful can be found by pressing <keycap>F2</keycap> through
 <keycap>F8</keycap>. If you add any parameters to
 the boot command line, be sure to type the boot method (the default is
-<userinput>linux</userinput>) and a space before the first parameter (e.g.,
-<userinput>linux fb=false</userinput>).
+<userinput>install</userinput>) and a space before the first parameter (e.g.,
+<userinput>install fb=false</userinput>).
 -->
 ͭʵưˡ䵯ưѥ᡼ͭѤʾ<keycap>F2</keycap> 
 <keycap>F8</keycap> 򲡤ɽޤ
 ѥ᡼ưޥɥ饤ɲäˤϡ
-ưˡ (ǥեȤ <userinput>linux</userinput>) 򥿥פ
+ưˡ (ǥեȤ <userinput>install</userinput>) 򥿥פ
 ǽΥѥ᡼˥ڡƤ
-(: <userinput>linux fb=false</userinput>)
+(: <userinput>install fb=false</userinput>)
 
 <note><para>
 
Index: ja/boot-installer/s390.xml
===================================================================
--- ja/boot-installer/s390.xml	(ӥ 43857)
+++ ja/boot-installer/s390.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 40811 -->
+<!-- original version: 43745 -->
 
   <sect2 arch="s390"><title>s390 </title>
 <para>
@@ -36,15 +36,24 @@
 
 <!--
 On S/390 you can append boot parameters in the parm file.  This file can
-either be in ASCII or EBCDIC format.  Please read
-<ulink url="&url-s390-devices;">Device Drivers and Installation Commands</ulink>
-for more information about S/390-specific boot parameters.
+either be in ASCII or EBCDIC format.
+A sample parm file <filename>parmfile.debian</filename> is provided with
+the installation images.
 -->
 S/390 Ǥϡ֡ȥѥ᡼ parm եɲäޤ
 Υե ASCII ޤ EBCDIC եޥåȤˤޤ
+ѥ᡼ϡ󥹥ȡ륤᡼ <filename>parmfile.debian</filename> 
+󶡤Ƥޤ
+
+<!-- Link is bad; commented out for now
+Please read
+<ulink url="&url-s390-devices;">Device Drivers and Installation Commands</ulink>
+for more information about S/390-specific boot parameters.
 S/390 ͭΥ֡ȥѥ᡼˴ؤܺ٤ϡ
 <ulink url="&url-s390-devices;">Device Drivers and Installation Commands</ulink>
-򸫤Ƥ
+
+-->
 
+
 </para>
   </sect2>
Index: ja/boot-installer/boot-installer.xml
===================================================================
--- ja/boot-installer/boot-installer.xml	(ӥ 43857)
+++ ja/boot-installer/boot-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: 43782 -->
 
 <chapter id="boot-installer"><title>󥹥ȡ륷ƥεư</title>
 
@@ -13,6 +13,17 @@
 <!-- structure inside out for this chapter. Each arch has a document. -->
 <!-- Note: archs hppa and mipsel are currently missing -->
 
+<note condition="gtk"><para>
+
+<!--
+For information on how to boot the graphical installer, see
+<xref linkend="graphical"/>.
+-->
+ե륤󥹥ȡǵưˡϡ
+<xref linkend="graphical"/> 
+
+</para></note>
+
 &boot-installer-alpha.xml;
 &boot-installer-arm.xml;
 <!-- &boot-installer-hppa.xml; -->
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml	(ӥ 43857)
+++ 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: 43675 -->
+<!-- original version: 43730 -->
 
  <sect1 id="boot-parms"><title>֡ȥѥ᡼</title>
 <para>
@@ -570,15 +570,18 @@
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry arch="alpha;m68k;mips;mipsel">
 <term>ramdisk_size</term>
 <listitem><para>
 
 <!--
-If you are using a 2.2.x kernel, you may need to set &ramdisksize;.
+This parameter should already be set to a correct value where needed;
+set it only it you see errors during the boot that indicate the ramdisk
+could not be loaded completely. The value is in kB.
 -->
-2.2.x ͥѤΤʤ顢
-&ramdisksize; ꤹɬפ뤫⤷ޤ
+Υѥ᡼ɬפʾϡǤͤꤵƤϤǤ
+ξǡRAM ǥ˥ɤ줺˵ư˼ԤΤߡ
+ꤷƤͤ kB ǻꤷƤ
 
 </para></listitem>
 </varlistentry>
Index: ja/boot-installer/ia64.xml
===================================================================
--- ja/boot-installer/ia64.xml	(ӥ 43857)
+++ ja/boot-installer/ia64.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43255 -->
+<!-- original version: 43841 -->
 
   <sect2 arch="ia64"><title>CD-ROM εư</title>
 
@@ -587,7 +587,7 @@
 The EFI Boot Manager can load and start programs from a server on
 the network.
 Once the installation kernel is loaded and starts, the system install
-will proceed thru the same steps as the CD install with the exception
+will proceed through the same steps as the CD install with the exception
 that the packages of the base install will be loaded from the network
 rather than the CD drive.
 -->
Index: ja/boot-installer/sparc.xml
===================================================================
--- ja/boot-installer/sparc.xml	(ӥ 43857)
+++ ja/boot-installer/sparc.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 43841 -->
 
   <sect2 arch="sparc" id="boot-tftp"><title>TFTP Ǥεư</title>
 
@@ -15,9 +15,7 @@
 Use the command <userinput>boot net</userinput> to boot from a TFTP
 and RARP server, or try <userinput>boot net:bootp</userinput> or
 <userinput>boot net:dhcp</userinput> to boot from a TFTP and BOOTP
-or DHCP server. Some older OpenBoot revisions require using
-the device name, such as <userinput>boot le()</userinput>; these
-probably don't support BOOTP nor DHCP.
+or DHCP server.
 -->
 OpenBoot ΥޥǤϡ
 ñ˥󥹥ȡоݤΥޥǥ֡ȥ˥äƤ
@@ -27,9 +25,6 @@
 TFTP  BOOTP Ф TFTP  DHCP Ф鵯ưˤϡ
 <userinput>boot net:bootp</userinput>  
 <userinput>boot net:dhcp</userinput> ȤޥɤƤ
-OpenBoot Υӥ󤬸Ťȡ<userinput>boot le()</userinput>
-Τ褦˥ǥХ̾Ȥɬפ⤢ޤ
-Ϥ֤ BOOTP  DHCP ⥵ݡȤʤǤ礦
 
 </para>
   </sect2>
@@ -44,30 +39,44 @@
 <!--
 Most OpenBoot versions support the <userinput>boot cdrom</userinput>
 command which is simply an alias to boot from the SCSI device on ID 6
-(or the secondary master for IDE based systems). You may have to use
-the actual device name for older OpenBoot versions that don't support
-this special command. Note that some problems have been reported on Sun4m
-(e.g., Sparc 10s and Sparc 20s) systems booting from CD-ROM.
+(or the secondary master for IDE based systems).
 -->
 OpenBoot ΤۤȤɤΥС
 <userinput>boot cdrom</userinput> ޥɤ򥵥ݡȤƤޤ
 ñ ID 6  SCSI ǥХ (뤤 IDE ١Υƥʤ
 Υޥ) 鵯ư衢Ȥ̿̾Ǥ
 üʥޥɤ򥵥ݡȤƤʤ褦ʡ
-OpenBoot θŤСǤϡ
-ºݤΥǥХ̾Ѥɬפ뤫⤷ޤ
-Sun4m (: Sparc 10s  Sparc 20s) ƥǤϡ
-CD-ROM εưǡĤ꤬𤵤Ƥ뤳ȤդƤ
 
 </para>
   </sect2>
 
 
   <sect2 arch="sparc" condition="supports-floppy-boot">
+<!--
+  <title>Booting from Floppies</title>
+-->
   <title>եåԡεư</title>
 <para>
 
 <!--
+Floppy images are currently only available for sparc32, but, for technical
+reasons, not for official releases. (The reason is that they can only be
+built as root, which is not supported by our build daemons.)
+Look under <quote>daily built images</quote> on the
+<ulink url="&url-d-i;">Debian Installer project website</ulink> for links
+to floppy images for sparc32.
+-->
+եåԡ᡼ϡ sparc32 ǤѤǤޤ
+ޤŪǸ꡼˴ޤޤƤޤ
+(ϥեåԡ᡼ root ǤӥɤǤ
+䤿ΥӥɥǡǤϥݡȤƤʤǤ)
+sparc32 ѤΥեåԡ᡼ؤΥ󥯤ϡ
+<ulink url="&url-d-i;">Debian Installer project website</ulink>  
+<quote>daily built images</quote> ˤޤ
+
+</para><para>
+
+<!--
 To boot from floppy on a Sparc, use
 
 <informalexample><screen>
@@ -86,8 +95,6 @@
 Be warned that the newer Sun4u (ultra) architecture does not support
 floppy booting. A typical error message is <computeroutput>Bad magic
 number in disk label - Can't open disk label package</computeroutput>.
-Furthermore, a number of Sun4c models (such as the IPX) do not support
-the compressed images found on the disks, so also are not supported.
 -->
 դƤۤΤǤ
  Sun4u (ultra) ƥ
@@ -95,9 +102,6 @@
 Ūʥ顼åϡ<computeroutput>Bad magic
 number in disk label - Can't open disk label package</computeroutput>
 Ȥʤޤ
- Sun4c ǥ¿ (IPX ʤ) ϡ
-ǥΰ̥᡼򥵥ݡȤƤ餺
-äƵư⥵ݡȤƤޤ
 
 </para><para>
 
Index: ja/boot-installer/trouble.xml
===================================================================
--- ja/boot-installer/trouble.xml	(ӥ 43857)
+++ 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: 43514 -->
+<!-- original version: 43730 -->
 
  <sect1 id="boot-troubleshooting">
  <title>󥹥ȡץΥȥ֥륷塼ƥ</title>
@@ -456,19 +456,6 @@
 </para><para>
 
 <!--
-If you are booting with your own kernel instead of the one supplied
-with the installer, be sure that <userinput>CONFIG_DEVFS</userinput> is set in
-your kernel.  The installer requires
-<userinput>CONFIG_DEVFS</userinput>.
--->
-󥹥ȡ餫Ϳ줿ͥǤϤʤ
-ʬǺäͥ뤫鵯ưϡ
-<userinput>CONFIG_DEVFS</userinput> ꤵƤ뤳ȤǧƤ
-Υ󥹥ȡˤ <userinput>CONFIG_DEVFS</userinput> ɬפǤ
-
-</para><para>
-
-<!--
 Often, problems can be solved by removing add-ons and peripherals, and
 then trying booting again.  <phrase arch="x86">Internal modems, sound
 cards, and Plug-n-Play devices can be especially problematic.</phrase>
@@ -633,7 +620,7 @@
 
    <sect3>
 <!--
-   <title>System Freeze while Loading the USB Modules</title>
+   <title>System Freeze while Loading USB Modules</title>
 -->
    <title>USB ⥸塼Υƥե꡼</title>
 <para>
@@ -662,6 +649,99 @@
    </sect3>
   </sect2>
 
+  <sect2 arch="sparc" id="sparc-boot-problems">
+<!--
+  <title>Common &arch-title; Installation Problems</title>
+-->
+  <title>Ū&arch-title; 󥹥ȡ</title>
+<para>
+
+<!--
+There are some common installation problems that are worth mentioning.
+-->
+ʲڤƤ٤󥹥ȡΰŪ꤬ޤ
+
+</para>
+   <sect3>
+<!--
+   <title>Misdirected video output</title>
+-->
+   <title>ӥǥδְ㤤</title>
+<para>
+
+<!--
+It is fairly common for &arch-title; to have two video cards in one machine,
+for example an ATI card and a Sun Creator 3D. In some cases, this may result
+in the video output getting misdirected soon after the system boots. In
+typical cases, the display will only show:
+-->
+ATI ɤ Sun Creator 3D Ȥä
+1 Υޥ 2 Υӥǥɤ빽ϡ&arch-title; ˤ褯ޤ
+ξ硢ƥ൯ư˥ӥǥְ㤦ȤȤޤ
+ŵŪʥϡ
+ǥץ쥤˰ʲΥåɽʤȤäǤ
+
+<informalexample><screen>
+Remapping the kernel... done
+Booting Linux...
+</screen></informalexample>
+
+<!--
+To work around this, you can either pull out one of the video cards, or
+disable the one not used during the OpenProm boot phase using a kernel
+parameter. For example, to disable an ATI card, you should boot the
+installer with <userinput>video=atyfb:off</userinput>.
+-->
+н褹ˤϡӥǥɤȴ
+OpenProm ֡ȥեǥͥѥ᡼Ϳ
+Ѥʤɤ̵ˤƤ
+㤨СATI ɤ̵ˤˤϡ
+<userinput>video=atyfb:off</userinput> 򥤥󥹥ȡͿƵưƤ
+
+</para><para>
+
+<!--
+Note that you may also have to manually add this parameter to the silo
+configuration (edit <filename>/target/etc/silo.conf</filename> before
+rebooting) and, if you installed X11, modify the video driver in
+<filename>/etc/X11/xorg.conf</filename>.
+-->
+Υѥ᡼ silo ˡDzäʤФʤʤ 
+(Ƶư <filename>/target/etc/silo.conf</filename> Խ) 
+ȤդƤ
+ޤX11 򥤥󥹥ȡ뤷Ƥ硢
+<filename>/etc/X11/xorg.conf</filename> Υӥǥɥ饤ФƤ
+
+</para>
+   </sect3>
+
+   <sect3>
+<!--
+   <title>Failure to Boot or Install from CD-ROM</title>
+-->
+   <title>ư˼Ԥʤ CD-ROM 饤󥹥ȡ</title>
+<para>
+
+<!--
+Some Sparc systems are notoriously difficult to boot from CD-ROM and
+even if they do boot, there may be inexplicable failures during the
+installation. Most problems have been reported with SunBlade systems.
+-->
+Ĥ Sparc ƥϡCD-ROM 鵯ưΤ񤷤
+ưƤ⥤󥹥ȡԲIJʼԤ򤹤뤳ȤΤƤޤ
+ۤȤɤ SunBlade ƥ𤵤Ƥޤ
+
+</para><para>
+
+<!--
+We recommend to install such systems by netbooting the installer.
+-->
+Τ褦ʥƥǤϡ󥹥ȡͥåȤ鵯ưΤ򤪾ᤷޤ
+
+</para>
+   </sect3>
+  </sect2>
+
   <sect2 id="kernel-msgs">
   <title>ͥεưåΰ̣</title>
 
@@ -669,12 +749,12 @@
 
 <!--
 During the boot sequence, you may see many messages in the form
-<computeroutput>can't find <replaceable>something</replaceable>
-</computeroutput>, or <computeroutput>
-<replaceable>something</replaceable> not present</computeroutput>,
-<computeroutput>can't initialize <replaceable>something</replaceable>
-</computeroutput>, or even <computeroutput>this driver release depends
-on <replaceable>something</replaceable> </computeroutput>.
+<computeroutput>can't find <replaceable>something</replaceable></computeroutput>,
+or <computeroutput><replaceable>something</replaceable>
+not present</computeroutput>, <computeroutput>can't initialize
+<replaceable>something</replaceable></computeroutput>,
+or even <computeroutput>this driver release depends
+on <replaceable>something</replaceable></computeroutput>.
 Most of these messages are harmless. You
 see them because the kernel for the installation system is built to
 run on computers with many different peripheral devices. Obviously, no
@@ -687,14 +767,14 @@
 custom kernel later (see <xref linkend="kernel-baking"/>).
 -->
 ֡ȥ󥹤ǡ
-<computeroutput>can't find <replaceable>something</replaceable>
-</computeroutput> (Ĥʤ),
- <computeroutput><replaceable>something</replaceable> not present
-</computeroutput> (¸ߤʤ),
-<computeroutput>can't initialize <replaceable>something</replaceable>
-</computeroutput> (Ǥʤ),
-<computeroutput>this driver release depends on <replaceable>something
-</replaceable></computeroutput> (Υɥ饤Фˤϡɬפ)
+<computeroutput>can't find 
+<replaceable>something</replaceable></computeroutput> (Ĥʤ),
+ <computeroutput><replaceable>something</replaceable> 
+not present</computeroutput> (¸ߤʤ),
+<computeroutput>can't initialize 
+<replaceable>something</replaceable></computeroutput> (Ǥʤ),
+<computeroutput>this driver release depends on 
+<replaceable>something</replaceable></computeroutput> (Υɥ饤Фˤϡɬפ)
 ʤɤΥåϤ뤳Ȥޤ
 ΥåΤۤȤɤ̵Ǥ
 餬Ϥͳϡ󥹥ȡ륷ƥΥͥ뤬
@@ -775,24 +855,30 @@
 <!--
 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.
+you use an e-mail address that you do not mind being made public.
 -->
 ʤΥ󥹥ȡݡȤϡDebian Хץƥ (BTS) Ǹ졢
 ᡼󥰥ꥹȤž뤳ȤαդƤ
-ɬƤʤ E-mail ɥ쥹ѤƤ
+ɬƤʤ 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
-the command <command>reportbug installation-report</command>.
+report is to install the <classname>installation-report</classname> and
+<classname>reportbug</classname> packages
+(<command>aptitude install installation-report reportbug</command>),
+configure <classname>reportbug</classname> as explained in
+<xref linkend="mail-outgoing"/>, and run the command <command>reportbug
+installation-report</command>.
 -->
 ư Debian ƥब硢
 󥹥ȡݡȤǤñˡϰʲΤ褦ˤʤޤ
-installation-report  reportbug ѥå򥤥󥹥ȡ
-(<command>apt-get install installation-report reportbug</command>) 
+<classname>installation-report</classname>  
+<classname>reportbug</classname> ѥå򥤥󥹥ȡ
+(<command>aptitude install installation-report reportbug</command>) 
+<xref linkend="mail-outgoing"/> Ƥ褦 
+<classname>reportbug</classname> ꤷơ
 <command>reportbug installation-report</command> ¹ԤƤ
 
 </para><para>