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

1 files changed, 177 insertions, 118 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 7f29abc3e..446c0528f 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-04-25 00:10+0000\n"
+"POT-Creation-Date: 2008-04-30 00:09+0000\n"
 "PO-Revision-Date: 2008-04-20 13:41+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -26,7 +26,7 @@ msgid ""
 msgstr "本附录说明如何预置 &d-i; 中提问的答案，让安装过程自动化。"
 
 #. Tag: para
-#: preseed.xml:23 preseed.xml:654
+#: preseed.xml:23 preseed.xml:662
 #, no-c-format
 msgid ""
 "The configuration fragments used in this appendix are also available as an "
@@ -544,39 +544,40 @@ msgstr ""
 "</screen></informalexample> 这需要一个 DHCP 服务器能找到并且 DNS 可以解析 "
 "<literal>autoserver</literal>，或许要加上 DHCP 提供的本地域名。 如果域名是 "
 "<literal>example.com</literal>，并有相应的 DHCP 设置，那么预置文件将从 "
-"<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</literal> 获"
-"得。"
+"<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</"
+"literal> 获得。"
 
 #. Tag: para
 #: preseed.xml:391
 #, no-c-format
 msgid ""
-"The last part of that url (<literal>d-i/&releasename;/./preseed.cfg</literal>) is "
-"taken from <literal>auto-install/defaultroot</literal>. By default this "
-"includes the directory <literal>&releasename;</literal> to allow future versions to "
-"specify their own codename and let people migrate forwards in a controlled "
-"manner. The <literal>/./</literal> bit is used to indicate a root, relative "
-"to which subsequent paths can be anchored (for use in preseed/include and "
-"preseed/run). This allows files to be specified either as full URLs, paths "
-"starting with / that are thus anchored, or even paths relative to the "
-"location where the last preseed file was found. This can be used to "
-"construct more portable scripts where an entire hierarchy of scripts can be "
-"moved to a new location without breaking it, for example copying the files "
-"onto a USB stick when they started out on a web server. In this example, if "
-"the preseed file sets <literal>preseed/run</literal> to <literal>/scripts/"
-"late_command.sh</literal> then the file will be fetched from <literal>http://"
-"autoserver.example.com/d-i/&releasename;/./scripts/late_command.sh</literal>."
+"The last part of that url (<literal>d-i/&releasename;/./preseed.cfg</"
+"literal>) is taken from <literal>auto-install/defaultroot</literal>. By "
+"default this includes the directory <literal>&releasename;</literal> to "
+"allow future versions to specify their own codename and let people migrate "
+"forwards in a controlled manner. The <literal>/./</literal> bit is used to "
+"indicate a root, relative to which subsequent paths can be anchored (for use "
+"in preseed/include and preseed/run). This allows files to be specified "
+"either as full URLs, paths starting with / that are thus anchored, or even "
+"paths relative to the location where the last preseed file was found. This "
+"can be used to construct more portable scripts where an entire hierarchy of "
+"scripts can be moved to a new location without breaking it, for example "
+"copying the files onto a USB stick when they started out on a web server. In "
+"this example, if the preseed file sets <literal>preseed/run</literal> to "
+"<literal>/scripts/late_command.sh</literal> then the file will be fetched "
+"from <literal>http://autoserver.example.com/d-i/&releasename;/./scripts/"
+"late_command.sh</literal>."
 msgstr ""
 "url 的最后一部分(<literal>d-i/&releasename;/./preseed.cfg</literal>)来自 "
-"<literal>auto-install/defaultroot</literal>。默认包括 <literal>&releasename;</"
-"literal> 目录，让将来的版本在可控的方式下指定自己的代号。<literal>/./</"
+"<literal>auto-install/defaultroot</literal>。默认包括 <literal>&releasename;"
+"</literal> 目录，让将来的版本在可控的方式下指定自己的代号。<literal>/./</"
 "literal> 位用来定位相对于根目录的子目录(用于 preseed/include 和 preseed/"
 "run)。使文件可以指定为完整路径、以 / 开始的位置或者相对于最后一个预置的文件。"
 "这样可以建立更具移植性的脚本，让各级脚本完整地移动到新的位置而不被破坏。比"
 "如，复制 web 服务器上的文件到 U 盘。本例中，如果预置文件的 <literal>preseed/"
 "run</literal> 为 <literal>/scripts/late_command.sh</literal>，那么文件将从 "
-"<literal>http://autoserver.example.com/d-i/&releasename;/./scripts/late_command.sh</"
-"literal> 获得。"
+"<literal>http://autoserver.example.com/d-i/&releasename;/./scripts/"
+"late_command.sh</literal> 获得。"
 
 #. Tag: para
 #: preseed.xml:411
@@ -978,6 +979,18 @@ msgstr ""
 #: preseed.xml:584
 #, no-c-format
 msgid ""
+"For debconf variables (templates) used in the installer itself, the owner "
+"should be set to <quote>d-i</quote>; to preseed variables used in the "
+"installed system, the name of the package that contains the corresponding "
+"debconf template should be used. Only variables that have their owner set to "
+"something other than <quote>d-i</quote> will be propagated to the debconf "
+"database for the installed system."
+msgstr ""
+
+#. Tag: para
+#: preseed.xml:592
+#, no-c-format
+msgid ""
 "Most questions need to be preseeded using the values valid in English and "
 "not the translated values. However, there are some questions (for example in "
 "<classname>partman</classname>) where the translated values need to be used."
@@ -986,7 +999,7 @@ msgstr ""
 "<classname>partman</classname>)，需要使用翻译过的值。"
 
 #. Tag: para
-#: preseed.xml:590
+#: preseed.xml:598
 #, no-c-format
 msgid ""
 "Some questions take a code as value instead of the English text that is "
@@ -994,7 +1007,7 @@ msgid ""
 msgstr "有些问题在安装过程中显示值的代码而不是英文文本。"
 
 #. Tag: para
-#: preseed.xml:596
+#: preseed.xml:604
 #, no-c-format
 msgid ""
 "The easiest way to create a preconfiguration file is to use the example file "
@@ -1004,7 +1017,7 @@ msgstr ""
 "\"preseed-contents\"/>。"
 
 #. Tag: para
-#: preseed.xml:601
+#: preseed.xml:609
 #, no-c-format
 msgid ""
 "An alternative method is to do a manual installation and then, after "
@@ -1017,7 +1030,7 @@ msgstr ""
 "程序的 cdebconf 数据库到一个文件："
 
 #. Tag: screen
-#: preseed.xml:608
+#: preseed.xml:616
 #, no-c-format
 msgid ""
 "$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
@@ -1027,7 +1040,7 @@ msgstr ""
 "$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
 
 #. Tag: para
-#: preseed.xml:610
+#: preseed.xml:618
 #, no-c-format
 msgid ""
 "However, a file generated in this manner will have some items that should "
@@ -1038,7 +1051,7 @@ msgstr ""
 "始。"
 
 #. Tag: para
-#: preseed.xml:618
+#: preseed.xml:626
 #, no-c-format
 msgid ""
 "This method relies on the fact that, at the end of the installation, the "
@@ -1052,7 +1065,7 @@ msgstr ""
 "感的信息，默认只为 root 可读。"
 
 #. Tag: para
-#: preseed.xml:626
+#: preseed.xml:634
 #, no-c-format
 msgid ""
 "The directory <filename>/var/log/installer</filename> and all files in it "
@@ -1063,7 +1076,7 @@ msgstr ""
 "log/installer</filename> 目录及其中的文件将从您的系统中删除。"
 
 #. Tag: para
-#: preseed.xml:634
+#: preseed.xml:642
 #, no-c-format
 msgid ""
 "To check possible values for questions, you can use <command>nano</command> "
@@ -1078,7 +1091,7 @@ msgstr ""
 "值。"
 
 #. Tag: para
-#: preseed.xml:642
+#: preseed.xml:650
 #, no-c-format
 msgid ""
 "To check if the format of your preconfiguration file is valid before "
@@ -1089,14 +1102,14 @@ msgstr ""
 "selections -c <replaceable>preseed.cfg</replaceable></command> 命令。"
 
 #. Tag: title
-#: preseed.xml:653
+#: preseed.xml:661
 #, fuzzy, no-c-format
 #| msgid "Contents of the preconfiguration file"
 msgid "Contents of the preconfiguration file (for &releasename;)"
 msgstr "预置文件的内容"
 
 #. Tag: para
-#: preseed.xml:659
+#: preseed.xml:667
 #, no-c-format
 msgid ""
 "Note that this example is based on an installation for the Intel x86 "
@@ -1110,13 +1123,13 @@ msgstr ""
 "设置替换。"
 
 #. Tag: title
-#: preseed.xml:670
+#: preseed.xml:678
 #, no-c-format
 msgid "Localization"
 msgstr "本地化"
 
 #. Tag: para
-#: preseed.xml:671
+#: preseed.xml:679
 #, no-c-format
 msgid ""
 "Setting localization values will only work if you are using initrd "
@@ -1126,7 +1139,7 @@ msgstr ""
 "设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载的。"
 
 #. Tag: para
-#: preseed.xml:677
+#: preseed.xml:685
 #, no-c-format
 msgid ""
 "The locale can be used to specify both language and country. To specify the "
@@ -1137,7 +1150,7 @@ msgstr ""
 "<userinput>locale=<replaceable>en_US</replaceable></userinput>。"
 
 #. Tag: screen
-#: preseed.xml:683
+#: preseed.xml:691
 #, no-c-format
 msgid ""
 "# Locale sets language and country.\n"
@@ -1147,7 +1160,7 @@ msgstr ""
 "d-i debian-installer/locale string en_US"
 
 #. Tag: para
-#: preseed.xml:685
+#: preseed.xml:693
 #, no-c-format
 msgid ""
 "Keyboard configuration consists of selecting a keyboard architecture and a "
@@ -1159,7 +1172,7 @@ msgstr ""
 "因此通常不必预置。keymap 必须对所选择的键盘体系有效。"
 
 #. Tag: screen
-#: preseed.xml:692
+#: preseed.xml:700
 #, no-c-format
 msgid ""
 "# Keyboard selection.\n"
@@ -1175,7 +1188,7 @@ msgstr ""
 "#d-i console-keymaps-usb/keymap select mac-usb-us"
 
 #. Tag: para
-#: preseed.xml:694
+#: preseed.xml:702
 #, no-c-format
 msgid ""
 "To skip keyboard configuration, preseed <classname>console-tools/archs</"
@@ -1186,7 +1199,7 @@ msgstr ""
 "tools/archs</classname>。这将导致内核 keymap 保持活动。"
 
 #. Tag: para
-#: preseed.xml:703
+#: preseed.xml:711
 #, no-c-format
 msgid ""
 "The changes in the input layer for 2.6 kernels have made the keyboard "
@@ -1197,13 +1210,13 @@ msgstr ""
 "<quote>PC</quote> (<userinput>at</userinput>) keymap。"
 
 #. Tag: title
-#: preseed.xml:713
+#: preseed.xml:721
 #, no-c-format
 msgid "Network configuration"
 msgstr "网络设置"
 
 #. Tag: para
-#: preseed.xml:714
+#: preseed.xml:722
 #, no-c-format
 msgid ""
 "Of course, preseeding the network configuration won't work if you're loading "
@@ -1216,7 +1229,7 @@ msgstr ""
 "助。如果您计划从网络加载预置文件，应该使用传递网络设置给内核引导参数的方式。"
 
 #. Tag: para
-#: preseed.xml:722
+#: preseed.xml:730
 #, no-c-format
 msgid ""
 "If you need to pick a particular interface when netbooting before loading a "
@@ -1227,7 +1240,7 @@ msgstr ""
 "<userinput>interface=<replaceable>eth1</replaceable></userinput>。"
 
 #. Tag: para
-#: preseed.xml:728
+#: preseed.xml:736
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Although preseeding the network configuration is normally not possible "
@@ -1251,19 +1264,19 @@ msgstr ""
 "再运行一次，这需要下面的内容包含在 <quote>preseed/run</quote> 脚本里面："
 
 #. Tag: screen
-#: preseed.xml:738
+#: preseed.xml:746
 #, no-c-format
 msgid "killall.sh; netcfg"
 msgstr "killall.sh; netcfg"
 
 #. Tag: para
-#: preseed.xml:740
+#: preseed.xml:748
 #, no-c-format
 msgid "The following debconf variables are relevant for network configuration."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:746
+#: preseed.xml:754
 #, no-c-format
 msgid ""
 "# netcfg will choose an interface that has link if possible. This makes it\n"
@@ -1345,13 +1358,13 @@ msgstr ""
 "#d-i netcfg/dhcp_hostname string radish"
 
 #. Tag: title
-#: preseed.xml:751
+#: preseed.xml:759
 #, no-c-format
 msgid "Mirror settings"
 msgstr "镜像设置"
 
 #. Tag: para
-#: preseed.xml:752
+#: preseed.xml:760
 #, no-c-format
 msgid ""
 "Depending on the installation method you use, a mirror may be used to "
@@ -1363,7 +1376,7 @@ msgstr ""
 "安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
 
 #. Tag: para
-#: preseed.xml:759
+#: preseed.xml:767
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1372,7 +1385,7 @@ msgstr ""
 "参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
 
 #. Tag: para
-#: preseed.xml:764
+#: preseed.xml:772
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1388,7 +1401,7 @@ msgstr ""
 "suite</classname> 的值相同。"
 
 #. Tag: screen
-#: preseed.xml:776
+#: preseed.xml:784
 #, no-c-format
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1416,13 +1429,13 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:781
+#: preseed.xml:789
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "时钟与时区设置"
 
 #. Tag: screen
-#: preseed.xml:783
+#: preseed.xml:791
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1450,13 +1463,13 @@ msgstr ""
 "#d-i clock-setup/ntp-server ntp.example.com"
 
 #. Tag: title
-#: preseed.xml:788
+#: preseed.xml:796
 #, no-c-format
 msgid "Partitioning"
 msgstr "分区"
 
 #. Tag: para
-#: preseed.xml:789
+#: preseed.xml:797
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
@@ -1472,7 +1485,7 @@ msgstr ""
 "磁盘。"
 
 #. Tag: para
-#: preseed.xml:800
+#: preseed.xml:808
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1483,7 +1496,7 @@ msgstr ""
 "确的那一个。"
 
 #. Tag: screen
-#: preseed.xml:808
+#: preseed.xml:816
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1621,13 +1634,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:813
+#: preseed.xml:821
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "使用 RAID 分区"
 
 #. Tag: para
-#: preseed.xml:814
+#: preseed.xml:822
 #, no-c-format
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1641,7 +1654,7 @@ msgstr ""
 "列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
 
 #. Tag: para
-#: preseed.xml:824
+#: preseed.xml:832
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also a very "
@@ -1655,7 +1668,7 @@ msgstr ""
 "一下 <filename>/var/log/syslog</filename>。"
 
 #. Tag: para
-#: preseed.xml:832
+#: preseed.xml:840
 #, no-c-format
 msgid ""
 "Note that only RAID 0 and RAID 1 have been tested by the developers of the "
@@ -1666,7 +1679,7 @@ msgstr ""
 "RAID 设置像降级阵列或额外设备只经过了轻量级的测试。"
 
 #. Tag: screen
-#: preseed.xml:840
+#: preseed.xml:848
 #, no-c-format
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1764,13 +1777,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:845
+#: preseed.xml:853
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:846
+#: preseed.xml:854
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1779,7 +1792,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:853
+#: preseed.xml:861
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1801,13 +1814,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string linux-image-2.6-486"
 
 #. Tag: title
-#: preseed.xml:858
+#: preseed.xml:866
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:859
+#: preseed.xml:867
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1818,7 +1831,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:866
+#: preseed.xml:874
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1831,7 +1844,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:876
+#: preseed.xml:884
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1889,7 +1902,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:878
+#: preseed.xml:886
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1906,26 +1919,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:888
+#: preseed.xml:896
 #, no-c-format
 msgid ""
-"An MD5 hash for a password can be generated using the following command."
-msgstr "密码的 MD5 哈希值可以用下面命令产生。"
+"The following command can be used to generate an MD5 hash for a password:"
+msgstr ""
 
 #. Tag: screen
-#: preseed.xml:892
+#: preseed.xml:900
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:898
+#: preseed.xml:906
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:899
+#: preseed.xml:907
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -1938,7 +1951,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:907
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -1996,13 +2009,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:912
+#: preseed.xml:920
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:913
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2010,73 +2023,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有的任务是："
 
 #. Tag: userinput
-#: preseed.xml:922
+#: preseed.xml:930
 #, no-c-format
 msgid "standard"
 msgstr "标准"
 
 #. Tag: userinput
-#: preseed.xml:925
+#: preseed.xml:933
 #, no-c-format
 msgid "desktop"
 msgstr "桌面"
 
 #. Tag: userinput
-#: preseed.xml:928
+#: preseed.xml:936
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome 桌面"
 
 #. Tag: userinput
-#: preseed.xml:931
+#: preseed.xml:939
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde 桌面"
 
 #. Tag: userinput
-#: preseed.xml:934
+#: preseed.xml:942
 #, no-c-format
 msgid "web-server"
 msgstr "web 服务器"
 
 #. Tag: userinput
-#: preseed.xml:937
+#: preseed.xml:945
 #, no-c-format
 msgid "print-server"
 msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:940
+#: preseed.xml:948
 #, no-c-format
 msgid "dns-server"
 msgstr "dns 服务器"
 
 #. Tag: userinput
-#: preseed.xml:943
+#: preseed.xml:951
 #, no-c-format
 msgid "file-server"
 msgstr "文件服务器"
 
 #. Tag: userinput
-#: preseed.xml:946
+#: preseed.xml:954
 #, no-c-format
 msgid "mail-server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
-#: preseed.xml:949
+#: preseed.xml:957
 #, no-c-format
 msgid "sql-database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
-#: preseed.xml:952
+#: preseed.xml:960
 #, no-c-format
 msgid "laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: preseed.xml:956
+#: preseed.xml:964
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2087,7 +2100,7 @@ msgstr ""
 "userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:962
+#: preseed.xml:970
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2101,7 +2114,7 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:972
+#: preseed.xml:980
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2133,14 +2146,41 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:977
+#: preseed.xml:985
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装引导加载器"
 
 #. Tag: screen
-#: preseed.xml:979
-#, no-c-format
+#: preseed.xml:987
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
+#| "# instead, uncomment this:\n"
+#| "#d-i grub-installer/skip boolean true\n"
+#| "# To also skip installing lilo, and install no bootloader, uncomment "
+#| "this\n"
+#| "# too:\n"
+#| "#d-i lilo-installer/skip boolean true\n"
+#| "\n"
+#| "# This is fairly safe to set, it makes grub install automatically to the "
+#| "MBR\n"
+#| "# if no other operating system is detected on the machine.\n"
+#| "d-i grub-installer/only_debian boolean true\n"
+#| "\n"
+#| "# This one makes grub-installer install to the MBR if it also finds some "
+#| "other\n"
+#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
+#| "d-i grub-installer/with_other_os boolean true\n"
+#| "\n"
+#| "# Alternatively, if you want to install to a location other than the "
+#| "mbr,\n"
+#| "# uncomment and edit these lines:\n"
+#| "#d-i grub-installer/only_debian boolean false\n"
+#| "#d-i grub-installer/with_other_os boolean false\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
+#| "# To install grub to multiple disks:\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2165,7 +2205,13 @@ msgid ""
 "#d-i grub-installer/with_other_os boolean false\n"
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
-"#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
+"#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"\n"
+"# Optional password for grub, either in clear text\n"
+"#d-i grub-installer/password password r00tme\n"
+"#d-i grub-installer/password-again password r00tme\n"
+"# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
+"#d-i grub-installer/password-crypted password [MD5 hash]"
 msgstr ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2192,14 +2238,23 @@ msgstr ""
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
 
+#. Tag: para
+#: preseed.xml:989
+#, no-c-format
+msgid ""
+"An MD5 hash for a password for <classname>grub</classname> can be generated "
+"using <command>grub-md5-crypt</command>, or using the command from the "
+"example in <xref linkend=\"preseed-account\"/>."
+msgstr ""
+
 #. Tag: title
-#: preseed.xml:984
+#: preseed.xml:999
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:986
+#: preseed.xml:1001
 #, no-c-format
 msgid ""
 "# Avoid that last message about the install being complete.\n"
@@ -2225,13 +2280,13 @@ msgstr ""
 "#d-i debian-installer/exit/halt boolean true"
 
 #. Tag: title
-#: preseed.xml:991
+#: preseed.xml:1006
 #, no-c-format
 msgid "X configuration"
 msgstr "设置 X"
 
 #. Tag: para
-#: preseed.xml:992
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Preseeding Debian's X config is possible, but you probably need to know some "
@@ -2242,7 +2297,7 @@ msgstr ""
 "的 X 配置工具无法自动设置每一件事。"
 
 #. Tag: screen
-#: preseed.xml:1000
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -2290,13 +2345,13 @@ msgstr ""
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
-#: preseed.xml:1005
+#: preseed.xml:1020
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1007
+#: preseed.xml:1022
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2316,19 +2371,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1014
+#: preseed.xml:1029
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1032
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1033
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2338,7 +2393,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1026
+#: preseed.xml:1041
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2376,13 +2431,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1031
+#: preseed.xml:1046
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1032
+#: preseed.xml:1047
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2406,7 +2461,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1046
+#: preseed.xml:1061
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2423,13 +2478,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1061
+#: preseed.xml:1076
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1062
+#: preseed.xml:1077
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2443,7 +2498,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1072
+#: preseed.xml:1087
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2493,7 +2548,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1074
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
@@ -2506,3 +2561,7 @@ msgstr ""
 "也可以通过在前面设置 preseed/url 从 initrd 或者文件预置链载进入网络预置。这将"
 "使网络预置在网络连通时执行。您应该小心使用，因为这是两种预置，意味着您有机会"
 "执行 preseed/early 命令，第二个可以在网络连通后使用。"
+
+#~ msgid ""
+#~ "An MD5 hash for a password can be generated using the following command."
+#~ msgstr "密码的 MD5 哈希值可以用下面命令产生。"