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

1 files changed, 58 insertions, 30 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 0a92dc6e2..b853a9dd7 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2009-06-10 00:06+0000\n"
+"POT-Creation-Date: 2009-06-12 00:14+0000\n"
 "PO-Revision-Date: 2009-05-21 17:01+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -2272,7 +2272,40 @@ msgstr "安装 bootloader"
 
 #. Tag: screen
 #: preseed.xml:1041
-#, no-c-format
+#, 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)\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]"
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2303,7 +2336,12 @@ msgid ""
 "#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]"
+"#d-i grub-installer/password-crypted password [MD5 hash]\n"
+"\n"
+"# Use the following option to add additional boot parameters for the\n"
+"# installed system (if supported by the bootloader installer).\n"
+"# Note: options passed to the installer will be added automatically.\n"
+"#d-i debian-installer/add-kernel-opts string nousb"
 msgstr ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2336,18 +2374,8 @@ msgstr ""
 "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
 "#d-i grub-installer/password-crypted password [MD5 hash]"
 
-#. Tag: sect2
-#: preseed.xml:1041
-#, no-c-format
-msgid ""
-"# Use the following option to add additional boot parameters for the # "
-"installed system (if supported by the bootloader installer). # Note: options "
-"passed to the installer will be added automatically. #d-i debian-installer/"
-"add-kernel-opts string nousb"
-msgstr ""
-
 #. Tag: para
-#: preseed.xml:1048
+#: preseed.xml:1043
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2359,13 +2387,13 @@ msgstr ""
 "令。"
 
 #. Tag: title
-#: preseed.xml:1058
+#: preseed.xml:1053
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:1060
+#: preseed.xml:1055
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2405,13 +2433,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1065
+#: preseed.xml:1060
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1067
+#: preseed.xml:1062
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2431,19 +2459,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1074
+#: preseed.xml:1069
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1077
+#: preseed.xml:1072
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1078
+#: preseed.xml:1073
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2453,7 +2481,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1086
+#: preseed.xml:1081
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2501,13 +2529,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1091
+#: preseed.xml:1086
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1092
+#: preseed.xml:1087
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2531,7 +2559,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1106
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2544,7 +2572,7 @@ msgstr ""
 "\"preseed-bootparms\"/> 的脚注。"
 
 #. Tag: para
-#: preseed.xml:1113
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2565,13 +2593,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1127
+#: preseed.xml:1122
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1128
+#: preseed.xml:1123
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2585,7 +2613,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1138
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2635,7 +2663,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1140
+#: preseed.xml:1135
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "