�太郎��。
�ェック�り���������。
On Fri, 23 Feb 2007 17:00:28 +0900
TAKEI Nobumitsu <takei@xxxxxxxxxxxxxxxx> wrote:
> ★ja/preparing/install-overview.xml
> 「グラフィカル実験版���ょ��日本語���通り�悪�よ������,
>
> <phrase arch="powerpc">実験的�</phrase>グラフィカル版インストール…
>
> �������ょ�.
> ★ja/hardware/network-cards.xml
> 1行目ã�Œã�¡ã‚‡ã�£ã�¨ã�¾ã� ã‚‹ã�£ã�“ã�—ã�„感ã�˜ã�Œã�—ã�Ÿã�®ã�§ï¼Œ
>
> Linux カー�ル�サ�ート���る�ットワークインターフェースカード
> (NIC) �ら���ん�インストールシステム�もサ�ート�����。
> or
> Linux カー�ル�サ�ート���る�ットワークインターフェースカード
> (NIC) ���ん���インストールシステム�もサ�ート�����。
>
> �������ょ��.
> ★ja/hardware/installation-media.xml
> 係り�������よ��.
> ISDN ã‚„ PPP を使用ã�™ã‚‹ã‚ˆã�†ã�«ã‚·ã‚¹ãƒ†ãƒ *ã‚’*è¨å®šã�§ã��ã�¾ã�™ã€‚
> or
> ISDN ã‚„ PPP を使用ã�™ã‚‹ã‚ˆã�†ã�«ã‚·ã‚¹ãƒ†ãƒ ã�®è¨å®š*ã�Œ*ã�§ã��ã�¾ã�™ã€‚
以上ã€�訳をã�„ã�Ÿã� ã��ã�¾ã�—ã�Ÿã€‚
���ら�マニュアル�変更��り������以下�ファイルを追�����。
#��区切り����やら……
ja/install-methods/floppy/m68k.xml
ja/install-methods/create-floppy.xml
ja/preparing/install-overview.xml
ja/appendix/pppoe.xml
ja/appendix/preseed.xml
ja/appendix/random-bits.xml
ja/welcome/what-is-debian.xml
ja/using-d-i/modules/partman.xml
ja/hardware/network-cards.xml
ja/boot-installer/m68k.xml
ja/boot-installer/parameters.xml
diff�ファイルを��り�����
よ���れ��ェックを�願����。
--
+--------------------------------------------------------+
倉澤 望(�太郎)
KURASAWA Nozomu (nabetaro) <nabetaro @ caldron.jp>
GnuPG FingerPrint:
C4E5 7063 FD75 02EB E71D 559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+
Attachment:
d-i-update0228.tar.gz
Description: Binary data
Index: ja/install-methods/floppy/m68k.xml
===================================================================
--- ja/install-methods/floppy/m68k.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ ja/install-methods/floppy/m68k.xml (ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 18672 -->
+<!-- original version: 45433 -->
<sect2 arch="m68k"><title>Atari ¥·¥¹¥Æ¥à¤Ç¤Î¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤Î½ñ¤¹þ¤ß</title>
@@ -26,19 +26,15 @@
<para>
<!--
-There is no MacOS application to write images to floppy disks
-(and there would be no point in doing this as you can't use these
-floppies to boot the installation system or install kernel and modules
-from on Macintosh). However, these files are needed for the
-installation of the operating system and modules, later in the
-process.
+Since the current release does not yet support booting from floppies to
+start the installation, there would be no point in doing this on
+Macintosh Systems. However, these files are needed for the installation
+of the operating system and modules, later in the process.
-->
-¥¤¥á¡¼¥¸¤ò¥Õ¥í¥Ã¥Ô¡¼¤Ë½ñ¤¹þ¤à MacOS ÍÑ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¤¢¤ê¤Þ¤»¤ó
-(¤³¤ì¤é¤Î¥Õ¥í¥Ã¥Ô¡¼¤Ç¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤¹¤ë¤³¤È¤â¡¢
-Macintosh ¾å¤«¤é¥«¡¼¥Í¥ë¤ä¥â¥¸¥å¡¼¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤¤Ê¤¤¤Î¤Ç¡¢
-¥Õ¥í¥Ã¥Ô¡¼¤Ë½ñ¤¹þ¤ó¤Ç¤â°ÕÌ£¤¬¤Ê¤¤¤Î¤Ç¤¹)¡£
-¤·¤«¤·¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢
-¸å¤Û¤É OS ¤ä¥â¥¸¥å¡¼¥ë¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ËɬÍפȤʤê¤Þ¤¹¡£
+¸½ºß¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï¡¢¥Õ¥í¥Ã¥Ô¡¼¤«¤é¤Î¥¤¥ó¥¹¥È¡¼¥éµ¯Æ°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¤¿¤á¡¢
+Macintosh ¥·¥¹¥Æ¥à¤Ç¹Ô¤¦°ÕÌ£¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+¤·¤«¤·¡¢¸å¤Î²áÄø¤Ç OS ¤ä¥â¥¸¥å¡¼¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ë¡¢
+¤½¤Î¥Õ¥¡¥¤¥ë¤¬É¬Íפˤʤê¤Þ¤¹¡£
</para>
Index: ja/install-methods/create-floppy.xml
===================================================================
--- ja/install-methods/create-floppy.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ ja/install-methods/create-floppy.xml (ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 36841 -->
+<!-- original version: 45453 -->
<sect1 condition="supports-floppy-boot" id="create-floppy">
<title>¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤«¤é¤Î¥Õ¥í¥Ã¥Ô¡¼¤ÎºîÀ®</title>
@@ -69,6 +69,21 @@
</para><para>
<!--
+Before you can create the floppies, you will first need to download them
+from one of the Debian mirrors, as explained in
+<xref linkend="downloading-files"/>. <phrase arch="i386">If you already
+have an installation CD-ROM or DVD, the floppy images may also be included
+on the CD/DVD.</phrase>
+-->
+¥Õ¥í¥Ã¥Ô¡¼¤òºîÀ®¤¹¤ëÁ°¤Ë¡¢Debian ¤Î¥ß¥é¡¼¥µ¥¤¥È¤«¤é
+<xref linkend="downloading-files"/> ¤ÇÀâÌÀ¤·¤Æ¤¤¤ë¤è¤¦¤Ë¡¢
+¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+<phrase arch="i386">¥¤¥ó¥¹¥È¡¼¥ë CD-ROM/DVD ¤¬´û¤Ë¤¢¤ë¾ì¹ç¡¢
+¥Õ¥í¥Ã¥Ô¡¼¥¤¥á¡¼¥¸¤Ï CD/DVD ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¡£</phrase>
+
+</para><para>
+
+<!--
No matter which method you use to create your floppies, you should
remember to flip the write-protect tab on the floppies once you have
written them, to ensure they are not damaged unintentionally.
@@ -99,25 +114,20 @@
<!--
where <replaceable>filename</replaceable> is one of the floppy disk image
-files (see <xref linkend="downloading-files"/> for what
-<replaceable>filename</replaceable> should be).
+files.
<filename>/dev/fd0</filename> is a commonly used name of the floppy
-disk device, it may be different on your workstation
-<phrase arch="sparc">(on Solaris, it is
-<filename>/dev/fd/0</filename>)</phrase>.
+disk device, it may be different on your workstation<phrase arch="sparc">
+(on Solaris, it is <filename>/dev/fd/0</filename>)</phrase>.
The command may return to the
prompt before Unix has finished writing the floppy disk, so look for
the disk-in-use light on the floppy drive and be sure that the light
is out and the disk has stopped revolving before you remove it from
the drive. On some systems, you'll have to run a command to eject the
-floppy from the drive
-<phrase arch="sparc">(on Solaris, use <command>eject</command>, see
-the manual page)</phrase>.
+floppy from the drive <phrase arch="sparc"> (on Solaris, use
+<command>eject</command>, see the manual page)</phrase>.
-->
<replaceable>filename</replaceable> ¤Î¤È¤³¤í¤Ë¤Ï¡¢
¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤Î¤É¤ì¤«¤Î̾Á°¤ò½ñ¤¤Þ¤¹¡£
-(<replaceable>filename</replaceable> ¤ò¤É¤¦¤¹¤ë¤«¤Ï¡¢
-<xref linkend="downloading-files"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤)
<filename>/dev/fd0</filename> ¤Ï¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯ÁõÃÖ¤Ë
¤è¤¯»È¤ï¤ì¤Æ¤¤¤ë̾Á°¤Ç¤¹¤¬¡¢
¤¢¤Ê¤¿¤Î¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤Ç¤Ï°Û¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó
@@ -132,9 +142,9 @@
¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ¤Ï¡¢
¥É¥é¥¤¥Ö¤«¤é¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤ò¼è¤ê½Ð¤¹¤Ë¤Ï¡¢
¤Ê¤ó¤é¤«¤Î¥³¥Þ¥ó¥É¼Â¹Ô¤¬É¬ÍפȤʤ뤳¤È¤â¤¢¤ê¤Þ¤¹
-<phrase arch="sparc">
-(Solaris ¾å¤Ç¤Ï <command>eject</command> ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-¾Ü¤·¤¯¤Ï¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¸«¤Æ¤¯¤À¤µ¤¤)</phrase>¡£
+<phrase arch="sparc">(Solaris ¤Ç¤Ï <command>eject</command>
+¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
+¾ÜºÙ¤Ï¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)</phrase>¡£
</para><para>
<!--
Index: ja/preparing/install-overview.xml
===================================================================
--- ja/preparing/install-overview.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ ja/preparing/install-overview.xml (ºî¶È¥³¥Ô¡¼)
@@ -217,7 +217,7 @@
this graphical installer, see <xref linkend="graphical"/>.
-->
&arch-title; ¤Ç¤Ï¡¢
-¥°¥é¥Õ¥£¥«¥ë<phrase arch="powerpc">¼Â¸³</phrase>ÈÇ
+<phrase arch="powerpc">¼Â¸³Åª¤Ê</phrase>¥°¥é¥Õ¥£¥«¥ëÈÇ
¥¤¥ó¥¹¥È¡¼¥ë¥·¥¹¥Æ¥à¤ò»ÈÍѤ¹¤ë¤È¤¤¤¦ÁªÂò»è¤¬¤¢¤ê¤Þ¤¹¡£
¥°¥é¥Õ¥£¥«¥ë¥¤¥ó¥¹¥È¡¼¥é¤Ë¤Ä¤¤¤Æ¤Ï¡¢
<xref linkend="graphical"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
Index: ja/appendix/pppoe.xml
===================================================================
--- ja/appendix/pppoe.xml (¥ê¥Ó¥¸¥ç¥ó 0)
+++ ja/appendix/pppoe.xml (¥ê¥Ó¥¸¥ç¥ó 0)
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="EUC-JP"?>
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 45405 -->
+
+ <sect1 id="pppoe" arch="not-s390">
+<!--
+ <title>Installing &debian; using PPP over Ethernet (PPPoE)</title>
+-->
+ <title>PPP over Ethernet (PPPoE) ¤òÍѤ¤¤¿ &debian; ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
+
+<para>
+
+<!--
+In some countries PPP over Ethernet (PPPoE) is a common protocol for
+broadband (ADSL or cable) connections to an Internet Service Provider.
+Setting up a network connection using PPPoE is not supported by default
+in the installer, but can be made to work very simply. This section
+explains how.
+-->
+¤¤¤¯¤Ä¤«¤Î¹ñ¤Ç¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤ËÀܳ¤¹¤ë¤Î¤Ë¡¢
+¥Ö¥í¡¼¥É¥Ð¥ó¥ÉÀܳ (ADSL ¤ä¥±¡¼¥Ö¥ë TV) ¤Î°ìÈÌŪ¤Ê¥×¥í¥È¥³¥ë¤Ï¡¢
+PPP over Ethernet (PPPoE) ¤Ç¤¹¡£
+¥¤¥ó¥¹¥È¡¼¥é¤Ç¤Ï¡¢
+PPPoE ¤òÍѤ¤¤¿¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤Î¥»¥Ã¥È¥¢¥Ã¥×¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¤¬¡¢
+Èó¾ï¤Ë´Êñ¤ËÀßÄê¤Ç¤¤Þ¤¹¡£¤³¤ÎÀá¤Ç¤Ï¤½¤ÎÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£
+
+</para><para>
+
+<!--
+The PPPoE connection set up during the installation will also be available
+after the reboot into the installed system (see <xref linkend="boot-new"/>).
+-->
+¤Þ¤¿¡¢¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë PPPoE Àܳ¤ò¥»¥Ã¥È¥¢¥Ã¥×¤¹¤ë¤È¡¢
+¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤¿¸å¤Ç¤â͸ú¤Ë¤Ê¤ê¤Þ¤¹
+(<xref linkend="boot-new"/> »²¾È)¡£
+
+</para><para>
+
+<!--
+To have the option of setting up and using PPPoE during the installation,
+you will need to install using one of the CD-ROM/DVD images that are
+available. It is not supported for other installation methods (e.g.
+netboot<phrase condition="supports-floppy-boot"> or floppy</phrase>).
+-->
+¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë PPPoE ¤ò¥»¥Ã¥È¥¢¥Ã¥×¤·»ÈÍѤ¹¤ë¤Ë¤Ï¡¢
+͸ú¤Ê CD-ROM/DVD ¥¤¥á¡¼¥¸¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+¤½¤Î¾¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡ (Îã: netboot<phrase condition="supports-floppy-boot">
+¤ä¥Õ¥í¥Ã¥Ô¡¼</phrase>) ¤Ç¤Ï¡¢¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£
+
+</para><para>
+
+<!--
+Installing over PPPoE is mostly the same as any other installation. The
+following steps explain the differences.
+-->
+PPPoE ¤Ç¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¡¢Â¾¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤È¤Û¤È¤ó¤ÉƱ¤¸¤Ç¤¹¡£
+°Ê²¼¤ÇÀâÌÀ¤¹¤ë¥¹¥Æ¥Ã¥×¤¬°Û¤Ê¤ë¤À¤±¤Ç¤¹¡£
+
+</para>
+
+<itemizedlist>
+<listitem><para>
+
+<!--
+Boot the installer with <userinput>modules=ppp-udeb</userinput> as boot
+parameter. This means that at the boot prompt you should enter:
+-->
+¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤Ë <userinput>modules=ppp-udeb</userinput>
+¤ò»ØÄꤷ¤Æ¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£
+¥Ö¡¼¥È¥×¥í¥ó¥×¥È¤Ë°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ¹¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
+
+<informalexample><screen>
+install modules=ppp-udeb
+</screen></informalexample>
+
+<!--
+or, if you prefer using the graphical installer:
+-->
+¤Þ¤¿¤Ï¡¢¥°¥é¥Õ¥£¥«¥ë¥¤¥ó¥¹¥È¡¼¥é¤òÍѤ¤¤ë¾ì¹ç¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
+
+<informalexample><screen>
+installgui modules=ppp-udeb
+</screen></informalexample>
+
+<!--
+This will ensure the component responsible for the setup of PPPoE
+(<classname>ppp-udeb</classname>) will be loaded and run automatically.
+-->
+¤³¤ì¤Ë¤è¤ê¡¢PPPoE ¤Î¥»¥Ã¥È¥¢¥Ã¥×¤Ë»ÈÍѤ¹¤ë¥³¥ó¥Ý¡¼¥Í¥ó¥È
+(<classname>ppp-udeb</classname>) ¤ò³Î¼Â¤ËÆÉ¤ß¹þ¤ß¡¢¼«Æ°Åª¤Ëµ¯Æ°¤·¤Þ¤¹¡£
+
+</para></listitem>
+<listitem><para>
+
+<!--
+Follow the regular initial steps of the installation (language,
+country and keyboard selection; the loading of additional installer
+components<footnote>
+-->
+Ä̾ï¤Î¥¤¥ó¥¹¥È¡¼¥ë½é´ü²½¼ê½ç (¸À¸ì¡¢¹ñ¡¢¥¡¼¥Ü¡¼¥É¤ÎÁªÂò¡¢
+Äɲ夥󥹥ȡ¼¥é¥³¥ó¥Ý¡¼¥Í¥ó¥È<footnote>
+
+<para>
+
+<!--
+The <classname>ppp-udeb</classname> component is loaded as one of
+the additional components in this step. If you want to install at
+medium or low priority (expert mode), you can also manually select
+the <classname>ppp-udeb</classname> instead of entering the
+<quote>modules</quote> parameter at the boot prompt.
+-->
+<classname>ppp-udeb</classname> ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Ï¡¢
+¤³¤Î¥¹¥Æ¥Ã¥×¤ÎÄɲå³¥ó¥Ý¡¼¥Í¥ó¥È¤Î1¤Ä¤È¤·¤ÆÆÉ¤ß¹þ¤Þ¤ì¤Þ¤¹¡£
+Í¥ÀèÅÙ¤ò¡ÖÃæ¡×¡ÖÄã¡×¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç (¥¨¥¥¹¥Ñ¡¼¥È¥â¡¼¥É)¡¢
+¥Ö¡¼¥È¥×¥í¥ó¥×¥È¤Î <quote>modules</quote> ¥Ñ¥é¥á¡¼¥¿¤ËÆþÎϤ¹¤ëÂå¤ï¤ê¤Ë¡¢
+<classname>ppp-udeb</classname> ¤ò¼ê¤ÇÁªÂò¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
+
+</para>
+
+<!--
+</footnote>).
+-->
+</footnote>¤ÎÆÉ¤ß¹þ¤ß) ¤ò¹Ô¤¤¤Þ¤¹¡£
+
+</para></listitem>
+<listitem><para>
+
+<!--
+The next step is the detection of network hardware, in order to identify
+any Ethernet cards present in the system.
+-->
+¼¡¤Î¥¹¥Æ¥Ã¥×¤Ç¤Ï¡¢¥·¥¹¥Æ¥à¤Ë¤¢¤ë¥¤¡¼¥µ¥Í¥Ã¥È¥«¡¼¥É¤òÆÃÄꤹ¤ë¤Î¤Ë¡¢
+¥Í¥Ã¥È¥ï¡¼¥¯¥Ï¡¼¥É¥¦¥§¥¢¤ò¸¡½Ð¤·¤Þ¤¹¡£
+
+</para></listitem>
+<listitem><para>
+
+<!--
+After this the actual setup of PPPoE is started. The installer will probe
+all the detected Ethernet interfaces in an attempt to find a PPPoE
+concentrator (a type of server which handles PPPoE connections).
+-->
+¤³¤Î¸å¡¢¼ÂºÝ¤Î PPPoE ¤Î¥»¥Ã¥È¥¢¥Ã¥×¤¬»Ï¤Þ¤ê¤Þ¤¹¡£
+¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢PPPoE ¥³¥ó¥»¥ó¥È¥ì¡¼¥¿ (PPPoE Àܳ¤ò°·¤¦°ì¼ï¤Î¥µ¡¼¥Ð)
+¤ò¸«¤Ä¤±¤ë¤Î¤Ë¡¢¸¡½Ð¤·¤¿¤¹¤Ù¤Æ¤Î¥¤¡¼¥µ¥Í¥Ã¥È¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òÄ´¤Ù¤Þ¤¹¡£
+
+</para><para>
+
+<!--
+It is possible that the concentrator will not to be found at the first
+attempt. This can happen occasionally on slow or loaded networks or with
+faulty servers. In most cases a second attempt to detect the concentrator
+will be successful; to retry, select <guimenuitem>Configure and start a
+PPPoE connection</guimenuitem> from the main menu of the installer.
+-->
+ºÇ½é¤Î»î¹Ô¤Ç¤Ï¡¢¥³¥ó¥»¥ó¥È¥ì¡¼¥¿¤¬¸«¤Ä¤«¤é¤Ê¤¤²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£
+¤³¤ì¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¤¬ÃÙ¤¤¡¦Éé²Ù¤¬¹â¤¤¾ì¹ç¤ä¡¢
+¥µ¡¼¥Ð¦¤Î¥¨¥é¡¼¤Çµ¯¤³¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£
+¤Û¤È¤ó¤É¤Î¾ì¹ç¡¢2 ²óÌܤλî¹Ô¤Ç¥³¥ó¥»¥ó¥È¥ì¡¼¥¿¤Î¸¡½Ð¤ËÀ®¸ù¤·¤Þ¤¹¡£
+ºÆ»î¹Ô¤¹¤ë¤Ë¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥é¤Î¥á¥Ë¥å¡¼¤Ë¤¢¤ë <guimenuitem>Configure and start a
+PPPoE connection</guimenuitem> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
+
+</para></listitem>
+<listitem><para>
+
+<!--
+After a concentrator is found, the user will be prompted to type the login
+information (the PPPoE username and password).
+-->
+¥³¥ó¥»¥ó¥È¥ì¡¼¥¿¤ò¸¡½Ð¤·¤¿¸å¡¢¥í¥°¥¤¥ó¾ðÊó (PPPoE ¤Î¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É)
+¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
+
+</para></listitem>
+<listitem><para>
+
+<!--
+At this point the installer will use the provided information to establish
+the PPPoE connection. If the correct information was provided, the PPPoE
+connection should be configured and the installer should be able to use it
+to connect to the Internet and retrieve packages over it (if needed). If
+the login information is not correct or some error appears, the installer
+will stop, but the configuration can be attempted again by selecting the
+menu entry <guimenuitem>Configure and start a PPPoE connection</guimenuitem>.
+-->
+¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢Àè¤Û¤ÉÆþÎϤ·¤¿¾ðÊó¤òÍѤ¤¤Æ PPPoE Àܳ¤ò³ÎΩ¤·¤Þ¤¹¡£
+Àµ¤·¤¤¾ðÊó¤òÆþÎϤ·¤Æ¤¤¤ì¤Ð PPPoE Àܳ¤ÎÀßÄê¤ò¹Ô¤¤¡¢
+¥¤¥ó¥¹¥È¡¼¥é¤Ï¤½¤ÎÀܳ¤òÍѤ¤¤Æ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤·¡¢
+(ɬÍפʤé) ¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤Ç¤¤Þ¤¹¡£
+¥í¥°¥¤¥ó¾ðÊó¤¬Àµ¤·¤¯¤Ê¤¤¾ì¹ç¤ä¡¢²¿¤«¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¡¢
+¥¤¥ó¥¹¥È¡¼¥é¤ÏÄä»ß¤·¤Þ¤¹¤¬¡¢¥á¥Ë¥å¡¼¤Î
+<guimenuitem>Configure and start a PPPoE connection</guimenuitem> ¤òÁªÂò¤·¤Æ¡¢
+ÀßÄê¤òºÆÅÙ¹Ô¤¨¤Þ¤¹¡£
+
+</para></listitem>
+</itemizedlist>
+
+ </sect1>
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ ja/appendix/preseed.xml (ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 45190 -->
+<!-- original version: 45355 -->
<!--
Be careful with the format of this file as it is parsed to generate
@@ -816,6 +816,21 @@
DHCP Ì䤤¹ç¤ï¤»¤ËÂФ¹¤ëÊÖÅú¤ò¤â¤Ã¤È²æËý¶¯¤¯ÂԤĤ褦¤Ë¤Ê¤ê¤Þ¤¹¡£
</para>
+<tip><para>
+
+<!--
+An extensive example of how to use this framework, including example scripts
+and classes, can be found on the <ulink url="http://hands.com/d-i/">website
+of its developer</ulink>. The examples available there also show many other
+nice effects that can be achieved by creative use of preconfiguration.
+-->
+¥¹¥¯¥ê¥×¥È¤ä¥¯¥é¥¹¤Î¥µ¥ó¥×¥ë¤ò´Þ¤à¡¢
+¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤Î»ÈÍÑË¡¤Ë¤Ä¤¤¤Æ¤ÎÂ絬ÌϤʥµ¥ó¥×¥ë¤¬¡¢
+<ulink url="http://hands.com/d-i/">³«È¯¼Ô¤Î¥¦¥§¥Ö¥µ¥¤¥È</ulink>¤Ë¤¢¤ê¤Þ¤¹¡£
+¤½¤³¤ÇÆÀ¤é¤ì¤ë¥µ¥ó¥×¥ë¤Ç¤â¡¢»öÁ°ÀßÄê¤ÎÆÈÁÏŪ¤Ê»ÈÍѤòÀ®¤·¿ë¤²¤ë¡¢
+¤¿¤¯¤µ¤ó¤Î¤¹¤Ð¤é¤·¤¤¸ú²Ì¤¬¤¢¤ê¤Þ¤¹¡£
+
+</para></tip>
</sect2>
<sect2 id="preseed-aliases">
@@ -1906,33 +1921,6 @@
</sect2>
- <sect2 id="preseed-mailer">
-<!--
- <title>Mailer configuration</title>
--->
- <title>¥á¡¼¥ëÀßÄê</title>
-<para>
-
-<!--
-During a normal install, exim asks only a few questions. Here's how to
-avoid even those. More complicated preseeding is possible.
--->
-Ä̾ï¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢exim ¤Ï¾¯¡¹¼ÁÌ䤷¤Þ¤¹¤¬¡¢
-¤µ¤é¤Ë¤³¤ì¤òÍÞÀ©¤¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¡£
-¤â¤Ã¤ÈÊ£»¨¤Ê preseed ¤â²Äǽ¤Ç¤¹¡£
-
-</para>
-
-<informalexample role="example"><screen>
-exim4-config exim4/dc_eximconfig_configtype \
- select no configuration at this time
-exim4-config exim4/no_config boolean true
-exim4-config exim4/no_config boolean true
-exim4-config exim4/dc_postmaster string
-</screen></informalexample>
-
- </sect2>
-
<sect2 id="preseed-X">
<!--
<title>X configuration</title>
Index: ja/appendix/random-bits.xml
===================================================================
--- ja/appendix/random-bits.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ ja/appendix/random-bits.xml (ºî¶È¥³¥Ô¡¼)
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43782 -->
+<!-- original version: 45239 -->
<appendix id="appendix"><title>¥é¥ó¥À¥à¥Ó¥Ã¥È</title>
&files.xml;
&chroot-install.xml;
&plip.xml;
+&pppoe.xml;
&graphical.xml;
</appendix>
Index: ja/welcome/what-is-debian.xml
===================================================================
--- ja/welcome/what-is-debian.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ ja/welcome/what-is-debian.xml (ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 45186 -->
+<!-- original version: 45347 -->
<sect1 id="what-is-debian">
<title>Debian ¤È¤Ï?</title>
@@ -8,7 +8,7 @@
<!--
Debian is an all-volunteer organization dedicated to developing free
-software and promoting the ideals of the Free Software Foundation.
+software and promoting the ideals of the Free Software community.
The Debian Project began in 1993, when Ian Murdock issued an open
invitation to software developers to contribute to a complete and
coherent software distribution based on the relatively new Linux
@@ -21,8 +21,8 @@
&num-of-debian-developers; <firstterm>Debian Developers</firstterm>.
-->
Debian ¤Ï¡¢Í»Ö¤Î½¸¤Þ¤Ã¤Æ¤Ç¤¤¿ÃÄÂΤǡ¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤ò
-³«È¯¤·¡¢Free Software Foundation (¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃÄ) ¤ÎÍýÁÛ¤ò
-¿ä¿Ê¤¹¤ë¤³¤È¤òÌÜŪ¤È¤·¤Æ¤¤¤Þ¤¹¡£Debian ¥×¥í¥¸¥§¥¯¥È¤Ï 1993 ǯ¤Ë¡¢
+³«È¯¤·¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¥³¥ß¥å¥Ë¥Æ¥£¤ÎÍýÁÛ¤ò¿ä¿Ê¤¹¤ë¤³¤È¤òÌÜŪ¤È¤·¤Æ¤¤¤Þ¤¹¡£
+Debian ¥×¥í¥¸¥§¥¯¥È¤Ï 1993 ǯ¤Ë¡¢
Èæ³ÓŪ¿·¤·¤¤ Linux ¥«¡¼¥Í¥ë¤ò¤â¤È¤Ë¤·¤¿¡¢´°Á´¤Ç°ì´ÓÀ¤¢¤ë
¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎÀ©ºî¤Î¤¿¤á¤Ë¡¢Ian Murdock
¤¬³«È¯¼Ô¤ò¹¤¯Êç¤Ã¤¿¤È¤¤Ë»Ï¤Þ¤ê¤Þ¤·¤¿¡£
Index: ja/using-d-i/modules/partman.xml
===================================================================
--- ja/using-d-i/modules/partman.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ 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: 44026 -->
+<!-- original version: 45238 -->
<sect3 id="partman">
<title>¥Ç¥£¥¹¥¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä</title>
@@ -237,12 +237,12 @@
<!--
If you choose guided partitioning using (encrypted) LVM, the installer will also create
-a separate <filename>/boot</filename> partition. The other partitions, except
-for the swap partition, will be created inside the LVM partition.
+a separate <filename>/boot</filename> partition. The other partitions,
+including the swap partition, will be created inside the LVM partition.
-->
(°Å¹æ²½) LVM ¤òÍøÍѤ¹¤ë¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò¹Ô¤¦¤È·è¤á¤¿¾ì¹ç¡¢
¥¤¥ó¥¹¥È¡¼¥é¤ÏÆÈΩ¤·¤¿ <filename>/boot</filename> ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤âºîÀ®¤·¤Þ¤¹¡£
-¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò½ü¤¯¤½¤Î¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¡¢
+¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò´Þ¤à¤½¤Î¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¡¢
LVM ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎÆâÉô¤ËºîÀ®¤·¤Þ¤¹¡£
</para><para arch="ia64">
Index: ja/hardware/network-cards.xml
===================================================================
--- ja/hardware/network-cards.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ ja/hardware/network-cards.xml (ºî¶È¥³¥Ô¡¼)
@@ -14,8 +14,8 @@
should also be supported by the installation system; modular drivers
should normally be loaded automatically.
-->
-Linux ¥«¡¼¥Í¥ë¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë ¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¥«¡¼¥É (NIC) ¤Ï¡¢
-¤Û¤È¤ó¤É¥¤¥ó¥¹¥È¡¼¥ë¥·¥¹¥Æ¥à¤Ç¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
+Linux ¥«¡¼¥Í¥ë¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¥«¡¼¥É
+(NIC) ¤Ê¤é¡¢¤Û¤È¤ó¤É¥¤¥ó¥¹¥È¡¼¥ë¥·¥¹¥Æ¥à¤Ç¤â¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
¥É¥é¥¤¥Ð¥â¥¸¥å¡¼¥ë¤Ï¡¢Ä̾KưŪ¤ËÆÉ¤ß¹þ¤Þ¤ì¤Þ¤¹¡£
<!--
Index: ja/boot-installer/m68k.xml
===================================================================
--- ja/boot-installer/m68k.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ ja/boot-installer/m68k.xml (ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 38231 -->
+<!-- original version: 45435 -->
<!--
<sect2 arch="m68k"><title>Choosing an Installation Method</title>
@@ -373,18 +373,23 @@
</para><para>
<!--
-Macs require the <command>Penguin</command>
-bootloader. If you do not have the tools to handle
-a <command>Stuffit</command> archive, &penguin19.hfs; is an
-hfs disk image with <command>Penguin</command> unpacked.
-<xref linkend="create-floppy"/> describes how to copy this
-image to a floppy.
+Macs require the <command>Penguin</command> bootloader, which can be
+downloaded from <ulink url="&url-m68k-mac;">the Linux/mac68k
+sourceforge.net project</ulink>. If you do not have the tools to handle
+a <command>Stuffit</command> archive, you can put it on a
+MacOS-formatted floppy using a second GNU/Linux machine of any
+architecture and the <command>hmount</command>,
+<command>hcopy</command>, and <command>humount</command> tools from the
+<classname>hfsutils</classname> suite.
-->
-Mac ¤Ë¤Ï <command>Penguin</command> ¥Ö¡¼¥È¥í¡¼¥À¤¬É¬ÍפǤ¹¡£
+Mac ¤Ë¤Ï¡¢<ulink url="&url-m68k-mac;">the Linux/mac68k
+sourceforge.net project</ulink> ¤«¤é¥À¥¦¥ó¥í¡¼¥É¤Ç¤¤ë
+<command>Penguin</command> ¥Ö¡¼¥È¥í¡¼¥À¤¬É¬ÍפǤ¹¡£
<command>Stuffit</command> ¥¢¡¼¥«¥¤¥Ö¤ò°·¤¦¥Ä¡¼¥ë¤¬¤Ê¤±¤ì¤Ð¡¢
-&penguin19.hfs; ¤¬ <command>Penguin</command> ¤òŸ³«¤·¤¿ hfs ¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤Ç¤¹¡£
-<xref linkend="create-floppy"/> ¤Ç¤Ï¡¢
-¤³¤Î¥¤¥á¡¼¥¸¤ò¥Õ¥í¥Ã¥Ô¡¼¤Ë¥³¥Ô¡¼¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
+¤¤¤º¤ì¤«¤Î¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Î 2¤ÄÌܤΠGNU/Linux ¥Þ¥·¥ó¤È¡¢
+<classname>hfsutils</classname> ¥¹¥¤¡¼¥È¤Ë¤¢¤ë <command>hmount</command>,
+<command>hcopy</command>, <command>humount</command> ¥Ä¡¼¥ë¤Ç¡¢
+MacOS ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î¥Õ¥í¥Ã¥Ô¡¼¤ËÆþ¤ì¤é¤ì¤Þ¤¹¡£
</para><para>
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml (¥ê¥Ó¥¸¥ç¥ó 45608)
+++ 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: 45198 -->
+<!-- original version: 45239 -->
<sect1 id="boot-parms"><title>¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿</title>
<para>
@@ -723,14 +723,16 @@
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).
+<command>scp</command> during the installation)<phrase arch="not-s390"> and
+<classname>ppp-udeb</classname> (see <xref linkend="pppoe"/>)</phrase>.
-->
¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥í¡¼¥É¤µ¤ì¤Ê¤¤¥¤¥ó¥¹¥È¡¼¥é¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¡¢
¼«Æ°Åª¤ËÆÉ¤ß¹þ¤à¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£
Äɲå³¥ó¥Ý¡¼¥Í¥ó¥È¤ÎÎã¤È¤·¤Æ¡¢<classname>openssh-client-udeb</classname>
-(¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë <command>scp</command> ¥³¥Þ¥ó¥É¤ò»ÈÍѤǤ¤ë) ¤ä¡¢
-<classname>ppp-udeb</classname> (PPPoE ¤ÎÀßÄê¤ò¥µ¥Ý¡¼¥È¤¹¤ë) ¤¬ÊØÍø¤Ç¤¹¡£
+(¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë <command>scp</command> ¥³¥Þ¥ó¥É¤ò»ÈÍѤǤ¤ë)
+<phrase arch="not-s390">¤ä¡¢
+<classname>ppp-udeb</classname> (<xref linkend="pppoe"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤)
+</phrase>¤¬ÊØÍø¤Ç¤¹¡£
</para></listitem>
</varlistentry>