[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[d-i doc] 翻訳更新

鍋太郎です。

遅れていますが、インストールマニュアルが更新されてましたので、訳を追随しました。
チェックしていただけると助かります。

ja/preparing/nondeb-part/x86.xml
ja/appendix/files.xml
ja/using-d-i/modules/partman.xml
ja/using-d-i/modules/pkgsel.xml
ja/boot-installer/parameters.xml

よろしくお願いします。

#あとpreseed.xmlとtrouble.xmlをどうにかせねば……

-- 
+--------------------------------------------------------+
 倉澤 望(鍋太郎) 
 KURASAWA Nozomu (nabetaro)  <nabetaro @ caldron.jp>
 GnuPG FingerPrint:
    C4E5 7063 FD75 02EB E71D  559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+

Attachment: d-i-update1120.tar.gz
Description: Binary data

Index: ja/preparing/nondeb-part/x86.xml
===================================================================
--- ja/preparing/nondeb-part/x86.xml	(ӥ 42736)
+++ ja/preparing/nondeb-part/x86.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 -->
+<!-- original version: 42250 -->
 
 
   <sect2 arch="x86"><title>DOS  Windows Υѡƥʬ</title>
@@ -58,7 +58,9 @@
 NT, 2000, XP), or OS/2, and it is desired to put Debian onto the same disk
 without destroying the previous system. Note that the installer supports
 resizing of FAT and NTFS filesystems as used by DOS and Windows. Simply
-start the installer, select the partition to resize, and specify a new size.
+start the installer and when you get to the partitioning step, select the
+option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice>
+partitioning, select the partition to resize, and specify its new size.
 So in most cases you should not need to use the method described below.
 -->
 褯륤󥹥ȡΤȤơ
@@ -67,12 +69,14 @@
 OS/2 ʤɤäƤ륷ƥ˿ Debian 򥤥󥹥ȡ뤹硢
 ¸ΥƥȤʤ
 Ʊǥ Debian Ȥפޤ
-DOS  Windows ǻѤ줿
+DOS  Windows ǻѤ롢
 FAT ե륷ƥࡦNTFS ե륷ƥΥꥵ
-󥹥ȡϥݡȤƤޤ
-ñ˥󥹥ȡưꥵѡƥ򤷡
-ꤷƤ
-ۤȤɤξ硢ʲˡȤɬפʤȤդƤ
+󥹥ȡϥݡȤƤ뤳ȤդƤ
+ñ˥󥹥ȡưѡƥʬʳ褿顢
+<menuchoice> <guimenuitem>ư</guimenuitem> </menuchoice> 
+ѡƥʬ򤷡ꥵѡƥ
+θ塢ꤷƤ
+ۤȤɤξ硢ʲˡȤɬפϤޤ
 
 </para><para>
 
Index: ja/appendix/files.xml
===================================================================
--- ja/appendix/files.xml	(ӥ 42736)
+++ ja/appendix/files.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39551 -->
+<!-- original version: 42302 -->
 
 
  <sect1 id="linuxdevices"><title>Linux ΥǥХ</title>
@@ -242,23 +242,25 @@
  </sect1>
 
  <sect1 id="tasksel-size-list">
+<!--
+ <title>Disk Space Needed for Tasks</title>
+-->
  <title>ɬפʥǥζ</title>
 
 <!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running "tasksel new" on a system
- that been fully installed without selecting any tasks. By selecting a
- task together with the "manual selection" option, aptitude will be started
- and show the sizes for the task. After deselecting the packages to be
- installed, quit aptitude and repeat for other tasks.
+ Sizes of tasks should be determined by running tasksel with the "new-install"
+ option on a system that been fully installed without selecting any tasks. By
+ selecting a task together with the "manual selection" option, aptitude will
+ be started and show the sizes for the task. Use "cancel panding actions" to
+ clear the slate, quit aptitude and repeat for other tasks.
  Space requirements need to be determined from tasksel as tasksel will not
  install recommended packages while selecting a task from aptitude will.
-d-iޥ˥奢ƥʸ
- Υ򤻤˥󥹥ȡ뤷֤ "tasksel new" ¹Ԥơ
- Υꤹ٤Ǥ
+ d-iޥ˥奢ƥʸ
+ Υ򤻤˥󥹥ȡ뤷֤ tasksel  "new-install" 
+ ץĤƼ¹ԤΥꤷƤ
  "manual selection" ץѤƥ򤷤褦Ȥȡ
  aptitude Ѥ˵ươ򼨤ޤ
- 󥹥ȡ뤹ѥåơ
- aptitude λۤΥˤĤƷ֤ޤ
+ "cancel panding actions" Ƥ
  ɬפʶΰϡaptitude 饿򤷤Τ褦ˡ
  tasksel 侩ѥå򥤥󥹥ȡ뤷ʤ֤Ƿꤹɬפޤ
 -->
@@ -266,11 +268,14 @@
 <para>
 
 <!--
-The base installation for i386 using the default 2.4 kernel,
-including all standard packages, requires 573MB of disk space.
+The base installation for i386 using the default 2.6 kernel,
+including all standard packages, requires 585MB of disk space.
+A minimal base installation, without the standard task selected,
+will take 365MB.
 -->
-ǥեȤ 2.4 ͥѤ i386 Ѥδܥ󥹥ȡϡ
-ɸѥåޤȡ573MB Υǥΰ褬ɬפǤ
+ǥեȤ 2.6 ͥѤ i386 Ѥδܥ󥹥ȡϡ
+ɸѥåޤȡ585MB Υǥΰ褬ɬפǤ
+ɸॿ򤷤ʤǾΥ١󥹥ȡˤϡ365MB ɬפǤ
 
 </para><para>
 
@@ -325,19 +330,29 @@
   <entry>Desktop</entry>
 -->
   <entry>ǥȥå</entry>
-  <entry>1392</entry>
-  <entry>460</entry>
-  <entry>1852</entry>
+  <entry>1258</entry>
+  <entry>418</entry>
+  <entry>1676</entry>
 </row>
 
 <row>
 <!--
+  <entry>Laptop</entry>
+-->
+  <entry>åץȥå</entry>
+  <entry>46</entry>
+  <entry>16</entry>
+  <entry>62</entry>
+</row>
+
+<row>
+<!--
   <entry>Web server</entry>
 -->
   <entry>֥</entry>
-  <entry>36</entry>
-  <entry>12</entry>
-  <entry>48</entry>
+  <entry>35</entry>
+  <entry>11</entry>
+  <entry>46</entry>
 </row>
 
 <row>
@@ -345,9 +360,9 @@
   <entry>Print server</entry>
 -->
   <entry></entry>
-  <entry>168</entry>
-  <entry>58</entry>
-  <entry>226</entry>
+  <entry>326</entry>
+  <entry>95</entry>
+  <entry>421</entry>
 </row>
 
 <row>
@@ -365,8 +380,8 @@
   <entry>File server</entry>
 -->
   <entry>ե륵</entry>
-  <entry>47</entry>
-  <entry>24</entry>
+  <entry>50</entry>
+  <entry>21</entry>
   <entry>71</entry>
 </row>
 
@@ -375,9 +390,9 @@
   <entry>Mail server</entry>
 -->
   <entry>᡼륵</entry>
-  <entry>10</entry>
-  <entry>3</entry>
   <entry>13</entry>
+  <entry>5</entry>
+  <entry>18</entry>
 </row>
 
 <row>
@@ -385,9 +400,9 @@
   <entry>SQL database</entry>
 -->
   <entry>SQL ǡ١</entry>
-  <entry>66</entry>
-  <entry>21</entry>
-  <entry>87</entry>
+  <entry>24</entry>
+  <entry>8</entry>
+  <entry>32</entry>
 </row>
 
 </tbody>
@@ -396,11 +411,11 @@
 <note><para>
 
 <!--
-The <emphasis>Desktop</emphasis> task will install both the GNOME and KDE
-desktop environments.
+The <emphasis>Desktop</emphasis> task will install the GNOME desktop
+environment.
 -->
 <emphasis>ǥȥå</emphasis> ϡ
-GNOME  KDE ξǥȥå״Ķ򥤥󥹥ȡ뤷ޤ
+GNOME ǥȥå״Ķ򥤥󥹥ȡ뤷ޤ
 
 </para></note>
 
Index: ja/using-d-i/modules/partman.xml
===================================================================
--- ja/using-d-i/modules/partman.xml	(ӥ 42736)
+++ 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: 41871 -->
+<!-- original version: 42323 -->
 
    <sect3 id="partman">
    <title>ǥΥѡƥʬ</title>
@@ -35,17 +35,38 @@
 If you choose guided partitioning, you may have three options: to create
 partitions directly on the hard disk (classic method), or to create them
 using Logical Volume Management (LVM), or to create them using encrypted
-LVM. Note: the option to use (encrypted) LVM may not be available on all
-architectures.
+LVM<footnote>
 -->
 ɥѡƥʬ򤷤硢褬 3 Ĥޤ
 ϡɥǥľܥѡƥ (饷å) ˡ
 ܥ塼 (LVM) Ѥˡ
-Ź沽 LVM ѤˡǤ
-: (Ź沽ޤ) LVM Ѥˡϡ
+Ź沽 LVM<footnote>
+
+<para>
+<!--
+The installer will encrypt the LVM volume group using a 256 bit AES key and
+makes use of the kernel's <quote>dm-crypt</quote> support.
+-->
+Υ󥹥ȡǤϡLVM ܥ塼॰롼פ 256 bit AES ǰŹ沽
+ͥ <quote>dm-crypt</quote> ݡȤѤޤ
+</para>
+
+<!--
+</footnote>.
+-->
+</footnote> ѤˡǤ
+
+</para>
+<note><para>
+
+<!--
+The option to use (encrypted) LVM may not be available on all architectures.
+-->
+(Ź沽ޤ) LVM Ѥˡϡ
 ٤ƤΥƥǻѤǤ櫓ǤϤޤ
 
-</para><para>
+</para></note>
+<para>
 
 <!--
 When using LVM or encrypted LVM, the installer will create most
@@ -64,6 +85,21 @@
 üʥե졼Τ餺礭ʥѡƥɤळȤǤޤ
 Τᡢʤ (Ŀ) ǡˤʤ륻ƥ󶡤ޤ
 
+</para><para>
+
+<!--
+When using encrypted LVM, the installer will also automatically erase the
+disk by writing random data to it. This further improves security (as it
+makes it impossible to tell which parts of the disk are in use and also
+makes sure that any traces of previous installations are erased), but may
+take some time depending on the size of your disk.
+-->
+Ź沽 LVM Ѥ硢󥹥ȡϡ
+ưŪ˥ʥǡ񤭹ǥǥõޤ
+εǽϡ(ǥλΰʬʤ
+󥹥ȡ뤷ƤΤκפõ) ƥ夷ޤ
+ǥΥˤꡢ֤뤳Ȥޤ
+
 </para>
 <note><para>
 
Index: ja/using-d-i/modules/pkgsel.xml
===================================================================
--- ja/using-d-i/modules/pkgsel.xml	(ӥ 42736)
+++ 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: 35518 -->
+<!-- original version: 42551 -->
 
    <sect3 id="pkgsel">
 <!--
@@ -45,9 +45,9 @@
 
 <!--
 You should know that to present this list, the installer is merely
-invoking the <command>tasksel</command> program. It can be
-run at any time after installation to install (or remove) more
-packages, or you can use a more fine-grained tool such as <command>aptitude</command>.
+invoking the <command>tasksel</command> program. It can be run at any
+time after installation to install more packages or remove them), or
+you can use a more fine-grained tool such as <command>aptitude</command>.
 If you are looking for a specific single package, after
 installation is complete, simply run <userinput>aptitude install
 <replaceable>package</replaceable></userinput>, where
@@ -56,9 +56,8 @@
 -->
 ɽꥹȤϡ
 󥹥ȡ餬ñ <command>tasksel</command> ץưƤ
-ȤȤΤäƤƤ
-󥹥ȡθǡäȥѥå򥤥󥹥ȡ (⤷Ϻ) 
-ΤˤĤǤ¹ԤǤޤ
+ȤȤΤäƤƤ󥹥ȡθǡ
+¾Υѥå򥤥󥹥ȡ롦ΤˤĤǤ¹ԤǤޤ
 ޤ <command>aptitude</command> Τ褦ʡ꤭٤ġѤǤޤ
 󥹥ȡ봰λ塢 1 ѥåõΤʤ顢ñ 
 <userinput>aptitude install <replaceable>ѥå̾</replaceable></userinput>
@@ -77,6 +76,45 @@
 </para><para>
 
 <!--
+Some tasks may be pre-selected based on the characteristics of the
+computer you are installing. If you disagree with these selections you can
+un-select the tasks. You can even opt to install no tasks at all at this point.
+-->
+ĤΥϡ󥹥ȡ뤹륳ԥ塼ˤꡢ
+餫򤵤Ƥǽޤ
+򤵤ƤΤʤϡΥϤޤ
+Фʤ褦ˤǤޤ
+
+</para>
+<note><para>
+
+<!--
+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.
+-->
+<quote>ǥȥå״Ķ</quote> ϡ
+Gnome ǥȥå״Ķ򥤥󥹥ȡ뤷ޤ
+ߥ󥹥ȡ󶡤Ƥ륪ץǤϡ
+KDE Τ褦¾Υǥȥå״ĶǤޤ
+
+</para><para>
+
+<!--
+It is however 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.
+-->
+preseed (<xref linkend="preseed-pkgsel"/> ) Ѥꡢ
+󥹥ȡεư˥֡ȥץץȤ 
+<literal>tasksel/first=kde-desktop</literal> Ȼꤷơ
+󥹥ȡ餬 KDE 򥤥󥹥ȡ뤹褦ˤǤޤ
+
+</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
@@ -85,6 +123,7 @@
 򤷤顢<guibutton>Ok</guibutton> 򤷤Ƥ
 <command>aptitude</command> 򤷤ѥåΥ󥹥ȡ򳫻Ϥޤ
 
+</para>
 <note><para>
 
 <!--
@@ -95,21 +134,10 @@
 򥹥ڡСǥȥǤޤ
 
 </para></note>
+<para>
 
-<note><para>
 
-<!--
-Note that some tasks may be pre-selected based on the characteristics of the
-computer you are installing. If you disagree with these selections you can
-un-select the tasks. You can even opt to install no tasks at all at this point.
--->
-ĤΥϡ󥹥ȡ뤷Ƥ륳ԥ塼˹碌ơ
-餫򤵤Ƥǽޤ
-֤ʤСΥǤޤ
-ǡ򤹤٤򤷤ʤ褦ˤǤޤ
 
-</para></note>
-
 </para><para>
 
 <!--
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml	(ӥ 42736)
+++ 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: 40875 -->
+<!-- original version: 42485 -->
 
  <sect1 id="boot-parms"><title>֡ȥѥ᡼</title>
 <para>
@@ -133,19 +133,12 @@
 <para>
 
 <!--
-Note that the 2.4 kernel accepts a maximum of 8 command line options and
-8 environment options (including any options added by default for the
-installer). If these numbers are exceeded, 2.4 kernels will drop any
-excess options. With kernel 2.6.9 or newer,
-you can use 32 command line options and 32 environment options.
+With current kernels (2.6.9 or newer) you can use 32 command line options and
+32 environment options. If these numbers are exceeded, the kernel will panic.
 -->
-ͥ 2.4 Ϻǥޥɥ饤󥪥ץ 8 Ĥȡ
-Ķץ 8 ļդޤ
-(󥹥ȡ餬ǥեȤղä륪ץޤ)
-⤷οĶ᤹ȡ
-2.4 ͥĶᤷץ̵뤷Ƥޤޤ
-2.6.9 ͥʹߤǤϡ
+ߤΥͥ (2.6.9 ʹ) Ǥϡ
 ޥɥ饤󥪥ץ 32 ĤȴĶץ 32 ĻѤǤޤ
+ۤȡͥϥѥ˥åƤޤޤ
 
 </para>
 
@@ -525,6 +518,24 @@
 </varlistentry>
 
 <varlistentry>
+<term>auto-install/enabled</term>
+<listitem><para>
+
+<!--
+Delay questions that are normally asked before preseeding is possible until
+after the network is configured. Short form: <userinput>auto=true</userinput>
+See <xref linkend="preseed-auto"/> for details about using this to
+automate installs.
+-->
+̾ preseed ˹Ԥ򡢥ͥåȥ꤬ޤ٤餻ޤ
+û̷: <userinput>auto=true</userinput>
+ư󥹥ȡǤΥѥ᡼Ѥݤˤϡ
+<xref linkend="preseed-auto"/> 
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
 <term>cdrom-detect/eject</term>
 <listitem><para>
 
@@ -607,5 +618,75 @@
 
 </variablelist>
   </sect2>
+
+<!--
+  <sect2 id="module-parms"><title>Passing parameters to kernel modules</title>
+-->
+  <sect2 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
+an installation than when booting an installed system, it is not possible
+to pass parameters to modules as you would normally do. Instead, you need
+to use a special syntax recognized by the installer which will then make
+sure that the parameters are saved in the proper configuration files and
+will thus be used when the modules are actually loaded. The parameters
+will also be propagated automatically to the configuration for the installed
+system.
+-->
+ͥ˥ѥ뤵Ƥɥ饤Фξ硢
+ͥΥɥȤ˵ܤƤˡǥѥ᡼Ϥޤ
+ɥ饤Ф⥸塼Ȥƥѥ뤵Ƥꡢ
+󥹥ȡ뤷ƥεưˡ
+󥹥ȡ٤ƥͥ⥸塼ɤ߹ߤ㴳ۤʤ硢
+̾ˡǤϥ⥸塼˥ѥ᡼Ϥޤ
+ˡ󥹥ȡ餬ǧǤüʸˡѤơ
+ѥ᡼Ŭڤե˳Ǽ
+ºݤ˥⥸塼ɤݤ˻Ѥɬפޤ
+ѥ᡼ϼưŪ˥󥹥ȡ뤷ƥŤޤ
+
+</para><para>
+
+<!--
+Note that it is now quite rare that parameters need to be passed to modules.
+In most cases the kernel will be able to probe the hardware present in a
+system and set good defaults that way. However, in some situations it may
+still be needed to set parameters manually.
+-->
+⥸塼˥ѥ᡼ϤʤФʤʤȤΤϡ
+ˤޤʾȤȤդƤ
+ۤȤɤξ硢ͥϥƥˤϡɥͤ򸡽Ф
+ŬڤͤꤷƤޤ
+Ǥϡ̤˥ѥ᡼ꤷʤФʤޤ
+
+</para><para>
+
+<!--
+The syntax to use to set parameters for modules is:
+-->
+⥸塼˥ѥ᡼ꤹʸˡϰʲΤ褦ˤʤޤ
+
+<informalexample><screen>
+<replaceable>module_name</replaceable>.<replaceable>parameter_name</replaceable>=<replaceable>value</replaceable>
+</screen></informalexample>
+
+<!--
+If you need to pass multiple parameters to the same or different modules,
+just repeat this. For example, to set an old 3Com network interface card
+to use the BNC (coax) connector and IRQ 10, you would pass:
+-->
+1 ĤʤʣΥ⥸塼ˡʣΥѥ᡼ϤϷ֤Ƥ
+㤨СŤ 3Com Υͥåȥ󥿡եɤ BNC (coax) Ѥ
+IRQ 10 ꤹϡʲΤ褦ˤޤ
+
+<informalexample><screen>
+3c509.xcvr=3 3c509.irq=10
+</screen></informalexample>
+
+</para>
+  </sect2>
  </sect1>