鍋太郎です。 喜瀬さん、武井さん、ありがとうございました。 指摘の内容を修正しました。 で、申し訳ないのですが、前回のメールを送信してからさらに訳を進めてしまいましたので、 改めて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 Ĥä꤫ХѥǥեǤޤ ץȤγع¤˿˰ưǤ (㤨 ֥ФdzϤ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>