Update of POT and PO files for the manual

1 files changed, 226 insertions, 137 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 7c1c2dc09..a87e73924 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2006-04-12 19:05+0000\n"
+"POT-Creation-Date: 2006-04-28 19:33+0000\n"
 "PO-Revision-Date: 2006-04-13 12:00+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -26,7 +26,7 @@ msgid ""
 msgstr "本附录对 &d-i; 中提问对应的答案进行说明，让安装过程自动化。"
 
 #. Tag: para
-#: preseed.xml:23 preseed.xml:484
+#: preseed.xml:23 preseed.xml:492
 #, no-c-format
 msgid ""
 "The configuration fragments used in this appendix are also available as an "
@@ -70,7 +70,12 @@ msgid ""
 "With file and network preseeding the first few installer questions cannot be "
 "preseeded because the preconfiguration file is only loaded after they have "
 "been asked."
-msgstr "一共有三种方法可用于预置: <firstterm>initrd</firstterm>、<firstterm>file</firstterm> 和 <firstterm>network</firstterm>。initrd 方法可以用于任何一种安装方式并支持较多的预置内容，但它需要的准备工作也最多。file 和 network 方法分别用于不同的安装方式。在 file 和 network 预置方法中，最初的几个安装问题无法跳过，这是因为只有回答了这些问题才能加载预先准备的配置文件。"
+msgstr ""
+"一共有三种方法可用于预置: <firstterm>initrd</firstterm>、<firstterm>file</"
+"firstterm> 和 <firstterm>network</firstterm>。initrd 方法可以用于任何一种安装"
+"方式并支持较多的预置内容，但它需要的准备工作也最多。file 和 network 方法分别"
+"用于不同的安装方式。在 file 和 network 预置方法中，最初的几个安装问题无法跳"
+"过，这是因为只有回答了这些问题才能加载预先准备的配置文件。"
 
 #. Tag: para
 #: preseed.xml:55
@@ -166,7 +171,10 @@ msgid ""
 "even asked. For file preseeding this is after the CD or CD image has been "
 "loaded. For network preseeding it is only after the network has been "
 "configured."
-msgstr "这些预置方法的主要不同之处在于哪一个预置文件被加载和处理。对于 initrd 方法，它是在第一个问题询问之前，安装开始的时候。对于 file 方法，它是在加载 CD 或 CD 映像之后。对 network 方法，它在网络配置完毕之后。"
+msgstr ""
+"这些预置方法的主要不同之处在于哪一个预置文件被加载和处理。对于 initrd 方法，"
+"它是在第一个问题询问之前，安装开始的时候。对于 file 方法，它是在加载 CD 或 "
+"CD 映像之后。对 network 方法，它在网络配置完毕之后。"
 
 #. Tag: para
 #: preseed.xml:114
@@ -295,7 +303,12 @@ msgid ""
 "DVD, you will have to remaster the ISO image. How to get the "
 "preconfiguration file included in the initrd is outside the scope of this "
 "document; please consult the developers documentation for &d-i;."
-msgstr "毫无疑问，您首先要创建一个预置文件，并将它至于您希望使用的地方。创建预置文件在后面的附录中有说明。如果您打算使用网络预置或者从软盘或 U 盘读取，直接将它放到那里就可以了。如果您希望将它放到 CD 或 DVD 上面，那就需要重新制作一个 ISO 映像文件。而如何将预置文件包含到 initrd 里面，超出了本文档的范围；请查询 debian-installer 的开发者文档。"
+msgstr ""
+"毫无疑问，您首先要创建一个预置文件，并将它至于您希望使用的地方。创建预置文件"
+"在后面的附录中有说明。如果您打算使用网络预置或者从软盘或 U 盘读取，直接将它放"
+"到那里就可以了。如果您希望将它放到 CD 或 DVD 上面，那就需要重新制作一个 ISO "
+"映像文件。而如何将预置文件包含到 initrd 里面，超出了本文档的范围；请查询 "
+"debian-installer 的开发者文档。"
 
 #. Tag: para
 #: preseed.xml:259
@@ -425,7 +438,11 @@ msgid ""
 "it as a preconfiguration file. Here is an example of how to set it up in the "
 "dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server Debian "
 "package)."
-msgstr "还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下载，并用作预置文件。这是一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服务器第 3 版(Debian 里面是 dhcp3-server 软件包)。"
+msgstr ""
+"还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 "
+"netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下"
+"载，并用作预置文件。这是一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服务"
+"器第 3 版(Debian 里面是 dhcp3-server 软件包)。"
 
 #. Tag: screen
 #: preseed.xml:324
@@ -482,7 +499,10 @@ msgid ""
 "the network, the network setup must be done first. One reason to use initrd "
 "preseeding is that it allows preseeding of even these early steps of the "
 "installation process."
-msgstr "有些形式的预置，安装过程的一些部分无法自动进行，因为这些问题是在预置文件加载之前询问的。例如，如果预置文件从网络下载，首先应完成网络设置。采用 initrd 预置的一个原因，正是它可以设置安装过程的这些前期步骤。"
+msgstr ""
+"有些形式的预置，安装过程的一些部分无法自动进行，因为这些问题是在预置文件加载"
+"之前询问的。例如，如果预置文件从网络下载，首先应完成网络设置。采用 initrd 预"
+"置的一个原因，正是它可以设置安装过程的这些前期步骤。"
 
 #. Tag: para
 #: preseed.xml:355
@@ -498,7 +518,18 @@ msgstr ""
 "递例子中的这些预置值。"
 
 #. Tag: para
-#: preseed.xml:363
+#: preseed.xml:362
+#, no-c-format
+msgid ""
+"A <quote>&ndash;&ndash;</quote> in the boot options has special meaning. "
+"Kernel parameters that appear after it will be copied into the installed "
+"bootloader configuration (if supported by the installer for the bootloader). "
+"Note that the <quote>&ndash;&ndash;</quote> may already be present in the "
+"default boot parameters."
+msgstr ""
+
+#. Tag: para
+#: preseed.xml:371
 #, no-c-format
 msgid ""
 "The 2.4 kernel accepts a maximum of 8 command line options and 8 environment "
@@ -512,16 +543,18 @@ msgstr ""
 "以后的内核，您可以指定 32 个命令行选项和 32 个环境变量选项。"
 
 #. Tag: para
-#: preseed.xml:372
+#: preseed.xml:380
 #, no-c-format
 msgid ""
 "For most installations some of the default options in your bootloader "
 "configuration file, like <literal>vga=normal</literal>, may be safely "
 "removed which may allow you to add more options for preseeding."
-msgstr "大多数安装过程，在引导配置文件中一些默认的选项，比如 <literal>vga=normal</literal>，可以放心地删除，这让您可以添加更多的预置选项。"
+msgstr ""
+"大多数安装过程，在引导配置文件中一些默认的选项，比如 <literal>vga=normal</"
+"literal>，可以放心地删除，这让您可以添加更多的预置选项。"
 
 #. Tag: para
-#: preseed.xml:379
+#: preseed.xml:387
 #, no-c-format
 msgid ""
 "It may not always be possible to specify values with spaces for boot "
@@ -529,62 +562,70 @@ msgid ""
 msgstr "引导参数中即使使用引号，也可能无法夹杂空格。"
 
 #. Tag: title
-#: preseed.xml:389
+#: preseed.xml:397
 #, no-c-format
 msgid "Creating a preconfiguration file"
 msgstr "创建预置文件"
 
 #. Tag: para
-#: preseed.xml:390
+#: preseed.xml:398
 #, no-c-format
 msgid ""
 "The preconfiguration file is in the format used by the <command>debconf-set-"
 "selections</command> command. The general format of a line in a "
 "preconfiguration file is:"
-msgstr "预先配置文件是 <command>debconf-set-selections</command> 命令使用的格式。通常预置文件中每一行的格式为："
+msgstr ""
+"预先配置文件是 <command>debconf-set-selections</command> 命令使用的格式。通常"
+"预置文件中每一行的格式为："
 
 #. Tag: screen
-#: preseed.xml:396
+#: preseed.xml:404
 #, no-c-format
 msgid "&lt;owner&gt; &lt;template name&gt; &lt;template type&gt; &lt;value&gt;"
-msgstr "&lt;owner&gt; &lt;template name&gt; &lt;template type&gt; &lt;value&gt;"
+msgstr ""
+"&lt;owner&gt; &lt;template name&gt; &lt;template type&gt; &lt;value&gt;"
 
 #. Tag: para
-#: preseed.xml:398
+#: preseed.xml:406
 #, no-c-format
 msgid ""
 "There are a few rules to keep in mind when writing a preconfiguration file."
 msgstr "编写预置文件的时候要留意几条规则。"
 
 #. Tag: para
-#: preseed.xml:405
+#: preseed.xml:413
 #, no-c-format
 msgid ""
 "Put only a single space or tab between type and value: any additional "
 "whitespace will be interpreted as belonging to the value."
-msgstr "在类型和值之间只有一个空格或者 tab：任何额外的空格将被解释为值的一部分。"
+msgstr ""
+"在类型和值之间只有一个空格或者 tab：任何额外的空格将被解释为值的一部分。"
 
 #. Tag: para
-#: preseed.xml:409
+#: preseed.xml:417
 #, no-c-format
 msgid ""
 "A line can be split into multiple lines by appending a backslash "
 "(<quote><literal>\\</literal></quote>) as the line continuation character. A "
 "good place to split a line is after the template name; a bad place is "
 "between type and value."
-msgstr "一行可以通过行尾的反斜杠(<quote><literal>\\</literal></quote>)连接符分成多行。分割一行较好的地方是在模板名后面；而在类型和值之间则是糟糕的地方。"
+msgstr ""
+"一行可以通过行尾的反斜杠(<quote><literal>\\</literal></quote>)连接符分成多"
+"行。分割一行较好的地方是在模板名后面；而在类型和值之间则是糟糕的地方。"
 
 #. Tag: para
-#: preseed.xml:415
+#: preseed.xml:423
 #, no-c-format
 msgid ""
 "Most templates need to be preseeded using the values valid in English and "
 "not the translated values. However, there are some templates (for example in "
 "<classname>partman</classname> where the translated values need to be used."
-msgstr "大多少模板需要使用有效的英文预置值，而不是翻译过的值。但有些模板(例如 <classname>partman</classname>，需要使用翻译过的值。"
+msgstr ""
+"大多少模板需要使用有效的英文预置值，而不是翻译过的值。但有些模板(例如 "
+"<classname>partman</classname>，需要使用翻译过的值。"
 
 #. Tag: para
-#: preseed.xml:421
+#: preseed.xml:429
 #, no-c-format
 msgid ""
 "Some templates take a code as value instead of the English text that is "
@@ -592,25 +633,30 @@ msgid ""
 msgstr "有些模板在安装过程中显示值的代码而不是英文文本。"
 
 #. Tag: para
-#: preseed.xml:427
+#: preseed.xml:435
 #, no-c-format
 msgid ""
 "The easiest way to create a preconfiguration file is to use the example file "
 "linked in <xref linkend=\"preseed-contents\"/> as basis and work from there."
-msgstr "建立预置文件最简单的方法是使用例子文件作为工作的基础，它位于 <xref linkend=\"preseed-contents\"/>。"
+msgstr ""
+"建立预置文件最简单的方法是使用例子文件作为工作的基础，它位于 <xref linkend="
+"\"preseed-contents\"/>。"
 
 #. Tag: para
-#: preseed.xml:432
+#: preseed.xml:440
 #, no-c-format
 msgid ""
 "An alternative method is to do a manual installation and then, after "
 "rebooting, use the <command>debconf-get-selections</command> from the "
 "<classname>debconf-utils</classname> package to dump both the debconf "
 "database and the installer's cdebconf database to a single file:"
-msgstr "另一种方法是手动安装，重启后，使用 <classname>debconf-utils</classname> 软件包里面的 <command>debconf-get-selections</command> 导出 debconf 数据库和安装程序的 cdebconf 数据库到一个文件："
+msgstr ""
+"另一种方法是手动安装，重启后，使用 <classname>debconf-utils</classname> 软件"
+"包里面的 <command>debconf-get-selections</command> 导出 debconf 数据库和安装"
+"程序的 cdebconf 数据库到一个文件："
 
 #. Tag: screen
-#: preseed.xml:439
+#: preseed.xml:447
 #, no-c-format
 msgid ""
 "$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
@@ -620,16 +666,18 @@ msgstr ""
 "$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
 
 #. Tag: para
-#: preseed.xml:441
+#: preseed.xml:449
 #, no-c-format
 msgid ""
 "However, a file generated in this manner will have some items that should "
 "not be preseeded, and the example file is a better starting place for most "
 "users."
-msgstr "但用此方法产生的文件，有些项无法预置。对于大多数用户，示例文件是一个较佳的开始。"
+msgstr ""
+"但用此方法产生的文件，有些项无法预置。对于大多数用户，示例文件是一个较佳的开"
+"始。"
 
 #. Tag: para
-#: preseed.xml:449
+#: preseed.xml:457
 #, no-c-format
 msgid ""
 "This method relies on the fact that, at the end of the installation, the "
@@ -637,19 +685,24 @@ msgid ""
 "var/log/installer/cdebconf</filename>. However, because the database may "
 "contain sensitive information, by default the files are only readable by "
 "root."
-msgstr "这种方法在安装的最后，安装程序的 cdebconf 数据库被保存到新安装系统的 <filename>/var/log/installer/cdebconf</filename> 文件。由于数据库里面常还有敏感的信息，默认只为 root 可读。"
+msgstr ""
+"这种方法在安装的最后，安装程序的 cdebconf 数据库被保存到新安装系统的 "
+"<filename>/var/log/installer/cdebconf</filename> 文件。由于数据库里面常还有敏"
+"感的信息，默认只为 root 可读。"
 
 #. Tag: para
-#: preseed.xml:457
+#: preseed.xml:465
 #, no-c-format
 msgid ""
 "The directory <filename>/var/log/installer</filename> and all files in it "
 "will be deleted from your system if you purge the package "
 "<classname>installation-report</classname>."
-msgstr "如果您清除 <classname>installation-report</classname> 软件包，<filename>/var/log/installer</filename> 目录及其中的文件将从您的系统中删除。"
+msgstr ""
+"如果您清除 <classname>installation-report</classname> 软件包，<filename>/var/"
+"log/installer</filename> 目录及其中的文件将从您的系统中删除。"
 
 #. Tag: para
-#: preseed.xml:465
+#: preseed.xml:473
 #, no-c-format
 msgid ""
 "To check possible values for templates, you can use <command>nano</command> "
@@ -657,10 +710,14 @@ msgid ""
 "installation is in progress. View <filename>templates.dat</filename> for the "
 "raw templates and <filename>questions.dat</filename> for the current values "
 "and for the values assigned to variables."
-msgstr "为了检测模板可用的值，您可以在安装进行中使用 <command>nano</command> 检查 <filename>/var/lib/cdebconf</filename> 下的文件。<filename>templates.dat</filename> 是原始的模板，<filename>questions.dat</filename> 是当前变量设置的值。"
+msgstr ""
+"为了检测模板可用的值，您可以在安装进行中使用 <command>nano</command> 检查 "
+"<filename>/var/lib/cdebconf</filename> 下的文件。<filename>templates.dat</"
+"filename> 是原始的模板，<filename>questions.dat</filename> 是当前变量设置的"
+"值。"
 
 #. Tag: para
-#: preseed.xml:473
+#: preseed.xml:481
 #, no-c-format
 msgid ""
 "To check if the format of your preconfiguration file is valid before "
@@ -671,13 +728,13 @@ msgstr ""
 "selections -c <replaceable>preseed.cfg</replaceable></command> 命令。"
 
 #. Tag: title
-#: preseed.xml:483
+#: preseed.xml:491
 #, no-c-format
 msgid "Contents of the preconfiguration file"
 msgstr "预置文件的内容"
 
 #. Tag: para
-#: preseed.xml:489
+#: preseed.xml:497
 #, no-c-format
 msgid ""
 "Note that this example is based on an installation for the Intel x86 "
@@ -691,22 +748,23 @@ msgstr ""
 "设置替换。"
 
 #. Tag: title
-#: preseed.xml:500
+#: preseed.xml:508
 #, no-c-format
 msgid "Localization"
 msgstr "本地化"
 
 #. Tag: para
-#: preseed.xml:501
+#: preseed.xml:509
 #, no-c-format
 msgid ""
 "Setting localization values will only work if you are using initrd "
 "preseeding. With all other methods the preconfiguration file will only be "
 "loaded after these questions have been asked."
-msgstr "设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载的。"
+msgstr ""
+"设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载的。"
 
 #. Tag: para
-#: preseed.xml:507
+#: preseed.xml:515
 #, no-c-format
 msgid ""
 "The locale can be used to specify both language and country. To specify the "
@@ -717,7 +775,7 @@ msgstr ""
 "installer/locale=<replaceable>en_US</replaceable></userinput>。"
 
 #. Tag: screen
-#: preseed.xml:513
+#: preseed.xml:521
 #, no-c-format
 msgid ""
 "# Locale sets language and country.\n"
@@ -727,7 +785,7 @@ msgstr ""
 "d-i debian-installer/locale string en_US"
 
 #. Tag: para
-#: preseed.xml:515
+#: preseed.xml:523
 #, no-c-format
 msgid ""
 "Keyboard configuration consists of selecting a keyboard architecture and a "
@@ -739,7 +797,7 @@ msgstr ""
 "体系，因此通常不必预置。键映射必须对所选择的键盘体系有效。"
 
 #. Tag: screen
-#: preseed.xml:522
+#: preseed.xml:530
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
@@ -755,7 +813,7 @@ msgstr ""
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
 #. Tag: para
-#: preseed.xml:524
+#: preseed.xml:532
 #, no-c-format
 msgid ""
 "To skip keyboard configuration, preseed <classname>console-tools/archs</"
@@ -766,7 +824,7 @@ msgstr ""
 "tools/archs</classname>。这将导致内核键映射保持活动。"
 
 #. Tag: para
-#: preseed.xml:533
+#: preseed.xml:541
 #, no-c-format
 msgid ""
 "The changes in the input layer for 2.6 kernels have made the keyboard "
@@ -777,13 +835,13 @@ msgstr ""
 "<quote>PC</quote> (<userinput>at</userinput>) keymap。"
 
 #. Tag: title
-#: preseed.xml:543
+#: preseed.xml:551
 #, no-c-format
 msgid "Network configuration"
 msgstr "网络设置"
 
 #. Tag: para
-#: preseed.xml:544
+#: preseed.xml:552
 #, no-c-format
 msgid ""
 "Of course, preseeding the network configuration won't work if you're loading "
@@ -796,7 +854,7 @@ msgstr ""
 "助。如果您计划从网络加载预置文件，应该使用传递网络设置给内核引导参数的方式。"
 
 #. Tag: para
-#: preseed.xml:552
+#: preseed.xml:560
 #, no-c-format
 msgid ""
 "If you need to pick a particular interface when netbooting before loading a "
@@ -809,7 +867,7 @@ msgstr ""
 "userinput>。"
 
 #. Tag: screen
-#: preseed.xml:560
+#: preseed.xml:568
 #, no-c-format
 msgid ""
 "# netcfg will choose an interface that has link if possible. This makes it\n"
@@ -891,13 +949,13 @@ msgstr ""
 "#d-i netcfg/dhcp_hostname string radish"
 
 #. Tag: title
-#: preseed.xml:565
+#: preseed.xml:573
 #, no-c-format
 msgid "Mirror settings"
 msgstr "镜像设置"
 
 #. Tag: para
-#: preseed.xml:566
+#: preseed.xml:574
 #, no-c-format
 msgid ""
 "Depending on the installation method you use, a mirror may be used both to "
@@ -908,7 +966,7 @@ msgstr ""
 "系统建立 <filename>/etc/apt/sources.list</filename>。"
 
 #. Tag: para
-#: preseed.xml:573
+#: preseed.xml:581
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -917,7 +975,7 @@ msgstr ""
 "参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
 
 #. Tag: para
-#: preseed.xml:578
+#: preseed.xml:586
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -933,7 +991,7 @@ msgstr ""
 "suite</classname> 的值相同。"
 
 #. Tag: screen
-#: preseed.xml:590
+#: preseed.xml:598
 #, no-c-format
 msgid ""
 "d-i mirror/country string enter information manually\n"
@@ -957,13 +1015,13 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:595
+#: preseed.xml:603
 #, no-c-format
 msgid "Partitioning"
 msgstr "分区"
 
 #. Tag: para
-#: preseed.xml:596
+#: preseed.xml:604
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
@@ -973,10 +1031,14 @@ msgid ""
 "recipe file or a recipe included in the preconfiguration file. It is "
 "currently not possible to partition multiple disks using preseeding nor to "
 "set up RAID."
-msgstr "使用预置分区硬盘受限于 <classname>partman-auto</classname> 提供的支持。您可以选择使用磁盘上已有的空闲分区或者整个磁盘。磁盘的布局将取决于所使用的预定义配方，自定义的配方文件或预置文件包含的配方。当前还不能使用预置配置多个磁盘来建立 RAID。"
+msgstr ""
+"使用预置分区硬盘受限于 <classname>partman-auto</classname> 提供的支持。您可以"
+"选择使用磁盘上已有的空闲分区或者整个磁盘。磁盘的布局将取决于所使用的预定义配"
+"方，自定义的配方文件或预置文件包含的配方。当前还不能使用预置配置多个磁盘来建"
+"立 RAID。"
 
 #. Tag: para
-#: preseed.xml:608
+#: preseed.xml:616
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -987,7 +1049,7 @@ msgstr ""
 "确的那一个。"
 
 #. Tag: screen
-#: preseed.xml:616
+#: preseed.xml:624
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1045,7 +1107,8 @@ msgid ""
 "d-i partman/confirm boolean true"
 msgstr ""
 "# If the system has free space you can choose to only partition that space.\n"
-"# Note: this template must be preseeded with a localized (translated) value.\n"
+"# Note: this template must be preseeded with a localized (translated) "
+"value.\n"
 "#d-i partman-auto/init_automatically_partition \\\n"
 "#      select Use the largest continuous free space\n"
 "\n"
@@ -1055,7 +1118,8 @@ msgstr ""
 "d-i partman-auto/disk string /dev/discs/disc0/disc\n"
 "\n"
 "# You can choose from any of the predefined partitioning recipes.\n"
-"# Note: this template must be preseeded with a localized (translated) value.\n"
+"# Note: this template must be preseeded with a localized (translated) "
+"value.\n"
 "d-i partman-auto/choose_recipe \\\n"
 "       select All files in one partition (recommended for new users)\n"
 "#d-i partman-auto/choose_recipe \\\n"
@@ -1064,7 +1128,8 @@ msgstr ""
 "#       select Separate /home, /usr, /var, and /tmp partitions\n"
 "\n"
 "# Or provide a recipe of your own...\n"
-"# The recipe format is documented in the file devel/partman-auto-recipe.txt.\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"
@@ -1096,13 +1161,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:621
+#: preseed.xml:629
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "时钟与时区设置"
 
 #. Tag: screen
-#: preseed.xml:623
+#: preseed.xml:631
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1120,13 +1185,13 @@ msgstr ""
 "d-i time/zone string US/Eastern"
 
 #. Tag: title
-#: preseed.xml:628
+#: preseed.xml:636
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:629
+#: preseed.xml:637
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -1139,7 +1204,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:637
+#: preseed.xml:645
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -1171,13 +1236,13 @@ msgstr ""
 "#d-i apt-setup/local0/key string http://local.server/key"
 
 #. Tag: title
-#: preseed.xml:642
+#: preseed.xml:650
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:643
+#: preseed.xml:651
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1188,7 +1253,7 @@ msgstr ""
 "或 MD5 <emphasis>hashes</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:650
+#: preseed.xml:658
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1196,10 +1261,12 @@ msgid ""
 "passwords. Using MD5 hashes is considered slightly better in terms of "
 "security but it might also give a false sense of security as access to a MD5 "
 "hash allows for brute force attacks."
-msgstr "要知道预置密码并不安全，每个可以访问预置文件的用户都可以看到这些密码。使用 MD5 哈西表相对安全一些，但也会造成安全的假象，MD5 哈西表也可以被暴力破解。"
+msgstr ""
+"要知道预置密码并不安全，每个可以访问预置文件的用户都可以看到这些密码。使用 "
+"MD5 哈西表相对安全一些，但也会造成安全的假象，MD5 哈西表也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:660
+#: preseed.xml:668
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1245,7 +1312,7 @@ msgstr ""
 "#d-i passwd/user-password-crypted password [MD5 hash]"
 
 #. Tag: para
-#: preseed.xml:662
+#: preseed.xml:670
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1262,26 +1329,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:672
+#: preseed.xml:680
 #, no-c-format
 msgid ""
 "An MD5 hash for a password can be generated using the following command."
 msgstr "密码的 MD5 hash 可以用下面命令产生。"
 
 #. Tag: screen
-#: preseed.xml:676
+#: preseed.xml:684
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 
 #. Tag: title
-#: preseed.xml:682
+#: preseed.xml:690
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:683
+#: preseed.xml:691
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1290,7 +1357,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:690
+#: preseed.xml:698
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1302,13 +1369,13 @@ msgstr ""
 "#d-i base-installer/kernel/linux/initramfs-generators string yaird"
 
 #. Tag: title
-#: preseed.xml:695
+#: preseed.xml:703
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装引导加载器"
 
 #. Tag: screen
-#: preseed.xml:697
+#: preseed.xml:705
 #, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -1352,13 +1419,13 @@ msgstr ""
 "#d-i grub-installer/with_other_os boolean false"
 
 #. Tag: title
-#: preseed.xml:702
+#: preseed.xml:710
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:703
+#: preseed.xml:711
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -1366,76 +1433,89 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有的任务是："
 
 #. Tag: userinput
-#: preseed.xml:712
-#, no-c-format
-msgid "Standard system"
+#: preseed.xml:720
+#, fuzzy, no-c-format
+msgid "standard"
 msgstr "标准系统"
 
 #. Tag: userinput
-#: preseed.xml:715
+#: preseed.xml:723
 #, no-c-format
-msgid "Desktop environment"
-msgstr "桌面环境"
+msgid "desktop"
+msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:718
+#: preseed.xml:726
 #, no-c-format
-msgid "Web server"
-msgstr "web 服务器"
+msgid "gnome-desktop"
+msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:721
+#: preseed.xml:729
 #, no-c-format
-msgid "Print server"
+msgid "kde-desktop"
+msgstr ""
+
+#. Tag: userinput
+#: preseed.xml:732
+#, fuzzy, no-c-format
+msgid "web-server"
+msgstr "web 服务器"
+
+#. Tag: userinput
+#: preseed.xml:735
+#, fuzzy, no-c-format
+msgid "print-server"
 msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:724
-#, no-c-format
-msgid "DNS server"
-msgstr "DNS 服务器"
+#: preseed.xml:738
+#, fuzzy, no-c-format
+msgid "dns-server"
+msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:727
-#, no-c-format
-msgid "File server"
+#: preseed.xml:741
+#, fuzzy, no-c-format
+msgid "file-server"
 msgstr "文件服务器"
 
 #. Tag: userinput
-#: preseed.xml:730
-#, no-c-format
-msgid "Mail server"
+#: preseed.xml:744
+#, fuzzy, no-c-format
+msgid "mail-server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
-#: preseed.xml:733
-#, no-c-format
-msgid "SQL database"
+#: preseed.xml:747
+#, fuzzy, no-c-format
+msgid "sql-database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
-#: preseed.xml:736
-#, no-c-format
-msgid "Laptop"
+#: preseed.xml:750
+#, fuzzy, no-c-format
+msgid "laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: preseed.xml:740
-#, no-c-format
+#: preseed.xml:754
+#, fuzzy, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
 "of packages in some other way. We recommend always including the "
-"<userinput>Standard system</userinput> task."
+"<userinput>standard</userinput> task."
 msgstr ""
 "您可以不选任务，并用其他方法安装一系列软件包。我们推荐选上 <userinput>基本系"
 "统</userinput> 任务。"
 
 #. Tag: screen
-#: preseed.xml:748
-#, no-c-format
+#: preseed.xml:762
+#, fuzzy, no-c-format
 msgid ""
-"tasksel tasksel/first multiselect Standard system, Desktop environment\n"
-"#tasksel tasksel/first multiselect Standard system, Web server\n"
+"tasksel tasksel/first multiselect standard, desktop\n"
+"#tasksel tasksel/first multiselect standard, web-server\n"
+"#tasksel tasksel/first multiselect standard, kde-desktop\n"
 "\n"
 "# Some versions of the installer can report back on what software you have\n"
 "# installed, and what software you use. The default is not to report back,\n"
@@ -1453,13 +1533,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:753
+#: preseed.xml:767
 #, no-c-format
 msgid "Finishing up the first stage install"
 msgstr "完成第一阶段安装"
 
 #. Tag: screen
-#: preseed.xml:755
+#: preseed.xml:769
 #, no-c-format
 msgid ""
 "# Avoid that last message about the install being complete.\n"
@@ -1477,13 +1557,13 @@ msgstr ""
 "#d-i cdrom-detect/eject boolean false"
 
 #. Tag: title
-#: preseed.xml:760
+#: preseed.xml:774
 #, no-c-format
 msgid "Mailer configuration"
 msgstr "邮件设置"
 
 #. Tag: para
-#: preseed.xml:761
+#: preseed.xml:775
 #, no-c-format
 msgid ""
 "During a normal install, exim asks only a few questions. Here's how to avoid "
@@ -1492,7 +1572,7 @@ msgstr ""
 "普通安装方式下，exim 会问一些问题。这里是避免的方法。也可以有更多的预置内容。"
 
 #. Tag: screen
-#: preseed.xml:768
+#: preseed.xml:782
 #, no-c-format
 msgid ""
 "exim4-config exim4/dc_eximconfig_configtype \\\n"
@@ -1508,13 +1588,13 @@ msgstr ""
 "exim4-config exim4/dc_postmaster string"
 
 #. Tag: title
-#: preseed.xml:773
+#: preseed.xml:787
 #, no-c-format
 msgid "X configuration"
 msgstr "设置 X"
 
 #. Tag: para
-#: preseed.xml:774
+#: preseed.xml:788
 #, no-c-format
 msgid ""
 "Preseeding Debian's X config is possible, but you probably need to know some "
@@ -1525,7 +1605,7 @@ msgstr ""
 "的 X 配置工具无法自动设置每一件事。"
 
 #. Tag: screen
-#: preseed.xml:782
+#: preseed.xml:796
 #, no-c-format
 msgid ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -1573,13 +1653,13 @@ msgstr ""
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
-#: preseed.xml:787
+#: preseed.xml:801
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:789
+#: preseed.xml:803
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -1599,19 +1679,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:795
+#: preseed.xml:809
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:798
+#: preseed.xml:812
 #, no-c-format
 msgid "Shell commands"
 msgstr "shell 命令"
 
 #. Tag: screen
-#: preseed.xml:800
+#: preseed.xml:814
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -1649,13 +1729,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:805
+#: preseed.xml:819
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:806
+#: preseed.xml:820
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -1663,10 +1743,13 @@ msgid ""
 "existing settings from files loaded earlier. This makes it possible to put, "
 "for example, general networking settings for your location in one file and "
 "more specific settings for certain configurations in other files."
-msgstr "可以在一个预置文件里面包含另外的预置文件。这些文件里面的任何设置将覆盖前面加载的设置。这就有一种用法，如，通用的网络设置放在一个文件，其他规格的设置放在另外的文件里面。"
+msgstr ""
+"可以在一个预置文件里面包含另外的预置文件。这些文件里面的任何设置将覆盖前面加"
+"载的设置。这就有一种用法，如，通用的网络设置放在一个文件，其他规格的设置放在"
+"另外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:816
+#: preseed.xml:830
 #, no-c-format
 msgid ""
 "# More that one file can be listed, separated by spaces; all will be\n"
@@ -1700,3 +1783,9 @@ msgstr ""
 "# preconfiguration files, includes those files. \n"
 "#d-i preseed/include_command \\\n"
 "#      string echo if [ \"`hostname`\" = bob ]; then echo bob.cfg; fi"
+
+#~ msgid "Desktop environment"
+#~ msgstr "桌面环境"
+
+#~ msgid "DNS server"
+#~ msgstr "DNS 服务器"