po/zh_CN: Translate partitioner options

16 files changed, 172 insertions, 387 deletions

diff --git a/po/zh_CN/administrivia.po b/po/zh_CN/administrivia.po
index e8cfa14f7..3f2f237cc 100644
--- a/po/zh_CN/administrivia.po
+++ b/po/zh_CN/administrivia.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2006-12-04 17:30+0000\n"
-"PO-Revision-Date: 2007-03-04 12:24+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:18+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index 8ed4aab0a..64ba875c4 100644
--- a/po/zh_CN/bookinfo.po
+++ b/po/zh_CN/bookinfo.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2009-11-02 22:05+0000\n"
-"PO-Revision-Date: 2009-11-21 10:56+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:19+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 17dc0e4a5..95c286f1d 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-04-07 00:13+0000\n"
-"PO-Revision-Date: 2009-11-21 11:46+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:50+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -307,7 +307,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "To boot the SS4000-E, first load the Debian-provided firmware image "
 #| "(ss4000e.pkg) through the SS4000-E's web interface (go to "
@@ -327,13 +327,7 @@ msgid ""
 "program, in the package of the same name. Assuming the serial port on your "
 "computer is to be found on <filename>/dev/ttyS0</filename>, use the "
 "following command line:"
-msgstr ""
-"引导 SS4000-E 首先要通过 SS4000-E 的 web 界面(进入<quote>administration</"
-"quote>、然后选择 <quote>firmware</quote>，最后上传映像)加载 Debian 提供的固件"
-"映像(ss4000e.pkg)。接着、用您的串口 nullmodem 线和扁平电缆连接到 SS4000-E 的"
-"串口，然后重启机器。您需要使用串口终端程序与该机器通讯，在 Debian GNU/Linux "
-"上可以选择使用 <command>cu</command> 程序，对应的软件包与此同名。假设您计算机"
-"上的串口为 <filename>/dev/ttyS0</filename>，那么在命令行上使用："
+msgstr "要启动 SS4000-E，请使用您的串行 nullmodem 线和 ribbon 线连接到 SS4000-E 的串口，然后重新启动机器。您需要用一个串行终端程序与此机器通讯；Debian GNU/Linux 上可以使用 <command>cu</command> 程序，软件包和该程序同名。假设您计算机上的串口是 <filename>/dev/ttyS0</filename>，请使用下列命令行："
 
 #. Tag: screen
 #: boot-installer.xml:257
@@ -374,7 +368,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:273
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "At this point, hit Control-C to interrupt the boot loader<footnote id="
 #| "\"arm-s4ke-sec\"> <para> Note that you have only one second to do so; if "
@@ -393,7 +387,7 @@ msgstr ""
 
 #. Tag: screen
 #: boot-installer.xml:286
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "fis load ramdisk.gz\n"
 #| "fis load zImage\n"
@@ -405,10 +399,9 @@ msgid ""
 "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
 "0x01800000"
 msgstr ""
-"fis load ramdisk.gz\n"
-"fis load zImage\n"
-"exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
-"0x01800000"
+"load -v -r -b 0x01800000 -m ymodem ramdisk.gz\n"
+"load -v -r -b 0x01008000 -m ymodem zImage\n"
+"exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r 0x01800000"
 
 #. Tag: para
 #: boot-installer.xml:288
@@ -420,7 +413,7 @@ msgid ""
 "followed by the <quote>~&lt;</quote> escape sequence to start an external "
 "program, and run <command>sb initrd.gz</command> or <command>sb vmlinuz</"
 "command>."
-msgstr ""
+msgstr "在每一个 <command>load</command> 命令后面，系统系统使用 YMODEM 协议传输文件。如果使用的是 cu，确认您已经安装了 <classname>lrzsz</classname> 软件包，然后键入回车，在 <quote>~&lt;</quote> 字符后面启动外部程序，然后运行 <command>sb initrd.gz</command> 或 <command>sb vmlinuz</command>。"
 
 #. Tag: para
 #: boot-installer.xml:297
@@ -429,7 +422,7 @@ msgid ""
 "Alternatively, it is possible to load the kernel and ramdisk using HTTP "
 "rather than YMODEM. This is faster, but requires a working HTTP server on "
 "the network. To do so, first swith the bootloader to RAM mode:"
-msgstr ""
+msgstr "另外一种方法，可以通过 HTTP 而不是 YMODEM 加载内核和 ramdisk。这会更快，但要求网络内有一台 HTTP 服务器。做法是，首先将 bootloader 切换到 RAM 模式："
 
 #. Tag: screen
 #: boot-installer.xml:303
@@ -438,6 +431,8 @@ msgid ""
 "fis load rammode\n"
 "g"
 msgstr ""
+"fis load rammode\n"
+"g"
 
 #. Tag: para
 #: boot-installer.xml:305
@@ -446,17 +441,17 @@ msgid ""
 "This will seemingly restart the machine; but in reality, it loads reboot to "
 "RAM and restarts it from there. Not doing this step will cause the system to "
 "hang in the necessary ip_address step that comes next."
-msgstr ""
+msgstr "表面上看这在重新启动机器；但实际上是重新启动到 RAM，让它来启动。不进行这一步将导致系统在接下来需要 ip_address 时挂起。"
 
 #. Tag: para
 #: boot-installer.xml:311
 #, no-c-format
 msgid "You will need to hit Ctrl-C again to interrupt the boot. Then:"
-msgstr ""
+msgstr "您需要再次按下 Ctrl-C 中断启动。然后："
 
 #. Tag: screen
 #: boot-installer.xml:315
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "fis load ramdisk.gz\n"
 #| "fis load zImage\n"
@@ -469,16 +464,16 @@ msgid ""
 "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
 "0x01800000"
 msgstr ""
-"fis load ramdisk.gz\n"
-"fis load zImage\n"
-"exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
-"0x01800000"
+"ip_address -l 192.168.2.249 -h 192.168.2.4\n"
+"load -v -r -b 0x01800000 -m http /initrd.gz\n"
+"load -v -r -b 0x01008000 -m http /zImage\n"
+"exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r 0x01800000"
 
 #. Tag: para
 #: boot-installer.xml:317
 #, no-c-format
 msgid "The installer will now start as usual."
-msgstr ""
+msgstr "安装程序将正常启动。"
 
 # index.docbook:578, index.docbook:951, index.docbook:1764, index.docbook:2018, index.docbook:2372
 #. Tag: title
@@ -3005,7 +3000,7 @@ msgstr "base-installer/install-recommends (recommends)"
 
 #. Tag: para
 #: boot-installer.xml:2396
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "By setting this option to <userinput>false</userinput>, the package "
 #| "management system will be configured to not automatically install such "
@@ -3016,9 +3011,7 @@ msgid ""
 "management system will be configured to not automatically install "
 "<quote>Recommends</quote>, both during the installation and for the "
 "installed system. See also <xref linkend=\"di-install-base\"/>."
-msgstr ""
-"通过设置 <userinput>false</userinput> 选项，在安装过程和以后的系统中，包管理"
-"系统将配置为不自动安装这些<quote>推荐的软件包(Recommends)</quote>。"
+msgstr "通过设置 <userinput>false</userinput> 选项，在安装过程和以后的系统中，包管理系统将配置为不自动安装这些<quote>推荐的软件包(Recommends)</quote>。参阅 <xref linkend=\\\"di-install-base\\\"/>。"
 
 #. Tag: para
 #: boot-installer.xml:2403
@@ -4294,47 +4287,3 @@ msgstr ""
 "      and ideas you had during the initial install.&gt;\n"
 "</screen></informalexample> 在 bug 报告中，请说明问题所在，包括内核挂起时最后"
 "见到的内核消息。描述进入问题状态所进行的步骤。"
-
-#~ msgid "fconfig boot_script_data"
-#~ msgstr "fconfig boot_script_data"
-
-#~ msgid ""
-#~ "RedBoot is now waiting for you to enter the boot script. Make sure to "
-#~ "<emphasis>exactly</emphasis> enter the following script:"
-#~ msgstr ""
-#~ "现在 RedBoot 等待您输入引导脚本。一定要<emphasis>正确</emphasis>输入以下脚"
-#~ "本："
-
-#~ msgid ""
-#~ "Finish the script with an empty line, and enter <quote>y</quote> at the "
-#~ "prompt to update the non-volatile configuration. Finally, use "
-#~ "<quote>reset</quote> to restart the system, and allow it to boot "
-#~ "normally. The installer should now come up as normal. You can either "
-#~ "install Debian through the serial port, or use an SSH client to connect "
-#~ "through SSH."
-#~ msgstr ""
-#~ "以一个空行结束脚本，然后在提示 update the non-volatile configuration 时输"
-#~ "入 <quote>y</quote>。最后，使用 <quote>reset</quote> 重启系统，让它按普通"
-#~ "方式引导。安装程序这时应该能正常运行。您可以根据需要使用串口安装 Debian，"
-#~ "或者使用 SSH 客户端登录。"
-
-#~ msgid ""
-#~ "Note that it is not necessary to update the boot script after the "
-#~ "installation. The system will be configured to take the root device from "
-#~ "system configuration, rather than from the kernel command line. It will "
-#~ "not do any harm to do so anyway, however."
-#~ msgstr ""
-#~ "注意，在安装完成之后没有必要更新引导脚本。系统将会按照系统设置配置根设备，"
-#~ "而不是内核命令行。当然，这也不会造成任何损坏。"
-
-#~ msgid ""
-#~ "When packages are installed using the package management system, it will "
-#~ "by default also install packages that are recommended by those packages. "
-#~ "Recommended packages are not strictly required for the core functionality "
-#~ "of the selected software, but they do enhance that software and should, "
-#~ "in the view of the package maintainers, normally be installed together "
-#~ "with that software."
-#~ msgstr ""
-#~ "在使用包管理系统安装软件包时，将默认安装该软件包推荐的软件包。这些推荐的软"
-#~ "件包并不影响要安装软件包的核心功能，但可以增强其功能。从软件包维护人员的角"
-#~ "度看，正常情况下应该安装这些软件。"
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index 57ac4c517..b9512ab2e 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2009-11-02 22:05+0000\n"
-"PO-Revision-Date: 2009-11-21 11:46+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:19+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/gpl.po b/po/zh_CN/gpl.po
index 5579aef19..23d24d244 100644
--- a/po/zh_CN/gpl.po
+++ b/po/zh_CN/gpl.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2006-07-25 21:39+0000\n"
-"PO-Revision-Date: 2006-07-14 10:17+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:20+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 7344a900a..2d9a83f1b 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2009-12-02 01:11+0000\n"
-"PO-Revision-Date: 2009-12-25 17:12+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:20+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index d292138cb..335ed96c9 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-02-26 01:12+0000\n"
-"PO-Revision-Date: 2009-11-21 12:42+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:21+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1581,7 +1581,7 @@ msgid ""
 "written by the same author as the <classname>syslinux</classname> bootloader "
 "and is therefore least likely to cause issues. A good alternative is "
 "<classname>atftpd</classname>."
-msgstr ""
+msgstr "对于 &debian; 服务器，我们推荐使用 <classname>tftpd-hpa</classname>。它由 <classname>syslinux</classname> bootloader 的同一作者开发，因此不会导致很多问题。另一个好的选择是 <classname>atftpd</classname>。"
 
 #. Tag: title
 #: install-methods.xml:1140
@@ -1591,7 +1591,7 @@ msgstr "设置 RARP 服务器"
 
 #. Tag: para
 #: install-methods.xml:1141
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
 #| "address) of the client computers to be installed. If you don't know this "
@@ -1608,12 +1608,7 @@ msgid ""
 "command, or </phrase> boot into <quote>Rescue</quote> mode (e.g., from the "
 "rescue floppy) and use the command <userinput>ip addr show dev eth0</"
 "userinput>."
-msgstr ""
-"为了设置 RARP，需要知道需要安装系统的客户机以太网卡地址(网卡 MAC 地址)。如果"
-"您还不知道这个信息，可以<phrase arch=\"sparc\">从 OpenPROM 的初始化引导信息中"
-"获得，请使用 OpenBoot <userinput>.enet-addr</userinput> 命令，或者</phrase> "
-"启动进入<quote>Rescue</quote> 模式(例如使用恢复软盘)并使用 <userinput>/sbin/"
-"ifconfig eth0</userinput> 命令。"
+msgstr "为了设置 RARP，需要知道需要安装系统的客户机以太网卡地址(网卡 MAC 地址)。如果您还不知道这个信息，可以<phrase arch=\"sparc\">从 OpenPROM 的初始化引导信息中获得，请使用 OpenBoot <userinput>.enet-addr</userinput> 命令，或者</phrase> 启动进入<quote>Rescue</quote> 模式(例如使用恢复软盘)并使用 <userinput>ip addr show dev eth0</userinput> 命令。"
 
 #. Tag: para
 #: install-methods.xml:1153
@@ -1920,7 +1915,7 @@ msgstr "开启 TFTP 服务器"
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
 "<command>tftpd</command> is enabled."
-msgstr ""
+msgstr "要准备好 TFTP 服务器，您首先需要确定 <command>tftpd</command> 已经启动。"
 
 #. Tag: para
 #: install-methods.xml:1290
@@ -1931,7 +1926,7 @@ msgid ""
 "<classname>inetd</classname> daemon, or it can be set up to run as an "
 "independent daemon. Which of these methods is used is selected when the "
 "package is installed and can be changed by reconfiguring the package."
-msgstr ""
+msgstr "对于 <classname>tftpd-hpa</classname> 有两种方式可以启动服务。它可以通过系统的 <classname>inetd</classname> 守护程序启动，或者设置为独立的守护程序。这可以在安装软件包的时候选择，也可以用重新配置软件包方式修改。"
 
 #. Tag: para
 #: install-methods.xml:1299
@@ -1959,7 +1954,7 @@ msgid ""
 "<userinput>-v</userinput> argument to increase verbosity. It is recommended "
 "to check these log messages in case of boot problems as they are a good "
 "starting point for diagnosing the cause of errors."
-msgstr ""
+msgstr "Debian 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
 
 #. Tag: para
 #: install-methods.xml:1317
@@ -2188,56 +2183,3 @@ msgid ""
 msgstr ""
 "在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档，并有一些可"
 "以使用的例子供您修改。"
-
-#~ msgid ""
-#~ "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, "
-#~ "you will need a TFTP server with <userinput>tsize</userinput> support. On "
-#~ "a &debian; server, the <classname>atftpd</classname> and <classname>tftpd-"
-#~ "hpa</classname> packages qualify; we recommend <classname>tftpd-hpa</"
-#~ "classname>."
-#~ msgstr ""
-#~ "如果想用 TFTP 的 Pre-boot Execution Environment (PXE) 方式启动，您将需要一"
-#~ "台支持 <userinput>tsize</userinput> 的 TFTP 服务器。在 &debian; 服务器上，"
-#~ "<classname>atftpd</classname> 和 <classname>tftpd-hpa</classname> 包符合此"
-#~ "要求，我们推荐 <classname>tftpd-hpa</classname>。"
-
-#~ msgid ""
-#~ "To get the TFTP server ready to go, you should first make sure that "
-#~ "<command>tftpd</command> is enabled. This is usually enabled by having "
-#~ "something like the following line in <filename>/etc/inetd.conf</"
-#~ "filename>: <informalexample><screen>\n"
-#~ "tftp dgram udp wait nobody /usr/sbin/tcpd in.tftpd /tftpboot\n"
-#~ "</screen></informalexample> Debian packages will in general set this up "
-#~ "correctly by default when they are installed."
-#~ msgstr ""
-#~ "要准备好 TFTP 服务器，您首先需要确定 <command>tftpd</command> 已经启动。这"
-#~ "通常可以在 <filename>/etc/inetd.conf</filename> 添加如下字句来实现： "
-#~ "<informalexample><screen>\n"
-#~ "tftp dgram udp wait nobody /usr/sbin/tcpd in.tftpd /tftpboot\n"
-#~ "</screen></informalexample> Debian 包通常在安装后会自动把这条设置好。"
-
-#~ msgid ""
-#~ "Look in <filename>/etc/inetd.conf</filename> and remember the directory "
-#~ "which is used as the argument of <command>in.tftpd</command><footnote> "
-#~ "<para> All <command>in.tftpd</command> alternatives available in Debian "
-#~ "should log TFTP requests to the system logs by default. Some of them "
-#~ "support a <userinput>-v</userinput> argument to increase verbosity. It is "
-#~ "recommended to check these log messages in case of boot problems as they "
-#~ "are a good starting point for diagnosing the cause of errors. </para> </"
-#~ "footnote>; you'll need that below. If you've had to change <filename>/etc/"
-#~ "inetd.conf</filename>, you'll have to notify the running <command>inetd</"
-#~ "command> process that the file has changed. On a Debian machine, run "
-#~ "<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> 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>。"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 68fd67f9c..f5591b162 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2008-09-28 00:09+0000\n"
-"PO-Revision-Date: 2008-10-23 10:41+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:20+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index edd6b33d5..91c43a5d0 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2009-11-02 22:19+0000\n"
-"PO-Revision-Date: 2009-11-21 13:12+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:21+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index f0d125c35..7119d0de2 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2007-01-02 23:42+0000\n"
-"PO-Revision-Date: 2007-03-13 16:36+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:21+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index 3ebcfa62d..4d1e2f784 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2006-07-25 21:39+0000\n"
-"PO-Revision-Date: 2005-07-24 19:51+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:21+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 79cc5932b..09dc19c9d 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2009-11-02 22:19+0000\n"
-"PO-Revision-Date: 2009-11-21 13:12+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:21+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index b48adeb6a..438bd6cb6 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-03-28 00:13+0000\n"
-"PO-Revision-Date: 2010-01-18 18:22+0800\n"
-"Last-Translator: Ji YongGang <jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:22+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-xml2pot; charset=UTF-8\n"
@@ -1598,7 +1598,7 @@ msgstr "分区"
 
 #. Tag: para
 #: preseed.xml:841
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Using preseeding to partition the harddisk is very much limited to what "
 #| "is supported by <classname>partman-auto</classname>. You can choose to "
@@ -1613,11 +1613,7 @@ msgid ""
 "existing free space on a disk or a whole disk. The layout of the disk can be "
 "determined by using a predefined recipe, a custom recipe from a recipe file "
 "or a recipe included in the preconfiguration file."
-msgstr ""
-"使用预置进行硬盘分区受限于 <classname>partman-auto</classname> 提供的支持。您"
-"可以选择使用磁盘上已有的空闲分区或者整个磁盘。磁盘的布局将取决于所使用的预定"
-"义方案，用户自定义的方案文件或预置文件包含的方案。当前还不能使用预置配置多个"
-"磁盘。"
+msgstr "使用预置进行硬盘分区受限于 <classname>partman-auto</classname> 提供的支持。您可以选择使用磁盘上已有的空闲分区或者整个磁盘。磁盘的布局将取决于所使用的预定义方案，用户自定义的方案文件或预置文件包含的方案。"
 
 #. Tag: para
 #: preseed.xml:849
@@ -1626,7 +1622,7 @@ msgid ""
 "Preseeding of advanced partition setups using RAID, LVM and encryption is "
 "supported, but not with the full flexibility possible when partitioning "
 "during a non-preseeded install."
-msgstr ""
+msgstr "已经支持包括 RAID、LVM 和加密高级分区设置的预置，但对于非预置安装的分区仍然弹性不足。"
 
 #. Tag: para
 #: preseed.xml:855
@@ -1639,7 +1635,7 @@ msgid ""
 "available from the <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/devel/"
 "\">&d-i; source repository</ulink>. Note that the supported functionality "
 "may change between releases."
-msgstr ""
+msgstr "下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 <filename>partman-auto-recipe.txt</filename> 和 <filename>partman-auto-raid-recipe.txt</filename>，它们包含在 <classname>debian-installer</classname> 软件包内。这两个文件也可以从 <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/devel/\">&d-i; source repository</ulink> 获取。注意不同发布版支持的功能会有所改变。"
 
 #. Tag: para
 #: preseed.xml:869
@@ -1654,14 +1650,14 @@ msgstr ""
 
 #. Tag: title
 #: preseed.xml:878
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Partitioning"
 msgid "Partitioning example"
-msgstr "分区"
+msgstr "分区示例"
 
 #. Tag: screen
 #: preseed.xml:880
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# If the system has free space you can choose to only partition that "
 #| "space.\n"
@@ -1807,13 +1803,17 @@ 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 can specify a disk to partition. The device name must\n"
-"# be given in traditional non-devfs format.\n"
-"# Note: A disk must be specified, unless the system has only one disk.\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"
 "#d-i partman-auto/disk string /dev/sda\n"
 "# In addition, you'll need to specify the method to use.\n"
-"# The presently available methods are: \"regular\", \"lvm\" and \"crypto\"\n"
+"# The presently available methods are:\n"
+"# - regular: use the usual partition types for your architecture\n"
+"# - lvm:     use LVM to partition the disk\n"
+"# - crypto:  use LVM within an encrypted partition\n"
 "d-i partman-auto/method string lvm\n"
 "\n"
 "# If one of the disks that are going to be automatically partitioned\n"
@@ -1832,14 +1832,11 @@ msgstr ""
 "d-i partman-auto/choose_recipe select atomic\n"
 "\n"
 "# Or provide a recipe of your own...\n"
-"# The recipe format is documented in the file devel/partman-auto-recipe."
-"txt.\n"
 "# If you have a way to get a recipe file into the d-i environment, you can\n"
 "# 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"
@@ -1859,11 +1856,18 @@ msgstr ""
 "#                      method{ swap } format{ }                \\\n"
 "#              .\n"
 "\n"
+"# The full recipe format is documented in the file partman-auto-recipe.txt\n"
+"# included in the 'debian-installer' package or available from D-I source\n"
+"# repository. This also documents how to specify settings such as file\n"
+"# system labels, volume group names and which physical devices to include\n"
+"# in a volume group.\n"
+"\n"
 "# This makes partman automatically partition without confirmation, provided\n"
 "# that you told it what to do using one of the methods above.\n"
 "d-i partman-partitioning/confirm_write_new_label boolean true\n"
 "d-i partman/choose_partition select finish\n"
-"d-i partman/confirm boolean true"
+"d-i partman/confirm boolean true\n"
+"d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
 #: preseed.xml:884
@@ -1901,7 +1905,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:905
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# NOTE: this option is of beta release quality and should be used "
 #| "carefully\n"
@@ -2002,8 +2006,6 @@ msgid ""
 "d-i partman/confirm boolean true\n"
 "d-i partman/confirm_nooverwrite boolean true"
 msgstr ""
-"# NOTE: this option is of beta release quality and should be used carefully\n"
-"\n"
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
 "# Specify the disks to be partitioned. They will all get the same layout,\n"
@@ -2025,13 +2027,12 @@ msgstr ""
 "\n"
 "# Last you need to specify how the previously defined partitions will be\n"
 "# used in the RAID setup. Remember to use the correct partition numbers\n"
-"# for logical partitions.\n"
+"# for logical partitions. RAID levels 0, 1, 5, 6 and 10 are supported;\n"
+"# devices are separated using \"#\".\n"
 "# Parameters are:\n"
-"# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;"
-"mountpoint&gt; \\\n"
+"# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;mountpoint&gt; \\\n"
 "#          &lt;devices&gt; &lt;sparedevices&gt;\n"
-"# RAID levels 0, 1, 5, 6 and 10 are supported; devices are separated using "
-"\"#\"\n"
+"\n"
 "#d-i partman-auto-raid/recipe string \\\n"
 "#    1 2 0 ext3 /                    \\\n"
 "#          /dev/sda1#/dev/sdb1       \\\n"
@@ -2043,11 +2044,16 @@ msgstr ""
 "#          /dev/sda6#/dev/sdb6       \\\n"
 "#    .\n"
 "\n"
+"# For additional information see the file partman-auto-raid-recipe.txt\n"
+"# included in the 'debian-installer' package or available from D-I source\n"
+"# repository.\n"
+"\n"
 "# This makes partman automatically partition without confirmation.\n"
 "d-i partman-md/confirm boolean true\n"
 "d-i partman-partitioning/confirm_write_new_label boolean true\n"
 "d-i partman/choose_partition select finish\n"
-"d-i partman/confirm boolean true"
+"d-i partman/confirm boolean true\n"
+"d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
 #: preseed.xml:910
@@ -2506,7 +2512,7 @@ msgstr "安装 bootloader"
 
 #. Tag: screen
 #: preseed.xml:1077
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 #| "# instead, uncomment this:\n"
@@ -2594,13 +2600,16 @@ msgstr ""
 "# too:\n"
 "#d-i lilo-installer/skip boolean true\n"
 "\n"
-"# This is fairly safe to set, it makes grub install automatically to the "
-"MBR\n"
+"# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
+"# default. If you need GRUB Legacy for some particular reason, then\n"
+"# uncomment this:\n"
+"#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
+"\n"
+"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
 "# if no other operating system is detected on the machine.\n"
 "d-i grub-installer/only_debian boolean true\n"
 "\n"
-"# This one makes grub-installer install to the MBR if it also finds some "
-"other\n"
+"# This one makes grub-installer install to the MBR if it also finds some other\n"
 "# OS, which is less safe as it might not be able to boot that other OS.\n"
 "d-i grub-installer/with_other_os boolean true\n"
 "\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index aa3a43301..9be9557b4 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2009-12-28 01:10+0000\n"
-"PO-Revision-Date: 2010-01-18 18:21+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:18+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 36dacfabb..309c0df6b 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-03-22 00:13+0000\n"
-"PO-Revision-Date: 2010-01-18 18:21+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:22+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,10 +32,7 @@ msgid ""
 "user questions as necessary to do its job. The questions themselves are "
 "given priorities, and the priority of questions to be asked is set when the "
 "installer is started."
-msgstr ""
-"Debian 安装程序由一些特定功能的组件组成，它们完成各自的安装任务。每一组件执行"
-"任务时，会询问一些任务相关的问题。每个任务又有各自的优先级，可以在安装程序开"
-"始时设置优先级决定哪些问题会问到。"
+msgstr "Debian 安装程序由一些特定功能的组件组成，它们完成各自的安装任务。每一组件执行任务时，会询问一些任务相关的问题。每个任务又有各自的优先级，在安装程序开始时可以设置优先级以决定哪些问题会被询问。"
 
 #. Tag: para
 #: using-d-i.xml:16
@@ -47,10 +44,7 @@ msgid ""
 "sequence; which components are run depends mainly on the installation method "
 "you use and on your hardware. The installer will use default values for "
 "questions that are not asked."
-msgstr ""
-"执行默认安装时，只有必要的(高优先级)的问题会被问到。使得安装过程可以高度自动"
-"化，几乎不需用户干预。组件按次序执行；至于哪些组件会执行，这取决于您使用的安"
-"装方法，以及您的硬件。对于没有询问的问题，安装程序将采用默认值。"
+msgstr "执行默认安装时，只会问到必要的(高优先级)问题。这使得安装过程高度自动化，几乎不需用户干预。组件自动按次序执行；至于哪些组件会执行，取决于使用的安装方法，以及您的硬件。对于没有问到的问题，安装程序将采用默认值。"
 
 #. Tag: para
 #: using-d-i.xml:25
@@ -61,10 +55,7 @@ msgid ""
 "no problems, the user will never see the installer menu, but will simply "
 "answer questions for each component in turn. Serious error notifications are "
 "set to priority <quote>critical</quote> so the user will always be notified."
-msgstr ""
-"如果遇到麻烦，用户会看到错误画面，并且显示安装菜单供选择其它替代操作。如果没"
-"有问题，用户将不会碰到安装菜单，只需依此回答每个组件的提问。严重错误提示的优"
-"先级为<quote>critical</quote>，因此用户总会注意到。"
+msgstr "假如出现问题，用户将看到错误信息画面，并且安装程序会显示菜单以进行其它替代操作。如果没有问题，用户将不会碰到菜单，只需依此回答每个组件的提问。严重错误警示的优先级是 <quote>critical</quote>，因此用户一定能看到。"
 
 #. Tag: para
 #: using-d-i.xml:34
@@ -75,11 +66,7 @@ msgid ""
 "static network configuration (DHCP is used by default if available), you "
 "could add the boot parameter <userinput>netcfg/disable_dhcp=true</"
 "userinput>. See <xref linkend=\"installer-args\"/> for available options."
-msgstr ""
-"如果在 &d-i; 开始的时候，给启动加上一些参数，它将会影响安装程序使用的默认值。"
-"例如，假设您希望指定静态网络连接配置(如果存在 DHCP，将会被采用)，可以为启动参"
-"数加上 <userinput>netcfg/disable_dhcp=true</userinput>。参阅 <xref linkend="
-"\"installer-args\"/> 了解有效的选项。"
+msgstr "在 &d-i; 启动的时候，加上一些引导参数，它将会影响安装程序使用的默认值。例如，您希望指定静态网络连接配置(默认会使用已有的 DHCP)，可以加上引导参数 <userinput>netcfg/disable_dhcp=true</userinput>。参阅 <xref linkend=\"installer-args\"/> 了解可用的选项。"
 
 #. Tag: para
 #: using-d-i.xml:42
@@ -89,10 +76,7 @@ msgid ""
 "step is controlled by the user rather than the installer performing each "
 "step automatically in sequence. To use the installer in a manual, menu-"
 "driven way, add the boot argument <userinput>priority=medium</userinput>."
-msgstr ""
-"熟练的用户也许更习惯菜单驱动的交互方式，安装中的每一步都可以被用户控制，而不"
-"是让安装程序自动依次执行。要使用菜单驱动的手动安装方式，添加启动参数选项 "
-"<userinput>priority=medium</userinput>。"
+msgstr "高级用户可能更愿意采用菜单驱动的界面，安装中的每一步都可以被用户控制，而不是让安装程序自动执行。要使用菜单驱动的手动安装方式，需要添加引导参数 <userinput>priority=medium</userinput>。"
 
 #. Tag: para
 #: using-d-i.xml:50
@@ -104,11 +88,7 @@ msgid ""
 "to start the installer or by adding the boot argument "
 "<userinput>priority=low</userinput>. Expert mode gives you full control over "
 "&d-i;."
-msgstr ""
-"如果您的硬件要求给出内核模块设置选项才能安装，就需要使用 <quote>expert</"
-"quote> 模式启动安装程序。可以通过使用 <command>expert</command> 命令或者添加 "
-"<userinput>priority=low</userinput> 启动参数。专家模式赋予您对 &d-i; 完全的控"
-"制力。"
+msgstr "假如您的硬件需要指定内核模块选项才能安装，就要使用 <quote>expert</quote> 模式启动安装程序。可以通过 <command>expert</command> 命令或者添加 <userinput>priority=low</userinput> 引导参数。专家(export)模式让您可以完全控制 &d-i; 。"
 
 #. Tag: para
 #: using-d-i.xml:59
@@ -119,10 +99,7 @@ msgid ""
 "used by default unless you selected the <quote>Graphical install</quote> "
 "option in the initial boot menu. For more information about the graphical "
 "installer, please refer to <xref linkend=\"graphical\"/>."
-msgstr ""
-"本架构的 &d-i; 支持两种用户界面： 字符界面和图形界面。除非在引导菜单里面指定 "
-"<quote>Graphical install</quote> 选项，默认将使用字符界面。有关更多的图形界面"
-"安装程序的信息，请参阅 <xref linkend=\"graphical\"/>。"
+msgstr "本架构的 &d-i; 支持两种用户界面： 字符界面和图形界面。除非您在引导菜单里面指定 <quote>Graphical install</quote> 选项，否则默认将使用字符界面。更多的图形界面安装程序信息，请参阅 <xref linkend=\"graphical\"/>。"
 
 #. Tag: para
 #: using-d-i.xml:67
@@ -130,7 +107,7 @@ msgstr ""
 msgid ""
 "For this architecture the installer uses a character-based user interface. A "
 "graphical user interface is currently not available."
-msgstr "本架构的安装程序使用基于字符的用户界面。图形界面当前还不支持。"
+msgstr "本架构的安装程序使用基于字符的用户界面。当前还不支持图形界面。"
 
 #. Tag: para
 #: using-d-i.xml:72
@@ -149,15 +126,7 @@ msgid ""
 "Up</keycap> and <keycap>Pg-Down</keycap> to scroll the list in sections. The "
 "<keycap>space bar</keycap> selects an item such as a checkbox. Use "
 "&enterkey; to activate choices."
-msgstr ""
-"在基于字符的环境下无法使用鼠标。下面是那些对话框中您可以操作的键。在按钮和选"
-"项间用 <keycap>Tab</keycap> 或 <keycap>右</keycap> 箭头键可以 <quote>前进</"
-"quote>，<keycombo> <keycap>Shift</keycap> <keycap>Tab</keycap> </keycombo> "
-"或 <keycap>左</keycap> 箭头键 <quote>后退</quote>。<keycap>上</keycap> 和 "
-"<keycap>下</keycap> 箭头键选择列表里面的选项，并可以滚动列表。另外，在长列表"
-"里面，您可以按下某个字母直接跳到对应字母开头的选项，按下 <keycap>Pg-Up</"
-"keycap> 和 <keycap>Pg-Down</keycap> 可以快速滚动列表。<keycap>空格键</"
-"keycap> 可以选择像 checkbox 这样的选项。&enterkey; 执行选择。"
+msgstr "鼠标在基于字符的环境下无法使用。以下是对话框中您可以操作的键。在按钮和选项之间可以用 <keycap>Tab</keycap> 或 <keycap>right</keycap> 箭头键 <quote>前进</quote>，<keycombo> <keycap>Shift</keycap> <keycap>Tab</keycap> </keycombo> 或 <keycap>left</keycap> 箭头键 <quote>后退</quote>。<keycap>up</keycap> 和 <keycap>down</keycap> 箭头键选择列表里面的选项，并可以滚动列表。另外，在长列表里面，您可以按下某个字母直接跳到对应字母开头的选项，按下 <keycap>Pg-Up</keycap> 和 <keycap>Pg-Down</keycap> 可以快速滚动列表。<keycap>space bar</keycap> 可以选择像 checkbox 这样的选项。&enterkey; 执行选择。"
 
 #. Tag: para
 #: using-d-i.xml:89
@@ -166,9 +135,7 @@ msgid ""
 "Some dialogs may offer additional help information. If help is available "
 "this will be indicated on the bottom line of the screen by displaying that "
 "help information can be accessed by pressing the <keycap>F1</keycap> key."
-msgstr ""
-"一些对话框会提供额外的帮助信息。有帮助信息的时候，它们会显示在屏幕的最下面一"
-"行，帮助信息可以通过 <keycap>F1</keycap> 键访问。"
+msgstr "一些对话框可能会提供额外的帮助信息。如果有帮助信息，它们将在屏幕的最下面一行提示，可以通过 <keycap>F1</keycap> 键访问这些帮助信息。"
 
 #. Tag: para
 #: using-d-i.xml:95
@@ -189,11 +156,7 @@ msgid ""
 "the <keycap>F4</keycap> function key); get back to the main installer "
 "process with <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></"
 "keycombo>."
-msgstr ""
-"错误信息和记录被重定向到第四个控制台。您可以通过按下 <keycombo><keycap>左 "
-"Alt</keycap><keycap>F4</keycap></keycombo> (按住左 <keycap>Alt</keycap> 键同"
-"时按下 <keycap>F4</keycap> 功能键)访问该控制台；返回主安装进程使用 "
-"<keycombo><keycap>左 Alt</keycap><keycap>F1</keycap></keycombo>。"
+msgstr "错误信息和日志被重定向到第四个控制台。您可以通过按下 <keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo> (按住左 <keycap>Alt</keycap> 键同时按下 <keycap>F4</keycap> 功能键)访问该控制台；返回主安装进程使用 <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>。"
 
 #. Tag: para
 #: using-d-i.xml:110
@@ -245,10 +208,7 @@ msgid ""
 "which requires your intervention, the question priority may be downgraded "
 "temporarily to allow you to resolve the problem, and in that case the menu "
 "may appear."
-msgstr ""
-"在安装进行中，显示组件列表，并执行选中的组件。主菜单的优先级设为中，如果您的"
-"优先级设为高或紧急(默认为高)，您不会看到菜单。另一方面，假如出现问题需要您干"
-"预，询问的优先级会临时调低，而让您解决该问题，菜单可能在这种情况下出现。"
+msgstr "在安装过程中，显示组件列表，并执行选中的组件。主菜单的优先级为 medium，如果您的优先级设为 high 或 critical (默认为 high)，您不会看到菜单。另一方面，假如出现问题需要您干预，询问的优先级会临时调低，从而让您解决该问题，菜单则可能在这种情况下出现。"
 
 #. Tag: para
 #: using-d-i.xml:146
@@ -315,7 +275,7 @@ msgstr "cdrom-detect"
 #: using-d-i.xml:185
 #, no-c-format
 msgid "Looks for and mounts a Debian installation CD."
-msgstr "寻找并挂载 Debian 安装 CD。"
+msgstr "寻找并挂载 Debian 安装光盘。"
 
 #. Tag: term
 #: using-d-i.xml:193
@@ -370,7 +330,7 @@ msgstr "cdrom-checker"
 msgid ""
 "Checks integrity of a CD-ROM. This way, the user may assure him/herself that "
 "the installation CD-ROM was not corrupted."
-msgstr "检验 CD-ROM 的完整。这种方法让用户确保所用的安装 CD-ROM 没有损坏。"
+msgstr "检验 CD-ROM 的完整。这种方法让确保用户所用的安装 CD-ROM 没有损坏。"
 
 #. Tag: term
 #: using-d-i.xml:228
@@ -401,7 +361,7 @@ msgstr "anna"
 msgid ""
 "Anna's Not Nearly APT. Installs packages which have been retrieved from the "
 "chosen mirror or CD."
-msgstr "Anna's Not Nearly APT。安装软件包从选择的镜像或 CD 获取。"
+msgstr "Anna's Not Nearly APT。安装从选择的镜像或 CD 获取的软件包。"
 
 #. Tag: term
 #: using-d-i.xml:247
@@ -443,9 +403,7 @@ msgid ""
 "systems on the selected partitions, and attach them to the mountpoints. "
 "Included are also interesting features like a fully automatic mode or LVM "
 "support. This is the preferred partitioning tool in Debian."
-msgstr ""
-"让用户为系统安排磁盘分区，创建文件系统，并分配挂载点。它包括一些有趣的特性，"
-"如自动模式或 LVM 支持。在 Debian 里这是推荐的分区工具。"
+msgstr "让用户为系统中的磁盘分区，在分区上创建文件系统，并分配挂载点。它包括一些有趣的特性，如完全自动模式或 LVM 支持。Debian 里它是推荐使用的分区工具。"
 
 #. Tag: term
 #: using-d-i.xml:276
@@ -459,7 +417,7 @@ msgstr "partitioner"
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
 "program appropriate to your computer's architecture is chosen."
-msgstr "允许用户为系统安排磁盘分区。根据用户计算机的体系选择和善的分区工具。"
+msgstr "允许用户为系统中的磁盘分区。根据用户计算机的体系选择适合的分区工具。"
 
 #. Tag: term
 #: using-d-i.xml:286
@@ -487,7 +445,7 @@ msgstr "lvmcfg"
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
 "(Logical Volume Manager)."
-msgstr "帮助用户配置 <firstterm>LVM</firstterm> (Logical Volume Manager)。"
+msgstr "协助用户配置 <firstterm>LVM</firstterm> (Logical Volume Manager)。"
 
 #. Tag: term
 #: using-d-i.xml:304
@@ -502,10 +460,7 @@ msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
 "Array of Inexpensive Disks). This Software RAID is usually superior to the "
 "cheap IDE (pseudo hardware) RAID controllers found on newer motherboards."
-msgstr ""
-"让用户设置 Software <firstterm>RAID</firstterm> (Redundant Array of "
-"Inexpensive Disks)。Software RAID 是新主板提供的廉价 IDE (虚拟硬件) RAID 控制"
-"器的高级管理。"
+msgstr "让用户建立 Software <firstterm>RAID</firstterm> (Redundant Array of Inexpensive Disks)。Software RAID 是新主板提供的廉价 IDE (虚拟硬件) RAID 控制器的高级管理。"
 
 #. Tag: term
 #: using-d-i.xml:315
@@ -595,9 +550,7 @@ msgid ""
 "hard disk, which is necessary for the computer to start up using Linux "
 "without using a floppy or CD-ROM. Many boot loaders allow the user to choose "
 "an alternate operating system each time the computer boots."
-msgstr ""
-"在硬盘上安装启动加载程序，是必须的一步，使得计算机启动 Linux 不必依靠软盘和 "
-"CD-ROM 启动。许多启动加载程序都允许用户在启动的时候选择使用哪个操作系统。"
+msgstr "bootloader 安装程序在硬盘上安装 boot loader 程序，这是必须的一步，使得计算机启动 Linux 不必依靠软盘和 CD-ROM。许多 boot loader 程序都允许用户在开机的时候选择启动哪个操作系统。"
 
 #. Tag: term
 #: using-d-i.xml:372
@@ -625,9 +578,7 @@ msgid ""
 "Provides a way for the user to record information on a floppy disk, network, "
 "hard disk, or other media when trouble is encountered, in order to "
 "accurately report installer software problems to Debian developers later."
-msgstr ""
-"当用户遇到麻烦时，提供一种方式记录信息到软盘、网络、硬盘或其他介质，用于以后"
-"给 Debian 开发人员精确地报告安装程序的问题。"
+msgstr "当用户遇到麻烦时，提供一种方式记录信息到软盘、网络、硬盘或其他介质，用于以后精确地给 Debian 开发人员报告安装程序的问题。"
 
 #. Tag: title
 #: using-d-i.xml:399
@@ -645,10 +596,7 @@ msgid ""
 "that not all modules will be used for every installation; which modules are "
 "actually used depends on the installation method you use and on your "
 "hardware."
-msgstr ""
-"本节将会描述各个安装组件的详细信息。各组件按用户可以识别的阶段分组。它们在安"
-"装过程中按次序显示出来。注意，每次安装并不会使用所有的模块；至于哪些模块被用"
-"到，取决于您使用的安装方法以及硬件。"
+msgstr "本节将会描述各个安装组件的细节。组件按用户可以辨别的阶段分组。它们在安装过程中依次出现。要知道，每次安装并不会使用所有的模块；至于哪些模块被用到，取决于安装方法以及使用的硬件。"
 
 #. Tag: title
 #: using-d-i.xml:412
@@ -669,12 +617,7 @@ msgid ""
 "help &d-i; with some information it can't determine automatically (like "
 "selecting your preferred language, keyboard layout or desired network "
 "mirror)."
-msgstr ""
-"假设 Debian 安装程序已经启动，然后您看到了初始画面。此时，&d-i; 的能力还很有"
-"限。它还不了解您的硬件，首选的语言，甚至不知道要执行什么任务。不用担心，因为 "
-"&d-i; 相当聪明，它能自动探测您的硬件，定位其余的组件，并更新自己以具备安装系"
-"统的能力。但您仍然要协助 &d-i;，提供给它不能自动决定的内容(比如选择您首选的语"
-"言，键盘布局或网络镜像)。"
+msgstr "假设 Debian 安装程序已经启动，然后您看到了初始画面。此时，&d-i; 的能力还很有限。它还不了解您的硬件，首选的语言，甚至不知道要执行什么任务。不必担心，因为 &d-i; 相当聪明，它能自动探测您的硬件，定位其余的组件，并更新自己以具备安装系统的能力。但您仍然要协助 &d-i;，提供给它不能自动决定的内容(比如选择您首选的语言、键盘布局或网络镜像)。"
 
 #. Tag: para
 #: using-d-i.xml:426
@@ -685,10 +628,7 @@ msgid ""
 "specifically at the hardware needed to load installer components (e.g. your "
 "CD-ROM or network card). As not all drivers may be available during this "
 "first run, hardware detection needs to be repeated later in the process."
-msgstr ""
-"您会留意到 &d-i; 在本阶段执行 <firstterm>硬件侦测</firstterm> 多次。第一次目"
-"的是指定哪些硬件需要安装(比如，您的 CD-ROM 或者网卡)。在第一次运行的时候并不"
-"是所有的驱动程序都就绪，硬件侦测会在后续过程里面多次重复。"
+msgstr "您会留意到 &d-i; 在本阶段多次执行<firstterm>硬件侦测</firstterm>。第一次明确的目的是那些加载安装组件所需要的硬件(比如，您的 CD-ROM 或者网卡)。在第一次运行的时候并不是所有的驱动程序都就绪，硬件侦测会在后续过程多次重复。"
 
 #. Tag: para
 #: using-d-i.xml:434
@@ -699,10 +639,7 @@ msgid ""
 "firmware is requested but unavailable, a dialog will be displayed that "
 "allows the missing firmware to be loaded from a removable medium. See <xref "
 "linkend=\"loading-firmware\"/> for further details."
-msgstr ""
-"硬件侦测过程中 &d-i; 会检测系统中是否有硬件的驱动程序需要加载固件。如果所需的"
-"固件没找到，会弹出一个对话框提示您从移动介质加载所缺的固件。参阅 <xref "
-"linkend=\"loading-firmware\"/> 获得详细信息。"
+msgstr "在硬件侦测过程中， &d-i; 会检测系统中是否有硬件驱动程序需要加载固件(firmware)。如果没有找到所需的固件，将会弹出一个对话框让您可以从移动介质加载所缺的固件。参阅 <xref linkend=\"loading-firmware\"/> 获得详细信息。"
 
 #. Tag: title
 #: using-d-i.xml:449
@@ -744,10 +681,7 @@ msgid ""
 "will be given the opportunity to load additional components manually, but "
 "you should be aware that each component you select will use additional "
 "memory and thus may cause the installation to fail."
-msgstr ""
-"如果还不行，安装程序只加载那些完成基本安装的模块，进一步来减少内存消耗。这将"
-"减少安装系统的功能。您有机会手动加载额外的组件，但要留意您选择的组件会使用更"
-"多的内存，可能会使安装失败。"
+msgstr "如果还不行，安装程序只加载那些完成基本安装的模块，进一步减少内存消耗。这将减少安装系统的功能。您还有机会手动加载额外的组件，但要留意每个选择的组件都会使用更多的内存，有可能使安装失败。"
 
 #. Tag: para
 #: using-d-i.xml:474
@@ -786,10 +720,7 @@ msgid ""
 "doesn't help, try creating the file system as ext2 (which is an essential "
 "component of the installer) instead. It is possible to change an ext2 "
 "partition to ext3 after the installation."
-msgstr ""
-"例如，有报告称，小内存模式下，当交换分区不够大，创建一个大的 ext3 文件系统会"
-"失败。如果大的交换分区也不能解决问题，请建立 ext2 文件系统(它是安装程序的基本"
-"组件)。安装之后可以将 ext2 分区改成 ext3。"
+msgstr "例如，有报告称，小内存模式下，当交换分区不够大，创建一个大的 ext3 文件系统会失败。如果大的交换分区也不能解决问题，请建立 ext2 文件系统(它是安装程序的基本组件)代替。安装之后是可以将 ext2 分区改成 ext3。"
 
 #. Tag: para
 #: using-d-i.xml:499
@@ -859,12 +790,7 @@ msgid ""
 "will result in the installation proceding in English; the installed system "
 "will have no localization support as the <classname>locales</classname> "
 "package will not be installed."
-msgstr ""
-"您将被首先问到倾向的语言。语言名称同时以英文(左侧)和该语言(右侧)列出；右侧名"
-"称是使用该语言来书写。列表以英文名称排列。在列表的顶端是一个额外的选项，允许"
-"您使用 <quote>C</quote> locale 替代语言。选择 <quote>C</quote> locale 使得安"
-"装过程使用英文；安装的系统不再有本地化支持，<classname>locales</classname> 软"
-"件包也不会安装。"
+msgstr "您将被首先问到首选的语言。语言名称同时以英文(左侧)和该语言(右侧)列出；右侧名称是使用该语言来书写。列表以英文名称排列。在列表的顶端是一个额外的选项，允许您使用 <quote>C</quote> locale 替代语言。选择 <quote>C</quote> locale 使得安装过程使用英文；安装的系统不再有本地化支持，<classname>locales</classname> 软件包也不会安装。"
 
 #. Tag: para
 #: using-d-i.xml:550
@@ -970,10 +896,7 @@ msgid ""
 "installation is complete, you'll be able to select a keyboard layout from a "
 "wider range of choices (run <command>kbd-config</command> as root after you "
 "have completed the installation)."
-msgstr ""
-"键盘经常按照不同语言使用的字符裁剪。选择一个您的键盘使用的合适布局，或者为没"
-"有的布局选择一个接近的。一旦系统安装完毕，您可以从更大范围内您选择键盘的布局 "
-"(在安装完之后用 root 执行 <command>kbd-config</command>)。"
+msgstr "键盘经常按照不同语言使用的字符裁剪。为您使用的键盘选择一个合适布局，如果没有合适的布局，就选择一个近似的。一旦系统安装完毕，您可以从更大范围内选择键盘的布局(在安装完之后以 root 身份执行 <command>kbd-config</command>)。"
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -984,10 +907,7 @@ msgid ""
 "same place in all national language keyboard layouts, so they are "
 "independent of the keyboard configuration. An 'extended' keyboard is one "
 "with <keycap>F1</keycap> through <keycap>F10</keycap> keys along the top row."
-msgstr ""
-"将高亮显示部分移到选择的键盘，然后按下 &enterkey;。用箭头健移到高亮显示 "
-"&mdash; 它们位于所以国家键盘布局相同的地方，因此独立于键盘配置。'扩展的'键盘"
-"是具有 <keycap>F1</keycap> 到 <keycap>F10</keycap> 健，与顶端平行。"
+msgstr "将高亮显示部分移到您期望键盘选择，然后按下 &enterkey;。用箭头健移到高亮显示 &mdash; 它们位于所有国家键盘布局相同的地方，因此独立于键盘配置。'扩展的'键盘具有 <keycap>F1</keycap> 到 <keycap>F10</keycap> 健，与顶端平行。"
 
 #. Tag: para
 #: using-d-i.xml:645
@@ -1042,16 +962,7 @@ msgid ""
 "content to determine if the image is a valid Debian iso image or not. In the "
 "former case we are done, in the latter <command>iso-scan</command> seeks for "
 "another image."
-msgstr ""
-"首先，<command>iso-scan</command> 自动挂载具有已知文件系统的块设备(比如，分"
-"区)，然后顺次搜索文件名结尾是 <filename>.iso</filename> (或 <filename>.ISO</"
-"filename> 之类)。注意，首次只扫描位于根目录的文件，和第一层子目录 (例如，它找"
-"到 <filename>/<replaceable>whatever</replaceable>.iso</filename>，<filename>/"
-"data/<replaceable>whatever</replaceable>.iso</filename>，而不是 <filename>/"
-"data/tmp/<replaceable>whatever</replaceable>.iso</filename>)。在 iso 映象文件"
-"找到后，<command>iso-scan</command>检查它包含的内容，确定该映象文件是不是有效"
-"的 Debian iso 映象。如为前者，任务结束；如果是后者，<command>iso-scan</"
-"command> 搜索其它的映象。"
+msgstr "首先，<command>iso-scan</command> 自动挂载具有已知文件系统的块设备(比如，分区)，然后顺次搜索文件名结尾是 <filename>.iso</filename> (或 <filename>.ISO</filename> 之类)。注意，首次只扫描位于根目录的文件，和第一层子目录 (例如，它找到 <filename>/<replaceable>whatever</replaceable>.iso</filename>，<filename>/data/<replaceable>whatever</replaceable>.iso</filename>，而不是 <filename>/data/tmp/<replaceable>whatever</replaceable>.iso</filename>)。在 iso 映象文件找到后，<command>iso-scan</command> 检查它包含的内容，确定该映象文件是不是有效的 Debian iso 映象。如为前者，任务结束；若是后者，<command>iso-scan</command> 搜索其它的映象。"
 
 #. Tag: para
 #: using-d-i.xml:700
@@ -1098,12 +1009,7 @@ msgid ""
 "time. You may configure additional interfaces after installation is "
 "complete; see the <citerefentry> <refentrytitle>interfaces</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> man page."
-msgstr ""
-"进入到这一步，如果系统检测到有多于一个的网络接口，您将被要求选择哪个设备是您"
-"的<emphasis>主</emphasis>网络接口，比如，您在安装中要用的那个。其他的网络接口"
-"这时不会配置。您可以在安装完毕之后去配置额外的接口；参考 <citerefentry> "
-"<refentrytitle>interfaces</refentrytitle> <manvolnum>5</manvolnum> </"
-"citerefentry> man 手册。"
+msgstr "进入到这一步，如果系统检测到有多个的网络设备，您将被要求选择哪个设备是<emphasis>主</emphasis>网络接口，比如，在安装中使用的那个。其他的网络接口这时不会配置。您可以在安装完毕之后去配置额外的接口；参考 <citerefentry> <refentrytitle>interfaces</refentrytitle> <manvolnum>5</manvolnum> </citerefentry> man 手册。"
 
 #. Tag: para
 #: using-d-i.xml:741
@@ -1159,12 +1065,7 @@ msgid ""
 "answers, use the offered defaults &mdash; if necessary, you can change them "
 "by editing <filename>/etc/network/interfaces</filename> once the system has "
 "been installed."
-msgstr ""
-"您也许需要将一些或许用的着和用不着的技术细节放在手边：程序假定网络 IP 地址是"
-"您系统的 IP 地址和网络掩码按位与。默认的广播地址是通过您系统的 IP 地址和按位"
-"反网络掩码按位或计算得来。它也会猜测您的网关。如果您不能回答这些问题，让系统"
-"猜测 &mdash; 可以在系统安装完毕之后来修改它们。如果需要，编辑 <filename>/etc/"
-"network/interfaces</filename>。"
+msgstr "您也许需要将一些技术细节放在手边：程序假定网络 IP 地址是您系统的 IP 地址和网络掩码按位与。默认的广播地址是通过您系统的 IP 地址和按位反网络掩码按位或计算得来。它也会猜测您的网关。如果您不能回答这些问题，让系统猜测 &mdash; 如果需要，在系统安装完毕之后，通过编辑 <filename>/etc/network/interfaces</filename> 文件进行修改。"
 
 #. Tag: title
 #: using-d-i.xml:812
@@ -1283,10 +1184,7 @@ msgid ""
 "the next few components lies in partitioning your disks, creating "
 "filesystems, assigning mountpoints and optionally configuring closely "
 "related options like RAID, LVM or encrypted devices."
-msgstr ""
-"现在，经过最后的硬件检测，&d-i; 已经充满活力，按照用户定制，准备就绪。正如本"
-"节标题指明，接下来组件的主要任务是为您的硬盘分区，创建文件系统，安排挂载点，"
-"并为近似选项进行配置，比如 RAID、LVM 或加密设备。"
+msgstr "现在，经过最后的硬件检测，&d-i; 应该准备就绪，按照用户定制，进行实质性的工作。正如本节标题指明，接下来组件的主要任务是为您的硬盘分区、创建文件系统、安排挂载点，还可以选择为 RAID、LVM 或加密设备这组选项进行配置。"
 
 #. Tag: para
 #: using-d-i.xml:923
@@ -1326,17 +1224,14 @@ msgid ""
 "entire drive, or available free space on a drive. This is also called "
 "<quote>guided</quote> partitioning. If you do not want to autopartition, "
 "choose <guimenuitem>Manual</guimenuitem> from the menu."
-msgstr ""
-"首先您可以选择对整块硬盘或是其上的空闲空间进行自动分区。这也被称为 <quote>向"
-"导式</quote> 分区。倘若您不想用自动分区，那么也可以选择菜单中的 "
-"<guimenuitem>Manual</guimenuitem> 。"
+msgstr "首先，您可以选择对整块硬盘或是其上的空闲空间进行自动分区。这也被称为<quote>导引式(guided)</quote>分区。如果不想使用自动分区，也可以从菜单中选择 <guimenuitem>Manual</guimenuitem> 手动分区。"
 
 #. Tag: title
 #: using-d-i.xml:952
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Created partitions"
 msgid "Supported partitioning options"
-msgstr "所新建的分区"
+msgstr "支持的分区选项"
 
 #. Tag: para
 #: using-d-i.xml:953
@@ -1345,7 +1240,7 @@ msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
 "different partitioning schemes, using various partition tables, file systems "
 "and advanced block devices."
-msgstr ""
+msgstr "&d-i; 里面使用的 paritioner 近乎万能。它可以采用不同的分区表、文件系统和高级块设备创建多种分区方案。"
 
 #. Tag: para
 #: using-d-i.xml:959
@@ -1358,7 +1253,7 @@ msgid ""
 "capacity hard disks than for smaller hard disks. Some options can only be "
 "changed when installing at medium or low debconf priority; at higher "
 "priorities sensible defaults will be used."
-msgstr ""
+msgstr "具体可以使用哪些选项主要取决于体系架构，一些其他的因素也对此有影响。例如，有的系统上内存大小限制了一些选项的使用。默认值也会相应变化。比如大容量的硬盘比小容量的硬盘默认使用的分区表就不同。一些选项只能在使用 medium 或 low 优先级安装下改变；高优先级下会采用默认值。"
 
 #. Tag: para
 #: using-d-i.xml:970
@@ -1366,39 +1261,39 @@ msgstr ""
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
 "storage devices, which in many cases can be used in combination."
-msgstr ""
+msgstr "安装程序支持多种高级分区和存储设备，很多情况下可以组合使用。"
 
 #. Tag: emphasis
 #: using-d-i.xml:977
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Configuring the Logical Volume Manager (LVM)"
 msgid "Logical Volume Management (LVM)"
-msgstr "配置逻辑卷管理(LVM)"
+msgstr "逻辑卷管理(LVM)"
 
 #. Tag: emphasis
 #: using-d-i.xml:980
 #, no-c-format
 msgid "Software RAID"
-msgstr ""
+msgstr "Software RAID"
 
 #. Tag: para
 #: using-d-i.xml:981
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
-msgstr ""
+msgstr "支持 RAID levels 0, 1, 4, 5, 6 和 10。"
 
 #. Tag: emphasis
 #: using-d-i.xml:985
 #, no-c-format
 msgid "Encryption"
-msgstr ""
+msgstr "加密"
 
 #. Tag: para
 #: using-d-i.xml:987
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
-msgstr ""
+msgstr "<emphasis>Serial ATA RAID</emphasis> (采用 <classname>dmraid</classname>)"
 
 #. Tag: para
 #: using-d-i.xml:989
@@ -1408,13 +1303,13 @@ msgid ""
 "for Serial ATA RAID is currently only available if enabled when the "
 "installer is booted. Further information is available on <ulink url=\"&url-d-"
 "i-sataraid;\">our Wiki</ulink>."
-msgstr ""
+msgstr "也称为 <quote>fake RAID</quote> 或 <quote>BIOS RAID</quote>。对 Serial ATA RAID 当前只在安装程序启动时打开才支持。详细信息请参考<ulink url=\"&url-d-i-sataraid;\">我们的 Wiki</ulink>。"
 
 #. Tag: para
 #: using-d-i.xml:995
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
-msgstr ""
+msgstr "<emphasis>Multipath</emphasis> (experimental)"
 
 #. Tag: para
 #: using-d-i.xml:997
@@ -1423,13 +1318,13 @@ msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
 "Support for multipath is currently only available if enabled when the "
 "installer is booted."
-msgstr ""
+msgstr "参考<ulink url=\"&url-d-i-multipath;\">我们的 Wiki</ulink> 了解更多信息。对于 multipath 只在安装程序启动时打开才支持。"
 
 #. Tag: para
 #: using-d-i.xml:1004
 #, no-c-format
 msgid "The following file systems are supported."
-msgstr ""
+msgstr "支持下列的文件系统。"
 
 #. Tag: para
 #: using-d-i.xml:1009
@@ -1438,7 +1333,7 @@ msgid ""
 "<phrase arch=\"arm, mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
 "<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
 "emphasis>"
-msgstr ""
+msgstr "<phrase arch=\"arm, mipsel\"><emphasis>ext2r0</emphasis>,</phrase> <emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</emphasis>"
 
 #. Tag: para
 #: using-d-i.xml:1014
@@ -1447,32 +1342,32 @@ msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
 "filename> partitions ext2 will be selected by default when guided "
 "partitioning is used."
-msgstr ""
+msgstr "多数情况下默认的文件系统选择的是 ext3；使用导引式分区时 <filename>/boot</filename> 分区选择 ext2 作为默认值。"
 
 #. Tag: para
 #: using-d-i.xml:1019
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The option to use (encrypted) LVM may not be available on all "
 #| "architectures."
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
-msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
+msgstr "<emphasis>jfs</emphasis> (并不是所有架构都支持)"
 
 #. Tag: para
 #: using-d-i.xml:1022
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The option to use (encrypted) LVM may not be available on all "
 #| "architectures."
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
-msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
+msgstr "<emphasis>xfs</emphasis> (并不是所有架构都支持)"
 
 #. Tag: para
 #: using-d-i.xml:1025
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
-msgstr ""
+msgstr "<emphasis>reiserfs</emphasis> (选项；并不是所有架构都支持)"
 
 #. Tag: para
 #: using-d-i.xml:1027
@@ -1482,13 +1377,13 @@ msgid ""
 "the installer is running at medium or low debconf priority it can be enabled "
 "by selecting the <classname>partman-reiserfs</classname> component. Only "
 "version 3 of the file system is supported."
-msgstr ""
+msgstr "默认情况下 Reiser 文件系统不再支持。安装程序运行在 medium 或 low 优先级下时，可以通过选择 <classname>partman-reiserfs</classname> 组件打开。只支持文件系统版本 3。"
 
 #. Tag: emphasis
 #: using-d-i.xml:1034
 #, no-c-format
 msgid "jffs2"
-msgstr ""
+msgstr "jffs2"
 
 #. Tag: para
 #: using-d-i.xml:1035
@@ -1496,13 +1391,13 @@ msgstr ""
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
 "jffs2 partitions."
-msgstr ""
+msgstr "在一些系统上用于读取闪存。不可以创建新的 jffs2 分区。"
 
 #. Tag: emphasis
 #: using-d-i.xml:1040
 #, no-c-format
 msgid "qnx4"
-msgstr ""
+msgstr "qnx4"
 
 #. Tag: para
 #: using-d-i.xml:1041
@@ -1510,19 +1405,19 @@ msgstr ""
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
 "points for them. It is not possible to create new qnx4 partitions."
-msgstr ""
+msgstr "识别已存在的分区并挂载它们。不可以创建新的 qnx4 分区。"
 
 #. Tag: para
 #: using-d-i.xml:1045
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
-msgstr ""
+msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
 #: using-d-i.xml:1048
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
-msgstr ""
+msgstr "<emphasis>NTFS</emphasis> (只读)"
 
 #. Tag: para
 #: using-d-i.xml:1050
@@ -1530,7 +1425,7 @@ msgstr ""
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
 "points for them. It is not possible to create new NTFS partitions."
-msgstr ""
+msgstr "已存在的 NTFS 分区可以调整大小，并挂载它们。不能创建新的 NTFS 分区。"
 
 #. Tag: title
 #: using-d-i.xml:1060
@@ -3073,11 +2968,7 @@ msgid ""
 "by pressing <keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></"
 "keycombo>; get back to the main installer process with "
 "<keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>."
-msgstr ""
-"在基本系统安装期间，软件包解包和配置信息重定向到 <userinput>tty4</"
-"userinput>。您可以通过按下 <keycombo><keycap>左 Alt</keycap><keycap>F4</"
-"keycap></keycombo> 访问该终端；返回主安装进程使用 <keycombo><keycap>左 Alt</"
-"keycap><keycap>F1</keycap></keycombo>。"
+msgstr "在基本系统安装期间，软件包解包和配置信息重定向到 <userinput>tty4</userinput>。您可以通过按下 <keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo> 访问该终端；返回主安装进程使用 <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>。"
 
 #. Tag: para
 #: using-d-i.xml:2099
@@ -3112,7 +3003,7 @@ msgid ""
 "the selected software, but they do enhance that software and should, in the "
 "view of the package maintainers, normally be installed together with that "
 "software."
-msgstr ""
+msgstr "在使用包管理系统安装软件包时，将默认安装该软件包推荐的软件包。这些推荐的软件包并不影响要安装软件包的核心功能，但可以增强其功能。从软件包维护人员的角度看，正常情况下应该安装这些软件。"
 
 #. Tag: para
 #: using-d-i.xml:2122
@@ -3122,7 +3013,7 @@ msgid ""
 "system are installed without their <quote>Recommends</quote>. The rule "
 "described above only takes effect after this point in the installation "
 "process."
-msgstr ""
+msgstr "由于技术的原因，安装基本系统时所安装的软件包并不会安装对应的<quote>推荐软件包</quote>。上面提到的原则只适用于之后的安装过程。"
 
 #. Tag: title
 #: using-d-i.xml:2134
@@ -4724,7 +4615,7 @@ msgstr "在 &arch-title; 上安装，建立网络之后这是默认的方法。"
 
 #. Tag: para
 #: using-d-i.xml:3264
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
 #| "<phrase arch=\"s390\">You</phrase> will be asked for a new password to be "
@@ -4743,13 +4634,7 @@ msgid ""
 "just provided. Another important detail to notice on this screen is the "
 "fingerprint of this system. You need to transfer the fingerprint securely to "
 "the person who will continue the installation remotely."
-msgstr ""
-"<phrase arch=\"not-s390\">选择新菜单项之后，您</phrase> <phrase arch=\"s390"
-"\">您</phrase>会被问到新密码用于连接到安装系统，以及确认。只需要这些。现在您"
-"应该看到一个画面，提示使用 <emphasis>installer</emphasis> 用户远程登录，密码"
-"就是刚才您提供的。另外一个需要留意的重要细节，是屏幕上显示的该系统的 "
-"fingerprint。您需要安全地传输该 fingerprint 给<quote>那些要继续远程安装的人</"
-"quote>。"
+msgstr "<phrase arch=\"not-s390\">选择新菜单项之后，您</phrase> <phrase arch=\"s390\">您</phrase>会被问到新密码，以及确认密码用于连接到安装系统。这些就够了。现在您应该看到一个画面，提示使用 <emphasis>installer</emphasis> 用户名和刚才您提供的密码登录。另外一个屏幕上需留意的重要细节，是该系统的 fingerprint。您需要安全地传输该 fingerprint 给那些要继续远程安装的人。"
 
 #. Tag: para
 #: using-d-i.xml:3276
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 1ee9c0bfa..aa64f56b6 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2009-11-08 01:11+0000\n"
-"PO-Revision-Date: 2009-11-21 13:46+0800\n"
-"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:22+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"