po/zh_CN unfuzzy OpenFirmware

4 files changed, 29 insertions, 63 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 8bd806212..aa61e1f92 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2008-07-04 00:09+0000\n"
-"PO-Revision-Date: 2008-06-19 10:48+0800\n"
+"PO-Revision-Date: 2008-07-06 19:26+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -3143,7 +3143,7 @@ msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
 
 #. Tag: para
 #: boot-installer.xml:2500
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "You will have already placed the <filename>vmlinux</filename>, "
 #| "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
@@ -3188,24 +3188,11 @@ 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\"/> 文件。请重新启动计算机，并"
-"且立即(在发声时)同时按住 <keycap>Option</keycap>, <keycap>Command "
-"(cloverleaf/Apple)</keycap>, <keycap>o</keycap>, 和 <keycap>f</keycap> 键。过"
-"几秒钟后，将进入 Open Firmware 提示符。在提示符下，输入： "
-"<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
@@ -3222,7 +3209,7 @@ msgstr "当前，New World PowerMac 系统支持从 USB 引导。"
 
 #. Tag: para
 #: boot-installer.xml:2539
-#, fuzzy, no-c-format
+#, 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 "
@@ -3236,12 +3223,7 @@ msgid ""
 ">. 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 提示符。要得到提示符，在启动时按住 <keycombo><keycap>Command</"
-"keycap> <keycap>Option</keycap> <keycap>o</keycap> <keycap>f</keycap></"
-"keycombo> (参考 <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
@@ -3318,7 +3300,7 @@ msgstr "目前来说，PReP 以及 New World PowerMac 系统支持网络引导�
 
 #. Tag: para
 #: boot-installer.xml:2617
-#, fuzzy, no-c-format
+#, 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 "
@@ -3346,13 +3328,13 @@ 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\"/>) 并且使用命令 <command>boot enet:0</"
-"command>。PReP 以及 CHRP 可能使用不同的途径来确认网络。在一台 PReP 机器上，您"
-"应该尝试 <userinput>boot <replaceable>server_ipaddr</replaceable>,"
-"<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable></"
-"userinput>。在有些 PReP 系统上(例如 Motorola PowerStack)，<userinput>help "
-"boot</userinput> 命令可以给出语法和选项的说明。"
+"在 Open Firmware 机器上，比如 NewWorld Power Macs，进入引导监视器(参阅 <xref linkend=\"invoking-openfirmware\"/>) 并使用命令 <informalexample><screen>\n"
+"0 &gt; boot enet:0\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> 命令可以给出语法和选项的说明。"
 
 #. Tag: para
 #: boot-installer.xml:2645
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 6bc356912..7be0e8492 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2008-07-04 00:09+0000\n"
-"PO-Revision-Date: 2008-05-30 09:31+0800\n"
+"PO-Revision-Date: 2008-07-06 19:49+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1941,7 +1941,7 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1311
-#, fuzzy, no-c-format
+#, 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> "
@@ -1968,16 +1968,7 @@ 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> <userinput>-l</userinput> 参数能够让某"
-"些版本的 <command>in.tftpd</command> 将所有的请求记录到系统日志中。这将在检查"
-"错误的时候会很有用。</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
@@ -2030,7 +2021,7 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1363
-#, fuzzy, no-c-format
+#, 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. "
@@ -2044,18 +2035,13 @@ msgid ""
 "<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>引导装载"
-"器作为 TFTP 引导映像。<command>Yaboot</command> 接下来将通过 TFTP 来获到内核"
-"和内存虚拟磁盘映像。对于网络引导，请使用 <filename>yaboot-netboot.conf</"
-"filename>。只需要将其改名为 <filename>yaboot.conf</filename> 并且放入 TFTP 目"
-"录。"
+msgstr "在 NewWorld Power Macintosh 上，您需要设置 <command>yaboot</command> boot loader 作为 TFTP 引导映像。<command>Yaboot</command> 接下来将通过 TFTP 来获到内核和内存虚拟磁盘映像。您需要从 <filename>netboot/</filename> 目录下载一些文件："
 
 #. Tag: filename
 #: install-methods.xml:1394
 #, no-c-format
 msgid "boot.msg"
-msgstr ""
+msgstr "boot.msg"
 
 #. Tag: para
 #: install-methods.xml:1399
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 7a9d4eda4..57dddb1b1 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2008-07-04 00:09+0000\n"
-"PO-Revision-Date: 2008-01-14 10:24+0800\n"
+"PO-Revision-Date: 2008-07-06 19:51+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -2639,7 +2639,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1787
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "On &arch-title; Macintoshes, you invoke OpenFirmware with "
 #| "<keycombo><keycap>Command</keycap> <keycap>option</keycap> <keycap>O</"
@@ -2654,12 +2654,7 @@ 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</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 fdb1f20a4..b0abaf878 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2008-07-06 00:09+0000\n"
-"PO-Revision-Date: 2008-05-19 19:22+0800\n"
+"PO-Revision-Date: 2008-07-06 19:52+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -2110,7 +2110,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:980
-#, fuzzy, no-c-format
+#, 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"
@@ -2152,6 +2152,9 @@ msgstr ""
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
+"# Whether to upgrade packages after debootstrap.\n"
+"# Allowed values: none, safe-upgrade, full-upgrade\n"
+"#d-i pkgsel/upgrade select none\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"