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

1 files changed, 130 insertions, 132 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index f94aac049..83099fc22 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-09-28 00:09+0000\n"
+"POT-Creation-Date: 2008-10-05 00:05+0000\n"
 "PO-Revision-Date: 2008-09-26 11:28+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1752,31 +1752,26 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:845
-#, no-c-format
-msgid ""
-"This type of automated partitioning is easy to get wrong. It is also a very "
-"new component that may still have some bugs or missing error handling. The "
-"responsibility to get the various recipes right (so they make sense and "
-"don't conflict) lies with the user. Check <filename>/var/log/syslog</"
-"filename> if you run into problems."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This type of automated partitioning is easy to get wrong. It is also a "
+#| "very new component that may still have some bugs or missing error "
+#| "handling. The responsibility to get the various recipes right (so they "
+#| "make sense and don't conflict) lies with the user. Check <filename>/var/"
+#| "log/syslog</filename> if you run into problems."
+msgid ""
+"This type of automated partitioning is easy to get wrong. It is also "
+"functionality that receives relatively little testing from the developers of "
+"&d-i;. The responsibility to get the various recipes right (so they make "
+"sense and don't conflict) lies with the user. Check <filename>/var/log/"
+"syslog</filename> if you run into problems."
 msgstr ""
 "这种自动分区方式很容易出错。它是一个非常新的模块，可能还有很多 bug 或者缺少错"
 "误的处理。让各种方案正确(有意义而不冲突)的责任在于用户。如果您遇到问题，检查"
 "一下 <filename>/var/log/syslog</filename>。"
 
-#. Tag: para
-#: preseed.xml:853
-#, no-c-format
-msgid ""
-"Note that only RAID 0 and RAID 1 have been tested by the developers of the "
-"component. RAID 5 is untested. Advanced RAID setup with degraded arrays or "
-"spare devices has only been tested lightly."
-msgstr ""
-"注意，该模块的开发人员只测试了 RAID 0 和 RAID 1。RAID 5 未经测试。高级的 "
-"RAID 设置像降级阵列或额外设备只经过了轻量级的测试。"
-
 #. Tag: screen
-#: preseed.xml:861
+#: preseed.xml:855
 #, no-c-format
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1876,13 +1871,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:866
+#: preseed.xml:860
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:867
+#: preseed.xml:861
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1891,7 +1886,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:874
+#: preseed.xml:868
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1913,13 +1908,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string linux-image-2.6-486"
 
 #. Tag: title
-#: preseed.xml:879
+#: preseed.xml:873
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:880
+#: preseed.xml:874
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1930,7 +1925,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:887
+#: preseed.xml:881
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1943,7 +1938,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:897
+#: preseed.xml:891
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2001,7 +1996,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:899
+#: preseed.xml:893
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2018,26 +2013,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:909
+#: preseed.xml:903
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "下面的命令可用于生成密码的 MD5 值。"
 
 #. Tag: screen
-#: preseed.xml:913
+#: preseed.xml:907
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:919
+#: preseed.xml:913
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:920
+#: preseed.xml:914
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2050,7 +2045,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:928
+#: preseed.xml:922
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2108,13 +2103,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:933
+#: preseed.xml:927
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:928
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2122,73 +2117,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有的任务是："
 
 #. Tag: userinput
-#: preseed.xml:943
+#: preseed.xml:937
 #, no-c-format
 msgid "standard"
 msgstr "标准"
 
 #. Tag: userinput
-#: preseed.xml:946
+#: preseed.xml:940
 #, no-c-format
 msgid "desktop"
 msgstr "桌面"
 
 #. Tag: userinput
-#: preseed.xml:949
+#: preseed.xml:943
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome 桌面"
 
 #. Tag: userinput
-#: preseed.xml:952
+#: preseed.xml:946
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde 桌面"
 
 #. Tag: userinput
-#: preseed.xml:955
+#: preseed.xml:949
 #, no-c-format
 msgid "web-server"
 msgstr "web 服务器"
 
 #. Tag: userinput
-#: preseed.xml:958
+#: preseed.xml:952
 #, no-c-format
 msgid "print-server"
 msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:961
+#: preseed.xml:955
 #, no-c-format
 msgid "dns-server"
 msgstr "dns 服务器"
 
 #. Tag: userinput
-#: preseed.xml:964
+#: preseed.xml:958
 #, no-c-format
 msgid "file-server"
 msgstr "文件服务器"
 
 #. Tag: userinput
-#: preseed.xml:967
+#: preseed.xml:961
 #, no-c-format
 msgid "mail-server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
-#: preseed.xml:970
+#: preseed.xml:964
 #, no-c-format
 msgid "sql-database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
-#: preseed.xml:973
+#: preseed.xml:967
 #, no-c-format
 msgid "laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: preseed.xml:977
+#: preseed.xml:971
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2199,7 +2194,7 @@ msgstr ""
 "userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:977
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2213,7 +2208,7 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:993
+#: preseed.xml:987
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2251,13 +2246,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:998
+#: preseed.xml:992
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装引导加载器"
 
 #. Tag: screen
-#: preseed.xml:1000
+#: preseed.xml:994
 #, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2323,7 +2318,7 @@ msgstr ""
 "#d-i grub-installer/password-crypted password [MD5 hash]"
 
 #. Tag: para
-#: preseed.xml:1002
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2335,13 +2330,13 @@ msgstr ""
 "令。"
 
 #. Tag: title
-#: preseed.xml:1012
+#: preseed.xml:1006
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:1014
+#: preseed.xml:1008
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2381,78 +2376,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1019
-#, no-c-format
-msgid "X configuration"
-msgstr "设置 X"
-
-#. Tag: para
-#: preseed.xml:1020
-#, no-c-format
-msgid ""
-"Preseeding Debian's X config is possible, but you probably need to know some "
-"details about the video hardware of the machine, since Debian's X "
-"configurator does not do fully automatic configuration of everything."
-msgstr ""
-"您可以给 Debian 设置 X，但需要了解机器上视频硬件的详细资料，这是因为 Debian "
-"的 X 配置工具无法自动设置每一件事。"
-
-#. Tag: screen
-#: preseed.xml:1028
-#, no-c-format
-msgid ""
-"# X can detect the right driver for some cards, but if you're preseeding,\n"
-"# you override whatever it chooses. Still, vesa will work most places.\n"
-"#xserver-xorg xserver-xorg/config/device/driver select vesa\n"
-"\n"
-"# A caveat with mouse autodetection is that if it fails, X will retry it\n"
-"# over and over. So if it's preseeded to be done, there is a possibility of\n"
-"# an infinite loop if the mouse is not autodetected.\n"
-"#xserver-xorg xserver-xorg/autodetect_mouse boolean true\n"
-"\n"
-"# Monitor autodetection is recommended.\n"
-"xserver-xorg xserver-xorg/autodetect_monitor boolean true\n"
-"# Uncomment if you have an LCD display.\n"
-"#xserver-xorg xserver-xorg/config/monitor/lcd boolean true\n"
-"# X has three configuration paths for the monitor. Here's how to preseed\n"
-"# the \"medium\" path, which is always available. The \"simple\" path may "
-"not\n"
-"# be available, and the \"advanced\" path asks too many questions.\n"
-"xserver-xorg xserver-xorg/config/monitor/selection-method \\\n"
-"       select medium\n"
-"xserver-xorg xserver-xorg/config/monitor/mode-list \\\n"
-"       select 1024x768 @ 60 Hz"
-msgstr ""
-"# X can detect the right driver for some cards, but if you're preseeding,\n"
-"# you override whatever it chooses. Still, vesa will work most places.\n"
-"#xserver-xorg xserver-xorg/config/device/driver select vesa\n"
-"\n"
-"# A caveat with mouse autodetection is that if it fails, X will retry it\n"
-"# over and over. So if it's preseeded to be done, there is a possibility of\n"
-"# an infinite loop if the mouse is not autodetected.\n"
-"#xserver-xorg xserver-xorg/autodetect_mouse boolean true\n"
-"\n"
-"# Monitor autodetection is recommended.\n"
-"xserver-xorg xserver-xorg/autodetect_monitor boolean true\n"
-"# Uncomment if you have an LCD display.\n"
-"#xserver-xorg xserver-xorg/config/monitor/lcd boolean true\n"
-"# X has three configuration paths for the monitor. Here's how to preseed\n"
-"# the \"medium\" path, which is always available. The \"simple\" path may "
-"not\n"
-"# be available, and the \"advanced\" path asks too many questions.\n"
-"xserver-xorg xserver-xorg/config/monitor/selection-method \\\n"
-"       select medium\n"
-"xserver-xorg xserver-xorg/config/monitor/mode-list \\\n"
-"       select 1024x768 @ 60 Hz"
-
-#. Tag: title
-#: preseed.xml:1033
+#: preseed.xml:1013
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1035
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2472,19 +2402,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1042
+#: preseed.xml:1022
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1045
+#: preseed.xml:1025
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1046
+#: preseed.xml:1026
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2494,7 +2424,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1054
+#: preseed.xml:1034
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2532,13 +2462,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1059
+#: preseed.xml:1039
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1060
+#: preseed.xml:1040
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2562,7 +2492,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1074
+#: preseed.xml:1054
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2579,13 +2509,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1089
+#: preseed.xml:1069
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1090
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2599,7 +2529,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1100
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2649,7 +2579,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1102
+#: preseed.xml:1082
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
@@ -2662,3 +2592,71 @@ msgstr ""
 "也可以通过在前面设置 preseed/url 从 initrd 或者文件预置链载进入网络预置。这将"
 "使网络预置在网络连通时执行。您应该小心使用，因为这是两种预置，意味着您有机会"
 "执行 preseed/early 命令，第二个可以在网络连通后使用。"
+
+#~ msgid ""
+#~ "Note that only RAID 0 and RAID 1 have been tested by the developers of "
+#~ "the component. RAID 5 is untested. Advanced RAID setup with degraded "
+#~ "arrays or spare devices has only been tested lightly."
+#~ msgstr ""
+#~ "注意，该模块的开发人员只测试了 RAID 0 和 RAID 1。RAID 5 未经测试。高级的 "
+#~ "RAID 设置像降级阵列或额外设备只经过了轻量级的测试。"
+
+#~ msgid "X configuration"
+#~ msgstr "设置 X"
+
+#~ msgid ""
+#~ "Preseeding Debian's X config is possible, but you probably need to know "
+#~ "some details about the video hardware of the machine, since Debian's X "
+#~ "configurator does not do fully automatic configuration of everything."
+#~ msgstr ""
+#~ "您可以给 Debian 设置 X，但需要了解机器上视频硬件的详细资料，这是因为 "
+#~ "Debian 的 X 配置工具无法自动设置每一件事。"
+
+#~ msgid ""
+#~ "# X can detect the right driver for some cards, but if you're "
+#~ "preseeding,\n"
+#~ "# you override whatever it chooses. Still, vesa will work most places.\n"
+#~ "#xserver-xorg xserver-xorg/config/device/driver select vesa\n"
+#~ "\n"
+#~ "# A caveat with mouse autodetection is that if it fails, X will retry it\n"
+#~ "# over and over. So if it's preseeded to be done, there is a possibility "
+#~ "of\n"
+#~ "# an infinite loop if the mouse is not autodetected.\n"
+#~ "#xserver-xorg xserver-xorg/autodetect_mouse boolean true\n"
+#~ "\n"
+#~ "# Monitor autodetection is recommended.\n"
+#~ "xserver-xorg xserver-xorg/autodetect_monitor boolean true\n"
+#~ "# Uncomment if you have an LCD display.\n"
+#~ "#xserver-xorg xserver-xorg/config/monitor/lcd boolean true\n"
+#~ "# X has three configuration paths for the monitor. Here's how to preseed\n"
+#~ "# the \"medium\" path, which is always available. The \"simple\" path may "
+#~ "not\n"
+#~ "# be available, and the \"advanced\" path asks too many questions.\n"
+#~ "xserver-xorg xserver-xorg/config/monitor/selection-method \\\n"
+#~ "       select medium\n"
+#~ "xserver-xorg xserver-xorg/config/monitor/mode-list \\\n"
+#~ "       select 1024x768 @ 60 Hz"
+#~ msgstr ""
+#~ "# X can detect the right driver for some cards, but if you're "
+#~ "preseeding,\n"
+#~ "# you override whatever it chooses. Still, vesa will work most places.\n"
+#~ "#xserver-xorg xserver-xorg/config/device/driver select vesa\n"
+#~ "\n"
+#~ "# A caveat with mouse autodetection is that if it fails, X will retry it\n"
+#~ "# over and over. So if it's preseeded to be done, there is a possibility "
+#~ "of\n"
+#~ "# an infinite loop if the mouse is not autodetected.\n"
+#~ "#xserver-xorg xserver-xorg/autodetect_mouse boolean true\n"
+#~ "\n"
+#~ "# Monitor autodetection is recommended.\n"
+#~ "xserver-xorg xserver-xorg/autodetect_monitor boolean true\n"
+#~ "# Uncomment if you have an LCD display.\n"
+#~ "#xserver-xorg xserver-xorg/config/monitor/lcd boolean true\n"
+#~ "# X has three configuration paths for the monitor. Here's how to preseed\n"
+#~ "# the \"medium\" path, which is always available. The \"simple\" path may "
+#~ "not\n"
+#~ "# be available, and the \"advanced\" path asks too many questions.\n"
+#~ "xserver-xorg xserver-xorg/config/monitor/selection-method \\\n"
+#~ "       select medium\n"
+#~ "xserver-xorg xserver-xorg/config/monitor/mode-list \\\n"
+#~ "       select 1024x768 @ 60 Hz"