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

2 files changed, 110 insertions, 88 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 86c3ba60a..cea0c1c69 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-12-14 01:09+0000\n"
+"POT-Creation-Date: 2008-01-02 01:09+0000\n"
 "PO-Revision-Date: 2007-12-08 20:32+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1395,11 +1395,45 @@ msgstr ""
 #. Tag: title
 #: preseed.xml:770
 #, no-c-format
+msgid "Clock and time zone setup"
+msgstr "时钟与时区设置"
+
+#. Tag: screen
+#: preseed.xml:772
+#, no-c-format
+msgid ""
+"# Controls whether or not the hardware clock is set to UTC.\n"
+"d-i clock-setup/utc boolean true\n"
+"\n"
+"# You may set this to any valid setting for $TZ; see the contents of\n"
+"# /usr/share/zoneinfo/ for valid values.\n"
+"d-i time/zone string US/Eastern\n"
+"\n"
+"# Controls whether to use NTP to set the clock during the install\n"
+"d-i clock-setup/ntp boolean true\n"
+"# NTP server to use. The default is almost always fine here.\n"
+"#d-i clock-setup/ntp-server ntp.example.com"
+msgstr ""
+"# Controls whether or not the hardware clock is set to UTC.\n"
+"d-i clock-setup/utc boolean true\n"
+"\n"
+"# You may set this to any valid setting for $TZ; see the contents of\n"
+"# /usr/share/zoneinfo/ for valid values.\n"
+"d-i time/zone string US/Eastern\n"
+"\n"
+"# Controls whether to use NTP to set the clock during the install\n"
+"d-i clock-setup/ntp boolean true\n"
+"# NTP server to use. The default is almost always fine here.\n"
+"#d-i clock-setup/ntp-server ntp.example.com"
+
+#. Tag: title
+#: preseed.xml:777
+#, no-c-format
 msgid "Partitioning"
 msgstr "分区"
 
 #. Tag: para
-#: preseed.xml:771
+#: preseed.xml:778
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
@@ -1415,7 +1449,7 @@ msgstr ""
 "磁盘。"
 
 #. Tag: para
-#: preseed.xml:782
+#: preseed.xml:789
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1426,7 +1460,7 @@ msgstr ""
 "确的那一个。"
 
 #. Tag: screen
-#: preseed.xml:790
+#: preseed.xml:797
 #, fuzzy, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1563,13 +1597,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:795
+#: preseed.xml:802
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "使用 RAID 分区"
 
 #. Tag: para
-#: preseed.xml:796
+#: preseed.xml:803
 #, no-c-format
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1583,7 +1617,7 @@ msgstr ""
 "列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
 
 #. Tag: para
-#: preseed.xml:806
+#: preseed.xml:813
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also a very "
@@ -1597,7 +1631,7 @@ msgstr ""
 "一下 <filename>/var/log/syslog</filename>。"
 
 #. Tag: para
-#: preseed.xml:814
+#: preseed.xml:821
 #, no-c-format
 msgid ""
 "Note that only RAID 0 and RAID 1 have been tested by the developers of the "
@@ -1608,7 +1642,7 @@ msgstr ""
 "RAID 设置像降级阵列或额外设备只经过了轻量级的测试。"
 
 #. Tag: screen
-#: preseed.xml:822
+#: preseed.xml:829
 #, no-c-format
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1706,47 +1740,50 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:827
+#: preseed.xml:834
 #, no-c-format
-msgid "Clock and time zone setup"
-msgstr "时钟与时区设置"
+msgid "Base system installation"
+msgstr "基本系统安装"
+
+#. Tag: para
+#: preseed.xml:835
+#, no-c-format
+msgid ""
+"There is actually not very much that can be preseeded for this stage of the "
+"installation. The only questions asked concern the installation of the "
+"kernel."
+msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:829
+#: preseed.xml:842
 #, no-c-format
 msgid ""
-"# Controls whether or not the hardware clock is set to UTC.\n"
-"d-i clock-setup/utc boolean true\n"
-"\n"
-"# You may set this to any valid setting for $TZ; see the contents of\n"
-"# /usr/share/zoneinfo/ for valid values.\n"
-"d-i time/zone string US/Eastern\n"
+"# Select the initramfs generator used to generate the initrd for 2.6 "
+"kernels.\n"
+"#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
 "\n"
-"# Controls whether to use NTP to set the clock during the install\n"
-"d-i clock-setup/ntp boolean true\n"
-"# NTP server to use. The default is almost always fine here.\n"
-"#d-i clock-setup/ntp-server ntp.example.com"
+"# The kernel image (meta) package to be installed; \"none\" can be used if "
+"no\n"
+"# kernel is to be installed.\n"
+"#d-i base-installer/kernel/image linux-image-2.6-486"
 msgstr ""
-"# Controls whether or not the hardware clock is set to UTC.\n"
-"d-i clock-setup/utc boolean true\n"
-"\n"
-"# You may set this to any valid setting for $TZ; see the contents of\n"
-"# /usr/share/zoneinfo/ for valid values.\n"
-"d-i time/zone string US/Eastern\n"
+"# Select the initramfs generator used to generate the initrd for 2.6 "
+"kernels.\n"
+"#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
 "\n"
-"# Controls whether to use NTP to set the clock during the install\n"
-"d-i clock-setup/ntp boolean true\n"
-"# NTP server to use. The default is almost always fine here.\n"
-"#d-i clock-setup/ntp-server ntp.example.com"
+"# The kernel image (meta) package to be installed; \"none\" can be used if "
+"no\n"
+"# kernel is to be installed.\n"
+"#d-i base-installer/kernel/image linux-image-2.6-486"
 
 #. Tag: title
-#: preseed.xml:834
+#: preseed.xml:847
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:835
+#: preseed.xml:848
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1757,7 +1794,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:842
+#: preseed.xml:855
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1770,7 +1807,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:852
+#: preseed.xml:865
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1828,7 +1865,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:854
+#: preseed.xml:867
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1845,56 +1882,19 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:864
+#: preseed.xml:877
 #, no-c-format
 msgid ""
 "An MD5 hash for a password can be generated using the following command."
 msgstr "密码的 MD5 哈希值可以用下面命令产生。"
 
 #. Tag: screen
-#: preseed.xml:868
+#: preseed.xml:881
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 
 #. Tag: title
-#: preseed.xml:874
-#, no-c-format
-msgid "Base system installation"
-msgstr "基本系统安装"
-
-#. Tag: para
-#: preseed.xml:875
-#, no-c-format
-msgid ""
-"There is actually not very much that can be preseeded for this stage of the "
-"installation. The only questions asked concern the installation of the "
-"kernel."
-msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
-
-#. Tag: screen
-#: preseed.xml:882
-#, no-c-format
-msgid ""
-"# Select the initramfs generator used to generate the initrd for 2.6 "
-"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
-"\n"
-"# The kernel image (meta) package to be installed; \"none\" can be used if "
-"no\n"
-"# kernel is to be installed.\n"
-"#d-i base-installer/kernel/image linux-image-2.6-486"
-msgstr ""
-"# Select the initramfs generator used to generate the initrd for 2.6 "
-"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
-"\n"
-"# The kernel image (meta) package to be installed; \"none\" can be used if "
-"no\n"
-"# kernel is to be installed.\n"
-"#d-i base-installer/kernel/image linux-image-2.6-486"
-
-#. Tag: title
 #: preseed.xml:887
 #, no-c-format
 msgid "Apt setup"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 5212bf216..fc015119f 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.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-10-22 00:09+0000\n"
+"POT-Creation-Date: 2008-01-02 01:09+0000\n"
 "PO-Revision-Date: 2007-10-28 12:33+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -777,7 +777,11 @@ msgid ""
 "installation. You should also keep in mind that this procedure only gives "
 "the basic steps to set up a system. Additional installation and/or "
 "configuration steps may be needed."
-msgstr "由于绝大多数操作都是手动进行，应该记住这将需要您自己对系统做大量地基本配置，并且要具有比常规安装更多的 Debian 和 Linux 知识。不要期望这种执行的结果与常规安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能还需要额外的安装、或者配置步骤。"
+msgstr ""
+"由于绝大多数操作都是手动进行，应该记住这将需要您自己对系统做大量地基本配置，"
+"并且要具有比常规安装更多的 Debian 和 Linux 知识。不要期望这种执行的结果与常规"
+"安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能还需要额外"
+"的安装、或者配置步骤。"
 
 #. Tag: title
 #: random-bits.xml:373
@@ -1035,7 +1039,11 @@ msgid ""
 "whether you intend to use a modular kernel or not, and on whether you intend "
 "to use dynamic (e.g. using <classname>udev</classname>) or static device "
 "files for the new system."
-msgstr "此时，<filename>/dev/</filename> 只含有非常基本的设备文件。安装的后续步骤可能还需要更多的设备文件。使用什么样的文件和方法，取决于安装使用的系统、是否采用内核模块，以及在新系统中采用动态 (比如，使用 <classname>udev</classname>) 或静态设备文件。"
+msgstr ""
+"此时，<filename>/dev/</filename> 只含有非常基本的设备文件。安装的后续步骤可能"
+"还需要更多的设备文件。使用什么样的文件和方法，取决于安装使用的系统、是否采用"
+"内核模块，以及在新系统中采用动态 (比如，使用 <classname>udev</classname>) 或"
+"静态设备文件。"
 
 #. Tag: para
 #: random-bits.xml:536
@@ -1073,7 +1081,9 @@ msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
 "note that the postinst scripts of some packages may try to create device "
 "files, so this option should only be used with care"
-msgstr "将 host 系统上加载的 /dev 绑定到 target 系统的 /dev；注意，有些软件包的 postinst 脚本会创建设备文件，所以要小心使用改选项。"
+msgstr ""
+"将 host 系统上加载的 /dev 绑定到 target 系统的 /dev；注意，有些软件包的 "
+"postinst 脚本会创建设备文件，所以要小心使用改选项。"
 
 #. Tag: title
 #: random-bits.xml:565
@@ -1345,16 +1355,16 @@ msgstr "配置 Apt"
 
 #. Tag: para
 #: random-bits.xml:663
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
 "want to add some additional sources, for example for source packages and "
 "security updates: <informalexample><screen>\n"
-"deb-src http://ftp.us.debian.org/debian etch main\n"
+"deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ etch/updates main\n"
-"deb-src http://security.debian.org/ etch/updates main\n"
+"deb http://security.debian.org/ &releasename;/updates main\n"
+"deb-src http://security.debian.org/ &releasename;/updates main\n"
 "</screen></informalexample> Make sure to run <userinput>aptitude update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
@@ -1564,7 +1574,9 @@ msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
 "been created. There are alternative methods to install <command>grub</"
 "command>, but those are outside the scope of this appendix."
-msgstr "注意，这里假设已经创建了 <filename>/dev/hda</filename> 设备文件。另外一种方法是安装 <command>grub</command>，但本附录中不讨论。"
+msgstr ""
+"注意，这里假设已经创建了 <filename>/dev/hda</filename> 设备文件。另外一种方法"
+"是安装 <command>grub</command>，但本附录中不讨论。"
 
 #. Tag: para
 #: random-bits.xml:775
@@ -2202,7 +2214,12 @@ msgid ""
 "mainly useful for testing; in this case the image is booted just using "
 "<userinput>install</userinput>. There is no graphical installer image that "
 "can be netbooted."
-msgstr "还有一个特殊的 <quote>mini</quote> ISO 映像<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend=\"downloading-files\"/> 中的一个 Debian 镜像下载，名为 <filename>netboot/gtk/mini.iso</filename>。 </para> </footnote>，主要用于测试；这种情况下它只能使用 <userinput>install</userinput> 来引导。当前还没有可以使用网络启动的图形安装程序映像。"
+msgstr ""
+"还有一个特殊的 <quote>mini</quote> ISO 映像<footnote id=\"gtk-miniiso\"> "
+"<para> 该 mini ISO 映像可以从 <xref linkend=\"downloading-files\"/> 中的一个 "
+"Debian 镜像下载，名为 <filename>netboot/gtk/mini.iso</filename>。 </para> </"
+"footnote>，主要用于测试；这种情况下它只能使用 <userinput>install</userinput> "
+"来引导。当前还没有可以使用网络启动的图形安装程序映像。"
 
 #. Tag: para
 #: random-bits.xml:1175
@@ -2214,7 +2231,12 @@ msgid ""
 "\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</filename>. "
 "</para> </footnote>. It should work on almost all PowerPC systems that have "
 "an ATI graphical card, but is unlikely to work on other systems."
-msgstr "对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像可用<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend=\"downloading-files\"/> 中的一个 Debian 镜像下载，名为 <filename>netboot/gtk/mini.iso</filename>。</para> </footnote>。它可以工作在所有使用 ATI 图形卡的 PowerPC 系统上，其它的则不行。"
+msgstr ""
+"对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像可用"
+"<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend="
+"\"downloading-files\"/> 中的一个 Debian 镜像下载，名为 <filename>netboot/gtk/"
+"mini.iso</filename>。</para> </footnote>。它可以工作在所有使用 ATI 图形卡的 "
+"PowerPC 系统上，其它的则不行。"
 
 #. Tag: para
 #: random-bits.xml:1189