po/zh_CN: unfuzzy

4 files changed, 19 insertions, 211 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 318002427..30de5d36b 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: 2009-05-03 00:14+0000\n"
-"PO-Revision-Date: 2009-04-13 16:49+0800\n"
+"PO-Revision-Date: 2009-05-03 12:11+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"
@@ -1100,7 +1100,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:833
-#, fuzzy, no-c-format
+#, 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 <filename>hd-"
@@ -1115,11 +1115,7 @@ msgid ""
 "drive (make sure the file is named ending in <literal>.iso</literal>). The "
 "installer can then boot from the drive and install from the CD/DVD image, "
 "without needing the network."
-msgstr ""
-"另一种方法，可以让您在安装时保持原硬盘的分区不变，您需要下载 <filename>hd-"
-"media/initrd.gz</filename> 文件以及对应的内核，还需要一个 CD(或者 DVD) iso 文"
-"件的副本放在硬盘上(确认文件名是以 <literal>.iso</literal> 结尾的)。这样安装程"
-"序就可以从硬盘引导，并从 CD 映像文件上安装，而不使用网络。"
+msgstr "另一种方法，可以在安装时保持原硬盘的分区不变，您需要下载 <filename>hd-media/initrd.gz</filename> 文件以及对应的内核，还需要一个 CD(或者 DVD) iso 文件的副本放在硬盘上(确认文件名是以 <literal>.iso</literal> 结尾的)。这样安装程序就可以从硬盘引导，并从 CD/DVD 映像文件上安装，而不使用网络。"
 
 #. Tag: para
 #: boot-installer.xml:842
@@ -3396,11 +3392,11 @@ msgid ""
 "Support for hardware speech synthesis devices is available only alongside "
 "support for graphical installer. You thus need to select the "
 "<quote>Graphical install</quote> entry in the boot menu."
-msgstr ""
+msgstr "对于硬件语音合成设备的支持只在图形界面安装程序下有效。您需要在引导菜单里面选择 <quote>Graphical install</quote> 项。"
 
 #. Tag: para
 #: boot-installer.xml:2781
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Support for hardware speech synthesis devices is available only alongside "
 #| "support for graphical installer. You thus need to select the "
@@ -3423,14 +3419,7 @@ msgid ""
 "speakup-driver-codes;\">driver code list</ulink>). The textual version of "
 "the installer will then be automatically selected, and support for the "
 "speech synthesis device will be automatically installed on the target system."
-msgstr ""
-"对于硬件语音合成设备的支持只在图形界面安装程序下有效。您需要在引导菜单里面选"
-"择 <quote>Graphical install</quote> 相。硬件语音合成设备无法被自动识别。您需"
-"要添加 <userinput>speakup.synth=<replaceable>driver</replaceable></"
-"userinput> 引导参数说明 <classname>speakup</classname> 使用哪种驱动程序。"
-"<replaceable>driver</replaceable> 应替换为该设备的驱动程序代码(参阅 <ulink "
-"url=\"&url-speakup-driver-codes;\">driver code list</ulink>)。安装程序的图形"
-"界面之后自动被选中，对于语音合成设备的支持也会被自动安装到最终系统里面。"
+msgstr "硬件语音合成设备无法自动识别。您需要添加 <userinput>speakup.synth=<replaceable>driver</replaceable></userinput> 引导参数告诉 <classname>speakup</classname> 使用哪种驱动程序。<replaceable>driver</replaceable> 应替换为该设备的驱动程序代码(参阅 <ulink url=\"&url-speakup-driver-codes;\">driver code list</ulink>)。接着安装程序的文本界面自动被选中，对于语音合成设备的支持也会被自动安装到最终系统里面。"
 
 #. Tag: title
 #: boot-installer.xml:2796
@@ -3539,7 +3528,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:2863
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you are booting with a serial console, generally the kernel will "
 #| "autodetect this. If you have a videocard (framebuffer) and a keyboard "
@@ -3562,12 +3551,7 @@ msgid ""
 "<literal>linux</literal>, <literal>bterm</literal>, <literal>ansi</literal>, "
 "<literal>vt102</literal> and <literal>dumb</literal>. The default for serial "
 "console in &d-i; is <userinput>vt102</userinput>. </para> </footnote>."
-msgstr ""
-"假如您用串口控制台引导，一般情况下内核会自动检测到。如果在串口引导的计算机上"
-"有视频卡(framebuffer)和键盘，您可能必须传递 "
-"<userinput>console=<replaceable>device</replaceable></userinput> 参数给内核，"
-"其中 <replaceable>device</replaceable> 是串口设备，通常是 <filename>ttyS0</"
-"filename> 形式。"
+msgstr "假如您用串口控制台引导，通常内核可以自动检测到。如果在串口引导的计算机上有视频卡(framebuffer)和键盘，您必须传递 <userinput>console=<replaceable>device</replaceable></userinput> 参数给内核，其中 <replaceable>device</replaceable> 是串口设备，通常是 <filename>ttyS0</filename> 形式。<footnote> <para> 为了确保安装程序使用的终端类型与您的终端模拟程序匹配，可以添加一个 <userinput>TERM=<replaceable>type</replaceable></userinput> 参数。注意，安装程序仅支持下列终端类型: <literal>linux</literal>、<literal>bterm</literal>、<literal>ansi</literal>、<literal>vt102</literal> 和 <literal>dumb</literal>。&d-i; 中默认的串口控制台终端类型是 <userinput>vt102</userinput>。</para> </footnote>。"
 
 #. Tag: para
 #: boot-installer.xml:2887
@@ -5308,123 +5292,3 @@ msgstr ""
 "      and ideas you had during the initial install.&gt;\n"
 "</screen></informalexample> 在 bug 报告中，请说明问题所在，包括内核挂起时最后"
 "见到的内核消息。描述进入问题状态所进行的步骤。"
-
-#~ msgid "Booting from TFTP on Netwinder"
-#~ msgstr "从 Netwinder 上的 TFTP 上引导"
-
-#~ msgid ""
-#~ "Netwinders have two network interfaces: A 10Mbps NE2000-compatible card "
-#~ "(which is generally referred to as <literal>eth0</literal>) and a 100Mbps "
-#~ "Tulip card. There may be problems loading the image via TFTP using the "
-#~ "100Mbps card so it is recommended that you use the 10Mbps interface (the "
-#~ "one labeled with <literal>10 Base-T</literal>)."
-#~ msgstr ""
-#~ "Netwinder 有两个网络接口：一个 10Mbps NE2000 兼容卡 (通常作为 "
-#~ "<literal>eth0</literal>) 和一个 100Mbps Tulip 卡。使用 100Mbps 卡通过 "
-#~ "TFTP 加载映像可能会出现问题，所以建议使用 10Mbps 的接口 (标记为 "
-#~ "<literal>10 Base-T</literal>)。"
-
-#~ msgid ""
-#~ "You need NeTTrom 2.2.1 or later to boot the installation system, and "
-#~ "version 2.3.3 is recommended. Unfortunately, firmware files are currently "
-#~ "not available for download because of license issues. If this situation "
-#~ "changes, you may find new images at <ulink url=\"http//www.netwinder.org/"
-#~ "\"></ulink>."
-#~ msgstr ""
-#~ "您需要 NeTTrom 2.2.1 或者较高的版本来引导安装系统，推荐使用 NeTTrom "
-#~ "2.3.3。不幸的是，由于许可证的原因，固件的文件现在无法下载。如果情况有所改"
-#~ "变，您可以从 <ulink url=\"http://www.netwinder.org/\"></ulink>找到新映像。"
-
-#~ msgid ""
-#~ "When you boot your Netwinder you have to interrupt the boot process "
-#~ "during the countdown. This allows you to set a number of firmware "
-#~ "settings needed in order to boot the installer. First of all, start by "
-#~ "loading the default settings: <informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; load-defaults\n"
-#~ "</screen></informalexample> Furthermore, you must configure the network, "
-#~ "either with a static address: <informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv netconfig_eth0 flash\n"
-#~ "    NeTTrom command-&gt; setenv eth0_ip 192.168.0.10/24\n"
-#~ "</screen></informalexample> where 24 is the number of set bits in the "
-#~ "netmask, or a dynamic address: <informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv netconfig_eth0 dhcp\n"
-#~ "</screen></informalexample> You may also need to configure the "
-#~ "<userinput>route1</userinput> settings if the TFTP server is not on the "
-#~ "local subnet. Following these settings, you have to specify the TFTP "
-#~ "server and the location of the image. You can then store your settings to "
-#~ "flash. <informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv kerntftpserver 192.168.0.1\n"
-#~ "    NeTTrom command-&gt; setenv kerntftpfile boot.img\n"
-#~ "    NeTTrom command-&gt; save-all\n"
-#~ "</screen></informalexample> Now you have to tell the firmware that the "
-#~ "TFTP image should be booted: <informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv kernconfig tftp\n"
-#~ "    NeTTrom command-&gt; setenv rootdev /dev/ram\n"
-#~ "</screen></informalexample> If you use a serial console to install your "
-#~ "Netwinder, you need to add the following setting: "
-#~ "<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv cmdappend root=/dev/ram "
-#~ "console=ttyS0,115200\n"
-#~ "</screen></informalexample> Alternatively, for installations using a "
-#~ "keyboard and monitor you have to set: <informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv cmdappend root=/dev/ram\n"
-#~ "</screen></informalexample> You can use the <command>printenv</command> "
-#~ "command to review your environment settings. After you have verified that "
-#~ "the settings are correct, you can load the image: "
-#~ "<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; boot\n"
-#~ "</screen></informalexample> In case you run into any problems, a <ulink "
-#~ "url=\"http://www.netwinder.org/howto/Firmware-HOWTO.html\">detailed "
-#~ "HOWTO</ulink> is available."
-#~ msgstr ""
-#~ "启动 Netwinder 时，您必须在倒数时中断引导过程。这让您可以进行一些固件的设"
-#~ "置用于启动安装程序。首先，加载默认设置：<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; load-defaults\n"
-#~ "</screen></informalexample> 接着，您必须配置网络，可以是一个静态地址："
-#~ "<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv netconfig_eth0 flash\n"
-#~ "    NeTTrom command-&gt; setenv eth0_ip 192.168.0.10/24\n"
-#~ "</screen></informalexample> 其中 24 是网络掩码位数，或者是一个动态地址："
-#~ "<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv netconfig_eth0 dhcp\n"
-#~ "</screen></informalexample> 如果 TFTP 服务器不在子网内，您还必须配置 "
-#~ "<userinput>route1</userinput> 设置。下面的设置，要指定 TFTP 服务器和映像的"
-#~ "位置。您可以将设置保存到 U 盘里。<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv kerntftpserver 192.168.0.1\n"
-#~ "    NeTTrom command-&gt; setenv kerntftpfile boot.img\n"
-#~ "    NeTTrom command-&gt; save-all\n"
-#~ "</screen></informalexample> 现在您要告诉固件将要引导的 TFTP 映像："
-#~ "<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv kernconfig tftp\n"
-#~ "    NeTTrom command-&gt; setenv rootdev /dev/ram\n"
-#~ "</screen></informalexample> 如果您通过串口控制台安装 Netwinder，需要加入下"
-#~ "面设置：<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv cmdappend root=/dev/ram "
-#~ "console=ttyS0,115200\n"
-#~ "</screen></informalexample> 另外，对于安装时使用的键盘和监视器需要设置："
-#~ "<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; setenv cmdappend root=/dev/ram\n"
-#~ "</screen></informalexample> 您可以使用 <command>printenv</command> 命令回"
-#~ "顾环境设置。在确认设置正确之后，您可以加载映像："
-#~ "<informalexample><screen>\n"
-#~ "    NeTTrom command-&gt; boot\n"
-#~ "</screen></informalexample> 万一您遇到问题，有一个 <ulink url=\"http://"
-#~ "www.netwinder.org/howto/Firmware-HOWTO.html\">detailed HOWTO</ulink> 可以"
-#~ "參考。"
-
-#~ msgid "Booting from TFTP on CATS"
-#~ msgstr "在 CATS 上的 TFTP 引导"
-
-#~ msgid ""
-#~ "On CATS machines, use <command>boot de0:</command> or similar at the "
-#~ "Cyclone prompt."
-#~ msgstr ""
-#~ "在 CATS 机器上，可以使用命令 <command>boot de0:</command> 或者在 Cyclone "
-#~ "引导符下类似的命令。"
-
-#~ msgid ""
-#~ "To boot a CD-ROM from the Cyclone console prompt, use the command "
-#~ "<command>boot cd0:cats.bin</command>"
-#~ msgstr ""
-#~ "如果需要在 Cyclone 控制台提示符下从 CD 光盘下引导，请使用命令 "
-#~ "<command>boot cd0:cats.bin</command>"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 37b5ab295..2e86e9c33 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.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: 2009-05-03 00:14+0000\n"
-"PO-Revision-Date: 2009-04-13 16:59+0800\n"
+"PO-Revision-Date: 2009-05-03 12:15+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"
@@ -175,16 +175,16 @@ msgstr "ixp4xx"
 
 #. Tag: entry
 #: hardware.xml:89
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Marvell Orion"
 msgid "Marvell Kirkwood"
-msgstr "Marvell Orion"
+msgstr "Marvell Kirkwood"
 
 #. Tag: entry
 #: hardware.xml:90
 #, no-c-format
 msgid "kirkwood"
-msgstr ""
+msgstr "kirkwood"
 
 #. Tag: entry
 #: hardware.xml:92
@@ -1867,11 +1867,11 @@ msgstr ""
 #: hardware.xml:788
 #, no-c-format
 msgid "Kirkwood"
-msgstr ""
+msgstr "Kirkwood"
 
 #. Tag: para
 #: hardware.xml:789
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Orion is a system on a chip (SoC) from Marvell that integrates an ARM "
 #| "CPU, Ethernet, SATA, USB, and other functionality in one chip. There are "
@@ -1887,13 +1887,7 @@ msgid ""
 "support the following Kirkwood based devices: <ulink url=\"&url-arm-cyrius-"
 "sheevaplug;\">SheevaPlug</ulink> and <ulink url=\"&url-arm-cyrius-qnap-"
 "kirkwood;\">QNAP Turbo Station</ulink> (TS-119 and TS-219)."
-msgstr ""
-"Orion 是 Marvell 的 SoC (system on a chip) 产品，芯片上集成了 ARM CPU、以太"
-"网、SATA、USB，以及一些其他的功能。现在市场上有很多 NAS (Network Attached "
-"Storage) 设备基于 Orion 芯片。我们能支持以下几种基于 Orion 的设备： <ulink "
-"url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>、<ulink url="
-"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>、 <ulink url=\"&url-arm-cyrius-"
-"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)。"
+msgstr "Kirkwood 是 Marvell 的 SoC (system on a chip) 产品，芯片上集成了 ARM CPU、以太网、SATA、USB，以及一些其他的功能。当前我们能支持以下几种基于 Kirkwood 的设备: <ulink url=\"&url-arm-cyrius-sheevaplug;\">SheevaPlug</ulink> 和 <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (TS-119 and TS-219)。"
 
 #. Tag: term
 #: hardware.xml:802
@@ -4292,30 +4286,3 @@ msgstr ""
 #, no-c-format
 msgid "FIXME: is this still true?"
 msgstr "FIXME: is this still true?"
-
-#~ msgid "<entry>arm</entry>"
-#~ msgstr "<entry>arm</entry>"
-
-#~ msgid "Netwinder and CATS"
-#~ msgstr "Netwinder 与 CATS"
-
-#~ msgid "netwinder"
-#~ msgstr "netwinder"
-
-#~ msgid "arm and armel"
-#~ msgstr "arm 和 armel"
-
-#~ msgid "Netwinder"
-#~ msgstr "Netwinder"
-
-#~ msgid ""
-#~ "This is actually the name for the group of machines based upon the "
-#~ "StrongARM 110 CPU and Intel 21285 Northbridge (also known as Footbridge). "
-#~ "It comprises of machines like: Netwinder (possibly one of the most common "
-#~ "ARM boxes), CATS (also known as the EB110ATX), EBSA 285 and Compaq "
-#~ "personal server (cps, aka skiff)."
-#~ msgstr ""
-#~ "实际上这是一组机器的名称，它们基于 StrongARM 110 CPU 和 Intel 21285 北桥"
-#~ "(也称作 Footbridge)。包括的机器有： Netwinder (也许是最常见的 ARM 机器)、"
-#~ "CATS (也称为 EB110ATX)、EBSA 285 和 Compaq personal server (cps，也叫 "
-#~ "skiff)。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index c6826b33d..933eb7f0f 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: 2009-05-03 00:14+0000\n"
-"PO-Revision-Date: 2009-02-25 13:52+0800\n"
+"PO-Revision-Date: 2009-05-03 12:16+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"
@@ -2381,23 +2381,3 @@ msgid ""
 msgstr ""
 "在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档，并有一些可"
 "以使用的例子供您修改。"
-
-#~ msgid "Netwinder Installation Files"
-#~ msgstr "Netwinder 安装文件"
-
-#~ msgid ""
-#~ "The easiest way to boot a Netwinder is over the network, using the "
-#~ "supplied TFTP image &netwinder-boot-img;."
-#~ msgstr ""
-#~ "启动 Netwinder 最轻松的途径是使用所提供的 TFTP 映象文件 &netwinder-boot-"
-#~ "img; 进行网络引导。"
-
-#~ msgid "CATS Installation Files"
-#~ msgstr "CATS 的安装文件"
-
-#~ msgid ""
-#~ "CATS can be booted either via the network or from CD-ROM. The kernel and "
-#~ "initrd can be obtained from &cats-boot-img;."
-#~ msgstr ""
-#~ "CATS 可以通过网络或 CD-ROM 启动。内核与 initrd 可以从 &cats-boot-img; 获"
-#~ "得。"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 8738085d3..13dce119b 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: 2009-04-29 00:14+0000\n"
-"PO-Revision-Date: 2009-03-16 13:04+0800\n"
+"PO-Revision-Date: 2009-05-03 12:17+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"
@@ -2371,7 +2371,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1049
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# d-i preseeding is inherently not secure. Nothing in the installer "
 #| "checks\n"
@@ -2438,14 +2438,11 @@ msgstr ""
 "# This first command is run as early as possible, just after\n"
 "# preseeding is read.\n"
 "#d-i preseed/early_command string anna-install some-udeb\n"
-"<phrase condition=\"squeeze\">\n"
 "# This command is run immediately before the partitioner starts. It may be\n"
 "# useful to apply dynamic partitioner preseeding that depends on the state\n"
 "# of the disks (which may not be visible when preseed/early_command runs).\n"
 "#d-i partman/early_command \\\n"
-"#       string debconf-set partman-auto/disk \"$(list-devices disk | head -"
-"n1)\"\n"
-"</phrase>\n"
+"#       string debconf-set partman-auto/disk \"$(list-devices disk | head -n1)\"\n"
 "# This command is run just before the install finishes, but when there is\n"
 "# still a usable /target directory. You can chroot to /target and use it\n"
 "# directly, or use the apt-install and in-target commands to easily install\n"