[SILENT_COMMIT] Update of POT and PO files for the manual

4 files changed, 259 insertions, 285 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 95c286f1d..fca5a343e 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3,7 +3,7 @@ msgid ""
 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"
+"POT-Creation-Date: 2010-04-09 00:13+0000\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"
@@ -308,17 +308,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:245
 #, 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 "
-#| "<quote>administration</quote>, then to <quote>firmware</quote>, and "
-#| "upload the image). Next, use your serial nullmodem cable and the ribbon "
-#| "cable to connect to the serial port of the SS4000-E, and reboot the "
-#| "machine. You need to use a serial terminal application to communicate "
-#| "with the machine; a good option on a Debian GNU/Linux is to use the "
-#| "<command>cu</command> 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:"
 msgid ""
 "To boot the SS4000-E, use your serial nullmodem cable and the ribbon cable "
 "to connect to the serial port of the SS4000-E, and reboot the machine. You "
@@ -327,7 +316,11 @@ 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，请使用您的串行 nullmodem 线和 ribbon 线连接到 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
@@ -369,12 +362,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:273
 #, 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 "
-#| "you miss this window, just powercycle the machine and try again. </para> "
-#| "</footnote>. This will give you the RedBoot prompt. Enter the following "
-#| "command:"
 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 you miss "
@@ -388,11 +375,6 @@ msgstr ""
 #. Tag: screen
 #: boot-installer.xml:286
 #, no-c-format
-#| msgid ""
-#| "fis load ramdisk.gz\n"
-#| "fis load zImage\n"
-#| "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
-#| "0x01800000"
 msgid ""
 "load -v -r -b 0x01800000 -m ymodem ramdisk.gz\n"
 "load -v -r -b 0x01008000 -m ymodem zImage\n"
@@ -401,7 +383,8 @@ msgid ""
 msgstr ""
 "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"
+"exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
+"0x01800000"
 
 #. Tag: para
 #: boot-installer.xml:288
@@ -413,16 +396,26 @@ 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 "在每一个 <command>load</command> 命令后面，系统系统使用 YMODEM 协议传输文件。如果使用的是 cu，确认您已经安装了 <classname>lrzsz</classname> 软件包，然后键入回车，在 <quote>~&lt;</quote> 字符后面启动外部程序，然后运行 <command>sb initrd.gz</command> 或 <command>sb vmlinuz</command>。"
+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
-#, no-c-format
+#, fuzzy, no-c-format
+#| 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:"
 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 "另外一种方法，可以通过 HTTP 而不是 YMODEM 加载内核和 ramdisk。这会更快，但要求网络内有一台 HTTP 服务器。做法是，首先将 bootloader 切换到 RAM 模式："
+"the network. To do so, first switch the bootloader to RAM mode:"
+msgstr ""
+"另外一种方法，可以通过 HTTP 而不是 YMODEM 加载内核和 ramdisk。这会更快，但要"
+"求网络内有一台 HTTP 服务器。做法是，首先将 bootloader 切换到 RAM 模式："
 
 #. Tag: screen
 #: boot-installer.xml:303
@@ -441,7 +434,9 @@ 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 "表面上看这在重新启动机器；但实际上是重新启动到 RAM，让它来启动。不进行这一步将导致系统在接下来需要 ip_address 时挂起。"
+msgstr ""
+"表面上看这在重新启动机器；但实际上是重新启动到 RAM，让它来启动。不进行这一步"
+"将导致系统在接下来需要 ip_address 时挂起。"
 
 #. Tag: para
 #: boot-installer.xml:311
@@ -452,11 +447,6 @@ msgstr "您需要再次按下 Ctrl-C 中断启动。然后："
 #. Tag: screen
 #: boot-installer.xml:315
 #, no-c-format
-#| msgid ""
-#| "fis load ramdisk.gz\n"
-#| "fis load zImage\n"
-#| "exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
-#| "0x01800000"
 msgid ""
 "ip_address -l 192.168.2.249 -h 192.168.2.4\n"
 "load -v -r -b 0x01800000 -m http /initrd.gz\n"
@@ -467,7 +457,8 @@ msgstr ""
 "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"
+"exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
+"0x01800000"
 
 #. Tag: para
 #: boot-installer.xml:317
@@ -3001,17 +2992,15 @@ msgstr "base-installer/install-recommends (recommends)"
 #. Tag: para
 #: boot-installer.xml:2396
 #, no-c-format
-#| msgid ""
-#| "By setting this option to <userinput>false</userinput>, the package "
-#| "management system will be configured to not automatically install such "
-#| "<quote>Recommends</quote>, both during the installation and for the "
-#| "installed system."
 msgid ""
 "By setting this option to <userinput>false</userinput>, the package "
 "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>。参阅 <xref linkend=\\\"di-install-base\\\"/>。"
+msgstr ""
+"通过设置 <userinput>false</userinput> 选项，在安装过程和以后的系统中，包管理"
+"系统将配置为不自动安装这些<quote>推荐的软件包(Recommends)</quote>。参阅 "
+"<xref linkend=\\\"di-install-base\\\"/>。"
 
 #. Tag: para
 #: boot-installer.xml:2403
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 335ed96c9..c425f1f03 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -1581,7 +1581,10 @@ 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 "对于 &debian; 服务器，我们推荐使用 <classname>tftpd-hpa</classname>。它由 <classname>syslinux</classname> bootloader 的同一作者开发，因此不会导致很多问题。另一个好的选择是 <classname>atftpd</classname>。"
+msgstr ""
+"对于 &debian; 服务器，我们推荐使用 <classname>tftpd-hpa</classname>。它由 "
+"<classname>syslinux</classname> bootloader 的同一作者开发，因此不会导致很多问"
+"题。另一个好的选择是 <classname>atftpd</classname>。"
 
 #. Tag: title
 #: install-methods.xml:1140
@@ -1592,14 +1595,6 @@ msgstr "设置 RARP 服务器"
 #. Tag: para
 #: install-methods.xml:1141
 #, 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 "
-#| "information, you can <phrase arch=\"sparc\"> pick it off the initial "
-#| "OpenPROM boot messages, use the OpenBoot <userinput>.enet-addr</"
-#| "userinput> command, or </phrase> boot into <quote>Rescue</quote> mode (e."
-#| "g., from the rescue floppy) and use the command <userinput>/sbin/ifconfig "
-#| "eth0</userinput>."
 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,7 +1603,12 @@ 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>ip addr show dev 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
@@ -1915,7 +1915,8 @@ msgstr "开启 TFTP 服务器"
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
 "<command>tftpd</command> is enabled."
-msgstr "要准备好 TFTP 服务器，您首先需要确定 <command>tftpd</command> 已经启动。"
+msgstr ""
+"要准备好 TFTP 服务器，您首先需要确定 <command>tftpd</command> 已经启动。"
 
 #. Tag: para
 #: install-methods.xml:1290
@@ -1926,7 +1927,10 @@ 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 "对于 <classname>tftpd-hpa</classname> 有两种方式可以启动服务。它可以通过系统的 <classname>inetd</classname> 守护程序启动，或者设置为独立的守护程序。这可以在安装软件包的时候选择，也可以用重新配置软件包方式修改。"
+msgstr ""
+"对于 <classname>tftpd-hpa</classname> 有两种方式可以启动服务。它可以通过系统"
+"的 <classname>inetd</classname> 守护程序启动，或者设置为独立的守护程序。这可"
+"以在安装软件包的时候选择，也可以用重新配置软件包方式修改。"
 
 #. Tag: para
 #: install-methods.xml:1299
@@ -1954,7 +1958,10 @@ 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 "Debian 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
+msgstr ""
+"Debian 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系统"
+"日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导问"
+"题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
 
 #. Tag: para
 #: install-methods.xml:1317
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 438bd6cb6..cd3e4806b 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1599,21 +1599,16 @@ msgstr "分区"
 #. Tag: para
 #: preseed.xml:841
 #, 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 "
-#| "partition either 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. It is currently not possible to partition multiple "
-#| "disks using preseeding."
 msgid ""
 "Using preseeding to partition the harddisk is limited to what is supported "
 "by <classname>partman-auto</classname>. You can choose to partition either "
 "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
@@ -1622,7 +1617,9 @@ 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 "已经支持包括 RAID、LVM 和加密高级分区设置的预置，但对于非预置安装的分区仍然弹性不足。"
+msgstr ""
+"已经支持包括 RAID、LVM 和加密高级分区设置的预置，但对于非预置安装的分区仍然弹"
+"性不足。"
 
 #. Tag: para
 #: preseed.xml:855
@@ -1635,7 +1632,13 @@ 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 "下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 <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> 获取。注意不同发布版支持的功能会有所改变。"
+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
@@ -1651,80 +1654,12 @@ msgstr ""
 #. Tag: title
 #: preseed.xml:878
 #, no-c-format
-#| msgid "Partitioning"
 msgid "Partitioning example"
 msgstr "分区示例"
 
 #. Tag: screen
 #: preseed.xml:880
 #, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# 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"
-#| "# 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"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# The same applies to pre-existing software RAID array:\n"
-#| "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"
-#| "\n"
-#| "# You can choose one of the three predefined partitioning recipes:\n"
-#| "# - atomic: all files in one partition\n"
-#| "# - home:   separate /home partition\n"
-#| "# - multi:  separate /home, /usr, /var, and /tmp partitions\n"
-#| "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"
-#| "# (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"
-#| "#      boot-root ::                                            \\\n"
-#| "#              40 50 100 ext3                                  \\\n"
-#| "#                      $primary{ } $bootable{ }                \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ /boot }                     \\\n"
-#| "#              .                                               \\\n"
-#| "#              500 10000 1000000000 ext3                       \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ / }                         \\\n"
-#| "#              .                                               \\\n"
-#| "#              64 512 300% linux-swap                          \\\n"
-#| "#                      method{ swap } format{ }                \\\n"
-#| "#              .\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"
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# This is only honoured if partman-auto/method (below) is not set.\n"
@@ -1803,8 +1738,10 @@ 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"
@@ -1836,7 +1773,8 @@ 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"
@@ -1906,55 +1844,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:905
 #, no-c-format
-#| msgid ""
-#| "# 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"
-#| "# so this will only work if the disks are the same size.\n"
-#| "#d-i partman-auto/disk string /dev/sda /dev/sdb\n"
-#| "\n"
-#| "# Next you need to specify the physical partitions that will be used. \n"
-#| "#d-i partman-auto/expert_recipe string \\\n"
-#| "#      multiraid ::                                         \\\n"
-#| "#              1000 5000 4000 raid                          \\\n"
-#| "#                      $primary{ } method{ raid }           \\\n"
-#| "#              .                                            \\\n"
-#| "#              64 512 300% raid                             \\\n"
-#| "#                      method{ raid }                       \\\n"
-#| "#              .                                            \\\n"
-#| "#              500 10000 1000000000 raid                    \\\n"
-#| "#                      method{ raid }                       \\\n"
-#| "#              .\n"
-#| "\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"
-#| "# Parameters are:\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"
-#| "#d-i partman-auto-raid/recipe string \\\n"
-#| "#    1 2 0 ext3 /                    \\\n"
-#| "#          /dev/sda1#/dev/sdb1       \\\n"
-#| "#    .                               \\\n"
-#| "#    1 2 0 swap -                    \\\n"
-#| "#          /dev/sda5#/dev/sdb5       \\\n"
-#| "#    .                               \\\n"
-#| "#    0 2 0 ext3 /home                \\\n"
-#| "#          /dev/sda6#/dev/sdb6       \\\n"
-#| "#    .\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"
 msgid ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
@@ -2030,7 +1919,8 @@ msgstr ""
 "# 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"
 "\n"
 "#d-i partman-auto-raid/recipe string \\\n"
@@ -2513,44 +2403,6 @@ msgstr "安装 bootloader"
 #. Tag: screen
 #: preseed.xml:1077
 #, no-c-format
-#| msgid ""
-#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
-#| "# instead, uncomment this:\n"
-#| "#d-i grub-installer/skip boolean true\n"
-#| "# To also skip installing lilo, and install no bootloader, uncomment "
-#| "this\n"
-#| "# 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"
-#| "# 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"
-#| "# 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"
-#| "# Alternatively, if you want to install to a location other than the "
-#| "mbr,\n"
-#| "# uncomment and edit these lines:\n"
-#| "#d-i grub-installer/only_debian boolean false\n"
-#| "#d-i grub-installer/with_other_os boolean false\n"
-#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
-#| "# To install grub to multiple disks:\n"
-#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
-#| "\n"
-#| "# Optional password for grub, either in clear text\n"
-#| "#d-i grub-installer/password password r00tme\n"
-#| "#d-i grub-installer/password-again password r00tme\n"
-#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
-#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
-#| "\n"
-#| "# Use the following option to add additional boot parameters for the\n"
-#| "# installed system (if supported by the bootloader installer).\n"
-#| "# Note: options passed to the installer will be added automatically.\n"
-#| "#d-i debian-installer/add-kernel-opts string nousb"
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2605,11 +2457,13 @@ msgstr ""
 "# 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"
+"# 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/using-d-i.po b/po/zh_CN/using-d-i.po
index 309c0df6b..de721fec1 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -32,7 +32,10 @@ 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
@@ -44,7 +47,10 @@ 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
@@ -55,7 +61,10 @@ 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
@@ -66,7 +75,11 @@ 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
@@ -76,7 +89,10 @@ 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
@@ -88,7 +104,11 @@ 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> 引导参数。专家(export)模式让您可以完全控制 &d-i; 。"
+msgstr ""
+"假如您的硬件需要指定内核模块选项才能安装，就要使用 <quote>expert</quote> 模式"
+"启动安装程序。可以通过 <command>expert</command> 命令或者添加 "
+"<userinput>priority=low</userinput> 引导参数。专家(export)模式让您可以完全控"
+"制 &d-i; 。"
 
 #. Tag: para
 #: using-d-i.xml:59
@@ -99,7 +119,10 @@ 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
@@ -126,7 +149,15 @@ 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>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; 执行选择。"
+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
@@ -135,7 +166,9 @@ 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
@@ -156,7 +189,11 @@ 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>Left Alt</keycap><keycap>F4</keycap></keycombo> (按住左 <keycap>Alt</keycap> 键同时按下 <keycap>F4</keycap> 功能键)访问该控制台；返回主安装进程使用 <keycombo><keycap>Left 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
@@ -208,7 +245,11 @@ 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 "在安装过程中，显示组件列表，并执行选中的组件。主菜单的优先级为 medium，如果您的优先级设为 high 或 critical (默认为 high)，您不会看到菜单。另一方面，假如出现问题需要您干预，询问的优先级会临时调低，从而让您解决该问题，菜单则可能在这种情况下出现。"
+msgstr ""
+"在安装过程中，显示组件列表，并执行选中的组件。主菜单的优先级为 medium，如果您"
+"的优先级设为 high 或 critical (默认为 high)，您不会看到菜单。另一方面，假如出"
+"现问题需要您干预，询问的优先级会临时调低，从而让您解决该问题，菜单则可能在这"
+"种情况下出现。"
 
 #. Tag: para
 #: using-d-i.xml:146
@@ -403,7 +444,9 @@ 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
@@ -460,7 +503,10 @@ 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
@@ -550,7 +596,10 @@ 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 "bootloader 安装程序在硬盘上安装 boot loader 程序，这是必须的一步，使得计算机启动 Linux 不必依靠软盘和 CD-ROM。许多 boot loader 程序都允许用户在开机的时候选择启动哪个操作系统。"
+msgstr ""
+"bootloader 安装程序在硬盘上安装 boot loader 程序，这是必须的一步，使得计算机"
+"启动 Linux 不必依靠软盘和 CD-ROM。许多 boot loader 程序都允许用户在开机的时候"
+"选择启动哪个操作系统。"
 
 #. Tag: term
 #: using-d-i.xml:372
@@ -578,7 +627,9 @@ 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
@@ -596,7 +647,10 @@ 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
@@ -617,7 +671,12 @@ 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
@@ -628,7 +687,10 @@ 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
@@ -639,7 +701,10 @@ 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; 会检测系统中是否有硬件驱动程序需要加载固件(firmware)。如果没有找到所需的固件，将会弹出一个对话框让您可以从移动介质加载所缺的固件。参阅 <xref linkend=\"loading-firmware\"/> 获得详细信息。"
+msgstr ""
+"在硬件侦测过程中， &d-i; 会检测系统中是否有硬件驱动程序需要加载固件"
+"(firmware)。如果没有找到所需的固件，将会弹出一个对话框让您可以从移动介质加载"
+"所缺的固件。参阅 <xref linkend=\"loading-firmware\"/> 获得详细信息。"
 
 #. Tag: title
 #: using-d-i.xml:449
@@ -681,7 +746,10 @@ 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
@@ -720,7 +788,10 @@ 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
@@ -790,7 +861,12 @@ 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
@@ -896,7 +972,10 @@ 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
@@ -907,7 +986,10 @@ 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
@@ -962,7 +1044,16 @@ 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
@@ -1009,7 +1100,12 @@ 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
@@ -1065,7 +1161,12 @@ 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
@@ -1184,7 +1285,10 @@ 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
@@ -1224,12 +1328,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>导引式(guided)</quote>分区。如果不想使用自动分区，也可以从菜单中选择 <guimenuitem>Manual</guimenuitem> 手动分区。"
+msgstr ""
+"首先，您可以选择对整块硬盘或是其上的空闲空间进行自动分区。这也被称为<quote>导"
+"引式(guided)</quote>分区。如果不想使用自动分区，也可以从菜单中选择 "
+"<guimenuitem>Manual</guimenuitem> 手动分区。"
 
 #. Tag: title
 #: using-d-i.xml:952
 #, no-c-format
-#| msgid "Created partitions"
 msgid "Supported partitioning options"
 msgstr "支持的分区选项"
 
@@ -1240,7 +1346,9 @@ 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 "&d-i; 里面使用的 paritioner 近乎万能。它可以采用不同的分区表、文件系统和高级块设备创建多种分区方案。"
+msgstr ""
+"&d-i; 里面使用的 paritioner 近乎万能。它可以采用不同的分区表、文件系统和高级"
+"块设备创建多种分区方案。"
 
 #. Tag: para
 #: using-d-i.xml:959
@@ -1253,7 +1361,11 @@ 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 "具体可以使用哪些选项主要取决于体系架构，一些其他的因素也对此有影响。例如，有的系统上内存大小限制了一些选项的使用。默认值也会相应变化。比如大容量的硬盘比小容量的硬盘默认使用的分区表就不同。一些选项只能在使用 medium 或 low 优先级安装下改变；高优先级下会采用默认值。"
+msgstr ""
+"具体可以使用哪些选项主要取决于体系架构，一些其他的因素也对此有影响。例如，有"
+"的系统上内存大小限制了一些选项的使用。默认值也会相应变化。比如大容量的硬盘比"
+"小容量的硬盘默认使用的分区表就不同。一些选项只能在使用 medium 或 low 优先级安"
+"装下改变；高优先级下会采用默认值。"
 
 #. Tag: para
 #: using-d-i.xml:970
@@ -1266,7 +1378,6 @@ msgstr "安装程序支持多种高级分区和存储设备，很多情况下可
 #. Tag: emphasis
 #: using-d-i.xml:977
 #, no-c-format
-#| msgid "Configuring the Logical Volume Manager (LVM)"
 msgid "Logical Volume Management (LVM)"
 msgstr "逻辑卷管理(LVM)"
 
@@ -1293,7 +1404,8 @@ msgstr "加密"
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
-msgstr "<emphasis>Serial ATA RAID</emphasis> (采用 <classname>dmraid</classname>)"
+msgstr ""
+"<emphasis>Serial ATA RAID</emphasis> (采用 <classname>dmraid</classname>)"
 
 #. Tag: para
 #: using-d-i.xml:989
@@ -1303,7 +1415,10 @@ 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 "也称为 <quote>fake RAID</quote> 或 <quote>BIOS RAID</quote>。对 Serial ATA RAID 当前只在安装程序启动时打开才支持。详细信息请参考<ulink url=\"&url-d-i-sataraid;\">我们的 Wiki</ulink>。"
+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
@@ -1318,7 +1433,9 @@ 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 "参考<ulink url=\"&url-d-i-multipath;\">我们的 Wiki</ulink> 了解更多信息。对于 multipath 只在安装程序启动时打开才支持。"
+msgstr ""
+"参考<ulink url=\"&url-d-i-multipath;\">我们的 Wiki</ulink> 了解更多信息。对"
+"于 multipath 只在安装程序启动时打开才支持。"
 
 #. Tag: para
 #: using-d-i.xml:1004
@@ -1333,7 +1450,10 @@ msgid ""
 "<phrase arch=\"arm, mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
 "<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
 "emphasis>"
-msgstr "<phrase arch=\"arm, mipsel\"><emphasis>ext2r0</emphasis>,</phrase> <emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</emphasis>"
+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
@@ -1342,23 +1462,19 @@ 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 "多数情况下默认的文件系统选择的是 ext3；使用导引式分区时 <filename>/boot</filename> 分区选择 ext2 作为默认值。"
+msgstr ""
+"多数情况下默认的文件系统选择的是 ext3；使用导引式分区时 <filename>/boot</"
+"filename> 分区选择 ext2 作为默认值。"
 
 #. Tag: para
 #: using-d-i.xml:1019
 #, 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 "<emphasis>jfs</emphasis> (并不是所有架构都支持)"
 
 #. Tag: para
 #: using-d-i.xml:1022
 #, 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 "<emphasis>xfs</emphasis> (并不是所有架构都支持)"
 
@@ -1377,7 +1493,10 @@ 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 "默认情况下 Reiser 文件系统不再支持。安装程序运行在 medium 或 low 优先级下时，可以通过选择 <classname>partman-reiserfs</classname> 组件打开。只支持文件系统版本 3。"
+msgstr ""
+"默认情况下 Reiser 文件系统不再支持。安装程序运行在 medium 或 low 优先级下时，"
+"可以通过选择 <classname>partman-reiserfs</classname> 组件打开。只支持文件系统"
+"版本 3。"
 
 #. Tag: emphasis
 #: using-d-i.xml:1034
@@ -2968,7 +3087,11 @@ 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>Left Alt</keycap><keycap>F4</keycap></keycombo> 访问该终端；返回主安装进程使用 <keycombo><keycap>Left 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
@@ -3003,7 +3126,10 @@ 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
@@ -3013,7 +3139,9 @@ msgid ""
 "system are installed without their <quote>Recommends</quote>. The rule "
 "described above only takes effect after this point in the installation "
 "process."
-msgstr "由于技术的原因，安装基本系统时所安装的软件包并不会安装对应的<quote>推荐软件包</quote>。上面提到的原则只适用于之后的安装过程。"
+msgstr ""
+"由于技术的原因，安装基本系统时所安装的软件包并不会安装对应的<quote>推荐软件包"
+"</quote>。上面提到的原则只适用于之后的安装过程。"
 
 #. Tag: title
 #: using-d-i.xml:2134
@@ -4616,15 +4744,6 @@ msgstr "在 &arch-title; 上安装，建立网络之后这是默认的方法。"
 #. Tag: para
 #: using-d-i.xml:3264
 #, 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 "
-#| "used for connecting to the installation system and for its confirmation. "
-#| "That's all. Now you should see a screen which instructs you to login "
-#| "remotely as the user <emphasis>installer</emphasis> with the password you "
-#| "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 <quote>person who will continue the installation remotely</quote>."
 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 "
@@ -4634,7 +4753,12 @@ 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 给那些要继续远程安装的人。"
+msgstr ""
+"<phrase arch=\"not-s390\">选择新菜单项之后，您</phrase> <phrase arch=\"s390"
+"\">您</phrase>会被问到新密码，以及确认密码用于连接到安装系统。这些就够了。现"
+"在您应该看到一个画面，提示使用 <emphasis>installer</emphasis> 用户名和刚才您"
+"提供的密码登录。另外一个屏幕上需留意的重要细节，是该系统的 fingerprint。您需"
+"要安全地传输该 fingerprint 给那些要继续远程安装的人。"
 
 #. Tag: para
 #: using-d-i.xml:3276