鍋太郎です。 チェックありがとうございました。 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>