�太郎��。
喜瀬ã�•ã‚“ã€�æ¦äº•ã�•ã‚“ã€�ã�‚りã�Œã�¨ã�†ã�”ã�–ã�„ã�¾ã�—ã�Ÿã€‚
指摘ã�®å†…容を修æ£ã�—ã�¾ã�—ã�Ÿã€‚
��申�訳��������回�メールを�信���ら�ら�訳を進�����������
改��diff��状�ファイルを添付���。
#�回���れ��るファイル�(一部)異�り��。
ja/appendix/preseed.xml
ja/using-d-i/modules/netcfg.xml
ja/using-d-i/modules/pkgsel.xml
ja/hardware/supported/arm.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-update1221.tar.gz
Description: Binary data
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml (¥ê¥Ó¥¸¥ç¥ó 43428)
+++ ja/appendix/preseed.xml (ºî¶È¥³¥Ô¡¼)
@@ -527,7 +527,7 @@
û¤¤¥¨¥¤¥ê¥¢¥¹¤¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
͸ú¤Ê¥¨¥¤¥ê¥¢¥¹¤Ï¡¢ËÜ¥µ¥ó¥×¥ëÆâ¤Ç´°Á´¤ÊÊÑ¿ô̾¤ÎÂå¤ï¤ê¤Ë»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£
ÆÃ¤Ë¡¢<literal>preseed/url</literal> ÊÑ¿ô¤Ë¤Ï <literal>url</literal>
-¤È¤¤¤¦¥¨¥¤¥ê¥¢¥¹¤¬¤¢¤ê¡¢Ã»¤¤ URL ¤¬»È¤¨¤ë¤³¤È¤Î¤è¤ëµ»¤¬¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹¡£
+¤È¤¤¤¦¥¨¥¤¥ê¥¢¥¹¤¬¤¢¤ê¡¢Ã»¤¤ URL ¤¬»È¤¨¤ë¤³¤È¤Ë¤è¤ëµ»¤¬¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹¡£
¤â¤¦°ì¤Ä¡¢<literal>tasks</literal> ¤È¤¤¤¦¥¨¥¤¥ê¥¢¥¹¤¬¤¢¤ê¡¢
¤³¤ì¤Ï <literal>tasksel:tasksel/first</literal> ¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
@@ -618,7 +618,7 @@
setup, it would result in the preseed file being retrieved from
<literal>http://autoserver.example.com/d-i/etch/./preseed.cfg</literal>.
-->
-¤³¤ì¤Ï¡¢DNS ¤Ç <literal>autoserver</literal> ¤Î̾Á°²ò·è¤Ç¤
+¤³¤ì¤Ï¡¢DNS ¤Ç <literal>autoserver</literal> ¤Î̾Á°²ò·è¤¬¤Ç¤
(¤ª¤½¤é¤¯ DHCP ¤Ç¥í¡¼¥«¥ë¥É¥á¥¤¥óÄɲøå)¡¢
¤½¤Î¥Þ¥·¥ó¤¬ DHCP ¥µ¡¼¥Ð¤Ç¤¢¤ë¤³¤È¤òÁ°Äó¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
<literal>example.com</literal> ¤È¤¤¤¦¥É¥á¥¤¥ó¤Î¥µ¥¤¥È¤¬¡¢
@@ -651,8 +651,8 @@
¤³¤³¤Ë¤Ï¡¢¾Íè¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¥³¡¼¥É¥Í¡¼¥à¤ò»ØÄꤷ¤Æ°Ü¹Ô¤·¤Æ¤¤¤±¤ë¤è¤¦¤Ë¡¢
¥Ç¥Õ¥©¥ë¥È¤Ç <literal>etch</literal> ¥Ç¥£¥ì¥¯¥È¥ê¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
<literal>/./</literal> ¤Ï¡¢¤½¤Î¸å¤Ë³¤¯¥Ñ¥¹¤¬³ÎÄꤹ¤ë¤è¤¦¤Ë¡¢
-¥ë¡¼¥È¤«¤é¤ÎÁêÂХѥ¹¤ò¤ò¼¨¤·¤Þ¤¹ (preseed/include ¤ä preseed/run ¤Ç»ÈÍÑ)¡£
-¤³¤ì¤Ë¤è¤ê¡¢¥Õ¥¡¥¤¥ë¤ò´°Á´¤Ê URL¡¢/ ¤Ç»Ï¤Þ¤ë¥Ñ¥¹¡¢
+¥ë¡¼¥È¤«¤é¤ÎÁêÂХѥ¹¤ò¼¨¤·¤Þ¤¹ (preseed/include ¤ä preseed/run ¤Ç»ÈÍÑ)¡£
+¤³¤ì¤Ë¤è¤ê¡¢´°Á´¤Ê URL¤ä / ¤Ç»Ï¤Þ¤ë¥Ñ¥¹¡¢
Á°²ó preseed ¤¬¸«¤Ä¤«¤Ã¤¿¾ì½ê¤«¤é¤ÎÁêÂХѥ¹¤Ç¥Õ¥¡¥¤¥ë¤ò»ØÄê¤Ç¤¤Þ¤¹¡£
¥¹¥¯¥ê¥×¥È¤Î³¬Áع½Â¤¤ò²õ¤µ¤º¤Ë¿·¤·¤¤¾ì½ê¤Ë°Üư¤Ç¤¤ë
(Î㤨¤Ð ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ç³«»Ï¤·¡¢USB ¥¹¥Æ¥£¥Ã¥¯¤Ë¥³¥Ô¡¼¤¹¤ë)¡¢
@@ -780,7 +780,7 @@
¤Î¥¨¥¤¥ê¥¢¥¹¤Ç¡¢¥í¥±¡¼¥ë¤ä¥¡¼¥Ü¡¼¥É¤Î¼ÁÌä¤ò preseed ¤Ç¹Ô¤¨¤ë¤è¤¦Ã٤餻¤Þ¤¹¡£
¤Þ¤¿¡¢<literal>priority</literal> ¤Ï <literal>preseed/priority</literal>
¤Î¥¨¥¤¥ê¥¢¥¹¤Ç¡¢<literal>critical</literal> ¤ËÀßÄꤹ¤ë¤È¡¢
-Í¥ÀèÅÙ¤ÎÄ㤤¼ÁÌä¤òÍÞÀ©¤¹¤ë¡£
+Í¥ÀèÅÙ¤ÎÄ㤤¼ÁÌä¤òÍÞÀ©¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
</para><para>
Index: ja/using-d-i/modules/netcfg.xml
===================================================================
--- ja/using-d-i/modules/netcfg.xml (¥ê¥Ó¥¸¥ç¥ó 43397)
+++ ja/using-d-i/modules/netcfg.xml (ºî¶È¥³¥Ô¡¼)
@@ -20,7 +20,7 @@
¤³¤Î¥¹¥Æ¥Ã¥×¤ËÆþ¤Ã¤Æ¡¢¥Í¥Ã¥È¥ï¡¼¥¯¥Ç¥Ð¥¤¥¹¤¬ 1 ¤Ä°Ê¾å¤¢¤ë¤³¤È¤ò
¥·¥¹¥Æ¥à¤¬¸¡½Ð¤¹¤ë¤È¡¢¤É¤Î¥Ç¥Ð¥¤¥¹¤ò <emphasis>¼çÍ×</emphasis>
(¤Ä¤Þ¤ê¥¤¥ó¥¹¥È¡¼¥ë¤Ë»ÈÍѤ¹¤ë) ¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤È¤¹¤ë¤«¡¢
-¼ÁÌ䤵¤ì¤Þ¤¹ ¡£
+¼ÁÌ䤵¤ì¤Þ¤¹¡£
¤½¤Î¾¤Î¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Ï¤³¤³¤Ç¤ÏÀßÄꤷ¤Þ¤»¤ó¡£
¥¤¥ó¥¹¥È¡¼¥ë¤¬´°Î»¤·¤¿¤È¤³¤í¤Ç¡¢ÄɲäΥ¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÀßÄê¤Ç¤¤ë¤Ç¤·¤ç¤¦¡£
<citerefentry>
Index: ja/using-d-i/modules/pkgsel.xml
===================================================================
--- ja/using-d-i/modules/pkgsel.xml (¥ê¥Ó¥¸¥ç¥ó 43397)
+++ 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: 42551 -->
+<!-- original version: 42985 -->
<sect3 id="pkgsel">
<!--
@@ -89,39 +89,69 @@
<note><para>
<!--
-The <quote>Desktop environment</quote> task will install the Gnome desktop
+The <quote>Desktop environment</quote> task will install the GNOME desktop
environment. The options offered by the installer currently do not allow to
-select a different desktop environment like for example KDE.
+select a different desktop environment such as for example KDE.
-->
<quote>¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶</quote> ¥¿¥¹¥¯¤Ï¡¢
-Gnome ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
+GNOME ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
¸½ºß¥¤¥ó¥¹¥È¡¼¥é¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢
KDE ¤Î¤è¤¦¤Ê¾¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶¤òÁªÂò¤Ç¤¤Þ¤»¤ó¡£
</para><para>
<!--
-It is however possible to get the installer to install KDE by using preseeding
+It is possible to get the installer to install KDE by using preseeding
(see <xref linkend="preseed-pkgsel"/>) or by adding
-<literal>tasksel/first=kde-desktop</literal> at the boot prompt when starting
-the installer.
+<literal>tasks="standard, kde-desktop"</literal> at the boot prompt
+when starting the installer. However, this will only work if the packages
+needed for KDE are actually available. If you are installing using a full
+CD image, they will need to be downloaded from a mirror as KDE packages are
+not included on the first full CD; installing KDE this way should work fine
+if you are using a DVD image or any other installation method.
-->
-¤·¤«¤·¡¢preseed (<xref linkend="preseed-pkgsel"/> »²¾È) ¤ò»ÈÍѤ·¤¿¤ê¡¢
+preseed (<xref linkend="preseed-pkgsel"/> »²¾È) ¤ò»ÈÍѤ·¤¿¤ê¡¢
¥¤¥ó¥¹¥È¡¼¥é¤Îµ¯Æ°»þ¤Ë¥Ö¡¼¥È¥×¥í¥ó¥×¥È¤Ç
-<literal>tasksel/first=kde-desktop</literal> ¤È»ØÄꤷ¤Æ¡¢
+<literal>tasks="standard, kde-desktop"</literal> ¤È»ØÄꤷ¤Æ¡¢
¥¤¥ó¥¹¥È¡¼¥é¤¬ KDE ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦¤Ë¤Ç¤¤Þ¤¹¡£
+¤·¤«¤·¡¢KDE ¤ËɬÍפʥѥ屡¼¥¸¤¬Í¸ú¤Ê¾ì¹ç¤Î¤ßưºî¤·¤Þ¤¹¡£
+¥Õ¥ë CD ¥¤¥á¡¼¥¸¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ë¾ì¹ç¡¢
+KDE ¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¥Õ¥ë CD ¤Î 1 ËçÌÜ¤ËÆþ¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢
+¥ß¥é¡¼¥µ¥¤¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+DVD ¥¤¥á¡¼¥¸¤ä¤½¤Î¾¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ç¤Ï¡¢
+KDE ¤Ç¤Î¥¤¥ó¥¹¥È¡¼¥ë¤¬¤¦¤Þ¤¯¤¤¤¯¤Ç¤·¤ç¤¦¡£
+</para><para>
+
+<!--
+The various server tasks will install software roughly as follows.
+DNS server: <classname>bind9</classname>;
+File server: <classname>samba</classname>, <classname>nfs</classname>;
+Mail server: <classname>exim4</classname>, <classname>spamassassin</classname>,
+<classname>uw-imap</classname>;
+Print server: <classname>cups</classname>;
+SQL server: <classname>postgresql</classname>;
+Web server: <classname>apache</classname>.
+-->
+³Æ¥µ¡¼¥Ð¥¿¥¹¥¯¤Ç¤Ï¡¢¤ª¤ª¤Þ¤«¤Ë°Ê²¼¤Î¥½¥Õ¥È¥¦¥§¥¢¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
+DNS ¥µ¡¼¥Ð: <classname>bind9</classname>¡£
+¥Õ¥¡¥¤¥ë¥µ¡¼¥Ð: <classname>samba</classname>, <classname>nfs</classname>¡£
+¥á¡¼¥ë¥µ¡¼¥Ð: <classname>exim4</classname>,
+<classname>spamassassin</classname>, <classname>uw-imap</classname>¡£
+°õºþ¥µ¡¼¥Ð: <classname>cups</classname>¡£
+SQL ¥µ¡¼¥Ð: <classname>postgresql</classname>¡£
+Web ¥µ¡¼¥Ð: <classname>apache</classname>¡£
+
</para></note>
<para>
<!--
-Once you've selected your tasks, select
-<guibutton>Ok</guibutton>. At this point,
-<command>aptitude</command> will install the packages you've
-selected.
+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> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
-<command>aptitude</command> ¤¬ÁªÂò¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò³«»Ï¤·¤Þ¤¹¡£
+<command>aptitude</command> ¤¬ÁªÂò¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÉô¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·»Ï¤á¤Þ¤¹¡£
</para>
<note><para>
@@ -154,11 +184,13 @@
¤³¤Î½èÍýÃæ¤ËÆþÎϤò¤¦¤Ê¤¬¤·¤Æ¤¤Þ¤¹¡£
</para>
- <sect4 id="config-mta">
+ </sect3>
+
+ <sect3 id="config-mta">
<!--
- <title>Configuring Your Mail Transport Agent</title>
+ <title>Configuring Your Mail Transport Agent</title>
-->
- <title>¥á¡¼¥ëÇÛÁ÷¥¨¡¼¥¸¥§¥ó¥È (MTA) ¤ÎÀßÄê</title>
+ <title>¥á¡¼¥ëÇÛÁ÷¥¨¡¼¥¸¥§¥ó¥È (MTA) ¤ÎÀßÄê</title>
<para>
@@ -313,5 +345,4 @@
<filename>/usr/share/doc/exim4</filename> °Ê²¼¤Ë¤¢¤ê¤Þ¤¹¡£
</para>
- </sect4>
</sect3>
Index: ja/hardware/supported/arm.xml
===================================================================
--- ja/hardware/supported/arm.xml (¥ê¥Ó¥¸¥ç¥ó 43397)
+++ 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: 36908 -->
+<!-- original version: 43031 -->
<sect2 arch="arm"><title>CPU¡¦¥Þ¥¶¡¼¥Ü¡¼¥É¡¦¥Ó¥Ç¥ª¤Î¥µ¥Ý¡¼¥È</title>
@@ -10,12 +10,13 @@
<!--
Each distinct ARM architecture requires its own kernel. Because of
this the standard Debian distribution only supports installation on
-a number of the most common systems. The Debian userland however may be used by <emphasis>any</emphasis> ARM CPU including xscale.
+a number of the most common platforms. The Debian userland however may be
+used by <emphasis>any</emphasis> ARM CPU.
-->
¤½¤ì¤¾¤ì¤Î ARM ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Ï¼«Ê¬¼«¿È¤Î¥«¡¼¥Í¥ë¤òɬÍפȤ·¤Þ¤¹¡£
¤½¤Î¤¿¤á¡¢É¸½à¤Î Debian ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ï¡¢
-¿¤¯¤ÎºÇ¤â°ìÈÌŪ¤Ê¥·¥¹¥Æ¥à¾å¤Ø¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò»Ù±ç¤¹¤ë¤À¤±¤Ç¤¹¡£
-¤·¤«¤·¡¢Debian ¤Î¥æ¡¼¥¶¥é¥ó¥É¤Ï xscale ¤ò´Þ¤à¡¢
+¿¤¯¤ÎºÇ¤â°ìÈÌŪ¤Ê¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ø¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò»Ù±ç¤¹¤ë¤À¤±¤Ç¤¹¡£
+¤·¤«¤·¡¢Debian ¤Î¥æ¡¼¥¶¥é¥ó¥É¤Ï¡¢
<emphasis>¤É¤Î</emphasis> ARM CPU ¤Ç»ÈÍѤ·¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£
</para>
@@ -37,9 +38,9 @@
<para>
<!--
-The supported systems are:
+The supported platforms are:
-->
-¥µ¥Ý¡¼¥È¤¹¤ë¥·¥¹¥Æ¥à¤Ï°Ê²¼¤Î¤â¤Î¤Ç¤¹¡£
+¥µ¥Ý¡¼¥È¤¹¤ë¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ï°Ê²¼¤Î¤â¤Î¤Ç¤¹¡£
<variablelist>
@@ -66,15 +67,41 @@
</varlistentry>
<varlistentry>
-<term>NSLU2</term>
+<term>IOP32x</term>
<listitem><para>
<!--
+Intel's I/O Processor (IOP) line is found in a number of products related
+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.
+-->
+Intel ¤Î I/O ¥×¥í¥»¥Ã¥µ (IOP) ¥é¥¤¥ó¤Ï¡¢
+¥Ç¡¼¥¿¤Î¥¹¥È¥ì¡¼¥¸¤ä¥×¥í¥»¥Ã¥·¥ó¥°¤Ë´Ø·¸¤¹¤ëÀ½Éʤοô¤À¤±Â¸ºß¤·¤Þ¤¹¡£
+Debian ¤Ç¤Ï¸½ºß¡¢¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¥¹¥È¥ì¡¼¥¸ (NAS) ¥Ç¥Ð¥¤¥¹¤Ë¤è¤¯»È¤ï¤ì¤Æ¤¤¤ë¡¢
+IOP 80219 ¤ä 32x ¥Á¥Ã¥×¤È¤¤¤Ã¤¿ IOP32x ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
+Debian ¤¬³Î¼Â¤Ë¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤Î¤Ï¡¢IO-Data ¤Î GLAN Tank ¤È Thecus N2100
+¤Î 2 ¤Ä¤Î¥Ç¥Ð¥¤¥¹¤Ç¤¹¡£
+
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>IXP4xx</term>
+<listitem><para>
+
+<!--
+The IXP4xx platform is based on Intel's XScale ARM core. Currently, only
+one IXP4xx based system is supported, the Linksys NSLU2.
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.
-->
+IXP4xx ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ï¡¢Intel ¤Î XScale ARM ¥³¥¢¤ò¸µ¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
+¸½ºß¡¢Linksys NSLU2 ¤È¤¤¤¦ IXP4xx ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î¤ß¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
Linksys NSLU2 (Network Storage Link for USB 2.0 ¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö) ¤Ï¡¢
¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ì¡¼¥¸¤ò´Êñ¤ËÄ󶡤¹¤ë¾®·¿¥Ç¥Ð¥¤¥¹¤Ç¤¹¡£¥¤¡¼¥µ¥Í¥Ã¥ÈÀܳ¤È¡¢
¥Ï¡¼¥É¥Ç¥£¥¹¥¯¥É¥é¥¤¥Ö¤òÀܳ¤¹¤ë USB ¥Ý¡¼¥È¤ò 2 ¤ÄÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£
Index: ja/boot-installer/x86.xml
===================================================================
--- ja/boot-installer/x86.xml (¥ê¥Ó¥¸¥ç¥ó 43397)
+++ 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: 41808 -->
+<!-- original version: 42929 -->
<sect2 arch="x86"><title>CD-ROM ¤«¤é¤Îµ¯Æ°</title>
@@ -145,12 +145,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
-corresponding kernel. This will allow you to repartition the hard disk
-from which you boot the installer, although you should do so with care.
+corresponding kernel
+<filename>netboot/debian-installer/i386/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/i386/initrd.gz</filename>
+¥Õ¥¡¥¤¥ë¤È¤½¤ì¤ËÂбþ¤¹¤ë¥«¡¼¥Í¥ë
+<filename>netboot/debian-installer/i386/linux</filename>
+¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤È¤¤¤¤¤Ç¤·¤ç¤¦¡£
¤³¤ì¤Ï¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤¹¤ë¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¡¢
ÀÚ¤êľ¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£(Ãí°Õ¤·¤Æ¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤)
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml (¥ê¥Ó¥¸¥ç¥ó 43397)
+++ 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: 42824 -->
+<!-- original version: 42982 -->
<sect1 id="boot-parms"><title>¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿</title>
<para>
@@ -216,31 +216,25 @@
</listitem><listitem>
<para><userinput>DEBIAN_FRONTEND=newt</userinput></para>
</listitem><listitem>
-<para><userinput>DEBIAN_FRONTEND=slang</userinput></para>
-</listitem><listitem>
-<para><userinput>DEBIAN_FRONTEND=ncurses</userinput></para>
-</listitem><listitem>
-<para><userinput>DEBIAN_FRONTEND=bogl</userinput></para>
-</listitem><listitem>
<para><userinput>DEBIAN_FRONTEND=gtk</userinput></para>
-</listitem><listitem>
-<para><userinput>DEBIAN_FRONTEND=corba</userinput></para>
</listitem>
</itemizedlist>
<!--
-The default front end is <userinput>DEBIAN_FRONTEND=newt</userinput>.
+The default frontend is <userinput>DEBIAN_FRONTEND=newt</userinput>.
<userinput>DEBIAN_FRONTEND=text</userinput> may be preferable for
serial console installs. Generally only the
<userinput>newt</userinput> frontend is available on default install
-media, so this is not very useful right now.
+media. On architectures which support it, the graphical installer uses
+the <userinput>gtk</userinput> frontend.
-->
-¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥í¥ó¥È¥¨¥ó¥É¤Ï <userinput>DEBCONF_FRONTEND=newt</userinput> ¤Ç¤¹¡£
-¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥í¥ó¥È¥¨¥ó¥É¤Ï <userinput>DEBCONF_FRONTEND=newt</userinput>
+¤Ç¤¹¡£¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
<userinput>DEBIAN_FRONTEND=text</userinput> ¤È¤¹¤Ù¤¤Ç¤·¤ç¤¦¡£
°ìÈÌŪ¤Ë¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤Ç¤Ï <userinput>newt</userinput>
- ¥Õ¥í¥ó¥È¥¨¥ó¥É¤Î¤ß¤¬ÍøÍѲÄǽ¤Ç¤¹¡£
-¤½¤Î¤¿¤á¡¢º£¸½ºß¤¢¤Þ¤êÍÍѤǤϤ¢¤ê¤Þ¤»¤ó¡£
+¥Õ¥í¥ó¥È¥¨¥ó¥É¤Î¤ß¤¬ÍøÍѲÄǽ¤Ç¤¹¡£
+¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Ç¤Ï¡¢¥°¥é¥Õ¥£¥«¥ë¥¤¥ó¥¹¥È¡¼¥é¤¬
+<userinput>gtk</userinput> ¥Õ¥í¥ó¥È¥¨¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
</para></listitem>
@@ -414,8 +408,8 @@
or <userinput>theme=<replaceable>dark</replaceable></userinput>.
-->
¥Æ¡¼¥Þ (theme) ¤Ï¥¤¥ó¥¹¥È¡¼¥é¤Î¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤¬¤É¤Î¤è¤¦¤Ë¸«¤¨¤ë¤«
-(¿§¡¢¥¢¥¤¥³¥ó¤Ê¤É) ¤ò·èÄꤷ¤Þ¤¹¡£¸½ºß¡¢newt ¤È gtk ¤Î¥Õ¥í¥ó¥È¥¨¥ó¥É¤Ë¡¢
-ÌܤÎÉÔ¼«Í³¤ÊÊý¸þ¤±¤Ë¥Ç¥¶¥¤¥ó¤µ¤ì¤¿ <quote>dark</quote> ¥Æ¡¼¥Þ¤Î¤ß¤¢¤ê¤Þ¤¹¡£
+(¿§¡¢¥¢¥¤¥³¥ó¤Ê¤É) ¤ò·èÄꤷ¤Þ¤¹¡£¸½ºß¡¢newt ¤È gtk ¤Î¥Õ¥í¥ó¥È¥¨¥ó¥É¤Ë¤Î¤ß¡¢
+ÌܤÎÉÔ¼«Í³¤ÊÊý¸þ¤±¤Ë¥Ç¥¶¥¤¥ó¤µ¤ì¤¿ <quote>dark</quote> ¥Æ¡¼¥Þ¤¬¤¢¤ê¤Þ¤¹¡£
µ¯Æ°»þ¤Î¥Ñ¥é¥á¡¼¥¿¤Ë¡¢
<userinput>debian-installer/theme=<replaceable>dark</replaceable></userinput>
¤ä¾Êά·Á¤Î <userinput>theme=<replaceable>dark</replaceable></userinput>
@@ -493,12 +487,12 @@
<!--
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>
+Short form: <userinput>url</userinput>.
-->
preconfiguration ¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë URL ¤ò»ØÄꤷ¤Þ¤¹¡£
¤³¤ì¤Ï¼«Æ°¥¤¥ó¥¹¥È¡¼¥ë¤Ç»ÈÍѤ·¤Þ¤¹¡£
<xref linkend="automatic-install"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-û½Ì·Á: <userinput>url</userinput>
+û½Ì·Á¤Ï <userinput>url</userinput> ¤Ç¤¹¡£
</para></listitem>
</varlistentry>
@@ -510,9 +504,11 @@
<!--
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>
@@ -528,7 +524,7 @@
automate installs.
-->
Ä̾ï preseed ¤ÎÁ°¤Ë¹Ô¤ï¤ì¤ë¼ÁÌä¤ò¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄ꤬½ª¤ï¤ë¤Þ¤ÇÃ٤餻¤Þ¤¹¡£
-û½Ì·Á: <userinput>auto=true</userinput>¡£
+û½Ì·Á¤Ï <userinput>auto=true</userinput> ¤Ç¤¹¡£
¼«Æ°¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤³¤Î¥Ñ¥é¥á¡¼¥¿¤ò»ÈÍѤ¹¤ëºÝ¤Ë¤Ï¡¢
<xref linkend="preseed-auto"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
@@ -632,15 +628,93 @@
</varlistentry>
</variablelist>
- </sect2>
+ <sect3 id="preseed-args">
<!--
- <sect2 id="module-parms"><title>Passing parameters to kernel modules</title>
+ <title>Using boot parameters to answer questions</title>
-->
- <sect2 id="module-parms"><title>¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤Ø¤Î¥Ñ¥é¥á¡¼¥¿»ØÄê</title>
+ <title>¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤Ç¼ÁÌä¤ËÅú¤¨¤ë</title>
<para>
<!--
+With some exceptions, a value can be set at the boot prompt for any question
+asked during the installation, though this is only really useful in specific
+cases. General instructions how to do this can be found in
+<xref linkend="preseed-bootparms"/>. Some specific examples are listed below.
+-->
+Î㳰Ū¤Ë¡¢¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Î¼ÁÌä¤Ë¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤ÇÅú¤òÍ¿¤¨¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
+¤³¤ì¤Ï¡¢ÆÃ¼ì¤Ê¾õ¶·¤Ç¤Î¤ßÊØÍø¤Ç¤¹¡£
+¤³¤ÎÊýË¡¤Î³µÍפϡ¢<xref linkend="preseed-bootparms"/> ¤Ë¤¢¤ê¤Þ¤¹¡£
+ÆÃ¼ì¤ÊÎã¤ò°Ê²¼¤Ë¼¨¤·¤Þ¤¹¡£
+
+</para>
+
+<variablelist>
+
+<varlistentry>
+<term>debian-installer/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.
+-->
+¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Î¸À¸ì¤ä¹ñ¤Î¾ðÊó¤òÀßÄꤹ¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£
+¤³¤ì¤Ï Debian ¤Ç¥í¥±¡¼¥ë¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Î¤ß͸ú¤Ç¤¹¡£
+û½Ì·Á¤Ï <userinput>locale</userinput> ¤Ç¤¹¡£
+Î㤨¤Ð¡¢¸À¸ì¤Ë¥É¥¤¥Ä¸ì¡¢¹ñ¤Ë¥¹¥¤¥¹¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢
+<userinput>locale=de_CH</userinput> ¤È»ØÄꤷ¤Þ¤¹¡£
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>netcfg/disable_dhcp</term>
+<listitem><para>
+
+<!--
+Set to <userinput>true</userinput> if you want to disable DHCP and instead
+force static network configuration.
+-->
+DHCP ¤ò̵¸ú¤Ë¤·¡¢ÀÅŪ¥Í¥Ã¥È¥ï¡¼¥¯ÀßÄê¤ò¶¯À©¤¹¤ë¤Ë¤Ï¡¢
+<userinput>true</userinput> ¤ÈÀßÄꤷ¤Þ¤¹¡£
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>tasksel:tasksel/first</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>
+
+</variablelist>
+
+ </sect3>
+
+<!--
+ <sect3 id="module-parms"><title>Passing parameters to kernel modules</title>
+-->
+ <sect3 id="module-parms"><title>¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤Ø¥Ñ¥é¥á¡¼¥¿¤òÅϤ¹</title>
+<para>
+
+<!--
If drivers are compiled into the kernel, you can pass parameters to them
as described in the kernel documentation. However, if drivers are compiled
as modules and because kernel modules are loaded a bit differently during
@@ -702,6 +776,6 @@
</screen></informalexample>
</para>
+ </sect3>
</sect2>
</sect1>
-
Index: ja/boot-installer/trouble.xml
===================================================================
--- ja/boot-installer/trouble.xml (¥ê¥Ó¥¸¥ç¥ó 43428)
+++ ja/boot-installer/trouble.xml (ºî¶È¥³¥Ô¡¼)
@@ -157,7 +157,8 @@
Check that your BIOS actually supports booting from CD-ROM (older systems
possibly don't) and that your CD-ROM drive supports the media you are using.
-->
-BIOS ¤¬ CD-ROM ¤«¤é¤Îµ¯Æ°¤ò¤¤Á¤ó¤È¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤« (¸Å¤¤¥·¥¹¥Æ¥à¤ÏÉÔ²Ä)¡¢
+BIOS ¤¬ CD-ROM ¤«¤é¤Îµ¯Æ°¤ò¤¤Á¤ó¤È¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤«
+(¸Å¤¤¥·¥¹¥Æ¥à¤Ï¤ª¤½¤é¤¯ÌµÍý)¡¢
CD-ROM ¥É¥é¥¤¥Ö¤¬»È¤¦Í½Äê¤Î¥á¥Ç¥£¥¢¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤«¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
</para></listitem>