[SILENT_COMMIT] Update of POT and PO files for the manual

6 files changed, 7 insertions, 244 deletions

diff --git a/po/ja/hardware.po b/po/ja/hardware.po
index 96ffbd284..c00dcc3d4 100644
--- a/po/ja/hardware.po
+++ b/po/ja/hardware.po
@@ -2010,12 +2010,6 @@ msgstr "I/O バス"
 #. Tag: para
 #: hardware.xml:922
 #, no-c-format
-#| msgid ""
-#| "The system bus is the part of the motherboard which allows the CPU to "
-#| "communicate with peripherals such as storage devices. Your computer must "
-#| "use the ISA, EISA, PCI, the Microchannel Architecture (MCA, used in IBM's "
-#| "PS/2 line), or VESA Local Bus (VLB, sometimes called the VL bus). "
-#| "Essentially all personal computers sold in recent years use one of these."
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
@@ -3611,11 +3605,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1995
 #, no-c-format
-#| msgid ""
-#| "Generally, the Debian installation system includes support for floppies, "
-#| "IDE drives, IDE floppies, parallel port IDE devices, SCSI controllers and "
-#| "drives, USB, and FireWire. The supported file systems include FAT, Win-32 "
-#| "FAT extensions (VFAT) and NTFS."
 msgid ""
 "Generally, the Debian installation system includes support for floppies, IDE "
 "(also known as PATA) drives, IDE floppies, parallel port IDE devices, SATA "
@@ -3630,13 +3619,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:2002
 #, no-c-format
-#| msgid ""
-#| "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
-#| "&mdash; often called MFM, RLL, IDE, or ATA &mdash; are supported. Very "
-#| "old 8&ndash;bit hard disk controllers used in the IBM XT computer are "
-#| "supported only as a module. SCSI disk controllers from many different "
-#| "manufacturers are supported. See the <ulink url=\"&url-hardware-howto;"
-#| "\">Linux Hardware Compatibility HOWTO</ulink> for more details."
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
 "&mdash; often called MFM, RLL, IDE, or PATA &mdash; are supported. SATA and "
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 846ffc806..6d371e64a 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -129,9 +129,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:90
 #, no-c-format
-#| msgid ""
-#| "When downloading files from a Debian mirror, be sure to download the "
-#| "files in <emphasis>binary</emphasis> mode, not text or automatic mode."
 msgid ""
 "When downloading files from a Debian mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
diff --git a/po/ja/installation-howto.po b/po/ja/installation-howto.po
index 5c2f3ae8f..739208614 100644
--- a/po/ja/installation-howto.po
+++ b/po/ja/installation-howto.po
@@ -449,12 +449,6 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:248
 #, no-c-format
-#| msgid ""
-#| "Now it is time to partition your disks. First you will be given the "
-#| "opportunity to automatically partition either an entire drive, or "
-#| "available free space on a drive (guided partitioning). This is "
-#| "recommended for new users or anyone in a hurry. If you do not want to "
-#| "autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu."
 msgid ""
 "Now it is time to partition your disks. First you will be given the "
 "opportunity to automatically partition either an entire drive, or available "
@@ -487,15 +481,6 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:263
 #, no-c-format
-#| msgid ""
-#| "On the next screen you will see your partition table, how the partitions "
-#| "will be formatted, and where they will be mounted. Select a partition to "
-#| "modify or delete it. If you did automatic partitioning, you should just "
-#| "be able to choose <guimenuitem>Finish partitioning and write changes to "
-#| "disk</guimenuitem> from the menu to use what it set up. Remember to "
-#| "assign at least one partition for swap space and to mount a partition on "
-#| "<filename>/</filename>. <xref linkend=\"partitioning\"/> has more "
-#| "information about partitioning."
 msgid ""
 "On the next screen you will see your partition table, how the partitions "
 "will be formatted, and where they will be mounted. Select a partition to "
@@ -556,10 +541,6 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:293
 #, no-c-format
-#| msgid ""
-#| "Partitioning is followed by setting up user accounts. By default you will "
-#| "need to provide a password for the <quote>root</quote> (administrator) "
-#| "account and information necessary to create one regular user account."
 msgid ""
 "Installation of the base system is followed by setting up user accounts. By "
 "default you will need to provide a password for the <quote>root</quote> "
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 2a133ef8b..0fc359e75 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1233,7 +1233,7 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:693
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
 #| "Keyboard configuration consists of selecting a keyboard architecture and "
 #| "a keymap. In most cases the correct keyboard architecture is selected by "
@@ -1242,8 +1242,8 @@ msgstr ""
 msgid ""
 "Keyboard configuration consists of selecting a keyboard architecture and a "
 "keymap. In most cases the correct keyboard architecture is selected by "
-"default, so there's normally no need to preseed it. The keymap must be valid "
-"for the selected keyboard architecture."
+"default, so there's normally no need to preseed it. The keymap must be known "
+"to the &d-i; for the selected keyboard architecture."
 msgstr ""
 "キーボード設定は、キーボードアーキテクチャとキーマップを選択することから成っ"
 "ています。ほとんどの場合、正しいキーボードアーキテクチャはデフォルトで選択さ"
@@ -1616,76 +1616,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:829
 #, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# Note: this must be preseeded with a localized (translated) value.\n"
-#| "#d-i partman-auto/init_automatically_partition \\\n"
-#| "#      select Guided - use the largest continuous free space\n"
-#| "\n"
-#| "# Alternatively, you can specify a disk to partition. The device name "
-#| "must\n"
-#| "# be given in traditional non-devfs format.\n"
-#| "# For example, to use the first SCSI/SATA hard disk:\n"
-#| "# Note: A disk must be specified, unless the system has only one disk.\n"
-#| "#d-i partman-auto/disk string /dev/sda\n"
-#| "# In addition, you'll need to specify the method to use.\n"
-#| "# The presently available methods are: \"regular\", \"lvm\" and \"crypto"
-#| "\"\n"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# And the same goes for the confirmation to write the lvm partitions.\n"
-#| "d-i partman-lvm/confirm boolean true\n"
-#| "\n"
-#| "# You can choose from any of the predefined partitioning recipes.\n"
-#| "# Note: this must be preseeded with a localized (translated) value.\n"
-#| "d-i partman-auto/choose_recipe \\\n"
-#| "       select All files in one partition (recommended for new users)\n"
-#| "#d-i partman-auto/choose_recipe \\\n"
-#| "#       select Separate /home partition\n"
-#| "#d-i partman-auto/choose_recipe \\\n"
-#| "#       select Separate /home, /usr, /var, and /tmp partitions\n"
-#| "\n"
-#| "# Or provide a recipe of your own...\n"
-#| "# The recipe format is documented in the file devel/partman-auto-recipe."
-#| "txt.\n"
-#| "# If you have a way to get a recipe file into the d-i environment, you "
-#| "can\n"
-#| "# just point at it.\n"
-#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
-#| "\n"
-#| "# If not, you can put an entire recipe into the preconfiguration file in "
-#| "one\n"
-#| "# (logical) line. This example creates a small /boot partition, suitable\n"
-#| "# swap, and uses the rest of the space for the root partition:\n"
-#| "#d-i partman-auto/expert_recipe string                         \\\n"
-#| "#      boot-root ::                                            \\\n"
-#| "#              40 50 100 ext3                                  \\\n"
-#| "#                      $primary{ } $bootable{ }                \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ /boot }                     \\\n"
-#| "#              .                                               \\\n"
-#| "#              500 10000 1000000000 ext3                       \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ / }                         \\\n"
-#| "#              .                                               \\\n"
-#| "#              64 512 300% linux-swap                          \\\n"
-#| "#                      method{ swap } format{ }                \\\n"
-#| "#              .\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation, "
-#| "provided\n"
-#| "# that you told it what to do using one of the methods above.\n"
-#| "d-i partman/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition \\\n"
-#| "       select Finish partitioning and write changes to disk\n"
-#| "d-i partman/confirm boolean true"
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# Note: this must be preseeded with a localized (translated) value.\n"
@@ -1830,12 +1760,6 @@ msgstr "RAID を用いたパーティション分割"
 #. Tag: para
 #: preseed.xml:835
 #, no-c-format
-#| msgid ""
-#| "You can also use preseeding to set up partitions on software RAID arrays. "
-#| "Supported are RAID levels 0, 1 and 5, creating degraded arrays and "
-#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
-#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
-#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
@@ -1879,57 +1803,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:861
 #, no-c-format
-#| msgid ""
-#| "# NOTE: this option is of beta release quality and should be used "
-#| "carefully\n"
-#| "\n"
-#| "# The method should be set to \"raid\".\n"
-#| "#d-i partman-auto/method string raid\n"
-#| "# Specify the disks to be partitioned. They will all get the same "
-#| "layout,\n"
-#| "# so this will only work if the disks are the same size.\n"
-#| "#d-i partman-auto/disk string /dev/discs/disc0/disc /dev/discs/disc1/"
-#| "disc\n"
-#| "\n"
-#| "# Next you need to specify the physical partitions that will be used. \n"
-#| "#d-i partman-auto/expert_recipe string \\\n"
-#| "#      multiraid ::                                         \\\n"
-#| "#              1000 5000 4000 raid                          \\\n"
-#| "#                      $primary{ } method{ raid }           \\\n"
-#| "#              .                                            \\\n"
-#| "#              64 512 300% raid                             \\\n"
-#| "#                      method{ raid }                       \\\n"
-#| "#              .                                            \\\n"
-#| "#              500 10000 1000000000 raid                    \\\n"
-#| "#                      method{ raid }                       \\\n"
-#| "#              .\n"
-#| "\n"
-#| "# Last you need to specify how the previously defined partitions will be\n"
-#| "# used in the RAID setup. Remember to use the correct partition numbers\n"
-#| "# for logical partitions.\n"
-#| "# Parameters are:\n"
-#| "# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;"
-#| "mountpoint&gt; \\\n"
-#| "#          &lt;devices&gt; &lt;sparedevices&gt;\n"
-#| "# RAID levels 0, 1 and 5 are supported; devices are separated using \"#"
-#| "\"\n"
-#| "#d-i partman-auto-raid/recipe string \\\n"
-#| "#    1 2 0 ext3 /                                           \\\n"
-#| "#          /dev/discs/disc0/part1#/dev/discs/disc1/part1    \\\n"
-#| "#    .                                                      \\\n"
-#| "#    1 2 0 swap -                                           \\\n"
-#| "#          /dev/discs/disc0/part5#/dev/discs/disc1/part5    \\\n"
-#| "#    .                                                      \\\n"
-#| "#    0 2 0 ext3 /home                                       \\\n"
-#| "#          /dev/discs/disc0/part6#/dev/discs/disc1/part6    \\\n"
-#| "#    .\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation.\n"
-#| "d-i partman-md/confirm boolean true\n"
-#| "d-i partman/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition \\\n"
-#| "       select Finish partitioning and write changes to disk\n"
-#| "d-i partman/confirm boolean true"
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
 "\n"
diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po
index b4f837412..eb157ce08 100644
--- a/po/ja/random-bits.po
+++ b/po/ja/random-bits.po
@@ -2465,9 +2465,6 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:1256
 #, no-c-format
-#| msgid ""
-#| "Information on some screens is not yet nicely formatted into columns as "
-#| "it should be. This is most visible during partitioning."
 msgid ""
 "Information on some screens is not yet nicely formatted into columns as it "
 "should be."
diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po
index d2cab3b61..7158d0915 100644
--- a/po/ja/using-d-i.po
+++ b/po/ja/using-d-i.po
@@ -146,21 +146,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:72
 #, no-c-format
-#| msgid ""
-#| "The normal installer display is character-based (as opposed to the now "
-#| "more familiar graphical interface). The mouse is not operational in this "
-#| "environment. Here are the keys you can use to navigate within the various "
-#| "dialogs. The <keycap>Tab</keycap> or <keycap>right</keycap> arrow keys "
-#| "move <quote>forward</quote>, and the <keycombo> <keycap>Shift</keycap> "
-#| "<keycap>Tab</keycap> </keycombo> or <keycap>left</keycap> arrow keys move "
-#| "<quote>backward</quote> between displayed buttons and selections. The "
-#| "<keycap>up</keycap> and <keycap>down</keycap> arrow select different "
-#| "items within a scrollable list, and also scroll the list itself. In "
-#| "addition, in long lists, you can type a letter to cause the list to "
-#| "scroll directly to the section with items starting with the letter you "
-#| "typed and use <keycap>Pg-Up</keycap> and <keycap>Pg-Down</keycap> to "
-#| "scroll the list in sections. The <keycap>space bar</keycap> selects an "
-#| "item such as a checkbox. Use &enterkey; to activate choices."
 msgid ""
 "In the character-based environment the use of a mouse is not supported. Here "
 "are the keys you can use to navigate within the various dialogs. The "
@@ -1888,44 +1873,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:1180
 #, no-c-format
-#| msgid ""
-#| "What benefits this brings depends on the type of MD device you are "
-#| "creating. Currently supported are: <variablelist> <varlistentry> "
-#| "<term>RAID0</term><listitem><para> Is mainly aimed at performance. RAID0 "
-#| "splits all incoming data into <firstterm>stripes</firstterm> and "
-#| "distributes them equally over each disk in the array. This can increase "
-#| "the speed of read/write operations, but when one of the disks fails, you "
-#| "will lose <emphasis>everything</emphasis> (part of the information is "
-#| "still on the healthy disk(s), the other part <emphasis>was</emphasis> on "
-#| "the failed disk). </para><para> The typical use for RAID0 is a partition "
-#| "for video editing. </para></listitem> </varlistentry> <varlistentry> "
-#| "<term>RAID1</term><listitem><para> Is suitable for setups where "
-#| "reliability is the first concern. It consists of several (usually two) "
-#| "equally-sized partitions where every partition contains exactly the same "
-#| "data. This essentially means three things. First, if one of your disks "
-#| "fails, you still have the data mirrored on the remaining disks. Second, "
-#| "you can use only a fraction of the available capacity (more precisely, it "
-#| "is the size of the smallest partition in the RAID). Third, file-reads are "
-#| "load-balanced among the disks, which can improve performance on a server, "
-#| "such as a file server, that tends to be loaded with more disk reads than "
-#| "writes. </para><para> Optionally you can have a spare disk in the array "
-#| "which will take the place of the failed disk in the case of failure. </"
-#| "para></listitem> </varlistentry> <varlistentry> <term>RAID5</"
-#| "term><listitem><para> Is a good compromise between speed, reliability and "
-#| "data redundancy. RAID5 splits all incoming data into stripes and "
-#| "distributes them equally on all but one disk (similar to RAID0). Unlike "
-#| "RAID0, RAID5 also computes <firstterm>parity</firstterm> information, "
-#| "which gets written on the remaining disk. The parity disk is not static "
-#| "(that would be called RAID4), but is changing periodically, so the parity "
-#| "information is distributed equally on all disks. When one of the disks "
-#| "fails, the missing part of information can be computed from remaining "
-#| "data and its parity. RAID5 must consist of at least three active "
-#| "partitions. Optionally you can have a spare disk in the array which will "
-#| "take the place of the failed disk in the case of failure. </para><para> "
-#| "As you can see, RAID5 has a similar degree of reliability to RAID1 while "
-#| "achieving less redundancy. On the other hand, it might be a bit slower on "
-#| "write operations than RAID0 due to computation of parity information. </"
-#| "para></listitem> </varlistentry> </variablelist> To sum it up:"
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
 "Currently supported are: <variablelist> <varlistentry> <term>RAID0</"
@@ -2130,23 +2077,18 @@ msgstr "RAID にある最小パーティションのサイズ×(デバイス数
 #. Tag: entry
 #: using-d-i.xml:1331
 #, no-c-format
-#| msgid "RAID0"
 msgid "RAID6"
 msgstr "RAID6"
 
 #. Tag: entry
 #: using-d-i.xml:1332
 #, no-c-format
-#| msgid "<entry>2</entry>"
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
 #: using-d-i.xml:1335
 #, no-c-format
-#| msgid ""
-#| "Size of the smallest partition multiplied by (number of devices in RAID "
-#| "minus one)"
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
 "minus two)"
@@ -2155,7 +2097,6 @@ msgstr "最小パーティションのサイズ×(RAID にあるデバイス数
 #. Tag: entry
 #: using-d-i.xml:1342
 #, no-c-format
-#| msgid "RAID0"
 msgid "RAID10"
 msgstr "RAID10"
 
@@ -2293,12 +2234,12 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:1426
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "RAID5 has a similar setup procedure as RAID1 with the exception that you "
-#| "need to use at least <emphasis>three</emphasis> active partitions."
+#| "RAID6 also has a similar setup procedure as RAID1 except thatat least "
+#| "<emphasis>four</emphasis> active partitions are required."
 msgid ""
-"RAID6 also has a similar setup procedure as RAID1 except thatat least "
+"RAID6 also has a similar setup procedure as RAID1 except that at least "
 "<emphasis>four</emphasis> active partitions are required."
 msgstr ""
 "RAID6 では、少なくとも <emphasis>4 つ</emphasis>のアクティブパーティションを"
@@ -3691,14 +3632,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2325
 #, no-c-format
-#| msgid ""
-#| "The various server tasks will install software roughly as follows. DNS "
-#| "server: <classname>bind9</classname>; File server: <classname>samba</"
-#| "classname>, <classname>nfs</classname>; Mail server: <classname>exim4</"
-#| "classname>, <classname>spamassassin</classname>, <classname>uw-imap</"
-#| "classname>; Print server: <classname>cups</classname>; SQL database: "
-#| "<classname>postgresql</classname>; Web server: <classname>apache</"
-#| "classname>."
 msgid ""
 "The various server tasks will install software roughly as follows. DNS "
 "server: <classname>bind9</classname>; File server: <classname>samba</"