summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2006-07-30 15:30:38 +0000
committerFrans Pop <elendil@planet.nl>2006-07-30 15:30:38 +0000
commit29b5979914865a648a17f80aa7bf6745012586b6 (patch)
tree9f159217dde38c177abe1d1b6431b33d85d244e5 /po/zh_CN
parent3877f728f263d49ac04250e06b73a817127b6d1f (diff)
downloadinstallation-guide-29b5979914865a648a17f80aa7bf6745012586b6.zip
Update of POT and PO files for the manual
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po106
-rw-r--r--po/zh_CN/partitioning.po295
-rw-r--r--po/zh_CN/preseed.po51
-rw-r--r--po/zh_CN/random-bits.po204
-rw-r--r--po/zh_CN/using-d-i.po6
5 files changed, 347 insertions, 315 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 28b65f756..52fe8b755 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: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-07-30 15:28+0000\n"
"PO-Revision-Date: 2006-07-07 13:34+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -3678,14 +3678,14 @@ msgstr "在 hppa 上面报告过存在这些问题。"
#. Tag: para
#: boot-installer.xml:2971
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"Because of display problems on some systems, framebuffer support is "
"<emphasis>disabled by default</emphasis> for &arch-title;. This can result "
"in ugly display on systems that do properly support the framebuffer, like "
"those with ATI graphical cards. If you see display problems in the "
"installer, you can try booting with parameter <userinput>debian-installer/"
-"framebuffer=true</userinput>."
+"framebuffer=true</userinput> or <userinput>fb=true</userinput> for short."
msgstr ""
"由于某些系统上显示有问题,framebuffer 支持在 &arch-title; 上 <emphasis>默认禁"
"止</emphasis>。\n"
@@ -3694,13 +3694,13 @@ msgstr ""
"installer/framebuffer=true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2984
+#: boot-installer.xml:2985
#, no-c-format
msgid "debian-installer/probe/usb"
msgstr "debian-installer/probe/usb"
#. Tag: para
-#: boot-installer.xml:2985
+#: boot-installer.xml:2986
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to prevent probing for USB on boot, if "
@@ -3710,13 +3710,13 @@ msgstr ""
"起的问题。"
#. Tag: term
-#: boot-installer.xml:2994
+#: boot-installer.xml:2995
#, no-c-format
msgid "netcfg/disable_dhcp"
msgstr "netcfg/disable_dhcp"
#. Tag: para
-#: boot-installer.xml:2995
+#: boot-installer.xml:2996
#, no-c-format
msgid ""
"By default, the &d-i; automatically probes for network configuration via "
@@ -3728,7 +3728,7 @@ msgstr ""
"视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
#. Tag: para
-#: boot-installer.xml:3002
+#: boot-installer.xml:3003
#, no-c-format
msgid ""
"If you have a DHCP server on your local network, but want to avoid it "
@@ -3741,13 +3741,13 @@ msgstr ""
"DHCP 来配置网络并且手工输入参数。"
#. Tag: term
-#: boot-installer.xml:3013
+#: boot-installer.xml:3014
#, no-c-format
msgid "hw-detect/start_pcmcia"
msgstr "hw-detect/start_pcmcia"
#. Tag: para
-#: boot-installer.xml:3014
+#: boot-installer.xml:3015
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -3757,13 +3757,13 @@ msgstr ""
"题。有些笔记本电脑对此会有错误的行为。"
#. Tag: term
-#: boot-installer.xml:3024
+#: boot-installer.xml:3025
#, no-c-format
msgid "preseed/url"
msgstr "preseed/url"
#. Tag: para
-#: boot-installer.xml:3025
+#: boot-installer.xml:3026
#, no-c-format
msgid ""
"Specify the url to a preconfiguration file to download and use in automating "
@@ -3774,13 +3774,13 @@ msgstr ""
"install\"/>。简写: <userinput>url</userinput>。"
#. Tag: term
-#: boot-installer.xml:3035
+#: boot-installer.xml:3036
#, no-c-format
msgid "preseed/file"
msgstr "preseed/file"
#. Tag: para
-#: boot-installer.xml:3036
+#: boot-installer.xml:3037
#, no-c-format
msgid ""
"Specify the path to a preconfiguration file to load to automating the "
@@ -3791,13 +3791,13 @@ msgstr ""
">。简写: <userinput>file</userinput>"
#. Tag: term
-#: boot-installer.xml:3046
+#: boot-installer.xml:3047
#, no-c-format
msgid "cdrom-detect/eject"
msgstr "cdrom-detect/eject"
#. Tag: para
-#: boot-installer.xml:3047
+#: boot-installer.xml:3048
#, no-c-format
msgid ""
"By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3813,7 +3813,7 @@ msgstr ""
"重新加载介质。"
#. Tag: para
-#: boot-installer.xml:3056
+#: boot-installer.xml:3057
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3824,25 +3824,25 @@ msgstr ""
"后,不会自动从光盘引导。"
#. Tag: term
-#: boot-installer.xml:3067
+#: boot-installer.xml:3068
#, no-c-format
msgid "ramdisk_size"
msgstr "ramdisk_size"
#. Tag: para
-#: boot-installer.xml:3068
+#: boot-installer.xml:3069
#, no-c-format
msgid "If you are using a 2.2.x kernel, you may need to set &ramdisksize;."
msgstr "如果您在使用 2.2.x 内核,也许需要设置 &ramdisksize;。"
#. Tag: term
-#: boot-installer.xml:3076
+#: boot-installer.xml:3077
#, no-c-format
msgid "rescue/enable"
msgstr "rescue/enable"
#. Tag: para
-#: boot-installer.xml:3077
+#: boot-installer.xml:3078
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3852,19 +3852,19 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:3095
+#: boot-installer.xml:3096
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:3100
+#: boot-installer.xml:3101
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:3102
+#: boot-installer.xml:3103
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install Debian seems to "
@@ -3873,7 +3873,7 @@ msgstr ""
"对于用软盘安装 Debian 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:3107
+#: boot-installer.xml:3108
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3889,7 +3889,7 @@ msgstr ""
"印出很多有关的 I/O 错误。"
#. Tag: para
-#: boot-installer.xml:3116
+#: boot-installer.xml:3117
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -3904,7 +3904,7 @@ msgstr ""
"的话甚至要在别的统上重写这些软盘。"
#. Tag: para
-#: boot-installer.xml:3126
+#: boot-installer.xml:3127
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -3915,7 +3915,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:3132
+#: boot-installer.xml:3133
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -3926,13 +3926,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:3141
+#: boot-installer.xml:3142
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:3143
+#: boot-installer.xml:3144
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3945,7 +3945,7 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:3150
+#: boot-installer.xml:3151
#, no-c-format
msgid ""
"If you are booting with your own kernel instead of the one supplied with the "
@@ -3957,7 +3957,7 @@ msgstr ""
"<userinput>CONFIG_DEVFS</userinput>。"
#. Tag: para
-#: boot-installer.xml:3157
+#: boot-installer.xml:3158
#, no-c-format
msgid ""
"Often, problems can be solved by removing add-ons and peripherals, and then "
@@ -3969,7 +3969,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: boot-installer.xml:3163
+#: boot-installer.xml:3164
#, no-c-format
msgid ""
"If you have a large amount of memory installed in your machine, more than "
@@ -3982,13 +3982,13 @@ msgstr ""
"<userinput>mem=512m</userinput>。"
#. Tag: title
-#: boot-installer.xml:3174
+#: boot-installer.xml:3175
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:3175
+#: boot-installer.xml:3176
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -3996,7 +3996,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:3180
+#: boot-installer.xml:3181
#, no-c-format
msgid ""
"Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
@@ -4007,7 +4007,7 @@ msgstr ""
"息,并且知道软盘是好的,请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
#. Tag: para
-#: boot-installer.xml:3186
+#: boot-installer.xml:3187
#, no-c-format
msgid ""
"On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
@@ -4025,7 +4025,7 @@ msgstr ""
"replaceable>,<replaceable>sectors</replaceable></userinput>。"
#. Tag: para
-#: boot-installer.xml:3195
+#: boot-installer.xml:3196
#, no-c-format
msgid ""
"If you have a very old machine, and the kernel hangs after saying "
@@ -4038,7 +4038,7 @@ msgstr ""
"userinput> 参数来取消这个测试。"
#. Tag: para
-#: boot-installer.xml:3202
+#: boot-installer.xml:3203
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4056,13 +4056,13 @@ msgstr ""
"能用英语,请参见 <xref linkend=\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:3216
+#: boot-installer.xml:3217
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:3217
+#: boot-installer.xml:3218
#, no-c-format
msgid ""
"Some laptop models produced by Dell are known to crash when PCMCIA device "
@@ -4080,7 +4080,7 @@ msgstr ""
"段。"
#. Tag: para
-#: boot-installer.xml:3227
+#: boot-installer.xml:3228
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4100,13 +4100,13 @@ msgstr ""
"装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: title
-#: boot-installer.xml:3244
+#: boot-installer.xml:3245
#, no-c-format
msgid "System Freeze while Loading the USB Modules"
msgstr "在装入 USB 模块时系统停止"
#. Tag: para
-#: boot-installer.xml:3245
+#: boot-installer.xml:3246
#, no-c-format
msgid ""
"The kernel normally tries to install USB modules and the USB keyboard driver "
@@ -4123,13 +4123,13 @@ msgstr ""
"installer/probe/usb=false</userinput> 参数,这将阻止装入此模块。"
#. Tag: title
-#: boot-installer.xml:3259
+#: boot-installer.xml:3260
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3261
+#: boot-installer.xml:3262
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4162,13 +4162,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)。"
#. Tag: title
-#: boot-installer.xml:3286
+#: boot-installer.xml:3287
#, no-c-format
msgid "Bug Reporter"
msgstr "Bug Reporter"
#. Tag: para
-#: boot-installer.xml:3287
+#: boot-installer.xml:3288
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4184,7 +4184,7 @@ msgstr ""
"可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3298
+#: boot-installer.xml:3299
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4195,13 +4195,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3309
+#: boot-installer.xml:3310
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3310
+#: boot-installer.xml:3311
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4213,7 +4213,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3317
+#: boot-installer.xml:3318
#, no-c-format
msgid ""
"If you have a working Debian system, the easiest way to send an installation "
@@ -4227,7 +4227,7 @@ msgstr ""
"installation-report</command> 命令。"
#. Tag: para
-#: boot-installer.xml:3324
+#: boot-installer.xml:3325
#, no-c-format
msgid ""
"Please use this template when filling out installation reports, and file the "
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index cca7ae14d..497cdab33 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.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-07-30 15:28+0000\n"
"PO-Revision-Date: 2006-05-13 12:15+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -313,18 +313,30 @@ msgstr "活动数据"
#. Tag: filename
#: partitioning.xml:133
+#, fuzzy, no-c-format
+msgid "<filename>srv</filename>"
+msgstr "<filename>usr</filename>"
+
+#. Tag: entry
+#: partitioning.xml:134
+#, no-c-format
+msgid "Data for services provided by the system"
+msgstr ""
+
+#. Tag: filename
+#: partitioning.xml:136
#, no-c-format
msgid "<filename>opt</filename>"
msgstr "<filename>opt</filename>"
#. Tag: entry
-#: partitioning.xml:134
+#: partitioning.xml:137
#, no-c-format
msgid "Add-on application software packages"
msgstr "附加的应用程序软件包"
#. Tag: para
-#: partitioning.xml:139
+#: partitioning.xml:142
#, no-c-format
msgid ""
"The following is a list of important considerations regarding directories "
@@ -336,14 +348,14 @@ msgstr ""
"变化。这里所推荐的是通用指引,提供一个分区的起点。"
#. Tag: para
-#: partitioning.xml:149
-#, no-c-format
+#: partitioning.xml:152
+#, fuzzy, no-c-format
msgid ""
"The root partition <filename>/</filename> must always physically contain "
"<filename>/etc</filename>, <filename>/bin</filename>, <filename>/sbin</"
"filename>, <filename>/lib</filename> and <filename>/dev</filename>, "
-"otherwise you won't be able to boot. Typically 150&ndash;250 MB is needed "
-"for the root partition."
+"otherwise you won't be able to boot. Typically 150&ndash;250MB is needed for "
+"the root partition."
msgstr ""
"根分区 <filename>/</filename> 必须总是物理地包含 <filename>/etc</filename>,"
"<filename>/bin</filename>,<filename>/sbin</filename>,<filename>/lib</"
@@ -351,16 +363,16 @@ msgstr ""
"需要 150&ndash;250MB 大小空间。"
#. Tag: para
-#: partitioning.xml:158
-#, no-c-format
+#: partitioning.xml:161
+#, fuzzy, no-c-format
msgid ""
"<filename>/usr</filename>: contains all user programs (<filename>/usr/bin</"
"filename>), libraries (<filename>/usr/lib</filename>), documentation "
"(<filename>/usr/share/doc</filename>), etc. This is the part of the file "
-"system that generally takes up most space. You should provide at least 500 "
-"MB of disk space. This amount should be increased depending on the number "
-"and type of packages you plan to install. A generous workstation or server "
-"installation should allow 4-6 GB."
+"system that generally takes up most space. You should provide at least 500MB "
+"of disk space. This amount should be increased depending on the number and "
+"type of packages you plan to install. A generous workstation or server "
+"installation should allow 4&ndash;6GB."
msgstr ""
"<filename>/usr</filename>:包含所有的用户程序(<filename>/usr/bin</"
"filename>),库文件(<filename>/usr/lib</filename>),文档(<filename>/usr/share/"
@@ -369,20 +381,20 @@ msgstr ""
"器安装应该需要 4-6 GB。"
#. Tag: para
-#: partitioning.xml:171
-#, no-c-format
+#: partitioning.xml:174
+#, fuzzy, no-c-format
msgid ""
"<filename>/var</filename>: variable data like news articles, e-mails, web "
"sites, databases, the packaging system cache, etc. will be placed under this "
"directory. The size of this directory depends greatly on the usage of your "
"system, but for most people will be dictated by the package management "
"tool's overhead. If you are going to do a full installation of just about "
-"everything Debian has to offer, all in one session, setting aside 2 or 3 "
-"gigabyte of space for <filename>/var</filename> should be sufficient. If you "
-"are going to install in pieces (that is to say, install services and "
-"utilities, followed by text stuff, then X, ...), you can get away with "
-"300&ndash;500 MB. If hard drive space is at a premium and you don't plan on "
-"doing major system updates, you can get by with as little as 30 or 40 MB."
+"everything Debian has to offer, all in one session, setting aside 2 or 3 GB "
+"of space for <filename>/var</filename> should be sufficient. If you are "
+"going to install in pieces (that is to say, install services and utilities, "
+"followed by text stuff, then X, ...), you can get away with 300&ndash;500 "
+"MB. If hard drive space is at a premium and you don't plan on doing major "
+"system updates, you can get by with as little as 30 or 40 MB."
msgstr ""
"<filename>/var</filename>:所有的可变数据,如新的文章,电子邮件,网站,数据"
"库,软件包系统的缓存等等,将被放置入这个目录。这个目录的大小取决于您对计算机"
@@ -394,11 +406,11 @@ msgstr ""
"以为 <filename>/var</filename> 配置 30-40MB 大小。"
#. Tag: para
-#: partitioning.xml:187
-#, no-c-format
+#: partitioning.xml:190
+#, fuzzy, no-c-format
msgid ""
"<filename>/tmp</filename>: temporary data created by programs will most "
-"likely go in this directory. 40&ndash;100 MB should usually be enough. Some "
+"likely go in this directory. 40&ndash;100MB should usually be enough. Some "
"applications &mdash; including archive manipulators, CD/DVD authoring tools, "
"and multimedia software &mdash; may use <filename>/tmp</filename> to "
"temporarily store image files. If you plan to use such applications, you "
@@ -411,13 +423,13 @@ msgstr ""
"小。"
#. Tag: para
-#: partitioning.xml:198
-#, no-c-format
+#: partitioning.xml:201
+#, fuzzy, no-c-format
msgid ""
"<filename>/home</filename>: every user will put his personal data into a "
"subdirectory of this directory. Its size depends on how many users will be "
"using the system and what files are to be stored in their directories. "
-"Depending on your planned usage you should reserve about 100 MB for each "
+"Depending on your planned usage you should reserve about 100MB for each "
"user, but adapt this value to your needs. Reserve a lot more space if you "
"plan to save a lot of multimedia files (pictures, MP3, movies) in your home "
"directory."
@@ -428,13 +440,13 @@ msgstr ""
"home 目录计划保存大量的多媒体文件(图片,MP3,电影),该预备更多的空间。"
#. Tag: title
-#: partitioning.xml:219
+#: partitioning.xml:222
#, no-c-format
msgid "Recommended Partitioning Scheme"
msgstr "推荐的分区方案"
#. Tag: para
-#: partitioning.xml:220
+#: partitioning.xml:223
#, no-c-format
msgid ""
"For new users, personal Debian boxes, home systems, and other single-user "
@@ -450,7 +462,7 @@ msgstr ""
"且当分区很大的时候,这个特性将导致引导期间的延迟。"
#. Tag: para
-#: partitioning.xml:229
+#: partitioning.xml:232
#, no-c-format
msgid ""
"For multi-user systems or systems with lots of disk space, it's best to put "
@@ -463,18 +475,18 @@ msgstr ""
"filename> 到每个他们自己的分区空间以和 <filename>/</filename> 分区分离开来。"
#. Tag: para
-#: partitioning.xml:237
-#, no-c-format
+#: partitioning.xml:240
+#, fuzzy, no-c-format
msgid ""
"You might need a separate <filename>/usr/local</filename> partition if you "
"plan to install many programs that are not part of the Debian distribution. "
"If your machine will be a mail server, you might need to make <filename>/var/"
"mail</filename> a separate partition. Often, putting <filename>/tmp</"
-"filename> on its own partition, for instance 20 to 50MB, is a good idea. If "
-"you are setting up a server with lots of user accounts, it's generally good "
-"to have a separate, large <filename>/home</filename> partition. In general, "
-"the partitioning situation varies from computer to computer depending on its "
-"uses."
+"filename> on its own partition, for instance 20&ndash;50MB, is a good idea. "
+"If you are setting up a server with lots of user accounts, it's generally "
+"good to have a separate, large <filename>/home</filename> partition. In "
+"general, the partitioning situation varies from computer to computer "
+"depending on its uses."
msgstr ""
"当您计划安装许多不是 Debian 分发版本的程序的时候,您也许需要运行一个独立的 "
"<filename>/usr/local</filename> 分区。如果您的机器是一个小的邮件服务器,您也"
@@ -485,7 +497,7 @@ msgstr ""
"途。"
#. Tag: para
-#: partitioning.xml:249
+#: partitioning.xml:252
#, no-c-format
msgid ""
"For very complex systems, you should see the <ulink url=\"&url-multidisk-"
@@ -497,7 +509,7 @@ msgstr ""
"高级信息。"
#. Tag: para
-#: partitioning.xml:256
+#: partitioning.xml:259
#, no-c-format
msgid ""
"With respect to the issue of swap partition size, there are many views. One "
@@ -513,7 +525,7 @@ msgstr ""
"换分区。"
#. Tag: para
-#: partitioning.xml:265
+#: partitioning.xml:268
#, no-c-format
msgid ""
"On the other hand, Atari Falcons and Macs feel pain when swapping, so "
@@ -523,7 +535,7 @@ msgstr ""
"交换分区不如获得尽可能多的 RAM 。"
#. Tag: para
-#: partitioning.xml:270
+#: partitioning.xml:273
#, no-c-format
msgid ""
"On 32-bit architectures (i386, m68k, 32-bit SPARC, and PowerPC), the maximum "
@@ -540,7 +552,7 @@ msgstr ""
"话,不同的 SCSI 或者 IDE 通道。内核将在多个交换空间平衡用量来达到更好的性能。"
#. Tag: para
-#: partitioning.xml:280
+#: partitioning.xml:283
#, no-c-format
msgid ""
"As an example, an older home machine might have 32MB of RAM and a 1.7GB IDE "
@@ -556,7 +568,7 @@ msgstr ""
"filename> 用于 Linux 分区。"
#. Tag: para
-#: partitioning.xml:289
+#: partitioning.xml:292
#, no-c-format
msgid ""
"For an idea of the space taken by tasks you might be interested in adding "
@@ -567,13 +579,13 @@ msgstr ""
"检查 <xref linkend=\"tasksel-size-list\"/>。"
#. Tag: title
-#: partitioning.xml:305
+#: partitioning.xml:308
#, no-c-format
msgid "Device Names in Linux"
msgstr "Linux 里面的设备名称"
#. Tag: para
-#: partitioning.xml:306
+#: partitioning.xml:309
#, no-c-format
msgid ""
"Linux disks and partition names may be different from other operating "
@@ -584,19 +596,19 @@ msgstr ""
"以及挂接分区的设备名称。这里是基本的命名方案:"
#. Tag: para
-#: partitioning.xml:314
+#: partitioning.xml:317
#, no-c-format
msgid "The first floppy drive is named <filename>/dev/fd0</filename>."
msgstr "第一个软盘驱动器被命名为 <filename>/dev/fd0</filename>。"
#. Tag: para
-#: partitioning.xml:319
+#: partitioning.xml:322
#, no-c-format
msgid "The second floppy drive is named <filename>/dev/fd1</filename>."
msgstr "第二个软盘驱动器被命名为 <filename>/dev/fd1</filename>。"
#. Tag: para
-#: partitioning.xml:324
+#: partitioning.xml:327
#, no-c-format
msgid ""
"The first SCSI disk (SCSI ID address-wise) is named <filename>/dev/sda</"
@@ -606,7 +618,7 @@ msgstr ""
"filename>。"
#. Tag: para
-#: partitioning.xml:330
+#: partitioning.xml:333
#, no-c-format
msgid ""
"The second SCSI disk (address-wise) is named <filename>/dev/sdb</filename>, "
@@ -615,7 +627,7 @@ msgstr ""
"第二个 SCSI 驱动器 (反向地址) 被命名为 <filename>/dev/sdb</filename>,等等。"
#. Tag: para
-#: partitioning.xml:336
+#: partitioning.xml:339
#, no-c-format
msgid ""
"The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also known as "
@@ -625,7 +637,7 @@ msgstr ""
"<filename>/dev/sr0</filename>。"
#. Tag: para
-#: partitioning.xml:342
+#: partitioning.xml:345
#, no-c-format
msgid ""
"The master disk on IDE primary controller is named <filename>/dev/hda</"
@@ -633,7 +645,7 @@ msgid ""
msgstr "主 IDE 驱动器下的主磁盘被命名为 <filename>/dev/hda</filename>。"
#. Tag: para
-#: partitioning.xml:348
+#: partitioning.xml:351
#, no-c-format
msgid ""
"The slave disk on IDE primary controller is named <filename>/dev/hdb</"
@@ -642,7 +654,7 @@ msgstr ""
"第二个控制器的主磁盘和从磁盘会分别被叫做 <filename>/dev/hdb</filename>。"
#. Tag: para
-#: partitioning.xml:354
+#: partitioning.xml:357
#, no-c-format
msgid ""
"The master and slave disks of the secondary controller can be called "
@@ -660,19 +672,19 @@ msgstr ""
"<filename>/dev/hda</filename>)。</phrase>"
#. Tag: para
-#: partitioning.xml:369
+#: partitioning.xml:372
#, no-c-format
msgid "The first XT disk is named <filename>/dev/xda</filename>."
msgstr "第一个 XT 磁盘会被命名为 <filename>/dev/xda</filename>。"
#. Tag: para
-#: partitioning.xml:374
+#: partitioning.xml:377
#, no-c-format
msgid "The second XT disk is named <filename>/dev/xdb</filename>."
msgstr "第二个 XT 磁盘会被命名为 <filename>/dev/xdb</filename>。"
#. Tag: para
-#: partitioning.xml:379
+#: partitioning.xml:382
#, no-c-format
msgid ""
"The first ACSI device is named <filename>/dev/ada</filename>, the second is "
@@ -682,20 +694,20 @@ msgstr ""
"<filename>/dev/adb</filename>。"
#. Tag: para
-#: partitioning.xml:388
+#: partitioning.xml:391
#, no-c-format
msgid "The first DASD device is named <filename>/dev/dasda</filename>."
msgstr "第一个 DASD 设备被命名为 <filename>/dev/dasda</filename>。"
#. Tag: para
-#: partitioning.xml:394
+#: partitioning.xml:397
#, no-c-format
msgid ""
"The second DASD device is named <filename>/dev/dasdb</filename>, and so on."
msgstr "第二个 DASD 设备被命名为 <filename>/dev/dasdb</filename>,等等。"
#. Tag: para
-#: partitioning.xml:402
+#: partitioning.xml:405
#, no-c-format
msgid ""
"The partitions on each disk are represented by appending a decimal number to "
@@ -708,7 +720,7 @@ msgstr ""
"SCSI 磁盘驱动器的第一个和第二个分区。"
#. Tag: para
-#: partitioning.xml:409
+#: partitioning.xml:412
#, no-c-format
msgid ""
"Here is a real-life example. Let's assume you have a system with 2 SCSI "
@@ -727,7 +739,7 @@ msgstr ""
"filename> 及其分区。"
#. Tag: para
-#: partitioning.xml:420
+#: partitioning.xml:423
#, no-c-format
msgid ""
"Note that if you have two SCSI host bus adapters (i.e., controllers), the "
@@ -739,7 +751,7 @@ msgstr ""
"的解决方案是观察引导信息,假设您知道驱动器模式以及/或者容量。"
#. Tag: para
-#: partitioning.xml:427
+#: partitioning.xml:430
#, no-c-format
msgid ""
"Linux represents the primary partitions as the drive name, plus the numbers "
@@ -757,7 +769,7 @@ msgstr ""
"适用。"
#. Tag: para
-#: partitioning.xml:438
+#: partitioning.xml:441
#, no-c-format
msgid ""
"VMEbus systems using the TEAC FC-1 SCSI floppy drive will see it as normal "
@@ -770,7 +782,7 @@ msgstr ""
"dev/sfd0</filename>。"
#. Tag: para
-#: partitioning.xml:445
+#: partitioning.xml:448
#, no-c-format
msgid ""
"Sun disk partitions allow for 8 separate partitions (or slices). The third "
@@ -783,7 +795,7 @@ msgstr ""
"器(SILO 或者 SUN 的)使用。"
#. Tag: para
-#: partitioning.xml:452
+#: partitioning.xml:455
#, no-c-format
msgid ""
"The partitions on each disk are represented by appending a decimal number to "
@@ -796,13 +808,13 @@ msgstr ""
"个 DASD 设备的第一个以及第二个分区。"
#. Tag: title
-#: partitioning.xml:467
+#: partitioning.xml:470
#, no-c-format
msgid "Debian Partitioning Programs"
msgstr "Debian 分区程序"
#. Tag: para
-#: partitioning.xml:468
+#: partitioning.xml:471
#, no-c-format
msgid ""
"Several varieties of partitioning programs have been adapted by Debian "
@@ -814,13 +826,13 @@ msgstr ""
"您的结构的程序列表。"
#. Tag: command
-#: partitioning.xml:480
+#: partitioning.xml:483
#, no-c-format
msgid "partman"
msgstr "partman"
#. Tag: para
-#: partitioning.xml:481
+#: partitioning.xml:484
#, no-c-format
msgid ""
"Recommended partitioning tool in Debian. This Swiss army knife can also "
@@ -832,45 +844,45 @@ msgstr ""
"以及联系分区至挂接点。"
#. Tag: command
-#: partitioning.xml:492
+#: partitioning.xml:495
#, no-c-format
msgid "fdisk"
msgstr "fdisk"
#. Tag: para
-#: partitioning.xml:493
+#: partitioning.xml:496
#, no-c-format
msgid "The original Linux disk partitioner, good for gurus."
msgstr "原始版本的 Linux 磁盘分区工具,对于高手很好用。"
#. Tag: para
-#: partitioning.xml:497
-#, no-c-format
+#: partitioning.xml:500
+#, fuzzy, no-c-format
msgid ""
"Be careful if you have existing FreeBSD partitions on your machine. The "
"installation kernels include support for these partitions, but the way that "
"<command>fdisk</command> represents them (or not) can make the device names "
"differ. See the <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</"
-"ulink>"
+"ulink>."
msgstr ""
"这里注意,如果您的机器上有一个 FreeBSD 分区。安装内核将包括这些分区的支持,但"
"是 <command>fdisk</command> 表示他们的设备名称方式可能有所不同(也可能不是)。"
"请参照 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>"
#. Tag: command
-#: partitioning.xml:509
+#: partitioning.xml:512
#, no-c-format
msgid "cfdisk"
msgstr "cfdisk"
#. Tag: para
-#: partitioning.xml:510
+#: partitioning.xml:513
#, no-c-format
msgid "A simple-to-use, full-screen disk partitioner for the rest of us."
msgstr "一个简单易用,给其它人使用的是全屏幕磁盘分区程序。"
#. Tag: para
-#: partitioning.xml:514
+#: partitioning.xml:517
#, no-c-format
msgid ""
"Note that <command>cfdisk</command> doesn't understand FreeBSD partitions at "
@@ -880,49 +892,49 @@ msgstr ""
"名称可能最后有所不同。"
#. Tag: command
-#: partitioning.xml:523
+#: partitioning.xml:526
#, no-c-format
msgid "atari-fdisk"
msgstr "atari-fdisk"
#. Tag: para
-#: partitioning.xml:524
+#: partitioning.xml:527
#, no-c-format
msgid "Atari-aware version of <command>fdisk</command>."
msgstr "Atari 版本的 <command>fdisk</command>。"
#. Tag: command
-#: partitioning.xml:532
+#: partitioning.xml:535
#, no-c-format
msgid "amiga-fdisk"
msgstr "amiga-fdisk"
#. Tag: para
-#: partitioning.xml:533
+#: partitioning.xml:536
#, no-c-format
msgid "Amiga-aware version of <command>fdisk</command>."
msgstr "Amiga-aware 版本的 <command>fdisk</command>。"
#. Tag: command
-#: partitioning.xml:541
+#: partitioning.xml:544
#, no-c-format
msgid "mac-fdisk"
msgstr "mac-fdisk"
#. Tag: para
-#: partitioning.xml:542
+#: partitioning.xml:545
#, no-c-format
msgid "Mac-aware version of <command>fdisk</command>."
msgstr "Mac-aware 版本的 <command>fdisk</command>。"
#. Tag: command
-#: partitioning.xml:550
+#: partitioning.xml:553
#, no-c-format
msgid "pmac-fdisk"
msgstr "pmac-fdisk"
#. Tag: para
-#: partitioning.xml:551
+#: partitioning.xml:554
#, no-c-format
msgid ""
"PowerMac-aware version of <command>fdisk</command>, also used by BVM and "
@@ -932,13 +944,13 @@ msgstr ""
"VMEbus 系统。"
#. Tag: command
-#: partitioning.xml:560
+#: partitioning.xml:563
#, no-c-format
msgid "fdasd"
msgstr "fdasd"
#. Tag: para
-#: partitioning.xml:561
+#: partitioning.xml:564
#, no-c-format
msgid ""
"&arch-title; version of <command>fdisk</command>; Please read the fdasd "
@@ -953,7 +965,7 @@ msgstr ""
"\"Installation Commands</ulink> 的第 13 章获得详细信息。"
#. Tag: para
-#: partitioning.xml:572
+#: partitioning.xml:575
#, no-c-format
msgid ""
"One of these programs will be run by default when you select "
@@ -965,7 +977,7 @@ msgstr ""
"行其中的一个程序。在 VT2 命令行上也可以使用其他的分区工具,但不推荐这种方式。"
#. Tag: para
-#: partitioning.xml:579
+#: partitioning.xml:582
#, no-c-format
msgid ""
"If you will be working with more than 20 partitions on your ide disk, you "
@@ -1006,7 +1018,7 @@ msgstr ""
"<quote>Bootable</quote>。</phrase>"
#. Tag: para
-#: partitioning.xml:598
+#: partitioning.xml:601
#, no-c-format
msgid ""
"One key point when partitioning for Mac type disks is that the swap "
@@ -1023,15 +1035,15 @@ msgstr ""
# index.docbook:612, index.docbook:672, index.docbook:696, index.docbook:793, index.docbook:912, index.docbook:989
#. Tag: title
-#: partitioning.xml:614 partitioning.xml:674 partitioning.xml:698
-#: partitioning.xml:794 partitioning.xml:913 partitioning.xml:990
+#: partitioning.xml:617 partitioning.xml:677 partitioning.xml:701
+#: partitioning.xml:798 partitioning.xml:912 partitioning.xml:989
#, no-c-format
msgid "Partitioning for &arch-title;"
msgstr "为 &arch-title; 准备分区"
#. Tag: para
-#: partitioning.xml:615
-#, no-c-format
+#: partitioning.xml:618
+#, fuzzy, no-c-format
msgid ""
"Booting Debian from the SRM console (the only disk boot method supported by "
"&releasename;) requires you to have a BSD disk label, not a DOS partition "
@@ -1039,8 +1051,8 @@ msgid ""
"MS-DOS partition tables &mdash; see <xref linkend=\"alpha-firmware\"/>.) As "
"a result, <command>partman</command> creates BSD disk labels when running on "
"&architecture;, but if your disk has an existing DOS partition table the "
-"existing partitions will need to be deleted before partman can convert it to "
-"use a disk label."
+"existing partitions will need to be deleted before <command>partman</"
+"command> can convert it to use a disk label."
msgstr ""
"从 SRM 控制台引导 Debian (唯一能被 &releasename; 支持的启动方法)要求您的启动"
"盘上有 BSD 磁盘卷标,而不是 DOS 分区。(注意,SRM 引导块不和 MS-DOS 分区兼容 "
@@ -1049,7 +1061,7 @@ msgstr ""
"在一个 DOS 分区表,在 partman 转换到磁盘卷标前需要将它删除。"
#. Tag: para
-#: partitioning.xml:626
+#: partitioning.xml:629
#, no-c-format
msgid ""
"If you have chosen to use <command>fdisk</command> to partition your disk, "
@@ -1061,7 +1073,7 @@ msgstr ""
"磁盘卷标,您必须使用<quote>b</quote>命令进入磁盘卷标模式。"
#. Tag: para
-#: partitioning.xml:633
+#: partitioning.xml:636
#, no-c-format
msgid ""
"Unless you wish to use the disk you are partitioning from Tru64 Unix or one "
@@ -1080,7 +1092,7 @@ msgstr ""
"<command>aboot</command> 将报怨引导扇区将被一个分区覆盖。"
#. Tag: para
-#: partitioning.xml:644
+#: partitioning.xml:647
#, no-c-format
msgid ""
"Also, because <command>aboot</command> is written to the first few sectors "
@@ -1101,7 +1113,7 @@ msgstr ""
"这是习惯所致。"
#. Tag: para
-#: partitioning.xml:656
+#: partitioning.xml:659
#, no-c-format
msgid ""
"For ARC installations, you should make a small FAT partition at the "
@@ -1119,7 +1131,7 @@ msgstr ""
"<command>mkdosfs</command> 然后再尝试安装启动引导器。"
#. Tag: para
-#: partitioning.xml:675
+#: partitioning.xml:678
#, no-c-format
msgid ""
"PALO, the HPPA boot loader, requires a partition of type <quote>F0</quote> "
@@ -1145,15 +1157,16 @@ msgstr ""
"25&ndash;50 MB 一般来说应该足够了。"
#. Tag: para
-#: partitioning.xml:699
-#, no-c-format
+#: partitioning.xml:702
+#, fuzzy, no-c-format
msgid ""
"If you have an existing other operating system such as DOS or Windows and "
"you want to preserve that operating system while installing Debian, you may "
"need to resize its partition to free up space for the Debian installation. "
"The installer supports resizing of both FAT and NTFS filesystems; when you "
-"get to the installer's partitioning step, select the option to partition "
-"manually and then simply select an existing partition and change its size."
+"get to the installer's partitioning step, select the option "
+"<guimenuitem>Manually edit partition table</guimenuitem> and then simply "
+"select an existing partition and change its size."
msgstr ""
"如果您已经有 DOS 或 Windows 这样的其他操作系统存在,并想在安装 Debian 时保留"
"它们,您应该重新设置分区大小,释放更多的空间给 Debian 安装程序。安装程序支持 "
@@ -1161,7 +1174,7 @@ msgstr ""
"需选择该分区,并更改其尺寸。"
#. Tag: para
-#: partitioning.xml:708
+#: partitioning.xml:712
#, no-c-format
msgid ""
"The PC BIOS generally adds additional constraints for disk partitioning. "
@@ -1181,7 +1194,7 @@ msgstr ""
"包含一个简单的介绍,来帮助在大部分情况下进行规划。"
#. Tag: para
-#: partitioning.xml:719
+#: partitioning.xml:723
#, no-c-format
msgid ""
"<quote>Primary</quote> partitions are the original partitioning scheme for "
@@ -1199,7 +1212,7 @@ msgstr ""
"盘您只能含有一个扩展分区。"
#. Tag: para
-#: partitioning.xml:730
+#: partitioning.xml:734
#, no-c-format
msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
@@ -1215,7 +1228,7 @@ msgstr ""
"超过 20 个的分区,除非您为这些首先手工创建了设备文件。"
#. Tag: para
-#: partitioning.xml:740
+#: partitioning.xml:744
#, no-c-format
msgid ""
"If you have a large IDE disk, and are using neither LBA addressing, nor "
@@ -1229,7 +1242,7 @@ msgstr ""
"个 1024 柱面内。(在没有 BIOS 转换的情况下,大约有 524MB)。"
#. Tag: para
-#: partitioning.xml:748
+#: partitioning.xml:752
#, no-c-format
msgid ""
"This restriction doesn't apply if you have a BIOS newer than around "
@@ -1253,7 +1266,7 @@ msgstr ""
"来进行磁盘寻址。"
#. Tag: para
-#: partitioning.xml:762
+#: partitioning.xml:766
#, no-c-format
msgid ""
"If you have a large disk, you might have to use cylinder translation "
@@ -1273,7 +1286,7 @@ msgstr ""
"换后</emphasis> 的 1024 柱面内。"
#. Tag: para
-#: partitioning.xml:774
+#: partitioning.xml:778
#, no-c-format
msgid ""
"The recommended way of accomplishing this is to create a small "
@@ -1293,35 +1306,35 @@ msgstr ""
"用,甚至也不管您的 BIOS 是否支持大硬盘访问扩展。"
#. Tag: para
-#: partitioning.xml:796
-#, no-c-format
+#: partitioning.xml:799
+#, fuzzy, no-c-format
msgid ""
"The <command>partman</command> disk partitioner is the default partitioning "
"tool for the installer. It manages the set of partitions and their mount "
-"points to ensure that the disks and filesystems is properly configured for a "
-"successful installation. It actually uses the <command>parted</command> to "
-"do the on-disk partitioning."
+"points to ensure that the disks and filesystems are properly configured for "
+"a successful installation. It actually uses <command>parted</command> to do "
+"the on-disk partitioning."
msgstr ""
"<command>partman</command> 是安装程序的缺省分区工具。它管理一系列分区以及挂载"
"点,来保证磁盘和文件系统对于成功的安装来说具有有合适的配置。实际上它使用的是 "
"<command>parted</command> 来进行磁盘分区的。"
#. Tag: title
-#: partitioning.xml:808
+#: partitioning.xml:811
#, no-c-format
msgid "EFI Recognized Formats"
msgstr "EFI 能够识别的格式"
#. Tag: para
-#: partitioning.xml:809
-#, no-c-format
+#: partitioning.xml:812
+#, fuzzy, no-c-format
msgid ""
"The IA64 EFI firmware supports two partition table (or disk label) formats, "
"GPT and MS-DOS. MS-DOS, the format typically used on i386 PCs, is no longer "
-"recommended for IA64 systems. Although the installer also provides the "
-"<command>cfdisk</command>, you should only use the <ulink url=\"parted.txt"
-"\"> <command>parted</command></ulink> because only it can manage both GPT "
-"and MS-DOS tables correctly."
+"recommended for IA64 systems. Although the installer also provides "
+"<command>cfdisk</command>, you should only use <ulink url=\"parted.txt\"> "
+"<command>parted</command></ulink> because only it can manage both GPT and MS-"
+"DOS tables correctly."
msgstr ""
"IA64 EFI 固件支持 GPT 和 MS-DOS 两种分区表(或者磁盘标记)格式。MS-DOS 格式通常"
"用在 i386 PC 上,并且对于 IA64 系统来说并不合适推荐使用。尽管安装程序同时提供"
@@ -1330,7 +1343,7 @@ msgstr ""
"DOS 分区表。"
#. Tag: para
-#: partitioning.xml:821
+#: partitioning.xml:824
#, no-c-format
msgid ""
"The automatic partitioning recipes for <command>partman</command> allocate "
@@ -1344,7 +1357,7 @@ msgstr ""
"配置分区。其方法类似设置一个 <emphasis>交换</emphasis> 分区。"
#. Tag: para
-#: partitioning.xml:829
+#: partitioning.xml:832
#, no-c-format
msgid ""
"The <command>partman</command> partitioner will handle most disk layouts. "
@@ -1389,13 +1402,13 @@ msgstr ""
"它可能要扫描坏区。"
#. Tag: title
-#: partitioning.xml:854
+#: partitioning.xml:857
#, no-c-format
msgid "Boot Loader Partition Requirements"
msgstr "启动引导器分区要求"
#. Tag: para
-#: partitioning.xml:856
+#: partitioning.xml:858
#, no-c-format
msgid ""
"ELILO, the ia64 boot loader, requires a partition containing a FAT file "
@@ -1410,7 +1423,7 @@ msgstr ""
"个内核的话,128MB 也许更好。"
#. Tag: para
-#: partitioning.xml:865
+#: partitioning.xml:867
#, no-c-format
msgid ""
"The EFI Boot Manager and the EFI Shell fully support the GPT table so the "
@@ -1432,7 +1445,7 @@ msgstr ""
"入一个 EFI 分区。"
#. Tag: para
-#: partitioning.xml:880
+#: partitioning.xml:882
#, no-c-format
msgid ""
"It is strongly recommended that you allocate the EFI boot partition on the "
@@ -1442,7 +1455,7 @@ msgstr ""
"盘上。"
#. Tag: title
-#: partitioning.xml:889
+#: partitioning.xml:890
#, no-c-format
msgid "EFI Diagnostic Partitions"
msgstr "EFI 诊断分区"
@@ -1467,7 +1480,7 @@ msgstr ""
"区的时候。"
#. Tag: para
-#: partitioning.xml:914
+#: partitioning.xml:913
#, no-c-format
msgid ""
"SGI machines require an SGI disk label in order to make the system bootable "
@@ -1483,13 +1496,13 @@ msgstr ""
"入。注意 volume header 必须从 0 号扇区开始。"
#. Tag: title
-#: partitioning.xml:931
+#: partitioning.xml:930
#, no-c-format
msgid "Partitioning Newer PowerMacs"
msgstr "为较新的 PowerMacs 分区"
#. Tag: para
-#: partitioning.xml:932
+#: partitioning.xml:931
#, no-c-format
msgid ""
"If you are installing onto a NewWorld PowerMac you must create a special "
@@ -1511,7 +1524,7 @@ msgstr ""
"userinput> 命令。"
#. Tag: para
-#: partitioning.xml:945
+#: partitioning.xml:944
#, no-c-format
msgid ""
"The special partition type Apple_Bootstrap is required to prevent MacOS from "
@@ -1522,7 +1535,7 @@ msgstr ""
"为里面 含有一些特殊修改的模式来让 OpenFirmware 能够自动启动它。"
#. Tag: para
-#: partitioning.xml:952
+#: partitioning.xml:951
#, no-c-format
msgid ""
"Note that the bootstrap partition is only meant to hold 3 very small files: "
@@ -1539,7 +1552,7 @@ msgstr ""
"command> 工具可以用来维护这个分区。"
#. Tag: para
-#: partitioning.xml:962
+#: partitioning.xml:961
#, no-c-format
msgid ""
"In order for OpenFirmware to automatically boot &debian; the bootstrap "
@@ -1559,7 +1572,7 @@ msgstr ""
"顺序。"
#. Tag: para
-#: partitioning.xml:974
+#: partitioning.xml:973
#, no-c-format
msgid ""
"Apple disks normally have several small driver partitions. If you intend to "
@@ -1573,7 +1586,7 @@ msgstr ""
"启动的时候,会初始化没有任何激活的 MacOS 分区以及驱动分区的磁盘。"
#. Tag: para
-#: partitioning.xml:991
+#: partitioning.xml:990
#, no-c-format
msgid ""
"Make sure you create a <quote>Sun disk label</quote> on your boot disk. This "
@@ -1586,7 +1599,7 @@ msgstr ""
"<keycap>s</keycap> 中用 <command>fdisk</command> 键来创建 Sun 磁盘标记。"
#. Tag: para
-#: partitioning.xml:999
+#: partitioning.xml:998
#, no-c-format
msgid ""
"Furthermore, on &arch-title; disks, make sure your first partition on your "
@@ -1605,7 +1618,7 @@ msgstr ""
"或者 UFS 分区在那里;它们将隔离分区表和引导块。"
#. Tag: para
-#: partitioning.xml:1010
+#: partitioning.xml:1009
#, no-c-format
msgid ""
"It is also advised that the third partition should be of type <quote>Whole "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 03708057f..e33e63e10 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: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-07-30 15:28+0000\n"
"PO-Revision-Date: 2006-07-07 12:53+0800\n"
"Last-Translator: Ji YongGang <jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1558,14 +1558,27 @@ msgstr ""
"您可以不选任务,并用其他方法安装一系列软件包。我们推荐选上 <userinput>标准</"
"userinput> 任务。"
-#. Tag: screen
-#: preseed.xml:786
+#. Tag: para
+#: preseed.xml:784
#, no-c-format
msgid ""
+"If you want to install some individual packages in addition to packages "
+"installed by tasks, you can use the parameter <classname>pkgsel/include</"
+"classname>. The value of this parameter can be either comma-separated or "
+"space-separated, so you can also use it easily on the kernel command line."
+msgstr ""
+
+#. Tag: screen
+#: preseed.xml:794
+#, fuzzy, no-c-format
+msgid ""
"tasksel tasksel/first multiselect standard, desktop\n"
"#tasksel tasksel/first multiselect standard, web-server\n"
"#tasksel tasksel/first multiselect standard, kde-desktop\n"
"\n"
+"# Individual additional packages to install\n"
+"#d-i pkgsel/include string openssh-server build-essential\n"
+"\n"
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
"# but sending reports helps the project determine what software is most\n"
@@ -1583,13 +1596,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:791
+#: preseed.xml:799
#, no-c-format
msgid "Finishing up the first stage install"
msgstr "完成第一阶段安装"
#. Tag: screen
-#: preseed.xml:793
+#: preseed.xml:801
#, no-c-format
msgid ""
"# Avoid that last message about the install being complete.\n"
@@ -1607,13 +1620,13 @@ msgstr ""
"#d-i cdrom-detect/eject boolean false"
#. Tag: title
-#: preseed.xml:798
+#: preseed.xml:806
#, no-c-format
msgid "Mailer configuration"
msgstr "邮件设置"
#. Tag: para
-#: preseed.xml:799
+#: preseed.xml:807
#, no-c-format
msgid ""
"During a normal install, exim asks only a few questions. Here's how to avoid "
@@ -1622,7 +1635,7 @@ msgstr ""
"普通安装方式下,exim 会问一些问题。这里是避免的方法。也可以有更多的预置内容。"
#. Tag: screen
-#: preseed.xml:806
+#: preseed.xml:814
#, no-c-format
msgid ""
"exim4-config exim4/dc_eximconfig_configtype \\\n"
@@ -1638,13 +1651,13 @@ msgstr ""
"exim4-config exim4/dc_postmaster string"
#. Tag: title
-#: preseed.xml:811
+#: preseed.xml:819
#, no-c-format
msgid "X configuration"
msgstr "设置 X"
#. Tag: para
-#: preseed.xml:812
+#: preseed.xml:820
#, no-c-format
msgid ""
"Preseeding Debian's X config is possible, but you probably need to know some "
@@ -1655,7 +1668,7 @@ msgstr ""
"的 X 配置工具无法自动设置每一件事。"
#. Tag: screen
-#: preseed.xml:820
+#: preseed.xml:828
#, no-c-format
msgid ""
"# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -1703,13 +1716,13 @@ msgstr ""
" select 1024x768 @ 60 Hz"
#. Tag: title
-#: preseed.xml:825
+#: preseed.xml:833
#, no-c-format
msgid "Preseeding other packages"
msgstr "预置其他的软件包"
#. Tag: screen
-#: preseed.xml:827
+#: preseed.xml:835
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -1729,19 +1742,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:833
+#: preseed.xml:841
#, no-c-format
msgid "Advanced options"
msgstr "高级选项"
#. Tag: title
-#: preseed.xml:836
+#: preseed.xml:844
#, no-c-format
msgid "Shell commands"
msgstr "shell 命令"
#. Tag: screen
-#: preseed.xml:838
+#: preseed.xml:846
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -1779,13 +1792,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:843
+#: preseed.xml:851
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "预置文件链"
#. Tag: para
-#: preseed.xml:844
+#: preseed.xml:852
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -1799,7 +1812,7 @@ msgstr ""
"另外的文件里面。"
#. Tag: screen
-#: preseed.xml:854
+#: preseed.xml:862
#, no-c-format
msgid ""
"# More that one file can be listed, separated by spaces; all will be\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index fe48652a9..debbb3997 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-25 21:39+0000\n"
+"POT-Creation-Date: 2006-07-30 15:28+0000\n"
"PO-Revision-Date: 2006-05-13 16:02+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -371,11 +371,11 @@ msgstr ""
#. Tag: para
#: random-bits.xml:148
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"If gpm is disabled or not installed with some reason, make sure to set X to "
-"read directly from the mouse device such as /dev/psaux. For details, refer "
-"to the 3-Button Mouse mini-Howto at <filename>/usr/share/doc/HOWTO/en-txt/"
+"If gpm is disabled or not installed for some reason, make sure to set X to "
+"read directly from a mouse device such as /dev/psaux. For details, refer to "
+"the 3-Button Mouse mini-Howto at <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>, and <ulink url=\"&url-xorg;"
"current/doc/html/mouse.html\">README.mouse</ulink>."
@@ -662,9 +662,9 @@ msgstr "<entry>87</entry>"
#. Tag: para
#: random-bits.xml:274
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"The <emphasis>Desktop</emphasis> task will install both the Gnome and KDE "
+"The <emphasis>Desktop</emphasis> task will install both the GNOME and KDE "
"desktop environments."
msgstr "<emphasis>桌面</emphasis> 任务将同时安装 Gnome 和 KDE 桌面环境。"
@@ -744,11 +744,11 @@ msgstr ""
#. Tag: para
#: random-bits.xml:330
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"To create file systems on your partitions. For example, to create an ext3 "
-"file system on partition <filename>/dev/hda6</filename> (that's our example "
-"root partition): <informalexample><screen>\n"
+"Create file systems on your partitions. For example, to create an ext3 file "
+"system on partition <filename>/dev/hda6</filename> (that's our example root "
+"partition): <informalexample><screen>\n"
"# mke2fs -j /dev/hda6\n"
"</screen></informalexample> To create an ext2 file system instead, omit "
"<userinput>-j</userinput>."
@@ -812,17 +812,17 @@ msgstr "安装 <command>debootstrap</command>"
#. Tag: para
#: random-bits.xml:366
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"The tool that the Debian installer uses, which is recognized as the official "
-"way to install a Debian base system, is <command>debootstrap</command>. It "
-"uses <command>wget</command> and <command>ar</command>, but otherwise "
-"depends only on <classname>/bin/sh</classname> and basic Unix/Linux "
-"tools<footnote> <para> These include the GNU core utilities and commands "
-"like <command>sed</command>, <command>grep</command>, <command>tar</command> "
-"and <command>gzip</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>."
+"The utility used by the Debian installer, and recognized as the official way "
+"to install a Debian base system, is <command>debootstrap</command>. It uses "
+"<command>wget</command> and <command>ar</command>, but otherwise depends "
+"only on <classname>/bin/sh</classname> and basic Unix/Linux tools<footnote> "
+"<para> These include the GNU core utilities and commands like <command>sed</"
+"command>, <command>grep</command>, <command>tar</command> and <command>gzip</"
+"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> 和 "
@@ -1199,17 +1199,18 @@ msgstr "locales 的设置"
#. Tag: para
#: random-bits.xml:564
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"To configure your locale settings to use a language other than English, "
-"install the locales support package and configure it: "
+"install the <classname>locales</classname> support package and configure it: "
"<informalexample><screen>\n"
-"# apt-get install locales\n"
+"# aptitude install locales\n"
"# dpkg-reconfigure locales\n"
-"</screen></informalexample> NOTE: Apt must be configured beforehand by "
-"creating a sources.list and running apt-get update. Before using locales "
-"with character sets other than ASCII or latin1, please consult the "
-"appropriate localization HOWTO."
+"</screen></informalexample> NOTE: <classname>apt</classname> must be "
+"configured beforehand by creating a sources.list and running "
+"<command>aptitude update</command>. Before using locales with character sets "
+"other than ASCII or latin1, please consult the appropriate localization "
+"HOWTO."
msgstr ""
"要配置您的 locale 设定,以便使用英语以外的其它语言,就需要安装提供 locales 支"
"持的软件包,然后配置: <informalexample><screen>\n"
@@ -1220,13 +1221,13 @@ msgstr ""
"阅相应的本地化指南(localization HOWTO)。"
#. Tag: title
-#: random-bits.xml:581
+#: random-bits.xml:582
#, no-c-format
msgid "Install a Kernel"
msgstr "内核的安装"
#. Tag: para
-#: random-bits.xml:582
+#: random-bits.xml:583
#, no-c-format
msgid ""
"If you intend to boot this system, you probably want a Linux kernel and a "
@@ -1243,10 +1244,10 @@ msgstr ""
"</screen></informalexample> 接下来使用所选包名来安装。"
#. Tag: screen
-#: random-bits.xml:591
-#, no-c-format
+#: random-bits.xml:592
+#, fuzzy, no-c-format
msgid ""
-"# apt-get install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
+"# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
"condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
"arch-etc</replaceable>"
msgstr ""
@@ -1255,26 +1256,26 @@ msgstr ""
"arch-etc</replaceable>"
#. Tag: title
-#: random-bits.xml:597
+#: random-bits.xml:598
#, no-c-format
msgid "Set up the Boot Loader"
msgstr "Boot Loader 的设置"
#. Tag: para
-#: random-bits.xml:598
-#, no-c-format
+#: random-bits.xml:599
+#, fuzzy, no-c-format
msgid ""
"To make your &debian; system bootable, set up your boot loader to load the "
-"installed kernel with your new root partition. Note that debootstrap does "
-"not install a boot loader, though you can use apt-get inside your Debian "
-"chroot to do so."
+"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,好让它能加载已安装"
"的内核并用上新的根分区。注意 debootstrap 不会安装 boot loader,因此您要在 "
"Debian 的 chroot 中使用 apt-get 完成。"
#. Tag: para
-#: random-bits.xml:605
+#: random-bits.xml:606
#, no-c-format
msgid ""
"Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1295,13 +1296,13 @@ msgstr ""
"它就会用哪个系统里的 <filename>lilo.conf</filename> )。"
#. Tag: para
-#: random-bits.xml:616
+#: random-bits.xml:617
#, 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:620
+#: random-bits.xml:621
#, no-c-format
msgid ""
"boot=/dev/hda6\n"
@@ -1321,7 +1322,7 @@ msgstr ""
"label=Debian"
#. Tag: para
-#: random-bits.xml:622
+#: random-bits.xml:623
#, no-c-format
msgid ""
"Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1339,7 +1340,7 @@ msgstr ""
"filename> )。"
#. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:633
#, no-c-format
msgid ""
"Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1369,18 +1370,18 @@ msgstr ""
"userinput> 换成 <userinput>hd:</userinput>。"
#. Tag: title
-#: random-bits.xml:650
+#: random-bits.xml:651
#, no-c-format
msgid "Installing &debian; over Parallel Line IP (PLIP)"
msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian;"
#. Tag: para
-#: random-bits.xml:652
-#, no-c-format
+#: random-bits.xml:653
+#, fuzzy, no-c-format
msgid ""
-"This section explains how to install &debian; on a computer without 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 "
+"This section explains how to install &debian; on a computer without an "
+"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-"
@@ -1388,7 +1389,7 @@ msgstr ""
"具有 Debian 镜像的网络(例如,互联网)。"
#. Tag: para
-#: random-bits.xml:660
+#: random-bits.xml:661
#, no-c-format
msgid ""
"In the example in this appendix we will set up a PLIP connection using a "
@@ -1402,7 +1403,7 @@ msgstr ""
"IP 地址(这些地址在您的网络地址空间里面未被占用)。"
#. Tag: para
-#: random-bits.xml:668
+#: random-bits.xml:669
#, no-c-format
msgid ""
"The PLIP connection set up during the installation will also be available "
@@ -1413,7 +1414,7 @@ msgstr ""
"linkend=\"boot-new\"/>)。"
#. Tag: para
-#: random-bits.xml:673
+#: random-bits.xml:674
#, no-c-format
msgid ""
"Before you start, you will need to check the BIOS configuration (IO base "
@@ -1425,13 +1426,13 @@ msgstr ""
"为 <literal>io=0x378</literal>,<literal>irq=7</literal>。"
#. Tag: title
-#: random-bits.xml:683
+#: random-bits.xml:684
#, no-c-format
msgid "Requirements"
msgstr "需求"
#. Tag: para
-#: random-bits.xml:686
+#: random-bits.xml:687
#, no-c-format
msgid ""
"A target computer, called <emphasis>target</emphasis>, where Debian will be "
@@ -1439,13 +1440,13 @@ msgid ""
msgstr "目标计算机,称为 <emphasis>target</emphasis>,将安装 Debian 在上面。"
#. Tag: para
-#: random-bits.xml:692
+#: random-bits.xml:693
#, no-c-format
msgid "System installation media; see <xref linkend=\"installation-media\"/>."
msgstr "系统安装介质;参阅 <xref linkend=\"installation-media\"/>。"
#. Tag: para
-#: random-bits.xml:697
+#: random-bits.xml:698
#, no-c-format
msgid ""
"Another computer connected to the Internet, called <emphasis>source</"
@@ -1454,7 +1455,7 @@ msgstr ""
"另外一台连接到互联网的计算机,称为 <emphasis>source</emphasis>,功能是网关。"
#. Tag: para
-#: random-bits.xml:703
+#: random-bits.xml:704
#, no-c-format
msgid ""
"A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1465,13 +1466,13 @@ msgstr ""
"Install-HOWTO</ulink> 了解这种线的更多信息,以及如何自己制作。"
#. Tag: title
-#: random-bits.xml:715
+#: random-bits.xml:716
#, no-c-format
msgid "Setting up source"
msgstr "建立源"
#. Tag: para
-#: random-bits.xml:716
+#: random-bits.xml:717
#, no-c-format
msgid ""
"The following shell script is a simple example of how to configure the "
@@ -1481,7 +1482,7 @@ msgstr ""
"算机。"
#. Tag: screen
-#: random-bits.xml:721
+#: random-bits.xml:722
#, no-c-format
msgid ""
"#!/bin/sh\n"
@@ -1523,30 +1524,35 @@ msgstr ""
"echo 1 > /proc/sys/net/ipv4/ip_forward"
#. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:728
#, no-c-format
msgid "Installing target"
msgstr "安装目标"
#. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:729
#, no-c-format
msgid ""
"Boot the installation media. The installation needs to be run in expert "
-"mode; enter <userinput>expert</userinput> at the boot prompt. Below are the "
-"answers that should be given during various stages of the installation."
+"mode; enter <userinput>expert</userinput> at the boot prompt. If you need to "
+"set paramenters for kernel modules, you also need to do this at the boot "
+"prompt. For example, to boot the installer and set values for the <quote>io</"
+"quote> and <quote>irq</quote> options for the parport_pc module, enter the "
+"following at the boot prompt: <informalexample><screen>\n"
+"expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc."
+"irq=<replaceable>7</replaceable>\n"
+"</screen></informalexample> Below are the answers that should be given "
+"during various stages of the installation."
msgstr ""
-"用安装介质启动。安装需要使用专家模式; 在启动提示符下输入<userinput>expert</"
-"userinput>。下面是安装过程中不同阶段的应答。"
#. Tag: guimenuitem
-#: random-bits.xml:740
+#: random-bits.xml:748
#, no-c-format
msgid "Load installer components"
msgstr "加载安装组件"
#. Tag: para
-#: random-bits.xml:742
+#: random-bits.xml:750
#, no-c-format
msgid ""
"Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1556,13 +1562,13 @@ msgstr ""
"用 PLIP 驱动。"
#. Tag: guimenuitem
-#: random-bits.xml:750
+#: random-bits.xml:758
#, no-c-format
msgid "Detect network hardware"
msgstr "侦测网络硬件"
#. Tag: para
-#: random-bits.xml:755
+#: random-bits.xml:763
#, no-c-format
msgid ""
"If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1575,13 +1581,7 @@ msgstr ""
"系统没有网卡,安装程序不会显示该列表。"
#. Tag: para
-#: random-bits.xml:764
-#, no-c-format
-msgid "Prompt for module parameters: Yes"
-msgstr "提示模块参数: Yes"
-
-#. Tag: para
-#: random-bits.xml:769
+#: random-bits.xml:772
#, no-c-format
msgid ""
"Because no network card was detected/selected earlier, the installer will "
@@ -1591,36 +1591,20 @@ msgstr ""
"因为前面没有网卡侦测/选择,安装程序将要求您从列表中选择网络驱动模块。选择 "
"<userinput>plip</userinput> 模块。"
-#. Tag: para
-#: random-bits.xml:776
-#, no-c-format
-msgid ""
-"Additional parameters for module parport_pc: "
-"<userinput><replaceable>io=0x378 irq=7</replaceable></userinput>"
-msgstr ""
-"Additional parameters for module parport_pc: "
-"<userinput><replaceable>io=0x378 irq=7</replaceable></userinput>"
-
-#. Tag: para
-#: random-bits.xml:782
-#, no-c-format
-msgid "Additional parameters for module plip: leave empty"
-msgstr "Additional parameters for module plip: 保持空白"
-
#. Tag: guimenuitem
-#: random-bits.xml:792
+#: random-bits.xml:784
#, no-c-format
msgid "Configure the network"
msgstr "配置网络"
#. Tag: para
-#: random-bits.xml:795
+#: random-bits.xml:787
#, no-c-format
msgid "Auto-configure network with DHCP: No"
msgstr "Auto-configure network with DHCP: No"
#. Tag: para
-#: random-bits.xml:800
+#: random-bits.xml:792
#, no-c-format
msgid ""
"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -1628,7 +1612,7 @@ msgstr ""
"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
#. Tag: para
-#: random-bits.xml:805
+#: random-bits.xml:797
#, no-c-format
msgid ""
"Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -1638,7 +1622,7 @@ msgstr ""
"userinput>"
#. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:803
#, no-c-format
msgid ""
"Name server addresses: you can enter the same addresses used on source (see "
@@ -1646,3 +1630,25 @@ msgid ""
msgstr ""
"Name server addresses: 您可以使用与源计算机相同的地址 (参阅 <filename>/etc/"
"resolv.conf</filename>)"
+
+#~ msgid ""
+#~ "Boot the installation media. The installation needs to be run in expert "
+#~ "mode; enter <userinput>expert</userinput> at the boot prompt. Below are "
+#~ "the answers that should be given during various stages of the "
+#~ "installation."
+#~ msgstr ""
+#~ "用安装介质启动。安装需要使用专家模式; 在启动提示符下输入"
+#~ "<userinput>expert</userinput>。下面是安装过程中不同阶段的应答。"
+
+#~ msgid "Prompt for module parameters: Yes"
+#~ msgstr "提示模块参数: Yes"
+
+#~ msgid ""
+#~ "Additional parameters for module parport_pc: "
+#~ "<userinput><replaceable>io=0x378 irq=7</replaceable></userinput>"
+#~ msgstr ""
+#~ "Additional parameters for module parport_pc: "
+#~ "<userinput><replaceable>io=0x378 irq=7</replaceable></userinput>"
+
+#~ msgid "Additional parameters for module plip: leave empty"
+#~ msgstr "Additional parameters for module plip: 保持空白"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index e5cb44a2f..6ac8ed82c 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.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-07-30 15:28+0000\n"
"PO-Revision-Date: 2006-07-18 11:05+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1986,9 +1986,9 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1334
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"First, let's have a look at available options available when you select "
+"First, let's have a look at the options available when you select "
"<userinput>Device-mapper (dm-crypt)</userinput> as the encryption method. As "
"always: when in doubt, use the defaults, because they have been carefully "
"chosen with security in mind."