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

1 files changed, 80 insertions, 67 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 4cf3511ce..4a763efd6 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-08-17 00:09+0000\n"
+"POT-Creation-Date: 2008-09-10 00:09+0000\n"
 "PO-Revision-Date: 2008-08-08 10:03+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1362,14 +1362,27 @@ msgstr ""
 "# change to false to disable asking.\n"
 "#d-i hw-detect/load_firmware boolean true"
 
+#. Tag: para
+#: preseed.xml:756
+#, no-c-format
+msgid ""
+"Please note that <command>netcfg</command> will automatically determine the "
+"netmask if <classname>netcfg/get_netmask</classname> is not preseeded. In "
+"this case, the variable has to be marked as <literal>seen</literal> for "
+"automatic installations. Similarly, <command>netcfg</command> will choose an "
+"appropriate address if <classname>netcfg/get_gateway</classname> is not set. "
+"As a special case, you can set <classname>netcfg/get_gateway</classname> to "
+"<quote>none</quote> to specify that no gateway should be used."
+msgstr ""
+
 #. Tag: title
-#: preseed.xml:759
+#: preseed.xml:772
 #, no-c-format
 msgid "Mirror settings"
 msgstr "镜像设置"
 
 #. Tag: para
-#: preseed.xml:760
+#: preseed.xml:773
 #, no-c-format
 msgid ""
 "Depending on the installation method you use, a mirror may be used to "
@@ -1381,7 +1394,7 @@ msgstr ""
 "安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
 
 #. Tag: para
-#: preseed.xml:767
+#: preseed.xml:780
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1390,7 +1403,7 @@ msgstr ""
 "参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
 
 #. Tag: para
-#: preseed.xml:772
+#: preseed.xml:785
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1406,7 +1419,7 @@ msgstr ""
 "suite</classname> 的值相同。"
 
 #. Tag: screen
-#: preseed.xml:784
+#: preseed.xml:797
 #, no-c-format
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1434,13 +1447,13 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:789
+#: preseed.xml:802
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "时钟与时区设置"
 
 #. Tag: screen
-#: preseed.xml:791
+#: preseed.xml:804
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1468,13 +1481,13 @@ msgstr ""
 "#d-i clock-setup/ntp-server ntp.example.com"
 
 #. Tag: title
-#: preseed.xml:796
+#: preseed.xml:809
 #, no-c-format
 msgid "Partitioning"
 msgstr "分区"
 
 #. Tag: para
-#: preseed.xml:797
+#: preseed.xml:810
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
@@ -1490,7 +1503,7 @@ msgstr ""
 "磁盘。"
 
 #. Tag: para
-#: preseed.xml:808
+#: preseed.xml:821
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1501,7 +1514,7 @@ msgstr ""
 "确的那一个。"
 
 #. Tag: screen
-#: preseed.xml:816
+#: preseed.xml:829
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1635,13 +1648,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:821
+#: preseed.xml:834
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "使用 RAID 分区"
 
 #. Tag: para
-#: preseed.xml:822
+#: preseed.xml:835
 #, no-c-format
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1655,7 +1668,7 @@ msgstr ""
 "列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
 
 #. Tag: para
-#: preseed.xml:832
+#: preseed.xml:845
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also a very "
@@ -1669,7 +1682,7 @@ msgstr ""
 "一下 <filename>/var/log/syslog</filename>。"
 
 #. Tag: para
-#: preseed.xml:840
+#: preseed.xml:853
 #, no-c-format
 msgid ""
 "Note that only RAID 0 and RAID 1 have been tested by the developers of the "
@@ -1680,7 +1693,7 @@ msgstr ""
 "RAID 设置像降级阵列或额外设备只经过了轻量级的测试。"
 
 #. Tag: screen
-#: preseed.xml:848
+#: preseed.xml:861
 #, no-c-format
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1778,13 +1791,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:853
+#: preseed.xml:866
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:854
+#: preseed.xml:867
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1793,7 +1806,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:861
+#: preseed.xml:874
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1815,13 +1828,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string linux-image-2.6-486"
 
 #. Tag: title
-#: preseed.xml:866
+#: preseed.xml:879
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:867
+#: preseed.xml:880
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1832,7 +1845,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:874
+#: preseed.xml:887
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1845,7 +1858,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:884
+#: preseed.xml:897
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1903,7 +1916,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:886
+#: preseed.xml:899
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1920,26 +1933,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:896
+#: preseed.xml:909
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "下面的命令可用于生成密码的 MD5 值。"
 
 #. Tag: screen
-#: preseed.xml:900
+#: preseed.xml:913
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:906
+#: preseed.xml:919
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:907
+#: preseed.xml:920
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -1952,7 +1965,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:915
+#: preseed.xml:928
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2010,13 +2023,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:920
+#: preseed.xml:933
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:921
+#: preseed.xml:934
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2024,73 +2037,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有的任务是："
 
 #. Tag: userinput
-#: preseed.xml:930
+#: preseed.xml:943
 #, no-c-format
 msgid "standard"
 msgstr "标准"
 
 #. Tag: userinput
-#: preseed.xml:933
+#: preseed.xml:946
 #, no-c-format
 msgid "desktop"
 msgstr "桌面"
 
 #. Tag: userinput
-#: preseed.xml:936
+#: preseed.xml:949
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome 桌面"
 
 #. Tag: userinput
-#: preseed.xml:939
+#: preseed.xml:952
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde 桌面"
 
 #. Tag: userinput
-#: preseed.xml:942
+#: preseed.xml:955
 #, no-c-format
 msgid "web-server"
 msgstr "web 服务器"
 
 #. Tag: userinput
-#: preseed.xml:945
+#: preseed.xml:958
 #, no-c-format
 msgid "print-server"
 msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:948
+#: preseed.xml:961
 #, no-c-format
 msgid "dns-server"
 msgstr "dns 服务器"
 
 #. Tag: userinput
-#: preseed.xml:951
+#: preseed.xml:964
 #, no-c-format
 msgid "file-server"
 msgstr "文件服务器"
 
 #. Tag: userinput
-#: preseed.xml:954
+#: preseed.xml:967
 #, no-c-format
 msgid "mail-server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
-#: preseed.xml:957
+#: preseed.xml:970
 #, no-c-format
 msgid "sql-database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
-#: preseed.xml:960
+#: preseed.xml:973
 #, no-c-format
 msgid "laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:977
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2101,7 +2114,7 @@ msgstr ""
 "userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:970
+#: preseed.xml:983
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2115,7 +2128,7 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:980
+#: preseed.xml:993
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2153,13 +2166,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:985
+#: preseed.xml:998
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装引导加载器"
 
 #. Tag: screen
-#: preseed.xml:987
+#: preseed.xml:1000
 #, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2225,7 +2238,7 @@ msgstr ""
 "#d-i grub-installer/password-crypted password [MD5 hash]"
 
 #. Tag: para
-#: preseed.xml:989
+#: preseed.xml:1002
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2237,13 +2250,13 @@ msgstr ""
 "令。"
 
 #. Tag: title
-#: preseed.xml:999
+#: preseed.xml:1012
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:1001
+#: preseed.xml:1014
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# During installations from serial console, the regular virtual consoles\n"
@@ -2298,13 +2311,13 @@ msgstr ""
 "#d-i debian-installer/exit/halt boolean true"
 
 #. Tag: title
-#: preseed.xml:1006
+#: preseed.xml:1019
 #, no-c-format
 msgid "X configuration"
 msgstr "设置 X"
 
 #. Tag: para
-#: preseed.xml:1007
+#: preseed.xml:1020
 #, no-c-format
 msgid ""
 "Preseeding Debian's X config is possible, but you probably need to know some "
@@ -2315,7 +2328,7 @@ msgstr ""
 "的 X 配置工具无法自动设置每一件事。"
 
 #. Tag: screen
-#: preseed.xml:1015
+#: preseed.xml:1028
 #, no-c-format
 msgid ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -2363,13 +2376,13 @@ msgstr ""
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
-#: preseed.xml:1020
+#: preseed.xml:1033
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1022
+#: preseed.xml:1035
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2389,19 +2402,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1029
+#: preseed.xml:1042
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1032
+#: preseed.xml:1045
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1033
+#: preseed.xml:1046
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2411,7 +2424,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1041
+#: preseed.xml:1054
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2449,13 +2462,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1046
+#: preseed.xml:1059
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1047
+#: preseed.xml:1060
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2479,7 +2492,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1074
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2496,13 +2509,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1089
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1077
+#: preseed.xml:1090
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2516,7 +2529,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1087
+#: preseed.xml:1100
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2566,7 +2579,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1102
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "