po/zh_CN: Unfuzzy

4 files changed, 50 insertions, 85 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 385e4dee6..408892e26 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: 2008-09-01 00:10+0000\n"
-"PO-Revision-Date: 2008-05-30 09:31+0800\n"
+"PO-Revision-Date: 2008-09-11 23:30+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"
@@ -139,10 +139,10 @@ msgstr "alpha"
 
 #. Tag: entry
 #: hardware.xml:81
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "<entry>VME</entry>"
 msgid "<entry>ARM</entry>"
-msgstr "<entry>VME</entry>"
+msgstr "<entry>ARM</entry>"
 
 #. Tag: entry
 #: hardware.xml:82
@@ -190,26 +190,26 @@ msgstr "ixp4xx"
 #: hardware.xml:92
 #, no-c-format
 msgid "Marvell Orion"
-msgstr ""
+msgstr "Marvell Orion"
 
 #. Tag: entry
 #: hardware.xml:93
 #, no-c-format
 msgid "orion5x"
-msgstr ""
+msgstr "orion5x"
 
 #. Tag: entry
 #: hardware.xml:95
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "<entry>prep</entry>"
 msgid "<entry>Versatile</entry>"
-msgstr "<entry>prep</entry>"
+msgstr "<entry>Versatile</entry>"
 
 #. Tag: entry
 #: hardware.xml:96
 #, no-c-format
 msgid "versatile"
-msgstr ""
+msgstr "versatile"
 
 #. Tag: entry
 #: hardware.xml:100
@@ -299,25 +299,25 @@ msgstr "r5k-ip32"
 #: hardware.xml:125 hardware.xml:144
 #, no-c-format
 msgid "MIPS Malta (32 bit)"
-msgstr ""
+msgstr "MIPS Malta (32 bit)"
 
 #. Tag: entry
 #: hardware.xml:126 hardware.xml:145
 #, no-c-format
 msgid "4kc-malta"
-msgstr ""
+msgstr "4kc-malta"
 
 #. Tag: entry
 #: hardware.xml:128 hardware.xml:147
 #, no-c-format
 msgid "MIPS Malta (64 bit)"
-msgstr ""
+msgstr "MIPS Malta (64 bit)"
 
 #. Tag: entry
 #: hardware.xml:129 hardware.xml:148
 #, no-c-format
 msgid "5kc-malta"
-msgstr ""
+msgstr "5kc-malta"
 
 # index.docbook:162, index.docbook:177
 #. Tag: entry
@@ -1900,7 +1900,7 @@ msgstr ""
 #: hardware.xml:805
 #, no-c-format
 msgid "Orion5x"
-msgstr ""
+msgstr "Orion5x"
 
 #. Tag: para
 #: hardware.xml:806
@@ -1913,14 +1913,14 @@ msgid ""
 "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 ""
+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)。"
 
 #. Tag: term
 #: hardware.xml:821
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "<term>prep</term>"
 msgid "<term>Versatile</term>"
-msgstr "<term>prep</term>"
+msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:822
@@ -1928,7 +1928,7 @@ msgstr "<term>prep</term>"
 msgid ""
 "The Versatile platform is emulated by QEMU and is therefore a nice way to "
 "test and run Debian on ARM if you don't have the hardware."
-msgstr ""
+msgstr "Versatile 平台由 QEMU 模拟，如果您没有硬件设备，用它来测试运行在 ARM 上的 Debian 是一个不错的方法。"
 
 #. Tag: para
 #: hardware.xml:841
@@ -2077,7 +2077,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:988
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 #| "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
@@ -2114,18 +2114,7 @@ msgid ""
 "by the Debian installer will be covered. If you are looking for support for "
 "other subarchitectures, please contact the <ulink url=\"&url-list-subscribe;"
 "\"> debian-&arch-listname; mailing list</ulink>."
-msgstr ""
-"&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> SGI "
-"IP22：该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常接"
-"近，在本文档中所指的 SGI Indy 同样也代表 Indigo 2 与 Challenge S。</para></"
-"listitem> <listitem><para> Broadcom BCM91250A (SWARM)：此为 ATX 规格的开发"
-"板，基于 Broadcom 的 双核 SB1 1250 处理器。</para></listitem> "
-"<listitem><para> Broadcom BCM91480B (BigSur)：此为 ATX 规格的开发板，基于 "
-"Broadcom 的四核 SB1A 1480 CPU。 </para></listitem></itemizedlist> 关于支持 "
-"mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS "
-"homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子"
-"系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-"
-"listname;  邮件列表</ulink>。"
+msgstr "&arch-title; 上的 Debian 支持以下平台：<itemizedlist> <listitem><para> SGI IP22： 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近似，在本文档中所指的 SGI Indy 同样也代表 Indigo 2 与 Challenge S。</para></listitem> <listitem><para> SGI IP32：该平台常被称为 SGI O2。</para></listitem> <listitem><para> MIPS Malta：该平台由 QEMU 模拟，如果您没有硬件设备，用它来测试 MIPS 上的 Debian 是个不错的方法。</para></listitem> <listitem><para> Broadcom BCM91250A (SWARM)：此为 ATX 规格的开发板，基于 Broadcom 的 双核 SB1 1250 处理器。</para></listitem> <listitem><para> Broadcom BCM91480B (BigSur)：此为 ATX 规格的开发板，基于 Broadcom 的四核 SB1A 1480 处理器。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
 
 #. Tag: para
 #: hardware.xml:1035
@@ -2158,7 +2147,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1062
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 #| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -2191,17 +2180,7 @@ msgid ""
 "by the Debian installer will be covered. If you are looking for support for "
 "other subarchitectures, please contact the <ulink url=\"&url-list-subscribe;"
 "\"> debian-&arch-listname; mailing list</ulink>."
-msgstr ""
-"&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> "
-"Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt Qube 2700 "
-"(Qube1)、RaQ、Qube2 和 RaQ2，以及 Gateway Microserver。</para></listitem> "
-"<listitem><para> Broadcom BCM91250A (SWARM)：此为 ATX 规格的开发板，基于 "
-"Broadcom 的双核 SB1 1250 CPU。</para></listitem> <listitem><para> Broadcom "
-"BCM91480B (BigSur): 此为 ATX 规格的开发板，基于 Broadcom 的四核 SB1A 1480 "
-"CPU。</para></listitem>  </itemizedlist> 关于支持 mips/mipsel 机器的完整信息"
-"见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 "
-"Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持，请联系 <ulink url="
-"\"&url-list-subscribe;\"> debian-&arch-listname;  邮件列表</ulink>。"
+msgstr "&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt Qube 2700 (Qube1)、RaQ、Qube2 和 RaQ2，以及 Gateway Microserver。</para></listitem> <listitem><para> MIPS Malta：改平台由 QEMU 模拟，如果您没有硬件设备，使用它来测试运行在 MIPS 上的 Debian 是个不错的方法。</para></listitem> <listitem><para> Broadcom BCM91250A (SWARM)：此为 ATX 规格的开发板，基于 Broadcom 的双核 SB1 1250 处理器。</para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): 此为 ATX 规格的开发板，基于 Broadcom 的四核 SB1A 1480 处理器。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
 
 #. Tag: title
 #: hardware.xml:1103
@@ -4305,6 +4284,3 @@ msgid ""
 "blade systems."
 msgstr ""
 "<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
-
-#~ msgid "ARM and StrongARM"
-#~ msgstr "ARM and StrongARM"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index c0f0f0773..b76879cd6 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-09-05 00:09+0000\n"
-"PO-Revision-Date: 2008-07-06 19:49+0800\n"
+"PO-Revision-Date: 2008-09-11 23:43+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"
@@ -244,7 +244,7 @@ msgstr "NSLU2 安装文件"
 
 #. Tag: para
 #: install-methods.xml:173
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "A firmware image is provided for the Linksys NSLU2 which will "
 #| "automatically boot <classname>debian-installer</classname>. This firmware "
@@ -254,20 +254,18 @@ msgid ""
 "boot <classname>debian-installer</classname>. This image can be uploaded via "
 "the Linksys web frontend or with upslug2. This firmware image can be "
 "obtained from &nslu2-firmware-img;."
-msgstr ""
-"用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</"
-"classname>。固件映像可以从 &nslu2-firmware-img; 获得。"
+msgstr "用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</classname>。该映象可以用 Linksys web 前端或 upslug2 加载。固件映像可以从 &nslu2-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:185
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "NSLU2 Installation Files"
 msgid "Thecus N2100 Installation Files"
-msgstr "NSLU2 安装文件"
+msgstr "Thecus N2100 安装文件"
 
 #. Tag: para
 #: install-methods.xml:186
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "A firmware image is provided for the Linksys NSLU2 which will "
 #| "automatically boot <classname>debian-installer</classname>. This firmware "
@@ -277,16 +275,14 @@ msgid ""
 "boot <classname>debian-installer</classname>. This image can be installed "
 "using the Thecus firmware upgrade process. This firmware image can be "
 "obtained from &n2100-firmware-img;."
-msgstr ""
-"用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</"
-"classname>。固件映像可以从 &nslu2-firmware-img; 获得。"
+msgstr "用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</classname>。该映象可以使用 Thecus 固件升级程序安装。固件映像可以从 &nslu2-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:197
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "CATS Installation Files"
 msgid "GLAN Tank Installation Files"
-msgstr "CATS 的安装文件"
+msgstr "GLAN Tank 安装文件"
 
 #. Tag: para
 #: install-methods.xml:198
@@ -295,14 +291,14 @@ msgid ""
 "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
 "on which you intend to install Debian. These images can be obtained from "
 "&glantank-firmware-img;."
-msgstr ""
+msgstr "GLAN Tank 需要内核和 ramdisk，位于您打算安装 Debian 的 ext2 磁盘分区上。这些映象可以从 &glantank-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:208
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "CATS Installation Files"
 msgid "Kurobox Pro Installation Files"
-msgstr "CATS 的安装文件"
+msgstr "Kurobox Pro 安装文件"
 
 #. Tag: para
 #: install-methods.xml:209
@@ -311,18 +307,18 @@ msgid ""
 "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
 "disk on which you intend to install Debian. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
-msgstr ""
+msgstr "Kurobox Pro 需要内核和 ramdisk，位于您打算安装 Debian 的 ext2 磁盘分区上。这些映象可以从 &kuroboxpro-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:219
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "NSLU2 Installation Files"
 msgid "HP mv2120 Installation Files"
-msgstr "NSLU2 安装文件"
+msgstr "HP mv2120 安装文件"
 
 #. Tag: para
 #: install-methods.xml:220
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "A firmware image is provided for the Linksys NSLU2 which will "
 #| "automatically boot <classname>debian-installer</classname>. This firmware "
@@ -333,16 +329,14 @@ msgid ""
 "uphpmvault on Linux and other systems and with the HP Media Vault Firmware "
 "Recovery Utility on Windows. The firmware image can be obtained from &mv2120-"
 "firmware-img;."
-msgstr ""
-"用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</"
-"classname>。固件映像可以从 &nslu2-firmware-img; 获得。"
+msgstr "HP mv2120 的固件映象能自动引导 <classname>debian-installer</classname>。该映象在 Linux 和其他系统上可以用 uphpmvault 安装。Windows 上可以使用 HP Media Vault Firmware Recovery Utility 安装。可以从 &mv2120-firmware-img; 获得此固件映象。"
 
 #. Tag: title
 #: install-methods.xml:232
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "CATS Installation Files"
 msgid "QNAP Turbo Station Installation Files"
-msgstr "CATS 的安装文件"
+msgstr "QNAP Turbo Station 安装文件"
 
 #. Tag: para
 #: install-methods.xml:233
@@ -351,7 +345,7 @@ msgid ""
 "The QNAP Turbo Station (TS-109, TS-209 and TS-409) requires a kernel and "
 "ramdisk which can be obtained from &qnap-firmware-img;. A script is provided "
 "to write these images to flash."
-msgstr ""
+msgstr "QNAP Turbo Station (TS-109, TS-209 和 TS-409) 需要内核和 ramdisk，这些可从 &qnap-firmware-img; 获得。有一个脚本用于将这些映象写到 flash 里面。"
 
 #. Tag: title
 #: install-methods.xml:279
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 4a763efd6..921cca118 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-09-10 00:09+0000\n"
-"PO-Revision-Date: 2008-08-08 10:03+0800\n"
+"PO-Revision-Date: 2008-09-11 23:48+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"
@@ -1373,7 +1373,7 @@ msgid ""
 "appropriate address if <classname>netcfg/get_gateway</classname> is not set. "
 "As a special case, you can set <classname>netcfg/get_gateway</classname> to "
 "<quote>none</quote> to specify that no gateway should be used."
-msgstr ""
+msgstr "请注意，如果 <classname>netcfg/get_netmask</classname> 没有预置，<command>netcfg</command> 将自动侦测掩码。这种情况下，为了自动安装，变量需要标记为 <literal>seen</literal> 。同样，如果 <classname>netcfg/get_gateway</classname> 没有设置，<command>netcfg</command> 将自动选择一个合适的地址。特殊情况下，您可以设置 <classname>netcfg/get_gateway</classname> 为 <quote>none</quote> 确定不使用网关。"
 
 #. Tag: title
 #: preseed.xml:772
@@ -2257,7 +2257,7 @@ msgstr "完成安装"
 
 #. Tag: screen
 #: preseed.xml:1014
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# During installations from serial console, the regular virtual consoles\n"
 #| "# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next\n"
@@ -2308,7 +2308,9 @@ msgstr ""
 "\n"
 "# This is how to make the installer shutdown when finished, but not\n"
 "# reboot into the installed system.\n"
-"#d-i debian-installer/exit/halt boolean true"
+"#d-i debian-installer/exit/halt boolean true\n"
+"# This will power off the machine instead of just halting it.\n"
+"#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
 #: preseed.xml:1019
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 5d40a5b13..51cf93c81 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.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-09-07 00:09+0000\n"
-"PO-Revision-Date: 2008-05-19 19:44+0800\n"
+"PO-Revision-Date: 2008-09-11 23:50+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"
@@ -966,7 +966,7 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:485
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Substitute one of the following for <replaceable>ARCH</replaceable> in "
 #| "the <command>debootstrap</command> command: <userinput>alpha</userinput>, "
@@ -984,14 +984,7 @@ msgid ""
 "<userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</"
 "userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, "
 "<userinput>s390</userinput>, or <userinput>sparc</userinput>."
-msgstr ""
-"用下面列出的一个架构替换 <command>debootstrap</command> 命令中的 "
-"<replaceable>ARCH</replaceable>：<userinput>alpha</userinput>、"
-"<userinput>amd64</userinput>、<userinput>arm</userinput>、<userinput>hppa</"
-"userinput>、<userinput>i386</userinput>、<userinput>ia64</userinput>、"
-"<userinput>m68k</userinput>、<userinput>mips</userinput>、<userinput>mipsel</"
-"userinput>、<userinput>powerpc</userinput>、<userinput>s390</userinput> 或 "
-"<userinput>sparc</userinput>。"
+msgstr "用下面列出的一个架构替换 <command>debootstrap</command> 命令中的 <replaceable>ARCH</replaceable>： <userinput>alpha</userinput>, <userinput>amd64</userinput>, <userinput>arm</userinput>, <userinput>armel</userinput>, <userinput>hppa</userinput>, <userinput>i386</userinput>, <userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, <userinput>s390</userinput>, or <userinput>sparc</userinput>。"
 
 #. Tag: screen
 #: random-bits.xml:504