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

3 files changed, 187 insertions, 108 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 1d5fe8498..431adbb49 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -2845,16 +2845,13 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:2181
 #, no-c-format
-#| msgid ""
-#| "Via serial console: Using a null modem cable, you can connect to the "
-#| "serial port of your Cobalt machine (using 115200 bps) and perform the "
-#| "installation this way. This option is not available on Qube 2700 (Qube1) "
-#| "machines since they have no serial port."
 msgid ""
 "Via serial console: Using a null modem cable, you can connect to the serial "
 "port of your Cobalt machine (using 115200 bps) and perform the installation "
 "this way."
-msgstr "通过串口控制台：使用 null modem 线，您可以连接到 Cobalt 机器的串口 (使用 115200 bps) 然后进行安装。"
+msgstr ""
+"通过串口控制台：使用 null modem 线，您可以连接到 Cobalt 机器的串口 (使用 "
+"115200 bps) 然后进行安装。"
 
 #. Tag: para
 #: boot-installer.xml:2223
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 8dda54999..7cfdd76f1 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -2140,24 +2140,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1055
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
-#| "covered here. This includes the Cobalt Qube 2700 (Qube1), RaQ, Qube2 and "
-#| "RaQ2, and the Gateway Microserver. </para></listitem> <listitem><para> "
-#| "MIPS Malta: this platform is emulated by QEMU and is therefore a nice way "
-#| "to test and run Debian on MIPS if you don't have the hardware. </para></"
-#| "listitem> <listitem><para> Broadcom BCM91250A (SWARM): this is an ATX "
-#| "form factor evaluation board from Broadcom based on the dual-core SB1 "
-#| "1250 CPU. </para></listitem> <listitem><para> Broadcom BCM91480B "
-#| "(BigSur): this is an ATX form factor evaluation board from Broadcom based "
-#| "on the quad-core SB1A 1480 CPU. </para></listitem> </itemizedlist> "
-#| "Complete information regarding supported mips/mipsel machines can be "
-#| "found at the <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. "
-#| "In the following, only the systems supported by the Debian installer will "
-#| "be covered. If you are looking for support for other subarchitectures, "
-#| "please contact the <ulink url=\"&url-list-subscribe;\"> debian-&arch-"
-#| "listname; mailing list</ulink>."
 msgid ""
 "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -2175,7 +2157,19 @@ msgid ""
 "by the Debian installer will be covered. If you are looking for support for "
 "other subarchitectures, please contact the <ulink url=\"&url-list-subscribe;"
 "\"> debian-&arch-listname; mailing list</ulink>."
-msgstr "&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt RaQ、Qube2 和 RaQ2，以及 Gateway Microserver。</para></listitem> <listitem><para> MIPS Malta：该平台由 QEMU 模拟，如果您没有硬件设备，使用它来测试运行在 MIPS 上的 Debian 是个不错的方法。</para></listitem> <listitem><para> Broadcom BCM91250A (SWARM)：此为 ATX 规格的开发板，基于 Broadcom 的双核 SB1 1250 处理器。</para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): 此为 ATX 规格的开发板，基于 Broadcom 的四核 SB1A 1480 处理器。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
+msgstr ""
+"&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> "
+"Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt RaQ、Qube2 "
+"和 RaQ2，以及 Gateway Microserver。</para></listitem> <listitem><para> MIPS "
+"Malta：该平台由 QEMU 模拟，如果您没有硬件设备，使用它来测试运行在 MIPS 上的 "
+"Debian 是个不错的方法。</para></listitem> <listitem><para> Broadcom "
+"BCM91250A (SWARM)：此为 ATX 规格的开发板，基于 Broadcom 的双核 SB1 1250 处理"
+"器。</para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): 此为 "
+"ATX 规格的开发板，基于 Broadcom 的四核 SB1A 1480 处理器。</para></listitem> "
+"</itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-"
+"linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的"
+"系统。如果您寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;"
+"\"> debian-&arch-listname; mailing list</ulink>。"
 
 #. Tag: title
 #: hardware.xml:1095
@@ -2186,7 +2180,6 @@ msgstr "CPU/机器类型"
 #. Tag: para
 #: hardware.xml:1097
 #, no-c-format
-#| msgid "All MIPS based Cobalt machines are supported."
 msgid ""
 "All MIPS based Cobalt machines are supported with the exception of the Qube "
 "2700 (Qube 1)."
@@ -3906,18 +3899,6 @@ msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
 #. Tag: para
 #: hardware.xml:2298
 #, no-c-format
-#| msgid ""
-#| "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable "
-#| "of working with a logical blocksize of 512 bytes. Many of the SCSI CD-ROM "
-#| "drives sold on the PC market do not have this capability. If your CD-ROM "
-#| "drive has a jumper labeled <quote>Unix/PC</quote> or <quote>512/2048</"
-#| "quote>, place it in the <quote>Unix</quote> or <quote>512</quote> "
-#| "position. To start the install, simply choose the <quote>System "
-#| "installation</quote> entry in the firmware. The Broadcom BCM91250A "
-#| "supports standard IDE devices, including CD-ROM drives, but CD images for "
-#| "this platform are currently not provided because the firmware doesn't "
-#| "recognize CD drives. In order to install Debian on an Broadcom BCM91480B "
-#| "evaluation board, you need an PCI IDE, SATA or SCSI card."
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
 "working with a logical blocksize of 512 bytes. Many of the SCSI CD-ROM "
@@ -3926,7 +3907,12 @@ msgid ""
 "quote>, place it in the <quote>Unix</quote> or <quote>512</quote> position. "
 "To start the install, simply choose the <quote>System installation</quote> "
 "entry in the firmware."
-msgstr "在 SGI 的机器上，从 CD-ROM 启动需要一台能使用 512 字节逻辑块的 SCSI CD-ROM 驱动器。很多面向 PC 市场的 SCSI CD-ROM 驱动器并不具有这个能力。如果您的 CD-ROM 驱动器上有标注为 <quote>Unix/PC</quote> 或 <quote>512/2048</quote> 的跳线，请将其置于 <quote>Unix</quote> 或 <quote>512</quote> 的位置上。要开始安装，请从固件上选择 <quote>System installation</quote> 项。"
+msgstr ""
+"在 SGI 的机器上，从 CD-ROM 启动需要一台能使用 512 字节逻辑块的 SCSI CD-ROM 驱"
+"动器。很多面向 PC 市场的 SCSI CD-ROM 驱动器并不具有这个能力。如果您的 CD-ROM "
+"驱动器上有标注为 <quote>Unix/PC</quote> 或 <quote>512/2048</quote> 的跳线，请"
+"将其置于 <quote>Unix</quote> 或 <quote>512</quote> 的位置上。要开始安装，请从"
+"固件上选择 <quote>System installation</quote> 项。"
 
 #. Tag: para
 #: hardware.xml:2309
@@ -3936,7 +3922,10 @@ msgid ""
 "drives, but CD images for this platform are currently not provided because "
 "the firmware doesn't recognize CD drives. In order to install Debian on an "
 "Broadcom BCM91480B evaluation board, you need an PCI IDE, SATA or SCSI card."
-msgstr "Broadcom BCM91250A 支持标准的 IDE 设备，包括 CD-ROM 驱动器。可是当前并没有提供该平台的 CD 映像，这是因为其固件无法识别 CD 驱动器。为了安装 Debian 到 Broadcom BCM91480B 开发板，您需要一个 PCI IDE、SATA 或 SCSI 卡。"
+msgstr ""
+"Broadcom BCM91250A 支持标准的 IDE 设备，包括 CD-ROM 驱动器。可是当前并没有提"
+"供该平台的 CD 映像，这是因为其固件无法识别 CD 驱动器。为了安装 Debian 到 "
+"Broadcom BCM91480B 开发板，您需要一个 PCI IDE、SATA 或 SCSI 卡。"
 
 #. Tag: title
 #: hardware.xml:2320
@@ -4020,15 +4009,13 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:2367
 #, no-c-format
-#| msgid ""
-#| "You can also <emphasis>boot</emphasis> the installation system over the "
-#| "network. <phrase arch=\"mips\">This is the preferred installation "
-#| "technique for &arch-title;.</phrase>"
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
 "network. <phrase arch=\"mips;mipsel\">This is the preferred installation "
 "technique for &arch-title;.</phrase>"
-msgstr "您还可以从网络<emphasis>引导(boot)</emphasis>系统。<phrase arch=\"mips;mipsel\">在 &arch-title; 下此为推荐的安装技术。</phrase>"
+msgstr ""
+"您还可以从网络<emphasis>引导(boot)</emphasis>系统。<phrase arch=\"mips;mipsel"
+"\">在 &arch-title; 下此为推荐的安装技术。</phrase>"
 
 #. Tag: para
 #: hardware.xml:2373
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 7109c2b31..5eb9def4f 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: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2009-04-29 00:14+0000\n"
+"POT-Creation-Date: 2009-05-06 00:13+0000\n"
 "PO-Revision-Date: 2009-05-04 22:38+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -304,7 +304,10 @@ msgid ""
 "parameter, either manually at boot time or by editing the bootloader "
 "configuration file (e.g. <filename>syslinux.cfg</filename>) and adding the "
 "parameter to the end of the append line(s) for the kernel."
-msgstr "其他的预置方法，您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递引导参数完成，可以在启动时手动指定，或者编辑 bootloader 的配置文件(如: <filename>syslinux.cfg</filename>)，并在内核的附加行后面添加参数。"
+msgstr ""
+"其他的预置方法，您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递"
+"引导参数完成，可以在启动时手动指定，或者编辑 bootloader 的配置文件(如: "
+"<filename>syslinux.cfg</filename>)，并在内核的附加行后面添加参数。"
 
 #. Tag: para
 #: preseed.xml:260
@@ -327,7 +330,9 @@ msgid ""
 "optionally specify a checksum for the file. Currently this needs to be a "
 "md5sum, and if specified it must match the preconfiguration file or the "
 "installer will refuse to use it."
-msgstr "为了保证安装程序得到正确的预置文件，您可以选择为预置文件指定校验和。当前使用的是 md5sum，如果指定了，那么配置文件必须匹配，否则安装程序将拒绝使用。"
+msgstr ""
+"为了保证安装程序得到正确的预置文件，您可以选择为预置文件指定校验和。当前使用"
+"的是 md5sum，如果指定了，那么配置文件必须匹配，否则安装程序将拒绝使用。"
 
 #. Tag: screen
 #: preseed.xml:276
@@ -484,7 +489,10 @@ msgid ""
 "options and 32 environment options, including any options added by default "
 "for the installer. If these numbers are exceeded, the kernel will panic "
 "(crash). (For earlier kernels, these numbers were lower.)"
-msgstr "当前的 linux 内核(2.6.9 和更新的)，可以指定最多 32 个命令行选项和 32 个环境变量选项，包括安装程序默认的选项。如果数目超出，内核将崩溃。(早期的内核，接受的数目更少。)"
+msgstr ""
+"当前的 linux 内核(2.6.9 和更新的)，可以指定最多 32 个命令行选项和 32 个环境变"
+"量选项，包括安装程序默认的选项。如果数目超出，内核将崩溃。(早期的内核，接受的"
+"数目更少。)"
 
 #. Tag: para
 #: preseed.xml:357
@@ -648,7 +656,12 @@ msgid ""
 "<email>debian-boot@lists.debian.org</email> mailing list so that we can "
 "avoid namespace conflicts, and perhaps add an alias for the parameter for "
 "you."
-msgstr "只要您愿意，当然可以扩充这个概念，合理应用 auto-install 名字空间就是为了这个目的。这就可能会有诸如 <literal>auto-install/style</literal> 的内容加入到您的脚本。如果您觉得需要这样做，请发邮件到 <email>debian-boot@lists.debian.org</email> 邮件列表说明，我们可以避免名字空间的冲突，还可能会为您增加一个参数的别名。"
+msgstr ""
+"只要您愿意，当然可以扩充这个概念，合理应用 auto-install 名字空间就是为了这个"
+"目的。这就可能会有诸如 <literal>auto-install/style</literal> 的内容加入到您的"
+"脚本。如果您觉得需要这样做，请发邮件到 <email>debian-boot@lists.debian.org</"
+"email> 邮件列表说明，我们可以避免名字空间的冲突，还可能会为您增加一个参数的别"
+"名。"
 
 #. Tag: para
 #: preseed.xml:461
@@ -680,7 +693,10 @@ msgid ""
 "install while using DHCP are: <literal>interface=auto netcfg/"
 "dhcp_timeout=60</literal> which makes the machine choose the first viable "
 "NIC and be more patient about getting a reply to its DHCP query."
-msgstr "在使用 DHCP 自动安装时还有一个有趣的额外选项：<literal>interface=auto netcfg/dhcp_timeout=60</literal>，这让机器使用第一个可用的网卡并耐心地等待 DHCP 的查询。"
+msgstr ""
+"在使用 DHCP 自动安装时还有一个有趣的额外选项：<literal>interface=auto netcfg/"
+"dhcp_timeout=60</literal>，这让机器使用第一个可用的网卡并耐心地等待 DHCP 的查"
+"询。"
 
 #. Tag: para
 #: preseed.xml:484
@@ -691,7 +707,9 @@ msgid ""
 "\">website of its developer</ulink>. The examples available there also show "
 "many other nice effects that can be achieved by creative use of "
 "preconfiguration."
-msgstr "更多使用此框架的例子，包括示例脚本和类，可以在<ulink url=\"http://hands.com/d-i/\">其开发者的网站</ulink>找到。那里的例子还显示出预置可以达到更多的效果。"
+msgstr ""
+"更多使用此框架的例子，包括示例脚本和类，可以在<ulink url=\"http://hands.com/"
+"d-i/\">其开发者的网站</ulink>找到。那里的例子还显示出预置可以达到更多的效果。"
 
 #. Tag: title
 #: preseed.xml:495
@@ -867,7 +885,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:539
@@ -889,7 +911,10 @@ msgid ""
 "identify themselves as \"d-i\", so it will not affect regular DHCP clients, "
 "but only the installer. You can also put the text in a stanza for only one "
 "particular host to avoid preseeding all installs on your network."
-msgstr "注意，上面的例子中使用的文件名限定 DHCP 客户端自己是 \"d-i\"，因此仅适用于安装程序，而对普通的 DHCP 客户端无效。您可以将只用于一个特殊主机的文字放在一段，以避免预置网络中的其他安装。"
+msgstr ""
+"注意，上面的例子中使用的文件名限定 DHCP 客户端自己是 \"d-i\"，因此仅适用于安"
+"装程序，而对普通的 DHCP 客户端无效。您可以将只用于一个特殊主机的文字放在一"
+"段，以避免预置网络中的其他安装。"
 
 #. Tag: para
 #: preseed.xml:548
@@ -918,7 +943,9 @@ 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:569
@@ -952,7 +979,10 @@ msgid ""
 "good place to split a line is after the question name; a bad place is "
 "between type and value. Split lines will be joined into a single line with "
 "all leading/trailing whitespace condensed to a single space."
-msgstr "一行可以通过行尾的反斜杠(<quote><literal>\\</literal></quote>)连接符分成多行。分割一行比较妥当的地方是在问题后面；在类型和值之间分割则是糟糕做法。被分割的行连接时会把行首和行尾的空格缩减为一个空格，再组成单独一行。"
+msgstr ""
+"一行可以通过行尾的反斜杠(<quote><literal>\\</literal></quote>)连接符分成多"
+"行。分割一行比较妥当的地方是在问题后面；在类型和值之间分割则是糟糕做法。被分"
+"割的行连接时会把行首和行尾的空格缩减为一个空格，再组成单独一行。"
 
 #. Tag: para
 #: preseed.xml:589
@@ -1067,7 +1097,11 @@ 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:655
@@ -1095,7 +1129,10 @@ msgid ""
 "examples (like keyboard selection and bootloader installation) may not be "
 "relevant and will need to be replaced by debconf settings appropriate for "
 "your architecture."
-msgstr "请注意，这里的例子是基于 Intel x86 架构的安装过程。如果您安装到其他架构，其中的一些例子(像键盘选择和 bootloader 安装)可能不恰当，需要用适合您架构的 debconf 设置替换。"
+msgstr ""
+"请注意，这里的例子是基于 Intel x86 架构的安装过程。如果您安装到其他架构，其中"
+"的一些例子(像键盘选择和 bootloader 安装)可能不恰当，需要用适合您架构的 "
+"debconf 设置替换。"
 
 #. Tag: title
 #: preseed.xml:683
@@ -1123,7 +1160,11 @@ msgid ""
 "automatically select a locale that is valid for the selected language. To "
 "specify the locale as a boot parameter, use "
 "<userinput>locale=<replaceable>en_US</replaceable></userinput>."
-msgstr "locale 用于指定语言和国家或者任何 &d-i; 支持的语言与地区的组合。如果组合起来的不是有效的 locale，安装程序会自动选择一个指定语言可用的 locale。要在引导参数上指定本地，比如使用 <userinput>locale=<replaceable>en_US</replaceable></userinput>。"
+msgstr ""
+"locale 用于指定语言和国家或者任何 &d-i; 支持的语言与地区的组合。如果组合起来"
+"的不是有效的 locale，安装程序会自动选择一个指定语言可用的 locale。要在引导参"
+"数上指定本地，比如使用 <userinput>locale=<replaceable>en_US</replaceable></"
+"userinput>。"
 
 #. Tag: screen
 #: preseed.xml:699
@@ -1671,7 +1712,10 @@ msgid ""
 "&d-i;. The responsibility to get the various recipes right (so they make "
 "sense and don't conflict) lies with the user. Check <filename>/var/log/"
 "syslog</filename> if you run into problems."
-msgstr "这种自动分区方式很容易出错。&d-i; 开发人员对它的功能只进行了相对较少的测试。让各种方案都正确(有意义而不冲突)的责任在于用户。如果您遇到问题，检查一下 <filename>/var/log/syslog</filename>。"
+msgstr ""
+"这种自动分区方式很容易出错。&d-i; 开发人员对它的功能只进行了相对较少的测试。"
+"让各种方案都正确(有意义而不冲突)的责任在于用户。如果您遇到问题，检查一下 "
+"<filename>/var/log/syslog</filename>。"
 
 #. Tag: screen
 #: preseed.xml:870
@@ -1774,11 +1818,60 @@ msgstr ""
 #. Tag: title
 #: preseed.xml:875
 #, no-c-format
+msgid "Controlling how partitions are mounted"
+msgstr ""
+
+#. Tag: para
+#: preseed.xml:876
+#, no-c-format
+msgid ""
+"Normally, filesystems are mounted using a universally unique identifier "
+"(UUID) as a key; this allows them to be mounted properly even if their "
+"device name changes. UUIDs are long and difficult to read, so, if you "
+"prefer, the installer can mount filesystems based on the traditional device "
+"names, or based on a label you assign. If you ask the installer to mount by "
+"label, any filesystems without a label will be mounted using a UUID instead."
+msgstr ""
+
+#. Tag: para
+#: preseed.xml:885
+#, no-c-format
+msgid ""
+"Devices with stable names, such as LVM logical volumes, will continue to use "
+"their traditional names rather than UUIDs."
+msgstr ""
+
+#. Tag: para
+#: preseed.xml:892
+#, no-c-format
+msgid ""
+"Traditional device names may change based on the order in which the kernel "
+"discovers devices at boot, which may cause the wrong filesystem to be "
+"mounted. Similarly, labels are likely to clash if you plug in a new disk or "
+"a USB drive, and if that happens your system's behaviour when started will "
+"be random."
+msgstr ""
+
+#. Tag: screen
+#: preseed.xml:902
+#, no-c-format
+msgid ""
+"# The default is to mount by UUID, but you can also choose \"traditional\" "
+"to\n"
+"# use traditional device names, or \"label\" to try filesystem labels "
+"before\n"
+"# falling back to UUIDs.\n"
+"#d-i partman/mount_style select uuid"
+msgstr ""
+
+#. Tag: title
+#: preseed.xml:907
+#, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:876
+#: preseed.xml:908
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1787,7 +1880,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:883
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1809,13 +1902,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string linux-image-2.6-486"
 
 #. Tag: title
-#: preseed.xml:888
+#: preseed.xml:920
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:889
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1826,7 +1919,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:896
+#: preseed.xml:928
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1839,7 +1932,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:906
+#: preseed.xml:938
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1897,7 +1990,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:908
+#: preseed.xml:940
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1914,26 +2007,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:950
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "下面的命令可用于生成密码的 MD5 值。"
 
 #. Tag: screen
-#: preseed.xml:922
+#: preseed.xml:954
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:928
+#: preseed.xml:960
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:929
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -1946,7 +2039,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:937
+#: preseed.xml:969
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2004,13 +2097,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:942
+#: preseed.xml:974
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:943
+#: preseed.xml:975
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2018,82 +2111,84 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括："
 
 #. Tag: userinput
-#: preseed.xml:952
+#: preseed.xml:984
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:955
+#: preseed.xml:987
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:958
+#: preseed.xml:990
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:961
+#: preseed.xml:993
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:964
+#: preseed.xml:996
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:967
+#: preseed.xml:999
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:970
+#: preseed.xml:1002
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:973
+#: preseed.xml:1005
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:976
+#: preseed.xml:1008
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:979
+#: preseed.xml:1011
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:982
+#: preseed.xml:1014
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:986
+#: preseed.xml:1018
 #, 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</userinput> task."
-msgstr "您可以不选任务，并用其他方法安装一系列软件包。我们推荐选上 <userinput>standard</userinput> 任务。"
+msgstr ""
+"您可以不选任务，并用其他方法安装一系列软件包。我们推荐选上 "
+"<userinput>standard</userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:992
+#: preseed.xml:1024
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2107,7 +2202,7 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:1002
+#: preseed.xml:1034
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2145,13 +2240,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1007
+#: preseed.xml:1039
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装 bootloader"
 
 #. Tag: screen
-#: preseed.xml:1009
+#: preseed.xml:1041
 #, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2217,7 +2312,7 @@ msgstr ""
 "#d-i grub-installer/password-crypted password [MD5 hash]"
 
 #. Tag: para
-#: preseed.xml:1011
+#: preseed.xml:1043
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2229,13 +2324,13 @@ msgstr ""
 "令。"
 
 #. Tag: title
-#: preseed.xml:1021
+#: preseed.xml:1053
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:1023
+#: preseed.xml:1055
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2275,13 +2370,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1028
+#: preseed.xml:1060
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1030
+#: preseed.xml:1062
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2301,19 +2396,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1037
+#: preseed.xml:1069
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1040
+#: preseed.xml:1072
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1041
+#: preseed.xml:1073
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2323,7 +2418,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1049
+#: preseed.xml:1081
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2371,13 +2466,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1054
+#: preseed.xml:1086
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1055
+#: preseed.xml:1087
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2401,7 +2496,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1069
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2414,7 +2509,7 @@ msgstr ""
 "\"preseed-bootparms\"/> 的脚注。"
 
 #. Tag: para
-#: preseed.xml:1076
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2435,13 +2530,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1090
+#: preseed.xml:1122
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1091
+#: preseed.xml:1123
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2455,7 +2550,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1101
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2505,7 +2600,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1135
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "