Update chinese po/zh_CN translations

1 files changed, 28 insertions, 144 deletions

diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 1a184bb57..8a58be57c 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: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2010-11-04 16:56+0800\n"
+"PO-Revision-Date: 2012-07-25 22:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -230,7 +230,7 @@ msgstr "QNAP Turbo Station 安装文件"
 
 #. Tag: para
 #: install-methods.xml:161
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The installation files for the QNAP Turbo Station consist of a kernel and "
 #| "ramdisk as well as a script to write these images to flash. You can "
@@ -242,22 +242,18 @@ msgid ""
 "ramdisk as well as a script to write these images to flash. You can obtain "
 "the installation files for QNAP TS-11x, TS-21x and TS-41x models from &qnap-"
 "kirkwood-firmware-img;."
-msgstr ""
-"QNAP Turbo Station 安装文件包括内核和 ramdisk 以及将这些映象写入 flash 的脚"
-"本。您可以从 &qnap-orion-firmware-img; 获得 QNAP TS-109 和 TS-209 的安装文"
-"件。从 &qnap-kirkwood-firmware-img; 获得 QNAP TS-110, TS-119, TS-210, "
-"TS-219, TS-219P 的。"
+msgstr "QNAP Turbo Station 安装文件包括内核和 ramdisk，以及将这些映像写入 flash 的脚本。QNAP TS-11x、TS-21x 和 TS-41x 型号安装文件可以从 &qnap-kirkwood-firmware-img; 取得。"
 
 #. Tag: title
 #: install-methods.xml:172
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "SheevaPlug and OpenRD Installation Files"
 msgid "Plug Computer and OpenRD Installation Files"
-msgstr "SheevaPlug 和 OpenRD 安装文件"
+msgstr "Plug Computer 和 OpenRD 安装文件"
 
 #. Tag: para
 #: install-methods.xml:173
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The installation files for the Marvell SheevaPlug and OpenRD devices "
 #| "consist of a kernel and initrd for U-Boot. You can obtain these files "
@@ -266,9 +262,7 @@ msgid ""
 "The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
 "OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
 "these files from &kirkwood-marvell-firmware-img;."
-msgstr ""
-"Marvell SheevaPlug 和 OpenRD 设备的安装文件包括内核和 initrd 用于 U-Boot。您"
-"可以从 &kirkwood-marvell-firmware-img; 获得这些文件。"
+msgstr "plug computers (SheevaPlug、GuruPlug 等) 和 OpenRD 设备的安装文件包含对应 U-Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取得这些文件。"
 
 #. Tag: title
 #: install-methods.xml:223
@@ -725,7 +719,7 @@ msgstr ""
 #: install-methods.xml:541
 #, no-c-format
 msgid "Preparing a USB stick using a hybrid CD or DVD image"
-msgstr ""
+msgstr "使用混合 CD 或 DVD 映像制作 U 盘"
 
 #. Tag: para
 #: install-methods.xml:542
@@ -735,7 +729,7 @@ msgid ""
 "very easy way to make a bootable USB stick. Simply choose a CD or DVD image "
 "that will fit on your USB stick. See <xref linkend=\"official-cdrom\"/> to "
 "get a CD or DVD image."
-msgstr ""
+msgstr "现在 Debian CD 和 DVD 映像可以直接写入 U 盘，这是非常简单的制作启动 U 盘的方法。只需为 U 盘选择一个合适的 CD 或 DVD 映像。参阅 <xref linkend=\"official-cdrom\"/> 获取 CD 或 DVD 映像。"
 
 #. Tag: para
 #: install-methods.xml:549
@@ -745,11 +739,11 @@ msgid ""
 "can download the <filename>mini.iso</filename> image from the "
 "<filename>netboot</filename> directory (at the location mentioned in <xref "
 "linkend=\"where-files\"/>)."
-msgstr ""
+msgstr "另外，对于只有几 M 的小容量 U 盘，您可以从 <filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映像(位于 <xref linkend=\"where-files\"/>)。"
 
 #. Tag: para
 #: install-methods.xml:557
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "For example, when using an existing GNU/Linux system, the <filename>mini."
 #| "iso</filename> file can be written to a USB stick as follows: "
@@ -769,16 +763,7 @@ msgid ""
 "firmware\"/> for more information about firmware. Now unplug and replug the "
 "USB stick, and two partitions should now be visible on it. You should mount "
 "the second of the two partitions, and unpack the firmware onto it."
-msgstr ""
-"例如，当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件"
-"可以写如到一个 U 盘里面: <informalexample><screen>\n"
-"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> "
-"of=/dev/<replaceable>sdX</replaceable></userinput>\n"
-"<prompt>#</prompt> <userinput>sync</userinput>\n"
-"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘，需要先取得固件"
-"文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 "
-"U 盘，就可以看到有两个分区在上面。您应挂载第二个分区，然后将固件解开放在上"
-"面。"
+msgstr "有一个特殊的方法可以将固件加入 <filename>mini.iso</filename>。首先将 <filename>mini.iso</filename> 写入 U 盘。接着取得所需的固件。参阅 <xref linkend=\"loading-firmware\"/> 了解固件信息。然后拔插 U 盘，会有两个分区出现在 U 盘上。您应该挂载第二个分区，并将固件解压到里面。"
 
 #. Tag: screen
 #: install-methods.xml:567
@@ -804,7 +789,7 @@ msgid ""
 "overwriting its current contents. For example, when using an existing GNU/"
 "Linux system, the CD or DVD image file can be written to a USB stick as "
 "follows, after having made sure that the stick is unmounted:"
-msgstr ""
+msgstr "您选中的 CD 或 DVD 映像应该被直接写入 U 盘，覆盖它当前的内容。例如，使用已有的 GNU/Linux 系统，CD 或 DVD 映像文件可以参照下面方法写入 U 盘，写之前请确认 U 盘已经卸载："
 
 #. Tag: screen
 #: install-methods.xml:580
@@ -814,6 +799,8 @@ msgid ""
 "<replaceable>sdX</replaceable></userinput>\n"
 "<prompt>#</prompt> <userinput>sync</userinput>"
 msgstr ""
+"<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>"
 
 #. Tag: para
 #: install-methods.xml:582
@@ -822,18 +809,18 @@ msgid ""
 "Simply writing the CD or DVD image to USB like this should work fine for "
 "most users. The other options below are more complex, mainly for people with "
 "specialised needs."
-msgstr ""
+msgstr "对大多数用户来说，简单地把 CD 或 DVD 映像写入 U 盘已经够用。下面更为复杂的选项主要提供给有特殊需要的用户。"
 
 #. Tag: title
 #: install-methods.xml:593
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Booting the USB stick"
 msgid "Manually copying files to the USB stick"
-msgstr "从 U 盘启动"
+msgstr "手动复制文件到 U 盘。"
 
 #. Tag: para
 #: install-methods.xml:594
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Note that the USB stick should be at least 256 MB in size (smaller setups "
 #| "are possible if you follow <xref linkend=\"usb-copy-flexible\"/>)."
@@ -842,9 +829,7 @@ msgid ""
 "installer files, and also a CD image to it. Note that the USB stick should "
 "be at least 1 GB in size (smaller setups are possible if you follow <xref "
 "linkend=\"usb-copy-flexible\"/>)."
-msgstr ""
-"注意，U 盘至少要有 256MB 的容量(更小的尺寸安装也是可能的，请参阅 <xref "
-"linkend=\"usb-copy-flexible\"/>)。"
+msgstr "另一种方法制作 U 盘是手动复制安装文件和 CD 映像。注意 U 盘最小容量为 1 GB (也可以使用较少容量，请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
 
 #. Tag: para
 #: install-methods.xml:601
@@ -863,7 +848,7 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:610
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Note that, although convenient, this method does have one major "
 #| "disadvantage: the logical size of the device will be limited to 256 MB, "
@@ -878,11 +863,7 @@ msgid ""
 "if the capacity of the USB stick is larger. You will need to repartition the "
 "USB stick and create new file systems to get its full capacity back if you "
 "ever want to use it for some different purpose."
-msgstr ""
-"需要注意的是，虽然方便，但该方法有一个主要的缺点： 即使 U 盘很大，设备的逻辑"
-"尺寸还是限制在 256 MB。如果您要将该 U 盘用作其他用途，需要为它重新分区，为其"
-"余容量创建一个新的文件系统。次要的缺点是您无法复制完整的 CD 映象到 U 盘，只能"
-"使用较小的 businesscard 或 netinst CD 映象。"
+msgstr "需要注意的是，虽然方便，但该方法有一个主要缺点：即使 U 盘容量更大，该设备的逻辑尺寸还是限制在 1 GB。如果您要该 U 盘作其他用途，需要为它重新分区，为剩余容量创建一个新的文件系统。"
 
 #. Tag: para
 #: install-methods.xml:618
@@ -915,7 +896,7 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:632
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "After that, mount the USB memory stick <phrase arch=\"x86\">"
 #| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -934,21 +915,14 @@ msgid ""
 "filesystem</phrase> on it, and copy a &debian; ISO image (netinst, "
 "businesscard, or full CD) to it. Unmount the stick (<userinput>umount /mnt</"
 "userinput>) and you are done."
-msgstr ""
-"然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/"
-"<replaceable>sdX</replaceable> /mnt</userinput>)，</phrase> <phrase arch="
-"\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</"
-"userinput>)，</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</"
-"phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，复制 &debian; "
-"netinst 或 businesscard ISO 映象到里面。卸载 U 盘 (<userinput>umount /mnt</"
-"userinput>) 就完成了。"
+msgstr "然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，然后复制 &debian; ISO 映像 (netinst、businesscard 或完整的 CD) 到里面。卸载 U 盘 (<userinput>umount /mnt</userinput>) 就完成了。"
 
 #. Tag: title
 #: install-methods.xml:649
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Copying the files &mdash; the flexible way"
 msgid "Manually copying files to the USB stick &mdash; the flexible way"
-msgstr "复制文件 &mdash; 灵活的方法"
+msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
 
 #. Tag: para
 #: install-methods.xml:650
@@ -1095,7 +1069,7 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:754 install-methods.xml:864
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you used an <filename>hd-media</filename> image, you should now copy a "
 #| "&debian; ISO image<footnote> <para> You can use either a businesscard, a "
@@ -1112,12 +1086,7 @@ msgid ""
 "<filename>mini.iso</filename></quote> image is not usable for this purpose. "
 "</para> </footnote> onto the stick. When you are done, unmount the USB "
 "memory stick (<userinput>umount /mnt</userinput>)."
-msgstr ""
-"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象"
-"<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 "
-"<xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
-"<filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> "
-"到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
+msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映像文件<footnote> <para> 您可以选择 businesscard、netinst 或完整 CD 映像 (参阅 <xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot <filename>mini.iso</filename></quote> 映象并在这里并不适用。</para> </footnote> 到 U 盘。完成后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
 
 #. Tag: para
 #: install-methods.xml:778
@@ -2262,88 +2231,3 @@ msgid ""
 msgstr ""
 "在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档，并有一些可"
 "以使用的例子供您修改。"
-
-#~ msgid "NSLU2 Installation Files"
-#~ msgstr "NSLU2 安装文件"
-
-#~ msgid ""
-#~ "A firmware image is provided for the Linksys NSLU2 which will "
-#~ "automatically 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>。该映象可以用 Linksys web 前端或 upslug2 加载。固件映像可以从 "
-#~ "&nslu2-firmware-img; 获得。"
-
-#~ msgid ""
-#~ "There are two installation methods possible when booting from USB stick. "
-#~ "The first is to only use the USB stick to boot the installer, and then "
-#~ "install completely from the network. The second is to also copy a CD "
-#~ "image onto the USB stick and use that as a source for packages, possibly "
-#~ "in combination with a mirror."
-#~ msgstr ""
-#~ "从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序，然后完全通过"
-#~ "网络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源，还可以结合其他镜"
-#~ "像。"
-
-#~ msgid ""
-#~ "To prepare a USB stick that only boots the installer, which then proceeds "
-#~ "to install entirely from the network, you'll need to download the "
-#~ "<filename>mini.iso</filename> image from the <filename>netboot</filename> "
-#~ "directory (at the location mentioned in <xref linkend=\"where-files\"/>), "
-#~ "and write this file directly to the USB stick, overwriting its current "
-#~ "contents. This method will work with very small USB sticks, only a few "
-#~ "megabytes in size."
-#~ msgstr ""
-#~ "要制作一个仅启动安装程序的 U 盘，之后完全从网络安装，您需要从 "
-#~ "<filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象"
-#~ "(它位于 <xref linkend=\"where-files\"/>)，然后将该文件直接写入 U 盘，覆盖"
-#~ "里面的内容。此方法适用于容量很小的 U 盘，它只需要几 M 的字节。"
-
-#~ msgid ""
-#~ "To prepare a USB stick that installs packages from a CD image included on "
-#~ "the stick, use the installer images found in the <filename>hd-media</"
-#~ "filename> directory. Either the <quote>easy way</quote> or the "
-#~ "<quote>flexible way</quote> can be used to copy the image to the USB "
-#~ "stick. For this installation method you will also need to download a CD "
-#~ "image. The installation image and the CD image must be based on the same "
-#~ "release of &d-i;. If they do not match you are likely to get "
-#~ "errors<footnote> <para> The error message that is most likely to be "
-#~ "displayed is that no kernel modules can be found. This means that the "
-#~ "version of the kernel module udebs included on the CD image is different "
-#~ "from the version of the running kernel. </para> </footnote> during the "
-#~ "installation."
-#~ msgstr ""
-#~ "制作包含 CD 映象软件包的 U 盘，需要使用的安装映象放在 <filename>hd-media</"
-#~ "filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将"
-#~ "它复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映"
-#~ "象应该是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> "
-#~ "<para> 错误信息大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内"
-#~ "核模块 udeb 版本与正在运行的内核不符。</para> </footnote>。"
-
-#~ msgid "Copying the files &mdash; the easy way"
-#~ msgstr "复制文件 &mdash; 轻松的途径"
-
-#~ msgid ""
-#~ "If you used an <filename>hd-media</filename> image, you should now copy a "
-#~ "&debian; ISO image (businesscard, netinst or full CD image; be sure to "
-#~ "select one that fits) onto the stick. When you are done, unmount the USB "
-#~ "memory stick (<userinput>umount /mnt</userinput>)."
-#~ msgstr ""
-#~ "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO "
-#~ "映象(businesscard、netinst 或者完整的 CD 映象；确认适合的一种)到 U 盘上。"
-#~ "然后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
-
-#~ msgid ""
-#~ "If your system refuses to boot from the memory stick, the stick may "
-#~ "contain an invalid master boot record (MBR). To fix this, use the "
-#~ "<command>install-mbr</command> command from the package <classname>mbr</"
-#~ "classname>:"
-#~ msgstr ""
-#~ "如果您的系统拒绝从 U 盘引导，那么可能是因为它含有无效的主引导扇区记录"
-#~ "(MBR)。您可以使用 <command>install-mbr</command> 命令来修复这个问题，该命"
-#~ "令来自 <classname>mbr</classname> 软件包："
-
-#~ msgid "# install-mbr /dev/<replaceable>sdX</replaceable>"
-#~ msgstr "# install-mbr /dev/<replaceable>sdX</replaceable>"