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

1 files changed, 58 insertions, 50 deletions

diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 458763a65..d292138cb 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: 2010-02-24 01:12+0000\n"
+"POT-Creation-Date: 2010-02-26 01:12+0000\n"
 "PO-Revision-Date: 2009-11-21 12:42+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1444,25 +1444,25 @@ msgstr ""
 "盘图标的方法来完成)。"
 
 #. Tag: filename
-#: install-methods.xml:1034 install-methods.xml:1361
+#: install-methods.xml:1034 install-methods.xml:1360
 #, no-c-format
 msgid "vmlinux"
 msgstr "vmlinux"
 
 #. Tag: filename
-#: install-methods.xml:1039 install-methods.xml:1366
+#: install-methods.xml:1039 install-methods.xml:1365
 #, no-c-format
 msgid "initrd.gz"
 msgstr "initrd.gz"
 
 #. Tag: filename
-#: install-methods.xml:1044 install-methods.xml:1371
+#: install-methods.xml:1044 install-methods.xml:1370
 #, no-c-format
 msgid "yaboot"
 msgstr "yaboot"
 
 #. Tag: filename
-#: install-methods.xml:1049 install-methods.xml:1376
+#: install-methods.xml:1049 install-methods.xml:1375
 #, no-c-format
 msgid "yaboot.conf"
 msgstr "yaboot.conf"
@@ -1577,24 +1577,20 @@ msgstr ""
 #: install-methods.xml:1124
 #, no-c-format
 msgid ""
-"To use the Pre-boot Execution Environment (PXE) method of TFTP booting, you "
-"will need a TFTP server with <userinput>tsize</userinput> support. On a "
-"&debian; server, the <classname>atftpd</classname> and <classname>tftpd-hpa</"
-"classname> packages qualify; we recommend <classname>tftpd-hpa</classname>."
+"For a &debian; server we recommend <classname>tftpd-hpa</classname>. It's "
+"written by the same author as the <classname>syslinux</classname> bootloader "
+"and is therefore least likely to cause issues. A good alternative is "
+"<classname>atftpd</classname>."
 msgstr ""
-"如果想用 TFTP 的 Pre-boot Execution Environment (PXE) 方式启动，您将需要一台"
-"支持 <userinput>tsize</userinput> 的 TFTP 服务器。在 &debian; 服务器上，"
-"<classname>atftpd</classname> 和 <classname>tftpd-hpa</classname> 包符合此要"
-"求，我们推荐 <classname>tftpd-hpa</classname>。"
 
 #. Tag: title
-#: install-methods.xml:1141
+#: install-methods.xml:1140
 #, no-c-format
 msgid "Setting up RARP server"
 msgstr "设置 RARP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1142
+#: install-methods.xml:1141
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1620,7 +1616,7 @@ msgstr ""
 "ifconfig eth0</userinput> 命令。"
 
 #. Tag: para
-#: install-methods.xml:1154
+#: install-methods.xml:1153
 #, no-c-format
 msgid ""
 "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1643,13 +1639,13 @@ msgstr ""
 "<userinput>/usr/etc/rarpd -a</userinput> 命令。"
 
 #. Tag: title
-#: install-methods.xml:1175
+#: install-methods.xml:1174
 #, no-c-format
 msgid "Setting up a DHCP server"
 msgstr "设置 DHCP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1176
+#: install-methods.xml:1175
 #, no-c-format
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
@@ -1662,7 +1658,7 @@ msgstr ""
 "文件(参阅 <filename>/etc/dhcp3/dhcpd.conf</filename>)："
 
 #. Tag: screen
-#: install-methods.xml:1183
+#: install-methods.xml:1182
 #, no-c-format
 msgid ""
 "option domain-name \"example.com\";\n"
@@ -1706,7 +1702,7 @@ msgstr ""
 "}"
 
 #. Tag: para
-#: install-methods.xml:1185
+#: install-methods.xml:1184
 #, no-c-format
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
@@ -1722,7 +1718,7 @@ msgstr ""
 "TFTP 获取的文件名。"
 
 #. Tag: para
-#: install-methods.xml:1195
+#: install-methods.xml:1194
 #, no-c-format
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
@@ -1732,13 +1728,13 @@ msgstr ""
 "<userinput>/etc/init.d/dhcpd3-server restart</userinput>。"
 
 #. Tag: title
-#: install-methods.xml:1203
+#: install-methods.xml:1202
 #, no-c-format
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr "在 DHCP 配置中打开 PXE 引导功能"
 
 #. Tag: para
-#: install-methods.xml:1204
+#: install-methods.xml:1203
 #, no-c-format
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1808,13 +1804,13 @@ msgstr ""
 "的 <xref linkend=\"tftp-images\"/>)。"
 
 #. Tag: title
-#: install-methods.xml:1224
+#: install-methods.xml:1223
 #, no-c-format
 msgid "Setting up a BOOTP server"
 msgstr "架设 BOOTP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1225
+#: install-methods.xml:1224
 #, no-c-format
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1829,7 +1825,7 @@ msgstr ""
 "server</classname> 软件包。"
 
 #. Tag: para
-#: install-methods.xml:1233
+#: install-methods.xml:1232
 #, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1891,7 +1887,7 @@ msgstr ""
 "MAC 地址。</phrase>"
 
 #. Tag: para
-#: install-methods.xml:1266
+#: install-methods.xml:1265
 #, no-c-format
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1913,13 +1909,13 @@ msgstr ""
 "<command>dhcpd</command>。"
 
 #. Tag: title
-#: install-methods.xml:1285
+#: install-methods.xml:1284
 #, no-c-format
 msgid "Enabling the TFTP Server"
 msgstr "开启 TFTP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1286
+#: install-methods.xml:1285
 #, no-c-format
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
@@ -1927,7 +1923,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1291
+#: install-methods.xml:1290
 #, no-c-format
 msgid ""
 "In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -1938,7 +1934,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1300
+#: install-methods.xml:1299
 #, no-c-format
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -1955,7 +1951,7 @@ msgstr ""
 "整一下配置文件示例。"
 
 #. Tag: para
-#: install-methods.xml:1310
+#: install-methods.xml:1309
 #, no-c-format
 msgid ""
 "All <command>in.tftpd</command> alternatives available in Debian should log "
@@ -1966,7 +1962,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1318
+#: install-methods.xml:1317
 #, no-c-format
 msgid ""
 "If you intend to install Debian on an SGI machine and your TFTP server is a "
@@ -1994,13 +1990,13 @@ msgstr ""
 "错误。"
 
 #. Tag: title
-#: install-methods.xml:1340
+#: install-methods.xml:1339
 #, no-c-format
 msgid "Move TFTP Images Into Place"
 msgstr "将 TFTP 映像放到适当的位置"
 
 #. Tag: para
-#: install-methods.xml:1341
+#: install-methods.xml:1340
 #, no-c-format
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2015,7 +2011,7 @@ msgstr ""
 "完全决定于 TFTP 客户程序，而且没有一个强制的标准。"
 
 #. Tag: para
-#: install-methods.xml:1350
+#: install-methods.xml:1349
 #, no-c-format
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2030,13 +2026,13 @@ msgstr ""
 "件："
 
 #. Tag: filename
-#: install-methods.xml:1381
+#: install-methods.xml:1380
 #, no-c-format
 msgid "boot.msg"
 msgstr "boot.msg"
 
 #. Tag: para
-#: install-methods.xml:1386
+#: install-methods.xml:1385
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -2051,7 +2047,7 @@ msgstr ""
 "所需的文件名传递给 <command>tftpd</command>。"
 
 #. Tag: para
-#: install-methods.xml:1394
+#: install-methods.xml:1393
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -2066,13 +2062,13 @@ msgstr ""
 "efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
 
 #. Tag: title
-#: install-methods.xml:1406
+#: install-methods.xml:1405
 #, no-c-format
 msgid "SPARC TFTP Booting"
 msgstr "SPARC TFTP 引导"
 
 #. Tag: para
-#: install-methods.xml:1407
+#: install-methods.xml:1406
 #, no-c-format
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
@@ -2100,7 +2096,7 @@ msgstr ""
 "并在必要时加上子体系名。"
 
 #. Tag: para
-#: install-methods.xml:1423
+#: install-methods.xml:1422
 #, no-c-format
 msgid ""
 "If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2112,7 +2108,7 @@ msgstr ""
 "映像。假如映像找不到，查看 tftp 服务器的日志所需要的映像文件名。"
 
 #. Tag: para
-#: install-methods.xml:1430
+#: install-methods.xml:1429
 #, no-c-format
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
@@ -2125,13 +2121,13 @@ msgstr ""
 "仍然必须被请放置在 TFTP 服务器要查找的目录中。"
 
 #. Tag: title
-#: install-methods.xml:1441
+#: install-methods.xml:1440
 #, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "SGI TFTP 引导"
 
 #. Tag: para
-#: install-methods.xml:1442
+#: install-methods.xml:1441
 #, no-c-format
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2145,13 +2141,13 @@ msgstr ""
 "现在 <filename>/etc/dhcpd.conf</filename>。"
 
 #. Tag: title
-#: install-methods.xml:1550
+#: install-methods.xml:1549
 #, no-c-format
 msgid "Automatic Installation"
 msgstr "自动化安装"
 
 #. Tag: para
-#: install-methods.xml:1551
+#: install-methods.xml:1550
 #, no-c-format
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
@@ -2166,13 +2162,13 @@ msgstr ""
 "<classname>autoinstall</classname>，以及 Debian 安装程序本身。"
 
 #. Tag: title
-#: install-methods.xml:1564
+#: install-methods.xml:1563
 #, no-c-format
 msgid "Automatic Installation Using the Debian Installer"
 msgstr "使用 Debian 安装程序进行自动安装"
 
 #. Tag: para
-#: install-methods.xml:1565
+#: install-methods.xml:1564
 #, no-c-format
 msgid ""
 "The Debian Installer supports automating installs via preconfiguration "
@@ -2184,7 +2180,7 @@ msgstr ""
 "质上加载，并自动回答安装过程中的问题。"
 
 #. Tag: para
-#: install-methods.xml:1572
+#: install-methods.xml:1571
 #, no-c-format
 msgid ""
 "Full documentation on preseeding including a working example that you can "
@@ -2194,6 +2190,18 @@ msgstr ""
 "以使用的例子供您修改。"
 
 #~ msgid ""
+#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
+#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
+#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
+#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
+#~ "classname>."
+#~ msgstr ""
+#~ "如果想用 TFTP 的 Pre-boot Execution Environment (PXE) 方式启动，您将需要一"
+#~ "台支持 <userinput>tsize</userinput> 的 TFTP 服务器。在 &debian; 服务器上，"
+#~ "<classname>atftpd</classname> 和 <classname>tftpd-hpa</classname> 包符合此"
+#~ "要求，我们推荐 <classname>tftpd-hpa</classname>。"
+
+#~ msgid ""
 #~ "To get the TFTP server ready to go, you should first make sure that "
 #~ "<command>tftpd</command> is enabled. This is usually enabled by having "
 #~ "something like the following line in <filename>/etc/inetd.conf</"