Update of POT and PO files for the manual

2 files changed, 143 insertions, 66 deletions

diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index aa7af687b..73db5e785 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.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-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
 "PO-Revision-Date: 2006-07-13 14:42+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -327,17 +327,17 @@ msgstr ""
 #. Tag: title
 #: boot-new.xml:203
 #, no-c-format
-msgid "loop-AES"
-msgstr "loop-AES"
+msgid "dm-crypt"
+msgstr "dm-crypt"
 
 #. Tag: para
 #: boot-new.xml:205
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For partitions encrypted via loop-AES you will be shown the following prompt "
-"during the boot: <informalexample><screen>\n"
-"mount: going to use loop device /dev/loop<replaceable>X</replaceable>\n"
-"Password:\n"
+"For partitions encrypted using dm-crypt you will be shown the following "
+"prompt during the boot: <informalexample><screen>\n"
+"Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)\n"
+"Enter LUKS passphrase:\n"
 "</screen></informalexample> In the first line of the prompt, <replaceable>X</"
 "replaceable> is the number of the loop device. You are now probably "
 "wondering <emphasis>for which volume</emphasis> you are actually entering "
@@ -347,9 +347,9 @@ msgid ""
 "this volume. If you set up more than one encrypted volume during the "
 "installation, the notes you wrote down as the last step in <xref linkend="
 "\"partman-crypto\"/> come in handy. If you did not make a note of the "
-"mapping between <filename>loop<replaceable>X</replaceable></filename> and "
-"the mount points before, you can still find it in <filename>/etc/fstab</"
-"filename> of your new system."
+"mapping between <filename>crypt<replaceable>X</replaceable></filename> and "
+"the mount points before, you can still find it in <filename>/etc/crypttab</"
+"filename> and <filename>/etc/fstab</filename> of your new system."
 msgstr ""
 "通过 loop-AES 加密的分区，启动的时候会有下面的提示信息："
 "<informalexample><screen>\n"
@@ -365,45 +365,76 @@ msgstr ""
 "filename> 里面找到它。"
 
 #. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:227
 #, no-c-format
 msgid ""
+"The prompt may look somewhat different when an encrypted root file system is "
+"mounted. This depends on which initramfs generator was used to generate the "
+"initrd used to boot the system. The example below is for an initrd generated "
+"using <classname>initramfs-tools</classname>:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:234
+#, no-c-format
+msgid ""
+"Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
+"Begin: Running /scripts/local-top ...\n"
+"Enter LUKS passphrase:"
+msgstr ""
+
+#. Tag: para
+#: boot-new.xml:236 boot-new.xml:261
+#, fuzzy, no-c-format
+msgid ""
 "No characters (even asterisks) will be shown while entering the passphrase. "
-"Be careful, you have only <emphasis>one try</emphasis>. If you enter wrong "
-"passphrase, an error message will appear and the boot process will skip that "
-"volume and continue to mount the next filesystem. Please see <xref linkend="
-"\"crypto-troubleshooting\"/> for further information."
+"If you enter the wrong passphrase, you have two more tries to correct it. "
+"After the third try the boot process will skip this volume and continue to "
+"mount the next filesystem. Please see <xref linkend=\"crypto-troubleshooting"
+"\"/> for further information."
 msgstr ""
 "输入密码时不会有字符(包括星号)回显。注意，您只有 <emphasis>一次机会</"
 "emphasis>。如果密码输错，将显示错误信息，但启动过程将跳过该卷进入到下一个文件"
 "系统。请参阅 <xref linkend=\"crypto-troubleshooting\"/> 了解更多信息。"
 
 #. Tag: para
-#: boot-new.xml:235
+#: boot-new.xml:244 boot-new.xml:269
 #, no-c-format
 msgid "After entering all passphrases the boot should continue as usual."
 msgstr "输入密码之后，启动过程与通常情况相同。"
 
 #. Tag: title
-#: boot-new.xml:243
+#: boot-new.xml:252
 #, no-c-format
-msgid "dm-crypt"
-msgstr "dm-crypt"
+msgid "loop-AES"
+msgstr "loop-AES"
 
 #. Tag: para
-#: boot-new.xml:245
+#: boot-new.xml:254
+#, no-c-format
+msgid ""
+"For partitions encrypted using loop-AES you will be shown the following "
+"prompt during the boot:"
+msgstr ""
+
+#. Tag: screen
+#: boot-new.xml:259
 #, no-c-format
-msgid "TODO: write something once it works."
-msgstr "TODO: write something once it works."
+msgid ""
+"Checking loop-encrypted file systems.\n"
+"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
+"replaceable>)\n"
+"Password:"
+msgstr ""
 
 #. Tag: title
-#: boot-new.xml:253
+#: boot-new.xml:277
 #, no-c-format
 msgid "Troubleshooting"
 msgstr "故障处理"
 
 #. Tag: para
-#: boot-new.xml:255
+#: boot-new.xml:279
 #, no-c-format
 msgid ""
 "If some of the encrypted volumes could not be mounted because a wrong "
@@ -414,7 +445,7 @@ msgstr ""
 "况。"
 
 #. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:288
 #, no-c-format
 msgid ""
 "The first case concerns the root partition. When it is not mounted "
@@ -425,7 +456,7 @@ msgstr ""
 "动计算机再试一次。"
 
 #. Tag: para
-#: boot-new.xml:271
+#: boot-new.xml:295
 #, no-c-format
 msgid ""
 "The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -451,7 +482,7 @@ msgstr ""
 "于需要为该卷输入密码。"
 
 #. Tag: para
-#: boot-new.xml:285
+#: boot-new.xml:309
 #, no-c-format
 msgid ""
 "For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -474,7 +505,7 @@ msgstr ""
 "就可以按普通的方法加载这些卷："
 
 #. Tag: screen
-#: boot-new.xml:300
+#: boot-new.xml:324
 #, no-c-format
 msgid ""
 "<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -484,10 +515,10 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: boot-new.xml:303
-#, no-c-format
+#: boot-new.xml:327
+#, fuzzy, no-c-format
 msgid ""
-"If the volumes holding noncritical system files could not be mounted "
+"If any volume holding noncritical system files could not be mounted "
 "(<filename>/usr</filename> or <filename>/var</filename>), the system should "
 "still boot and you should be able to mount the volumes manually like in the "
 "previous case. However, you will also need to (re)start any services usually "
@@ -508,13 +539,13 @@ msgstr ""
 "时按下 <keycombo> <keycap>Control</keycap> <keycap>D</keycap> </keycombo>。"
 
 #. Tag: title
-#: boot-new.xml:326
+#: boot-new.xml:350
 #, no-c-format
 msgid "Log In"
 msgstr "登录"
 
 #. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:352
 #, no-c-format
 msgid ""
 "Once your system boots, you'll be presented with the login prompt. Log in "
@@ -525,7 +556,7 @@ msgstr ""
 "在您的系统就能使用了。"
 
 #. Tag: para
-#: boot-new.xml:334
+#: boot-new.xml:358
 #, no-c-format
 msgid ""
 "If you are a new user, you may want to explore the documentation which is "
@@ -537,7 +568,7 @@ msgstr ""
 "文档系统，由不同类型的文档组成。这里是一些出发点。"
 
 #. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:366
 #, no-c-format
 msgid ""
 "Documentation accompanying programs you have installed is in <filename>/usr/"
@@ -551,7 +582,7 @@ msgstr ""
 "统，位于 <filename>/usr/share/doc/apt/guide.html/index.html</filename>。"
 
 #. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:375
 #, no-c-format
 msgid ""
 "In addition, there are some special folders within the <filename>/usr/share/"
@@ -567,7 +598,7 @@ msgstr ""
 "index.html</filename> 文档索引。"
 
 #. Tag: para
-#: boot-new.xml:361
+#: boot-new.xml:385
 #, no-c-format
 msgid ""
 "One easy way to view these documents is to <userinput>cd /usr/share/doc/</"
@@ -578,7 +609,7 @@ msgstr ""
 "<userinput>lynx</userinput> 后面是空格加一个点(点是指当前目录)。"
 
 #. Tag: para
-#: boot-new.xml:368
+#: boot-new.xml:392
 #, no-c-format
 msgid ""
 "You can also type <userinput>info <replaceable>command</replaceable></"
@@ -601,7 +632,7 @@ msgstr ""
 "母，再是两个 tab。"
 
 #. Tag: para
-#: boot-new.xml:383
+#: boot-new.xml:407
 #, no-c-format
 msgid ""
 "For a more complete introduction to Debian and GNU/Linux, see <filename>/usr/"
@@ -609,3 +640,6 @@ msgid ""
 msgstr ""
 "了解更多的 Debian 和 GNU/Linux，请参阅 <filename>/usr/share/doc/debian-guide/"
 "html/noframes/index.html</filename>。"
+
+#~ msgid "TODO: write something once it works."
+#~ msgstr "TODO: write something once it works."
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index ab046e631..668ccde02 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-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-05 12:45+0000\n"
 "PO-Revision-Date: 2006-08-02 19:35+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -27,19 +27,14 @@ msgstr "Linux 里的设备"
 #: random-bits.xml:12
 #, no-c-format
 msgid ""
-"In Linux you have various special files in <filename>/dev</filename>. These "
-"files are called device files. In the Unix world accessing hardware is "
-"different. There you have a special file which actually runs a driver which "
-"in turn accesses the hardware. The device file is an interface to the actual "
-"system component. Files under <filename>/dev</filename> also behave "
-"differently than ordinary files. Below are the most important device files "
-"listed."
+"In Linux various special files can be found under the directory <filename>/"
+"dev</filename>. These files are called device files and behave unlike "
+"ordinary files. The most common types of device files are for block devices "
+"and character devices. These files are an interface to the actual driver "
+"(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> 发现许多很特别的文件。这些文件"
-"被称为设备文件。在 Unix 世界里，访问硬件的方式有些不一样。这些特别的文件的背"
-"后其实运行着驱动程序，而正是驱动程序控制着硬件。设备文件就是访问真实的系统部"
-"件的接口。<filename>/dev</filename> 目录下的文件的各种特性也和普通文件大相径"
-"庭。下面列举了最重要的一些设备文件。"
 
 #. Tag: filename
 #: random-bits.xml:27
@@ -301,8 +296,8 @@ msgstr "null"
 
 #. Tag: entry
 #: random-bits.xml:115
-#, no-c-format
-msgid "Everything pointed to this device will disappear"
+#, fuzzy, no-c-format
+msgid "Anything written to this device will disappear"
 msgstr "所有指向该设备的东西都会消失"
 
 #. Tag: filename
@@ -379,7 +374,12 @@ msgid ""
 "mini/3-Button-Mouse.gz</filename>, <userinput>man gpm</userinput>, "
 "<filename>/usr/share/doc/gpm/FAQ.gz</filename>, and <ulink url=\"&url-xorg;"
 "current/doc/html/mouse.html\">README.mouse</ulink>."
-msgstr "如果禁用了 gpm，或者因为某些原因没有安装，请确保设置 X 从鼠标设备，比如 /dev/psaux 上直接读取数据。详情情况，请参阅三键鼠标的 mini-Howto <filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>、<userinput>man gpm</userinput>、<filename>/usr/share/doc/gpm/FAQ.gz</filename> 以及 <ulink url=\"&url-xorg;current/doc/html/mouse.html\">README.mouse</ulink>。"
+msgstr ""
+"如果禁用了 gpm，或者因为某些原因没有安装，请确保设置 X 从鼠标设备，比如 /dev/"
+"psaux 上直接读取数据。详情情况，请参阅三键鼠标的 mini-Howto <filename>/usr/"
+"share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>、<userinput>man "
+"gpm</userinput>、<filename>/usr/share/doc/gpm/FAQ.gz</filename> 以及 <ulink "
+"url=\"&url-xorg;current/doc/html/mouse.html\">README.mouse</ulink>。"
 
 #. Tag: para
 #: random-bits.xml:158
@@ -748,9 +748,12 @@ msgid ""
 "</screen></informalexample> To create an ext2 file system instead, omit "
 "<userinput>-j</userinput>."
 msgstr ""
-"在分区上创建文件系统。举例来说，要在 <filename>/dev/hda6</filename> 分区(以后的例子中，将把它作为 root 分区)建立一个 ext3 格式的文件系统： <informalexample><screen>\n"
+"在分区上创建文件系统。举例来说，要在 <filename>/dev/hda6</filename> 分区(以后"
+"的例子中，将把它作为 root 分区)建立一个 ext3 格式的文件系统： "
+"<informalexample><screen>\n"
 "# mke2fs -j /dev/hda6\n"
-"</screen></informalexample> 要建立 ext2 格式的文件系统，去掉 <userinput>-j</userinput>。"
+"</screen></informalexample> 要建立 ext2 格式的文件系统，去掉 <userinput>-j</"
+"userinput>。"
 
 #. Tag: para
 #: random-bits.xml:340
@@ -815,7 +818,15 @@ msgid ""
 "command>. </para> </footnote>. Install <command>wget</command> and "
 "<command>ar</command> if they aren't already on your current system, then "
 "download and install <command>debootstrap</command>."
-msgstr "Debian 安装程序使用的工具，同时也为安装 Debian 基本系统的官方方法采用，是 <command>debootstrap</command>。它调用了 <command>wget</command> 和 <command>ar</command>，而其他的仅依赖 <classname>/bin/sh</classname> 和基本的 Unix/Linux 工具<footnote> <para> 它们包括 GNU core 工具和命令，像 <command>sed</command>、<command>grep</command>、<command>tar</command> 和 <command>gzip</command>。</para> </footnote>。如果您的系统里还没有 <command>wget</command> 和 <command>ar</command>，先安装它们，然后下载并安装 <command>debootstrap</command>。"
+msgstr ""
+"Debian 安装程序使用的工具，同时也为安装 Debian 基本系统的官方方法采用，是 "
+"<command>debootstrap</command>。它调用了 <command>wget</command> 和 "
+"<command>ar</command>，而其他的仅依赖 <classname>/bin/sh</classname> 和基本"
+"的 Unix/Linux 工具<footnote> <para> 它们包括 GNU core 工具和命令，像 "
+"<command>sed</command>、<command>grep</command>、<command>tar</command> 和 "
+"<command>gzip</command>。</para> </footnote>。如果您的系统里还没有 "
+"<command>wget</command> 和 <command>ar</command>，先安装它们，然后下载并安装 "
+"<command>debootstrap</command>。"
 
 #. Tag: para
 #: random-bits.xml:396
@@ -1196,10 +1207,14 @@ msgid ""
 "other than ASCII or latin1, please consult the appropriate localization "
 "HOWTO."
 msgstr ""
-"要设置您的 locale 设定，以便使用英语以外的其它语言，就需要安装提供 <classname>locales</classname> 支持软件包，然后配置： <informalexample><screen>\n"
+"要设置您的 locale 设定，以便使用英语以外的其它语言，就需要安装提供 "
+"<classname>locales</classname> 支持软件包，然后配置： "
+"<informalexample><screen>\n"
 "# aptitude install locales\n"
 "# dpkg-reconfigure locales\n"
-"</screen></informalexample> 注意：在此之前必须配置好 apt，创建 source.list 并执行 <command>aptitude update</command>。在使用非 ASCII 或 latin1 的字符集的 locale 之前，请先参阅相应的本地化指南(localization HOWTO)。"
+"</screen></informalexample> 注意：在此之前必须配置好 apt，创建 source.list 并"
+"执行 <command>aptitude update</command>。在使用非 ASCII 或 latin1 的字符集的 "
+"locale 之前，请先参阅相应的本地化指南(localization HOWTO)。"
 
 #. Tag: title
 #: random-bits.xml:582
@@ -1231,7 +1246,10 @@ msgid ""
 "# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
 "condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
 "arch-etc</replaceable>"
-msgstr "# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>"
+msgstr ""
+"# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
+"condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
+"arch-etc</replaceable>"
 
 #. Tag: title
 #: random-bits.xml:598
@@ -1247,7 +1265,10 @@ msgid ""
 "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; 系统能够启动，还要创建您的 boot loader，好让它能加载已安装的内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot loader，因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
+msgstr ""
+"要让您的 &debian; 系统能够启动，还要创建您的 boot loader，好让它能加载已安装"
+"的内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot "
+"loader，因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
 
 #. Tag: para
 #: random-bits.xml:606
@@ -1358,7 +1379,10 @@ msgid ""
 "Ethernet card, but with just a remote gateway computer attached via a Null-"
 "Modem cable (also called Null-Printer cable). The gateway computer should be "
 "connected to a network that has a Debian mirror on it (e.g. to the Internet)."
-msgstr "本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-Printer 线)，连接到远端网关计算机来安装 &debian;。充当网关的计算机应该连接到具有 Debian 镜像的网络(例如，互联网)。"
+msgstr ""
+"本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-"
+"Printer 线)，连接到远端网关计算机来安装 &debian;。充当网关的计算机应该连接到"
+"具有 Debian 镜像的网络(例如，互联网)。"
 
 #. Tag: para
 #: random-bits.xml:661
@@ -1516,8 +1540,12 @@ 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
@@ -1605,3 +1633,18 @@ msgid ""
 msgstr ""
 "Name server addresses: 您可以使用与源计算机相同的地址 (参阅 <filename>/etc/"
 "resolv.conf</filename>)"
+
+#~ msgid ""
+#~ "In Linux you have various special files in <filename>/dev</filename>. "
+#~ "These files are called device files. In the Unix world accessing hardware "
+#~ "is different. There you have a special file which actually runs a driver "
+#~ "which in turn accesses the hardware. The device file is an interface to "
+#~ "the actual system component. Files under <filename>/dev</filename> also "
+#~ "behave differently than ordinary files. Below are the most important "
+#~ "device files listed."
+#~ msgstr ""
+#~ "在 Linux 里，您会在 <filename>/dev</filename> 发现许多很特别的文件。这些文"
+#~ "件被称为设备文件。在 Unix 世界里，访问硬件的方式有些不一样。这些特别的文件"
+#~ "的背后其实运行着驱动程序，而正是驱动程序控制着硬件。设备文件就是访问真实的"
+#~ "系统部件的接口。<filename>/dev</filename> 目录下的文件的各种特性也和普通文"
+#~ "件大相径庭。下面列举了最重要的一些设备文件。"