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

1 files changed, 87 insertions, 74 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 201a3efc4..5d9bb7882 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-06 00:11+0000\n"
+"POT-Creation-Date: 2008-04-25 00:10+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"
@@ -1090,8 +1090,9 @@ msgstr ""
 
 #. Tag: title
 #: preseed.xml:653
-#, no-c-format
-msgid "Contents of the preconfiguration file"
+#, fuzzy, no-c-format
+#| msgid "Contents of the preconfiguration file"
+msgid "Contents of the preconfiguration file (for &releasename;)"
 msgstr "预置文件的内容"
 
 #. Tag: para
@@ -1227,7 +1228,15 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:728
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Although preseeding the network configuration is normally not possible "
+#| "when using network preseeding (using <quote>preseed/url</quote>), you can "
+#| "use the following hack to work around that, for example if you'd like to "
+#| "set a static address for the network interface. The hack is to force the "
+#| "network configuration to run again after the preconfiguration file has "
+#| "been loaded by creating a <quote>preseed/run</quote> script containing "
+#| "the following lines:"
 msgid ""
 "Although preseeding the network configuration is normally not possible when "
 "using network preseeding (using <quote>preseed/url</quote>), you can use the "
@@ -1235,7 +1244,7 @@ msgid ""
 "static address for the network interface. The hack is to force the network "
 "configuration to run again after the preconfiguration file has been loaded "
 "by creating a <quote>preseed/run</quote> script containing the following "
-"lines:"
+"commands:"
 msgstr ""
 "虽然使用网络预置(用 <quote>preseed/url</quote>)通常并不能配置配置，但是您可以"
 "使用下面的技巧实现。例如，为网卡设置静态地址。它使加载了预置文件以后网络预置"
@@ -1244,13 +1253,17 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:738
 #, no-c-format
-msgid ""
-"killall.sh; netcfg"
+msgid "killall.sh; netcfg"
+msgstr "killall.sh; netcfg"
+
+#. Tag: para
+#: preseed.xml:740
+#, no-c-format
+msgid "The following debconf variables are relevant for network configuration."
 msgstr ""
-"killall.sh; netcfg"
 
 #. Tag: screen
-#: preseed.xml:742
+#: preseed.xml:746
 #, no-c-format
 msgid ""
 "# netcfg will choose an interface that has link if possible. This makes it\n"
@@ -1332,13 +1345,13 @@ msgstr ""
 "#d-i netcfg/dhcp_hostname string radish"
 
 #. Tag: title
-#: preseed.xml:747
+#: preseed.xml:751
 #, no-c-format
 msgid "Mirror settings"
 msgstr "镜像设置"
 
 #. Tag: para
-#: preseed.xml:748
+#: preseed.xml:752
 #, no-c-format
 msgid ""
 "Depending on the installation method you use, a mirror may be used to "
@@ -1350,7 +1363,7 @@ msgstr ""
 "安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
 
 #. Tag: para
-#: preseed.xml:755
+#: preseed.xml:759
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1359,7 +1372,7 @@ msgstr ""
 "参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
 
 #. Tag: para
-#: preseed.xml:760
+#: preseed.xml:764
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1375,7 +1388,7 @@ msgstr ""
 "suite</classname> 的值相同。"
 
 #. Tag: screen
-#: preseed.xml:772
+#: preseed.xml:776
 #, no-c-format
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1403,13 +1416,13 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:777
+#: preseed.xml:781
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "时钟与时区设置"
 
 #. Tag: screen
-#: preseed.xml:779
+#: preseed.xml:783
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1437,13 +1450,13 @@ msgstr ""
 "#d-i clock-setup/ntp-server ntp.example.com"
 
 #. Tag: title
-#: preseed.xml:784
+#: preseed.xml:788
 #, no-c-format
 msgid "Partitioning"
 msgstr "分区"
 
 #. Tag: para
-#: preseed.xml:785
+#: preseed.xml:789
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
@@ -1459,7 +1472,7 @@ msgstr ""
 "磁盘。"
 
 #. Tag: para
-#: preseed.xml:796
+#: preseed.xml:800
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1470,7 +1483,7 @@ msgstr ""
 "确的那一个。"
 
 #. Tag: screen
-#: preseed.xml:804
+#: preseed.xml:808
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1608,13 +1621,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:809
+#: preseed.xml:813
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "使用 RAID 分区"
 
 #. Tag: para
-#: preseed.xml:810
+#: preseed.xml:814
 #, no-c-format
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1628,7 +1641,7 @@ msgstr ""
 "列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
 
 #. Tag: para
-#: preseed.xml:820
+#: preseed.xml:824
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also a very "
@@ -1642,7 +1655,7 @@ msgstr ""
 "一下 <filename>/var/log/syslog</filename>。"
 
 #. Tag: para
-#: preseed.xml:828
+#: preseed.xml:832
 #, no-c-format
 msgid ""
 "Note that only RAID 0 and RAID 1 have been tested by the developers of the "
@@ -1653,7 +1666,7 @@ msgstr ""
 "RAID 设置像降级阵列或额外设备只经过了轻量级的测试。"
 
 #. Tag: screen
-#: preseed.xml:836
+#: preseed.xml:840
 #, no-c-format
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1751,13 +1764,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:841
+#: preseed.xml:845
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:842
+#: preseed.xml:846
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1766,7 +1779,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:849
+#: preseed.xml:853
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1788,13 +1801,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string linux-image-2.6-486"
 
 #. Tag: title
-#: preseed.xml:854
+#: preseed.xml:858
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:855
+#: preseed.xml:859
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1805,7 +1818,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:862
+#: preseed.xml:866
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1818,7 +1831,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:872
+#: preseed.xml:876
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1876,7 +1889,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:874
+#: preseed.xml:878
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1893,26 +1906,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:884
+#: preseed.xml:888
 #, no-c-format
 msgid ""
 "An MD5 hash for a password can be generated using the following command."
 msgstr "密码的 MD5 哈希值可以用下面命令产生。"
 
 #. Tag: screen
-#: preseed.xml:888
+#: preseed.xml:892
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 
 #. Tag: title
-#: preseed.xml:894
+#: preseed.xml:898
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:895
+#: preseed.xml:899
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -1925,7 +1938,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:903
+#: preseed.xml:907
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -1983,13 +1996,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:908
+#: preseed.xml:912
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:909
+#: preseed.xml:913
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -1997,73 +2010,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有的任务是："
 
 #. Tag: userinput
-#: preseed.xml:918
+#: preseed.xml:922
 #, no-c-format
 msgid "standard"
 msgstr "标准"
 
 #. Tag: userinput
-#: preseed.xml:921
+#: preseed.xml:925
 #, no-c-format
 msgid "desktop"
 msgstr "桌面"
 
 #. Tag: userinput
-#: preseed.xml:924
+#: preseed.xml:928
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome 桌面"
 
 #. Tag: userinput
-#: preseed.xml:927
+#: preseed.xml:931
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde 桌面"
 
 #. Tag: userinput
-#: preseed.xml:930
+#: preseed.xml:934
 #, no-c-format
 msgid "web-server"
 msgstr "web 服务器"
 
 #. Tag: userinput
-#: preseed.xml:933
+#: preseed.xml:937
 #, no-c-format
 msgid "print-server"
 msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:936
+#: preseed.xml:940
 #, no-c-format
 msgid "dns-server"
 msgstr "dns 服务器"
 
 #. Tag: userinput
-#: preseed.xml:939
+#: preseed.xml:943
 #, no-c-format
 msgid "file-server"
 msgstr "文件服务器"
 
 #. Tag: userinput
-#: preseed.xml:942
+#: preseed.xml:946
 #, no-c-format
 msgid "mail-server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
-#: preseed.xml:945
+#: preseed.xml:949
 #, no-c-format
 msgid "sql-database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
-#: preseed.xml:948
+#: preseed.xml:952
 #, no-c-format
 msgid "laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: preseed.xml:952
+#: preseed.xml:956
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2074,7 +2087,7 @@ msgstr ""
 "userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:958
+#: preseed.xml:962
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2088,7 +2101,7 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:968
+#: preseed.xml:972
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2120,13 +2133,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:973
+#: preseed.xml:977
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装引导加载器"
 
 #. Tag: screen
-#: preseed.xml:975
+#: preseed.xml:979
 #, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2180,13 +2193,13 @@ msgstr ""
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
 
 #. Tag: title
-#: preseed.xml:980
+#: preseed.xml:984
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:982
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "# Avoid that last message about the install being complete.\n"
@@ -2212,13 +2225,13 @@ msgstr ""
 "#d-i debian-installer/exit/halt boolean true"
 
 #. Tag: title
-#: preseed.xml:987
+#: preseed.xml:991
 #, no-c-format
 msgid "X configuration"
 msgstr "设置 X"
 
 #. Tag: para
-#: preseed.xml:988
+#: preseed.xml:992
 #, no-c-format
 msgid ""
 "Preseeding Debian's X config is possible, but you probably need to know some "
@@ -2229,7 +2242,7 @@ msgstr ""
 "的 X 配置工具无法自动设置每一件事。"
 
 #. Tag: screen
-#: preseed.xml:996
+#: preseed.xml:1000
 #, no-c-format
 msgid ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -2277,13 +2290,13 @@ msgstr ""
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
-#: preseed.xml:1001
+#: preseed.xml:1005
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1003
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2303,19 +2316,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1010
+#: preseed.xml:1014
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1013
+#: preseed.xml:1017
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1014
+#: preseed.xml:1018
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2325,7 +2338,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1022
+#: preseed.xml:1026
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2363,13 +2376,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1027
+#: preseed.xml:1031
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1028
+#: preseed.xml:1032
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2393,7 +2406,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1042
+#: preseed.xml:1046
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2410,13 +2423,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1057
+#: preseed.xml:1061
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1058
+#: preseed.xml:1062
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2430,7 +2443,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1068
+#: preseed.xml:1072
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2480,7 +2493,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1070
+#: preseed.xml:1074
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "