鍋太郎です。 インストールマニュアルの訳を追随しました。 本文と差分を添付しますので査読をお願いいたします。 アーカイブの内容は以下になります。 $ tar ztf d-i-update0608.tar.gz ja/appendix/chroot-install.xml ja/appendix/preseed.xml -- +--------------------------------------------------------+ 倉澤 望(鍋太郎) KURASAWA Nozomu (nabetaro) <nabetaro @ caldron.jp> GnuPG FingerPrint: C4E5 7063 FD75 02EB E71D 559B ECF6 B9D2 8147 ADFB +--------------------------------------------------------+
Attachment:
d-i-update0608.tar.gz
Description: Binary data
Index: ja/appendix/chroot-install.xml =================================================================== --- ja/appendix/chroot-install.xml (ӥ 37903) +++ ja/appendix/chroot-install.xml (ȥԡ) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="EUC-JP"?> <!-- retain these comments for translator revision tracking --> -<!-- original version: 34713 --> +<!-- original version: 36758 --> <sect1 id="linux-upgrade"> <!-- @@ -441,13 +441,15 @@ <!-- To configure networking, edit <filename>/etc/network/interfaces</filename>, -<filename>/etc/resolv.conf</filename>, and -<filename>/etc/hostname</filename>. +<filename>/etc/resolv.conf</filename>, +<filename>/etc/hostname</filename> and +<filename>/etc/hosts</filename>. --> ͥåȥˤϡ <filename>/etc/network/interfaces</filename>, <filename>/etc/resolv.conf</filename>, -<filename>/etc/hostname</filename> ԽƤ +<filename>/etc/hostname</filename>, +<filename>/etc/hosts</filename> ԽƤ <informalexample><screen> # editor /etc/network/interfaces @@ -577,7 +579,7 @@ Τ褦ˤơ餫ѥåͥǧƤ <informalexample><screen> -# apt-cache search kernel-image +# apt-cache search <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image </screen></informalexample> <!-- @@ -586,7 +588,7 @@ ˡѥå̾Ȥäƥȡ뤷Ƥ <informalexample><screen> -# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable> +# apt-get install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> </para> Index: ja/appendix/preseed.xml =================================================================== --- ja/appendix/preseed.xml (ӥ 37903) +++ ja/appendix/preseed.xml (ȥԡ) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="EUC-JP"?> <!-- retain these comments for translator revision tracking --> -<!-- original version: 36269 --> +<!-- original version: 37512 --> <!-- Be carefull with the format of this file as it is parsed to generate @@ -291,7 +291,7 @@ Another readable file <filename>/var/cache/debconf/questions.dat</filename> is used to store the values for variables and the answers given to questions. A question always refers to the template used to ask it. For obvious -security reasons the values for templates of type <quote>password</quote> +security reasons the values for questions of type <quote>password</quote> are stored in a separate, non-readable file in the same directory. </para> @@ -350,10 +350,10 @@ It is possible to use preseeding to change the default answer for a question, but still have the question asked. To do this the <firstterm>seen</firstterm> flag must be reset to <quote>false</quote> after -setting the value for a template. +setting the value for a question. --> ֤ФǥեȤβѹΤ preseed ѤǤޤ -ˤϡƥץ졼Ȥͤꤷǡ +ˤϡͤꤷǡ <firstterm>seen</firstterm> ե饰 <quote>false</quote> ꤷʤФʤޤ @@ -618,6 +618,22 @@ <userinput>path/to/var=value</userinput> Ȥ褦ˡ ץˤ preseed ѿϤƤ +</para><para> + +<!-- +A <quote>-\-</quote> in the boot options has special meaning. +Kernel parameters that appear after it will be copied into the installed +bootloader configuration (if supported by the installer for the +bootloader). Note that the <quote>-\-</quote> may already be +present in the default boot parameters. +--> +֡ȥץ <quote>--</quote> ̤ʰ̣ޤ +³ͥѥȡ +ȡѤߤΥ֡ȥ˥ԡޤ +(ȡ餬ݡȤ֡ȥξ) +<quote>--</quote> ϡǥեȥ֡ȥѥǡ +Ǥ˻ѤƤ뤳ȤդƤ + </para> <note><para> @@ -678,8 +694,13 @@ ޥɤǻѤΤƱǤ եιԤΰŪʥեޥåȤϰʲΤ褦ˤʤޤ +<!-- + <informalexample><screen> +<owner> <question name> <question type> <value> + </screen></informalexample> +--> <informalexample><screen> -<ͭ> <ƥץ졼̾> <ƥץ졼ȷ> <> +<ͭ> <̾> <ƥץ졼ȷ> <> </screen></informalexample> </para><para> @@ -705,32 +726,31 @@ <!-- A line can be split into multiple lines by appending a backslash (<quote><literal>\</literal></quote>) as the line continuation character. - A good place to split a line is after the template name; a bad place is + A good place to split a line is after the question name; a bad place is between type and value. --> Է³ʸȤƥХåå (<quote><literal>\</literal></quote>) դʣԤʬǤޤ - ƥץ졼̾θʬ䤹ΤŬǤ礦 + ̾θʬ䤹ΤŬǤ礦 ͤδ֤Ϥ褯ޤ </para></listitem> <listitem><para> <!-- - Most templates need to be preseeded using the values valid in English and - not the translated values. However, there are some templates (for example + Most questions need to be preseeded using the values valid in English and + not the translated values. However, there are some questions (for example in <classname>partman</classname> where the translated values need to be used. --> - ۤȤɤΥƥץ졼ȤǤϡ - ͤǤϤʤѸͤꤹɬפޤ + ۤȤɤμǤϡͤǤϤʤѸͤꤹɬפޤ (<classname>partman</classname> ʤ) - ͤѤǤƥץ졼Ȥ⤢ޤ + ͤѤǤ⤢ޤ </para></listitem> <listitem><para> <!-- - Some templates take a code as value instead of the English text that is + Some questions take a code as value instead of the English text that is shown during installation. --> - ƥץ졼ȤˤϡȡɽѸΥƥȤˡ + ˤϡȡɽѸΥƥȤˡ ɤΤޤ </para></listitem> </itemizedlist> @@ -806,13 +826,13 @@ <para> <!-- -To check possible values for templates, you can use <command>nano</command> +To check possible values for questions, you can use <command>nano</command> to examine the files in <filename>/var/lib/cdebconf</filename> while an installation is in progress. View <filename>templates.dat</filename> for the raw templates and <filename>questions.dat</filename> for the current values and for the values assigned to variables. --> -ͭʥƥץ졼ȤͤåΤˡ +ͭʼͤåΤˡ ȡ <filename>/var/lib/cdebconf</filename> Υե <command>nano</command> ѤƳǧǤޤ Υƥץ졼Ȥ <filename>templates.dat</filename> @@ -1133,7 +1153,7 @@ <informalexample role="example"><screen> # If the system has free space you can choose to only partition that space. -# Note: this template must be preseeded with a localized (translated) value. +# Note: this must be preseeded with a localized (translated) value. #d-i partman-auto/init_automatically_partition \ # select Use the largest continuous free space @@ -1143,7 +1163,7 @@ d-i partman-auto/disk string /dev/discs/disc0/disc # You can choose from any of the predefined partitioning recipes. -# Note: this template must be preseeded with a localized (translated) value. +# Note: this must be preseeded with a localized (translated) value. d-i partman-auto/choose_recipe \ select All files in one partition (recommended for new users) #d-i partman-auto/choose_recipe \ @@ -1232,7 +1252,7 @@ # Additional repositories, local[0-9] available #d-i apt-setup/local0/comment string local server -#d-i apt-setup/local0/repository string \ +#d-i apt-setup/local0/source string \ # deb http://local.server/debian stable main # URL to the public key of the local repository #d-i apt-setup/local0/key string http://local.server/key @@ -1401,59 +1421,38 @@ <itemizedlist> <listitem><para> -<!-- - <userinput>Standard system</userinput> ---> - <userinput>Standard system (ɸॷƥ)</userinput> + <userinput>standard</userinput> </para></listitem> <listitem><para> -<!-- - <userinput>Desktop environment</userinput> ---> - <userinput>Desktop environment (ǥȥå״Ķ)</userinput> + <userinput>desktop</userinput> </para></listitem> <listitem><para> -<!-- - <userinput>Web server</userinput> ---> - <userinput>Web server (Web )</userinput> + <userinput>gnome-desktop</userinput> </para></listitem> <listitem><para> -<!-- - <userinput>Print server</userinput> ---> - <userinput>Print server ()</userinput> + <userinput>kde-desktop</userinput> </para></listitem> <listitem><para> -<!-- - <userinput>DNS server</userinput> ---> - <userinput>DNS server (DNS )</userinput> + <userinput>web-server</userinput> </para></listitem> <listitem><para> -<!-- - <userinput>File server</userinput> ---> - <userinput>File server (ե륵)</userinput> + <userinput>print-server</userinput> </para></listitem> <listitem><para> -<!-- - <userinput>Mail server</userinput> ---> - <userinput>Mail server (륵)</userinput> + <userinput>dns-server</userinput> </para></listitem> <listitem><para> -<!-- - <userinput>SQL database</userinput> ---> - <userinput>SQL database (SQL )</userinput> + <userinput>file-server</userinput> </para></listitem> <listitem><para> -<!-- - <userinput>Laptop</userinput> ---> - <userinput>Laptop (åץȥå)</userinput> + <userinput>mail-server</userinput> </para></listitem> +<listitem><para> + <userinput>sql-database</userinput> +</para></listitem> +<listitem><para> + <userinput>laptop</userinput> +</para></listitem> </itemizedlist> <para> @@ -1461,17 +1460,18 @@ <!-- You can also choose to install no tasks, and force the installation of a set of packages in some other way. We recommend always including the -<userinput>Standard system</userinput> task. +<userinput>standard</userinput> task. --> ȡ뤷ʤȤǤޤ ¾ˡǥѥåΥåȤŪ˥ȡ뤵뤳Ȥ⤢ޤ -<userinput>Standard system</userinput> Ͼ˴ޤΤᤷޤ +<userinput>standard</userinput> Ͼ˴ޤΤᤷޤ </para> <informalexample role="example"><screen> -tasksel tasksel/first multiselect Standard system, Desktop environment -#tasksel tasksel/first multiselect Standard system, Web server +tasksel tasksel/first multiselect standard, desktop +#tasksel tasksel/first multiselect standard, web-server +#tasksel tasksel/first multiselect standard, kde-desktop # Some versions of the installer can report back on what software you have # installed, and what software you use. The default is not to report back, @@ -1490,7 +1490,7 @@ <informalexample role="example"><screen> # Avoid that last message about the install being complete. -d-i prebaseconfig/reboot_in_progress note +d-i finish-install/reboot_in_progress note # This will prevent the installer from ejecting the CD during the reboot, # which is useful in some situations. @@ -1664,6 +1664,12 @@ # preconfiguration files, includes those files. #d-i preseed/include_command \ # string echo if [ "`hostname`" = bob ]; then echo bob.cfg; fi + +# Most flexibly of all, this downloads a program and runs it. The program +# can use commands such as debconf-set to manupulate the debconf database. +# Note that if the filenames are relative, they are taken from the same +# directory as the preconfiguration file that runs them. +d-i preseed/run string foo.sh </screen></informalexample> </sect2>