po/zh_CN: Update Chinese translations

7 files changed, 85 insertions, 237 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 8804f7b61..b982169f2 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: 2012-07-20 14:12+0000\n"
-"PO-Revision-Date: 2012-07-25 16:38+0800\n"
+"PO-Revision-Date: 2012-10-21 14:06+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -658,7 +658,7 @@ msgstr "从 U 盘引导"
 
 #. Tag: para
 #: boot-installer.xml:506
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
 #| "select\"/> and <xref linkend=\"boot-usb-files\"/>. Now just plug your USB "
@@ -673,11 +673,7 @@ msgid ""
 "should boot up, and unless you have used the flexible way to build the stick "
 "and not enabled it, you should be presented with the <prompt>boot:</prompt> "
 "prompt. Here you can enter optional boot arguments, or just hit &enterkey;."
-msgstr ""
-"假设您已经准备好了从 <xref linkend=\"boot-dev-select\"/> 到 <xref linkend="
-"\"boot-usb-files\"/> 的所有步骤。现在只需要插入您的 USB 盘到一个空闲的 USB 插"
-"槽并且重启计算机。系统应该重新引导，并且得到一个 <prompt>boot:</prompt> 提示"
-"符。这里您可以输入一些引导选项，或者只是敲击 &enterkey;。"
+msgstr "假设您已经准备好了从 <xref linkend=\"boot-dev-select\"/> 到 <xref linkend=\"boot-usb-files\"/> 的所有步骤。现在只需要插入 USB 盘到一个空闲的 USB 插槽并且重启计算机。系统应该重新引导，除非是使用灵活方式创建启动 U 盘并没激活，您应当看到一个 <prompt>boot:</prompt> 提示符。这里可以输入一些引导选项，或者只是键入 &enterkey;。"
 
 # index.docbook:723, index.docbook:1876, index.docbook:2278, index.docbook:2426
 #. Tag: title
@@ -2524,7 +2520,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:2014
-#, 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 "
@@ -3493,7 +3489,7 @@ msgstr "如果 CD-ROM 没有引导，检查一下它是否放好，并且没有�
 
 #. Tag: para
 #: boot-installer.xml:2639
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If the installer fails to recognize a CD-ROM, try just running the option "
 #| "<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </"
@@ -3555,7 +3551,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:2679
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Some older CD-ROM drives do not work correctly if <quote>direct memory "
 #| "access</quote> (DMA) is enabled."
@@ -3580,7 +3576,7 @@ msgstr "如果从 CD-ROM 引导失败，试试下面所列的建议。"
 
 #. Tag: para
 #: boot-installer.xml:2696
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Check that your BIOS actually supports booting from CD-ROM (older systems "
 #| "possibly don't) and that your CD-ROM drive supports the media you are "
@@ -4028,7 +4024,7 @@ msgstr "在 PCMCIA 配置阶段系统停止"
 
 #. Tag: para
 #: boot-installer.xml:2961
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Some laptop models produced by Dell are known to crash when PCMCIA device "
 #| "detection tries to access some hardware addresses. Other laptops may "
@@ -4374,40 +4370,3 @@ msgstr ""
 "      and ideas you had during the initial install.&gt;\n"
 "</screen></informalexample> 在 bug 报告中，请说明问题所在，包括内核挂起时最后"
 "见到的内核消息。描述进入问题状态所进行的步骤。"
-
-#, fuzzy
-#~| msgid ""
-#~| "If you are booting with a serial console, generally the kernel will "
-#~| "autodetect this. If you have a videocard (framebuffer) and a keyboard "
-#~| "also attached to the computer which you wish to boot via serial console, "
-#~| "you may have to pass the <userinput>console=<replaceable>device</"
-#~| "replaceable></userinput> argument to the kernel, where "
-#~| "<replaceable>device</replaceable> is your serial device, which is "
-#~| "usually something like <filename>ttyS0</filename><footnote> <para> In "
-#~| "order to ensure the terminal type used by the installer matches your "
-#~| "terminal emulator, the parameter <userinput>TERM=<replaceable>type</"
-#~| "replaceable></userinput> can be added. Note that the installer only "
-#~| "supports the following terminal types: <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>."
-#~ msgid ""
-#~ "If you are booting with a serial console, generally the kernel will "
-#~ "autodetect this. If you have a videocard (framebuffer) and a keyboard "
-#~ "also attached to the computer which you wish to boot via serial console, "
-#~ "you may have to pass the <userinput>console=<replaceable>device</"
-#~ "replaceable></userinput> argument to the kernel, where "
-#~ "<replaceable>device</replaceable> is your serial device, which is usually "
-#~ "something like <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>。"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index af1778f29..3b95ae413 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: 2012-07-20 14:12+0000\n"
-"PO-Revision-Date: 2012-07-25 21:40+0800\n"
+"PO-Revision-Date: 2012-10-21 13:59+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -203,26 +203,26 @@ msgstr "versatile"
 #: hardware.xml:93
 #, no-c-format
 msgid "ARM with hardware FPU"
-msgstr ""
+msgstr "带 FPU 的 ARM"
 
 #. Tag: entry
 #: hardware.xml:94
 #, no-c-format
 msgid "armhf"
-msgstr ""
+msgstr "armhf"
 
 #. Tag: entry
 #: hardware.xml:95
 #, no-c-format
 msgid "Freescale"
-msgstr ""
+msgstr "Freescale"
 
 #. Tag: entry
 #: hardware.xml:96
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "<entry>32</entry>"
 msgid "<entry>mx5</entry>"
-msgstr "<entry>32</entry>"
+msgstr "<entry>mx5</entry>"
 
 #. Tag: entry
 #: hardware.xml:100
@@ -244,10 +244,10 @@ msgstr "PA-RISC 1.1"
 
 #. Tag: entry
 #: hardware.xml:103
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "<entry>64</entry>"
 msgid "<entry>32</entry>"
-msgstr "<entry>64</entry>"
+msgstr "<entry>32</entry>"
 
 #. Tag: entry
 #: hardware.xml:105
@@ -461,17 +461,17 @@ msgstr "type"
 
 #. Tag: entry
 #: hardware.xml:175
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "IBM S/390"
 msgid "64bit IBM S/390"
-msgstr "IBM S/390"
+msgstr "64bit IBM S/390"
 
 #. Tag: entry
 #: hardware.xml:176
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "s390"
 msgid "s390x"
-msgstr "s390"
+msgstr "s390x"
 
 #. Tag: para
 #: hardware.xml:186
@@ -635,7 +635,7 @@ msgstr "Kirkwood"
 
 #. Tag: para
 #: hardware.xml:333
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
 #| "CPU, Ethernet, SATA, USB, and other functionality in one chip. We "
@@ -1651,7 +1651,7 @@ msgstr "便携机"
 
 #. Tag: para
 #: hardware.xml:1128
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Laptops are also supported and nowadays most laptops work out of the box. "
 #| "In case a laptop contains specialized or proprietary hardware, some "
@@ -1711,7 +1711,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1165
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
 #| "multiprocessing</quote> or SMP &mdash; is available for this "
@@ -1726,11 +1726,7 @@ msgid ""
 "alternatives</firstterm> support. This means that the kernel will detect the "
 "number of processors (or processor cores) and will automatically deactivate "
 "SMP on uniprocessor systems."
-msgstr ""
-"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
-"&mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已"
-"经加入了 SMP 功能。标准内核也可以在非 SMP 系统下使用，只不过多些系统开销降低"
-"了一些性能。在普通系统中使用时几乎不会察觉。"
+msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已经加入 <firstterm>SMP-alternatives</firstterm> 支持。这意味内核将自动侦测处理器数目(或处理器核心数)，并能在单处理器系统上自动关闭 SMP 功能。"
 
 #. Tag: para
 #: hardware.xml:1174
@@ -1742,7 +1738,7 @@ msgstr "&arch-title; 的 486 &debian; 内核映像软件包没有支持 SMP 。"
 
 #. Tag: para
 #: hardware.xml:1184
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
 #| "multiprocessing</quote> or SMP &mdash; is available for this "
@@ -1843,7 +1839,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1244
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "&debian;'s support for graphical interfaces is determined by the "
 #| "underlying support found in X.Org's X11 system. Most AGP, PCI, PCIe, and "
@@ -1918,7 +1914,7 @@ msgstr "网络连接硬件"
 
 #. Tag: para
 #: hardware.xml:1291
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Almost any network interface card (NIC) supported by the &arch-kernel; "
 #| "kernel should also be supported by the installation system; modular "
@@ -2022,7 +2018,7 @@ msgstr "无线网卡"
 
 #. Tag: para
 #: hardware.xml:1370
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Wireless networking is in general supported as well and a growing number "
 #| "of wireless adapters are supported by the official &arch-kernel; kernel, "
@@ -2233,7 +2229,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1508
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "USB hardware generally works fine, only some USB keyboards may require "
 #| "additional configuration (see <xref linkend=\"hardware-issues\"/>)."
@@ -2282,7 +2278,7 @@ msgstr "需要固件的设备"
 
 #. Tag: para
 #: hardware.xml:1539
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Besides the availability of a device driver, some hardware also requires "
 #| "so-called <firstterm>firmware</firstterm> or <firstterm>microcode</"
@@ -2319,7 +2315,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1556
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "However, this does not mean that such hardware cannot be used during an "
 #| "installation. Starting with &debian-gnu; 5.0, &d-i; supports loading "
@@ -2398,7 +2394,7 @@ msgstr "避免专有或封闭的硬件"
 
 #. Tag: para
 #: hardware.xml:1602
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Some hardware manufacturers simply won't tell us how to write drivers for "
 #| "their hardware. Others won't allow us access to the documentation without "
@@ -2554,7 +2550,7 @@ msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
 #: hardware.xml:1702
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both "
 #| "CD-ROMs and DVD-ROMs, because both technologies are really the same from "
@@ -2641,7 +2637,7 @@ msgstr "硬盘"
 
 #. Tag: para
 #: hardware.xml:1752
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Booting the installation system directly from a hard disk is another "
 #| "option for many architectures. This will require some other operating "
@@ -2737,7 +2733,7 @@ msgstr "Un*x 或 GNU 系统"
 
 #. Tag: para
 #: hardware.xml:1808
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you are running another Unix-like system, you could use it to install "
 #| "&debian-gnu; without using the &d-i; described in the rest of this "
@@ -2783,7 +2779,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1832
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Generally, the &debian; installation system includes support for "
 #| "floppies, IDE (also known as PATA) drives, IDE floppies, parallel port "
@@ -2913,52 +2909,3 @@ msgstr ""
 "本界面需要更多的内存，并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
 "形界面两种方式之间选择，应选择普通方式。</para> </footnote>或磁盘空间上安装系"
 "统或许可行，但只针对有经验的用户。"
-
-#, fuzzy
-#~| msgid ""
-#~| "Multiprocessor support &mdash; also called <quote>symmetric "
-#~| "multiprocessing</quote> or SMP &mdash; is available for this "
-#~| "architecture. The standard &debian; &release; kernel image has been "
-#~| "compiled with <firstterm>SMP-alternatives</firstterm> support. This "
-#~| "means that the kernel will detect the number of processors (or processor "
-#~| "cores) and will automatically deactivate SMP on uniprocessor systems."
-#~ msgid ""
-#~ "Multiprocessor support &mdash; also called <quote>symmetric "
-#~ "multiprocessing</quote> or SMP &mdash; is available for this "
-#~ "architecture. The standard &debian; &release; kernel image has been "
-#~ "compiled with <firstterm>SMP-alternatives</firstterm> support. This means "
-#~ "that the kernel will detect the number of processors (or processor cores) "
-#~ "and will automatically deactivate SMP on uniprocessor systems. Having "
-#~ "multiple processors in a computer was originally only an issue for high-"
-#~ "end server systems but has become quite common in recent years even for "
-#~ "rather low-end desktop computers and laptops with the introduction of so "
-#~ "called <quote>multi-core</quote> processors. These contain two or more "
-#~ "processor units, called <quote>cores</quote>, in one physical chip."
-#~ msgstr ""
-#~ "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
-#~ "&mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时"
-#~ "已经加入了 <firstterm>SMP-alternatives</firstterm> 支持。也就是内核可以侦"
-#~ "测处理器的数量(或者处理器核心数)，并在单处理器系统上自动关闭 SMP 的功能。"
-
-#, fuzzy
-#~| msgid ""
-#~| "Wireless networking is in general supported as well and a growing number "
-#~| "of wireless adapters are supported by the official &arch-kernel; kernel, "
-#~| "although many of them do require firmware to be loaded. If firmware is "
-#~| "needed, the installer will prompt you to load firmware. See <xref "
-#~| "linkend=\"loading-firmware\"/> for detailed information on how to load "
-#~| "firmware during the installation."
-#~ msgid ""
-#~ "If firmware is needed, the installer will prompt you to load firmware. "
-#~ "See <xref linkend=\"loading-firmware\"/> for detailed information on how "
-#~ "to load firmware during the installation."
-#~ msgstr ""
-#~ "无线网络也能得到很好地支持。虽然大多数都需要加载固件，正式的 &arch-"
-#~ "kernel; 内核能支持的无线网卡也越来越多。如果需要固件，安装程序会提示您加"
-#~ "载。参阅 <xref linkend=\"loading-firmware\"/> 了解如何在安装过程中加载固件"
-#~ "的更多信息。"
-
-#, fuzzy
-#~| msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
-#~ msgid "On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported."
-#~ msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 4b46ba4cd..8012145de 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-07-20 14:12+0000\n"
-"PO-Revision-Date: 2012-07-25 22:21+0800\n"
+"PO-Revision-Date: 2012-10-21 13:47+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -20,14 +20,14 @@ msgstr "获取系统安装介质"
 
 #. Tag: title
 #: install-methods.xml:12
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Official &debian-gnu; CD-ROM Sets"
 msgid "Official &debian-gnu; CD-ROM Sets"
 msgstr "官方的 &debian-gnu; 光盘套装"
 
 #. Tag: para
 #: install-methods.xml:13
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "By far the easiest way to install &debian-gnu; is from an Official "
 #| "&debian; CD-ROM Set. You can buy a set from a vendor (see the <ulink url="
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If your machine doesn't support CD booting, but you do have a CD set, you "
 #| "can use an alternative strategy such as <phrase condition=\"supports-"
@@ -276,7 +276,7 @@ msgstr "Plug Computer 和 OpenRD 安装文件"
 
 #. Tag: para
 #: install-methods.xml:173
-#, fuzzy, no-c-format
+#, no-c-format
 #| 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 "
@@ -972,7 +972,7 @@ msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设
 
 #. Tag: para
 #: install-methods.xml:671
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Since most USB sticks come pre-configured with a single FAT16 partition, "
 #| "you probably won't have to repartition or reformat the stick. If you have "
@@ -1001,14 +1001,11 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> &debian; package."
 msgstr ""
-"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式"
-"化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来"
-"创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导"
-"标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
+"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式化 U 盘。如果必须格式化，请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区<footnote> <para> 别忘了设置 <quote>bootable</quote> 引导标记。</para> </footnote>，安装 MBR 使用: <informalexample><screen>\n"
+"# install-mbr /dev/<replaceable>sdX</replaceable>\n"
+"</screen></informalexample> 其中 <command>install-mbr</command> 命令属于 <classname>mbr</classname> &debian; 软件包。然后建立文件系统： <informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。"
-"<command>mkdosfs</command> 命令包含在 &debian; 的 <classname>dosfstools</"
-"classname> 软件包中。"
+"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。<command>mkdosfs</command> 命令属于 <classname>dosfstools</classname> &debian; 软件包。"
 
 #. Tag: para
 #: install-methods.xml:695
@@ -1082,7 +1079,7 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:747
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Next you should create a <filename>syslinux.cfg</filename> configuration "
 #| "file, which at a bare minimum should contain the following two lines "
@@ -1105,13 +1102,10 @@ msgid ""
 "<userinput>vga=788</userinput> to the second line. Other parameters can be "
 "appended as desired."
 msgstr ""
-"接下来，您需要创建一个 <filename>syslinux.cfg</filename> 配置文件，里面最少要"
-"包含下面两行(如果您使用 <filename>netboot</filename> 映象，修改内核文件名为  "
-"<quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
+"接下来，您需要创建一个 <filename>syslinux.cfg</filename> 配置文件，里面最少要包含下面两行(如果您使用 <filename>netboot</filename> 映象，修改内核文件名为  <quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
-"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>vga=788</"
-"userinput> 到第二行尾部。"
+"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>vga=788</userinput> 到第二行尾部。还可以添加其他参数到行尾。"
 
 #. Tag: para
 #: install-methods.xml:759
@@ -1119,7 +1113,7 @@ msgstr ""
 msgid ""
 "To enable the boot prompt to permit further parameter appending, add a "
 "<userinput>prompt 1</userinput> line."
-msgstr ""
+msgstr "在启动提示符后允许添加参数，需要加上 <userinput>prompt 1</userinput>。"
 
 #. Tag: para
 #: install-methods.xml:764 install-methods.xml:874
@@ -2282,23 +2276,3 @@ msgid ""
 msgstr ""
 "在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档，并有一些可"
 "以使用的例子供您修改。"
-
-#, fuzzy
-#~| msgid "GLAN Tank Installation Files"
-#~ msgid "LaCie NASes Installation Files"
-#~ msgstr "GLAN Tank 安装文件"
-
-#, fuzzy
-#~| 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;."
-#~ msgid ""
-#~ "The installation files for LaCie NASes (Network Space v2, Network Space "
-#~ "Max v2, Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big "
-#~ "Network v2) consist of a kernel and initrd for U-Boot. You can obtain "
-#~ "these files from &lacie-kirkwood-firmware-img;."
-#~ msgstr ""
-#~ "plug computers (SheevaPlug、GuruPlug 等) 和 OpenRD 设备的安装文件包含对应 "
-#~ "U-Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取得这些"
-#~ "文件。"
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index ae643d3c5..299468267 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: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2012-07-25 14:34+0800\n"
+"PO-Revision-Date: 2012-10-21 13:11+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -112,7 +112,7 @@ msgstr "在硬盘上为 &debian; 留出可以用来创建分区的空间；"
 
 #. Tag: para
 #: preparing.xml:73
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Locate and/or download the installer software and any specialized driver "
 #| "files your machine requires (except &debian; CD users)."
@@ -257,7 +257,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:173
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "One important option during the installation is whether or not to install "
 #| "a graphical desktop environment, consisting of the X Window System and "
@@ -285,7 +285,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:185
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Just be aware that the X Window System is completely separate from "
 #| "<classname>debian-installer</classname>, and in fact is much more "
@@ -309,7 +309,7 @@ msgstr "记得备份您所有的数据！"
 
 #. Tag: para
 #: preparing.xml:201
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Before you start, make sure to back up every file that is now on your "
 #| "system. If this is the first time a non-native operating system has been "
@@ -341,7 +341,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:214
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you are creating a multi-boot system, make sure that you have the "
 #| "distribution media of any other present operating systems on hand. "
@@ -531,7 +531,7 @@ msgstr "每个硬件附带的手册。"
 
 #. Tag: para
 #: preparing.xml:379
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The BIOS setup screens of your computer. You can view these screens when "
 #| "you start your computer by pressing a combination of keys. Check your "
@@ -579,7 +579,7 @@ msgstr ""
 
 #. Tag: title
 #: preparing.xml:417
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Hardware Information Needed for an Install"
 msgid "Hardware Information Needed for an Install"
 msgstr "安装所需的硬件信息"
@@ -790,7 +790,7 @@ msgstr "硬件兼容性"
 
 #. Tag: para
 #: preparing.xml:503
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Many brand name products work without trouble on &arch-kernel;. Moreover, "
 #| "hardware support in &arch-kernel; is improving daily. However, &arch-"
@@ -882,7 +882,7 @@ msgstr "网络设置"
 
 #. Tag: para
 #: preparing.xml:562
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If your computer is connected to a network 24 hours a day (i.e., an "
 #| "Ethernet or equivalent connection &mdash; not a PPP connection), you "
@@ -938,7 +938,7 @@ msgstr "您的网络中作为 DNS(域名服务) 服务器的系统。"
 
 #. Tag: para
 #: preparing.xml:603
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "On the other hand, if your administrator tells you that a DHCP server is "
 #| "available and is recommended, then you don't need this information "
@@ -955,21 +955,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:610
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "If you use a wireless network, you should also find out:"
 msgid "If you use a wireless network, you should also find out:"
 msgstr "如果您有一个无线网络，您应该找出："
 
 #. Tag: para
 #: preparing.xml:615
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "ESSID of your wireless network."
 msgid "ESSID of your wireless network."
 msgstr "您的无线网络的 ESSID。"
 
 #. Tag: para
 #: preparing.xml:620
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "WEP or WPA/WPA2 security key (if applicable)."
 msgid "WEP or WPA/WPA2 security key (if applicable)."
 msgstr "WEP 或 WPA/WPA2 安全密钥(如果可用)。"
@@ -1200,7 +1200,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:758
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you already have an operating system on your system <phrase arch=\"any-"
 #| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
@@ -1232,7 +1232,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:777
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "You can find information about your current partition setup by using a "
 #| "partitioning tool for your current operating system<phrase arch=\"any-"
@@ -1360,7 +1360,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:848
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you are going to install more than one operating system on the same "
 #| "machine, you should install all other system(s) before proceeding with "
@@ -1807,7 +1807,7 @@ msgstr "安装前的硬件和操作系统的相关设置"
 
 #. Tag: para
 #: preparing.xml:1139
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "This section will walk you through pre-installation hardware setup, if "
 #| "any, that you will need to do prior to installing &debian;. Generally, "
@@ -1840,7 +1840,7 @@ msgstr "BIOS 设置菜单的使用"
 
 #. Tag: para
 #: preparing.xml:1163
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "BIOS provides the basic functions needed to boot your machine to allow "
 #| "your operating system to access your hardware. Your system probably "
@@ -2721,7 +2721,7 @@ msgstr "USB BIOS 支持与键盘"
 
 #. Tag: para
 #: preparing.xml:1757
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you have no AT-style keyboard and only a USB model, you may need to "
 #| "enable legacy AT keyboard emulation in your BIOS setup. Only do this if "
@@ -2769,19 +2769,3 @@ msgstr ""
 "碰到这种问题(有时可以看到显示器上的数据，有时却什么都没有)，或者引导安装程序"
 "以后黑屏，而不是显示用户界面，请试着在 MacOS 下修改显示设置为 256 色，替代 "
 "<quote>thousands</quote> 或 <quote>millions</quote>。"
-
-#, fuzzy
-#~| msgid "Network Settings"
-#~ msgid "Network interfaces"
-#~ msgstr "网络设置"
-
-#, fuzzy
-#~| msgid "Configure one network interface."
-#~ msgid "Type/model of available network interfaces."
-#~ msgstr "配置一个网络接口；"
-
-# index.docbook:453, index.docbook:473, index.docbook:479, index.docbook:485
-#, fuzzy
-#~| msgid "Model and manufacturer."
-#~ msgid "Type/model and manufacturer."
-#~ msgstr "型号与制造商。"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index f7e9c6138..227dca452 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: 2012-06-26 13:45+0000\n"
-"PO-Revision-Date: 2012-07-25 22:54+0800\n"
+"PO-Revision-Date: 2012-10-21 13:04+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "Language: \n"
@@ -1496,7 +1496,7 @@ msgstr "网络控制台"
 
 #. Tag: screen
 #: preseed.xml:803
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# Use the following settings if you wish to make use of the network-"
 #| "console\n"
@@ -1520,7 +1520,6 @@ msgstr ""
 "# component for remote installation over SSH. This only makes sense if you\n"
 "# intend to perform the remainder of the installation manually.\n"
 "#d-i anna/choose_modules string network-console\n"
-"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
 "#d-i network-console/password password r00tme\n"
 "#d-i network-console/password-again password r00tme"
 
@@ -1814,7 +1813,7 @@ msgstr "分区示例"
 
 #. Tag: screen
 #: preseed.xml:924
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# If the system has free space you can choose to only partition that "
 #| "space.\n"
@@ -1974,10 +1973,8 @@ msgstr ""
 "# This is only honoured if partman-auto/method (below) is not set.\n"
 "#d-i partman-auto/init_automatically_partition select biggest_free\n"
 "\n"
-"# Alternatively, you may specify a disk to partition. If the system has "
-"only\n"
-"# one disk the installer will default to using that, but otherwise the "
-"device\n"
+"# Alternatively, you may specify a disk to partition. If the system has only\n"
+"# one disk the installer will default to using that, but otherwise the device\n"
 "# name must be given in traditional, non-devfs format (so e.g. /dev/hda or\n"
 "# /dev/sda, and not e.g. /dev/discs/disc0/disc).\n"
 "# For example, to use the first SCSI/SATA hard disk:\n"
@@ -1997,7 +1994,6 @@ msgstr ""
 "d-i partman-md/device_remove_md boolean true\n"
 "# And the same goes for the confirmation to write the lvm partitions.\n"
 "d-i partman-lvm/confirm boolean true\n"
-"d-i partman-lvm/confirm_nooverwrite boolean true\n"
 "\n"
 "# You can choose one of the three predefined partitioning recipes:\n"
 "# - atomic: all files in one partition\n"
@@ -2010,8 +2006,7 @@ msgstr ""
 "# just point at it.\n"
 "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
 "\n"
-"# If not, you can put an entire recipe into the preconfiguration file in "
-"one\n"
+"# If not, you can put an entire recipe into the preconfiguration file in one\n"
 "# (logical) line. This example creates a small /boot partition, suitable\n"
 "# swap, and uses the rest of the space for the root partition:\n"
 "#d-i partman-auto/expert_recipe string                         \\\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 45cdfd0a4..58ab5f752 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: 2012-07-20 14:12+0000\n"
-"PO-Revision-Date: 2012-07-25 23:07+0800\n"
+"PO-Revision-Date: 2012-10-21 12:59+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -905,7 +905,7 @@ msgstr "准备开始"
 
 #. Tag: para
 #: random-bits.xml:405
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "With your current *nix partitioning tools, repartition the hard drive as "
 #| "needed, creating at least one filesystem plus swap. You need around &base-"
@@ -918,11 +918,7 @@ msgid ""
 "space available for a console only install, or about 1GB if you plan to "
 "install X (more if you intend to install desktop environments like GNOME or "
 "KDE)."
-msgstr ""
-"如果需重新分区，用您当前的 *nix 的分区工具，至少要划分出一个文件系统，以及交"
-"换分区。如果只用控制台，至少要准备 &base-system-size;MB 空间，倘若想装 X，就"
-"需要至少 &task-desktop-lxde-inst;MB 的空间了(安装 GNOME 或 KDE 这样的桌面环"
-"境，还要更多)。"
+msgstr "如需重新分区，用当前的 *nix 的分区工具，您至少要划分出一个文件系统，以及交换分区。只用控制台，需要准备 350MB 空间；要装 X，就需要至少 1GB 的空间(如果安装 GNOME 或 KDE 这样的桌面环境，那还要更多空间)。"
 
 #. Tag: para
 #: random-bits.xml:413
@@ -1087,7 +1083,7 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:516
-#, 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>, "
@@ -1105,14 +1101,7 @@ msgid ""
 "<userinput>mipsel</userinput>, <userinput>powerpc</userinput>, "
 "<userinput>s390</userinput>, <userinput>s390x</userinput>, or "
 "<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>。"
+msgstr "使用下面其中一个架构替换 <command>debootstrap</command> 命令中的 <replaceable>ARCH</replaceable>: <userinput>amd64</userinput>, <userinput>armel</userinput>, <userinput>armhf</userinput>, <userinput>i386</userinput>, <userinput>ia64</userinput>, <userinput>mips</userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, <userinput>s390</userinput>, <userinput>s390x</userinput>, or <userinput>sparc</userinput>。"
 
 #. Tag: screen
 #: random-bits.xml:533
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 49b8d1a6e..d83936a0b 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.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-10-28 00:19+0800\n"
+"PO-Revision-Date: 2012-10-21 12:13+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -702,7 +702,7 @@ msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这
 
 #. Tag: para
 #: welcome.xml:484
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
 #| ">. This involves choosing your language, configuring peripheral driver "
@@ -819,7 +819,7 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:566
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Calling software <emphasis>free</emphasis> doesn't mean that the software "
 #| "isn't copyrighted, and it doesn't mean that CDs containing that software "
@@ -844,7 +844,7 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The &debian; project, as a pragmatic concession to its users, does make "
 #| "some packages available that do not meet our criteria for being free. "