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

1 files changed, 94 insertions, 58 deletions

diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index 0a56fad74..fefb0b9a0 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-12-27 20:04+0000\n"
+"POT-Creation-Date: 2007-02-27 20:31+0000\n"
 "PO-Revision-Date: 2007-01-08 18:27+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -43,7 +43,11 @@ msgid ""
 "will be for your new Debian system. If you had any other operating systems "
 "on your computer (like Windows) that were detected by the installation "
 "system, those will be listed lower down in the menu."
-msgstr "如果使用了默认安装，引导系统后您首先看到的是 <classname>grub</classname> 菜单或者是 <classname>lilo</classname> bootloader。菜单中的首选项将是您的新 Debian 系统。假如您的计算机上有其他的操作系统(如 Windows)，它们将被安装系统检测到，列入菜单的下方。"
+msgstr ""
+"如果使用了默认安装，引导系统后您首先看到的是 <classname>grub</classname> 菜单"
+"或者是 <classname>lilo</classname> bootloader。菜单中的首选项将是您的新 "
+"Debian 系统。假如您的计算机上有其他的操作系统(如 Windows)，它们将被安装系统检"
+"测到，列入菜单的下方。"
 
 #. Tag: para
 #: boot-new.xml:23
@@ -55,7 +59,10 @@ msgid ""
 "such problems can be fixed without having to repeat the installation. One "
 "available option to fix boot problems is to use the installer's built-in "
 "rescue mode (see <xref linkend=\"rescue\"/>)."
-msgstr "如果系统无法正确启动，请勿惊慌。如果安装成功，还不错，只是出了一点儿小问题没法让系统引导 Debian。多数情况下不需重新安装就能修复。修复引导问题的一个方法是使用安装程序内置的 rescue 模式(参阅 <xref linkend=\"rescue\"/>)。"
+msgstr ""
+"如果系统无法正确启动，请勿惊慌。如果安装成功，还不错，只是出了一点儿小问题没"
+"法让系统引导 Debian。多数情况下不需重新安装就能修复。修复引导问题的一个方法是"
+"使用安装程序内置的 rescue 模式(参阅 <xref linkend=\"rescue\"/>)。"
 
 #. Tag: para
 #: boot-new.xml:32
@@ -72,7 +79,15 @@ msgid ""
 "linkend=\"submit-bug\"/>. Please make sure that you describe your problem "
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
-msgstr "假如您刚接触 Debian 和 Linux，您可能需要从有经验的用户那里得到一些帮助。<phrase arch=\"x86\">直接的在线帮助，可以通过 OFTC network 上的 #debian 或 #debian-boot IRC 频道。另一种选择是 <ulink url=\"&url-list-subscribe;\">debian-user mailing list</ulink>。</phrase> <phrase arch=\"not-x86\">对于不常见的体系，比如 &arch-title;，最适合的方式是在 <ulink url=\"&url-list-subscribe;\">debian-&arch-listname; mailing list</ulink> 上请教。</phrase> 您也可以写下安装报告，说明见 <xref linkend=\"submit-bug\"/>。请确保问题描述清楚，并包括显示的任何信息，以助于分析问题。"
+msgstr ""
+"假如您刚接触 Debian 和 Linux，您可能需要从有经验的用户那里得到一些帮助。"
+"<phrase arch=\"x86\">直接的在线帮助，可以通过 OFTC network 上的 #debian 或 "
+"#debian-boot IRC 频道。另一种选择是 <ulink url=\"&url-list-subscribe;"
+"\">debian-user mailing list</ulink>。</phrase> <phrase arch=\"not-x86\">对于"
+"不常见的体系，比如 &arch-title;，最适合的方式是在 <ulink url=\"&url-list-"
+"subscribe;\">debian-&arch-listname; mailing list</ulink> 上请教。</phrase> 您"
+"也可以写下安装报告，说明见 <xref linkend=\"submit-bug\"/>。请确保问题描述清"
+"楚，并包括显示的任何信息，以助于分析问题。"
 
 #. Tag: para
 #: boot-new.xml:48
@@ -80,7 +95,9 @@ msgstr "假如您刚接触 Debian 和 Linux，您可能需要从有经验的用�
 msgid ""
 "If you had any other operating systems on your computer that were not "
 "detected or not detected correctly, please file an installation report."
-msgstr "如果您计算机上的其他操作系统没有被侦测到，或者未被正确侦测，请撰写一份安装报告。"
+msgstr ""
+"如果您计算机上的其他操作系统没有被侦测到，或者未被正确侦测，请撰写一份安装报"
+"告。"
 
 #. Tag: title
 #: boot-new.xml:55
@@ -129,14 +146,14 @@ msgstr "Macintosh 启动"
 
 #. Tag: para
 #: boot-new.xml:88
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Go to the directory containing the installation files and start up the "
 "<command>Penguin</command> booter, holding down the <keycap>command</keycap> "
 "key. Go to the <userinput>Settings</userinput> dialogue (<keycombo> "
 "<keycap>command</keycap> <keycap>T</keycap> </keycombo>), and locate the "
 "kernel options line which should look like <userinput>root=/dev/ram "
-"video=font:VGA8x16</userinput> or similar."
+"ramdisk_size=15000</userinput> or similar."
 msgstr ""
 "进入包含安装文件的目录，然后启动 <command>Penguin</command> 引导器，按住 "
 "<keycap>command</keycap> 键。进入 <userinput>设置</userinput>对话框"
@@ -146,16 +163,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:98
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "You need to change the entry to <userinput>root=/dev/<replaceable>yyyy</"
 "replaceable></userinput>. Replace the <replaceable>yyyy</replaceable> with "
 "the Linux name of the partition onto which you installed the system (e.g. "
-"<filename>/dev/sda1</filename>); you wrote this down earlier. The "
-"<userinput>video=font:VGA8x8</userinput> is recommended especially for users "
-"with tiny screens. The kernel would pick a prettier (6x11) font but the "
-"console driver for this font can hang the machine, so using 8x16 or 8x8 is "
-"safer at this stage. You can change this at any time."
+"<filename>/dev/sda1</filename>); you wrote this down earlier. For users with "
+"tiny screens, adding <userinput>fbcon=font:VGA8x8</userinput> (or "
+"<userinput>video=font:VGA8x8</userinput> on pre-2.6 kernels) may help "
+"readability. You can change this at any time."
 msgstr ""
 "您需要修改入口为 <userinput>root=/dev/<replaceable>yyyy</replaceable></"
 "userinput>。替换 <replaceable>yyyy</replaceable> 为您安装分区的 Linux 名称(例"
@@ -165,7 +181,7 @@ msgstr ""
 "随时修改它。"
 
 #. Tag: para
-#: boot-new.xml:111
+#: boot-new.xml:109
 #, no-c-format
 msgid ""
 "If you don't want to start GNU/Linux immediately each time you start, "
@@ -178,7 +194,7 @@ msgstr ""
 "<userinput>Save Settings As Default</userinput> 选项。"
 
 #. Tag: para
-#: boot-new.xml:118
+#: boot-new.xml:116
 #, no-c-format
 msgid ""
 "Now select <userinput>Boot Now</userinput> (<keycombo> <keycap>command</"
@@ -190,7 +206,7 @@ msgstr ""
 "RAMdisk 安装系统。"
 
 #. Tag: para
-#: boot-new.xml:124
+#: boot-new.xml:122
 #, no-c-format
 msgid ""
 "Debian should boot, and you should see the same messages as when you first "
@@ -198,13 +214,13 @@ msgid ""
 msgstr "Debian 应该启动，然后您将看到与安装系统同样的讯息，跟着是一些新讯息。"
 
 #. Tag: title
-#: boot-new.xml:134
+#: boot-new.xml:132
 #, no-c-format
 msgid "OldWorld PowerMacs"
 msgstr "OldWorld PowerMacs"
 
 #. Tag: para
-#: boot-new.xml:135
+#: boot-new.xml:133
 #, no-c-format
 msgid ""
 "If the machine fails to boot after completing the installation, and stops "
@@ -228,7 +244,7 @@ msgstr ""
 "ulink>。"
 
 #. Tag: para
-#: boot-new.xml:149
+#: boot-new.xml:147
 #, no-c-format
 msgid ""
 "To boot back into MacOS without resetting the nvram, type <userinput>bye</"
@@ -250,7 +266,7 @@ msgstr ""
 "<keycap>r</keycap> </keycombo> 键，在启动机器的时候。"
 
 #. Tag: para
-#: boot-new.xml:162
+#: boot-new.xml:160
 #, no-c-format
 msgid ""
 "If you use <command>BootX</command> to boot into the installed system, just "
@@ -263,13 +279,13 @@ msgstr ""
 "对应的根设备；如 <userinput>/dev/hda8</userinput>。"
 
 #. Tag: title
-#: boot-new.xml:174
+#: boot-new.xml:172
 #, no-c-format
 msgid "NewWorld PowerMacs"
 msgstr "NewWorld PowerMacs"
 
 #. Tag: para
-#: boot-new.xml:175
+#: boot-new.xml:173
 #, no-c-format
 msgid ""
 "On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
@@ -280,7 +296,7 @@ msgstr ""
 "面，每个可以启动的系统对应一个按钮，&debian; 将是一个企鹅图标的按钮。"
 
 #. Tag: para
-#: boot-new.xml:182
+#: boot-new.xml:180
 #, no-c-format
 msgid ""
 "If you kept MacOS and at some point it changes the OpenFirmware <envar>boot-"
@@ -295,7 +311,7 @@ msgstr ""
 "<keycap>r</keycap> </keycombo> 键，在启动机器的时候。"
 
 #. Tag: para
-#: boot-new.xml:190
+#: boot-new.xml:188
 #, no-c-format
 msgid ""
 "The labels defined in <filename>yaboot.conf</filename> will be displayed if "
@@ -305,7 +321,7 @@ msgstr ""
 "keycap> 键在 <prompt>boot:</prompt> 提示符时标签会显示出来。"
 
 #. Tag: para
-#: boot-new.xml:196
+#: boot-new.xml:194
 #, no-c-format
 msgid ""
 "Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian; "
@@ -321,7 +337,7 @@ msgstr ""
 "<envar>boot-device</envar> 变量，<command>ybin</command> 通常会自动完成。"
 
 #. Tag: para
-#: boot-new.xml:205
+#: boot-new.xml:203
 #, no-c-format
 msgid ""
 "After you boot &debian; for the first time you can add any additional "
@@ -336,13 +352,13 @@ msgstr ""
 "ulink> 了解更多信息。"
 
 #. Tag: title
-#: boot-new.xml:223
+#: boot-new.xml:221
 #, no-c-format
 msgid "Mounting encrypted volumes"
 msgstr "挂载加密卷"
 
 #. Tag: para
-#: boot-new.xml:225
+#: boot-new.xml:223
 #, no-c-format
 msgid ""
 "If you created encrypted volumes during the installation and assigned them "
@@ -354,13 +370,13 @@ msgstr ""
 "求输入密码。对于 dm-crypt 和 loop-AES 具体的过程稍有不同。"
 
 #. Tag: title
-#: boot-new.xml:235
+#: boot-new.xml:233
 #, no-c-format
 msgid "dm-crypt"
 msgstr "dm-crypt"
 
 #. Tag: para
-#: boot-new.xml:237
+#: boot-new.xml:235
 #, no-c-format
 msgid ""
 "For partitions encrypted using dm-crypt you will be shown the following "
@@ -398,7 +414,7 @@ msgstr ""
 "到它。"
 
 #. Tag: para
-#: boot-new.xml:260
+#: boot-new.xml:258
 #, no-c-format
 msgid ""
 "The prompt may look somewhat different when an encrypted root file system is "
@@ -411,7 +427,7 @@ msgstr ""
 "classname> 生成的 initrd："
 
 #. Tag: screen
-#: boot-new.xml:267
+#: boot-new.xml:265
 #, no-c-format
 msgid ""
 "Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
@@ -423,7 +439,7 @@ msgstr ""
 "Enter LUKS passphrase:"
 
 #. Tag: para
-#: boot-new.xml:269 boot-new.xml:294
+#: boot-new.xml:267 boot-new.xml:292
 #, no-c-format
 msgid ""
 "No characters (even asterisks) will be shown while entering the passphrase. "
@@ -437,19 +453,19 @@ msgstr ""
 "\"crypto-troubleshooting\"/> 了解更多信息。"
 
 #. Tag: para
-#: boot-new.xml:277 boot-new.xml:302
+#: boot-new.xml:275 boot-new.xml:300
 #, no-c-format
 msgid "After entering all passphrases the boot should continue as usual."
 msgstr "输入密码之后，启动过程与通常情况相同。"
 
 #. Tag: title
-#: boot-new.xml:285
+#: boot-new.xml:283
 #, no-c-format
 msgid "loop-AES"
 msgstr "loop-AES"
 
 #. Tag: para
-#: boot-new.xml:287
+#: boot-new.xml:285
 #, no-c-format
 msgid ""
 "For partitions encrypted using loop-AES you will be shown the following "
@@ -457,7 +473,7 @@ msgid ""
 msgstr "使用 loop-AES 加密的分区，启动的时候将会有下面的提示信息："
 
 #. Tag: screen
-#: boot-new.xml:292
+#: boot-new.xml:290
 #, no-c-format
 msgid ""
 "Checking loop-encrypted file systems.\n"
@@ -471,13 +487,13 @@ msgstr ""
 "Password:"
 
 #. Tag: title
-#: boot-new.xml:310
+#: boot-new.xml:308
 #, no-c-format
 msgid "Troubleshooting"
 msgstr "故障处理"
 
 #. Tag: para
-#: boot-new.xml:312
+#: boot-new.xml:310
 #, no-c-format
 msgid ""
 "If some of the encrypted volumes could not be mounted because a wrong "
@@ -488,7 +504,7 @@ msgstr ""
 "况。"
 
 #. Tag: para
-#: boot-new.xml:321
+#: boot-new.xml:319
 #, no-c-format
 msgid ""
 "The first case concerns the root partition. When it is not mounted "
@@ -499,7 +515,7 @@ msgstr ""
 "动计算机再试一次。"
 
 #. Tag: para
-#: boot-new.xml:328
+#: boot-new.xml:326
 #, no-c-format
 msgid ""
 "The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -525,7 +541,7 @@ msgstr ""
 "于需要为该卷输入密码。"
 
 #. Tag: para
-#: boot-new.xml:342
+#: boot-new.xml:340
 #, no-c-format
 msgid ""
 "For dm-crypt this is a bit trickier. First you need to register the volumes "
@@ -548,7 +564,7 @@ msgstr ""
 "就可以按普通的方法加载这些卷："
 
 #. Tag: screen
-#: boot-new.xml:357
+#: boot-new.xml:355
 #, no-c-format
 msgid ""
 "<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -558,7 +574,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: boot-new.xml:360
+#: boot-new.xml:358
 #, no-c-format
 msgid ""
 "If any volume holding noncritical system files could not be mounted "
@@ -582,13 +598,13 @@ msgstr ""
 "令时按下 <keycombo> <keycap>Control</keycap> <keycap>D</keycap> </keycombo>。"
 
 #. Tag: title
-#: boot-new.xml:383
+#: boot-new.xml:381
 #, no-c-format
 msgid "Log In"
 msgstr "登录"
 
 #. Tag: para
-#: boot-new.xml:385
+#: boot-new.xml:383
 #, no-c-format
 msgid ""
 "Once your system boots, you'll be presented with the login prompt. Log in "
@@ -599,7 +615,7 @@ msgstr ""
 "在您的系统就能使用了。"
 
 #. Tag: para
-#: boot-new.xml:391
+#: boot-new.xml:389
 #, no-c-format
 msgid ""
 "If you are a new user, you may want to explore the documentation which is "
@@ -611,7 +627,7 @@ msgstr ""
 "文档系统，由不同类型的文档组成。这里是一些出发点。"
 
 #. Tag: para
-#: boot-new.xml:399
+#: boot-new.xml:397
 #, no-c-format
 msgid ""
 "Documentation accompanying programs you have installed can be found in "
@@ -622,10 +638,15 @@ msgid ""
 "example, documentation about the package management tool <command>apt</"
 "command> can be found in the packages <classname>apt-doc</classname> or "
 "<classname>apt-howto</classname>."
-msgstr "已安装程序相关的文档可以在 <filename>/usr/share/doc/</filename> 里找到，位于该程序名的子目录下(或者，更准确地说，包含该程序的软件包名)。但范围更广的文档会单独放在一个特殊的文档软件包内，默认并不安装。例如，关于软件包管理工具 <command>apt</command> 的文档放在 <classname>apt-doc</classname> 或 <classname>apt-howto</classname> 软件包内。"
+msgstr ""
+"已安装程序相关的文档可以在 <filename>/usr/share/doc/</filename> 里找到，位于"
+"该程序名的子目录下(或者，更准确地说，包含该程序的软件包名)。但范围更广的文档"
+"会单独放在一个特殊的文档软件包内，默认并不安装。例如，关于软件包管理工具 "
+"<command>apt</command> 的文档放在 <classname>apt-doc</classname> 或 "
+"<classname>apt-howto</classname> 软件包内。"
 
 #. Tag: para
-#: boot-new.xml:410
+#: boot-new.xml:408
 #, no-c-format
 msgid ""
 "In addition, there are some special folders within the <filename>/usr/share/"
@@ -634,10 +655,14 @@ msgid ""
 "filename>. After installing <classname>dhelp</classname>, you will find a "
 "browse-able index of documentation in <filename>/usr/share/doc/HTML/index."
 "html</filename>."
-msgstr "另外，还有一些特殊的目录位于 <filename>/usr/share/doc/</filename> 里。Linux HOWTOs 以 <emphasis>.gz</emphasis> (压缩)格式安装，放在 <filename>/usr/share/doc/HOWTO/en-txt/</filename>。安装 <command>dhelp</command>之后，可以浏览 <filename>/usr/share/doc/HTML/index.html</filename> 文档索引。"
+msgstr ""
+"另外，还有一些特殊的目录位于 <filename>/usr/share/doc/</filename> 里。Linux "
+"HOWTOs 以 <emphasis>.gz</emphasis> (压缩)格式安装，放在 <filename>/usr/share/"
+"doc/HOWTO/en-txt/</filename>。安装 <command>dhelp</command>之后，可以浏览 "
+"<filename>/usr/share/doc/HTML/index.html</filename> 文档索引。"
 
 #. Tag: para
-#: boot-new.xml:419
+#: boot-new.xml:417
 #, no-c-format
 msgid ""
 "One easy way to view these documents using a text based browser is to enter "
@@ -647,22 +672,26 @@ msgid ""
 "</screen></informalexample> The dot after the <command>w3c</command> command "
 "tells it to show the contents of the current directory."
 msgstr ""
-"使用基于文本的浏览器查看这些文档的简单方法是输入下面命令：<informalexample><screen>\n"
+"使用基于文本的浏览器查看这些文档的简单方法是输入下面命令："
+"<informalexample><screen>\n"
 "$ cd /usr/share/doc/\n"
 "$ w3c .\n"
-"</screen></informalexample> <command>w3c</command> 命令后的点告知将显示当前目录下的内容。"
+"</screen></informalexample> <command>w3c</command> 命令后的点告知将显示当前目"
+"录下的内容。"
 
 #. Tag: para
-#: boot-new.xml:429
+#: boot-new.xml:427
 #, no-c-format
 msgid ""
 "If you have a graphical desktop environment installed, you can also use its "
 "web browser. Start the web browser from the application menu and enter "
 "<userinput>/usr/share/doc/</userinput> in the address bar."
-msgstr "如果您安装了图形桌面环境，可以使用它的 web 浏览器。从应用程序菜单启动 web 浏览器，然后在地址栏内键入 <userinput>/usr/share/doc/</userinput>。"
+msgstr ""
+"如果您安装了图形桌面环境，可以使用它的 web 浏览器。从应用程序菜单启动 web 浏"
+"览器，然后在地址栏内键入 <userinput>/usr/share/doc/</userinput>。"
 
 #. Tag: para
-#: boot-new.xml:435
+#: boot-new.xml:433
 #, no-c-format
 msgid ""
 "You can also type <userinput>info <replaceable>command</replaceable></"
@@ -675,4 +704,11 @@ msgid ""
 "after the command to cause the results to pause before scrolling past the "
 "top of the screen. To see a list of all commands available which begin with "
 "a certain letter, type the letter and then two tabs."
-msgstr "您也可以键入 <userinput>info <replaceable>command</replaceable></userinput> 或 <userinput>man <replaceable>command</replaceable></userinput> 去查看大多数的命令行下的命令。键入 <userinput>help</userinput> 将显示 shell 命令的帮助。键入命令后面加上 <userinput>--help</userinput> 通常会显示命令用法的简短摘要。如果命令的结果滚动超出屏幕顶端，命令后面加上 <userinput>|&nbsp;more</userinput>，可以让输出在滚出顶端屏幕前暂停。查看某字母开始的所有可用命令，键入该字母，然后两个 tab。"
+msgstr ""
+"您也可以键入 <userinput>info <replaceable>command</replaceable></userinput> "
+"或 <userinput>man <replaceable>command</replaceable></userinput> 去查看大多数"
+"的命令行下的命令。键入 <userinput>help</userinput> 将显示 shell 命令的帮助。"
+"键入命令后面加上 <userinput>--help</userinput> 通常会显示命令用法的简短摘要。"
+"如果命令的结果滚动超出屏幕顶端，命令后面加上 <userinput>|&nbsp;more</"
+"userinput>，可以让输出在滚出顶端屏幕前暂停。查看某字母开始的所有可用命令，键"
+"入该字母，然后两个 tab。"