Update of POT and PO files for the manual

2 files changed, 83 insertions, 63 deletions

diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 61ef771b3..61e025fe7 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.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-08-18 17:32+0000\n"
+"POT-Creation-Date: 2006-09-28 13:02+0000\n"
 "PO-Revision-Date: 2006-09-04 10:41+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -33,7 +33,11 @@ msgid ""
 "lost and/or disk damage might occur. If you run a desktop environment, there "
 "is usually an option to <quote>log out</quote> available from the "
 "application menu that allows you to shutdown (or reboot) the system."
-msgstr "关闭一个运行着的 Linux 系统，不要使用计算机前面或后面的 reset 开关重启，或者直接关闭计算机。Linux 应该使用可控的过程关闭，否则会造成文件丢失或/和磁盘损坏。假如您运行了桌面环境，通常会有一个 <quote>log out</quote> 选项位于应用程序菜单让您关闭(或者重启)系统。"
+msgstr ""
+"关闭一个运行着的 Linux 系统，不要使用计算机前面或后面的 reset 开关重启，或者"
+"直接关闭计算机。Linux 应该使用可控的过程关闭，否则会造成文件丢失或/和磁盘损"
+"坏。假如您运行了桌面环境，通常会有一个 <quote>log out</quote> 选项位于应用程"
+"序菜单让您关闭(或者重启)系统。"
 
 #. Tag: para
 #: post-install.xml:25
@@ -47,7 +51,14 @@ msgid ""
 "<command>poweroff</command>, <command>halt</command> or <command>shutdown -h "
 "now</command> if either of the key combinations do not work or you prefer to "
 "type commands; use <command>reboot</command> to reboot the system."
-msgstr "另外您可以按下组合键 <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;m68k\"> 或 <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> <keycap>Power</keycap> </keycombo> 于 Macintosh 系统上</phrase>。最后一个选项是用 root 登录，执行 <command>poweroff</command>、<command>halt</command> 或 <command>shutdown -h now</command> 中的一个命令，这在组合键不起作用或者您喜欢敲命令时使用；<command>reboot</command> 可以重启系统。"
+msgstr ""
+"另外您可以按下组合键 <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> "
+"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;m68k\"> 或 "
+"<keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> <keycap>Power</"
+"keycap> </keycombo> 于 Macintosh 系统上</phrase>。最后一个选项是用 root 登"
+"录，执行 <command>poweroff</command>、<command>halt</command> 或 "
+"<command>shutdown -h now</command> 中的一个命令，这在组合键不起作用或者您喜欢"
+"敲命令时使用；<command>reboot</command> 可以重启系统。"
 
 #. Tag: title
 #: post-install.xml:46
@@ -492,16 +503,13 @@ msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
 
 #. Tag: para
 #: post-install.xml:361
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "To compile a kernel the Debian way, you need some packages: "
 "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
-"<phrase condition=\"classic-kpkg\"><classname>kernel-source-&kernelversion;</"
-"classname> (the most recent version at the time of this writing)</phrase> "
-"<phrase condition=\"common-kpkg\"><classname>linux-source-2.6</classname></"
-"phrase> and a few others which are probably already installed (see "
-"<filename>/usr/share/doc/kernel-package/README.gz</filename> for the "
-"complete list)."
+"<classname>linux-source-2.6</classname> and a few others which are probably "
+"already installed (see <filename>/usr/share/doc/kernel-package/README.gz</"
+"filename> for the complete list)."
 msgstr ""
 "为了以 Debian 的方式编译内核，您需要一些软件包： <classname>fakeroot</"
 "classname>，<classname>kernel-package</classname>，<phrase condition="
@@ -512,7 +520,7 @@ msgstr ""
 "gz</filename>)。"
 
 #. Tag: para
-#: post-install.xml:372
+#: post-install.xml:370
 #, no-c-format
 msgid ""
 "This method will make a .deb of your kernel source, and, if you have non-"
@@ -525,16 +533,15 @@ msgstr ""
 "filename> 目录将保存内核，System.map，以及当前编译的活动配置文件的日志。"
 
 #. Tag: para
-#: post-install.xml:380
-#, no-c-format
+#: post-install.xml:378
+#, fuzzy, no-c-format
 msgid ""
 "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
 "<quote>Debian way</quote>; but we find that using the packaging system to "
 "manage your kernel is actually safer and easier. In fact, you can get your "
-"kernel sources right from Linus instead of <phrase condition=\"classic-kpkg"
-"\"><classname>kernel-source-&kernelversion;</classname>,</phrase> <phrase "
-"condition=\"common-kpkg\"><classname>linux-source-2.6</classname>,</phrase> "
-"yet still use the <classname>kernel-package</classname> compilation method."
+"kernel sources right from Linus instead of <classname>linux-source-2.6</"
+"classname>, yet still use the <classname>kernel-package</classname> "
+"compilation method."
 msgstr ""
 "注意您不一定<emphasis>要</emphasis>以 <quote>Debian 方式</quote>编译内核；但"
 "我们发现使用软件包系统来管理您的内核，确实可以更加安全和易用。事实上，您可以"
@@ -544,7 +551,7 @@ msgstr ""
 "<classname>kernel-package</classname> 的编译方法。"
 
 #. Tag: para
-#: post-install.xml:390
+#: post-install.xml:387
 #, no-c-format
 msgid ""
 "Note that you'll find complete documentation on using <classname>kernel-"
@@ -556,8 +563,8 @@ msgstr ""
 "入门指南。"
 
 #. Tag: para
-#: post-install.xml:397
-#, no-c-format
+#: post-install.xml:394
+#, fuzzy, no-c-format
 msgid ""
 "Hereafter, we'll assume you have free rein over your machine and will "
 "extract your kernel source to somewhere in your home directory<footnote> "
@@ -565,14 +572,10 @@ msgid ""
 "build your custom kernel, but this is easiest as it does not require special "
 "permissions. </para> </footnote>. We'll also assume that your kernel version "
 "is &kernelversion;. Make sure you are in the directory to where you want to "
-"unpack the kernel sources, extract them using <phrase condition=\"classic-"
-"kpkg\"><userinput>tar xjf /usr/src/kernel-source-&kernelversion;.tar.bz2</"
-"userinput></phrase> <phrase condition=\"common-kpkg\"><userinput>tar xjf /"
-"usr/src/linux-source-&kernelversion;.tar.bz2</userinput></phrase> and change "
-"to the directory <phrase condition=\"classic-kpkg\"><filename>kernel-source-"
-"&kernelversion;</filename></phrase> <phrase condition=\"common-kpkg"
-"\"><filename>linux-source-&kernelversion;</filename></phrase> that will have "
-"been created."
+"unpack the kernel sources, extract them using <userinput>tar xjf /usr/src/"
+"linux-source-&kernelversion;.tar.bz2</userinput> and change to the directory "
+"<filename>linux-source-&kernelversion;</filename> that will have been "
+"created."
 msgstr ""
 "此后，我们假设您具有操作您机器的权力，可以将内核源码解压到您的 home 目录"
 "<footnote> <para> 可以在其他目录解开内核源码并编译自定义内核，但是不需要额外"
@@ -587,7 +590,7 @@ msgstr ""
 "phrase> 刚才创建的目录。"
 
 #. Tag: para
-#: post-install.xml:422
+#: post-install.xml:414
 #, no-c-format
 msgid ""
 "Now, you can configure your kernel. Run <userinput>make xconfig</userinput> "
@@ -613,7 +616,7 @@ msgstr ""
 "quote> (它们默认并没有被选择)。否则，您的 Debian 安装将会遇到问题。"
 
 #. Tag: para
-#: post-install.xml:437
+#: post-install.xml:429
 #, no-c-format
 msgid ""
 "Clean the source tree and reset the <classname>kernel-package</classname> "
@@ -623,7 +626,7 @@ msgstr ""
 "<userinput>make-kpkg clean</userinput>。"
 
 #. Tag: para
-#: post-install.xml:442
+#: post-install.xml:434
 #, no-c-format
 msgid ""
 "Now, compile the kernel: <userinput>fakeroot make-kpkg --initrd --"
@@ -640,17 +643,14 @@ msgstr ""
 "长的时间，这取决于您的机器的性能。"
 
 #. Tag: para
-#: post-install.xml:452
-#, no-c-format
+#: post-install.xml:444
+#, fuzzy, no-c-format
 msgid ""
 "Once the compilation is complete, you can install your custom kernel like "
-"any package. As root, do <phrase condition=\"classic-kpkg\"> <userinput>dpkg "
-"-i ../kernel-image-&kernelversion;-<replaceable>subarchitecture</"
-"replaceable>_custom.1.0_&architecture;.deb</userinput>. </phrase> <phrase "
-"condition=\"common-kpkg\"> <userinput>dpkg -i ../linux-image-&kernelversion;-"
+"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-"
 "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</"
-"userinput>. </phrase> The <replaceable>subarchitecture</replaceable> part is "
-"an optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</"
+"userinput>. The <replaceable>subarchitecture</replaceable> part is an "
+"optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</"
 "quote>, </phrase> depending on what kernel options you set. <userinput>dpkg -"
 "i</userinput> will install the kernel, along with some other nice supporting "
 "files. For instance, the <filename>System.map</filename> will be properly "
@@ -658,12 +658,25 @@ msgid ""
 "config-&kernelversion;</filename> will be installed, containing your current "
 "configuration set. Your new kernel package is also clever enough to "
 "automatically update your boot loader to use the new kernel. If you have "
-"created a modules package, <phrase condition=\"classic-kpkg\">e.g., if you "
-"have PCMCIA,</phrase> you'll need to install that package as well."
-msgstr "一旦编译完成，您就可以像安装其它软件包一样安装定制的内核。以 root 身份，执行 <phrase condition=\"classic-kpkg\"> <userinput>dpkg -i ../kernel-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>。</phrase> <phrase condition=\"common-kpkg\"> <userinput>dpkg -i ../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>。</phrase> 其中 <replaceable>subarchitecture</replaceable> 部分是一个可选的子结构，<phrase arch=\"i386\">例如 <quote>686</quote>，</phrase>这取决于您所设置的内核选项。<userinput>dpkg -i</userinput> 将安装内核以及其它的一些支持文件。例如，<filename>System.map</filename> 可能会被安装(用来辅助调试内核问题)，<filename>/boot/config-&kernelversion;</filename> 也将被安装，它包含了您当前的配置。新的内核软件包将会自动地更新您的系统上的启动引导器，让它使用新内核。如果您创建了一个模块软件包，<phrase condition=\"classic-kpkg\">例如 PCMCIA，</phrase>您也要同时安装该软件包。"
+"created a modules package, you'll need to install that package as well."
+msgstr ""
+"一旦编译完成，您就可以像安装其它软件包一样安装定制的内核。以 root 身份，执行 "
+"<phrase condition=\"classic-kpkg\"> <userinput>dpkg -i ../kernel-image-"
+"&kernelversion;-<replaceable>subarchitecture</"
+"replaceable>_custom.1.0_&architecture;.deb</userinput>。</phrase> <phrase "
+"condition=\"common-kpkg\"> <userinput>dpkg -i ../linux-image-&kernelversion;-"
+"<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</"
+"userinput>。</phrase> 其中 <replaceable>subarchitecture</replaceable> 部分是"
+"一个可选的子结构，<phrase arch=\"i386\">例如 <quote>686</quote>，</phrase>这"
+"取决于您所设置的内核选项。<userinput>dpkg -i</userinput> 将安装内核以及其它的"
+"一些支持文件。例如，<filename>System.map</filename> 可能会被安装(用来辅助调试"
+"内核问题)，<filename>/boot/config-&kernelversion;</filename> 也将被安装，它包"
+"含了您当前的配置。新的内核软件包将会自动地更新您的系统上的启动引导器，让它使"
+"用新内核。如果您创建了一个模块软件包，<phrase condition=\"classic-kpkg\">例"
+"如 PCMCIA，</phrase>您也要同时安装该软件包。"
 
 #. Tag: para
-#: post-install.xml:479
+#: post-install.xml:464
 #, no-c-format
 msgid ""
 "It is time to reboot the system: read carefully any warning that the above "
@@ -673,7 +686,7 @@ msgstr ""
 "<userinput>shutdown -r now</userinput>。"
 
 #. Tag: para
-#: post-install.xml:484
+#: post-install.xml:469
 #, no-c-format
 msgid ""
 "For more information on Debian kernels and kernel compilation, see the "
@@ -687,13 +700,13 @@ msgstr ""
 "<filename>/usr/share/doc/kernel-package</filename>。"
 
 #. Tag: title
-#: post-install.xml:500
+#: post-install.xml:485
 #, no-c-format
 msgid "Recovering a Broken System"
 msgstr "修复损坏的系统"
 
 #. Tag: para
-#: post-install.xml:501
+#: post-install.xml:486
 #, no-c-format
 msgid ""
 "Sometimes, things go wrong, and the system you've carefully installed is no "
@@ -711,7 +724,7 @@ msgstr ""
 "用于此目的。"
 
 #. Tag: para
-#: post-install.xml:511
+#: post-install.xml:496
 #, no-c-format
 msgid ""
 "To access rescue mode, type <userinput>rescue</userinput> at the "
@@ -734,7 +747,7 @@ msgstr ""
 "硬盘，网络设备等等可以使用。"
 
 #. Tag: para
-#: post-install.xml:526
+#: post-install.xml:511
 #, no-c-format
 msgid ""
 "Instead of the partitioning tool, you should now be presented with a list of "
@@ -748,7 +761,7 @@ msgstr ""
 "您也可以选择 RAID 和 LVM 设备上的分区，与直接在磁盘上创建一样。"
 
 #. Tag: para
-#: post-install.xml:534
+#: post-install.xml:519
 #, no-c-format
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
@@ -764,7 +777,7 @@ msgstr ""
 "userinput>。</phrase>"
 
 #. Tag: para
-#: post-install.xml:546
+#: post-install.xml:531
 #, no-c-format
 msgid ""
 "If the installer cannot run a usable shell in the root file system you "
@@ -782,13 +795,13 @@ msgstr ""
 "filename> 目录。"
 
 #. Tag: para
-#: post-install.xml:555
+#: post-install.xml:540
 #, no-c-format
 msgid "In either case, after you exit the shell, the system will reboot."
 msgstr "无论哪种情况，退出 shell 之后，系统将重启。"
 
 #. Tag: para
-#: post-install.xml:559
+#: post-install.xml:544
 #, no-c-format
 msgid ""
 "Finally, note that repairing broken systems can be difficult, and this "
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index cf572c900..e640c3488 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-08-09 13:37+0000\n"
+"POT-Creation-Date: 2006-09-28 13:02+0000\n"
 "PO-Revision-Date: 2006-08-10 11:16+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -34,7 +34,11 @@ msgid ""
 "(part of the Linux kernel) which in turn accesses the hardware. Another, "
 "less common, type of device file is the named <firstterm>pipe</firstterm>. "
 "The most important device files are listed in the tables below."
-msgstr "Linux 的许多特殊文件可以在 <filename>/dev</filename> 目录下找到。这些文件称为设备文件，其行为与普通文件不同。大多数设备文件的类型是块设备和字符设备。这些文件是访问硬件的驱动程序(Linux 内核的一部分)的接口。另外一些，不那么常见的类型，是命名<firstterm>管道(pipe)</firstterm>。下表中列出了最重要的设备文件。"
+msgstr ""
+"Linux 的许多特殊文件可以在 <filename>/dev</filename> 目录下找到。这些文件称为"
+"设备文件，其行为与普通文件不同。大多数设备文件的类型是块设备和字符设备。这些"
+"文件是访问硬件的驱动程序(Linux 内核的一部分)的接口。另外一些，不那么常见的类"
+"型，是命名<firstterm>管道(pipe)</firstterm>。下表中列出了最重要的设备文件。"
 
 #. Tag: filename
 #: random-bits.xml:27
@@ -1224,13 +1228,12 @@ msgstr "内核的安装"
 
 #. Tag: para
 #: random-bits.xml:583
-#, no-c-format
+#, 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 <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
-"condition=\"common-kpkg\">linux</phrase>-image\n"
+"# apt-cache search linux-image\n"
 "</screen></informalexample> Then install your choice using its package name."
 msgstr ""
 "若想启动这个系统，您很可能还需要一个 Linux 内核和一个 boot loader。可以用下面"
@@ -1241,11 +1244,10 @@ msgstr ""
 
 #. Tag: screen
 #: random-bits.xml:592
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
-"condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
-"arch-etc</replaceable>"
+"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
+"replaceable>"
 msgstr ""
 "# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
 "condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
@@ -1540,8 +1542,13 @@ msgid ""
 "</screen></informalexample> Below are the answers that should be given "
 "during various stages of the installation."
 msgstr ""
-"启动安装介质。安装需要运行在 expert 模式; 在启动提示符下输入 <userinput>expert</userinput>。如果您需要为内核模块设置参数，同样要在启动提示符下输入。例如，要启动安装程序，并为 parport_pc 模块的 <quote>io</quote> 和 <quote>irq</quote> 选项设置值，在启动提示符后面输入：<informalexample><screen>\n"
-"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc.irq=<replaceable>7</replaceable>\n"
+"启动安装介质。安装需要运行在 expert 模式; 在启动提示符下输入 "
+"<userinput>expert</userinput>。如果您需要为内核模块设置参数，同样要在启动提示"
+"符下输入。例如，要启动安装程序，并为 parport_pc 模块的 <quote>io</quote> 和 "
+"<quote>irq</quote> 选项设置值，在启动提示符后面输入："
+"<informalexample><screen>\n"
+"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc."
+"irq=<replaceable>7</replaceable>\n"
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem