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

1 files changed, 118 insertions, 73 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index d8d746790..780429c55 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-09-02 00:14+0000\n"
+"POT-Creation-Date: 2009-11-08 01:11+0000\n"
 "PO-Revision-Date: 2009-09-12 09:50+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1458,14 +1458,22 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:800
-#, no-c-format
+#, fuzzy, 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 "
 "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>."
+"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 建立套件相匹配时才有效。默"
@@ -1473,7 +1481,7 @@ msgstr ""
 "suite</classname> 的值相同。"
 
 #. Tag: screen
-#: preseed.xml:812
+#: preseed.xml:811
 #, no-c-format
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1501,13 +1509,13 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:817
+#: preseed.xml:816
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "时钟与时区设置"
 
 #. Tag: screen
-#: preseed.xml:819
+#: preseed.xml:818
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1535,13 +1543,13 @@ msgstr ""
 "#d-i clock-setup/ntp-server string ntp.example.com"
 
 #. Tag: title
-#: preseed.xml:824
+#: preseed.xml:823
 #, no-c-format
 msgid "Partitioning"
 msgstr "分区"
 
 #. Tag: para
-#: preseed.xml:825
+#: preseed.xml:824
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
@@ -1557,7 +1565,7 @@ msgstr ""
 "磁盘。"
 
 #. Tag: para
-#: preseed.xml:836
+#: preseed.xml:835
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1568,7 +1576,7 @@ msgstr ""
 "确的那一个。"
 
 #. Tag: screen
-#: preseed.xml:844
+#: preseed.xml:843
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1696,13 +1704,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:849
+#: preseed.xml:848
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "使用 RAID 分区"
 
 #. Tag: para
-#: preseed.xml:850
+#: preseed.xml:849
 #, no-c-format
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1716,7 +1724,7 @@ msgstr ""
 "阵列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
 
 #. Tag: para
-#: preseed.xml:860
+#: preseed.xml:859
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -1730,7 +1738,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>。"
 
 #. Tag: screen
-#: preseed.xml:870
+#: preseed.xml:869
 #, no-c-format
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1828,13 +1836,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:875
+#: preseed.xml:874
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "分区挂载控制"
 
 #. Tag: para
-#: preseed.xml:876
+#: preseed.xml:875
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -1850,7 +1858,7 @@ msgstr ""
 "系统仍然使用 UUID 方式挂载。"
 
 #. Tag: para
-#: preseed.xml:885
+#: preseed.xml:884
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -1860,7 +1868,7 @@ msgstr ""
 "挂载。"
 
 #. Tag: para
-#: preseed.xml:892
+#: preseed.xml:891
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -1874,7 +1882,7 @@ msgstr ""
 "后会出现一些随机的情况。"
 
 #. Tag: screen
-#: preseed.xml:902
+#: preseed.xml:901
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -1892,13 +1900,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:907
+#: preseed.xml:906
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:908
+#: preseed.xml:907
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1907,9 +1915,23 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:915
-#, no-c-format
-msgid ""
+#: preseed.xml:914
+#, fuzzy, 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"
+"# 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"
 "#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
@@ -1929,13 +1951,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string linux-image-2.6-486"
 
 #. Tag: title
-#: preseed.xml:920
+#: preseed.xml:919
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:921
+#: preseed.xml:920
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1946,7 +1968,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:928
+#: preseed.xml:927
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1959,7 +1981,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:938
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2017,7 +2039,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:940
+#: preseed.xml:939
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2034,26 +2056,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:950
+#: preseed.xml:949
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "下面的命令可用于生成密码的 MD5 值。"
 
 #. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:953
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:960
+#: preseed.xml:959
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:961
+#: preseed.xml:960
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2066,7 +2088,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:969
+#: preseed.xml:968
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2124,13 +2146,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:974
+#: preseed.xml:973
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:975
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2138,73 +2160,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括："
 
 #. Tag: userinput
-#: preseed.xml:984
+#: preseed.xml:983
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:987
+#: preseed.xml:986
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:990
+#: preseed.xml:989
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:993
+#: preseed.xml:992
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:996
+#: preseed.xml:995
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:999
+#: preseed.xml:998
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:1002
+#: preseed.xml:1001
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:1005
+#: preseed.xml:1004
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:1008
+#: preseed.xml:1007
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:1011
+#: preseed.xml:1010
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:1014
+#: preseed.xml:1013
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1017
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2215,7 +2237,7 @@ msgstr ""
 "<userinput>standard</userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:1024
+#: preseed.xml:1023
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2229,8 +2251,33 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:1034
-#, no-c-format
+#: preseed.xml:1033
+#, fuzzy, 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"
@@ -2242,8 +2289,6 @@ msgid ""
 "# 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"
@@ -2277,13 +2322,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1039
+#: preseed.xml:1038
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装 bootloader"
 
 #. Tag: screen
-#: preseed.xml:1041
+#: preseed.xml:1040
 #, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2359,7 +2404,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1043
+#: preseed.xml:1042
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2371,13 +2416,13 @@ msgstr ""
 "令。"
 
 #. Tag: title
-#: preseed.xml:1053
+#: preseed.xml:1052
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:1055
+#: preseed.xml:1054
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2417,13 +2462,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1060
+#: preseed.xml:1059
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1062
+#: preseed.xml:1061
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2443,19 +2488,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1068
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1072
+#: preseed.xml:1071
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1073
+#: preseed.xml:1072
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2465,7 +2510,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1081
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2513,13 +2558,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1086
+#: preseed.xml:1085
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1087
+#: preseed.xml:1086
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2543,7 +2588,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1101
+#: preseed.xml:1100
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2556,7 +2601,7 @@ msgstr ""
 "\"preseed-bootparms\"/> 的脚注。"
 
 #. Tag: para
-#: preseed.xml:1108
+#: preseed.xml:1107
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2577,13 +2622,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1122
+#: preseed.xml:1121
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1123
+#: preseed.xml:1122
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2597,7 +2642,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1133
+#: preseed.xml:1132
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2647,7 +2692,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1135
+#: preseed.xml:1134
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "