鍋太郎です。
インストールガイドの訳を更新しました。
チェックしていただけると助かります。
よろしくお願いします。
#そろそろpo化しないと、DocBookの翻訳の保守はつらいですね。
#試してみたいと思います。
--
+--------------------------------------------------------+
倉澤 望(鍋太郎)
KURASAWA Nozomu (nabetaro) <nabetaro @ caldron.jp>
GnuPG FingerPrint:
C4E5 7063 FD75 02EB E71D 559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+
Index: ja/appendix/files.xml
===================================================================
--- ja/appendix/files.xml (revision 52184)
+++ ja/appendix/files.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46461 -->
+<!-- original version: 51571 -->
<sect1 id="linuxdevices"><title>Linux ΥǥХ</title>
@@ -373,7 +373,7 @@
<entry>Laptop<footnote>
<para>
- There is some overlap of the Laptop task with the Destop environment task.
+ There is some overlap of the Laptop task with the Desktop environment task.
If you install both, the Laptop task will only require a few MB additional
disk space.
</para>
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml (revision 52184)
+++ ja/appendix/preseed.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 50744 -->
+<!-- original version: 51573 -->
<!--
Be careful with the format of this file as it is parsed to generate
@@ -65,6 +65,19 @@
ˤꡢۤȤɤˡΥȡư
̾ΥȡǤѤǤʤħ⤢ޤ
+</para><para>
+
+<!--
+Preseeding is not required. If you use an empty preseed file, the installer
+will behave just the same way as in a normal manual installation. Each
+question you preseed will (if you got it right!) modify the installation in
+some way from that baseline.
+-->
+preseed ɬܤǤϤޤ preseed եѤȡ
+ȡ̾μưȡƱޤ
+preseed Ƽϡ(ͿƤ!) ١饤Ʊˡǡ
+ȡƤѹޤ
+
</para>
<sect2 id="preseed-methods">
@@ -1791,7 +1804,7 @@
#d-i apt-setup/use_mirror boolean false
# Select which update services to use; define the mirrors to be used.
# Values shown below are the normal defaults.
-#d-i apt-setup/services-select multi-select security, volatile
+#d-i apt-setup/services-select multiselect security, volatile
#d-i apt-setup/security_host string security.debian.org
#d-i apt-setup/volatile_host string volatile.debian.org
Index: ja/appendix/graphical.xml
===================================================================
--- ja/appendix/graphical.xml (revision 52184)
+++ ja/appendix/graphical.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 49849 -->
+<!-- original version: 51523 -->
<sect1 condition="gtk" id="graphical">
<!--
@@ -187,15 +187,21 @@
<!--
To switch to another console, you will also need to use the
<keycap>Ctrl</keycap> key, just as with the X Window System. For example,
-to switch to VT1 you would use: <keycombo> <keycap>Ctrl</keycap>
-<keycap>Left Alt</keycap> <keycap>F1</keycap> </keycombo>.
+to switch to VT2 (the first debug shell) you would use: <keycombo>
+<keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F2</keycap>
+</keycombo>. The graphical installer itself runs on VT5, so you can use
+<keycombo> <keycap>Left Alt</keycap> <keycap>F5</keycap> </keycombo>
+to switch back.
-->
̤ΥڤؤˤϡX Window System Ʊͤ
<keycap>Ctrl</keycap> Ȥɬפޤ
-㤨СVT1 ڤؤˤϡ<keycombo> <keycap>Ctrl</keycap>
-<keycap>Left Alt</keycap> <keycap>F1</keycap> </keycombo> ȤƤ
+㤨СVT2 ( 1 ǥХå) ڤؤˤϡ
+<keycombo> <keycap>Ctrl</keycap>
+<keycap>Left Alt</keycap> <keycap>F2</keycap> </keycombo> ȤƤ
+ե륤ȡ鼫ΤϡVT5 ưƤޤΤḵˤϡ
+<keycombo> <keycap>Left Alt</keycap> <keycap>F5</keycap> </keycombo>
+ȤƤ
-
</para>
</sect2>
@@ -255,23 +261,6 @@
<listitem><para>
<!--
-You should not switch to a different console while the installer is busy;
-this may cause the frontend to crash. The frontend will be restarted
-automatically, but this may still cause problems with the installation.
-Switching to another console while the installer is waiting for input
-should work without causing any problems.
--->
-եȥɤå夷ơȡαʤʤäƤޤȡ
-̤Υؤڤؤޤޤ
-եȥɤϼưŪ˺Ƶưޤ
-ȡθˤʤ뤫⤷ޤ
-̤Υڤؤݤˡ
-ȡ餬Ԥξ֤ǤСޤޤ
-
-</para></listitem>
-<listitem><para>
-
-<!--
Support for creating encrypted partitions is limited as it is not possible
to generate a random encryption key. It is possible to set up an encrypted
partition using a passphrase as encryption key.
Index: ja/using-d-i/modules/mdcfg.xml
===================================================================
--- ja/using-d-i/modules/mdcfg.xml (revision 52184)
+++ ja/using-d-i/modules/mdcfg.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 50619 -->
+<!-- original version: 51911 -->
<sect3 id="mdcfg">
<!--
@@ -242,13 +242,35 @@
ƽФƤ롢<guimenu>ѡƥ</guimenu> ˥塼
<command>partman</command> ǹԤޤ)
-</para><warning><para>
+</para><note><para>
<!--
+Make sure that the system can be booted with the partitioning scheme
+you are planning. In general it will be necessary to create a separate
+file system for <filename>/boot</filename> when using RAID for the root
+(<filename>/</filename>) file system.
+Most boot loaders <phrase arch="x86">(including lilo and grub)</phrase>
+do support mirrored (not striped!) RAID1, so using for example RAID5 for
+<filename>/</filename> and RAID1 for <filename>/boot</filename> can be
+an option.
+-->
+ײ褷Ƥѡƥʬǡ
+ƥब֡ȤǤ뤳ȤǧƤ
+̾롼 (<filename>/</filename>) ե륷ƥ RAID Ѥݤˤϡ
+<filename>/boot</filename> Ωե륷ƥˤɬפޤ
+ۤȤɤΥ֡ȥ<phrase arch="x86"> (lilo grub ʤ) </phrase>ϡ
+ߥ顼 (ȥ饤ԥǤϤʤ!) RAID1 ݡȤƤޤ
+Τᡢ<filename>/</filename> RAID5 Ѥ
+<filename>/boot</filename> RAID1 Ѥ㤬ޤ
+
+</para></note>
+<warning><para>
+
+<!--
Support for MD is a relatively new addition to the installer.
You may experience problems for some RAID levels and in combination
with some bootloaders if you try to use MD for the root
-(<filename>/</filename>) filesystem. For experienced users, it may be
+(<filename>/</filename>) file system. For experienced users, it may be
possible to work around some of these problems by executing some
configuration or installation steps manually from a shell.
-->
Index: ja/using-d-i/modules/apt-setup.xml
===================================================================
--- ja/using-d-i/modules/apt-setup.xml (revision 52184)
+++ ja/using-d-i/modules/apt-setup.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 49871 -->
+<!-- original version: 51744 -->
<sect3 id="apt-setup">
<!--
@@ -105,6 +105,102 @@
</para>
+ <sect4 id="apt-setup-cdset">
+<!--
+ <title>Installing from more than one CD or DVD</title>
+-->
+ <title>2 ʾ CD/DVD ǤΥȡ</title>
+
+<para>
+
+<!--
+If you are installing from a CD or a DVD that is part of a larger set,
+the installer will ask if you want to scan additional CDs or DVDs.
+If you have additional CDs or DVDs available, you probably want to do
+this so the installer can use the packages included on them.
+-->
+ʣ礫ʤ CD DVD ǥȡ뤹硢
+ CD DVD 뤫ȡ餬ҤͤƤޤ
+ɲä CD DVD 硢ѥåȡ뤹뤿ᡢ
+ʤȻפޤ
+
+</para><para>
+
+<!--
+If you do not have any additional CDs or DVDs, that is no problem: using
+them is not required. If you also do not use a network mirror (as explained
+in the next section), it can mean that not all packages belonging to the
+tasks you select in the next step of the installation can be installed.
+-->
+ɲä CD DVD ʤ硢ɬܤǤϤʤΤǡꤢޤ
+ͥåȥߥ顼Ѥʤ (ޤ)Υƥåפ롢
+°뤹٤ƤΥѥåȡǤ櫓ǤϤʤȤ̣ޤ
+
+</para>
+<note><para>
+
+<!--
+Packages are included on CDs (and DVDs) in the order of their popularity.
+This means that for most uses only the first CDs in a set are needed and
+that only very few people actually use any of the packages included on the
+last CDs in a set.
+-->
+CD ( DVD) ˤѥåϡ͵ΤǼƤޤ
+ˤꡢۤȤɤοͤɬפ CD åȤ 1 ܤ CD Ȥ
+˾οͤǸ CD äƤѥåѤ뤳Ȥˤʤޤ
+
+</para><para>
+
+<!--
+It also means that buying or downloading and burning a full CD set is just
+a waste of money as you'll never use most of them. In most cases you are
+better off getting only the first 3 to 8 CDs and installing any additional
+packages you may need from the Internet by using a mirror.
+The same goes for DVD sets: the first DVD, or maybe the first two DVDs
+will cover most needs.
+-->
+ϥե CD åȤΤޤäȤʤΤäꡢ
+ɤƾƤȤäȤϡ
+̵̤ˤʤäƤޤȤȤǤ⤢ޤ
+ۤȤɤξ硢38 CD Ѱդ
+˥ѥåɲäɬפˤϡ
+ߥ顼ȤѤͥåȤڤǤ
+DVD åȤξƱȤޤ
+1 ܤ DVD ⤷ 2 ܤ DVD ɬפʤΤСǤǤ礦
+
+</para><para>
+
+<!--
+A good rule of thumb is that for a regular desktop installation (using the
+GNOME desktop environment) only the first three CDs are needed. For the
+alternative desktop environments (KDE or Xfce), additional CDs are needed.
+The first DVD easily covers all three desktop environments.
+-->
+и塢ɸŪʥǥȥå (GNOME ǥȥå״Ķ) ȡ뤹硢
+ǽ 3 CD лޤ
+¾Υǥȥå״Ķ (KDE Xfce) Ǥϡɲ CD ɬפǤ
+1 ܤ DVD Ǥϡ 3 ĤΥǥȥå״Ķ٤ƥСƤޤ
+
+</para></note>
+<para>
+
+<!--
+If you do scan multiple CDs or DVDs, the installer will prompt you to
+exchange them when it needs packages from another CD/DVD than the one
+currently in the drive. Note that only CDs or DVDs that belong to the
+same set should be scanned. The order in which they are scanned does not
+really matter, but scanning them in ascending order will reduce the chance
+of mistakes.
+-->
+ʣ CD/DVD 硢ߥɥ饤֤äƤΤǤϤʤ
+̤ CD/DVD ˤѥåɬפˤʤȡȡϸ褦¥ޤ
+: CD DVD ϡƱåȤ°ΤΤߤ٤Ǥ
+֤ϤޤפǤϤޤ
+˥ȡԤǽ㤯ʤޤ
+
+</para>
+ </sect4>
+
<sect4 id="apt-setup-mirror">
<!--
<title>Using a network mirror</title>
@@ -114,11 +210,11 @@
<para>
<!--
-One question that will be asked in most cases is whether or not to use a
-network mirror as a source for packages. In most cases the default answer
-should be fine, but there are some exceptions.
+One question that will be asked during most installs is whether or not to
+use a network mirror as a source for packages. In most cases the default
+answer should be fine, but there are some exceptions.
-->
-褯ˡ
+ȡ˴ؤ褯ˡ
ѥåμ˥ͥåȥߥ顼Ѥ뤫ɤޤ
ۤȤɤξ硢ǥեȤβǤޤޤˤ㳰⤢ޤ
@@ -141,153 +237,115 @@
</para><para>
<!--
-If you are installing from a full CD or using a CD image (not DVD), using a
-network mirror is not required, but is still strongly recommended because a
-single CD contains only a fairly limited number of packages. The installer
-currently does not support using multiple CD or DVD images during the
-installation<footnote>
-
-<para>
-Adding that option is planned.
-</para>
-
-</footnote>. If you have a limited Internet connection it may still be best
+If you are installing from a single full CD or using a full CD image, using
+a network mirror is not required, but is still strongly recommended because
+a single CD contains only a fairly limited number of packages.
+If you have a limited Internet connection it may still be best
to <emphasis>not</emphasis> select a network mirror here, but to finish the
-installation using only what's available on the CD and install additional
-packages after the installation (i.e. after you have rebooted into the new
-system).
+installation using only what's available on the CD and selectively install
+additional packages after the installation (i.e. after you have rebooted into
+the new system).
-->
-(DVD ǤϤʤ) CD ǥȡ뤷Ƥꡢ
+1 δ CD ǥȡ뤷Ƥꡢ
CD ѤƤ硢
ͥåȥߥ顼ѤɬפϤޤ
1 CD ˤ˸¤줿ΥѥåޤޤƤʤᡢ
ߥ顼ѤΤᤷޤ
-ߥȡϡʣ CD DVD
-ȡ˻ȤˡϥݡȤƤޤ<footnote>
-
-<para>
-ΥץɲäײǤ
-</para>
-
-</footnote>ͥ峤ϡޤǥͥåȥߥ顼ꤷʤ褤Ǥ礦
+ͥ峤ϡޤǥͥåȥߥ顼ꤷʤ褤Ǥ礦
CD ǤǤ¤ΥȡԤɲåѥåΥȡϡ
(ƥǵưʤ) ǹԤΤ褤Ǥ礦
+</para><para>
+<!--
+If you are installing from a DVD or using a DVD image, any packages needed
+during the installation should be present on the first DVD. The same is true
+if you have scanned multiple CDs as explained in the previous section. Use
+of a network mirror is optional.
+-->
+DVD ǥȡ뤷ƤꡢDVD ѤƤ硢
+ȡɬפʥѥåϡ1 ܤ DVD ƤϤǤ
+褦ˡʣ CD ƱǤ
+ͥåȥߥ顼λѤϥץȤʤޤ
+
</para><para>
<!--
-If you are installing from a DVD or using a DVD image, the need to use a
-network mirror is a lot smaller, but there is still a chance that some
-packages that are part of the tasks you select in the next step will not
-be included on the first DVD. This is especially true if you are installing
-in another language than English: a number of font and localization packages
-are known to be on the second DVD. So, if you have a reasonable Internet
-connection it is still advisable to use a network mirror.
+One advantage of adding a network mirror is that updates that have occurred
+since the CD/DVD set was created and have been included in a point release,
+will become available for installation, thus extending the life of your CD/DVD
+set without compromising the security or stability of the installed system.
-->
-DVD饤ȡ뤷ꡢDVD ѤƤ硢
-ͥåȥߥ顼ɬϤʤ㤤Ǥ
-Υƥåפ륿ΰ
-1 ܤ DVD ˴ޤޤƤʤǽޤ
-Ѹʳθǥȡ뤷Ƥϡäˤηޤ
-ΥեȤϰ貽Υѥå
-DVD 2 ܤ˴ޤޤƤ뤳ȤΤƤޤ
-Τᡢ꺢ʥͥå³ʤ顢
-ͥåȥߥ顼ѤǤ
+ͥåȥߥ顼ɲäϡCD/DVD åȤ줿ι䡢
+ݥȥ˴ޤޤ빹ȡǤȤȤǤ
+Ĥޤꡢȡ뤷ƥΥƥĤ뤳Ȥʤ
+CD/DVD μ̿ФȤǤޤ
-
</para><para>
-<!-- This should probably be documented a bit more extensively in
- post-install instead. -->
<!--
-To install additional packages after the installation you have two options:
+In summary: selecting a network mirror is generally a good idea, except
+if you do not have a good Internet connection. If the current version of
+a package is available from CD/DVD, the installer will always use that.
+The amount of data that will be downloaded if you do select a mirror thus
+depends on
-->
-ȡɲåѥåȡ뤹ˤϡ
-ʲ 2 ̤ˡޤ
+ޤȤȡͥåȥߥ顼Τϡ
+ɤͥå³ʤŪˤ褤ͤǤ
+ѥåκǿǤ CD/DVD ѤǤˤϡ
+ȡϾˤѤޤ
+äơߥ顼Υɤǡ̤ϡʲ˰¸ޤ
<orderedlist>
<listitem><para>
<!--
-if you have additional CD/DVD images available (from same set as the
-installation CD/DVD you are using), you can add those to the
-<filename>sources.list</filename> using <command>apt-cdrom</command>;
+the tasks you select in the next step of the installation,
-->
-(ȡ˻Ѥ CD/DVD ƱåȤ) ɲCD/DVDѤǤ硢
-<command>apt-cdrom</command> Ѥơ
-<filename>sources.list</filename> ɲäǤޤ
+ȡμΥƥåפ륿
</para></listitem>
<listitem><para>
<!--
-manually add a mirror to the <filename>sources.list</filename> using an
-editor.
+which packages are needed for those tasks,
-->
-ǥѤơ
-<filename>sources.list</filename> ˥ߥ顼ɲäƤ
+ɤΥѥåΥɬפ
</para></listitem>
-</orderedlist>
+<listitem><para>
-<!--
-You can then use one of the package management front-ends to select and
-install additional packages<footnote>
-
-<para>
-It is possible to add both additional CDs or DVDs <emphasis>and</emphasis>
-a network mirror in <filename>/etc/apt/sources.list</filename>. Also adding
-a network mirror has the advantage that it will make updates of packages in
-point releases of the distribution available for installation.
-</para>
-
-</footnote>.
+<!--
+which of those packages are present on the CDs or DVDs you have scanned, and
-->
-줫顢ѥåեȥɤΤ줫Ѥơ
-ɲäѥåȡ뤷Ƥ<footnote>
+Υѥå CD DVD ˼ϿƤ뤫ɤ
-<para>
-<filename>/etc/apt/sources.list</filename> ؤ CD DVD ɲ<emphasis></emphasis>
-ͥåȥߥ顼ɲäƱ˹Ԥޤ
-ޤͥåȥߥ顼ɲäΤˤϡȡѤǤ롢
-Υǥȥӥ塼Υݥȥѥåι
-Ȥޤ
-</para>
+</para></listitem>
+<listitem><para>
-</footnote>
-
-</para><para>
-
<!--
-In summary: selecting a network mirror is generally a good idea, except
-if you do not have a good Internet connection. If the current version of
-a package is available on the CD/DVD, the installer will always use that.
-The amount of data that will be downloaded if you do select a mirror thus
-depends on a) the tasks you select in the next step of the installation, b)
-which packages are needed for those tasks, and c) which of those packages
-are present on the CD/DVD.
+whether any updated versions of packages included on the CDs or DVDs are
+available from a mirror (either a regular package mirror, or a mirror for
+security or volatile updates).
-->
-ʲˤޤȤޤͥåȥߥ顼Τϡ
-ɤͥå³ʤŪˤ褤ͤǤ
-ѥåκǿǤ CD/DVD ѤǤˤϡ
-ȡϾˤѤޤ
-äơߥ顼Υɤǡ̤ϡ
-a) ȡμΥƥåפ륿
-b) ɤΥѥåΥɬפ
-c) Υѥå CD/DVD ˼ϿƤ뤫ɤ˰¸ޤ
+CDDVD˼ϿѥåιǤߥ顼
+(̾ΥѥåΥߥ顼ȤǤʤƥΥߥ顼Ȥ volatile Υߥ顼) ѰդƤ뤫ɤ
+</para></listitem>
+</orderedlist>
+
</para><para>
<!--
-Note that even if you choose not to use a network mirror, some packages
-may still be downloaded from the Internet if there is a security or
-volatile update available for them and those services have been configured.
+Note that the last point means that, even if you choose not to use a network
+mirror, some packages may still be downloaded from the Internet if there is a
+security or volatile update available for them and those services have been
+configured.
-->
-ͥåȥߥ顼Ѥʤ褦ȤƤ⡢
+ǸˤĤƤϡͥåȥߥ顼Ѥʤ褦ȤƤ⡢
ƥ volatile ˹ꡢ
ΥӥѤ褦ꤷƤϡ
-ѥåɤǽĤäƤ뤳ȤդƤ
+ѥåɤǽĤäƤ롢ȤȤդƤ
</para>
</sect4>
Index: ja/using-d-i/modules/pkgsel.xml
===================================================================
--- ja/using-d-i/modules/pkgsel.xml (revision 52184)
+++ ja/using-d-i/modules/pkgsel.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46722 -->
+<!-- original version: 52083 -->
<sect3 id="pkgsel">
<!--
@@ -80,7 +80,7 @@
<!--
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.
+deselect them. You can even opt to install no tasks at all at this point.
-->
ĤΥϡȡ뤹륳ԥ塼ˤꡢ
餫Ƥǽޤ
@@ -93,56 +93,48 @@
<!-- TODO: Explain the "Standard system" task first -->
<!--
-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 such as for example KDE.
+Unless you are using the special KDE or Xfce CDs, the <quote>Desktop
+environment</quote> task will install the GNOME desktop environment.
-->
+ü KDE CD Xfce CD ѤƤΤǤʤС
<quote>ǥȥå״Ķ</quote> ϡ
GNOME ǥȥå״Ķȡ뤷ޤ
-ߥȡƤ륪ץǤϡ
-KDE Τ褦¾Υǥȥå״ĶǤޤ
</para><para>
<!--
-It is possible to get the installer to install KDE by using preseeding
-(see <xref linkend="preseed-pkgsel"/>) or by adding
-<literal>tasks="standard, kde-desktop"</literal> at the boot prompt
-when starting the installer<footnote>
-
-<para>
-A more lightweight Xfce desktop environment can be selected by using
-<literal>xfce-desktop</literal> instead of <literal>kde-desktop</literal>.
-If you are installing on a laptop, you could also add
-<literal>laptop</literal> to the tasks to be installed.
-</para>
-
-</footnote>. 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.
+It is not possible to interactively select a different desktop during
+the installation. However, it <emphasis>is</emphasis> possible to get &d-i;
+to install a KDE desktop environment instead of GNOME by using preseeding
+(see <xref linkend="preseed-pkgsel"/>) or by adding the parameter
+<literal>desktop=kde</literal> at the boot prompt when starting the
+installer. Alternatively the more lightweight Xfce desktop environment can
+be selected by using <literal>desktop=xfce</literal>.
-->
-preseed (<xref linkend="preseed-pkgsel"/> ) Ѥꡢ
-ȡεư˥֡ȥץץȤ
+ȡ˰ۤʤǥȥå״Ķ
+饯ƥ֤뤳ȤϤǤޤ
+preseed (<xref linkend="preseed-pkgsel"/> ) Ѥꡢ
+ȡεư˥֡ȥץץȤΥѥ
<literal>tasks="standard, kde-desktop"</literal> Ȼꤷơ
-ȡ餬 KDE ȡ뤹褦ˤǤޤ
-<footnote>
+&d-i; GNOME ǤϤʤ KDE ǥȥå״Ķȡ뤹褦ˤǤޤ
+ޤ<literal>desktop=xfce</literal> Ȥȡ
+äȷ̤ Xfce ǥȥå״ĶǤޤ
-<para>
-̤ Xfce ǥȥå״Ķ⡢<literal>kde-desktop</literal>
-<literal>xfce-desktop</literal> Ȥ뤳ȤǤޤ
-åץȥåפ˥ȡ뤹硢
-<literal>laptop</literal> ɲäƤȥȡ뤵ޤ
-</para>
+</para><para>
-</footnote>
-KDE ɬפʥѥåͭʾΤưޤ
-ե CD ǥȡ뤷Ƥ硢
-KDE Υѥåե CD 1 ܤäƤʤΤǡ
+<!--
+Note that this will only work if the packages needed for KDE or Xfce
+are actually available. If you are installing using a single full CD image,
+they will need to be downloaded from a mirror as most needed packages are
+only included on later CDs; installing KDE or Xfce this way should work
+fine if you are using a DVD image or any other installation method.
+-->
+KDE Xfce ɬפʥѥåͭʾΤư뤳ȤդƤ
+ե CD 1 ǥȡ뤷Ƥ硢
+ɬפʥѥå CD äƤΤǡ
ߥ顼Ȥɤɬפޤ
DVD 䤽¾ΥȡˡǤϡ
-KDE ǤΥȡ뤬ޤǤ礦
+KDE Xfce Υȡ뤬ޤǤ礦
</para><para>
Index: ja/using-d-i/modules/shell.xml
===================================================================
--- ja/using-d-i/modules/shell.xml (revision 52184)
+++ ja/using-d-i/modules/shell.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46722 -->
+<!-- original version: 51519 -->
<sect3 id="shell">
<title>λѤȥλ</title>
@@ -40,6 +40,13 @@
<keycombo><keycap>Left Alt</keycap>
<keycap>F1</keycap></keycombo> ǥȡ鼫ΤäƤ
+</para><para condition="gtk">
+
+<!--
+For the graphical installer see also <xref linkend="gtk-using"/>.
+-->
+ե륤ȡǤϡ<xref linkend="gtk-using"/> ⤴
+
</para><para>
<!--
Index: ja/boot-installer/x86.xml
===================================================================
--- ja/boot-installer/x86.xml (revision 52184)
+++ ja/boot-installer/x86.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 44002 -->
+<!-- original version: 51739 -->
<sect2 arch="x86"><title>CD-ROM εư</title>
@@ -73,6 +73,50 @@
</sect2>
+ <sect2 arch="x86" id="boot-win32">
+<!--
+ <title>Booting from Windows</title>
+-->
+ <title>Windows εư</title>
+<para>
+
+<!--
+To start the installer from Windows, you must first obtain CD-ROM/DVD-ROM
+or USB memory stick installation media as described in
+<xref linkend="official-cdrom"/> and <xref linkend="boot-usb-files"/>.
+-->
+Windows 饤ȡưˤϡ<xref linkend="official-cdrom"/>
+<xref linkend="boot-usb-files"/> Ƥ褦ˡ
+ޤ CD-ROM/DVD-ROM USB Υȡǥ
+ꤷʤФʤޤ
+
+</para><para>
+
+<!--
+If you use an installation CD or DVD, a pre-installation program should be
+launched automatically when you insert the disc.
+In case Windows does not start it automatically, or if you are using a USB
+memory stick, you can run it manually by accessing the device and executing
+<command>setup.exe</command>.
+-->
+ȡ CD/DVD Ѥ硢
+ǥȥץ쥤ȡץबưŪ˵ưޤ
+ưŪ˵ưʤ䡢USB Ѥ硢
+ǥХ˥<command>setup.exe</command> ¹Ԥ
+ưǵưǤޤ
+
+</para><para>
+
+<!--
+After the program has been started, a few preliminary questions will be
+asked and the system will be prepared to start the &debian; installer.
+-->
+ץ൯ưϡĤͽŪʼ䤬ʤ줿塢
+&debian; ȡưޤ
+
+</para>
+ </sect2>
+
<!-- FIXME the documented procedure does not exactly work, commented out
until fixes
Attachment:
di20080325.tar.gz
Description: Binary data