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

1 files changed, 103 insertions, 53 deletions

diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index eeceaf4de..2936c966f 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: 2006-12-29 19:35+0000\n"
+"POT-Creation-Date: 2006-12-31 03:15+0000\n"
 "PO-Revision-Date: 2006-10-31 21:52+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1296,10 +1296,7 @@ msgstr "内核的安装"
 #, fuzzy, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a Linux kernel and a "
-"boot loader. Identify available pre-packaged kernels with: "
-"<informalexample><screen>\n"
-"# apt-cache search linux-image\n"
-"</screen></informalexample> Then install your choice using its package name."
+"boot loader. Identify available pre-packaged kernels with:"
 msgstr ""
 "若想启动这个系统，您很可能还需要一个 Linux 内核和一个 boot loader。可以用下面"
 "指令找到那些预先打包的内核 <informalexample><screen>\n"
@@ -1307,34 +1304,80 @@ msgstr ""
 "</screen></informalexample> 接下来使用所选包名来安装。"
 
 #. Tag: screen
-#: random-bits.xml:630
+#: random-bits.xml:626
+#, no-c-format
+msgid "# apt-cache search linux-image"
+msgstr ""
+
+#. Tag: para
+#: random-bits.xml:628
 #, no-c-format
 msgid ""
-"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
-"replaceable>"
+"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 ""
+
+#. Tag: screen
+#: random-bits.xml:634
+#, 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 ""
+
+#. Tag: para
+#: random-bits.xml:636
+#, 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 "
+"appropirate for your system."
+msgstr ""
+
+#. Tag: para
+#: random-bits.xml:643
+#, no-c-format
+msgid ""
+"If you intend to use <classname>grub</classname> as your bootloader, you can "
+"set the <literal>do_bootloader</literal> option to <quote>no</quote>. 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 be <quote>yes</quote>."
 msgstr ""
-"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
-"replaceable>"
 
 #. Tag: para
-#: random-bits.xml:633
+#: random-bits.xml:655
 #, no-c-format
 msgid ""
-"The configuration file <filename>/etc/kernel-img.conf</filename> influences "
-"the installation and upgrade of pre-packaged Debian kernels. A default file "
-"will be created when you first install a Debian kernel image. For additional "
-"information about this file, consult its man page which will be available "
-"after installing the <classname>kernel-package</classname> package."
+"Then install the kernel package of your choice using its package name. "
+"<informalexample><screen>\n"
+"# aptitude install linux-image-<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 ""
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:669
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:670
 #, no-c-format
 msgid ""
 "To make your &debian; system bootable, set up your boot loader to load the "
@@ -1347,7 +1390,7 @@ msgstr ""
 "loader，因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
 
 #. Tag: para
-#: random-bits.xml:653
+#: random-bits.xml:677
 #, fuzzy, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1368,7 +1411,7 @@ msgstr ""
 "它就会用哪个系统里的 <filename>lilo.conf</filename> )。"
 
 #. Tag: para
-#: random-bits.xml:665
+#: random-bits.xml:689
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1383,13 +1426,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:675
+#: random-bits.xml:699
 #, 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:679
+#: random-bits.xml:703
 #, fuzzy, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1409,7 +1452,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:681
+#: random-bits.xml:705
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1427,7 +1470,7 @@ msgstr ""
 "filename> )。"
 
 #. Tag: para
-#: random-bits.xml:691
+#: random-bits.xml:715
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1457,13 +1500,13 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:728
 #, no-c-format
 msgid "Finishing touches"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:729
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1476,7 +1519,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:716
+#: random-bits.xml:740
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1485,19 +1528,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:722
+#: random-bits.xml:746
 #, no-c-format
 msgid "# aptitude clean"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:733
+#: random-bits.xml:757
 #, no-c-format
 msgid "Installing &debian; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:759
 #, no-c-format
 msgid ""
 "This section explains how to install &debian; on a computer without an "
@@ -1510,7 +1553,7 @@ msgstr ""
 "具有 Debian 镜像的网络(例如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:743
+#: random-bits.xml:767
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1524,7 +1567,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:751
+#: random-bits.xml:775
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1535,7 +1578,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:756
+#: random-bits.xml:780
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1547,13 +1590,13 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:766
+#: random-bits.xml:790
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:769
+#: random-bits.xml:793
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where Debian will be "
@@ -1561,13 +1604,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将安装 Debian 在上面。"
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:799
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:780
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1576,7 +1619,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:786
+#: random-bits.xml:810
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1587,13 +1630,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:798
+#: random-bits.xml:822
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:799
+#: random-bits.xml:823
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1603,7 +1646,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:804
+#: random-bits.xml:828
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1645,13 +1688,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:834
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:835
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1675,13 +1718,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:830
+#: random-bits.xml:854
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:832
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1691,13 +1734,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:840
+#: random-bits.xml:864
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:845
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1710,7 +1753,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:854
+#: random-bits.xml:878
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -1721,19 +1764,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:866
+#: random-bits.xml:890
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:869
+#: random-bits.xml:893
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:874
+#: random-bits.xml:898
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -1741,7 +1784,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:879
+#: random-bits.xml:903
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -1751,7 +1794,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:885
+#: random-bits.xml:909
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -1761,6 +1804,13 @@ msgstr ""
 "resolv.conf</filename>)"
 
 #~ msgid ""
+#~ "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
+#~ "replaceable>"
+#~ msgstr ""
+#~ "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
+#~ "replaceable>"
+
+#~ msgid ""
 #~ "Now you've got a real Debian system, though rather lean, on disk. "
 #~ "<command>Chroot</command> into it:"
 #~ msgstr ""