Refresh po|pot files after changings in en

1 files changed, 107 insertions, 81 deletions

diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 32c317975..bf71415dc 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2020-04-02 09:22+0000\n"
 "PO-Revision-Date: 2018-12-22 15:08+0900\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -766,14 +766,22 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:436
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order to start the kernel after booting from the USB stick, we will "
+#| "put a boot loader on the stick. Although any boot loader (e.g. "
+#| "<classname>lilo</classname>) should work, it's convenient to use "
+#| "<classname>syslinux</classname>, since it uses a FAT16 partition and can "
+#| "be reconfigured by just editing a text file. Any operating system which "
+#| "supports the FAT file system can be used to make changes to the "
+#| "configuration of the boot loader."
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
-"boot loader on the stick. Although any boot loader (e.g. <classname>lilo</"
-"classname>) should work, it's convenient to use <classname>syslinux</"
-"classname>, since it uses a FAT16 partition and can be reconfigured by just "
-"editing a text file. Any operating system which supports the FAT file system "
-"can be used to make changes to the configuration of the boot loader."
+"boot loader on the stick. Although any boot loader should work, it's "
+"convenient to use <classname>syslinux</classname>, since it uses a FAT16 "
+"partition and can be reconfigured by just editing a text file. Any operating "
+"system which supports the FAT file system can be used to make changes to the "
+"configuration of the boot loader."
 msgstr ""
 "USB メモリからブートしてカーネルを起動するには、USB メモリにブートローダを配"
 "置します。どのブートローダ (例: <classname>lilo</classname>) も動作しますが、"
@@ -1140,31 +1148,39 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:676
-#, no-c-format
-msgid ""
-"Hard disk installer booting from Linux using <command>LILO</command> or "
-"<command>GRUB</command>"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Hard disk installer booting from DOS using <command>loadlin</command>"
+msgid "Hard disk installer booting from Linux using <command>GRUB</command>"
 msgstr ""
-"<command>LILO</command> や <command>GRUB</command> を使用した Linux からの"
-"ハードディスクインストーラ起動"
+"<command>loadlin</command> を使用した DOS からのハードディスクインストーラ起"
+"動"
 
 #. Tag: para
 #: install-methods.xml:678
-#, no-c-format
+#, fuzzy, 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 add to or even replace an existing linux "
-"installation using either <command>LILO</command> or <command>GRUB</command>."
+"installation using <command>GRUB</command>."
 msgstr ""
 "本節では、<command>LILO</command> や <command>GRUB</command> のどちらかを使用"
 "して、linux を追加したり、 既存の linux を交換する方法について説明します。"
 
 #. Tag: para
 #: install-methods.xml:684
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "At boot time, both bootloaders support loading in memory not only the "
+#| "kernel, but also a disk image. This RAM disk can be used as the root file-"
+#| "system by the kernel."
 msgid ""
-"At boot time, both bootloaders support loading in memory not only the "
-"kernel, but also a disk image. This RAM disk can be used as the root file-"
-"system by the kernel."
+"At boot time, <command>GRUB</command> supports loading in memory not only "
+"the kernel, but also a disk image. This RAM disk can be used as the root "
+"file-system by the kernel."
 msgstr ""
 "起動時に、カーネルだけでなくディスクイメージをメモリに読み込むのを、 どちらの"
 "ブートローダでもサポートしています。 この RAM ディスクは カーネルが root ファ"
@@ -1172,30 +1188,33 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:690
-#, no-c-format
+#, fuzzy, no-c-format
+#| 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 system), 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 "
-"system), for instance to <filename>/boot/newinstall/</filename>."
+"on your hard drive, for instance to <filename>/boot/newinstall/</filename>."
 msgstr ""
 "以下のファイルを、 &debian; アーカイブからあなたのハードディスクの適当な場所"
 "にコピーしてください (LILO は NTFS ファイルシステムから起動できないことに注意"
 "してください)。例えば <filename>/boot/newinstall/</filename> などです。"
 
 #. Tag: para
-#: install-methods.xml:698
+#: install-methods.xml:697
 #, no-c-format
 msgid "<filename>vmlinuz</filename> (kernel binary)"
 msgstr "<filename>vmlinuz</filename> (カーネルバイナリ)"
 
 #. Tag: para
-#: install-methods.xml:703
+#: install-methods.xml:702
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (RAM ディスクイメージ)"
 
 #. Tag: para
-#: install-methods.xml:710
+#: install-methods.xml:709
 #, no-c-format
 msgid ""
 "Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1205,7 +1224,7 @@ msgstr ""
 "ください。"
 
 #. Tag: title
-#: install-methods.xml:720
+#: install-methods.xml:719
 #, no-c-format
 msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
 msgstr ""
@@ -1213,7 +1232,7 @@ msgstr ""
 "動"
 
 #. Tag: para
-#: install-methods.xml:721
+#: install-methods.xml:720
 #, no-c-format
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
@@ -1223,7 +1242,7 @@ msgstr ""
 "するようハードディスクを準備する方法を説明します。"
 
 #. Tag: para
-#: install-methods.xml:726
+#: install-methods.xml:725
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Copy the following directories from a &debian; CD image to <filename>c:"
@@ -1236,7 +1255,7 @@ msgstr ""
 "コピーしてください。"
 
 #. Tag: para
-#: install-methods.xml:731
+#: install-methods.xml:730
 #, no-c-format
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
@@ -1245,19 +1264,19 @@ msgstr ""
 "メージ)"
 
 #. Tag: para
-#: install-methods.xml:736
+#: install-methods.xml:735
 #, no-c-format
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (loadlin ツール)"
 
 #. Tag: title
-#: install-methods.xml:848
+#: install-methods.xml:847
 #, no-c-format
 msgid "Preparing Files for TFTP Net Booting"
 msgstr "TFTP ネットブート用ファイルの準備"
 
 #. Tag: para
-#: install-methods.xml:849
+#: install-methods.xml:848
 #, no-c-format
 msgid ""
 "If your machine is connected to a local area network, you may be able to "
@@ -1273,7 +1292,7 @@ msgstr ""
 "せん。"
 
 #. Tag: para
-#: install-methods.xml:857
+#: install-methods.xml:856
 #, no-c-format
 msgid ""
 "You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1286,7 +1305,7 @@ msgstr ""
 "要です。"
 
 #. Tag: para
-#: install-methods.xml:864
+#: install-methods.xml:863
 #, no-c-format
 msgid ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1307,7 +1326,7 @@ msgstr ""
 "DHCP でしか設定できないこともあります。"
 
 #. Tag: para
-#: install-methods.xml:878
+#: install-methods.xml:877
 #, no-c-format
 msgid ""
 "For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1319,7 +1338,7 @@ msgstr ""
 "あります。"
 
 #. Tag: para
-#: install-methods.xml:884
+#: install-methods.xml:883
 #, no-c-format
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1330,7 +1349,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
-#: install-methods.xml:889
+#: install-methods.xml:888
 #, no-c-format
 msgid ""
 "The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1344,7 +1363,7 @@ msgstr ""
 "4.x, SunOS 5.x (Solaris), GNU/Linux での例を示します。"
 
 #. Tag: para
-#: install-methods.xml:897
+#: install-methods.xml:896
 #, no-c-format
 msgid ""
 "For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1358,13 +1377,13 @@ msgstr ""
 "です。"
 
 #. Tag: title
-#: install-methods.xml:913
+#: install-methods.xml:912
 #, no-c-format
 msgid "Setting up RARP server"
 msgstr "RARP サーバの設定"
 
 #. Tag: para
-#: install-methods.xml:914
+#: install-methods.xml:913
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1390,7 +1409,7 @@ msgstr ""
 "て <userinput>ip addr show dev eth0</userinput> コマンドを使ってください。"
 
 #. Tag: para
-#: install-methods.xml:926
+#: install-methods.xml:925
 #, no-c-format
 msgid ""
 "On a RARP server system using a Linux kernel or Solaris/SunOS, you use the "
@@ -1414,13 +1433,13 @@ msgstr ""
 "rarpd -a</userinput> を (ルート権限で) 実行してください。"
 
 #. Tag: title
-#: install-methods.xml:947
+#: install-methods.xml:946
 #, no-c-format
 msgid "Setting up a DHCP server"
 msgstr "DHCP サーバの設定"
 
 #. Tag: para
-#: install-methods.xml:948
+#: install-methods.xml:947
 #, no-c-format
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1434,7 +1453,7 @@ msgstr ""
 "dhcpd.conf</filename> を参照)"
 
 #. Tag: screen
-#: install-methods.xml:955
+#: install-methods.xml:954
 #, no-c-format
 msgid ""
 "option domain-name \"example.com\";\n"
@@ -1478,7 +1497,7 @@ msgstr ""
 "}"
 
 #. Tag: para
-#: install-methods.xml:957
+#: install-methods.xml:956
 #, no-c-format
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
@@ -1495,7 +1514,7 @@ msgstr ""
 "ションは TFTP 経由で取得するファイルの名前です。"
 
 #. Tag: para
-#: install-methods.xml:967
+#: install-methods.xml:966
 #, no-c-format
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
@@ -1506,13 +1525,13 @@ msgstr ""
 "動してください。"
 
 #. Tag: title
-#: install-methods.xml:975
+#: install-methods.xml:974
 #, no-c-format
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr "DHCP 設定での PXE 起動の有効化"
 
 #. Tag: para
-#: install-methods.xml:976
+#: install-methods.xml:975
 #, no-c-format
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1583,7 +1602,7 @@ msgstr ""
 "い)。"
 
 #. Tag: para
-#: install-methods.xml:986
+#: install-methods.xml:985
 #, no-c-format
 msgid ""
 "If your machine uses UEFI to boot, you will have to specify a boot loader "
@@ -1593,7 +1612,7 @@ msgstr ""
 "たブートローダーを指定する必要があります"
 
 #. Tag: screen
-#: install-methods.xml:990
+#: install-methods.xml:989
 #, no-c-format
 msgid ""
 "group {\n"
@@ -1615,13 +1634,13 @@ msgstr ""
 "}"
 
 #. Tag: title
-#: install-methods.xml:1003
+#: install-methods.xml:1002
 #, no-c-format
 msgid "Setting up a BOOTP server"
 msgstr "BOOTP サーバの設定"
 
 #. Tag: para
-#: install-methods.xml:1004
+#: install-methods.xml:1003
 #, no-c-format
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1637,7 +1656,7 @@ msgstr ""
 "れぞれ入っています。"
 
 #. Tag: para
-#: install-methods.xml:1012
+#: install-methods.xml:1011
 #, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1701,7 +1720,7 @@ msgstr ""
 "userinput> 変数がマシンの MAC アドレスです。 </phrase>"
 
 #. Tag: para
-#: install-methods.xml:1045
+#: install-methods.xml:1044
 #, no-c-format
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1725,13 +1744,13 @@ msgstr ""
 "<command>dhcpd</command> を再起動するだけです。"
 
 #. Tag: title
-#: install-methods.xml:1064
+#: install-methods.xml:1063
 #, no-c-format
 msgid "Enabling the TFTP Server"
 msgstr "TFTP サーバの立ち上げ"
 
 #. Tag: para
-#: install-methods.xml:1065
+#: install-methods.xml:1064
 #, no-c-format
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
@@ -1741,7 +1760,7 @@ msgstr ""
 "を確認してください。"
 
 #. Tag: para
-#: install-methods.xml:1070
+#: install-methods.xml:1069
 #, no-c-format
 msgid ""
 "In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -1756,7 +1775,7 @@ msgstr ""
 "は、パッケージのインストール時や再設定時に選択できます。"
 
 #. Tag: para
-#: install-methods.xml:1079
+#: install-methods.xml:1078
 #, no-c-format
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -1774,7 +1793,7 @@ msgstr ""
 "要に応じて、本節の設定例を調整してください。"
 
 #. Tag: para
-#: install-methods.xml:1089
+#: install-methods.xml:1088
 #, no-c-format
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -1790,7 +1809,7 @@ msgstr ""
 "勧めします。"
 
 #. Tag: para
-#: install-methods.xml:1097
+#: install-methods.xml:1096
 #, no-c-format
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -1820,13 +1839,13 @@ msgstr ""
 "調整してください。"
 
 #. Tag: title
-#: install-methods.xml:1119
+#: install-methods.xml:1118
 #, no-c-format
 msgid "Move TFTP Images Into Place"
 msgstr "TFTP イメージを適切な場所に配置する"
 
 #. Tag: para
-#: install-methods.xml:1120
+#: install-methods.xml:1119
 #, no-c-format
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -1842,7 +1861,7 @@ msgstr ""
 "TFTP クライアントによって決まり、 強制力のある標準は存在しません。"
 
 #. Tag: para
-#: install-methods.xml:1129
+#: install-methods.xml:1128
 #, no-c-format
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
@@ -1858,37 +1877,37 @@ msgstr ""
 "す。"
 
 #. Tag: filename
-#: install-methods.xml:1140
+#: install-methods.xml:1139
 #, no-c-format
 msgid "vmlinux"
 msgstr "vmlinux"
 
 #. Tag: filename
-#: install-methods.xml:1145
+#: install-methods.xml:1144
 #, no-c-format
 msgid "initrd.gz"
 msgstr "initrd.gz"
 
 #. Tag: filename
-#: install-methods.xml:1150
+#: install-methods.xml:1149
 #, no-c-format
 msgid "yaboot"
 msgstr "yaboot"
 
 #. Tag: filename
-#: install-methods.xml:1155
+#: install-methods.xml:1154
 #, no-c-format
 msgid "yaboot.conf"
 msgstr "yaboot.conf"
 
 #. Tag: filename
-#: install-methods.xml:1160
+#: install-methods.xml:1159
 #, no-c-format
 msgid "boot.msg"
 msgstr "boot.msg"
 
 #. Tag: para
-#: install-methods.xml:1165
+#: install-methods.xml:1164
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -1908,7 +1927,7 @@ msgstr ""
 "な EFI ブートイメージ名を渡す必要があります。"
 
 #. Tag: para
-#: install-methods.xml:1175
+#: install-methods.xml:1174
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -1925,13 +1944,13 @@ msgstr ""
 "を確認してください。"
 
 #. Tag: title
-#: install-methods.xml:1187
+#: install-methods.xml:1186
 #, no-c-format
 msgid "SPARC TFTP Booting"
 msgstr "SPARC TFTP ブート"
 
 #. Tag: para
-#: install-methods.xml:1188
+#: install-methods.xml:1187
 #, no-c-format
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
@@ -1961,7 +1980,7 @@ msgstr ""
 "字に変更し、 (必要なら) サブアーキテクチャ名を追加しなければなりません。"
 
 #. Tag: para
-#: install-methods.xml:1204
+#: install-methods.xml:1203
 #, no-c-format
 msgid ""
 "If you've done all this correctly, giving the command <userinput>boot net</"
@@ -1975,7 +1994,7 @@ msgstr ""
 "い。"
 
 #. Tag: para
-#: install-methods.xml:1211
+#: install-methods.xml:1210
 #, no-c-format
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
@@ -1989,13 +2008,13 @@ msgstr ""
 "しても TFTP サーバが見るディレクトリの内部でなければいけません。"
 
 #. Tag: title
-#: install-methods.xml:1222
+#: install-methods.xml:1221
 #, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "SGI の TFTP での起動"
 
 #. Tag: para
-#: install-methods.xml:1223
+#: install-methods.xml:1222
 #, no-c-format
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2009,13 +2028,13 @@ msgstr ""
 "filename> の <userinput>filename=</userinput> オプションに指定します。"
 
 #. Tag: title
-#: install-methods.xml:1331
+#: install-methods.xml:1330
 #, no-c-format
 msgid "Automatic Installation"
 msgstr "自動インストール"
 
 #. Tag: para
-#: install-methods.xml:1332
+#: install-methods.xml:1331
 #, no-c-format
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
@@ -2030,13 +2049,13 @@ msgstr ""
 "<ulink url=\"http://fai-project.org\">FAI home page</ulink> をご覧ください。"
 
 #. Tag: title
-#: install-methods.xml:1344
+#: install-methods.xml:1343
 #, no-c-format
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "&debian; インストーラを用いた自動インストール"
 
 #. Tag: para
-#: install-methods.xml:1345
+#: install-methods.xml:1344
 #, no-c-format
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
@@ -2050,7 +2069,7 @@ msgstr ""
 "れます。"
 
 #. Tag: para
-#: install-methods.xml:1352
+#: install-methods.xml:1351
 #, no-c-format
 msgid ""
 "Full documentation on preseeding including a working example that you can "
@@ -2059,6 +2078,13 @@ msgstr ""
 "編集できる動作サンプルを含む preseed の完全なドキュメントは、 <xref linkend="
 "\"appendix-preseed\"/> にあります。"
 
+#~ msgid ""
+#~ "Hard disk installer booting from Linux using <command>LILO</command> or "
+#~ "<command>GRUB</command>"
+#~ msgstr ""
+#~ "<command>LILO</command> や <command>GRUB</command> を使用した Linux からの"
+#~ "ハードディスクインストーラ起動"
+
 #~ msgid "Creating Floppies from Disk Images"
 #~ msgstr "ディスクイメージからのフロッピーの作成"