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

6 files changed, 14 insertions, 327 deletions

diff --git a/po/ja/boot-installer.po b/po/ja/boot-installer.po
index 65d4d81f0..b42231ed0 100644
--- a/po/ja/boot-installer.po
+++ b/po/ja/boot-installer.po
@@ -3342,30 +3342,6 @@ msgstr "OpenFirmware からの NewWorld Mac の起動"
 #. Tag: para
 #: boot-installer.xml:2500
 #, no-c-format
-#| msgid ""
-#| "You will have already placed the <filename>vmlinux</filename>, "
-#| "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
-#| "<filename>yaboot.conf</filename> files at the root level of your HFS "
-#| "partition in <xref linkend=\"files-newworld\"/>. Restart the computer, "
-#| "and immediately (during the chime) hold down the <keycap>Option</keycap>, "
-#| "<keycap>Command (cloverleaf/Apple)</keycap>, <keycap>o</keycap>, and "
-#| "<keycap>f</keycap> keys all together. After a few seconds you will be "
-#| "presented with the Open Firmware prompt. At the prompt, type "
-#| "<informalexample><screen>\n"
-#| "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-#| "</screen></informalexample> replacing <replaceable>x</replaceable> with "
-#| "the partition number of the HFS partition where the kernel and yaboot "
-#| "files were placed, followed by a &enterkey;. On some machines, you may "
-#| "need to use <userinput>ide0:</userinput> instead of <userinput>hd:</"
-#| "userinput>. In a few more seconds you will see a yaboot prompt "
-#| "<informalexample><screen>\n"
-#| "boot:\n"
-#| "</screen></informalexample> At yaboot's <prompt>boot:</prompt> prompt, "
-#| "type either <userinput>install</userinput> or <userinput>install "
-#| "video=ofonly</userinput> followed by a &enterkey;. The "
-#| "<userinput>video=ofonly</userinput> argument is for maximum "
-#| "compatibility; you can try it if <userinput>install</userinput> doesn't "
-#| "work. The Debian installation program should start."
 msgid ""
 "You will have already placed the <filename>vmlinux</filename>, "
 "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
@@ -3424,14 +3400,6 @@ msgstr "現在、NewWorld PowerMac は USB からの起動をサポートして�
 #. Tag: para
 #: boot-installer.xml:2539
 #, no-c-format
-#| msgid ""
-#| "Make sure you have prepared everything from <xref linkend=\"boot-usb-files"
-#| "\"/>. To boot a Macintosh system from a USB stick, you will need to use "
-#| "the Open Firmware prompt, since Open Firmware does not search USB storage "
-#| "devices by default. To get to the prompt, hold down "
-#| "<keycombo><keycap>Command</keycap> <keycap>Option</keycap> <keycap>o</"
-#| "keycap> <keycap>f</keycap></keycombo> all together while booting (see "
-#| "<xref linkend=\"invoking-openfirmware\"/>)."
 msgid ""
 "Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
 ">. To boot a Macintosh system from a USB stick, you will need to use the "
@@ -3526,16 +3494,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:2617
 #, no-c-format
-#| msgid ""
-#| "On machines with Open Firmware, such as NewWorld Power Macs, enter the "
-#| "boot monitor (see <xref linkend=\"invoking-openfirmware\"/>) and use the "
-#| "command <command>boot enet:0</command>. PReP and CHRP boxes may have "
-#| "different ways of addressing the network. On a PReP machine, you should "
-#| "try <userinput>boot net:<replaceable>server_ipaddr</replaceable>,"
-#| "<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable></"
-#| "userinput>. On some PReP systems (e.g. Motorola PowerStack machines) the "
-#| "command <userinput>help boot</userinput> may give a description of syntax "
-#| "and available options."
 msgid ""
 "On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
 "monitor (see <xref linkend=\"invoking-openfirmware\"/>) and use the command "
@@ -5508,50 +5466,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:3900
 #, no-c-format
-#| msgid ""
-#| "Alternatively you can use this template when filling out installation "
-#| "reports, and file the report as a bug report against the "
-#| "<classname>installation-reports</classname> pseudo package, by sending it "
-#| "to <email>submit@bugs.debian.org</email>. <informalexample><screen>\n"
-#| "Package: installation-reports\n"
-#| "\n"
-#| "Boot method: &lt;How did you boot the installer? CD? floppy? network?"
-#| "&gt;\n"
-#| "Image version: &lt;Full URL to image you downloaded is best&gt;\n"
-#| "Date: &lt;Date and time of the install&gt;\n"
-#| "\n"
-#| "Machine: &lt;Description of machine (eg, IBM Thinkpad R32)&gt;\n"
-#| "Processor:\n"
-#| "Memory:\n"
-#| "Partitions: &lt;df -Tl will do; the raw partition table is preferred&gt;\n"
-#| "\n"
-#| "Output of lspci -nn and lspci -vnn:\n"
-#| "\n"
-#| "Base System Installation Checklist:\n"
-#| "[O] = OK, [E] = Error (please elaborate below), [ ] = didn't try it\n"
-#| "\n"
-#| "Initial boot:           [ ]\n"
-#| "Detect network card:    [ ]\n"
-#| "Configure network:      [ ]\n"
-#| "Detect CD:              [ ]\n"
-#| "Load installer modules: [ ]\n"
-#| "Detect hard drives:     [ ]\n"
-#| "Partition hard drives:  [ ]\n"
-#| "Install base system:    [ ]\n"
-#| "Clock/timezone setup:   [ ]\n"
-#| "User/password setup:    [ ]\n"
-#| "Install tasks:          [ ]\n"
-#| "Install boot loader:    [ ]\n"
-#| "Overall install:        [ ]\n"
-#| "\n"
-#| "Comments/Problems:\n"
-#| "\n"
-#| "&lt;Description of the install, in prose, and any thoughts, comments\n"
-#| "      and ideas you had during the initial install.&gt;\n"
-#| "</screen></informalexample> In the bug report, describe what the problem "
-#| "is, including the last visible kernel messages in the event of a kernel "
-#| "hang. Describe the steps that you did which brought the system into the "
-#| "problem state."
 msgid ""
 "Alternatively you can use this template when filling out installation "
 "reports, and file the report as a bug report against the "
diff --git a/po/ja/hardware.po b/po/ja/hardware.po
index 705ebb455..5247f8ee3 100644
--- a/po/ja/hardware.po
+++ b/po/ja/hardware.po
@@ -143,7 +143,6 @@ msgstr "alpha"
 #. Tag: entry
 #: hardware.xml:81
 #, no-c-format
-#| msgid "<entry>VME</entry>"
 msgid "<entry>ARM</entry>"
 msgstr "<entry>ARM</entry>"
 
@@ -204,7 +203,6 @@ msgstr "orion5x"
 #. Tag: entry
 #: hardware.xml:95
 #, no-c-format
-#| msgid "<entry>prep</entry>"
 msgid "<entry>Versatile</entry>"
 msgstr "<entry>Versatile</entry>"
 
@@ -1909,7 +1907,6 @@ msgstr ""
 #. Tag: term
 #: hardware.xml:821
 #, no-c-format
-#| msgid "<term>prep</term>"
 msgid "<term>Versatile</term>"
 msgstr "<term>Versatile</term>"
 
@@ -2086,23 +2083,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:988
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
-#| "Indigo 2 and Challenge S. Since these machines are very similar, whenever "
-#| "this document refers to the SGI Indy, the Indigo 2 and Challenge S are "
-#| "meant as well. </para></listitem> <listitem><para> SGI IP32: this "
-#| "platform is generally known as SGI O2. </para></listitem> "
-#| "<listitem><para> Broadcom BCM91250A (SWARM): this is an ATX form factor "
-#| "evaluation board from Broadcom based on the dual-core SB1 1250 CPU. </"
-#| "para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): this is an "
-#| "ATX form factor evaluation board from Broadcom based on the quad-core "
-#| "SB1A 1480 CPU. </para></listitem> </itemizedlist> Complete information "
-#| "regarding supported mips/mipsel machines can be found at the <ulink url="
-#| "\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. In the following, only "
-#| "the systems supported by the Debian installer will be covered. If you are "
-#| "looking for support for other subarchitectures, please contact the <ulink "
-#| "url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
@@ -2176,21 +2156,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1062
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
-#| "covered here. This includes the Cobalt Qube 2700 (Qube1), RaQ, Qube2 and "
-#| "RaQ2, and the Gateway Microserver. </para></listitem> <listitem><para> "
-#| "Broadcom BCM91250A (SWARM): this is an ATX form factor evaluation board "
-#| "from Broadcom based on the dual-core SB1 1250 CPU. </para></listitem> "
-#| "<listitem><para> Broadcom BCM91480B (BigSur): this is an ATX form factor "
-#| "evaluation board from Broadcom based on the quad-core SB1A 1480 CPU. </"
-#| "para></listitem> </itemizedlist> Complete information regarding supported "
-#| "mips/mipsel machines can be found at the <ulink url=\"&url-linux-mips;"
-#| "\">Linux-MIPS homepage</ulink>. In the following, only the systems "
-#| "supported by the Debian installer will be covered. If you are looking for "
-#| "support for other subarchitectures, please contact the <ulink url=\"&url-"
-#| "list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
 msgid ""
 "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 1491f4fa2..ce59d049d 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-09-01 00:10+0000\n"
+"POT-Creation-Date: 2008-09-05 00:09+0000\n"
 "PO-Revision-Date: 2008-09-03 13:32+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: \n"
@@ -261,10 +261,6 @@ msgstr "NSLU2 のインストールファイル"
 #. Tag: para
 #: install-methods.xml:173
 #, no-c-format
-#| msgid ""
-#| "A firmware image is provided for the Linksys NSLU2 which will "
-#| "automatically boot <classname>debian-installer</classname>. This firmware "
-#| "image can be obtained from &nslu2-firmware-img;."
 msgid ""
 "A firmware image is provided for the Linksys NSLU2 which will automatically "
 "boot <classname>debian-installer</classname>. This image can be uploaded via "
@@ -279,17 +275,12 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:185
 #, no-c-format
-#| msgid "NSLU2 Installation Files"
 msgid "Thecus N2100 Installation Files"
 msgstr "Thecus N2100 のインストールファイル"
 
 #. Tag: para
 #: install-methods.xml:186
 #, no-c-format
-#| msgid ""
-#| "A firmware image is provided for the Linksys NSLU2 which will "
-#| "automatically boot <classname>debian-installer</classname>. This firmware "
-#| "image can be obtained from &nslu2-firmware-img;."
 msgid ""
 "A firmware image is provided for the Thecus N2100 which will automatically "
 "boot <classname>debian-installer</classname>. This image can be installed "
@@ -304,16 +295,19 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:197
 #, no-c-format
-#| msgid "CATS Installation Files"
 msgid "GLAN Tank Installation Files"
 msgstr "GLAN Tank のインストールファイル"
 
 #. Tag: para
 #: install-methods.xml:198
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the "
+#| "disk on with you intend to install Debian. These images can be obtained "
+#| "from &glantank-firmware-img;."
 msgid ""
 "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
-"on with you intend to install Debian. These images can be obtained from "
+"on which you intend to install Debian. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "GLAN Tank は Debian をインストールする予定のディスクに、ext2 パーティションに"
@@ -323,17 +317,20 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:208
 #, no-c-format
-#| msgid "CATS Installation Files"
 msgid "Kurobox Pro Installation Files"
 msgstr "玄箱 Pro のインストールファイル"
 
 #. Tag: para
 #: install-methods.xml:209
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
+#| "disk on with you intend to install Debian. These images can be obtained "
+#| "from &kuroboxpro-firmware-img;."
 msgid ""
 "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
-"disk on with you intend to install Debian. These images can be obtained from "
-"&kuroboxpro-firmware-img;."
+"disk on which you intend to install Debian. These images can be obtained "
+"from &kuroboxpro-firmware-img;."
 msgstr ""
 "玄箱 Pro は Debian をインストールする予定のディスクに、ext2 パーティションに"
 "あるカーネルと RAM ディスクが必要です。このイメージは、 &kuroboxpro-firmware-"
@@ -342,17 +339,12 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:219
 #, no-c-format
-#| msgid "NSLU2 Installation Files"
 msgid "HP mv2120 Installation Files"
 msgstr "HP mv2120 のインストールファイル"
 
 #. Tag: para
 #: install-methods.xml:220
 #, no-c-format
-#| msgid ""
-#| "A firmware image is provided for the Linksys NSLU2 which will "
-#| "automatically boot <classname>debian-installer</classname>. This firmware "
-#| "image can be obtained from &nslu2-firmware-img;."
 msgid ""
 "A firmware image is provided for the HP mv2120 which will automatically boot "
 "<classname>debian-installer</classname>. This image can be installed with "
@@ -369,7 +361,6 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:232
 #, no-c-format
-#| msgid "CATS Installation Files"
 msgid "QNAP Turbo Station Installation Files"
 msgstr "QNAP Turbo Station のインストールファイル"
 
@@ -2194,18 +2185,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1371
 #, no-c-format
-#| msgid ""
-#| "Look in <filename>/etc/inetd.conf</filename> and remember the directory "
-#| "which is used as the argument of <command>in.tftpd</command><footnote> "
-#| "<para> The <userinput>-l</userinput> argument enables some versions of "
-#| "<command>in.tftpd</command> to log all requests to the system logs; this "
-#| "is useful for diagnosing boot errors. </para> </footnote>; you'll need "
-#| "that below. If you've had to change <filename>/etc/inetd.conf</filename>, "
-#| "you'll have to notify the running <command>inetd</command> process that "
-#| "the file has changed. On a Debian machine, run <userinput>/etc/init.d/"
-#| "inetd reload</userinput>; on other machines, find out the process ID for "
-#| "<command>inetd</command>, and run <userinput>kill -HUP <replaceable>inetd-"
-#| "pid</replaceable></userinput>."
 msgid ""
 "Look in <filename>/etc/inetd.conf</filename> and remember the directory "
 "which is used as the argument of <command>in.tftpd</command><footnote> "
@@ -2289,13 +2268,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1423
 #, no-c-format
-#| msgid ""
-#| "On NewWorld Power Macintosh machines, you will need to set up the "
-#| "<command>yaboot</command> boot loader as the TFTP boot image. "
-#| "<command>Yaboot</command> will then retrieve the kernel and RAMdisk "
-#| "images via TFTP itself. For net booting, use the <filename>yaboot-netboot."
-#| "conf</filename>. Just rename this to <filename>yaboot.conf</filename> in "
-#| "the TFTP directory."
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
 "<command>yaboot</command> boot loader as the TFTP boot image. "
diff --git a/po/ja/preparing.po b/po/ja/preparing.po
index cd62a5033..5ef66c16a 100644
--- a/po/ja/preparing.po
+++ b/po/ja/preparing.po
@@ -2812,13 +2812,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1787
 #, no-c-format
-#| msgid ""
-#| "On &arch-title; Macintoshes, you invoke OpenFirmware with "
-#| "<keycombo><keycap>Command</keycap> <keycap>option</keycap> <keycap>O</"
-#| "keycap> <keycap>F</keycap></keycombo> while booting. Generally it will "
-#| "check for these keystrokes after the chime, but the exact timing varies "
-#| "from model to model. See <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> "
-#| "for more hints."
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
 "<keycombo><keycap>Command (cloverleaf/Apple)</keycap><keycap>Option</"
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index ed58bb319..3e9c160ea 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1352,48 +1352,6 @@ msgstr "以下の debconf 変数は、ネットワークの設定と関係があ
 #. Tag: screen
 #: preseed.xml:754
 #, no-c-format
-#| msgid ""
-#| "# netcfg will choose an interface that has link if possible. This makes "
-#| "it\n"
-#| "# skip displaying a list if there is more than one interface.\n"
-#| "d-i netcfg/choose_interface select auto\n"
-#| "\n"
-#| "# To pick a particular interface instead:\n"
-#| "#d-i netcfg/choose_interface select eth1\n"
-#| "\n"
-#| "# If you have a slow dhcp server and the installer times out waiting for\n"
-#| "# it, this might be useful.\n"
-#| "#d-i netcfg/dhcp_timeout string 60\n"
-#| "\n"
-#| "# If you prefer to configure the network manually, uncomment this line "
-#| "and\n"
-#| "# the static network configuration below.\n"
-#| "#d-i netcfg/disable_dhcp boolean true\n"
-#| "\n"
-#| "# If you want the preconfiguration file to work on systems both with and\n"
-#| "# without a dhcp server, uncomment these lines and the static network\n"
-#| "# configuration below.\n"
-#| "#d-i netcfg/dhcp_failed note\n"
-#| "#d-i netcfg/dhcp_options select Configure network manually\n"
-#| "\n"
-#| "# Static network configuration.\n"
-#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
-#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
-#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
-#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
-#| "#d-i netcfg/confirm_static boolean true\n"
-#| "\n"
-#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
-#| "# values set here. However, setting the values still prevents the "
-#| "questions\n"
-#| "# from being shown, even if values come from dhcp.\n"
-#| "d-i netcfg/get_hostname string unassigned-hostname\n"
-#| "d-i netcfg/get_domain string unassigned-domain\n"
-#| "\n"
-#| "# Disable that annoying WEP key dialog.\n"
-#| "d-i netcfg/wireless_wep string\n"
-#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
-#| "#d-i netcfg/dhcp_hostname string radish"
 msgid ""
 "# netcfg will choose an interface that has link if possible. This makes it\n"
 "# skip displaying a list if there is more than one interface.\n"
@@ -1632,79 +1590,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:816
 #, 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"
-#| "d-i partman-auto/disk string /dev/sda\n"
-#| "# Note: If you want to use whatever disk is available, no matter\n"
-#| "# what its device name, comment the line above out. This will only work "
-#| "if\n"
-#| "# the system only has one disk.\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"
@@ -2336,22 +2221,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:980
 #, no-c-format
-#| msgid ""
-#| "#tasksel tasksel/first multiselect standard, web-server\n"
-#| "# If the desktop task is selected, install the kde and xfce desktops\n"
-#| "# instead of the default gnome desktop.\n"
-#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
-#| "\n"
-#| "# Individual additional packages to install\n"
-#| "#d-i pkgsel/include string openssh-server build-essential\n"
-#| "\n"
-#| "# Some versions of the installer can report back on what software you "
-#| "have\n"
-#| "# installed, and what software you use. The default is not to report "
-#| "back,\n"
-#| "# but sending reports helps the project determine what software is most\n"
-#| "# popular and include it on CDs.\n"
-#| "#popularity-contest popularity-contest/participate boolean false"
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
 "# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2480,23 +2349,6 @@ msgstr "インストールの仕上げ"
 #. Tag: screen
 #: preseed.xml:1001
 #, no-c-format
-#| msgid ""
-#| "# During installations from serial console, the regular virtual consoles\n"
-#| "# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next\n"
-#| "# line to prevent this.\n"
-#| "#d-i finish-install/keep-consoles boolean true\n"
-#| "\n"
-#| "# Avoid that last message about the install being complete.\n"
-#| "d-i finish-install/reboot_in_progress note\n"
-#| "\n"
-#| "# This will prevent the installer from ejecting the CD during the "
-#| "reboot,\n"
-#| "# which is useful in some situations.\n"
-#| "#d-i cdrom-detect/eject boolean false\n"
-#| "\n"
-#| "# This is how to make the installer shutdown when finished, but not\n"
-#| "# reboot into the installed system.\n"
-#| "#d-i debian-installer/exit/halt boolean true"
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
 "# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next\n"
diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po
index f664b79d1..03b783d4d 100644
--- a/po/ja/using-d-i.po
+++ b/po/ja/using-d-i.po
@@ -896,15 +896,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:524
 #, no-c-format
-#| msgid ""
-#| "If you selected a language that is recognized as an official language for "
-#| "more than one country<footnote> <para> In technical terms: where multiple "
-#| "locales exist for that language with differing country codes. </para> </"
-#| "footnote>, you will next be asked to select a country. If you choose "
-#| "<guimenuitem>Other</guimenuitem> at the bottom of the list, you will be "
-#| "presented with a list of all countries, grouped by continent. If the "
-#| "language has only one country associated with it, that country will be "
-#| "selected automatically."
 msgid ""
 "If you selected a language that is recognized as an official language for "
 "more than one country<footnote> <para> In technical terms: where multiple "