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

2 files changed, 41 insertions, 49 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index b34e11be7..c3ae5f606 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: 2007-02-18 17:46+0000\n"
+"POT-Creation-Date: 2007-02-22 15:36+0000\n"
 "PO-Revision-Date: 2007-02-08 09:33+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -2105,42 +2105,11 @@ msgstr ""
 #. Tag: title
 #: preseed.xml:966
 #, no-c-format
-msgid "Mailer configuration"
-msgstr "邮件设置"
-
-#. Tag: para
-#: preseed.xml:967
-#, no-c-format
-msgid ""
-"During a normal install, exim asks only a few questions. Here's how to avoid "
-"even those. More complicated preseeding is possible."
-msgstr ""
-"普通安装方式下，exim 会问一些问题。这里是避免的方法。也可以有更多的预置内容。"
-
-#. Tag: screen
-#: preseed.xml:974
-#, no-c-format
-msgid ""
-"exim4-config exim4/dc_eximconfig_configtype \\\n"
-"       select no configuration at this time\n"
-"exim4-config exim4/no_config boolean true\n"
-"exim4-config exim4/no_config boolean true\n"
-"exim4-config exim4/dc_postmaster string"
-msgstr ""
-"exim4-config exim4/dc_eximconfig_configtype \\\n"
-"       select no configuration at this time\n"
-"exim4-config exim4/no_config boolean true\n"
-"exim4-config exim4/no_config boolean true\n"
-"exim4-config exim4/dc_postmaster string"
-
-#. Tag: title
-#: preseed.xml:979
-#, no-c-format
 msgid "X configuration"
 msgstr "设置 X"
 
 #. Tag: para
-#: preseed.xml:980
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "Preseeding Debian's X config is possible, but you probably need to know some "
@@ -2151,7 +2120,7 @@ msgstr ""
 "的 X 配置工具无法自动设置每一件事。"
 
 #. Tag: screen
-#: preseed.xml:988
+#: preseed.xml:975
 #, no-c-format
 msgid ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -2199,13 +2168,13 @@ msgstr ""
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
-#: preseed.xml:993
+#: preseed.xml:980
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:995
+#: preseed.xml:982
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2225,19 +2194,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1002
+#: preseed.xml:989
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1005
+#: preseed.xml:992
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1006
+#: preseed.xml:993
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2247,7 +2216,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1014
+#: preseed.xml:1001
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2285,13 +2254,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1019
+#: preseed.xml:1006
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1020
+#: preseed.xml:1007
 #, fuzzy, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2321,13 +2290,13 @@ msgstr ""
 "出来的，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1048
+#: preseed.xml:1035
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1049
+#: preseed.xml:1036
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2341,7 +2310,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1059
+#: preseed.xml:1046
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2391,7 +2360,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1048
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
@@ -2405,6 +2374,29 @@ msgstr ""
 "使网络预置在网络连通时执行。您应该小心使用，因为这是两种预置，意味着您有机会"
 "执行 preseed/early 命令，第二个可以在网络连通后使用。"
 
+#~ msgid "Mailer configuration"
+#~ msgstr "邮件设置"
+
+#~ msgid ""
+#~ "During a normal install, exim asks only a few questions. Here's how to "
+#~ "avoid even those. More complicated preseeding is possible."
+#~ msgstr ""
+#~ "普通安装方式下，exim 会问一些问题。这里是避免的方法。也可以有更多的预置内"
+#~ "容。"
+
+#~ msgid ""
+#~ "exim4-config exim4/dc_eximconfig_configtype \\\n"
+#~ "       select no configuration at this time\n"
+#~ "exim4-config exim4/no_config boolean true\n"
+#~ "exim4-config exim4/no_config boolean true\n"
+#~ "exim4-config exim4/dc_postmaster string"
+#~ msgstr ""
+#~ "exim4-config exim4/dc_eximconfig_configtype \\\n"
+#~ "       select no configuration at this time\n"
+#~ "exim4-config exim4/no_config boolean true\n"
+#~ "exim4-config exim4/no_config boolean true\n"
+#~ "exim4-config exim4/dc_postmaster string"
+
 #~ msgid ""
 #~ "The same effect can be achieved for <emphasis>all</emphasis> questions by "
 #~ "setting the parameter <classname>preseed/interactive=true</classname> at "
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 50f22d7a2..0156bd526 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.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: 2007-02-18 17:46+0000\n"
+"POT-Creation-Date: 2007-02-22 15:36+0000\n"
 "PO-Revision-Date: 2006-05-14 09:07+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -39,8 +39,8 @@ msgstr "什么是 Debian？"
 #, fuzzy, no-c-format
 msgid ""
 "Debian is an all-volunteer organization dedicated to developing free "
-"software and promoting the ideals of the Free Software Foundation. The "
-"Debian Project began in 1993, when Ian Murdock issued an open invitation to "
+"software and promoting the ideals of the Free Software community. The Debian "
+"Project began in 1993, when Ian Murdock issued an open invitation to "
 "software developers to contribute to a complete and coherent software "
 "distribution based on the relatively new Linux kernel. That relatively small "
 "band of dedicated enthusiasts, originally funded by the <ulink url=\"&url-"