鍋太郎です。
インストールマニュアルの訳を追随しました。
Debian Installer beta3用に急げと言われてしまった……orz
本文と差分を添付しますので査読をお願いいたします。
アーカイブの内容は以下になります。
$ tar ztf d-i-update0723.tar.gz
ja/appendix/preseed.xml
ja/using-d-i/components.xml
ja/using-d-i/modules/partman-crypto.xml
ja/using-d-i/modules/mdcfg.xml
ja/hardware/hardware-supported.xml
ja/hardware/supported/powerpc.xml
--
+--------------------------------------------------------+
倉澤 望(鍋太郎)
KURASAWA Nozomu (nabetaro) <nabetaro @ caldron.jp>
GnuPG FingerPrint:
C4E5 7063 FD75 02EB E71D 559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+
Attachment:
d-i-update0723.tar.gz
Description: Binary data
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml (ӥ 39241)
+++ ja/appendix/preseed.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 38429 -->
+<!-- original version: 38662 -->
<!--
Be carefull with the format of this file as it is parsed to generate
@@ -1026,7 +1026,30 @@
<userinput>interface=<replaceable>eth1</replaceable></userinput>
Τ褦˥֡ȥѥѤƤ
+</para><para>
+<!--
+Although preseeding the network configuration is normally not possible when
+using network preseeding (using <quote>preseed/url</quote>), you can use
+the following hack to work around that, for example if you'd like to set a
+static address for the network interface. The hack is to force the network
+configuration to run again after the preconfiguration file has been loaded
+by creating a <quote>preseed/run</quote> script containing the following
+lines:
+-->
+<quote>preseed/url</quote> ǥͥåȥ preseed Ѥݡ
+ͥåȥ preseed ̾ԲǽǤ
+㤨СͥåȥեŪɥ쥹ꤹȤä
+ʲΥϥåѤư뤳ȤǤޤ
+ΥϥåϡʲιԤޤ <quote>preseed/run</quote> ץȤ
+եɤ߹ǥͥåȥŪ˺ٹԤ
+ȤΤǤ
+
+<informalexample><screen>
+killall.sh dhclient
+netcfg
+</screen></informalexample>
+
</para>
<informalexample role="example"><screen>
Index: ja/using-d-i/components.xml
===================================================================
--- ja/using-d-i/components.xml (ӥ 39241)
+++ ja/using-d-i/components.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 37253 -->
+<!-- original version: 38703 -->
<sect1 id="module-details">
<!--
@@ -128,6 +128,7 @@
&module-partconf.xml;
&module-lvmcfg.xml;
&module-mdcfg.xml;
+&module-partman-crypto.xml;
</sect2>
<sect2 id="di-system-setup">
Index: ja/using-d-i/modules/partman-crypto.xml
===================================================================
--- ja/using-d-i/modules/partman-crypto.xml (ӥ 0)
+++ ja/using-d-i/modules/partman-crypto.xml (ӥ 0)
@@ -0,0 +1,592 @@
+<?xml version="1.0" encoding="EUC-JP"?>
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 39224 -->
+
+ <sect3 id="partman-crypto">
+<!--
+ <title>Configuring Encrypted Volumes</title>
+-->
+ <title>Ź沽ܥ塼</title>
+<para>
+
+<!--
+&d-i; allows you to set up encrypted partitions. Every file you write
+to such a partition is immediately saved to the device in encrypted
+form. Access to the encrypted data is granted only after entering
+the <firstterm>passphrase</firstterm> used when the encrypted
+partition was originally created. This feature is useful to protect
+sensitive data in case your laptop or hard drive gets stolen. The
+thief might get physical access to the hard drive, but without knowing
+the right passphrase, the data on the hard drive will look like random
+characters.
+-->
+&d-i; ǤϰŹ沽ѡƥǤޤ
+Ź沽ѡƥ¸եϤ٤ơ
+˰Ź沽ǥǥХ˽ޤޤ
+Ź沽ǡؤΥϡŹ沽ѡƥݤꤷ
+<firstterm>ѥե졼</firstterm> Ϥͭˤʤޤ
+εǽϡΡ PC ϡɥǥäݤˡ
+̩ǡݸΤǤ
+ͤϡɥǥʪǡ˥ͤȤݡ
+ѥե졼Τʤȡ
+ϡɥǥΥǡϥʸˤޤ
+
+</para><para>
+
+<!--
+The two most important partitions to encrypt are: the home partition,
+where your private data resides, and the swap partition, where
+sensitive data might be stored temporarily during operation. Of
+course, nothing prevents you from encrypting any other partitions that might
+be of interest. For example <filename>/var</filename> where database
+servers, mail servers or print servers store their data, or
+<filename>/tmp</filename> which is used by various programs to store
+potentially interesting temporary files. Some people may even want to
+encrypt their whole system. The only exception is
+the <filename>/boot</filename> partition which must remain
+unencrypted, because currently there is no way to load the kernel from
+an encrypted partition.
+-->
+Ź沽Τ˺ǽפʥѡƥ 2 Ĥޤ
+ĿŪʥǡǼ home ѡƥȡ
+˵̩ǡŪ˳Ǽ swap ѡƥǤ
+¾ΥѡƥΰŹ沽˸ΤϤʤˤ⤢ޤ
+ȤСǡ١С륵С
+ץФ줾եǼ <filename>/var</filename> 䡢
+͡ʥץब
+Ū˶̣ե <filename>/tmp</filename> Ǥ
+ƥΤŹ沽ȹͤ⤤ޤ
+Ź沽ʤͣ㳰ѡƥϡ
+<filename>/boot</filename> ѡƥǤ
+Ź沽줿ѡƥ饫ͥưˡʤǤ
+
+</para><note><para>
+
+<!--
+Please note that the performance of encrypted partitions will be
+less than that of unencrypted ones because the data needs to be
+decrypted or encrypted for every read or write. The performance impact
+depends on your CPU speed, chosen cipher and a key length.
+-->
+Ź沽ѡƥΥѥեޥϡ
+ǡɤ߽ˡ˰Ź沽Ԥᡢ
+Ź沽ƤʤΤ㲼դƤ
+ѥեޥϡCPU ΥԡɡŹĹ˱ƶޤ
+
+</para></note><para>
+
+<!--
+To use encryption, you have to create a new partition by selecting
+some free space in the main partitioning menu. Another option is to
+choose an existing partition (e.g. a regular partition, an LVM logical
+volume or a RAID volume). In the <guimenu>Partition setting</guimenu>
+menu, you need to select <guimenuitem>physical volume for
+encryption</guimenuitem> at the <menuchoice> <guimenu>Use
+as:</guimenu> </menuchoice> option. The menu will then change to
+include several cryptographic options for the partition.
+-->
+Ź沽Ѥˤϡᥤѡƥ˥塼Ƕΰơ
+ѡƥɬפޤ
+¾ˤϴ¸Υѡƥ (㡢̾ΥѡƥLVM ܥ塼ࡢ
+RAID ܥ塼) Ȥ⤢ޤ
+<guimenu>ѡƥ</guimenu> ˥塼Ρ
+<menuchoice> <guimenu>ˡ:</guimenu> </menuchoice>
+<guimenuitem>Ź沽ʪܥ塼</guimenuitem> ɬפޤ
+ȡ˥塼˥ѡƥŹ沽륪ץɲäޤ
+
+</para><para>
+
+<!--
+&d-i; supports several encryption methods. The default method
+is <firstterm>dm-crypt</firstterm> (included in newer Linux kernels,
+able to host LVM physical volumes), the other
+is <firstterm>loop-AES</firstterm> (older, maintained separately from
+the Linux kernel tree). Unless you have compelling reasons to do
+otherwise, it is recommended to use the default.
+-->
+&d-i; ϡŹ沽ˡĤݡȤƤޤ
+ǥեȤˡ<firstterm>dm-crypt</firstterm>
+( Linux ͥ˴ޤޤ졢LVM ʪܥ塼ǼǤ) Ǥ
+¾ˤϡ<firstterm>loop-AES</firstterm>
+(ŤLinux ͥĥȤΩƥƥʥƤ) ޤ
+ˤޤͳΤǤʤС
+ǥեȤΤޤޤˤƤΤᤷޤ
+
+<!-- TODO: link to the "Debian block device encryption guide"
+ once Max writes it :-) -->
+
+</para><para>
+
+<!--
+First, let's have a look at available options available when you
+select <userinput>Device-mapper (dm-crypt)</userinput> as the
+encryption method. As always: when in doubt, use the defaults, because
+they have been carefully chosen with security in mind.
+-->
+ϤˡŹ沽ˡȤ <userinput>Device-mapper (dm-crypt)</userinput>
+ơͭˤǤ륪ץͭˤޤ礦
+ĤΤ褦ˡХǥեͤꤷƤ
+ƥǰƬ֤Ƥޤ
+
+<variablelist>
+
+<varlistentry>
+<term>Encryption: <userinput>aes</userinput></term>
+
+<listitem><para>
+
+<!--
+This option lets you select the encryption algorithm
+(<firstterm>cipher</firstterm>) which will be used to encrypt the data
+on the partition. &d-i; currently supports the following block
+ciphers: <firstterm>aes</firstterm>, <firstterm>blowfish</firstterm>,
+<firstterm>serpent</firstterm>, and <firstterm>twofish</firstterm>.
+It is beyond the scope of this document to discuss the qualities of
+these different algorithms, however, it might help your decision to
+know that in 2000, <emphasis>AES</emphasis> was chosen by the American
+National Institute of Standards and Technology as the standard
+encryption algorithm for protecting sensitive information in the 21st
+century.
+-->
+ΥץǡѡƥΥǡŹ沽Τ˻Ѥ롢
+Ź沽르ꥺ (<firstterm>Ź</firstterm>) ޤ
+ߡ&d-i; ϰʲΰŹݡȤƤޤ
+<firstterm>aes</firstterm>, <firstterm>blowfish</firstterm>,
+<firstterm>serpent</firstterm>, <firstterm>twofish</firstterm> Ǥ
+줾Υ르ꥺʼˤĤƤεϡ
+ʸƤۤƤޤޤ
+ʲϤʤηǤνˤʤ뤫⤷ޤ
+<emphasis>AES</emphasis> ϡ2000 ǯƹ̳ɸൻѶɤˤꡢ
+21 ε̩ݸɸŹ沽르ꥺȤƺѤޤ
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Key size: <userinput>256</userinput></term>
+
+<listitem><para>
+
+<!--
+Here you can specify the length of the encryption key. With a larger
+key size, the strength of the encryption is generally improved. On the
+other hand, increasing the length of the key usually has a negative
+impact on performance. Available key sizes vary depending on the
+cipher.
+-->
+ǤϰŹ沽ĹǤޤ
+Ū˥ĹʤȰŹ涯٤夷ޤ
+Ĺʤȡѥեޥ˥ޥʥαƶͿޤ
+ѤǤ륭ΥϰŹ˰¸ޤ
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>IV algorithm: <userinput>cbc-essiv:sha256</userinput></term>
+
+<listitem><para>
+
+<!--
+The <firstterm>Initialization Vector</firstterm> or
+<firstterm>IV</firstterm> algorithm is used in cryptography to ensure
+that applying the cipher on the same <firstterm>clear text</firstterm>
+data with the same key always produces a unique
+<firstterm>cipher text</firstterm>. The idea is to prevent the
+attacker from deducing information from repeated patterns in the encrypted
+data.
+-->
+<firstterm>٥ȥ</firstterm>
+<firstterm>IV</firstterm> 르ꥺϡ
+Ʊ <firstterm>ꥢƥ</firstterm> ǡƱǡ
+˰դ <firstterm>Ź沽ƥ</firstterm> Τݾڤơ
+˰ŹɤΤѤޤ
+ˤꡢԤŹ沽ǡη֤ѥ顢
+¬Τɤޤ
+
+</para><para>
+
+<!--
+From the provided alternatives, the default
+<userinput>cbc-essiv:sha256</userinput> is currently the least
+vulnerable to known attacks. Use the other alternatives only when you
+need to ensure compatibility with some previously installed system
+that is not able to use newer algorithms.
+-->
+ǥեȤ <userinput>cbc-essiv:sha256</userinput> ϸߤΤȤ
+⤵붲줬äȤ⾯ʤǤ
+¾ϡ르ꥺбƤʤ
+ȡ뤷ƥȸߴȤΤѤƤ
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>Encryption key: <userinput>Passphrase</userinput></term>
+-->
+<term>Encryption key: <userinput>Passphrase</userinput></term>
+
+<listitem><para>
+
+<!--
+Here you can choose the type of the encryption key for this partition.
+-->
+ǤϡΥѡƥΰŹ沽ΥפǤޤ
+
+ <variablelist>
+ <varlistentry>
+ <term>Passphrase</term>
+ <listitem><para>
+
+<!--
+The encryption key will be computed<footnote>
+<para>
+
+Using a passphrase as the key currently means that the partition will
+be set up using <ulink url="&url-luks;">LUKS</ulink>.
+
+</para></footnote> on the basis of a passphrase which you will be able
+to enter later in the process.
+-->
+Ź沽ץθϤѥե졼˴ŤƷ<footnote>
+<para>
+
+˥ѥե졼ѤΤϡ
+<ulink url="&url-luks;">LUKS</ulink> ѤꤹȤ̣Ǥ
+
+</para></footnote>ޤ
+
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Random key</term>
+ <listitem><para>
+
+<!--
+A new encryption key will be generated from random data each time you
+try to bring up the encrypted partition. In other words: on every
+shutdown the content of the partition will be lost as the key is
+deleted from memory. (Of course, you could try to guess the key with a
+brute force attack, but unless there is an unknown weakness in the
+cipher algorithm, it is not achievable in our lifetime.)
+-->
+Ź沽ѡƥ뤿ӤˡŹ沽ޤ
+ȡåȥȤ˥꤫졢
+ѡƥƤȤȤǤ
+(ǥ¬뤳ȤϤǤޤ
+Ź楢르ꥺ̤Τμʤ¤ꡢãǤʤǤ礦)
+
+ </para><para>
+
+<!--
+Random keys are useful for swap partitions because you do not need to
+bother yourself with remembering the passphrase or wiping sensitive
+information from the swap partition before shutting down your
+computer. However, it also means that you
+will <emphasis>not</emphasis> be able to use
+the <quote>suspend-to-disk</quote> functionality offered by newer
+Linux kernels as it will be impossible (during a subsequent boot) to
+recover the suspended data written to the swap partition.
+-->
+Random key swap ѡƥǻȤǤ
+ȤΤ⡢ѥե졼ФƤɬפʤ
+ԥ塼åȥˡ
+̩ swap ѡƥݽ뤫Ǥ
+Ƕ Linux ͥѤǤ <quote>suspend-to-disk</quote>
+ǽǤϻѤǤʤȤȤǤ⤢ޤ
+(εư) swap ѡƥ饵ڥɥǡ
+ǤʤʤäƤޤΤǤ
+
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Erase data: <userinput>yes</userinput></term>
+
+<listitem><para>
+
+<!--
+Determines whether the content of this partition should be overwritten
+with random data before setting up the encryption. This is recommended
+because it might otherwise be possible for an attacker to discern
+which parts of the partition are in use and which are not. In
+addition, this will make it harder to recover any leftover data from
+previous installations<footnote><para>
+
+It is believed that the guys from three-letter agencies can restore
+the data even after several rewrites of the magnetooptical media,
+though.
+
+</para></footnote>.
+-->
+Ź沽ˡ
+ΥѡƥƤʥǡǾ뤫ɤޤ
+ʤȹԤѡƥΤɤʬǡ
+ɤʬѤƤʤʬޤΤǡ뤳Ȥᤷޤ
+ξ塢ȡ뤷ƤƻĤäƤޤäǡ
+ˤޤ<footnote><para>
+
+3 ʸεؤǤϡإǥ٤Ǥ⡢
+ǡǤȿƤޤ
+
+</para></footnote>
+
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</para><para>
+
+<!--
+If you select <menuchoice> <guimenu>Encryption method:</guimenu>
+<guimenuitem>Loopback (loop-AES)</guimenuitem> </menuchoice>, the menu
+changes to provide the following options:
+-->
+<menuchoice> <guimenu>Encryption method:</guimenu>
+<guimenuitem>Loopback (loop-AES)</guimenuitem> </menuchoice> ȡ
+˥塼ϰʲΥץ褦Ѥޤ
+
+<variablelist>
+<varlistentry>
+<term>Encryption: <userinput>AES256</userinput></term>
+
+<listitem><para>
+
+<!--
+For loop-AES, unlike dm-crypt, the options for cipher and key size are
+combined, so you can select both at the same time. Please see the
+above sections on ciphers and key sizes for further information.
+-->
+dm-crypt Ȱ㤤 loop-AES ǤϡŹȥΥץƤꡢ
+Ʊ˻ǤޤŹȥˤĤƤϡ
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Encryption key: <userinput>Keyfile (GnuPG)</userinput></term>
+
+<listitem><para>
+
+<!--
+Here you can select the type of the encryption key for this partition.
+-->
+ǤϡΥѡƥΰŹ沽ΥפǤޤ
+
+ <variablelist>
+ <varlistentry>
+ <term>Keyfile (GnuPG)</term>
+ <listitem><para>
+
+<!--
+The encryption key will be generated from random data during the
+installation. Moreover this key will be encrypted
+with <application>GnuPG</application>, so to use it, you will need to
+enter the proper passphrase (you will be asked to provide one later in
+the process).
+-->
+Ź沽ϥȡ˥ǡޤ
+ξǡΥ <application>GnuPG</application> ǰŹ沽ޤ
+ѤˤϡŬڤʥѥե졼Ϥɬפޤ
+(Υץᤵޤ)
+
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Random key</term>
+ <listitem><para>
+
+<!--
+Please see the the section on random keys above.
+-->
+ Random key
+
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Erase data: <userinput>yes</userinput></term>
+
+<listitem><para>
+
+<!--
+Please see the the section on erasing data above.
+-->
+ Erase data
+
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</para><note><para>
+
+<!--
+Please note that the <emphasis>graphical</emphasis> version of the
+installer still has some limitations when compared to the textual
+one. For cryptography it means you can set up only volumes using
+<emphasis>passphrases</emphasis> as the encryption keys.
+-->
+<emphasis>ե</emphasis>ǥȡǤϡ
+ƥǤ٤ơޤĤ¤뤳ȤդƤ
+Ź沽ˤĤƤϡŹ沽 <emphasis>ѥե졼</emphasis>
+Ѥܥ塼ΤߺǤޤ
+
+</para></note><para>
+
+<!--
+After you have selected the desired parameters for your encrypted
+partitions, return back to the main partitioning menu. There should
+now be a new menu item called <guimenu>Configure encrypted
+volumes</guimenu>. After you select it, you will be asked to confirm
+the deletion of data on partitions marked to be erased and possibly
+other actions such as writing a new partition table. For large
+partitions this might take some time.
+-->
+Ź沽ѡƥѤɬפʥѥȡ
+ᥤѡƥʬ˥塼ޤ
+˺٤<guimenu>Ź沽줿ܥ塼</guimenu>
+ȤܤϤǤȡ
+ȥޡѡƥ˺Ƥ褤ǧ
+ѡƥơ֥Ȥäޤ
+礭ʥѡƥǤϤФ餯֤Ǥ礦
+
+</para><para>
+
+<!--
+Next you will be asked to enter a passphrase for partitions configured
+to use one. Good passphrases should be longer than 8 characters,
+should be a mixture of letters, numbers and other characters and
+should not contain common dictionary words or information easily
+associable with you (such as birthdates, hobbies, pet names, names of
+family members or relatives, etc.).
+-->
+ˡѥե졼Ѥ褦ꤷƤСѥե졼֤ޤ
+褤ѥե졼ϡ8 ʸʾǡʸ¾ε椬ꡢ
+˺ܤäƤʤưפϢۤ
+(̣ڥåȤ̾²̤̾ʤ) ǤʤΤǤ
+
+</para><warning><para>
+
+<!--
+Before you input any passphrases, you should have made sure that your
+keyboard is configured correctly and generates the expected
+characters. If you are unsure, you can switch to the second virtual
+console and type some text at the prompt. This ensures that you won't be
+surprised later, e.g. by trying to input a passphrase using a qwerty
+keyboard layout when you used an azerty layout during the installation.
+This situation can have several causes. Maybe you switched to another
+keyboard layout during the installation, or the selected keyboard layout
+might not have been set up yet when entering the passphrase for the
+root file system.
+-->
+ѥե졼Ϥˡܡɤꤵ졢
+ԤʸϤǤ褦ˤʤäƤʤФʤޤ
+褯狼ʤС̤βüڤؤơץץȤϤƤ
+ˤꡢ㤨Сȡ azerty ѤƤΤˡ
+qwerty ǥѥե졼ϤȤäȤǡ
+ʤǶä褦ʤȤˤϤʤʤǤ礦
+ξϤĤθͤޤ
+ȡ̤ΥܡڤؤȤ
+롼ȥե륷ƥΥѥե졼Ϥˡ
+ޤܡɥ쥤ȤͭǤʤäΤ⤷ޤ
+
+</para></warning><para>
+
+<!--
+If you selected to use methods other than a passphrase to create
+encryption keys, they will be generated now. Because the kernel may
+not have gathered a sufficient amount of entropy at this early stage
+of the installation, the process may take a long time. You can help
+speed up the process by generating entropy: e.g. by pressing random
+keys, or by switching to the shell on the second virtual console and
+generating some network and disk traffic (downloading some files,
+feeding big files into <filename>/dev/null</filename>, etc.).
+-->
+Ź沽κˡѥե졼ʳˡ硢
+˰Ź沽ޤ
+ȡνǤϡͥ뤬ʬʥȥԡƤʤΤǡ
+ΥץĹ֤뤫⤷ޤ
+ȥԡƤΥץΥԡɤ夲ˤϡ
+˥̤βۥڤؤ
+(եΥɤ䡢
+礭ʥե <filename>/dev/null</filename> ήʤ)
+ͥåȥǥΥȥեåʤɤޤ
+
+<!-- TODO: Mention hardware random generators when we will support
+ them -->
+
+<!--
+This will be repeated for each partition to be encrypted.
+-->
+Ź沽ѡƥο֤ޤ
+
+</para><para>
+
+<!--
+After returning to the main partitioning menu, you will see all
+encrypted volumes as additional partitions which can be configured in
+the same way as ordinary partitions. The following example shows two
+different volumes. The first one is encrypted via dm-crypt, the second
+one via loop-AES.
+-->
+ᥤѡƥʬ˥塼ȡŹ沽ܥ塼ब
+̾ΥѡƥƱͤɲåѡƥȤƸƤޤ
+ʲǤϡ2 Ĥΰۤʤܥ塼ޤ
+1 ܤ dm-crypt ǰŹ沽2 ܤ loop-AES ǰŹ沽Ƥޤ
+
+<informalexample><screen>
+Encrypted volume (<replaceable>crypt0</replaceable>) - 115.1 GB Linux device-mapper
+ #1 115.1 GB F ext3
+
+Loopback (<replaceable>loop0</replaceable>) - 515.2 MB AES256 keyfile
+ #1 515.2 MB F ext3
+</screen></informalexample>
+
+<!--
+Now is the time to assign mount points to the volumes and optionally
+change the file system types if the defaults do not suit you.
+-->
+٤ϡܥ塼ޥȥݥȤ˳Ƥޤ
+ޤǥեȤΥե륷ƥॿפäƤʤѹԤޤ
+
+</para><para>
+
+<!--
+One thing to note here are the identifiers in parentheses
+(<replaceable>crypt0</replaceable>
+and <replaceable>loop0</replaceable> in this case) and the mount
+points you assigned to each encrypted volume. You will need this
+information later when booting the new system. The differences between
+ordinary boot process and boot process with encryption involved will
+be covered later in <xref linkend="mount-encrypted-volumes"/>.
+-->
+դΤϡμ̻ (Ǥ <replaceable>crypt0</replaceable>
+ <replaceable>loop0</replaceable>) ȡ
+Ź沽ܥ塼ƤޥȥݥȤǤ
+ǿƥưȤˡξɬפˤʤޤ
+̾εưץȡŹȼưץϡ
+<xref linkend="mount-encrypted-volumes"/> ǰޤ
+
+</para><para>
+
+<!--
+Once you are satisfied with the partitioning scheme, continue with the
+installation.
+-->
+ѡƥʬƤǼä顢ȡ˿ʤǤ
+
+</para>
+ </sect3>
Index: ja/using-d-i/modules/mdcfg.xml
===================================================================
--- ja/using-d-i/modules/mdcfg.xml (ӥ 39241)
+++ ja/using-d-i/modules/mdcfg.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 -->
+<!-- original version: 38703 -->
<sect3 id="mdcfg">
<title>ޥǥǥХ (եȥ RAID) </title>
@@ -261,6 +261,8 @@
<!--
Next, you should choose <guimenuitem>Configure software
RAID</guimenuitem> from the main <command>partman</command> menu.
+(The menu will only appear after you mark at least one partition for
+use as <guimenuitem>physical volume for RAID</guimenuitem>.)
On the first screen of <command>mdcfg</command> simply select
<guimenuitem>Create MD device</guimenuitem>. You will be presented with
a list of supported types of MD devices, from which you should choose
@@ -268,6 +270,9 @@
-->
˥ᥤ <command>partman</command> ˥塼
<guimenuitem>Configure software RAID</guimenuitem> Ǥ
+(Υ˥塼ϡʤȤѡƥҤȤ
+<guimenuitem>physical volume for RAID</guimenuitem>
+Ȥƥޡʤɽޤ)
<command>mdcfg</command> κǽβ̤Ǥϡ
ñ <guimenu>Create MD device</guimenu> Ƥ
ݡȤ MD ǥХΥꥹȤޤ
Index: ja/hardware/hardware-supported.xml
===================================================================
--- ja/hardware/hardware-supported.xml (ӥ 39241)
+++ ja/hardware/hardware-supported.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 36908 -->
+<!-- original version: 38778 -->
<sect1 id="hardware-supported">
<title>ݡȤϡɥ</title>
@@ -126,10 +126,10 @@
</row><row>
<!--
<entry>RiscPC</entry>
- <entry>riscpc</entry>
+ <entry>rpc</entry>
-->
<entry>RiscPC</entry>
- <entry>riscpc</entry>
+ <entry>rpc</entry>
</row>
<row>
@@ -167,15 +167,13 @@
<row>
<!--
- <entry morerows="4">MIPS (big endian)</entry>
+ <entry morerows="3">MIPS (big endian)</entry>
-->
- <entry morerows="4">MIPS (ӥåǥ)</entry>
- <entry morerows="4">mips</entry>
- <entry morerows="1">SGI IP22 (Indy/Indigo 2)</entry>
+ <entry morerows="3">MIPS (ӥåǥ)</entry>
+ <entry morerows="3">mips</entry>
+ <entry>SGI IP22 (Indy/Indigo 2)</entry>
<entry>r4k-ip22</entry>
</row><row>
- <entry>r5k-ip22</entry>
-</row><row>
<entry>SGI IP32 (O2)</entry>
<entry>r5k-ip32</entry>
</row><row>
Index: ja/hardware/supported/powerpc.xml
===================================================================
--- ja/hardware/supported/powerpc.xml (ӥ 39241)
+++ ja/hardware/supported/powerpc.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 30269 -->
+<!-- original version: 38791 -->
<sect2 arch="powerpc"><title>CPUޥܡɡӥǥΥݡ</title>
@@ -8,13 +8,14 @@
<!--
There are four major supported <emphasis>&architecture;</emphasis>
-subarchitectures: PMac (Power-Macintosh), PReP, APUS (Amiga Power-UP
-System), and CHRP machines. Each subarchitecture has its own boot
+subarchitectures: PMac (Power-Macintosh or PowerMac), PReP, APUS (Amiga
+Power-UP System), and CHRP machines. Each subarchitecture has its own boot
methods. In addition, there are four different kernel flavours,
supporting different CPU variants.
-->
ݡȤ <emphasis>&architecture;</emphasis> Υ֥ƥϡ
-PMac (Power-Macintosh), PReP, APUS (Amiga Power-UP System), CHRP 4 ĤǤ
+PMac (Power-Macintosh PowerMac), PReP, APUS (Amiga Power-UP System),
+CHRP 4 ĤǤ
Υ֥ƥ⼫Ȥǵưˡޤ
ˡۤʤ CPU ѼݡȤ롢4 Υͥե졼Сޤ
@@ -49,22 +50,29 @@
<!--
Most systems use this kernel flavour, which supports the PowerPC 601,
-603, 604, 740, 750, and 7400 processors. All Apple Power Macintosh
-systems up to and including the G4 use one of these processors.
+603, 604, 740, 750, and 7400 processors. All Apple PowerMac machines
+up to and including the one marketed as G4 use one of these processors.
-->
ۤȤɤΥƥϤΥͥե졼СѤޤ
PowerPC 601, 603, 604, 740, 750, 7400 ץåݡȤƤޤ
-G4 ޤ Apple Power Macintosh ƥϡ
+G4 Ȥȯ䤵줿Τޤ Apple PowerMac ޥϡ
Τ줫ΥץåѤƤޤ
</para></listitem>
</varlistentry>
<varlistentry>
-<term>power3</term>
+<term>power64</term>
<listitem><para>
<!--
+The power64 kernel flavour supports the following CPUs:
+-->
+power64 ͥե졼Сϰʲ CPU ݡȤƤޤ
+
+</para><para>
+
+<!--
The POWER3 processor is used in older IBM 64-bit server systems: known
models include the IntelliStation POWER Model 265, the pSeries 610 and
640, and the RS/6000 7044-170, 7043-260, and 7044-270.
@@ -73,13 +81,8 @@
褯Τ줿ǥϡIntelliStation POWER Model 265 pSeries 610/640
RS/6000 7044-170, 7043-260, 7044-270 Ǥ
-</para></listitem>
-</varlistentry>
+</para><para>
-<varlistentry>
-<term>power4</term>
-<listitem><para>
-
<!--
The POWER4 processor is used in more recent IBM 64-bit server systems:
known models include the pSeries 615, 630, 650, 655, 670, and 690.
@@ -90,23 +93,37 @@
</para><para>
<!--
-The Apple G5 is also based on the POWER4 architecture, and uses this
-kernel flavour.
+Systems using the Apple G5 (PPC970FX processor) are also based on the
+POWER4 architecture, and use this kernel flavour.
-->
-Apple G5 POWER4 ƥ١ˤƤꡢ
-Υͥե졼СѤޤ
+Apple G5 (PPC970FX processor) Ѥƥ
+POWER4 ƥ١ˤƤꡢΥͥե졼СѤޤ
</para></listitem>
</varlistentry>
<varlistentry>
+<term>prep</term>
+<listitem><para>
+
+<!--
+This kernel flavour supports the PReP subarchitecture.
+-->
+Υͥե졼С PReP ֥ƥݡȤƤޤ
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
<term>apus</term>
<listitem><para>
<!--
-This kernel flavour supports the Amiga Power-UP System.
+This kernel flavour supports the Amiga Power-UP System, though it is
+currently disabled.
-->
-Υͥե졼СϡAmiga Power-UP System ݡȤƤޤ
+Υͥե졼СϡAmiga Power-UP System ݡȤƤޤ
+̵ˤʤäƤޤ
</para></listitem>
</varlistentry>
@@ -122,96 +139,40 @@
<!--
Apple (and briefly a few other manufacturers — Power Computing, for
-example) makes a series of Macintosh computers based on the PowerPC
+example) made a series of Macintosh computers based on the PowerPC
processor. For purposes of architecture support, they are categorized
-as NuBus, OldWorld PCI, and NewWorld.
+as NuBus (not supported by Debian), OldWorld, and NewWorld.
-->
Apple (ƤȤ Power Computing Τ褦¾Υ) ϡ
PowerPC ץå١ Macintosh ԥ塼¤Ƥޤ
-ƥΥݡȤμˤꡢNuBus, OldWorld PCI, NewWorld
-ʬवƤޤ
+ƥΥݡȤμˤꡢNuBus (Debian Ǥ̤ݡ),
+OldWorld PCI, NewWorld ʬवƤޤ
</para><para>
<!--
-Macintosh computers using the 680x0 series of processors are not in
-the PowerPC family but are instead m68k machines. Those models start
-with <quote>Mac II</quote> or have a 3-digit model number such as Centris 650
-or Quadra 950. Apple's pre-iMac PowerPC model numbers have four digits.
--->
-680x0 Ϥ ץåܤ Macintosh ԥ塼ϡPowerPC ϤǤϤʤ
- m68k ޥȤʤޤ
-<quote>Mac II</quote> Ϥޤ Centris 650 Quadra 950 Τ褦
-3 ΥǥʥСΤΤ˳ޤ
-Apple iMac PowerPC ǥ 4 οˤʤäƤޤ
-
-</para><para>
-
-<!--
-NuBus systems are not currently supported by debian/powerpc. The
-monolithic Linux/PPC kernel architecture does not have support for
-these machines; instead, one must use the MkLinux Mach microkernel,
-which Debian does not yet support. These include the following:
--->
-Nubus ƥ debian/powerpc ǤϸߥݡȤƤޤ
-Υꥷå Linux/PPC ͥ륢ƥ㤬ݡȤƤʤΤǤ
-ˡȤˤ Debian ǤϤޤݡȤƤʤ
-MkLinux Mach ޥͥȤɬפޤ
-ˤϰʲΤΤޤ
-
-<itemizedlist>
-<listitem><para>
-
-Power Macintosh 6100, 7100, 8100
-
-</para></listitem>
-<listitem><para>
-
-Performa 5200, 6200, 6300
-
-</para></listitem>
-<listitem><para>
-
-Powerbook 1400, 2300, 5300
-
-</para></listitem>
-<listitem><para>
-
-Workgroup Server 6150, 8150, 9150
-
-</para></listitem>
-</itemizedlist>
-
-<!--
-A linux kernel for these machines and limited support is available at
-<ulink url="http://nubus-pmac.sourceforge.net/";></ulink>
--->
-ʾΥޥѤ Linux ͥ
-<ulink url="http://nubus-pmac.sourceforge.net/";></ulink>
-Ū˥ݡȤƤޤ
-
-</para><para>
-
-<!--
OldWorld systems are most Power Macintoshes with a floppy drive and a
PCI bus. Most 603, 603e, 604, and 604e based Power Macintoshes are
-OldWorld machines. The beige colored G3 systems are also OldWorld.
+OldWorld machines. Those pre-iMac PowerPC models from Apple use a
+four digit naming scheme, except for the beige colored G3 systems, which
+are also OldWorld.
-->
OldWorld ƥϥեåԡɥ饤֤ PCI Х
ۤȤɤ Power Macintosh ΤȤǤ
603, 603e, 604, 604e ١ Power Macintosh OldWorld ޥǤ
-١ G3 ƥ⡢OldWorld Ǥ
+١ G3 ƥ¾ϡ
+Apple 4 ο̿̾§ iMac PowerPC ǥ OldWorld Ǥ
</para><para>
<!--
The so called NewWorld PowerMacs are any PowerMacs in translucent
-colored plastic cases. That includes all iMacs, iBooks, G4 systems,
-blue colored G3 systems, and most PowerBooks manufactured in and after
-1999. The NewWorld PowerMacs are also known for using the <quote>ROM in
+colored plastic cases and later models. That includes all iMacs, iBooks,
+G4 systems, blue colored G3 systems, and most PowerBooks manufactured in and
+after 1999. The NewWorld PowerMacs are also known for using the <quote>ROM in
RAM</quote> system for MacOS, and were manufactured from mid-1998 onwards.
-->
-Ф NewWorld PowerMac ȸƤФΤȾƩ PowerMac Ǥ
+Ф NewWorld PowerMac ȸƤФΤȾƩ PowerMac ʹߤΤΤǤ
٤Ƥ iMac, iBook, G4 ƥ, Ĥ G3 ƥ,
1999 ǯʹߤ¤줿ۤȤɤ PowerBook ޤޤޤ
NewWorld PowerMac ϡ1998 ǯȾФ¤졢
@@ -247,7 +208,7 @@
<tbody>
<row>
- <entry morerows="22">Apple</entry>
+ <entry morerows="27">Apple</entry>
<entry>iMac Bondi Blue, 5 Flavors, Slot Loading</entry>
<entry>NewWorld</entry>
</row><row>
@@ -365,6 +326,9 @@
</sect3>
+<!--
+ <sect3><title>PReP subarchitecture</title>
+-->
<sect3><title>PReP ֥ƥ</title>
<para>
@@ -460,5 +424,112 @@
</tbody></tgroup></informaltable>
</para>
+
</sect3>
- </sect2>
+
+<!--
+ <sect3><title>Nubus PowerMac subarchitecture (unsupported)</title>
+-->
+ <sect3><title>Nubus PowerMac ֥ƥ (̤ݡ)</title>
+
+<para>
+
+<!--
+NuBus systems are not currently supported by Debian/powerpc. The
+monolithic Linux/PPC kernel architecture does not have support for
+these machines; instead, one must use the MkLinux Mach microkernel,
+which Debian does not yet support. These include the following:
+-->
+NuBus ƥϸ Debian/powerpc ǥݡȤƤޤ
+Υꥷå Linux/PPC ͥ륢ƥǤϡ
+ޥݡȤƤ餺Debian ǤϤޤݡȤƤʤ
+MkLinux Mach ޥͥѤʤФʤʤΤޤ
+ʲΤΤޤޤޤ
+
+<itemizedlist>
+<listitem><para>
+
+Power Macintosh 6100, 7100, 8100
+
+</para></listitem>
+<listitem><para>
+
+Performa 5200, 6200, 6300
+
+</para></listitem>
+<listitem><para>
+
+Powerbook 1400, 2300, and 5300
+
+</para></listitem>
+<listitem><para>
+
+Workgroup Server 6150, 8150, 9150
+
+</para></listitem>
+</itemizedlist>
+
+<!--
+A linux kernel for these machines and limited support is available at
+<ulink url="http://nubus-pmac.sourceforge.net/";></ulink>.
+-->
+ʾΥޥ Linux ͥ
+<ulink url="http://nubus-pmac.sourceforge.net/";></ulink>
+ǸŪ˥ݡȤƤޤ
+
+</para>
+
+ </sect3>
+
+<!--
+ <sect3><title>Non-PowerPC Macs</title>
+-->
+ <sect3><title> PowerPC Mac</title>
+
+<para>
+
+<!--
+Macintosh computers using the 680x0 series of processors are
+<emphasis>not</emphasis> in the PowerPC family but are instead m68k
+machines. Those models start with <quote>Mac II</quote> series, go on
+to the <quote>LC</quote> family, then the Centris series, and culminate
+in the Quadras and Performas. These models usually have a Roman numeral
+or 3-digit model number such as Mac IIcx, LCIII or Quadra 950.
+-->
+680x0 Ϥ ץåܤ Macintosh ԥ塼ϡ
+PowerPC <emphasis>ǤϤʤ</emphasis> m68k ޥȤʤޤ
+Υ <quote>Mac II</quote> Ϥޤꡢ
+<quote>LC</quote> ϡCentris Quadra Performa Ȥʤޤ
+ʾΥǥϡMac IIcx, LCIII, Quadra 950 Τ褦˥
+3 ΥǥʥСΤΤۤܤ˳ޤ
+
+</para><para>
+
+<!--
+This model range started with the Mac II (Mac II, IIx, IIcx, IIci,
+IIsi, IIvi, IIvx, IIfx), then the LC (LC, LCII, III, III+, 475, 520,
+550, 575, 580, 630), then the Mac TV, then the Centris (610, 650,
+660AV), the Quadra (605, 610, 630, 650, 660AV, 700, 800, 840AV, 900,
+950), and finally the Performa 200-640CD.
+-->
+ΥǥϰϤϡMac II (Mac II, IIx, IIcx, IIci, IIsi, IIvi, IIvx, IIfx)
+ǤϤޤꡢLC (LC, LCII, III, III+, 475, 520, 550, 575, 580, 630)
+Mac TVCentris (610, 650, 660AV)
+Quadra (605, 610, 630, 650, 660AV, 700, 800, 840AV, 900, 950)
+Ǹ Performa 200-640CD Ȥʤޤ
+
+</para><para>
+
+<!--
+In laptops, it started with the Mac Portable, then the PowerBook
+100-190cs and the PowerBook Duo 210-550c (excluding PowerBook 500
+which is Nubus, please see the section above).
+-->
+åץȥåפǤϡMac Portable ϤޤꡢPowerBook 100-190cs
+PowerBook Duo 210-550c (PowerBook 500 Nubus Ϥޤ
+Ф)
+
+</para>
+
+ </sect3>
+ </sect2>