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

4 files changed, 50 insertions, 96 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index aa61e1f92..8bcfcb0af 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3144,30 +3144,6 @@ msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
 #. 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 "
@@ -3188,11 +3164,22 @@ msgid ""
 "argument is for maximum compatibility; you can try it if <userinput>install</"
 "userinput> doesn't work. The Debian installation program should start."
 msgstr ""
-"您也许已经按照 <filename>vmlinux</filename>, <filename>initrd.gz</filename>, <filename>yaboot</filename> 和 <filename>yaboot.conf</filename> 在 HFS 分区的根层次放置好了 <xref linkend=\"files-newworld\"/> 文件。您现在必须引导进入 Open Firmware (参阅 <xref linkend=\"invoking-openfirmware\"/>)。在提示符下，输入： <informalexample><screen>\n"
+"您也许已经按照 <filename>vmlinux</filename>, <filename>initrd.gz</filename>, "
+"<filename>yaboot</filename> 和 <filename>yaboot.conf</filename> 在 HFS 分区的"
+"根层次放置好了 <xref linkend=\"files-newworld\"/> 文件。您现在必须引导进入 "
+"Open Firmware (参阅 <xref linkend=\"invoking-openfirmware\"/>)。在提示符下，"
+"输入： <informalexample><screen>\n"
 "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-"</screen></informalexample> 用放置内核和 yaboot 文件的 HFS 分区号来替换 <replaceable>x</replaceable> 然后按下 &enterkey;。在某些机器上，您也许需要时用 <userinput>ide0:</userinput> 来替换 <userinput>hd:</userinput>，在接下来的几秒钟内，将会看到一个提示符 <informalexample><screen>\n"
+"</screen></informalexample> 用放置内核和 yaboot 文件的 HFS 分区号来替换 "
+"<replaceable>x</replaceable> 然后按下 &enterkey;。在某些机器上，您也许需要时"
+"用 <userinput>ide0:</userinput> 来替换 <userinput>hd:</userinput>，在接下来的"
+"几秒钟内，将会看到一个提示符 <informalexample><screen>\n"
 "boot:\n"
-"</screen></informalexample> 在 yaboot 的 <prompt>boot:</prompt> 提示符下，输入 <userinput>install</userinput> 或者 <userinput>install video=ofonly</userinput> 然后点击 &enterkey;。<userinput>video=ofonly</userinput> 参数是用于最大可能性的兼容性；您可以在 <userinput>install</userinput> 不工作的情况下尝试使用它。Debian 安装程序应该立刻启动。"
+"</screen></informalexample> 在 yaboot 的 <prompt>boot:</prompt> 提示符下，输"
+"入 <userinput>install</userinput> 或者 <userinput>install video=ofonly</"
+"userinput> 然后点击 &enterkey;。<userinput>video=ofonly</userinput> 参数是用"
+"于最大可能性的兼容性；您可以在 <userinput>install</userinput> 不工作的情况下"
+"尝试使用它。Debian 安装程序应该立刻启动。"
 
 # index.docbook:700, index.docbook:2176
 #. Tag: title
@@ -3210,20 +3197,15 @@ msgstr "当前，New World 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 "
 "Open Firmware prompt, since Open Firmware does not search USB storage "
 "devices by default. See <xref linkend=\"invoking-openfirmware\"/>."
-msgstr "确认您已经准备就绪 <xref linkend=\"boot-usb-files\"/>。要从 USB 记忆棒引导 Macintosh 系统，即使 Open Firmware 默认不搜索 USB 存储设备，您也需要使用 Open Firmware 提示符。参阅 <xref linkend=\"invoking-openfirmware\"/>。"
+msgstr ""
+"确认您已经准备就绪 <xref linkend=\"boot-usb-files\"/>。要从 USB 记忆棒引导 "
+"Macintosh 系统，即使 Open Firmware 默认不搜索 USB 存储设备，您也需要使用 "
+"Open Firmware 提示符。参阅 <xref linkend=\"invoking-openfirmware\"/>。"
 
 #. Tag: para
 #: boot-installer.xml:2548
@@ -3301,16 +3283,6 @@ msgstr "目前来说，PReP 以及 New World PowerMac 系统支持网络引导�
 #. 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 "
@@ -3328,13 +3300,18 @@ msgid ""
 "machines) the command <userinput>help boot</userinput> may give a "
 "description of syntax and available options."
 msgstr ""
-"在 Open Firmware 机器上，比如 NewWorld Power Macs，进入引导监视器(参阅 <xref linkend=\"invoking-openfirmware\"/>) 并使用命令 <informalexample><screen>\n"
+"在 Open Firmware 机器上，比如 NewWorld Power Macs，进入引导监视器(参阅 <xref "
+"linkend=\"invoking-openfirmware\"/>) 并使用命令 <informalexample><screen>\n"
 "0 &gt; boot enet:0\n"
-"</screen></informalexample> 如果无效，您也许该添加文件名，比如：<informalexample><screen>\n"
+"</screen></informalexample> 如果无效，您也许该添加文件名，比如："
+"<informalexample><screen>\n"
 "0 &gt; boot enet:0,yaboot\n"
-"</screen></informalexample> 可能使用不同的途径来确认网络。在一台 PReP 机器上，您应该尝试 <informalexample><screen>\n"
-"boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable>\n"
-"</screen></informalexample> 在有些 PReP 系统上(比如 Motorola PowerStack)， <userinput>help boot</userinput> 命令可以给出语法和选项的说明。"
+"</screen></informalexample> 可能使用不同的途径来确认网络。在一台 PReP 机器"
+"上，您应该尝试 <informalexample><screen>\n"
+"boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</"
+"replaceable>,<replaceable>client_ipaddr</replaceable>\n"
+"</screen></informalexample> 在有些 PReP 系统上(比如 Motorola PowerStack)， "
+"<userinput>help boot</userinput> 命令可以给出语法和选项的说明。"
 
 #. Tag: para
 #: boot-installer.xml:2645
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 7be0e8492..2b7d7de67 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -1942,18 +1942,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1311
 #, 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> "
@@ -1968,7 +1956,17 @@ msgid ""
 "<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>."
-msgstr "检查 <filename>/etc/inetd.conf</filename> 文件记住被用作 <command>in.tftpd</command> 的参数的目录<footnote> <para> Debian 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。</para> </footnote>，您接下来会需要它。如果必须修改 <filename>/etc/inetd.conf</filename>，您一定要提醒正在运行的 <command>inetd</command> 进程，该文件已经修改。在 Debian 系统中，应该执行 <userinput>/etc/init.d/inetd reload</userinput>；而在其它系统中，找到 <command>inetd</command> 所对应的进程 ID，并执行 <userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>。"
+msgstr ""
+"检查 <filename>/etc/inetd.conf</filename> 文件记住被用作 <command>in.tftpd</"
+"command> 的参数的目录<footnote> <para> Debian 中所有 <command>in.tftpd</"
+"command> 参数默认都会将 TFTP 请求记录到系统日志中。有些还支持 <userinput>-v</"
+"userinput> 选项增加详细程度。万一遇到引导问题，建议先检查这些日志信息，这对于"
+"分析错误是一个好的起始点。</para> </footnote>，您接下来会需要它。如果必须修"
+"改 <filename>/etc/inetd.conf</filename>，您一定要提醒正在运行的 "
+"<command>inetd</command> 进程，该文件已经修改。在 Debian 系统中，应该执行 "
+"<userinput>/etc/init.d/inetd reload</userinput>；而在其它系统中，找到 "
+"<command>inetd</command> 所对应的进程 ID，并执行 <userinput>kill -HUP "
+"<replaceable>inetd-pid</replaceable></userinput>。"
 
 #. Tag: para
 #: install-methods.xml:1331
@@ -2022,20 +2020,17 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1363
 #, 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. "
 "<command>Yaboot</command> will then retrieve the kernel and RAMdisk images "
 "via TFTP itself. You will need to download the following files from the "
 "<filename>netboot/</filename> directory:"
-msgstr "在 NewWorld Power Macintosh 上，您需要设置 <command>yaboot</command> boot loader 作为 TFTP 引导映像。<command>Yaboot</command> 接下来将通过 TFTP 来获到内核和内存虚拟磁盘映像。您需要从 <filename>netboot/</filename> 目录下载一些文件："
+msgstr ""
+"在 NewWorld Power Macintosh 上，您需要设置 <command>yaboot</command> boot "
+"loader 作为 TFTP 引导映像。<command>Yaboot</command> 接下来将通过 TFTP 来获到"
+"内核和内存虚拟磁盘映像。您需要从 <filename>netboot/</filename> 目录下载一些文"
+"件："
 
 #. Tag: filename
 #: install-methods.xml:1394
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 57dddb1b1..f8fd42e8c 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -2640,13 +2640,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 </"
@@ -2654,7 +2647,12 @@ msgid ""
 "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."
-msgstr "在 &arch-title; 的 Macintoshe 机器上，您在启动时通过 <keycombo><keycap>Command (cloverleaf/Apple)</keycap> <keycap>Option </keycap> <keycap>o</keycap> <keycap>f</keycap></keycombo> 命令使用 OpenFirmware。一般情况下，它会按时钟顺序检验击键，但也会与不同的型号有关。参阅 <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> 了解更多提示。"
+msgstr ""
+"在 &arch-title; 的 Macintoshe 机器上，您在启动时通过 "
+"<keycombo><keycap>Command (cloverleaf/Apple)</keycap> <keycap>Option </"
+"keycap> <keycap>o</keycap> <keycap>f</keycap></keycombo> 命令使用 "
+"OpenFirmware。一般情况下，它会按时钟顺序检验击键，但也会与不同的型号有关。参"
+"阅 <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> 了解更多提示。"
 
 #. Tag: para
 #: preparing.xml:1796
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index b0abaf878..f5f19752e 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -2111,22 +2111,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"