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

1 files changed, 149 insertions, 148 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index c3bde04d4..295770662 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-05-05 22:00+0000\n"
+"POT-Creation-Date: 2007-05-19 14:20+0000\n"
 "PO-Revision-Date: 2007-03-01 09:27+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1713,84 +1713,11 @@ msgstr ""
 #. Tag: title
 #: preseed.xml:828
 #, no-c-format
-msgid "Apt setup"
-msgstr "设置 apt"
-
-#. Tag: para
-#: preseed.xml:829
-#, no-c-format
-msgid ""
-"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
-"configuration options is fully automated based on your installation method "
-"and answers to earlier questions. You can optionally add other (local) "
-"repositories."
-msgstr ""
-"设置 <filename>/etc/apt/sources.list</filename> 和其他的基本配置选项，将自动"
-"地基于您使用的安装方式以及前面问题的回答。您也可以选择性地安装其他(或本地)的"
-"仓库。"
-
-#. Tag: screen
-#: preseed.xml:837
-#, no-c-format
-msgid ""
-"# You can choose to install non-free and contrib software.\n"
-"#d-i apt-setup/non-free boolean true\n"
-"#d-i apt-setup/contrib boolean true\n"
-"# Uncomment this if you don't want to use a network mirror.\n"
-"#d-i apt-setup/use_mirror boolean false\n"
-"# Uncomment this to avoid adding security sources, or\n"
-"# add a hostname to use a different server than security.debian.org.\n"
-"#d-i apt-setup/security_host string\n"
-"\n"
-"# Additional repositories, local[0-9] available\n"
-"#d-i apt-setup/local0/repository string \\\n"
-"#       http://local.server/debian stable main\n"
-"#d-i apt-setup/local0/comment string local server\n"
-"# Enable deb-src lines\n"
-"#d-i apt-setup/local0/source boolean true\n"
-"# URL to the public key of the local repository; you must provide a key or\n"
-"# apt will complain about the unauthenticated repository and so the\n"
-"# sources.list line will be left commented out\n"
-"#d-i apt-setup/local0/key string http://local.server/key\n"
-"\n"
-"# By default the installer requires that repositories be authenticated\n"
-"# using a known gpg key. This setting can be used to disable that\n"
-"# authentication. Warning: Insecure, not recommended.\n"
-"#d-i debian-installer/allow_unauthenticated string true"
-msgstr ""
-"# You can choose to install non-free and contrib software.\n"
-"#d-i apt-setup/non-free boolean true\n"
-"#d-i apt-setup/contrib boolean true\n"
-"# Uncomment this if you don't want to use a network mirror.\n"
-"#d-i apt-setup/use_mirror boolean false\n"
-"# Uncomment this to avoid adding security sources, or\n"
-"# add a hostname to use a different server than security.debian.org.\n"
-"#d-i apt-setup/security_host string\n"
-"\n"
-"# Additional repositories, local[0-9] available\n"
-"#d-i apt-setup/local0/repository string \\\n"
-"#       http://local.server/debian stable main\n"
-"#d-i apt-setup/local0/comment string local server\n"
-"# Enable deb-src lines\n"
-"#d-i apt-setup/local0/source boolean true\n"
-"# URL to the public key of the local repository; you must provide a key or\n"
-"# apt will complain about the unauthenticated repository and so the\n"
-"# sources.list line will be left commented out\n"
-"#d-i apt-setup/local0/key string http://local.server/key\n"
-"\n"
-"# By default the installer requires that repositories be authenticated\n"
-"# using a known gpg key. This setting can be used to disable that\n"
-"# authentication. Warning: Insecure, not recommended.\n"
-"#d-i debian-installer/allow_unauthenticated string true"
-
-#. Tag: title
-#: preseed.xml:842
-#, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:843
+#: preseed.xml:829
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1801,7 +1728,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:850
+#: preseed.xml:836
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1814,7 +1741,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:860
+#: preseed.xml:846
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1860,7 +1787,7 @@ msgstr ""
 "#d-i passwd/user-password-crypted password [MD5 hash]"
 
 #. Tag: para
-#: preseed.xml:862
+#: preseed.xml:848
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1877,26 +1804,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:872
+#: preseed.xml:858
 #, no-c-format
 msgid ""
 "An MD5 hash for a password can be generated using the following command."
 msgstr "密码的 MD5 哈希值可以用下面命令产生。"
 
 #. Tag: screen
-#: preseed.xml:876
+#: preseed.xml:862
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 
 #. Tag: title
-#: preseed.xml:882
+#: preseed.xml:868
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:883
+#: preseed.xml:869
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1905,7 +1832,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:890
+#: preseed.xml:876
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1917,67 +1844,86 @@ msgstr ""
 "#d-i base-installer/kernel/linux/initramfs-generators string yaird"
 
 #. Tag: title
-#: preseed.xml:895
+#: preseed.xml:881
 #, no-c-format
-msgid "Boot loader installation"
-msgstr "安装引导加载器"
+msgid "Apt setup"
+msgstr "设置 apt"
+
+#. Tag: para
+#: preseed.xml:882
+#, no-c-format
+msgid ""
+"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
+"configuration options is fully automated based on your installation method "
+"and answers to earlier questions. You can optionally add other (local) "
+"repositories."
+msgstr ""
+"设置 <filename>/etc/apt/sources.list</filename> 和其他的基本配置选项，将自动"
+"地基于您使用的安装方式以及前面问题的回答。您也可以选择性地安装其他(或本地)的"
+"仓库。"
 
 #. Tag: screen
-#: preseed.xml:897
+#: preseed.xml:890
 #, no-c-format
 msgid ""
-"# Grub is the default boot loader (for x86). If you want lilo installed\n"
-"# instead, uncomment this:\n"
-"#d-i grub-installer/skip boolean true\n"
-"\n"
-"# This is fairly safe to set, it makes grub install automatically to the "
-"MBR\n"
-"# if no other operating system is detected on the machine.\n"
-"d-i grub-installer/only_debian boolean true\n"
+"# You can choose to install non-free and contrib software.\n"
+"#d-i apt-setup/non-free boolean true\n"
+"#d-i apt-setup/contrib boolean true\n"
+"# Uncomment this if you don't want to use a network mirror.\n"
+"#d-i apt-setup/use_mirror boolean false\n"
+"# Uncomment this to avoid adding security sources, or\n"
+"# add a hostname to use a different server than security.debian.org.\n"
+"#d-i apt-setup/security_host string\n"
 "\n"
-"# This one makes grub-installer install to the MBR if it also finds some "
-"other\n"
-"# OS, which is less safe as it might not be able to boot that other OS.\n"
-"d-i grub-installer/with_other_os boolean true\n"
+"# Additional repositories, local[0-9] available\n"
+"#d-i apt-setup/local0/repository string \\\n"
+"#       http://local.server/debian stable main\n"
+"#d-i apt-setup/local0/comment string local server\n"
+"# Enable deb-src lines\n"
+"#d-i apt-setup/local0/source boolean true\n"
+"# URL to the public key of the local repository; you must provide a key or\n"
+"# apt will complain about the unauthenticated repository and so the\n"
+"# sources.list line will be left commented out\n"
+"#d-i apt-setup/local0/key string http://local.server/key\n"
 "\n"
-"# Alternatively, if you want to install to a location other than the mbr,\n"
-"# uncomment and edit these lines:\n"
-"#d-i grub-installer/only_debian boolean false\n"
-"#d-i grub-installer/with_other_os boolean false\n"
-"#d-i grub-installer/bootdev  string (hd0,0)\n"
-"# To install grub to multiple disks:\n"
-"#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
+"# By default the installer requires that repositories be authenticated\n"
+"# using a known gpg key. This setting can be used to disable that\n"
+"# authentication. Warning: Insecure, not recommended.\n"
+"#d-i debian-installer/allow_unauthenticated string true"
 msgstr ""
-"# Grub is the default boot loader (for x86). If you want lilo installed\n"
-"# instead, uncomment this:\n"
-"#d-i grub-installer/skip boolean true\n"
-"\n"
-"# This is fairly safe to set, it makes grub install automatically to the "
-"MBR\n"
-"# if no other operating system is detected on the machine.\n"
-"d-i grub-installer/only_debian boolean true\n"
+"# You can choose to install non-free and contrib software.\n"
+"#d-i apt-setup/non-free boolean true\n"
+"#d-i apt-setup/contrib boolean true\n"
+"# Uncomment this if you don't want to use a network mirror.\n"
+"#d-i apt-setup/use_mirror boolean false\n"
+"# Uncomment this to avoid adding security sources, or\n"
+"# add a hostname to use a different server than security.debian.org.\n"
+"#d-i apt-setup/security_host string\n"
 "\n"
-"# This one makes grub-installer install to the MBR if it also finds some "
-"other\n"
-"# OS, which is less safe as it might not be able to boot that other OS.\n"
-"d-i grub-installer/with_other_os boolean true\n"
+"# Additional repositories, local[0-9] available\n"
+"#d-i apt-setup/local0/repository string \\\n"
+"#       http://local.server/debian stable main\n"
+"#d-i apt-setup/local0/comment string local server\n"
+"# Enable deb-src lines\n"
+"#d-i apt-setup/local0/source boolean true\n"
+"# URL to the public key of the local repository; you must provide a key or\n"
+"# apt will complain about the unauthenticated repository and so the\n"
+"# sources.list line will be left commented out\n"
+"#d-i apt-setup/local0/key string http://local.server/key\n"
 "\n"
-"# Alternatively, if you want to install to a location other than the mbr,\n"
-"# uncomment and edit these lines:\n"
-"#d-i grub-installer/only_debian boolean false\n"
-"#d-i grub-installer/with_other_os boolean false\n"
-"#d-i grub-installer/bootdev  string (hd0,0)\n"
-"# To install grub to multiple disks:\n"
-"#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
+"# By default the installer requires that repositories be authenticated\n"
+"# using a known gpg key. This setting can be used to disable that\n"
+"# authentication. Warning: Insecure, not recommended.\n"
+"#d-i debian-installer/allow_unauthenticated string true"
 
 #. Tag: title
-#: preseed.xml:902
+#: preseed.xml:895
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:903
+#: preseed.xml:896
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -1985,73 +1931,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有的任务是："
 
 #. Tag: userinput
-#: preseed.xml:912
+#: preseed.xml:905
 #, no-c-format
 msgid "standard"
 msgstr "标准"
 
 #. Tag: userinput
-#: preseed.xml:915
+#: preseed.xml:908
 #, no-c-format
 msgid "desktop"
 msgstr "桌面"
 
 #. Tag: userinput
-#: preseed.xml:918
+#: preseed.xml:911
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome 桌面"
 
 #. Tag: userinput
-#: preseed.xml:921
+#: preseed.xml:914
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde 桌面"
 
 #. Tag: userinput
-#: preseed.xml:924
+#: preseed.xml:917
 #, no-c-format
 msgid "web-server"
 msgstr "web 服务器"
 
 #. Tag: userinput
-#: preseed.xml:927
+#: preseed.xml:920
 #, no-c-format
 msgid "print-server"
 msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:930
+#: preseed.xml:923
 #, no-c-format
 msgid "dns-server"
 msgstr "dns 服务器"
 
 #. Tag: userinput
-#: preseed.xml:933
+#: preseed.xml:926
 #, no-c-format
 msgid "file-server"
 msgstr "文件服务器"
 
 #. Tag: userinput
-#: preseed.xml:936
+#: preseed.xml:929
 #, no-c-format
 msgid "mail-server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
-#: preseed.xml:939
+#: preseed.xml:932
 #, no-c-format
 msgid "sql-database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
-#: preseed.xml:942
+#: preseed.xml:935
 #, no-c-format
 msgid "laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: preseed.xml:946
+#: preseed.xml:939
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2062,7 +2008,7 @@ msgstr ""
 "userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:952
+#: preseed.xml:945
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2076,18 +2022,16 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:962
+#: preseed.xml:955
 #, fuzzy, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"<phrase condition=\"lenny\">\n"
+"#tasksel tasksel/first multiselect standard, web-server<phrase condition="
+"\"lenny\">\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-desktop, xfce-desktop\n"
-"</phrase>\n"
-"<phrase condition=\"etch\">\n"
-"#tasksel tasksel/first multiselect standard, kde-desktop\n"
-"</phrase>\n"
+"#tasksel tasksel/desktop multiselect kde-desktop, xfce-desktop</"
+"phrase><phrase condition=\"etch\">\n"
+"#tasksel tasksel/first multiselect standard, kde-desktop</phrase>\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2112,6 +2056,63 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
+#: preseed.xml:960
+#, no-c-format
+msgid "Boot loader installation"
+msgstr "安装引导加载器"
+
+#. Tag: screen
+#: preseed.xml:962
+#, fuzzy, no-c-format
+msgid ""
+"# Grub is the default boot loader (for x86). If you want lilo installed\n"
+"# instead, uncomment this:\n"
+"#d-i grub-installer/skip boolean true<phrase condition=\"lenny\">\n"
+"# To also skip installing lilo, and install no bootloader, uncomment this\n"
+"# too:\n"
+"#d-i lilo-installer/skip boolean true</phrase>\n"
+"\n"
+"# This is fairly safe to set, it makes grub install automatically to the "
+"MBR\n"
+"# if no other operating system is detected on the machine.\n"
+"d-i grub-installer/only_debian boolean true\n"
+"\n"
+"# This one makes grub-installer install to the MBR if it also finds some "
+"other\n"
+"# OS, which is less safe as it might not be able to boot that other OS.\n"
+"d-i grub-installer/with_other_os boolean true\n"
+"\n"
+"# Alternatively, if you want to install to a location other than the mbr,\n"
+"# uncomment and edit these lines:\n"
+"#d-i grub-installer/only_debian boolean false\n"
+"#d-i grub-installer/with_other_os boolean false\n"
+"#d-i grub-installer/bootdev  string (hd0,0)\n"
+"# To install grub to multiple disks:\n"
+"#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
+msgstr ""
+"# Grub is the default boot loader (for x86). If you want lilo installed\n"
+"# instead, uncomment this:\n"
+"#d-i grub-installer/skip boolean true\n"
+"\n"
+"# This is fairly safe to set, it makes grub install automatically to the "
+"MBR\n"
+"# if no other operating system is detected on the machine.\n"
+"d-i grub-installer/only_debian boolean true\n"
+"\n"
+"# This one makes grub-installer install to the MBR if it also finds some "
+"other\n"
+"# OS, which is less safe as it might not be able to boot that other OS.\n"
+"d-i grub-installer/with_other_os boolean true\n"
+"\n"
+"# Alternatively, if you want to install to a location other than the mbr,\n"
+"# uncomment and edit these lines:\n"
+"#d-i grub-installer/only_debian boolean false\n"
+"#d-i grub-installer/with_other_os boolean false\n"
+"#d-i grub-installer/bootdev  string (hd0,0)\n"
+"# To install grub to multiple disks:\n"
+"#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
+
+#. Tag: title
 #: preseed.xml:967
 #, no-c-format
 msgid "Finishing up the first stage install"