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

6 files changed, 547 insertions, 485 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 283a1245b..2e34d691b 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -1839,15 +1839,13 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1538
 #, no-c-format
-#| msgid ""
-#| "To boot the installer from hard disk, you will have already completed "
-#| "downloading and placing the needed files in <xref linkend=\"boot-drive-"
-#| "files\"/>."
 msgid ""
 "To boot the installer from hard disk, you will have already completed "
 "downloading and placing the needed files as described in <xref linkend="
 "\"boot-drive-files\"/>."
-msgstr "如果要从硬盘上引导安装程序，您需要参考 <xref linkend=\"boot-drive-files\"/> 下载并且安置所需文件。"
+msgstr ""
+"如果要从硬盘上引导安装程序，您需要参考 <xref linkend=\"boot-drive-files\"/> "
+"下载并且安置所需文件。"
 
 #. Tag: title
 #: boot-installer.xml:1558
@@ -2955,7 +2953,6 @@ msgstr ""
 #. Tag: term
 #: boot-installer.xml:2392
 #, no-c-format
-#| msgid "debian-installer/theme (theme)"
 msgid "base-installer/install-recommends (recommends)"
 msgstr "base-installer/install-recommends (recommends)"
 
@@ -2969,7 +2966,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
 #: boot-installer.xml:2402
@@ -2979,7 +2979,9 @@ msgid ""
 "management system will be configured to not automatically install such "
 "<quote>Recommends</quote>, both during the installation and for the "
 "installed system."
-msgstr "通过设置 <userinput>false</userinput> 选项，在安装过程和以后的系统中，包管理系统将配置为不自动安装这些<quote>推荐的软件包(Recommends)</quote>。"
+msgstr ""
+"通过设置 <userinput>false</userinput> 选项，在安装过程和以后的系统中，包管理"
+"系统将配置为不自动安装这些<quote>推荐的软件包(Recommends)</quote>。"
 
 #. Tag: para
 #: boot-installer.xml:2409
@@ -2990,7 +2992,10 @@ msgid ""
 "may have to manually install some of the recommended packages to obtain the "
 "full functionality you want. This option should therefore only be used by "
 "very experienced users."
-msgstr "注意，虽然使用该选项可以得到一个瘦小的系统，但将会失去一些通常认为应有的特性。您不得不使用手动方式安装这些推荐软件包以获得完整的功能。因此，该选项应由非常有经验的用户来使用。"
+msgstr ""
+"注意，虽然使用该选项可以得到一个瘦小的系统，但将会失去一些通常认为应有的特"
+"性。您不得不使用手动方式安装这些推荐软件包以获得完整的功能。因此，该选项应由"
+"非常有经验的用户来使用。"
 
 #. Tag: term
 #: boot-installer.xml:2421
@@ -3147,14 +3152,12 @@ msgstr ""
 #. Tag: term
 #: boot-installer.xml:2525
 #, no-c-format
-#| msgid "debian-installer/locale (locale)"
 msgid "debian-installer/language (language)"
 msgstr "debian-installer/language (language)"
 
 #. Tag: term
 #: boot-installer.xml:2526
 #, no-c-format
-#| msgid "debian-installer/theme (theme)"
 msgid "debian-installer/country (country)"
 msgstr "debian-installer/country (country)"
 
@@ -3170,7 +3173,9 @@ msgstr "debian-installer/locale (locale)"
 msgid ""
 "There are two ways to specify the language, country and locale to use for "
 "the installation and the installed system."
-msgstr "有两种方法可以指定安装过程和安装后系统中所使用的语言(language)、国家(country)和地方(locale)。"
+msgstr ""
+"有两种方法可以指定安装过程和安装后系统中所使用的语言(language)、国家(country)"
+"和地方(locale)。"
 
 #. Tag: para
 #: boot-installer.xml:2533
@@ -3183,7 +3188,12 @@ msgid ""
 "set as default locale for the installed system). Limitation is that not all "
 "possible combinations of language, country and locale can be achieved this "
 "way."
-msgstr "第一种和最简单的方法为只设置 <literal>locale</literal> 参数。语言和国家将依据该值产生。例如，您可以使用 <userinput>locale=de_CH</userinput> 选择语言为德语，瑞士为国家(安装后的系统中默认的 locale 将设置为 <literal>de_CH.UTF-8</literal> )。该方法有一个缺陷，因为并不是所有的语言、国家和地方可以采用这种方式组合。"
+msgstr ""
+"第一种和最简单的方法为只设置 <literal>locale</literal> 参数。语言和国家将依据"
+"该值产生。例如，您可以使用 <userinput>locale=de_CH</userinput> 选择语言为德"
+"语，瑞士为国家(安装后的系统中默认的 locale 将设置为 <literal>de_CH.UTF-8</"
+"literal> )。该方法有一个缺陷，因为并不是所有的语言、国家和地方可以采用这种方"
+"式组合。"
 
 #. Tag: para
 #: boot-installer.xml:2542
@@ -3194,7 +3204,11 @@ msgid ""
 "literal> can optionally be added to specify a specific default locale for "
 "the installed system. Example: <userinput>language=en country=DE "
 "locale=en_GB.UTF-8</userinput>."
-msgstr "第二种更具弹性的方法，是分开指定 <literal>language</literal> 和 <literal>country</literal>。这种方式下 <literal>locale</literal> 可以作为选项来指定安装后系统中默认的 locale 值。例如： <userinput>language=en country=DE locale=en_GB.UTF-8</userinput>。"
+msgstr ""
+"第二种更具弹性的方法，是分开指定 <literal>language</literal> 和 "
+"<literal>country</literal>。这种方式下 <literal>locale</literal> 可以作为选项"
+"来指定安装后系统中默认的 locale 值。例如： <userinput>language=en country=DE "
+"locale=en_GB.UTF-8</userinput>。"
 
 #. Tag: term
 #: boot-installer.xml:2554
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 229681e0a..182957cb8 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -453,7 +453,11 @@ msgid ""
 "the Pentium&nbsp;D and the Core2&nbsp;Duo). Those systems are supported by "
 "the <emphasis>amd64</emphasis> architecture or, if you prefer a 32-bit "
 "userland, the <emphasis>i386</emphasis> architecture."
-msgstr "&arch-title; 体系只支持 Intel Itanium 处理器，而不是常见的属于 EM64T 家族的 64 位处理器(包括像 Pentium&nbsp;D 和 Core2&nbsp;Duo)。它们是被 <emphasis>amd64</emphasis> 体系支持。如果您希望使用 32 位系统，可以选择 <emphasis>i386</emphasis> 体系。"
+msgstr ""
+"&arch-title; 体系只支持 Intel Itanium 处理器，而不是常见的属于 EM64T 家族的 "
+"64 位处理器(包括像 Pentium&nbsp;D 和 Core2&nbsp;Duo)。它们是被 "
+"<emphasis>amd64</emphasis> 体系支持。如果您希望使用 32 位系统，可以选择 "
+"<emphasis>i386</emphasis> 体系。"
 
 #. Tag: para
 #: hardware.xml:188
@@ -594,12 +598,6 @@ msgstr "Kirkwood"
 #. Tag: para
 #: hardware.xml:302
 #, no-c-format
-#| msgid ""
-#| "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
-#| "CPU, Ethernet, SATA, USB, and other functionality in one chip. We "
-#| "currently support the following Kirkwood based devices: <ulink url=\"&url-"
-#| "arm-cyrius-sheevaplug;\">SheevaPlug</ulink> and <ulink url=\"&url-arm-"
-#| "cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (TS-119 and TS-219)."
 msgid ""
 "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
 "CPU, Ethernet, SATA, USB, and other functionality in one chip. We currently "
@@ -608,7 +606,13 @@ msgid ""
 "<ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (TS-"
 "110, TS-119, TS-210, TS-219 and TS-219P; the TS-410 and TS-419P are not yet "
 "supported)."
-msgstr "Kirkwood 是 Marvell 的 SoC (system on a chip) 产品，该芯片上集成了 ARM CPU、Ethernet、SATA、USB，以及一些其他的功能。当前我们能支持以下几种基于 Kirkwood 的设备： OpenRD (OpenRD-Base 和 OpenRD-Client)、<ulink url=\"&url-arm-cyrius-sheevaplug;\">SheevaPlug</ulink> 和 <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (TS-110, TS-119, TS-210, TS-219 和 TS-219P; TS-410 和 TS-419P 仍然不被支持)。"
+msgstr ""
+"Kirkwood 是 Marvell 的 SoC (system on a chip) 产品，该芯片上集成了 ARM CPU、"
+"Ethernet、SATA、USB，以及一些其他的功能。当前我们能支持以下几种基于 Kirkwood "
+"的设备： OpenRD (OpenRD-Base 和 OpenRD-Client)、<ulink url=\"&url-arm-cyrius-"
+"sheevaplug;\">SheevaPlug</ulink> 和 <ulink url=\"&url-arm-cyrius-qnap-"
+"kirkwood;\">QNAP Turbo Station</ulink> (TS-110, TS-119, TS-210, TS-219 和 TS-"
+"219P; TS-410 和 TS-419P 仍然不被支持)。"
 
 #. Tag: term
 #: hardware.xml:317
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 457495272..1a7bd7ca6 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -255,12 +255,15 @@ msgid ""
 "the installation files for QNAP TS-109 and TS-209 from &qnap-orion-firmware-"
 "img; and for QNAP TS-110, TS-119, TS-210, TS-219, TS-219P from &qnap-"
 "kirkwood-firmware-img;."
-msgstr "QNAP Turbo Station 安装文件包括内核和 ramdisk 以及将这些映象写入 flash 的脚本。您可以从 &qnap-orion-firmware-img; 获得 QNAP TS-109 和 TS-209 的安装文件。从 &qnap-kirkwood-firmware-img; 获得 QNAP TS-110, TS-119, TS-210, TS-219, TS-219P 的。"
+msgstr ""
+"QNAP Turbo Station 安装文件包括内核和 ramdisk 以及将这些映象写入 flash 的脚"
+"本。您可以从 &qnap-orion-firmware-img; 获得 QNAP TS-109 和 TS-209 的安装文"
+"件。从 &qnap-kirkwood-firmware-img; 获得 QNAP TS-110, TS-119, TS-210, TS-"
+"219, TS-219P 的。"
 
 #. Tag: title
 #: install-methods.xml:186
 #, no-c-format
-#| msgid "Alpha Installation Files"
 msgid "SheevaPlug and OpenRD Installation Files"
 msgstr "SheevaPlug 和 OpenRD 安装文件"
 
@@ -271,7 +274,9 @@ msgid ""
 "The installation files for the Marvell SheevaPlug and OpenRD devices consist "
 "of a kernel and initrd for U-Boot. You can obtain these files from &kirkwood-"
 "marvell-firmware-img;."
-msgstr "Marvell SheevaPlug 和 OpenRD 设备的安装文件包括内核和 initrd 用于 U-Boot。您可以从 &kirkwood-marvell-firmware-img; 获得这些文件。"
+msgstr ""
+"Marvell SheevaPlug 和 OpenRD 设备的安装文件包括内核和 initrd 用于 U-Boot。您"
+"可以从 &kirkwood-marvell-firmware-img; 获得这些文件。"
 
 #. Tag: title
 #: install-methods.xml:237
@@ -905,16 +910,6 @@ msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设
 #. Tag: para
 #: install-methods.xml:670
 #, no-c-format
-#| msgid ""
-#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
-#| "you probably won't have to repartition or reformat the stick. If you have "
-#| "to do that anyway, use <command>cfdisk</command> or any other "
-#| "partitioning tool to create a FAT16 partition, and then create the "
-#| "filesystem using: <informalexample><screen>\n"
-#| "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>mkdosfs</command> command is "
-#| "contained in the <classname>dosfstools</classname> Debian package."
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
@@ -927,9 +922,14 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> Debian package."
 msgstr ""
-"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
+"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式"
+"化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来"
+"创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导"
+"标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。<command>mkdosfs</command> 命令包含在 Debian 的 <classname>dosfstools</classname> 软件包中。"
+"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。"
+"<command>mkdosfs</command> 命令包含在 Debian 的 <classname>dosfstools</"
+"classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:689
@@ -980,17 +980,6 @@ msgstr "添加安装程序映像"
 #. Tag: para
 #: install-methods.xml:717
 #, no-c-format
-#| msgid ""
-#| "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</"
-#| "replaceable> /mnt</userinput>) and copy the following installer image "
-#| "files to the stick: <itemizedlist> <listitem><para> <filename>vmlinuz</"
-#| "filename> (kernel binary) </para></listitem> <listitem><para> "
-#| "<filename>initrd.gz</filename> (initial ramdisk image) </para></listitem> "
-#| "</itemizedlist> You can choose between either the regular version or the "
-#| "graphical version of the installer. The latter can be found in the "
-#| "<filename>gtk</filename> subdirectory. If you want to rename the files, "
-#| "please note that <classname>syslinux</classname> can only process DOS "
-#| "(8.3) file names."
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
 "mnt</userinput>) and copy the following installer image files to the stick: "
@@ -1002,19 +991,19 @@ msgid ""
 "in the <filename>gtk</filename> subdirectory. If you want to rename the "
 "files, please note that <classname>syslinux</classname> can only process DOS "
 "(8.3) file names."
-msgstr "挂载分区(<userinput>mount /dev/<replaceable>sdX1</replaceable> /mnt</userinput>)并复制下列安装程序映象文件到 U 盘：<itemizedlist> <listitem><para> <filename>vmlinuz</filename> 或 <filename>linux</filename> (内核二进制文件) </para></listitem> <listitem><para> <filename>initrd.gz</filename> (初始化 ramdisk 映象) </para></listitem> </itemizedlist> 你可以选择使用安装程序的文本或者图形界面。后者放在 <filename>gtk</filename> 子目录下面。如果需要改文件名，请注意 <classname>syslinux</classname> 只能处理 DOS (8.3) 文件名。"
+msgstr ""
+"挂载分区(<userinput>mount /dev/<replaceable>sdX1</replaceable> /mnt</"
+"userinput>)并复制下列安装程序映象文件到 U 盘：<itemizedlist> "
+"<listitem><para> <filename>vmlinuz</filename> 或 <filename>linux</filename> "
+"(内核二进制文件) </para></listitem> <listitem><para> <filename>initrd.gz</"
+"filename> (初始化 ramdisk 映象) </para></listitem> </itemizedlist> 你可以选择"
+"使用安装程序的文本或者图形界面。后者放在 <filename>gtk</filename> 子目录下"
+"面。如果需要改文件名，请注意 <classname>syslinux</classname> 只能处理 DOS "
+"(8.3) 文件名。"
 
 #. Tag: para
 #: install-methods.xml:741
 #, no-c-format
-#| msgid ""
-#| "Next you should create a <filename>syslinux.cfg</filename> configuration "
-#| "file, which at a bare minimum should contain the following two lines: "
-#| "<informalexample><screen>\n"
-#| "default vmlinuz\n"
-#| "append initrd=initrd.gz\n"
-#| "</screen></informalexample> For the graphical installer you should add "
-#| "<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
 msgid ""
 "Next you should create a <filename>syslinux.cfg</filename> configuration "
 "file, which at a bare minimum should contain the following two lines (change "
@@ -1026,19 +1015,17 @@ msgid ""
 "</screen></informalexample> For the graphical installer you should add "
 "<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
 msgstr ""
-"接下来，您需要创建一个 <filename>syslinux.cfg</filename> 配置文件，里面最少要包含下面两行(如果您使用 <filename>netboot</filename> 映象，修改内核文件名为  <quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
+"接下来，您需要创建一个 <filename>syslinux.cfg</filename> 配置文件，里面最少要"
+"包含下面两行(如果您使用 <filename>netboot</filename> 映象，修改内核文件名为  "
+"<quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
-"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>video=vesa:ywrap,mtrr vga=788</userinput> 到第二行尾部。"
+"</screen></informalexample> 对于图形安装程序，您需要添加 "
+"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> 到第二行尾部。"
 
 #. Tag: para
 #: install-methods.xml:753
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image (businesscard, netinst or full CD image; be sure to "
-#| "select one that fits) onto the stick. When you are done, unmount the USB "
-#| "memory stick (<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "Debian ISO image<footnote> <para> You can use either a businesscard, a "
@@ -1047,7 +1034,12 @@ msgid ""
 "filename></quote> image is not usable for this purpose. </para> </footnote> "
 "onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
-msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 Debian ISO 映象<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 <xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot <filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> 到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 Debian ISO 映象"
+"<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 "
+"<xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
+"<filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> "
+"到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
 
 #. Tag: para
 #: install-methods.xml:777
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index afaffd400..58c5d88f7 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -775,7 +775,6 @@ msgstr "language"
 #. Tag: entry
 #: preseed.xml:512
 #, no-c-format
-#| msgid "debian-installer/locale"
 msgid "debian-installer/language"
 msgstr "debian-installer/language"
 
@@ -788,7 +787,6 @@ msgstr "country"
 #. Tag: entry
 #: preseed.xml:513
 #, no-c-format
-#| msgid "debian-installer/locale"
 msgid "debian-installer/country"
 msgstr "debian-installer/country"
 
@@ -1204,7 +1202,12 @@ msgid ""
 "instead, the values will need to be preseeded individually. </para> </"
 "footnote>. So alternatively the values can be preseeded individually. "
 "Language and country can also be specified as boot parameters."
-msgstr "虽然这个方法很容易使用，但它无法预置所有的语言、国家和地方组合<footnote> <para> 比如预置 <literal>locale</literal> 为 <userinput>en_NL</userinput> 在安装后的系统中默认的 locale 将是 <literal>en_US.UTF-8</literal>。如果想使用 <literal>en_GB.UTF-8</literal>，该值应该分别进行预置。</para> </footnote>。 因此另一种方法是单独预置各值。语言和国家可以在引导参数里面指定。"
+msgstr ""
+"虽然这个方法很容易使用，但它无法预置所有的语言、国家和地方组合<footnote> "
+"<para> 比如预置 <literal>locale</literal> 为 <userinput>en_NL</userinput> 在"
+"安装后的系统中默认的 locale 将是 <literal>en_US.UTF-8</literal>。如果想使用 "
+"<literal>en_GB.UTF-8</literal>，该值应该分别进行预置。</para> </footnote>。 "
+"因此另一种方法是单独预置各值。语言和国家可以在引导参数里面指定。"
 
 #. Tag: screen
 #: preseed.xml:716
@@ -1513,14 +1516,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:817
 #, no-c-format
-#| msgid ""
-#| "The parameter <classname>mirror/udeb/suite</classname> determines the "
-#| "suite for additional components for the installer. It is only useful to "
-#| "set this if components are actually downloaded over the network and "
-#| "should match the suite that was used to build the initrd for the "
-#| "installation method used for the installation. By default the value for "
-#| "<classname>mirror/udeb/suite</classname> is the same as <classname>mirror/"
-#| "suite</classname>."
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
 "for additional components for the installer. It is only useful to set this "
@@ -1528,7 +1523,10 @@ msgid ""
 "suite that was used to build the initrd for the installation method used for "
 "the installation. Normally the installer will automatically use the correct "
 "value and there should be no need to set this."
-msgstr "参数 <classname>mirror/udeb/suite</classname> 决定安装程序使用的额外组件的套件。它只在组件通过网络下载并与安装时使用的 initrd 建立套件相匹配时才有效。通常安装程序会自动安装并使用正确的值而毋需手动设置。"
+msgstr ""
+"参数 <classname>mirror/udeb/suite</classname> 决定安装程序使用的额外组件的套"
+"件。它只在组件通过网络下载并与安装时使用的 initrd 建立套件相匹配时才有效。通"
+"常安装程序会自动安装并使用正确的值而毋需手动设置。"
 
 #. Tag: screen
 #: preseed.xml:828
@@ -1967,15 +1965,6 @@ msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内
 #. Tag: screen
 #: preseed.xml:931
 #, no-c-format
-#| msgid ""
-#| "# Select the initramfs generator used to generate the initrd for 2.6 "
-#| "kernels.\n"
-#| "#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
-#| "\n"
-#| "# The kernel image (meta) package to be installed; \"none\" can be used "
-#| "if no\n"
-#| "# kernel is to be installed.\n"
-#| "#d-i base-installer/kernel/image string linux-image-2.6-486"
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
 "# option can result in an incomplete system and should only be used by very\n"
@@ -1996,10 +1985,12 @@ msgstr ""
 "# experienced users.\n"
 "#d-i base-installer/install-recommends boolean false\n"
 "\n"
-"# Select the initramfs generator used to generate the initrd for 2.6 kernels.\n"
+"# Select the initramfs generator used to generate the initrd for 2.6 "
+"kernels.\n"
 "#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
 "\n"
-"# The kernel image (meta) package to be installed; \"none\" can be used if no\n"
+"# The kernel image (meta) package to be installed; \"none\" can be used if "
+"no\n"
 "# kernel is to be installed.\n"
 "#d-i base-installer/kernel/image string linux-image-2.6-486"
 
@@ -2306,31 +2297,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:1050
 #, no-c-format
-#| msgid ""
-#| "#tasksel tasksel/first multiselect standard, web-server\n"
-#| "# If the desktop task is selected, install the kde and xfce desktops\n"
-#| "# instead of the default gnome desktop.\n"
-#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
-#| "\n"
-#| "# Individual additional packages to install\n"
-#| "#d-i pkgsel/include string openssh-server build-essential\n"
-#| "# By default, packages that are only Recommended by packages installed "
-#| "using\n"
-#| "# pkgsel/include (as opposed to their dependencies) will not be "
-#| "installed.\n"
-#| "# Uncomment this line to install Recommends as well.\n"
-#| "#d-i pkgsel/include/install-recommends boolean true\n"
-#| "# Whether to upgrade packages after debootstrap.\n"
-#| "# Allowed values: none, safe-upgrade, full-upgrade\n"
-#| "#d-i pkgsel/upgrade select none\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"
-#| "# but sending reports helps the project determine what software is most\n"
-#| "# popular and include it on CDs.\n"
-#| "#popularity-contest popularity-contest/participate boolean false"
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
 "# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2359,7 +2325,8 @@ msgstr ""
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
-"# By default, packages that are only Recommended by packages installed using\n"
+"# By default, packages that are only Recommended by packages installed "
+"using\n"
 "# pkgsel/include (as opposed to their dependencies) will not be installed.\n"
 "# Whether to upgrade packages after debootstrap.\n"
 "# Allowed values: none, safe-upgrade, full-upgrade\n"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 1f8de8158..b7eae90ea 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.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-11-11 01:11+0000\n"
+"POT-Creation-Date: 2009-11-22 01:11+0000\n"
 "PO-Revision-Date: 2009-11-21 13:42+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -166,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
@@ -832,12 +834,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The selected country will be used later in the installation process to "
+#| "pick the default timezone and a Debian mirror appropriate for your "
+#| "geographic location. Language and country together will be used to set "
+#| "the default locale for your system and to help select your keyboard."
 msgid ""
 "The selected country will be used later in the installation process to pick "
-"the default timezone and a Debian mirror appropriate for your geographic "
-"location. Language and country together will be used to set the default "
-"locale for your system and to help select your keyboard."
+"the default time zone and a Debian mirror appropriate for your geographic "
+"location. Language and country together will help determine the default "
+"locale for your system and select the correct keyboard layout."
 msgstr ""
 "在安装过程的后面，选择的国家还会被用于设置默认的时区和您所处地理位置的 "
 "Debian 镜像。语言和国家可以一起用来设置您系统默认的 locale，并帮助您选择键"
@@ -865,13 +872,22 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:549
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you selected a language that is recognized as an official language for "
+#| "more than one country<footnote> <para> In technical terms: where multiple "
+#| "locales exist for that language with differing country codes. </para> </"
+#| "footnote>, you will be shown a list of only those countries. To select a "
+#| "country that is not in that list, choose <guimenuitem>Other</guimenuitem> "
+#| "(the last option). You will then be presented with a list of continents; "
+#| "selecting a continent will lead to a list of relevant countries on that "
+#| "continent."
 msgid ""
 "If you selected a language that is recognized as an official language for "
 "more than one country<footnote> <para> In technical terms: where multiple "
 "locales exist for that language with differing country codes. </para> </"
 "footnote>, you will be shown a list of only those countries. To select a "
-"country that is not in that list, choose <guimenuitem>Other</guimenuitem> "
+"country that is not in that list, choose <guimenuitem>other</guimenuitem> "
 "(the last option). You will then be presented with a list of continents; "
 "selecting a continent will lead to a list of relevant countries on that "
 "continent."
@@ -885,40 +901,62 @@ msgstr ""
 #: using-d-i.xml:567
 #, no-c-format
 msgid ""
-"If the language has only one country associated with it, that country will "
-"be selected automatically. In that case it is only possible to select a "
-"different country by first lowering the debconf priority to medium, followed "
-"by revisiting the language selection option in the main menu of the "
-"installer."
+"If the language has only one country associated with it, a list of countries "
+"will be displayed for the continent or region the country belongs to, with "
+"that country selected as the default. Use the <guibutton>Go Back</guibutton> "
+"option to select countries on a different continent."
 msgstr ""
-"如果此语言只对应一个国家，该国将会被自动选中。这种情况下如果要选择其他的国"
-"家，首先要降低 debconf 优先级为 medium，然后在安装程序的主菜单中重新选择语"
-"言。"
 
 #. Tag: para
-#: using-d-i.xml:575
+#: using-d-i.xml:574
 #, no-c-format
-#| msgid ""
-#| "A default locale will be selected based on the selected language and "
-#| "country. If you are installing at medium or low priority, you will have "
-#| "the option of selecting a different default locale and of selecting "
-#| "additional locales to be generated for the installed system."
-msgid ""
-"A default locale will be selected based on the selected language and "
-"country. If you are installing at medium or low priority, you will have the "
-"option of selecting additional locales to be generated for the installed "
-"system; if you do, you will be asked which locale should be the default for "
-"the installed system."
-msgstr "默认 locale 的选择是基于先前所选的语言和国家。如果您以 medium 或 low 优先级安装，可以有机会为安装后的系统选择生成额外的 locale；这时，您将会被要求选择默认的 local。"
+msgid ""
+"It is important to select the country where you live or where you are "
+"located as it determines the time zone that will be configured for the "
+"installed system."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:580
+#, no-c-format
+msgid ""
+"If you selected a combination of language and country for which no locale is "
+"defined and there exist multiple locales for the language, then the "
+"installer will allow you to choose which of those locales you prefer as the "
+"default locale for the installed system. In all other cases a default locale "
+"will be selected based on the selected language and country."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:588
+#, no-c-format
+msgid ""
+"Any default locale selected as described in the previous paragraph will use "
+"UTF-8 as character encoding."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:593
+#, no-c-format
+msgid ""
+"If you are installing at medium or low priority, you will have the option of "
+"selecting additional locales, including so-called <quote>legacy</quote> "
+"locales<footnote> <para> Legacy locales are locales which do not use UTF-8, "
+"but one of the older standards for character encoding such as ISO&nbsp;8859-"
+"1 (used by West European languages) or EUC-JP (used by Japanese). </para> </"
+"footnote>, to be generated for the installed system; if you do, you will be "
+"asked which of the selected locales should be the default for the installed "
+"system."
+msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:591
+#: using-d-i.xml:617
 #, no-c-format
 msgid "Choosing a Keyboard"
 msgstr "选择键盘"
 
 #. Tag: para
-#: using-d-i.xml:593
+#: using-d-i.xml:619
 #, no-c-format
 msgid ""
 "Keyboards are often tailored to the characters used in a language. Select a "
@@ -933,7 +971,7 @@ msgstr ""
 "(在安装完之后用 root 执行 <command>kbd-config</command>)。"
 
 #. Tag: para
-#: using-d-i.xml:603
+#: using-d-i.xml:629
 #, no-c-format
 msgid ""
 "Move the highlight to the keyboard selection you desire and press "
@@ -947,7 +985,7 @@ msgstr ""
 "是具有 <keycap>F1</keycap> 到 <keycap>F10</keycap> 健，与顶端平行。"
 
 #. Tag: para
-#: using-d-i.xml:612
+#: using-d-i.xml:638
 #, no-c-format
 msgid ""
 "There are two keyboard layouts for US keyboards; the qwerty/mac-usb-us "
@@ -965,13 +1003,13 @@ msgstr ""
 "方这两种布局相似。"
 
 #. Tag: title
-#: using-d-i.xml:642
+#: using-d-i.xml:668
 #, no-c-format
 msgid "Looking for the Debian Installer ISO Image"
 msgstr "寻找 Debian 安装程序 ISO 映像"
 
 #. Tag: para
-#: using-d-i.xml:643
+#: using-d-i.xml:669
 #, no-c-format
 msgid ""
 "When installing via the <emphasis>hd-media</emphasis> method, there will be "
@@ -984,7 +1022,7 @@ msgstr ""
 "command> 正是用来完成此任务。"
 
 #. Tag: para
-#: using-d-i.xml:650
+#: using-d-i.xml:676
 #, no-c-format
 msgid ""
 "At first, <command>iso-scan</command> automatically mounts all block devices "
@@ -1011,7 +1049,7 @@ msgstr ""
 "command> 搜索其它的映象。"
 
 #. Tag: para
-#: using-d-i.xml:667
+#: using-d-i.xml:693
 #, no-c-format
 msgid ""
 "In case the previous attempt to find an installer iso image fails, "
@@ -1023,7 +1061,7 @@ msgstr ""
 "行完整的搜索。这次不只查看最上级目录，而是真正地贯穿整个文件系统。"
 
 #. Tag: para
-#: using-d-i.xml:674
+#: using-d-i.xml:700
 #, no-c-format
 msgid ""
 "If <command>iso-scan</command> does not discover your installer iso image, "
@@ -1039,13 +1077,13 @@ msgstr ""
 "用户可以在第二个控制台上完成这些动作，而毋须重新启动。"
 
 #. Tag: title
-#: using-d-i.xml:695
+#: using-d-i.xml:721
 #, no-c-format
 msgid "Configuring the Network"
 msgstr "配置网络"
 
 #. Tag: para
-#: using-d-i.xml:697
+#: using-d-i.xml:723
 #, no-c-format
 msgid ""
 "As you enter this step, if the system detects that you have more than one "
@@ -1063,7 +1101,7 @@ msgstr ""
 "citerefentry> man 手册。"
 
 #. Tag: para
-#: using-d-i.xml:708
+#: using-d-i.xml:734
 #, no-c-format
 msgid ""
 "By default, &d-i; tries to configure your computer's network automatically "
@@ -1083,7 +1121,7 @@ msgstr ""
 "服务器有时候响应很慢，如果您确定都正常，请再试一次。"
 
 #. Tag: para
-#: using-d-i.xml:720
+#: using-d-i.xml:746
 #, no-c-format
 msgid ""
 "The manual network setup in turn asks you a number of questions about your "
@@ -1105,7 +1143,7 @@ msgstr ""
 "\"needed-info\"/>。"
 
 #. Tag: para
-#: using-d-i.xml:734
+#: using-d-i.xml:760
 #, no-c-format
 msgid ""
 "Some technical details you might, or might not, find handy: the program "
@@ -1124,13 +1162,14 @@ msgstr ""
 "network/interfaces</filename>。"
 
 #. Tag: title
-#: using-d-i.xml:779
-#, no-c-format
-msgid "Configuring the Clock"
+#: using-d-i.xml:805
+#, fuzzy, no-c-format
+#| msgid "Configuring the Clock"
+msgid "Configuring the Clock and Time Zone"
 msgstr "配置时钟"
 
 #. Tag: para
-#: using-d-i.xml:781
+#: using-d-i.xml:807
 #, no-c-format
 msgid ""
 "The installer will first attempt to connect to a time server on the Internet "
@@ -1145,25 +1184,39 @@ msgstr ""
 "的。在安装过程中没法手动对系统时间进行设置。"
 
 #. Tag: para
-#: using-d-i.xml:790
+#: using-d-i.xml:816
 #, no-c-format
 msgid "The installer does not modify the system clock on the s390 platform."
 msgstr "在 s390 平台，安装程序不会修改系统时钟。"
 
 #. Tag: para
-#: using-d-i.xml:803
-#, no-c-format
+#: using-d-i.xml:829
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Depending on the location selected earlier in the installation process, "
+#| "you may be shown a list of timezones relevant for that location. If your "
+#| "location has only one time zone, you will not be asked anything and the "
+#| "system will assume that time zone."
 msgid ""
 "Depending on the location selected earlier in the installation process, you "
-"may be shown a list of timezones relevant for that location. If your "
-"location has only one time zone, you will not be asked anything and the "
-"system will assume that time zone."
+"may be shown a list of time zones relevant for that location. If your "
+"location has only one time zone and you are doing a default installation, "
+"you will not be asked anything and the system will assume that time zone."
 msgstr ""
 "基于安装过程前面所选择的地理位置，您将看到系统只列出与其地点相关的时区列表。"
 "如果该地只对应一个时区，那么系统就不会询问而直接使用该时区。"
 
 #. Tag: para
-#: using-d-i.xml:810
+#: using-d-i.xml:837
+#, no-c-format
+msgid ""
+"In expert mode or when installing at medium priority, you will have the "
+"additional option to select <quote>Universal Time Coordinated</quote> (UTC) "
+"as time zone."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:843
 #, no-c-format
 msgid ""
 "If for some reason you wish to set a time zone for the installed system that "
@@ -1174,23 +1227,27 @@ msgstr ""
 "选项。"
 
 #. Tag: para
-#: using-d-i.xml:821
-#, no-c-format
+#: using-d-i.xml:854
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The simplest option is to just select a different timezone after the "
+#| "installation has been completed and you've booted into the new system. "
+#| "The command to do this is:"
 msgid ""
-"The simplest option is to just select a different timezone after the "
+"The simplest option is to just select a different time zone after the "
 "installation has been completed and you've booted into the new system. The "
 "command to do this is:"
 msgstr ""
 "简易的方法是，在安装完成后重新启动进入新系统，选择一个不同的时区。该命令为："
 
 #. Tag: screen
-#: using-d-i.xml:827
+#: using-d-i.xml:860
 #, no-c-format
 msgid "# dpkg-reconfigure tzdata"
 msgstr "# dpkg-reconfigure tzdata"
 
 #. Tag: para
-#: using-d-i.xml:833
+#: using-d-i.xml:866
 #, no-c-format
 msgid ""
 "Alternatively, the time zone can be set at the very start of the "
@@ -1205,20 +1262,24 @@ msgstr ""
 "userinput> 或 <userinput>UTC</userinput>。"
 
 #. Tag: para
-#: using-d-i.xml:847
-#, no-c-format
+#: using-d-i.xml:880
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For automated installations the time zone can also be set using "
+#| "preseeding."
 msgid ""
-"For automated installations the time zone can also be set using preseeding."
+"For automated installations the time zone can be set to any desired value "
+"using preseeding."
 msgstr "自动安装可以通过预置设置时区。"
 
 #. Tag: title
-#: using-d-i.xml:860
+#: using-d-i.xml:894
 #, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "分区与选择挂载点"
 
 #. Tag: para
-#: using-d-i.xml:861
+#: using-d-i.xml:895
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1233,7 +1294,7 @@ msgstr ""
 "并为近似选项进行配置，比如 RAID、LVM 或加密设备。"
 
 #. Tag: para
-#: using-d-i.xml:882
+#: using-d-i.xml:916
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1243,7 +1304,7 @@ msgstr ""
 "\"partitioning\"/>。"
 
 #. Tag: para
-#: using-d-i.xml:888
+#: using-d-i.xml:922
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1263,7 +1324,7 @@ msgstr ""
 "</screen></informalexample> 注意，这会是磁盘上已有的数据无法访问。"
 
 #. Tag: para
-#: using-d-i.xml:901
+#: using-d-i.xml:935
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1276,13 +1337,13 @@ msgstr ""
 "<guimenuitem>Manual</guimenuitem> 。"
 
 #. Tag: title
-#: using-d-i.xml:911
+#: using-d-i.xml:945
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "导引式分区"
 
 #. Tag: para
-#: using-d-i.xml:912
+#: using-d-i.xml:946
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1298,14 +1359,14 @@ msgstr ""
 "footnote>"
 
 #. Tag: para
-#: using-d-i.xml:927
+#: using-d-i.xml:961
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
 msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
 
 #. Tag: para
-#: using-d-i.xml:932
+#: using-d-i.xml:966
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1319,7 +1380,7 @@ msgstr ""
 "大分区将无法读取，对您的(私有)数据提供了额外的安全性。"
 
 #. Tag: para
-#: using-d-i.xml:941
+#: using-d-i.xml:975
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1333,7 +1394,7 @@ msgstr ""
 "时间。"
 
 #. Tag: para
-#: using-d-i.xml:950
+#: using-d-i.xml:984
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1348,7 +1409,7 @@ msgstr ""
 "安装程序会在写入磁盘之前让您确认。"
 
 #. Tag: para
-#: using-d-i.xml:960
+#: using-d-i.xml:994
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1363,7 +1424,7 @@ msgstr ""
 "的那块。排列的次序可能与以前的不同。磁盘的尺寸将会帮助您识别它们。"
 
 #. Tag: para
-#: using-d-i.xml:969
+#: using-d-i.xml:1003
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1377,7 +1438,7 @@ msgstr ""
 "销。"
 
 #. Tag: para
-#: using-d-i.xml:977
+#: using-d-i.xml:1011
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1393,73 +1454,73 @@ msgstr ""
 "1GB 以上的空间(具体大小视所选的方式而不同)，那么导引式分区将以失败告终。"
 
 #. Tag: entry
-#: using-d-i.xml:993
+#: using-d-i.xml:1027
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "分区方式"
 
 #. Tag: entry
-#: using-d-i.xml:994
+#: using-d-i.xml:1028
 #, no-c-format
 msgid "Minimum space"
 msgstr "所需最小空间"
 
 #. Tag: entry
-#: using-d-i.xml:995
+#: using-d-i.xml:1029
 #, no-c-format
 msgid "Created partitions"
 msgstr "所新建的分区"
 
 #. Tag: entry
-#: using-d-i.xml:1001
+#: using-d-i.xml:1035
 #, no-c-format
 msgid "All files in one partition"
 msgstr "所有文件在同一分区"
 
 #. Tag: entry
-#: using-d-i.xml:1002
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "600MB"
 msgstr "600MB"
 
 #. Tag: entry
-#: using-d-i.xml:1003
+#: using-d-i.xml:1037
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1005
+#: using-d-i.xml:1039
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "建立 /home 分区"
 
 #. Tag: entry
-#: using-d-i.xml:1006
+#: using-d-i.xml:1040
 #, no-c-format
 msgid "500MB"
 msgstr "500MB"
 
 #. Tag: entry
-#: using-d-i.xml:1007
+#: using-d-i.xml:1041
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1011
+#: using-d-i.xml:1045
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "分别建立 /home、/usr、/var 和 /tmp 分区"
 
 #. Tag: entry
-#: using-d-i.xml:1012
+#: using-d-i.xml:1046
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1013
+#: using-d-i.xml:1047
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1469,7 +1530,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1056
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1481,7 +1542,7 @@ msgstr ""
 "boot</filename> 分区。其他的分区，除了交换分区，都会建在 LVM 分区之内。"
 
 #. Tag: para
-#: using-d-i.xml:1028
+#: using-d-i.xml:1062
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1494,7 +1555,7 @@ msgstr ""
 "手动把某个分区作为 EFI 引导分区。"
 
 #. Tag: para
-#: using-d-i.xml:1036
+#: using-d-i.xml:1070
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -1505,7 +1566,7 @@ msgstr ""
 "区是否将被格式化，将以何种方式格式化，以及它们将被挂载到哪里的相关信息。"
 
 #. Tag: para
-#: using-d-i.xml:1042
+#: using-d-i.xml:1076
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -1553,7 +1614,7 @@ msgstr ""
 "置，但使用手动方式分区的结果会有所不同。"
 
 #. Tag: para
-#: using-d-i.xml:1055
+#: using-d-i.xml:1089
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -1571,13 +1632,13 @@ msgstr ""
 "后再次运行导引式分区，或者按照下面的介绍进行手动分区。"
 
 #. Tag: title
-#: using-d-i.xml:1069
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "手动分区"
 
 #. Tag: para
-#: using-d-i.xml:1070
+#: using-d-i.xml:1104
 #, no-c-format
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
@@ -1592,7 +1653,7 @@ msgstr ""
 "谈到。"
 
 #. Tag: para
-#: using-d-i.xml:1078
+#: using-d-i.xml:1112
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -1605,7 +1666,7 @@ msgstr ""
 "的磁盘条目下出现一个新行，上面写着 <quote>FREE SPACE</quote>。"
 
 #. Tag: para
-#: using-d-i.xml:1086
+#: using-d-i.xml:1120
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -1640,7 +1701,7 @@ msgstr ""
 "动退回到 <command>partman</command> 的主界面。"
 
 #. Tag: para
-#: using-d-i.xml:1108
+#: using-d-i.xml:1142
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -1659,7 +1720,7 @@ msgstr ""
 "这个菜单中，您还可以删除分区。"
 
 #. Tag: para
-#: using-d-i.xml:1119
+#: using-d-i.xml:1153
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -1674,7 +1735,7 @@ msgstr ""
 "面的步骤，直到您纠正了这个错误。"
 
 #. Tag: para
-#: using-d-i.xml:1127
+#: using-d-i.xml:1161
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -1685,7 +1746,7 @@ msgstr ""
 "点，不让您继续操作，直到您划分出这样一个分区。"
 
 #. Tag: para
-#: using-d-i.xml:1133
+#: using-d-i.xml:1167
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -1701,7 +1762,7 @@ msgstr ""
 "filename> 或者 <filename>partman-lvm</filename>)。"
 
 #. Tag: para
-#: using-d-i.xml:1141
+#: using-d-i.xml:1175
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -1715,13 +1776,13 @@ msgstr ""
 "此分区。"
 
 #. Tag: title
-#: using-d-i.xml:1169
+#: using-d-i.xml:1203
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "配置多磁盘设备(软 RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1170
+#: using-d-i.xml:1204
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -1739,7 +1800,7 @@ msgstr ""
 "<firstterm>软 RAID</firstterm>)。"
 
 #. Tag: para
-#: using-d-i.xml:1183
+#: using-d-i.xml:1217
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -1752,7 +1813,7 @@ msgstr ""
 "command> 格式化，分配挂载点，等等)。"
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1225
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -1844,101 +1905,101 @@ msgstr ""
 "listitem> </varlistentry></variablelist> 总结："
 
 #. Tag: entry
-#: using-d-i.xml:1305
+#: using-d-i.xml:1339
 #, no-c-format
 msgid "Type"
 msgstr "类型"
 
 #. Tag: entry
-#: using-d-i.xml:1306
+#: using-d-i.xml:1340
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "最少设备"
 
 #. Tag: entry
-#: using-d-i.xml:1307
+#: using-d-i.xml:1341
 #, no-c-format
 msgid "Spare Device"
 msgstr "备用设备"
 
 #. Tag: entry
-#: using-d-i.xml:1308
+#: using-d-i.xml:1342
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "幸免于磁盘损坏？"
 
 #. Tag: entry
-#: using-d-i.xml:1309
+#: using-d-i.xml:1343
 #, no-c-format
 msgid "Available Space"
 msgstr "可用空间"
 
 #. Tag: entry
-#: using-d-i.xml:1315
+#: using-d-i.xml:1349
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 # index.docbook:1105, index.docbook:1113
 #. Tag: entry
-#: using-d-i.xml:1316 using-d-i.xml:1324 using-d-i.xml:1354
+#: using-d-i.xml:1350 using-d-i.xml:1358 using-d-i.xml:1388
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 # index.docbook:1106, index.docbook:1107
 #. Tag: entry
-#: using-d-i.xml:1317 using-d-i.xml:1318
+#: using-d-i.xml:1351 using-d-i.xml:1352
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>否</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1319
+#: using-d-i.xml:1353
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "容量为最小分区乘以 RAID 设备数"
 
 #. Tag: entry
-#: using-d-i.xml:1323
+#: using-d-i.xml:1357
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 # index.docbook:1114, index.docbook:1122
 #. Tag: entry
-#: using-d-i.xml:1325 using-d-i.xml:1333 using-d-i.xml:1344 using-d-i.xml:1355
+#: using-d-i.xml:1359 using-d-i.xml:1367 using-d-i.xml:1378 using-d-i.xml:1389
 #, no-c-format
 msgid "optional"
 msgstr "可选"
 
 # index.docbook:1115, index.docbook:1123
 #. Tag: entry
-#: using-d-i.xml:1326 using-d-i.xml:1334 using-d-i.xml:1345 using-d-i.xml:1356
+#: using-d-i.xml:1360 using-d-i.xml:1368 using-d-i.xml:1379 using-d-i.xml:1390
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>是</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1327
+#: using-d-i.xml:1361
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "容量为 RAID 最小分区"
 
 #. Tag: entry
-#: using-d-i.xml:1331
+#: using-d-i.xml:1365
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1332
+#: using-d-i.xml:1366
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1335
+#: using-d-i.xml:1369
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -1946,20 +2007,20 @@ msgid ""
 msgstr "容量为最小分区乘以(RAID 设备数量减一)"
 
 #. Tag: entry
-#: using-d-i.xml:1342
+#: using-d-i.xml:1376
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 # index.docbook:1105, index.docbook:1113
 #. Tag: entry
-#: using-d-i.xml:1343
+#: using-d-i.xml:1377
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1346
+#: using-d-i.xml:1380
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -1967,13 +2028,13 @@ msgid ""
 msgstr "容量为最小分区乘以(RAID 设备数量减二)"
 
 #. Tag: entry
-#: using-d-i.xml:1353
+#: using-d-i.xml:1387
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1357
+#: using-d-i.xml:1391
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -1981,7 +2042,7 @@ msgid ""
 msgstr "所有的分区数除以 chunk 拷贝数(默认为二)"
 
 #. Tag: para
-#: using-d-i.xml:1364
+#: using-d-i.xml:1398
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -1991,7 +2052,7 @@ msgstr ""
 "\">Software RAID HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:1369
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2006,7 +2067,7 @@ msgstr ""
 "volume for RAID</guimenuitem> </menuchoice>。)"
 
 #. Tag: para
-#: using-d-i.xml:1378
+#: using-d-i.xml:1412
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2024,7 +2085,7 @@ msgstr ""
 "<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
 
 #. Tag: para
-#: using-d-i.xml:1390
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2039,7 +2100,7 @@ msgstr ""
 "验的用户，从 shell 手动地处理一些配置和安装步骤，也许会绕开这些问题。"
 
 #. Tag: para
-#: using-d-i.xml:1399
+#: using-d-i.xml:1433
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2059,7 +2120,7 @@ msgstr ""
 "RAID1)。后续操作会根据您选择的 MD 类型而定。"
 
 #. Tag: para
-#: using-d-i.xml:1412
+#: using-d-i.xml:1446
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2070,7 +2131,7 @@ msgstr ""
 "组成 MD 的分区。"
 
 #. Tag: para
-#: using-d-i.xml:1419
+#: using-d-i.xml:1453
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2087,7 +2148,7 @@ msgstr ""
 "将不会允许您继续下去，直到纠正错误。"
 
 #. Tag: para
-#: using-d-i.xml:1431
+#: using-d-i.xml:1465
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2097,7 +2158,7 @@ msgstr ""
 "区。"
 
 #. Tag: para
-#: using-d-i.xml:1437
+#: using-d-i.xml:1471
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2107,7 +2168,7 @@ msgstr ""
 "区。"
 
 #. Tag: para
-#: using-d-i.xml:1443
+#: using-d-i.xml:1477
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2125,7 +2186,7 @@ msgstr ""
 "贝数。这些活动设备必须是让所有的拷贝可以分布到不同磁盘。"
 
 #. Tag: para
-#: using-d-i.xml:1457
+#: using-d-i.xml:1491
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2141,7 +2202,7 @@ msgstr ""
 "RAID1 (相当可靠的 100 GB 分区用于 <filename>/home</filename>)。"
 
 #. Tag: para
-#: using-d-i.xml:1466
+#: using-d-i.xml:1500
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2154,13 +2215,13 @@ msgstr ""
 "您的新 MD 设备，并分配挂载点这样的属性。"
 
 #. Tag: title
-#: using-d-i.xml:1481
+#: using-d-i.xml:1515
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "配置逻辑卷管理(LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1482
+#: using-d-i.xml:1516
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2174,7 +2235,7 @@ msgstr ""
 "或符号链接等方法来折腾。"
 
 #. Tag: para
-#: using-d-i.xml:1490
+#: using-d-i.xml:1524
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2192,7 +2253,7 @@ msgstr ""
 "点在于它可以跨越多个物理磁盘。"
 
 #. Tag: para
-#: using-d-i.xml:1500
+#: using-d-i.xml:1534
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2210,7 +2271,7 @@ msgstr ""
 "阅 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:1511
+#: using-d-i.xml:1545
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2225,7 +2286,7 @@ msgstr ""
 "<guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>"
 
 #. Tag: para
-#: using-d-i.xml:1520
+#: using-d-i.xml:1554
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2242,7 +2303,7 @@ msgstr ""
 "了 LVM 配置的小结。菜单项本身是与内容相关，只显示可用的操作。可能的操作有："
 
 #. Tag: para
-#: using-d-i.xml:1531
+#: using-d-i.xml:1565
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2252,43 +2313,43 @@ msgstr ""
 "名称和逻辑卷尺寸等"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1536
+#: using-d-i.xml:1570
 #, no-c-format
 msgid "Create volume group"
 msgstr "Create volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1539
+#: using-d-i.xml:1573
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Create logical volume"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1542
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Delete volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1545
+#: using-d-i.xml:1579
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Delete logical volume"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1548
+#: using-d-i.xml:1582
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Extend volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1551
+#: using-d-i.xml:1585
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Reduce volume group"
 
 #. Tag: para
-#: using-d-i.xml:1553
+#: using-d-i.xml:1587
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2297,7 +2358,7 @@ msgstr ""
 "<guimenuitem>Finish</guimenuitem>: 返回 <command>partman</command> 主界面"
 
 #. Tag: para
-#: using-d-i.xml:1559
+#: using-d-i.xml:1593
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2305,7 +2366,7 @@ msgid ""
 msgstr "使用该菜单内的选项首先创建卷组，然后在里面创建逻辑卷。"
 
 #. Tag: para
-#: using-d-i.xml:1564
+#: using-d-i.xml:1598
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2316,13 +2377,13 @@ msgstr ""
 "通的分区一样(您也应该这样对待它们)。"
 
 #. Tag: title
-#: using-d-i.xml:1578
+#: using-d-i.xml:1612
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "配置加密卷"
 
 #. Tag: para
-#: using-d-i.xml:1579
+#: using-d-i.xml:1613
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2340,7 +2401,7 @@ msgstr ""
 "许可以访问硬盘，但是没有正确的口令，硬盘上的数据看起来就像是随机的字符。"
 
 #. Tag: para
-#: using-d-i.xml:1591
+#: using-d-i.xml:1625
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2363,7 +2424,7 @@ msgstr ""
 "加载内核。"
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1640
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2375,7 +2436,7 @@ msgstr ""
 "密和解密。性能将与您的 CPU 速度、选择的加密算法和密钥长度紧密相关。"
 
 #. Tag: para
-#: using-d-i.xml:1613
+#: using-d-i.xml:1647
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2393,7 +2454,7 @@ msgstr ""
 "guimenu> </menuchoice> 选项。菜单将包含分区的加密选项。"
 
 #. Tag: para
-#: using-d-i.xml:1624
+#: using-d-i.xml:1658
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2408,7 +2469,7 @@ msgstr ""
 "使用默认的方法。"
 
 #. Tag: para
-#: using-d-i.xml:1636
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2421,13 +2482,13 @@ msgstr ""
 "的安全考虑的选择。"
 
 #. Tag: term
-#: using-d-i.xml:1646
+#: using-d-i.xml:1680
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Encryption: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1648
+#: using-d-i.xml:1682
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2450,13 +2511,13 @@ msgstr ""
 "纪的敏感信息。"
 
 #. Tag: term
-#: using-d-i.xml:1666
+#: using-d-i.xml:1700
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Key size: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1668
+#: using-d-i.xml:1702
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -2468,13 +2529,13 @@ msgstr ""
 "加长度自然会降低性能。cipher 决定可用的密钥长度。"
 
 #. Tag: term
-#: using-d-i.xml:1680
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1682
+#: using-d-i.xml:1716
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2490,7 +2551,7 @@ msgstr ""
 "复模板推断信息。"
 
 #. Tag: para
-#: using-d-i.xml:1692
+#: using-d-i.xml:1726
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2503,25 +2564,25 @@ msgstr ""
 "法时，才使用其他的算法。"
 
 #. Tag: term
-#: using-d-i.xml:1704
+#: using-d-i.xml:1738
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Encryption key: <userinput>Passphrase</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1706
+#: using-d-i.xml:1740
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "这里您可以为分区选择所使用的加密密钥类型。"
 
 #. Tag: term
-#: using-d-i.xml:1712
+#: using-d-i.xml:1746
 #, no-c-format
 msgid "Passphrase"
 msgstr "Passphrase"
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1747
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -2534,13 +2595,13 @@ msgstr ""
 "使用时要求输入。"
 
 #. Tag: term
-#: using-d-i.xml:1728 using-d-i.xml:1821
+#: using-d-i.xml:1762 using-d-i.xml:1855
 #, no-c-format
 msgid "Random key"
 msgstr "Random key"
 
 #. Tag: para
-#: using-d-i.xml:1729
+#: using-d-i.xml:1763
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -2555,7 +2616,7 @@ msgstr ""
 "面临暴力破解，但是除非加密算法中有未知的弱点，这辈子也不会被攻破。)"
 
 #. Tag: para
-#: using-d-i.xml:1738
+#: using-d-i.xml:1772
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -2572,13 +2633,13 @@ msgstr ""
 "写入到交换分区的数据。"
 
 #. Tag: term
-#: using-d-i.xml:1757 using-d-i.xml:1834
+#: using-d-i.xml:1791 using-d-i.xml:1868
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Erase data: <userinput>yes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1759
+#: using-d-i.xml:1793
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -2596,7 +2657,7 @@ msgstr ""
 "备上的数据。</para></footnote>。"
 
 #. Tag: para
-#: using-d-i.xml:1779
+#: using-d-i.xml:1813
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -2608,13 +2669,13 @@ msgstr ""
 "下面内容："
 
 #. Tag: term
-#: using-d-i.xml:1788
+#: using-d-i.xml:1822
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Encryption: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1790
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -2625,25 +2686,25 @@ msgstr ""
 "时选取。请查阅前面关于 cipher 和密钥长度的章节了解更多信息。"
 
 #. Tag: term
-#: using-d-i.xml:1800
+#: using-d-i.xml:1834
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1802
+#: using-d-i.xml:1836
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "这里您可以为分区选择加密密钥的类型。"
 
 #. Tag: term
-#: using-d-i.xml:1808
+#: using-d-i.xml:1842
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Keyfile (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1809
+#: using-d-i.xml:1843
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -2655,19 +2716,19 @@ msgstr ""
 "application> 加密。要使用它，您需要输入正确的 passphrase (在以后会要求提供)。"
 
 #. Tag: para
-#: using-d-i.xml:1822
+#: using-d-i.xml:1856
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "请查阅前面有关随机密钥的章节。"
 
 #. Tag: para
-#: using-d-i.xml:1836
+#: using-d-i.xml:1870
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "请查阅前面有关删除数据的章节。"
 
 #. Tag: para
-#: using-d-i.xml:1845
+#: using-d-i.xml:1879
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -2682,7 +2743,7 @@ msgstr ""
 "标记分区上的数据，以及写新分区表等动作。对于大的分区，这会花一些时间。"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1889
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -2696,7 +2757,7 @@ msgstr ""
 "(比如生日、爱好、宠物的名字、以及家里其他成员的名字，等等)。"
 
 #. Tag: para
-#: using-d-i.xml:1864
+#: using-d-i.xml:1898
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -2716,7 +2777,7 @@ msgstr ""
 "所选择的键盘布局未能正确建立，而且是在为根文件系统输入 passphrase 的时候。"
 
 #. Tag: para
-#: using-d-i.xml:1877
+#: using-d-i.xml:1911
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -2735,7 +2796,7 @@ msgstr ""
 "程在每个要加密的分区重复进行。"
 
 #. Tag: para
-#: using-d-i.xml:1893
+#: using-d-i.xml:1927
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -2766,7 +2827,7 @@ msgstr ""
 "您不合适，可以进行修改。"
 
 #. Tag: para
-#: using-d-i.xml:1906
+#: using-d-i.xml:1940
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -2782,7 +2843,7 @@ msgstr ""
 "面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
 
 #. Tag: para
-#: using-d-i.xml:1916
+#: using-d-i.xml:1950
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -2790,13 +2851,13 @@ msgid ""
 msgstr "当您满意分区之后，可以继续安装过程。"
 
 #. Tag: title
-#: using-d-i.xml:1927
+#: using-d-i.xml:1961
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "安装基本系统"
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -2808,7 +2869,7 @@ msgstr ""
 "果您用较慢的计算机或网络，这要花费好一会儿时间。"
 
 #. Tag: para
-#: using-d-i.xml:1941
+#: using-d-i.xml:1975
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -2823,7 +2884,7 @@ msgstr ""
 "keycap><keycap>F1</keycap></keycombo>。"
 
 #. Tag: para
-#: using-d-i.xml:1950
+#: using-d-i.xml:1984
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -2834,7 +2895,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:1956
+#: using-d-i.xml:1990
 #, no-c-format
 msgid ""
 "As part of the installation, a Linux kernel will be installed. At the "
@@ -2846,13 +2907,13 @@ msgstr ""
 "您硬件最匹配的内核。在较低的优先级下，您可以从列表中选择一个有效的内核。"
 
 #. Tag: title
-#: using-d-i.xml:1968
+#: using-d-i.xml:2002
 #, no-c-format
 msgid "Setting Up Users And Passwords"
 msgstr "设置用户和密码"
 
 #. Tag: para
-#: using-d-i.xml:1969
+#: using-d-i.xml:2003
 #, no-c-format
 msgid ""
 "After the base system has been installed, the installer will allow you to "
@@ -2863,13 +2924,13 @@ msgstr ""
 "号。其他的用户帐号可以在安装完成之后创建。"
 
 #. Tag: title
-#: using-d-i.xml:1983
+#: using-d-i.xml:2017
 #, no-c-format
 msgid "Set the Root Password"
 msgstr "设置 root 密码"
 
 #. Tag: para
-#: using-d-i.xml:1987
+#: using-d-i.xml:2021
 #, no-c-format
 msgid ""
 "The <emphasis>root</emphasis> account is also called the <emphasis>super-"
@@ -2882,7 +2943,7 @@ msgstr ""
 "理，而且使用时间应该尽可能短。"
 
 #. Tag: para
-#: using-d-i.xml:1995
+#: using-d-i.xml:2029
 #, no-c-format
 msgid ""
 "Any password you create should contain at least 6 characters, and should "
@@ -2896,7 +2957,7 @@ msgstr ""
 "小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
 
 #. Tag: para
-#: using-d-i.xml:2003
+#: using-d-i.xml:2037
 #, no-c-format
 msgid ""
 "If anyone ever tells you they need your root password, be extremely wary. "
@@ -2907,13 +2968,13 @@ msgstr ""
 "员，否则通常不应该将超级用户密码交给别人。"
 
 #. Tag: title
-#: using-d-i.xml:2013
+#: using-d-i.xml:2047
 #, no-c-format
 msgid "Create an Ordinary User"
 msgstr "创建一个普通用户"
 
 #. Tag: para
-#: using-d-i.xml:2015
+#: using-d-i.xml:2049
 #, no-c-format
 msgid ""
 "The system will ask you whether you wish to create an ordinary user account "
@@ -2925,7 +2986,7 @@ msgstr ""
 "记，平时<emphasis>不要</emphasis>使用 root 帐户登录或者将其作为个人帐号使用。"
 
 #. Tag: para
-#: using-d-i.xml:2024
+#: using-d-i.xml:2058
 #, no-c-format
 msgid ""
 "Why not? Well, one reason to avoid using root's privileges is that it is "
@@ -2943,7 +3004,7 @@ msgstr ""
 "容，建议找一本进行学习。"
 
 #. Tag: para
-#: using-d-i.xml:2034
+#: using-d-i.xml:2068
 #, no-c-format
 msgid ""
 "You will first be prompted for the user's full name. Then you'll be asked "
@@ -2955,7 +3016,7 @@ msgstr ""
 "便满足要求，并为缺省值。最后，您将要求输入该帐号的密码。"
 
 #. Tag: para
-#: using-d-i.xml:2041
+#: using-d-i.xml:2075
 #, no-c-format
 msgid ""
 "If at any point after installation you would like to create another account, "
@@ -2965,13 +3026,13 @@ msgstr ""
 "令。"
 
 #. Tag: title
-#: using-d-i.xml:2052
+#: using-d-i.xml:2086
 #, no-c-format
 msgid "Installing Additional Software"
 msgstr "安装额外的软件"
 
 #. Tag: para
-#: using-d-i.xml:2053
+#: using-d-i.xml:2087
 #, no-c-format
 msgid ""
 "At this point you have a usable but limited system. Most users will want to "
@@ -2984,13 +3045,13 @@ msgstr ""
 "装基本系统还要花时间。"
 
 #. Tag: title
-#: using-d-i.xml:2068
+#: using-d-i.xml:2102
 #, no-c-format
 msgid "Configuring apt"
 msgstr "配置 apt"
 
 #. Tag: para
-#: using-d-i.xml:2070
+#: using-d-i.xml:2104
 #, no-c-format
 msgid ""
 "One of the tools used to install packages on a &debian; system is a program "
@@ -3021,7 +3082,7 @@ msgstr ""
 "软件包管理工具使用。"
 
 #. Tag: para
-#: using-d-i.xml:2094
+#: using-d-i.xml:2128
 #, no-c-format
 msgid ""
 "<command>apt</command> must be configured so that it knows from where to "
@@ -3034,7 +3095,7 @@ msgstr ""
 "并编辑成自己喜欢的地方。"
 
 #. Tag: para
-#: using-d-i.xml:2101
+#: using-d-i.xml:2135
 #, no-c-format
 msgid ""
 "If you are installing at default priority, the installer will largely take "
@@ -3049,7 +3110,7 @@ msgstr ""
 "序程序会自动加上安全镜像，它是 <quote>volatile</quote> 更新服务的镜像。"
 
 #. Tag: para
-#: using-d-i.xml:2110
+#: using-d-i.xml:2144
 #, no-c-format
 msgid ""
 "If you are installing at a lower priority (e.g. in expert mode), you will be "
@@ -3063,13 +3124,13 @@ msgstr ""
 "和 <quote>non-free</quote> 软件仓库里面添加软件包。"
 
 #. Tag: title
-#: using-d-i.xml:2121
+#: using-d-i.xml:2155
 #, no-c-format
 msgid "Installing from more than one CD or DVD"
 msgstr "从多个 CD 或 DVD 安装"
 
 #. Tag: para
-#: using-d-i.xml:2123
+#: using-d-i.xml:2157
 #, no-c-format
 msgid ""
 "If you are installing from a CD or a DVD that is part of a larger set, the "
@@ -3082,7 +3143,7 @@ msgstr ""
 "们里面的软件包了。"
 
 #. Tag: para
-#: using-d-i.xml:2130
+#: using-d-i.xml:2164
 #, no-c-format
 msgid ""
 "If you do not have any additional CDs or DVDs, that is no problem: using "
@@ -3094,7 +3155,7 @@ msgstr ""
 "节说明)，意味着下一步中选择的任务里面并非所有的软件包都会安装。"
 
 #. Tag: para
-#: using-d-i.xml:2138
+#: using-d-i.xml:2172
 #, no-c-format
 msgid ""
 "Packages are included on CDs (and DVDs) in the order of their popularity. "
@@ -3106,7 +3167,7 @@ msgstr ""
 "常用的软件，而最后一张光盘里面包含的是很少有人用到的软件。"
 
 #. Tag: para
-#: using-d-i.xml:2145
+#: using-d-i.xml:2179
 #, no-c-format
 msgid ""
 "It also means that buying or downloading and burning a full CD set is just a "
@@ -3120,7 +3181,7 @@ msgstr ""
 "DVD 的情况类似：只要一张，或者前两张 DVD 就能满足您大部分要求。"
 
 #. Tag: para
-#: using-d-i.xml:2154
+#: using-d-i.xml:2188
 #, no-c-format
 msgid ""
 "A good rule of thumb is that for a regular desktop installation (using the "
@@ -3133,7 +3194,7 @@ msgstr ""
 "境。"
 
 #. Tag: para
-#: using-d-i.xml:2162
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "If you do scan multiple CDs or DVDs, the installer will prompt you to "
@@ -3148,13 +3209,13 @@ msgstr ""
 "照次序来可以降低出错的几率。"
 
 #. Tag: title
-#: using-d-i.xml:2175
+#: using-d-i.xml:2209
 #, no-c-format
 msgid "Using a network mirror"
 msgstr "使用网络镜像"
 
 #. Tag: para
-#: using-d-i.xml:2177
+#: using-d-i.xml:2211
 #, no-c-format
 msgid ""
 "One question that will be asked during most installs is whether or not to "
@@ -3165,7 +3226,7 @@ msgstr ""
 "默认答案会很好，但还是有一些例外。"
 
 #. Tag: para
-#: using-d-i.xml:2183
+#: using-d-i.xml:2217
 #, no-c-format
 msgid ""
 "If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
@@ -3181,7 +3242,7 @@ msgstr ""
 "<literal>desktop</literal> 任务。"
 
 #. Tag: para
-#: using-d-i.xml:2192
+#: using-d-i.xml:2226
 #, no-c-format
 msgid ""
 "If you are installing from a single full CD or using a full CD image, using "
@@ -3198,7 +3259,7 @@ msgstr ""
 "装，以后(比如，重新启动到新系统)再安装额外的软件包。"
 
 #. Tag: para
-#: using-d-i.xml:2203
+#: using-d-i.xml:2237
 #, no-c-format
 msgid ""
 "If you are installing from a DVD or using a DVD image, any packages needed "
@@ -3211,7 +3272,7 @@ msgstr ""
 "项。"
 
 #. Tag: para
-#: using-d-i.xml:2210
+#: using-d-i.xml:2244
 #, no-c-format
 msgid ""
 "One advantage of adding a network mirror is that updates that have occurred "
@@ -3224,7 +3285,7 @@ msgstr ""
 "可以安装已经更新的内容，确保了系统的安全性和稳定性。。"
 
 #. Tag: para
-#: using-d-i.xml:2217
+#: using-d-i.xml:2251
 #, no-c-format
 msgid ""
 "In summary: selecting a network mirror is generally a good idea, except if "
@@ -3238,26 +3299,26 @@ msgstr ""
 "的数据量取决于"
 
 #. Tag: para
-#: using-d-i.xml:2226
+#: using-d-i.xml:2260
 #, no-c-format
 msgid "the tasks you select in the next step of the installation,"
 msgstr "安装下一步选择的任务，"
 
 #. Tag: para
-#: using-d-i.xml:2231
+#: using-d-i.xml:2265
 #, no-c-format
 msgid "which packages are needed for those tasks,"
 msgstr "这些任务所需的软件包，"
 
 #. Tag: para
-#: using-d-i.xml:2236
+#: using-d-i.xml:2270
 #, no-c-format
 msgid ""
 "which of those packages are present on the CDs or DVDs you have scanned, and"
 msgstr "已检测的 CD 或 DVD 上的软件包，并且"
 
 #. Tag: para
-#: using-d-i.xml:2241
+#: using-d-i.xml:2275
 #, no-c-format
 msgid ""
 "whether any updated versions of packages included on the CDs or DVDs are "
@@ -3268,7 +3329,7 @@ msgstr ""
 "安全更新的镜像)。"
 
 #. Tag: para
-#: using-d-i.xml:2250
+#: using-d-i.xml:2284
 #, no-c-format
 msgid ""
 "Note that the last point means that, even if you choose not to use a network "
@@ -3280,13 +3341,13 @@ msgstr ""
 "且软件包有安全更新，仍然会从互联网下载更新后的软件包。"
 
 #. Tag: title
-#: using-d-i.xml:2266
+#: using-d-i.xml:2300
 #, no-c-format
 msgid "Selecting and Installing Software"
 msgstr "选择和安装软件"
 
 #. Tag: para
-#: using-d-i.xml:2268
+#: using-d-i.xml:2302
 #, no-c-format
 msgid ""
 "During the installation process, you are given the opportunity to select "
@@ -3301,7 +3362,7 @@ msgstr ""
 "来快速建立您的计算机应对各种任务。"
 
 #. Tag: para
-#: using-d-i.xml:2277
+#: using-d-i.xml:2311
 #, no-c-format
 msgid ""
 "So, you have the ability to choose <emphasis>tasks</emphasis> first, and "
@@ -3331,7 +3392,7 @@ msgstr ""
 "空间。"
 
 #. Tag: para
-#: using-d-i.xml:2304
+#: using-d-i.xml:2338
 #, no-c-format
 msgid ""
 "Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3342,7 +3403,7 @@ msgstr ""
 "些任务。此时甚至可以不选中任何任务。"
 
 #. Tag: para
-#: using-d-i.xml:2311
+#: using-d-i.xml:2345
 #, no-c-format
 msgid ""
 "In the standard user interface of the installer, you can use the space bar "
@@ -3350,7 +3411,7 @@ msgid ""
 msgstr "在安装程序的标准用户界面下，您可以使用空格键切换任务的选择。"
 
 #. Tag: para
-#: using-d-i.xml:2317
+#: using-d-i.xml:2351
 #, no-c-format
 msgid ""
 "Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
@@ -3360,7 +3421,7 @@ msgstr ""
 "GNOME 桌面环境。"
 
 #. Tag: para
-#: using-d-i.xml:2322
+#: using-d-i.xml:2356
 #, no-c-format
 msgid ""
 "It is not possible to interactively select a different desktop during the "
@@ -3379,7 +3440,7 @@ msgstr ""
 "literal> 或 <literal>desktop=lxde</literal> 进行选择。"
 
 #. Tag: para
-#: using-d-i.xml:2333
+#: using-d-i.xml:2367
 #, no-c-format
 msgid ""
 "Some CD images (businesscard, netinst and DVD) also allow selection of the "
@@ -3392,7 +3453,7 @@ msgstr ""
 "<quote>Alternative desktop environments</quote>。"
 
 #. Tag: para
-#: using-d-i.xml:2340
+#: using-d-i.xml:2374
 #, no-c-format
 msgid ""
 "Note that this will only work if the packages needed for the desired desktop "
@@ -3407,7 +3468,7 @@ msgstr ""
 "Xfce 或 LXDE 同样适用于 DVD 映象或其他的安装方法。"
 
 #. Tag: para
-#: using-d-i.xml:2350
+#: using-d-i.xml:2384
 #, no-c-format
 msgid ""
 "The various server tasks will install software roughly as follows. DNS "
@@ -3426,7 +3487,7 @@ msgstr ""
 "classname>。"
 
 #. Tag: para
-#: using-d-i.xml:2361
+#: using-d-i.xml:2395
 #, no-c-format
 msgid ""
 "The <quote>Standard system</quote> task will install any package that has a "
@@ -3440,7 +3501,7 @@ msgstr ""
 "并需要一个最小化的系统，您应该让该任务选中。"
 
 #. Tag: para
-#: using-d-i.xml:2369
+#: using-d-i.xml:2403
 #, no-c-format
 msgid ""
 "If during language selection a default locale other than the <quote>C</"
@@ -3457,7 +3518,7 @@ msgstr ""
 "(如果存在)还会安装该桌面对应的本地化软件包。"
 
 #. Tag: para
-#: using-d-i.xml:2379
+#: using-d-i.xml:2413
 #, no-c-format
 msgid ""
 "Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -3469,7 +3530,7 @@ msgstr ""
 "选中任务的软件包。假如某个程序需要用户输入信息，它将提示您指定。"
 
 #. Tag: para
-#: using-d-i.xml:2386
+#: using-d-i.xml:2420
 #, no-c-format
 msgid ""
 "You should be aware that especially the Desktop task is very large. "
@@ -3484,7 +3545,7 @@ msgstr ""
 "间。一旦启动，安装软件包过程将无法取消。"
 
 #. Tag: para
-#: using-d-i.xml:2395
+#: using-d-i.xml:2429
 #, no-c-format
 msgid ""
 "Even when packages are included on the CD-ROM, the installer may still "
@@ -3499,13 +3560,13 @@ msgstr ""
 "新)；如果您安装的是测试版本，这会出现在使用旧映像安装时。"
 
 #. Tag: title
-#: using-d-i.xml:2410
+#: using-d-i.xml:2444
 #, no-c-format
 msgid "Making Your System Bootable"
 msgstr "创建启动系统"
 
 #. Tag: para
-#: using-d-i.xml:2412
+#: using-d-i.xml:2446
 #, no-c-format
 msgid ""
 "If you are installing a diskless workstation, obviously, booting off the "
@@ -3518,13 +3579,13 @@ msgstr ""
 "linkend=\"boot-dev-select-sun\"/>。</phrase>"
 
 #. Tag: title
-#: using-d-i.xml:2427
+#: using-d-i.xml:2461
 #, no-c-format
 msgid "Detecting other operating systems"
 msgstr "检测其他的操作系统"
 
 #. Tag: para
-#: using-d-i.xml:2429
+#: using-d-i.xml:2463
 #, no-c-format
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
@@ -3538,7 +3599,7 @@ msgstr ""
 "Debian 一起，计算机也将配置为可以启动其他操作系统。"
 
 #. Tag: para
-#: using-d-i.xml:2437
+#: using-d-i.xml:2471
 #, no-c-format
 msgid ""
 "Note that multiple operating systems booting on a single machine is still "
@@ -3552,13 +3613,13 @@ msgstr ""
 "管理器的文档了解更多信息。"
 
 #. Tag: title
-#: using-d-i.xml:2455
+#: using-d-i.xml:2489
 #, no-c-format
 msgid "<command>palo</command>-installer"
 msgstr "<command>palo</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:2456
+#: using-d-i.xml:2490
 #, no-c-format
 msgid ""
 "The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3573,19 +3634,19 @@ msgstr ""
 "<command>PALO</command> 能真正地读 Linux 分区。"
 
 #. Tag: para
-#: using-d-i.xml:2465
+#: using-d-i.xml:2499
 #, no-c-format
 msgid "hppa FIXME ( need more info )"
 msgstr "hppa FIXME ( need more info )"
 
 #. Tag: title
-#: using-d-i.xml:2477
+#: using-d-i.xml:2511
 #, no-c-format
 msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
 msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
 
 #. Tag: para
-#: using-d-i.xml:2479
+#: using-d-i.xml:2513
 #, no-c-format
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3596,7 +3657,7 @@ msgstr ""
 "定的 boot loader，它对新手和老手都是一个不错的缺省选择。"
 
 #. Tag: para
-#: using-d-i.xml:2485
+#: using-d-i.xml:2519
 #, no-c-format
 msgid ""
 "By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3608,7 +3669,7 @@ msgstr ""
 "请参阅 grub 的手册。"
 
 #. Tag: para
-#: using-d-i.xml:2491
+#: using-d-i.xml:2525
 #, no-c-format
 msgid ""
 "If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -3619,13 +3680,13 @@ msgstr ""
 "用的任何 bootloader。"
 
 #. Tag: title
-#: using-d-i.xml:2504
+#: using-d-i.xml:2538
 #, no-c-format
 msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
 
 #. Tag: para
-#: using-d-i.xml:2506
+#: using-d-i.xml:2540
 #, no-c-format
 msgid ""
 "The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -3641,7 +3702,7 @@ msgstr ""
 "HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:2516
+#: using-d-i.xml:2550
 #, no-c-format
 msgid ""
 "Currently the LILO installation will only create menu entries for other "
@@ -3654,7 +3715,7 @@ msgstr ""
 "统。"
 
 #. Tag: para
-#: using-d-i.xml:2524
+#: using-d-i.xml:2558
 #, no-c-format
 msgid ""
 "&d-i; offers you three choices on where to install the <command>LILO</"
@@ -3662,13 +3723,13 @@ msgid ""
 msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader："
 
 #. Tag: term
-#: using-d-i.xml:2531
+#: using-d-i.xml:2565
 #, no-c-format
 msgid "Master Boot Record (MBR)"
 msgstr "主引导区(MBR)"
 
 #. Tag: para
-#: using-d-i.xml:2531
+#: using-d-i.xml:2565
 #, no-c-format
 msgid ""
 "This way the <command>LILO</command> will take complete control of the boot "
@@ -3676,13 +3737,13 @@ msgid ""
 msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
 
 #. Tag: term
-#: using-d-i.xml:2538
+#: using-d-i.xml:2572
 #, no-c-format
 msgid "new Debian partition"
 msgstr "新 Debian 分区"
 
 #. Tag: para
-#: using-d-i.xml:2538
+#: using-d-i.xml:2572
 #, no-c-format
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -3693,13 +3754,13 @@ msgstr ""
 "新 Debian 分区的起始位置，并能作为第二 boot loader。"
 
 #. Tag: term
-#: using-d-i.xml:2547
+#: using-d-i.xml:2581
 #, no-c-format
 msgid "Other choice"
 msgstr "其它选择"
 
 #. Tag: para
-#: using-d-i.xml:2547
+#: using-d-i.xml:2581
 #, no-c-format
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
@@ -3712,7 +3773,7 @@ msgstr ""
 "filename> 或 <filename>/dev/sda</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:2557
+#: using-d-i.xml:2591
 #, no-c-format
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -3726,13 +3787,13 @@ msgstr ""
 "录 &mdash; 但这也意味着您要使用其他方法才能启动 Debian！"
 
 #. Tag: title
-#: using-d-i.xml:2573
+#: using-d-i.xml:2607
 #, no-c-format
 msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
 msgstr "安装 <command>ELILO</command> Boot Loader 到硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2575
+#: using-d-i.xml:2609
 #, no-c-format
 msgid ""
 "The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -3757,7 +3818,7 @@ msgstr ""
 "和启动 Linux 内核的工作。"
 
 #. Tag: para
-#: using-d-i.xml:2591
+#: using-d-i.xml:2625
 #, no-c-format
 msgid ""
 "The <quote>elilo</quote> configuration and installation is done as the last "
@@ -3772,13 +3833,13 @@ msgstr ""
 "<emphasis>root</emphasis> 文件系统相同的磁盘。"
 
 #. Tag: title
-#: using-d-i.xml:2603
+#: using-d-i.xml:2637
 #, no-c-format
 msgid "Choose the correct partition!"
 msgstr "选择正确的分区！"
 
 #. Tag: para
-#: using-d-i.xml:2605
+#: using-d-i.xml:2639
 #, no-c-format
 msgid ""
 "The criteria for selecting a partition is that it is FAT format filesystem "
@@ -3794,13 +3855,13 @@ msgstr ""
 "有内容！"
 
 #. Tag: title
-#: using-d-i.xml:2620
+#: using-d-i.xml:2654
 #, no-c-format
 msgid "EFI Partition Contents"
 msgstr "EFI 分区内容"
 
 #. Tag: para
-#: using-d-i.xml:2622
+#: using-d-i.xml:2656
 #, no-c-format
 msgid ""
 "The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -3826,13 +3887,13 @@ msgstr ""
 "间，系统更新或重新配置，文件系统中也许会有其他文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2644
+#: using-d-i.xml:2678
 #, no-c-format
 msgid "elilo.conf"
 msgstr "elilo.conf"
 
 #. Tag: para
-#: using-d-i.xml:2645
+#: using-d-i.xml:2679
 #, no-c-format
 msgid ""
 "This is the configuration file read by the boot loader when it starts. It is "
@@ -3843,13 +3904,13 @@ msgstr ""
 "filename> 的复制，其文件名重写成 EFI 分区上的文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2654
+#: using-d-i.xml:2688
 #, no-c-format
 msgid "elilo.efi"
 msgstr "elilo.efi"
 
 #. Tag: para
-#: using-d-i.xml:2655
+#: using-d-i.xml:2689
 #, no-c-format
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -3862,13 +3923,13 @@ msgstr ""
 "<quote>EFI Boot Manager</quote> 命令菜单。"
 
 #. Tag: filename
-#: using-d-i.xml:2665
+#: using-d-i.xml:2699
 #, no-c-format
 msgid "initrd.img"
 msgstr "initrd.img"
 
 #. Tag: para
-#: using-d-i.xml:2666
+#: using-d-i.xml:2700
 #, no-c-format
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -3881,13 +3942,13 @@ msgstr ""
 "filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2678
+#: using-d-i.xml:2712
 #, no-c-format
 msgid "readme.txt"
 msgstr "readme.txt"
 
 #. Tag: para
-#: using-d-i.xml:2679
+#: using-d-i.xml:2713
 #, no-c-format
 msgid ""
 "This is a small text file warning you that the contents of the directory are "
@@ -3898,13 +3959,13 @@ msgstr ""
 "任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
 
 #. Tag: filename
-#: using-d-i.xml:2689
+#: using-d-i.xml:2723
 #, no-c-format
 msgid "vmlinuz"
 msgstr "vmlinuz"
 
 #. Tag: para
-#: using-d-i.xml:2690
+#: using-d-i.xml:2724
 #, no-c-format
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -3917,13 +3978,13 @@ msgstr ""
 "<filename>/vmlinuz</filename> 指向的文件。"
 
 #. Tag: title
-#: using-d-i.xml:2710
+#: using-d-i.xml:2744
 #, no-c-format
 msgid "<command>arcboot</command>-installer"
 msgstr "<command>arcboot</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:2711
+#: using-d-i.xml:2745
 #, no-c-format
 msgid ""
 "The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -3963,13 +4024,13 @@ msgstr ""
 "</screen></informalexample> ，然后键入 <command>boot</command>。"
 
 #. Tag: replaceable
-#: using-d-i.xml:2730
+#: using-d-i.xml:2764
 #, no-c-format
 msgid "scsi"
 msgstr "scsi"
 
 #. Tag: para
-#: using-d-i.xml:2731
+#: using-d-i.xml:2765
 #, no-c-format
 msgid ""
 "is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -3977,13 +4038,13 @@ msgid ""
 msgstr "是启动的 SCSI 总线，<userinput>0</userinput> 为板载控制器"
 
 #. Tag: replaceable
-#: using-d-i.xml:2739
+#: using-d-i.xml:2773
 #, no-c-format
 msgid "disk"
 msgstr "disk"
 
 #. Tag: para
-#: using-d-i.xml:2740
+#: using-d-i.xml:2774
 #, no-c-format
 msgid ""
 "is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -3992,13 +4053,13 @@ msgstr "硬盘的 SCSI ID，<command>arcboot</command> 安装在其上"
 
 # index.docbook:1643, index.docbook:1712
 #. Tag: replaceable
-#: using-d-i.xml:2748
+#: using-d-i.xml:2782
 #, no-c-format
 msgid "partnr"
 msgstr "partnr"
 
 #. Tag: para
-#: using-d-i.xml:2749
+#: using-d-i.xml:2783
 #, no-c-format
 msgid ""
 "is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -4006,13 +4067,13 @@ msgid ""
 msgstr "分区号，<filename>/etc/arcboot.conf</filename> 处于该分区"
 
 #. Tag: replaceable
-#: using-d-i.xml:2757
+#: using-d-i.xml:2791
 #, no-c-format
 msgid "config"
 msgstr "config"
 
 #. Tag: para
-#: using-d-i.xml:2758
+#: using-d-i.xml:2792
 #, no-c-format
 msgid ""
 "is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -4022,13 +4083,13 @@ msgstr ""
 "quote> 。"
 
 #. Tag: title
-#: using-d-i.xml:2779
+#: using-d-i.xml:2813
 #, no-c-format
 msgid "Install <command>Yaboot</command> on a Hard Disk"
 msgstr "安装 <command>Yaboot</command> 至硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2780
+#: using-d-i.xml:2814
 #, no-c-format
 msgid ""
 "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -4046,13 +4107,13 @@ msgstr ""
 "设为启动 &debian;。"
 
 #. Tag: title
-#: using-d-i.xml:2798
+#: using-d-i.xml:2832
 #, no-c-format
 msgid "Install <command>Quik</command> on a Hard Disk"
 msgstr "安装 <command>Quik</command> 至硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2799
+#: using-d-i.xml:2833
 #, no-c-format
 msgid ""
 "The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -4065,13 +4126,13 @@ msgstr ""
 "以工作在 7200，7300 和 7600 Powermacs，以及一些 Power Computing 克隆。"
 
 #. Tag: title
-#: using-d-i.xml:2815
+#: using-d-i.xml:2849
 #, no-c-format
 msgid "<command>zipl</command>-installer"
 msgstr "<command>zipl</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:2816
+#: using-d-i.xml:2850
 #, no-c-format
 msgid ""
 "The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -4086,13 +4147,13 @@ msgstr ""
 "Commands</quote>，它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
 
 #. Tag: title
-#: using-d-i.xml:2833
+#: using-d-i.xml:2867
 #, no-c-format
 msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
 msgstr "安装 <command>SILO</command> Boot Loader 到硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2835
+#: using-d-i.xml:2869
 #, no-c-format
 msgid ""
 "The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -4119,13 +4180,13 @@ msgstr ""
 "区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
 
 #. Tag: title
-#: using-d-i.xml:2860
+#: using-d-i.xml:2894
 #, no-c-format
 msgid "Continue Without Boot Loader"
 msgstr "不使用 boot loader 继续进行"
 
 #. Tag: para
-#: using-d-i.xml:2862
+#: using-d-i.xml:2896
 #, no-c-format
 msgid ""
 "This option can be used to complete the installation even when no boot "
@@ -4136,7 +4197,7 @@ msgstr ""
 "是因为不想要(比如，您想使用已经存在的 boot loader)"
 
 #. Tag: para
-#: using-d-i.xml:2869
+#: using-d-i.xml:2903
 #, no-c-format
 msgid ""
 "If you plan to manually configure your bootloader, you should check the name "
@@ -4155,13 +4216,13 @@ msgstr ""
 "filename> 到一个独立的分区，还需要 <filename>/boot</filename> 文件系统。"
 
 #. Tag: title
-#: using-d-i.xml:2886
+#: using-d-i.xml:2920
 #, no-c-format
 msgid "Finishing the Installation"
 msgstr "完成安装"
 
 #. Tag: para
-#: using-d-i.xml:2887
+#: using-d-i.xml:2921
 #, no-c-format
 msgid ""
 "This is the last step in the Debian installation process during which the "
@@ -4172,13 +4233,13 @@ msgstr ""
 "i; 之后的清理。"
 
 #. Tag: title
-#: using-d-i.xml:2900
+#: using-d-i.xml:2934
 #, no-c-format
 msgid "Setting the System Clock"
 msgstr "设置系统时钟"
 
 #. Tag: para
-#: using-d-i.xml:2902
+#: using-d-i.xml:2936
 #, no-c-format
 msgid ""
 "The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -4190,7 +4251,7 @@ msgstr ""
 "装程序依据是否有其他系统已经安装这类事情，来决定时钟要不要设为 UTC。"
 
 #. Tag: para
-#: using-d-i.xml:2909
+#: using-d-i.xml:2943
 #, no-c-format
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
@@ -4206,7 +4267,7 @@ msgstr ""
 "为本地时间。如果您需要多重引导，请选择本地时间而不是 GMT。</phrase>"
 
 #. Tag: para
-#: using-d-i.xml:2920
+#: using-d-i.xml:2954
 #, no-c-format
 msgid ""
 "At this point &d-i; will also attempt to save the current time to the "
@@ -4217,13 +4278,13 @@ msgstr ""
 "决于刚才的选择。"
 
 #. Tag: title
-#: using-d-i.xml:2935
+#: using-d-i.xml:2969
 #, no-c-format
 msgid "Reboot the System"
 msgstr "重新启动系统"
 
 #. Tag: para
-#: using-d-i.xml:2937
+#: using-d-i.xml:2971
 #, no-c-format
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -4234,7 +4295,7 @@ msgstr ""
 "Debian 系统。"
 
 #. Tag: para
-#: using-d-i.xml:2943
+#: using-d-i.xml:2977
 #, no-c-format
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
@@ -4246,13 +4307,13 @@ msgstr ""
 "上的 IPL &debian;，它在安装步骤第一步里被选做根文件系统。"
 
 #. Tag: title
-#: using-d-i.xml:2956
+#: using-d-i.xml:2990
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "杂项"
 
 #. Tag: para
-#: using-d-i.xml:2957
+#: using-d-i.xml:2991
 #, no-c-format
 msgid ""
 "The components listed in this section are usually not involved in the "
@@ -4263,13 +4324,13 @@ msgstr ""
 "题。"
 
 #. Tag: title
-#: using-d-i.xml:2970
+#: using-d-i.xml:3004
 #, no-c-format
 msgid "Saving the installation logs"
 msgstr "保存安装记录"
 
 #. Tag: para
-#: using-d-i.xml:2972
+#: using-d-i.xml:3006
 #, no-c-format
 msgid ""
 "If the installation is successful, the logfiles created during the "
@@ -4280,7 +4341,7 @@ msgstr ""
 "<filename>/var/log/installer/</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:2979
+#: using-d-i.xml:3013
 #, no-c-format
 msgid ""
 "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -4294,13 +4355,13 @@ msgstr ""
 "其它系统上研究记录，或者用于报告的附件。"
 
 #. Tag: title
-#: using-d-i.xml:2999
+#: using-d-i.xml:3033
 #, no-c-format
 msgid "Using the Shell and Viewing the Logs"
 msgstr "使用 Shell 查看记录"
 
 #. Tag: para
-#: using-d-i.xml:3001
+#: using-d-i.xml:3035
 #, no-c-format
 msgid ""
 "There are several methods you can use to get a shell while running an "
@@ -4324,13 +4385,13 @@ msgstr ""
 "安装程序。"
 
 #. Tag: para
-#: using-d-i.xml:3019
+#: using-d-i.xml:3053
 #, no-c-format
 msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
 msgstr "对于图形安装程序，请参阅 <xref linkend=\"gtk-using\"/>。"
 
 #. Tag: para
-#: using-d-i.xml:3023
+#: using-d-i.xml:3057
 #, no-c-format
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -4345,7 +4406,7 @@ msgstr ""
 "到安装程序。"
 
 #. Tag: para
-#: using-d-i.xml:3031
+#: using-d-i.xml:3065
 #, no-c-format
 msgid ""
 "At this point you are booted from the RAM disk, and there is a limited set "
@@ -4361,7 +4422,7 @@ msgstr ""
 "Bourne shell 的克隆，有一些如自动完成与历史纪录这样的好特性。"
 
 #. Tag: para
-#: using-d-i.xml:3040
+#: using-d-i.xml:3074
 #, no-c-format
 msgid ""
 "To edit and view files, use the text editor <command>nano</command>. Log "
@@ -4372,7 +4433,7 @@ msgstr ""
 "以在 <filename>/var/log</filename> 目录找到。"
 
 #. Tag: para
-#: using-d-i.xml:3047
+#: using-d-i.xml:3081
 #, no-c-format
 msgid ""
 "Although you can do basically anything in a shell that the available "
@@ -4383,7 +4444,7 @@ msgstr ""
 "题时进行调试。"
 
 #. Tag: para
-#: using-d-i.xml:3053
+#: using-d-i.xml:3087
 #, no-c-format
 msgid ""
 "Doing things manually from the shell may interfere with the installation "
@@ -4395,13 +4456,13 @@ msgstr ""
 "该让安装程序激活交换分区，而不是在 shell 里面自己动手。"
 
 #. Tag: title
-#: using-d-i.xml:3068
+#: using-d-i.xml:3102
 #, no-c-format
 msgid "Installation Over the Network"
 msgstr "通过网络安装"
 
 #. Tag: para
-#: using-d-i.xml:3070
+#: using-d-i.xml:3104
 #, no-c-format
 msgid ""
 "One of the more interesting components is <firstterm>network-console</"
@@ -4416,7 +4477,7 @@ msgstr ""
 "先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
 
 #. Tag: para
-#: using-d-i.xml:3080
+#: using-d-i.xml:3114
 #, no-c-format
 msgid ""
 "This component is not loaded into the main installation menu by default, so "
@@ -4436,7 +4497,7 @@ msgstr ""
 "SSH</guimenuitem>。"
 
 #. Tag: para
-#: using-d-i.xml:3093
+#: using-d-i.xml:3127
 #, no-c-format
 msgid ""
 "For installations on &arch-title;, this is the default method after setting "
@@ -4444,7 +4505,7 @@ msgid ""
 msgstr "在 &arch-title; 上安装，建立网络之后这是默认的方法。"
 
 #. Tag: para
-#: using-d-i.xml:3098
+#: using-d-i.xml:3132
 #, no-c-format
 msgid ""
 "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -4464,7 +4525,7 @@ msgstr ""
 "quote>。"
 
 #. Tag: para
-#: using-d-i.xml:3110
+#: using-d-i.xml:3144
 #, no-c-format
 msgid ""
 "Should you decide to continue with the installation locally, you can always "
@@ -4475,7 +4536,7 @@ msgstr ""
 "他的组件。"
 
 #. Tag: para
-#: using-d-i.xml:3116
+#: using-d-i.xml:3150
 #, no-c-format
 msgid ""
 "Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4503,7 +4564,7 @@ msgstr ""
 "确认是否正确。"
 
 #. Tag: para
-#: using-d-i.xml:3133
+#: using-d-i.xml:3167
 #, no-c-format
 msgid ""
 "The <command>ssh</command> server in the installer uses a default "
@@ -4524,7 +4585,7 @@ msgstr ""
 "接在安装过程中的哪一点断开，您在连接之后可能继续，也可能无法继续安装过程。"
 
 #. Tag: para
-#: using-d-i.xml:3146
+#: using-d-i.xml:3180
 #, no-c-format
 msgid ""
 "You may be able to avoid the connection being dropped by adding the option "
@@ -4544,7 +4605,7 @@ msgstr ""
 "需要的时候采用。"
 
 #. Tag: para
-#: using-d-i.xml:3159
+#: using-d-i.xml:3193
 #, no-c-format
 msgid ""
 "If you install several computers in turn and they happen to have the same IP "
@@ -4566,7 +4627,7 @@ msgstr ""
 "footnote>，再重新来过。"
 
 #. Tag: para
-#: using-d-i.xml:3175
+#: using-d-i.xml:3209
 #, no-c-format
 msgid ""
 "After the login you will be presented with an initial screen where you have "
@@ -4583,7 +4644,7 @@ msgstr ""
 "的系统。在安装菜单只能打开一个 SSH 会话，但 shell 可以打开多个。"
 
 #. Tag: para
-#: using-d-i.xml:3185
+#: using-d-i.xml:3219
 #, no-c-format
 msgid ""
 "After you have started the installation remotely over SSH, you should not go "
@@ -4596,13 +4657,13 @@ msgstr ""
 "配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
 
 #. Tag: title
-#: using-d-i.xml:3205
+#: using-d-i.xml:3239
 #, no-c-format
 msgid "Loading Missing Firmware"
 msgstr "加载缺失的固件"
 
 #. Tag: para
-#: using-d-i.xml:3206
+#: using-d-i.xml:3240
 #, no-c-format
 msgid ""
 "As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -4615,7 +4676,7 @@ msgstr ""
 "强功能就无法使用。"
 
 #. Tag: para
-#: using-d-i.xml:3214
+#: using-d-i.xml:3248
 #, no-c-format
 msgid ""
 "If a device driver requests firmware that is not available, &d-i; will "
@@ -4631,7 +4692,7 @@ msgstr ""
 "序模块。"
 
 #. Tag: para
-#: using-d-i.xml:3224
+#: using-d-i.xml:3258
 #, no-c-format
 msgid ""
 "Which devices are scanned and which file systems are supported depends on "
@@ -4647,7 +4708,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: using-d-i.xml:3234
+#: using-d-i.xml:3268
 #, no-c-format
 msgid ""
 "Note that it is possible to skip loading the firmware if you know the device "
@@ -4658,7 +4719,7 @@ msgstr ""
 "固件。"
 
 #. Tag: para
-#: using-d-i.xml:3241
+#: using-d-i.xml:3275
 #, no-c-format
 msgid ""
 "Support for loading firmware is still relatively basic and is likely to be "
@@ -4672,13 +4733,13 @@ msgstr ""
 "反应遇到的任何问题(参阅 <xref linkend=\"submit-bug\"/>)。"
 
 #. Tag: title
-#: using-d-i.xml:3252
+#: using-d-i.xml:3286
 #, no-c-format
 msgid "Preparing a medium"
 msgstr "准备介质"
 
 #. Tag: para
-#: using-d-i.xml:3253
+#: using-d-i.xml:3287
 #, no-c-format
 msgid ""
 "Although in some cases the firmware can also be loaded from a partition on a "
@@ -4695,7 +4756,7 @@ msgstr ""
 "程最初阶段最可能支持的文件系统。"
 
 #. Tag: para
-#: using-d-i.xml:3263
+#: using-d-i.xml:3297
 #, no-c-format
 msgid ""
 "Tarballs containing current packages for the most common firmware are "
@@ -4709,7 +4770,7 @@ msgstr ""
 "下载对应版本的压缩包，然后解压到介质的文件系统里面。"
 
 #. Tag: para
-#: using-d-i.xml:3277
+#: using-d-i.xml:3311
 #, no-c-format
 msgid ""
 "If the firmware you need is not included in the tarball, you can also "
@@ -4722,7 +4783,7 @@ msgstr ""
 "件。以下概要列出大多数固件软件包，但不保证完整，有些还是非固件软件包："
 
 #. Tag: para
-#: using-d-i.xml:3291
+#: using-d-i.xml:3325
 #, no-c-format
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
@@ -4733,13 +4794,13 @@ msgstr ""
 "造商那里获得。"
 
 #. Tag: title
-#: using-d-i.xml:3300
+#: using-d-i.xml:3334
 #, no-c-format
 msgid "Firmware and the Installed System"
 msgstr "固件和安装好的系统"
 
 #. Tag: para
-#: using-d-i.xml:3301
+#: using-d-i.xml:3335
 #, no-c-format
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
@@ -4754,7 +4815,7 @@ msgstr ""
 "序不同的内核版本，有可能由于版本的偏差造成固件不能加载。"
 
 #. Tag: para
-#: using-d-i.xml:3310
+#: using-d-i.xml:3344
 #, no-c-format
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -4768,7 +4829,7 @@ msgstr ""
 "做的优点在于如果有固件的新版本存在会自动更新。"
 
 #. Tag: para
-#: using-d-i.xml:3318
+#: using-d-i.xml:3352
 #, no-c-format
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
@@ -4779,7 +4840,7 @@ msgstr ""
 "安装好固件或软件包。"
 
 #. Tag: para
-#: using-d-i.xml:3325
+#: using-d-i.xml:3359
 #, no-c-format
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -4789,3 +4850,30 @@ msgid ""
 msgstr ""
 "如果固件从不严格的固件文件加载，复制到安装好的系统的固件将<emphasis>不会</"
 "emphasis>自动更新，除非对应的固件软件包(如果有的话)在系统安装之后安装。"
+
+#~ msgid ""
+#~ "If the language has only one country associated with it, that country "
+#~ "will be selected automatically. In that case it is only possible to "
+#~ "select a different country by first lowering the debconf priority to "
+#~ "medium, followed by revisiting the language selection option in the main "
+#~ "menu of the installer."
+#~ msgstr ""
+#~ "如果此语言只对应一个国家，该国将会被自动选中。这种情况下如果要选择其他的国"
+#~ "家，首先要降低 debconf 优先级为 medium，然后在安装程序的主菜单中重新选择语"
+#~ "言。"
+
+#~| msgid ""
+#~| "A default locale will be selected based on the selected language and "
+#~| "country. If you are installing at medium or low priority, you will have "
+#~| "the option of selecting a different default locale and of selecting "
+#~| "additional locales to be generated for the installed system."
+#~ msgid ""
+#~ "A default locale will be selected based on the selected language and "
+#~ "country. If you are installing at medium or low priority, you will have "
+#~ "the option of selecting additional locales to be generated for the "
+#~ "installed system; if you do, you will be asked which locale should be the "
+#~ "default for the installed system."
+#~ msgstr ""
+#~ "默认 locale 的选择是基于先前所选的语言和国家。如果您以 medium 或 low 优先"
+#~ "级安装，可以有机会为安装后的系统选择生成额外的 locale；这时，您将会被要求"
+#~ "选择默认的 local。"
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index c1a286f48..1ee9c0bfa 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -296,14 +296,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:194
 #, no-c-format
-#| msgid ""
-#| "Linus Torvalds continues to coordinate the work of several hundred "
-#| "developers with the help of a few trusty deputies. An excellent weekly "
-#| "summary of discussions on the <userinput>linux-kernel</userinput> mailing "
-#| "list is <ulink url=\"&url-kernel-traffic;\">Kernel Traffic</ulink>. More "
-#| "information about the <userinput>linux-kernel</userinput> mailing list "
-#| "can be found on the <ulink url=\"&url-linux-kernel-list-faq;\">linux-"
-#| "kernel mailing list FAQ</ulink>."
 msgid ""
 "Linus Torvalds continues to coordinate the work of several hundred "
 "developers with the help of a number of subsystem maintainers. There is an "
@@ -311,7 +303,12 @@ msgid ""
 "kernel. More information about the <userinput>linux-kernel</userinput> "
 "mailing list can be found on the <ulink url=\"&url-linux-kernel-list-faq;"
 "\">linux-kernel mailing list FAQ</ulink>."
-msgstr "在一些子系统维护人员的帮助下，Linus Torvalds 一直协调着数百位开发人员的工作。Linux 内核有一个 <ulink url=\"&url-kernel-org;\">official website</ulink>。有关 <userinput>linux-kernel</userinput> 邮件列表更多的信息可以在 <ulink url=\"&url-linux-kernel-list-faq;\">linux-kernel mailing list FAQ</ulink> 上找到。"
+msgstr ""
+"在一些子系统维护人员的帮助下，Linus Torvalds 一直协调着数百位开发人员的工作。"
+"Linux 内核有一个 <ulink url=\"&url-kernel-org;\">official website</ulink>。有"
+"关 <userinput>linux-kernel</userinput> 邮件列表更多的信息可以在 <ulink url="
+"\"&url-linux-kernel-list-faq;\">linux-kernel mailing list FAQ</ulink> 上找"
+"到。"
 
 #. Tag: para
 #: welcome.xml:204