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

[d-i doc] appendix 翻訳更新



鍋太郎です。

新訳のgraphical.xml以外のappendix以下のファイルの訳を追随しました。
よろしければチェックをお願いします。

$ tar ztf d-i-update0106.tar.gz
ja/appendix/chroot-install.xml
ja/appendix/files.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-update0106.tar.gz
Description: Binary data

Index: ja/appendix/chroot-install.xml
===================================================================
--- ja/appendix/chroot-install.xml	(ӥ 43899)
+++ 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: 41453 -->
+<!-- original version: 43841 -->
 
  <sect1 id="linux-upgrade">
 <!--
@@ -59,29 +59,32 @@
 <!--
 With your current *nix partitioning tools, repartition the hard
 drive as needed, creating at least one filesystem plus swap. You
-need at least 150MB of space available for a console only install,
-or at least 300MB if you plan to install X.
+need around 350MB of space available for a console only install,
+or about 1GB if you plan to install X (more if you intend to
+install desktop environments like GNOME or KDE).
 -->
  *nix Υѡƥʬġǡ
 åפȺ 1 ĥե륷ƥ褦
 ϡɥǥ˾źäƺʬ䤷Ƥ
-󥽡ΤߤΥ󥹥ȡˤϡ 150MB ζΰ褬ɬפǤ
-X 򥤥󥹥ȡ뤹ͽʤ 300MB ɬפǤ
+󥽡ΤߤΥ󥹥ȡˤϡ 350MB ζΰ褬ɬפǤ
+X 򥤥󥹥ȡ뤹ͽʤ 1GB 
+(GNOME  KDE Τ褦ʥǥȥå״Ķ򥤥󥹥ȡ뤹Ϥä) 
+ɬפǤ
 
 </para><para>
 
 <!--
-Create file systems on your partitions. For example, to create an
+Next, create file systems on the partitions. For example, to create an
 ext3 file system on partition <filename>/dev/hda6</filename> (that's
 our example root partition):
 -->
-ѡƥ˥ե륷ƥƤ
+ˡѡƥ˥ե륷ƥƤ
 㤨С<filename>/dev/hda6</filename> ѡƥˡ
 ext3 ե륷ƥˤϡʲΤ褦ˤޤ
 (ǤϤΥѡƥ root ѡƥȤޤ)
 
 <informalexample><screen>
-# mke2fs -j /dev/hda6
+# mke2fs -j /dev/<replaceable>hda6</replaceable>
 </screen></informalexample>
 
 <!--
@@ -102,9 +105,9 @@
 ɤؤƤ)
 
 <informalexample><screen>
-# mkswap /dev/hda5
+# mkswap /dev/<replaceable>hda5</replaceable>
 # sync; sync; sync
-# swapon /dev/hda5
+# swapon /dev/<replaceable>hda5</replaceable>
 </screen></informalexample>
 
 <!--
@@ -121,7 +124,7 @@
 
 <informalexample><screen>
 # mkdir /mnt/debinst
-# mount /dev/hda6 /mnt/debinst
+# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst
 </screen></informalexample>
 
 </para>
@@ -275,6 +278,7 @@
 ʲΤĤѤƤ
 
 <userinput>alpha</userinput>,
+<userinput>amd64</userinput>,
 <userinput>arm</userinput>,
 <userinput>hppa</userinput>,
 <userinput>i386</userinput>,
@@ -288,7 +292,7 @@
 
 <informalexample><screen>
 # /usr/sbin/debootstrap --arch ARCH &releasename; \
-     /mnt/debinst http://http.us.debian.org/debian
+     /mnt/debinst http://ftp.us.debian.org/debian
 </screen></informalexample>
 
 </para>
@@ -300,16 +304,28 @@
 
 <!--
 Now you've got a real Debian system, though rather lean, on disk.
-<command>Chroot</command> into it:
+<command>chroot</command> into it:
 -->
 ǥǥ˿ Debian ƥ 
 (֤椬Ǥ) ޤ
  <command>chroot</command> Ƥ
 
 <informalexample><screen>
-# LANG= chroot /mnt/debinst /bin/bash
+# LANG=C chroot /mnt/debinst /bin/bash
 </screen></informalexample>
 
+<!--
+After chrooting you may need to set the terminal definition to be
+compatible with the Debian base system, for example:
+-->
+chroot ǡ
+Debian ܥƥȸߴΤüˤɬפ뤫⤷ޤ
+㤨СʲΤ褦ˤޤ
+
+<informalexample><screen>
+# export TERM=<replaceable>xterm-color</replaceable>
+</screen></informalexample>
+
 </para>
 
    <sect3>
@@ -340,8 +356,8 @@
 /dev/XXX         none          swap    sw                       0    0
 proc             /proc         proc    defaults                 0    0
 
-/dev/fd0         /mnt/floppy   auto    noauto,rw,sync,user,exec 0    0
-/dev/cdrom       /mnt/cdrom    iso9660 noauto,ro,user,exec      0    0
+/dev/fd0         /media/floppy auto    noauto,rw,sync,user,exec 0    0
+/dev/cdrom       /media/cdrom  iso9660 noauto,ro,user,exec      0    0
 
 /dev/XXX         /tmp          ext3    rw,nosuid,nodev          0    2
 /dev/XXX         /var          ext3    rw,nosuid,nodev          0    2
@@ -351,18 +367,36 @@
 
 <!--
 Use <userinput>mount -a</userinput> to mount all the file systems you
-have specified in your <filename>/etc/fstab</filename>, or to mount
-file systems individually use:
+have specified in your <filename>/etc/fstab</filename>, or, to mount
+file systems individually, use:
 -->
 <filename>/etc/fstab</filename> ǻꤷե륷ƥ
 ٤ƥޥȤˤ <userinput>mount -a</userinput> ȤƤ
 ޤե륷ƥ̡˥ޥȤˤϡʲΤ褦ˤƤ
 
 <informalexample><screen>
-# mount /path   # : mount /usr
+# mount /path   # e.g.: mount /usr
 </screen></informalexample>
 
 <!--
+Current Debian systems have mountpoints for removable media under
+<filename>/media</filename>, but keep compatibility symlinks in
+<filename>/</filename>. Create these as as needed, for example:
+-->
+ Debian ƥǤϡࡼХ֥ǥΥޥȥݥȤ
+<filename>/media</filename> ˤƤޤ
+<filename>/</filename> ˥ܥå󥯤֤ߴݤäƤޤ
+ʲΤ褦ˡɬפǤкƤ
+
+<informalexample><screen>
+# cd /media
+# mkdir cdrom0
+# ln -s cdrom0 cdrom
+# cd /
+# ln -s media/cdrom
+</screen></informalexample>
+
+<!--
 You can mount the proc file system multiple times and to arbitrary
 locations, though <filename>/proc</filename> is customary. If you didn't use
 <userinput>mount -a</userinput>, be sure to mount proc before continuing:
@@ -395,27 +429,28 @@
    </sect3>
 
    <sect3>
-   <title>ܡɤ</title>
+<!--
+   <title>Setting Timezone</title>
+-->
+   <title>ॾ</title>
 <para>
 
 <!--
-To configure your keyboard:
+An option in the file <filename>/etc/default/rcS</filename> determines
+whether the system will interpret the hardware clock as being set to UTC
+or local time. The following command allow you to set that and choose
+your timezone.
 -->
-ܡɤꤹˤϼΤ褦ˤƤ
+<filename>/etc/default/rcS</filename> եˤǡ
+ƥबϡɥλפ UTC ȤƲ᤹뤫
+ϻ֤ȤƤ᤹뤫ꤷޤ
+ʲΥޥɤǡ嵭ȥॾԤޤ
 
 <informalexample><screen>
-# dpkg-reconfigure console-data
+# editor /etc/default/rcS
+# tzconfig
 </screen></informalexample>
 
-</para><para>
-
-<!--
-Note that the keyboard cannot be set while in the chroot, but will be
-configured for the next reboot.
--->
-chroot ǤϡܡɤǤޤ󤬡
-Ƶưͭˤʤ뤳ȤդƤ
-
 </para>
    </sect3>
 
@@ -506,6 +541,24 @@
 </screen></informalexample>
 
 <!--
+And a basic <filename>/etc/hosts</filename> with IPv6 support:
+-->
+ޤIPv6 򥵥ݡȤŪ <filename>/etc/hosts</filename> 
+ϰʲΤ褦ˤޤ
+
+<informalexample><screen>
+127.0.0.1 localhost DebianHostName
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+</screen></informalexample>
+
+<!--
 If you have multiple network cards, you should arrange the names of
 driver modules in the <filename>/etc/modules</filename> file into the
 desired order. Then during boot, each card will be associated with the
@@ -521,17 +574,56 @@
    </sect3>
 
    <sect3>
-   <title></title>
+<!--
+   <title>Configure Apt</title>
+-->
+   <title>apt </title>
 <para>
 
 <!--
+Debootstrap will have created a very basic
+<filename>/etc/apt/sources.list</filename> that will allow installing
+additional packages. However, you may want to add some additional sources,
+for example for source packages and security updates:
+-->
+debootstrap ϡɲåѥå򥤥󥹥ȡ뤹롢
+˴Ū <filename>/etc/apt/sources.list</filename> ޤ
+¾ΥѥåɲäʤȻפޤ
+ʲϥѥåȥƥɲäƤޤ
+
+<informalexample><screen>
+deb-src http://ftp.us.debian.org/debian etch main
+
+deb http://security.debian.org/ etch/updates main
+deb-src http://security.debian.org/ etch/updates main
+</screen></informalexample>
+
+<!--
+Make sure to run <userinput>aptitude update</userinput> after you have
+made changes to the sources list.
+-->
+sources list 򹹿顢
+<userinput>aptitude update</userinput> ɬ¹ԤƤ
+
+</para>
+   </sect3>
+
+   <sect3>
+<!--
+   <title>Configure Locales and Keyboard</title>
+-->
+   <title>ȥܡɤ</title>
+<para>
+
+<!--
 To configure your locale settings to use a language other than
 English, install the <classname>locales</classname> support package
-and configure it:
+and configure it. Currently the use of UTF-8 locales is recommended.
 -->
 ѸʳθѤ褦򤹤뤿ˡ
-Τ褦˥򥵥ݡȤѥå 
-(<classname>locales</classname>) 򥤥󥹥ȡ롦ꤷޤ
+򥵥ݡȤѥå 
+(<classname>locales</classname>) 򥤥󥹥ȡ롦ꤷƤ
+ߤ UTF-8 ѤΤ򤪾ᤷޤ
 
 <informalexample><screen>
 # aptitude install locales
@@ -539,16 +631,24 @@
 </screen></informalexample>
 
 <!--
-NOTE: <classname>apt</classname> must be configured beforehand by creating
-a sources.list and running <command>aptitude update</command>.
-Before using locales with character sets other than ASCII or latin1,
-please consult the appropriate localisation HOWTO.
+To configure your keyboard (if needed):
 -->
-: 餫 sources.list κ apt-get update ¹Ԥơ
-<classname>apt</classname> ꤷƤʤФʤޤ
-ASCII  latin1 ʳʸåȤĥѤˤϡ
-Ŭڤ localization HOWTO Ĵ٤Ƥ
+(ɬפʤ) ʲΤ褦˥ܡɤԤäƤ
 
+<informalexample><screen>
+# aptitude install console-data
+# dpkg-reconfigure console-data
+</screen></informalexample>
+
+</para><para>
+
+<!--
+Note that the keyboard cannot be set while in the chroot, but will be
+configured for the next reboot.
+-->
+chroot ǤϡܡɤǤޤ󤬡
+Ƶưͭˤʤ뤳ȤդƤ
+
 </para>
    </sect3>
   </sect2>
@@ -559,25 +659,100 @@
 
 <!--
 If you intend to boot this system, you probably want a Linux kernel
-and a boot loader. Identify available pre-packaged kernels with
+and a boot loader. Identify available pre-packaged kernels with:
 -->
 ΥƥưǤ褦ˤʤ顢
 餯 Linux ͥȥ֡ȥɬפǤ礦
-Τ褦ˤơ餫ѥåͥǧƤ
+ʲΤ褦ˤơѥåѤߥͥǧƤ
 
 <informalexample><screen>
 # apt-cache search linux-image
 </screen></informalexample>
 
+</para><para>
+
 <!--
-Then install your choice using its package name.
+If you intend to use a pre-packaged kernel, you may want to create the
+configuration file <filename>/etc/kernel-img.conf</filename> before you
+do so. Here's an example file:
 -->
-ˡѥå̾Ȥäƥ󥹥ȡ뤷Ƥ
+ѥåѤߥͥѤͽǤС
+ <filename>/etc/kernel-img.conf</filename> 
+եʤȻפޤ
+ʲ˥ץեǤޤ
 
 <informalexample><screen>
+# Kernel image management overrides
+# See kernel-img.conf(5) for details
+do_symlinks = yes
+relative_links = yes
+do_bootloader = yes
+do_bootfloppy = no
+do_initrd = yes
+link_in_boot = no
+</screen></informalexample>
+
+</para><para>
+
+<!--
+For detailed information about this file and the various options, consult
+its man page which will be available after installing the
+<classname>kernel-package</classname> package. We recommend that you check
+that the values are appropriate for your system.
+-->
+Υե͡ʥץξܺ٤ϡ
+<classname>kernel-package</classname> ѥå󥹥ȡͭˤʤ 
+man ڡƤޤ
+ǡʤΥƥŬڤͤåΤ򤪾ᤷޤ
+
+</para><para arch="x86">
+
+<!--
+If you intend to use <classname>grub</classname> as your bootloader, you
+can set the <literal>do_bootloader</literal> option to <quote>no</quote>.
+To automatically update your <filename>/boot/grub/menu.lst</filename> on
+installation or removal of Debian kernels, add the following lines:
+-->
+֡ȥ <classname>grub</classname> Ѥ硢
+<literal>do_bootloader</literal>ץ <quote>no</quote> 
+ȥåȤǤޤ
+Debian Υͥ򥤥󥹥ȡ롦
+<filename>/boot/grub/menu.lst</filename> 򹹿ˤϡ
+ʲιԤɲäƤ
+
+<informalexample><screen>
+postinst_hook = update-grub
+postrm_hook   = update-grub
+</screen></informalexample>
+
+<!--
+For the <classname>lilo</classname> bootloader, the value of
+<literal>do_bootloader</literal> needs to be <quote>yes</quote>.
+-->
+<classname>lilo</classname> ֡ȥǤϡ
+<literal>do_bootloader</literal> ͤ <quote>yes</quote> 
+Ǥɬפޤ
+
+</para><para>
+
+<!--
+Then install the kernel package of your choice using its package name.
+-->
+줫顢ѥå̾Υͥѥå򥤥󥹥ȡ뤷Ƥ
+
+<informalexample><screen>
 # aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>
 </screen></informalexample>
 
+<!--
+If you did not create a <filename>/etc/kernel-img.conf</filename> before
+installing a pre-packaged kernel, you may be asked some questions during
+its installation that refer to it.
+-->
+ѥåѤߥͥ򥤥󥹥ȡ뤹 
+<filename>/etc/kernel-img.conf</filename> ʤ硢
+󥹥ȡ˴Ϣ䤬ԤȻפޤ
+
 </para>
   </sect2>
 
@@ -607,7 +782,8 @@
 add an entry for the Debian install to your existing grub 
 <filename>menu.lst</filename> or <filename>lilo.conf</filename>.  For
 <filename>lilo.conf</filename>, you could also copy it to the new system and
-edit it there. After you are done editing, call lilo (remember it will use
+edit it there. After you are done editing, call <command>lilo</command>
+(remember it will use
 <filename>lilo.conf</filename> relative to the system you call it from).
 -->
 ֡ȥΥåȥåפˤĤƤϡ
@@ -618,20 +794,43 @@
 <filename>lilo.conf</filename> ˡ
 Debian 󥹥ȡؤΥȥñ˲äƤ
 lilo.conf ǤϿƥˤ򥳥ԡԽƤ
-Խ򽪤塢lilo ƤӽФƤ
+Խ򽪤塢<command>lilo</command> ƤӽФƤ
 (lilo ƤӽФƥȴطȤΡ
 <filename>lilo.conf</filename> ȤȤȤФƤƤ)
 
 </para><para arch="x86">
 
 <!--
+Installing and setting up <classname>grub</classname> is as easy as:
+-->
+<classname>grub</classname> Υ󥹥ȡϰʲΤ褦˴ñǤ
+
+<informalexample><screen>
+# aptitude install grub
+# grub-install /dev/<replaceable>hda</replaceable>
+# update-grub
+</screen></informalexample>
+
+<!--
+The second command will install <command>grub</command> (in this case in
+the MBR of <literal>hda</literal>). The last command will create a sane
+and working <filename>/boot/grub/menu.lst</filename>.
+-->
+2 ܤΥޥɤǡ<command>grub</command>  
+(ξ <literal>hda</literal>  MBR ) 󥹥ȡ뤷ޤ
+ǸΥޥɤǡ
+ư <filename>/boot/grub/menu.lst</filename> ޤ
+
+</para><para arch="x86">
+
+<!--
 Here is a basic <filename>/etc/lilo.conf</filename> as an example:
 -->
 ʲϴŪ <filename>/etc/lilo.conf</filename> Ǥ
 
 <informalexample><screen>
-boot=/dev/hda6
-root=/dev/hda6
+boot=/dev/<replaceable>hda6</replaceable>
+root=/dev/<replaceable>hda6</replaceable>
 install=menu
 delay=20
 lba32
@@ -688,4 +887,47 @@
 
 </para>
   </sect2>
+
+  <sect2>
+<title>ž夲</title>
+<para>
+
+<!--
+As mentioned earlier, the installed system will be very basic. If you
+would like to make the system a bit more mature, there is an easy method
+to install all packages with <quote>standard</quote> priority:
+-->
+Ǥ˽Ҥ٤褦ˡ󥹥ȡ뤷ƥ˴Ūʪˤʤޤ
+äϤƥˤС
+ͥ٤ <quote>standard</quote> Υѥå
+٤ƥ󥹥ȡ뤹ñˡʲΤ褦ˤޤ
+
+<informalexample><screen>
+# tasksel install standard
+</screen></informalexample>
+
+<!--
+Of course, you can also just use <command>aptitude</command> to install
+packages individually.
+-->
+ <command>aptitude</command> ǡ
+ġΥѥå򥤥󥹥ȡ뤹뤳ȤǤޤ
+
+</para><para>
+
+<!--
+After the installation there will be a lot of downloaded packages in
+<filename>/var/cache/apt/archives/</filename>. You can free up some
+diskspace by running:
+-->
+󥹥ȡ뤬ȡɤѥå 
+<filename>/var/cache/apt/archives/</filename> ̤ˤޤ
+ʲΤ褦ˤơǥΰǤޤ
+
+<informalexample><screen>
+# aptitude clean
+</screen></informalexample>
+
+</para>
+  </sect2>
  </sect1>
Index: ja/appendix/files.xml
===================================================================
--- ja/appendix/files.xml	(ӥ 43899)
+++ ja/appendix/files.xml	(ȥԡ)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42302 -->
+<!-- original version: 43841 -->
 
 
  <sect1 id="linuxdevices"><title>Linux ΥǥХ</title>
@@ -251,35 +251,63 @@
  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
+ be started and show the sizes for the task. Use "cancel pending 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.
+
+ The size for the minimal base system should be determined after running
+ 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
+ should be installed after which the size of the standard system should be
+ determined using the same method.
  d-iޥ˥奢ƥʸ
  Υ򤻤˥󥹥ȡ뤷֤ tasksel  "new-install" 
  ץĤƼ¹ԤΥꤷƤ
  "manual selection" ץѤƥ򤷤褦Ȥȡ
  aptitude Ѥ˵ươ򼨤ޤ
- "cancel panding actions" Ƥ
+ "cancel pending actions" Ƥ
  ɬפʶΰϡaptitude 饿򤷤Τ褦ˡ
  tasksel 侩ѥå򥤥󥹥ȡ뤷ʤ֤Ƿꤹɬפޤ
+
+ ܥƥΥϡ'aptitude clean' ¹Ԥǡ
+ 'du -hsx /' Ƿꤹ٤Ǥstandard system Υϡ
+ Ʊˡ "Standard system" Υ󥹥ȡ˷ꤹ٤Ǥ
 -->
 
 <para>
 
 <!--
-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.
+A standard installation for the i386 architecture, including all standard
+packages and using the default 2.6 kernel, takes up 442MB of disk space.
+A minimal base installation, without the <quote>Standard system</quote>
+task selected, will take 230MB.
 -->
-ǥեȤ 2.6 ͥѤ i386 Ѥδܥ󥹥ȡϡ
-ɸѥåޤȡ585MB Υǥΰ褬ɬפǤ
-ɸॿ򤷤ʤǾΥ١󥹥ȡˤϡ365MB ɬפǤ
+i386 ƥɸѥåޤɸ।󥹥ȡǡ
+ǥեȤ 2.6 ͥѤȡ442MB ʾΥǥΰɬפȤޤ
+<quote>ɸॷƥ</quote>򤷤ʤǾδܥ󥹥ȡǤϡ
+230MB ɬפǤ礦
 
-</para><para>
+</para>
+<important><para>
 
 <!--
+In both cases this is the actual disk space used <emphasis>after</emphasis>
+the installation is finished and any temporary files deleted. It also does
+not take into account overhead used by the file system, for example for
+journal files. This means that significantly more disk space is needed both
+<emphasis>during</emphasis> the installation and for normal system use.
+-->
+ɤξ⡢
+󥹥ȡ뤬λե<emphasis></emphasis>Ρ
+ºݤΥǥΰǤ㡼ʥեΤ褦ʡ
+ե륷ƥΥСإåɤǾ񤵤̤ϴޤޤƤޤ
+ϡ󥹥ȡ<emphasis></emphasis>̾ΥƥѤǤϡ
+ä̤˥ǥΰ褬ɬפȤȤǤ
+
+</para></important>
+<para>
+
+<!--
 The following table lists sizes reported by aptitude for the tasks listed
 in tasksel. Note that some tasks have overlapping constituents, so the
 total installed size for two tasks together may be less than the total
@@ -295,15 +323,17 @@
 
 <!--
 Note that you will need to add the sizes listed in the table to the size
-of the base installation when determining the size of partitions.
+of the standard installation when determining the size of partitions.
 Most of the size listed as <quote>Installed size</quote> will end up in
-<filename>/usr</filename>; the size listed as <quote>Download size</quote>
+<filename>/usr</filename> and in <filename>/lib</filename>;
+the size listed as <quote>Download size</quote>
 is (temporarily) required in <filename>/var</filename>.
 -->
-ѡƥΥꤹȤܥ󥹥ȡΥ˲ä
+ѡƥΥꤹȤɸ।󥹥ȡΥ˲ä
 ʲɽ󤷤ɬפǤΤդƤ
-<quote>Installed size</quote> ϥ󥹥ȡ봰λ <filename>/usr</filename>
-ɬפʥ<quote>Download size</quote>  <filename>/var</filename> 
+<quote>Installed size</quote> ϥ󥹥ȡ봰λ 
+<filename>/usr</filename>  <filename>/lib</filename> ɬפʥ
+<quote>Download size</quote>  <filename>/var</filename> 
 (Ū) ɬפʥ򵭽ҤƤޤ
 
 </para><para>
@@ -327,22 +357,36 @@
 <tbody>
 <row>
 <!--
-  <entry>Desktop</entry>
+  <entry>Desktop environment</entry>
 -->
-  <entry>ǥȥå</entry>
-  <entry>1258</entry>
-  <entry>418</entry>
-  <entry>1676</entry>
+  <entry>ǥȥå״Ķ</entry>
+  <entry>1267</entry>
+  <entry>420</entry>
+  <entry>1667</entry>
 </row>
 
 <row>
 <!--
-  <entry>Laptop</entry>
+  <entry>Laptop<footnote>
+
+  <para>
+  There is a large overlap of the Laptop task with the Destop environment task.
+  If you install both, the Laptop task will only require a few MB additional
+  disk space.
+  </para>
 -->
-  <entry>åץȥå</entry>
-  <entry>46</entry>
-  <entry>16</entry>
-  <entry>62</entry>
+  <entry>åץȥå<footnote>
+
+  <para>
+  åץȥåץȥǥȥåץϤʤʣƤޤ
+  ξ󥹥ȡ뤷硢åץȥåץϥǥΰ
+   MB ɲäɬפȤǤ礦
+  </para>
+
+  </footnote></entry>
+  <entry>50</entry>
+  <entry>17</entry>
+  <entry>67</entry>
 </row>
 
 <row>
@@ -360,9 +404,9 @@
   <entry>Print server</entry>
 -->
   <entry></entry>
-  <entry>326</entry>
-  <entry>95</entry>
-  <entry>421</entry>
+  <entry>277</entry>
+  <entry>79</entry>
+  <entry>356</entry>
 </row>
 
 <row>
@@ -380,9 +424,9 @@
   <entry>File server</entry>
 -->
   <entry>ե륵</entry>
-  <entry>50</entry>
+  <entry>49</entry>
   <entry>21</entry>
-  <entry>71</entry>
+  <entry>70</entry>
 </row>
 
 <row>
@@ -425,12 +469,12 @@
 If you install in a language other than English, <command>tasksel</command>
 may automatically install a <firstterm>localization task</firstterm>, if one
 is available for your language. Space requirements differ per language;
-you should allow up to 200MB in total for download and installation.
+you should allow up to 350MB in total for download and installation.
 -->
 Ѹʳθǥ󥹥ȡ뤹硢θ줬ͭʤ 
 <command>tasksel</command>  <firstterm>ϰ貽</firstterm> 
 ưŪ˥󥹥ȡ뤷ޤ
 ɬפ̤ϸˤäưۤʤޤ
-ɤȥ󥹥ȡǺ 200MB ɬפȤʤޤ
+ɤȥ󥹥ȡǺ 350MB ɬפȤʤޤ
 </para>
  </sect1>
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml	(ӥ 43899)
+++ ja/appendix/preseed.xml	(ȥԡ)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42982 -->
+<!-- original version: 43841 -->
 
 <!--
-Be carefull with the format of this file as it is parsed to generate
+Be careful with the format of this file as it is parsed to generate
 the example preconfiguration file.
 ΥեѡƥץեΤǡ
 դƤ
@@ -495,7 +495,18 @@
 <userinput><replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>
 for any of the preseed variables listed in the examples in this appendix.
 If a value is to be used to configure packages for the target system, you
-will need to prepend the <firstterm>owner</firstterm> of the variable as in
+will need to prepend the <firstterm>owner</firstterm><footnote>
+
+<para>
+The owner of a debconf variable (or template) is normally the name of the
+package that contains the corresponding debconf template. For variables
+used in the installer itself the owner is <quote>d-i</quote>.
+Templates and variables can have more than one owner which helps to
+determine whether they can be removed from the debconf database if the
+package is purged.
+</para>
+
+</footnote> of the variable as in
 <userinput><replaceable>owner</replaceable>:<replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>.
 If you don't specify the owner, the value for the variable will not be
 copied to the debconf database in the target system and thus remain unused
@@ -505,9 +516,19 @@
 <userinput><replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>
 Τ褦Ͽˤ preseed ѿϤǤ
 ͤåȥƥΥѥåꤹ뤳Ȥ硢
+<firstterm>owner</firstterm><footnote>
+
+<para>
+debconf ѿ (ƥץ졼) νͭ (owner) ϡ
+debconf ƥץ졼Ȥ˴ޤޤ褦ˡ̾ѥå̾Ǥ
+󥹥ȡ鼫ΤѤͤϡ<quote>d-i</quote> ˤʤäƤޤ
+ƥץ졼Ȥѿϡʣ owner ơѥåݤ 
+debconf ǡ١Ǥ뤫ɤꤹΤѤޤ
+</para>
+
+</footnote> ѿ򡢤餫Ѱդ
 <userinput><replaceable>owner</replaceable>:<replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>
-ǻѤ褦ѿ <firstterm>owner</firstterm> 
-餫Ѱդɬפޤ
+ǻѤɬפޤ
 owner ꤷʤ硢
 ѿͤϥåȥƥ debconf ǡ١˥ԡ줺
 ϢѥåѤޤ
@@ -629,12 +650,12 @@
 </para><para>
 
 <!--
-The path segment of that comes from
-<literal>auto-install/defaultroot</literal>, which includes the
-directory <literal>etch</literal> by default to allow future versions
-to specify their own codename to let people migrate forwards in a
+The last part of that url (<literal>d-i/etch/./preseed.cfg</literal>)
+is taken from <literal>auto-install/defaultroot</literal>. By default
+this includes the directory <literal>etch</literal> to allow future versions
+to specify their own codename and let people migrate forwards in a
 controlled manner.  The <literal>/./</literal> bit is used to indicate
-a root relative to which subsequent paths can be anchored (for use in
+a root, relative to which subsequent paths can be anchored (for use in
 preseed/include and preseed/run).  This allows files to be specified
 either as full URLs, paths starting with / that are thus anchored, or
 even paths relative to the location where the last preseed file was
@@ -647,9 +668,10 @@
 fetched from
 <literal>http://autoserver.example.com/d-i/etch/./scripts/late_command.sh</literal>.
 -->
-ΥѥȤ <literal>auto-install/defaultroot</literal> ͳ褷ޤ
-ˤϡΥСǥɥ͡ꤷưܹԤƤ褦ˡ
-ǥեȤ <literal>etch</literal> ǥ쥯ȥ꤬ޤޤƤޤ
+URL (<literal>d-i/etch/./preseed.cfg</literal>) κǸʬϡ
+<literal>auto-install/defaultroot</literal> Ƥޤ
+ǥեȤǤϡΥСǥɥ͡ꤷưܹԤƤ褦ˡ
+<literal>etch</literal> ǥ쥯ȥ꤬ޤޤƤޤ
 <literal>/./</literal> ϡθ³ѥꤹ褦ˡ
 롼ȤХѥ򼨤ޤ (preseed/include  preseed/run ǻ)
 ˤꡢ URL / ǻϤޤѥ
@@ -665,17 +687,17 @@
 </para><para>
 
 <!--
-If there is no local DHCP or DNS infrastructure, or if you
-do not want to use the default path to the preseed.cfg, you can still
+If there is no local DHCP or DNS infrastructure, or if you do not want to
+use the default path to <filename>preseed.cfg</filename>, you can still
 use an explicit url, and if you don't use the <literal>/./</literal>
-element it will be anchored to the start of the path (i.e. the third /
-in the URL).  Here is an example that requires minimal support from
-the local network infrastructure:
+element it will be anchored to the start of the path (i.e. the third
+<literal>/</literal> in the URL).  Here is an example that requires minimal
+support from the local network infrastructure:
 -->
 긵 DHCP  DNS Υե餬ʤ䡢
-preseed.cfg ΥǥեȥѥѤʤǤ⡢
+<filename>preseed.cfg</filename> ΥǥեȥѥѤʤǤ⡢
 Ȥ URL ѤǤ<literal>/./</literal> ǤѤʤϡ
-ѥγǤޤ (㤨 URL  3 ܤ /)
+ѥγǤޤ (㤨 URL  3 ܤ <literal>/</literal>)
 ʲϡ긵Υͥåȥե餫ɬפʪΥץǤ
 
 <informalexample><screen>
@@ -714,15 +736,15 @@
 <!--
 In addition to specifying the url, you can also specify settings that
 do not directly affect the behavior of &d-i; itself, but can be passed
-through to any scripts that might be specified <literal>preseed/run</literal>
-settings in the loaded preseed file.  At present, the only example of
+through to scripts specified using <literal>preseed/run</literal>
+in the loaded preseed file.  At present, the only example of
 this is <literal>auto-install/classes</literal>, which has an alias
 <literal>classes</literal>.  This can be used thus:
 -->
 URL ꤹΤ˲äơ
 &d-i; Ȥο񤤤ˤľܱƶʤɲäǤޤ
-ɤ߹ preseed ե <literal>preseed/run</literal> ǻꤷ
-ΥץȤˤϤȤǤޤ
+ɤ߹ preseed ե <literal>preseed/run</literal> ǻꤷ
+ץȤϤȤǤޤ
 ߤΤȤ<literal>classes</literal> Ȥꥢġ
 <literal>auto-install/classes</literal> ΥץΤߤǤ
 ʲΤ褦˻Ѥޤ
@@ -825,9 +847,10 @@
 <row><entry>priority</entry><entry>debconf/priority</entry></row>
 <row><entry>file</entry><entry>preseed/file</entry></row>
 <row><entry>url</entry><entry>preseed/url</entry></row>
+<row><entry>interface</entry><entry>netcfg/choose_interface</entry></row>
 <row><entry>hostname&nbsp;&nbsp;&nbsp;</entry><entry>netcfg/get_hostname</entry></row>
 <row><entry>domain</entry><entry>netcfg/get_domain</entry></row>
-<row><entry>interface</entry><entry>netcfg/choose_interface</entry></row>
+<row><entry>protocol</entry><entry>mirror/protocol</entry></row>
 <row><entry>suite</entry><entry>mirror/suite</entry></row>
 </tbody></tgroup>
 </informaltable>
@@ -1303,13 +1326,13 @@
 <para>
 
 <!--
-Depending on the installation method you use, a mirror may be used both to
-download additional components of the installer, the base system and to
-set up the <filename>/etc/apt/sources.list</filename> for the installed
+Depending on the installation method you use, a mirror may be used to
+download additional components of the installer, to install the base system,
+and to set up the <filename>/etc/apt/sources.list</filename> for the installed
 system.
 -->
 Ѥ륤󥹥ȡˡ˰¸ޤ
-󥹥ȡɲåݡͥȤΥɤ䡢ܥƥࡢ
+󥹥ȡɲåݡͥȤΥɤ䡢ܥƥΥ󥹥ȡ롢
 󥹥ȡ뤷ƥ <filename>/etc/apt/sources.list</filename> 
 åȥåפ˥ߥ顼ѤǤޤ
 
@@ -1366,8 +1389,8 @@
 
 <!--
 Using preseeding to partition the harddisk is very much limited to what is
-supported by <classname>partman-auto</classname>. You can choose to either
-partition existing free space on a disk or a whole disk. The layout of the
+supported by <classname>partman-auto</classname>. You can choose to partition
+either existing free space on a disk or a whole disk. The layout of the
 disk can be determined by using a predefined recipe, a custom recipe from
 a recipe file or a recipe included in the preconfiguration file. It is
 currently not possible to partition multiple disks using preseeding.
@@ -1752,8 +1775,8 @@
 # if no other operating system is detected on the machine.
 d-i grub-installer/only_debian boolean true
 
-# This one makes grub-installer install to the MBR if if finds some other OS
-# too, which is less safe as it might not be able to boot that other OS.
+# This one makes grub-installer install to the MBR if it also finds some other
+# OS, which is less safe as it might not be able to boot that other OS.
 d-i grub-installer/with_other_os boolean true
 
 # Alternatively, if you want to install to a location other than the mbr,
@@ -1837,14 +1860,14 @@
 If you want to install some individual packages in addition to packages
 installed by tasks, you can use the parameter
 <classname>pkgsel/include</classname>. The value of this parameter can be
-either comma-separated or space-separated, so you can also use it easily on
-the kernel command line.
+a list of packages separated by either commas or spaces, which allows it
+to be used easily on the kernel command line as well.
 -->
 ǥ󥹥ȡ뤹ѥå˲äơ
 Υѥå򥤥󥹥ȡ뤹硢
 <classname>pkgsel/include</classname> ѥ᡼ѤǤޤ
 Υѥ᡼ͤϡͥ륳ޥɥ饤ˤΤޤϤΤǡ
-޶ڤ꤫ڤˤƤ
+ޤǶڤäѥåΥꥹȤޤ
 
 </para>
 
@@ -2050,9 +2073,10 @@
 
 # Most flexibly of all, this downloads a program and runs it. The program
 # can use commands such as debconf-set to manipulate the debconf database.
+# More than one script can be listed, separated by spaces.
 # 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
+#d-i preseed/run string foo.sh
 </screen></informalexample>
 
   </sect2>