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

1 files changed, 28 insertions, 51 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