Refresh po|pot files + sync translations as possible

1 files changed, 98 insertions, 67 deletions

diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index b29c6d8f0..236f3e4f2 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2020-04-02 09:22+0000\n"
+"POT-Creation-Date: 2020-05-20 19:14+0000\n"
 "PO-Revision-Date: 2012-11-26 00:19+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -397,12 +397,12 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Alternatively, for very small USB sticks, only a few megabytes in size, you "
-"can download the <filename>mini.iso</filename> image from the "
-"<filename>netboot</filename> directory (at the location mentioned in <xref "
-"linkend=\"where-files\"/>)."
+"can download the &netboot-mini-iso; image from the <filename>netboot</"
+"filename> directory (at the location mentioned in <xref linkend=\"where-files"
+"\"/>)."
 msgstr ""
 "另外，对于只有几 M 的小容量 U 盘，您可以从 <filename>netboot</filename> 目录"
-"下载 <filename>mini.iso</filename> 映像(位于 <xref linkend=\"where-files\"/"
+"下载 &netboot-mini-iso; 映像(位于 <xref linkend=\"where-files\"/"
 ">)。"
 
 #. Tag: para
@@ -525,13 +525,13 @@ msgstr ""
 #: install-methods.xml:342
 #, 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>."
+"There is an all-in-one file &hdmedia-boot-img; 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>."
 msgstr ""
-"有一个文件合集 <filename>hd-media/boot.img.gz</filename> 包含所有的安装程序文"
+"有一个文件合集 &hdmedia-boot-img; 包含所有的安装程序文"
 "件(包括内核) <phrase arch=\"x86\">以及 <classname>syslinux</classname> 和对应"
 "的配置文件</phrase> <phrase arch=\"powerpc\">以及 <classname>yaboot</"
 "classname> 和对应的配置文件</phrase>。"
@@ -1130,19 +1130,50 @@ msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
 #: install-methods.xml:709
 #, no-c-format
 msgid ""
+"If you intend to use the hard drive only for booting and then download "
+"everything over the network, you should download the &x86-netboot-initrd; "
+"file and its corresponding kernel &x86-netboot-linux;. This will allow you "
+"to repartition the hard disk from which you boot the installer, although you "
+"should do so with care."
+msgstr ""
+"如果您只愿意使用硬盘引导，然后从网络下载其他文件，需要下载 "
+"&x86-netboot-initrd; 文"
+"件及其对应的内核 &x86-netboot-linux;。这将允许您重新分区用于引导的硬盘，需要小心操作。"
+
+#. Tag: para
+#: install-methods.xml:718
+#, fuzzy, no-c-format
+msgid ""
+"Alternatively, if you intend to keep an existing partition on the hard drive "
+"unchanged during the install, you can download the &x86-hdmedia-initrd; file "
+"and its kernel &x86-hdmedia-vmlinuz;, as well as copy an installation image "
+"to the hard drive (make sure the file is named ending in <literal>.iso</"
+"literal>). The installer can then boot from the hard drive and install from "
+"the installation image, without needing the network."
+msgstr ""
+"另一种方法，可以在安装时保持原硬盘的分区不变，您需要下载 &x86-hdmedia-initrd; "
+"文件以及对应的内核，还需要一个 CD（或者 DVD） "
+"iso 文件的副本放在硬盘上（确认文件名是以 <literal>.iso</literal> 结尾"
+"的）。这样安装程序就可以从硬盘引导，并从 CD/DVD 映像文件上安装，而不使用网"
+"络。"
+
+#. Tag: para
+#: install-methods.xml:726
+#, no-c-format
+msgid ""
 "Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
 "\"/>."
 msgstr "最后，要配置 bootloader，请进入 <xref linkend=\"boot-initrd\"/>。"
 
 #. Tag: title
-#: install-methods.xml:719
+#: install-methods.xml:736
 #, fuzzy, no-c-format
 #| msgid "Hard disk installer booting using <command>loadlin</command>"
 msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
 msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
 
 #. Tag: para
-#: install-methods.xml:720
+#: install-methods.xml:737
 #, no-c-format
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
@@ -1151,7 +1182,7 @@ msgstr ""
 "本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
 
 #. Tag: para
-#: install-methods.xml:725
+#: install-methods.xml:742
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Copy the following directories from a &debian; CD image to <filename>c:"
@@ -1162,26 +1193,26 @@ msgid ""
 msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
 
 #. Tag: para
-#: install-methods.xml:730
+#: install-methods.xml:747
 #, no-c-format
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
 
 #. Tag: para
-#: install-methods.xml:735
+#: install-methods.xml:752
 #, no-c-format
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (loadlin 工具)"
 
 #. Tag: title
-#: install-methods.xml:847
+#: install-methods.xml:864
 #, no-c-format
 msgid "Preparing Files for TFTP Net Booting"
 msgstr "为使用 TFTP 网络引导准备文件"
 
 #. Tag: para
-#: install-methods.xml:848
+#: install-methods.xml:865
 #, no-c-format
 msgid ""
 "If your machine is connected to a local area network, you may be able to "
@@ -1195,7 +1226,7 @@ msgstr ""
 "上面的某个特殊地方，并且配置好能够能够支持对您的机器进行引导。"
 
 #. Tag: para
-#: install-methods.xml:856
+#: install-methods.xml:873
 #, no-c-format
 msgid ""
 "You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1207,7 +1238,7 @@ msgstr ""
 "condition=\"supports-bootp\">，或 BOOTP 服务器</phrase>。"
 
 #. Tag: para
-#: install-methods.xml:863
+#: install-methods.xml:880
 #, no-c-format
 msgid ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1226,7 +1257,7 @@ msgstr ""
 "些系统只能通过 DHCP 来配置。"
 
 #. Tag: para
-#: install-methods.xml:877
+#: install-methods.xml:894
 #, no-c-format
 msgid ""
 "For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1237,7 +1268,7 @@ msgstr ""
 "替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
 
 #. Tag: para
-#: install-methods.xml:883
+#: install-methods.xml:900
 #, no-c-format
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1247,7 +1278,7 @@ msgstr ""
 "个 <classname>rbootd</classname> 软件包。"
 
 #. Tag: para
-#: install-methods.xml:888
+#: install-methods.xml:905
 #, no-c-format
 msgid ""
 "The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1261,7 +1292,7 @@ msgstr ""
 "Linux 上面的一些操作例子。"
 
 #. Tag: para
-#: install-methods.xml:896
+#: install-methods.xml:913
 #, no-c-format
 msgid ""
 "For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1274,13 +1305,13 @@ msgstr ""
 "多问题。另一个好的选择是 <classname>atftpd</classname>。"
 
 #. Tag: title
-#: install-methods.xml:912
+#: install-methods.xml:929
 #, no-c-format
 msgid "Setting up RARP server"
 msgstr "设置 RARP 服务器"
 
 #. Tag: para
-#: install-methods.xml:913
+#: install-methods.xml:930
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1305,7 +1336,7 @@ msgstr ""
 "addr show dev eth0</userinput> 命令。"
 
 #. Tag: para
-#: install-methods.xml:925
+#: install-methods.xml:942
 #, fuzzy, no-c-format
 #| msgid ""
 #| "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/"
@@ -1339,13 +1370,13 @@ msgstr ""
 "<userinput>/usr/etc/rarpd -a</userinput> 命令。"
 
 #. Tag: title
-#: install-methods.xml:946
+#: install-methods.xml:963
 #, no-c-format
 msgid "Setting up a DHCP server"
 msgstr "设置 DHCP 服务器"
 
 #. Tag: para
-#: install-methods.xml:947
+#: install-methods.xml:964
 #, no-c-format
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1358,7 +1389,7 @@ msgstr ""
 "配置示例文件(参阅 <filename>/etc/dhcp/dhcpd.conf</filename>)："
 
 #. Tag: screen
-#: install-methods.xml:954
+#: install-methods.xml:971
 #, no-c-format
 msgid ""
 "option domain-name \"example.com\";\n"
@@ -1402,7 +1433,7 @@ msgstr ""
 "}"
 
 #. Tag: para
-#: install-methods.xml:956
+#: install-methods.xml:973
 #, no-c-format
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
@@ -1418,7 +1449,7 @@ msgstr ""
 "TFTP 获取的文件名。"
 
 #. Tag: para
-#: install-methods.xml:966
+#: install-methods.xml:983
 #, no-c-format
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
@@ -1428,13 +1459,13 @@ msgstr ""
 "<userinput>/etc/init.d/isc-dhcp-server restart</userinput>。"
 
 #. Tag: title
-#: install-methods.xml:974
+#: install-methods.xml:991
 #, no-c-format
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr "在 DHCP 配置中打开 PXE 引导功能"
 
 #. Tag: para
-#: install-methods.xml:975
+#: install-methods.xml:992
 #, no-c-format
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1504,7 +1535,7 @@ msgstr ""
 "的 <xref linkend=\"tftp-images\"/>)。"
 
 #. Tag: para
-#: install-methods.xml:985
+#: install-methods.xml:1002
 #, no-c-format
 msgid ""
 "If your machine uses UEFI to boot, you will have to specify a boot loader "
@@ -1512,7 +1543,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: install-methods.xml:989
+#: install-methods.xml:1006
 #, no-c-format
 msgid ""
 "group {\n"
@@ -1526,13 +1557,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1002
+#: install-methods.xml:1019
 #, no-c-format
 msgid "Setting up a BOOTP server"
 msgstr "架设 BOOTP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1003
+#: install-methods.xml:1020
 #, no-c-format
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1547,7 +1578,7 @@ msgstr ""
 "<classname>isc-dhcp-server</classname> 软件包。"
 
 #. Tag: para
-#: install-methods.xml:1011
+#: install-methods.xml:1028
 #, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1609,7 +1640,7 @@ msgstr ""
 "MAC 地址。</phrase>"
 
 #. Tag: para
-#: install-methods.xml:1044
+#: install-methods.xml:1061
 #, no-c-format
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1631,13 +1662,13 @@ msgstr ""
 "<command>dhcpd</command>。"
 
 #. Tag: title
-#: install-methods.xml:1063
+#: install-methods.xml:1080
 #, no-c-format
 msgid "Enabling the TFTP Server"
 msgstr "开启 TFTP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1064
+#: install-methods.xml:1081
 #, no-c-format
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
@@ -1646,7 +1677,7 @@ msgstr ""
 "要准备好 TFTP 服务器，您首先需要确定 <command>tftpd</command> 已经启动。"
 
 #. Tag: para
-#: install-methods.xml:1069
+#: install-methods.xml:1086
 #, no-c-format
 msgid ""
 "In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -1660,7 +1691,7 @@ msgstr ""
 "以在安装软件包的时候选择，也可以用重新配置软件包方式修改。"
 
 #. Tag: para
-#: install-methods.xml:1078
+#: install-methods.xml:1095
 #, no-c-format
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -1677,7 +1708,7 @@ msgstr ""
 "置文件示例。"
 
 #. Tag: para
-#: install-methods.xml:1088
+#: install-methods.xml:1105
 #, no-c-format
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -1691,7 +1722,7 @@ msgstr ""
 "问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
 
 #. Tag: para
-#: install-methods.xml:1096
+#: install-methods.xml:1113
 #, no-c-format
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -1719,13 +1750,13 @@ msgstr ""
 "错误。"
 
 #. Tag: title
-#: install-methods.xml:1118
+#: install-methods.xml:1135
 #, no-c-format
 msgid "Move TFTP Images Into Place"
 msgstr "将 TFTP 映像放到适当的位置"
 
 #. Tag: para
-#: install-methods.xml:1119
+#: install-methods.xml:1136
 #, no-c-format
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -1740,7 +1771,7 @@ msgstr ""
 "完全决定于 TFTP 客户程序，而且没有一个强制的标准。"
 
 #. Tag: para
-#: install-methods.xml:1128
+#: install-methods.xml:1145
 #, no-c-format
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
@@ -1755,37 +1786,37 @@ msgstr ""
 "件："
 
 #. Tag: filename
-#: install-methods.xml:1139
+#: install-methods.xml:1156
 #, no-c-format
 msgid "vmlinux"
 msgstr "vmlinux"
 
 #. Tag: filename
-#: install-methods.xml:1144
+#: install-methods.xml:1161
 #, no-c-format
 msgid "initrd.gz"
 msgstr "initrd.gz"
 
 #. Tag: filename
-#: install-methods.xml:1149
+#: install-methods.xml:1166
 #, no-c-format
 msgid "yaboot"
 msgstr "yaboot"
 
 #. Tag: filename
-#: install-methods.xml:1154
+#: install-methods.xml:1171
 #, no-c-format
 msgid "yaboot.conf"
 msgstr "yaboot.conf"
 
 #. Tag: filename
-#: install-methods.xml:1159
+#: install-methods.xml:1176
 #, no-c-format
 msgid "boot.msg"
 msgstr "boot.msg"
 
 #. Tag: para
-#: install-methods.xml:1164
+#: install-methods.xml:1181
 #, fuzzy, no-c-format
 #| msgid ""
 #| "For PXE booting, everything you should need is set up in the "
@@ -1808,7 +1839,7 @@ msgstr ""
 "需的文件名传递给 <command>tftpd</command>。"
 
 #. Tag: para
-#: install-methods.xml:1174
+#: install-methods.xml:1191
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -1823,13 +1854,13 @@ msgstr ""
 "efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
 
 #. Tag: title
-#: install-methods.xml:1186
+#: install-methods.xml:1203
 #, no-c-format
 msgid "SPARC TFTP Booting"
 msgstr "SPARC TFTP 引导"
 
 #. Tag: para
-#: install-methods.xml:1187
+#: install-methods.xml:1204
 #, no-c-format
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
@@ -1857,7 +1888,7 @@ msgstr ""
 "并在必要时加上子体系名。"
 
 #. Tag: para
-#: install-methods.xml:1203
+#: install-methods.xml:1220
 #, no-c-format
 msgid ""
 "If you've done all this correctly, giving the command <userinput>boot net</"
@@ -1869,7 +1900,7 @@ msgstr ""
 "映像。假如映像找不到，查看 tftp 服务器的日志所需要的映像文件名。"
 
 #. Tag: para
-#: install-methods.xml:1210
+#: install-methods.xml:1227
 #, no-c-format
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
@@ -1882,13 +1913,13 @@ msgstr ""
 "仍然必须被请放置在 TFTP 服务器要查找的目录中。"
 
 #. Tag: title
-#: install-methods.xml:1221
+#: install-methods.xml:1238
 #, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "SGI TFTP 引导"
 
 #. Tag: para
-#: install-methods.xml:1222
+#: install-methods.xml:1239
 #, no-c-format
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -1902,13 +1933,13 @@ msgstr ""
 "现在 <filename>/etc/dhcpd.conf</filename>。"
 
 #. Tag: title
-#: install-methods.xml:1330
+#: install-methods.xml:1347
 #, no-c-format
 msgid "Automatic Installation"
 msgstr "自动化安装"
 
 #. Tag: para
-#: install-methods.xml:1331
+#: install-methods.xml:1348
 #, no-c-format
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
@@ -1923,13 +1954,13 @@ msgstr ""
 "更多细节。"
 
 #. Tag: title
-#: install-methods.xml:1343
+#: install-methods.xml:1360
 #, no-c-format
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "使用 &debian; 安装程序进行自动安装"
 
 #. Tag: para
-#: install-methods.xml:1344
+#: install-methods.xml:1361
 #, no-c-format
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
@@ -1941,7 +1972,7 @@ msgstr ""
 "介质上加载，并自动回答安装过程中的问题。"
 
 #. Tag: para
-#: install-methods.xml:1351
+#: install-methods.xml:1368
 #, no-c-format
 msgid ""
 "Full documentation on preseeding including a working example that you can "