Update PO files

1 files changed, 208 insertions, 197 deletions

diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 40f274110..3b7077d94 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -3,10 +3,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-04-19 00:12+0000\n"
+"POT-Creation-Date: 2010-10-05 18:28+0000\n"
 "PO-Revision-Date: 2010-05-14 15:56+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -822,22 +823,22 @@ msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 #: random-bits.xml:360
 #, no-c-format
 msgid ""
-"This section explains how to install &debian-gnu; from an existing Unix or Linux "
-"system, without using the menu-driven installer as explained in the rest of "
-"the manual. This <quote>cross-install</quote> HOWTO has been requested by "
-"users switching to &debian-gnu; from Red Hat, Mandrake, and SUSE. In this "
-"section some familiarity with entering *nix commands and navigating the file "
-"system is assumed. In this section, <prompt>$</prompt> symbolizes a command "
-"to be entered in the user's current system, while <prompt>#</prompt> refers "
-"to a command entered in the Debian chroot."
+"This section explains how to install &debian-gnu; from an existing Unix or "
+"Linux system, without using the menu-driven installer as explained in the "
+"rest of the manual. This <quote>cross-install</quote> HOWTO has been "
+"requested by users switching to &debian-gnu; from Red Hat, Mandrake, and "
+"SUSE. In this section some familiarity with entering *nix commands and "
+"navigating the file system is assumed. In this section, <prompt>$</prompt> "
+"symbolizes a command to be entered in the user's current system, while "
+"<prompt>#</prompt> refers to a command entered in the Debian chroot."
 msgstr ""
-"本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册后面"
-"要谈到的由菜单驱动的安装软件。这篇<quote>交叉安装(cross-install)</quote> "
+"本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册"
+"后面要谈到的由菜单驱动的安装软件。这篇<quote>交叉安装(cross-install)</quote> "
 "HOWTO 是应用户的要求而撰写的。他们原来是 Redhat、Mandrake 和 SUSE 的用户，现"
-"转而使用 &debian-gnu;。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中穿梭"
-"移动并不生疏。同时，在本节中，<prompt>$</prompt> 标志着这个命令是在用户当前使"
-"用的系统中输入的，而 <prompt>#</prompt> 则表示这个命令是在 Debian chroot 环境"
-"中输入的。"
+"转而使用 &debian-gnu;。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中"
+"穿梭移动并不生疏。同时，在本节中，<prompt>$</prompt> 标志着这个命令是在用户当"
+"前使用的系统中输入的，而 <prompt>#</prompt> 则表示这个命令是在 Debian chroot "
+"环境中输入的。"
 
 #. Tag: para
 #: random-bits.xml:372
@@ -851,8 +852,8 @@ msgid ""
 msgstr ""
 "一旦您根据自己的要求配置好了新的 Debian 系统，就可以将您原来系统中的用户数据"
 "(如果有的话)悉数迁移到 Debian 里去。然后就能继续爽了。一言以蔽之，这是一次"
-"<quote>不停机</quote>的 &debian-gnu; 安装。同时，这也是处理那些因为硬件原因不能通"
-"过任何引导或者安装介质完成安装的权宜之计。"
+"<quote>不停机</quote>的 &debian-gnu; 安装。同时，这也是处理那些因为硬件原因不"
+"能通过任何引导或者安装介质完成安装的权宜之计。"
 
 #. Tag: para
 #: random-bits.xml:383
@@ -868,9 +869,9 @@ msgid ""
 "configuration steps may be needed."
 msgstr ""
 "由于绝大多数操作都是手动进行，应该记住这将需要您自己对系统做大量地基本配置，"
-"并且要具有比常规安装更多的 Debian 和 &arch-kernel; 知识。不要期望这种执行的结果与常规"
-"安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能还需要额外"
-"的安装、或者配置步骤。"
+"并且要具有比常规安装更多的 Debian 和 &arch-kernel; 知识。不要期望这种执行的结"
+"果与常规安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能还"
+"需要额外的安装、或者配置步骤。"
 
 #. Tag: title
 #: random-bits.xml:397
@@ -1049,9 +1050,9 @@ msgid ""
 "filename>, you could substitute a file URL instead of the http URL: "
 "<userinput>file:/cdrom/debian/</userinput>"
 msgstr ""
-"如果您已经把一张 &releasename; 版本的 &debian-gnu; CD 挂载到 <filename>/cdrom</"
-"filename>，那么也可以把 http URL 替换成 file URL，即：<userinput>file:/cdrom/"
-"debian/</userinput>"
+"如果您已经把一张 &releasename; 版本的 &debian-gnu; CD 挂载到 <filename>/"
+"cdrom</filename>，那么也可以把 http URL 替换成 file URL，即："
+"<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
 #: random-bits.xml:509
@@ -1522,11 +1523,11 @@ msgstr "内核的安装"
 #: random-bits.xml:728
 #, no-c-format
 msgid ""
-"If you intend to boot this system, you probably want a &arch-kernel; kernel and a "
-"boot loader. Identify available pre-packaged kernels with:"
+"If you intend to boot this system, you probably want a &arch-kernel; kernel "
+"and a boot loader. Identify available pre-packaged kernels with:"
 msgstr ""
-"要想启动这个系统，您很可能还需要一个 &arch-kernel; 内核和一个 boot loader。可以用下面"
-"指令找到那些预先打包的内核："
+"要想启动这个系统，您很可能还需要一个 &arch-kernel; 内核和一个 boot loader。可"
+"以用下面指令找到那些预先打包的内核："
 
 #. Tag: screen
 #: random-bits.xml:733
@@ -1537,97 +1538,58 @@ msgstr "# apt-cache search &kernelpackage;"
 #. Tag: para
 #: random-bits.xml:735
 #, no-c-format
-msgid ""
-"If you intend to use a pre-packaged kernel, you may want to create the "
-"configuration file <filename>/etc/kernel-img.conf</filename> before you do "
-"so. Here's an example file:"
+msgid "Then install the kernel package of your choice using its package name."
 msgstr ""
-"如果您打算使用预编译的内核包，可以在使用前创建 <filename>/etc/kernel-img."
-"conf</filename> 配置文件。这里是一个示例文件："
 
 #. Tag: screen
-#: random-bits.xml:741
-#, no-c-format
-msgid ""
-"# Kernel image management overrides\n"
-"# See kernel-img.conf(5) for details\n"
-"do_symlinks = yes\n"
-"relative_links = yes\n"
-"do_bootloader = yes\n"
-"do_bootfloppy = no\n"
-"do_initrd = yes\n"
-"link_in_boot = no"
-msgstr ""
-"# Kernel image management overrides\n"
-"# See kernel-img.conf(5) for details\n"
-"do_symlinks = yes\n"
-"relative_links = yes\n"
-"do_bootloader = yes\n"
-"do_bootfloppy = no\n"
-"do_initrd = yes\n"
-"link_in_boot = no"
-
-#. Tag: para
-#: random-bits.xml:743
+#: random-bits.xml:739
 #, no-c-format
 msgid ""
-"For detailed information about this file and the various options, consult "
-"its man page which will be available after installing the <classname>kernel-"
-"package</classname> package. We recommend that you check that the values are "
-"appropriate for your system."
-msgstr ""
-"要了解该文件及其选项的信息，请在安装 <classname>kernel-package</classname> 软"
-"件包后参考其手册(man)。我们建议使用适合您系统的值。"
-
-#. Tag: para
-#: random-bits.xml:750
-#, no-c-format
-msgid ""
-"Then install the kernel package of your choice using its package name. "
-"<informalexample><screen>\n"
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
-"replaceable>\n"
-"</screen></informalexample> If you did not create a <filename>/etc/kernel-"
-"img.conf</filename> before installing a pre-packaged kernel, you may be "
-"asked some questions during its installation that refer to it."
+"replaceable>"
 msgstr ""
-"然后使用所选择的内核软件包名来安装。<informalexample><screen>\n"
-"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
-"replaceable>\n"
-"</screen></informalexample> 假如您在安装预编译内核包之前没有创建 <filename>/"
-"etc/kernel-img.conf</filename> 文件，安装时会被问到相关的问题。"
 
 #. Tag: title
-#: random-bits.xml:764
+#: random-bits.xml:745
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
-"To make your &debian-gnu; system bootable, set up your boot loader to load the "
-"installed kernel with your new root partition. Note that "
+"To make your &debian-gnu; system bootable, set up your boot loader to load "
+"the installed kernel with your new root partition. Note that "
 "<command>debootstrap</command> does not install a boot loader, though you "
 "can use <command>aptitude</command> inside your Debian chroot to do so."
 msgstr ""
-"要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的内核"
-"并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot loader，"
-"因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
-
-#. Tag: para
-#: random-bits.xml:772
-#, no-c-format
-msgid ""
-"Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
-"userinput> for instructions on setting up the bootloader. If you are keeping "
-"the system you used to install Debian, just add an entry for the Debian "
-"install to your existing grub <filename>menu.lst</filename> or "
-"<filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you "
-"could also copy it to the new system and edit it there. After you are done "
-"editing, call <command>lilo</command> (remember it will use <filename>lilo."
-"conf</filename> relative to the system you call it from)."
+"要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的"
+"内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot "
+"loader，因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
+
+#. Tag: para
+#: random-bits.xml:753
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
+#| "userinput> for instructions on setting up the bootloader. If you are "
+#| "keeping the system you used to install Debian, just add an entry for the "
+#| "Debian install to your existing grub <filename>menu.lst</filename> or "
+#| "<filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you "
+#| "could also copy it to the new system and edit it there. After you are "
+#| "done editing, call <command>lilo</command> (remember it will use "
+#| "<filename>lilo.conf</filename> relative to the system you call it from)."
+msgid ""
+"Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
+"<userinput>man lilo.conf</userinput></phrase> for instructions on setting up "
+"the bootloader. If you are keeping the system you used to install Debian, "
+"just add an entry for the Debian install to your existing grub "
+"<filename>menu.lst</filename><phrase arch=\"x86\">or <filename>lilo.conf</"
+"filename>. For <filename>lilo.conf</filename>, you could also copy it to the "
+"new system and edit it there. After you are done editing, call "
+"<command>lilo</command> (remember it will use <filename>lilo.conf</filename> "
+"relative to the system you call it from)</phrase>."
 msgstr ""
 "通过 <userinput>info grub</userinput> 或 <userinput>man lilo.conf</"
 "userinput> 可以看到有关设置 bootloader 的指导。如果希望保留用来安装 Debian 的"
@@ -1638,7 +1600,7 @@ msgstr ""
 "哪个系统里的 <filename>lilo.conf</filename>)。"
 
 #. Tag: para
-#: random-bits.xml:784
+#: random-bits.xml:765
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1660,7 +1622,7 @@ msgstr ""
 "boot/grub/menu.lst</filename>。"
 
 #. Tag: para
-#: random-bits.xml:794
+#: random-bits.xml:775
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1671,13 +1633,13 @@ msgstr ""
 "是安装 <command>grub</command>，但本附录中不讨论。"
 
 #. Tag: para
-#: random-bits.xml:800
+#: random-bits.xml:781
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "下面有一个简单的<filename>/etc/lilo.conf</filename> 作为例子："
 
 #. Tag: screen
-#: random-bits.xml:804
+#: random-bits.xml:785
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1699,41 +1661,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:806
-#, no-c-format
-msgid ""
-"Depending on which bootloader you selected, you can now make some additional "
-"changes in <filename>/etc/kernel-img.conf</filename>."
-msgstr ""
-"根据您选择的 bootloader，可以在 <filename>/etc/kernel-img.conf</filename> 里"
-"做一些修改。"
-
-#. Tag: para
-#: random-bits.xml:811
-#, no-c-format
-msgid ""
-"For the <classname>grub</classname> bootloader, you should set the "
-"<literal>do_bootloader</literal> option to <quote>no</quote>. And to "
-"automatically update your <filename>/boot/grub/menu.lst</filename> on "
-"installation or removal of Debian kernels, add the following lines: "
-"<informalexample><screen>\n"
-"postinst_hook = update-grub\n"
-"postrm_hook   = update-grub\n"
-"</screen></informalexample> For the <classname>lilo</classname> bootloader, "
-"the value of <literal>do_bootloader</literal> needs to remain <quote>yes</"
-"quote>."
-msgstr ""
-"对于 <classname>grub</classname> bootloader，您应该设置 "
-"<literal>do_bootloader</literal> 选项为 <quote>no</quote>。为了能在安装或删"
-"除 Debian 内核时自动更新 <filename>/boot/grub/menu.lst</filename>，应添加下面"
-"几行：<informalexample><screen>\n"
-"postinst_hook = update-grub\n"
-"postrm_hook   = update-grub\n"
-"</screen></informalexample> 对于 <classname>lilo</classname> bootloader，"
-"<literal>do_bootloader</literal> 的值应保留为 <quote>yes</quote>。"
-
-#. Tag: para
-#: random-bits.xml:823
+#: random-bits.xml:787
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1751,7 +1679,7 @@ msgstr ""
 "filename> )。"
 
 #. Tag: para
-#: random-bits.xml:833
+#: random-bits.xml:797
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1781,13 +1709,13 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:846
+#: random-bits.xml:810
 #, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:847
+#: random-bits.xml:811
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1806,7 +1734,7 @@ msgstr ""
 "装单独的软件包。"
 
 #. Tag: para
-#: random-bits.xml:858
+#: random-bits.xml:822
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1817,19 +1745,19 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:864
+#: random-bits.xml:828
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:875
+#: random-bits.xml:839
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:877
+#: random-bits.xml:841
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1838,11 +1766,11 @@ msgid ""
 "connected to a network that has a Debian mirror on it (e.g. to the Internet)."
 msgstr ""
 "本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-"
-"Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连接到"
-"具有 Debian 镜像的网络(例如，互联网)。"
+"Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连"
+"接到具有 Debian 镜像的网络(例如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:885
+#: random-bits.xml:849
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1856,7 +1784,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:893
+#: random-bits.xml:857
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1867,7 +1795,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:898
+#: random-bits.xml:862
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1879,13 +1807,13 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:908
+#: random-bits.xml:872
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:911
+#: random-bits.xml:875
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where Debian will be "
@@ -1893,13 +1821,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 Debian。"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:881
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:922
+#: random-bits.xml:886
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1908,7 +1836,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:928
+#: random-bits.xml:892
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1919,13 +1847,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:940
+#: random-bits.xml:904
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:941
+#: random-bits.xml:905
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1935,7 +1863,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:946
+#: random-bits.xml:910
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1977,13 +1905,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:952
+#: random-bits.xml:916
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:953
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2007,13 +1935,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:936
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:974
+#: random-bits.xml:938
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2023,13 +1951,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:982
+#: random-bits.xml:946
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:987
+#: random-bits.xml:951
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2042,7 +1970,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:996
+#: random-bits.xml:960
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2053,19 +1981,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:1008
+#: random-bits.xml:972
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:1011
+#: random-bits.xml:975
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:1016
+#: random-bits.xml:980
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2073,7 +2001,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:1021
+#: random-bits.xml:985
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2083,7 +2011,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:1027
+#: random-bits.xml:991
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2093,13 +2021,13 @@ msgstr ""
 "resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1046
+#: random-bits.xml:1010
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1048
+#: random-bits.xml:1012
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2113,7 +2041,7 @@ msgstr ""
 "本节将说明操作方法。"
 
 #. Tag: para
-#: random-bits.xml:1056
+#: random-bits.xml:1020
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2124,7 +2052,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:1061
+#: random-bits.xml:1025
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2137,7 +2065,7 @@ msgstr ""
 "phrase>)。"
 
 #. Tag: para
-#: random-bits.xml:1068
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2145,7 +2073,7 @@ msgid ""
 msgstr "通过 PPPoE 进行安装，绝大部分与其他方式相同。下面步骤说明不同之处。"
 
 #. Tag: para
-#: random-bits.xml:1076
+#: random-bits.xml:1040
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2160,7 +2088,7 @@ msgstr ""
 "udeb</classname>) 会被加载并自动运行。"
 
 #. Tag: para
-#: random-bits.xml:1091
+#: random-bits.xml:1055
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2178,7 +2106,7 @@ msgstr ""
 "footnote>)。"
 
 #. Tag: para
-#: random-bits.xml:1110
+#: random-bits.xml:1074
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2186,7 +2114,7 @@ msgid ""
 msgstr "下一步是侦测网络硬件，目的是识别当前系统中的网卡。"
 
 #. Tag: para
-#: random-bits.xml:1116
+#: random-bits.xml:1080
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2197,7 +2125,7 @@ msgstr ""
 "处理 PPPoE 连接的服务器)。"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1086
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2211,7 +2139,7 @@ msgstr ""
 "<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
 
 #. Tag: para
-#: random-bits.xml:1131
+#: random-bits.xml:1095
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2219,7 +2147,7 @@ msgid ""
 msgstr "连接找到之后，用户需要提供登录信息(PPPoE 用户名和密码)。"
 
 #. Tag: para
-#: random-bits.xml:1137
+#: random-bits.xml:1101
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2236,13 +2164,13 @@ msgstr ""
 "and start PPPoE connection</guimenuitem> 菜单项重新配置。"
 
 #. Tag: title
-#: random-bits.xml:1157
+#: random-bits.xml:1121
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1158
+#: random-bits.xml:1122
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2255,7 +2183,7 @@ msgstr ""
 "前端。"
 
 #. Tag: para
-#: random-bits.xml:1166
+#: random-bits.xml:1130
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2270,7 +2198,7 @@ msgstr ""
 "有一些优点，比如可以使用鼠标，以及在一个屏幕下显示多个问题。"
 
 #. Tag: para
-#: random-bits.xml:1175
+#: random-bits.xml:1139
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2290,7 +2218,7 @@ msgstr ""
 "<quote>Help</quote> 选项选取后看到。"
 
 #. Tag: para
-#: random-bits.xml:1186
+#: random-bits.xml:1150
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -2299,10 +2227,14 @@ msgid ""
 "described in <xref linkend=\"downloading-files\"/>. Look for "
 "<filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is "
 "mainly useful for testing."
-msgstr "图形安装程序的映象也可用于网络引导。有一个特殊的 <quote>mini</quote> ISO 映象<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映象可在 Debian 镜像的 <xref linkend=\"downloading-files\"/> 里下载。名字是 <filename>netboot/gtk/mini.iso</filename>。</para> </footnote>，主要用于测试。"
+msgstr ""
+"图形安装程序的映象也可用于网络引导。有一个特殊的 <quote>mini</quote> ISO 映象"
+"<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映象可在 Debian 镜像的 "
+"<xref linkend=\"downloading-files\"/> 里下载。名字是 <filename>netboot/gtk/"
+"mini.iso</filename>。</para> </footnote>，主要用于测试。"
 
 #. Tag: para
-#: random-bits.xml:1199
+#: random-bits.xml:1163
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2319,7 +2251,7 @@ msgstr ""
 "PowerPC 系统上，其它的则不行。"
 
 #. Tag: para
-#: random-bits.xml:1213
+#: random-bits.xml:1177
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2327,7 +2259,7 @@ msgid ""
 msgstr "如同一般安装程序，它也可以在启动图形安装界面时添加引导参数。"
 
 #. Tag: para
-#: random-bits.xml:1219
+#: random-bits.xml:1183
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2339,7 +2271,7 @@ msgstr ""
 "内存条件，它将自动回到普通的 <quote>newt</quote> 前端。"
 
 #. Tag: para
-#: random-bits.xml:1226
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2351,13 +2283,13 @@ msgstr ""
 "程序可能根本无法启动。因此建议在较少内存的系统上使用普通安装程序。"
 
 #. Tag: title
-#: random-bits.xml:1236
+#: random-bits.xml:1200
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "使用图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1237
+#: random-bits.xml:1201
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2368,7 +2300,7 @@ msgstr ""
 "用来给您的安装过程进行指导。"
 
 #. Tag: para
-#: random-bits.xml:1243
+#: random-bits.xml:1207
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2385,7 +2317,7 @@ msgstr ""
 "换选择，而不是激活 &BTN-CONT; 。"
 
 #. Tag: para
-#: random-bits.xml:1253
+#: random-bits.xml:1217
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2396,7 +2328,7 @@ msgstr ""
 "帮助信息可以通过该按钮或者按下 <keycap>F1</keycap> 键。"
 
 #. Tag: para
-#: random-bits.xml:1259
+#: random-bits.xml:1223
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
@@ -2412,3 +2344,82 @@ msgstr ""
 "keycap> </keycombo>。图形安装程序自己运行在 VT5，所以您可以使用 <keycombo> "
 "<keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F5</keycap> </"
 "keycombo> 切换回去。"
+
+#~ msgid ""
+#~ "If you intend to use a pre-packaged kernel, you may want to create the "
+#~ "configuration file <filename>/etc/kernel-img.conf</filename> before you "
+#~ "do so. Here's an example file:"
+#~ msgstr ""
+#~ "如果您打算使用预编译的内核包，可以在使用前创建 <filename>/etc/kernel-img."
+#~ "conf</filename> 配置文件。这里是一个示例文件："
+
+#~ msgid ""
+#~ "# Kernel image management overrides\n"
+#~ "# See kernel-img.conf(5) for details\n"
+#~ "do_symlinks = yes\n"
+#~ "relative_links = yes\n"
+#~ "do_bootloader = yes\n"
+#~ "do_bootfloppy = no\n"
+#~ "do_initrd = yes\n"
+#~ "link_in_boot = no"
+#~ msgstr ""
+#~ "# Kernel image management overrides\n"
+#~ "# See kernel-img.conf(5) for details\n"
+#~ "do_symlinks = yes\n"
+#~ "relative_links = yes\n"
+#~ "do_bootloader = yes\n"
+#~ "do_bootfloppy = no\n"
+#~ "do_initrd = yes\n"
+#~ "link_in_boot = no"
+
+#~ msgid ""
+#~ "For detailed information about this file and the various options, consult "
+#~ "its man page which will be available after installing the "
+#~ "<classname>kernel-package</classname> package. We recommend that you "
+#~ "check that the values are appropriate for your system."
+#~ msgstr ""
+#~ "要了解该文件及其选项的信息，请在安装 <classname>kernel-package</"
+#~ "classname> 软件包后参考其手册(man)。我们建议使用适合您系统的值。"
+
+#~ msgid ""
+#~ "Then install the kernel package of your choice using its package name. "
+#~ "<informalexample><screen>\n"
+#~ "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
+#~ "replaceable>\n"
+#~ "</screen></informalexample> If you did not create a <filename>/etc/kernel-"
+#~ "img.conf</filename> before installing a pre-packaged kernel, you may be "
+#~ "asked some questions during its installation that refer to it."
+#~ msgstr ""
+#~ "然后使用所选择的内核软件包名来安装。<informalexample><screen>\n"
+#~ "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
+#~ "replaceable>\n"
+#~ "</screen></informalexample> 假如您在安装预编译内核包之前没有创建 "
+#~ "<filename>/etc/kernel-img.conf</filename> 文件，安装时会被问到相关的问题。"
+
+#~ msgid ""
+#~ "Depending on which bootloader you selected, you can now make some "
+#~ "additional changes in <filename>/etc/kernel-img.conf</filename>."
+#~ msgstr ""
+#~ "根据您选择的 bootloader，可以在 <filename>/etc/kernel-img.conf</filename> "
+#~ "里做一些修改。"
+
+#~ msgid ""
+#~ "For the <classname>grub</classname> bootloader, you should set the "
+#~ "<literal>do_bootloader</literal> option to <quote>no</quote>. And to "
+#~ "automatically update your <filename>/boot/grub/menu.lst</filename> on "
+#~ "installation or removal of Debian kernels, add the following lines: "
+#~ "<informalexample><screen>\n"
+#~ "postinst_hook = update-grub\n"
+#~ "postrm_hook   = update-grub\n"
+#~ "</screen></informalexample> For the <classname>lilo</classname> "
+#~ "bootloader, the value of <literal>do_bootloader</literal> needs to remain "
+#~ "<quote>yes</quote>."
+#~ msgstr ""
+#~ "对于 <classname>grub</classname> bootloader，您应该设置 "
+#~ "<literal>do_bootloader</literal> 选项为 <quote>no</quote>。为了能在安装或"
+#~ "删除 Debian 内核时自动更新 <filename>/boot/grub/menu.lst</filename>，应添"
+#~ "加下面几行：<informalexample><screen>\n"
+#~ "postinst_hook = update-grub\n"
+#~ "postrm_hook   = update-grub\n"
+#~ "</screen></informalexample> 对于 <classname>lilo</classname> bootloader，"
+#~ "<literal>do_bootloader</literal> 的值应保留为 <quote>yes</quote>。"