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

3 files changed, 175 insertions, 139 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index afcaa89f0..365792b12 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.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: 2007-06-10 22:49+0000\n"
+"POT-Creation-Date: 2007-07-09 16:32+0000\n"
 "PO-Revision-Date: 2007-06-27 09:54+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -3662,7 +3662,9 @@ msgid ""
 "Can be used to force the installer to a lowmem level higher than the one the "
 "installer sets by default based on available memory. Possible values are 1 "
 "and 2. See also <xref linkend=\"lowmem\"/>."
-msgstr "可以强制安装程序设置高于安装程序根据实际内存默认的 lomem 等级。该值可设为 1 和 2。参阅 <xref linkend=\"lowmem\"/>。"
+msgstr ""
+"可以强制安装程序设置高于安装程序根据实际内存默认的 lomem 等级。该值可设为 1 "
+"和 2。参阅 <xref linkend=\"lowmem\"/>。"
 
 #. Tag: term
 #: boot-installer.xml:2984
@@ -3747,7 +3749,7 @@ msgstr ""
 "<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
 
 #. Tag: term
-#: boot-installer.xml:3035 boot-installer.xml:3226
+#: boot-installer.xml:3035 boot-installer.xml:3238
 #, no-c-format
 msgid "netcfg/disable_dhcp"
 msgstr "netcfg/disable_dhcp"
@@ -3796,11 +3798,27 @@ msgstr ""
 #. Tag: term
 #: boot-installer.xml:3065
 #, no-c-format
+msgid "disk-detect/dmraid/enable (dmraid)"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:3066
+#, no-c-format
+msgid ""
+"Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
+"(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. Note "
+"that this support is currently experimental. Additional information can be "
+"found on the <ulink url=\"&url-d-i-wiki;\">Debian Installer Wiki</ulink>."
+msgstr ""
+
+#. Tag: term
+#: boot-installer.xml:3077
+#, no-c-format
 msgid "preseed/url (url)"
 msgstr "preseed/url (url)"
 
 #. Tag: para
-#: boot-installer.xml:3066
+#: boot-installer.xml:3078
 #, no-c-format
 msgid ""
 "Specify the url to a preconfiguration file to download and use for "
@@ -3810,13 +3828,13 @@ msgstr ""
 "install\"/>。"
 
 #. Tag: term
-#: boot-installer.xml:3075
+#: boot-installer.xml:3087
 #, no-c-format
 msgid "preseed/file (file)"
 msgstr "preseed/file (file)"
 
 #. Tag: para
-#: boot-installer.xml:3076
+#: boot-installer.xml:3088
 #, no-c-format
 msgid ""
 "Specify the path to a preconfiguration file to load for automating the "
@@ -3826,13 +3844,13 @@ msgstr ""
 ">。"
 
 #. Tag: term
-#: boot-installer.xml:3085
+#: boot-installer.xml:3097
 #, no-c-format
 msgid "preseed/interactive"
 msgstr "preseed/interactive"
 
 #. Tag: para
-#: boot-installer.xml:3086
+#: boot-installer.xml:3098
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to display questions even if they have "
@@ -3846,13 +3864,13 @@ msgstr ""
 "<xref linkend=\"preseed-seenflag\"/> 了解详细信息。"
 
 #. Tag: term
-#: boot-installer.xml:3098
+#: boot-installer.xml:3110
 #, no-c-format
 msgid "auto-install/enable (auto)"
 msgstr "auto-install/enable (auto)"
 
 #. Tag: para
-#: boot-installer.xml:3099
+#: boot-installer.xml:3111
 #, no-c-format
 msgid ""
 "Delay questions that are normally asked before preseeding is possible until "
@@ -3863,13 +3881,13 @@ msgstr ""
 "auto\"/> 了解自动安装的详细信息。"
 
 #. Tag: term
-#: boot-installer.xml:3110
+#: boot-installer.xml:3122
 #, no-c-format
 msgid "cdrom-detect/eject"
 msgstr "cdrom-detect/eject"
 
 #. Tag: para
-#: boot-installer.xml:3111
+#: boot-installer.xml:3123
 #, no-c-format
 msgid ""
 "By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3885,7 +3903,7 @@ msgstr ""
 "新加载介质。"
 
 #. Tag: para
-#: boot-installer.xml:3120
+#: boot-installer.xml:3132
 #, no-c-format
 msgid ""
 "Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3896,13 +3914,13 @@ msgstr ""
 "后，不会自动从光盘引导。"
 
 #. Tag: term
-#: boot-installer.xml:3131
+#: boot-installer.xml:3143
 #, no-c-format
 msgid "debian-installer/allow_unauthenticated"
 msgstr "debian-installer/allow_unauthenticated"
 
 #. Tag: para
-#: boot-installer.xml:3132
+#: boot-installer.xml:3144
 #, no-c-format
 msgid ""
 "By default the installer requires that repositories be authenticated using a "
@@ -3915,13 +3933,13 @@ msgstr ""
 "emphasis>"
 
 #. Tag: term
-#: boot-installer.xml:3143
+#: boot-installer.xml:3155
 #, no-c-format
 msgid "ramdisk_size"
 msgstr "ramdisk_size"
 
 #. Tag: para
-#: boot-installer.xml:3144
+#: boot-installer.xml:3156
 #, no-c-format
 msgid ""
 "This parameter should already be set to a correct value where needed; set it "
@@ -3932,13 +3950,13 @@ msgstr ""
 "置。该值的单位是 kB。"
 
 #. Tag: term
-#: boot-installer.xml:3154
+#: boot-installer.xml:3166
 #, no-c-format
 msgid "mouse/left"
 msgstr "mouse/left"
 
 #. Tag: para
-#: boot-installer.xml:3155
+#: boot-installer.xml:3167
 #, no-c-format
 msgid ""
 "For the gtk frontend (graphical installer), users can switch the mouse to "
@@ -3949,13 +3967,13 @@ msgstr ""
 "userinput> 切换成左手使用鼠标。"
 
 #. Tag: term
-#: boot-installer.xml:3164
+#: boot-installer.xml:3176
 #, no-c-format
 msgid "directfb/hw-accel"
 msgstr "directfb/hw-accel"
 
 #. Tag: para
-#: boot-installer.xml:3165
+#: boot-installer.xml:3177
 #, no-c-format
 msgid ""
 "For the gtk frontend (graphical installer), hardware acceleration in "
@@ -3966,13 +3984,13 @@ msgstr ""
 "以在启动安装程序的时候设置参数为 <userinput>true</userinput>。"
 
 #. Tag: term
-#: boot-installer.xml:3175
+#: boot-installer.xml:3187
 #, no-c-format
 msgid "rescue/enable"
 msgstr "rescue/enable"
 
 #. Tag: para
-#: boot-installer.xml:3176
+#: boot-installer.xml:3188
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3982,13 +4000,13 @@ msgstr ""
 "<xref linkend=\"rescue\"/>。"
 
 #. Tag: title
-#: boot-installer.xml:3187
+#: boot-installer.xml:3199
 #, no-c-format
 msgid "Using boot parameters to answer questions"
 msgstr "使用内核模块参数回答提问"
 
 #. Tag: para
-#: boot-installer.xml:3188
+#: boot-installer.xml:3200
 #, no-c-format
 msgid ""
 "With some exceptions, a value can be set at the boot prompt for any question "
@@ -4001,13 +4019,13 @@ msgstr ""
 "bootparms\"/> 找到。下面是一些具体的例子。"
 
 #. Tag: term
-#: boot-installer.xml:3200
+#: boot-installer.xml:3212
 #, no-c-format
 msgid "debian-installer/locale (locale)"
 msgstr "debian-installer/locale (locale)"
 
 #. Tag: para
-#: boot-installer.xml:3201
+#: boot-installer.xml:3213
 #, no-c-format
 msgid ""
 "Can be used to set both the language and country for the installation. This "
@@ -4019,13 +4037,13 @@ msgstr ""
 "<userinput>locale=de_CH</userinput> 选择德语作为语言，并且瑞士作为国家。"
 
 #. Tag: term
-#: boot-installer.xml:3212
+#: boot-installer.xml:3224
 #, no-c-format
 msgid "anna/choose_modules (modules)"
 msgstr "anna/choose_modules (modules)"
 
 #. Tag: para
-#: boot-installer.xml:3213
+#: boot-installer.xml:3225
 #, no-c-format
 msgid ""
 "Can be used to automatically load installer components that are not loaded "
@@ -4040,7 +4058,7 @@ msgstr ""
 "classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
 
 #. Tag: para
-#: boot-installer.xml:3227
+#: boot-installer.xml:3239
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> if you want to disable DHCP and instead "
@@ -4049,13 +4067,13 @@ msgstr ""
 "如果您想禁止 DHCP 使用静态网络设置，将它设为 <userinput>true</userinput>。"
 
 #. Tag: term
-#: boot-installer.xml:3236
+#: boot-installer.xml:3248
 #, no-c-format
 msgid "mirror/protocol (protocol)"
 msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
-#: boot-installer.xml:3237
+#: boot-installer.xml:3249
 #, no-c-format
 msgid ""
 "By default the installer will use the http protocol to download files from "
@@ -4070,13 +4088,13 @@ msgstr ""
 "使用该协议。注意，您必须手动输入主机名，而不是从列表中选择 ftp 镜像。"
 
 #. Tag: term
-#: boot-installer.xml:3250
+#: boot-installer.xml:3262
 #, no-c-format
 msgid "tasksel:tasksel/first (tasks)"
 msgstr "tasksel:tasksel/first (tasks)"
 
 #. Tag: para
-#: boot-installer.xml:3251
+#: boot-installer.xml:3263
 #, no-c-format
 msgid ""
 "Can be used to select tasks that are not available from the interactive task "
@@ -4087,13 +4105,13 @@ msgstr ""
 "literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
 
 #. Tag: title
-#: boot-installer.xml:3265
+#: boot-installer.xml:3277
 #, no-c-format
 msgid "Passing parameters to kernel modules"
 msgstr "给内核模块传递参数"
 
 #. Tag: para
-#: boot-installer.xml:3266
+#: boot-installer.xml:3278
 #, no-c-format
 msgid ""
 "If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -4113,7 +4131,7 @@ msgstr ""
 "配置中。"
 
 #. Tag: para
-#: boot-installer.xml:3279
+#: boot-installer.xml:3291
 #, no-c-format
 msgid ""
 "Note that it is now quite rare that parameters need to be passed to modules. "
@@ -4125,7 +4143,7 @@ msgstr ""
 "并很好地设置默认参数。然而，某些情况下还是需要手动设置参数。"
 
 #. Tag: para
-#: boot-installer.xml:3286
+#: boot-installer.xml:3298
 #, no-c-format
 msgid ""
 "The syntax to use to set parameters for modules is: "
@@ -4145,19 +4163,19 @@ msgstr ""
 "用："
 
 #. Tag: screen
-#: boot-installer.xml:3296
+#: boot-installer.xml:3308
 #, no-c-format
 msgid "3c509.xcvr=3 3c509.irq=10"
 msgstr "3c509.xcvr=3 3c509.irq=10"
 
 #. Tag: title
-#: boot-installer.xml:3302
+#: boot-installer.xml:3314
 #, no-c-format
 msgid "Blacklisting kernel modules"
 msgstr "内核模块黑名单"
 
 #. Tag: para
-#: boot-installer.xml:3303
+#: boot-installer.xml:3315
 #, no-c-format
 msgid ""
 "Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -4172,7 +4190,7 @@ msgstr ""
 "间冲突或者错误的驱动先加载，将造成设备无法正常工作。"
 
 #. Tag: para
-#: boot-installer.xml:3312
+#: boot-installer.xml:3324
 #, no-c-format
 msgid ""
 "You can blacklist a module using the following syntax: "
@@ -4186,7 +4204,7 @@ msgstr ""
 "入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
 
 #. Tag: para
-#: boot-installer.xml:3320
+#: boot-installer.xml:3332
 #, no-c-format
 msgid ""
 "Note that a module may still be loaded by the installation system itself. "
@@ -4198,19 +4216,19 @@ msgstr ""
 "件检查过程中从显示的模块列表中取消该模块。"
 
 #. Tag: title
-#: boot-installer.xml:3337
+#: boot-installer.xml:3349
 #, no-c-format
 msgid "Troubleshooting the Installation Process"
 msgstr "安装过程中的故障修复"
 
 #. Tag: title
-#: boot-installer.xml:3342
+#: boot-installer.xml:3354
 #, no-c-format
 msgid "CD-ROM Reliability"
 msgstr "CD-ROM 的可靠性"
 
 #. Tag: para
-#: boot-installer.xml:3343
+#: boot-installer.xml:3355
 #, no-c-format
 msgid ""
 "Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -4222,7 +4240,7 @@ msgstr ""
 "&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
 
 #. Tag: para
-#: boot-installer.xml:3350
+#: boot-installer.xml:3362
 #, no-c-format
 msgid ""
 "There are a many different possible causes for these problems. We can only "
@@ -4233,13 +4251,13 @@ msgstr ""
 "下的由您来处理。"
 
 #. Tag: para
-#: boot-installer.xml:3356
+#: boot-installer.xml:3368
 #, no-c-format
 msgid "There are two very simple things that you should try first."
 msgstr "您首先应试试两种最简单的方法。"
 
 #. Tag: para
-#: boot-installer.xml:3361
+#: boot-installer.xml:3373
 #, no-c-format
 msgid ""
 "If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -4247,7 +4265,7 @@ msgid ""
 msgstr "如果 CD-ROM 没有引导，检查一下它是否放好，并且没有弄脏。"
 
 #. Tag: para
-#: boot-installer.xml:3367
+#: boot-installer.xml:3379
 #, no-c-format
 msgid ""
 "If the installer fails to recognize a CD-ROM, try just running the option "
@@ -4260,7 +4278,7 @@ msgstr ""
 "的问题可以用这种方法解决。"
 
 #. Tag: para
-#: boot-installer.xml:3377
+#: boot-installer.xml:3389
 #, no-c-format
 msgid ""
 "If this does not work, then try the suggestions in the subsections below. "
@@ -4271,7 +4289,7 @@ msgstr ""
 "CD-ROM 和 DVD，为了方便，只提到 CD-ROM。"
 
 #. Tag: para
-#: boot-installer.xml:3383
+#: boot-installer.xml:3395
 #, no-c-format
 msgid ""
 "If you cannot get the installation working from CD-ROM, try one of the other "
@@ -4279,13 +4297,13 @@ msgid ""
 msgstr "如果您用 CD-ROM 无法安装，试试其他可用的安装方法。"
 
 #. Tag: title
-#: boot-installer.xml:3391
+#: boot-installer.xml:3403
 #, no-c-format
 msgid "Common issues"
 msgstr "常见问题"
 
 #. Tag: para
-#: boot-installer.xml:3394
+#: boot-installer.xml:3406
 #, no-c-format
 msgid ""
 "Some older CD-ROM drives do not support reading from discs that were burned "
@@ -4293,7 +4311,7 @@ msgid ""
 msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
 
 #. Tag: para
-#: boot-installer.xml:3400
+#: boot-installer.xml:3412
 #, no-c-format
 msgid ""
 "If your system boots correctly from the CD-ROM, it does not necessarily mean "
@@ -4304,7 +4322,7 @@ msgstr ""
 "准确一点，CD-ROM 驱动器所连接的控制器)。"
 
 #. Tag: para
-#: boot-installer.xml:3407
+#: boot-installer.xml:3419
 #, no-c-format
 msgid ""
 "Some older CD-ROM drives do not work correctly if <quote>direct memory "
@@ -4314,19 +4332,19 @@ msgstr ""
 "常工作。"
 
 #. Tag: title
-#: boot-installer.xml:3418
+#: boot-installer.xml:3430
 #, no-c-format
 msgid "How to investigate and maybe solve issues"
 msgstr "如何调查研究或许可以解决问题"
 
 #. Tag: para
-#: boot-installer.xml:3419
+#: boot-installer.xml:3431
 #, no-c-format
 msgid "If the CD-ROM fails to boot, try the suggestions listed below."
 msgstr "如果从 CD-ROM 引导失败，试试下面所列的建议。"
 
 #. Tag: para
-#: boot-installer.xml:3424
+#: boot-installer.xml:3436
 #, no-c-format
 msgid ""
 "Check that your BIOS actually supports booting from CD-ROM (older systems "
@@ -4336,7 +4354,7 @@ msgstr ""
 "持您所使用的介质。"
 
 #. Tag: para
-#: boot-installer.xml:3430
+#: boot-installer.xml:3442
 #, no-c-format
 msgid ""
 "If you downloaded an iso image, check that the md5sum of that image matches "
@@ -4360,7 +4378,7 @@ msgstr ""
 "用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
 
 #. Tag: screen
-#: boot-installer.xml:3443
+#: boot-installer.xml:3455
 #, no-c-format
 msgid ""
 "$ dd if=/dev/cdrom | \\\n"
@@ -4382,7 +4400,7 @@ msgstr ""
 "134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
 
 #. Tag: para
-#: boot-installer.xml:3448
+#: boot-installer.xml:3460
 #, no-c-format
 msgid ""
 "If, after the installer has been booted successfully, the CD-ROM is not "
@@ -4399,7 +4417,7 @@ msgstr ""
 "Linux 知识。要执行命令，您应该首先切换到第二虚拟控制台(VT2)，并激活 shell。"
 
 #. Tag: para
-#: boot-installer.xml:3460
+#: boot-installer.xml:3472
 #, no-c-format
 msgid ""
 "Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -4411,7 +4429,7 @@ msgstr ""
 "<command>dmesg</command> 的输出。"
 
 #. Tag: para
-#: boot-installer.xml:3467
+#: boot-installer.xml:3479
 #, no-c-format
 msgid ""
 "Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -4439,7 +4457,7 @@ msgstr ""
 "<command>modprobe</command> 手动加载。"
 
 #. Tag: para
-#: boot-installer.xml:3481
+#: boot-installer.xml:3493
 #, no-c-format
 msgid ""
 "Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -4451,7 +4469,7 @@ msgstr ""
 "cdrom0</filename>。"
 
 #. Tag: para
-#: boot-installer.xml:3489
+#: boot-installer.xml:3501
 #, no-c-format
 msgid ""
 "Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -4466,7 +4484,7 @@ msgstr ""
 "</screen></informalexample> 检查命令后面是否有什么错误信息。"
 
 #. Tag: para
-#: boot-installer.xml:3499
+#: boot-installer.xml:3511
 #, no-c-format
 msgid ""
 "Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -4491,7 +4509,7 @@ msgstr ""
 "</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
 
 #. Tag: para
-#: boot-installer.xml:3514
+#: boot-installer.xml:3526
 #, no-c-format
 msgid ""
 "If there are any problems during the installation, try checking the "
@@ -4503,13 +4521,13 @@ msgstr ""
 "性。如果 CD-ROM 可以读，该选项可以对其进行测试。"
 
 #. Tag: title
-#: boot-installer.xml:3529
+#: boot-installer.xml:3541
 #, no-c-format
 msgid "Floppy Disk Reliability"
 msgstr "软盘的可靠性"
 
 #. Tag: para
-#: boot-installer.xml:3531
+#: boot-installer.xml:3543
 #, no-c-format
 msgid ""
 "The biggest problem for people using floppy disks to install Debian seems to "
@@ -4518,7 +4536,7 @@ msgstr ""
 "对于用软盘安装 Debian 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
 
 #. Tag: para
-#: boot-installer.xml:3536
+#: boot-installer.xml:3548
 #, no-c-format
 msgid ""
 "The boot floppy is the floppy with the worst problems, because it is read by "
@@ -4534,7 +4552,7 @@ msgstr ""
 "息。"
 
 #. Tag: para
-#: boot-installer.xml:3545
+#: boot-installer.xml:3557
 #, no-c-format
 msgid ""
 "If you are having the installation stall at a particular floppy, the first "
@@ -4549,7 +4567,7 @@ msgstr ""
 "化以后看起来没有错误。如果可能，在别的统上重写这些软盘更好一些。"
 
 #. Tag: para
-#: boot-installer.xml:3554
+#: boot-installer.xml:3566
 #, no-c-format
 msgid ""
 "One user reports he had to write the images to floppy <emphasis>three</"
@@ -4560,7 +4578,7 @@ msgstr ""
 "软盘才算工作良好。"
 
 #. Tag: para
-#: boot-installer.xml:3560
+#: boot-installer.xml:3572
 #, no-c-format
 msgid ""
 "Normally you should not have to download a floppy image again, but if you "
@@ -4571,7 +4589,7 @@ msgstr ""
 "来检验下载的映像是否正确。"
 
 #. Tag: para
-#: boot-installer.xml:3566
+#: boot-installer.xml:3578
 #, no-c-format
 msgid ""
 "Other users have reported that simply rebooting a few times with the same "
@@ -4582,13 +4600,13 @@ msgstr ""
 "有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
 
 #. Tag: title
-#: boot-installer.xml:3575
+#: boot-installer.xml:3587
 #, no-c-format
 msgid "Boot Configuration"
 msgstr "引导配置"
 
 #. Tag: para
-#: boot-installer.xml:3577
+#: boot-installer.xml:3589
 #, no-c-format
 msgid ""
 "If you have problems and the kernel hangs during the boot process, doesn't "
@@ -4601,7 +4619,7 @@ msgstr ""
 "\"/> 讨论。"
 
 #. Tag: para
-#: boot-installer.xml:3584
+#: boot-installer.xml:3596
 #, no-c-format
 msgid ""
 "Often, problems can be solved by removing add-ons and peripherals, and then "
@@ -4612,7 +4630,7 @@ msgstr ""
 "arch=\"x86\">内置调制解调器、声卡以及即插即用设备特别容易引起问题。</phrase>"
 
 #. Tag: para
-#: boot-installer.xml:3590
+#: boot-installer.xml:3602
 #, no-c-format
 msgid ""
 "If you have a large amount of memory installed in your machine, more than "
@@ -4625,13 +4643,13 @@ msgstr ""
 "<userinput>mem=512m</userinput>。"
 
 #. Tag: title
-#: boot-installer.xml:3601 boot-installer.xml:3685
+#: boot-installer.xml:3613 boot-installer.xml:3697
 #, no-c-format
 msgid "Common &arch-title; Installation Problems"
 msgstr "&arch-title; 常见安装问题"
 
 #. Tag: para
-#: boot-installer.xml:3602
+#: boot-installer.xml:3614
 #, no-c-format
 msgid ""
 "There are some common installation problems that can be solved or avoided by "
@@ -4639,7 +4657,7 @@ msgid ""
 msgstr "有一些常见的安装问题，可以通过给安装程序特定的引导参数解决或避免。"
 
 #. Tag: para
-#: boot-installer.xml:3607
+#: boot-installer.xml:3619
 #, no-c-format
 msgid ""
 "Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
@@ -4650,7 +4668,7 @@ msgstr ""
 "息，并且知道软盘是好的，请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
 
 #. Tag: para
-#: boot-installer.xml:3613
+#: boot-installer.xml:3625
 #, no-c-format
 msgid ""
 "On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
@@ -4668,7 +4686,7 @@ msgstr ""
 "replaceable>,<replaceable>sectors</replaceable></userinput>。"
 
 #. Tag: para
-#: boot-installer.xml:3622
+#: boot-installer.xml:3634
 #, no-c-format
 msgid ""
 "If you have a very old machine, and the kernel hangs after saying "
@@ -4681,7 +4699,7 @@ msgstr ""
 "userinput> 参数来取消这个测试。"
 
 #. Tag: para
-#: boot-installer.xml:3629
+#: boot-installer.xml:3641
 #, no-c-format
 msgid ""
 "If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4699,13 +4717,13 @@ msgstr ""
 "阅 <xref linkend=\"boot-parms\"/> 来获得细节信息。"
 
 #. Tag: title
-#: boot-installer.xml:3643
+#: boot-installer.xml:3655
 #, no-c-format
 msgid "System Freeze During the PCMCIA Configuration Phase"
 msgstr "在 PCMCIA 配置阶段系统停止"
 
 #. Tag: para
-#: boot-installer.xml:3644
+#: boot-installer.xml:3656
 #, no-c-format
 msgid ""
 "Some laptop models produced by Dell are known to crash when PCMCIA device "
@@ -4723,7 +4741,7 @@ msgstr ""
 "段。"
 
 #. Tag: para
-#: boot-installer.xml:3654
+#: boot-installer.xml:3666
 #, no-c-format
 msgid ""
 "Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4743,13 +4761,13 @@ msgstr ""
 "项。注意您在安装程序中，输入这些值的时候必须忽略逗号。"
 
 #. Tag: title
-#: boot-installer.xml:3671
+#: boot-installer.xml:3683
 #, no-c-format
 msgid "System Freeze while Loading USB Modules"
 msgstr "在装入 USB 模块时系统停止"
 
 #. Tag: para
-#: boot-installer.xml:3672
+#: boot-installer.xml:3684
 #, no-c-format
 msgid ""
 "The kernel normally tries to install USB modules and the USB keyboard driver "
@@ -4758,22 +4776,26 @@ msgid ""
 "may be disabling the USB controller in your mainboard BIOS setup. Another "
 "option is passing the <userinput>nousb</userinput> parameter at the boot "
 "prompt."
-msgstr "内核正常情况下会尝试安装 USB 模块以及 USB 键盘驱动来支持一些非标准的 USB 键盘。但是，有些不完整的 USB 系统会在驱动程序装入时死机。一个可能的解决方法是设置主板的 BIOS 禁止 USB 控制器。另一种选择是在引导提示符处传入 <userinput>nousb</userinput> 参数。"
+msgstr ""
+"内核正常情况下会尝试安装 USB 模块以及 USB 键盘驱动来支持一些非标准的 USB 键"
+"盘。但是，有些不完整的 USB 系统会在驱动程序装入时死机。一个可能的解决方法是设"
+"置主板的 BIOS 禁止 USB 控制器。另一种选择是在引导提示符处传入 "
+"<userinput>nousb</userinput> 参数。"
 
 #. Tag: para
-#: boot-installer.xml:3686
+#: boot-installer.xml:3698
 #, no-c-format
 msgid "There are some common installation problems that are worth mentioning."
 msgstr "有一些常见的安装问题值得解释一下。"
 
 #. Tag: title
-#: boot-installer.xml:3692
+#: boot-installer.xml:3704
 #, no-c-format
 msgid "Misdirected video output"
 msgstr "错误的视频输出"
 
 #. Tag: para
-#: boot-installer.xml:3693
+#: boot-installer.xml:3705
 #, no-c-format
 msgid ""
 "It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4797,7 +4819,7 @@ msgstr ""
 "<userinput>video=atyfb:off</userinput> 启动安装程序。"
 
 #. Tag: para
-#: boot-installer.xml:3707
+#: boot-installer.xml:3719
 #, no-c-format
 msgid ""
 "Note that you may also have to manually add this parameter to the silo "
@@ -4810,13 +4832,13 @@ msgstr ""
 "xorg.conf</filename> 中的视频驱动。"
 
 #. Tag: title
-#: boot-installer.xml:3718
+#: boot-installer.xml:3730
 #, no-c-format
 msgid "Failure to Boot or Install from CD-ROM"
 msgstr "从 CD-ROM 上引导或安装失败"
 
 #. Tag: para
-#: boot-installer.xml:3719
+#: boot-installer.xml:3731
 #, no-c-format
 msgid ""
 "Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4827,19 +4849,19 @@ msgstr ""
 "费解的错误。SunBlade 系统被报告了很多问题。"
 
 #. Tag: para
-#: boot-installer.xml:3725
+#: boot-installer.xml:3737
 #, no-c-format
 msgid "We recommend to install such systems by netbooting the installer."
 msgstr "我们建议从网络安装这些系统。"
 
 #. Tag: title
-#: boot-installer.xml:3734
+#: boot-installer.xml:3746
 #, no-c-format
 msgid "Interpreting the Kernel Startup Messages"
 msgstr "内核起始信息注解"
 
 #. Tag: para
-#: boot-installer.xml:3736
+#: boot-installer.xml:3748
 #, no-c-format
 msgid ""
 "During the boot sequence, you may see many messages in the form "
@@ -4872,13 +4894,13 @@ msgstr ""
 ">)。"
 
 #. Tag: title
-#: boot-installer.xml:3761
+#: boot-installer.xml:3773
 #, no-c-format
 msgid "Reporting Installation Problems"
 msgstr "报告安装问题"
 
 #. Tag: para
-#: boot-installer.xml:3762
+#: boot-installer.xml:3774
 #, no-c-format
 msgid ""
 "If you get through the initial boot phase but cannot complete the install, "
@@ -4895,7 +4917,7 @@ msgstr ""
 "索。如果您正在提交一个 bug 报告，可以报告里附上该信息。"
 
 #. Tag: para
-#: boot-installer.xml:3773
+#: boot-installer.xml:3785
 #, no-c-format
 msgid ""
 "Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4906,13 +4928,13 @@ msgstr ""
 "新安装的系统启动后，放在 <filename>/var/log/debian-installer/</filename> 里。"
 
 #. Tag: title
-#: boot-installer.xml:3784
+#: boot-installer.xml:3796
 #, no-c-format
 msgid "Submitting Installation Reports"
 msgstr "提交缺陷报告"
 
 #. Tag: para
-#: boot-installer.xml:3785
+#: boot-installer.xml:3797
 #, no-c-format
 msgid ""
 "If you still have problems, please submit an installation report. We also "
@@ -4924,7 +4946,7 @@ msgstr ""
 "这让我们可以尽可能多地了解硬件的配置数量。"
 
 #. Tag: para
-#: boot-installer.xml:3792
+#: boot-installer.xml:3804
 #, no-c-format
 msgid ""
 "Note that your installation report will be published in the Debian Bug "
@@ -4935,7 +4957,7 @@ msgstr ""
 "件列表。确保您使用的邮件地址可以被公开。"
 
 #. Tag: para
-#: boot-installer.xml:3798
+#: boot-installer.xml:3810
 #, no-c-format
 msgid ""
 "If you have a working Debian system, the easiest way to send an installation "
@@ -4953,7 +4975,7 @@ msgstr ""
 "command> 命令。"
 
 #. Tag: para
-#: boot-installer.xml:3808
+#: boot-installer.xml:3820
 #, no-c-format
 msgid ""
 "Alternatively you can use this template when filling out installation "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index dbd619f57..d64f2a55b 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.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: 2007-06-26 11:41+0000\n"
+"POT-Creation-Date: 2007-07-09 16:32+0000\n"
 "PO-Revision-Date: 2007-06-27 09:55+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1372,7 +1372,8 @@ msgid ""
 msgstr ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
 "#d-i mirror/protocol string ftp<phrase condition=\"etch\">\n"
-"d-i mirror/country string enter information manually</phrase><phrase condition=\"lenny\">\n"
+"d-i mirror/country string enter information manually</phrase><phrase "
+"condition=\"lenny\">\n"
 "d-i mirror/country string manual</phrase>\n"
 "d-i mirror/http/hostname string &archive-mirror;\n"
 "d-i mirror/http/directory string /debian\n"
@@ -1745,7 +1746,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:846
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
 "# use sudo).\n"
@@ -1766,7 +1767,12 @@ msgid ""
 "#d-i passwd/user-password password insecure\n"
 "#d-i passwd/user-password-again password insecure\n"
 "# or encrypted using an MD5 hash.\n"
-"#d-i passwd/user-password-crypted password [MD5 hash]"
+"#d-i passwd/user-password-crypted password [MD5 hash]<phrase condition="
+"\"lenny\">\n"
+"\n"
+"# The user account will be added to some standard initial groups. To\n"
+"# override that, use this.\n"
+"#d-i passwd/user-default-groups string audio cdrom video</phrase>"
 msgstr ""
 "# Skip creation of a root account (normal user account will be able to\n"
 "# use sudo).\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index dac9da561..43aa38f17 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: 2007-05-10 19:09+0000\n"
+"POT-Creation-Date: 2007-07-09 16:44+0000\n"
 "PO-Revision-Date: 2007-06-23 19:17+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2111,14 +2111,16 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1101
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "It is also available as a special <quote>mini</quote> ISO image<footnote id="
 "\"gtk-miniiso\"> <para> The mini ISO image can be downloaded from a Debian "
 "mirror as described in <xref linkend=\"downloading-files\"/>. Look for "
-"<quote>gtk-miniiso</quote>. </para> </footnote>, which is mainly useful for "
-"testing; in this case the image is booted just using <userinput>install</"
-"userinput>. There is no graphical installer image that can be netbooted."
+"<phrase condition=\"etch\"><filename>gtk-miniiso</filename></phrase> <phrase "
+"condition=\"lenny\"><filename>netboot/gtk/mini.iso</filename></phrase>. </"
+"para> </footnote>, which is mainly useful for testing; in this case the "
+"image is booted just using <userinput>install</userinput>. There is no "
+"graphical installer image that can be netbooted."
 msgstr ""
 "还有一个特殊的 <quote>mini</quote> ISO 映像<footnote id=\"gtk-miniiso\"> "
 "<para> mini ISO 映像可从 <xref linkend=\"downloading-files\"/> 里面的 Debian "
@@ -2127,15 +2129,17 @@ msgstr ""
 "对应的图形安装程序。"
 
 #. Tag: para
-#: random-bits.xml:1115
-#, no-c-format
+#: random-bits.xml:1117
+#, fuzzy, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
 "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
 "can be downloaded from a Debian mirror as described in <xref linkend="
-"\"downloading-files\"/>. Look for <quote>gtk-miniiso</quote>. </para> </"
-"footnote>. It should work on almost all PowerPC systems that have an ATI "
-"graphical card, but is unlikely to work on other systems."
+"\"downloading-files\"/>. Look for <phrase condition=\"etch\"><filename>gtk-"
+"miniiso</filename></phrase> <phrase condition=\"lenny\"><filename>netboot/"
+"gtk/mini.iso</filename></phrase>. </para> </footnote>. It should work on "
+"almost all PowerPC systems that have an ATI graphical card, but is unlikely "
+"to work on other systems."
 msgstr ""
 "对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像"
 "<footnote id=\"gtk-miniiso\"> <para> mini ISO image 可以从 <xref linkend="
@@ -2144,7 +2148,7 @@ msgstr ""
 "上，但其它的则不行。"
 
 #. Tag: para
-#: random-bits.xml:1128
+#: random-bits.xml:1132
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2156,7 +2160,7 @@ msgstr ""
 "内存条件，它将自动回到普通的 <quote>newt</quote> 前端。"
 
 #. Tag: para
-#: random-bits.xml:1135
+#: random-bits.xml:1139
 #, no-c-format
 msgid ""
 "You can add boot parameters when starting the graphical installer, just as "
@@ -2168,13 +2172,13 @@ msgstr ""
 "许您设置鼠标为左手习惯。参阅 <xref linkend=\"boot-parms\"/> 了解可用的参数。"
 
 #. Tag: title
-#: random-bits.xml:1145
+#: random-bits.xml:1149
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "使用图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1146
+#: random-bits.xml:1150
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2185,7 +2189,7 @@ msgstr ""
 "用来给您的安装过程进行指导。"
 
 #. Tag: para
-#: random-bits.xml:1152
+#: random-bits.xml:1156
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2195,10 +2199,14 @@ msgid ""
 "selected (e.g. task selection), you first need to tab to the &BTN-CONT; "
 "button after making your selections; hitting enter will toggle a selection, "
 "not activate &BTN-CONT;."
-msgstr "如果您喜欢用键盘替代鼠标，有两件事需要知道。要展开一个层级列表(比如用从大洲里面选择国家)，可以使用 <keycap>+</keycap> 和 <keycap>-</keycap> 键。对于多项选择(例如，选择任务)，您首先需要在选中后用 tab 跳到 &BTN-CONT; 按钮；按回车键切换选择，而不是激活 &BTN-CONT; 。"
+msgstr ""
+"如果您喜欢用键盘替代鼠标，有两件事需要知道。要展开一个层级列表(比如用从大洲里"
+"面选择国家)，可以使用 <keycap>+</keycap> 和 <keycap>-</keycap> 键。对于多项选"
+"择(例如，选择任务)，您首先需要在选中后用 tab 跳到 &BTN-CONT; 按钮；按回车键切"
+"换选择，而不是激活 &BTN-CONT; 。"
 
 #. Tag: para
-#: random-bits.xml:1162
+#: random-bits.xml:1166
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
@@ -2211,13 +2219,13 @@ msgstr ""
 "keycap> <keycap>Left Alt</keycap> <keycap>F1</keycap> </keycombo>。"
 
 #. Tag: title
-#: random-bits.xml:1173
+#: random-bits.xml:1177
 #, no-c-format
 msgid "Known issues"
 msgstr "已知事项"
 
 #. Tag: para
-#: random-bits.xml:1174
+#: random-bits.xml:1178
 #, no-c-format
 msgid ""
 "Etch is the first release that includes the graphical installer and uses "
@@ -2229,7 +2237,7 @@ msgstr ""
 "会出现在您的安装过程中。我们希望在下一个 &debian; 发布版中解决这些问题。"
 
 #. Tag: para
-#: random-bits.xml:1184
+#: random-bits.xml:1188
 #, no-c-format
 msgid ""
 "Information on some screens is not nicely formatted into columns as it "
@@ -2240,7 +2248,7 @@ msgstr ""
 "语言选择。另外一个例子是 partman 的主画面。"
 
 #. Tag: para
-#: random-bits.xml:1191
+#: random-bits.xml:1195
 #, no-c-format
 msgid ""
 "Typing some characters may not work and in some cases the wrong character "
@@ -2251,13 +2259,13 @@ msgstr ""
 "号之上/下的字母应该显示，但却没有。"
 
 #. Tag: para
-#: random-bits.xml:1198
+#: random-bits.xml:1202
 #, no-c-format
 msgid "Support for touchpads is not yet optimal."
 msgstr "还不支持触摸板。"
 
 #. Tag: para
-#: random-bits.xml:1203
+#: random-bits.xml:1207
 #, no-c-format
 msgid ""
 "You should not switch to a different console while the installer is busy; "
@@ -2271,7 +2279,7 @@ msgstr ""
 "制台就不会造成任何问题。"
 
 #. Tag: para
-#: random-bits.xml:1212
+#: random-bits.xml:1216
 #, no-c-format
 msgid ""
 "Support for creating encrypted partitions is limited as it is not possible "
@@ -2282,7 +2290,7 @@ msgstr ""
 "钥来建立加密分区。"
 
 #. Tag: para
-#: random-bits.xml:1219
+#: random-bits.xml:1223
 #, no-c-format
 msgid ""
 "Starting a shell from the graphical frontend is currently not supported. "
@@ -2297,7 +2305,7 @@ msgstr ""
 "拟终端 VT2 和 VT3 的 shell。 "
 
 #. Tag: para
-#: random-bits.xml:1228
+#: random-bits.xml:1232
 #, no-c-format
 msgid ""
 "After booting the installer in rescue mode, it may be useful to start a "
@@ -2309,7 +2317,7 @@ msgstr ""
 "选择分区挂载到根分区之后)切换到 VT2 或 VT3，然后键入下面命令："
 
 #. Tag: screen
-#: random-bits.xml:1235
+#: random-bits.xml:1239
 #, no-c-format
 msgid "# chroot /target"
 msgstr "# chroot /target"