10 files changed, 2 insertions, 258 deletions
diff --git a/po/ja/boot-installer.po b/po/ja/boot-installer.po
index 41017ed98..99e0138ff 100644
--- a/po/ja/boot-installer.po
+++ b/po/ja/boot-installer.po
@@ -552,7 +552,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:465
 #, no-c-format
-#| msgid "Booting from MacOS"
 msgid "Booting from DOS"
 msgstr "DOS からの起動"
 
diff --git a/po/ja/hardware.po b/po/ja/hardware.po
index 87a1ba856..e91653467 100644
--- a/po/ja/hardware.po
+++ b/po/ja/hardware.po
@@ -41,14 +41,6 @@ msgstr "サポートするハードウェア"
 #. Tag: para
 #: hardware.xml:21
 #, no-c-format
-#| msgid ""
-#| "Debian does not impose hardware requirements beyond the requirements of "
-#| "the Linux kernel and the GNU tool-sets. Therefore, any architecture or "
-#| "platform to which the Linux kernel, libc, <command>gcc</command>, etc. "
-#| "have been ported, and for which a Debian port exists, can run Debian. "
-#| "Please refer to the Ports pages at <ulink url=\"&url-ports;\"></ulink> "
-#| "for more details on &arch-title; architecture systems which have been "
-#| "tested with &debian-gnu;."
 msgid ""
 "&debian; does not impose hardware requirements beyond the requirements of "
 "the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
@@ -471,11 +463,6 @@ msgstr "kfreebsd-amd64"
 #. Tag: para
 #: hardware.xml:196
 #, no-c-format
-#| msgid ""
-#| "This document covers installation for the <emphasis>&arch-title;</"
-#| "emphasis> architecture. If you are looking for information on any of the "
-#| "other Debian-supported architectures take a look at the <ulink url="
-#| "\"http://www.debian.org/ports/\">Debian-Ports</ulink> pages."
 msgid ""
 "This document covers installation for the <emphasis>&arch-title;</emphasis> "
 "architecture using the <emphasis>&arch-kernel;</emphasis> kernel. If you are "
@@ -508,15 +495,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:216
 #, no-c-format
-#| msgid ""
-#| "This is the first official release of &debian-gnu; for the &arch-title; "
-#| "architecture. We feel that it has proven itself sufficiently to be "
-#| "released. However, because it has not had the exposure (and hence testing "
-#| "by users) that some other architectures have had, you may encounter a few "
-#| "bugs. Use our <ulink url=\"&url-bts;\">Bug Tracking System</ulink> to "
-#| "report any problems; make sure to mention the fact that the bug is on the "
-#| "&arch-title; platform. It can be necessary to use the <ulink url=\"&url-"
-#| "list-subscribe;\">debian-&arch-listname; mailing list</ulink> as well."
 msgid ""
 "This is the first official release of &debian-gnu; for the &arch-title; "
 "architecture. We feel that it has proven itself sufficiently to be released. "
@@ -1839,13 +1817,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1212
 #, no-c-format
-#| msgid ""
-#| "You can also build your own customized kernel to support SMP. <phrase "
-#| "arch=\"linux-any\">You can find a discussion of how to do this in <xref "
-#| "linkend=\"kernel-baking\"/>. At this time (kernel version "
-#| "&kernelversion;) the way you enable SMP is to select <quote>&smp-config-"
-#| "option;</quote> in the <quote>&smp-config-section;</quote> section of the "
-#| "kernel config.</phrase>"
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
 "\"linux-any\"> You can find a discussion of how to do this in <xref linkend="
@@ -1868,12 +1839,6 @@ msgstr "グラフィックカードのサポート"
 #. Tag: para
 #: hardware.xml:1224
 #, no-c-format
-#| msgid ""
-#| "You should be using a VGA-compatible display interface for the console "
-#| "terminal. Nearly every modern display card is compatible with VGA. "
-#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
-#| "not require X11 support. Note that X11 is not used during the "
-#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
@@ -2574,12 +2539,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1656
 #, no-c-format
-#| msgid ""
-#| "You can help improve this situation by encouraging these manufacturers to "
-#| "release the documentation and other resources necessary for us to program "
-#| "their hardware, but the best strategy is simply to avoid this sort of "
-#| "hardware until it is listed as working in the <ulink url=\"&url-hardware-"
-#| "howto;\">Linux Hardware Compatibility HOWTO</ulink>."
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
 "release the documentation and other resources necessary for us to program "
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 32693be15..3897dd8b7 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
 "PO-Revision-Date: 2010-12-30 09:42+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -760,12 +760,6 @@ msgstr "USB メモリでの起動用ファイルの準備"
 #. Tag: para
 #: install-methods.xml:532
 #, no-c-format
-#| msgid ""
-#| "There are two installation methods possible when booting from USB stick. "
-#| "The first is to install completely from the network. The second is to "
-#| "also copy a CD image onto the USB stick and use that as a source for "
-#| "packages, possibly in combination with a mirror. This second method is "
-#| "the more common."
 msgid ""
 "There are two installation methods possible when booting from USB stick. The "
 "first is to only use the USB stick to boot the installer, and then install "
@@ -817,11 +811,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:560
 #, no-c-format
-#| msgid ""
-#| "For the first installation method you'll need to download an installer "
-#| "image from the <filename>netboot</filename> directory (at the location "
-#| "mentioned in <xref linkend=\"where-files\"/>) and use the <quote>flexible "
-#| "way</quote> explained below to copy the files to the USB stick."
 msgid ""
 "To prepare a USB stick that only boots the installer, which then proceeds to "
 "install entirely from the network, you'll need to download the "
@@ -881,18 +870,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:584
 #, no-c-format
-#| msgid ""
-#| "Installation images for the second installation method can be found in "
-#| "the <filename>hd-media</filename> directory and either the <quote>easy "
-#| "way</quote> or the <quote>flexible way</quote> can be used to copy the "
-#| "image to the USB stick. For this installation method you will also need "
-#| "to download a CD image. The installation image and the CD image must be "
-#| "based on the same release of &d-i;. If they do not match you are likely "
-#| "to get errors<footnote> <para> The error message that is most likely to "
-#| "be displayed is that no kernel modules can be found. This means that the "
-#| "version of the kernel module udebs included on the CD image is different "
-#| "from the version of the running kernel. </para> </footnote> during the "
-#| "installation."
 msgid ""
 "To prepare a USB stick that installs packages from a CD image included on "
 "the stick, use the installer images found in the <filename>hd-media</"
@@ -936,12 +913,6 @@ msgstr "ファイルのコピー &mdash; 簡単な方法"
 #. Tag: para
 #: install-methods.xml:613
 #, no-c-format
-#| msgid ""
-#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
-#| "which contains all the installer files (including the kernel) <phrase "
-#| "arch=\"x86\">as well as <classname>syslinux</classname> and its "
-#| "configuration file.</phrase> <phrase arch=\"powerpc\">as well as "
-#| "<classname>yaboot</classname> and its configuration file.</phrase>"
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
 "contains all the installer files (including the kernel) <phrase arch="
@@ -1496,10 +1467,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:960
 #, no-c-format
-#| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
-#| "filename>."
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
 "on your hard drive (note that LILO can not boot from files on an NTFS file "
@@ -1534,9 +1501,6 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:990
 #, no-c-format
-#| msgid ""
-#| "Hard disk installer booting using <command>LILO</command> or "
-#| "<command>GRUB</command>"
 msgid "Hard disk installer booting using <command>loadlin</command>"
 msgstr ""
 "<command>loadlin</command> を使用したハードディスクからのインストーラの起動"
@@ -1544,10 +1508,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:991
 #, no-c-format
-#| msgid ""
-#| "This section explains how to add to or even replace an existing linux "
-#| "installation using either <command>LILO</command> or <command>GRUB</"
-#| "command>."
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
 "installer from DOS using <command>loadlin</command>."
@@ -1558,10 +1518,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:996
 #, no-c-format
-#| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
-#| "filename>."
 msgid ""
 "Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
@@ -1572,7 +1528,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1001
 #, no-c-format
-#| msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr ""
@@ -1582,7 +1537,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1006
 #, no-c-format
-#| msgid "<filename>boot.msg</filename> (optional boot message)"
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (loadlin ツール)"
 
@@ -2435,12 +2389,6 @@ msgstr "自動インストール"
 #. Tag: para
 #: install-methods.xml:1591
 #, no-c-format
-#| msgid ""
-#| "For installing on multiple computers it's possible to do fully automatic "
-#| "installations. Debian packages intended for this include <classname>fai</"
-#| "classname> (which uses an install server), <classname>replicator</"
-#| "classname>, <classname>systemimager</classname>, <classname>autoinstall</"
-#| "classname>, and the Debian Installer itself."
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
 "installations. &debian; packages intended for this include <classname>fai-"
diff --git a/po/ja/installation-howto.po b/po/ja/installation-howto.po
index ab1bf60a5..1ebf8bb73 100644
--- a/po/ja/installation-howto.po
+++ b/po/ja/installation-howto.po
@@ -328,13 +328,6 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:178
 #, no-c-format
-#| msgid ""
-#| "The easiest thing to set up is probably PXE netbooting. Untar the file "
-#| "<filename>netboot/pxeboot.tar.gz</filename> into <filename>/var/lib/"
-#| "tftpboot</filename> or wherever is appropriate for your tftp server. Set "
-#| "up your DHCP server to pass filename <filename>/pxelinux.0</filename> to "
-#| "clients, and with luck everything will just work. For detailed "
-#| "instructions, see <xref linkend=\"install-tftp\"/>."
 msgid ""
 "The easiest thing to set up is probably PXE netbooting. Untar the file "
 "<filename>netboot/pxeboot.tar.gz</filename> into <filename>/srv/tftp</"
diff --git a/po/ja/post-install.po b/po/ja/post-install.po
index d99a4bbbe..f582aed65 100644
--- a/po/ja/post-install.po
+++ b/po/ja/post-install.po
@@ -1123,13 +1123,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:710
 #, no-c-format
-#| msgid ""
-#| "If possible, the installer will now present you with a shell prompt in "
-#| "the file system you selected, which you can use to perform any necessary "
-#| "repairs. <phrase arch=\"x86\"> For example, if you need to reinstall the "
-#| "GRUB boot loader into the master boot record of the first hard disk, you "
-#| "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
-#| "so. </phrase>"
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
 "file system you selected, which you can use to perform any necessary "
diff --git a/po/ja/preparing.po b/po/ja/preparing.po
index eebfc00b4..5bccfb2ae 100644
--- a/po/ja/preparing.po
+++ b/po/ja/preparing.po
@@ -212,11 +212,6 @@ msgstr "新しいシステムを初めて起動する。"
 #. Tag: para
 #: preparing.xml:141
 #, no-c-format
-#| msgid ""
-#| "For &arch-title; you have the option of using <phrase arch=\"x86\">a</"
-#| "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical "
-#| "version of the installation system. For more information about this "
-#| "graphical installer, see <xref linkend=\"graphical\"/>."
 msgid ""
 "For &arch-title; you have the option of using <phrase arch=\"any-x86\">a</"
 "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical version "
@@ -1065,7 +1060,6 @@ msgstr "デスクトップあり"
 #. Tag: entry
 #: preparing.xml:681
 #, no-c-format
-#| msgid "512 megabytes"
 msgid "128 megabytes"
 msgstr "128 メガバイト"
 
@@ -1197,16 +1191,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:758
 #, no-c-format
-#| msgid ""
-#| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
-#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
-#| "OS/390, &hellip;) </phrase> and want to stick Linux on the same disk, you "
-#| "will need to repartition the disk. Debian requires its own hard disk "
-#| "partitions. It cannot be installed on Windows or MacOS partitions. It may "
-#| "be able to share some partitions with other Linux systems, but that's not "
-#| "covered here. At the very least you will need a dedicated partition for "
-#| "the Debian root."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
@@ -1230,13 +1214,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:777
 #, no-c-format
-#| msgid ""
-#| "You can find information about your current partition setup by using a "
-#| "partitioning tool for your current operating system<phrase arch=\"x86\">, "
-#| "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such "
-#| "as Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, "
-#| "such as the VM diskmap</phrase>. Partitioning tools always provide a way "
-#| "to show existing partitions without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
@@ -1396,16 +1373,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:861
 #, no-c-format
-#| msgid ""
-#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
-#| "parttype; partitions should appear before all other partitions on the "
-#| "disk, especially MacOS boot partitions. This should be kept in mind when "
-#| "pre-partitioning; you should create a &arch-parttype; placeholder "
-#| "partition to come <emphasis>before</emphasis> the other bootable "
-#| "partitions on the disk. (The small partitions dedicated to Apple disk "
-#| "drivers are not bootable.) You can delete the placeholder with the Linux "
-#| "partition tools later during the actual install, and replace it with "
-#| "Linux partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
@@ -1600,17 +1567,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:983
 #, no-c-format
-#| msgid ""
-#| "The first thing needed is a copy of <command>fips</command> which is "
-#| "available in the <filename>tools/</filename> directory on your nearest "
-#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-#| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-#| "filename> to a bootable floppy. A bootable floppy can be created using "
-#| "the command <filename>sys a:</filename> under DOS. <command>fips</"
-#| "command> comes with very good documentation which you may want to read. "
-#| "You will definitely need to read the documentation if you use a disk "
-#| "compression driver or a disk manager. Create the disk and read the "
-#| "documentation <emphasis>before</emphasis> you defragment the disk."
 msgid ""
 "The first thing needed is a copy of <command>fips</command>. Unzip the "
 "archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
@@ -2757,11 +2713,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1710
 #, no-c-format
-#| msgid ""
-#| "You need to copy all the files from the <filename>generic</filename> sub-"
-#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
-#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
-#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 361596e54..7d53297b5 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1354,14 +1354,12 @@ msgid ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
-"d-i keyboard-configuration/xkb-keymap select us\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 msgstr ""
 "# Keyboard selection.\n"
 "#d-i console-tools/archs select at\n"
 "d-i console-keymaps-at/keymap select us\n"
-"d-i keyboard-configuration/xkb-keymap select jp\n"
 "# Example for a different keyboard architecture\n"
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po
index 1cf3a5654..514533dc0 100644
--- a/po/ja/random-bits.po
+++ b/po/ja/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
 "PO-Revision-Date: 2010-12-29 23:28+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -821,28 +821,24 @@ msgstr "&task-sql-tot;"
 #. Tag: entry
 #: random-bits.xml:341
 #, no-c-format
-#| msgid "DNS server"
 msgid "SSH server"
 msgstr "SSH サーバ"
 
 #. Tag: entry
 #: random-bits.xml:342
 #, no-c-format
-#| msgid "&task-sql-inst;"
 msgid "&task-ssh-inst;"
 msgstr "&task-ssh-inst;"
 
 #. Tag: entry
 #: random-bits.xml:343
 #, no-c-format
-#| msgid "&task-sql-dl;"
 msgid "&task-ssh-dl;"
 msgstr "&task-ssh-dl;"
 
 #. Tag: entry
 #: random-bits.xml:344
 #, no-c-format
-#| msgid "&task-sql-tot;"
 msgid "&task-ssh-tot;"
 msgstr "&task-ssh-tot;"
 
@@ -869,15 +865,6 @@ msgstr "Unix/Linux システムからの &debian-gnu; のインストール"
 #. Tag: para
 #: random-bits.xml:367
 #, no-c-format
-#| msgid ""
-#| "This section explains how to install &debian-gnu; from an existing Unix "
-#| "or Linux system, without using the menu-driven installer as explained in "
-#| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
-#| "SUSE. In this section some familiarity with entering *nix commands and "
-#| "navigating the file system is assumed. In this section, <prompt>$</"
-#| "prompt> symbolizes a command to be entered in the user's current system, "
-#| "while <prompt>#</prompt> refers to a command entered in the Debian chroot."
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
@@ -1665,15 +1652,6 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:760
 #, no-c-format
-#| msgid ""
-#| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
-#| "userinput> for instructions on setting up the bootloader. If you are "
-#| "keeping the system you used to install Debian, just add an entry for the "
-#| "Debian install to your existing grub <filename>menu.lst</filename> or "
-#| "<filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you "
-#| "could also copy it to the new system and edit it there. After you are "
-#| "done editing, call <command>lilo</command> (remember it will use "
-#| "<filename>lilo.conf</filename> relative to the system you call it from)."
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
 "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up "
diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po
index 62d9870b6..1cb01b1a3 100644
--- a/po/ja/using-d-i.po
+++ b/po/ja/using-d-i.po
@@ -1394,11 +1394,6 @@ msgstr "ユーザとパスワードのセットアップ"
 #. Tag: para
 #: using-d-i.xml:902
 #, no-c-format
-#| msgid ""
-#| "After the base system has been installed, the installer will allow you to "
-#| "set up the <quote>root</quote> account and/or an account for the first "
-#| "user. Other user accounts can be created after the installation has been "
-#| "completed."
 msgid ""
 "Just before configuring the clock, the installer will allow you to set up "
 "the <quote>root</quote> account and/or an account for the first user. Other "
@@ -1708,10 +1703,6 @@ msgstr "以下のファイルシステムをサポートしています。"
 #. Tag: para
 #: using-d-i.xml:1093
 #, no-c-format
-#| msgid ""
-#| "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
-#| "<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
-#| "emphasis>"
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
 "<emphasis>ext2</emphasis>, <phrase arch=\"linux-any\"><emphasis>ext3</"
@@ -1745,7 +1736,6 @@ msgstr ""
 #. Tag: emphasis
 #: using-d-i.xml:1107
 #, no-c-format
-#| msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgid "<emphasis>ufs</emphasis>"
 msgstr "<emphasis>ufs</emphasis>"
 
@@ -1765,7 +1755,6 @@ msgstr ""
 #. Tag: emphasis
 #: using-d-i.xml:1115
 #, no-c-format
-#| msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgid "<emphasis>zfs</emphasis>"
 msgstr "<emphasis>zfs</emphasis>"
 
@@ -1986,13 +1975,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:1227
 #, no-c-format
-#| msgid ""
-#| "If you choose guided partitioning (either classic or using (encrypted) "
-#| "LVM) for a whole disk, you will first be asked to select the disk you "
-#| "want to use. Check that all your disks are listed and, if you have "
-#| "several disks, make sure you select the correct one. The order they are "
-#| "listed in may differ from what you are used to. The size of the disks may "
-#| "help to identify them."
 msgid ""
 "If you choose guided partitioning<phrase arch=\"linux-any\"> (either classic "
 "or using (encrypted) LVM)</phrase> for a whole disk, you will first be asked "
@@ -2011,12 +1993,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:1236
 #, no-c-format
-#| msgid ""
-#| "Any data on the disk you select will eventually be lost, but you will "
-#| "always be asked to confirm any changes before they are written to the "
-#| "disk. If you have selected the classic method of partitioning, you will "
-#| "be able to undo any changes right until the end; when using (encrypted) "
-#| "LVM this is not possible."
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
 "be asked to confirm any changes before they are written to the disk. <phrase "
@@ -2271,25 +2247,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:1355
 #, no-c-format
-#| msgid ""
-#| "If you select some free space, you will have the opportunity to create a "
-#| "new partition. You will have to answer a quick series of questions about "
-#| "its size, type (primary or logical), and location (beginning or end of "
-#| "the free space). After this, you will be presented with a detailed "
-#| "overview of your new partition. The main setting is <guimenuitem>Use as:</"
-#| "guimenuitem>, which determines if the partition will have a file system "
-#| "on it, or be used for swap, software RAID, LVM, an encrypted file system, "
-#| "or not be used at all. Other settings include mountpoint, mount options, "
-#| "and bootable flag; which settings are shown depends on how the partition "
-#| "is to be used. If you don't like the preselected defaults, feel free to "
-#| "change them to your liking. E.g. by selecting the option <guimenuitem>Use "
-#| "as:</guimenuitem>, you can choose a different filesystem for this "
-#| "partition, including options to use the partition for swap, software "
-#| "RAID, LVM, or not use it at all. Another nice feature is the ability to "
-#| "copy data from an existing partition onto this one. When you are "
-#| "satisfied with your new partition, select <guimenuitem>Done setting up "
-#| "the partition</guimenuitem> and you will return to <command>partman</"
-#| "command>'s main screen."
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
 "partition. You will have to answer a quick series of questions about its "
@@ -4536,13 +4493,6 @@ msgstr "正しいパーティションを選択してください!"
 #. Tag: para
 #: using-d-i.xml:2807
 #, no-c-format
-#| msgid ""
-#| "The criteria for selecting a partition is that it is FAT format "
-#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
-#| "multiple choices depending on what it finds from scanning all of the "
-#| "disks of the system including EFI partitions of other system disks and "
-#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
-#| "the partition during the installation, erasing any previous contents!"
 msgid ""
 "The criterion for selecting a partition is that it must be a FAT format "
 "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
@@ -5536,12 +5486,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:3465
 #, no-c-format
-#| msgid ""
-#| "Tarballs containing current packages for the most common firmware are "
-#| "available from: <itemizedlist> <listitem><para> <ulink url=\"&url-"
-#| "firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> Just "
-#| "download the tarball for the correct release and unpack it to the file "
-#| "system on the medium."
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
 "firmware are available from: <itemizedlist> <listitem><para> <ulink url="
diff --git a/po/ja/welcome.po b/po/ja/welcome.po
index 9215cbf10..7254e6250 100644
--- a/po/ja/welcome.po
+++ b/po/ja/welcome.po
@@ -514,7 +514,6 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:315
 #, no-c-format
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "&debian; GNU/kFreeBSD とは?"
 
@@ -530,13 +529,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:321
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "This port of &debian; is currently only being developed for the i386 and "
 "amd64 architectures, although ports to other architectures is possible."
@@ -557,10 +549,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:331
 #, no-c-format
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
 "kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
@@ -589,13 +577,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:357
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "The Hurd is still unfinished, and is unsuitable for day-to-day use, but work "
 "is continuing. The Hurd is currently only being developed for the i386 "